diff options
| author | Rafi Zadanly <zadanlyr@gmail.com> | 2024-03-06 10:40:21 +0700 |
|---|---|---|
| committer | Rafi Zadanly <zadanlyr@gmail.com> | 2024-03-06 10:40:21 +0700 |
| commit | b774b4d834ee8f77b5d2782e88ed910d6778b9be (patch) | |
| tree | 48c06bc14bac1694f78d60f4dd79cf8efb9e46d3 | |
| parent | d569804844ee77f9f08879dda8c3f1e292470813 (diff) | |
| parent | de5a35b272b4c84b5eb7ab8d9d429a9cbae46381 (diff) | |
Merge branch 'production' into feature/web-sale-approval
| -rw-r--r-- | indoteknik_custom/models/account_bank_statement.py | 4 | ||||
| -rw-r--r-- | indoteknik_custom/models/promotion/sale_order.py | 2 | ||||
| -rwxr-xr-x | indoteknik_custom/models/sale_order.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/indoteknik_custom/models/account_bank_statement.py b/indoteknik_custom/models/account_bank_statement.py index 61e9ca31..801dad6a 100644 --- a/indoteknik_custom/models/account_bank_statement.py +++ b/indoteknik_custom/models/account_bank_statement.py @@ -8,12 +8,12 @@ class AccountBankStatement(models.Model): def is_edited(self): if not self.env.user.is_admin_reconcile: - raise UserError('Yang berhak hanya Mba Tania dan Iqmal Saputra') + raise UserError('Anda tidak memiliki akses') self.is_edit = True def not_edited(self): if not self.env.user.is_admin_reconcile: - raise UserError('Yang berhak hanya Mba Tania dan Iqmal Saputra') + raise UserError('Anda tidak memiliki akses') self.is_edit = False
\ No newline at end of file diff --git a/indoteknik_custom/models/promotion/sale_order.py b/indoteknik_custom/models/promotion/sale_order.py index 42e972d0..cb9a6f92 100644 --- a/indoteknik_custom/models/promotion/sale_order.py +++ b/indoteknik_custom/models/promotion/sale_order.py @@ -26,7 +26,7 @@ class SaleOrder(models.Model): else: all_products = self._merge_promotion_products(promotion) - promotion_price = promotion['price']['price_discount'] + promotion_price = promotion['price']['price_discount'] * line.quantity * 1.11 promotion_amt_total = sum(product['price']['price'] * product['qty'] for product in all_products) promotion_used_price = 0 diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py index 6fe1db3b..d4c70fdc 100755 --- a/indoteknik_custom/models/sale_order.py +++ b/indoteknik_custom/models/sale_order.py @@ -15,7 +15,7 @@ class SaleOrder(models.Model): ('pengajuan2', 'Approval Pimpinan'), ('approved', 'Approved'), ], string='Approval Status', readonly=True, copy=False, index=True, tracking=3) - carrier_id = fields.Many2one('delivery.carrier', string='Shipping Method') + carrier_id = fields.Many2one('delivery.carrier', string='Shipping Method', tracking=3) have_visit_service = fields.Boolean(string='Have Visit Service', compute='_have_visit_service', help='To compute is customer get visit service') delivery_amt = fields.Float('Delivery Amt') shipping_cost_covered = fields.Selection([ |