diff options
| -rw-r--r-- | indoteknik_custom/models/account_move_due_extension.py | 3 | ||||
| -rw-r--r-- | indoteknik_custom/models/partial_delivery.py | 20 | ||||
| -rw-r--r-- | indoteknik_custom/models/refund_sale_order.py | 6 |
3 files changed, 21 insertions, 8 deletions
diff --git a/indoteknik_custom/models/account_move_due_extension.py b/indoteknik_custom/models/account_move_due_extension.py index 951d9745..352200e0 100644 --- a/indoteknik_custom/models/account_move_due_extension.py +++ b/indoteknik_custom/models/account_move_due_extension.py @@ -127,6 +127,9 @@ class DueExtension(models.Model): self.order_id.due_id = self.id self.approve_by = self.env.user.id self.date_approve = datetime.utcnow() + + # self.order_id.message_post("Due Extension telah di approve") + self.order_id.message_post(f"Due Extension {self.number} telah di approve") template = self.env.ref('indoteknik_custom.mail_template_due_extension_approve') template.send_mail(self.id, force_send=True) return { diff --git a/indoteknik_custom/models/partial_delivery.py b/indoteknik_custom/models/partial_delivery.py index 519f505c..4e8ddbda 100644 --- a/indoteknik_custom/models/partial_delivery.py +++ b/indoteknik_custom/models/partial_delivery.py @@ -213,14 +213,22 @@ class PartialDeliveryWizard(models.TransientModel): new_picking.action_assign() picking.action_assign() - existing_partials = self.env['stock.picking'].search([ - ('origin', '=', picking.origin), - ('state_reserve', '=', 'partial'), + origin_name = picking.name + + existing_siblings = self.env['stock.picking'].search([ + ('name', 'like', f"{origin_name}/%"), ('id', '!=', new_picking.id), - ], order='name asc') + ]) + + suffixes = [] + for p in existing_siblings: + match = re.search(r'/(\d+)$', p.name) + if match: + suffixes.append(int(match.group(1))) + + next_suffix = max(suffixes) + 1 if suffixes else 1 - suffix_number = len(existing_partials) + 1 - new_picking.name = f"{picking.name}/{suffix_number}" + new_picking.name = f"{origin_name}/{next_suffix}" if picking.origin: sale_order = self.env['sale.order'].search([('name', '=', picking.origin)], limit=1) diff --git a/indoteknik_custom/models/refund_sale_order.py b/indoteknik_custom/models/refund_sale_order.py index c6db2174..cbc0b717 100644 --- a/indoteknik_custom/models/refund_sale_order.py +++ b/indoteknik_custom/models/refund_sale_order.py @@ -332,7 +332,8 @@ class RefundSaleOrder(models.Model): domain = [ ('journal_id', '=', 11), ('state', '=', 'posted'), - ('ref', 'ilike', 'uang muka penjualan') + ('ref', 'ilike', 'uang muka penjualan'), + ('ref', 'not ilike', 'reklas'), ] if so_names: domain += ['|'] * (len(so_names) - 1) @@ -696,7 +697,8 @@ class RefundSaleOrder(models.Model): domain = [ ('journal_id', '=', 11), ('state', '=', 'posted'), - ('ref', 'ilike', 'uang muka penjualan') + ('ref', 'ilike', 'uang muka penjualan'), + ('ref', 'not ilike', 'reklas'), ] domain += ['|'] * (len(so_names) - 1) for n in so_names: |