Merged in hotfix/revisi-due-extension (pull request #51)

Hotfix/revisi due extension

6 files changed, 101 insertions, 87 deletions

diff --git a/indoteknik_custom/models/account_move.py b/indoteknik_custom/models/account_move.py
index c2e93632..99439915 100644
--- a/indoteknik_custom/models/account_move.py
+++ b/indoteknik_custom/models/account_move.py
@@ -13,6 +13,8 @@ class AccountMove(models.Model):
     resi_tukar_faktur = fields.Char(string='Resi Faktur')
     date_terima_tukar_faktur = fields.Date(string='Terima Faktur')
     shipper_faktur_id = fields.Many2one('delivery.carrier', string='Shipper Faktur')
+    due_extension = fields.Integer(string='Due Extension', default=0)
+    new_due_date = fields.Date(string='New Due')
 
     def unlink(self):
         res = super(AccountMove, self).unlink()
@@ -70,6 +72,8 @@ class AccountMove(models.Model):
             invoice_day_to_due = 0
             if invoice.payment_state not in ['paid', 'in_payment', 'reversed'] and invoice.invoice_date_due:
                 invoice_day_to_due = invoice.invoice_date_due - date.today()
+                if invoice.new_due_date:
+                    invoice_day_to_due = invoice.new_due_date - date.today()
                 invoice_day_to_due = invoice_day_to_due.days
             invoice.invoice_day_to_due = invoice_day_to_due
 
diff --git a/indoteknik_custom/models/account_move_due_extension.py b/indoteknik_custom/models/account_move_due_extension.py
index 1e3bdad1..27c8577d 100644
--- a/indoteknik_custom/models/account_move_due_extension.py
+++ b/indoteknik_custom/models/account_move_due_extension.py
@@ -62,72 +62,66 @@ class DueExtension(models.Model):
             raise UserError('Hanya Finance yang bisa cancel')
         
     def approve_new_due(self):
-        if self.env.user.is_accounting:
-            if not self.approval_status == 'approved':
-                self.is_approve = True
-                self.approval_status = 'approved'
+        if not self.env.user.is_accounting:
+            raise UserError('Hanya Finance Yang Bisa Approve')
+        
+        if self.approval_status == 'approved':
+            raise UserError('Document ini sudah di approve')
+        
+        self.is_approve = True
+        self.approval_status = 'approved'
 
-                self.partner_id.counter+=1
+        self.partner_id.counter+=1
 
-                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()
+        day_extension = int(self.day_extension)
+        if self.partner_id:
+            new_due = date.today() + timedelta(days=day_extension)
+            
+        for line in self.due_line:
+            line.invoice_id.new_due_date = new_due
+            line.invoice_id.due_extension = day_extension
+        
+        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.state = 'sale'
-                sales.action_confirm()
-                self.order_id.due_id = self.id
-            else:
-                raise UserError('Document ini sudah di approve')
-        else:
-            raise UserError('Hanya Finance Yang Bisa Approve')
+        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'].browse(self.order_id.id)
+        
+        sales.action_confirm()
+        self.order_id.due_id = self.id
         
     def generate_due_line(self):
-        partners = []
-        partners += self.partner_id.child_ids
-        partners.append(self.partner_id)
-
+        partners = self.partner_id.get_child_ids()
 
-        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)
+        query = [
+            ('partner_id', 'in', partners),
+            ('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:
+            day_to_due = invoice.invoice_day_to_due + invoice.due_extension
+            if 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
+                }])
+                count += 1
+            _logger.info("Due Extension Line generated %s" % count)
+            
     def unlink(self):
         res = super(DueExtension, self).unlink()
         if not self._name == 'due.extension':
@@ -157,5 +151,8 @@ class DueExtensionLine(models.Model):
 
     def _compute_due_date(self):
         for line in self:
-            line.due_date = line.invoice_id.invoice_date_due
+            if line.invoice_id.new_due_date:
+                line.due_date = line.invoice_id.new_due_date
+            else:
+                line.due_date = line.invoice_id.invoice_date_due
 
diff --git a/indoteknik_custom/models/res_partner.py b/indoteknik_custom/models/res_partner.py
index 5dec8da8..1695639d 100644
--- a/indoteknik_custom/models/res_partner.py
+++ b/indoteknik_custom/models/res_partner.py
@@ -20,6 +20,14 @@ class ResPartner(models.Model):
     sppkp = fields.Char(string="SPPKP")
     counter = fields.Integer(string="Counter", default=0)
 
+    def get_child_ids(self):
+        partner = self.env['res.partner'].search([('id', '=', self.id)], limit=1)
+        partner_child_ids = [x['id'] for x in partner.child_ids] + [partner.id]
+        if partner.parent_id:
+            partner_child_ids += [x['id'] for x in partner.parent_id.child_ids]
+            partner_child_ids += [partner.parent_id.id]
+        return partner_child_ids
+
     def unlink(self):
         if self._name == 'res.partner':
             raise UserError('Maaf anda tidak bisa delete contact')
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index e54b9ae2..3d0dfc17 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -8,6 +8,7 @@ import string
 import requests
 import math
 import json
+from datetime import timedelta, date
 
 _logger = logging.getLogger(__name__)
 
@@ -390,26 +391,28 @@ class SaleOrder(models.Model):
         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
+        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')
+
+        if invoices:
+            if not self.env.user.is_leader and not self.env.user.is_sales_manager:
+                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:
diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index 9faf3149..7f7fb228 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -15,6 +15,7 @@
                     <field name="shipper_faktur_id"/>
                     <field name="resi_tukar_faktur"/>
                     <field name="date_terima_tukar_faktur"/>
+                    <field name="due_extension"/>
                 </field>
             </field>
         </record>
@@ -30,13 +31,14 @@
                 </field>
                 <field name="invoice_date_due" position="after">
                     <field name="invoice_day_to_due" attrs="{'invisible': [['payment_state', 'in', ('paid', 'in_payment', 'reversed')]]}"/>
+                    <field name="due_extension" optional="hide"/>
                 </field>
                 <field name="payment_state" position="after">
-                    <field name="invoice_payment_term_id"/>
-                    <field name="date_kirim_tukar_faktur"/>
-                    <field name="shipper_faktur_id" optional="1"/>
-                    <field name="resi_tukar_faktur" optional="1"/>
-                    <field name="date_terima_tukar_faktur"/>
+                    <field name="invoice_payment_term_id" optional="hide"/>
+                    <field name="date_kirim_tukar_faktur" optional="hide"/>
+                    <field name="shipper_faktur_id" optional="hide"/>
+                    <field name="resi_tukar_faktur" optional="hide"/>
+                    <field name="date_terima_tukar_faktur" optional="hide"/>
                 </field>
             </field>
         </record>
diff --git a/indoteknik_custom/views/account_move_views.xml b/indoteknik_custom/views/account_move_views.xml
index 983fbd5a..fee94b42 100644
--- a/indoteknik_custom/views/account_move_views.xml
+++ b/indoteknik_custom/views/account_move_views.xml
@@ -4,7 +4,7 @@
         <field name="name">due.extension.tree</field>
         <field name="model">due.extension</field>
         <field name="arch" type="xml">
-            <tree create="false">
+            <tree default_order="create_date desc" create="0">
                 <field name="number"/>
                 <field name="partner_id"/>
                 <field name="day_extension"/>