[merge]

bzr revid: rvalyi@gmail.com-20100716170425-0dclsuqucwt7p0u6
bzr revid: rvalyi@gmail.com-20100716185348-fp5mmaunjaag21o5
bzr revid: rvalyi@gmail.com-20100718201931-m2c3clfyb0nmt2b1

addons/account/i18n/zh_CN.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-16 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-07-17 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account

addons/account_anglo_saxon/i18n/nl.po

@@ -0,0 +1,66 @@
+# Dutch translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-24 12:50+0000\n"
+"PO-Revision-Date: 2010-07-16 15:49+0000\n"
+"Last-Translator: Jan Verlaan (Veritos) <Unknown>\n"
+"Language-Team: Dutch <nl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-07-17 03:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
+msgid ""
+"This module will support the Anglo-Saxons accounting methodology by \n"
+"    changing the accounting logic with stock transactions. The difference "
+"between the Anglo-Saxon accounting countries \n"
+"    and the Rhine or also called Continental accounting countries is the "
+"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
+"    Anglo-Saxons accounting does take the cost when sales invoice is "
+"created, Continental accounting will take the cost at he moment the goods "
+"are shipped.\n"
+"    This module will add this functionality by using a interim account, to "
+"store the value of shipped goods and will contra book this interim account \n"
+"    when the invoice is created to transfer this amount to the debtor or "
+"creditor account."
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
+msgid "Stock Account"
+msgstr "Voorraadrekening"
+
+#. module: account_anglo_saxon
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Ongeldige XML, kan overzicht niet weergeven!"
+
+#. module: account_anglo_saxon
+#: field:product.category,property_account_creditor_price_difference_categ:0
+#: field:product.template,property_account_creditor_price_difference:0
+msgid "Price Difference Account"
+msgstr "Prijsverschillen rekening"
+
+#. module: account_anglo_saxon
+#: help:product.category,property_account_creditor_price_difference_categ:0
+#: help:product.template,property_account_creditor_price_difference:0
+msgid ""
+"This account will be used to value price difference between purchase price "
+"and cost price."
+msgstr ""
+"Deze rekening wordt gebruikt om de prijsverschillen tussen inkoop- en "
+"kostprijs te boeken."

addons/base_contact/i18n/zh_CN.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-29 00:51+0000\n"
-"Last-Translator: digitalsatori <Unknown>\n"
+"PO-Revision-Date: 2010-07-17 09:25+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
@@ -30,7 +30,7 @@ msgstr ""
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须是以x_开头并且不能含有特殊字符"
+msgstr "对象名必须以x_开头并且不能包含特殊字符"
 
 #. module: base_contact
 #: field:res.partner.job,function_id:0
@@ -45,7 +45,7 @@ msgstr "业务伙伴职能"
 #: view:res.partner.address:0
 #: field:res.partner.address,job_ids:0
 msgid "Contacts"
-msgstr "联系人列表"
+msgstr "联系"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_partner:0
@@ -60,7 +60,7 @@ msgstr "当前"
 #. module: base_contact
 #: field:res.partner.contact,first_name:0
 msgid "First Name"
-msgstr "名"
+msgstr "名字"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_job
@@ -80,7 +80,7 @@ msgstr "联系人到职能"
 #. module: base_contact
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在动作定义中使用了无效的模快名。"
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_partnertoaddress0
@@ -90,7 +90,7 @@ msgstr "业务伙伴到地址"
 #. module: base_contact
 #: view:res.partner.address:0
 msgid "# of Contacts"
-msgstr "个联系人"
+msgstr "# 联系人"
 
 #. module: base_contact
 #: help:res.partner.job,other:0
@@ -142,7 +142,7 @@ msgstr "基本联系人管理模块"
 msgid ""
 "Order of importance of this job title in the list of job title of the linked "
 "partner"
-msgstr ""
+msgstr "链接业务伙伴按职称按重要性排序的列表"
 
 #. module: base_contact
 #: field:res.partner.contact,email:0
@@ -153,19 +153,19 @@ msgstr "电子邮件"
 #. module: base_contact
 #: field:res.partner.job,date_stop:0
 msgid "Date Stop"
-msgstr "停止时间"
+msgstr "停止日期"
 
 #. module: base_contact
 #: view:res.partner:0
 #: field:res.partner.job,address_id:0
 msgid "Address"
-msgstr "地址:"
+msgstr "地址"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_res_partner_job
 #: model:ir.ui.menu,name:base_contact.menu_action_res_partner_job
 msgid "Contact's Jobs"
-msgstr "联系人工作"
+msgstr "联系人职务"
 
 #. module: base_contact
 #: field:res.partner.contact,country_id:0
@@ -177,7 +177,7 @@ msgstr "国籍"
 msgid ""
 "Order of importance of this address in the list of addresses of the linked "
 "contact"
-msgstr ""
+msgstr "链接联系人按地址重要性排序的地址列表"
 
 #. module: base_contact
 #: field:res.partner.address,job_id:0
@@ -203,7 +203,7 @@ msgstr "定义业务伙伴和地址"
 #. module: base_contact
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图结构"
+msgstr "无效的视图结构xml文件!"
 
 #. module: base_contact
 #: model:process.process,name:base_contact.process_process_basecontactprocess0
@@ -218,7 +218,7 @@ msgstr "序号"
 #. module: base_contact
 #: field:res.partner.job,extension:0
 msgid "Extension"
-msgstr ""
+msgstr "扩展"
 
 #. module: base_contact
 #: field:res.partner.contact,mobile:0
@@ -311,7 +311,7 @@ msgstr "省/ 州"
 #: view:res.partner.contact:0
 #: view:res.partner.job:0
 msgid "General"
-msgstr "常规"
+msgstr "一般"
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
@@ -321,7 +321,7 @@ msgstr "过去"
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "General Information"
-msgstr "通用信息"
+msgstr "一般信息"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_function0
@@ -336,7 +336,7 @@ msgstr "业务伙伴"
 #. module: base_contact
 #: field:res.partner.job,date_start:0
 msgid "Date Start"
-msgstr "开始时间"
+msgstr "开始日期"
 
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_functiontoaddress0

addons/base_iban/i18n/zh_CN.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 07:35+0000\n"
+"PO-Revision-Date: 2010-07-17 09:28+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
@@ -34,7 +34,7 @@ msgstr "银行帐号"
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_country_field
 msgid "country_id"
-msgstr "国家 - ID"
+msgstr "country_id"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_swift_field
@@ -60,7 +60,7 @@ msgstr "IBAN帐号"
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_acc_number_field
 msgid "acc_number"
-msgstr "账号"
+msgstr "acc_number"
 
 #~ msgid ""
 #~ "\n"

addons/base_module_quality/i18n/zh_CN.po

@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-06-09 16:41+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-07-17 09:42+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:19+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
@@ -61,14 +61,14 @@ msgstr "详细信息"
 #. module: base_module_quality
 #: field:module.quality.detail,ponderation:0
 msgid "Ponderation"
-msgstr ""
+msgstr "考虑"
 
 #. module: base_module_quality
 #: help:module.quality.detail,ponderation:0
 msgid ""
 "Some tests are more critical than others, so they have a bigger weight in "
 "the computation of final rating"
-msgstr ""
+msgstr "一些测试比其他更重要, 所以它们在计算最终等级时占更大分量."
 
 #. module: base_module_quality
 #: view:module.quality.check:0
@@ -86,12 +86,12 @@ msgstr "已跳过"
 msgid ""
 "The test will be completed only if the module is installed or if the test "
 "may be processed on uninstalled module."
-msgstr "只有模块已经安装或测试能在已卸载的模块上运行的情况下测试才能完成。"
+msgstr "只有模块已安装或如果测试能在已卸载的模块上运行, 测试才能完成."
 
 #. module: base_module_quality
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图结构"
+msgstr "无效的视图结构xml文件!"
 
 #. module: base_module_quality
 #: model:ir.model,name:base_module_quality.model_module_quality_check
@@ -116,7 +116,7 @@ msgstr "文件名"
 #. module: base_module_quality
 #: field:module.quality.detail,score:0
 msgid "Score (%)"
-msgstr ""
+msgstr "评分(%)"
 
 #. module: base_module_quality
 #: help:quality_detail_save,init,name:0
@@ -137,7 +137,7 @@ msgstr "保存报告"
 #. module: base_module_quality
 #: wizard_view:quality_detail_save,init:0
 msgid "Standard entries"
-msgstr ""
+msgstr "普通记录"
 
 #. module: base_module_quality
 #: view:module.quality.detail:0

addons/base_module_record/i18n/zh_CN.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 07:36+0000\n"
+"PO-Revision-Date: 2010-07-17 09:51+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
@@ -66,7 +66,7 @@ msgstr "只记录"
 #: selection:base_module_record.module_record_objects,intro,data_kind:0
 #: selection:base_module_record.module_save,info,data_kind:0
 msgid "Demo Data"
-msgstr "示范数据"
+msgstr "演示数据"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,save,module_filename:0
@@ -173,7 +173,7 @@ msgstr "记录信息"
 #: wizard_view:base_module_record.module_record_objects,save:0
 #: wizard_view:base_module_record.module_save,save:0
 msgid "Module successfully created !"
-msgstr "模块创建完成！"
+msgstr "模块已成功创建！"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,start:0
@@ -183,7 +183,7 @@ msgstr "停止记录"
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,init,filter_cond:0
 msgid "Created"
-msgstr "创建"
+msgstr "已创建"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,end:0
@@ -210,7 +210,7 @@ msgstr "修改"
 #. module: base_module_record
 #: selection:base_module_record.module_save,init,info_status:0
 msgid "Recording"
-msgstr "记录"
+msgstr "记录中"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_objects,init,record:0
@@ -275,7 +275,7 @@ msgstr "模块创建"
 msgid ""
 "You can continue the recording session by relauching the 'start recording' "
 "wizard."
-msgstr "你可以继续记录这会话.开始记录向导"
+msgstr "你可以继续记录这会话. '开始记录' 向导"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,data_kind:0
@@ -293,7 +293,7 @@ msgstr "模块信息"
 #: model:ir.actions.wizard,name:base_module_record.wizard_base_module_save
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_save
 msgid "Save Recorded Module"
-msgstr "保存记录"
+msgstr "保存记录模块"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,stop:0
@@ -314,7 +314,7 @@ msgstr "取消"
 #: wizard_button:base_module_record.module_record_objects,save,end:0
 #: wizard_button:base_module_record.module_save,save,end:0
 msgid "Close"
-msgstr "结束"
+msgstr "关闭"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,init,filter_cond:0

addons/base_report_creator/i18n/zh_CN.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 07:37+0000\n"
+"PO-Revision-Date: 2010-07-17 10:17+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -22,7 +22,7 @@ msgid ""
 "Provide an expression for the field based on which you want to filter the "
 "records.\n"
 " e.g. res_partner.id=3"
-msgstr "提供一个基于字段的表达式必须过滤记录 .例如res_partner.id=3"
+msgstr "提供一个基于字段过滤记录的表达式. 例如: res_partner.id=3"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_graph_type:0
@@ -47,7 +47,7 @@ msgstr "图形模式"
 #. module: base_report_creator
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在这动作定义中有无效的模块名"
+msgstr "在动作定义中使用了无效的模快名。"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
@@ -182,7 +182,7 @@ msgstr "开始日期"
 #. module: base_report_creator
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
+msgstr "无效的视图结构xml文件!"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_type1:0
@@ -209,7 +209,7 @@ msgstr "授权组(留空为所有)"
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Security"
-msgstr "安全"
+msgstr "安全设定"
 
 #. module: base_report_creator
 #: wizard_field:base_report_creator.report.menu.create,init,menu_name:0
@@ -242,7 +242,7 @@ msgstr "y轴"
 #: selection:base_report_creator.report,view_type2:0
 #: selection:base_report_creator.report,view_type3:0
 msgid "Calendar"
-msgstr "日程表"
+msgstr "日历"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_type1:0
@@ -274,7 +274,7 @@ msgstr "状态"
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_orientation:0
 msgid "Vertical"
-msgstr "垂直线"
+msgstr "纵向"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,type:0
@@ -299,12 +299,12 @@ msgstr "有效"
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_orientation:0
 msgid "Horizontal"
-msgstr "水平线"
+msgstr "横向"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,group_method:0
 msgid "Grouping Method"
-msgstr "图形模板"
+msgstr "分组方式"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.filter,condition:0
@@ -345,7 +345,7 @@ msgstr "打开报表"
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Grouped"
-msgstr "图形"
+msgstr "已分组"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
@@ -407,11 +407,9 @@ msgid ""
 "the \"Dashboard\" menu.\n"
 msgstr ""
 "这模块允许你创建任何统计\n"
-"报告几个对象,它是一SQL查询生成器和浏览器\n"
-"和用户\n"
+"报告几个对象, 它是一SQL查询生成器和浏览器\n"
 "\n"
-"安装模块后,它在控制台菜单增加一个自定义的报表菜单在\n"
-"控制台 的 菜单\n"
+"安装模块后, 它在控制台菜单增加一个自定义的报表菜单\n"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
@@ -456,7 +454,7 @@ msgstr "值"
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_type:0
 msgid "Bar Chart"
-msgstr "条线图"
+msgstr "柱状图表"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_type2:0

addons/base_report_designer/i18n/zh_CN.po

@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 07:37+0000\n"
+"PO-Revision-Date: 2010-07-17 10:22+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
 #: wizard_field:base_report_designer.modify,init,text:0
 msgid "Introduction"
-msgstr "介绍"
+msgstr "简介"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,send_form:0
@@ -98,7 +98,7 @@ msgid ""
 "open it with OpenOffice. Don't forget to install the Tiny OpenOffice package "
 "to modify it. Once it is modified, re-upload it in Open ERP using this "
 "wizard."
-msgstr "这是你要求报表的模板.保存为一个.SXW文件和用openoffice打开和修改.修改后使用这个向导重新上传"
+msgstr "这是你要求报表的模板. 保存为一个.SXW文件和用openoffice打开和修改. 修改后使用这个向导重新上传"
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,send_form,send_form_result:0

addons/base_setup/i18n/zh_CN.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 07:37+0000\n"
+"PO-Revision-Date: 2010-07-17 10:27+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
@@ -84,12 +84,12 @@ msgstr "电子邮件"
 #: wizard_field:base_setup.base_setup,init,state_id:0
 #: wizard_field:base_setup.base_setup,update,state_id:0
 msgid "State"
-msgstr "省市"
+msgstr "省/州"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,finish:0
 msgid "Your new database is now fully installed."
-msgstr "新账套已安装完毕."
+msgstr "新帐套已安装完毕."
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,profile:0

addons/board/i18n/zh_CN.po

