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

[FIX] Remove also import and correct total invoiced on so by calculation of invoice lines 

bzr revid: jco@openerp.com-20130327171243-zzagfabhf5i0bb90
This commit is contained in:
Josse Colpaert 2013-03-27 18:12:43 +01:00
parent 7bf78a7097
commit 23d2c6d634
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
addons/account_analytic_analysis/account_analytic_analysis.py
View File

@ -206,15 +206,14 @@ class account_analytic_account(osv.osv):
return res return res
if child_ids: if child_ids:
cr.execute("SELECT account_analytic_line.account_id, COALESCE(SUM(amount), 0.0) \ #Search all invoice lines not in cancelled state that refer to this analytic account
FROM account_analytic_line \ inv_line_obj = self.pool.get("account.invoice.line")
JOIN account_analytic_journal \ inv_lines = inv_line_obj.search(cr, uid, ['&', ('account_analytic_id', 'in', child_ids), ('invoice_id.state', '!=', 'cancel')], context=context)
ON account_analytic_line.journal_id = account_analytic_journal.id \ for line in inv_line_obj.browse(cr, uid, inv_lines, context=context):
WHERE account_analytic_line.account_id IN %s \ res[line.account_analytic_id.id] += line.price_subtotal
AND account_analytic_journal.type = 'sale' \ for acc in self.browse(cr, uid, res.keys(), context=context):
GROUP BY account_analytic_line.account_id", (child_ids,)) res[acc.id] = res[acc.id] - (acc.timesheet_ca_invoiced or 0.0)
for account_id, sum in cr.fetchall():
res[account_id] = round(sum,2)
res_final = res res_final = res
return res_final return res_final

2
addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
View File

@ -100,6 +100,8 @@ class account_analytic_account(osv.osv):
def _ca_invoiced_calc(self, cr, uid, ids, name, arg, context=None): def _ca_invoiced_calc(self, cr, uid, ids, name, arg, context=None):
result = super(account_analytic_account, self)._ca_invoiced_calc(cr, uid, ids, name, arg, context=context) result = super(account_analytic_account, self)._ca_invoiced_calc(cr, uid, ids, name, arg, context=context)
for acc in self.browse(cr, uid, result.keys(), context=context):
result[acc.id] = result[acc.id] - (acc.expense_invoiced or 0.0)
return result return result
_columns = { _columns = {

1
addons/hr_timesheet_invoice/wizard/__init__.py
View File

@ -21,7 +21,6 @@
import hr_timesheet_invoice_create import hr_timesheet_invoice_create
import hr_timesheet_analytic_profit import hr_timesheet_analytic_profit
import hr_timesheet_final_invoice_create
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: