From eb9b43dc91e6c1396620818729bfaa756cdc6986 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 26 Aug 2024 16:11:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=20=20=20=E3=80=90?=
=?UTF-8?q?=E5=BA=93=E5=AD=98=E6=A6=82=E8=A7=88=E5=86=85=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E6=94=B6=E8=97=8F=E7=9A=84=E9=BB=98=E8=AE=A4=E7=AD=9B=E9=80=89?=
=?UTF-8?q?=E9=A1=B9=E5=90=8E=EF=BC=8C=E5=88=A0=E9=99=A4=E6=8A=A5=E9=94=99?=
=?UTF-8?q?=EF=BC=88=E5=8E=9F=E7=94=9F=E6=8A=A5=E9=94=99=EF=BC=89=E3=80=91?=
=?UTF-8?q?=20=20=20=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jikimo_hide_options/models/models.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jikimo_hide_options/models/models.py b/jikimo_hide_options/models/models.py
index 84aee828..8f30543c 100644
--- a/jikimo_hide_options/models/models.py
+++ b/jikimo_hide_options/models/models.py
@@ -324,4 +324,4 @@ def unlink(self):
BaseModel._create = _create
-BaseModel.unlink = unlink
\ No newline at end of file
+# BaseModel.unlink = unlink
\ No newline at end of file
From da02d68c1289e35e99c349b6b2fbb8b510a20b40 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 26 Aug 2024 16:58:54 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1=E3=80=81=E5=B0=86=E9=94=80=E5=94=AE?=
=?UTF-8?q?=E5=8D=95=E7=9A=84=E3=80=90=E5=8F=96=E6=B6=88=E3=80=91=E6=94=B9?=
=?UTF-8?q?=E4=B8=BA=E3=80=90=E6=8B=92=E7=BB=9D=E6=8E=A5=E5=8D=95=E3=80=91?=
=?UTF-8?q?=EF=BC=9B2=E3=80=81=E5=8F=96=E6=B6=88=E5=8A=9F=E8=83=BD?=
=?UTF-8?q?=E5=88=80=E5=85=B7=E6=8B=86=E8=A7=A3=E5=8D=95=E7=9A=84=E5=88=80?=
=?UTF-8?q?=E6=9F=84=E6=98=AF=E5=90=A6=E6=8A=A5=E5=BA=9F=E6=8C=89=E9=92=AE?=
=?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf_sale/views/sale_order_view.xml | 1 +
sf_tool_management/views/tool_base_views.xml | 28 ++++++++++----------
2 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml
index d5af8ebd..73996954 100644
--- a/sf_sale/views/sale_order_view.xml
+++ b/sf_sale/views/sale_order_view.xml
@@ -50,6 +50,7 @@
('check_status', '!=', 'approved'),('state', 'in', ['draft','cancel']),'&','&',('check_status',
'=', 'approved'),('state', 'in', ['sale','cancel']),('delivery_status', '!=', False)]}
+ 拒绝接单
1
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 2fc9d5ba..390fcb15 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -842,21 +842,21 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+