odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[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
This commit is contained in:
Nicolas Vanhoren 2010-10-26 10:18:30 +02:00 committed by Olivier Dony
parent 3572ed909a e6a27d1f4f
commit 8b1ef6ba2b
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/account/account.py
View File

@ -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()

7
addons/hr/hr.py
View File

@ -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,

1
addons/l10n_be/account_pcmn_belgium.xml
View File

@ -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"/>