From 519c621acb06d5290e99dcfe0b09644d40b4bea5 Mon Sep 17 00:00:00 2001 From: Amit Patel Date: Wed, 17 Oct 2012 15:45:34 +0530 Subject: [PATCH 01/12] [FIX]:hr_timesheet:ProgrammingError: column timesheet_report.day does not exist:LINE 1: ...d) AS id, count(timesheet_report.id) AS day_count,"timesheet... bzr revid: apa@tinyerp.com-20121017101534-pixtr1ayjw3xgk3k --- .../hr_timesheet_sheet/report/hr_timesheet_report_view.xml | 1 - addons/hr_timesheet_sheet/report/timesheet_report.py | 6 ++++++ addons/hr_timesheet_sheet/report/timesheet_report_view.xml | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml index 50a99673e73..9ee55f9c9f5 100644 --- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml +++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml @@ -26,7 +26,6 @@ - diff --git a/addons/hr_timesheet_sheet/report/timesheet_report.py b/addons/hr_timesheet_sheet/report/timesheet_report.py index 497fe8da117..95ebf0f2623 100644 --- a/addons/hr_timesheet_sheet/report/timesheet_report.py +++ b/addons/hr_timesheet_sheet/report/timesheet_report.py @@ -32,6 +32,7 @@ class timesheet_report(osv.osv): ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True), 'day': fields.char('Day', size=128, readonly=True), + 'date': fields.date('Date', readonly=True), 'name': fields.char('Description', size=64,readonly=True), 'product_id' : fields.many2one('product.product', 'Product'), 'general_account_id' : fields.many2one('account.account', 'General Account', readonly=True), @@ -62,6 +63,10 @@ class timesheet_report(osv.osv): select min(aal.id) as id, htss.name, + aal.date as date, + to_char(aal.date, 'YYYY-MM-DD') as day, + to_char(aal.date,'YYYY') as year, + to_char(aal.date,'MM') as month, htss.date_from, htss.date_to, count(*) as nbr, @@ -92,6 +97,7 @@ class timesheet_report(osv.osv): left join hr_timesheet_sheet_sheet as htss ON (hat.line_id=htss.id) group by aal.account_id, + aal.date, htss.date_from, htss.date_to, aal.unit_amount, diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml index 711bbaf2a35..aee07fc23b6 100644 --- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml +++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml @@ -17,6 +17,7 @@ timesheet.report + From 1a627b275cf57029eceaf6b1806d91f11b23a00e Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Wed, 17 Oct 2012 17:04:34 +0530 Subject: [PATCH 02/12] [FIX] traceback of graph in mrp bzr revid: fka@tinyerp.com-20121017113434-lihuvchvs6621id6 --- addons/mrp/mrp_view.xml | 2 +- addons/mrp_operations/mrp_operations_view.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 9d1ae9eae8a..8d8e77bf75e 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -606,7 +606,7 @@ mrp.production - + diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml index 834f3000472..c8167fcb0b5 100644 --- a/addons/mrp_operations/mrp_operations_view.xml +++ b/addons/mrp_operations/mrp_operations_view.xml @@ -328,7 +328,7 @@ mrp.production.workcenter.line - + From ec98ebf92df860c6e73bb16412d19b598dc6139e Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Wed, 17 Oct 2012 17:26:26 +0530 Subject: [PATCH 03/12] [FIX] traceback of graph in event bzr revid: fka@tinyerp.com-20121017115626-d04xo8ri38yj8sll --- addons/event/event.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/event/event.py b/addons/event/event.py index e30dda7be8d..ecfb02f8d4a 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -188,7 +188,7 @@ class event_event(osv.osv): 'type': fields.many2one('event.type', 'Type of Event', readonly=False, states={'done': [('readonly', True)]}), 'register_max': fields.integer('Maximum Registrations', help="You can for each event define a maximum registration level. If you have too much registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}), 'register_min': fields.integer('Minimum Registrations', help="You can for each event define a minimum registration level. If you do not enough registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}), - 'register_current': fields.function(_get_register, string='Confirmed Registrations', multi='register_numbers'), + 'register_current': fields.function(_get_register, string='Confirmed Registrations', multi='register_numbers', store=True), 'register_avail': fields.function(_get_register, string='Available Registrations', multi='register_numbers',type='integer'), 'register_prospect': fields.function(_get_register, string='Unconfirmed Registrations', multi='register_numbers'), 'register_attended': fields.function(_get_register, string='# of Participations', multi='register_numbers'), From 7fbd15bfcd53e2dcb7a29470d925bd1850ff24f8 Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Wed, 17 Oct 2012 19:03:56 +0530 Subject: [PATCH 04/12] [IMP] remove graph view bzr revid: fka@tinyerp.com-20121017133356-heetzi8ntfv3aoqo --- addons/event/event.py | 2 +- addons/event/event_view.xml | 16 +--------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/addons/event/event.py b/addons/event/event.py index ecfb02f8d4a..e30dda7be8d 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -188,7 +188,7 @@ class event_event(osv.osv): 'type': fields.many2one('event.type', 'Type of Event', readonly=False, states={'done': [('readonly', True)]}), 'register_max': fields.integer('Maximum Registrations', help="You can for each event define a maximum registration level. If you have too much registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}), 'register_min': fields.integer('Minimum Registrations', help="You can for each event define a minimum registration level. If you do not enough registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}), - 'register_current': fields.function(_get_register, string='Confirmed Registrations', multi='register_numbers', store=True), + 'register_current': fields.function(_get_register, string='Confirmed Registrations', multi='register_numbers'), 'register_avail': fields.function(_get_register, string='Available Registrations', multi='register_numbers',type='integer'), 'register_prospect': fields.function(_get_register, string='Unconfirmed Registrations', multi='register_numbers'), 'register_attended': fields.function(_get_register, string='# of Participations', multi='register_numbers'), diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index ccac74086ff..61dc554d7ce 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -315,20 +315,6 @@ - - - - Event Graph - event.event - - - - - - - - - @@ -364,7 +350,7 @@ ir.actions.act_window event.event form - kanban,calendar,tree,form,graph + kanban,calendar,tree,form {"search_default_upcoming":1} From 7abde8ad1c0b38e7eb2672d4b4d29b7679ee6b88 Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Thu, 18 Oct 2012 17:04:44 +0530 Subject: [PATCH 05/12] [IMP] solve error of graph view bzr revid: fka@tinyerp.com-20121018113444-y2meq3jv060rypjw --- addons/account/report/account_invoice_report_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index e352a33d850..289db376e5d 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -42,7 +42,7 @@ - + From ad61fb4c60a6542467a53f1496c8f90ef98a4fed Mon Sep 17 00:00:00 2001 From: Amit Patel Date: Thu, 18 Oct 2012 17:24:26 +0530 Subject: [PATCH 06/12] [FIX] bzr revid: apa@tinyerp.com-20121018115426-mqpqv8zqfgc6ftys --- addons/account_budget/account_budget_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml index fdc358f5c98..175b3c9c847 100644 --- a/addons/account_budget/account_budget_view.xml +++ b/addons/account_budget/account_budget_view.xml @@ -290,7 +290,7 @@ - + From f188aeb65a4e6b67697c23adcf5a9881ddf5cb7f Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Fri, 19 Oct 2012 15:19:08 +0530 Subject: [PATCH 07/12] [IMP] remove error of graph view in project_issue bzr revid: fka@tinyerp.com-20121019094908-2c8dt206qe784a80 --- addons/project_issue/report/project_issue_report_view.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml index 6bee4e38842..47ea91fad5f 100644 --- a/addons/project_issue/report/project_issue_report_view.xml +++ b/addons/project_issue/report/project_issue_report_view.xml @@ -63,7 +63,6 @@ - From b24eb49293529ac30d12f2a97a003ee679c806ec Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Fri, 19 Oct 2012 15:57:02 +0530 Subject: [PATCH 08/12] [IMP] remove date_planned_date function Field in mrp_production bzr revid: fka@tinyerp.com-20121019102702-gcskff4ae16jrzqp --- addons/mrp/mrp.py | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 3ae27bf2c41..8f294539fd4 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -431,16 +431,6 @@ class mrp_production(osv.osv): result[prod.id] = prod.date_planned return result - def _production_date(self, cr, uid, ids, prop, unknow_none, context=None): - """ Finds production planned date. - @param prop: Name of field. - @param unknow_none: - @return: Dictionary of values. - """ - result = {} - for prod in self.browse(cr, uid, ids, context=context): - result[prod.id] = prod.date_planned[:10] - return result def _src_id_default(self, cr, uid, ids, context=None): src_location_id = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock', context=context) @@ -471,7 +461,6 @@ class mrp_production(osv.osv): help="Location where the system will stock the finished products."), 'date_planned_end': fields.function(_production_date_end, type='date', string='Scheduled End Date'), - 'date_planned_date': fields.function(_production_date, type='date', string='Scheduled Date'), 'date_planned': fields.datetime('Scheduled Date', required=True, select=1, readonly=True, states={'draft':[('readonly',False)]}), 'date_start': fields.datetime('Start Date', select=True, readonly=True), 'date_finished': fields.datetime('End Date', select=True, readonly=True), From aa7856b025c17d3e36dad7cfdda84cf2fafc4b11 Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Fri, 19 Oct 2012 16:22:10 +0530 Subject: [PATCH 09/12] [IMP] remove date_planned_end function Field in mrp_production bzr revid: fka@tinyerp.com-20121019105210-fx477sy9ht4mlic1 --- addons/mrp/mrp.py | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 8f294539fd4..92b47ff66e1 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -420,18 +420,6 @@ class mrp_production(osv.osv): result[prod.id]['cycle_total'] += wc.cycle return result - def _production_date_end(self, cr, uid, ids, prop, unknow_none, context=None): - """ Finds production end date. - @param prop: Name of field. - @param unknow_none: - @return: Dictionary of values. - """ - result = {} - for prod in self.browse(cr, uid, ids, context=context): - result[prod.id] = prod.date_planned - return result - - def _src_id_default(self, cr, uid, ids, context=None): src_location_id = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock', context=context) return src_location_id.id @@ -459,12 +447,9 @@ class mrp_production(osv.osv): 'location_dest_id': fields.many2one('stock.location', 'Finished Products Location', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="Location where the system will stock the finished products."), - - 'date_planned_end': fields.function(_production_date_end, type='date', string='Scheduled End Date'), 'date_planned': fields.datetime('Scheduled Date', required=True, select=1, readonly=True, states={'draft':[('readonly',False)]}), 'date_start': fields.datetime('Start Date', select=True, readonly=True), 'date_finished': fields.datetime('End Date', select=True, readonly=True), - 'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)], readonly=True, states={'draft':[('readonly',False)]}, help="Bill of Materials allow you to define the list of required raw materials to make a finished product."), 'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', readonly=True, states={'draft':[('readonly',False)]}, From 16dd332339276324cd9fb360f724a09f4ea93220 Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Mon, 22 Oct 2012 12:06:55 +0530 Subject: [PATCH 10/12] [IMP] remove extra column day,month,year in timesheet report bzr revid: fka@tinyerp.com-20121022063655-r7f9hof8i4aho0oj --- addons/hr_timesheet_sheet/report/timesheet_report.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/addons/hr_timesheet_sheet/report/timesheet_report.py b/addons/hr_timesheet_sheet/report/timesheet_report.py index 434d48e59be..e276980ddf7 100644 --- a/addons/hr_timesheet_sheet/report/timesheet_report.py +++ b/addons/hr_timesheet_sheet/report/timesheet_report.py @@ -65,9 +65,6 @@ class timesheet_report(osv.osv): min(aal.id) as id, htss.name, aal.date as date, - to_char(aal.date, 'YYYY-MM-DD') as day, - to_char(aal.date,'YYYY') as year, - to_char(aal.date,'MM') as month, htss.date_from, htss.date_to, to_char(htss.date_from, 'YYYY-MM-DD') as day, From 4d9907ada9b65d52eb038efc0629e23260298b58 Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Mon, 22 Oct 2012 19:03:54 +0530 Subject: [PATCH 11/12] [IMP] remove graph view mode in bank statement & coda statement bzr revid: fka@tinyerp.com-20121022133354-03g0z7se5tv4ngb1 --- .../account_bank_statement_view.xml | 2 +- addons/l10n_be_coda/l10n_be_coda_view.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account_bank_statement_extensions/account_bank_statement_view.xml b/addons/account_bank_statement_extensions/account_bank_statement_view.xml index 9164c00373f..3d5560856a3 100644 --- a/addons/account_bank_statement_extensions/account_bank_statement_view.xml +++ b/addons/account_bank_statement_extensions/account_bank_statement_view.xml @@ -148,7 +148,7 @@ Bank Statement Lines account.bank.statement.line form - tree,graph,form + tree,form {'block_statement_line_delete' : 1} diff --git a/addons/l10n_be_coda/l10n_be_coda_view.xml b/addons/l10n_be_coda/l10n_be_coda_view.xml index 21db77466a0..d5067e7951a 100644 --- a/addons/l10n_be_coda/l10n_be_coda_view.xml +++ b/addons/l10n_be_coda/l10n_be_coda_view.xml @@ -473,7 +473,7 @@ CODA Statement Lines coda.bank.statement.line form - tree,graph,form + tree,form {'block_statement_line_delete' : 1} From 7f64cbd875e22d8feb1555cf886c00bb3163c072 Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Tue, 23 Oct 2012 11:52:30 +0530 Subject: [PATCH 12/12] [IMP] remove date_start_date function field bzr revid: fka@tinyerp.com-20121023062230-l6941b0lt7qx4wzu --- addons/mrp_operations/mrp_operations.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py index 9f6671c3b2b..ffe0305d5f1 100644 --- a/addons/mrp_operations/mrp_operations.py +++ b/addons/mrp_operations/mrp_operations.py @@ -50,17 +50,6 @@ class stock_move(osv.osv): stock_move() class mrp_production_workcenter_line(osv.osv): - def _get_date_date(self, cr, uid, ids, field_name, arg, context=None): - """ Finds starting date. - @return: Dictionary of values. - """ - res={} - for op in self.browse(cr, uid, ids, context=context): - if op.date_start: - res[op.id] = op.date_start[:10] - else: - res[op.id]=False - return res def _get_date_end(self, cr, uid, ids, field_name, arg, context=None): """ Finds ending date. @@ -92,7 +81,6 @@ class mrp_production_workcenter_line(osv.osv): "* When work order is in running mode, during that time if user wants to stop or to make changes in order then can set in 'Pending' state.\n" \ "* When the user cancels the work order it will be set in 'Canceled' state.\n" \ "* When order is completely processed that time it is set in 'Finished' state."), - 'date_start_date': fields.function(_get_date_date, string='Start Date', type='date'), 'date_planned': fields.datetime('Scheduled Date', select=True), 'date_planned_end': fields.function(_get_date_end, string='End Date', type='datetime'), 'date_start': fields.datetime('Start Date'),