Merge 4c2ed56 into 87dca39

Trust-Code · Dec 11, 2018 · 12f0667 · 12f0667
2 parents 87dca39 + 4c2ed56
commit 12f0667
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 11 deletions.
diff --git a/br_account_payment/models/payment_order.py b/br_account_payment/models/payment_order.py
@@ -119,7 +119,8 @@ def mark_order_line_processed(self, cnab_code, cnab_message,
                                   rejected=False, statement_id=None):
         pass
 
-    def mark_order_line_paid(self, cnab_code, cnab_message, statement_id=None):
+    def mark_order_line_paid(self, cnab_code, cnab_message, statement_id=None,
+                             autenticacao=None, protocolo=None):
         pass
 
     @api.multi

diff --git a/br_cnab/models/payment_order.py b/br_cnab/models/payment_order.py
@@ -112,10 +112,12 @@ def create_receivable_move_and_reconcile(self, order_line):
         (counterpart_aml + order_line.move_line_id).reconcile()
         return move
 
-    def mark_order_line_paid(self, cnab_code, cnab_message, statement_id=None):
+    def mark_order_line_paid(self, cnab_code, cnab_message, statement_id=None,
+                             autenticacao=None, protocolo=None):
         if self.type != 'receivable':
             return super(PaymentOrderLine, self).mark_order_line_paid(
-                cnab_code, cnab_message, statement_id)
+                cnab_code, cnab_message, statement_id,
+                autenticacao=autenticacao, protocolo=protocolo)
 
         bank_account_ids = self.mapped('src_bank_account_id')
         for account in bank_account_ids:

diff --git a/br_payment_cnab/models/payment_order.py b/br_payment_cnab/models/payment_order.py
@@ -347,10 +347,12 @@ def mark_order_line_processed(self, cnab_code, cnab_message,
             })
         return statement_id
 
-    def mark_order_line_paid(self, cnab_code, cnab_message, statement_id=None):
+    def mark_order_line_paid(self, cnab_code, cnab_message, statement_id=None,
+                             autenticacao=None, protocolo=None):
         if self.filtered(lambda x: x.type != 'payable'):
             return super(PaymentOrderLine, self).mark_order_line_paid(
-                cnab_code, cnab_message, statement_id)
+                cnab_code, cnab_message, statement_id,
+                autenticacao=autenticacao, protocolo=protocolo)
 
         bank_account_ids = self.mapped('src_bank_account_id')
         for account in bank_account_ids:
@@ -370,6 +372,9 @@ def mark_order_line_paid(self, cnab_code, cnab_message, statement_id=None):
                 })
             for item in order_lines:
                 move_id = self.create_move_and_reconcile(item)
+                item.write({
+                    'autenticacao_pagamento': autenticacao,
+                    'protocolo_pagamento': protocolo})
                 self.env['l10n_br.payment.statement.line'].create({
                     'statement_id': statement_id.id,
                     'date': date.today(),

diff --git a/br_payment_cnab/reports/cnab_payment_receipt_report.xml b/br_payment_cnab/reports/cnab_payment_receipt_report.xml
@@ -8,7 +8,7 @@
                     <span> Comprovante de pagamento de </span> <span t-field="line.payment_mode_id.payment_type"/>
                 </div>
             </div>
-            <div class="row" name="account_infos" style="margin-bottom:20px;margin-left:30px;margin-right:90px">
+            <div class="row" name="account_infos" style="margin-bottom:20px;margin-left:30px;margin-right:30px">
                 <t t-set="acc" t-value="line.src_bank_account_id"/>
                 <div class="col-xs-6" style="font-size:20">
                     <span>Conta: </span> <span t-field="acc.acc_number"/> - 

diff --git a/br_payment_cnab/views/payment_order.xml b/br_payment_cnab/views/payment_order.xml
@@ -38,6 +38,8 @@
                 <field name="barcode" />
                 <field name="cnab_code" />
                 <field name="cnab_message" />
+                <field name="autenticacao_pagamento" />
+                <field name="protocolo_pagamento"/>
             </field>
             <field name="emission_date" position="after">
                 <field name="invoice_date"/>

diff --git a/br_payment_cnab/wizard/payment_cnab_import.py b/br_payment_cnab/wizard/payment_cnab_import.py
@@ -83,23 +83,26 @@ def do_import(self, cnab_file):
                         'ignored': True,
                     })
                     continue
-
+                protocol = event.protocolo_pagamento or None
+                autentication = event.autenticacao_pagamento or None
                 self.select_routing(
-                    payment_line, cnab_code, bank, message, statement)
+                    payment_line, cnab_code, bank, message, statement,
+                    protocolo=protocol, autenticacao=autentication)
 
         action = self.env.ref(
             'br_account_payment.action_payment_statement_tree')
         return action.read()[0]
 
-    def select_routing(self, pay_line, cnab_code, bank, message, statement):
+    def select_routing(self, pay_line, cnab_code, bank, message,
+                       statement, protocolo=None, autenticacao=None):
         if cnab_code == 'BD':  # Inclusão OK
             pay_line.mark_order_line_processed(
                 cnab_code, message, statement_id=statement
             )
         elif cnab_code in ('00', '03'):  # Débito
             pay_line.mark_order_line_paid(
-                cnab_code, message, statement_id=statement
-            )
+                cnab_code, message, statement_id=statement,
+                autenticacao=autenticacao, protocolo=protocolo)
         else:
             pay_line.mark_order_line_processed(
                 cnab_code, message, rejected=True,