bugfixed for tax calculation in timesheet invoice creation and encoding
bzr revid: hda@hda-20090406135740-qgsl2oo8qn5hro7r
This commit is contained in:
parent
826a996c3a
commit
4855232a2d
|
@ -158,7 +158,8 @@ class invoice_create(wizard.interface):
|
|||
pool.get('account.invoice.line').create(cr, uid, curr_line)
|
||||
strids = ','.join(map(str, data['ids']))
|
||||
cr.execute("update account_analytic_line set invoice_id=%%s WHERE account_id = %%s and id IN (%s)" % strids, (last_invoice,account.id,))
|
||||
|
||||
pool.get('account.invoice').button_reset_taxes(cr, uid, [last_invoice], context)
|
||||
|
||||
return {
|
||||
'domain': "[('id','in', ["+','.join(map(str,invoices))+"])]",
|
||||
'name': _('Invoices'),
|
||||
|
|
|
@ -712,7 +712,7 @@
|
|||
<separator colspan="4" string="Properties"/>
|
||||
<field colspan="4" name="property_ids" nolabel="1" groups="base.group_extended"/>
|
||||
</page>
|
||||
<page string="Note">
|
||||
<page string="Notes">
|
||||
<separator colspan="4" string="Note" />
|
||||
<field name="note" colspan="4" nolabel="1"/>
|
||||
</page>
|
||||
|
|
|
@ -78,7 +78,7 @@ class project_work(osv.osv):
|
|||
if line_id:
|
||||
obj = self.pool.get('hr.analytic.timesheet')
|
||||
if 'name' in vals:
|
||||
vals_line['name'] = '%s: %s' % (task.name, vals['name'] or '/')
|
||||
vals_line['name'] = '%s: %s' % (tools.ustr(task.name), tools.ustr(vals['name']) or '/')
|
||||
if 'user_id' in vals:
|
||||
vals_line['user_id'] = vals['user_id']
|
||||
if 'date' in vals:
|
||||
|
|
Loading…
Reference in New Issue