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 @@
sale
+ 0