summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzka Nathan <darizkyfaz@gmail.com>2024-06-14 13:52:49 +0700
committerAzka Nathan <darizkyfaz@gmail.com>2024-06-14 13:52:49 +0700
commitc901ed7eed709120334e6f52ae9bcb0180fd0c2f (patch)
tree50c770f781663aed3fae66c8783d8a0d75600b7e
parentfe64d54541eb0c47a69cb789f593e44726758ab1 (diff)
fix bug so
-rwxr-xr-xindoteknik_custom/models/sale_order.py16
-rwxr-xr-xindoteknik_custom/views/sale_order.xml6
2 files changed, 11 insertions, 11 deletions
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 8d8dd04c..9a4f9035 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -9,7 +9,7 @@ _logger = logging.getLogger(__name__)
class SaleOrder(models.Model):
_inherit = "sale.order"
- # fullfillment_line = fields.One2many('sales.order.fullfillment', 'sales_order_id', string='Fullfillment')
+ fullfillment_line = fields.One2many('sales.order.fullfillment', 'sales_order_id', string='Fullfillment')
order_sales_match_line = fields.One2many('sales.order.purchase.match', 'sales_order_id', string='Purchase Match Lines', states={'cancel': [('readonly', True)], 'done': [('readonly', True)]}, copy=True)
total_margin = fields.Float('Total Margin', compute='_compute_total_margin', help="Total Margin in Sales Order Header")
total_percent_margin = fields.Float('Total Percent Margin', compute='_compute_total_percent_margin', help="Total % Margin in Sales Order Header")
@@ -96,16 +96,16 @@ class SaleOrder(models.Model):
('cust_director', 'Customer Director'),
('cust_procurement', 'Customer Procurement')
], string='Web Approval', copy=False)
- # compute_fullfillment = fields.Boolean(string='Compute Fullfillment', compute="_compute_fullfillment")
+ compute_fullfillment = fields.Boolean(string='Compute Fullfillment', compute="_compute_fullfillment")
- # def _compute_fullfillment(self):
- # for rec in self:
- # rec.fullfillment_line.unlink()
+ def _compute_fullfillment(self):
+ for rec in self:
+ rec.fullfillment_line.unlink()
- # for line in rec.order_line:
- # line._compute_reserved_from()
+ for line in rec.order_line:
+ line._compute_reserved_from()
- # rec.compute_fullfillment = True
+ rec.compute_fullfillment = True
def _compute_eta_date(self):
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index ee864dab..d6738759 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -49,7 +49,7 @@
</field>
<field name="user_id" position="after">
<field name="helper_by_id" readonly="1"/>
- <!-- <field name="compute_fullfillment"/> -->
+ <field name="compute_fullfillment"/>
</field>
<field name="tag_ids" position="after">
<field name="eta_date" readonly="1"/>
@@ -187,9 +187,9 @@
<page string="Matches PO" name="page_matches_po" invisible="1">
<field name="order_sales_match_line" readonly="1"/>
</page>
- <!-- <page string="Fullfillment" name="page_sale_order_fullfillment">
+ <page string="Fullfillment" name="page_sale_order_fullfillment">
<field name="fullfillment_line" readonly="1"/>
- </page> -->
+ </page>
</page>
</field>
</record>