@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 07:37+0000\n"
+"PO-Revision-Date: 2010-07-17 14:45+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board
@@ -30,12 +30,12 @@ msgstr "控制台"
 #. module: board
 #: field:board.note,user_id:0
 msgid "Author"
-msgstr "建立者"
+msgstr "作者"
 
 #. module: board
 #: model:ir.module.module,shortdesc:board.module_meta_information
 msgid "Dashboard main module"
-msgstr "控制台主要模块"
+msgstr "控制面板主要模块"
 
 #. module: board
 #: view:board.note:0
@@ -51,7 +51,7 @@ msgstr "宽度"
 #. module: board
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在动作定义中使用了无效的模快名。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: board
 #: field:board.board.line,name:0
@@ -62,7 +62,7 @@ msgstr "标题"
 #: model:ir.actions.act_window,name:board.action_view_board_list_form
 #: model:ir.ui.menu,name:board.menu_view_board_form
 msgid "Dashboard Definition"
-msgstr "控制台定义"
+msgstr "控制面板定义"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_view_board_note_form
@@ -103,12 +103,12 @@ msgstr "备注类型"
 #. module: board
 #: wizard_view:board.board.menu.create,init:0
 msgid "Create Menu For Dashboard"
-msgstr "创建控制台菜单"
+msgstr "创建控制面板菜单"
 
 #. module: board
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
+msgstr "无效的视图结构xml文件!"
 
 #. module: board
 #: wizard_field:board.board.menu.create,init,menu_parent_id:0
@@ -130,12 +130,12 @@ msgstr "备注类型"
 #: field:board.board,name:0
 #: field:board.board.line,board_id:0
 msgid "Dashboard"
-msgstr "控制台"
+msgstr "控制面板"
 
 #. module: board
 #: model:ir.module.module,description:board.module_meta_information
 msgid "Base module for all dashboards."
-msgstr "所有控制台的基础模块"
+msgstr "所有控制面板的基础模块"
 
 #. module: board
 #: field:board.board.line,position:0
@@ -145,7 +145,7 @@ msgstr "位置"
 #. module: board
 #: model:ir.actions.act_window,name:board.dashboard_open
 msgid "Open Dashboard"
-msgstr "打开控制台"
+msgstr "打开控制面板"
 
 #. module: board
 #: wizard_field:board.board.menu.create,init,menu_name:0
@@ -186,7 +186,7 @@ msgstr "创建菜单"
 #. module: board
 #: model:ir.ui.menu,name:board.dashboard_menu
 msgid "Dashboards"
-msgstr "控制台"
+msgstr "控制面板"
 
 #. module: board
 #: field:board.board.line,height:0
@@ -206,7 +206,7 @@ msgstr "取消"
 #. module: board
 #: view:board.board:0
 msgid "Dashboard View"
-msgstr "控制台视图"
+msgstr "控制面板视图"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board_line
@@ -218,5 +218,13 @@ msgstr "控制台明细"
 msgid "Subject"
 msgstr "主题"
 
+#, python-format
+#~ msgid "User Error!"
+#~ msgstr "用户错误！"
+
+#, python-format
+#~ msgid "Please Insert Dashboard View(s) !"
+#~ msgstr "请插入看板视图！"
+
 #~ msgid "Action"
 #~ msgstr "动作"

addons/crm/i18n/zh_CN.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-03-29 13:14+0000\n"
-"Last-Translator: darkblue <darkblue086@yahoo.com.cn>\n"
+"PO-Revision-Date: 2010-07-18 03:06+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -26,23 +26,23 @@ msgstr "发送到"
 msgid ""
 "This property defines the list                 of date/time exceptions for "
 "arecurring calendar component."
-msgstr ""
+msgstr "这属性定义了一个循环的日历组件的例外日期/ 时间列表"
 
 #. module: crm
 #: help:crm.case.rule,act_mail_to_user:0
 msgid ""
 "Check this if you want the rule to send an email to the responsible person."
-msgstr ""
+msgstr "如果你想定规则发送电子邮件给负责人选这个"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Title"
-msgstr ""
+msgstr "标题"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ2
 msgid "Cases by section and category2"
-msgstr ""
+msgstr "分类2和部分业务个案"
 
 #. module: crm
 #: wizard_field:crm.lead.partner_create,init,close:0
@@ -60,27 +60,27 @@ msgstr "    7天    "
 #. module: crm
 #: help:crm.menu.config_wizard,helpdesk:0
 msgid "Manages an Helpdesk service."
-msgstr "管理求助台服务"
+msgstr "管理求助服务"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Pending Jobs"
-msgstr ""
+msgstr "等待的工作"
 
 #. module: crm
 #: field:crm.case.rule,trg_state_to:0
 msgid "Button Pressed"
-msgstr "紧迫"
+msgstr "按下按钮"
 
 #. module: crm
 #: view:crm.case:0
 msgid "Planned costs"
-msgstr "计划成本"
+msgstr "已计划成本"
 
 #. module: crm
 #: wizard_field:crm.job.partner_create,init,close:0
 msgid "Close job request"
-msgstr ""
+msgstr "关闭工作需求"
 
 #. module: crm
 #: field:crm.case.stage,name:0
@@ -90,9 +90,7 @@ msgstr "阶段名称"
 #. module: crm
 #: view:crm.case:0
 #: view:crm.case.history:0
-#: model:ir.actions.act_window,name:crm.crm_case_categ0-act
 #: model:ir.actions.act_window,name:crm.crm_case_section_open_act
-#: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act
 #: model:ir.ui.menu,name:crm.next_id_51
 msgid "Cases"
 msgstr "业务个案"
@@ -124,7 +122,7 @@ msgstr "管理客户和供应商的索求，包括您的纠正或预防措施"
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Amount"
-msgstr ""
+msgstr "金额"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
@@ -139,9 +137,6 @@ msgstr "已解决"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/crm_job_wizard.py:0
-#: code:addons/crm/wizard/crm_lead_wizard.py:0
-#: code:addons/crm/wizard/crm_phonecall_wizard.py:0
 #, python-format
 msgid "Warning !"
 msgstr "警告！"
@@ -155,7 +150,7 @@ msgstr "请指定用户的电子邮件地址"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Campaign"
-msgstr "商战"
+msgstr "商业活动"
 
 #. module: crm
 #: view:crm.opportunity:0
@@ -166,13 +161,13 @@ msgstr "搜索商机"
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_stage_tree
 #: view:report.crm.case.section.stage:0
 msgid "Cases by Section and Stage"
-msgstr "按组和阶段排列案例"
+msgstr "部分业务个案和阶段"
 
 #. module: crm
 #: wizard_field:crm.job.meeting_set,init,duration:0
 #: wizard_field:crm.phonecall.meeting_set,init,duration:0
 msgid "Duration (Hours)"
-msgstr "期间(小时数)"
+msgstr "持续时间(小时数)"
 
 #. module: crm
 #: selection:crm.meeting,transparent:0
@@ -184,40 +179,26 @@ msgstr ""
 msgid ""
 "Describes the action name.eg:on which object which ation to be taken on "
 "basis of which condition"
-msgstr ""
+msgstr "动作描述, 例如: 根据哪些条件哪些对象的哪些动作要起作用"
 
 #. module: crm
 #: help:crm.case,section_id:0
 msgid ""
 "Section to which Case belongs to. Define Responsible user and Email account "
 "for mail gateway."
-msgstr ""
+msgstr "业务个案属于哪些部分. 定义责任用户和电子邮件帐号的邮件网关."
 
 #. module: crm
-#: view:crm.case:0
 #: field:crm.case,partner_id:0
-#: model:crm.case.categ,name:crm.categ_lead4
-#: model:crm.case.categ,name:crm.categ_oppor4
-#: wizard_field:crm.case.opportunity.partner_opportunity,init,partner_id:0
 #: field:crm.case.rule,trg_partner_id:0
-#: selection:crm.email.add.cc,name:0
-#: field:crm.email.add.cc,partner_id:0
-#: wizard_field:crm.lead.opportunity_set,create_partner,partner_id:0
-#: wizard_field:crm.lead.opportunity_set,opportunity,partner_id:0
-#: view:crm.opportunity:0
-#: view:crm.phonecall:0
-#: wizard_field:crm.phonecall.opportunity_set,create_partner,partner_id:0
-#: wizard_field:crm.phonecall.opportunity_set,opportunity,partner_id:0
-#: model:process.node,name:crm.process_node_partner0
 msgid "Partner"
 msgstr "业务伙伴"
 
 #. module: crm
 #: field:crm.case.categ,section_id:0
-#: field:crm.case.category2,section_id:0
 #: view:crm.case.section:0
 #: field:crm.case.section,name:0
-#: field:crm.case.stage,section_id:0
+#: wizard_field:crm.case.section.menu,init,section_id:0
 #: model:ir.model,name:crm.model_crm_case_section
 msgid "Case Section"
 msgstr "业务个案项"
@@ -243,7 +224,7 @@ msgstr "电话呼叫"
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_stage
 msgid "Cases by section and stage"
-msgstr ""
+msgstr "业务个案项和阶段"
 
 #. module: crm
 #: field:crm.case.rule,act_mail_to_email:0
@@ -268,17 +249,18 @@ msgstr "内容使用的特别关键字"
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Send New Email"
-msgstr ""
+msgstr "发送新电子邮件"
 
 #. module: crm
-#: view:crm.case.history:0
+#: model:ir.actions.act_window,name:crm.crm_case_history_my-act
+#: model:ir.ui.menu,name:crm.menu_crm_case_history_my-act
 msgid "My Histories"
 msgstr "我的日志"
 
 #. module: crm
 #: field:crm.segmentation,segmentation_line:0
 msgid "Criteria"
-msgstr "条件"
+msgstr "标准"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act
@@ -289,12 +271,12 @@ msgstr "项"
 #. module: crm
 #: help:crm.menu.config_wizard,opportunity:0
 msgid "Tracks identified business opportunities for your sales pipeline."
-msgstr "为你的销售渠道跟踪已定义的商机"
+msgstr "从你的销售渠道跟踪出销售机会"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Exception Dates"
-msgstr ""
+msgstr "例外日期"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_type:0
@@ -304,7 +286,7 @@ msgstr "最近动作日期"
 #. module: crm
 #: view:crm.job:0
 msgid "Appreciation"
-msgstr ""
+msgstr "鉴识"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job3
@@ -314,7 +296,7 @@ msgstr "复试"
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_cal_subscribe
 msgid "Subscribe to a Remote calendar"
-msgstr ""
+msgstr "预订一个遥远的日程"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ-act
@@ -330,11 +312,6 @@ msgstr "警告!"
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "Dates"
 msgstr "日期"
 
@@ -346,7 +323,7 @@ msgstr "细分测试"
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
 msgid "Prospect Partner"
-msgstr ""
+msgstr "潜在业务伙伴"
 
 #. module: crm
 #: view:crm.fundraising:0
@@ -363,7 +340,7 @@ msgstr "联系人姓名"
 #: selection:crm.lead.opportunity_set,create_partner,action:0
 #: selection:crm.phonecall.opportunity_set,create_partner,action:0
 msgid "Link to an existing partner"
-msgstr "链接到已存在的业务伙伴"
+msgstr "链接到现有的业务伙伴"
 
 #. module: crm
 #: field:crm.case.rule,trg_date_range_type:0
@@ -378,12 +355,12 @@ msgstr "耽搁类型"
 #: view:crm.opportunity:0
 #: view:crm.phonecall:0
 msgid "Contact"
-msgstr ""
+msgstr "联系"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Next Interview"
-msgstr "下次面试"
+msgstr "下次会面"
 
 #. module: crm
 #: field:crm.case.rule,regex_history:0
@@ -414,7 +391,6 @@ msgid "Exception Rules"
 msgstr ""
 
 #. module: crm
-#: field:crm.menu.config_wizard,opportunity:0
 #: model:ir.actions.report.xml,name:crm.crm_business_opportunities_report
 msgid "Business Opportunities"
 msgstr "商机"
@@ -465,12 +441,6 @@ msgstr ""
 #. module: crm
 #: field:crm.case,categ_id:0
 #: field:crm.case.rule,trg_categ_id:0
-#: wizard_field:crm.job.reschedule_phone_call,init,category_id:0
-#: view:crm.opportunity:0
-#: wizard_field:crm.opportunity.reschedule_phone_call,init,category_id:0
-#: field:report.crm.case.section.categ.categ2,categ_id:0
-#: field:report.crm.case.section.categ.stage,categ_id:0
-#: field:report.crm.case.section.stage,categ_id:0
 msgid "Category"
 msgstr "分类"
 
@@ -500,11 +470,6 @@ msgstr "%(partner)s = 业务伙伴名称"
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "Action Information"
 msgstr "动作信息"
 
@@ -517,7 +482,7 @@ msgstr "%(case_user_phone)s = 负责人电话"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
 
 #. module: crm
 #: constraint:ir.actions.act_window:0
@@ -531,15 +496,14 @@ msgstr "条件"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ0-act_open
+#: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act_open
 msgid "Open Cases"
 msgstr "待处理业务个案"
 
 #. module: crm
-#: field:crm.case.log,name:0
-#: view:crm.claim:0
-#: view:crm.job:0
+#: field:crm.case,state:0
 msgid "Status"
-msgstr "状态"
+msgstr ""
 
 #. module: crm
 #: wizard_view:crm.case.opportunity.partner_opportunity,init:0
@@ -569,9 +533,6 @@ msgstr "会议树"
 #: view:crm.case:0
 #: selection:crm.case.rule,trg_state_from:0
 #: selection:crm.case.rule,trg_state_to:0
-#: view:crm.fundraising:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 #, python-format
 msgid "Escalate"
 msgstr "提升"
@@ -686,8 +647,6 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
-#: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid ""
 "You must define a responsible user for this case in order to use this action!"
@@ -731,13 +690,8 @@ msgstr "九月"
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "Communication history"
-msgstr "沟通日志"
+msgstr "交流记录"
 
 #. module: crm
 #: view:crm.claim:0
@@ -1151,10 +1105,8 @@ msgid "Next Action"
 msgstr "下一动作"
 
 #. module: crm
-#: view:crm.case:0
 #: field:crm.case,date_deadline:0
 #: selection:crm.case.rule,trg_date_type:0
-#: view:crm.opportunity:0
 msgid "Deadline"
 msgstr "截止日期"
 
@@ -1173,7 +1125,7 @@ msgstr "分类名称"
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
-msgstr "业务伙伴细分"
+msgstr "业务伙伴分类"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1317,12 +1269,6 @@ msgstr "%(partner_email)s = 业务伙伴电子邮箱"
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
-#: view:crm.phonecall:0
 msgid "Reset to Draft"
 msgstr "重置为草稿"
 
@@ -1529,8 +1475,6 @@ msgstr ""
 #: field:crm.case,date:0
 #: field:crm.case.log,date:0
 #: selection:crm.case.rule,trg_date_type:0
-#: view:crm.claim:0
-#: view:crm.phonecall:0
 msgid "Date"
 msgstr "日期"
 
@@ -1577,13 +1521,8 @@ msgstr ""
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "History"
-msgstr "日志"
+msgstr "历史记录"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_job
@@ -1616,40 +1555,18 @@ msgstr "发送提醒"
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "References"
-msgstr "参考"
+msgstr "参照"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: view:crm.case:0
-#: wizard_button:crm.case.opportunity.partner_opportunity,init,end:0
-#: view:crm.claim:0
-#: view:crm.claim.assign_wizard:0
-#: view:crm.fundraising:0
-#: view:crm.helpdesk.assign_wizard:0
-#: wizard_button:crm.job.meeting_set,init,end:0
-#: wizard_button:crm.job.partner_create,init,end:0
-#: wizard_button:crm.job.reschedule_phone_call,init,end:0
-#: view:crm.lead:0
-#: wizard_button:crm.lead.opportunity_set,create_partner,end:0
-#: wizard_button:crm.lead.opportunity_set,opportunity,end:0
-#: wizard_button:crm.lead.partner_create,init,end:0
-#: view:crm.meeting.generic_wizard:0
-#: wizard_button:crm.new.send.mail,init,end:0
-#: view:crm.opportunity:0
-#: view:crm.opportunity.assign_wizard:0
-#: wizard_button:crm.opportunity.reschedule_phone_call,init,end:0
-#: view:crm.phonecall:0
-#: view:crm.phonecall.assign_wizard:0
-#: wizard_button:crm.phonecall.meeting_set,init,end:0
-#: wizard_button:crm.phonecall.opportunity_set,create_partner,end:0
-#: wizard_button:crm.phonecall.opportunity_set,opportunity,end:0
-#: wizard_button:crm.phonecall.partner_create,init,end:0
-#: wizard_button:crm.send.mail,init,end:0
+#: selection:crm.case,state:0
+#: selection:crm.case.rule,act_state:0
+#: selection:crm.case.rule,trg_state_from:0
+#: selection:crm.case.rule,trg_state_to:0
+#: wizard_button:crm.case.section.menu,design_menu,end:0
+#: wizard_button:crm.case.section.menu,init,end:0
 #, python-format
 msgid "Cancel"
 msgstr "取消"
@@ -1762,9 +1679,6 @@ msgid "="
 msgstr "="
 
 #. module: crm
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: field:crm.menu.config_wizard,name:0
 #: field:crm.segmentation,name:0
 msgid "Name"
 msgstr "名称"
@@ -1816,11 +1730,6 @@ msgstr ""
 #. module: crm
 #: view:crm.case:0
 #: view:crm.case.rule:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "Actions"
 msgstr "动作"
 
@@ -2081,17 +1990,12 @@ msgstr "业务个案状态"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
-#: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "Send"
 msgstr "发送"
 
 #. module: crm
 #: field:crm.case,priority:0
-#: view:crm.fundraising:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "Priority"
 msgstr "优先级(0=紧急)"
 
@@ -2137,11 +2041,6 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/crm_claim.py:0
-#: code:addons/crm/crm_helpdesk.py:0
-#: code:addons/crm/crm_meeting.py:0
-#: code:addons/crm/crm_opportunity.py:0
-#: code:addons/crm/crm_phonecall.py:0
 #, python-format
 msgid "Error !"
 msgstr "错误！"
@@ -2385,14 +2284,6 @@ msgstr "低"
 
 #. module: crm
 #: field:crm.case,date_closed:0
-#: selection:crm.case,state:0
-#: selection:crm.case.rule,act_state:0
-#: selection:crm.case.rule,trg_state_from:0
-#: selection:crm.case.rule,trg_state_to:0
-#: selection:report.crm.case.section.categ.categ2,state:0
-#: selection:report.crm.case.section.categ.stage,state:0
-#: selection:report.crm.case.section.categ2,state:0
-#: selection:report.crm.case.section.stage,state:0
 msgid "Closed"
 msgstr "已关闭"
 
@@ -2572,10 +2463,9 @@ msgid "Are you sure you want to create a partner based on this job request ?"
 msgstr ""
 
 #. module: crm
-#: wizard_field:crm.lead.opportunity_set,create_partner,action:0
-#: wizard_field:crm.phonecall.opportunity_set,create_partner,action:0
+#: field:crm.case.log,name:0
 msgid "Action"
-msgstr "动作"
+msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_claim.py:0
@@ -2621,7 +2511,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.phonecall:0
 msgid "General"
 msgstr "常规"
 
@@ -2668,16 +2557,6 @@ msgstr ""
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
 #: selection:crm.case.rule,trg_state_to:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
-#: view:crm.phonecall:0
-#: selection:report.crm.case.section.categ.categ2,state:0
-#: selection:report.crm.case.section.categ.stage,state:0
-#: selection:report.crm.case.section.categ2,state:0
-#: selection:report.crm.case.section.stage,state:0
 #, python-format
 msgid "Open"
 msgstr "待处理"
@@ -2713,16 +2592,6 @@ msgstr ""
 #. module: crm
 #: field:crm.case,user_id:0
 #: field:crm.case.rule,trg_user_id:0
-#: view:crm.claim:0
-#: field:crm.claim.assign_wizard,user_id:0
-#: view:crm.fundraising:0
-#: field:crm.helpdesk.assign_wizard,user_id:0
-#: view:crm.job:0
-#: view:crm.meeting:0
-#: field:crm.meeting.generic_wizard,user_id:0
-#: view:crm.opportunity:0
-#: field:crm.opportunity.assign_wizard,user_id:0
-#: field:crm.phonecall.assign_wizard,user_id:0
 msgid "Responsible"
 msgstr "负责人"
 
@@ -2953,6 +2822,8 @@ msgid "Jobs Hiring Process"
 msgstr ""
 
 #. module: crm
+#: model:ir.actions.act_window,name:crm.crm_case_categ0-act
+#: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act
 #: model:ir.ui.menu,name:crm.next_id_52
 msgid "All Cases"
 msgstr "所有业务个案"
@@ -3072,7 +2943,6 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/wizard_cal_subscribe.py:0
 #, python-format
 msgid "Error!"
 msgstr "错误！"
@@ -3161,17 +3031,6 @@ msgstr "%(case_subject)s = 业务个案主题"
 #: field:crm.case,section_id:0
 #: field:crm.case.log,section_id:0
 #: field:crm.case.rule,trg_section_id:0
-#: field:crm.claim.assign_wizard,section_id:0
-#: field:crm.helpdesk.assign_wizard,section_id:0
-#: wizard_field:crm.job.reschedule_phone_call,init,section_id:0
-#: field:crm.meeting.generic_wizard,section_id:0
-#: field:crm.opportunity.assign_wizard,section_id:0
-#: wizard_field:crm.opportunity.reschedule_phone_call,init,section_id:0
-#: field:crm.phonecall.assign_wizard,section_id:0
-#: field:report.crm.case.section.categ.categ2,section_id:0
-#: field:report.crm.case.section.categ.stage,section_id:0
-#: field:report.crm.case.section.categ2,section_id:0
-#: field:report.crm.case.section.stage,section_id:0
 msgid "Section"
 msgstr "项"
 
@@ -3202,10 +3061,7 @@ msgid "Your action"
 msgstr "你的动作"
 
 #. module: crm
-#: model:crm.case.category2,name:crm.category_lead3
 #: field:crm.case.history,email:0
-#: field:crm.email.add.cc,email:0
-#: view:crm.job:0
 msgid "Email"
 msgstr "Email"
 
@@ -3262,16 +3118,6 @@ msgstr ""
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
 #: selection:crm.case.rule,trg_state_to:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: selection:crm.new.send.mail,init,state:0
-#: view:crm.opportunity:0
-#: selection:report.crm.case.section.categ.categ2,state:0
-#: selection:report.crm.case.section.categ.stage,state:0
-#: selection:report.crm.case.section.categ2,state:0
-#: selection:report.crm.case.section.stage,state:0
 #, python-format
 msgid "Pending"
 msgstr "未结的"
@@ -3414,11 +3260,25 @@ msgid "All Funds"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.section,calendar:0
-#: view:crm.meeting:0
-#: model:ir.ui.menu,name:crm.menu_crm_case_category_act_meetings
+#: selection:crm.case.section.menu,design_menu,menu10_option:0
+#: selection:crm.case.section.menu,design_menu,menu11_option:0
+#: selection:crm.case.section.menu,design_menu,menu12_option:0
+#: selection:crm.case.section.menu,design_menu,menu13_option:0
+#: selection:crm.case.section.menu,design_menu,menu14_option:0
+#: selection:crm.case.section.menu,design_menu,menu15_option:0
+#: selection:crm.case.section.menu,design_menu,menu16_option:0
+#: selection:crm.case.section.menu,design_menu,menu17_option:0
+#: selection:crm.case.section.menu,design_menu,menu1_option:0
+#: selection:crm.case.section.menu,design_menu,menu2_option:0
+#: selection:crm.case.section.menu,design_menu,menu3_option:0
+#: selection:crm.case.section.menu,design_menu,menu4_option:0
+#: selection:crm.case.section.menu,design_menu,menu5_option:0
+#: selection:crm.case.section.menu,design_menu,menu6_option:0
+#: selection:crm.case.section.menu,design_menu,menu7_option:0
+#: selection:crm.case.section.menu,design_menu,menu8_option:0
+#: selection:crm.case.section.menu,design_menu,menu9_option:0
 msgid "Calendar"
-msgstr "日程表"
+msgstr ""
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_job1
@@ -3462,6 +3322,7 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm.py:0
+#: view:crm.case:0
 #, python-format
 msgid "Historize"
 msgstr "日志"
@@ -3489,11 +3350,6 @@ msgstr ""
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
 #: selection:crm.case.rule,trg_state_to:0
-#: view:crm.meeting:0
-#: selection:report.crm.case.section.categ.categ2,state:0
-#: selection:report.crm.case.section.categ.stage,state:0
-#: selection:report.crm.case.section.categ2,state:0
-#: selection:report.crm.case.section.stage,state:0
 #, python-format
 msgid "Draft"
 msgstr "草稿"
@@ -3523,8 +3379,6 @@ msgstr "普通"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
-#: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "You must put a Partner eMail to use this action!"
 msgstr "此行动需要业务伙伴的电子邮件地址！"
@@ -3665,8 +3519,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.fundraising:0
-#: view:crm.opportunity:0
 msgid "Estimates"
 msgstr "估计"
 
@@ -3678,6 +3530,10 @@ msgstr "负责用户"
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: view:crm.case:0
+#: selection:crm.case,state:0
+#: selection:crm.case.rule,act_state:0
+#: selection:crm.case.rule,trg_state_from:0
+#: selection:crm.case.rule,trg_state_to:0
 #, python-format
 msgid "Close"
 msgstr "关闭"
@@ -3735,14 +3591,9 @@ msgid "% = The '%' Character"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0
 #: field:crm.case,name:0
 #: field:crm.case.history,description:0
 #: field:crm.case.history,note:0
-#: view:crm.job:0
-#: view:crm.meeting:0
-#: view:crm.opportunity:0
-#: view:crm.phonecall:0
 #: field:crm.segmentation,description:0
 msgid "Description"
 msgstr "说明"
@@ -3791,14 +3642,6 @@ msgstr ""
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: field:crm.case.log,case_id:0
-#: field:crm.claim,inherit_case_id:0
-#: field:crm.fundraising,inherit_case_id:0
-#: field:crm.helpdesk,inherit_case_id:0
-#: field:crm.job,inherit_case_id:0
-#: field:crm.lead,inherit_case_id:0
-#: field:crm.meeting,inherit_case_id:0
-#: field:crm.opportunity,inherit_case_id:0
-#: field:crm.phonecall,inherit_case_id:0
 #: model:ir.model,name:crm.model_crm_case
 #: model:res.request.link,name:crm.req_link_case
 #, python-format
@@ -3920,7 +3763,6 @@ msgstr ""
 #. module: crm
 #: field:crm.case.rule,sequence:0
 #: field:crm.case.section,sequence:0
-#: field:crm.case.stage,sequence:0
 msgid "Sequence"
 msgstr "序号"
 
@@ -3988,9 +3830,6 @@ msgstr ""
 #~ msgid "Complete this if you use the mail gateway."
 #~ msgstr "如果使用此邮件网关请填写完整"
 
-#~ msgid "Add Last Mail for Replying"
-#~ msgstr "增加最近回复邮件"
-
 #~ msgid "this wizard will create all sub-menus, within the selected menu."
 #~ msgstr "这向导将在选择的菜单创建所有子菜单"
 
@@ -4070,9 +3909,6 @@ msgstr ""
 #~ msgid "All "
 #~ msgstr "所有 "
 
-#~ msgid "Send Partner & Historize"
-#~ msgstr "发送到业务伙伴和日志"
-
 #~ msgid "All Histories"
 #~ msgstr "所有日志"
 
@@ -4087,3 +3923,35 @@ msgstr ""
 
 #~ msgid "Included Answers :"
 #~ msgstr "包括回答:"
+
+#~ msgid "All Unclosed and Unassigned "
+#~ msgstr "所有未结束和未分配 "
+
+#~ msgid "Profiling"
+#~ msgstr "特征"
+
+#~ msgid "Profiling Options"
+#~ msgstr "特征选项"
+
+#~ msgid "My Pending "
+#~ msgstr "我未决 的 "
+
+#~ msgid ""
+#~ "These people will receive a copy of the futur communication between partner "
+#~ "and users by email"
+#~ msgstr "这些人将收到一份将来业务伙伴和用户之间沟通的电子邮件的拷贝"
+
+#~ msgid "Tree View"
+#~ msgstr "目录视图"
+
+#~ msgid "Deadline Date is automatically computed from Start Date + Duration"
+#~ msgstr "截止日期为自动计算：开始时间+持续时间"
+
+#~ msgid "Mail to watchers (Cc)"
+#~ msgstr "发送到关注者"
+
+#~ msgid "Add Last Mail for Replying"
+#~ msgstr "回复时增加最近的邮件"
+
+#~ msgid "Send Partner & Historize"
+#~ msgstr "发送到业务伙伴和记载"

addons/delivery/delivery_view.xml

@@ -141,6 +141,8 @@
             <field name="arch" type="xml">
                 <field name="address_id" position="after">
                     <field name="carrier_id"/>
+                    <field name="carrier_tracking_ref" groups="base.group_extended"/>
+                    <field name="number_of_packages" groups="base.group_extended"/>
                     <field name="weight"/>
                 </field>
             </field>
