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

merge

Browse Source 
bzr revid: olt@tinyerp.com-20090115170920-i8f3vn1ny629hi7l
This commit is contained in:
Olivier Laurent
2009-01-15 18:09:20 +01:00
parent 1e3b10416e 0ca40fec5e
commit 6e6e48f768
2 changed files with 32 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account.py
+2 -1
View File
@@ -1874,6 +1874,7 @@ class account_fiscal_position_template(osv.osv):
_columns = {
'name': fields.char('Fiscal Position Template', size=64, translate=True, required=True),
'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', required=True),
'account_ids': fields.one2many('account.fiscal.position.account.template', 'position_id', 'Accounts Mapping'),
'tax_ids': fields.one2many('account.fiscal.position.tax.template', 'position_id', 'Taxes Mapping')
}
@@ -2153,7 +2154,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
#create the property
property_obj.create(cr, uid, vals)
fp_ids = obj_fiscal_position_template.search(cr, uid,[])
fp_ids = obj_fiscal_position_template.search(cr, uid,[('chart_template_id', '=', obj_multi.chart_template_id.id)])
if fp_ids:
for position in obj_fiscal_position_template.browse(cr, uid, fp_ids):
addons/l10n_be/fiscal_templates.xml
+30 -35
View File
@@ -5,65 +5,60 @@
<!-- Fiscal Position Templates -->
<record id="fiscal_position_template_1" model="account.fiscal.position.template">
<field name="name">Fiscal Position for Sale</field>
<field name="name">En Belgique</field>
<field name="chart_template_id" ref="l10nbe_chart_template"/>
</record>
<record id="fiscal_position_template_2" model="account.fiscal.position.template">
<field name="name">Fiscal Position for Purchase</field>
<field name="name">Dans l'U.E</field>
<field name="chart_template_id" ref="l10nbe_chart_template"/>
</record>
<!-- Fiscal Position Tax Templates -->
<record id="fiscal_position_tax_template_1" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_1" />
<field name="tax_src_id" ref="l10n_be.vat_6" />
<field name="tax_dest_id" ref="l10n_be.vat_12" />
<field name="position_id" ref="fiscal_position_template_2" />
<field name="tax_src_id" ref="l10n_be.vat_21" />
<field name="tax_dest_id" ref="l10n_be.vat_I0" />
</record>
<record id="fiscal_position_tax_template_2" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_1" />
<field name="tax_src_id" ref="l10n_be.vat_21" />
<field name="tax_dest_id" ref="l10n_be.vat_21_buy" />
<field name="position_id" ref="fiscal_position_template_2"/>
<field name="tax_src_id" ref="l10n_be.vat_21_buy" />
<field name="tax_dest_id" ref="l10n_be.vat_CO" />
</record>
<record id="fiscal_position_tax_template_3" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_2" />
<field name="tax_src_id" ref="l10n_be.vat_XO_1" />
<field name="tax_dest_id" ref="l10n_be.vat_XO_2" />
</record>
<record id="fiscal_position_tax_template_4" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_2" />
<field name="tax_src_id" ref="l10n_be.vat_I0_1" />
<field name="tax_dest_id" ref="l10n_be.vat_I0_2" />
</record>
<!-- Fiscal Position Account Templates -->
<record id="fiscal_position_account_template_1" model="account.fiscal.position.account.template">
<field name="position_id" ref="fiscal_position_template_1" />
<field name="account_src_id" ref="l10n_be.a408" />
<field name="account_dest_id" ref="l10n_be.a480" />
<field name="account_src_id" ref="l10n_be.a7000" />
<field name="account_dest_id" ref="l10n_be.a_sale" />
</record>
<record id="fiscal_position_account_template_2" model="account.fiscal.position.account.template">
<field name="position_id" ref="fiscal_position_template_1" />
<field name="account_src_id" ref="l10n_be.a419" />
<field name="account_dest_id" ref="l10n_be.a4201" />
</record>
<record id="fiscal_position_account_template_3" model="account.fiscal.position.account.template">
<field name="position_id" ref="fiscal_position_template_2" />
<field name="account_src_id" ref="l10n_be.a4200" />
<field name="account_dest_id" ref="l10n_be.a4168" />
<field name="account_src_id" ref="l10n_be.a7000" />
<field name="account_dest_id" ref="l10n_be.a7001" />
</record>
<record id="fiscal_position_account_template_4" model="account.fiscal.position.account.template">
<field name="position_id" ref="fiscal_position_template_2" />
<field name="account_src_id" ref="l10n_be.a4210" />
<field name="account_dest_id" ref="l10n_be.a4164" />
<field name="account_src_id" ref="l10n_be.a_sale" />
<field name="account_dest_id" ref="l10n_be.a7011" />
</record>
<record id="fiscal_position_account_template_5" model="account.fiscal.position.account.template">
<field name="position_id" ref="fiscal_position_template_2" />
<field name="account_src_id" ref="l10n_be.a7020" />
<field name="account_dest_id" ref="l10n_be.a7021" />
</record>
<record id="fiscal_position_account_template_6" model="account.fiscal.position.account.template">
<field name="position_id" ref="fiscal_position_template_2" />
<field name="account_src_id" ref="l10n_be.a7050" />
<field name="account_dest_id" ref="l10n_be.a7051" />
</record>
</data>
</openerp>
</openerp>