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

fix 

bzr revid: fp@tinyerp.com-20100612162959-0v4p939h5loo8qxq
This commit is contained in:
Fabien Pinckaers 2010-06-12 18:29:59 +02:00
parent 8baf16f25e
commit ef9361f19d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
addons/point_of_sale/pos.py
View File

@ -193,10 +193,10 @@ class pos_order(osv.osv):
res[order.id]['amount_tax'])
else:
res[order.id]['amount_tax'] = reduce(lambda x, y: x+round(y['amount'], 2),
tax_obj.compute(cr, uid, line.product_id.taxes_id,
tax_obj.compute_all(cr, uid, line.product_id.taxes_id,
line.price_unit * \
(1-(line.discount or 0.0)/100.0), line.qty),
res[order.id]['amount_tax'])
(1-(line.discount or 0.0)/100.0), line.qty)['taxes'],
res[order.id]['amount_tax'])
return res
@ -789,8 +789,8 @@ class pos_order(osv.osv):
tax_amount = 0
taxes = [t for t in line.product_id.taxes_id]
if order.price_type=='tax_excluded':
computed_taxes = account_tax_obj.compute(
cr, uid, taxes, line.price_unit, line.qty)
computed_taxes = account_tax_obj.compute_all(
cr, uid, taxes, line.price_unit, line.qty)['taxes']
else:
computed_taxes = account_tax_obj.compute_inv(
cr, uid, taxes, line.price_unit, line.qty)
@ -1058,7 +1058,7 @@ class pos_order_line(osv.osv):
for line in self.browse(cr, uid, ids):
tax_amount = 0.0
taxes = [t for t in line.product_id.taxes_id]
computed_taxes = account_tax_obj.compute(cr, uid, taxes, line.price_unit, line.qty)
computed_taxes = account_tax_obj.compute_all(cr, uid, taxes, line.price_unit, line.qty)['taxes']
for tax in computed_taxes:
tax_amount += tax['amount']
price = self.price_by_product(cr, uid, ids, line.order_id.pricelist_id.id, line.product_id.id, line.qty, line.order_id.partner_id.id)

2
addons/project_long_term/security/ir.model.access.csv
View File

@ -1,3 +1,3 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_project_phase","project.phase","model_project_phase",project.group_project_user,1,1,1,1
"access_project_resource_allocation","project.resource.allocation","model_project_resource_allocation",group_project_user,1,1,1,1
"access_project_resource_allocation","project.resource.allocation","model_project_resource_allocation",project.group_project_user,1,1,1,1

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_project_phase project.phase model_project_phase project.group_project_user 1 1 1 1
3 access_project_resource_allocation project.resource.allocation model_project_resource_allocation group_project_user project.group_project_user 1 1 1 1