From fd9fcd3ac77229ccf7e0d391ada83975860a4910 Mon Sep 17 00:00:00 2001 From: skh Date: Wed, 6 Apr 2011 12:27:36 +0530 Subject: [PATCH 01/12] [FIX] [PS] List view of leaves type contains different fields as the form view lp bug: https://launchpad.net/bugs/751299 fixed bzr revid: skh@tinyerp.com-20110406065736-944f5id53aesdf8b --- addons/hr_holidays/hr_holidays_view.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index 7740470ccc7..2eb58504275 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -361,6 +361,12 @@ + + + + + + From a45a076aba0842e838bb1368d1c0d930ee406f0f Mon Sep 17 00:00:00 2001 From: skh Date: Wed, 6 Apr 2011 12:55:20 +0530 Subject: [PATCH 02/12] [FIX] [PS] List view of leaves type contains different fields as the form view lp bug: https://launchpad.net/bugs/751299 fixed bzr revid: skh@tinyerp.com-20110406072520-vd8qj7iphmzkry3r --- addons/hr_holidays/hr_holidays_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index 2eb58504275..3de7a254f01 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -361,7 +361,7 @@ - + From 0f3d174ff241cd624cadef577918927cb939469f Mon Sep 17 00:00:00 2001 From: skh Date: Wed, 6 Apr 2011 15:29:19 +0530 Subject: [PATCH 03/12] [FIX] [PS] List view of leaves type contains different fields as the form view lp bug: https://launchpad.net/bugs/751299 fixed bzr revid: skh@tinyerp.com-20110406095919-rsp0rzugqglp901b --- addons/hr_holidays/hr_holidays_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index 3de7a254f01..3f3a79c45cd 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -361,8 +361,8 @@ - - + + From 309493382d2105996982acaffa524255be1cb421 Mon Sep 17 00:00:00 2001 From: skh Date: Thu, 21 Apr 2011 12:09:36 +0530 Subject: [PATCH 04/12] [FIX] [PS] List view of leaves type contains different fields as the form view lp bug: https://launchpad.net/bugs/751299 fixed bzr revid: skh@tinyerp.com-20110421063936-a2k70vufxdvt3efm --- addons/hr_holidays/hr_holidays_view.xml | 28 +++++++++++++++---------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index 3f3a79c45cd..1fb5ac5e7ae 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -361,12 +361,6 @@ - - - - - - @@ -396,7 +390,19 @@ - + + hr.holidays.status.leave.type.tree + hr.holidays.status + tree + + + + + + + + + hr.holidays.status.search hr.holidays.status @@ -408,19 +414,19 @@ - + Leave Type ir.actions.act_window hr.holidays.status form tree,form - + - + - + Date: Thu, 21 Apr 2011 12:50:31 +0530 Subject: [PATCH 05/12] [FIX] [PS] List view of leaves type contains different fields as the form view lp bug: https://launchpad.net/bugs/751299 fixed bzr revid: skh@tinyerp.com-20110421072031-r6l3uxk91bewcfrk --- addons/hr_holidays/hr_holidays_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index 1fb5ac5e7ae..25d0deff9a4 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -394,7 +394,7 @@ hr.holidays.status.leave.type.tree hr.holidays.status tree - + 10 From c6cc93fcb0a3987c47d87038dbda6fdeff9da97f Mon Sep 17 00:00:00 2001 From: skh Date: Thu, 21 Apr 2011 17:42:26 +0530 Subject: [PATCH 06/12] [FIX] [PS] List view of leaves type contains different fields as the form view lp bug: https://launchpad.net/bugs/751299 fixed bzr revid: skh@tinyerp.com-20110421121226-40h4sahiuoydnjgt --- addons/hr_holidays/hr_holidays_view.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index 25d0deff9a4..7ba9df629f3 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -390,8 +390,8 @@ - - hr.holidays.status.leave.type.tree + + hr.holidays.status.normal.tree hr.holidays.status tree 10 @@ -421,7 +421,7 @@ hr.holidays.status form tree,form - + From fb7a13668cce24b9cd8ffe2d50f79cc219da7df1 Mon Sep 17 00:00:00 2001 From: "AVP(Axelor)" <> Date: Fri, 29 Apr 2011 14:21:45 +0530 Subject: [PATCH 07/12] [REF] code improvement bzr revid: amp@tinyerp.com-20110429085145-ybql99jhrk5fdxqf --- openerp/osv/osv.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/openerp/osv/osv.py b/openerp/osv/osv.py index 7dbc8c71cc6..23e67b00334 100644 --- a/openerp/osv/osv.py +++ b/openerp/osv/osv.py @@ -239,10 +239,7 @@ class osv_pool(object): if name in self.obj_pool: del self.obj_pool[name] self.obj_pool[name] = obj_inst - - module = str(obj_inst.__class__)[6:] - module = module[:len(module)-1] - module = module.split('.')[0][2:] + module = obj_inst.__class__.__module__.split('.')[0] self.module_object_list.setdefault(module, []).append(obj_inst) # Return None if object does not exist @@ -265,9 +262,7 @@ class osv_base(object): super(osv_base, self).__init__(cr) def __new__(cls): - module = str(cls)[6:] - module = module[:len(module)-1] - module = module.split('.')[0][2:] + module = cls.__module__.split('.')[0] if not hasattr(cls, '_module'): cls._module = module module_class_list.setdefault(cls._module, []).append(cls) From 6eb80b96efe419482a7a83fb8614d2ed632e0cf6 Mon Sep 17 00:00:00 2001 From: "Harry (OpenERP)" Date: Tue, 3 May 2011 18:41:17 +0530 Subject: [PATCH 08/12] [FIX] base_calendar: regression on unlink_events method. bzr revid: hmo@tinyerp.com-20110503131117-kam00efh31ql7nwg --- addons/base_calendar/base_calendar.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index a0275cada4e..bfcccb3dfe0 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -982,7 +982,7 @@ class calendar_event(osv.osv): """ if context is None: context = {} - cr.execute('select id from %s where recurrent_uid in %s', (self._table, tuple(ids),)) + cr.execute('select id from '+self._table+' where recurrent_uid in %s', (tuple(ids),)) r_ids = map(lambda x: x[0], cr.fetchall()) self.unlink(cr, uid, r_ids, context=context) return True From e439a15f5887b78a82fa745f744715b5395fe85c Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Wed, 4 May 2011 04:36:39 +0000 Subject: [PATCH 09/12] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20110504043639-opizoisi4324m60y --- addons/account/i18n/pt_BR.po | 30 +- addons/stock/i18n/zh_CN.po | 287 ++-- addons/stock_invoice_directly/i18n/zh_CN.po | 14 +- addons/stock_no_autopicking/i18n/zh_CN.po | 25 +- addons/stock_planning/i18n/zh_CN.po | 1513 +++++++++++++++++++ 5 files changed, 1712 insertions(+), 157 deletions(-) create mode 100644 addons/stock_planning/i18n/zh_CN.po diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po index 0ece2f8232d..a1abf106de4 100644 --- a/addons/account/i18n/pt_BR.po +++ b/addons/account/i18n/pt_BR.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-05-01 19:01+0000\n" +"PO-Revision-Date: 2011-05-04 03:16+0000\n" "Last-Translator: Emerson \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: 2011-05-02 04:37+0000\n" +"X-Launchpad-Export-Date: 2011-05-04 04:36+0000\n" "X-Generator: Launchpad (build 12758)\n" #. module: account @@ -5759,7 +5759,7 @@ msgstr "" #: code:addons/account/invoice.py:997 #, python-format msgid "Invoice '%s' is validated." -msgstr "" +msgstr "A fatura '%s' está validada." #. module: account #: view:account.chart.template:0 @@ -7119,6 +7119,9 @@ msgid "" "will be added, Loss : Amount will be deducted.), Which is calculated from " "Profit & Loss Report" msgstr "" +"Essa conta é usada para a transferência de Lucro/Perdas (se for lucro: O " +"valor será adicionado, Perda: O valor será deduzido), que é calculado a " +"partir de Relatório de Lucos e Perdas" #. module: account #: view:account.invoice.line:0 @@ -8042,6 +8045,10 @@ msgid "" "sales orders or deliveries. You should only confirm them before sending them " "to your customers." msgstr "" +"Com as Faturas de Clientes você pode criar e gerenciar notas de vendas " +"emitidas para seus clientes. O OpenERP pode também gerar faturas provisórias " +"automaticamente a partir de pedidos de venda ou entregas. Você deve apenas " +"confirma-las antes de enviar para os seus clientes." #. module: account #: view:account.entries.report:0 @@ -8087,7 +8094,7 @@ msgstr "Subtotal" #. module: account #: view:account.vat.declaration:0 msgid "Print Tax Statement" -msgstr "" +msgstr "Imprimir Declaração de Imposto" #. module: account #: view:account.model.line:0 @@ -8436,6 +8443,9 @@ msgid "" "the amount of this case into its parent. For example, set 1/-1 if you want " "to add/substract it." msgstr "" +"Você pode especificar o coeficiente que será usado para consolidação do " +"valor desta taxa no seu item pai. Por exemplo, defina 1/-1 se quiser " +"adicionar/subtrair o valor." #. module: account #: view:account.invoice:0 @@ -8832,6 +8842,12 @@ msgid "" "closed or left open depending on your company's activities over a specific " "period." msgstr "" +"Aqui você pode definir um período financeiro, ou seja, um intervalo de tempo " +"no ano fiscal da sua empresa. Um período contábil é normalmente um mês ou um " +"quadrimestre. Ele geralmente corresponde ao período de declaração de " +"impostos. Crie e administre os períodos a partir daqui e decida se um " +"período deve ser fechado ou deixado aberto dependendo das atividades da sua " +"empresa sobre um período específico." #. module: account #: report:account.move.voucher:0 @@ -9512,7 +9528,7 @@ msgstr "JNRL" #. module: account #: view:account.payment.term.line:0 msgid " value amount: 0.02" -msgstr "" +msgstr " valor total: 0.02" #. module: account #: view:account.fiscalyear:0 @@ -9606,7 +9622,7 @@ msgstr "Criar períodos mensais" #. module: account #: field:account.tax.code.template,sign:0 msgid "Sign For Parent" -msgstr "" +msgstr "Sinal Para o Pai" #. module: account #: model:ir.model,name:account.model_account_balance_report @@ -9623,6 +9639,8 @@ msgstr "Demonstrativos provisórios" msgid "" "Manual or automatic creation of payment entries according to the statements" msgstr "" +"Criação manual ou automática dos lançamentos de pagamento de acordo com a " +"declaração" #. module: account #: view:account.invoice:0 diff --git a/addons/stock/i18n/zh_CN.po b/addons/stock/i18n/zh_CN.po index 11b4607c771..0d5a4605549 100644 --- a/addons/stock/i18n/zh_CN.po +++ b/addons/stock/i18n/zh_CN.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-05-02 20:45+0000\n" +"PO-Revision-Date: 2011-05-03 13:12+0000\n" "Last-Translator: openerp-china.Black Jack \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: 2011-05-03 04:39+0000\n" +"X-Launchpad-Export-Date: 2011-05-04 04:36+0000\n" "X-Generator: Launchpad (build 12758)\n" #. module: stock @@ -35,7 +35,7 @@ msgstr "产品类型“%s”没有指定科目" #. module: stock #: field:stock.location,chained_location_id:0 msgid "Chained Location If Fixed" -msgstr "如果固定为连锁仓库" +msgstr "如果固定为连锁存货地点" #. module: stock #: view:stock.inventory:0 @@ -546,7 +546,7 @@ msgid "" "buttons on the right of each line. You can filter the products to deliver by " "customer, products or sale order (using the Origin field)." msgstr "" -"您将在这列表的所有产品中选择给客户送货的产品.您可以在这直接在这列表每行最右面的按钮处理送货,您可以按客户,产品或销售订单(用源字段)等过滤产品." +"您将在这列表的所有产品中选择给客户送货的产品.您可以在这直接在这列表每行最右面的按钮处理送货,您可以按客户,产品或销售订单(用源字段)等筛选产品." #. module: stock #: model:ir.ui.menu,name:stock.menu_stock_inventory_control @@ -1083,7 +1083,7 @@ msgstr "实物盘点" msgid "" "The company the Picking List containing the chained move will belong to " "(leave empty to use the default company determination rules" -msgstr "公司的装箱单列表将适用于控制链式调拨(如果为空使用默认规则)" +msgstr "公司的装箱单列表将适用于控制连锁调拨(如果为空使用默认规则)" #. module: stock #: help:stock.location,chained_picking_type:0 @@ -1091,7 +1091,7 @@ msgid "" "Shipping Type of the Picking List that will contain the chained move (leave " "empty to automatically detect the type based on the source and destination " "locations)." -msgstr "装箱单列表的运送类型将控制链式调拨(为空为自动检测源和目标存货地点的类型)" +msgstr "装箱单列表的运送类型将控制连锁调拨(为空为自动检测来源和目标存货地点的类型)" #. module: stock #: view:stock.move.split:0 @@ -1130,7 +1130,7 @@ msgstr "欧洲客户" #. module: stock #: help:stock.location,chained_delay:0 msgid "Delay between original move and chained move in days" -msgstr "在调拨源和链式调拨间耽搁的天数" +msgstr "在来源调拨和连锁调拨间耽搁的天数" #. module: stock #: view:stock.fill.inventory:0 @@ -1146,10 +1146,10 @@ msgid "" "move has to be validated by a worker. With 'Automatic No Step Added', the " "location is replaced in the original move." msgstr "" -"只有当您选择一个链式存货地点类型.\n" +"只有当您选择一个连锁存货地点类型.\n" "\"自动调拨\"值将在创建库存调拨后将自动使当前库存值生效.\n" "\"手动操作\"库存调拨要手动确认生效.\n" -"\"自动,不增加步骤\"这存货地点是取代调拨的源." +"\"自动,不增加步骤\"这存货地点是取代调拨的来源." #. module: stock #: view:stock.production.lot:0 @@ -1446,7 +1446,7 @@ msgstr "“消耗”字段请填写一个正数" #. module: stock #: field:stock.location,chained_delay:0 msgid "Chaining Lead Time" -msgstr "链式的提前时间" +msgstr "连锁调拨的提前时间" #. module: stock #: code:addons/stock/wizard/stock_partial_move.py:85 @@ -1964,7 +1964,7 @@ msgstr "总计" msgid "" "Inventory Journal in which the chained move will be written, if the Chaining " "Type is not Transparent (no journal is used if left empty)" -msgstr "库存凭证簿在链式调拨将被记录,如果链式类型不清楚(如左为空凭证簿不记录)" +msgstr "库存凭证簿在连锁调拨将被记录,如果连锁类型不清楚(如左为空,凭证簿不记录)" #. module: stock #: view:board.board:0 @@ -2380,12 +2380,12 @@ msgstr "计量单位" #. module: stock #: selection:stock.location,chained_location_type:0 msgid "Fixed Location" -msgstr "固定库位" +msgstr "固定存货地点" #. module: stock #: selection:report.stock.move,month:0 msgid "July" -msgstr "七月" +msgstr "7月" #. module: stock #: view:report.stock.lines.date:0 @@ -2399,12 +2399,12 @@ msgid "" "specific filtering criteria. If you do frequent and partial inventories, you " "need this report in order to ensure that the stock of each product is " "controlled at least once a year." -msgstr "" +msgstr "显示您产品的最后库存并用特定的过滤规则去排序.如果您经常部分盘点,您需要确保这报表至少每年一次包含库存的所有产品." #. module: stock #: model:ir.actions.report.xml,name:stock.report_product_history msgid "Stock Level Forecast" -msgstr "库存登记预报" +msgstr "库存量预报" #. module: stock #: model:ir.model,name:stock.model_stock_journal @@ -2413,7 +2413,7 @@ msgstr "库存登记预报" #: field:stock.journal,name:0 #: field:stock.picking,stock_journal_id:0 msgid "Stock Journal" -msgstr "库存业务类型" +msgstr "库存凭证簿" #. module: stock #: selection:report.stock.inventory,location_type:0 @@ -2442,7 +2442,7 @@ msgstr "强制可用" #: model:ir.actions.act_window,name:stock.move_scrap #: view:stock.move.scrap:0 msgid "Scrap Move" -msgstr "" +msgstr "损耗调拨" #. module: stock #: code:addons/stock/wizard/stock_partial_move.py:138 @@ -2469,7 +2469,7 @@ msgstr "查看库存产品" #. module: stock #: view:stock.picking:0 msgid "Internal Picking list" -msgstr "内部分拣单列表" +msgstr "内部装箱单" #. module: stock #: view:report.stock.move:0 @@ -2535,13 +2535,13 @@ msgstr "计量单位" #, python-format msgid "" "There is no stock input account defined for this product: \"%s\" (id: %d)" -msgstr "" +msgstr "这产品 \"%s\" (id: %d)没定义入库科目:." #. module: stock #: code:addons/stock/stock.py:2302 #, python-format msgid "Can not consume a move with negative or zero quantity !" -msgstr "" +msgstr "不能生成一个负数或者为0的调拨!" #. module: stock #: field:stock.location,stock_real:0 @@ -2551,7 +2551,7 @@ msgstr "实际库存" #. module: stock #: view:stock.fill.inventory:0 msgid "Fill Inventory" -msgstr "填写盘存" +msgstr "填写盘点表" #. module: stock #: constraint:product.template:0 @@ -2566,7 +2566,7 @@ msgid "" "incoming stock moves will be posted in this account. This is the default " "value for all products in this category, it can also directly be set on each " "product." -msgstr "" +msgstr "当进行实时库存估值时,对应的所有入库调拨凭证项将记录到这科目上,它是产品分类的默认值,它能直接设定在每个产品上." #. module: stock #: field:stock.production.lot.revision,date:0 @@ -2613,7 +2613,7 @@ msgstr "联系地址：" #. module: stock #: field:stock.move,backorder_id:0 msgid "Back Order" -msgstr "订单" +msgstr "返回单" #. module: stock #: field:stock.incoterms,active:0 @@ -2658,14 +2658,14 @@ msgid "" "Incoterms are series of sales terms.They are used to divide transaction " "costs and responsibilities between buyer and seller and reflect state-of-the-" "art transportation practices." -msgstr "" +msgstr "贸易术语是一系列的销售术语,用来划分交易成本和买卖双方的责任,反映各国的习惯." #. module: stock #: help:stock.fill.inventory,recursive:0 msgid "" "If checked, products contained in child locations of selected location will " "be included as well." -msgstr "" +msgstr "如果选择,产品可选择的存货地点将包含子存货地点." #. module: stock #: field:stock.move.track,tracking_prefix:0 @@ -2675,13 +2675,13 @@ msgstr "跟踪前缀" #. module: stock #: field:stock.inventory,name:0 msgid "Inventory Reference" -msgstr "盘点单号" +msgstr "盘点表单号" #. module: stock #: code:addons/stock/stock.py:1307 #, python-format msgid "Internal picking" -msgstr "内部分拣单" +msgstr "内部装箱单" #. module: stock #: view:stock.location.product:0 @@ -2691,7 +2691,7 @@ msgstr "打开产品信息" #. module: stock #: field:stock.location.product,to_date:0 msgid "To" -msgstr "至" +msgstr "到" #. module: stock #: view:stock.move:0 @@ -2717,7 +2717,7 @@ msgid "" "(Keep empty to open the current situation. Adjust HH:MM:SS to 00:00:00 to " "filter all resources of the day for the 'From' date and 23:59:59 for the " "'To' date)" -msgstr "" +msgstr "(保持为空去打开当前状态.把所有资源的\"从\"日期调整为 HH:MM:SS为00:00:00,\"到\"日期为23:59:59)" #. module: stock #: view:product.category:0 @@ -2727,7 +2727,7 @@ msgstr "会计库存属性" #. module: stock #: model:ir.actions.act_window,name:stock.action_picking_tree_out msgid "Customers Packings" -msgstr "客户包装" +msgstr "客户装箱单" #. module: stock #: selection:report.stock.inventory,state:0 @@ -2751,7 +2751,7 @@ msgstr "更改标准价" #. module: stock #: model:stock.location,name:stock.stock_location_locations_virtual msgid "Virtual Locations" -msgstr "虚拟库位" +msgstr "虚拟存货地点" #. module: stock #: selection:stock.picking,invoice_state:0 @@ -2768,7 +2768,7 @@ msgstr "完成日期" #, python-format msgid "" "Please put a partner on the picking list if you want to generate invoice." -msgstr "如果想生成发票，请在挑选列表上填写一家业务伙伴。" +msgstr "如果想生成发票，请在装箱单上填写上业务伙伴." #. module: stock #: selection:stock.move,priority:0 @@ -2794,7 +2794,7 @@ msgstr "负责人" #. module: stock #: field:stock.move,returned_price:0 msgid "Returned product price" -msgstr "" +msgstr "退货的产品价格" #. module: stock #: model:ir.actions.act_window,name:stock.action_stock_inventory_report @@ -2806,7 +2806,7 @@ msgstr "盘点分析" #. module: stock #: field:stock.invoice.onshipping,journal_id:0 msgid "Destination Journal" -msgstr "目标业务类型" +msgstr "目标凭证簿" #. module: stock #: model:ir.actions.act_window,name:stock.act_stock_tracking_lot_2_stock_report_tracklots @@ -2873,7 +2873,7 @@ msgstr "批次重量" #: model:ir.model,name:stock.model_stock_move_consume #: view:stock.move.consume:0 msgid "Consume Products" -msgstr "" +msgstr "消耗的产品" #. module: stock #: code:addons/stock/stock.py:1646 @@ -2895,7 +2895,7 @@ msgstr "地址" #: report:lot.stock.overview:0 #: report:lot.stock.overview_all:0 msgid "Variants" -msgstr "系列型号" +msgstr "变动" #. module: stock #: field:stock.location,posx:0 @@ -2933,7 +2933,7 @@ msgstr "向导" #: model:ir.actions.act_window,name:stock.action_view_stock_location_product #: model:ir.model,name:stock.model_stock_location_product msgid "Products by Location" -msgstr "产品库位" +msgstr "产品存货地点" #. module: stock #: field:stock.fill.inventory,recursive:0 @@ -2943,7 +2943,7 @@ msgstr "包括下级" #. module: stock #: model:stock.location,name:stock.stock_location_components msgid "Shelf 1" -msgstr "架子 1" +msgstr "货架 1" #. module: stock #: model:ir.actions.act_window,help:stock.action_picking_tree6 @@ -2955,23 +2955,25 @@ msgid "" "preconfigured logistics rules, but you can also record manual stock " "operations." msgstr "" +"内部调拨显示您仓库里必须要执行的操作.所有操作都能被划分入库存凭证簿使每个员工都有自己的日志记录自己执行的操作,大多数操作系统根据您预先设置物流规则自动准" +"备,但您也可以记录手动的库存操作." #. module: stock #: view:stock.move:0 msgid "Order" -msgstr "" +msgstr "排序" #. module: stock #: field:stock.tracking,name:0 msgid "Pack Reference" -msgstr "包装单号" +msgstr "托盘编号" #. module: stock #: view:report.stock.move:0 #: field:report.stock.move,location_id:0 #: field:stock.move,location_id:0 msgid "Source Location" -msgstr "源库位" +msgstr "来源存货地点" #. module: stock #: view:product.template:0 @@ -3009,12 +3011,12 @@ msgstr "批次" #: view:stock.move:0 #: view:stock.picking:0 msgid "New pack" -msgstr "" +msgstr "新托盘" #. module: stock #: view:stock.move:0 msgid "Destination" -msgstr "目标货位" +msgstr "目标存货地点" #. module: stock #: selection:stock.picking,move_type:0 @@ -3027,13 +3029,13 @@ msgstr "全部一次性" msgid "" "Quantities, UoMs, Products and Locations cannot be modified on stock moves " "that have already been processed (except by the Administrator)" -msgstr "" +msgstr "不能修改已经处理的库存调拨的数量,计量单位,产品和存货地点.(除非是管理员)" #. module: stock #: code:addons/stock/product.py:383 #, python-format msgid "Future Productions" -msgstr "" +msgstr "未来生产" #. module: stock #: view:stock.picking:0 @@ -3050,7 +3052,7 @@ msgstr "退货明细" #: model:ir.model,name:stock.model_report_stock_lines_date #: view:report.stock.lines.date:0 msgid "Dates of Inventories" -msgstr "盘存日期" +msgstr "盘点日期" #. module: stock #: view:report.stock.move:0 @@ -3082,12 +3084,12 @@ msgstr "消息！" #: view:stock.move:0 #: view:stock.picking:0 msgid "Put in current pack" -msgstr "放入当前包装" +msgstr "放入当前的托盘" #. module: stock #: view:stock.inventory:0 msgid "Lot Inventory" -msgstr "盘存明细" +msgstr "盘点明细" #. module: stock #: view:stock.move:0 @@ -3097,7 +3099,7 @@ msgstr "原因" #. module: stock #: report:stock.picking.list:0 msgid "Delivery Order:" -msgstr "配送单：" +msgstr "送货单：" #. module: stock #: model:ir.actions.act_window,help:stock.action_production_lot_form @@ -3109,6 +3111,8 @@ msgid "" "'Available' button to get all the lots you produced, received or delivered " "to customers." msgstr "" +"这列表是您所有生产批次的记录(序号),当你选择一个批次你可以向上或向下追溯在这批次的产品.在默认情况下,这列表在您的仓库筛选可用的序号,但您能不点击\"可" +"用\"按钮去以获得您生产,收货,发货的所有批次." #. module: stock #: field:stock.location,icon:0 @@ -3182,25 +3186,25 @@ msgstr "已取消" #. module: stock #: view:stock.move:0 msgid "Picking" -msgstr "领料/提货" +msgstr "装箱单" #. module: stock #: help:stock.picking,move_type:0 msgid "It specifies goods to be delivered all at once or by direct delivery" -msgstr "" +msgstr "它指定送货是一次性交付还是直接交付." #. module: stock #: code:addons/stock/wizard/stock_invoice_onshipping.py:83 #, python-format msgid "This picking list does not require invoicing." -msgstr "" +msgstr "这装箱单不需要开发票." #. module: stock #: selection:report.stock.move,type:0 #: selection:stock.location,chained_picking_type:0 #: selection:stock.picking,type:0 msgid "Getting Goods" -msgstr "获得的货物" +msgstr "收货" #. module: stock #: help:stock.location,chained_location_type:0 @@ -3216,6 +3220,10 @@ msgid "" "* Fixed Location: The chained location is taken from the next field: Chained " "Location if Fixed." msgstr "" +"决定这存货地点是不是连锁存货地点的头,比如这存货地点接收来货然后送到连锁存货地点的下一个位置.连锁存货地点的类型包括:\n" +"* 不是: 不是连锁存货地点.\n" +"* 客户: 这连锁存货地点将来自客户的存货地点,它在装箱单指定为来源.\n" +"* 固定存货地点: 这连锁存货地点来自下一个地点." #. module: stock #: code:addons/stock/wizard/stock_inventory_merge.py:43 @@ -3243,7 +3251,7 @@ msgstr "送货单" msgid "" "This stock location will be used, instead of the default one, as the " "destination location for goods you send to this partner" -msgstr "默认作为你发送货物到业务伙伴的目标库位." +msgstr "这存货地点替代默认值作为您送货物到业务伙伴的目标存货地点." #. module: stock #: selection:report.stock.inventory,state:0 @@ -3262,7 +3270,7 @@ msgstr "确认" #. module: stock #: help:stock.location,icon:0 msgid "Icon show in hierarchical tree view" -msgstr "层次树视图显示的图标" +msgstr "树视图显示的图标" #. module: stock #: model:ir.actions.act_window,name:stock.action_view_stock_merge_inventories @@ -3284,12 +3292,12 @@ msgstr "收货：" #: help:stock.location,scrap_location:0 msgid "" "Check this box to allow using this location to put scrapped/damaged goods." -msgstr "" +msgstr "这选项确定这存货地点能不能放置废料" #. module: stock #: model:ir.actions.act_window,name:stock.act_relate_picking msgid "Related Picking" -msgstr "关联的分拣单" +msgstr "关联的装箱单" #. module: stock #: view:report.stock.move:0 @@ -3299,7 +3307,7 @@ msgstr "总出库数量" #. module: stock #: field:stock.picking,backorder_id:0 msgid "Back Order of" -msgstr "" +msgstr "退货单" #. module: stock #: help:stock.move.memory.in,cost:0 @@ -3320,7 +3328,7 @@ msgstr "产品分类" #: code:addons/stock/wizard/stock_change_product_qty.py:88 #, python-format msgid "INV: %s" -msgstr "" +msgstr "发票: %s" #. module: stock #: model:ir.ui.menu,name:stock.next_id_61 @@ -3331,12 +3339,12 @@ msgstr "报表" #: code:addons/stock/stock.py:1316 #, python-format msgid " for the " -msgstr "" +msgstr " 为了 " #. module: stock #: view:stock.split.into:0 msgid "Quantity to leave in the current pack" -msgstr "" +msgstr "在当前托盘里的数量" #. module: stock #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping @@ -3359,7 +3367,7 @@ msgstr "已存在批次" #: field:product.product,location_id:0 #: view:stock.location:0 msgid "Stock Location" -msgstr "库存库位" +msgstr "库存存货地点" #. module: stock #: help:stock.change.standard.price,new_price:0 @@ -3370,17 +3378,19 @@ msgid "" "If cost price is decreased, stock variation account will be creadited and " "stock input account will be debited." msgstr "" +"如果成本价格上升,库存变动科目将记入借方并且出库科目将记入贷方,其值是(相差的金额 * 数量).\n" +"如果成本价格下降,库存变动科目为贷方,入库科目为借方." #. module: stock #: field:stock.location,chained_journal_id:0 msgid "Chaining Journal" -msgstr "" +msgstr "连锁存货地点凭证簿" #. module: stock #: code:addons/stock/stock.py:729 #, python-format msgid "Not enough stock, unable to reserve the products." -msgstr "" +msgstr "没足够的库存没法保存产品" #. module: stock #: model:stock.location,name:stock.stock_location_customers @@ -3391,41 +3401,41 @@ msgstr "客户" #: code:addons/stock/stock.py:1320 #, python-format msgid "is cancelled." -msgstr "" +msgstr "已取消" #. module: stock #: view:stock.inventory.line:0 msgid "Stock Inventory Lines" -msgstr "库存盘存明细" +msgstr "库存盘点明细" #. module: stock #: code:addons/stock/wizard/stock_partial_picking.py:74 #, python-format msgid "Process Document" -msgstr "" +msgstr "处理方式" #. module: stock #: code:addons/stock/product.py:365 #, python-format msgid "Future Deliveries" -msgstr "" +msgstr "未来送货" #. module: stock #: view:stock.picking:0 msgid "Additional info" -msgstr "" +msgstr "备注信息" #. module: stock #: view:stock.move:0 #: field:stock.move,tracking_id:0 msgid "Pack" -msgstr "" +msgstr "托盘" #. module: stock #: view:stock.move:0 #: view:stock.picking:0 msgid "Date Expected" -msgstr "" +msgstr "日期预计" #. module: stock #: model:ir.actions.act_window,help:stock.action_picking_tree4 @@ -3434,7 +3444,7 @@ msgid "" "supplier. An incoming shipment contains a list of products to be received " "according to the original purchase order. You can validate the shipment " "totally or partially." -msgstr "" +msgstr "这来料送货列表是您将从供应商那收货的所有产品,其来自与采购订单.您能使送货单全部或部分生效." #. module: stock #: field:stock.move,auto_validate:0 @@ -3449,12 +3459,12 @@ msgstr "重量" #. module: stock #: model:ir.model,name:stock.model_product_template msgid "Product Template" -msgstr "" +msgstr "产品模板" #. module: stock #: selection:report.stock.move,month:0 msgid "December" -msgstr "" +msgstr "12月" #. module: stock #: selection:stock.location,chained_auto_packing:0 @@ -3467,29 +3477,29 @@ msgid "" "This menu gives you the full traceability of inventory operations on a " "specific product. You can filter on the product to see all the past or " "future movements for the product." -msgstr "" +msgstr "这菜单使您对指定产品追溯其全部的库存操作.您可以筛选这产品看到的过去或未来的运作." #. module: stock #: view:stock.picking:0 msgid "Return Products" -msgstr "" +msgstr "退货产品" #. module: stock #: view:stock.inventory:0 msgid "Validate Inventory" -msgstr "" +msgstr "使盘点生效" #. module: stock #: help:stock.move,price_currency_id:0 msgid "" "Technical field used to record the currency chosen by the user during a " "picking confirmation (when average price costing method is used)" -msgstr "" +msgstr "字段用于记录用户在确认装箱单时所用的货币(用在平均价格计算成本方法上)." #. module: stock #: model:ir.ui.menu,name:stock.menu_stock_products_moves msgid "Products Moves" -msgstr "货物移动" +msgstr "产品调拨" #. module: stock #: selection:stock.picking,invoice_state:0 @@ -3504,22 +3514,22 @@ msgstr "目的地址" #. module: stock #: field:stock.picking,max_date:0 msgid "Max. Expected Date" -msgstr "" +msgstr "最大预计日期" #. module: stock #: field:stock.picking,auto_picking:0 msgid "Auto-Picking" -msgstr "" +msgstr "自动装箱" #. module: stock #: model:stock.location,name:stock.stock_location_shop1 msgid "Shop 2" -msgstr "" +msgstr "货架 2" #. module: stock #: constraint:res.partner:0 msgid "Error ! You can not create recursive associated members." -msgstr "" +msgstr "错误！您不能创建递归的相关成员。" #. module: stock #: view:report.stock.inventory:0 @@ -3544,7 +3554,7 @@ msgstr "草稿" #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move #: report:stock.inventory.move:0 msgid "Stock Inventory" -msgstr "" +msgstr "库存盘点" #. module: stock #: help:report.stock.inventory,state:0 @@ -3555,63 +3565,68 @@ msgid "" " When the picking it done the state is 'Done'. \n" "The state is 'Waiting' if the move is waiting for another one." msgstr "" +"当创建库存调拨时它是\"草稿\"状态.\n" +"之后设为\"确认\"状态.\n" +"如果库存为可用状态设为\"可用\".\n" +"在装箱单完成时设为\"完成\"状态.\n" +"如果调拨时在等待其它设为\"等待\"状态." #. module: stock #: view:board.board:0 msgid "Outgoing Products Delay" -msgstr "" +msgstr "耽搁出仓的产品" #. module: stock #: field:stock.move.split.lines,use_exist:0 msgid "Existing Lot" -msgstr "" +msgstr "现有的批次" #. module: stock #: code:addons/stock/wizard/stock_return_picking.py:204 #, python-format msgid "Please specify at least one non-zero quantity!" -msgstr "" +msgstr "请指定一个不为0的数量!" #. module: stock #: help:product.template,property_stock_procurement:0 msgid "" "For the current product, this stock location will be used, instead of the " "default one, as the source location for stock moves generated by procurements" -msgstr "" +msgstr "对现有产品这库存存货地点将用来替代默认作为库存调拨产生的需求的来源存货地点." #. module: stock #: code:addons/stock/stock.py:1319 #, python-format msgid "is ready to process." -msgstr "" +msgstr "准备过程" #. module: stock #: help:stock.picking,origin:0 msgid "Reference of the document that produced this picking." -msgstr "产生此分拣单的原始单据编号。" +msgstr "产生此装箱单的原始单据编号。" #. module: stock #: field:stock.fill.inventory,set_stock_zero:0 msgid "Set to zero" -msgstr "" +msgstr "设为0." #. module: stock #: code:addons/stock/wizard/stock_invoice_onshipping.py:85 #, python-format msgid "None of these picking lists require invoicing." -msgstr "" +msgstr "不需要发票的装箱单." #. module: stock #: selection:report.stock.move,month:0 msgid "November" -msgstr "" +msgstr "11月" #. module: stock #: code:addons/stock/product.py:101 #: code:addons/stock/stock.py:1987 #, python-format msgid "There is no journal defined on the product category: \"%s\" (id: %d)" -msgstr "" +msgstr "这产品分类: \"%s\" (id: %d)没定义凭证簿." #. module: stock #: code:addons/stock/product.py:379 @@ -3622,7 +3637,7 @@ msgstr "计划外数量" #. module: stock #: field:stock.location,chained_company_id:0 msgid "Chained Company" -msgstr "" +msgstr "连锁公司" #. module: stock #: view:stock.picking:0 @@ -3632,14 +3647,14 @@ msgstr "检查可用" #. module: stock #: selection:report.stock.move,month:0 msgid "January" -msgstr "" +msgstr "1月" #. module: stock #: help:product.product,track_incoming:0 msgid "" "Forces to specify a Production Lot for all moves containing this product and " "coming from a Supplier Location" -msgstr "" +msgstr "强制为这产品的所有调拨和这供应商存货地点指定一个生产批次" #. module: stock #: model:ir.actions.act_window,name:stock.act_product_stock_move_futur_open @@ -3649,7 +3664,7 @@ msgstr "未来库存调拨" #. module: stock #: field:stock.move,move_history_ids2:0 msgid "Move History (parent moves)" -msgstr "" +msgstr "调拨日志(上级调拨)" #. module: stock #: code:addons/stock/product.py:361 @@ -3669,12 +3684,12 @@ msgstr "错误" #. module: stock #: field:stock.ups.final,xmlfile:0 msgid "XML File" -msgstr "" +msgstr "XML 文件" #. module: stock #: view:stock.change.product.qty:0 msgid "Select Quantity" -msgstr "" +msgstr "选择数量" #. module: stock #: model:ir.actions.act_window,help:stock.action_location_tree @@ -3682,7 +3697,7 @@ msgid "" "This is the structure of your company's warehouses and locations. You can " "click on a location to get the list of the products and their stock level in " "this particular location and all its children." -msgstr "" +msgstr "您公司的仓库和存货地点结构.您可以点击一个存货地点来获得指定存货地点和它的所有子项的产品的列表和库存量." #. module: stock #: model:res.request.link,name:stock.req_link_tracking @@ -3705,19 +3720,19 @@ msgstr "生产批次" #: view:stock.production.lot:0 #: view:stock.tracking:0 msgid "Traceability" -msgstr "可跟踪的" +msgstr "可追溯的" #. module: stock #: view:stock.picking:0 msgid "To invoice" -msgstr "" +msgstr "开发票" #. module: stock #: model:ir.actions.act_window,name:stock.action_location_form #: model:ir.ui.menu,name:stock.menu_action_location_form #: view:stock.picking:0 msgid "Locations" -msgstr "库位" +msgstr "存货地点" #. module: stock #: view:stock.picking:0 @@ -3727,7 +3742,7 @@ msgstr "一般信息" #. module: stock #: field:stock.production.lot,prefix:0 msgid "Prefix" -msgstr "" +msgstr "前缀" #. module: stock #: code:addons/stock/wizard/stock_splitinto.py:53 @@ -3735,7 +3750,7 @@ msgstr "" msgid "" "Total quantity after split exceeds the quantity to split for this product: " "\"%s\" (id: %d)" -msgstr "" +msgstr "这产品: \"%s\" (id: %d)拆分后的总数超过原来的数量." #. module: stock #: view:stock.move:0 @@ -3744,42 +3759,42 @@ msgstr "" #: field:stock.partial.picking,product_moves_in:0 #: field:stock.partial.picking,product_moves_out:0 msgid "Moves" -msgstr "凭证" +msgstr "调拨" #. module: stock #: view:report.stock.move:0 #: field:report.stock.move,location_dest_id:0 #: field:stock.picking,location_dest_id:0 msgid "Dest. Location" -msgstr "目标库位" +msgstr "目标存货地点" #. module: stock #: help:stock.move,product_packaging:0 msgid "" "It specifies attributes of packaging like type, quantity of packaging,etc." -msgstr "" +msgstr "指定托盘的属性如数量,类型等" #. module: stock #: code:addons/stock/stock.py:2386 #, python-format msgid "Product '%s' is consumed with '%s' quantity." -msgstr "" +msgstr "产品t '%s' 是损耗品和 '%s' 的数量" #. module: stock #: code:addons/stock/stock.py:2595 #, python-format msgid "Inventory '%s' is done." -msgstr "" +msgstr "盘点 '%s'完成" #. module: stock #: constraint:stock.move:0 msgid "You must assign a production lot for this product" -msgstr "" +msgstr "您必须为此产品赋予一个生产批次" #. module: stock #: view:stock.move:0 msgid "Expected" -msgstr "" +msgstr "预期" #. module: stock #: selection:report.stock.inventory,location_type:0 @@ -3791,7 +3806,7 @@ msgstr "生产" #. module: stock #: view:stock.split.into:0 msgid "Split Move" -msgstr "" +msgstr "拆分调拨" #. module: stock #: code:addons/stock/wizard/stock_return_picking.py:97 @@ -3799,17 +3814,17 @@ msgstr "" msgid "" "There are no products to return (only lines in Done state and not fully " "returned yet can be returned)!" -msgstr "" +msgstr "没有产品给退货(明细在完成状态但能退货)" #. module: stock #: model:ir.model,name:stock.model_stock_move_split msgid "Split in Production lots" -msgstr "" +msgstr "拆分生产批次" #. module: stock #: view:report.stock.inventory:0 msgid "Real" -msgstr "" +msgstr "实际" #. module: stock #: report:stock.picking.list:0 @@ -3821,13 +3836,13 @@ msgstr "说明" #. module: stock #: selection:report.stock.move,month:0 msgid "May" -msgstr "" +msgstr "5月" #. module: stock #: code:addons/stock/wizard/stock_partial_move.py:133 #, python-format msgid "Deliver" -msgstr "" +msgstr "送货" #. module: stock #: help:product.template,property_stock_account_output:0 @@ -3835,7 +3850,7 @@ msgid "" "When doing real-time inventory valuation, counterpart Journal Items for all " "outgoing stock moves will be posted in this account. If not set on the " "product, the one from the product category is used." -msgstr "" +msgstr "在进行实时库存估值时,对应的出库调拨分录项将被记录在这个科目;如果没设置在这产品上就是设置在这产品分类里." #. module: stock #: view:stock.tracking:0 @@ -3846,7 +3861,7 @@ msgstr "向上追溯" #: model:ir.actions.report.xml,name:stock.report_location_overview_all #: report:lot.stock.overview_all:0 msgid "Location Content" -msgstr "" +msgstr "存货地点包含" #. module: stock #: code:addons/stock/product.py:385 @@ -3864,7 +3879,7 @@ msgstr "出库科目" #. module: stock #: field:stock.location,chained_location_type:0 msgid "Chained Location Type" -msgstr "连锁库位类型" +msgstr "连锁存货地点类型" #. module: stock #: model:ir.model,name:stock.model_stock_report_prodlots @@ -3881,34 +3896,34 @@ msgstr "客户" #. module: stock #: selection:report.stock.move,month:0 msgid "February" -msgstr "" +msgstr "2月" #. module: stock #: view:stock.production.lot:0 msgid "Production Lot Identification" -msgstr "" +msgstr "生产批次标识" #. module: stock #: field:stock.location,scrap_location:0 #: view:stock.move.scrap:0 msgid "Scrap Location" -msgstr "" +msgstr "报废存货地点" #. module: stock #: selection:report.stock.move,month:0 msgid "April" -msgstr "" +msgstr "4月" #. module: stock #: view:report.stock.inventory:0 #: view:stock.move:0 msgid "Future" -msgstr "" +msgstr "未来" #. module: stock #: field:stock.invoice.onshipping,invoice_date:0 msgid "Invoiced date" -msgstr "" +msgstr "开票日期" #. module: stock #: code:addons/stock/stock.py:729 @@ -3919,7 +3934,7 @@ msgstr "" #: code:addons/stock/wizard/stock_return_picking.py:204 #, python-format msgid "Warning !" -msgstr "" +msgstr "警告！" #. module: stock #: model:stock.location,name:stock.stock_location_output @@ -3929,40 +3944,40 @@ msgstr "发出" #. module: stock #: selection:stock.move.split.lines,action:0 msgid "Keep in one lot" -msgstr "" +msgstr "保持在一个批次" #. module: stock #: view:product.product:0 msgid "Cost Price:" -msgstr "" +msgstr "成本价:" #. module: stock #: help:stock.move,move_dest_id:0 msgid "Optional: next stock move when chaining them" -msgstr "" +msgstr "选项: 如果是连锁那会引发库存调拨." #. module: stock #: view:report.stock.move:0 #: field:report.stock.move,year:0 msgid "Year" -msgstr "" +msgstr "年" #. module: stock #: model:stock.location,name:stock.stock_location_locations msgid "Physical Locations" -msgstr "物理库位" +msgstr "物理存货地点" #. module: stock #: model:ir.model,name:stock.model_stock_partial_move msgid "Partial Move" -msgstr "" +msgstr "部分调拨" #. module: stock #: help:stock.location,posx:0 #: help:stock.location,posy:0 #: help:stock.location,posz:0 msgid "Optional localization details, for information purpose only" -msgstr "" +msgstr "可选存货地点信息仅供参考" #~ msgid "Status" #~ msgstr "状态" diff --git a/addons/stock_invoice_directly/i18n/zh_CN.po b/addons/stock_invoice_directly/i18n/zh_CN.po index 1119246bdb6..e86b3cbaf2b 100644 --- a/addons/stock_invoice_directly/i18n/zh_CN.po +++ b/addons/stock_invoice_directly/i18n/zh_CN.po @@ -7,19 +7,19 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-03 16:58+0000\n" -"PO-Revision-Date: 2010-09-29 09:44+0000\n" -"Last-Translator: Black Jack \n" +"PO-Revision-Date: 2011-05-03 13:24+0000\n" +"Last-Translator: openerp-china.Black Jack \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: 2011-04-29 05:40+0000\n" +"X-Launchpad-Export-Date: 2011-05-04 04:36+0000\n" "X-Generator: Launchpad (build 12758)\n" #. module: stock_invoice_directly #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking msgid "Partial Picking" -msgstr "" +msgstr "部分装箱单" #. module: stock_invoice_directly #: model:ir.module.module,description:stock_invoice_directly.module_meta_information @@ -29,8 +29,12 @@ msgid "" " the invoicing wizard if the delivery is to be invoiced.\n" " " msgstr "" +"\n" +" 当您发货或送货时这模块自动启动.\n" +"开发票向导如果是送货要开具发票.\n" +" " #. module: stock_invoice_directly #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information msgid "Invoice Picking Directly" -msgstr "根据分拣单开发票" +msgstr "根据装箱单开发票" diff --git a/addons/stock_no_autopicking/i18n/zh_CN.po b/addons/stock_no_autopicking/i18n/zh_CN.po index 750acad2263..5caa686311f 100644 --- a/addons/stock_no_autopicking/i18n/zh_CN.po +++ b/addons/stock_no_autopicking/i18n/zh_CN.po @@ -7,19 +7,19 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-03 16:58+0000\n" -"PO-Revision-Date: 2010-09-29 08:54+0000\n" -"Last-Translator: Black Jack \n" +"PO-Revision-Date: 2011-05-03 15:11+0000\n" +"Last-Translator: openerp-china.Black Jack \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: 2011-04-29 05:32+0000\n" +"X-Launchpad-Export-Date: 2011-05-04 04:36+0000\n" "X-Generator: Launchpad (build 12758)\n" #. module: stock_no_autopicking #: model:ir.model,name:stock_no_autopicking.model_product_product msgid "Product" -msgstr "" +msgstr "产品" #. module: stock_no_autopicking #: model:ir.module.module,description:stock_no_autopicking.module_meta_information @@ -37,36 +37,41 @@ msgid "" " supplier in the routing of the assembly operation.\n" " " msgstr "" +"\n" +" 这模块允许在为生产单的提供原料中间处理装箱单.\n" +"使用本模块的一个例子是在生产管理里您的供应商分包制造您来组装产品.\n" +"那些分包是\"不自动装箱\"和在组装操作路径中放置在供应商的存货地点里.\n" +" " #. module: stock_no_autopicking #: model:ir.model,name:stock_no_autopicking.model_mrp_production msgid "Manufacturing Order" -msgstr "" +msgstr "生产单" #. module: stock_no_autopicking #: field:product.product,auto_pick:0 msgid "Auto Picking" -msgstr "自动创建分拣单" +msgstr "自动创建装箱单" #. module: stock_no_autopicking #: help:product.product,auto_pick:0 msgid "Auto picking for raw materials of production orders." -msgstr "生产单原料自动创建的分拣单" +msgstr "生产单原料自动创建的装箱单" #. module: stock_no_autopicking #: constraint:product.product:0 msgid "Error: Invalid ean code" -msgstr "" +msgstr "错误：无效的(EAN)条码" #. module: stock_no_autopicking #: model:ir.module.module,shortdesc:stock_no_autopicking.module_meta_information msgid "Stock No Auto-Picking" -msgstr "库存没自动创建分拣单" +msgstr "库存没自动创建装箱单" #. module: stock_no_autopicking #: constraint:mrp.production:0 msgid "Order quantity cannot be negative or zero !" -msgstr "" +msgstr "订单数量不能为0或者负数!" #~ msgid "Invalid XML for View Architecture!" #~ msgstr "无效的视图结构xml文件" diff --git a/addons/stock_planning/i18n/zh_CN.po b/addons/stock_planning/i18n/zh_CN.po new file mode 100644 index 00000000000..db9fd8dc2a3 --- /dev/null +++ b/addons/stock_planning/i18n/zh_CN.po @@ -0,0 +1,1513 @@ +# Chinese (Simplified) translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:16+0000\n" +"PO-Revision-Date: 2011-05-03 15:22+0000\n" +"Last-Translator: openerp-china.Black Jack \n" +"Language-Team: Chinese (Simplified) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-05-04 04:36+0000\n" +"X-Generator: Launchpad (build 12758)\n" + +#. module: stock_planning +#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73 +#, python-format +msgid "" +"No forecasts for selected period or no products in selected category !" +msgstr "" + +#. module: stock_planning +#: help:stock.planning,stock_only:0 +msgid "" +"Check to calculate stock location of selected warehouse only. If not " +"selected calculation is made for input, stock and output location of " +"warehouse." +msgstr "" + +#. module: stock_planning +#: field:stock.planning,maximum_op:0 +msgid "Maximum Rule" +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,analyzed_period1_per_company:0 +msgid "This Copmany Period1" +msgstr "" + +#. module: stock_planning +#: view:stock.planning:0 +#: view:stock.sale.forecast:0 +msgid "Group By..." +msgstr "" + +#. module: stock_planning +#: help:stock.sale.forecast,product_amt:0 +msgid "" +"Forecast value which will be converted to Product Quantity according to " +"prices." +msgstr "" + +#. module: stock_planning +#: code:addons/stock_planning/stock_planning.py:621 +#: code:addons/stock_planning/stock_planning.py:663 +#, python-format +msgid "Incoming Left must be greater than 0 !" +msgstr "" + +#. module: stock_planning +#: help:stock.planning,outgoing_before:0 +msgid "" +"Planned Out in periods before calculated. Between start date of current " +"period and one day before start of calculated period." +msgstr "" + +#. module: stock_planning +#: code:addons/stock_planning/wizard/stock_planning_forecast.py:59 +#, python-format +msgid "No products in selected category !" +msgstr "" + +#. module: stock_planning +#: help:stock.sale.forecast.createlines,warehouse_id:0 +msgid "" +"Warehouse which forecasts will concern. If during stock planning you will " +"need sales forecast for all warehouses choose any warehouse now." +msgstr "" + +#. module: stock_planning +#: field:stock.planning,outgoing_left:0 +msgid "Expected Out" +msgstr "" + +#. module: stock_planning +#: view:stock.sale.forecast:0 +msgid " " +msgstr "" + +#. module: stock_planning +#: field:stock.planning,incoming_left:0 +msgid "Incoming Left" +msgstr "" + +#. module: stock_planning +#: view:stock.planning:0 +msgid "Requisition history" +msgstr "" + +#. module: stock_planning +#: view:stock.sale.forecast.createlines:0 +msgid "Create Forecasts Lines" +msgstr "" + +#. module: stock_planning +#: help:stock.planning,outgoing:0 +msgid "Quantity of all confirmed outgoing moves in calculated Period." +msgstr "" + +#. module: stock_planning +#: view:stock.period.createlines:0 +msgid "Create Daily Periods" +msgstr "" + +#. module: stock_planning +#: view:stock.planning:0 +#: field:stock.planning,company_id:0 +#: field:stock.planning.createlines,company_id:0 +#: view:stock.sale.forecast:0 +#: field:stock.sale.forecast,company_id:0 +#: field:stock.sale.forecast.createlines,company_id:0 +msgid "Company" +msgstr "" + +#. module: stock_planning +#: code:addons/stock_planning/stock_planning.py:640 +#: code:addons/stock_planning/stock_planning.py:682 +#, python-format +msgid "" +"\n" +" Initial Stock: " +msgstr "" + +#. module: stock_planning +#: help:stock.planning,warehouse_forecast:0 +msgid "" +"All sales forecasts for selected Warehouse of selected Product during " +"selected Period." +msgstr "" + +#. module: stock_planning +#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines +msgid "Create Stock and Sales Periods" +msgstr "" + +#. module: stock_planning +#: view:stock.planning:0 +msgid "Minimum Stock Rule Indicators" +msgstr "" + +#. module: stock_planning +#: help:stock.sale.forecast.createlines,period_id:0 +msgid "Period which forecasts will concern." +msgstr "" + +#. module: stock_planning +#: field:stock.planning,stock_only:0 +msgid "Stock Location Only" +msgstr "" + +#. module: stock_planning +#: help:stock.planning,already_out:0 +msgid "" +"Quantity which is already dispatched out of this warehouse in current period." +msgstr "" + +#. module: stock_planning +#: help:stock.planning,procure_to_stock:0 +msgid "" +"Chect to make procurement to stock location of selected warehouse. If not " +"selected procurement will be made into input location of warehouse." +msgstr "" + +#. module: stock_planning +#: view:stock.planning:0 +msgid "Current Period Situation" +msgstr "" + +#. module: stock_planning +#: view:stock.period.createlines:0 +msgid "Create Monthly Periods" +msgstr "创建月度" + +#. module: stock_planning +#: help:stock.planning,supply_warehouse_id:0 +msgid "" +"Warehouse used as source in supply pick move created by 'Supply from Another " +"Warhouse'." +msgstr "" + +#. module: stock_planning +#: model:ir.model,name:stock_planning.model_stock_period_createlines +msgid "stock.period.createlines" +msgstr "" + +#. module: stock_planning +#: field:stock.planning,outgoing_before:0 +msgid "Planned Out Before" +msgstr "" + +#. module: stock_planning +#: field:stock.planning.createlines,forecasted_products:0 +msgid "All Products with Forecast" +msgstr "" + +#. module: stock_planning +#: view:stock.sale.forecast:0 +msgid "Periods :" +msgstr "" + +#. module: stock_planning +#: help:stock.planning,already_in:0 +msgid "" +"Quantity which is already picked up to this warehouse in current period." +msgstr "" + +#. module: stock_planning +#: code:addons/stock_planning/stock_planning.py:644 +#: code:addons/stock_planning/stock_planning.py:686 +#, python-format +msgid " Confirmed In Before: " +msgstr "" + +#. module: stock_planning +#: view:stock.sale.forecast:0 +msgid "Stock and Sales Forecast" +msgstr "" + +#. module: stock_planning +#: model:ir.model,name:stock_planning.model_stock_sale_forecast +msgid "stock.sale.forecast" +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,analyzed_dept_id:0 +msgid "This Department" +msgstr "" + +#. module: stock_planning +#: field:stock.planning,to_procure:0 +msgid "Planned In" +msgstr "" + +#. module: stock_planning +#: field:stock.planning,stock_simulation:0 +msgid "Stock Simulation" +msgstr "" + +#. module: stock_planning +#: model:ir.model,name:stock_planning.model_stock_planning_createlines +msgid "stock.planning.createlines" +msgstr "" + +#. module: stock_planning +#: help:stock.planning,incoming_before:0 +msgid "" +"Confirmed incoming in periods before calculated (Including Already In). " +"Between start date of current period and one day before start of calculated " +"period." +msgstr "" + +#. module: stock_planning +#: view:stock.sale.forecast:0 +msgid "Search Sales Forecast" +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,analyzed_period5_per_user:0 +msgid "This User Period5" +msgstr "" + +#. module: stock_planning +#: help:stock.planning,history:0 +msgid "History of procurement or internal supply of this planning line." +msgstr "" + +#. module: stock_planning +#: help:stock.planning,company_forecast:0 +msgid "" +"All sales forecasts for whole company (for all Warehouses) of selected " +"Product during selected Period." +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,analyzed_period1_per_user:0 +msgid "This User Period1" +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,analyzed_period3_per_user:0 +msgid "This User Period3" +msgstr "" + +#. module: stock_planning +#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_main +#: view:stock.planning:0 +msgid "Stock Planning" +msgstr "" + +#. module: stock_planning +#: field:stock.planning,minimum_op:0 +msgid "Minimum Rule" +msgstr "" + +#. module: stock_planning +#: view:stock.planning:0 +msgid "Procure Incoming Left" +msgstr "" + +#. module: stock_planning +#: code:addons/stock_planning/stock_planning.py:646 +#: code:addons/stock_planning/stock_planning.py:688 +#, python-format +msgid " Incoming Left: " +msgstr "" + +#. module: stock_planning +#: code:addons/stock_planning/stock_planning.py:719 +#, python-format +msgid "%s Pick List %s (%s, %s) %s %s \n" +msgstr "" + +#. module: stock_planning +#: view:stock.planning.createlines:0 +#: view:stock.sale.forecast.createlines:0 +msgid "Create" +msgstr "" + +#. module: stock_planning +#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form +#: model:ir.module.module,shortdesc:stock_planning.module_meta_information +#: model:ir.ui.menu,name:stock_planning.menu_stock_planning +#: view:stock.planning:0 +msgid "Master Procurement Schedule" +msgstr "" + +#. module: stock_planning +#: code:addons/stock_planning/stock_planning.py:636 +#: code:addons/stock_planning/stock_planning.py:678 +#, python-format +msgid " Creation Date: " +msgstr "" + +#. module: stock_planning +#: field:stock.planning,period_id:0 +#: field:stock.planning.createlines,period_id:0 +#: field:stock.sale.forecast,period_id:0 +#: field:stock.sale.forecast.createlines,period_id:0 +msgid "Period" +msgstr "" + +#. module: stock_planning +#: view:stock.period:0 +#: field:stock.period,state:0 +#: field:stock.planning,state:0 +#: field:stock.sale.forecast,state:0 +msgid "State" +msgstr "" + +#. module: stock_planning +#: help:stock.sale.forecast.createlines,product_categ_id:0 +msgid "Product Category of products which created forecasts will concern." +msgstr "" + +#. module: stock_planning +#: model:ir.model,name:stock_planning.model_stock_period +msgid "stock period" +msgstr "" + +#. module: stock_planning +#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines +msgid "stock.sale.forecast.createlines" +msgstr "" + +#. module: stock_planning +#: field:stock.planning,warehouse_id:0 +#: field:stock.planning.createlines,warehouse_id:0 +#: field:stock.sale.forecast,warehouse_id:0 +#: field:stock.sale.forecast.createlines,warehouse_id:0 +msgid "Warehouse" +msgstr "" + +#. module: stock_planning +#: help:stock.planning,stock_simulation:0 +msgid "" +"Stock simulation at the end of selected Period.\n" +" For current period it is: \n" +"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n" +"For periods ahead it is: \n" +"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned " +"In." +msgstr "" + +#. module: stock_planning +#: help:stock.sale.forecast,analyze_company:0 +msgid "Check this box to see the sales for whole company." +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,name:0 +msgid "Name" +msgstr "" + +#. module: stock_planning +#: view:stock.planning:0 +msgid "Search Stock Planning" +msgstr "" + +#. module: stock_planning +#: field:stock.planning,incoming_before:0 +msgid "Incoming Before" +msgstr "" + +#. module: stock_planning +#: field:stock.planning.createlines,product_categ_id:0 +#: field:stock.sale.forecast.createlines,product_categ_id:0 +msgid "Product Category" +msgstr "" + +#. module: stock_planning +#: code:addons/stock_planning/stock_planning.py:621 +#: code:addons/stock_planning/stock_planning.py:663 +#: code:addons/stock_planning/stock_planning.py:665 +#: code:addons/stock_planning/stock_planning.py:667 +#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73 +#: code:addons/stock_planning/wizard/stock_planning_forecast.py:59 +#, python-format +msgid "Error !" +msgstr "" + +#. module: stock_planning +#: code:addons/stock_planning/stock_planning.py:626 +#, python-format +msgid "Manual planning for %s" +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,analyzed_user_id:0 +msgid "This User" +msgstr "" + +#. module: stock_planning +#: code:addons/stock_planning/stock_planning.py:643 +#: code:addons/stock_planning/stock_planning.py:685 +#, python-format +msgid "" +"\n" +" Confirmed Out: " +msgstr "" + +#. module: stock_planning +#: view:stock.planning:0 +msgid "Forecasts" +msgstr "" + +#. module: stock_planning +#: view:stock.planning:0 +msgid "Supply from Another Warehouse" +msgstr "" + +#. module: stock_planning +#: view:stock.planning:0 +msgid "Calculate Planning" +msgstr "" + +#. module: stock_planning +#: code:addons/stock_planning/stock_planning.py:636 +#, python-format +msgid "" +" Procurement created in MPS by user: %s Creation Date: %s " +" \n" +" For period: %s \n" +" according to state: \n" +" Warehouse Forecast: %s \n" +" Initial Stock: %s \n" +" Planned Out: %s Planned In: %s \n" +" Already Out: %s Already In: %s \n" +" Confirmed Out: %s Confirmed In: %s " +" \n" +" Planned Out Before: %s Confirmed In Before: %s " +" \n" +" Expected Out: %s Incoming Left: %s " +" \n" +" Stock Simulation: %s Minimum stock: %s" +msgstr "" + +#. module: stock_planning +#: code:addons/stock_planning/stock_planning.py:140 +#, python-format +msgid "Invalid action !" +msgstr "" + +#. module: stock_planning +#: help:stock.planning,stock_start:0 +msgid "Stock quantity one day before current period." +msgstr "" + +#. module: stock_planning +#: view:stock.period.createlines:0 +msgid "Create Weekly Periods" +msgstr "" + +#. module: stock_planning +#: help:stock.planning,maximum_op:0 +msgid "Maximum quantity set in Minimum Stock Rules for this Warhouse" +msgstr "" + +#. module: stock_planning +#: code:addons/stock_planning/stock_planning.py:665 +#, python-format +msgid "You must specify a Source Warehouse !" +msgstr "" + +#. module: stock_planning +#: view:stock.planning.createlines:0 +msgid "Creates planning lines for selected period and warehouse." +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,analyzed_period4_per_user:0 +msgid "This User Period4" +msgstr "" + +#. module: stock_planning +#: view:stock.planning.createlines:0 +#: view:stock.sale.forecast.createlines:0 +msgid "Note: Doesn't duplicate existing lines created by you." +msgstr "" + +#. module: stock_planning +#: view:stock.period:0 +msgid "Stock and Sales Period" +msgstr "" + +#. module: stock_planning +#: field:stock.planning,company_forecast:0 +msgid "Company Forecast" +msgstr "" + +#. module: stock_planning +#: help:stock.planning,product_uom:0 +#: help:stock.sale.forecast,product_uom:0 +msgid "" +"Unit of Measure used to show the quanities of stock calculation.You can use " +"units form default category or from second category (UoS category)." +msgstr "" + +#. module: stock_planning +#: view:stock.sale.forecast:0 +msgid "Per User :" +msgstr "" + +#. module: stock_planning +#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast +#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all +#: view:stock.sale.forecast:0 +msgid "Sales Forecasts" +msgstr "" + +#. module: stock_planning +#: field:stock.period,name:0 +#: field:stock.period.createlines,name:0 +msgid "Period Name" +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,user_id:0 +msgid "Created/Validated by" +msgstr "" + +#. module: stock_planning +#: view:stock.planning:0 +msgid "Internal Supply" +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,analyzed_period4_per_company:0 +msgid "This Company Period4" +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,analyzed_period5_per_company:0 +msgid "This Company Period5" +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,analyzed_period2_per_company:0 +msgid "This Company Period2" +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,analyzed_period3_per_company:0 +msgid "This Company Period3" +msgstr "" + +#. module: stock_planning +#: field:stock.period,date_start:0 +#: field:stock.period.createlines,date_start:0 +msgid "Start Date" +msgstr "" + +#. module: stock_planning +#: code:addons/stock_planning/stock_planning.py:642 +#: code:addons/stock_planning/stock_planning.py:684 +#, python-format +msgid "" +"\n" +" Already Out: " +msgstr "" + +#. module: stock_planning +#: field:stock.planning,confirmed_forecasts_only:0 +msgid "Validated Forecasts" +msgstr "" + +#. module: stock_planning +#: help:stock.planning.createlines,product_categ_id:0 +msgid "" +"Planning will be created for products from Product Category selected by this " +"field. This field is ignored when you check \"All Forecasted Product\" box." +msgstr "" + +#. module: stock_planning +#: field:stock.planning,planned_outgoing:0 +msgid "Planned Out" +msgstr "" + +#. module: stock_planning +#: view:stock.sale.forecast:0 +msgid "Per Department :" +msgstr "" + +#. module: stock_planning +#: view:stock.planning:0 +msgid "Forecast" +msgstr "" + +#. module: stock_planning +#: selection:stock.period,state:0 +#: selection:stock.planning,state:0 +#: selection:stock.sale.forecast,state:0 +msgid "Draft" +msgstr "" + +#. module: stock_planning +#: view:stock.period:0 +msgid "Closed" +msgstr "" + +#. module: stock_planning +#: view:stock.planning:0 +#: view:stock.sale.forecast:0 +msgid "Warehouse " +msgstr "" + +#. module: stock_planning +#: code:addons/stock_planning/stock_planning.py:646 +#: code:addons/stock_planning/stock_planning.py:688 +#, python-format +msgid "" +"\n" +" Expected Out: " +msgstr "" + +#. module: stock_planning +#: view:stock.period.createlines:0 +msgid "Create periods for Stock and Sales Planning" +msgstr "" + +#. module: stock_planning +#: help:stock.planning,planned_outgoing:0 +msgid "" +"Enter planned outgoing quantity from selected Warehouse during the selected " +"Period of selected Product. To plan this value look at Confirmed Out or " +"Sales Forecasts. This value should be equal or greater than Confirmed Out." +msgstr "" + +#. module: stock_planning +#: model:ir.module.module,description:stock_planning.module_meta_information +msgid "" +"\n" +"This module is based on original OpenERP SA module stock_planning version " +"1.0 of the same name Master Procurement Schedule.\n" +"\n" +"Purpose of MPS is to allow create a manual procurement (requisition) apart " +"of MRP scheduler (which works automatically on minimum stock rules).\n" +"\n" +"Terms used in the module:\n" +"- Stock and Sales Period - is the time (between Start Date and End Date) for " +"which you plan Stock and Sales Forecast and make Procurement Planning. \n" +"- Stock and Sales Forecast - is the quantity of products you plan to sell in " +"the Period.\n" +"- Stock Planning - is the quantity of products you plan to purchase or " +"produce for the Period.\n" +"\n" +"Because we have another module sale_forecast which uses terms \"Sales " +"Forecast\" and \"Planning\" as amount values we will use terms \"Stock and " +"Sales Forecast\" and \"Stock Planning\" to emphasize that we use quantity " +"values. \n" +"\n" +"Activity with this module is divided to three steps:\n" +"- Creating Periods. Mandatory step.\n" +"- Creating Sale Forecasts and entering quantities to them. Optional step but " +"useful for further planning.\n" +"- Creating Planning lines, entering quantities to them and making " +"Procurement. Making procurement is the final step for the Period.\n" +"\n" +"Periods\n" +"=======\n" +"You have two menu items for Periods in \"Sales Management - Configuration\". " +"There are:\n" +"- \"Create Sales Periods\" - Which automates creating daily, weekly or " +"monthly periods.\n" +"- \"Stock and sales Periods\" - Which allows to create any type of periods, " +"change the dates and change the State of period.\n" +"\n" +"Creating periods is the first step you have to do to use modules features. " +"You can create custom periods using \"New\" button in \"Stock and Sales " +"Periods\" form or view but it is recommended to use automating tool.\n" +"\n" +"Remarks:\n" +"- These periods (officially Stock and Sales Periods) are separated of " +"Financial or other periods in the system.\n" +"- Periods are not assigned to companies (when you use multicompany feature " +"at all). Module suppose that you use the same periods across companies. If " +"you wish to use different periods for different companies define them as you " +"wish (they can overlap). Later on in this text will be indications how to " +"use such periods.\n" +"- When periods are created automatically their start and finish dates are " +"with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily " +"periods they will have start date 31.01.2010 00:00:00 and end date " +"31.01.2010 23:59:00. It works only in automatic creation of periods. When " +"you create periods manually you have to take care about hours because you " +"can have incorrect values form sales or stock. \n" +"- If you use overlapping periods for the same product, warehouse and company " +"results can be unpredictable.\n" +"- If current date doesn't belong to any period or you have holes between " +"periods results can be unpredictable.\n" +"\n" +"Sales Forecasts\n" +"===============\n" +"You have few menus for Sales forecast in \"Sales Management - Sales " +"Forecasts\".\n" +"- \"Create Sales Forecasts for Sales Periods\" - which automates creating " +"forecasts lines according to some parameters.\n" +"- \"Sales Forecasts\" - few menus for working with forecasts lists and " +"forms.\n" +"\n" +"Menu \"Create Sales Forecasts for Sales Periods\" creates Forecasts for " +"products from selected Category, for selected Period and for selected " +"Warehouse. It is an option \"Copy Last Forecast\" to copy forecast and other " +"settings of period before this one to created one.\n" +"\n" +"Remarks:\n" +"- This tool doesn't create lines, if relevant lines (for the same Product, " +"Period, Warehouse and validated or created by you) already exists. If you " +"wish to create another forecast, if relevant lines exists you have to do it " +"manually using menus described bellow.\n" +"- When created lines are validated by someone else you can use this tool to " +"create another lines for the same Period, Product and Warehouse. \n" +"- When you choose \"Copy Last Forecast\" created line takes quantity and " +"some settings from your (validated by you or created by you if not validated " +"yet) forecast which is for last period before period of created forecast. If " +"there are few your forecasts for period before this one (it is possible) " +"system takes one of them (no rule which of them).\n" +"\n" +"\n" +"Menus \"Sales Forecasts\"\n" +"On \"Sales Forecast\" form mainly you have to enter a forecast quantity in " +"\"Product Quantity\". Further calculation can work for draft forecasts. But " +"validation can save your data against any accidental changes. You can click " +"\"Validate\" button but it is not mandatory.\n" +"\n" +"Instead of forecast quantity you can enter amount of forecast sales in field " +"\"Product Amount\". System will count quantity from amount according to Sale " +"price of the Product.\n" +"\n" +"All values on the form are expressed in unit of measure selected on form. " +"You can select one of unit of measure from default category or from second " +"category. When you change unit of measure the quanities will be recalculated " +"according to new UoM: editable values (blue fields) immediately, non edited " +"fields after clicking of \"Calculate Planning\" button.\n" +"\n" +"To find proper value for Sale Forecast you can use \"Sales History\" table " +"for this product. You have to enter parameters to the top and left of this " +"table and system will count sale quantities according to these parameters. " +"So you can select fe. your department (at the top) then (to the left): last " +"period, period before last and period year ago.\n" +"\n" +"Remarks:\n" +"\n" +"\n" +"Procurement Planning\n" +"====================\n" +"Menu for Planning you can find in \"Warehouse - Stock Planning\".\n" +"- \"Create Stock Planning Lines\" - allows you to automate creating planning " +"lines according to some parameters.\n" +"- \"Master Procurement Scheduler\" - is the most important menu of the " +"module which allows to create procurement.\n" +"\n" +"As Sales forecast is phase of planning sales. The Procurement Planning " +"(Planning) is the phase of scheduling Purchasing or Producing. You can " +"create Procurement Planning quickly using tool from menu \"Create Stock " +"Planning Lines\", then you can review created planning and make procurement " +"using menu \"Master Procurement Schedule\".\n" +"\n" +"Menu \"Create Stock Planning Lines\" allows you to create quickly Planning " +"lines for products from selected Category, for selected Period, and for " +"selected Warehouse. When you check option \"All Products with Forecast\" " +"system creates lines for all products having forecast for selected Period " +"and Warehouse. Selected Category will be ignored in this case.\n" +"\n" +"Under menu \"Master Procurement Scheduler\" you can generally change the " +"values \"Planned Out\" and \"Planned In\" to observe the field \"Stock " +"Simulation\" and decide if this value would be accurate for end of the " +"Period. \n" +"\"Planned Out\" can be based on \"Warehouse Forecast\" which is the sum of " +"all forecasts for Period and Warehouse. But your planning can be based on " +"any other information you have. It is not necessary to have any forecast. \n" +"\"Planned In\" quantity is used to calculate field \"Incoming Left\" which " +"is the quantity to be procured to make stock as indicated in \"Stock " +"Simulation\" at the end of Period. You can compare \"Stock Simulation\" " +"quantity to minimum stock rules visible on the form. But you can plan " +"different quantity than in Minimum Stock Rules. Calculation is made for " +"whole Warehouse by default. But if you want to see values for Stock location " +"of calculated warehouse you can use check box \"Stock Location Only\".\n" +"\n" +"If after few tries you decide that you found correct quantities for " +"\"Planned Out\" and \"Planned In\" and you are satisfied with end of period " +"stock calculated in \"Stock Simulation\" you can click \"Procure Incoming " +"Left\" button to procure quantity of field \"Incoming Left\" into the " +"Warehouse. System creates appropriate Procurement Order. You can decide if " +"procurement will be made to Stock or Input location of calculated Warehouse. " +"\n" +"\n" +"If you don't want to Produce or Buy the product but just pick calculated " +"quantity from another warehouse you can click \"Supply from Another " +"Warehouse\" (instead of \"Procure Incoming Left\"). System creates pick list " +"with move from selected source Warehouse to calculated Warehouse (as " +"destination). You can also decide if this pick should be done from Stock or " +"Output location of source warehouse. Destination location (Stock or Input) " +"of destination warehouse will be used as set for \"Procure Incoming Left\". " +"\n" +"\n" +"To see proper quantities in fields \"Confirmed In\", \"Confirmed Out\", " +"\"Confirmed In Before\", \"Planned Out Before\" and \"Stock Simulation\" you " +"have to click button \"Calculate Planning\".\n" +"\n" +"All values on the form are expressed in unit of measure selected on form. " +"You can select one of unit of measure from default category or from second " +"category. When you change unit of measure the quanities will be recalculated " +"according to new UoM: editable values (blue fields) immediately, non edited " +"fields after clicking of \"Calculate Planning\" button.\n" +"\n" +"How Stock Simulation field is calculated:\n" +"Generally Stock Simulation shows the stock for end of the calculated period " +"according to some planned or confirmed stock moves. Calculation always " +"starts with quantity of real stock of beginning of current period. Then " +"calculation adds or subtracts quantities of calculated period or periods " +"before calculated.\n" +"When you are in the same period (current period is the same as calculated) " +"Stock Simulation is calculated as follows:\n" +"Stock Simulation = \n" +"\tStock of beginning of current Period\n" +"\t- Planned Out \n" +"\t+ Planned In\n" +"\n" +"When you calculate period next to current:\n" +"Stock Simulation = \n" +"\tStock of beginning of current Period\n" +"\t- Planned Out of current Period \n" +"\t+ Confirmed In of current Period (incl. Already In)\n" +"\t- Planned Out of calculated Period \n" +"\t+ Planned In of calculated Period .\n" +"\n" +"As you see calculated Period is taken the same way like in case above. But " +"calculation of current Period are made a little bit different. First you " +"should note that system takes for current Period only Confirmed In moves. It " +"means that you have to make planning and procurement for current Period " +"before this calculation (for Period next to current). \n" +"\n" +"When you calculate Period ahead:\n" +"Stock Simulation = \n" +"\tStock of beginning of current Period \n" +"\t- Sum of Planned Out of Periods before calculated \n" +"\t+ Sum of Confirmed In of Periods before calculated (incl. Already In) \n" +"\t- Planned Out of calculated Period \n" +"\t+ Planned In of calculated Period.\n" +"\n" +"Periods before calculated means periods starting from current till period " +"before calculated.\n" +"\n" +"Remarks:\n" +"- Remember to make planning for all periods before calculated because " +"omitting these quantities and procurements can cause wrong suggestions for " +"procurements few periods ahead.\n" +"- If you made planning few periods ahead and you find that real Confirmed " +"Out is bigger than Planned Out in some periods before you can repeat " +"Planning and make another procurement. You should do it in the same planning " +"line. If you create another planning line the suggestions can be wrong.\n" +"- When you wish to work with different periods for some part of products " +"define two kinds of periods (fe. Weekly and Monthly) and use them for " +"different products. Example: If you use always Weekly periods for Products " +"A, and Monthly periods for Products B your all calculations will work " +"correctly. You can also use different kind of periods for the same products " +"from different warehouse or companies. But you cannot use overlapping " +"periods for the same product, warehouse and company because results can be " +"unpredictable. The same apply to Forecasts lines.\n" +msgstr "" + +#. module: stock_planning +#: code:addons/stock_planning/stock_planning.py:140 +#, python-format +msgid "Cannot delete Validated Sale Forecasts !" +msgstr "" + +#. module: stock_planning +#: code:addons/stock_planning/stock_planning.py:641 +#: code:addons/stock_planning/stock_planning.py:683 +#, python-format +msgid "" +"\n" +" Planned Out: " +msgstr "" + +#. module: stock_planning +#: code:addons/stock_planning/stock_planning.py:667 +#, python-format +msgid "" +"You must specify a Source Warehouse different than calculated (destination) " +"Warehouse !" +msgstr "" + +#. module: stock_planning +#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form +#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines +msgid "Create Sales Forecasts" +msgstr "" + +#. module: stock_planning +#: view:stock.sale.forecast.createlines:0 +msgid "Creates forecast lines for selected warehouse and period." +msgstr "" + +#. module: stock_planning +#: code:addons/stock_planning/stock_planning.py:656 +#, python-format +msgid "%s Requisition (%s, %s) %s %s \n" +msgstr "" + +#. module: stock_planning +#: code:addons/stock_planning/stock_planning.py:655 +#, python-format +msgid "Requisition (" +msgstr "" + +#. module: stock_planning +#: help:stock.planning,outgoing_left:0 +msgid "" +"Quantity expected to go out in selected period. As a difference between " +"Planned Out and Confirmed Out. For current period Already Out is also " +"calculated" +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,analyzed_period4_id:0 +msgid "Period4" +msgstr "" + +#. module: stock_planning +#: code:addons/stock_planning/stock_planning.py:642 +#: code:addons/stock_planning/stock_planning.py:684 +#, python-format +msgid " Already In: " +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,analyzed_period2_id:0 +msgid "Period2" +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,analyzed_period3_id:0 +msgid "Period3" +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,analyzed_period1_id:0 +msgid "Period1" +msgstr "" + +#. module: stock_planning +#: code:addons/stock_planning/stock_planning.py:647 +#: code:addons/stock_planning/stock_planning.py:689 +#, python-format +msgid " Minimum stock: " +msgstr "" + +#. module: stock_planning +#: field:stock.planning,active_uom:0 +#: field:stock.sale.forecast,active_uom:0 +msgid "Active UoM" +msgstr "" + +#. module: stock_planning +#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form +#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines +#: view:stock.planning.createlines:0 +msgid "Create Stock Planning Lines" +msgstr "" + +#. module: stock_planning +#: view:stock.planning:0 +msgid "General Info" +msgstr "" + +#. module: stock_planning +#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form +msgid "Sales Forecast" +msgstr "" + +#. module: stock_planning +#: view:stock.planning:0 +msgid "Planning and Situation for Calculated Period" +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0 +msgid "This Warehouse Period1" +msgstr "" + +#. module: stock_planning +#: field:stock.planning,warehouse_forecast:0 +msgid "Warehouse Forecast" +msgstr "" + +#. module: stock_planning +#: code:addons/stock_planning/stock_planning.py:643 +#: code:addons/stock_planning/stock_planning.py:685 +#, python-format +msgid " Confirmed In: " +msgstr "" + +#. module: stock_planning +#: view:stock.sale.forecast:0 +msgid "Sales history" +msgstr "" + +#. module: stock_planning +#: field:stock.planning,supply_warehouse_id:0 +msgid "Source Warehouse" +msgstr "" + +#. module: stock_planning +#: help:stock.sale.forecast,product_qty:0 +msgid "Forecasted quantity." +msgstr "" + +#. module: stock_planning +#: view:stock.planning:0 +msgid "Stock" +msgstr "" + +#. module: stock_planning +#: field:stock.planning,stock_supply_location:0 +msgid "Stock Supply Location" +msgstr "" + +#. module: stock_planning +#: help:stock.period.createlines,date_stop:0 +msgid "Ending date for planning period." +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,analyzed_period2_per_user:0 +msgid "This User Period2" +msgstr "" + +#. module: stock_planning +#: help:stock.planning.createlines,forecasted_products:0 +msgid "" +"Check this box to create planning for all products having any forecast for " +"selected Warehouse and Period. Product Category field will be ignored." +msgstr "" + +#. module: stock_planning +#: field:stock.planning,already_in:0 +msgid "Already In" +msgstr "" + +#. module: stock_planning +#: field:stock.planning,product_uom_categ:0 +#: field:stock.planning,product_uos_categ:0 +#: field:stock.sale.forecast,product_uom_categ:0 +msgid "Product UoM Category" +msgstr "" + +#. module: stock_planning +#: field:stock.planning,incoming:0 +msgid "Confirmed In" +msgstr "" + +#. module: stock_planning +#: field:stock.planning,line_time:0 +msgid "Past/Future" +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,product_uos_categ:0 +msgid "Product UoS Category" +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,product_qty:0 +msgid "Product Quantity" +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast.createlines,copy_forecast:0 +msgid "Copy Last Forecast" +msgstr "" + +#. module: stock_planning +#: help:stock.sale.forecast,product_id:0 +msgid "Shows which product this forecast concerns." +msgstr "" + +#. module: stock_planning +#: selection:stock.planning,state:0 +msgid "Done" +msgstr "" + +#. module: stock_planning +#: field:stock.period.createlines,period_ids:0 +msgid "Periods" +msgstr "" + +#. module: stock_planning +#: code:addons/stock_planning/stock_planning.py:638 +#: code:addons/stock_planning/stock_planning.py:680 +#, python-format +msgid " according to state:" +msgstr "" + +#. module: stock_planning +#: view:stock.period.createlines:0 +msgid "Cancel" +msgstr "" + +#. module: stock_planning +#: view:stock.period:0 +#: selection:stock.period,state:0 +#: view:stock.planning.createlines:0 +#: view:stock.sale.forecast.createlines:0 +msgid "Close" +msgstr "" + +#. module: stock_planning +#: view:stock.sale.forecast:0 +#: selection:stock.sale.forecast,state:0 +msgid "Validated" +msgstr "" + +#. module: stock_planning +#: view:stock.period:0 +#: selection:stock.period,state:0 +msgid "Open" +msgstr "" + +#. module: stock_planning +#: help:stock.sale.forecast.createlines,copy_forecast:0 +msgid "Copy quantities from last Stock and Sale Forecast." +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,analyzed_period1_per_dept:0 +msgid "This Dept Period1" +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,analyzed_period3_per_dept:0 +msgid "This Dept Period3" +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,analyzed_period2_per_dept:0 +msgid "This Dept Period2" +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,analyzed_period5_per_dept:0 +msgid "This Dept Period5" +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,analyzed_period4_per_dept:0 +msgid "This Dept Period4" +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0 +msgid "This Warehouse Period2" +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0 +msgid "This Warehouse Period3" +msgstr "" + +#. module: stock_planning +#: field:stock.planning,outgoing:0 +msgid "Confirmed Out" +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,create_uid:0 +msgid "Responsible" +msgstr "" + +#. module: stock_planning +#: view:stock.sale.forecast:0 +msgid "Default UOM" +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0 +msgid "This Warehouse Period4" +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0 +msgid "This Warehouse Period5" +msgstr "" + +#. module: stock_planning +#: view:stock.period:0 +msgid "Current" +msgstr "" + +#. module: stock_planning +#: model:ir.model,name:stock_planning.model_stock_planning +msgid "stock.planning" +msgstr "" + +#. module: stock_planning +#: help:stock.sale.forecast,warehouse_id:0 +msgid "" +"Shows which warehouse this forecast concerns. If during stock planning you " +"will need sales forecast for all warehouses choose any warehouse now." +msgstr "" + +#. module: stock_planning +#: help:stock.planning.createlines,warehouse_id:0 +msgid "Warehouse which planning will concern." +msgstr "" + +#. module: stock_planning +#: code:addons/stock_planning/stock_planning.py:647 +#: code:addons/stock_planning/stock_planning.py:689 +#, python-format +msgid "" +"\n" +" Stock Simulation: " +msgstr "" + +#. module: stock_planning +#: help:stock.planning,to_procure:0 +msgid "" +"Enter quantity which (by your plan) should come in. Change this value and " +"observe Stock simulation. This value should be equal or greater than " +"Confirmed In." +msgstr "" + +#. module: stock_planning +#: help:stock.planning.createlines,period_id:0 +msgid "Period which planning will concern." +msgstr "" + +#. module: stock_planning +#: field:stock.planning,already_out:0 +msgid "Already Out" +msgstr "" + +#. module: stock_planning +#: help:stock.planning,product_id:0 +msgid "Product which this planning is created for." +msgstr "" + +#. module: stock_planning +#: view:stock.sale.forecast:0 +msgid "Per Warehouse :" +msgstr "" + +#. module: stock_planning +#: code:addons/stock_planning/stock_planning.py:639 +#: code:addons/stock_planning/stock_planning.py:681 +#, python-format +msgid "" +"\n" +" Warehouse Forecast: " +msgstr "" + +#. module: stock_planning +#: field:stock.planning,history:0 +msgid "Procurement History" +msgstr "" + +#. module: stock_planning +#: help:stock.period.createlines,date_start:0 +msgid "Starting date for planning period." +msgstr "" + +#. module: stock_planning +#: code:addons/stock_planning/stock_planning.py:641 +#: code:addons/stock_planning/stock_planning.py:683 +#, python-format +msgid " Planned In: " +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,analyze_company:0 +msgid "Per Company" +msgstr "" + +#. module: stock_planning +#: help:stock.planning,incoming_left:0 +msgid "" +"Quantity left to Planned incoming quantity. This is calculated difference " +"between Planned In and Confirmed In. For current period Already In is also " +"calculated. This value is used to create procurement for lacking quantity." +msgstr "" + +#. module: stock_planning +#: help:stock.planning,incoming:0 +msgid "Quantity of all confirmed incoming moves in calculated Period." +msgstr "" + +#. module: stock_planning +#: field:stock.period,date_stop:0 +#: field:stock.period.createlines,date_stop:0 +msgid "End Date" +msgstr "" + +#. module: stock_planning +#: help:stock.planning,stock_supply_location:0 +msgid "" +"Check to supply from Stock location of Supply Warehouse. If not checked " +"supply will be made from Output location of Supply Warehouse. Used in " +"'Supply from Another Warhouse' with Supply Warehouse." +msgstr "" + +#. module: stock_planning +#: view:stock.planning:0 +msgid "No Requisition" +msgstr "" + +#. module: stock_planning +#: help:stock.planning,minimum_op:0 +msgid "Minimum quantity set in Minimum Stock Rules for this Warhouse" +msgstr "" + +#. module: stock_planning +#: help:stock.sale.forecast,period_id:0 +msgid "Shows which period this forecast concerns." +msgstr "" + +#. module: stock_planning +#: field:stock.planning,product_uom:0 +msgid "UoM" +msgstr "" + +#. module: stock_planning +#: view:stock.planning:0 +msgid "Calculated Period Simulation" +msgstr "" + +#. module: stock_planning +#: view:stock.planning:0 +#: field:stock.planning,product_id:0 +#: view:stock.sale.forecast:0 +#: field:stock.sale.forecast,product_id:0 +msgid "Product" +msgstr "" + +#. module: stock_planning +#: code:addons/stock_planning/stock_planning.py:638 +#: code:addons/stock_planning/stock_planning.py:680 +#, python-format +msgid "" +"\n" +"For period: " +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,product_uom:0 +msgid "Product UoM" +msgstr "" + +#. module: stock_planning +#: code:addons/stock_planning/stock_planning.py:627 +#: code:addons/stock_planning/stock_planning.py:673 +#: code:addons/stock_planning/stock_planning.py:697 +#, python-format +msgid "MPS(%s) %s" +msgstr "" + +#. module: stock_planning +#: code:addons/stock_planning/stock_planning.py:627 +#: code:addons/stock_planning/stock_planning.py:671 +#: code:addons/stock_planning/stock_planning.py:693 +#, python-format +msgid "MPS(" +msgstr "" + +#. module: stock_planning +#: code:addons/stock_planning/stock_planning.py:680 +#, python-format +msgid "" +"Pick created from MPS by user: %s Creation Date: %s " +" \n" +"For period: %s according to state: \n" +" Warehouse Forecast: %s \n" +" Initial Stock: %s \n" +" Planned Out: %s Planned In: %s \n" +" Already Out: %s Already In: %s \n" +" Confirmed Out: %s Confirmed In: %s \n" +" Planned Out Before: %s Confirmed In Before: %s " +" \n" +" Expected Out: %s Incoming Left: %s \n" +" Stock Simulation: %s Minimum stock: %s " +msgstr "" + +#. module: stock_planning +#: field:stock.planning,procure_to_stock:0 +msgid "Procure To Stock Location" +msgstr "" + +#. module: stock_planning +#: view:stock.sale.forecast:0 +msgid "Approve" +msgstr "" + +#. module: stock_planning +#: help:stock.planning,period_id:0 +msgid "" +"Period for this planning. Requisition will be created for beginning of the " +"period." +msgstr "" + +#. module: stock_planning +#: view:stock.sale.forecast:0 +msgid "Calculate Sales History" +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,product_amt:0 +msgid "Product Amount" +msgstr "" + +#. module: stock_planning +#: help:stock.planning,confirmed_forecasts_only:0 +msgid "" +"Check to take validated forecasts only. If not checked system takes " +"validated and draft forecasts." +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,analyzed_period5_id:0 +msgid "Period5" +msgstr "" + +#. module: stock_planning +#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form +msgid "Stock and Sales Planning Periods" +msgstr "" + +#. module: stock_planning +#: field:stock.sale.forecast,analyzed_warehouse_id:0 +msgid "This Warehouse" +msgstr "" + +#. module: stock_planning +#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form +#: model:ir.ui.menu,name:stock_planning.menu_stock_period +#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main +#: view:stock.period:0 +#: view:stock.period.createlines:0 +msgid "Stock and Sales Periods" +msgstr "" + +#. module: stock_planning +#: help:stock.sale.forecast,user_id:0 +msgid "Shows who created this forecast, or who validated." +msgstr "" + +#. module: stock_planning +#: code:addons/stock_planning/stock_planning.py:644 +#: code:addons/stock_planning/stock_planning.py:686 +#, python-format +msgid "" +"\n" +" Planned Out Before: " +msgstr "" + +#. module: stock_planning +#: field:stock.planning,stock_start:0 +msgid "Initial Stock" +msgstr "" From 87cb06d0d6754ef397b365ba0ea95a7f1838dd5b Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 4 May 2011 08:46:42 +0200 Subject: [PATCH 10/12] [IMP] remove timeouting XMLRPC socket bzr revid: xmo@openerp.com-20110504064642-48u0giakycwqufwr --- openerpweb/openerpweb.py | 3 --- openerpweb/xmlrpctimeout.py | 30 ------------------------------ 2 files changed, 33 deletions(-) delete mode 100644 openerpweb/xmlrpctimeout.py diff --git a/openerpweb/openerpweb.py b/openerpweb/openerpweb.py index 835d43ef358..19d6ec1eeb4 100644 --- a/openerpweb/openerpweb.py +++ b/openerpweb/openerpweb.py @@ -16,7 +16,6 @@ import cherrypy.lib.static import simplejson import nonliterals -import xmlrpctimeout import logging #----------------------------------------------------------- @@ -93,8 +92,6 @@ class OpenERPSession(object): self.client_timezone = False def proxy(self, service): - # TODO: correct this bug with timeout connections not working in python 2.7 - # s = xmlrpctimeout.TimeoutServerProxy('http://%s:%s/xmlrpc/%s' % (self._server, self._port, service), timeout=5) s = xmlrpclib.ServerProxy('http://%s:%s/xmlrpc/%s' % (self._server, self._port, service)) return s diff --git a/openerpweb/xmlrpctimeout.py b/openerpweb/xmlrpctimeout.py deleted file mode 100644 index 28f9bcd41bd..00000000000 --- a/openerpweb/xmlrpctimeout.py +++ /dev/null @@ -1,30 +0,0 @@ -import xmlrpclib -import httplib - -class TimeoutHTTPConnection(httplib.HTTPConnection): - def connect(self): - httplib.HTTPConnection.connect(self) - self.sock.settimeout(self.timeout) - -class TimeoutHTTP(httplib.HTTP): - _connection_class = TimeoutHTTPConnection - def set_timeout(self, timeout): - self._conn.timeout = timeout - -class TimeoutTransport(xmlrpclib.Transport): - def __init__(self, timeout=10, *l, **kw): - xmlrpclib.Transport.__init__(self,*l,**kw) - self.timeout=timeout - def make_connection(self, host): - conn = TimeoutHTTP(host) - conn.set_timeout(self.timeout) - return conn - -class TimeoutServerProxy(xmlrpclib.ServerProxy): - def __init__(self,uri,timeout=10,*l,**kw): - kw['transport']=TimeoutTransport(timeout=timeout, use_datetime=kw.get('use_datetime',0)) - xmlrpclib.ServerProxy.__init__(self,uri,*l,**kw) - -if __name__ == "__main__": - s=TimeoutServerProxy('http://127.0.0.1:9090',timeout=2) - s.dummy() From fa99ebc9f9de011bc16012a963365c836c431672 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 4 May 2011 09:35:47 +0200 Subject: [PATCH 11/12] [FIX] window.openerp.base.form now depends on window.openerp.base.list... bzr revid: xmo@openerp.com-20110504073547-i5hs96a1wk2jltjc --- addons/base/static/test/form.js | 1 + addons/base/static/test/list.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/base/static/test/form.js b/addons/base/static/test/form.js index 6ae1719f620..cf1f49f93cd 100644 --- a/addons/base/static/test/form.js +++ b/addons/base/static/test/form.js @@ -7,6 +7,7 @@ $(document).ready(function () { // views loader stuff window.openerp.base.data(openerp); window.openerp.base.views(openerp); + window.openerp.base.list(openerp); window.openerp.base.form(openerp); } }); diff --git a/addons/base/static/test/list.js b/addons/base/static/test/list.js index 92d0bdd5fd5..86cc088311e 100644 --- a/addons/base/static/test/list.js +++ b/addons/base/static/test/list.js @@ -26,8 +26,8 @@ $(document).ready(function () { // views loader stuff window.openerp.base.data(openerp); window.openerp.base.views(openerp); - window.openerp.base.form(openerp); window.openerp.base.list(openerp); + window.openerp.base.form(openerp); } }); From 0f6e4b72d509f40c78aaabf59e067d42e3c53882 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 4 May 2011 09:36:29 +0200 Subject: [PATCH 12/12] [REM] useless TODO, fix the tests when you've broken them bzr revid: xmo@openerp.com-20110504073629-lam2vv6irq3pv99p --- addons/base/static/test/dates.js | 1 - 1 file changed, 1 deletion(-) delete mode 100644 addons/base/static/test/dates.js diff --git a/addons/base/static/test/dates.js b/addons/base/static/test/dates.js deleted file mode 100644 index 3973f73e1a8..00000000000 --- a/addons/base/static/test/dates.js +++ /dev/null @@ -1 +0,0 @@ -// TODO when the tests will not be broken anymore \ No newline at end of file