diff --git a/app_product_variant_color/__init__.py b/app_product_variant_color/__init__.py new file mode 100644 index 00000000..792d6005 --- /dev/null +++ b/app_product_variant_color/__init__.py @@ -0,0 +1 @@ +# diff --git a/app_product_variant_color/__manifest__.py b/app_product_variant_color/__manifest__.py new file mode 100644 index 00000000..4eb115c1 --- /dev/null +++ b/app_product_variant_color/__manifest__.py @@ -0,0 +1,53 @@ +# -*- coding: utf-8 -*- + +# Created on 2019-01-04 +# author: 广州尚鹏，http://www.sunpop.cn +# email: 300883@qq.com +# resource of Sunpop +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +# Odoo12在线用户手册（长期更新） +# http://www.sunpop.cn/documentation/user/12.0/en/index.html + +# Odoo12在线开发者手册（长期更新） +# http://www.sunpop.cn/documentation/12.0/index.html + +# Odoo10在线中文用户手册（长期更新） +# 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/ + +# Odoo, Open Source Web Widget Color +# Copyright (C) 2012 Savoir-faire Linux (). +# Copyright (C) 2014 Anybox +# Copyright (C) 2015 Taktik SA +# Copyright (C) 2018 Alexandre Díaz +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).# + +{ + 'name': "App Product Attribute Color", + 'category': "Sales", + 'version': "12.19.1.04", + "author": "Sunpop.cn", + 'price': 0.00, + 'currency': 'EUR', + 'summary': """ + Use for quick select color. can be use in product attribute and other color variant. color widget. color pick. + """, + 'depends': [ + 'app_web_widget_color', + 'sale', + ], + 'data': [ + 'view/product_attribute_views.xml' + ], + 'qweb': [ + 'static/src/xml/widget.xml', + ], + 'license': 'AGPL-3', + 'auto_install': True, + 'installable': True, +} diff --git a/app_product_variant_color/images/form_view.png b/app_product_variant_color/images/form_view.png new file mode 100644 index 00000000..db1026b9 Binary files /dev/null and b/app_product_variant_color/images/form_view.png differ diff --git a/app_product_variant_color/images/list_view.png b/app_product_variant_color/images/list_view.png new file mode 100644 index 00000000..f4965fd5 Binary files /dev/null and b/app_product_variant_color/images/list_view.png differ diff --git a/app_product_variant_color/images/picker.png b/app_product_variant_color/images/picker.png new file mode 100644 index 00000000..4c3f5e07 Binary files /dev/null and b/app_product_variant_color/images/picker.png differ diff --git a/app_product_variant_color/static/description/banner.png b/app_product_variant_color/static/description/banner.png new file mode 100644 index 00000000..cc148d1d Binary files /dev/null and b/app_product_variant_color/static/description/banner.png differ diff --git a/app_product_variant_color/static/description/demo1.jpg b/app_product_variant_color/static/description/demo1.jpg new file mode 100644 index 00000000..bf810acc Binary files /dev/null and b/app_product_variant_color/static/description/demo1.jpg differ diff --git a/app_product_variant_color/static/description/demo2.jpg b/app_product_variant_color/static/description/demo2.jpg new file mode 100644 index 00000000..36d511a0 Binary files /dev/null and b/app_product_variant_color/static/description/demo2.jpg differ diff --git a/app_product_variant_color/static/description/form_view.png b/app_product_variant_color/static/description/form_view.png new file mode 100644 index 00000000..db1026b9 Binary files /dev/null and b/app_product_variant_color/static/description/form_view.png differ diff --git a/app_product_variant_color/static/description/icon.png b/app_product_variant_color/static/description/icon.png new file mode 100644 index 00000000..22b83ffe Binary files /dev/null and b/app_product_variant_color/static/description/icon.png differ diff --git a/app_product_variant_color/static/description/index.html b/app_product_variant_color/static/description/index.html new file mode 100644 index 00000000..483209cb --- /dev/null +++ b/app_product_variant_color/static/description/index.html @@ -0,0 +1,85 @@ +
+
+
+

