From e59d33ea416afbe5d2e531f524be37c1eeef6015 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Mon, 19 Jun 2023 17:08:38 +0700 Subject: Create due extension when approve so --- indoteknik_custom/models/sale_order.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py index cbc6a60a..e2693688 100755 --- a/indoteknik_custom/models/sale_order.py +++ b/indoteknik_custom/models/sale_order.py @@ -282,7 +282,18 @@ class SaleOrder(models.Model): def sale_order_approve(self): # raise UserError("Bisa langsung Confirm") self.check_due() + invoices = self.env['account.move'].search([ + ('partner_id', '=', self.partner_id.id), + ('invoice_day_to_due', '<', 0) + ]) + due_extension_obj = self.env['due.extension'] for order in self: + for invoice in invoices: + if invoice.invoice_day_to_due < 0: + value = { + 'invoice_id': invoice.id + } + due_extension_obj.create(value) if order.warehouse_id.id != 8: #GD Bandengan raise UserError('Gudang harus Bandengan') if order.state == 'cancel' or order.state == 'done' or order.state == 'sale': @@ -323,7 +334,9 @@ class SaleOrder(models.Model): elif order.total_percent_margin <= 22 and not self.env.user.is_leader and not self.env.user.is_sales_manager: order.approval_status = 'pengajuan1' elif order._have_outstanding_invoices() and not self.env.user.is_leader and not self.env.user.is_sales_manager: - order.approval_status = 'pengajuan1' + order.approval_status = 'pengajuan1' + elif invoice.invoice_day_to_due < 0: + raise UserError("Anda Harus Memperbarui Due Date di Due Extension") else: raise UserError("Bisa langsung Confirm") -- cgit v1.2.3 From fb8abc000707a2b8ba1fb0d16c1d8cbbd640ea34 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Fri, 23 Jun 2023 14:12:49 +0700 Subject: Fiture Over Due Limit --- indoteknik_custom/__manifest__.py | 1 + indoteknik_custom/models/__init__.py | 1 + .../models/account_move_due_extension.py | 121 +++++++++++++++++++++ indoteknik_custom/models/sale_order.py | 120 +++++++++++++++----- indoteknik_custom/security/ir.model.access.csv | 2 + indoteknik_custom/views/account_move_views.xml | 82 ++++++++++++++ indoteknik_custom/views/ir_sequence.xml | 10 ++ indoteknik_custom/views/sale_order.xml | 3 + 8 files changed, 315 insertions(+), 25 deletions(-) create mode 100644 indoteknik_custom/models/account_move_due_extension.py create mode 100644 indoteknik_custom/views/account_move_views.xml diff --git a/indoteknik_custom/__manifest__.py b/indoteknik_custom/__manifest__.py index eaa5390a..79f6e195 100755 --- a/indoteknik_custom/__manifest__.py +++ b/indoteknik_custom/__manifest__.py @@ -45,6 +45,7 @@ 'views/uangmuka_penjualan.xml', 'views/sale_order.xml', 'views/account_asset_views.xml', + 'views/account_move_views.xml', 'views/ir_sequence.xml', 'views/stock_location.xml', 'views/stock_picking.xml', diff --git a/indoteknik_custom/models/__init__.py b/indoteknik_custom/models/__init__.py index 9764e0c0..9d0f8d47 100755 --- a/indoteknik_custom/models/__init__.py +++ b/indoteknik_custom/models/__init__.py @@ -63,3 +63,4 @@ from . import procurement_monitoring_detail from . import brand_vendor from . import manufacturing from . import requisition +from . import account_move_due_extension diff --git a/indoteknik_custom/models/account_move_due_extension.py b/indoteknik_custom/models/account_move_due_extension.py new file mode 100644 index 00000000..1de34408 --- /dev/null +++ b/indoteknik_custom/models/account_move_due_extension.py @@ -0,0 +1,121 @@ +from odoo import models, api, fields +from odoo.exceptions import AccessError, UserError, ValidationError +from datetime import timedelta, date +import logging + +_logger = logging.getLogger(__name__) + +class DueExtension(models.Model): + _name = "due.extension" + _rec_name = 'number' + + number = fields.Char(string='Document No', index=True, copy=False, readonly=True) + partner_id = fields.Many2one('res.partner', string="Customer") + order_id = fields.Many2one('sale.order', string="SO", readonly=True) + due_line = fields.One2many('due.extension.line', 'due_id', string='Due Extension Lines', auto_join=True) + old_due = fields.Date(string="Old Due") + is_approve = fields.Boolean(string="Is Approve", readonly=True) + day_extension = fields.Selection([ + ('3', '3 Hari'), + ('7', '7 Hari'), + ('14', '14 Hari'), + ], string='Day Extension', help='Menambah Due Date yang sudah limit dari hari ini') + + @api.model + def create(self, vals): + vals['number'] = self.env['ir.sequence'].next_by_code('due.extension') or '0' + result = super(DueExtension, self).create(vals) + return result + + def approve_new_due(self): + if self.env.user.is_accounting: + if not self.day_extension: + raise UserError('Day Extension is not set.') + if not self.due_line: + raise UserError('Tidak ada data di due line.') + + self.is_approve = True + + if self.partner_id: + if self.day_extension: + day_extension = int(self.day_extension) + new_due = date.today() + timedelta(days=day_extension) + + for line in self.due_line: + line.invoice_id.invoice_date_due = new_due + + if self.order_id._notification_margin_leader(): + self.order_id.approval_status = 'pengajuan2' + return self.order_id._notification_has_margin_leader() + + if self.order_id._notification_margin_manager(): + self.order_id.approval_status = 'pengajuan1' + return self.order_id._notification_has_margin_manager() + + sales = self.env['sale.order'].search([ + ('id', '=', self.order_id.id) + ]) + + sales.action_confirm() + else: + raise UserError('Hanya Finance Yang Bisa Approve') + + def generate_due_line(self): + if self.is_approve: + raise UserError('Sudah di approve, tidak bisa digenerate ulang') + if self.due_line: + raise UserError('Harus hapus semua line jika ingin generate ulang') + if self.partner_id.parent_id: + raise UserError('Harus pilih parent company') + + + partners = [] + partners += self.partner_id.child_ids + partners.append(self.partner_id) + + + for partner in partners: + query = [ + ('partner_id', '=', partner.id), + ('state', '=', 'posted'), + ('move_type', '=', 'out_invoice'), + ('amount_residual_signed', '>', 0) + ] + invoices = self.env['account.move'].search(query, order='invoice_date') + count = 0 + + for invoice in invoices: + if invoice.invoice_day_to_due < 0: + self.env['due.extension.line'].create([{ + 'due_id': self.id, + 'partner_id': invoice.partner_id.id, + 'invoice_id': invoice.id, + 'date_invoice': invoice.invoice_date, + 'efaktur_id': invoice.efaktur_id.id, + 'reference': invoice.ref, + 'total_amt': invoice.amount_total, + 'open_amt': invoice.amount_residual_signed, + 'due_date': invoice.invoice_date_due + }]) + count += 1 + _logger.info("Due Extension Line generated %s" % count) + +class DueExtensionLine(models.Model): + _name = 'due.extension.line' + _description = 'Due Extension Line' + _order = 'due_id, id' + + due_id = fields.Many2one('due.extension', string='Dunning Ref', required=True, ondelete='cascade', index=True, copy=False) + partner_id = fields.Many2one('res.partner', string='Customer') + invoice_id = fields.Many2one('account.move', string='Invoice') + date_invoice = fields.Date(string='Invoice Date') + efaktur_id = fields.Many2one('vit.efaktur', string='Faktur Pajak') + reference = fields.Char(string='Reference') + total_amt = fields.Float(string='Total Amount') + open_amt = fields.Float(string='Open Amount') + due_date = fields.Date(string='Due Date') + day_to_due = fields.Integer(string='Day To Due', compute="_compute_day_to_due") + + def _compute_day_to_due(self): + for line in self: + line.day_to_due = line.invoice_id.invoice_day_to_due diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py index e99876c2..d531c869 100755 --- a/indoteknik_custom/models/sale_order.py +++ b/indoteknik_custom/models/sale_order.py @@ -78,6 +78,7 @@ class SaleOrder(models.Model): delivery_service_type = fields.Char(string='Delivery Service Type', help='data dari rajaongkir') grand_total = fields.Monetary(string='Grand Total', help='Amount total + amount delivery', compute='_compute_grand_total') payment_link_midtrans = fields.Char(string='Payment Link', help='Url payment yg digenerate oleh midtrans, harap diserahkan ke customer agar dapat dilakukan pembayaran secara mandiri') + due_id = fields.Many2one('due.extension', string="Due Extension", readonly=True) def generate_payment_link_midtrans_sales_order(self): # midtrans_url = 'https://app.sandbox.midtrans.com/snap/v1/transactions' # dev - sandbox @@ -282,18 +283,10 @@ class SaleOrder(models.Model): def sale_order_approve(self): # raise UserError("Bisa langsung Confirm") self.check_due() - invoices = self.env['account.move'].search([ - ('partner_id', '=', self.partner_id.id), - ('invoice_day_to_due', '<', 0) - ]) - due_extension_obj = self.env['due.extension'] + parent_id = self.partner_id.parent_id.id + parent_id = parent_id if parent_id else self.partner_id.id + for order in self: - for invoice in invoices: - if invoice.invoice_day_to_due < 0: - value = { - 'invoice_id': invoice.id - } - due_extension_obj.create(value) if order.warehouse_id.id != 8: #GD Bandengan raise UserError('Gudang harus Bandengan') if order.state == 'cancel' or order.state == 'done' or order.state == 'sale': @@ -329,14 +322,16 @@ class SaleOrder(models.Model): raise UserError(_('Tidak bisa Confirm menggunakan Produk Sementara')) if not line.vendor_id or not line.purchase_price: raise UserError(_('Isi Vendor dan Harga Beli sebelum Request Approval')) - if order.total_percent_margin <= 15 and not self.env.user.is_leader: + + if order.validate_partner_invoice_due(): + return self._notification_has_unapprove_due() + + if order._notification_margin_leader(): order.approval_status = 'pengajuan2' - elif order.total_percent_margin <= 22 and not self.env.user.is_leader and not self.env.user.is_sales_manager: + return self._notification_has_margin_leader() + elif order._notification_margin_manager(): order.approval_status = 'pengajuan1' - elif order._have_outstanding_invoices() and not self.env.user.is_leader and not self.env.user.is_sales_manager: - order.approval_status = 'pengajuan1' - elif invoice.invoice_day_to_due < 0: - raise UserError("Anda Harus Memperbarui Due Date di Due Extension") + return self._notification_has_margin_manager() else: raise UserError("Bisa langsung Confirm") @@ -354,9 +349,81 @@ class SaleOrder(models.Model): self.approval_status = False return super(SaleOrder, self).action_cancel() + + def validate_partner_invoice_due(self): + parent_id = self.partner_id.parent_id.id + parent_id = parent_id if parent_id else self.partner_id.id + if self.due_id and self.due_id.is_approve == False: + raise UserError('Document Over Due Yang Anda Buat Belum Di Approve') + + if not self.env.user.is_leader and not self.env.user.is_sales_manager: + query = [ + ('partner_id', '=', parent_id), + ('state', '=', 'posted'), + ('move_type', '=', 'out_invoice'), + ('amount_residual_signed', '>', 0) + ] + invoices = self.env['account.move'].search(query, order='invoice_date') + due_extension = self.env['due.extension'].create([{ + 'partner_id': parent_id, + 'day_extension': '3', + 'order_id': self.id, + }]) + due_extension.generate_due_line() + self.due_id = due_extension.id + if len(self.due_id.due_line) > 0: + return True + else: + due_extension.unlink() + return False + + def _notification_margin_leader(self): + if self.total_percent_margin <= 15 and not self.env.user.is_leader: + return True + else: + return False + + def _notification_margin_manager(self): + if self.total_percent_margin <= 22 and not self.env.user.is_leader and not self.env.user.is_sales_manager: + return True + else: + return False + + def _notification_has_unapprove_due(self): + return { + 'type': 'ir.actions.client', + 'tag': 'display_notification', + 'params': { + 'title': 'Notification', + 'message': 'Ada Invoice Yang Sudah Over Due, Silahkan Memperbarui Over Due di Due Extension', + 'next': {'type': 'ir.actions.act_window_close'}, + } + } + + def _notification_has_margin_leader(self): + return { + 'type': 'ir.actions.client', + 'tag': 'display_notification', + 'params': { + 'title': 'Notification', + 'message': 'SO Harus Di Approve Oleh Pimpinan', + 'next': {'type': 'ir.actions.act_window_close'}, + } + } + + def _notification_has_margin_manager(self): + return { + 'type': 'ir.actions.client', + 'tag': 'display_notification', + 'params': { + 'title': 'Notification', + 'message': 'SO Harus Di Approve Oleh Sales Manager', + 'next': {'type': 'ir.actions.act_window_close'}, + } + } + def action_confirm(self): - res = super(SaleOrder, self).action_confirm() for order in self: if order.warehouse_id.id != 8: #GD Bandengan raise UserError('Gudang harus Bandengan') @@ -375,16 +442,19 @@ class SaleOrder(models.Model): raise UserError(_('Tidak bisa Confirm menggunakan Produk Sementara')) if not line.vendor_id or not line.purchase_price or not line.purchase_tax_id: raise UserError(_('Isi Vendor, Harga Beli, dan Tax sebelum Request Approval')) - if order.total_percent_margin <= 15 and not self.env.user.is_leader: - raise UserError("Harus diapprove oleh Pimpinan") - elif order.total_percent_margin <= 22 and not self.env.user.is_leader and not self.env.user.is_sales_manager: - raise UserError("Harus diapprove oleh Manager") - elif order._have_outstanding_invoices() and not self.env.user.is_leader and not self.env.user.is_sales_manager: - raise UserError("Ada invoice due date, harus diapprove oleh Manager") + + if order.validate_partner_invoice_due(): + return self._notification_has_unapprove_due() + + if order._notification_margin_leader(): + return self._notification_has_margin_leader() + elif order._notification_margin_manager(): + return self._notification_has_margin_manager() else: order.approval_status = 'approved' - order.calculate_line_no() + order.calculate_line_no() + res = super(SaleOrder, self).action_confirm() return res def _have_outstanding_invoices(self): diff --git a/indoteknik_custom/security/ir.model.access.csv b/indoteknik_custom/security/ir.model.access.csv index 26e852f1..df820053 100755 --- a/indoteknik_custom/security/ir.model.access.csv +++ b/indoteknik_custom/security/ir.model.access.csv @@ -1,4 +1,5 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_due_extension,access.due.extension,model_due_extension,,1,1,1,1 access_x_banner_category,access.x.banner.category,model_x_banner_category,,1,1,1,1 access_x_banner_banner,access.x.banner.banner,model_x_banner_banner,,1,1,1,1 access_x_biaya_kirim,access.x.biaya.kirim,model_x_biaya_kirim,,1,1,1,1 @@ -14,6 +15,7 @@ access_delivery_order,access.delivery.order,model_delivery_order,,1,1,1,1 access_delivery_order_line,access.delivery.order.line,model_delivery_order_line,,1,1,1,1 access_dunning_run,access.dunning.run,model_dunning_run,,1,1,1,1 access_dunning_run_line,access.dunning.run.line,model_dunning_run_line,,1,1,1,1 +access_due_extension_line,access.due.extension.line,model_due_extension_line,,1,1,1,1 access_website_user_cart,access.website.user.cart,model_website_user_cart,,1,1,1,1 access_website_user_wishlist,access.website.user.wishlist,model_website_user_wishlist,,1,1,1,1 access_website_brand_homepage,access.website.brand.homepage,model_website_brand_homepage,,1,1,1,1 diff --git a/indoteknik_custom/views/account_move_views.xml b/indoteknik_custom/views/account_move_views.xml new file mode 100644 index 00000000..1ff7f3aa --- /dev/null +++ b/indoteknik_custom/views/account_move_views.xml @@ -0,0 +1,82 @@ + + + + due.extension.tree + due.extension + + + + + + + + + + + + due.extension.line.tree + due.extension.line + + + + + + + + + + + + + + + + + due.extension.form + due.extension + +
+
+
+ + + + + + + + + + + + + + + + + +
+ + + + + Due Extension + ir.actions.act_window + due.extension + tree,form + + + + diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml index 9af85408..a8348772 100644 --- a/indoteknik_custom/views/ir_sequence.xml +++ b/indoteknik_custom/views/ir_sequence.xml @@ -31,6 +31,16 @@ 1 + + Due Extension + due.extension + TRUE + DE/%(year)s/ + 5 + 1 + 1 + + Requisition requisition diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml index b160d9b1..222fb057 100755 --- a/indoteknik_custom/views/sale_order.xml +++ b/indoteknik_custom/views/sale_order.xml @@ -26,6 +26,9 @@ + + + -- cgit v1.2.3 From dbe06610522bea7ff86d517dea626d91a59a73c8 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Fri, 23 Jun 2023 15:31:23 +0700 Subject: non pkp and pkp --- indoteknik_custom/models/res_partner.py | 5 +++++ indoteknik_custom/models/sale_order.py | 19 +++++++++++++++++++ indoteknik_custom/views/res_partner.xml | 4 ++++ indoteknik_custom/views/sale_order.xml | 3 +++ 4 files changed, 31 insertions(+) diff --git a/indoteknik_custom/models/res_partner.py b/indoteknik_custom/models/res_partner.py index 77abaaf9..08e5b9e8 100644 --- a/indoteknik_custom/models/res_partner.py +++ b/indoteknik_custom/models/res_partner.py @@ -13,6 +13,11 @@ class ResPartner(models.Model): company_type_id = fields.Many2one('res.partner.company_type', string='Company Type') custom_pricelist_id = fields.Many2one('product.pricelist', string='Price Matrix') group_partner_id = fields.Many2one('group.partner', string='Group Partner') + customer_type = fields.Selection([ + ('pkp', 'PKP'), + ('non_pkp', 'Non PKP') + ]) + sppkp = fields.Char(string="SPPKP") def unlink(self): if self._name == 'res.partner': diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py index d531c869..6a040ff3 100755 --- a/indoteknik_custom/models/sale_order.py +++ b/indoteknik_custom/models/sale_order.py @@ -79,6 +79,13 @@ class SaleOrder(models.Model): grand_total = fields.Monetary(string='Grand Total', help='Amount total + amount delivery', compute='_compute_grand_total') payment_link_midtrans = fields.Char(string='Payment Link', help='Url payment yg digenerate oleh midtrans, harap diserahkan ke customer agar dapat dilakukan pembayaran secara mandiri') due_id = fields.Many2one('due.extension', string="Due Extension", readonly=True) + customer_type = fields.Selection([ + ('pkp', 'PKP'), + ('nonpkp', 'Non PKP') + ]) + sppkp = fields.Char(string="SPPKP") + npwp = fields.Char(string="NPWP") + def generate_payment_link_midtrans_sales_order(self): # midtrans_url = 'https://app.sandbox.midtrans.com/snap/v1/transactions' # dev - sandbox @@ -423,6 +430,17 @@ class SaleOrder(models.Model): } } + def _set_sppkp_npwp_contact(self): + for contact in self: + partner_customer_type = contact.customer_type + contact.partner_id.customer_type = partner_customer_type + + partner_npwp = contact.npwp + contact.partner_id.npwp = partner_npwp + + partner_sppkp = contact.sppkp + contact.partner_id.sppkp = partner_sppkp + def action_confirm(self): for order in self: if order.warehouse_id.id != 8: #GD Bandengan @@ -451,6 +469,7 @@ class SaleOrder(models.Model): elif order._notification_margin_manager(): return self._notification_has_margin_manager() else: + order._set_sppkp_npwp_contact() order.approval_status = 'approved' order.calculate_line_no() diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml index a9372da0..341d0076 100644 --- a/indoteknik_custom/views/res_partner.xml +++ b/indoteknik_custom/views/res_partner.xml @@ -7,12 +7,16 @@ + + + + diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml index 222fb057..450b3303 100755 --- a/indoteknik_custom/views/sale_order.xml +++ b/indoteknik_custom/views/sale_order.xml @@ -27,6 +27,9 @@ + + + -- cgit v1.2.3 From e22cda13f913f3c2839009095b42ebee440f599d Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Fri, 23 Jun 2023 15:38:11 +0700 Subject: fix bug customer_type selection value --- indoteknik_custom/models/res_partner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indoteknik_custom/models/res_partner.py b/indoteknik_custom/models/res_partner.py index 08e5b9e8..bdeb8a2c 100644 --- a/indoteknik_custom/models/res_partner.py +++ b/indoteknik_custom/models/res_partner.py @@ -15,7 +15,7 @@ class ResPartner(models.Model): group_partner_id = fields.Many2one('group.partner', string='Group Partner') customer_type = fields.Selection([ ('pkp', 'PKP'), - ('non_pkp', 'Non PKP') + ('nonpkp', 'Non PKP') ]) sppkp = fields.Char(string="SPPKP") -- cgit v1.2.3 From 787fe14fc0b14ed67f3d25a634c7a5a7e1a27204 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Mon, 26 Jun 2023 09:45:46 +0700 Subject: invisible field due_id after action cancel --- .../models/account_move_due_extension.py | 22 +++++----------------- indoteknik_custom/models/sale_order.py | 11 ++++++++--- indoteknik_custom/views/account_move_views.xml | 2 +- 3 files changed, 14 insertions(+), 21 deletions(-) diff --git a/indoteknik_custom/models/account_move_due_extension.py b/indoteknik_custom/models/account_move_due_extension.py index 1de34408..fbb8efe1 100644 --- a/indoteknik_custom/models/account_move_due_extension.py +++ b/indoteknik_custom/models/account_move_due_extension.py @@ -10,7 +10,7 @@ class DueExtension(models.Model): _rec_name = 'number' number = fields.Char(string='Document No', index=True, copy=False, readonly=True) - partner_id = fields.Many2one('res.partner', string="Customer") + partner_id = fields.Many2one('res.partner', string="Customer", readonly=True) order_id = fields.Many2one('sale.order', string="SO", readonly=True) due_line = fields.One2many('due.extension.line', 'due_id', string='Due Extension Lines', auto_join=True) old_due = fields.Date(string="Old Due") @@ -29,11 +29,6 @@ class DueExtension(models.Model): def approve_new_due(self): if self.env.user.is_accounting: - if not self.day_extension: - raise UserError('Day Extension is not set.') - if not self.due_line: - raise UserError('Tidak ada data di due line.') - self.is_approve = True if self.partner_id: @@ -56,19 +51,11 @@ class DueExtension(models.Model): ('id', '=', self.order_id.id) ]) - sales.action_confirm() + sales.state = 'sale' else: raise UserError('Hanya Finance Yang Bisa Approve') def generate_due_line(self): - if self.is_approve: - raise UserError('Sudah di approve, tidak bisa digenerate ulang') - if self.due_line: - raise UserError('Harus hapus semua line jika ingin generate ulang') - if self.partner_id.parent_id: - raise UserError('Harus pilih parent company') - - partners = [] partners += self.partner_id.child_ids partners.append(self.partner_id) @@ -99,13 +86,14 @@ class DueExtension(models.Model): }]) count += 1 _logger.info("Due Extension Line generated %s" % count) - + + class DueExtensionLine(models.Model): _name = 'due.extension.line' _description = 'Due Extension Line' _order = 'due_id, id' - due_id = fields.Many2one('due.extension', string='Dunning Ref', required=True, ondelete='cascade', index=True, copy=False) + due_id = fields.Many2one('due.extension', string='Due Ref', required=True, ondelete='cascade', index=True, copy=False) partner_id = fields.Many2one('res.partner', string='Customer') invoice_id = fields.Many2one('account.move', string='Invoice') date_invoice = fields.Date(string='Invoice Date') diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py index 6a040ff3..5bb93805 100755 --- a/indoteknik_custom/models/sale_order.py +++ b/indoteknik_custom/models/sale_order.py @@ -215,6 +215,12 @@ class SaleOrder(models.Model): def onchange_partner_shipping(self): self.real_shipping_id = self.partner_shipping_id + @api.onchange('partner_id') + def onchange_partner_contact(self): + self.npwp = self.partner_id.npwp + self.sppkp = self.partner_id.sppkp + self.customer_type = self.partner_id.customer_type + def _get_purchases(self): po_state = ['done', 'draft', 'purchase'] for order in self: @@ -290,8 +296,6 @@ class SaleOrder(models.Model): def sale_order_approve(self): # raise UserError("Bisa langsung Confirm") self.check_due() - parent_id = self.partner_id.parent_id.id - parent_id = parent_id if parent_id else self.partner_id.id for order in self: if order.warehouse_id.id != 8: #GD Bandengan @@ -355,6 +359,7 @@ class SaleOrder(models.Model): # raise UserError("PO harus di Cancel dahulu") self.approval_status = False + self.due_id = False return super(SaleOrder, self).action_cancel() def validate_partner_invoice_due(self): @@ -469,8 +474,8 @@ class SaleOrder(models.Model): elif order._notification_margin_manager(): return self._notification_has_margin_manager() else: - order._set_sppkp_npwp_contact() order.approval_status = 'approved' + order._set_sppkp_npwp_contact() order.calculate_line_no() res = super(SaleOrder, self).action_confirm() diff --git a/indoteknik_custom/views/account_move_views.xml b/indoteknik_custom/views/account_move_views.xml index 1ff7f3aa..1dcace46 100644 --- a/indoteknik_custom/views/account_move_views.xml +++ b/indoteknik_custom/views/account_move_views.xml @@ -47,7 +47,7 @@ - + -- cgit v1.2.3 From 25a124e690cfea45d69ac34f051f0ee8749cda83 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Mon, 26 Jun 2023 16:42:08 +0700 Subject: add new field and log to due extension --- .../models/account_move_due_extension.py | 33 ++++++++++++++++++++-- indoteknik_custom/views/account_move_views.xml | 14 +++++++++ 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/indoteknik_custom/models/account_move_due_extension.py b/indoteknik_custom/models/account_move_due_extension.py index fbb8efe1..f4ad1076 100644 --- a/indoteknik_custom/models/account_move_due_extension.py +++ b/indoteknik_custom/models/account_move_due_extension.py @@ -7,6 +7,8 @@ _logger = logging.getLogger(__name__) class DueExtension(models.Model): _name = "due.extension" + _description = "Due Extension" + _inherit = ['mail.thread'] _rec_name = 'number' number = fields.Char(string='Document No', index=True, copy=False, readonly=True) @@ -14,12 +16,17 @@ class DueExtension(models.Model): order_id = fields.Many2one('sale.order', string="SO", readonly=True) due_line = fields.One2many('due.extension.line', 'due_id', string='Due Extension Lines', auto_join=True) old_due = fields.Date(string="Old Due") - is_approve = fields.Boolean(string="Is Approve", readonly=True) + description = fields.Text(string="Description") + is_approve = fields.Boolean(string="Is Approve", readonly=True, tracking=True) + approval_status = fields.Selection([ + ('pengajuan', 'Pengajuan'), + ('approved', 'Approved'), + ], string='Approval Status', readonly=True, copy=False, index=True, tracking=3) day_extension = fields.Selection([ ('3', '3 Hari'), ('7', '7 Hari'), ('14', '14 Hari'), - ], string='Day Extension', help='Menambah Due Date yang sudah limit dari hari ini') + ], string='Day Extension', help='Menambah Due Date yang sudah limit dari hari ini', tracking=True) @api.model def create(self, vals): @@ -27,9 +34,19 @@ class DueExtension(models.Model): result = super(DueExtension, self).create(vals) return result + def due_extension_approval(self): + if not self.approval_status: + self.approval_status = 'pengajuan' + elif self.approval_status == 'pengajuan': + raise UserError('Anda sudah mengajukan ask approval') + elif self.approval_status == 'approved': + raise UserError('Document sudah di approve') + + def approve_new_due(self): if self.env.user.is_accounting: self.is_approve = True + self.approval_status = 'approved' if self.partner_id: if self.day_extension: @@ -86,6 +103,11 @@ class DueExtension(models.Model): }]) count += 1 _logger.info("Due Extension Line generated %s" % count) + def unlink(self): + res = super(DueExtension, self).unlink() + if self._name == 'due.extension': + raise UserError('Due Extension tidak bisa didelete') + return res class DueExtensionLine(models.Model): @@ -101,9 +123,14 @@ class DueExtensionLine(models.Model): reference = fields.Char(string='Reference') total_amt = fields.Float(string='Total Amount') open_amt = fields.Float(string='Open Amount') - due_date = fields.Date(string='Due Date') + due_date = fields.Date(string='Due Date', compute="_compute_due_date") day_to_due = fields.Integer(string='Day To Due', compute="_compute_day_to_due") def _compute_day_to_due(self): for line in self: line.day_to_due = line.invoice_id.invoice_day_to_due + + def _compute_due_date(self): + for line in self: + line.due_date = line.invoice_id.invoice_date_due + diff --git a/indoteknik_custom/views/account_move_views.xml b/indoteknik_custom/views/account_move_views.xml index 1dcace46..42262780 100644 --- a/indoteknik_custom/views/account_move_views.xml +++ b/indoteknik_custom/views/account_move_views.xml @@ -8,6 +8,8 @@ + + @@ -43,6 +45,10 @@ class="mr-2 oe_highlight oe_edit_only" attrs="{'invisible': [('is_approve', '=', True)]}" /> +