Преглед изворни кода

[FIX] Date_maturity is none

adrielso пре 6 година
родитељ
комит
6eb89d944f
2 измењених фајлова са 7 додато и 4 уклоњено
  1. 5 2
      models/eiru_account_interest.py
  2. 2 2
      static/src/js/verify_interest_invoice.js

+ 5 - 2
models/eiru_account_interest.py

@@ -101,7 +101,7 @@ class EiruAccountInterest(models.Model):
     @api.model
     def get_account_invoice_interest(self, invoice=None, partner=None):
         _logger.info('Verify invoice')
-        domain = [('state', '=', 'open'),('is_interest', '=', False), ('type', '=', 'out_invoice')]
+        domain = [('state', '=', 'open'),('is_interest', '=', False),('type', '=', 'out_invoice')]
 
         if (invoice):
             domain.append(('id', '=', invoice))
@@ -121,11 +121,14 @@ class EiruAccountInterest(models.Model):
     def get_move_line_in_invoice(self, invoice):
         _logger.info('Get Move Line')
         accountInvoice = self.env['account.invoice'].browse(invoice)
-
         dateServer = self._convert_str_to_datetime(self.get_date())
 
         domain = [('state','!=','draft'), ('credit','<=', 0),('invoice','=',accountInvoice.id)]
         for line in self.env['account.move.line'].search(domain):
+
+            if(not line.date_maturity):
+                return False
+
             expiredDays = dateServer - self._convert_str_to_datetime(line.date_maturity)
             if (line.date_interest):
                 expiredDays = dateServer - self._convert_str_to_datetime(line.date_interest)

+ 2 - 2
static/src/js/verify_interest_invoice.js

@@ -30,7 +30,7 @@
                 return accountInvoice;
             }).then(function(accountInvoice) {
                 self.accountInvoice = accountInvoice;
-                if ((accountInvoice[0].state !== 'open') || (accountInvoice[0] !=='out_invoice') || ((accountInvoice[0].state === 'open') && (accountInvoice[0].is_interest))){
+                if ((accountInvoice[0].state !== 'open') || (accountInvoice[0].type !=='out_invoice') || ((accountInvoice[0].state === 'open') && (accountInvoice[0].is_interest))){
                     return false;
                 }
                 self.verifyInterestPartner(accountInvoice[0].id).then(function(results) {
@@ -43,7 +43,7 @@
         },
         fetchInvoice: function(id){
             var invoice = new instanceWeb.Model('account.invoice');
-            var fields =['id', 'name', 'state', 'is_interest'];
+            var fields =['id', 'name', 'state', 'is_interest', 'type'];
             var domain=[['id', '=', id]]
             return  invoice.query(fields).filter(domain).all();
         },