jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化

Browse Source
This commit is contained in:
mgw
2023-10-30 15:45:21 +08:00
parent 76368398ba 8e5fc5eb61
commit f81ee155e7
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jikimo_frontend/static/src/scss/custom_style.scss
View File

@@ -341,3 +341,15 @@ div:has(.o_required_modifier) > label::before {
overflow: visible; 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;
}
}

2
sf_warehouse/models/model.py
View File

@@ -237,4 +237,6 @@ class SfProcurementGroup(models.Model):
for res1 in res_list: for res1 in res_list:
if product_id.categ_id in res1.location_dest_id.product_type: if product_id.categ_id in res1.location_dest_id.product_type:
res = res1 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 return res