Merge lp:~sebastien.beau/c2c-financial-addons/c2c-financial-addons-fix-rule-m2m into lp:c2c-financial-addons/6.1

[Guewen Baconnier @ Camptocamp]

FIX a bug

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

The merge is huge for "a bug". Can you check you requested the merge on the right branch + describe the bug you're trying to fix (or link to a bug on the tracker)?

Thanks

review: Needs Fixing

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Hi Sébastien,

Please create your merge proposal into lp:c2c-financial-addons/6.1

Thanks

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Hi Sébastien,

I merged your fix (slightly modified) from the revision 90 in our 6.1 branch.

Thanks

Guewen

review: Approve

=== modified file 'account_fiscal_position_rule_m2m/fiscal_rules.py'
--- account_fiscal_position_rule_m2m/fiscal_rules.py	2012-10-23 14:41:46 +0000
+++ account_fiscal_position_rule_m2m/fiscal_rules.py	2012-10-23 14:44:25 +0000
@@ -177,9 +177,14 @@
         )
 
         for field in account_fiscal_position_rule.m2o_replaced_fields:
+<<<<<<< TREE
             field_name = "%s_ids" % field
             field_ids = [item.id for item in template[field_name]]
             vals[field_name] = [(6, 0, field_ids)]
+=======
+            field_ids = [item.id for item in template["%s_ids"%field]]
+            vals["%s_ids"%field] = [(6, 0, field_ids)]
+>>>>>>> MERGE-SOURCE
 
         return vals