Merge branch 'release' of bitbucket.org:altafixco/indoteknik-addons into release

1 files changed, 5 insertions, 2 deletions

diff --git a/indoteknik_custom/models/dunning_run.py b/indoteknik_custom/models/dunning_run.py
index ee0669ca..8e5b2c19 100644
--- a/indoteknik_custom/models/dunning_run.py
+++ b/indoteknik_custom/models/dunning_run.py
@@ -23,13 +23,14 @@ class DunningRun(models.Model):
     date_terima_tukar_faktur = fields.Date(string='Terima Faktur')
     shipper_faktur_id = fields.Many2one('delivery.carrier', string='Shipper Faktur')
     is_validated = fields.Boolean(string='Validated')
+    notification = fields.Char(string='Notification')
 
     def copy_date_faktur(self):
         if not self.is_validated:
             raise UserError('Harus di validate dulu')
         for line in self.dunning_line:
             invoice = line.invoice_id
-            if not invoice.date_kirim_tukar_faktur:
+            if not invoice.date_kirim_tukar_faktur and self.date_kirim_tukar_faktur:
                 invoice.date_kirim_tukar_faktur = self.date_kirim_tukar_faktur
                 tukar_date = self.date_kirim_tukar_faktur
                 term = invoice.invoice_payment_term_id
@@ -40,7 +41,7 @@ class DunningRun(models.Model):
                 invoice.invoice_date_due = due_date
             if not invoice.resi_tukar_faktur:
                 invoice.resi_tukar_faktur = self.resi_tukar_faktur
-            if not invoice.date_terima_tukar_faktur:
+            if not invoice.date_terima_tukar_faktur and self.date_terima_tukar_faktur:
                 invoice.date_terima_tukar_faktur = self.date_terima_tukar_faktur
                 tukar_date = self.date_terima_tukar_faktur
                 term = invoice.invoice_payment_term_id
@@ -51,12 +52,14 @@ class DunningRun(models.Model):
                 invoice.invoice_date_due = due_date
             if not invoice.shipper_faktur_id:
                 invoice.shipper_faktur_id = self.shipper_faktur_id
+        self.notification = 'Berhasil copy tanggal terima faktur ke setiap invoice %s' % self.date_terima_tukar_faktur
 
     def validate_dunning(self):
         if not self.dunning_line:
             raise UserError('Dunning Line masih kosong, generate dulu')
         else:
             self.is_validated = True
+            self.notification = 'Jangan lupa klik Copy Date jika sudah ada tanggal kirim / tanggal terima faktur'
 
     def generate_dunning_line(self):
         if self.is_validated: