From 1e8a9a983f604076b1528dfdb484d1ba63fa25bb Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Thu, 26 Aug 2010 19:15:15 +0530
Subject: [PATCH] [IMP] account: assigned collection and paid account to
 remaining configuration charts taxes, assigned common sequence for sale and
 purchase, assigned invoice seq for minimum chart demo journals.

bzr revid: vra@tinyerp.com-20100826134515-vzqm2ergu3bzkm0v
---
 addons/account/configurable_account_chart.xml | 8 ++++++++
 addons/account/data/account_data2.xml         | 6 ++++--
 addons/account/demo/account_minimal.xml       | 6 ++++--
 addons/account/installer.py                   | 8 ++++----
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml
index de8c1ba0cd0..f9512cd4e83 100644
--- a/addons/account/configurable_account_chart.xml
+++ b/addons/account/configurable_account_chart.xml
@@ -470,6 +470,8 @@
             <field name="name">OTAX X</field>
             <field eval="0.0" name="amount"/>
             <field name="type">percent</field>
+            <field name="account_collected_id" ref="conf_ova"/>
+            <field name="account_paid_id" ref="conf_ova"/>
             <field name="base_code_id" ref="tax_code_purch_X"/>
             <field name="tax_code_id" ref="tax_code_output_X"/>
             <field name="ref_base_code_id" ref="tax_code_purch_X"/>
@@ -482,6 +484,8 @@
             <field name="name">OTAX O</field>
             <field eval="0.0" name="amount"/>
             <field name="type">percent</field>
+            <field name="account_collected_id" ref="conf_ova"/>
+            <field name="account_paid_id" ref="conf_ova"/>
             <field name="base_code_id" ref="tax_code_purch_O"/>
             <field name="tax_code_id" ref="tax_code_output_O"/>
             <field name="ref_base_code_id" ref="tax_code_purch_O"/>
@@ -524,6 +528,8 @@
             <field name="name">ITAX X</field>
             <field eval="0.0" name="amount"/>
             <field name="type">percent</field>
+            <field name="account_collected_id" ref="conf_iva"/>
+            <field name="account_paid_id" ref="conf_iva"/>
             <field name="base_code_id" ref="tax_code_sales_X"/>
             <field name="tax_code_id" ref="tax_code_input_X"/>
             <field name="ref_base_code_id" ref="tax_code_sales_X"/>
@@ -536,6 +542,8 @@
             <field name="name">ITAX O</field>
             <field eval="0.0" name="amount"/>
             <field name="type">percent</field>
+            <field name="account_collected_id" ref="conf_iva"/>
+            <field name="account_paid_id" ref="conf_iva"/>
             <field name="base_code_id" ref="tax_code_sales_O"/>
             <field name="tax_code_id" ref="tax_code_input_O"/>
             <field name="ref_base_code_id" ref="tax_code_sales_O"/>
diff --git a/addons/account/data/account_data2.xml b/addons/account/data/account_data2.xml
index af55e477b42..b0f5f82e156 100644
--- a/addons/account/data/account_data2.xml
+++ b/addons/account/data/account_data2.xml
@@ -461,12 +461,14 @@
         <record id="sequence_sale_journal" model="ir.sequence">
             <field name="name">Sale Journal</field>
             <field name="code">account.journal</field>
-            <field name="prefix"/>
+            <field eval="3" name="padding"/>
+            <field name="prefix">%(year)s/</field>
         </record>
         <record id="sequence_purchase_journal" model="ir.sequence">
             <field name="name">Purchase Journal</field>
             <field name="code">account.journal</field>
-            <field name="prefix"/>
+            <field eval="3" name="padding"/>
+            <field name="prefix">%(year)s/</field>
         </record>
 
         <!--
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index bedfed3bb69..fcaca5b19f0 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -346,7 +346,7 @@
             <field name="type">sale</field>
             <field name="view_id" ref="account_sp_journal_view"/>
             <field name="sequence_id" ref="sequence_sale_journal"/>
-            <field name="invoice_sequence_id" ref="seq_type_out_invoice"/>
+            <field name="invoice_sequence_id" ref="seq_out_invoice"/>
             <field model="account.account" name="default_credit_account_id" ref="a_sale"/>
             <field model="account.account" name="default_debit_account_id" ref="a_sale"/>
             <field name="user_id" ref="base.user_root"/>
@@ -357,6 +357,7 @@
             <field name="type">sale_refund</field>
             <field name="view_id" ref="account_sp_refund_journal_view"/>
             <field name="sequence_id" ref="sequence_sale_journal"/>
+            <field name="invoice_sequence_id" ref="seq_out_refund"/>
             <field model="account.account" name="default_credit_account_id" ref="a_sale"/>
             <field model="account.account" name="default_debit_account_id" ref="a_sale"/>
             <field name="user_id" ref="base.user_root"/>
@@ -368,7 +369,7 @@
             <field name="type">purchase</field>
             <field name="view_id" ref="account_sp_journal_view"/>
             <field name="sequence_id" ref="sequence_purchase_journal"/>
-            <field name="invoice_sequence_id" ref="seq_type_in_invoice"/>
+            <field name="invoice_sequence_id" ref="seq_in_invoice"/>
             <field model="account.account" name="default_debit_account_id" ref="a_expense"/>
             <field model="account.account" name="default_credit_account_id" ref="a_expense"/>
             <field name="user_id" ref="base.user_root"/>
@@ -379,6 +380,7 @@
             <field name="type">purchase_refund</field>
             <field name="view_id" ref="account_sp_refund_journal_view"/>
             <field name="sequence_id" ref="sequence_purchase_journal"/>
+            <field name="invoice_sequence_id" ref="seq_in_refund"/>
             <field model="account.account" name="default_debit_account_id" ref="a_expense"/>
             <field model="account.account" name="default_credit_account_id" ref="a_expense"/>
             <field name="user_id" ref="base.user_root"/>
diff --git a/addons/account/installer.py b/addons/account/installer.py
index a9d7e12ff72..d82db6de96d 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -319,15 +319,15 @@ class account_installer(osv.osv_memory):
             seq_sale = {
                         'name': 'Sale Journal',
                         'code': 'account.journal',
-                        'prefix': 'INV/',
-                        'padding': 4
+                        'prefix': '%(year)s/',
+                        'padding': 3
                         }
             seq_id_sale = obj_sequence.create(cr, uid, seq_sale)
             seq_purchase = {
                         'name': 'Purchase Journal',
                         'code': 'account.journal',
-                        'prefix': 'VEN/',
-                        'padding': 4
+                        'prefix': '%(year)s/',
+                        'padding': 3
                         }
             seq_id_purchase = obj_sequence.create(cr, uid, seq_purchase)
         else: