+
+
@@ -55,78 +53,61 @@
-
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- From:
- Subject:
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index 9dd5d1afb0e..0ac0c02540f 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -21,19 +21,18 @@
- Production Dashboard
+ Manufacturing
board.board
form
form
-
-
+
diff --git a/addons/pad_project/i18n/sv.po b/addons/pad_project/i18n/sv.po
new file mode 100644
index 00000000000..fef26a15515
--- /dev/null
+++ b/addons/pad_project/i18n/sv.po
@@ -0,0 +1,38 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR
, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-06-20 15:16+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Swedish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-21 05:25+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr "Fel ! Aktivitetens slutdatum måste komma efter startdatumet"
+
+#. module: pad_project
+#: model:ir.model,name:pad_project.model_project_task
+msgid "Task"
+msgstr "Aktivitet"
+
+#. module: pad_project
+#: view:project.task:0
+msgid "Pad"
+msgstr "Pad"
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Fel ! Du kan inte skapa rekursiva aktiviteter"
diff --git a/addons/product/i18n/zh_CN.po b/addons/product/i18n/zh_CN.po
index c321d75611c..5a2fe1756b2 100644
--- a/addons/product/i18n/zh_CN.po
+++ b/addons/product/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 17:16+0000\n"
-"Last-Translator: Jeff Wang \n"
+"PO-Revision-Date: 2012-06-21 02:47+0000\n"
+"Last-Translator: Wei \"oldrev\" Li \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: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
@@ -53,11 +53,11 @@ msgid ""
"Otherwise, this includes goods stored in any Stock Location typed as "
"'internal'."
msgstr ""
-"预测数量(计算公式:在库数量 - 将要出库 + 将要入库 )。\n"
-"针对库位来说,包含该库位及其子库位的存货数量。\n"
-"针对仓库来说,包含该仓库所有子库位,及其下级库位的存货数量。\n"
-"对于门店,包含该门店对应的仓库的所有子库位,及其下级库位的存货数量。\n"
-"其他情况下,包含存储在类型为“内部”的库位中的存货数量。"
+"预计数量(计算公式:在手数量 - 将要出库 + 将要入库 )。\n"
+"对库位,包含该库位及其子库位的存货数量。\n"
+"对仓库,包含该仓库所有库位的存货数量。\n"
+"对门店,包含该门店仓库的存货数量。\n"
+"其它情况下,为“内部”类型库位的存货数量。"
#. module: product
#: model:product.category,name:product.cat1
@@ -92,7 +92,7 @@ msgstr "基本配置 PC 组装订单"
#. module: product
#: field:product.product,incoming_qty:0
msgid "Incoming"
-msgstr "接收"
+msgstr "入库"
#. module: product
#: help:res.partner,property_product_pricelist:0
@@ -141,7 +141,7 @@ msgstr "规则名称"
#: field:product.product,code:0
#: field:product.product,default_code:0
msgid "Reference"
-msgstr "编号"
+msgstr "相关单号"
#. module: product
#: help:pricelist.partnerinfo,min_quantity:0
@@ -166,7 +166,7 @@ msgstr "业务伙伴"
msgid ""
"Conversion from Product UoM %s to Default UoM %s is not possible as they "
"both belong to different Category!."
-msgstr "产品单位 %s 与默认单位 %s 无法转换,二者属于不同的分类。"
+msgstr "产品单位 %s 与默认单位 %s 无法转换,二者属于不同的类别!"
#. module: product
#: model:product.uom,name:product.product_uom_dozen
@@ -211,12 +211,12 @@ msgstr "个"
#. module: product
#: view:product.template:0
msgid "Miscelleanous"
-msgstr "其他"
+msgstr "杂项"
#. module: product
#: model:product.template,name:product.product_product_worker0_product_template
msgid "Worker"
-msgstr "作业员"
+msgstr "员工"
#. module: product
#: help:product.template,sale_ok:0
@@ -268,7 +268,7 @@ msgstr "产品: "
#. module: product
#: field:product.category,parent_id:0
msgid "Parent Category"
-msgstr "上级分类"
+msgstr "上级类别"
#. module: product
#: help:product.template,procure_method:0
@@ -276,7 +276,9 @@ msgid ""
"'Make to Stock': When needed, take from the stock or wait until re-"
"supplying. 'Make to Order': When needed, purchase or produce for the "
"procurement request."
-msgstr "按库存生产: 在仓库或等待重新供应时得到需求。按订单生产: 在采购或产品获得请求时得到需求。"
+msgstr ""
+"按库存生产: 在库存或等待重新供应时得到需求。\r\n"
+"按订单生产: 被采购或产品有需求时。"
#. module: product
#: model:process.node,note:product.process_node_supplier0
@@ -291,7 +293,7 @@ msgstr "希捷 7200.8 160GB 硬盘"
#. module: product
#: field:product.product,ean13:0
msgid "EAN13"
-msgstr "条形码"
+msgstr "条形码(EAN13)"
#. module: product
#: field:product.template,seller_id:0
@@ -312,7 +314,7 @@ msgstr "包装"
#: view:product.product:0
#: field:product.template,categ_id:0
msgid "Category"
-msgstr "分类"
+msgstr "类别"
#. module: product
#: help:product.pricelist.item,min_quantity:0
@@ -328,7 +330,7 @@ msgstr "木材 2mm"
#. module: product
#: field:product.price_list,qty1:0
msgid "Quantity-1"
-msgstr "数量1"
+msgstr "数量-1"
#. module: product
#: help:product.packaging,ul_qty:0
@@ -350,17 +352,17 @@ msgstr "状态"
#. module: product
#: help:product.template,categ_id:0
msgid "Select category for the current product"
-msgstr "为当前产品选择一个分类"
+msgstr "为当前产品选择一个类别"
#. module: product
#: field:product.product,outgoing_qty:0
msgid "Outgoing"
-msgstr "发出"
+msgstr "出仓"
#. module: product
#: selection:product.uom,uom_type:0
msgid "Reference UoM for this category"
-msgstr "参考此分类的计量单位"
+msgstr "此类别的计量单位"
#. module: product
#: model:product.price.type,name:product.list_price
@@ -371,7 +373,7 @@ msgstr "公开价格"
#. module: product
#: field:product.price_list,qty5:0
msgid "Quantity-5"
-msgstr "数量5"
+msgstr "数量-5"
#. module: product
#: model:product.category,name:product.product_category_10
@@ -415,11 +417,11 @@ msgid ""
"Otherwise, this includes goods stored in any Stock Location typed as "
"'internal'."
msgstr ""
-"在库数量。\n"
-"针对库位来说,包含该库位及其子库位的存货数量。\n"
-"针对仓库来说,包含该仓库所有子库位,及其下级库位的存货数量。\n"
-"对于门店,包含该门店对应的仓库的所有子库位,及其下级库位的存货数量。\n"
-"其他情况下,包含存储在类型为“内部”的库位中的存货数量。"
+"当前的产品数量。\n"
+"对库位,包含该库位和子库位的存货数量。\n"
+"对仓库,包含该仓库所有库位的存货数量。\n"
+"对门店,包含该门店仓库的所有存货数量。\n"
+"其它情况下,为“内部”类型库位的存货数量。"
#. module: product
#: view:product.pricelist:0
@@ -483,12 +485,12 @@ msgstr "业务伙伴信息"
#. module: product
#: field:product.price_list,qty2:0
msgid "Quantity-2"
-msgstr "数量2"
+msgstr "数量-2"
#. module: product
#: field:product.price_list,qty3:0
msgid "Quantity-3"
-msgstr "数量3"
+msgstr "数量-3"
#. module: product
#: view:product.product:0
@@ -498,7 +500,7 @@ msgstr "代码"
#. module: product
#: field:product.price_list,qty4:0
msgid "Quantity-4"
-msgstr "数量4"
+msgstr "数量-4"
#. module: product
#: view:res.partner:0
@@ -532,12 +534,12 @@ msgstr "金属螺栓"
#: code:addons/product/product.py:175
#, python-format
msgid "Cannot change the category of existing UoM '%s'."
-msgstr "不能修改已存在计量单位的分类“%s”"
+msgstr "不能修改已存在计量单位的类别“%s”"
#. module: product
#: model:ir.model,name:product.model_product_uom_categ
msgid "Product uom categ"
-msgstr "产品计量单位分类"
+msgstr "产品计量单位类别"
#. module: product
#: model:product.ul,name:product.product_ul_box
@@ -557,7 +559,7 @@ msgstr "产品销售单位视图"
#. module: product
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
-msgstr "可被采购"
+msgstr "可采购"
#. module: product
#: model:product.template,name:product.product_product_cpu2_product_template
@@ -576,7 +578,7 @@ msgstr "1个或多个供应商能关联到一个产品,所有信息委员产品
msgid ""
"Quantity conversions may happen automatically between Units of Measure in "
"the same category, according to their respective ratios."
-msgstr "同一分组内的计量单位按照各自的比率自动发生转换."
+msgstr "同一类别内的计量单位按照各自的比率自动发生转换。"
#. module: product
#: help:product.packaging,width:0
@@ -711,11 +713,11 @@ msgid ""
"Otherwise, this includes goods arriving to any Stock Location typed as "
"'internal'."
msgstr ""
-"待收货数量。\n"
-"针对库位来说,包含该库位及其子库位的待收货数量。\n"
-"针对仓库来说,包含该仓库所有子库位,及其下级库位的待收货数量。\n"
-"对于门店,包含该门店对应的仓库的所有子库位,及其下级库位的待收货数量。\n"
-"其他情况下,包含存储在类型为“内部”的库位中的待收货数量。"
+"计划到货的产品数量。\n"
+"对库位,包含该库位及其子库位的待收货数量。\n"
+"对仓库,包含该仓库所有库位的待收货数量。\n"
+"对门店,包含该门店仓库的待收货数量。\n"
+"其它情况下,为“内部”类型库位的待收货数量。"
#. module: product
#: model:product.template,name:product.product_product_woodentable0_product_template
@@ -799,7 +801,7 @@ msgstr "最小上浮金额"
#. module: product
#: field:product.category,child_id:0
msgid "Child Categories"
-msgstr "子类"
+msgstr "子类别"
#. module: product
#: field:product.pricelist.version,date_end:0
@@ -877,7 +879,7 @@ msgstr "开发中"
#: code:addons/product/product.py:363
#, python-format
msgid "UoM categories Mismatch!"
-msgstr "计量单位分类不匹配!"
+msgstr "计量单位类别不匹配!"
#. module: product
#: model:product.template,name:product.product_product_shelfofcm1_product_template
@@ -928,7 +930,7 @@ msgstr "DDR 256MB PC400"
#: model:ir.ui.menu,name:product.menu_product_category_action_form
#: view:product.category:0
msgid "Product Categories"
-msgstr "产品分类"
+msgstr "产品类别"
#. module: product
#: view:product.uom:0
@@ -941,7 +943,7 @@ msgid ""
"Create and manage the units of measure you want to be used in your system. "
"You can define a conversion rate between several Units of Measure within the "
"same category."
-msgstr "创建与管理系统中的计量单位信息。您可以定义统一分类下单位之间的转换比率。"
+msgstr "创建与管理系统中的计量单位信息。您可以定义同一类别下几个计量单位之间的转换比率。"
#. module: product
#: field:product.packaging,weight:0
@@ -1077,7 +1079,7 @@ msgid ""
"your system. If several units of measure are in the same category, they can "
"be converted to each other. For example, in the unit of measure category "
"\"Time\", you will have the following UoM: Hours, Days."
-msgstr "创建与管理系统中的计量单位分类信息。统一分类的计量单位可以互相转换,比如,“时间”分类下的计量单位包含:小时、天等等"
+msgstr "创建与管理系统中的计量单位类别信息。同一类别下的计量单位可以互相转换,比如,“时间”类别下的计量单位包含:小时、天等等"
#. module: product
#: selection:product.uom,uom_type:0
@@ -1107,11 +1109,11 @@ msgid ""
"Otherwise, this includes goods leaving from any Stock Location typed as "
"'internal'."
msgstr ""
-"待发货数量。\n"
-"针对库位来说,包含该库位及其子库位的待发货数量。\n"
-"针对仓库来说,包含该仓库所有子库位,及其下级库位的待发货数量。\n"
-"对于门店,包含该门店对应的仓库的所有子库位,及其下级库位的待发货数量。\n"
-"其他情况下,包含存储在类型为“内部”的库位中的待发货数量。"
+"计划发货数量。\n"
+"对库位,包含该库位及其子库位的待发货数量。\n"
+"对仓库,包含该仓库所有库位的待发货数量。\n"
+"对门店,包含该门店仓库的待发货数量。\n"
+"其它情况下,为“内部”类型库位的待发货数量。"
#. module: product
#: model:product.category,name:product.product_category_services0
@@ -1161,7 +1163,7 @@ msgid ""
"contains detailed information about your products related to procurement "
"logistics, sales price, product category, suppliers and so on."
msgstr ""
-"您必须定义产品信息用于您的销售或采购。产品可以是原材料、可库存商品、消耗品或服务。产品表单包含产品相关的生产物流、售价、分类、供应商等等信息。"
+"您必须定义产品信息用于您的销售或采购。产品可以是原材料、可库存商品、消耗品或服务。产品表单包含产品相关的生产物流、售价、类别、供应商等等信息。"
#. module: product
#: model:product.uom,name:product.product_uom_kgm
@@ -1419,7 +1421,7 @@ msgstr "重量"
#. module: product
#: field:product.uom,category_id:0
msgid "UoM Category"
-msgstr "计量单位分类"
+msgstr "计量单位类别"
#. module: product
#: field:product.template,loc_rack:0
@@ -1442,7 +1444,7 @@ msgid ""
"Here is a list of all your products classified by category. You can click a "
"category to get the list of all products linked to this category or to a "
"child of this category."
-msgstr "此处是所有产品的分类表。您可以单击一个分类来查看该分类下的所有产品或下级分类。"
+msgstr "此处是所有产品的类别表。您可以单击一个类别来查看该类别下的所有产品或下级类别。"
#. module: product
#: view:product.product:0
@@ -1502,7 +1504,7 @@ msgstr "产品计量单位"
#: constraint:product.template:0
msgid ""
"Error: The default UOM and the purchase UOM must be in the same category."
-msgstr "错误:默认计量单位和采购计量单位必须在同一分类中。"
+msgstr "错误:默认计量单位和采购计量单位必须是同一类别中。"
#. module: product
#: field:product.uom,rounding:0
@@ -1527,7 +1529,7 @@ msgstr "购买"
#. module: product
#: view:product.uom.categ:0
msgid "Units of Measure categories"
-msgstr "计量单位分类"
+msgstr "计量单位类别"
#. module: product
#: help:product.packaging,weight_ul:0
@@ -1669,7 +1671,7 @@ msgstr "保证期(月)"
msgid ""
"Set a category of product if this rule only apply to products of a category "
"and his children. Keep empty for all products"
-msgstr "指定此规则要应用到的产品分类及其下级分类,如果为空则应用于所有产品。"
+msgstr "指定此规则要应用到的产品类别及其下级类别,如果为空则应用于所有产品。"
#. module: product
#: model:ir.model,name:product.model_product_product
@@ -1709,7 +1711,7 @@ msgstr "系列型号"
#: model:ir.actions.act_window,name:product.product_category_action
#: model:ir.ui.menu,name:product.menu_products_category
msgid "Products by Category"
-msgstr "产品分类"
+msgstr "产品类别"
#. module: product
#: field:product.template,uos_coeff:0
@@ -1809,7 +1811,7 @@ msgstr "价格表版本生效的开始日期"
msgid ""
"Default Unit of Measure used for purchase orders. It must be in the same "
"category than the default unit of measure."
-msgstr "采购单默认使用的计量单位。必须与默认计量单位位于相同分类中。"
+msgstr "采购单默认使用的计量单位。必须与默认计量单位位于同一类别。"
#. module: product
#: model:product.template,description:product.product_product_cpu1_product_template
@@ -1855,7 +1857,7 @@ msgstr "特征"
#. module: product
#: field:product.template,sale_ok:0
msgid "Can be Sold"
-msgstr "可以卖出"
+msgstr "可销售"
#. module: product
#: field:product.template,produce_delay:0
@@ -1934,7 +1936,7 @@ msgstr "100cm 架子"
#: model:ir.model,name:product.model_product_category
#: field:product.pricelist.item,categ_id:0
msgid "Product Category"
-msgstr "产品分类"
+msgstr "产品类别"
#. module: product
#: report:product.pricelist:0
@@ -1957,7 +1959,7 @@ msgstr "如果您取消选定“可用”字段的话可以隐藏此计量单位
#: model:ir.actions.act_window,name:product.product_uom_categ_form_action
#: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action
msgid "UoM Categories"
-msgstr "计量单位分类"
+msgstr "计量单位类别"
#. module: product
#: field:product.template,seller_delay:0
@@ -2337,12 +2339,12 @@ msgstr "标价"
#. module: product
#: constraint:product.category:0
msgid "Error ! You cannot create recursive categories."
-msgstr "错误!您不能创建循环分类。"
+msgstr "错误!您不能创建循环的类别。"
#. module: product
#: field:product.category,type:0
msgid "Category Type"
-msgstr "分类类型"
+msgstr "类属"
#. module: product
#: model:product.category,name:product.cat2
diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index 2c53fc2a28a..2c38b2e56c1 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -54,7 +54,6 @@ Dashboard for project members that includes:
"res_partner_view.xml",
"report/project_report_view.xml",
"board_project_view.xml",
- 'board_project_manager_view.xml',
'report/project_cumulative.xml',
'res_config_view.xml',
],
diff --git a/addons/project/board_project_manager_view.xml b/addons/project/board_project_manager_view.xml
deleted file mode 100644
index d9340eefb3a..00000000000
--- a/addons/project/board_project_manager_view.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index df35534659d..09a7fe57bab 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -2,14 +2,48 @@
-
+
+ project.vs.remaining.hour.tree
+ project.vs.hours
+ tree
+
+
+
+
+
+
+
+
+
+
+ project.vs.remaining.hour.graph
+ project.vs.hours
+ graph
+
+
+
+
+
+
+
+
+
+
+ Remaining Hours Per Project
+ project.vs.hours
+ form
+ graph,tree
+ [('user_id','=',uid),('state','not in',('cancel','done'))]
+
+
+
project.task.tree
project.task
tree
-
+
@@ -23,50 +57,12 @@
-
- project.task.delegated.tree
- project.task
- tree
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- My Open Tasks
+ My Tasks
project.task
form
tree,form
- [('user_id','=',uid),('state','=','open')]
-
-
-
-
- My Delegated Tasks
- project.task
- form
- tree,form
- [('parent_ids.user_id','=',uid),('state', 'in', ('draft','open','pending'))]
-
-
-
-
- My Task's Deadlines
- project.task
- form
- tree,form
- [('user_id','=',uid),('state','=','open'),('date_deadline','<>',False)]
+ [('user_id','=',uid),('state','not in',('cancel','done'))]
@@ -78,11 +74,10 @@
@@ -90,7 +85,7 @@
- Project Dashboard
+ Project
board.board
form
form
@@ -98,19 +93,10 @@
-
-
-
+
diff --git a/addons/project/i18n/ja.po b/addons/project/i18n/ja.po
index 1021622f637..23af8d1c547 100644
--- a/addons/project/i18n/ja.po
+++ b/addons/project/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-06-11 23:07+0000\n"
+"PO-Revision-Date: 2012-06-20 17:12+0000\n"
"Last-Translator: Akira Hiyama \n"
"Language-Team: Japanese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-13 04:55+0000\n"
-"X-Generator: Launchpad (build 15389)\n"
+"X-Launchpad-Export-Date: 2012-06-21 05:16+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1931,7 +1931,7 @@ msgstr "タスク %s はキャンセル済です。"
#. module: project
#: view:project.task:0 view:res.partner:0
msgid "For changing to open state"
-msgstr "状態を開くと目の変更"
+msgstr "開く状態に変更"
#. module: project
#: model:ir.model,name:project.model_res_partner view:project.project:0
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index d9cba469bc4..f883f007bd6 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -361,7 +361,6 @@
-
@@ -385,15 +384,16 @@
-