diff --git a/app_account_chinese_ztree/__init__.py b/app_account_chinese_ztree/__init__.py new file mode 100644 index 00000000..86764a0e --- /dev/null +++ b/app_account_chinese_ztree/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- + +from . import models +from .hooks import post_init_hook \ No newline at end of file diff --git a/app_account_chinese_ztree/__manifest__.py b/app_account_chinese_ztree/__manifest__.py new file mode 100644 index 00000000..c90e745c --- /dev/null +++ b/app_account_chinese_ztree/__manifest__.py @@ -0,0 +1,62 @@ +# -*- coding: utf-8 -*- + +# Created on 2018-08-15 +# author: 广州尚鹏，http://www.sunpop.cn +# email: 300883@qq.com +# resource of Sunpop +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +# Odoo在线中文用户手册（长期更新） +# http://www.sunpop.cn/documentation/user/10.0/zh_CN/index.html + +# Odoo10离线中文用户手册下载 +# http://www.sunpop.cn/odoo10_user_manual_document_offline/ +# Odoo10离线开发手册下载-含python教程，jquery参考，Jinja2模板，PostgresSQL参考（odoo开发必备） +# http://www.sunpop.cn/odoo10_developer_document_offline/ +# description: + +{ + 'name': "App Multi Level Account Chart, parent children tree", + 'version': '12.0.12.14', + 'author': 'Sunpop.cn', + 'category': 'Base', + 'website': 'http://www.sunpop.cn', + 'license': 'LGPL-3', + 'sequence': 2, + 'summary': """ + Use for parent children tree list select navigator. Multi Level Account Chart tree. + ztree widget. + """, + 'description': """ + zTree widget. + Advance search with real parent children tree, ListView or KanbanView , + eg: Account Chart tree, Product category tree,Department tree, stock location tree. + 超级方便的查询，树状视图。 + """, + 'price': 0.00, + 'currency': 'EUR', + 'depends': [ + 'account', + 'l10n_cn_standard_lastest', + ], + 'images': ['static/description/banner.gif'], + 'data': [ + 'views/account_views.xml', + ], + 'demo': [ + ], + 'test': [ + ], + 'css': [ + ], + 'qweb': [ + 'static/src/xml/*.xml', + ], + 'js': [ + ], + 'post_load': None, + 'post_init_hook': 'post_init_hook', + 'installable': True, + 'application': True, + 'auto_install': False, +} diff --git a/app_account_chinese_ztree/hooks.py b/app_account_chinese_ztree/hooks.py new file mode 100644 index 00000000..3f9582b9 --- /dev/null +++ b/app_account_chinese_ztree/hooks.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- + +# Created on 2018-10-12 +# author: 广州尚鹏，http://www.sunpop.cn +# email: 300883@qq.com +# resource of Sunpop +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +# Odoo在线中文用户手册（长期更新） +# http://www.sunpop.cn/documentation/user/10.0/zh_CN/index.html + +# Odoo10离线中文用户手册下载 +# http://www.sunpop.cn/odoo10_user_manual_document_offline/ +# Odoo10离线开发手册下载-含python教程，jquery参考，Jinja2模板，PostgresSQL参考（odoo开发必备） +# http://www.sunpop.cn/odoo10_developer_document_offline/ +# description: + +def post_init_hook(cr, pool): + pass + # cr.execute("") diff --git a/app_account_chinese_ztree/i18n/zh_CN.po b/app_account_chinese_ztree/i18n/zh_CN.po new file mode 100644 index 00000000..f1e36e3e --- /dev/null +++ b/app_account_chinese_ztree/i18n/zh_CN.po @@ -0,0 +1,14 @@ +# Translation of Odoo Server. +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-01-08 14:28+0000\n" +"PO-Revision-Date: 2018-01-08 14:28+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" diff --git a/app_account_chinese_ztree/models/__init__.py b/app_account_chinese_ztree/models/__init__.py new file mode 100644 index 00000000..40a96afc --- /dev/null +++ b/app_account_chinese_ztree/models/__init__.py @@ -0,0 +1 @@ +# -*- coding: utf-8 -*- diff --git a/app_account_chinese_ztree/report/__init__.py b/app_account_chinese_ztree/report/__init__.py new file mode 100644 index 00000000..633f8661 --- /dev/null +++ b/app_account_chinese_ztree/report/__init__.py @@ -0,0 +1,2 @@ +# -*- coding: utf-8 -*- + diff --git a/app_account_chinese_ztree/static/description/banner.gif b/app_account_chinese_ztree/static/description/banner.gif new file mode 100644 index 00000000..ac3c0327 Binary files /dev/null and b/app_account_chinese_ztree/static/description/banner.gif differ diff --git a/app_account_chinese_ztree/static/description/demo1.jpg b/app_account_chinese_ztree/static/description/demo1.jpg new file mode 100644 index 00000000..fd538628 Binary files /dev/null and b/app_account_chinese_ztree/static/description/demo1.jpg differ diff --git a/app_account_chinese_ztree/static/description/demo11.jpg b/app_account_chinese_ztree/static/description/demo11.jpg new file mode 100644 index 00000000..72ad356b Binary files /dev/null and b/app_account_chinese_ztree/static/description/demo11.jpg differ diff --git a/app_account_chinese_ztree/static/description/demo12.jpg b/app_account_chinese_ztree/static/description/demo12.jpg new file mode 100644 index 00000000..ecc58186 Binary files /dev/null and b/app_account_chinese_ztree/static/description/demo12.jpg differ diff --git a/app_account_chinese_ztree/static/description/demo2.jpg b/app_account_chinese_ztree/static/description/demo2.jpg new file mode 100644 index 00000000..b856e71d Binary files /dev/null and b/app_account_chinese_ztree/static/description/demo2.jpg differ diff --git a/app_account_chinese_ztree/static/description/demo3.jpg b/app_account_chinese_ztree/static/description/demo3.jpg new file mode 100644 index 00000000..e82b0990 Binary files /dev/null and b/app_account_chinese_ztree/static/description/demo3.jpg differ diff --git a/app_account_chinese_ztree/static/description/demo4.jpg b/app_account_chinese_ztree/static/description/demo4.jpg new file mode 100644 index 00000000..4a4abce1 Binary files /dev/null and b/app_account_chinese_ztree/static/description/demo4.jpg differ diff --git a/app_account_chinese_ztree/static/description/demo5.jpg b/app_account_chinese_ztree/static/description/demo5.jpg new file mode 100644 index 00000000..849b7841 Binary files /dev/null and b/app_account_chinese_ztree/static/description/demo5.jpg differ diff --git a/app_account_chinese_ztree/static/description/icon.png b/app_account_chinese_ztree/static/description/icon.png new file mode 100644 index 00000000..57e223d0 Binary files /dev/null and b/app_account_chinese_ztree/static/description/icon.png differ diff --git a/app_account_chinese_ztree/static/description/index.html b/app_account_chinese_ztree/static/description/index.html new file mode 100644 index 00000000..7d0308d0 --- /dev/null +++ b/app_account_chinese_ztree/static/description/index.html @@ -0,0 +1,179 @@ +
+
+

