From f31e25b3b1626e03031cfbfb504dfc2da2f51b6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= Date: Fri, 23 May 2025 11:20:17 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E5=8D=95=E8=8F=9C=E5=8D=95=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/purchase_request_menu_views.xml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/jikimo_purchase_request/views/purchase_request_menu_views.xml b/jikimo_purchase_request/views/purchase_request_menu_views.xml index b5775099..85864351 100644 --- a/jikimo_purchase_request/views/purchase_request_menu_views.xml +++ b/jikimo_purchase_request/views/purchase_request_menu_views.xml @@ -1,8 +1,14 @@ - - + + 0 + + + + 1 + + From 7941c1981ca72ac1bf189fbafd57ce1b210a0e33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= Date: Fri, 23 May 2025 11:37:21 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=92=A4=E5=9B=9E=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E8=A7=86=E5=9B=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/purchase_request_view.xml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/jikimo_purchase_request/views/purchase_request_view.xml b/jikimo_purchase_request/views/purchase_request_view.xml index b90ad415..9976b52a 100644 --- a/jikimo_purchase_request/views/purchase_request_view.xml +++ b/jikimo_purchase_request/views/purchase_request_view.xml @@ -7,12 +7,6 @@ 重置草稿 - - 1 - - - oe_highlight - @@ -21,12 +15,6 @@ - - - - - oe_highlight - From 89f8718fe1a4ec7168e5f6c389ee5e844c1e4177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= Date: Fri, 23 May 2025 14:20:38 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=BD=93=E8=AF=A2=E4=BB=B7=E5=8D=95?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E4=B8=BA=E9=87=87=E8=B4=AD=E5=8D=95=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E6=A0=B9=E6=8D=AE=E9=87=87=E8=B4=AD=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E8=A1=8C=E5=8F=98=E4=B8=BA=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E5=8D=95=E6=95=B0=E9=87=8F=E6=9D=A5=E5=AE=8C=E6=88=90=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../models/purchase_order.py | 16 +++++++++++++++ .../views/purchase_request_view.xml | 20 +++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/jikimo_purchase_request/models/purchase_order.py b/jikimo_purchase_request/models/purchase_order.py index 59a7959c..95f81e9f 100644 --- a/jikimo_purchase_request/models/purchase_order.py +++ b/jikimo_purchase_request/models/purchase_order.py @@ -1,4 +1,5 @@ from odoo import api, fields, models, _ +from odoo.tools import float_compare class PurchaseOrder(models.Model): @@ -38,3 +39,18 @@ class PurchaseOrder(models.Model): move_ids.write({'state': 'waiting', 'is_done': False}) return res + def write(self, vals): + res = super(PurchaseOrder, self).write(vals) + if 'state' in vals and vals['state'] == 'purchase': + purchase_request = self.order_line.purchase_request_lines.request_id + if purchase_request: + finished = True + # 判断该采购申请所有明细行是否都完成 + for purchase_request_line in purchase_request.line_ids: + finished_qty = sum(purchase_request_line.purchase_lines.filtered(lambda line: line.state == 'purchase').mapped('product_qty')) + if float_compare(finished_qty ,purchase_request_line.product_qty, precision_rounding=purchase_request_line.product_id.uom_id.rounding) < 0: + finished = False + break + if finished: + purchase_request.button_done() + return res diff --git a/jikimo_purchase_request/views/purchase_request_view.xml b/jikimo_purchase_request/views/purchase_request_view.xml index 9976b52a..d8357fac 100644 --- a/jikimo_purchase_request/views/purchase_request_view.xml +++ b/jikimo_purchase_request/views/purchase_request_view.xml @@ -15,6 +15,26 @@ + + + + + 1 + + + oe_highlight + + + + + + purchase.request.sf.tree + purchase.request + + + + hide + From b39395196889c013ebadef66f77297c36ec26781 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= Date: Fri, 23 May 2025 14:45:57 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=88=97=E8=A1=A8=E9=BB=98=E8=AE=A4=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jikimo_purchase_request/views/purchase_request_view.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jikimo_purchase_request/views/purchase_request_view.xml b/jikimo_purchase_request/views/purchase_request_view.xml index d8357fac..151152e8 100644 --- a/jikimo_purchase_request/views/purchase_request_view.xml +++ b/jikimo_purchase_request/views/purchase_request_view.xml @@ -83,4 +83,9 @@ + + + Purchase Requests + + \ No newline at end of file