From dd2b1bed63e62bfcadfca8c1760d4ea9ab47afeb Mon Sep 17 00:00:00 2001 From: Niels Huylebroeck Date: Wed, 15 Sep 2010 13:58:12 +0200 Subject: [PATCH 01/73] [FIX] Removed all code and XML mentions of "finnished", as it's written "finished" (Bug #326160) bzr revid: niels@bubbles-it.be-20100915115812-j6lec74or0y61psp --- addons/mrp/mrp.py | 4 ++-- addons/mrp/mrp_view.xml | 4 ++-- addons/mrp/report/mrp_production_order.py | 6 +++--- addons/mrp/report/mrp_production_order_view.xml | 2 +- addons/mrp_operations/mrp_operations.py | 16 ++++++++-------- addons/mrp_operations/mrp_operations_view.xml | 4 ++-- addons/procurement/procurement.py | 6 +++--- addons/procurement/procurement_workflow.xml | 2 +- addons/sale/process/sale_process.xml | 2 +- addons/stock/stock.py | 2 +- addons/stock/stock_workflow.xml | 4 ++-- 11 files changed, 26 insertions(+), 26 deletions(-) diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 8b616c3d7ac..eb5fd5d15e7 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -450,7 +450,7 @@ class mrp_production(osv.osv): 'date_planned_date': fields.function(_production_date, method=True, type='date', string='Scheduled Date'), 'date_planned': fields.datetime('Scheduled date', required=True, select=1), 'date_start': fields.datetime('Start Date'), - 'date_finnished': fields.datetime('End Date'), + 'date_finished': fields.datetime('End Date'), 'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)]), 'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', help="The list of operations (list of workcenters) to produce the finished product. The routing is mainly used to compute workcenter costs during operations and to plan future loads on workcenters based on production plannification."), @@ -652,7 +652,7 @@ class mrp_production(osv.osv): """ for production in self.browse(cr, uid, ids): self._costs_generate(cr, uid, production) - return self.write(cr, uid, ids, {'state': 'done', 'date_finnished': time.strftime('%Y-%m-%d %H:%M:%S')}) + return self.write(cr, uid, ids, {'state': 'done', 'date_finished': time.strftime('%Y-%m-%d %H:%M:%S')}) def test_production_done(self, cr, uid, ids): """ Tests whether production is done or not. diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index ba7ebef1973..bd0a52159bf 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -530,7 +530,7 @@ mrp.production gantt - + @@ -696,7 +696,7 @@ - + diff --git a/addons/mrp/report/mrp_production_order.py b/addons/mrp/report/mrp_production_order.py index 9aeae1781cd..3ad4184c413 100644 --- a/addons/mrp/report/mrp_production_order.py +++ b/addons/mrp/report/mrp_production_order.py @@ -51,7 +51,7 @@ class mrp_production_order(osv.osv): 'date_planned':fields.date('Scheduled Date'), 'location_src_id': fields.many2one('stock.location', 'Raw Materials Location', readonly=True), 'date_start': fields.datetime('Start Date',readonly=True), - 'date_finnished': fields.datetime('End Date',readonly=True), + 'date_finished': fields.datetime('End Date',readonly=True), 'location_dest_id': fields.many2one('stock.location', 'Finished Products Location', readonly=True), 'company_id': fields.many2one('res.company','Company',readonly=True), 'bom_id': fields.many2one('mrp.bom', 'Bill of Material',readonly=True), @@ -100,7 +100,7 @@ class mrp_production_order(osv.osv): s.routing_id, s.picking_id, s.date_start, - s.date_finnished, + s.date_finished, to_date(to_char(s.date_planned, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_planned, s.origin, s.priority, @@ -128,7 +128,7 @@ class mrp_production_order(osv.osv): to_date(to_char(s.date_planned, 'dd-MM-YYYY'),'dd-MM-YYYY'), s.origin, s.date_start, - s.date_finnished, + s.date_finished, s.company_id )""") mrp_production_order() diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml index 7617c8f55e4..31a8b36a59d 100644 --- a/addons/mrp/report/mrp_production_order_view.xml +++ b/addons/mrp/report/mrp_production_order_view.xml @@ -97,7 +97,7 @@ - + diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py index ab936e78daf..2d6ef47b81e 100644 --- a/addons/mrp_operations/mrp_operations.py +++ b/addons/mrp_operations/mrp_operations.py @@ -85,7 +85,7 @@ class mrp_production_workcenter_line(osv.osv): 'date_planned': fields.datetime('Scheduled Date'), 'date_planned_end': fields.function(_get_date_end, method=True, string='End Date', type='datetime'), 'date_start': fields.datetime('Start Date'), - 'date_finnished': fields.datetime('End Date'), + 'date_finished': fields.datetime('End Date'), 'delay': fields.float('Working Hours',help="This is lead time between operation start and stop in this workcenter",readonly=True), 'production_state':fields.related('production_id','state', type='selection', @@ -171,7 +171,7 @@ class mrp_production_workcenter_line(osv.osv): delay += (date_finished-date_start).days * 24 delay += (date_finished-date_start).seconds / float(60*60) - self.write(cr, uid, ids, {'state':'done', 'date_finnished': date_now,'delay':delay}) + self.write(cr, uid, ids, {'state':'done', 'date_finished': date_now,'delay':delay}) self.modify_production_order_state(cr,uid,ids,'done') return True @@ -280,7 +280,7 @@ class mrp_production(osv.osv): dt_end = DateTime.strptime(wc.date_planned_end, '%Y-%m-%d %H:%M:%S') old = wc.sequence or 0 super(mrp_production, self).write(cr, uid, [po.id], { - 'date_finnished': dt_end + 'date_finished': dt_end }) return dt_end @@ -298,7 +298,7 @@ class mrp_production(osv.osv): if l.state in ('done','cancel','draft'): continue todo += l.move_dest_id_lines - if l.production_id and (l.production_id.date_finnished > dt): + if l.production_id and (l.production_id.date_finished > dt): if l.production_id.state not in ('done','cancel'): for wc in l.production_id.workcenter_lines: i = self.pool.get('resource.calendar').interval_min_get( @@ -327,8 +327,8 @@ class mrp_production(osv.osv): break if l.production_id.state in ('done','cancel'): break - if l.production_id and (l.production_id.date_start < po.date_finnished): - self.write(cr, uid, [l.production_id.id], {'date_start': po.date_finnished}) + if l.production_id and (l.production_id.date_start < po.date_finished): + self.write(cr, uid, [l.production_id.id], {'date_start': po.date_finished}) break @@ -503,7 +503,7 @@ class mrp_operations_operation(osv.osv): if code.start_stop=='done': tmp=self.pool.get('mrp.production.workcenter.line').action_done(cr,uid,wc_op_id) wf_service.trg_validate(uid, 'mrp.production.workcenter.line', wc_op_id[0], 'button_done', cr) - self.pool.get('mrp.production').write(cr,uid,vals['production_id'],{'date_finnished':DateTime.now().strftime('%Y-%m-%d %H:%M:%S')}) + self.pool.get('mrp.production').write(cr,uid,vals['production_id'],{'date_finished':DateTime.now().strftime('%Y-%m-%d %H:%M:%S')}) if code.start_stop=='pause': tmp=self.pool.get('mrp.production.workcenter.line').action_pause(cr,uid,wc_op_id) @@ -524,7 +524,7 @@ class mrp_operations_operation(osv.osv): line_vals['delay'] = delay if vals.get('date_start',False): if code.start_stop == 'done': - line_vals['date_finnished'] = vals['date_start'] + line_vals['date_finished'] = vals['date_start'] elif code.start_stop == 'start': line_vals['date_start'] = vals['date_start'] diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml index 4af63c52b77..37a02956ce0 100644 --- a/addons/mrp_operations/mrp_operations_view.xml +++ b/addons/mrp_operations/mrp_operations_view.xml @@ -101,7 +101,7 @@ - + @@ -170,7 +170,7 @@ mrp.production.workcenter.line calendar - + diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py index 5c6caf1e9db..72dc73f025b 100644 --- a/addons/procurement/procurement.py +++ b/addons/procurement/procurement.py @@ -440,7 +440,7 @@ class procurement_order(osv.osv): wf_service.trg_trigger(uid, 'procurement.order', id, cr) return True - def action_check_finnished(self, cr, uid, ids): + def action_check_finished(self, cr, uid, ids): return self.check_move_done(cr, uid, ids) def action_check(self, cr, uid, ids): @@ -493,9 +493,9 @@ procurement_order() class StockPicking(osv.osv): _inherit = 'stock.picking' - def test_finnished(self, cursor, user, ids): + def test_finished(self, cursor, user, ids): wf_service = netsvc.LocalService("workflow") - res = super(StockPicking, self).test_finnished(cursor, user, ids) + res = super(StockPicking, self).test_finished(cursor, user, ids) for picking in self.browse(cursor, user, ids): for move in picking.move_lines: if move.state == 'done' and move.procurements: diff --git a/addons/procurement/procurement_workflow.xml b/addons/procurement/procurement_workflow.xml index ff4325e248f..b4bcd1e1f04 100644 --- a/addons/procurement/procurement_workflow.xml +++ b/addons/procurement/procurement_workflow.xml @@ -187,7 +187,7 @@ - action_check_finnished() + action_check_finished() stock.move [move_id.id] diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml index b4a54d5afa5..55bb3d6a2c3 100644 --- a/addons/sale/process/sale_process.xml +++ b/addons/sale/process/sale_process.xml @@ -261,7 +261,7 @@ - + diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 5ecbd5f40ba..6e50587d014 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -786,7 +786,7 @@ class stock_picking(osv.osv): self.log_picking(cr, uid, ids, context=context) return True - def test_finnished(self, cr, uid, ids): + def test_finished(self, cr, uid, ids): """ Tests whether the move is in done or cancel state or not. @return: True or False """ diff --git a/addons/stock/stock_workflow.xml b/addons/stock/stock_workflow.xml index 3254f7b6984..2a682833a1c 100644 --- a/addons/stock/stock_workflow.xml +++ b/addons/stock/stock_workflow.xml @@ -86,12 +86,12 @@ - test_finnished() + test_finished() - not test_finnished() + not test_finished() From 38fdf845844c8e915314fefad00ede12c927974c Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Wed, 29 Sep 2010 13:03:34 +0530 Subject: [PATCH 02/73] improved bzr revid: apa@tinyerp.com-20100929073334-snelmyf56ldzlp1y --- .../report/account_aged_partner_balance.rml | 12 ++++++------ addons/account/report/account_partner_ledger.rml | 8 ++++---- .../report/account_partner_ledger_other.rml | 8 ++++---- addons/hr_expense/report/expense.rml | 14 +++++++------- addons/stock/report/lot_overview.rml | 4 ++-- addons/stock/report/lot_overview_all.rml | 4 ++-- addons/stock/report/stock_inventory_move.rml | 10 +++++----- 7 files changed, 30 insertions(+), 30 deletions(-) diff --git a/addons/account/report/account_aged_partner_balance.rml b/addons/account/report/account_aged_partner_balance.rml index 7f90ae0983b..ab57db23a27 100644 --- a/addons/account/report/account_aged_partner_balance.rml +++ b/addons/account/report/account_aged_partner_balance.rml @@ -168,22 +168,22 @@ Partners - [[ data['form']['direction_selection'] == 'future' and 'Due' or 'Not due' ]]([[ company.currency_id.code ]]) + [[ data['form']['direction_selection'] == 'future' and 'Due' or 'Not due' ]] - [[ data['form']['4']['name'] ]]([[ company.currency_id.code ]]) + [[ data['form']['4']['name'] ]] - [[ data['form']['3']['name'] ]]([[ company.currency_id.code ]]) + [[ data['form']['3']['name'] ]] - [[ data['form']['2']['name'] ]]([[ company.currency_id.code ]]) + [[ data['form']['2']['name'] ]] - [[ data['form']['1']['name'] ]]([[ company.currency_id.code ]]) + [[ data['form']['1']['name'] ]] - [[ data['form']['0']['name'] ]]([[ company.currency_id.code ]]) + [[ data['form']['0']['name'] ]] Total diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml index 7de67780056..ec0adbdc400 100644 --- a/addons/account/report/account_partner_ledger.rml +++ b/addons/account/report/account_partner_ledger.rml @@ -289,7 +289,7 @@ Ref. - A/c No.- Name + Account Entry Label @@ -359,7 +359,7 @@ [[ line['move_name'] ]] - [[ line['a_code'] ]] - [[ line['a_name'] ]] + [[ line['a_code'] ]] [[ line['ref'] ]] - [[ line['name'] ]] @@ -391,7 +391,7 @@ Ref. - A/c No.- Name + Account Entry Label @@ -472,7 +472,7 @@ [[ line['move_name'] ]] - [[ line['a_code'] ]] - [[ line['a_name'] ]] + [[ line['a_code'] ]] [[ (line['ref'] or '') + ' ' + line['name'] ]] diff --git a/addons/account/report/account_partner_ledger_other.rml b/addons/account/report/account_partner_ledger_other.rml index 53cb0d46d83..a49616e4427 100644 --- a/addons/account/report/account_partner_ledger_other.rml +++ b/addons/account/report/account_partner_ledger_other.rml @@ -443,7 +443,7 @@ Ref. - A/c No.- Name + Account Entry Label @@ -506,7 +506,7 @@ [[ line['move_name'] ]] - [[ line['a_code'] ]] - [[ line['a_name'] ]] + [[ line['a_code'] ]] [[ (line['ref'] or '') + ' ' + line['name'] ]] @@ -536,7 +536,7 @@ Ref. - A/c No.- Name + Account Entry Label @@ -611,7 +611,7 @@ [[ line['move_name'] ]] - [[ line['a_code'] ]] - [[ line['a_name'] ]] + [[ line['a_code'] ]] [[ (line['ref'] or '') + ' ' + line['name'] ]] diff --git a/addons/hr_expense/report/expense.rml b/addons/hr_expense/report/expense.rml index fa9e78c68cd..7d7be76ea8e 100644 --- a/addons/hr_expense/report/expense.rml +++ b/addons/hr_expense/report/expense.rml @@ -115,9 +115,9 @@ - HR Expenses [[ o.name or '' ]] - - + HR Expenses + + [[ o.name or '' ]] @@ -166,10 +166,10 @@ Unit Price - Qty + Qty - Total Price([[ o.currency_id.code ]]) + Total Price @@ -181,7 +181,7 @@ - [[ formatLang(line.date_value,date = True) ]] + [[ formatLang(line.date_value,date=True) ]] [[ line.name or '' ]] [[ line.description or '' ]] @@ -259,7 +259,7 @@ - [[ setTag('para','xpre') ]] [[ o.note or '' ]] + [[ o.note or '' ]] [[ setTag('para','xpre') ]] diff --git a/addons/stock/report/lot_overview.rml b/addons/stock/report/lot_overview.rml index f4332455cf9..4b6e02c5b81 100644 --- a/addons/stock/report/lot_overview.rml +++ b/addons/stock/report/lot_overview.rml @@ -108,7 +108,7 @@ Unit Price - Value([[ company.currency_id.name ]]) + Value @@ -209,4 +209,4 @@ - \ No newline at end of file + diff --git a/addons/stock/report/lot_overview_all.rml b/addons/stock/report/lot_overview_all.rml index a0e58e8ce7d..13ca75381a1 100644 --- a/addons/stock/report/lot_overview_all.rml +++ b/addons/stock/report/lot_overview_all.rml @@ -108,7 +108,7 @@ Unit Price - Value([[ company.currency_id.name ]]) + Value @@ -209,4 +209,4 @@ - \ No newline at end of file + diff --git a/addons/stock/report/stock_inventory_move.rml b/addons/stock/report/stock_inventory_move.rml index 7cb18a4e161..9531c534dec 100755 --- a/addons/stock/report/stock_inventory_move.rml +++ b/addons/stock/report/stock_inventory_move.rml @@ -151,7 +151,7 @@ - + Location @@ -172,7 +172,7 @@
[[ repeatIn(o.inventory_line_id, 'p') ]] - + [[ p.location_id.name ]] @@ -181,7 +181,7 @@ [[ p.prod_lot_id and p.prod_lot_id.name or '' ]] - [[ p.product_id.name ]] + [ [[ p.product_id.code ]] ] [[ p.product_id.name ]] [[ formatLang(p.product_qty) ]] [[ p.product_uom.name ]] @@ -189,7 +189,7 @@
- + Total: @@ -203,4 +203,4 @@ - \ No newline at end of file + From 278b1454c0a166fedef40efaab390b7e43eb0213 Mon Sep 17 00:00:00 2001 From: "Jni (Open ERP)" Date: Wed, 29 Sep 2010 13:54:37 +0530 Subject: [PATCH 03/73] [IMP]:Change the name of button. bzr revid: jni@tinyerp.com-20100929082437-knbp6re6k69ii44p --- addons/account/wizard/account_vat_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml index c8a6645f744..72c6fa768e5 100644 --- a/addons/account/wizard/account_vat_view.xml +++ b/addons/account/wizard/account_vat_view.xml @@ -16,7 +16,7 @@