App Product Attribute Color

+

Quick Color picker for product variant

+
+
+ +
+
+
+ Key features: +
    +
  • + + Lastest update: v12.19.1.4 +
    • +
  • + + Easy to set color for product. +
    • +
+
+
+
+

Use in product color setup

+ +
+
+ +
+
+

In Form View

+ +
+
+

In List View

+ +
+
+

Picker View

+ +
+
+
+
+
+ +
+
+
+

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 +
+
+
+
+

More Powerful addons, Make your odoo very easy to use, easy customize: + Supop.cn Odoo Addons +

+
+
+ diff --git a/app_product_variant_color/static/description/list_view.png b/app_product_variant_color/static/description/list_view.png new file mode 100644 index 00000000..f4965fd5 Binary files /dev/null and b/app_product_variant_color/static/description/list_view.png differ diff --git a/app_product_variant_color/static/description/picker.png b/app_product_variant_color/static/description/picker.png new file mode 100644 index 00000000..4c3f5e07 Binary files /dev/null and b/app_product_variant_color/static/description/picker.png differ diff --git a/app_product_variant_color/view/product_attribute_views.xml b/app_product_variant_color/view/product_attribute_views.xml new file mode 100644 index 00000000..0e0adc6c --- /dev/null +++ b/app_product_variant_color/view/product_attribute_views.xml @@ -0,0 +1,61 @@ + + + + + app.product.attribute.form.inherit + product.attribute + + + + color + + + + + + app.product.template.attribute.line.form.inherit + product.template.attribute.line + + + + + color + + + + + + app.product.template.attribute.value.view.tree.inherit + product.template.attribute.value + + + + color + + + + + + app.product.template.attribute.value.view.form.inherit + product.template.attribute.value + + + + color + + + + + + app.variants.template.tree + product.attribute.value + + + + color + + + + + + \ No newline at end of file diff --git a/app_product_weight_sale/models/sale_order_line.py b/app_product_weight_sale/models/sale_order_line.py index 23fd1851..3c0157cd 100644 --- a/app_product_weight_sale/models/sale_order_line.py +++ b/app_product_weight_sale/models/sale_order_line.py @@ -21,7 +21,10 @@ class SaleOrderLine(models.Model): weight = 0 weight_subtotal = 0 if line.product_id and line.product_id.weight: - weight = line.product_id.weight / line.product_uom.factor + try: + weight = line.product_id.weight / line.product_uom.factor + except: + weight = line.product_id.weight weight_subtotal += (weight * line.product_uom_qty) line.weight = weight line.weight_subtotal = weight_subtotal diff --git a/app_stock_superbar/__manifest__.py b/app_stock_superbar/__manifest__.py index 553870e4..48faa193 100644 --- a/app_stock_superbar/__manifest__.py +++ b/app_stock_superbar/__manifest__.py @@ -24,7 +24,7 @@ 'license': 'LGPL-3', 'sequence': 2, 'summary': """ - Use for parent children tree list select navigator. stock location tree. + Use for parent children tree list select navigator. stock location tree, filter by parent location. ztree widget. """, 'description': """ @@ -40,7 +40,7 @@ ], 'images': ['static/description/banner.gif'], 'data': [ - 'views/stock_views.xml', + 'views/stock_location_views.xml', ], 'demo': [ ], diff --git a/app_stock_superbar/views/stock_location_views.xml b/app_stock_superbar/views/stock_location_views.xml new file mode 100644 index 00000000..93413ae2 --- /dev/null +++ b/app_stock_superbar/views/stock_location_views.xml @@ -0,0 +1,24 @@ + + + + + stock.location.search.superbar + stock.location + + + + + + + + + + + + \ No newline at end of file diff --git a/app_stock_superbar/views/stock_views.xml b/app_stock_superbar/views/stock_views.xml deleted file mode 100644 index 90399d53..00000000 --- a/app_stock_superbar/views/stock_views.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - app.stock.location.form - stock.location - - - - - ztree_select - location_id - - - - - - \ No newline at end of file