Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化
This commit is contained in:
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -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
|
||||
Reference in New Issue
Block a user