Merge lp:~openerp-dev/openobject-addons/trunk-opw-574253-port-mma into lp:openobject-addons

[Mayur Maheshwari(OpenERP)]

Hello,

I have changed Invoice Tax Account and Refund Tax Account for TVA "acquittée (achat) 19,6%"
as their internal type were view instead of regular.

For Account "Associés - Comptes courants" and its children. I have change Account Type and Internal Type "payable" from "Receivable" as they are liabilities account.

Code is forward port from 6.1

Thanks
Mayur

[Purnendu Singh (OpenERP) (purnendu-singh)]

review: Approve

=== modified file 'l10n_fr/fr_tax.xml'
--- l10n_fr/fr_tax.xml	2012-05-16 13:09:11 +0000
+++ l10n_fr/fr_tax.xml	2012-10-31 11:07:46 +0000
@@ -131,8 +131,8 @@
       <field name="tax_code_id" ref="tax_acq_196"/>
       <field name="tax_sign" eval="-1"/>
 
-      <field name="account_collected_id" ref="pcg_44566"/>
-      <field name="account_paid_id" ref="pcg_44566"/>
+      <field name="account_collected_id" ref="pcg_445662"/>
+      <field name="account_paid_id" ref="pcg_445662"/>
 
       <field name="ref_base_code_id" ref="tax_acq_196_ht"/>
       <field name="ref_base_sign" eval="1"/>

=== modified file 'l10n_fr/plan_comptable_general.xml'
--- l10n_fr/plan_comptable_general.xml	2012-07-07 14:52:17 +0000
+++ l10n_fr/plan_comptable_general.xml	2012-10-31 11:07:46 +0000
@@ -3903,7 +3903,7 @@
       <field name="name">Associés - Comptes courants</field>
       <field name="code">455</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account.data_account_type_view"/>
+      <field name="user_type" ref="account.data_account_type_payable"/>
       <field name="note">Pour frais avancés personnellement</field>
       <field name="parent_id" ref="pcg_45"/>
       <field name="reconcile" eval="True"/>
@@ -3912,8 +3912,8 @@
     <record id="pcg_4551" model="account.account.template">
       <field name="name">Principal</field>
       <field name="code">4551</field>
-      <field name="type">receivable</field>
-      <field name="user_type" ref="account.data_account_type_receivable"/>
+      <field name="type">payable</field>
+      <field name="user_type" ref="account.data_account_type_payable"/>
       <field name="parent_id" ref="pcg_455"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3921,8 +3921,8 @@
     <record id="pcg_4558" model="account.account.template">
       <field name="name">Intérêts courus</field>
       <field name="code">4558</field>
-      <field name="type">receivable</field>
-      <field name="user_type" ref="account.data_account_type_receivable"/>
+      <field name="type">payable</field>
+      <field name="user_type" ref="account.data_account_type_payable"/>
       <field name="parent_id" ref="pcg_455"/>
       <field name="reconcile" eval="True"/>
     </record>