From ae4900a2786c83a6611539f647705818ab3fa38b Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Tue, 9 Apr 2013 16:18:07 +0530 Subject: [PATCH 1/7] [IMP] Modify tooltip for remaining on timesheet. bzr revid: bth@tinyerp.com-20130409104807-jme2059quueouns8 --- addons/account_analytic_analysis/account_analytic_analysis.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index 33ab3be209c..54e84e56c7d 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -481,7 +481,7 @@ class account_analytic_account(osv.osv): 'remaining_hours': fields.function(_remaining_hours_calc, type='float', string='Remaining Time', help="Computed using the formula: Maximum Time - Total Worked Time"), 'remaining_hours_to_invoice': fields.function(_remaining_hours_to_invoice_calc, type='float', string='Remaining Time', - help="Computed using the formula: Maximum Time - Total Invoiced Time"), + help="Computed using the formula: Maximum Time - Total Invoiced Amount"), 'fix_price_to_invoice': fields.function(_fix_price_to_invoice_calc, type='float', string='Remaining Time', help="Sum of quotations for this contract."), 'timesheet_ca_invoiced': fields.function(_timesheet_ca_invoiced_calc, type='float', string='Remaining Time', From 79a335f2f4e203e564c93fc42bc7b7423bda53f2 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Thu, 11 Apr 2013 19:03:51 +0530 Subject: [PATCH 2/7] [IMP] date start & end taken from template. bzr revid: bth@tinyerp.com-20130411133351-z8zypiywjbgwt7by --- addons/account_analytic_analysis/account_analytic_analysis.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index 54e84e56c7d..8b614e9c6f0 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -572,6 +572,8 @@ class account_analytic_account(osv.osv): res['value']['recurring_interval'] = template.recurring_interval res['value']['recurring_rule_type'] = template.recurring_rule_type res['value']['recurring_invoice_line_ids'] = invoice_line_ids + res['value']['date_start'] = template.date_start + res['value']['date'] = template.date return res def onchange_recurring_invoices(self, cr, uid, ids, recurring_invoices, date_start=False, context=None): From d6fcb3ec65e90c04a7397b00f3a72f9a0993bfd1 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Fri, 12 Apr 2013 12:49:37 +0530 Subject: [PATCH 3/7] [IMP]FIX:Wrong value coming in invoiced on fixed price. bzr revid: bth@tinyerp.com-20130412071937-b23oux3oabqgoywz --- .../account_analytic_analysis.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index 8b614e9c6f0..263ead9bb85 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -267,18 +267,16 @@ class account_analytic_account(osv.osv): AND account_analytic_journal.type = 'sale' \ GROUP BY account_analytic_line.account_id", (child_ids,)) for account_id, sum in cr.fetchall(): - res[account_id] = round(sum,2) - for acc in self.browse(cr, uid, res.keys(), context=context): - res[acc.id] = res[acc.id] - (acc.timesheet_ca_invoiced or 0.0) + res[account_id] = round(sum, 2) res_final = res return res_final def _total_cost_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. + 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 + res[i] = 0.0 if not child_ids: return res if child_ids: From 8caa5bae8da3b4378b435ba710355b812af0bd15 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Mon, 15 Apr 2013 12:50:53 +0530 Subject: [PATCH 4/7] [IMP] Improve tooltip on field. bzr revid: bth@tinyerp.com-20130415072053-5zyrp09xf9bd2ivf --- addons/account_analytic_analysis/account_analytic_analysis.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index 263ead9bb85..26a681075ee 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -479,7 +479,7 @@ class account_analytic_account(osv.osv): 'remaining_hours': fields.function(_remaining_hours_calc, type='float', string='Remaining Time', help="Computed using the formula: Maximum Time - Total Worked Time"), 'remaining_hours_to_invoice': fields.function(_remaining_hours_to_invoice_calc, type='float', string='Remaining Time', - help="Computed using the formula: Maximum Time - Total Invoiced Amount"), + help="Computed using the formula: Expected on timesheets - Total invoiced on timesheets"), 'fix_price_to_invoice': fields.function(_fix_price_to_invoice_calc, type='float', string='Remaining Time', help="Sum of quotations for this contract."), 'timesheet_ca_invoiced': fields.function(_timesheet_ca_invoiced_calc, type='float', string='Remaining Time', From 30b847fbf0e53e80a0a6deb7a3cf40c0489281f8 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Tue, 16 Apr 2013 12:52:48 +0530 Subject: [PATCH 5/7] [REM] Remove unwanted changes. bzr revid: bth@tinyerp.com-20130416072248-qtn1ajo89i4wt048 --- addons/account_analytic_analysis/account_analytic_analysis.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index 26a681075ee..cd7d0ed3660 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -274,9 +274,9 @@ class account_analytic_account(osv.osv): def _total_cost_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. + 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 + res[i] = 0.0 if not child_ids: return res if child_ids: From 334faeb843afea52d5aa43a90a6e792d1d1a48f6 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Wed, 17 Apr 2013 10:39:00 +0530 Subject: [PATCH 6/7] [REV] Revert code for wrong value in invoiced in fixed price. bzr revid: bth@tinyerp.com-20130417050900-mri6vhcb1v9i5lya --- addons/account_analytic_analysis/account_analytic_analysis.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index cd7d0ed3660..2cd2c3254a7 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -268,6 +268,8 @@ class account_analytic_account(osv.osv): GROUP BY account_analytic_line.account_id", (child_ids,)) for account_id, sum in cr.fetchall(): res[account_id] = round(sum, 2) + for acc in self.browse(cr, uid, res.keys(), context=context): + res[acc.id] = res[acc.id] - (acc.timesheet_ca_invoiced or 0.0) res_final = res return res_final From 94d1af294c9a87c2504a401c0689b5127ad0d8b6 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Fri, 17 May 2013 11:26:55 +0530 Subject: [PATCH 7/7] [FIX]revert code. bzr revid: bth@tinyerp.com-20130517055655-9fscfd08aaom0wyt --- addons/account_analytic_analysis/account_analytic_analysis.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index 2cd2c3254a7..95182229b87 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -572,8 +572,6 @@ class account_analytic_account(osv.osv): res['value']['recurring_interval'] = template.recurring_interval res['value']['recurring_rule_type'] = template.recurring_rule_type res['value']['recurring_invoice_line_ids'] = invoice_line_ids - res['value']['date_start'] = template.date_start - res['value']['date'] = template.date return res def onchange_recurring_invoices(self, cr, uid, ids, recurring_invoices, date_start=False, context=None):