@@ -178,6 +180,8 @@
             <field name="arch" type="xml">
                 <field name="address_id" position="after">
                     <field name="carrier_id"/>
+                    <field name="carrier_tracking_ref" groups="base.group_extended"/>
+                    <field name="number_of_packages" groups="base.group_extended"/>
                     <field name="weight"/>
                 </field>
             </field>

addons/delivery/report/shipping.rml

@@ -114,7 +114,7 @@
     <blockTable colWidths="287.0,254.0" repeatRows="1" style="Tableau1">
       <tr>
         <td>
-          <para style="terp_default_Bold_9">Invoiced to</para>
+          <para style="terp_default_Bold_9">[[ o.sale_id and o.sale_id.partner_invoice_id and 'Invoiced to' or '' ]]</para>
           <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.partner_id.name or '']]</para>
           <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.name or '']]</para>
           <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.street or '']]</para>

addons/delivery/stock.py

@@ -55,6 +55,8 @@ class stock_picking(osv.osv):
                  'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['move_lines'], 20),
                  'stock.move': (_get_picking_line, ['product_id','product_qty','product_uom','product_uos_qty'], 20),
                  }),
+        'carrier_tracking_ref': fields.char('Carrier Tracking Ref', size=32),
+        'number_of_packages': fields.integer('Number of Packages'),
         }
 
     def action_invoice_create(self, cursor, user, ids, journal_id=False,

addons/marketing_campaign/marketing_campaign.py

@@ -678,6 +678,8 @@ class marketing_campaign_workitem(osv.osv):
                 'datas' : datas,
                 'nodestroy': True,
             }
+        else:
+            raise osv.except_osv(_('No preview'),_('The current step for this item has no email or report to preview.'))
         return res
 
 marketing_campaign_workitem()

addons/marketing_campaign/marketing_campaign_view.xml

@@ -306,8 +306,8 @@
                 <field name="partner_id"/>
                 <field name="date"/>
                 <field name="state"/>
-                <button string="Preview" states="todo" name="preview" icon="gtk-apply" type="object"/>
-                <button string="Process" states="todo" name="process" type="object" icon="gtk-ok"/>
+                <button string="Preview" states="todo" name="preview" icon="gtk-zoom-fit" type="object"/>
+                <button string="Process" states="todo" name="process" type="object" icon="terp-gtk-go-back-rtl"/>
                 <button string="Cancel" states="todo" name="button_cancel" type="object" icon="gtk-cancel"/>
             </tree>
         </field>
@@ -335,7 +335,7 @@
                         <separator string="Date" colspan="2"/>
                         <field name="date"/>
                         <label string="" colspan="1"/>
-                        <button string="Preview" states="todo" name="preview" icon="gtk-apply" type="object"/>
+                        <button string="Preview" states="todo" name="preview" icon="gtk-zoom-fit" type="object"/>
                     </group>
                 </group>
                 <group colspan="4" col="4" attrs="{'invisible':[('state','!=','exception')]}">
@@ -345,8 +345,8 @@
                 <separator string="Status" colspan="4"/>
                 <group colspan="4" col="11">
                     <field name="state" nolabel="1" readonly="True" select="1"/>
-                    <button string="Reset" states="exception,cancelled" name="button_draft" type="object" icon="gtk-ok"/>
-                    <button string="Process" states="todo" name="process" type="object" icon="gtk-ok"/>
+                    <button string="Reset" states="exception,cancelled" name="button_draft" type="object" icon="gtk-undo"/>
+                    <button string="Process" states="todo" name="process" type="object" icon="terp-gtk-go-back-rtl"/>
                     <button string="Cancel" states="todo,exception" name="button_cancel" type="object" icon="gtk-cancel"/>
                 </group>
             </form>
@@ -379,7 +379,7 @@
    </record>
 
     <record model="ir.actions.act_window" id="action_marketing_campaign_workitem">
-        <field name="name">Campaign Activities (Workitems)</field>
+        <field name="name">Campaign Followup</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">marketing.campaign.workitem</field>
         <field name="view_type">form</field>

addons/procurement/procurement.py

@@ -319,7 +319,7 @@ class procurement_order(osv.osv):
         move_obj = self.pool.get('stock.move')
         for procurement in self.browse(cr, uid, ids):
             if procurement.product_qty <= 0.00:
-                raise osv.except_osv(_('Data Insufficient !'), _('Please check the Quantity of Procurement Order(s), it should not be less than 1!'))
+                raise osv.except_osv(_('Data Insufficient !'), _('Please check the Quantity in Procurement Order(s), it should not be less than 1!'))
             if procurement.product_id.type in ('product', 'consu'):
                 if not procurement.move_id:
                     source = procurement.location_id.id

addons/product/product.py

@@ -48,25 +48,24 @@ class product_uom(osv.osv):
     _name = 'product.uom'
     _description = 'Product Unit of Measure'
 
+    def _compute_factor_inv(self, factor):
+        return factor and round(1.0 / factor, 6) or 0.0
+
     def _factor_inv(self, cursor, user, ids, name, arg, context):
         res = {}
         for uom in self.browse(cursor, user, ids, context=context):
-            if uom.factor:
-                res[uom.id] = round(1 / uom.factor, 6)
-            else:
-                res[uom.id] = 0.0
+            res[uom.id] = self._compute_factor_inv(uom.factor)
         return res
 
     def _factor_inv_write(self, cursor, user, id, name, value, arg, context):
-        if value:
-            self.write(cursor, user, id, {
-                'factor': round(1/value, 6),
-            }, context=context)
-        else:
-            self.write(cursor, user, id, {
-                'factor': 0.0,
-            }, context=context)
-        return True
+        return self.write(cursor, user, id, {'factor': self._compute_factor_inv(value)}, context=context)
+  
+    def create(self, cr, uid, data, context={}):
+        if 'factor_inv' in data:
+            if data['factor_inv'] <> 1:
+                data['factor'] = self._compute_factor_inv(data['factor_inv'])
+            del(data['factor_inv'])
+        return super(product_uom, self).create(cr, uid, data, context)
 
     _columns = {
         'name': fields.char('Name', size=64, required=True, translate=True),
@@ -85,13 +84,11 @@ class product_uom(osv.osv):
                  "Use 1.0 for a UoM that cannot be further split, such as a piece."),
         'active': fields.boolean('Active', help="By unchecking the active field you can disable a unit of measure without deleting it."),
         'uom_type': fields.selection([('bigger','Bigger than the reference UoM'),
-                                      ('reference','Reference UoM for this category (ratio=1)'),
+                                      ('reference','Reference UoM for this category'),
                                       ('smaller','Smaller than the reference UoM')],'UoM Type', required=1),
     }
 
     _defaults = {
-        'factor': 1.0,
-        'factor_inv': 1.0,
         'active': 1,
         'rounding': 0.01,
         'uom_type': 'reference',

addons/product/product_view.xml

@@ -297,6 +297,7 @@
                 <tree string="Units of Measure">
                     <field name="name"/>
                     <field name="category_id"/>
+                    <field name="uom_type"/>
                     <field name="factor"/>
                     <field name="rounding"/>
                 </tree>

addons/project/project.py

@@ -337,6 +337,7 @@ class task(osv.osv):
     def copy_data(self, cr, uid, id, default={}, context=None):
         default = default or {}
         default['work_ids'] = []
+        default['active'] = True
         return super(task, self).copy_data(cr, uid, id, default, context)
 
     def _check_dates(self, cr, uid, ids, context=None):
@@ -353,8 +354,17 @@ class task(osv.osv):
                  return False
         return True
 
+    def _is_template(self, cr, uid, ids, field_name, arg, context=None):
+        res = {}
+        for task in self.browse(cr, uid, ids, context=context):
+            res[task.id] = True
+            if task.project_id:
+                if task.project_id.active == False or task.project_id.state == 'template':
+                    res[task.id] = False
+        return res
+
     _columns = {
-        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the task without removing it. This is basically used for the management of templates of projects and tasks."),
+        'active': fields.function(_is_template, method=True, store=True, string='Not a Template Task', type='boolean', help="This field is computed automatically and have the same behavior than the boolean 'active' field: if the task is linked to a template or unactivated project, it will be hidden unless specifically asked."),
         'name': fields.char('Task Summary', size=128, required=True),
         'description': fields.text('Description'),
         'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'), ('0','Very urgent')], 'Importance'),

addons/purchase/i18n/pt_BR.po

@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-16 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-07-17 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase

addons/sale/sale.py

@@ -221,7 +221,7 @@ class sale_order(osv.osv):
             ('invoice_except', 'Invoice Exception'),
             ('done', 'Done'),
             ('cancel', 'Cancelled')
-            ], 'Order State', readonly=True, help="Gives the state of the quotation or sale order. The exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). The 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the date 'Ordered Date'.", select=True),
+            ], 'Order State', readonly=True, help="Gives the state of the quotation or sale order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the date 'Ordered Date'.", select=True),
         'date_order': fields.date('Ordered Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'create_date': fields.date('Creation Date', readonly=True, help="Date on which sale order is created"),
         'date_confirm': fields.date('Confirmation Date', readonly=True, help="Date on which sale order is confirmed"),
@@ -473,7 +473,9 @@ class sale_order(osv.osv):
         for o in self.browse(cr, uid, ids):
             lines = []
             for line in o.order_line:
-                if (line.state in states) and not line.invoiced:
+                if line.invoiced:
+                    raise osv.except_osv(_('Error !'), _('The Sale Order already has some lines invoiced. You should continue the billing process by line.'))
+                elif (line.state in states):
                     lines.append(line.id)
             created_lines = self.pool.get('sale.order.line').invoice_line_create(cr, uid, lines)
             if created_lines:
@@ -830,11 +832,11 @@ class sale_order_line(osv.osv):
         'notes': fields.text('Notes'),
         'th_weight': fields.float('Weight', readonly=True, states={'draft':[('readonly',False)]}),
         'state': fields.selection([('draft', 'Draft'),('confirmed', 'Confirmed'),('done', 'Done'),('cancel', 'Cancelled'),('exception', 'Exception')], 'State', required=True, readonly=True,
-                help=' * The \'Draft\' state is set automatically when sale order in draft state. \
-                    \n* The \'Confirmed\' state is set automatically when sale order in confirm state. \
-                    \n* The \'Exception\' state is set automatically when sale order is set as exception. \
-                    \n* The \'Done\' state is set automatically when sale order is set as done. \
-                    \n* The \'Cancelled\' state is set automatically when user cancel sale order.'),
+                help='* The \'Draft\' state is set when the related sale order in draft state. \
+                    \n* The \'Confirmed\' state is set when the related sale order is confirmed. \
+                    \n* The \'Exception\' state is set when the related sale order is set as exception. \
+                    \n* The \'Done\' state is set when the sale order line has been picked. \
+                    \n* The \'Cancelled\' state is set when a user cancel the sale order related.'),
         'order_partner_id': fields.related('order_id', 'partner_id', type='many2one', relation='res.partner', string='Customer'),
         'salesman_id':fields.related('order_id', 'user_id', type='many2one', relation='res.users', string='Salesman'),
         'company_id': fields.related('order_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True, states={'draft':[('readonly',False)]}),

addons/sale/sale_view.xml

@@ -93,7 +93,7 @@
             </field>
         </record>
 
-        <act_window name="Partial Invoice"
+        <act_window name="Deposit"
            res_model="sale.advance.payment.inv"
            src_model="sale.order"
            view_mode="form"
@@ -101,7 +101,6 @@
            key2="client_action_multi"
            id="action_view_sale_advance_payment_inv"/>
 
-
         <record id="view_order_form" model="ir.ui.view">
             <field name="name">sale.order.form</field>
             <field name="model">sale.order</field>
@@ -264,14 +263,17 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
-                    <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/>
+                    <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]" help="Sale Orders that haven't yet be confirmed"/>
                     <filter icon="terp-check" string="Sales" domain="[('state','in',('manual','progress'))]"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-gtk-go-back-rtl" string="To Invoice" domain="[('state','=','manual')]"/>
+                    <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('state','=','manual')]" help="Sale Orders ready to be invoiced"/>
                     <separator orientation="vertical"/>
                     <field name="name" select="1"/>
                     <field name="partner_id" select="1"/>
-                    <field name="user_id" select="1"/>
+                    <field name="user_id" select="1">
+                          <filter domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal"/>
+                    </field>
+
                     <field name="date_order" select="1" string="Order date" />
                     <newline/>
                     <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
@@ -397,23 +399,20 @@
                             <separator colspan="4" string="States"/>
                             <field name="state"/>
                             <group col="3" colspan="2">
-                            	<button colspan="1"
-	                              name="create_sale_order_line_invoice"
-	                              states="confirmed"
-	                              string="Create Invoice"
-	                              type="object"
-	                              icon="terp-document-new"
-	                              attrs="{'invisible': [('invoiced', '=', 1)]}"/>
-	                            <button name="button_cancel"
-                                    states="confirmed,exception"
+                                <button colspan="1"
+                                  name="create_sale_order_line_invoice"
+                                  string="Create Invoice"
+                                  type="object"
+                                  icon="terp-document-new"
+                                  attrs="{'invisible': ['|',('state', 'in', ('draft','cancel')),('invoiced', '=', 1)]}"/>
+                                <button name="button_cancel"
                                     string="Cancel" type="object"
                                     icon="gtk-cancel"
-                                    attrs="{'invisible': [('invoiced', '=', 1)]}" />
+                                    attrs="{'invisible': ['|',('state', 'not in', ('confirmed', 'exception')),('invoiced', '=', 1)]}"/>
                                 <button name="button_done"
-                                    states="confirmed,exception"
                                     string="Done" type="object"
-									icon="gtk-jump-to"
-									attrs="{'invisible': [('invoiced', '=', 0)]}"/>
+                                    icon="gtk-jump-to"
+                                    attrs="{'invisible': ['|',('state', 'not in', ('confirmed','exception')),('invoiced', '=', 0)]}"/>
                             </group>
                         </page>
 <!--                        <page string="Properties" groups="base.group_extended">-->
@@ -436,13 +435,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
-                    <filter icon="terp-gtk-go-back-rtl" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]" separator="1"/>
+                    <filter icon="terp-gtk-go-back-rtl" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]" separator="1" help="Sale Order Lines ready to be invoiced"/>
                     <separator orientation="vertical"/>
                     <field name="order_id"/>
                     <field name="order_partner_id"/>
                     <field name="product_id"/>
                     <field name="salesman_id">
-                        <filter icon="terp-dolar" domain="[('salesman_id','=',uid)]" help="My Sale Order Lines"/>
+                        <filter icon="terp-personnal" domain="[('salesman_id','=',uid)]" help="Sale Order Lines related to a Sale Order of mine"/>
                     </field>
                     <newline/>
                     <group expand="context.get('report',False)" string="Group By..." colspan="9" col="8">
