res[account_id] = round(sum,2)
res_final = res
return res_final
-
- def _expense_invoiced_calc(self, cr, uid, ids, name, arg, context=None):
- res = {}
- res_final = {}
- child_ids = tuple(ids) #We don't want consolidation for each of these fields because those complex computation is resource-greedy.
- for i in child_ids:
- res[i] = 0.0
- if not child_ids:
- return res
- if child_ids:
- cr.execute("SELECT hel.analytic_account,SUM(hel.unit_amount*hel.unit_quantity)\
- FROM hr_expense_line AS hel\
- LEFT JOIN hr_expense_expense AS he \
- ON he.id = hel.expense_id\
- WHERE he.state = 'paid' \
- AND hel.analytic_account IN %s \
- GROUP BY hel.analytic_account",(child_ids,))
- for account_id, sum in cr.fetchall():
- res[account_id] = sum
- res_final = res
- return res_final
-
- def _expense_to_invoice_calc(self, cr, uid, ids, name, arg, context=None):
- res = {}
- res_final = {}
- child_ids = tuple(ids) #We don't want consolidation for each of these fields because those complex computation is resource-greedy.
- for i in child_ids:
- res[i] = 0.0
- if not child_ids:
- return res
-
- if child_ids:
- cr.execute("SELECT hel.analytic_account, SUM(hel.unit_amount*hel.unit_quantity) \
- FROM hr_expense_line AS hel\
- LEFT JOIN hr_expense_expense AS he \
- ON he.id = hel.expense_id\
- WHERE he.state = 'invoiced' \
- AND hel.analytic_account IN %s \
- GROUP BY hel.analytic_account",(child_ids,))
- for account_id, sum in cr.fetchall():
- res[account_id] = sum
- res_final = res
- return res_final
-
def _total_cost_calc(self, cr, uid, ids, name, arg, context=None):
res = {}
res_final = {}
for id in ids:
res[id] = round(res.get(id, 0.0),2)
return res
-
- def _remaining_expnse_calc(self, cr, uid, ids, name, arg, context=None):
- res = {}
- for account in self.browse(cr, uid, ids, context=context):
- if account.expense_max != 0:
- res[account.id] = account.expense_max - account.expense_invoiced
- else:
- res[account.id]=0.0
- for id in ids:
- res[id] = round(res.get(id, 0.0),2)
- return res
def _real_margin_calc(self, cr, uid, ids, name, arg, context=None):
res = {}
for line in self.pool.get('account.analytic.line').browse(cr, uid, ids, context=context):
result.add(line.account_id.id)
return list(result)
-
+
+ def _get_total_estimation(self, account):
+ tot_est = 0.0
+ if account.fix_price_invoices:
+ total_est += account.amount_max
+ if account.invoice_on_timesheets:
+ tot_est += account.hours_qtt_est
+ return tot_est
+
+ def _get_total_invoiced(self, account):
+ total_invoiced = 0.0
+ if account.fix_price_invoices:
+ total_invoiced += account.ca_invoiced
+ if account.invoice_on_timesheets:
+ total_invoiced += account.hours_qtt_invoiced
+ return total_invoiced
+
+ def _get_total_remaining(self, account):
+ total_remaining = 0.0
+ if account.fix_price_invoices:
+ total_remaining += account.remaining_ca
+ if account.invoice_on_timesheets:
+ total_remaining += account.remaining_hours
+ return total_remaining
+
+ def _get_total_toinvoice(self, account):
+ total_toinvoice = 0.0
+ if account.fix_price_invoices:
+ total_toinvoice += account.ca_to_invoice
+ if account.invoice_on_timesheets:
+ total_toinvoice += account.hours_qtt_non_invoiced
+ return total_toinvoice
+
def _sum_of_fields(self, cr, uid, ids, name, arg, context=None):
res = dict([(i, {}) for i in ids])
- total_max = 0.0
- total_invoiced = 0.0
- total_toinvoice = 0.0
- total_remaining = 0.0
for account in self.browse(cr, uid, ids, context=context):
- if account.fix_price_invoices:
- total_max += account.amount_max
- total_invoiced += account.ca_invoiced
- total_remaining += account.remaining_ca
- total_toinvoice += account.ca_to_invoice
- if account.invoice_on_timesheets:
- total_max += account.quantity_max
- total_invoiced += account.hours_qtt_invoiced
- total_remaining += account.remaining_hours
- total_toinvoice += account.hours_qtt_non_invoiced
- if account.charge_expenses:
- total_max += account.expense_max
- total_invoiced += account.expense_invoiced
- total_remaining += account.remaining_expense
- total_toinvoice += account.expense_to_invoice
- res[account.id]['est_total'] = total_max or 0.0
- res[account.id]['invoiced_total'] = total_invoiced or 0.0
- res[account.id]['remaining_total'] = total_remaining or 0.0
- res[account.id]['toinvoice_total'] = total_toinvoice or 0.0
+ res[account.id]['est_total'] = self._get_total_estimation(account)
+ res[account.id]['invoiced_total'] = self._get_total_invoiced(account)
+ res[account.id]['remaining_total'] = self._get_total_remaining(account)
+ res[account.id]['toinvoice_total'] = self._get_total_toinvoice(account)
return res
_columns = {
digits_compute=dp.get_precision('Account')),
'fix_price_invoices' : fields.boolean('Fix Price Invoices'),
'invoice_on_timesheets' : fields.boolean("Invoice On Timesheets"),
- 'charge_expenses' : fields.boolean('Charge Expenses'),
'month_ids': fields.function(_analysis_all, multi='analytic_analysis', type='many2many', relation='account_analytic_analysis.summary.month', string='Month'),
'user_ids': fields.function(_analysis_all, multi='analytic_analysis', type="many2many", relation='account_analytic_analysis.summary.user', string='User'),
'template_id':fields.many2one('account.analytic.account', 'Template of Contract'),
- 'expense_invoiced' : fields.function(_expense_invoiced_calc, type="float"),
- 'expense_to_invoice' : fields.function(_expense_to_invoice_calc, type='float'),
- 'remaining_expense' : fields.function(_remaining_expnse_calc, type="float"),
- #'fix_exp_max' : fields.float('Max. amt'),
- #'timesheet_max': fields.float('max_timesheet'),
- 'expense_max': fields.float('expenses'),
+ 'hours_qtt_est': fields.float('Estimation of Hours to Invoice'),
'est_total' : fields.function(_sum_of_fields, type="float",multi="sum_of_all"),
'invoiced_total' : fields.function(_sum_of_fields, type="float",multi="sum_of_all"),
'remaining_total' : fields.function(_sum_of_fields, type="float",multi="sum_of_all"),
'toinvoice_total' : fields.function(_sum_of_fields, type="float",multi="sum_of_all"),
}
+
def on_change_template(self, cr, uid, id, template_id):
if not template_id:
return {}
res['value']['description'] = template.description
return res
- def open_hr_expense(self, cr, uid, ids, context=None):
- account = self.browse(cr, uid, ids[0], context)
- data_obj = self.pool.get('ir.model.data')
- try:
- journal_id = data_obj.get_object(cr, uid, 'hr_timesheet', 'analytic_journal').id
- except ValueError:
- journal_id = False
- line_ids = self.pool.get('hr.expense.line').search(cr,uid,[('analytic_account','=',account.id)])
- id2 = data_obj._get_id(cr, uid, 'hr_expense', 'view_expenses_form')
- id3 = data_obj._get_id(cr, uid, 'hr_expense', 'view_expenses_tree')
- if id2:
- id2 = data_obj.browse(cr, uid, id2, context=context).res_id
- if id3:
- id3 = data_obj.browse(cr, uid, id3, context=context).res_id
- domain = [('line_ids','in',line_ids)]
- return {
- 'type': 'ir.actions.act_window',
- 'name': _('Expenses'),
- 'view_type': 'form',
- 'view_mode': 'tree,form',
- 'views': [(id3,'tree'),(id2,'form')],
- 'domain' : domain,
- 'res_model': 'hr.expense.expense',
- 'nodestroy': True,
- }
-
- def hr_to_invoiced_expense(self, cr, uid, ids, context=None):
- res = self.open_hr_expense(cr,uid,ids,context)
- account = self.browse(cr, uid, ids[0], context)
- line_ids = self.pool.get('hr.expense.line').search(cr,uid,[('analytic_account','=',account.id)])
- res['domain'] = [('line_ids','in',line_ids),('state','=','invoiced')]
- return res
-
account_analytic_account()
class account_analytic_account_summary_user(osv.osv):
projects / odoo / odoo.git / blobdiff