Merge lp:~openerp-dev/openobject-addons/6.1-opw-574253-han into lp:openobject-addons/6.1

[Hardik Ansodariya (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.

In module l10_fr by concerning Maintenance Case:574253

Thanks

[Vinay Rana (OpenERP) (vra-openerp)]

review: Approve

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Confirmed on Trunk (means still existing and reproducible). A Merge Proposal for trunk was created to fix it. Here is the link to follow the MP on Launchpad https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-opw-574253-port-mma/+merge/132296 and be informed once it's been merged in trunk: ... If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

6788. By Hardik Ansodariya (OpenERP) on 2012-05-09

[FIXED] l10_fr:change the worng account type and internal type in demo data(Maintanace Case: 574253)

=== modified file 'l10n_fr/fr_tax_demo.xml'
--- l10n_fr/fr_tax_demo.xml	2012-01-31 09:25:10 +0000
+++ l10n_fr/fr_tax_demo.xml	2012-05-09 10:11:19 +0000
@@ -109,8 +109,8 @@
       <field name="base_code_id" ref="tax_acq_196_ht"/>
       <field name="tax_code_id" ref="tax_acq_196"/>
 
-      <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_demo.xml'
--- l10n_fr/plan_comptable_general_demo.xml	2011-10-16 01:28:00 +0000
+++ l10n_fr/plan_comptable_general_demo.xml	2012-05-09 10:11:19 +0000
@@ -4471,7 +4471,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_type_receivable"/>
+      <field name="user_type" ref="account_type_payable"/>
       <field name="note">Pour frais avancés personnellement</field>
 
       <field name="parent_id" ref="pcg_45"/>
@@ -4481,8 +4481,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_type_receivable"/>
+      <field name="type">payable</field>
+      <field name="user_type" ref="account_type_payable"/>
 
       <field name="parent_id" ref="pcg_455"/>
       <field name="reconcile" eval="True"/>
@@ -4491,8 +4491,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_type_receivable"/>
+      <field name="type">payable</field>
+      <field name="user_type" ref="account_type_payable"/>
 
       <field name="parent_id" ref="pcg_455"/>
       <field name="reconcile" eval="True"/>