@@ -464,20 +463,23 @@
                     <filter icon="terp-accessories-archiver" string="Shipped"
                         domain="[('state','=','done')]"
                         name="unshipped"
+                        help="Sale Order Lines that are in 'done' state"
                         />
                     <filter icon="terp-dolar_ok!" string="Uninvoiced" name="uninvoiced"
                         domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"
+                        help="Sale Order Lines that are confirmed, done or in exception state and haven't yet been invoiced"
                         />
-                    <filter icon="terp-dolar" string="Sale Order"
+                    <filter icon="terp-check" string="Confirmed"
                         domain="[('state','=','confirmed')]"
                         name="sale order"
+                        help="Confirmed Sale Order Lines"
                         />
                     <separator orientation="vertical"/>
                     <field name="order_id"/>
                     <field name="order_partner_id"/>
                     <field name="product_id"/>
                     <field name="salesman_id">
-                        <filter icon="terp-dolar" domain="[('salesman_id','=',uid)]" help="My Sale Order Lines"/>
+                        <filter icon="terp-personal" domain="[('salesman_id','=',uid)]" help="My Sale Order Lines"/>
                     </field>
                     <newline />
                     <group expand="0" string="Group By..." colspan="9" col="8">

addons/sale/wizard/sale_make_invoice_advance.xml

@@ -31,7 +31,7 @@
                   <newline />
                  <separator string="" colspan="4"/>
                  <group colspan="4">
-                  <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                  <button special="cancel" string="Close" icon="gtk-cancel"/>
                    <button name="open_invoice" string="Open Invoice" type="object" icon="gtk-open"/>
                    </group>
              </form>

addons/sale_crm/wizard/crm_make_sale.py

@@ -21,7 +21,6 @@
 
 from osv import fields, osv
 from tools.translate import _
-from mx.DateTime import now
 import time
 import decimal_precision as dp
 
@@ -100,7 +99,7 @@ class crm_make_sale(osv.osv_memory):
                     raise osv.except_osv(_('Data Insufficient!'),_('Customer has no addresses defined!'))
     
                 vals = {
-                    'origin': 'Opportunity:%s' % str(case.id),
+                    'origin': 'Opportunity: %s' % str(case.id),
                     'section_id': case.section_id and case.section_id.id or False,
                     'shop_id': make.shop_id.id,
                     'partner_id': partner_id,
@@ -108,8 +107,7 @@ class crm_make_sale(osv.osv_memory):
                     'partner_invoice_id': partner_addr['invoice'],
                     'partner_order_id': partner_addr['contact'],
                     'partner_shipping_id': partner_addr['delivery'],
-                    'order_policy': 'manual',
-                    'date_order': now(),
+                    'date_order': time.strftime('%Y-%m-%d'),
                     'fiscal_position': fpos,
                 }
     
@@ -121,14 +119,21 @@ class crm_make_sale(osv.osv_memory):
                     vals['project_id'] = make.analytic_account.id
                 new_id = sale_obj.create(cr, uid, vals)
                 for line in make.sale_order_line:
-                    value = sale_line_obj.product_id_change(cr, uid, [], pricelist,
-                            line.product_id.id, qty=1, partner_id=partner_id, fiscal_position=fpos)['value']
-                    value['product_id'] =line.product_id.id
+                    value = {}
                     value['order_id'] = new_id
-                    value['tax_id'] = [(6,0,line['tax_id'])]
+                    value['name'] = line.name
+                    value['delay'] = line.delay
+                    value['product_id'] =line.product_id and line.product_id.id or False
+                    value['price_unit'] = line.price_unit
+                    value['tax_id'] = line.tax_id and [(6,0,map(lambda x: x.id,line.tax_id))] or False
+                    value['type'] = line.type
                     value['product_uom_qty']=line.product_uom_qty
-                    value['discount']=line.discount
                     value['product_uom']=line.product_uom.id
+                    value['product_uos_qty']=line.product_uos_qty
+                    value['product_uos']=line.product_uos and line.product_uos.id or False
+                    value['product_packaging'] = line.product_packaging and line.product_packaging.id or False
+                    value['discount']=line.discount
+                    value['notes']=line.notes
                     sale_line_obj.create(cr, uid, value)
                 case_obj.write(cr, uid, [case.id], {'ref': 'sale.order,%s' % new_id})
                 new_ids.append(new_id)
@@ -149,7 +154,6 @@ class crm_make_sale(osv.osv_memory):
                     'view_id': False,
                     'type': 'ir.actions.act_window',
                     'res_id': new_ids and new_ids[0]
-
                 }
             else:
                 value = {
@@ -165,8 +169,8 @@ class crm_make_sale(osv.osv_memory):
 
     _columns = {
         'shop_id': fields.many2one('sale.shop', 'Shop', required=True),
-        'partner_id': fields.many2one('res.partner', 'Customer', required=True, help='Use this partner if there is no partner on the Opportunity'),
-        'sale_order_line': fields.one2many('sale.order.make.line', 'order_line', 'Product Line', readonly=True, states={'draft': [('readonly', False)]}),
+        'partner_id': fields.many2one('res.partner', 'Customer', required=True),
+        'sale_order_line': fields.one2many('sale.order.make.line', 'opportunity_order_id', 'Product Line'),
         'analytic_account': fields.many2one('account.analytic.account', 'Analytic Account'),   
         'close': fields.boolean('Close Case', help='Check this to close the case after having created the sale order.'),              
     }
@@ -180,140 +184,33 @@ crm_make_sale()
 
 class sale_order_make_line(osv.osv_memory):
    
-
-    def product_id_change(self, cr, uid, ids, pricelist, product, qty=0,
+    def product_id_change(self, cr, uid, ids, product, qty=0,
             uom=False, qty_uos=0, uos=False, name='', partner_id=False,
-            lang=False, update_tax=True, date_order=False, packaging=False, fiscal_position=False, flag=False):
+            lang=False, update_tax=True, packaging=False, flag=False):
         if not  partner_id:
             raise osv.except_osv(_('No Customer Defined !'), _('You have to select a customer in the sale form !\nPlease set one customer before choosing a product.'))
-        warning = {}
-        product_uom_obj = self.pool.get('product.uom')
-        partner_obj = self.pool.get('res.partner')
-        product_obj = self.pool.get('product.product')
-        if partner_id:
-            lang = partner_obj.browse(cr, uid, partner_id).lang
-        context = {'lang': lang, 'partner_id': partner_id}
-
-        if not product:
-            return {'value': {'th_weight': 0, 'product_packaging': False,
-                'product_uos_qty': qty}, 'domain': {'product_uom': [],
-                   'product_uos': []}}
-
-        if not date_order:
-            date_order = time.strftime('%Y-%m-%d')
-
-        result = {}
-        product_obj = product_obj.browse(cr, uid, product, context=context)
-        if not packaging and product_obj.packaging:
-            packaging = product_obj.packaging[0].id
-            result['product_packaging'] = packaging
-
-        if packaging:
-            default_uom = product_obj.uom_id and product_obj.uom_id.id
-            pack = self.pool.get('product.packaging').browse(cr, uid, packaging, context=context)
-            q = product_uom_obj._compute_qty(cr, uid, uom, pack.qty, default_uom)
-#            qty = qty - qty % q + q
-            if qty and (q and not (qty % q) == 0):
-                ean = pack.ean
-                qty_pack = pack.qty
-                type_ul = pack.ul
-                warn_msg = _("You selected a quantity of %d Units.\nBut it's not compatible with the selected packaging.\nHere is a proposition of quantities according to the packaging: ") % (qty)
-                warn_msg = warn_msg + "\n\n" + _("EAN: ") + str(ean) + _(" Quantity: ") + str(qty_pack) + _(" Type of ul: ") + str(type_ul.name)
-                warning = {
-                    'title': _('Picking Information !'),
-                    'message': warn_msg
-                    }
-            result['product_uom_qty'] = qty
-
-        uom2 = False
-        if uom:
-            uom2 = product_uom_obj.browse(cr, uid, uom)
-            if product_obj.uom_id.category_id.id != uom2.category_id.id:
-                uom = False
-
-        if uos:
-            if product_obj.uos_id:
-                uos2 = product_uom_obj.browse(cr, uid, uos)
-                if product_obj.uos_id.category_id.id != uos2.category_id.id:
-                    uos = False
-            else:
-                uos = False
-        if product_obj.description_sale:
-            result['notes'] = product_obj.description_sale
-        fpos = fiscal_position and self.pool.get('account.fiscal.position').browse(cr, uid, fiscal_position) or False
-        if update_tax: #The quantity only have changed
-            result['delay'] = (product_obj.sale_delay or 0.0)
-            partner = partner_obj.browse(cr, uid, partner_id)
-            result['tax_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, product_obj.taxes_id)
-            result.update({'type': product_obj.procure_method})
-
-        if not flag:
-            result['name'] = self.pool.get('product.product').name_get(cr, uid, [product_obj.id], context=context)[0][1]
-        domain = {}
-        if (not uom) and (not uos):
-            result['product_uom'] = product_obj.uom_id.id
-            if product_obj.uos_id:
-                result['product_uos'] = product_obj.uos_id.id
-                result['product_uos_qty'] = qty * product_obj.uos_coeff
-                uos_category_id = product_obj.uos_id.category_id.id
-            else:
-                result['product_uos'] = False
-                result['product_uos_qty'] = qty
-                uos_category_id = False
-            domain = {'product_uom':
-                        [('category_id', '=', product_obj.uom_id.category_id.id)],
-                        'product_uos':
-                        [('category_id', '=', uos_category_id)]}
-
-        elif uos and not uom: # only happens if uom is False
-            result['product_uom'] = product_obj.uom_id and product_obj.uom_id.id
-            result['product_uom_qty'] = qty_uos / product_obj.uos_coeff
-        elif uom: # whether uos is set or not
-            default_uom = product_obj.uom_id and product_obj.uom_id.id
-            q = product_uom_obj._compute_qty(cr, uid, uom, qty, default_uom)
-            if product_obj.uos_id:
-                result['product_uos'] = product_obj.uos_id.id
-                result['product_uos_qty'] = qty * product_obj.uos_coeff
-            else:
-                result['product_uos'] = False
-                result['product_uos_qty'] = qty
-
-        if not uom2:
-            uom2 = product_obj.uom_id
-        return {'value': result, 'domain': domain, 'warning': warning}
+        date_order = time.strftime('%Y-%m-%d') 
+        part = self.pool.get('res.partner').browse(cr, uid, partner_id)
+        pricelist = part.property_product_pricelist and part.property_product_pricelist.id or False
+        fiscal_position = part.property_account_position and part.property_account_position.id or False
+        return self.pool.get('sale.order.line').product_id_change(cr, uid, ids, pricelist, product, qty, uom, qty_uos, uos, name, partner_id, lang, update_tax, date_order, packaging, fiscal_position, flag)
     
-    def product_uom_change(self, cursor, user, ids, pricelist, product, qty=0,
-            uom=False, qty_uos=0, uos=False, name='', partner_id=False,
-            lang=False, update_tax=True, date_order=False):
-        res = self.product_id_change(cursor, user, ids, pricelist, product,
-                qty=qty, uom=uom, qty_uos=qty_uos, uos=uos, name=name,
-                partner_id=partner_id, lang=lang, update_tax=update_tax,
-                date_order=date_order)
-        if 'product_uom' in res['value']:
-            del res['value']['product_uom']
-        if not uom:
-            res['value']['price_unit'] = 0.0
-        return res    
-
     _name = 'sale.order.make.line'
-    _description = 'Sale Order Line'
+    _description = 'Opportunity Sale Order Line'
     _columns = {
-        'order_line': fields.many2one('crm.make.sale', 'Order Reference', required=True, ondelete='cascade', select=True, readonly=True, ),
-        'order_id': fields.many2one('sale.order', 'Order Reference', required=True, ondelete='cascade', select=True, readonly=True, ),
-        'name': fields.char('Description', size=256, required=True, select=True, readonly=True, ),
-        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of sale order lines."),
-        'delay': fields.float('Delivery Lead Time', required=True, help="Number of days between the order confirmation the the shipping of the products to the customer", readonly=True, ),
+        'opportunity_order_id': fields.many2one('crm.make.sale', 'Order Reference', required=True, ondelete='cascade', select=True, readonly=True, ),
+        'name': fields.char('Description', size=256, required=True, select=True, ),
+        'delay': fields.float('Delivery Lead Time', required=True, help="Number of days between the order confirmation the the shipping of the products to the customer"),
         'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], change_default=True),
-        'procurement_id': fields.many2one('procurement.order', 'Procurement'),
-        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, ),
-        'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes', readonly=True, states={'draft':[('readonly',False)]}),
-        'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'product_uom_qty': fields.float('Quantity (UoM)', digits=(16, 2), required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'product_uom': fields.many2one('product.uom', 'Unit of Measure ', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'product_uos_qty': fields.float('Quantity (UoS)', readonly=True, states={'draft':[('readonly',False)]}),
+        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price')),
+        'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes'),
+        'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True),
+        'product_uom_qty': fields.float('Quantity (UoM)', digits=(16, 2), required=True, ),
+        'product_uom': fields.many2one('product.uom', 'Unit of Measure ', required=True, ),
+        'product_uos_qty': fields.float('Quantity (UoS)'),
         'product_uos': fields.many2one('product.uom', 'Product UoS'),
         'product_packaging': fields.many2one('product.packaging', 'Packaging'),
-        'discount': fields.float('Discount (%)', digits=(16, 2), readonly=True, states={'draft':[('readonly',False)]}),
+        'discount': fields.float('Discount (%)', digits=(16, 2)),
         'notes': fields.text('Notes'),
     }
     _order = 'sequence, id'

addons/sale_crm/wizard/crm_make_sale_view.xml

@@ -21,25 +21,21 @@
                                     <notebook>
                                         <page string="Order Line">
                                             <field colspan="4"
-                                                context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
+                                                context="partner_id=parent.partner_id,shop=parent.shop_id"
                                                 name="product_id"
-                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], True, parent.date_order, product_packaging, parent.fiscal_position, False)"
+                                                on_change="product_id_change(product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], True, product_packaging, False)"
                                                 />
-                                            <field
-                                                context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
-                                                name="product_uom_qty"
-                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging, parent.fiscal_position, True)"
-                                                />
-                                                <field groups="product.group_uos" name="product_uos_qty"/>
-                                            <field name="product_uom"
-                                                on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order)"/>
+                                            <group colspan="2">
+                                               <field name="product_uom_qty"/>
+                                               <field name="product_uom" nolabel="1"/>
+                                            </group>
+                                            <group colspan="2" groups="product.group_uos">
+                                               <field name="product_uos_qty"/>
+                                               <field name="product_uos" nolabel="1"/></group>
                                             <field
                                                 name="product_packaging"
