diff --git a/yuthon_purchase/__manifest__.py b/yuthon_purchase/__manifest__.py index 40017858d..b95ca8471 100644 --- a/yuthon_purchase/__manifest__.py +++ b/yuthon_purchase/__manifest__.py @@ -9,6 +9,8 @@ 'depends': ['base', 'soong_workflow', 'hr', 'product', 'documents', 'purchase'], 'data': [ 'security/ir.model.access.csv', + 'views/inherit_product_product_views.xml', + 'views/inherit_purchase_order_views.xml', 'views/purchase_workflow_views.xml', ], 'installable': True, diff --git a/yuthon_purchase/models/__init__.py b/yuthon_purchase/models/__init__.py index 354e16ae1..5a97a318c 100644 --- a/yuthon_purchase/models/__init__.py +++ b/yuthon_purchase/models/__init__.py @@ -1,3 +1,4 @@ # -*- coding: utf-8 -*- from . import inherit_purchase_order from . import purchase_workflow +from . import inherit_product_product diff --git a/yuthon_purchase/models/inherit_product_product.py b/yuthon_purchase/models/inherit_product_product.py new file mode 100644 index 000000000..9537bb240 --- /dev/null +++ b/yuthon_purchase/models/inherit_product_product.py @@ -0,0 +1,9 @@ +# -*- coding: utf-8 -*- +from odoo import api, fields, models + + +class InheritProductProduct(models.Model): + _inherit = 'product.product' + + brand = fields.Char(string="品牌") + specs = fields.Char(string="规格") diff --git a/yuthon_purchase/models/purchase_workflow.py b/yuthon_purchase/models/purchase_workflow.py index dba9a0bf5..8c07ca609 100644 --- a/yuthon_purchase/models/purchase_workflow.py +++ b/yuthon_purchase/models/purchase_workflow.py @@ -150,8 +150,8 @@ class PurchaseLowLine(models.Model): _description = '低值易耗采购明细' purchase_id = fields.Many2one('purchase.workflow', string="关联采购工作流") product_id = fields.Many2one('product.product', string="物品名称") - brand = fields.Char(string="品牌") - specs = fields.Char(string="规格") + brand = fields.Char(related="product_id.brand", string="品牌") + specs = fields.Char(related="product_id.specs", string="规格") name = fields.Text(string="描述") product_packaging_id = fields.Many2one('product.packaging', string="包装") taxes_id = fields.Many2one('account.tax', string='税项') diff --git a/yuthon_purchase/views/inherit_product_product_views.xml b/yuthon_purchase/views/inherit_product_product_views.xml new file mode 100644 index 000000000..6edf9a0da --- /dev/null +++ b/yuthon_purchase/views/inherit_product_product_views.xml @@ -0,0 +1,14 @@ + + + + product.product.form.inherit + product.product + + + + + + + + + \ No newline at end of file diff --git a/yuthon_purchase/views/inherit_purchase_order_views.xml b/yuthon_purchase/views/inherit_purchase_order_views.xml new file mode 100644 index 000000000..2031d7336 --- /dev/null +++ b/yuthon_purchase/views/inherit_purchase_order_views.xml @@ -0,0 +1,22 @@ + + + + purchase.order.tree + purchase.order + + + + 1 + + + 1 + + + 1 + + + 1 + + + + diff --git a/yuthon_stock/__manifest__.py b/yuthon_stock/__manifest__.py index 8ee081f88..d8053bfd1 100644 --- a/yuthon_stock/__manifest__.py +++ b/yuthon_stock/__manifest__.py @@ -6,9 +6,10 @@ 'category': 'zhou', 'version': '0.1', 'license': 'LGPL-3', - 'depends': ['base', 'stock', 'documents'], + 'depends': ['base', 'stock', 'documents', 'maintenance'], 'data': [ 'security/ir.model.access.csv', + 'views/menu.xml', 'views/inherit_stock_picking.xml', ], 'installable': True, diff --git a/yuthon_stock/views/inherit_stock_picking.xml b/yuthon_stock/views/inherit_stock_picking.xml index 6ee7b118a..e41bfc840 100644 --- a/yuthon_stock/views/inherit_stock_picking.xml +++ b/yuthon_stock/views/inherit_stock_picking.xml @@ -20,8 +20,23 @@ + + 编号 + - 标题 + 目的位置 + + + 1 + + + 1 + + + 1 + + + 1 diff --git a/yuthon_stock/views/menu.xml b/yuthon_stock/views/menu.xml new file mode 100644 index 000000000..b0f598afb --- /dev/null +++ b/yuthon_stock/views/menu.xml @@ -0,0 +1,8 @@ + + + +