L10N_CH: DTA & BVR demo data imporved
bzr revid: pinky-da7f8e1fd7ae31f0301dc9c727aea2ad1d672a45
This commit is contained in:
parent
1ceb037e4a
commit
e0707d560b
|
@ -1110,7 +1110,7 @@ class account_move_line(osv.osv):
|
||||||
r = cr.fetchall()
|
r = cr.fetchall()
|
||||||
#TODO: move this check to a constraint in the account_move_reconcile object
|
#TODO: move this check to a constraint in the account_move_reconcile object
|
||||||
if len(r) != 1:
|
if len(r) != 1:
|
||||||
raise Exception('Entries are not of the same account !')
|
raise Exception('Entries are not of the same account or already reconciled ! ')
|
||||||
if r[0][1] != None:
|
if r[0][1] != None:
|
||||||
raise Exception('Some entries are already reconciled !')
|
raise Exception('Some entries are already reconciled !')
|
||||||
if writeoff != 0:
|
if writeoff != 0:
|
||||||
|
|
|
@ -87,7 +87,7 @@ class account_invoice(osv.osv):
|
||||||
('in_refund','Supplier Refund'),
|
('in_refund','Supplier Refund'),
|
||||||
],'Type', readonly=True, states={'draft':[('readonly',False)]}, select=True),
|
],'Type', readonly=True, states={'draft':[('readonly',False)]}, select=True),
|
||||||
|
|
||||||
'number': fields.char('Invoice Number', size=32), # readonly=True
|
'number': fields.char('Invoice Number', size=32,readonly=True),
|
||||||
'reference': fields.char('Invoice Reference', size=64),
|
'reference': fields.char('Invoice Reference', size=64),
|
||||||
'project_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True, states={'draft':[('readonly',False)]}),
|
'project_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True, states={'draft':[('readonly',False)]}),
|
||||||
'comment': fields.text('Additionnal Information'),
|
'comment': fields.text('Additionnal Information'),
|
||||||
|
|
|
@ -9,9 +9,9 @@
|
||||||
"website": "http://www.tinyerp.com",
|
"website": "http://www.tinyerp.com",
|
||||||
"depends" : ["base", "account"],
|
"depends" : ["base", "account"],
|
||||||
"init_xml" : [],
|
"init_xml" : [],
|
||||||
"init_xml" : ["zip_code_default.xml"],
|
# "init_xml" : ["zip_code_default.xml"],
|
||||||
"demo_xml" : ["vaudtax_data_demo.xml","dta/dta_demo.xml",],
|
"demo_xml" : ["vaudtax_data_demo.xml","dta/dta_demo.xml"],
|
||||||
"update_xml" : ["dta/dta_view.xml","dta/dta_wizard.xml",
|
"update_xml" : ["dta/dta_view.xml","dta/dta_wizard.xml","dta/dta_demo.xml",
|
||||||
"v11/v11_wizard.xml",
|
"v11/v11_wizard.xml",
|
||||||
"account_vat.xml","base_config.xml","account_config.xml",
|
"account_vat.xml","base_config.xml","account_config.xml",
|
||||||
"company_view.xml"],
|
"company_view.xml"],
|
||||||
|
|
|
@ -27,5 +27,29 @@
|
||||||
<field name="bank_id" ref="main_bank"/>
|
<field name="bank_id" ref="main_bank"/>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
|
|
||||||
|
<record model="account.invoice" id="dta_invoice">
|
||||||
|
<field name="name">DTA invoice</field>
|
||||||
|
<field name="dta_state">2bpaid</field>
|
||||||
|
<field name="number">200602</field>
|
||||||
|
<field name="partner_id" ref="base.res_partner_agrolait"/>
|
||||||
|
<field name="account_id" ref="account.a_recv"/>
|
||||||
|
</record>
|
||||||
|
|
||||||
|
<record model="account.invoice" id="v11_invoice">
|
||||||
|
<field name="name">V11 invoice</field>
|
||||||
|
<field name="amount_total">54150</field>
|
||||||
|
<field name="number">1</field>
|
||||||
|
<field name="partner_id" ref="base.res_partner_agrolait"/>
|
||||||
|
<field name="account_id" ref="account.a_recv"/>
|
||||||
|
</record>
|
||||||
|
|
||||||
|
<!-- need a invoice line ! -->
|
||||||
|
|
||||||
|
<record model="account.journal" id="account.sales_journal">
|
||||||
|
<field name="default_debit_account_id" ref="account.a_recv"/>
|
||||||
|
</record>
|
||||||
|
|
||||||
|
|
||||||
</data>
|
</data>
|
||||||
</terp>
|
</terp>
|
||||||
|
|
Loading…
Reference in New Issue