From 8056010771b284f663589d6f84fb7948e305ba28 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Mon, 14 Jun 2010 13:49:11 +0200 Subject: [PATCH 1/6] bugfix bzr revid: fp@tinyerp.com-20100614114911-z2c17zol480zsz4c --- addons/mrp/mrp_view.xml | 41 +++++++++++++++++++++++++++++++ addons/stock/stock.py | 8 ------ addons/stock/wizard/stock_move.py | 6 +---- 3 files changed, 42 insertions(+), 13 deletions(-) diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index b3004fffb2f..3837588035e 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -856,5 +856,46 @@ + + + + product.normal.form + product.product + + form + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/stock/stock.py b/addons/stock/stock.py index d6d3a23efa7..ddfe4808dba 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1427,14 +1427,6 @@ class stock_move(osv.osv): default = default.copy() return super(stock_move, self).copy(cr, uid, id, default, context) - def create(self, cr, user, vals, context=None): - # Check that the stock.move is in draft state at creation to force - # passing through button_confirm - if vals.get('state','draft') not in ('draft','done','waiting'): - logger = netsvc.Logger() - logger.notifyChannel("code", netsvc.LOG_WARNING, "All new stock.move must be in state draft at the creation !") - return super(stock_move, self).create(cr, user, vals, context) - def _auto_init(self, cursor, context): res = super(stock_move, self)._auto_init(cursor, context) cursor.execute('SELECT indexname \ diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py index 0e670ee3e5d..8616f939bb8 100644 --- a/addons/stock/wizard/stock_move.py +++ b/addons/stock/wizard/stock_move.py @@ -240,15 +240,11 @@ class split_in_production_lot(osv.osv_memory): default_val = { 'product_qty': quantity, 'product_uos_qty': uos_qty, - 'state': 'draft' + 'state': move.state } if quantity_rest > 0: current_move = move_obj.copy(cr, uid, move.id, default_val) move_obj.action_confirm(cr, uid, [current_move]) - if move.state=='assigned': - move_obj.force_assign(cr, uid, [current_move]) - elif move.state<>'confirmed': - move_obj.write(cr, uid, [current_move], {'state': move.state}) new_move.append(current_move) if quantity_rest == 0: current_move = move.id From d31298b09cbbca1ef06e5e7a0961c13e94bcc13c Mon Sep 17 00:00:00 2001 From: "Vir (Open ERP)" Date: Mon, 14 Jun 2010 17:34:38 +0530 Subject: [PATCH 2/6] [ADD,IMP] board_purchase : Graph view added in purchase dashboard bzr revid: vir@tinyerp.com-20100614120438-te1jsipj8nwkd4xz --- addons/board_purchase/board_purchase_view.xml | 8 +++- .../purchase/report/purchase_report_view.xml | 44 +++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/addons/board_purchase/board_purchase_view.xml b/addons/board_purchase/board_purchase_view.xml index bf19c039407..c5ee7b885bc 100644 --- a/addons/board_purchase/board_purchase_view.xml +++ b/addons/board_purchase/board_purchase_view.xml @@ -14,7 +14,7 @@ purchase.order form tree,form - [('date_order','>',time.strftime('%Y-01-01 00:00:00')),('date_order','<',time.strftime('%Y-12-31 23:59:59')), ('state','=','draft')] + [('date_order','>',time.strftime('%Y-01-01 00:00:00')),('date_order','<',time.strftime('%Y-12-31 23:59:59')), ('state','=','draft')] @@ -23,7 +23,7 @@ purchase.order form tree,form - [('date_order','>',time.strftime('%Y-01-01 00:00:00')),('date_order','<',time.strftime('%Y-12-31 23:59:59')), ('state','in',('wait','confirmed'))] + [('date_order','>',time.strftime('%Y-01-01 00:00:00')),('date_order','<',time.strftime('%Y-12-31 23:59:59')), ('state','in',('wait','confirmed'))] @@ -38,6 +38,10 @@ + + + + diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml index b2bdf840c3d..2d18ae18b36 100644 --- a/addons/purchase/report/purchase_report_view.xml +++ b/addons/purchase/report/purchase_report_view.xml @@ -112,6 +112,33 @@ + + purchase.order.qty.amount.graph + purchase.report + graph + + + + + + + + + + + purchase.order.by.user.graph + purchase.report + graph + + + + + + + + + + Purchase Orders purchase.report @@ -120,6 +147,23 @@ {'search_default_month':1,'search_default_group_partner_id':1,'search_default_group_product_id': 1, 'search_default_orders': 1, 'group_by_no_leaf':1,'group_by':[]} + + Total Qty and Amount by month + purchase.report + form + graph,tree + + + + + Total Orders by User per month + purchase.report + form + graph,tree + + + + From 0b66c19f61cc050b32e40f056a55e03bc560201c Mon Sep 17 00:00:00 2001 From: Julien Thewys Date: Mon, 14 Jun 2010 15:53:54 +0200 Subject: [PATCH 3/6] [FIX] xml typo bzr revid: jth@openerp.com-20100614135354-vfud6vgoru90wcaa --- addons/email_template/email_template_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml index 7b72ecdac4e..0faa28e042f 100644 --- a/addons/email_template/email_template_view.xml +++ b/addons/email_template/email_template_view.xml @@ -44,7 +44,7 @@ ir.actions.act_window form form - + new {'template_id':active_id} From 32c6c7993d207a06ad90917d6327e87048c39cfd Mon Sep 17 00:00:00 2001 From: Launchpad Code Hosting Date: Tue, 15 Jun 2010 04:33:10 +0100 Subject: [PATCH 4/6] Launchpad automatic translations update. bzr revid: codehost@crowberry-20100615033310-63v2pr3m83wla4v5 --- addons/google_map/i18n/ru.po | 2 +- addons/mrp_operations/i18n/hi.po | 439 +++++++++++++++++++++++++++++++ addons/product/i18n/vi.po | 2 +- addons/stock/i18n/nl.po | 64 +++-- addons/stock/i18n/pl.po | 42 +-- 5 files changed, 492 insertions(+), 57 deletions(-) create mode 100644 addons/mrp_operations/i18n/hi.po diff --git a/addons/google_map/i18n/ru.po b/addons/google_map/i18n/ru.po index 6e3e44985e5..640f842cade 100644 --- a/addons/google_map/i18n/ru.po +++ b/addons/google_map/i18n/ru.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-14 03:42+0000\n" +"X-Launchpad-Export-Date: 2010-06-15 03:32+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: google_map diff --git a/addons/mrp_operations/i18n/hi.po b/addons/mrp_operations/i18n/hi.po new file mode 100644 index 00000000000..25ec3464854 --- /dev/null +++ b/addons/mrp_operations/i18n/hi.po @@ -0,0 +1,439 @@ +# Hindi translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2009-08-28 16:01+0000\n" +"PO-Revision-Date: 2010-06-14 08:48+0000\n" +"Last-Translator: vir (Open ERP) \n" +"Language-Team: Hindi \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-06-15 03:33+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: mrp_operations +#: model:process.node,name:mrp_operations.process_node_startoperation0 +msgid "Start Operation" +msgstr "ऑपरेशन प्रारंभ करें" + +#. module: mrp_operations +#: selection:mrp.production.workcenter.line,state:0 +msgid "In Progress" +msgstr "प्रगति में है" + +#. module: mrp_operations +#: view:mrp.production.workcenter.line:0 +#: selection:mrp.production.workcenter.line,state:0 +#: selection:mrp_operations.operation.code,start_stop:0 +msgid "Pause" +msgstr "ठहरें (Pause)" + +#. module: mrp_operations +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" + +#. module: mrp_operations +#: model:process.node,note:mrp_operations.process_node_startoperation0 +msgid "Operation is started" +msgstr "ऑपरेशन शुरू कर दिया है" + +#. module: mrp_operations +#: view:mrp.production.workcenter.line:0 +msgid "Information" +msgstr "जानकारी" + +#. module: mrp_operations +#: model:process.transition,name:mrp_operations.process_transition_startcanceloperation0 +msgid "Start Cancel Operation" +msgstr "आरंभ रद्द संचालन" + +#. module: mrp_operations +#: selection:mrp.production.workcenter.line,production_state:0 +msgid "In Production" +msgstr "उत्पादन में" + +#. module: mrp_operations +#: model:ir.actions.act_window,name:mrp_operations.mrp_production_code_action +msgid "Operations Code" +msgstr "परिचालन संहिता" + +#. module: mrp_operations +#: model:process.process,name:mrp_operations.process_process_mrpoperationprocess0 +msgid "Mrp Operation Process" +msgstr "एमआरपी ऑपरेशन प्रक्रिया" + +#. module: mrp_operations +#: view:mrp.production.workcenter.line:0 +#: field:mrp.production.workcenter.line,state:0 +#: field:mrp_operations.operation.code,start_stop:0 +msgid "Status" +msgstr "स्थिति" + +#. module: mrp_operations +#: model:process.transition,name:mrp_operations.process_transition_startdoneoperation0 +msgid "Start Done Operation" +msgstr "" + +#. module: mrp_operations +#: view:mrp.production.workcenter.line:0 +#: selection:mrp_operations.operation.code,start_stop:0 +msgid "Start" +msgstr "प्रारंभ" + +#. module: mrp_operations +#: field:mrp_operations.operation,production_id:0 +msgid "Production" +msgstr "उत्पादन" + +#. module: mrp_operations +#: view:mrp_operations.operation:0 +msgid "Calendar View" +msgstr "कैलेंडर देखना" + +#. module: mrp_operations +#: model:process.node,name:mrp_operations.process_node_workorder0 +msgid "Work Center" +msgstr "कार्य केंद्र" + +#. module: mrp_operations +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "कार्य की परिभाषा में मॉडल का नाम अमान्य है." + +#. module: mrp_operations +#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_operation_action +msgid "Work Order Events Using Bar Codes" +msgstr "" + +#. module: mrp_operations +#: view:mrp.production.workcenter.line:0 +msgid "Set Draft" +msgstr "Set as Draft" + +#. module: mrp_operations +#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form +#: view:mrp.production.workcenter.line:0 +msgid "Work Orders" +msgstr "काम के आदेश" + +#. module: mrp_operations +#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_code_action +msgid "Start - Stop Codes" +msgstr "शुरू और बंद कोड" + +#. module: mrp_operations +#: field:mrp.production.workcenter.line,uom:0 +msgid "UOM" +msgstr "" + +#. module: mrp_operations +#: view:mrp_operations.operation.code:0 +msgid "Production Operation Code" +msgstr "" + +#. module: mrp_operations +#: field:mrp.production.workcenter.line,date_planned:0 +msgid "Scheduled Date" +msgstr "अनुसूचित तिथि" + +#. module: mrp_operations +#: model:process.transition,note:mrp_operations.process_transition_productionstart0 +msgid "From production order, create the workorder" +msgstr "उत्पादन से आदेश, कार्य आदेश बनाने के लिए" + +#. module: mrp_operations +#: view:mrp.production.workcenter.line:0 +msgid "Hours by Workcenter" +msgstr "" + +#. module: mrp_operations +#: help:mrp.production,allow_reorder:0 +msgid "" +"Check this to be able to move independently all production orders, without " +"moving dependent ones." +msgstr "" + +#. module: mrp_operations +#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action +#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_action +msgid "All Work Orders" +msgstr "सभी कार्य आदेश" + +#. module: mrp_operations +#: rml:mrp.code.barcode:0 +msgid "(" +msgstr "" + +#. module: mrp_operations +#: view:mrp.production.workcenter.line:0 +msgid "Product to Produce" +msgstr "" + +#. module: mrp_operations +#: model:ir.actions.report.xml,name:mrp_operations.report_wc_barcode +msgid "Workcenters Barcode" +msgstr "कार्य केंद्र बारकोड" + +#. module: mrp_operations +#: model:process.node,note:mrp_operations.process_node_doneoperation0 +#: model:process.transition,note:mrp_operations.process_transition_startdoneoperation0 +msgid "Operation is done" +msgstr "ऑपरेशन पूरा हो गया है" + +#. module: mrp_operations +#: view:mrp.production.workcenter.line:0 +msgid "Planned Date" +msgstr "" + +#. module: mrp_operations +#: selection:mrp.production.workcenter.line,production_state:0 +msgid "Ready to Produce" +msgstr "Ready to Produce" + +#. module: mrp_operations +#: view:mrp.production.workcenter.line:0 +#: selection:mrp_operations.operation.code,start_stop:0 +msgid "Cancel" +msgstr "रद्द करना" + +#. module: mrp_operations +#: view:mrp.production.workcenter.line:0 +#: selection:mrp.production.workcenter.line,state:0 +msgid "Finished" +msgstr "समाप्त" + +#. module: mrp_operations +#: field:mrp.production,allow_reorder:0 +msgid "Free Serialisation" +msgstr "नि: शुल्क Serialisation" + +#. module: mrp_operations +#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_planning +#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_draft_action_planning +msgid "Work Orders Planning" +msgstr "कार्य योजना के आदेश" + +#. module: mrp_operations +#: model:process.node,name:mrp_operations.process_node_productionorder0 +msgid "Production Order" +msgstr "उत्पादन के आदेश" + +#. module: mrp_operations +#: model:process.node,note:mrp_operations.process_node_productionorder0 +msgid "Production order for any products" +msgstr "किसी भी उत्पाद के लिए उत्पादन के आदेश" + +#. module: mrp_operations +#: field:stock.move,move_dest_id_lines:0 +msgid "Children Moves" +msgstr "" + +#. module: mrp_operations +#: field:mrp_operations.operation.code,name:0 +msgid "Operation Name" +msgstr "संचालन नाम" + +#. module: mrp_operations +#: model:ir.model,name:mrp_operations.model_mrp_operations_operation +msgid "mrp_operations.operation" +msgstr "" + +#. module: mrp_operations +#: field:mrp.production.workcenter.line,date_finnished:0 +#: field:mrp.production.workcenter.line,date_planned_end:0 +#: field:mrp_operations.operation,date_finished:0 +msgid "End Date" +msgstr "आखिरी दिनांक" + +#. module: mrp_operations +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "संरचना देखने के लिए अमान्य XML!" + +#. module: mrp_operations +#: view:mrp.production.workcenter.line:0 +msgid "Real" +msgstr "वास्तविक" + +#. module: mrp_operations +#: model:ir.module.module,shortdesc:mrp_operations.module_meta_information +msgid "Workcenter Production start end workflow" +msgstr "Workcenter उत्पादन आरंभ और अंत कार्यप्रवाह" + +#. module: mrp_operations +#: help:mrp.production.workcenter.line,delay:0 +msgid "This is delay between operation start and stop in this workcenter" +msgstr "" + +#. module: mrp_operations +#: field:mrp.production.workcenter.line,product:0 +msgid "Product" +msgstr "उत्पाद" + +#. module: mrp_operations +#: model:process.transition,note:mrp_operations.process_transition_workstartoperation0 +msgid "From work order, define the cycles and hour for creating product" +msgstr "" + +#. module: mrp_operations +#: field:mrp.production.workcenter.line,delay:0 +msgid "Working Hours" +msgstr "कार्य घंटे" + +#. module: mrp_operations +#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_draft_action +#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_draft_action +msgid "Future Work Orders" +msgstr "भविष्य के कार्य आदेश" + +#. module: mrp_operations +#: field:mrp.production.workcenter.line,production_state:0 +msgid "Prod.State" +msgstr "" + +#. module: mrp_operations +#: field:mrp_operations.operation,order_date:0 +msgid "Order Date" +msgstr "आदेश की तिथि" + +#. module: mrp_operations +#: model:process.node,note:mrp_operations.process_node_workorder0 +msgid "Production Work Center" +msgstr "उत्पादन कार्य केंद्र" + +#. module: mrp_operations +#: model:process.transition,name:mrp_operations.process_transition_productionstart0 +msgid "Production start Operation" +msgstr "उत्पादन ऑपरेशन शुरू" + +#. module: mrp_operations +#: selection:mrp.production.workcenter.line,production_state:0 +msgid "Packing Exception" +msgstr "पैकिंग अपवाद" + +#. module: mrp_operations +#: field:mrp_operations.operation,workcenter_id:0 +msgid "Workcenter" +msgstr "Work center" + +#. module: mrp_operations +#: field:mrp.production.workcenter.line,date_start:0 +#: field:mrp.production.workcenter.line,date_start_date:0 +#: field:mrp_operations.operation,date_start:0 +msgid "Start Date" +msgstr "प्रारंभ दिनांक" + +#. module: mrp_operations +#: model:ir.model,name:mrp_operations.model_mrp_operations_operation_code +msgid "mrp_operations.operation.code" +msgstr "" + +#. module: mrp_operations +#: model:ir.actions.act_window,name:mrp_operations.mrp_production_operation_action +#: view:mrp.production.workcenter.line:0 +msgid "Operations" +msgstr "संचालन" + +#. module: mrp_operations +#: field:mrp_operations.operation,code_id:0 +#: field:mrp_operations.operation.code,code:0 +msgid "Code" +msgstr "कोड" + +#. module: mrp_operations +#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_confirm_action +msgid "Confirmed Work Orders" +msgstr "काम के आदेश की पुष्टि की" + +#. module: mrp_operations +#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_confirm_action +msgid "Work Orders to Do" +msgstr "" + +#. module: mrp_operations +#: model:process.node,name:mrp_operations.process_node_canceloperation0 +msgid "Cancel Operation" +msgstr "संचालन रद्द" + +#. module: mrp_operations +#: model:process.transition,name:mrp_operations.process_transition_workstartoperation0 +msgid "Work start Operation" +msgstr "कार्य संचालन शुरू" + +#. module: mrp_operations +#: model:ir.actions.report.xml,name:mrp_operations.report_code_barcode +msgid "Start/Stop Barcode" +msgstr "शुरू /बंद बारकोड" + +#. module: mrp_operations +#: view:mrp.production.workcenter.line:0 +#: selection:mrp_operations.operation.code,start_stop:0 +msgid "Resume" +msgstr "पुनरारंभ" + +#. module: mrp_operations +#: model:process.node,name:mrp_operations.process_node_doneoperation0 +msgid "Done Operation" +msgstr "" + +#. module: mrp_operations +#: field:mrp.production.workcenter.line,qty:0 +msgid "Qty" +msgstr "मात्रा" + +#. module: mrp_operations +#: rml:mrp.code.barcode:0 +msgid ")" +msgstr "" + +#. module: mrp_operations +#: view:mrp_operations.operation:0 +msgid "Production Operation" +msgstr "" + +#. module: mrp_operations +#: selection:mrp.production.workcenter.line,production_state:0 +#: selection:mrp_operations.operation.code,start_stop:0 +msgid "Done" +msgstr "" + +#. module: mrp_operations +#: selection:mrp.production.workcenter.line,production_state:0 +msgid "Waiting Goods" +msgstr "" + +#. module: mrp_operations +#: view:mrp.production.workcenter.line:0 +msgid "Duration" +msgstr "" + +#. module: mrp_operations +#: selection:mrp.production.workcenter.line,production_state:0 +#: selection:mrp.production.workcenter.line,state:0 +msgid "Draft" +msgstr "" + +#. module: mrp_operations +#: model:process.node,note:mrp_operations.process_node_canceloperation0 +#: model:process.transition,note:mrp_operations.process_transition_startcanceloperation0 +msgid "Operation is cancelled" +msgstr "" + +#. module: mrp_operations +#: selection:mrp.production.workcenter.line,production_state:0 +#: selection:mrp.production.workcenter.line,state:0 +msgid "Canceled" +msgstr "" + +#. module: mrp_operations +#: view:mrp.production.workcenter.line:0 +msgid "Start working" +msgstr "" diff --git a/addons/product/i18n/vi.po b/addons/product/i18n/vi.po index a2c65299744..ac596518e54 100644 --- a/addons/product/i18n/vi.po +++ b/addons/product/i18n/vi.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-14 03:42+0000\n" +"X-Launchpad-Export-Date: 2010-06-15 03:33+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: product diff --git a/addons/stock/i18n/nl.po b/addons/stock/i18n/nl.po index b3085199524..445249906e7 100644 --- a/addons/stock/i18n/nl.po +++ b/addons/stock/i18n/nl.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-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-17 10:48+0000\n" -"Last-Translator: Marcel van der Boom (HS-Development BV) \n" +"PO-Revision-Date: 2010-06-14 13:39+0000\n" +"Last-Translator: Marcel van der Boom (HS-Development BV) \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-04-17 03:55+0000\n" +"X-Launchpad-Export-Date: 2010-06-15 03:33+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: stock @@ -44,13 +44,13 @@ msgstr "terp-account" #. module: stock #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Ongeldige modelnaam in de definitie van de actie." #. module: stock #: model:ir.module.module,shortdesc:stock.module_meta_information #: model:ir.ui.menu,name:stock.menu_stock_root msgid "Inventory Management" -msgstr "" +msgstr "Voorraadbeheer" #. module: stock #: selection:stock.location,icon:0 @@ -70,7 +70,7 @@ msgstr "STOCK_MEDIA_FORWARD" #. module: stock #: rml:lot.location:0 msgid "Total :" -msgstr "" +msgstr "Totaal :" #. module: stock #: selection:stock.location,icon:0 @@ -81,7 +81,7 @@ msgstr "STOCK_ZOOM_100" #: rml:lot.stock.overview:0 #: rml:lot.stock.overview_all:0 msgid "UoM" -msgstr "" +msgstr "Meeteenheid" #. module: stock #: model:ir.actions.wizard,name:stock.return_picking @@ -109,7 +109,7 @@ msgstr "Paklijst" #: rml:lot.stock.overview:0 #: rml:lot.stock.overview_all:0 msgid "Amount" -msgstr "" +msgstr "Hoeveelheid" #. module: stock #: view:stock.picking:0 @@ -141,8 +141,7 @@ msgstr "Relatie" #. module: stock #: help:product.product,track_incoming:0 msgid "Force to use a Production Lot during receptions" -msgstr "" -"Forceer om een productie-eenheid te gebruiken tijdens goederenontvangst." +msgstr "Forceer het gebruik van een batchnummer bij goederenontvangst" #. module: stock #: field:stock.move,move_history_ids:0 @@ -155,7 +154,7 @@ msgstr "Notatie" #: field:stock.production.lot.revision,lot_id:0 #: field:stock.report.prodlots,prodlot_id:0 msgid "Production lot" -msgstr "Seriegrootte" +msgstr "Batchnummer" #. module: stock #: selection:stock.location,icon:0 @@ -306,7 +305,7 @@ msgstr "STOCK_FLOPPY" #. module: stock #: view:stock.production.lot.revision:0 msgid "Production Lot Revisions" -msgstr "Herziening productie-eenheden" +msgstr "Batchnummer herzieningen" #. module: stock #: view:stock.location:0 @@ -371,7 +370,7 @@ msgstr "Leveringslocatie" #: model:ir.actions.act_window,name:stock.action_production_lot_form #: model:ir.ui.menu,name:stock.menu_action_production_lot_form msgid "Production Lots" -msgstr "Productie-eenheden" +msgstr "Batchnummers" #. module: stock #: rml:stock.picking.list:0 @@ -425,9 +424,7 @@ msgstr "Locatieadres" #. module: stock #: help:stock.move,prodlot_id:0 msgid "Production lot is used to put a serial number on the production" -msgstr "" -"Productie-eenheid wordt gebruikt om een serienummer aan de productie toe te " -"voegen." +msgstr "Batchnummers worden gebruikt om productie-eenheden te identificeren." #. module: stock #: model:stock.location,name:stock.stock_location_13 @@ -493,8 +490,7 @@ msgstr "Voorraadlocatie" #. module: stock #: help:product.product,track_production:0 msgid "Force to use a Production Lot during production order" -msgstr "" -"Forceer deze op een productie-eenheid te gebruiken tijdens de productieorder" +msgstr "Forceer het gebruik van een batchnummer bij productieorders" #. module: stock #: selection:stock.location,icon:0 @@ -537,7 +533,7 @@ msgstr "Leveringskalender" #. module: stock #: field:product.product,track_incoming:0 msgid "Track Incomming Lots" -msgstr "Traceer inkomende pakketten" +msgstr "Traceer binnenkomende batches" #. module: stock #: model:ir.actions.act_window,name:stock.act_stock_product_location_open @@ -552,7 +548,7 @@ msgstr "STOCK_SAVE_AS" #. module: stock #: model:ir.model,name:stock.model_stock_report_prodlots msgid "Stock report by production lots" -msgstr "Voorraadrapport met productie-eenheden" +msgstr "Voorraadrapport met batchnummers" #. module: stock #: field:stock.location,stock_virtual:0 @@ -598,7 +594,7 @@ msgstr "Nieuw ontvangstbon aanmaken" #. module: stock #: wizard_field:stock.move.track,init,quantity:0 msgid "Quantity per lot" -msgstr "Aantal per eenheid" +msgstr "Aantal per batch" #. module: stock #: model:ir.actions.act_window,name:stock.action_move_form2 @@ -661,7 +657,7 @@ msgstr "Verwachte verzenddatum" #. module: stock #: rml:stock.picking.list:0 msgid "Shipping Address :" -msgstr "" +msgstr "Afleveradres :" #. module: stock #: view:stock.tracking:0 @@ -727,7 +723,7 @@ msgstr "Van" #. module: stock #: rml:stock.picking.list:0 msgid "weight" -msgstr "" +msgstr "gewicht" #. module: stock #: rml:stock.picking.list:0 @@ -742,7 +738,7 @@ msgstr "Factuurcontrole" #. module: stock #: model:ir.model,name:stock.model_stock_production_lot_revision msgid "Production lot revisions" -msgstr "Heroverweeg productie-eenheden" +msgstr "Batchnummer herzieningen" #. module: stock #: view:stock.picking:0 @@ -1554,7 +1550,7 @@ msgstr "Revisiedatum" #. module: stock #: rml:stock.picking.list:0 msgid "Lot" -msgstr "Overdoos" +msgstr "Batch" #. module: stock #: wizard_view:inventory.merge.stock.zero,init:0 @@ -1628,7 +1624,7 @@ msgstr "Leveringsvoorwaarden" #: rml:lot.stock.overview:0 #: rml:lot.stock.overview_all:0 msgid "Total:" -msgstr "" +msgstr "Totaal:" #. module: stock #: selection:stock.location,icon:0 @@ -1731,7 +1727,7 @@ msgstr "Magazijnen" #. module: stock #: help:product.product,track_outgoing:0 msgid "Force to use a Production Lot during deliveries" -msgstr "Forceer om productie-eenheiden te gebruiken om te leveren" +msgstr "Forceer het gebruik van batchnummers bij leveringen" #. module: stock #: view:stock.picking:0 @@ -1790,7 +1786,7 @@ msgstr "Product eenh." #: rml:lot.stock.overview:0 #: rml:lot.stock.overview_all:0 msgid "Variants" -msgstr "" +msgstr "Varianten" #. module: stock #: field:stock.location,posx:0 @@ -1870,7 +1866,7 @@ msgstr "STOCK_MEDIA_PAUSE" #. module: stock #: view:product.product:0 msgid "Lots" -msgstr "Aantallen" +msgstr "Batches" #. module: stock #: selection:stock.picking,move_type:0 @@ -1880,7 +1876,7 @@ msgstr "Allen te gelijk" #. module: stock #: field:product.product,track_outgoing:0 msgid "Track Outging Lots" -msgstr "Uitgaande voorraadeenheden" +msgstr "Traceer uitgaande batches" #. module: stock #: model:ir.actions.act_window,name:stock.action_stock_line_date @@ -1903,7 +1899,7 @@ msgstr "STOCK_FIND" #. module: stock #: view:stock.inventory:0 msgid "Lot Inventory" -msgstr "Partijvoorraad" +msgstr "Batchvoorraad" #. module: stock #: help:stock.location,chained_auto_packing:0 @@ -2088,7 +2084,7 @@ msgstr "terp-project" #: model:ir.ui.menu,name:stock.menu_stock_report_prodlots #: view:stock.report.prodlots:0 msgid "Stock by Lots" -msgstr "In voorraad per verpakkingseenheid" +msgstr "Voorraad per batch" #. module: stock #: field:stock.move,auto_validate:0 @@ -2199,7 +2195,7 @@ msgstr "STOCK_REVERT_TO_SAVED" #. module: stock #: field:product.product,track_production:0 msgid "Track Production Lots" -msgstr "Traceerd productie-eenheden" +msgstr "Traceer productiebatches" #. module: stock #: view:stock.picking:0 @@ -2232,7 +2228,7 @@ msgstr "stock.picking.move.wizard" #: field:stock.move,prodlot_id:0 #: view:stock.production.lot:0 msgid "Production Lot" -msgstr "Productie-eenheid." +msgstr "Productie batch" #. module: stock #: model:ir.ui.menu,name:stock.menu_traceability diff --git a/addons/stock/i18n/pl.po b/addons/stock/i18n/pl.po index 117d90e683a..c1d33bc694d 100644 --- a/addons/stock/i18n/pl.po +++ b/addons/stock/i18n/pl.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-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-06-13 15:17+0000\n" +"PO-Revision-Date: 2010-06-14 14:56+0000\n" "Last-Translator: Grzegorz Grzelak (Cirrus.pl) \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-06-14 03:42+0000\n" +"X-Launchpad-Export-Date: 2010-06-15 03:33+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: stock @@ -86,7 +86,7 @@ msgstr "JM" #. module: stock #: model:ir.actions.wizard,name:stock.return_picking msgid "Return packing" -msgstr "Lista przesunięć zwrotnych" +msgstr "Zwrot" #. module: stock #: field:product.category,property_stock_journal:0 @@ -103,7 +103,7 @@ msgstr "Wypełnij inwentaryzację dla podanej strefy mag." #: view:stock.picking:0 #: field:stock.picking.move.wizard,picking_id:0 msgid "Packing list" -msgstr "Lista przesunięć" +msgstr "Pobranie" #. module: stock #: rml:lot.stock.overview:0 @@ -206,7 +206,7 @@ msgstr "Wykonaj paczkę (przesunięcie)" #. module: stock #: wizard_view:stock.partial_picking,end2:0 msgid "Packing result" -msgstr "Rezultat listy przesunięć" +msgstr "Rezultat pobrania" #. module: stock #: selection:stock.location,icon:0 @@ -708,7 +708,7 @@ msgstr "terp-stock" #. module: stock #: rml:stock.picking.list:0 msgid "Packing List:" -msgstr "Lista przesunięć:" +msgstr "Pobranie:" #. module: stock #: selection:stock.location,icon:0 @@ -748,7 +748,7 @@ msgstr "Wersja partii produkcyjnej" #. module: stock #: view:stock.picking:0 msgid "Packing Done" -msgstr "Listę przesunięć wykonano" +msgstr "Pobranie wykonane" #. module: stock #: selection:stock.move,state:0 @@ -762,7 +762,7 @@ msgstr "Oczekiwanie" #: model:ir.ui.menu,name:stock.menu_action_picking_tree7 #: model:ir.ui.menu,name:stock.menu_picking_waiting msgid "Available Packing" -msgstr "Dostępne listy przesunięć" +msgstr "Dostępne pobrania" #. module: stock #: model:ir.model,name:stock.model_stock_warehouse @@ -815,7 +815,7 @@ msgstr "" #: model:ir.ui.menu,name:stock.menu_action_picking_all #: wizard_field:stock.picking.make,init,pickings:0 msgid "Packing" -msgstr "Listy przesunięć" +msgstr "Pobrania" #. module: stock #: selection:stock.location,icon:0 @@ -988,7 +988,7 @@ msgstr "" #. module: stock #: wizard_view:stock.partial_picking,end2:0 msgid "The packing has been successfully made !" -msgstr "Lista przesunięć zostało poprawnie wykonana !" +msgstr "Pobranie wykonano poprawnie !" #. module: stock #: field:stock.move,address_id:0 @@ -1158,13 +1158,13 @@ msgstr "" #. module: stock #: view:stock.picking:0 msgid "Input Packing List" -msgstr "Lista przesunięć wchodzących" +msgstr "Przyjęcie zewnętrzne" #. module: stock #: model:ir.model,name:stock.model_stock_picking #: field:stock.move,picking_id:0 msgid "Packing List" -msgstr "Lista przesunięć" +msgstr "Pobranie" #. module: stock #: selection:stock.location,icon:0 @@ -1205,7 +1205,7 @@ msgstr "" #. module: stock #: selection:stock.picking,invoice_state:0 msgid "Not from Packing" -msgstr "Nie z listy przesunięć" +msgstr "Nie z pobrania" #. module: stock #: view:stock.location:0 @@ -1299,7 +1299,7 @@ msgstr "Metoda dostawy" #. module: stock #: model:ir.actions.wizard,name:stock.partial_picking msgid "Partial packing" -msgstr "Częściowa lista przesunięć" +msgstr "Pobranie częściowe" #. module: stock #: selection:stock.location,icon:0 @@ -1370,7 +1370,7 @@ msgstr "Strefa magazynowa" #. module: stock #: field:stock.picking,invoice_state:0 msgid "Invoice Status" -msgstr "Stan faktury" +msgstr "Fakturowanie" #. module: stock #: rml:lot.location:0 @@ -1572,7 +1572,7 @@ msgstr "Ilość (JS)" #: model:ir.actions.act_window,name:stock.action_picking_tree5 #: model:ir.ui.menu,name:stock.menu_action_picking_tree5 msgid "Packing to Process" -msgstr "Listy przesunięć do obróbki" +msgstr "Pobrania do wykonania" #. module: stock #: selection:stock.location,icon:0 @@ -1588,12 +1588,12 @@ msgstr "Ustaw jako dostępne" #: model:ir.actions.wizard,name:stock.make_picking #: wizard_view:stock.picking.make,init:0 msgid "Make packing" -msgstr "Wykonaj listę przesunięć" +msgstr "Wykonaj pobranie" #. module: stock #: field:stock.picking,backorder_id:0 msgid "Back Order" -msgstr "Zamówienie zaległe" +msgstr "Pobranie częściowe" #. module: stock #: selection:stock.location,icon:0 @@ -1770,7 +1770,7 @@ msgstr "Zwrot" #. module: stock #: field:stock.picking,auto_picking:0 msgid "Auto-Packing" -msgstr "Auto-przesunięcie" +msgstr "Auto-pobranie" #. module: stock #: field:stock.move,product_uos:0 @@ -2172,7 +2172,7 @@ msgstr "" #: model:ir.ui.menu,name:stock.menu_action_picking_tree3 #: model:ir.ui.menu,name:stock.menu_action_picking_tree8 msgid "Confirmed Packing Waiting Availability" -msgstr "Potwierdzone listy przesunięć oczekujące na dostępność" +msgstr "Potwierdzone pobrania oczekujące na dostępność" #. module: stock #: field:stock.location,posy:0 @@ -2257,7 +2257,7 @@ msgstr "Data zamówienia" #. module: stock #: selection:stock.invoice_onshipping,init,type:0 msgid "Supplier Invoice" -msgstr "Faktura dostawcy" +msgstr "Faktura od dostawcy" #. module: stock #: model:ir.actions.act_window,name:stock.action_location_form From 0f3b579a54684ac68f156d36ac8a311ff74bb684 Mon Sep 17 00:00:00 2001 From: Dhara Date: Tue, 15 Jun 2010 11:34:21 +0530 Subject: [PATCH 5/6] [FIX][IMP] email_template view and preview button for wi bzr revid: dhara@dhara-laptop-20100615060421-3346bwibul6kf2ig --- addons/email_template/email_template_view.xml | 20 ++--- .../marketing_campaign/marketing_campaign.py | 87 +++++++++++-------- .../marketing_campaign_view.xml | 2 +- 3 files changed, 62 insertions(+), 47 deletions(-) diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml index 0faa28e042f..934a7324b07 100644 --- a/addons/email_template/email_template_view.xml +++ b/addons/email_template/email_template_view.xml @@ -20,19 +20,17 @@ - - - - - + + + + + + + - -