diff options
| author | Miqdad <ahmadmiqdad27@gmail.com> | 2025-05-18 01:57:44 +0700 |
|---|---|---|
| committer | Miqdad <ahmadmiqdad27@gmail.com> | 2025-05-18 01:57:44 +0700 |
| commit | a32b53c4f8b92045d78a99a8ead746c7db1c96a0 (patch) | |
| tree | 9d0c1548892a3ec34b5cf7a9c659df82eaf14f5b | |
| parent | 434bf64f3229b12ec938671d74446389cb0455aa (diff) | |
| parent | f5d261ee2d263603d5becb32832765863c9dd9e8 (diff) | |
<miqdad> fix merge conflict
| -rwxr-xr-x | indoteknik_custom/models/sale_order.py | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py index bfb38f6d..bbd2cd71 100755 --- a/indoteknik_custom/models/sale_order.py +++ b/indoteknik_custom/models/sale_order.py @@ -334,9 +334,9 @@ class SaleOrder(models.Model): ('approve', 'Approve') ], tracking=True, string='State Cancel', copy=False) date_hold = fields.Datetime(string='Date Hold', tracking=True, readonly=True, help='Waktu ketika SO di Hold' - ) + ) date_unhold = fields.Datetime(string='Date Unhold', tracking=True, readonly=True, help='Waktu ketika SO di Unhold' - ) + ) def _compute_total_margin_excl_third_party(self): for order in self: @@ -389,6 +389,7 @@ class SaleOrder(models.Model): picking.do_unreserve() self.hold_outgoing = True self.date_hold = fields.Datetime.now() + def _validate_uniform_taxes(self): for order in self: @@ -1032,6 +1033,12 @@ class SaleOrder(models.Model): line_no += 1 line.line_no = line_no + def write(self, vals): + if 'carrier_id' in vals: + for picking in self.picking_ids: + if picking.state == 'assigned': + picking.carrier_id = self.carrier_id + def calculate_so_status(self): so_state = ['sale'] sales = self.search([ @@ -1287,7 +1294,7 @@ class SaleOrder(models.Model): if not order.real_shipping_id: UserError('Real Delivery Address harus di isi') - if self.env.context.get('due_approve', []) == False: + if not self.env.context.get('due_approve', []): if order.validate_partner_invoice_due(): return self._create_notification_action('Notification', 'Terdapat invoice yang telah melewati batas waktu, mohon perbarui pada dokumen Due Extension') @@ -1535,8 +1542,8 @@ class SaleOrder(models.Model): if not order.real_shipping_id: UserError('Real Delivery Address harus di isi') - - if self.env.context.get('due_approve', []) == False: + + if not self.env.context.get('due_approve', []): if order.validate_partner_invoice_due(): return self._create_notification_action('Notification', 'Terdapat invoice yang telah melewati batas waktu, mohon perbarui pada dokumen Due Extension') |