From 9bd2e38eafdf37e87bc9327e4d01363361c44f31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= Date: Mon, 1 Mar 2010 00:55:24 -0300 Subject: [PATCH 001/116] [REF] removed mx.DateTime unused import as well as 2 other unused imports (!!) bzr revid: rvalyi@gmail.com-20100301035524-4nejbvju86c1wwvb --- addons/hr/hr.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/addons/hr/hr.py b/addons/hr/hr.py index 475185aa10e..a4a36d0e052 100755 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -19,10 +19,6 @@ # ############################################################################## -from mx import DateTime -import time -import math - from osv import fields, osv from tools.translate import _ From b04e0c64d1d48c4219774912d3b03c87637f49dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= Date: Mon, 1 Mar 2010 01:00:47 -0300 Subject: [PATCH 002/116] [REF] [account] removed unused mx.DateTime imports bzr revid: rvalyi@gmail.com-20100301040047-3p41ik9rzhq5luoz --- addons/account/report/general_ledger.py | 1 - addons/account/report/general_ledger_landscape.py | 1 - 2 files changed, 2 deletions(-) diff --git a/addons/account/report/general_ledger.py b/addons/account/report/general_ledger.py index 43c298866ed..b06aa1198fc 100644 --- a/addons/account/report/general_ledger.py +++ b/addons/account/report/general_ledger.py @@ -25,7 +25,6 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. import time -from mx.DateTime import * from report import report_sxw import xml import rml_parse diff --git a/addons/account/report/general_ledger_landscape.py b/addons/account/report/general_ledger_landscape.py index dcb4e47fbdd..c888994622b 100644 --- a/addons/account/report/general_ledger_landscape.py +++ b/addons/account/report/general_ledger_landscape.py @@ -27,7 +27,6 @@ ############################################################################## import time -from mx.DateTime import * from report import report_sxw import xml import rml_parse From a421e021ed7aa289c217dbb7cb14202b6c0dd43d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= Date: Mon, 1 Mar 2010 01:09:24 -0300 Subject: [PATCH 003/116] [REF] [account] removed unused mx.DateTime imports bzr revid: rvalyi@gmail.com-20100301040924-b8wxwhmvopxas6v7 --- addons/account/invoice.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/addons/account/invoice.py b/addons/account/invoice.py index 96f3a0afb40..ae9428f19db 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -24,8 +24,6 @@ import netsvc from osv import fields, osv import ir import pooler -import mx.DateTime -from mx.DateTime import RelativeDateTime from tools import config from tools.translate import _ From b8d17ac8044fe2cfca00530d61966960525102c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= Date: Mon, 1 Mar 2010 01:36:05 -0300 Subject: [PATCH 004/116] [REF] [account] replaced mx.DateTime usage by pure Python datime and dateutil bzr revid: rvalyi@gmail.com-20100301043605-35lca2eqgk774jgh --- addons/account/account.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index 516c185b652..8134c6d0c30 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -27,8 +27,8 @@ from osv import fields, osv from tools.misc import currency from tools.translate import _ import pooler -import mx.DateTime -from mx.DateTime import RelativeDateTime, now, DateTime, localtime +from datetime import datetime +from dateutil.relativedelta import relativedelta from tools import config @@ -60,11 +60,11 @@ class account_payment_term(osv.osv): elif line.value == 'balance': amt = round(amount, int(config['price_accuracy'])) if amt: - next_date = mx.DateTime.strptime(date_ref, '%Y-%m-%d') + RelativeDateTime(days=line.days) + next_date = datetime.strptime(date_ref, '%y-%m-%d') + relativedelta(days=line.days) if line.days2 < 0: - next_date += RelativeDateTime(day=line.days2) + next_date += relativedelta(day=line.days2) if line.days2 > 0: - next_date += RelativeDateTime(day=line.days2, months=1) + next_date += relativedelta(day=line.days2, months=1) result.append( (next_date.strftime('%Y-%m-%d'), amt) ) amount -= amt return result @@ -582,12 +582,12 @@ class account_fiscalyear(osv.osv): def create_period(self,cr, uid, ids, context={}, interval=1): for fy in self.browse(cr, uid, ids, context): - ds = mx.DateTime.strptime(fy.date_start, '%Y-%m-%d') + ds = datetime.strptime(fy.date_start, '%Y-%m-%d') while ds.strftime('%Y-%m-%d')fy.date_stop: - de=mx.DateTime.strptime(fy.date_stop, '%Y-%m-%d') + de = datetime.strptime(fy.date_stop, '%Y-%m-%d') self.pool.get('account.period').create(cr, uid, { 'name': ds.strftime('%m/%Y'), @@ -596,7 +596,7 @@ class account_fiscalyear(osv.osv): 'date_stop': de.strftime('%Y-%m-%d'), 'fiscalyear_id': fy.id, }) - ds = ds + RelativeDateTime(months=interval) + ds = ds + relativedelta(months=interval) return True def find(self, cr, uid, dt=None, exception=True, context={}): @@ -1720,11 +1720,11 @@ class account_subscription(osv.osv): 'subscription_id': sub.id, }) if sub.period_type=='day': - ds = (mx.DateTime.strptime(ds, '%Y-%m-%d') + RelativeDateTime(days=sub.period_nbr)).strftime('%Y-%m-%d') + ds = (datetime.strptime(ds, '%Y-%m-%d') + relativedelta(days=sub.period_nbr)).strftime('%Y-%m-%d') if sub.period_type=='month': - ds = (mx.DateTime.strptime(ds, '%Y-%m-%d') + RelativeDateTime(months=sub.period_nbr)).strftime('%Y-%m-%d') + ds = (datetime.strptime(ds, '%Y-%m-%d') + relativedelta(months=sub.period_nbr)).strftime('%Y-%m-%d') if sub.period_type=='year': - ds = (mx.DateTime.strptime(ds, '%Y-%m-%d') + RelativeDateTime(years=sub.period_nbr)).strftime('%Y-%m-%d') + ds = (datetime.strptime(ds, '%Y-%m-%d') + relativedelta(years=sub.period_nbr)).strftime('%Y-%m-%d') self.write(cr, uid, ids, {'state':'running'}) return True account_subscription() From bb84484882f15ca7ea2b452d61505d1914c68be2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= Date: Mon, 1 Mar 2010 01:53:16 -0300 Subject: [PATCH 005/116] [REF] [account] further mx.DateTime cleanup bzr revid: rvalyi@gmail.com-20100301045316-mw67ahn1epe4lknq --- addons/account/account_move_line.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 8355cf6be3c..ba44f413410 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -24,8 +24,7 @@ import netsvc from osv import fields, osv from tools.translate import _ -import mx.DateTime -from mx.DateTime import RelativeDateTime, now, DateTime, localtime +from datetime import now import tools From fca1d230e4a87630b05cd704e0e077b8342b4b85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= Date: Mon, 1 Mar 2010 01:54:48 -0300 Subject: [PATCH 006/116] [REF] [account] removed unused mx.DateTime imports bzr revid: rvalyi@gmail.com-20100301045448-6c7j5ck2gtkc6u09 --- addons/account/account_bank_statement.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 01c1eb7fa37..e0a316ae2a1 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -26,10 +26,6 @@ from osv import fields, osv from tools.misc import currency from tools.translate import _ -import mx.DateTime -from mx.DateTime import RelativeDateTime, now, DateTime, localtime - - class account_bank_statement(osv.osv): def _default_journal_id(self, cr, uid, context={}): if context.get('journal_id', False): From 45edbf48b9626834469adc91f28d3e6bc12169c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= Date: Mon, 1 Mar 2010 02:05:14 -0300 Subject: [PATCH 007/116] [REF] [stock] removed mx.DateTime from stock module bzr revid: rvalyi@gmail.com-20100301050514-0dq2xgpypxw52hbj --- addons/stock/report/product_stock.py | 7 ++++--- addons/stock/report/stock_graph.py | 1 - addons/stock/stock.py | 10 ++++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/addons/stock/report/product_stock.py b/addons/stock/report/product_stock.py index 49c1daef8ed..f9a61a8989a 100644 --- a/addons/stock/report/product_stock.py +++ b/addons/stock/report/product_stock.py @@ -19,7 +19,8 @@ # ############################################################################## -from mx import DateTime +from datetime import datetime +from dateutil.relativedelta import relativedelta import osv import time @@ -76,7 +77,7 @@ class report_stock(report_int): "group by date_planned,product_id",(('confirmed','assigned','waiting'),loc_ids ,product_ids,)) for (qty, dt, prod_id) in cr.fetchall(): if dt<=dt_from: - dt= (DateTime.now() + DateTime.RelativeDateTime(days=1)).strftime('%Y-%m-%d') + dt= (datetime.now() + relativedelta(days=1)).strftime('%Y-%m-%d') else: dt = dt[:10] products.setdefault(prod_id, []) @@ -91,7 +92,7 @@ class report_stock(report_int): for (qty, dt, prod_id) in cr.fetchall(): if dt<=dt_from: - dt= (DateTime.now() + DateTime.RelativeDateTime(days=1)).strftime('%Y-%m-%d') + dt= (datetime.now() + relativedelta(days=1)).strftime('%Y-%m-%d') else: dt = dt[:10] products.setdefault(prod_id, []) diff --git a/addons/stock/report/stock_graph.py b/addons/stock/report/stock_graph.py index 0fdf88da7ce..d20baa08d58 100644 --- a/addons/stock/report/stock_graph.py +++ b/addons/stock/report/stock_graph.py @@ -18,7 +18,6 @@ # along with this program. If not, see . # ############################################################################## -from mx.DateTime import * from pychart import * import pychart.legend import time diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 240bc9762ce..6cf6d5901c3 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -19,7 +19,9 @@ # ############################################################################## -from mx import DateTime +from datetime import datetime +from dateutil.relativedelta import relativedelta + from osv import fields, osv from tools import config from tools.translate import _ @@ -1169,8 +1171,8 @@ class stock_move(osv.osv): if dest: if dest[1] == 'transparent': self.write(cr, uid, [m.id], { - 'date_planned': (DateTime.strptime(m.date_planned, '%Y-%m-%d %H:%M:%S') + \ - DateTime.RelativeDateTime(days=dest[2] or 0)).strftime('%Y-%m-%d'), + 'date_planned': (datetime.strptime(m.date_planned, '%Y-%m-%d %H:%M:%S') + \ + relativedelta(days=dest[2] or 0)).strftime('%Y-%m-%d'), 'location_dest_id': dest[0].id}) else: result.setdefault(m.picking_id, []) @@ -1206,7 +1208,7 @@ class stock_move(osv.osv): 'picking_id': pickid, 'state': 'waiting', 'move_history_ids': [], - 'date_planned': (DateTime.strptime(move.date_planned, '%Y-%m-%d %H:%M:%S') + DateTime.RelativeDateTime(days=delay or 0)).strftime('%Y-%m-%d'), + 'date_planned': (datetime.strptime(move.date_planned, '%Y-%m-%d %H:%M:%S') + relativedelta(days=delay or 0)).strftime('%Y-%m-%d'), 'move_history_ids2': []} ) self.pool.get('stock.move').write(cr, uid, [move.id], { From caef744e048f8b6562282bce6f9549de751c42a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= Date: Mon, 1 Mar 2010 02:09:11 -0300 Subject: [PATCH 008/116] [REF] [sale] removed mx.DateTime usage from sale module bzr revid: rvalyi@gmail.com-20100301050911-sqnifbigc455bylm --- addons/sale/sale.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index a9d0935fc76..f3997e6334d 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -22,7 +22,8 @@ import time import netsvc from osv import fields, osv -from mx import DateTime +from datetime import datetime, now +from dateutil.relativedelta import relativedelta from tools import config from tools.translate import _ @@ -581,8 +582,8 @@ class sale_order(osv.osv): picking_id = False for line in order.order_line: proc_id = False - date_planned = DateTime.now() + DateTime.DateTimeDeltaFromDays(line.delay or 0.0) - date_planned = (date_planned - DateTime.DateTimeDeltaFromDays(company.security_lead)).strftime('%Y-%m-%d %H:%M:%S') + date_planned = datetime.now() + relativedelta(days=line.delay or 0.0) + date_planned = (date_planned - relativedelta(company.security_lead)).strftime('%Y-%m-%d %H:%M:%S') if line.state == 'done': continue if line.product_id and line.product_id.product_tmpl_id.type in ('product', 'consu'): From 325ba204715bb1e8e2a729d45ccbe7f0df3a132d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= Date: Mon, 1 Mar 2010 02:13:20 -0300 Subject: [PATCH 009/116] [REF] [purchase] removed mx.DateTime usage from purchase module bzr revid: rvalyi@gmail.com-20100301051320-j20t2m079zh49rrx --- addons/purchase/purchase.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 1d7745a82f7..581c055db7c 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -25,7 +25,8 @@ import time import netsvc import ir -from mx import DateTime +from datetime import datetime +from dateutil.relativedelta import relativedelta import pooler from tools import config from tools.translate import _ @@ -518,7 +519,7 @@ class purchase_order_line(osv.osv): 'uom': uom, 'date': date_order, })[pricelist] - dt = (DateTime.now() + DateTime.RelativeDateTime(days=seller_delay or 0.0)).strftime('%Y-%m-%d %H:%M:%S') + dt = (datetime.now() + relativedelta(days=seller_delay or 0.0)).strftime('%Y-%m-%d %H:%M:%S') prod_name = self.pool.get('product.product').name_get(cr, uid, [prod.id])[0][1] From 42f1ff14d1a9c10b183a35e250042e1f481e4300 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= Date: Mon, 1 Mar 2010 02:16:51 -0300 Subject: [PATCH 010/116] [REF] fixed datetime now() method call in account and sale modules bzr revid: rvalyi@gmail.com-20100301051651-2gdc7tn8ljyi5vz9 --- addons/account/account.py | 2 +- addons/account/account_move_line.py | 4 ++-- addons/sale/sale.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index 8134c6d0c30..7fbab48d436 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -48,7 +48,7 @@ class account_payment_term(osv.osv): def compute(self, cr, uid, id, value, date_ref=False, context={}): if not date_ref: - date_ref = now().strftime('%Y-%m-%d') + date_ref = datetime.now().strftime('%Y-%m-%d') pt = self.browse(cr, uid, id, context) amount = value result = [] diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index ba44f413410..15c2c93b8fb 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -24,7 +24,7 @@ import netsvc from osv import fields, osv from tools.translate import _ -from datetime import now +from datetime import datetime import tools @@ -484,7 +484,7 @@ class account_move_line(osv.osv): if not partner_id: return {'value':val} if not date: - date = now().strftime('%Y-%m-%d') + date = datetime.now().strftime('%Y-%m-%d') part = self.pool.get('res.partner').browse(cr, uid, partner_id) if part.property_payment_term and part.property_payment_term.line_ids: diff --git a/addons/sale/sale.py b/addons/sale/sale.py index f3997e6334d..60e5b39a183 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -22,7 +22,7 @@ import time import netsvc from osv import fields, osv -from datetime import datetime, now +from datetime import datetime from dateutil.relativedelta import relativedelta from tools import config from tools.translate import _ From 04f0a967d9ae5509f778e86486e782d7b581c816 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Wed, 3 Mar 2010 15:43:58 +0530 Subject: [PATCH 011/116] [Fix] report_crm: change the name of object_id /report_crm_fundraising bzr revid: sbh@tinyerp.com-20100303101358-x7i0wi5wexcyrv0l --- addons/report_crm/report_crm_fundraising.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/report_crm/report_crm_fundraising.py b/addons/report_crm/report_crm_fundraising.py index 88c32af31cb..518e03c9a01 100644 --- a/addons/report_crm/report_crm_fundraising.py +++ b/addons/report_crm/report_crm_fundraising.py @@ -6,8 +6,8 @@ class report_crm_fundraising(osv.osv): _auto = False _inherit = "report.crm.case" _columns = { - 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"), - 'stage_id':fields.many2one('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]", readonly=True), + 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.fundraising')]"), + 'stage_id':fields.many2one('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.fundraising')]", readonly=True), 'probability': fields.float('Avg. Probability', readonly=True), 'amount_revenue': fields.float('Est.Revenue', readonly=True), 'amount_costs': fields.float('Est.Cost', readonly=True), From 1400413c128a094105886de960b99a654016c6f2 Mon Sep 17 00:00:00 2001 From: "Rvo (Open ERP)" Date: Wed, 3 Mar 2010 16:56:40 +0530 Subject: [PATCH 012/116] [IMP]:improved the menu of Resources in project_long_term and mrp bzr revid: rvo@tinyerp.co.in-20100303112640-ye7j3c0j0u31zzx6 --- addons/mrp/mrp_view.xml | 45 ++++++++++--------- addons/mrp/mrp_wizard.xml | 2 +- addons/mrp_operations/mrp_operations_view.xml | 2 +- addons/project_long_term/__terp__.py | 1 + addons/project_long_term/project_wizard.xml | 1 + addons/report_mrp/report_mrp_view.xml | 2 +- addons/resource/resource_view.xml | 22 +++++---- 7 files changed, 41 insertions(+), 34 deletions(-) diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index d47311f543e..fde53d537fe 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -2,15 +2,15 @@ - - + - + diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml index 36f15124b9d..b42cf310b98 100755 --- a/addons/resource/resource_view.xml +++ b/addons/resource/resource_view.xml @@ -1,9 +1,6 @@ - - - resource.calendar.form resource.calendar @@ -24,7 +21,6 @@ form - resource.calendar.week.tree @@ -65,7 +61,6 @@ - - resource.resource.form resource.resource @@ -120,8 +114,6 @@ tree,form - - resource.calendar.leaves.form resource.calendar.leaves @@ -158,7 +150,19 @@ tree,form,calendar - + + + + + + + + + + + + + From 487b54802b96b4667bf91acaa1f7fc35d0fd93d4 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Wed, 3 Mar 2010 17:05:55 +0530 Subject: [PATCH 013/116] [IMP]report_crm: Fix the view of report bzr revid: sbh@tinyerp.com-20100303113555-hibktw5szm3unzhn --- addons/report_crm/report_crm_claim.py | 13 ++++--------- addons/report_crm/report_crm_claim_view.xml | 18 +++++++++--------- addons/report_crm/report_crm_fundraising.py | 3 +-- .../report_crm/report_crm_fundraising_view.xml | 1 + addons/report_crm/report_crm_lead_view.xml | 1 + addons/report_crm/report_crm_view.xml | 2 +- 6 files changed, 17 insertions(+), 21 deletions(-) diff --git a/addons/report_crm/report_crm_claim.py b/addons/report_crm/report_crm_claim.py index c32999754de..e78f2c8aa51 100644 --- a/addons/report_crm/report_crm_claim.py +++ b/addons/report_crm/report_crm_claim.py @@ -6,10 +6,6 @@ class report_crm_claim(osv.osv): _auto = False _inherit = "report.crm.case" _columns = { - 'probability': fields.float('Avg. Probability', readonly=True), - 'amount_revenue': fields.float('Est.Revenue', readonly=True), - 'amount_costs': fields.float('Est.Cost', readonly=True), - 'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True), 'delay_close': fields.char('Delay to close', size=20, readonly=True), 'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.claim')]", readonly=True), 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.claim')]"), @@ -24,14 +20,13 @@ class report_crm_claim(osv.osv): to_char(c.create_date, 'MM') as month, c.state, c.user_id, - c.section_id, c.stage_id, + c.section_id, c.categ_id, count(*) as nbr, - sum(planned_revenue) as amount_revenue, - sum(planned_cost) as amount_costs, - sum(planned_revenue*probability)::decimal(16,2) as amount_revenue_prob, - avg(probability)::decimal(16,2) as probability, + 0 as avg_answers, + 0.0 as perc_done, + 0.0 as perc_cancel, to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close from crm_claim c diff --git a/addons/report_crm/report_crm_claim_view.xml b/addons/report_crm/report_crm_claim_view.xml index 67933557a1c..22d4a2ba0f2 100644 --- a/addons/report_crm/report_crm_claim_view.xml +++ b/addons/report_crm/report_crm_claim_view.xml @@ -8,16 +8,16 @@ tree - + - - - - - - - - + + + + + + + + diff --git a/addons/report_crm/report_crm_fundraising.py b/addons/report_crm/report_crm_fundraising.py index 518e03c9a01..ef01c5246e5 100644 --- a/addons/report_crm/report_crm_fundraising.py +++ b/addons/report_crm/report_crm_fundraising.py @@ -31,8 +31,7 @@ class report_crm_fundraising(osv.osv): 0 as avg_answers, 0.0 as perc_done, 0.0 as perc_cancel, - sum(planned_revenue) as amount_revenue, - sum(planned_cost) as amount_costs, + sum(planned_revenue) as amount_revenue, sum(planned_revenue*probability)::decimal(16,2) as amount_revenue_prob, avg(probability)::decimal(16,2) as probability, to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close diff --git a/addons/report_crm/report_crm_fundraising_view.xml b/addons/report_crm/report_crm_fundraising_view.xml index da92023ee55..633023d3b4c 100644 --- a/addons/report_crm/report_crm_fundraising_view.xml +++ b/addons/report_crm/report_crm_fundraising_view.xml @@ -19,6 +19,7 @@ + diff --git a/addons/report_crm/report_crm_lead_view.xml b/addons/report_crm/report_crm_lead_view.xml index 97903e738f7..3b87dfe6ed8 100644 --- a/addons/report_crm/report_crm_lead_view.xml +++ b/addons/report_crm/report_crm_lead_view.xml @@ -16,6 +16,7 @@ + diff --git a/addons/report_crm/report_crm_view.xml b/addons/report_crm/report_crm_view.xml index c55cf54e9c1..61fe7766ddf 100644 --- a/addons/report_crm/report_crm_view.xml +++ b/addons/report_crm/report_crm_view.xml @@ -56,7 +56,7 @@ - + From 07cbe5aca598ebb4148c425c6732a58ee0a391ae Mon Sep 17 00:00:00 2001 From: "Rvo (Open ERP)" Date: Wed, 3 Mar 2010 17:13:50 +0530 Subject: [PATCH 014/116] [IMP]:menu changes bzr revid: rvo@tinyerp.co.in-20100303114350-si24bf7gtg5p0r2v --- addons/mrp/mrp_view.xml | 7 +++++++ addons/project_long_term/project_view.xml | 7 +++++++ addons/resource/resource_view.xml | 14 -------------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index fde53d537fe..a94d12f23e3 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -1038,5 +1038,12 @@ res_model="mrp.bom" src_model="product.product"/> + + + + + + + diff --git a/addons/project_long_term/project_view.xml b/addons/project_long_term/project_view.xml index be7b8de5977..e2f0c0207f2 100644 --- a/addons/project_long_term/project_view.xml +++ b/addons/project_long_term/project_view.xml @@ -160,6 +160,13 @@ + + + + + + + diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml index b42cf310b98..ece75a4cb54 100755 --- a/addons/resource/resource_view.xml +++ b/addons/resource/resource_view.xml @@ -150,19 +150,5 @@ tree,form,calendar - - - - - - - - - - - - - - From 8d90f1aa7198caa399752403f7a5e32d68dca413 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Wed, 3 Mar 2010 18:03:37 +0530 Subject: [PATCH 015/116] [IMP]report_crm: remove the duplicate field bzr revid: sbh@tinyerp.com-20100303123337-lj7z94afln03cls3 --- addons/report_crm/report_crm_claim_view.xml | 1 - addons/report_crm/report_crm_lead_view.xml | 1 - 2 files changed, 2 deletions(-) diff --git a/addons/report_crm/report_crm_claim_view.xml b/addons/report_crm/report_crm_claim_view.xml index 22d4a2ba0f2..8a9aa3d0273 100644 --- a/addons/report_crm/report_crm_claim_view.xml +++ b/addons/report_crm/report_crm_claim_view.xml @@ -16,7 +16,6 @@ - diff --git a/addons/report_crm/report_crm_lead_view.xml b/addons/report_crm/report_crm_lead_view.xml index 3b87dfe6ed8..4ce37467409 100644 --- a/addons/report_crm/report_crm_lead_view.xml +++ b/addons/report_crm/report_crm_lead_view.xml @@ -17,7 +17,6 @@ - From 873461674a47bb6b6ba76ff07eab79b2c802c835 Mon Sep 17 00:00:00 2001 From: "Rvo (Open ERP)" Date: Wed, 3 Mar 2010 19:46:20 +0530 Subject: [PATCH 016/116] [ADD]:added search views on resource module bzr revid: rvo@tinyerp.co.in-20100303141620-qjnk3hlbaip8x3vj --- addons/mrp/mrp_view.xml | 6 +- addons/project/project_view.xml | 21 ++----- addons/project_long_term/project_view.xml | 7 +-- addons/resource/resource_view.xml | 72 ++++++++++++++++++++++- 4 files changed, 83 insertions(+), 23 deletions(-) diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index a94d12f23e3..3d58d595ac5 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -1041,9 +1041,9 @@ - - - + + + diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 73249f58384..749222a2275 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -505,15 +505,6 @@ - - - + res.company.task.config res.company form diff --git a/addons/project_long_term/project_view.xml b/addons/project_long_term/project_view.xml index e2f0c0207f2..9977933238e 100644 --- a/addons/project_long_term/project_view.xml +++ b/addons/project_long_term/project_view.xml @@ -163,10 +163,9 @@ - - - - + + + diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml index ece75a4cb54..bd2f63d5853 100755 --- a/addons/resource/resource_view.xml +++ b/addons/resource/resource_view.xml @@ -15,11 +15,27 @@ + + + resource.calendar.tree + resource.calendar + tree + + + + + + + + + Resource Calendar resource.calendar form + tree,form + @@ -98,7 +114,7 @@ resource.resource tree - + @@ -112,6 +128,7 @@ Resources resource.resource tree,form + @@ -148,6 +165,59 @@ Resource Leaves resource.calendar.leaves tree,form,calendar + + + + + + + + resource.resource.search + resource.resource + search + + + + + + + + + + + + + + + + resource.calendar.search + resource.calendar + search + + + + + + + + + + + + + resource.calendar.leaves.search + resource.calendar.leaves + search + + + + + + + + + + From e24a9602f62b687da8844373e6e1a28f67e55ddb Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 3 Mar 2010 15:38:27 +0100 Subject: [PATCH 017/116] [fix] hr: Issue with toplevel menu Two different toplevel menu items are created, generating a single ir.ui.menu but two different ir.model.data... lp bug: https://launchpad.net/bugs/530835 fixed bzr revid: xmo@tinyerp.com-20100303143827-mlzt58p0prvyqlgr --- addons/hr/hr_view.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index fdc55999297..907d2bdbb76 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -377,11 +377,10 @@ tree,form - + parent="menu_hr_root"/> From 60321a3fe5d8347efa6b894dd4048f0bb1b0bbf1 Mon Sep 17 00:00:00 2001 From: "Jay (Open ERP)" Date: Wed, 3 Mar 2010 21:24:52 +0530 Subject: [PATCH 018/116] [FIX] project_planing : BAD code corrected lp bug: https://launchpad.net/bugs/531382 fixed bzr revid: jvo@tinyerp.com-20100303155452-uavskwmhrhi9tw74 --- addons/project_planning/project_planning.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py index 96e6dd94bca..359fdd6887f 100644 --- a/addons/project_planning/project_planning.py +++ b/addons/project_planning/project_planning.py @@ -286,7 +286,7 @@ Business Days - (Time Allocation of Tasks + Time Allocation without Tasks + Holi cr.execute(""" CREATE OR REPLACE VIEW report_account_analytic_planning_user AS ( SELECT planning.id AS planning_id, - planning.id::varchar(32) || '-' || COALESCE(users.id,0)::varchar(32) AS id, + (1000*(planning.id) + users.id)::integer AS id, planning.business_days, users.id AS user_id, (SELECT sum(line1.amount_in_base_uom) @@ -330,7 +330,7 @@ Business Days - (Time Allocation of Tasks + Time Allocation without Tasks + Holi SELECT planning.id AS planning_id, - planning.id::varchar(32) || '-' || '0' AS id, + (1000*(planning.id) - 1)::integer AS id, planning.business_days, line.user_id, (SELECT SUM(line1.amount_in_base_uom) From ca854b98ba3ab8717f431620ef6ca2a6951065b6 Mon Sep 17 00:00:00 2001 From: Launchpad Code Hosting Date: Thu, 4 Mar 2010 04:52:14 +0000 Subject: [PATCH 019/116] Launchpad automatic translations update. bzr revid: codehost@crowberry-20100304045214-zrx2me4aqrltx0zo --- bin/addons/base/i18n/hr.po | 4 ++-- bin/addons/base/i18n/ja.po | 6 +++--- bin/addons/base/i18n/uk.po | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po index c6f03c89808..9537a0c20e8 100644 --- a/bin/addons/base/i18n/hr.po +++ b/bin/addons/base/i18n/hr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-12-18 08:39+0000\n" -"PO-Revision-Date: 2010-03-02 05:28+0000\n" +"PO-Revision-Date: 2010-03-03 12:31+0000\n" "Last-Translator: goranc \n" "Language-Team: openerp-translators\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-03 04:45+0000\n" +"X-Launchpad-Export-Date: 2010-03-04 04:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" "Language: hr\n" diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po index 834624306a4..5536334e978 100644 --- a/bin/addons/base/i18n/ja.po +++ b/bin/addons/base/i18n/ja.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-server\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-12-18 08:39+0000\n" -"PO-Revision-Date: 2010-03-02 05:31+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2010-03-03 11:42+0000\n" +"Last-Translator: Harry (Open ERP) \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-03 04:45+0000\n" +"X-Launchpad-Export-Date: 2010-03-04 04:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base diff --git a/bin/addons/base/i18n/uk.po b/bin/addons/base/i18n/uk.po index 66bb3b18544..e4b56f5b302 100644 --- a/bin/addons/base/i18n/uk.po +++ b/bin/addons/base/i18n/uk.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-12-18 08:39+0000\n" -"PO-Revision-Date: 2010-01-27 05:47+0000\n" +"PO-Revision-Date: 2010-03-03 12:33+0000\n" "Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-01-28 04:34+0000\n" +"X-Launchpad-Export-Date: 2010-03-04 04:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base From 3e6ae1128103ab483bc211d6da800091e1b63776 Mon Sep 17 00:00:00 2001 From: "Rvo (Open ERP)" Date: Thu, 4 Mar 2010 10:40:05 +0530 Subject: [PATCH 020/116] [IMP]:search views on resource bzr revid: rvo@tinyerp.co.in-20100304051005-65ouresjg24w247u --- addons/resource/resource_view.xml | 100 +++++++++++++++--------------- 1 file changed, 51 insertions(+), 49 deletions(-) diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml index bd2f63d5853..c3092cb7697 100755 --- a/addons/resource/resource_view.xml +++ b/addons/resource/resource_view.xml @@ -1,6 +1,57 @@ + + + + + resource.resource.search + resource.resource + search + + + + + + + + + + + + + + + + resource.calendar.search + resource.calendar + search + + + + + + + + + + + + + resource.calendar.leaves.search + resource.calendar.leaves + search + + + + + + + + + + + resource.calendar.form resource.calendar @@ -169,56 +220,7 @@ - - - resource.resource.search - resource.resource - search - - - - - - - - - - - - - - - - resource.calendar.search - resource.calendar - search - - - - - - - - - - - - - resource.calendar.leaves.search - resource.calendar.leaves - search - - - - - - - - - - - From 80ea4bb587a0a33643a9d09386f3c19498d8b0d7 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Thu, 4 Mar 2010 10:46:01 +0530 Subject: [PATCH 021/116] [Add] report_crm: add the search view of phonecall bzr revid: sbh@tinyerp.com-20100304051601-9plgk16vijizm25i --- .../report_crm/report_crm_phonecall_view.xml | 37 +++++++++++++++++-- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/addons/report_crm/report_crm_phonecall_view.xml b/addons/report_crm/report_crm_phonecall_view.xml index 27f9ceda835..e74a2d05fe4 100644 --- a/addons/report_crm/report_crm_phonecall_view.xml +++ b/addons/report_crm/report_crm_phonecall_view.xml @@ -49,15 +49,44 @@ - report.crm.phonecall.select report.crm.phonecall - search - - + + + + + + + + + + + + + + + + + + + + + + + + + + From 4ababa7f00c12cff6ce974747d650419aa4e6ada Mon Sep 17 00:00:00 2001 From: "Rvo (Open ERP)" Date: Thu, 4 Mar 2010 11:04:20 +0530 Subject: [PATCH 022/116] [IMP]:removed the phase relate button from project/project_view.xml to project_long_term/project_view.xml bzr revid: rvo@tinyerp.co.in-20100304053420-isz3yaega0v5y9ne --- addons/project/project_view.xml | 9 --------- addons/project_long_term/project_view.xml | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 749222a2275..92c90ba9e2b 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -514,15 +514,6 @@ view_mode="tree,form,calendar,graph" view_type="form"/> - - res.company.task.config res.company diff --git a/addons/project_long_term/project_view.xml b/addons/project_long_term/project_view.xml index 9977933238e..d8f6cfe697f 100644 --- a/addons/project_long_term/project_view.xml +++ b/addons/project_long_term/project_view.xml @@ -158,6 +158,15 @@ view_mode="tree,form" domain="[('phase_id','=',active_id)]"/> + + From b1175ec0876521c9bce745dba9eab678ecd0fb8c Mon Sep 17 00:00:00 2001 From: "noz@tinyerp.com" <> Date: Thu, 4 Mar 2010 11:54:34 +0530 Subject: [PATCH 023/116] [IMP] Added HTML tag support in rng file. bzr revid: noz@tinyerp.com-20100304062434-ctsqkqsdsb6bu6wj --- bin/addons/base/rng/view.rng | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/bin/addons/base/rng/view.rng b/bin/addons/base/rng/view.rng index 766b75bf9c3..4dc74d0294c 100644 --- a/bin/addons/base/rng/view.rng +++ b/bin/addons/base/rng/view.rng @@ -12,7 +12,7 @@ - + @@ -23,6 +23,7 @@ + @@ -46,13 +47,14 @@ - + + @@ -74,6 +76,7 @@ + @@ -86,6 +89,12 @@ + + + + + + @@ -111,6 +120,7 @@ + @@ -125,6 +135,7 @@ + @@ -140,6 +151,7 @@ + @@ -149,6 +161,7 @@ + @@ -158,6 +171,7 @@ + @@ -190,7 +204,7 @@ - + @@ -200,6 +214,7 @@ + @@ -230,10 +245,11 @@ - + + @@ -249,6 +265,7 @@ + @@ -269,6 +286,7 @@ + @@ -349,6 +367,7 @@ + @@ -376,7 +395,7 @@ - + @@ -386,6 +405,7 @@ + @@ -403,6 +423,7 @@ + @@ -415,6 +436,7 @@ + @@ -454,6 +476,7 @@ + @@ -493,6 +516,7 @@ + @@ -528,6 +552,7 @@ + From 30c239414fe282ec5d6bf5c7c50dc9a3f64ada6c Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Thu, 4 Mar 2010 12:09:08 +0530 Subject: [PATCH 024/116] [Fix]report_crm: Fix the field name in report_crm_case bzr revid: sbh@tinyerp.com-20100304063908-gym80r62yxym78ad --- addons/report_crm/report_crm.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/report_crm/report_crm.py b/addons/report_crm/report_crm.py index c9e22dc3af8..da9ba2e9ba3 100644 --- a/addons/report_crm/report_crm.py +++ b/addons/report_crm/report_crm.py @@ -45,7 +45,7 @@ class report_crm_case(osv.osv): state = field_name[5:] cr.execute("select count(*) from crm_opportunity where section_id =%s and state='%s'"%(case.section_id.id,state)) state_cases = cr.fetchone()[0] - perc_state = (state_cases / float(case.nbr_cases) ) * 100 + perc_state = (state_cases / float(case.nbr) ) * 100 res[case.id] = perc_state else: @@ -58,7 +58,7 @@ class report_crm_case(osv.osv): cr.execute("select count(*) from crm_case_log l, ir_model m where l.model_id=m.id and m.model = '%s'" , model_name) logs = cr.fetchone()[0] - avg_ans = logs / case.nbr_cases + avg_ans = logs / case.nbr res[case.id] = avg_ans return res @@ -68,7 +68,7 @@ class report_crm_case(osv.osv): 'user_id':fields.many2one('res.users', 'User', readonly=True), 'section_id':fields.many2one('crm.case.section', 'Section', readonly=True), 'nbr': fields.integer('# of Cases', readonly=True), - 'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True), + 'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True), 'avg_answers': fields.function(_get_data,string='Avg. Answers', method=True,type="integer"), 'perc_done': fields.function(_get_data,string='%Done', method=True,type="float"), 'perc_cancel': fields.function(_get_data,string='%Cancel', method=True,type="float"), From 22200c4c5f1811d249400fae585d800512cba861 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Thu, 4 Mar 2010 07:39:52 +0100 Subject: [PATCH 025/116] [IMP] better views bzr revid: fp@tinyerp.com-20100304063952-dtrqbmwo3r2wz2ki --- addons/crm/crm_lead_view.xml | 2 +- addons/crm/crm_opportunity.py | 2 +- addons/crm/crm_opportunity_view.xml | 2 ++ addons/sale/sale_view.xml | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 9039f00381c..c81f6040a3d 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -29,7 +29,7 @@
- + diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py index 84141bdbfc2..f993e79a13f 100644 --- a/addons/crm/crm_opportunity.py +++ b/addons/crm/crm_opportunity.py @@ -26,7 +26,7 @@ AVAILABLE_STATES = [ ('draft','New'), ('open','Open'), ('cancel', 'Lost'), - ('done', 'Won'), + ('done', 'Converted'), ('pending','Pending') ] diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml index 9fa6108e70f..9546906d020 100644 --- a/addons/crm/crm_opportunity_view.xml +++ b/addons/crm/crm_opportunity_view.xml @@ -149,6 +149,8 @@ + +