From 018b51e1e5fdd93d2e101b2fd0effc29392e3c2e Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Fri, 27 Oct 2023 15:06:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E7=94=9F=E6=88=90=E9=87=87=E8=B4=AD=E5=8D=95=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_warehouse/models/model.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sf_warehouse/models/model.py b/sf_warehouse/models/model.py index eafdffac..65bdc0ea 100644 --- a/sf_warehouse/models/model.py +++ b/sf_warehouse/models/model.py @@ -237,4 +237,6 @@ class SfProcurementGroup(models.Model): for res1 in res_list: if product_id.categ_id in res1.location_dest_id.product_type: res = res1 + if not res: + res = Rule.search(expression.AND([[('route_id', 'in', warehouse_routes.ids)], domain]), order='route_sequence, sequence', limit=1) return res \ No newline at end of file From 4634393f6c66db857a0b2fb7aeb080d91c1f198c Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Mon, 30 Oct 2023 11:14:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9form=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jikimo_frontend/static/src/scss/custom_style.scss | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/jikimo_frontend/static/src/scss/custom_style.scss b/jikimo_frontend/static/src/scss/custom_style.scss index 3626cd08..00db5f3b 100644 --- a/jikimo_frontend/static/src/scss/custom_style.scss +++ b/jikimo_frontend/static/src/scss/custom_style.scss @@ -341,3 +341,15 @@ div:has(.o_required_modifier) > label::before { overflow: visible; } +.o_form_view { + .o_form_sheet_bg .o_form_sheet { + //max-width: none !important; + width: auto !important; + max-width: 98% !important; + } + .o_FormRenderer_chatterContainer { + max-width: none; + } +} + +