diff options
| author | stephanchrst <stephanchrst@gmail.com> | 2023-06-30 11:02:59 +0700 |
|---|---|---|
| committer | stephanchrst <stephanchrst@gmail.com> | 2023-06-30 11:02:59 +0700 |
| commit | 73fc17f3490e34924d58e90054a371d613450b74 (patch) | |
| tree | 5df50c855e6b5686df6fb2e10729af82e5639091 | |
| parent | c86d91e089c4a72ee137365c4033f02c23238c09 (diff) | |
| parent | 08bab33de9381b9a6d7ed53bb64976d52f0d7ecc (diff) | |
Merge branch 'release' into nathan-dev
# Conflicts:
# indoteknik_custom/models/sale_order.py
| -rw-r--r-- | indoteknik_custom/models/delivery_order.py | 3 | ||||
| -rwxr-xr-x | indoteknik_custom/models/sale_order.py | 7 | ||||
| -rw-r--r-- | indoteknik_custom/views/delivery_order.xml | 1 |
3 files changed, 11 insertions, 0 deletions
diff --git a/indoteknik_custom/models/delivery_order.py b/indoteknik_custom/models/delivery_order.py index 3f8da384..be5fd2e0 100644 --- a/indoteknik_custom/models/delivery_order.py +++ b/indoteknik_custom/models/delivery_order.py @@ -74,6 +74,7 @@ class DeliveryOrderLine(models.TransientModel): carrier_id = fields.Many2one('delivery.carrier', string='Shipping Method') tracking_no = fields.Char(string='Tracking No') delivery_order_id = fields.Many2one('delivery.order', string='Delivery Order') + partner_id = fields.Many2one('res.partner', string='Customer') @api.onchange('name') def onchange_name(self): @@ -98,6 +99,8 @@ class DeliveryOrderLine(models.TransientModel): self.tracking_no = picking.delivery_tracking_no + self.partner_id = picking.partner_id + delivery_type = self.get_delivery_type(picking.driver_departure_date, picking.driver_arrival_date) if delivery_type != 'departure': self.departure_date = picking.driver_departure_date.astimezone(timezone('Asia/Jakarta')).strftime('%Y-%m-%d %H:%M:%S') diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py index b1f74587..c5169420 100755 --- a/indoteknik_custom/models/sale_order.py +++ b/indoteknik_custom/models/sale_order.py @@ -85,7 +85,14 @@ class SaleOrder(models.Model): ]) sppkp = fields.Char(string="SPPKP") npwp = fields.Char(string="NPWP") + purchase_total = fields.Monetary(string='Purchase Total', compute='_compute_purchase_total') + def _compute_purchase_total(self): + for order in self: + total = 0 + for line in order.order_line: + total += line.vendor_subtotal + order.purchase_total = total def generate_payment_link_midtrans_sales_order(self): # midtrans_url = 'https://app.sandbox.midtrans.com/snap/v1/transactions' # dev - sandbox diff --git a/indoteknik_custom/views/delivery_order.xml b/indoteknik_custom/views/delivery_order.xml index 29ca7365..0b2fd576 100644 --- a/indoteknik_custom/views/delivery_order.xml +++ b/indoteknik_custom/views/delivery_order.xml @@ -21,6 +21,7 @@ <field name="arrival_date" readonly="1"/> <field name="carrier_id" readonly="1"/> <field name="tracking_no"/> + <field name="partner_id" readonly="1"/> </tree> </field> </sheet> |