App ztree widget, for parent children tree list. Demo for hr department employee

+

Very useful for parent child relationship, like product category, stock location, hr department

+
+
+ +
+
+
+
+ Key features: +
    +
  • + + Easy to make custom parent children tree. +
    • +
  • + + Use in product category. +
    • +
  • + + Use in stock location. +
    • +
  • + + Use in hr department, employee. +
    • +
  • + + It's a widget, you can use it in anywhere in odoo. +
    • +
+
+
+ Extend features(Need extra module, release soon): +
    +
  • + + Easy to navigate product, employee in tree or kanban view. +
    • +
+
+
+ Get relate Module + +
+
+
+
+ +
+
+

Use in hr department.

+
+ +
+
+
+ +
+
+

Use in hr employee.

+
+ +
+
+
+ +
+
+

Use in product.

+
+ +
+
+
+ +
+
+

Use in product category.

+
+ +
+
+
+ +
+
+

Use in stock location.

+
+ +
+
+
+ +
+
+

 

+

(!Need extra module and pay, release soon)Easy to navigator.

+

Product, employee in kanban view

+
+ +
+
+
+ +
+
+

(!Need extra module and pay, release soon)List view

+
+ +
+
+
+ +
+
+

Easy to setup just use widget='widget_select'. like this

+
+ +
+


Use follow param to setup widget:

+

ztree_parent_key: --the key field of parent children relation.

+

ztree_expend_level: --how many level to expend the tree for initialize. Default is 2

+

limit: --how many record to show ztree. Default is 16

+

order: --the field to order by

+
+
+
+
+
+

Technical Help & Support

+
+
+
+

+ For any type of technical help & support requests, Feel free to contact us

+ + guohuadeng@hotmail.com +

+ Via QQ: 300883

+ + 300883@qq.com +
+
+

+ Visit our website for more support.

