pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modifs

Browse Source 
bzr revid: fp@tinyerp.com-20080903153748-urg6n86b6x4jixdj
This commit is contained in:
Fabien Pinckaers
2008-09-03 17:37:48 +02:00
parent 63cd43dca4 f66624a2f2
commit f59569dfc0
2 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account.py
+10 -3
View File
@@ -2043,10 +2043,18 @@ class wizard_multi_charts_accounts(osv.osv_memory):
property_obj = self.pool.get('ir.property')
fields_obj = self.pool.get('ir.model.fields')
todo_list = [('property_account_receivable','res.partner','account.account'), ('property_account_payable','res.partner','account.account'),('property_account_expense_categ','product.category','account.account'),('property_account_income_categ','product.category','account.account'),('property_account_tax','res.partner','account.tax'),('property_account_expense','product.template','account.account'),('property_account_income','product.template','account.account')]
todo_list = [
('property_account_receivable','res.partner','account.account'),
('property_account_payable','res.partner','account.account'),
('property_account_expense_categ','product.category','account.account'),
('property_account_income_categ','product.category','account.account'),
('property_account_tax','res.partner','account.tax'),
('property_account_expense','product.template','account.account'),
('property_account_income','product.template','account.account')
]
for record in todo_list:
r = []
r = property_obj.search(cr, uid, [('name','like', record[0] ),('company_id','=',company_id)])
r = property_obj.search(cr, uid, [('name','=', record[0] ),('company_id','=',company_id)])
account = getattr(obj_multi.chart_template_id, record[0])
field = fields_obj.search(cr, uid, [('name','=',record[0]),('model','=',record[1]),('relation','=',record[2])])
vals = {
@@ -2060,7 +2068,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
property_obj.write(cr, uid, r, vals)
else:
#create the property
print "create the property",record[0]," for ",company_id
property_obj.create(cr, uid, vals)
return {}
addons/l10n_be/account_pcmn_belgium.xml
+12 -9
View File
@@ -2872,9 +2872,10 @@
<field ref="a401" name="parent_id"/>
</record>
<record id="account.property_account_receivable" model="ir.property">
<!-- <record id="account.property_account_receivable" model="ir.property">
<field eval="'account.account,'+str(a_recv)" name="value"/>
</record>
-->
<record id="a4013" model="account.account.template">
<field name="name">Effets à l'encaissement</field>
@@ -3451,10 +3452,10 @@
<field ref="a4400" name="parent_id"/>
</record>
<record id="account.property_account_payable" model="ir.property">
<!-- <record id="account.property_account_payable" model="ir.property">
<field eval="'account.account,'+str(a_pay)" name="value"/>
</record>
-->
<record id="a44001" model="account.account.template">
<field name="name">Entreprises avec lesquelles il existe un lien de participation</field>
<field name="code">44001</field>
@@ -4391,10 +4392,10 @@
<field ref="a60" name="parent_id"/>
</record>
<record id="account.property_account_expense_categ" model="ir.property">
<!-- <record id="account.property_account_expense_categ" model="ir.property">
<field eval="'account.account,'+str(a_expense)" name="value"/>
</record>
-->
<record id="a601" model="account.account.template">
<field name="name">Achats de fournitures</field>
<field name="code">601</field>
@@ -5795,11 +5796,11 @@
<field ref="a701" name="parent_id"/>
</record>
<!--
<record id="account.property_account_income_categ" model="ir.property">
<field eval="'account.account,'+str(a_sale)" name="value"/>
</record>
-->
<record id="a7011" model="account.account.template">
<field name="name">Ventes dans les pays membres de la C.E.E.</field>
<field name="code">7011</field>
@@ -6592,8 +6593,10 @@
<field name="account_root_id" ref="a_root"/>
<field name="tax_code_root_id" ref="vat_code_chart_root"/>
<field name="bank_account_view_id" ref="a550"/>
<field name="property_account_receivable" ref="a_sale"/>
<field name="property_account_payable" ref="a_expense"/>
<field name="property_account_receivable" ref="a_recv"/>
<field name="property_account_payable" ref="a_pay"/>
<field name="property_account_expense_categ" ref="a_expense"/>
<field name="property_account_income_categ" ref="a_sale"/>
</record>
<!-- TVA - Taxe sur la Valeur Ajoutée -->