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

Accept Merge Request #2280: (feature/7249 -> develop)

Browse Source 
Merge Request: Merge branch 'develop' into feature/7249

Created By: @陈烨
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @陈烨
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2280
This commit is contained in:
陈烨
2025-07-14 08:50:26 +08:00
committed by Coding
parent f0ff7c4a74 5ae3c5dd47
commit 9b94357439
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_demand_plan/models/sf_demand_plan.py
View File

@@ -212,7 +212,7 @@ class SfDemandPlan(models.Model):
def name_get(self): def name_get(self):
result = [] result = []
for plan in self: for plan in self:
result.append((plan.id, plan.product_id.name)) result.append((plan.id, plan.demand_plan_number))
return result return result
def button_production_release_plan(self): def button_production_release_plan(self):

6
sf_demand_plan/views/demand_plan.xml
View File

@@ -32,9 +32,9 @@
<field name="product_uom_qty"/> <field name="product_uom_qty"/>
<field name="plan_uom_qty" attrs="{'readonly': [('status', '!=', '30')]}"/> <field name="plan_uom_qty" attrs="{'readonly': [('status', '!=', '30')]}"/>
<field name="deadline_of_delivery"/> <field name="deadline_of_delivery"/>
<field name="inventory_quantity_auto_apply"/> <field name="inventory_quantity_auto_apply" optional="hide"/>
<field name="qty_delivered"/> <field name="qty_delivered" optional="hide"/>
<field name="qty_to_deliver"/> <field name="qty_to_deliver" optional="hide"/>
<field name="model_long"/> <field name="model_long"/>
<field name="blank_type" optional="hide"/> <field name="blank_type" optional="hide"/>
<field name="blank_precision"/> <field name="blank_precision"/>