From 854c3ceef285d8d9ec9b718938c76b99fba40267 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Mon, 30 Dec 2024 13:51:31 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_production.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index b213a456..c68a41d6 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -1622,7 +1622,7 @@ class MrpProduction(models.Model):
     def _subcontract_sanity_check(self):
         for production in self:
             if production.product_tracking != 'none' and not self.lot_producing_id:
-                raise UserError(_('You must enter a serial number for %s') % production.product_id.name)
+                raise UserError(_('您必须为以下各%s行输入序列号') % production.product_id.name)
             for sml in production.move_raw_ids.move_line_ids:
                 if sml.tracking != 'none' and not sml.lot_id:
                     picking_ids = production.picking_ids.filtered(

From f084b5d7657f8352222cb3d327a10da8b9db4308 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Mon, 30 Dec 2024 14:12:54 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_production.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index c68a41d6..0e431347 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -1622,7 +1622,7 @@ class MrpProduction(models.Model):
     def _subcontract_sanity_check(self):
         for production in self:
             if production.product_tracking != 'none' and not self.lot_producing_id:
-                raise UserError(_('您必须为以下各%s行输入序列号') % production.product_id.name)
+                raise UserError(_('您必须为%s输入一个序列号。') % production.product_id.name)
             for sml in production.move_raw_ids.move_line_ids:
                 if sml.tracking != 'none' and not sml.lot_id:
                     picking_ids = production.picking_ids.filtered(

From 5928456ffea4b545f47060f196ba56d4b3d9f34c Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Mon, 30 Dec 2024 16:19:17 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/i18n/zh_CN.po            | 21 +++++++++++++++++++++
 sf_manufacturing/models/mrp_production.py |  6 +++---
 2 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 sf_manufacturing/i18n/zh_CN.po

diff --git a/sf_manufacturing/i18n/zh_CN.po b/sf_manufacturing/i18n/zh_CN.po
new file mode 100644
index 00000000..a3e8e67e
--- /dev/null
+++ b/sf_manufacturing/i18n/zh_CN.po
@@ -0,0 +1,21 @@
+#. module: sf_manufacturing
+#. odoo-python
+#: code:addons/sf_manufacturing/models/mrp_production.py:0
+#, python-format
+msgid "You must enter a serial number for %s"
+msgstr "您必须为%s输入一个序列号。"
+
+
+#. module: sf_manufacturing
+#. odoo-python
+#: code:addons/sf_manufacturing/models/mrp_production.py:0
+#, python-format
+msgid "You must enter a serial number for each line of %s"
+msgstr "您必须为以下各%s行输入序列号"
+
+#. module: sf_manufacturing
+#. odoo-python
+#: code:addons/sf_manufacturing/models/mrp_production.py:0
+#, python-format
+msgid "You have %s incomplete supplies: %s"
+msgstr "您有%s补给未完成: %s"
\ No newline at end of file
diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 0e431347..4216442c 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -1622,7 +1622,7 @@ class MrpProduction(models.Model):
     def _subcontract_sanity_check(self):
         for production in self:
             if production.product_tracking != 'none' and not self.lot_producing_id:
-                raise UserError(_('您必须为%s输入一个序列号。') % production.product_id.name)
+                raise UserError(_('You must enter a serial number for %s') % production.product_id.name)
             for sml in production.move_raw_ids.move_line_ids:
                 if sml.tracking != 'none' and not sml.lot_id:
                     picking_ids = production.picking_ids.filtered(
@@ -1632,11 +1632,11 @@ class MrpProduction(models.Model):
                         ['%s:%s' % (picking.picking_type_id.name, picking.name) for picking in picking_ids]
                     )
                     if picking_info:
-                        raise UserError(_('您有%s补给未完成: %s') % (
+                        raise UserError(_('You have %s incomplete supplies: %s') % (
                             picking_num, picking_info))
                     else:
                         raise UserError(
-                            _('您必须为以下各%s行输入序列号') % sml.product_id.display_name)
+                            _('You must enter a serial number for each line of %s') % sml.product_id.display_name)
         return True
 
 

From c124e2962c53bcac540d52ce92f01171c41e29d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= <huyao@jikimo.com>
Date: Mon, 30 Dec 2024 16:32:36 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jikimo_frontend/static/src/js/custom_form_status_indicator.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jikimo_frontend/static/src/js/custom_form_status_indicator.js b/jikimo_frontend/static/src/js/custom_form_status_indicator.js
index 1e39b719..52331a1c 100644
--- a/jikimo_frontend/static/src/js/custom_form_status_indicator.js
+++ b/jikimo_frontend/static/src/js/custom_form_status_indicator.js
@@ -139,7 +139,7 @@ patch(ListRenderer.prototype, 'jikimo_frontend.ListRenderer', {
         owl.onMounted(() => {
             this.activeElement = this.uiService.activeElement;
             this.setRequired()
-            this.listherHeaderBodyNum()
+            // this.listherHeaderBodyNum()
         })
         return this._super(...arguments);
     },

From d7ce69f474efc3d2bb5dbf0f96465840609515bd Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 30 Dec 2024 17:04:59 +0800
Subject: [PATCH 5/5] =?UTF-8?q?1=E3=80=81=E8=AF=A2=E4=BB=B7=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=E7=A1=AE=E8=AE=A4=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9B2=E3=80=81=E6=88=90=E5=93=81?=
 =?UTF-8?q?=E8=B0=83=E6=8B=A8=E5=8D=95=E6=B7=BB=E5=8A=A0=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E7=9A=84=E5=9D=AF=E6=96=99=E9=87=87=E8=B4=AD=E5=8D=95=E5=92=8C?=
 =?UTF-8?q?=E5=9D=AF=E6=96=99=E5=A4=96=E5=8D=8F=E5=8D=95=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_sale/views/purchase_order_view.xml | 32 ++++---------
 sf_stock/models/stock_picking.py      | 68 +++++++++++++++++++++++++++
 sf_stock/views/stock_picking.xml      | 28 +++++++++--
 3 files changed, 103 insertions(+), 25 deletions(-)

diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml
index 3b3353bb..bab28456 100644
--- a/sf_sale/views/purchase_order_view.xml
+++ b/sf_sale/views/purchase_order_view.xml
@@ -9,12 +9,16 @@
                 <xpath expr="//header/button[@name='action_view_picking']" position="attributes">
                     <attribute name="invisible">1</attribute>
                 </xpath>
+                <xpath expr="//header/button[@name='button_confirm']" position="replace">
+                </xpath>
+                <xpath expr="//header/button[@name='button_confirm']" position="replace">
+                </xpath>
                 <xpath expr="//header/button[@name='action_rfq_send'][1]" position="before">
-                    <button name="button_confirm" type="object" states="sent" string="Confirm Order"
-                            context="{'validate_analytic': True}" class="oe_highlight" id="bid_confirm"
-                            data-hotkey="v"/>
-                    <button name="button_confirm" type="object" states="draft" context="{'validate_analytic': True}"
-                            string="Confirm Order" id="draft_confirm"/>
+                    <button name="button_confirm" type="object" string="确认订单"
+                            context="{'validate_analytic': True}" class="oe_highlight" id="draft_confirm"
+                            groups="sf_base.group_purchase,sf_base.group_purchase_director"
+                            attrs="{'invisible': [('state', 'in', ['purchase', 'done', 'cancel'])]}"
+                    />
                     <button name="action_view_picking"
                             string="接收产品" class="oe_highlight" type="object"
                             attrs="{'invisible': ['|', '|' , ('is_shipped', '=', True), ('state','not in', ('purchase','done')), ('incoming_picking_count', '=', 0)]}"
@@ -25,12 +29,7 @@
                 <xpath expr="//header/button[@name='button_cancel'][2]" position="attributes">
                     <attribute name="invisible">1</attribute>
                 </xpath>
-                <xpath expr="//header/button[@name='button_confirm'][3]" position="attributes">
-                    <attribute name="invisible">1</attribute>
-                </xpath>
-                <xpath expr="//header/button[@name='button_confirm'][4]" position="attributes">
-                    <attribute name="invisible">1</attribute>
-                </xpath>
+
 
                 <field name="partner_id" position="replace">
                     <field name="partner_id" widget="res_partner_many2one" context="{'is_supplier': True }"/>
@@ -38,13 +37,6 @@
                 <field name="currency_id" position="after">
                     <field name="remark" attrs="{'readonly': [('state', 'in', ['purchase'])]}" string="订单备注"/>
                 </field>
-                <xpath expr="//form/header/button[@name='button_confirm'][2]" position="replace">
-                    <button name="button_confirm" type="object" context="{'validate_analytic': True}"
-                            string="确认订单" id="draft_confirm"
-                            groups="sf_base.group_purchase,sf_base.group_purchase_director"
-                            attrs="{'invisible': [('state', 'in', ['purchase', 'cancel'])]}"
-                    />
-                </xpath>
                 <xpath expr="//form/header/button[@name='action_rfq_send'][1]" position="replace">
                     <button name="action_rfq_send" states="draft" string="通过Email发送采购单" type="object"
                             context="{'send_rfq':True}" class="oe_highlight" data-hotkey="g"
@@ -81,10 +73,6 @@
                 <xpath expr="//form/header/button[@name='action_create_invoice'][2]" position="attributes">
                     <attribute name="groups">sf_base.group_purchase,sf_base.group_purchase_director</attribute>
                 </xpath>
-                <xpath expr="//form/header/button[@name='button_confirm']" position="attributes">
-                    <attribute name="groups">sf_base.group_purchase,sf_base.group_purchase_director</attribute>
-                    <!--                    <button name="action_create_invoice" string="创建账单" type="object" class="oe_highlight" context="{'create_bill':True}" attrs="{'invisible': ['|', ('state', 'not in', ('purchase', 'done')), ('invoice_status', 'in', ('no', 'invoiced'))]}" data-hotkey="w" groups="sf_base.group_purchase,sf_base.group_purchase_director"/> -->
-                </xpath>
                 <!--                <xpath expr="//form/header/button[@name='action_create_invoice[2]']" position="attributes">-->
                 <!--                    <attribute name="groups">sf_base.group_purchase,sf_base.group_purchase_director</attribute>-->
                 <!--                </xpath>-->
diff --git a/sf_stock/models/stock_picking.py b/sf_stock/models/stock_picking.py
index a429db36..9b7b22b1 100644
--- a/sf_stock/models/stock_picking.py
+++ b/sf_stock/models/stock_picking.py
@@ -13,6 +13,74 @@ _logger = logging.getLogger(__name__)
 class StockPicking(models.Model):
     _inherit = 'stock.picking'
 
+    pro_purchase_count = fields.Integer('坯料采购单数量', compute='_compute_pro_purchase_count', store=True)
+
+    @api.depends('name')
+    def _compute_pro_purchase_count(self):
+        for sp in self:
+            if sp:
+                po_ids = self.env['purchase.order'].sudo().search([
+                    ('origin', 'like', sp.name), ('purchase_type', '=', 'standard')])
+                if po_ids:
+                    sp.pro_purchase_count = len(po_ids)
+
+    def pro_purchase_order(self):
+        """
+        坯料采购
+        """
+        po_ids = self.env['purchase.order'].sudo().search([
+            ('origin', 'like', self.name), ('purchase_type', '=', 'standard')])
+        action = {
+            'res_model': 'purchase.order',
+            'type': 'ir.actions.act_window',
+        }
+        if len(po_ids) == 1:
+            action.update({
+                'view_mode': 'form',
+                'res_id': po_ids.id,
+            })
+        else:
+            action.update({
+                'name': _("采购订单列表"),
+                'domain': [('id', 'in', po_ids.ids)],
+                'view_mode': 'tree,form',
+            })
+        return action
+
+    pro_out_purchase_count = fields.Integer('坯料外协单数量', compute='_compute_pro_out_purchase_count', store=True)
+
+    @api.depends('name')
+    def _compute_pro_out_purchase_count(self):
+        for sp in self:
+            if sp:
+                po_ids = self.env['purchase.order'].sudo().search([
+                    ('origin', 'like', sp.name), ('purchase_type', '=', 'consignment')])
+                if po_ids:
+                    sp.pro_out_purchase_count = len(po_ids)
+
+    def pro_out_purchase_order(self):
+        """
+        坯料外协
+        """
+        po_ids = self.env['purchase.order'].sudo().search([
+            ('origin', 'like', self.name), ('purchase_type', '=', 'consignment')])
+        action = {
+            'res_model': 'purchase.order',
+            'type': 'ir.actions.act_window',
+        }
+        if len(po_ids) == 1:
+            action.update({
+                'view_mode': 'form',
+                'res_id': po_ids.id,
+            })
+        else:
+            action.update({
+                'name': _("外协订单列表"),
+                'domain': [('id', 'in', po_ids.ids)],
+                'view_mode': 'tree,form',
+            })
+        return action
+
     # 重写验证，下发发货到bfm
     def button_validate(self):
         info = super(StockPicking, self).button_validate()
diff --git a/sf_stock/views/stock_picking.xml b/sf_stock/views/stock_picking.xml
index 5bf4d40e..1ecc0d40 100644
--- a/sf_stock/views/stock_picking.xml
+++ b/sf_stock/views/stock_picking.xml
@@ -1,6 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-  <data>
-
-  </data>
+    <data>
+        <record id="add_check_out_view_picking_form" model="ir.ui.view">
+            <field name="name">添加坯料采购单链接</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.view_picking_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//form//sheet//div[@name='button_box']//button[@name='action_picking_move_tree']" position="before">
+                    <button class="oe_stat_button" name="pro_purchase_order" type="object" icon="fa-credit-card"
+                            attrs="{'invisible': [('pro_purchase_count', '=', 0)]}">
+                        <div class="o_field_widget o_stat_info">
+                            <span class="o_stat_value"><field name="pro_purchase_count"/></span>
+                            <span class="o_stat_text">坯料采购</span>
+                        </div>
+                    </button>
+                    <button class="oe_stat_button" name="pro_out_purchase_order" type="object" icon="fa-credit-card"
+                            attrs="{'invisible': [('pro_out_purchase_count', '=', 0)]}">
+                        <div class="o_field_widget o_stat_info">
+                            <span class="o_stat_value"><field name="pro_out_purchase_count"/></span>
+                            <span class="o_stat_text">坯料外协</span>
+                        </div>
+                    </button>
+                </xpath>
+            </field>
+        </record>
+    </data>
 </odoo>
\ No newline at end of file