diff --git a/yuthon_catering/models/yuthon_catering_setting.py b/yuthon_catering/models/yuthon_catering_setting.py index d324b8a43..ba09af4b9 100644 --- a/yuthon_catering/models/yuthon_catering_setting.py +++ b/yuthon_catering/models/yuthon_catering_setting.py @@ -33,14 +33,17 @@ class YuthonDishesSetting(models.Model): ingredient_id1 = fields.Many2one('yuthon.ingredient.setting', string='食材1') ingredient_id2 = fields.Many2one('yuthon.ingredient.setting', string='食材2') ingredient_id3 = fields.Many2one('yuthon.ingredient.setting', string='食材3') + ingredient_id4 = fields.Many2one('yuthon.ingredient.setting', string='食材4') single_quantity1 = fields.Float(string='单量1') single_quantity2 = fields.Float(string='单量2') single_quantity3 = fields.Float(string='单量3') + single_quantity4 = fields.Float(string='单量4') unit1_id = fields.Many2one('yuthon.unit.setting', string='单位1') unit2_id = fields.Many2one('yuthon.unit.setting', string='单位2') unit3_id = fields.Many2one('yuthon.unit.setting', string='单位3') + unit4_id = fields.Many2one('yuthon.unit.setting', string='单位4') class YuthonIngredientSetting(models.Model): diff --git a/yuthon_catering/views/yuthon_catering_setting_views.xml b/yuthon_catering/views/yuthon_catering_setting_views.xml index 381e198d5..787422a20 100644 --- a/yuthon_catering/views/yuthon_catering_setting_views.xml +++ b/yuthon_catering/views/yuthon_catering_setting_views.xml @@ -34,6 +34,9 @@ + + + diff --git a/yuthon_property/views/property_meter_archives_views.xml b/yuthon_property/views/property_meter_archives_views.xml index 65483c3ee..0093e60a4 100644 --- a/yuthon_property/views/property_meter_archives_views.xml +++ b/yuthon_property/views/property_meter_archives_views.xml @@ -97,7 +97,7 @@
-