Demurrage
This commit is contained in:
@@ -3183,7 +3183,7 @@ class StatementOfFacts(ModelSQL, ModelView):
|
||||
charter_party = fields.Many2One('stock.charter.party', "Charter Party")
|
||||
applied_conditions = fields.Function(
|
||||
fields.One2Many('charter.condition', '', "Available Conditions"),
|
||||
'get_applied_conditions')
|
||||
'on_change_with_applied_conditions')
|
||||
applied_condition = fields.Many2One(
|
||||
'charter.condition', "Applied Condition",
|
||||
domain=[('id', 'in', Eval('applied_conditions', []))],
|
||||
@@ -3354,7 +3354,7 @@ class StatementOfFacts(ModelSQL, ModelView):
|
||||
self._set_default_applied_condition()
|
||||
|
||||
def _set_default_applied_condition(self):
|
||||
condition_ids = self.get_applied_conditions()
|
||||
condition_ids = self.on_change_with_applied_conditions()
|
||||
applied_condition_id = getattr(self.applied_condition, 'id', None)
|
||||
if applied_condition_id in condition_ids:
|
||||
return
|
||||
@@ -3379,12 +3379,16 @@ class StatementOfFacts(ModelSQL, ModelView):
|
||||
return self.shipment.get_sale_charter_conditions(name)
|
||||
return []
|
||||
|
||||
def get_applied_conditions(self, name=None):
|
||||
@fields.depends('shipment', 'charter_party')
|
||||
def on_change_with_applied_conditions(self, name=None):
|
||||
return ShipmentIn._unique_condition_ids(
|
||||
self.get_owner_charter_conditions(name)
|
||||
+ self.get_purchase_charter_conditions(name)
|
||||
+ self.get_sale_charter_conditions(name))
|
||||
|
||||
def get_applied_conditions(self, name=None):
|
||||
return self.on_change_with_applied_conditions(name)
|
||||
|
||||
@staticmethod
|
||||
def _rate_category(rate):
|
||||
rate_type = getattr(rate, 'rate_type', None)
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<form>
|
||||
<notebook>
|
||||
<page string="Contract Conditions" id="cs">
|
||||
<field name="shipment" invisible="1"/>
|
||||
<field name="charter_party" invisible="1"/>
|
||||
<field name="applied_conditions" invisible="1" colspan="4"/>
|
||||
<label name="applied_condition"/>
|
||||
|
||||
Reference in New Issue
Block a user