summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorARA (OpenERP) <ara@tinyerp.com>2010-11-24 14:45:14 +0530
committerARA (OpenERP) <ara@tinyerp.com>2010-11-24 14:45:14 +0530
commit849a4e9b5f7bcd93fd9fb370e4bad1bd1469bb7a (patch)
treec8400b1d0d032e9b0bcd887ff01015d313a26f47
parent08584d04f5b28b9f60ad66325632652bf8b72f24 (diff)
[REF] Account: journal code size=5 and related demo data changes
bzr revid: ara@tinyerp.com-20101124091514-4tyb6ozxi1cnhxfa
-rw-r--r--addons/account/account.py2
-rw-r--r--addons/account/demo/account_minimal.xml14
2 files changed, 8 insertions, 8 deletions
diff --git a/addons/account/account.py b/addons/account/account.py
index 485b085fbbe..f557861700e 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -585,7 +585,7 @@ class account_journal(osv.osv):
_description = "Journal"
_columns = {
'name': fields.char('Journal Name', size=64, required=True, translate=True),
- 'code': fields.char('Code', size=16, required=True, help="The code will be used to generate the numbers of the journal entries of this journal."),
+ 'code': fields.char('Code', size=5, required=True, help="The code will be used to generate the numbers of the journal entries of this journal."),
'type': fields.selection([('sale', 'Sale'),('sale_refund','Sale Refund'), ('purchase', 'Purchase'), ('purchase_refund','Purchase Refund'), ('cash', 'Cash'), ('bank', 'Bank and Cheques'), ('general', 'General'), ('situation', 'Opening/Closing Situation')], 'Type', size=32, required=True,
help="Select 'Sale' for Sale journal to be used at the time of making invoice."\
" Select 'Purchase' for Purchase Journal to be used at the time of approving purchase order."\
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 10f2df28605..d670cb67d0f 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -342,7 +342,7 @@
<record id="sales_journal" model="account.journal">
<field name="name">Sales Journal - (test)</field>
- <field name="code">SAJ - (test)</field>
+ <field name="code">SAJ_J</field>
<field name="type">sale</field>
<field name="view_id" ref="account_sp_journal_view"/>
<field name="sequence_id" ref="sequence_sale_journal"/>
@@ -353,7 +353,7 @@
</record>
<record id="refund_sales_journal" model="account.journal">
<field name="name">Sales Credit Note Journal - (test)</field>
- <field name="code">SCNJ - (test)</field>
+ <field name="code">SCN_J</field>
<field name="type">sale_refund</field>
<field eval="True" name="refund_journal"/>
<field name="view_id" ref="account_sp_refund_journal_view"/>
@@ -366,7 +366,7 @@
<record id="expenses_journal" model="account.journal">
<field name="name">Expenses Journal - (test)</field>
- <field name="code">EXJ - (test)</field>
+ <field name="code">EXJ_J</field>
<field name="type">purchase</field>
<field name="view_id" ref="account_sp_journal_view"/>
<field name="sequence_id" ref="sequence_purchase_journal"/>
@@ -377,7 +377,7 @@
</record>
<record id="refund_expenses_journal" model="account.journal">
<field name="name">Expenses Credit Notes Journal - (test)</field>
- <field name="code">ECNJ - (test)</field>
+ <field name="code">ECN_J</field>
<field name="type">purchase_refund</field>
<field eval="True" name="refund_journal"/>
<field name="view_id" ref="account_sp_refund_journal_view"/>
@@ -390,7 +390,7 @@
<record id="bank_journal" model="account.journal">
<field name="name">Bank Journal - (test)</field>
- <field name="code">BNK - (test)</field>
+ <field name="code">BNK_J</field>
<field name="type">bank</field>
<field name="view_id" ref="account_journal_bank_view"/>
<field name="sequence_id" ref="sequence_bank_journal"/>
@@ -401,7 +401,7 @@
</record>
<record id="check_journal" model="account.journal">
<field name="name">Checks Journal - (test)</field>
- <field name="code">CHK - (test)</field>
+ <field name="code">CHK_J</field>
<field name="type">bank</field>
<field name="view_id" ref="account_journal_bank_view"/>
<field name="sequence_id" ref="sequence_check_journal"/>
@@ -412,7 +412,7 @@
</record>
<record id="cash_journal" model="account.journal">
<field name="name">Cash Journal - (test)</field>
- <field name="code">CSH - (test)</field>
+ <field name="code">CSH_J</field>
<field name="type">cash</field>
<field name="view_id" ref="account_journal_bank_view"/>
<field name="sequence_id" ref="sequence_cash_journal"/>