diff --git a/app_base_chinese/__manifest__.py b/app_base_chinese/__manifest__.py
index bc751518..f1cc6fe6 100644
--- a/app_base_chinese/__manifest__.py
+++ b/app_base_chinese/__manifest__.py
@@ -18,7 +18,7 @@
{
'name': "App base chinese,中国化基本模块增强",
- 'version': '13.20.01.13',
+ 'version': '13.20.01.18',
'author': 'Sunpop.cn',
'category': 'Base',
'website': 'https://www.sunpop.cn',
@@ -44,20 +44,25 @@
8. 超级用户改时区为 中国
9. 时间格式年月日为 2019-12-30,时间为 22:10
10. 国家增加排序,中国排第一
- 11. todo:中文演示数据(只有demo模式才加载)
+ 11. 收款相关显示中国习惯
+ 21. todo:中文演示数据(只有demo模式才加载)
""",
'pre_init_hook': 'pre_init_hook',
'post_init_hook': 'post_init_hook',
'depends': [
'app_base',
+ 'account',
'stock',
],
'images': ['static/description/banner.jpg'],
'data': [
'views/res_partner_views.xml',
'views/res_currency_views.xml',
+ 'views/sale_order_views.xml',
+ 'views/account_move_views.xml',
'views/ir_default_views.xml',
'views/templates.xml',
+ 'wizard/sale_make_invoice_advance_views.xml',
'data/ir_default_data.xml',
'data/ir_sequence_data.xml',
'data/base_data.xml',
diff --git a/app_base_chinese/i18n/zh_CN.po b/app_base_chinese/i18n/zh_CN.po
index d4e9e2e2..8f7abb75 100644
--- a/app_base_chinese/i18n/zh_CN.po
+++ b/app_base_chinese/i18n/zh_CN.po
@@ -1,49 +1,94 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
-# * app_base
+# * app_base_chinese
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 13.0+e-20191027\n"
+"Project-Id-Version: Odoo Server 13.0+e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-27 20:43+0000\n"
-"PO-Revision-Date: 2019-10-27 20:43+0000\n"
+"POT-Creation-Date: 2020-01-18 15:21+0000\n"
+"PO-Revision-Date: 2020-01-18 23:22+0800\n"
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
+"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: \n"
+"X-Generator: Poedit 1.7.7\n"
-#. module: app_base
-#: model:ir.model.fields,help:app_base.field_res_partner__customer
-#: model:ir.model.fields,help:app_base.field_res_users__customer
-msgid ""
-"Check this box if this contact is a customer. It can be selected in sales "
-"orders."
-msgstr ""
+#. module: app_base_chinese
+#: model:ir.model.fields,field_description:app_base_chinese.field_product_category__complete_name
+msgid "Complete Name"
+msgstr "完整名称"
-#. module: app_base
-#: model:ir.model.fields,help:app_base.field_res_partner__supplier
-#: model:ir.model.fields,help:app_base.field_res_users__supplier
-msgid ""
-"Check this box if this contact is a vendor. It can be selected in purchase "
-"orders."
-msgstr ""
-
-#. module: app_base
-#: model:ir.model,name:app_base.model_res_partner
+#. module: app_base_chinese
+#: model:ir.model,name:app_base_chinese.model_res_partner
msgid "Contact"
msgstr "联系人"
-#. module: app_base
-#: model:ir.model.fields,field_description:app_base.field_res_partner__customer
-#: model:ir.model.fields,field_description:app_base.field_res_users__customer
-msgid "Is a Customer"
-msgstr "客户"
+#. module: app_base_chinese
+#: model_terms:ir.ui.view,arch_db:app_base_chinese.app_res_partner_kanban_view
+msgid "Credit:"
+msgstr "信用额:"
-#. module: app_base
-#: model:ir.model.fields,field_description:app_base.field_res_partner__supplier
-#: model:ir.model.fields,field_description:app_base.field_res_users__supplier
-msgid "Is a Vendor"
-msgstr "供应商"
+#. module: app_base_chinese
+#: model:ir.model,name:app_base_chinese.model_res_currency
+msgid "Currency"
+msgstr "币种"
+
+#. module: app_base_chinese
+#: model:ir.model.fields,help:app_base_chinese.field_res_currency__sequence
+msgid "Determine the display order. Sort ascending."
+msgstr "决定显示顺序,数字越小排序越前"
+
+#. module: app_base_chinese
+#: model_terms:ir.ui.view,arch_db:app_base_chinese.app_view_sale_advance_payment_inv
+msgid "FaPiao / Invoice Orders"
+msgstr "创建收据/发票"
+
+#. module: app_base_chinese
+#: model:ir.model.fields,field_description:app_base_chinese.field_stock_location__complete_name
+msgid "Full Location Name"
+msgstr "完整的位置名称"
+
+#. module: app_base_chinese
+#: model:ir.model,name:app_base_chinese.model_stock_location
+msgid "Inventory Locations"
+msgstr "库存位置"
+
+#. module: app_base_chinese
+#: model_terms:ir.ui.view,arch_db:app_base_chinese.app_view_order_form
+msgid "Invoices/FaPiao"
+msgstr "收据/发票"
+
+#. module: app_base_chinese
+#: model_terms:ir.ui.view,arch_db:app_base_chinese.app_view_order_form
+msgid "Make Collections"
+msgstr "收款"
+
+#. module: app_base_chinese
+#: model:ir.model.fields,field_description:app_base_chinese.field_res_partner__name
+#: model:ir.model.fields,field_description:app_base_chinese.field_res_users__name
+msgid "Name"
+msgstr "名称"
+
+#. module: app_base_chinese
+#: model_terms:ir.ui.view,arch_db:app_base_chinese.app_view_move_form
+msgid "Post Entry"
+msgstr "过帐"
+
+#. module: app_base_chinese
+#: model:ir.model,name:app_base_chinese.model_product_category
+msgid "Product Category"
+msgstr "产品类别"
+
+#. module: app_base_chinese
+#: model:ir.model.fields,field_description:app_base_chinese.field_res_currency__sequence
+msgid "Sequence"
+msgstr "单号规则"
+
+#. module: app_base_chinese
+#: model:ir.model.fields,field_description:app_base_chinese.field_res_partner__short_name
+#: model:ir.model.fields,field_description:app_base_chinese.field_res_users__short_name
+msgid "Short Name"
+msgstr "缩写"
diff --git a/app_base_chinese/views/account_move_views.xml b/app_base_chinese/views/account_move_views.xml
new file mode 100644
index 00000000..728d8a79
--- /dev/null
+++ b/app_base_chinese/views/account_move_views.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+ app.account.move.form
+ account.move
+
+
+
+
+ Post Entry
+
+
+
+
+
+
diff --git a/app_base_chinese/views/sale_order_views.xml b/app_base_chinese/views/sale_order_views.xml
new file mode 100644
index 00000000..b67ab85c
--- /dev/null
+++ b/app_base_chinese/views/sale_order_views.xml
@@ -0,0 +1,24 @@
+
+
+
+
+ app.sale.order.form
+ sale.order
+
+
+
+
+ Make Collections
+
+
+
+ Make Collections
+
+
+
+ Invoices/FaPiao
+
+
+
+
+
\ No newline at end of file
diff --git a/app_base_chinese/wizard/sale_make_invoice_advance_views.xml b/app_base_chinese/wizard/sale_make_invoice_advance_views.xml
new file mode 100644
index 00000000..1362a7aa
--- /dev/null
+++ b/app_base_chinese/wizard/sale_make_invoice_advance_views.xml
@@ -0,0 +1,21 @@
+
+
+
+ FaPiao / Invoice Orders
+
+
+
+ app.account.move.form
+ sale.advance.payment.inv
+
+
+
+ FaPiao / Invoice Orders
+
+
+
+
+
+ Create FaPiao / Invoice
+
+