Merge remote-tracking branch 'origin/11.0' into 11.0

# Conflicts:
#	app_account_invoice_product_multi_add/static/description/banner.gif
#	app_mrp_bom_product_multi_add/static/description/banner.gif
#	app_purchase_product_multi_add/static/description/banner.gif
#	app_sale_product_multi_add/static/description/banner.gif
#	app_stock_picking_product_multi_add/static/description/banner.gif
This commit is contained in:
ivan deng
2018-08-26 00:31:58 +08:00
25 changed files with 20 additions and 284 deletions

View File

@@ -23,6 +23,8 @@
'website': 'http://www.sunpop.cn',
'license': 'LGPL-3',
'sequence': 2,
'price': 0.00,
'currency': 'USD',
'summary': """
App Purchase Order Product Multi Batch Add, 采购订单批量增加产品.
Odoo App of Sunpop.cn
@@ -36,7 +38,7 @@
2. 可对产品进行过滤、分组,然后批量加入
""",
'depends': [
'app_web_one2many_multi_add',
# 'app_web_one2many_multi_add',
'purchase',
],
'images': ['static/description/banner.png'],