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

modifs 

bzr revid: fp@tinyerp.com-20081205001808-rpu4csh3zvl3qb3x
This commit is contained in:
Fabien Pinckaers 2008-12-05 01:18:08 +01:00
parent 7182d99f98
commit 713b3de5b9
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account/account.py
View File

@ -1369,7 +1369,7 @@ class account_tax(osv.osv):
r['amount'] *= quantity
return res
def _unit_compute_inv(self, cr, uid, taxes, price_unit, address_id=None, product=None, partner=None):
def _unit_compute_inv(self, cr, uid, taxes, price_unit, address_id=None, product=None, partner=None,tax_parent_tot=0.0):
taxes = self._applicable(cr, uid, taxes, price_unit, address_id, product, partner)
res = []

2
addons/event_project/event.py
View File

@ -51,7 +51,7 @@ class event(osv.osv):
def write(self, cr, uid, ids,vals, *args, **kwargs):
if 'date_begin' in vals and vals['date_begin']:
for eve in self.browse(cr, uid, ids):
self.pool.get('project.project').write(cr, uid, [eve.project_id.id], {'date_end':eve.date_begin})
self.pool.get('project.project').write(cr, uid, [eve.project_id.id], {'date_end':eve.date_begin[:10]})
return super(event,self).write(cr, uid, ids,vals, *args, **kwargs)

5
addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
View File

@ -134,7 +134,10 @@ class invoice_create(wizard.interface):
if data['form']['date']:
details.append(line['date'])
if data['form']['time']:
details.append("%s %s" % (line['unit_amount'], pool.get('product.uom').browse(cr, uid, [line['product_uom_id']])[0].name))
if line['product_uom_id']:
details.append("%s %s" % (line['unit_amount'], pool.get('product.uom').browse(cr, uid, [line['product_uom_id']])[0].name))
else:
details.append("%s" % (line['unit_amount'], ))
if data['form']['name']:
details.append(line['name'])
#if data['form']['price']: