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

[MERGE] analytic_contract_hr_expense: functional field computation fixed + added some helping info in hr_timesheet_invoice in the reinvoicing wizard 

bzr revid: qdp-launchpad@openerp.com-20130319125028-59jnnfc7tiixag4b
This commit is contained in:
Quentin (OpenERP) 2013-03-19 13:50:28 +01:00
parent 3b54759913 fffc371f96
commit 748ebf0ab0
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
View File

@ -76,11 +76,11 @@ class account_analytic_account(osv.osv):
GROUP BY product_id, user_id, to_invoice, product_uom_id, line.name""", (account.id,)) GROUP BY product_id, user_id, to_invoice, product_uom_id, line.name""", (account.id,))
res[account.id] = 0.0 res[account.id] = 0.0
for product_id, price, user_id, factor_id, qty, uom, line_name in cr.fetchall(): for product_id, total_amount, user_id, factor_id, qty, uom, line_name in cr.fetchall():
#the amount to reinvoice is the real cost. We don't use the pricelist #the amount to reinvoice is the real cost. We don't use the pricelist
price = -price total_amount = -total_amount
factor = self.pool.get('hr_timesheet_invoice.factor').browse(cr, uid, factor_id, context=context) factor = self.pool.get('hr_timesheet_invoice.factor').browse(cr, uid, factor_id, context=context)
res[account.id] += price * qty * (100 - factor.factor or 0.0) / 100.0 res[account.id] += total_amount * (100 - factor.factor or 0.0) / 100.0
return res return res
def _expense_invoiced_calc(self, cr, uid, ids, name, arg, context=None): def _expense_invoiced_calc(self, cr, uid, ids, name, arg, context=None):
@ -89,8 +89,13 @@ class account_analytic_account(osv.osv):
for account in self.browse(cr, uid, ids, context=context): for account in self.browse(cr, uid, ids, context=context):
res[account.id] = 0.0 res[account.id] = 0.0
line_ids = lines_obj.search(cr, uid, [('account_id','=', account.id), ('invoice_id','!=',False), ('to_invoice','!=', False), ('journal_id.type', '=', 'purchase')], context=context) line_ids = lines_obj.search(cr, uid, [('account_id','=', account.id), ('invoice_id','!=',False), ('to_invoice','!=', False), ('journal_id.type', '=', 'purchase')], context=context)
#Put invoices in separate array in order not to calculate them double
invoices = []
for line in lines_obj.browse(cr, uid, line_ids, context=context): for line in lines_obj.browse(cr, uid, line_ids, context=context):
res[account.id] += line.invoice_id.amount_untaxed if line.invoice_id not in invoices:
invoices.append(line.invoice_id)
for invoice in invoices:
res[account.id] += invoice.amount_untaxed
return res return res
def _ca_invoiced_calc(self, cr, uid, ids, name, arg, context=None): def _ca_invoiced_calc(self, cr, uid, ids, name, arg, context=None):

21
addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
View File

@ -9,16 +9,17 @@
<form string="Create Invoice" version="7.0"> <form string="Create Invoice" version="7.0">
<notebook> <notebook>
<page string="Billing Data"> <page string="Billing Data">
<group> <group cols="2">
<group string="Do you want to show details of work in invoice?"> <group string="Do you want to show details of work in invoice?" colspan="1" cols="2">
<field name="date"/> <field name="date"/>
<field name="time"/> <field name="time"/>
<field name="name"/> <field name="name"/>
<field name="price"/> <field name="price"/>
</group> </group>
<group string="Force to use a specific product"> <group string="Force to use a specific product" colspan="1" cols="2">
<field name="product"/> <p class="oe_grey" colspan="2">When reinvoicing costs, the amount on the invoice lines is given by the sale price of the corresponding product (if any, and if its sale price is not 0). You can use the following field to enforce the use of a single product for all the chosen lines in the future invoices.</p>
</group> <field name="product"/>
</group>
</group> </group>
</page> </page>
</notebook> </notebook>