diff options
| author | Nicolas Vanhoren <niv@openerp.com> | 2010-10-26 10:18:30 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2010-10-26 10:18:30 +0200 |
| commit | 8b1ef6ba2b0ac67cc4e63cab7f35a165dabf8e3a (patch) | |
| tree | c4944c66a3f56d822f86220902b8b0ae236a45b9 | |
| parent | 3572ed909a2294a876fa6329593d976dd94594bb (diff) | |
| parent | e6a27d1f4faa773335d586f2bf2852c338101ead (diff) | |
[MERGE] account,l10n_be: improved sale and purchase tax config for chart template wizard
hr: fixed resource loading for multiple addons paths
bzr revid: odo@openerp.com-20101026081830-qm3zbwt4quhqz2qu
| -rw-r--r-- | addons/account/account.py | 10 | ||||
| -rw-r--r-- | addons/hr/hr.py | 7 | ||||
| -rw-r--r-- | addons/l10n_be/account_pcmn_belgium.xml | 1 |
3 files changed, 11 insertions, 7 deletions
diff --git a/addons/account/account.py b/addons/account/account.py index ea0b98e26bf..50b922d723b 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -2874,10 +2874,12 @@ class wizard_multi_charts_accounts(osv.osv_memory): obj_ac_fp.create(cr, uid, vals_acc) ir_values = self.pool.get('ir.values') - ir_values.set(cr, uid, key='default', key2=False, name="taxes_id", company=obj_multi.company_id.id - , models =[('product.product',False)], value=[tax_template_to_tax[obj_multi.sale_tax.id]]) - ir_values.set(cr, uid, key='default', key2=False, name="supplier_taxes_id", company=obj_multi.company_id.id - , models =[('product.product',False)], value=[tax_template_to_tax[obj_multi.purchase_tax.id]]) + if obj_multi.sale_tax: + ir_values.set(cr, uid, key='default', key2=False, name="taxes_id", company=obj_multi.company_id.id, + models =[('product.product',False)], value=[tax_template_to_tax[obj_multi.sale_tax.id]]) + if obj_multi.purchase_tax: + ir_values.set(cr, uid, key='default', key2=False, name="supplier_taxes_id", company=obj_multi.company_id.id, + models =[('product.product',False)], value=[tax_template_to_tax[obj_multi.purchase_tax.id]]) wizard_multi_charts_accounts() diff --git a/addons/hr/hr.py b/addons/hr/hr.py index 3c65e79f11f..0f499c43ddd 100644 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -25,6 +25,8 @@ from osv import fields, osv import tools from tools.translate import _ +import addons + class hr_employee_category(osv.osv): def name_get(self, cr, uid, ids, context=None): @@ -180,9 +182,8 @@ class hr_employee(osv.osv): return {'value': {'work_email' : work_email}} def _get_photo(self, cr, uid, context=None): - return open(os.path.join( - tools.config['addons_path'], 'hr/image', 'photo.png'), - 'rb') .read().encode('base64') + res_path = addons.get_module_resource("hr","image/photo.png") + return open(res_path,'rb').read().encode('base64') _defaults = { 'active': 1, diff --git a/addons/l10n_be/account_pcmn_belgium.xml b/addons/l10n_be/account_pcmn_belgium.xml index dc6c86fc9fa..3471a184d62 100644 --- a/addons/l10n_be/account_pcmn_belgium.xml +++ b/addons/l10n_be/account_pcmn_belgium.xml @@ -6718,6 +6718,7 @@ <field name="ref_base_code_id" ref="vat_code_a49"/> <field name="ref_tax_code_id" ref="vat_code_a64"/> <field name="type_tax_use">sale</field> + <field name="sequence">0</field> </record> <record id="vat_21_s" model="account.tax.template"> <field name="chart_template_id" ref="l10nbe_chart_template"/> |