+ + http://www.sunpop.cn +
+
+
+
+ diff --git a/app_account_chinese_ztree/static/description/setup1.jpg b/app_account_chinese_ztree/static/description/setup1.jpg new file mode 100644 index 00000000..d5ade2b1 Binary files /dev/null and b/app_account_chinese_ztree/static/description/setup1.jpg differ diff --git a/app_account_chinese_ztree/static/img/icon_sunpop.png b/app_account_chinese_ztree/static/img/icon_sunpop.png new file mode 100644 index 00000000..aa490954 Binary files /dev/null and b/app_account_chinese_ztree/static/img/icon_sunpop.png differ diff --git a/app_account_chinese_ztree/static/img/logo_sunpop.png b/app_account_chinese_ztree/static/img/logo_sunpop.png new file mode 100644 index 00000000..90cbe0e2 Binary files /dev/null and b/app_account_chinese_ztree/static/img/logo_sunpop.png differ diff --git a/app_account_chinese_ztree/views/account_views.xml b/app_account_chinese_ztree/views/account_views.xml new file mode 100644 index 00000000..cdeffb7f --- /dev/null +++ b/app_account_chinese_ztree/views/account_views.xml @@ -0,0 +1,17 @@ + + + + + app.account.account.form + account.account + + + + + ztree_select + parent_id + + + + + \ No newline at end of file diff --git a/app_base_chinese/data/res_country_data.xml b/app_base_chinese/data/res_country_data.xml index 49a3c1f6..c9f79627 100644 --- a/app_base_chinese/data/res_country_data.xml +++ b/app_base_chinese/data/res_country_data.xml @@ -3,7 +3,7 @@ - + diff --git a/app_base_chinese/views/res_partner_views.xml b/app_base_chinese/views/res_partner_views.xml index f8de1fd2..5b7cae19 100644 --- a/app_base_chinese/views/res_partner_views.xml +++ b/app_base_chinese/views/res_partner_views.xml @@ -19,24 +19,17 @@ - -
-
-
- - - - - - -
+ + + + + + + + + + + @@ -56,57 +49,101 @@ 1 - - - + + + + + + + + + + + + - -
-
- [] - - - -
-
- -
-
- -
-
- -
-
- -
- - - -
-
-
Tel: - -
-
Mobile: - -
-
+ + [] + + +
+ + + + + + + app.res.partner.form.address + res.partner + + + + + + + + + + + + + + + + + + + app.res.partner.form + res.partner + + + + + + + + + + + + + + + + + + + app.res.partner.view.form.private + res.partner + + + + + + + + + + + + + + + + + + + app.res.partner.tree + res.partner + + + + + + + diff --git a/app_product_weight_sale/models/sale_order_line.py b/app_product_weight_sale/models/sale_order_line.py index 0e90886d..9d1a77b6 100644 --- a/app_product_weight_sale/models/sale_order_line.py +++ b/app_product_weight_sale/models/sale_order_line.py @@ -13,10 +13,10 @@ class SaleOrderLine(models.Model): # weight_uom_name = fields.Char(string='Weight Measure', related='product_id.weight_uom_id.name', readonly=True) weight = fields.Float(string='Weight', related='product_id.weight', store=True, readonly=True) weight_subtotal = fields.Float(string='Weight Subtotal', compute='_compute_weight_subtotal', - inverse='_set_weight_subtotal', store=True) + inverse='_set_weight_subtotal', store=True) @api.multi - @api.depends('product_id', 'product_uom', 'product_uom_qty') + @api.depends('product_id', 'weight', 'product_uom', 'product_uom_qty') def _compute_weight_subtotal(self): for line in self: weight_subtotal = 0 diff --git a/l10n_cn_standard_lastest/__manifest__.py b/l10n_cn_standard_lastest/__manifest__.py index 2ce92201..19917490 100644 --- a/l10n_cn_standard_lastest/__manifest__.py +++ b/l10n_cn_standard_lastest/__manifest__.py @@ -10,18 +10,15 @@ { 'name': '2018最新中国企业会计表.Latest Chinese Accounting.', - 'version': '12.0.11.14', + 'version': '12.0.12.14', 'author': 'Sunpop.cn', 'category': 'Localization', 'website': 'http://www.sunpop.cn', 'license': 'LGPL-3', 'sequence': 12, 'summary': """ - Chinese enhance. Focus on account chart. - update tax. - add account chart group data. - Set account group. - Set chinese tax. + Multi level account chart. Chinese enhance. Focus on account chart. + Add account chart group data. Account group, Chinese tax. Set chinese account report. """, 'description': """ @@ -31,7 +28,7 @@ 2. 将菜单中设置为"财务"。 3. 补充分类及标签信息。 4. 更新税信息。 - 5. 增加树状结构，可设置上级科目，配合 "app_web_superbar" 使用可轻易实现树状导航。 + 5. 增加树状结构，支持二级科目，可设置上级科目，配合 "app_web_superbar" 使用可轻易实现树状导航。 6. 使用金蝶的会计科目命名法对多级科目进行初始化。可自行调整为用友科目命名法 7. 注意，必须在没有业务数据，没有会计科目的初始环境。可以使用 "app_odoo_customize" 模块清除财务数据，重置会计科目。