-                                                context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
-                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging, parent.fiscal_position, False)"
                                                 domain="[('product_id','=',product_id)]"
                                                 groups="base.group_extended"/>
-
                                             <field colspan="4" name="name"/>
                                             <field name="price_unit"/>
                                             <field name="discount"/>
@@ -49,6 +45,9 @@
                                             <separator colspan="5" string="Taxes"/>
                                             <field colspan="4" name="tax_id" nolabel="1" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
                                         </page>
+                                        <page string="Notes">
+                                            <field colspan="4" name="notes" nolabel="1"/>
+                                        </page>
                                     </notebook>
                                 </form>
                                 <tree string="Sales order lines">

addons/sale_journal/sale_journal_view.xml

@@ -1,6 +1,9 @@
 <openerp>
    <data>
 
+        <menuitem id="menu_sale_journal_config" name="Sale Journals"
+            parent="base.menu_base_config" sequence="5"/>
+
    <!--  sale journal invoice Type's Form  view -->
 
         <record model="ir.ui.view" id="view_sale_journal_invoice_type_form">
@@ -40,7 +43,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-    <!-- <menuitem name="Invoicing Methods" id="menu_definition_journal_invoice_type" parent="sale.menu_shop_configuration" action="action_definition_journal_invoice_type"/> -->
+     <menuitem name="Invoicing Methods" id="menu_definition_journal_invoice_type" parent="menu_sale_journal_config" action="action_definition_journal_invoice_type"/> 
 
     <!-- sale journal Form view  -->
 
@@ -138,7 +141,8 @@
             <field name="search_view_id" ref="view_sale_journal_search"/>
         </record>
 
-        <menuitem id="menu_definition_journal" name="Sales Journals" parent="product.prod_config_main"  action="action_definition_journal" sequence="70" />
+
+        <menuitem id="menu_definition_journal" name="Sales Journals" parent="menu_sale_journal_config"  action="action_definition_journal" sequence="70" />
 
     <!-- Inherit sales order form view -->
 
@@ -151,7 +155,7 @@
                 <field name="origin" position="after">
                 	<group colspan="2" col="2">
 	                    <separator string="Journal" colspan="4"/>
-	                    <field name="journal_id" select="1" widget="selection"/>
+	                    <field name="journal_id" select="1"/>
 	                    <field name="invoice_type_id" select="1" widget="selection"/>
                     </group>
                 </field>

addons/sale_layout/report/report_sale_layout.rml

@@ -31,6 +31,27 @@
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
+    <blockTableStyle id="Table_final">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,2" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,2" stop="1,2"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,2" stop="2,2"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,2" stop="3,2"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_note">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+
+
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -233,7 +254,7 @@
     <blockTable colWidths="132.0,134.0,135.0,135.0" style="Table6">
       <tr>
         <td>
-          <para style="terp_default_Centre_8">[[ o.name ]]</para>
+          <para style="terp_default_Centre_8">[[ o.client_order_ref ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ o.date_order ]]</para>
@@ -345,8 +366,72 @@
           <para style="P31">Price</para>
         </td>
       </tr>
