Ravish(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-bug-1097934-rmu into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
Related bugs:
Bug #1097934 in OpenERP Addons: "[trunk/7.0] account - duplicate sequence for
some journals"
https://bugs.launchpad.net/openobject-addons/+bug/1097934
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-1097934-rmu/+merge/143684
Hello,
I have solved the issue of "account - duplicate sequence for some journals".
Thanks,
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-1097934-rmu/+merge/143684
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-bug-1097934-rmu.
=== modified file 'account/data/account_data.xml'
--- account/data/account_data.xml 2012-12-21 16:48:08 +0000
+++ account/data/account_data.xml 2013-01-17 12:59:54 +0000
@@ -59,52 +59,6 @@
Account Journal Sequences
-->
- <record id="sequence_sale_journal" model="ir.sequence">
- <field name="name">Account Default Sales Journal</field>
- <field eval="3" name="padding"/>
- <field name="prefix">SAJ/%(year)s/</field>
- </record>
- <record id="sequence_refund_sales_journal" model="ir.sequence">
- <field name="name">Account Default Sales Credit Note Journal</field>
- <field eval="3" name="padding"/>
- <field name="prefix">SCNJ/%(year)s/</field>
- </record>
- <record id="sequence_purchase_journal" model="ir.sequence">
- <field name="name">Account Default Expenses Journal</field>
- <field eval="3" name="padding"/>
- <field name="prefix">EXJ/%(year)s/</field>
- </record>
- <record id="sequence_refund_purchase_journal" model="ir.sequence">
- <field name="name">Account Default Expenses Credit Notes Journal</field>
- <field eval="3" name="padding"/>
- <field name="prefix">ECNJ/%(year)s/</field>
- </record>
- <record id="sequence_bank_journal" model="ir.sequence">
- <field name="name">Account Default Bank Journal</field>
- <field eval="3" name="padding"/>
- <field name="prefix">BNK/%(year)s/</field>
- </record>
- <record id="sequence_check_journal" model="ir.sequence">
- <field name="name">Account Default Checks Journal</field>
- <field eval="3" name="padding"/>
- <field name="prefix">CHK/%(year)s/</field>
- </record>
- <record id="sequence_cash_journal" model="ir.sequence">
- <field name="name">Account Default Cash Journal</field>
- <field eval="3" name="padding"/>
- <field name="prefix">CSH/%(year)s/</field>
- </record>
- <record id="sequence_opening_journal" model="ir.sequence">
- <field name="name">Account Default Opening Entries Journal</field>
- <field eval="3" name="padding"/>
- <field name="prefix">OPEJ/%(year)s/</field>
- </record>
- <record id="sequence_miscellaneous_journal" model="ir.sequence">
- <field name="name">Account Default Miscellaneous Journal</field>
- <field eval="3" name="padding"/>
- <field name="prefix">MISJ/%(year)s/</field>
- </record>
-
<!--
Account Statement Sequences
-->
=== modified file 'account/demo/account_minimal.xml'
--- account/demo/account_minimal.xml 2012-12-15 18:15:44 +0000
+++ account/demo/account_minimal.xml 2013-01-17 12:59:54 +0000
@@ -312,7 +312,6 @@
<field name="name">Sales Journal - (test)</field>
<field name="code">TSAJ</field>
<field name="type">sale</field>
- <field name="sequence_id" ref="sequence_sale_journal"/>
<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="analytic_journal_id" ref="cose_journal_sale"/>
@@ -322,7 +321,6 @@
<field name="name">Sales Credit Note Journal - (test)</field>
<field name="code">TSCNJ</field>
<field name="type">sale_refund</field>
- <field name="sequence_id" ref="sequence_refund_sales_journal"/>
<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="analytic_journal_id" ref="cose_journal_sale"/>
@@ -333,7 +331,6 @@
<field name="name">Expenses Journal - (test)</field>
<field name="code">TEXJ</field>
<field name="type">purchase</field>
- <field name="sequence_id" ref="sequence_purchase_journal"/>
<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="analytic_journal_id" ref="exp"/>
@@ -343,7 +340,6 @@
<field name="name">Expenses Credit Notes Journal - (test)</field>
<field name="code">TECNJ</field>
<field name="type">purchase_refund</field>
- <field name="sequence_id" ref="sequence_refund_purchase_journal"/>
<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="analytic_journal_id" ref="exp"/>
@@ -354,7 +350,6 @@
<field name="name">Bank Journal - (test)</field>
<field name="code">TBNK</field>
<field name="type">bank</field>
- <field name="sequence_id" ref="sequence_bank_journal"/>
<field model="account.account" name="default_debit_account_id" ref="bnk"/>
<field model="account.account" name="default_credit_account_id" ref="bnk"/>
<field name="analytic_journal_id" ref="sit"/>
@@ -364,7 +359,6 @@
<field name="name">Checks Journal - (test)</field>
<field name="code">TCHK</field>
<field name="type">bank</field>
- <field name="sequence_id" ref="sequence_check_journal"/>
<field model="account.account" name="default_debit_account_id" ref="cash"/>
<field model="account.account" name="default_credit_account_id" ref="cash"/>
<field name="analytic_journal_id" ref="sit"/>
@@ -384,7 +378,6 @@
that test OpenERP arrive directly in the touchscreen UI.
-->
<field name="cash_control" eval="False"/>
- <field name="sequence_id" ref="sequence_cash_journal"/>
<field model="account.account" name="default_debit_account_id" ref="cash"/>
<field model="account.account" name="default_credit_account_id" ref="cash"/>
<field name="analytic_journal_id" ref="sit"/>
@@ -394,7 +387,6 @@
<field name="name">Miscellaneous Journal - (test)</field>
<field name="code">TMIS</field>
<field name="type">general</field>
- <field name="sequence_id" ref="sequence_miscellaneous_journal"/>
<field name="analytic_journal_id" ref="sit"/>
<field name="user_id" ref="base.user_root"/>
</record>
@@ -402,7 +394,6 @@
<field name="name">Opening Entries Journal - (test)</field>
<field name="code">TOEJ</field>
<field name="type">situation</field>
- <field name="sequence_id" ref="sequence_opening_journal"/>
<field model="account.account" name="default_debit_account_id" ref="o_income"/>
<field model="account.account" name="default_credit_account_id" ref="o_expense"/>
<field eval="True" name="centralisation"/>
=== modified file 'multi_company/multi_company_demo.xml'
--- multi_company/multi_company_demo.xml 2012-11-29 22:26:45 +0000
+++ multi_company/multi_company_demo.xml 2013-01-17 12:59:54 +0000
@@ -191,7 +191,6 @@
<field name="name">Sales Journal - (OpenERP IN)</field>
<field name="code">SAJ-OpenERP IN</field>
<field name="type">sale</field>
- <field name="sequence_id" ref="account.sequence_sale_journal"/>
<field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
<field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
<field name="analytic_journal_id" ref="account.cose_journal_sale"/>
@@ -203,7 +202,6 @@
<field name="name">Sales Credit Note Journal - (OpenERP IN)</field>
<field name="code">SCNJ-OpenERP IN</field>
<field name="type">sale_refund</field>
- <field name="sequence_id" ref="account.sequence_refund_sales_journal"/>
<field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
<field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
<field name="analytic_journal_id" ref="account.cose_journal_sale"/>
@@ -215,7 +213,6 @@
<field name="name">Expenses Journal - (OpenERP IN)</field>
<field name="code">EXJ-OpenERP IN</field>
<field name="type">purchase</field>
- <field name="sequence_id" ref="account.sequence_purchase_journal"/>
<field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
<field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
<field name="analytic_journal_id" ref="account.exp"/>
@@ -227,7 +224,6 @@
<field name="name">Expenses Credit Notes Journal - (OpenERP IN)</field>
<field name="code">ECNJ-OpenERP IN</field>
<field name="type">purchase_refund</field>
- <field name="sequence_id" ref="account.sequence_refund_purchase_journal"/>
<field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
<field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
<field name="analytic_journal_id" ref="account.exp"/>
@@ -239,7 +235,6 @@
<field name="name">Bank Journal - (OpenERP IN)</field>
<field name="code">BNK-OpenERP IN</field>
<field name="type">bank</field>
- <field name="sequence_id" ref="account.sequence_bank_journal"/>
<field model="account.account" name="default_debit_account_id" ref="account.cash"/>
<field model="account.account" name="default_credit_account_id" ref="account.cash"/>
<field name="analytic_journal_id" ref="account.sit"/>
@@ -251,7 +246,6 @@
<field name="name">Checks Journal - (OpenERP IN)</field>
<field name="code">CHK-OpenERP IN</field>
<field name="type">bank</field>
- <field name="sequence_id" ref="account.sequence_check_journal"/>
<field model="account.account" name="default_debit_account_id" ref="account.cash"/>
<field model="account.account" name="default_credit_account_id" ref="account.cash"/>
<field name="analytic_journal_id" ref="account.sit"/>
@@ -263,7 +257,6 @@
<field name="name">Cash Journal - (OpenERP IN)</field>
<field name="code">CSH-OpenERP IN</field>
<field name="type">cash</field>
- <field name="sequence_id" ref="account.sequence_cash_journal"/>
<field model="account.account" name="default_debit_account_id" ref="account.cash"/>
<field model="account.account" name="default_credit_account_id" ref="account.cash"/>
<field name="analytic_journal_id" ref="account.sit"/>
@@ -276,7 +269,6 @@
<field name="name">Sales Journal - (OpenERP US)</field>
<field name="code">SAJ-OpenERP US</field>
<field name="type">sale</field>
- <field name="sequence_id" ref="account.sequence_sale_journal"/>
<field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
<field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
<field name="analytic_journal_id" ref="account.cose_journal_sale"/>
@@ -288,7 +280,6 @@
<field name="name">Sales Credit Note Journal - (OpenERP US)</field>
<field name="code">SCNJ-OpenERP US</field>
<field name="type">sale_refund</field>
- <field name="sequence_id" ref="account.sequence_refund_sales_journal"/>
<field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
<field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
<field name="analytic_journal_id" ref="account.cose_journal_sale"/>
@@ -300,7 +291,6 @@
<field name="name">Expenses Journal - (OpenERP US)</field>
<field name="code">EXJ-OpenERP US</field>
<field name="type">purchase</field>
- <field name="sequence_id" ref="account.sequence_purchase_journal"/>
<field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
<field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
<field name="analytic_journal_id" ref="account.exp"/>
@@ -312,7 +302,6 @@
<field name="name">Expenses Credit Notes Journal - (OpenERP US)</field>
<field name="code">ECNJ-OpenERP US</field>
<field name="type">purchase_refund</field>
- <field name="sequence_id" ref="account.sequence_refund_purchase_journal"/>
<field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
<field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
<field name="analytic_journal_id" ref="account.exp"/>
@@ -324,7 +313,6 @@
<field name="name">Bank Journal - (OpenERP US)</field>
<field name="code">BNK-OpenERP US</field>
<field name="type">bank</field>
- <field name="sequence_id" ref="account.sequence_bank_journal"/>
<field model="account.account" name="default_debit_account_id" ref="account.cash"/>
<field model="account.account" name="default_credit_account_id" ref="account.cash"/>
<field name="analytic_journal_id" ref="account.sit"/>
@@ -336,7 +324,6 @@
<field name="name">Checks Journal - (OpenERP US)</field>
<field name="code">CHK-OpenERP US</field>
<field name="type">bank</field>
- <field name="sequence_id" ref="account.sequence_check_journal"/>
<field model="account.account" name="default_debit_account_id" ref="account.cash"/>
<field model="account.account" name="default_credit_account_id" ref="account.cash"/>
<field name="analytic_journal_id" ref="account.sit"/>
@@ -348,7 +335,6 @@
<field name="name">Cash Journal - (OpenERP US)</field>
<field name="code">CSH-OpenERP US</field>
<field name="type">cash</field>
- <field name="sequence_id" ref="account.sequence_cash_journal"/>
<field model="account.account" name="default_debit_account_id" ref="account.cash"/>
<field model="account.account" name="default_credit_account_id" ref="account.cash"/>
<field name="analytic_journal_id" ref="account.sit"/>
@@ -362,7 +348,6 @@
<field name="name">Sales Journal - (OpenERP BE)</field>
<field name="code">SAJ-OpenERP BE</field>
<field name="type">sale</field>
- <field name="sequence_id" ref="account.sequence_sale_journal"/>
<field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
<field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
<field name="analytic_journal_id" ref="account.cose_journal_sale"/>
@@ -374,7 +359,6 @@
<field name="name">Sales Credit Note Journal - (OpenERP BE)</field>
<field name="code">SCNJ-OpenERP BE</field>
<field name="type">sale_refund</field>
- <field name="sequence_id" ref="account.sequence_refund_sales_journal"/>
<field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
<field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
<field name="analytic_journal_id" ref="account.cose_journal_sale"/>
@@ -386,7 +370,6 @@
<field name="name">Expenses Journal - (OpenERP BE)</field>
<field name="code">EXJ-OpenERP BE</field>
<field name="type">purchase</field>
- <field name="sequence_id" ref="account.sequence_purchase_journal"/>
<field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
<field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
<field name="analytic_journal_id" ref="account.exp"/>
@@ -398,7 +381,6 @@
<field name="name">Expenses Credit Notes Journal - (OpenERP BE)</field>
<field name="code">ECNJ-OpenERP BE</field>
<field name="type">purchase_refund</field>
- <field name="sequence_id" ref="account.sequence_refund_purchase_journal"/>
<field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
<field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
<field name="analytic_journal_id" ref="account.exp"/>
@@ -410,7 +392,6 @@
<field name="name">Bank Journal - (OpenERP BE)</field>
<field name="code">BNK-OpenERP BE</field>
<field name="type">bank</field>
- <field name="sequence_id" ref="account.sequence_bank_journal"/>
<field model="account.account" name="default_debit_account_id" ref="account.cash"/>
<field model="account.account" name="default_credit_account_id" ref="account.cash"/>
<field name="analytic_journal_id" ref="account.sit"/>
@@ -422,7 +403,6 @@
<field name="name">Checks Journal - (OpenERP BE)</field>
<field name="code">CHK-OpenERP BE</field>
<field name="type">bank</field>
- <field name="sequence_id" ref="account.sequence_check_journal"/>
<field model="account.account" name="default_debit_account_id" ref="account.cash"/>
<field model="account.account" name="default_credit_account_id" ref="account.cash"/>
<field name="analytic_journal_id" ref="account.sit"/>
@@ -434,7 +414,6 @@
<field name="name">Cash Journal - (OpenERP BE)</field>
<field name="code">CSH-OpenERP BE</field>
<field name="type">cash</field>
- <field name="sequence_id" ref="account.sequence_cash_journal"/>
<field model="account.account" name="default_debit_account_id" ref="account.cash"/>
<field model="account.account" name="default_credit_account_id" ref="account.cash"/>
<field name="analytic_journal_id" ref="account.sit"/>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : openerp-dev-gtk@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