-		</blockTable>
-		</section>
-		
+    </blockTable>
+    </section>
+   <blockTable colWidths="387.0,56.0,73.0,21.0" style="Table_final">
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_9">Net Total :</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed ) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_9">Taxes :</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax ) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Total :</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total ) ]] </para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9_Bold">[[ o.pricelist_id.currency_id.name ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="533.0" style="Table_note">
+      <tr>
+        <td>
+          <para style="terp_default_9">[[ format(o.note or '') ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_9">[[ format((o.partner_id.property_payment_term and o.partner_id.property_payment_term.note) or '') ]]</para>
+        </td>
+      </tr>
+    </blockTable>
   </story>
 </document>

addons/sale_layout/sale_layout_view.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data>
-
+        <data>
+             <record id="sale.action_order_line_tree2" model="ir.actions.act_window">
+               <field name="domain">[('layout_type','=', 'article')]</field>
+             </record>
 		<record model="ir.ui.view" id="view_order_line_form2_inherit_1">
 			<field name="name">sale.order.line.form2.inherit_1</field>
 			<field name="model">sale.order.line</field>
@@ -15,20 +17,6 @@
 			</field>
 		</record>
 
-		<record model="ir.ui.view" id="view_order_line_tree_inherit_1">
-			<field name="name">sale.order.line.tree.inherit_1</field>
-			<field name="model">sale.order.line</field>
-			<field name="inherit_id" ref="sale.view_order_line_tree"/>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<xpath expr="/tree/field[@name='name']" position="before">
-					<field name="sequence" string="Seq."/>
-					<field name="layout_type"/>
-				</xpath>
-			</field>
-		</record>
-
-
 		<record model="ir.ui.view" id="view_order_form_inherit_1">
 			<field name="name">sale.order.form.inherit_1</field>
 			<field name="model">sale.order</field>

addons/stock/i18n/nl.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-06-14 13:39+0000\n"
-"Last-Translator: Marcel van der Boom (HS-Development BV) <marcel@hsdev.com>\n"
+"PO-Revision-Date: 2010-07-16 15:56+0000\n"
+"Last-Translator: Jan Verlaan (Veritos) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-07-17 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -44,7 +44,7 @@ msgstr "terp-account"
 #. module: stock
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "Ongeldige modelnaam in de definitie van de actie."
+msgstr "Ongeldige modelnaam in de actie-definitie."
 
 #. module: stock
 #: model:ir.module.module,shortdesc:stock.module_meta_information
@@ -592,7 +592,7 @@ msgid "New Reception Packing"
 msgstr "Nieuw ontvangstbon aanmaken"
 
 #. module: stock
-#: wizard_field:stock.move.track,init,quantity:0
+#: wizard_field:mrp.stock.move.track,init,quantity:0
 msgid "Quantity per lot"
 msgstr "Aantal per batch"
 
@@ -683,7 +683,7 @@ msgstr "Relatie locaties"
 #: help:stock.move,tracking_id:0
 msgid ""
 "Tracking lot is the code that will be put on the logistical unit/pallet"
-msgstr ""
+msgstr "Lotnummer is de identificatie voor de logistieke eenheid/pallet"
 
 #. module: stock
 #: view:stock.tracking:0
@@ -840,7 +840,9 @@ msgid "General Informations"
 msgstr "Algemene Informatie"
 
 #. module: stock
+#: code:addons/stock/wizard/wizard_return.py:0
 #: selection:stock.location,chained_location_type:0
+#, python-format
 msgid "None"
 msgstr "Geen"
 
@@ -879,7 +881,7 @@ msgstr "Alle voorraadbewegingen"
 #. module: stock
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor overzicht"
+msgstr "Ongeldige XML voor weergave!"
 
 #. module: stock
 #: field:res.partner,property_stock_supplier:0
@@ -1028,12 +1030,12 @@ msgstr "Concept periodieke voorraadcontroles"
 #. module: stock
 #: wizard_button:inventory.merge,init,end:0
 #: wizard_button:inventory.merge.stock.zero,init,end:0
+#: wizard_button:mrp.stock.move.track,init,end:0
 #: wizard_button:stock.fill_inventory,init,end:0
 #: wizard_button:stock.invoice_onshipping,init,end:0
 #: wizard_button:stock.location.products,init,end:0
 #: view:stock.move:0
 #: wizard_button:stock.move.split,init,end:0
-#: wizard_button:stock.move.track,init,end:0
 #: wizard_button:stock.partial_picking,init,end:0
 #: view:stock.picking:0
 #: wizard_button:stock.picking.make,init,end:0
@@ -1046,7 +1048,7 @@ msgstr "Annuleer"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Split in production lots"
-msgstr "Splits in productie-eenheden"
+msgstr "Splits in productie-lots"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory
@@ -1228,9 +1230,9 @@ msgid "STOCK_STOP"
 msgstr "STOCK_STOP"
 
 #. module: stock
-#: wizard_view:stock.move.track,init:0
+#: wizard_view:mrp.stock.move.track,init:0
 msgid "Tracking a move"
-msgstr "Volg een voorraadbeweging"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1274,7 +1276,7 @@ msgstr "Transactieregels"
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "Value"
-msgstr ""
+msgstr "Waarde"
 
 #. module: stock
 #: field:stock.picking,type:0
@@ -1415,7 +1417,7 @@ msgstr "Vaste locatie"
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
+"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
 
 #. module: stock
 #: field:stock.picking,min_date:0
@@ -1503,7 +1505,7 @@ msgstr "STOCK_SORT_DESCENDING"
 #: model:ir.actions.act_window,name:stock.action_tracking_form
 #: model:ir.ui.menu,name:stock.menu_action_tracking_form
 msgid "Tracking Lots"
-msgstr "Traceer eenheden"
+msgstr "Traceer lots"
 
 #. module: stock
 #: wizard_button:inventory.merge,init,merge:0
@@ -1585,6 +1587,7 @@ msgid "Make packing"
 msgstr "Maak picking"
 
 #. module: stock
+#: wizard_field:stock.partial_picking,end2,back_order_notification:0
 #: field:stock.picking,backorder_id:0
 msgid "Back Order"
 msgstr "Nalevering"
@@ -1637,9 +1640,9 @@ msgid "STOCK_ZOOM_OUT"
 msgstr "STOCK_ZOOM_OUT"
 
 #. module: stock
-#: wizard_field:stock.move.track,init,tracking_prefix:0
+#: wizard_field:mrp.stock.move.track,init,tracking_prefix:0
 msgid "Tracking prefix"
-msgstr "Volgkengetal"
+msgstr "Traceer voorloper"
 
 #. module: stock
 #: selection:stock.location,allocation_method:0
@@ -1922,7 +1925,7 @@ msgid "Tracking"
 msgstr "Traceren"
 
 #. module: stock
-#: wizard_button:stock.move.track,init,track:0
+#: wizard_button:mrp.stock.move.track,init,track:0
 #: wizard_button:stock.picking.make,init,make:0
 msgid "Ok"
 msgstr "Akkoord"
@@ -2400,6 +2403,58 @@ msgstr "Fysieke locaties"
 #~ msgid "Stock Management"
 #~ msgstr "Voorraadbeheer"
 
+#, python-format
+#~ msgid "You cannot delete any record!"
+#~ msgstr "U kunt dit record niet verwijderen!"
+
+#, python-format
+#~ msgid "UserError"
+#~ msgstr "Gebruikersfout"
+
+#, python-format
+#~ msgid "You can only delete draft moves."
+#~ msgstr "Er kunnen alleen concept-wijzigingen worden verwijderd."
+
+#, python-format
+#~ msgid "Invoice state"
+#~ msgstr "Factuur status"
+
+#, python-format
+#~ msgid "Delivered Qty"
+#~ msgstr "Geleverd aantal"
+
+#, python-format
+#~ msgid "Merging is only allowed on draft inventories."
+#~ msgstr "Samenvoegen is alleen toegestaan vanaf concept-facturen"
+
+#, python-format
+#~ msgid "Please select at least two inventories."
+#~ msgstr "Selecteer tenminste twee inventarisaties"
+
+#, python-format
+#~ msgid "You can not remove a lot line !"
+#~ msgstr "Een eenheidsregel kan niet worden verwijderd!"
+
+#, python-format
+#~ msgid "Provide the quantities of the returned products."
+#~ msgstr "Geeft de aantallen van de geretourneerde producten."
+
+#, python-format
+#~ msgid "Received Qty"
+#~ msgstr "Ontvangen aantal"
+
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Fout"
+
+#, python-format
+#~ msgid "Products: "
+#~ msgstr "Producten: "
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Fout!"
+
 #~ msgid ""
 #~ "OpenERP Stock Management module can manage multi-warehouses, multi and "
 #~ "structured stock locations.\n"
@@ -2428,3 +2483,68 @@ msgstr "Fysieke locaties"
 #~ "* Rapid detection of mistakes through double entry system\n"
 #~ "* Traceability (upstream/downstream, production lots, serial number, ...)\n"
 #~ "    "
+
+#, python-format
+#~ msgid "No production sequence defined"
+#~ msgstr "Geen productievolgorde gedefinieerd"
+
+#, python-format
+#~ msgid "Error, no partner !"
+#~ msgstr "Fout, geen relatie!"
+
+#, python-format
+#~ msgid ""
+#~ "Please put a partner on the picking list if you want to generate invoice."
+#~ msgstr "Selecteer een relatie op een factuur aan te maken."
+
+#, python-format
+#~ msgid "Return lines"
+#~ msgstr "Retour regels"
+
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "Fout!"
+
+#, python-format
+#~ msgid "Unplanned Qty"
+#~ msgstr "Niet geplande aantal"
+
+#, python-format
+#~ msgid "to be invoiced"
+#~ msgstr "te factureren"
+
+#, python-format
+#~ msgid "Produced Qty"
+#~ msgstr "Geproduceerd aantal"
+
+#, python-format
+#~ msgid "No product in this location."
+#~ msgstr "Geen producten op deze locatie"
+
+#, python-format
+#~ msgid "Invoice is not created"
+#~ msgstr "Factuur is niet gegenereerd"
+
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Waarschuwing"
+
+#, python-format
+#~ msgid "Message !"
+#~ msgstr "Bericht !"
+
+#, python-format
+#~ msgid "Invoice is already created."
+#~ msgstr "Factuur is reeds gegenereerd"
+
+#, python-format
+#~ msgid "Please select one and only one inventory !"
+#~ msgstr "Selecteer één voorraad locatie"
+
+#, python-format
+#~ msgid "P&L Qty"
+#~ msgstr "Winst&Verlies hoeveelheid"
+
+#, python-format
+#~ msgid "Invoice cannot be created from Packing."
+#~ msgstr "Factuur kan niet worden gegenereerd vanuit Pick-order"

addons/stock/i18n/zh_CN.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-05-06 03:59+0000\n"
-"Last-Translator: digitalsatori <Unknown>\n"
+"PO-Revision-Date: 2010-07-17 05:42+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -44,7 +44,7 @@ msgstr "terp-account"
 #. module: stock
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在动作定义使用了无效的模型名称。"
+msgstr "在动作定义中使用了无效的模快名。"
 
 #. module: stock
 #: model:ir.module.module,shortdesc:stock.module_meta_information
@@ -91,19 +91,19 @@ msgstr "退货"
 #. module: stock
 #: field:product.category,property_stock_journal:0
 msgid "Stock journal"
-msgstr "库存分类帐"
+msgstr "库存记录集合"
 
 #. module: stock
 #: wizard_view:stock.fill_inventory,init:0
 msgid "Fill Inventory for specific location"
-msgstr "填写具体库位盘存"
+msgstr "填写库存的具体库位"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_picking_list
 #: view:stock.picking:0
 #: field:stock.picking.move.wizard,picking_id:0
 msgid "Packing list"
-msgstr "分拣单"
+msgstr "装箱单"
 
 #. module: stock
 #: rml:lot.stock.overview:0
@@ -114,13 +114,13 @@ msgstr "金额"
 #. module: stock
 #: view:stock.picking:0
 msgid "Products Received"
-msgstr "已收到的货品"
+msgstr "已收到的产品"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree4
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree4
 msgid "Incoming Products"
-msgstr "入库货品"
+msgstr "接收的产品"
 
 #. module: stock
 #: field:stock.picking,name:0
@@ -131,7 +131,7 @@ msgstr "参照"
 #. module: stock
 #: wizard_field:stock.invoice_onshipping,init,group:0
 msgid "Group by partner"
-msgstr "按业务伙伴分类"
+msgstr "按业务伙伴分组"
 
 #. module: stock
 #: field:stock.picking,address_id:0
@@ -184,7 +184,7 @@ msgstr "状态"
 #. module: stock
 #: field:stock.location,stock_real_value:0
 msgid "Real Stock Value"
-msgstr "实际库存额"
+msgstr "实际库存值"
 
 #. module: stock
 #: view:stock.move:0
@@ -201,12 +201,12 @@ msgstr "可用"
 #. module: stock
 #: view:stock.move:0
 msgid "Make Parcel"
-msgstr "装箱"
+msgstr "打包"
 
 #. module: stock
 #: wizard_view:stock.partial_picking,end2:0
 msgid "Packing result"
-msgstr "包装结果"
+msgstr "装箱单结果"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -272,7 +272,7 @@ msgstr "内部调拨"
 #. module: stock
 #: field:stock.move,product_packaging:0
 msgid "Packaging"
-msgstr "装箱"
+msgstr "装箱单"
 
 #. module: stock
 #: rml:stock.picking.list:0
@@ -295,7 +295,7 @@ msgstr "附加信息"
 #. module: stock
 #: selection:stock.invoice_onshipping,init,type:0
 msgid "Customer Refund"
-msgstr "客户退货"
+msgstr "客户退还"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -305,7 +305,7 @@ msgstr "STOCK_FLOPPY"
 #. module: stock
 #: view:stock.production.lot.revision:0
 msgid "Production Lot Revisions"
-msgstr ""
+msgstr "生产批次修订"
 
 #. module: stock
 #: view:stock.location:0
@@ -332,7 +332,7 @@ msgstr "调拨信息"
 #. module: stock
 #: view:stock.picking:0
 msgid "Unreceived Products"
-msgstr "未接收产品"
+msgstr "未接收的产品"
 
 #. module: stock
 #: field:stock.inventory,state:0
@@ -354,12 +354,12 @@ msgstr "STOCK_UNDERLINE"
 #. module: stock
 #: view:stock.picking.move.wizard:0
 msgid "Move Lines"
-msgstr "凭证明细"
+msgstr "调拨明细"
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
 msgid "Include all childs for the location"
-msgstr "包括所有库位子项"
+msgstr "包括所有该库位的子库位"
 
 #. module: stock
 #: field:product.template,property_stock_procurement:0
@@ -414,7 +414,7 @@ msgstr "数量"
 #. module: stock
 #: view:stock.picking:0
 msgid "Process Now"
-msgstr "现在处理"
+msgstr "立即处理"
 
 #. module: stock
 #: field:stock.location,address_id:0
@@ -449,7 +449,7 @@ msgstr "库存属性"
 #. module: stock
 #: wizard_button:stock.partial_picking,init,split:0
 msgid "Make Picking"
-msgstr "建立领料/提货"
+msgstr "建立装箱单"
 
 #. module: stock
 #: model:stock.location,name:stock.location_procurement
@@ -475,7 +475,7 @@ msgstr "产品ID"
 #. module: stock
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr "销售与采购"
+msgstr "销售&采购"
 
 #. module: stock
 #: selection:stock.invoice_onshipping,init,type:0
@@ -485,7 +485,7 @@ msgstr "客户发票"
 #. module: stock
 #: field:product.template,property_stock_inventory:0
 msgid "Inventory Location"
-msgstr "盘存库位"
+msgstr "库存库位"
 
 #. module: stock
 #: help:product.product,track_production:0
@@ -503,12 +503,12 @@ msgid ""
 "For the current product (template), this stock location will be used, "
 "instead of the default one, as the source location for stock moves generated "
 "when you do an inventory"
-msgstr "对于当前产品(模板)该库存库位默认作为库存盘点时库存调拨的源库位."
+msgstr "对于当前产品(模板), 这库存库位将作为默认值, 库存盘点时作为库存调拨的源库位."
 
 #. module: stock
 #: help:product.category,property_stock_account_output_categ:0
 msgid "This account will be used to value the output stock"
-msgstr "用于记录出库价值科目"
+msgstr "这科目用于记录出库值"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -519,7 +519,7 @@ msgstr "STOCK_ZOOM_FIT"
 #: help:product.category,property_stock_journal:0
 msgid ""
 "This journal will be used for the accounting move generated by stock move"
-msgstr "用于记录库存调拨产生的会计变动."
+msgstr "这记录集合用于库存调拨产生的会计凭证."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_calendar_delivery
@@ -545,7 +545,7 @@ msgstr "STOCK_SAVE_AS"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_prodlots
 msgid "Stock report by production lots"
-msgstr "库存生产批次报表"
+msgstr "生产批次库存报表"
 
 #. module: stock
 #: field:stock.location,stock_virtual:0
@@ -586,10 +586,10 @@ msgstr "STOCK_GOTO_BOTTOM"
 #: model:ir.actions.act_window,name:stock.action_picking_form
 #: model:ir.ui.menu,name:stock.menu_action_picking_form
 msgid "New Reception Packing"
-msgstr "新接收的包装"
+msgstr "新接收的装箱单"
 
 #. module: stock
-#: wizard_field:stock.move.track,init,quantity:0
+#: wizard_field:mrp.stock.move.track,init,quantity:0
 msgid "Quantity per lot"
 msgstr "每批次数量"
 
@@ -700,7 +700,7 @@ msgstr "terp-stock"
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "Packing List:"
-msgstr "包装单:"
+msgstr "装箱单:"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -730,7 +730,7 @@ msgstr "未分派的产品"
 #. module: stock
 #: view:stock.picking:0
 msgid "Invoice Control"
-msgstr "发票控制"
+msgstr "发票管理"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot_revision
@@ -754,7 +754,7 @@ msgstr "等待中"
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree7
 #: model:ir.ui.menu,name:stock.menu_picking_waiting
 msgid "Available Packing"
-msgstr ""
+msgstr "有效的装箱单"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_warehouse
@@ -780,7 +780,7 @@ msgstr "一般IT供应商"
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview_all
 msgid "Location Content (With children)"
-msgstr "库存地点（包括子项）"
+msgstr "库位内容(包括子项)"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -807,7 +807,7 @@ msgstr "STOCK_CONNECT"
 #: model:ir.ui.menu,name:stock.menu_action_picking_all
 #: wizard_field:stock.picking.make,init,pickings:0
 msgid "Packing"
-msgstr "装箱"
+msgstr "装箱单"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -818,7 +818,7 @@ msgstr "STOCK_GO_DOWN"
 #: field:res.partner,property_stock_customer:0
 #: selection:stock.location,usage:0
 msgid "Customer Location"
-msgstr "客户存货地点"
+msgstr "客户库位"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -829,7 +829,7 @@ msgstr "STOCK_OK"
 #: model:ir.actions.act_window,name:stock.action_picking_tree9
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree9
 msgid "New Internal Packing"
-msgstr "新的内部包装"
+msgstr "新的内部装箱单"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -837,7 +837,9 @@ msgid "General Informations"
 msgstr "一般信息"
 
 #. module: stock
+#: code:addons/stock/wizard/wizard_return.py:0
 #: selection:stock.location,chained_location_type:0
+#, python-format
 msgid "None"
 msgstr "空"
 
@@ -876,7 +878,7 @@ msgstr "所有库存调拨"
 #. module: stock
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "描述视图结构的XML文件无效"
+msgstr "无效的视图结构xml文件!"
 
 #. module: stock
 #: field:res.partner,property_stock_supplier:0
@@ -897,7 +899,7 @@ msgstr "紧急"
 #. module: stock
 #: help:product.category,property_stock_account_input_categ:0
 msgid "This account will be used to value the input stock"
-msgstr "此科目用于记录入库库存金额"
+msgstr "这科目用于记录入库值"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -980,7 +982,7 @@ msgstr "STOCK_APPLY"
 #. module: stock
 #: wizard_view:stock.partial_picking,end2:0
 msgid "The packing has been successfully made !"
-msgstr "装箱已完成！"
+msgstr "这装箱单已完成!"
 
 #. module: stock
 #: field:stock.move,address_id:0
@@ -1024,12 +1026,12 @@ msgstr "定期盘存草稿"
 #. module: stock
 #: wizard_button:inventory.merge,init,end:0
 #: wizard_button:inventory.merge.stock.zero,init,end:0
+#: wizard_button:mrp.stock.move.track,init,end:0
 #: wizard_button:stock.fill_inventory,init,end:0
 #: wizard_button:stock.invoice_onshipping,init,end:0
 #: wizard_button:stock.location.products,init,end:0
 #: view:stock.move:0
 #: wizard_button:stock.move.split,init,end:0
-#: wizard_button:stock.move.track,init,end:0
 #: wizard_button:stock.partial_picking,init,end:0
 #: view:stock.picking:0
 #: wizard_button:stock.picking.make,init,end:0
@@ -1089,7 +1091,7 @@ msgstr "稍候处理"
 msgid ""
 "This stock location will be used, instead of the default one, as the source "
 "location for goods you receive from the current partner"
-msgstr "默认作为你接收业务伙伴产品的来源库位"
+msgstr "默认作为你接收当前业务伙伴产品的来源库位"
 
 #. module: stock
 #: field:stock.warehouse,partner_address_id:0
@@ -1120,7 +1122,7 @@ msgstr "STOCK_HARDDISK"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_relate_picking
 msgid "Related Picking"
-msgstr "相关领料/提货"
+msgstr "相关的装箱单"
 
 #. module: stock
 #: field:stock.incoterms,name:0
@@ -1148,13 +1150,13 @@ msgstr "]"
 #. module: stock
 #: view:stock.picking:0
 msgid "Input Packing List"
-msgstr "接收包装单"
+msgstr "接收的装箱单"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_picking
 #: field:stock.move,picking_id:0
 msgid "Packing List"
-msgstr "包装单"
+msgstr "装箱单"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1164,7 +1166,7 @@ msgstr "STOCK_COPY"
 #. module: stock
 #: selection:stock.invoice_onshipping,init,type:0
 msgid "Supplier Refund"
-msgstr "供应商退货"
+msgstr "供应商退还"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move
@@ -1195,7 +1197,7 @@ msgstr "STOCK_CDROM"
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "Not from Packing"
-msgstr "不是来自包装"
+msgstr "不是来自装箱单"
 
 #. module: stock
 #: view:stock.location:0
@@ -1223,7 +1225,7 @@ msgid "STOCK_STOP"
 msgstr "STOCK_STOP"
 
 #. module: stock
-#: wizard_view:stock.move.track,init:0
+#: wizard_view:mrp.stock.move.track,init:0
 msgid "Tracking a move"
 msgstr "跟踪调拨"
 
@@ -1235,7 +1237,7 @@ msgstr "STOCK_FIND_AND_REPLACE"
 #. module: stock
 #: view:stock.picking:0
 msgid "Validate"
-msgstr "审核"
+msgstr "确认"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1284,7 +1286,7 @@ msgstr "产品"
 #. module: stock
 #: field:stock.picking,move_type:0
 msgid "Delivery Method"
-msgstr "运输方式"
+msgstr "送货方式"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.partial_picking
@@ -1399,14 +1401,14 @@ msgid ""
 "* Traceability (upstream/downstream, production lots, serial number, ...)\n"
 "    "
 msgstr ""
-"\"OpenERP库存管理模块可以管理多仓库，多样化结构的仓储地点.\\n\"\n"
-"\"感谢复式记帐管理，存货管理很强大并且灵活:\\n\"\n"
-"\"* 移动历史和规划,\\n\"\n"
-"\"* 不同的库存管理法 (FIFO, LIFO, ...)\\n\"\n"
+"\"库存管理模块可以管理多仓库, 多样化结构的仓储地点.\\n\"\n"
+"\"感谢复式记帐管理, 存货管理很强大并且灵活:\\n\"\n"
+"\"* 调拨历史和计划\\n\"\n"
+"\"* 不同的库存管理法 (先进先出, 先进后出, ...)\\n\"\n"
 "\"* 库存估价 (标准或平均价格, ...)\\n\"\n"
 "\"* 稳健面临盘存差错\\n\"\n"
 "\"* 自动重新订货规则 (库存水平, JIT, ...)\\n\"\n"
-"\"* 支持条形码\\n\"\n"
+"\"* 支持条码\\n\"\n"
 "\"* 通过复式记帐系统快速检测错误\\n\"\n"
 "\"* 可追溯性(向上追溯/向下追溯,产品批次,序列号, ...)\\n\"\n"
 "    "
@@ -1451,7 +1453,7 @@ msgstr "STOCK_DELETE"
 #. module: stock
 #: model:account.journal,name:stock.stock_journal
 msgid "Stock Journal"
-msgstr "库存分类帐"
+msgstr "库存记录集合"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1481,7 +1483,7 @@ msgstr "强制可用"
 #. module: stock
 #: wizard_view:stock.location.products,init:0
 msgid "View Stock of Products"
-msgstr "产品库存视图"
+msgstr "查看库存产品"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1571,7 +1573,7 @@ msgstr "数量(销售单位)"
 #: model:ir.actions.act_window,name:stock.action_picking_tree5
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree5
 msgid "Packing to Process"
-msgstr "包装处理"
+msgstr "装箱单处理"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1587,12 +1589,13 @@ msgstr "设为可用"
 #: model:ir.actions.wizard,name:stock.make_picking
 #: wizard_view:stock.picking.make,init:0
 msgid "Make packing"
-msgstr "装箱"
+msgstr "建立装箱单"
 
 #. module: stock
+#: wizard_field:stock.partial_picking,end2,back_order_notification:0
 #: field:stock.picking,backorder_id:0
 msgid "Back Order"
-msgstr "拖欠订单"
+msgstr "订单"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1642,7 +1645,7 @@ msgid "STOCK_ZOOM_OUT"
 msgstr "STOCK_ZOOM_OUT"
 
 #. module: stock
-#: wizard_field:stock.move.track,init,tracking_prefix:0
+#: wizard_field:mrp.stock.move.track,init,tracking_prefix:0
 msgid "Tracking prefix"
 msgstr "跟踪前缀"
 
@@ -1732,7 +1735,7 @@ msgstr "仓库"
 #. module: stock
 #: help:product.product,track_outgoing:0
 msgid "Force to use a Production Lot during deliveries"
-msgstr "出库时指定批次"
+msgstr "送货时指定批次"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1742,7 +1745,7 @@ msgstr "把调拨明细线分为两部分"
 #. module: stock
 #: wizard_field:stock.invoice_onshipping,init,journal_id:0
 msgid "Destination Journal"
-msgstr "目标分类帐"
+msgstr "目的地记录集合"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_production_lot_2_stock_report_prodlots
@@ -1769,7 +1772,7 @@ msgstr "退回"
 #. module: stock
 #: field:stock.picking,auto_picking:0
 msgid "Auto-Packing"
-msgstr "自动创建分拣单"
+msgstr "自动装箱单"
 
 #. module: stock
 #: field:stock.move,product_uos:0
@@ -1915,7 +1918,8 @@ msgid ""
 "move has to be validated by a worker. With 'Automatic No Step Added', the "
 "location is replaced in the original move."
 msgstr ""
-"如果你选择链式库位这是唯一的.'自动调拨'将创建一个库存调拨后当前这个将自动确认.'手动操作'库存调拨需要人手确认.'自动不增加'库位式取代调拨来源."
+"如果你只选择链式库位类型.\n"
+"'自动调拨' 将创建一个库存调拨后将自动确认. '手动操作' 库存调拨需要人手确认. '自动不增加'步骤' 库位将取代调拨源库位."
 
 #. module: stock
 #: field:stock.location,icon:0
@@ -1928,7 +1932,7 @@ msgid "Tracking"
 msgstr "跟踪"
 
 #. module: stock
-#: wizard_button:stock.move.track,init,track:0
+#: wizard_button:mrp.stock.move.track,init,track:0
 #: wizard_button:stock.picking.make,init,make:0
 msgid "Ok"
 msgstr "确定"
@@ -1937,7 +1941,7 @@ msgstr "确定"
 #: help:product.template,property_stock_account_input:0
 msgid ""
 "This account will be used, instead of the default one, to value input stock"
-msgstr "默认作为记录入库值科目"
+msgstr "这科目默认作为记录入库值"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_8
@@ -1967,7 +1971,7 @@ msgstr "已登入库存"
 #. module: stock
 #: selection:stock.picking,type:0
 msgid "Getting Goods"
-msgstr "收货"
+msgstr "获得的货物"
 
 #. module: stock
 #: view:stock.location:0
@@ -1977,7 +1981,7 @@ msgstr "库存库位"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_PLAY"
-msgstr "播放"
+msgstr "STOCK_MEDIA_PLAY"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree_delivery
@@ -1988,7 +1992,7 @@ msgstr "送货单"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_OPEN"
-msgstr "打开"
+msgstr "STOCK_OPEN"
 
 #. module: stock
 #: help:res.partner,property_stock_customer:0
@@ -2006,7 +2010,7 @@ msgstr "确定"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_PREVIOUS"
-msgstr "前一个"
+msgstr "STOCK_MEDIA_PREVIOUS"
 
 #. module: stock
 #: view:stock.move:0
@@ -2033,7 +2037,7 @@ msgstr "库存库位结构"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DISCONNECT"
-msgstr "分拆"
+msgstr "STOCK_DISCONNECT"
 
 #. module: stock
 #: help:product.template,property_stock_account_output:0
@@ -2044,7 +2048,7 @@ msgstr "默认作为记录出库值科目"
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirm (Do Not Process Now)"
-msgstr "确认(现在没处理进程)"
+msgstr "确认(现在不处理)"
 
 #. module: stock
 #: field:stock.tracking,move_ids:0
@@ -2054,7 +2058,7 @@ msgstr "调拨跟踪"
 #. module: stock
 #: model:ir.ui.menu,name:stock.next_id_61
 msgid "Reporting"
-msgstr "内部报表"
+msgstr "报表"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.wizard_invoice_onshipping
@@ -2065,7 +2069,7 @@ msgstr "创建发票"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_NETWORK"
-msgstr "网络"
+msgstr "STOCK_NETWORK"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_configuration
@@ -2075,7 +2079,7 @@ msgstr "设置"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-project"
-msgstr "项目"
+msgstr "terp-project"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_product_2_stock_report_prodlots
@@ -2089,7 +2093,7 @@ msgstr "库存批次"
 #. module: stock
 #: field:stock.move,auto_validate:0
 msgid "Auto Validate"
-msgstr "自动验证"
+msgstr "自动确认"
 
 #. module: stock
 #: field:stock.location,chained_auto_packing:0
@@ -2106,12 +2110,12 @@ msgstr "虚拟库存值"
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 msgid "Canceled"
-msgstr "取消"
+msgstr "已取消"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GOTO_LAST"
-msgstr "最后"
+msgstr "STOCK_GOTO_LAST"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
@@ -2121,7 +2125,7 @@ msgstr "已开票"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIRECTORY"
-msgstr "目录"
+msgstr "STOCK_DIRECTORY"
 
 #. module: stock
 #: help:product.template,property_stock_production:0
@@ -2151,7 +2155,7 @@ msgstr "草稿"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_JUSTIFY_CENTER"
-msgstr "居中"
+msgstr "STOCK_JUSTIFY_CENTER"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree3
@@ -2159,12 +2163,12 @@ msgstr "居中"
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree3
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree8
 msgid "Confirmed Packing Waiting Availability"
-msgstr "确认包装等待可用"
+msgstr "确认装箱单等待可用"
 
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
-msgstr "架子（Y）"
+msgstr "货架(Y)"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.wizard_merge_inventory_zero
@@ -2189,7 +2193,7 @@ msgstr "直接送货"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_REVERT_TO_SAVED"
-msgstr "恢复到保存"
+msgstr "STOCK_REVERT_TO_SAVED"
 
 #. module: stock
 #: field:product.product,track_production:0
@@ -2217,7 +2221,7 @@ msgstr "对于当前产品(模板)该库存库位默认作为产品需求的库
 #. module: stock
 #: model:ir.model,name:stock.model_stock_picking_move_wizard
 msgid "stock.picking.move.wizard"
-msgstr "库存.领料/提货.调拨.向导"
+msgstr "库存.装箱单.调拨.向导"
 
 #. module: stock
 #: model:res.request.link,name:stock.req_link_tracking
@@ -2253,7 +2257,7 @@ msgstr "库位"
 msgid ""
 "Scheduled date for the movement of the products or real date if the move is "
 "done."
-msgstr "如果调拨完成.产品调拨的预定日期或实际日期"
+msgstr "如果调拨完成. 产品调拨的预定日期或实际日期"
 
 #. module: stock
 #: view:stock.picking:0
@@ -2263,7 +2267,7 @@ msgstr "一般信息"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-product"
-msgstr "产品"
+msgstr "terp-product"
 
 #. module: stock
 #: wizard_button:stock.partial_picking,end2,end:0
@@ -2321,7 +2325,7 @@ msgstr "说明"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_INDENT"
-msgstr "缩进"
+msgstr "STOCK_INDENT"
 
 #. module: stock
 #: selection:stock.picking,type:0
@@ -2365,7 +2369,7 @@ msgstr "发出"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_JUSTIFY_RIGHT"
-msgstr "右对齐"
+msgstr "STOCK_JUSTIFY_RIGHT"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_line
@@ -2380,7 +2384,7 @@ msgstr "其它信息"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_NEXT"
-msgstr "下一个"
+msgstr "STOCK_MEDIA_NEXT"
 
 #. module: stock
 #: view:stock.move:0
@@ -2393,5 +2397,149 @@ msgstr "调拨状态"
 msgid "Physical Locations"
 msgstr "物理库位"
 
+#, python-format
+#~ msgid "You cannot delete any record!"
+#~ msgstr "您不能删除任何记录！"
+
 #~ msgid "Stock Management"
 #~ msgstr "库存管理"
+
+#, python-format
+#~ msgid "No product in this location."
+#~ msgstr "该货位没有产品"
+
+#, python-format
+#~ msgid "Invoice cannot be created from Packing."
+#~ msgstr "不可从装箱单创建发票"
+
+#, python-format
+#~ msgid "You can only delete draft moves."
+#~ msgstr "您只可删除草稿调拨"
+
+#, python-format
+#~ msgid "UserError"
+#~ msgstr "用户错误"
+
+#, python-format
+#~ msgid "Invoice state"
+#~ msgstr "发票状态"
+
+#, python-format
+#~ msgid "Delivered Qty"
+#~ msgstr "已交货数量"
+
+#, python-format
+#~ msgid "Invoice is not created"
+#~ msgstr "没有创建发票"
+
+#, python-format
+#~ msgid "Please select at least two inventories."
+#~ msgstr "请选择至少2个盘存"
+
+#, python-format
+#~ msgid "Merging is only allowed on draft inventories."
+#~ msgstr "只允许合并草搞盘存"
+
+#, python-format
+#~ msgid "Provide the quantities of the returned products."
+#~ msgstr "输入退货的数量"
+
+#, python-format
+#~ msgid "You can not remove a lot line !"
+#~ msgstr "您不能删除批次线!"
+
+#, python-format
+#~ msgid "Received Qty"
+#~ msgstr "已接收数量"
+
+#, python-format
+#~ msgid "Error"
+#~ msgstr "错误"
+
+#, python-format
+#~ msgid "Invoice is already created."
+#~ msgstr "发票已创建"
+
+#, python-format
+#~ msgid "Products: "
+#~ msgstr "产品： "
+
+#, python-format
+#~ msgid "P&L Qty"
+#~ msgstr "益损数量"
+
+#, python-format
+#~ msgid "No production sequence defined"
+#~ msgstr "无生产序列定义"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "错误！"
+
+#, python-format
+#~ msgid "Error, no partner !"
+#~ msgstr "错误，无业务伙伴！"
+
+#, python-format
+#~ msgid "Return lines"
+#~ msgstr "退回明细"
+
+#, python-format
+#~ msgid "Message !"
+#~ msgstr "消息！"
+
+#, python-format
+#~ msgid ""
+#~ "Please put a partner on the picking list if you want to generate invoice."
+#~ msgstr "如果想生成发票，请在挑选列表上填写一家业务伙伴。"
+
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "错误！"
+
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "警告"
+
+#, python-format
+#~ msgid "Please select one and only one inventory !"
+#~ msgstr "请选定唯一的盘存"
+
+#, python-format
+#~ msgid "Unplanned Qty"
+#~ msgstr "计划外数量"
+
+#, python-format
+#~ msgid "to be invoiced"
+#~ msgstr "需开发票"
+
+#, python-format
+#~ msgid "Produced Qty"
+#~ msgstr "产品数量"
+
+#~ msgid ""
+#~ "OpenERP Stock Management module can manage multi-warehouses, multi and "
+#~ "structured stock locations.\n"
+#~ "Thanks to the double entry management, the inventory controlling is powerful "
+#~ "and flexible:\n"
+#~ "* Moves history and planning,\n"
+#~ "* Different inventory methods (FIFO, LIFO, ...)\n"
+#~ "* Stock valuation (standard or average price, ...)\n"
+#~ "* Robustness faced with Inventory differences\n"
+#~ "* Automatic reordering rules (stock level, JIT, ...)\n"
+#~ "* Bar code supported\n"
+#~ "* Rapid detection of mistakes through double entry system\n"
+#~ "* Traceability (upstream/downstream, production lots, serial number, ...)\n"
+#~ "    "
+#~ msgstr ""
+#~ "系统库存管理模块能管理多仓库多和结构化仓库库位\n"
+#~ "使用复式记录管理提供灵活和强大库存控制:\n"
+#~ "* 调拨历史和计划\n"
+#~ "* 不同的库存管理方法(FIFO, LIFO, ...)\n"
+#~ "* 存货估计(标准和平均估价)\n"
+#~ "* 自动重开单规则(库存级别,jit)\n"
+#~ "* 存货清单不同的鲁棒性\n"
+#~ "* 条码支持\n"
+#~ "* 通过复式录入系统实现快速检测错误\n"
+#~ "* 跟踪能力(上游,下游,产品批号,序列号)\n"
+#~ "    "

addons/stock_invoice_directly/i18n/zh_CN.po

@@ -7,16 +7,16 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 10:29+0000\n"
+"PO-Revision-Date: 2010-07-17 05:33+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:19+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
-msgstr "发票直接分包"
+msgstr "直接发票装箱单"

addons/stock_location/i18n/zh_CN.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 10:30+0000\n"
+"PO-Revision-Date: 2010-07-17 05:40+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:18+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
@@ -24,7 +24,7 @@ msgstr "转换要的天数"
 #. module: stock_location
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
+msgstr "无效的视图结构xml文件!"
 
 #. module: stock_location
 #: model:ir.module.module,shortdesc:stock_location.module_meta_information
@@ -35,18 +35,18 @@ msgstr "库存库位路径"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
 
 #. module: stock_location
 #: selection:stock.location.path,auto:0
 msgid "Automatic No Step Added"
-msgstr "自动没步骤增加"
+msgstr "自动，不加入步骤"
 
 #. module: stock_location
 #: help:product.product,path_ids:0
 msgid ""
 "These rules set the right path of the product in the whole location tree."
-msgstr "这些规则确定了库位树正确的产品路径"
+msgstr "这些规则确定了产品在整个库位树的正确路径"
 
 #. module: stock_location
 #: field:stock.location.path,location_from_id:0
@@ -89,7 +89,8 @@ msgid ""
 "move has to be validated by a worker. With 'Automatic No Step Added', the "
 "location is replaced in the original move."
 msgstr ""
-"这些规则确定了库位树正确的产品路径.‘自动调拨’将创建库存调拨后当前将自动验证.‘手动操作’这库存调拨要工人验证.‘自动没增加步骤’库位是取代原来的"
+"这些规则确定了产品在库位树中的正确移动路径.\n"
+"‘自动调拨’ 将创建库存调拨后自动确认. ‘手动操作’ 库存调拨需要人工确认. ‘自动不加入步骤’ 库位是取代调拨源库位."
 
 #. module: stock_location
 #: field:stock.location.path,name:0

addons/stock_no_autopicking/i18n/zh_CN.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 10:30+0000\n"
+"PO-Revision-Date: 2010-07-17 05:44+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
@@ -24,14 +24,14 @@ msgstr "无效的视图结构xml文件"
 #. 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
 #: model:ir.module.module,shortdesc:stock_no_autopicking.module_meta_information
 msgid "Stock No Auto-Picking"
-msgstr "库存没自动分包"
+msgstr "库存没自动装箱单"