Merge lp:~pexego/sepa-tools/several_fixes-6.0 into lp:sepa-tools/6.0

[Omar (Pexego)]

Several fixes:

- The new debit_denied state in account_invoice object, was being created in init function but, it didn't check if state already had been created. Result: several debit_denied states registered in selection column of ir_model_fields, one for each server startup.
- I add reopen button in invoices with debit_denied state like paid state.
- Was impossible go out debit_denied state, because nowhere in code its signal was called, I changed its definition like open to paid behaviour, now, when test_paid is called, the workflow checks if can be moved from debit_denied to paid, newly.
- It was accessing to company, from payment type associated to payment mode, but, company field in payment type is not required because you can want share it between companies, I change it, to check the company in payment mode.
- I change the type of nb_transaction field from integer to char type, because in 6.0 there is a bug with integer function fields and you have to click twice in button to create xml file.

Other small fixes are required to work with these modules, but these are fixed in other merge proposal that we have to merge.

regards

[lp:~pexego/sepa-tools/several_fixes-6.0]

11. By Omar (Pexego) on 2014-07-04

[FIX] account_payment_pain_base: Changed one except_orm not supported in 6.0 to osv.osv_except

Unmerged revisions

11. By Omar (Pexego) on 2014-07-04

[FIX] account_payment_pain_base: Changed one except_orm not supported in 6.0 to osv.osv_except

10. By Omar (Pexego) on 2014-05-30

[FIX] Several fixes

=== modified file 'account_payment_direct_debit/model/account_invoice.py'
--- account_payment_direct_debit/model/account_invoice.py	2014-02-11 18:29:05 +0000
+++ account_payment_direct_debit/model/account_invoice.py	2014-07-04 14:29:28 +0000
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    Copyright (C) 2011 - 2013 Therp BV (<http://therp.nl>).
-#            
+#
 #    All other contributions are (C) by their respective contributors
 #
 #    All Rights Reserved
@@ -33,12 +33,12 @@
 
 Invoice workflow:
 
-1 the sale leads to 
+1 the sale leads to
    1300 Debtors 100
    8000 Sales       100
 
-Balance: 
-  Debtors  2000 | 
+Balance:
+  Debtors  2000 |
   Sales        | 2000
 
 2 an external booking takes place
@@ -59,11 +59,11 @@
 
    2000 Transfer account 100 |
    1300 Debtors              | 100
-   Reconciliation takes place between 1 and 2a. 
+   Reconciliation takes place between 1 and 2a.
    The invoice gets set to state 'paid', and 'reconciled' = True
 
 Balance:
-   Debtors             0 |  
+   Debtors             0 |
    Transfer account 2000 |
    Bank                0 |
    Sales                 | 2000
@@ -76,7 +76,7 @@
   Reconciliation takes place between 3a and 2a
 
 Balance:
-   Debtors             0 |  
+   Debtors             0 |
    Transfer account    0 |
    Bank             2000 |
    Sales                 | 2000
@@ -84,59 +84,59 @@
 4 a storno from invoice [1] triggers a new booking on the bank account
   1300 Debtors 100 |
   1100 Bank        | 100
-  
+
 Balance:
-   Debtors           100 |  
+   Debtors           100 |
    Transfer account    0 |
    Bank             1900 |
    Sales                 | 2000
 
-   The reconciliation of 2a is undone. The booking of 2a is reconciled 
+   The reconciliation of 2a is undone. The booking of 2a is reconciled
    with the booking of 4 instead.
    The payment line attribute 'storno' is set to True and the invoice
    state is no longer 'paid'.
 
 Two cases need to be distinguisted:
    1) If the storno is a manual storno from the partner, the invoice is set to
-      state 'debit_denied', with 'reconciled' = False 
+      state 'debit_denied', with 'reconciled' = False
       This module implements this option by allowing the bank module to call
-     
+
           netsvc.LocalService("workflow").trg_validate(
               uid, 'account.invoice', ids, 'debit_denied', cr)
 
    2) If the storno is an error generated by the bank (assumingly non-fatal),
       the invoice is reopened for the next debit run. This is a call to existing
-     
+
          netsvc.LocalService("workflow").trg_validate(
              uid, 'account.invoice', ids, 'open_test', cr)
 
       Should also be adding a log entry on the invoice for tracing purposes
 
-         self._log_event(cr, uid, ids, -1.0, 'Debit denied')           
+         self._log_event(cr, uid, ids, -1.0, 'Debit denied')
 
       If not for that funny comment
       "#TODO: implement messages system"  in account/invoice.py
 
    Repeating non-fatal fatal errors need to be dealt with manually by checking
    open invoices with a matured invoice- or due date.
-""" 
+"""
 
 class account_invoice(osv.osv):
     _inherit = "account.invoice"
 
     def __init__(self, pool, cr):
-        """ 
+        """
         Adding a state to the hardcoded state list of the inherited
-        model. The alternative is duplicating the field definition 
+        model. The alternative is duplicating the field definition
         in columns but only one module can do that!
 
         Maybe apply a similar trick when overriding the buttons' 'states' attributes
         in the form view, manipulating the xml in fields_view_get().
-        """ 
+        """
         super(account_invoice, self).__init__(pool, cr)
         invoice_obj = pool.get('account.invoice')
-        invoice_obj._columns['state'].selection.append(
-            ('debit_denied', 'Debit denied'))
+        if ('debit_denied', 'Debit denied') not in invoice_obj._columns['state'].selection:
+            invoice_obj._columns['state'].selection.append(('debit_denied', 'Debit denied'))
 
     def action_debit_denied(self, cr, uid, ids, context=None):
         for invoice_id in ids:
@@ -144,7 +144,7 @@
                 number = self.read(
                     cr, uid, invoice_id, ['number'], context=context)['number']
                 raise osv.except_osv(
-                    _('Error !'), 
+                    _('Error !'),
                     _('You cannot set invoice \'%s\' to state \'debit denied\', ' +
                       'as it is still reconciled.') % number)
         self.write(cr, uid, ids, {'state': 'debit_denied'}, context=context)
@@ -154,13 +154,13 @@
         return True
 
     def test_undo_debit_denied(self, cr, uid, ids, context=None):
-        """ 
+        """
         Called from the workflow. Used to unset paid state on
-        invoices that were paid with bank transfers which are being cancelled 
+        invoices that were paid with bank transfers which are being cancelled
         """
         for invoice in self.read(cr, uid, ids, ['reconciled'], context):
             if not invoice['reconciled']:
                 return False
         return True
 
-account_invoice()
 \ No newline at end of file
+account_invoice()
 
=== modified file 'account_payment_direct_debit/view/account_invoice.xml'
--- account_payment_direct_debit/view/account_invoice.xml	2014-02-11 18:29:05 +0000
+++ account_payment_direct_debit/view/account_invoice.xml	2014-07-04 14:29:28 +0000
@@ -7,7 +7,7 @@
             <field name="inherit_id" ref="account.invoice_form"/>
             <field name="arch" type="xml">
                 <data>
-                    <!-- 
+                    <!--
                          Add new state 'debit_denied' to applicable buttons.
                          Maybe apply trick in fields_view_get instead, for
                          better compatibility with other modules?
@@ -19,6 +19,9 @@
                         <button name="invoice_debit_denied" states="paid"
                                 string="Debit Denied" icon="gtk-cancel"/>
                     </button>
+                    <button name="%(account.action_account_state_open)d" position="replace">
+                        <button name="%(account.action_account_state_open)d" type='action' string='Re-Open' states='paid,debit_denied' icon="gtk-convert" groups="base.group_no_one"/>
+                    </button>
                </data>
             </field>
         </record>
 
=== modified file 'account_payment_direct_debit/workflow/account_invoice.xml'
--- account_payment_direct_debit/workflow/account_invoice.xml	2014-02-11 18:29:05 +0000
+++ account_payment_direct_debit/workflow/account_invoice.xml	2014-07-04 14:29:28 +0000
@@ -8,7 +8,7 @@
             <field name="kind">function</field>
         </record>
        <record id="paid_to_debit_denied" model="workflow.transition">
-            <!-- 
+            <!--
                  Set an invoice to state debit denied, either manually
                  or by confirming a bank statement line that constitutes
                  a fatal storno
@@ -18,7 +18,7 @@
             <field name="signal">invoice_debit_denied</field>
         </record>
        <record id="open_test_to_debit_denied" model="workflow.transition">
-            <!-- 
+            <!--
                  A storno leads to unreconciling the move line, which
                  reopens the invoice. We need to allow a transition from
                  this state to the debit denied state if the storno is fatal.
@@ -28,17 +28,18 @@
             <field name="signal">invoice_debit_denied</field>
         </record>
        <record id="debit_denied_to_paid" model="workflow.transition">
-            <!-- 
+            <!--
                  Cancel a bank statement line that constitutes a fatal
                  storno
             -->
             <field name="act_from" ref="act_debit_denied"/>
             <field name="act_to" ref="account.act_paid"/>
-            <field name="condition">test_undo_debit_denied()</field>
-            <field name="signal">undo_debit_denied</field>
+            <field name="trigger_model">account.move.line</field>
+            <field name="trigger_expr_id">move_line_id_payment_get()</field>
+            <field name="condition">test_paid()</field>
         </record>
         <record id="debit_denied_to_open" model="workflow.transition">
-            <!-- 
+            <!--
                  Allow the user to manually reset a debit denied status
                  on a paid invoice (but only after manually unreconciling
                  the invoice)
 
=== modified file 'account_payment_pain_base/banking_export_pain.py'
--- account_payment_pain_base/banking_export_pain.py	2014-02-11 18:29:05 +0000
+++ account_payment_pain_base/banking_export_pain.py	2014-07-04 14:29:28 +0000
@@ -154,7 +154,6 @@
                 'file_id': file_id,
                 'state': 'finish',
             }, context=context)
-
         action = {
             'name': 'SEPA File',
             'type': 'ir.actions.act_window',
@@ -264,10 +263,10 @@
         initiating_party_identifier = self.pool.get('res.company').\
             _get_initiating_party_identifier(
                 cr, uid,
-                gen_args['sepa_export'].payment_order_ids[0].mode.type.company_id.id,
+                gen_args['sepa_export'].payment_order_ids[0].mode.company_id.id,
                 context=context)
         initiating_party_issuer = gen_args['sepa_export'].\
-            payment_order_ids[0].mode.type.company_id.initiating_party_issuer
+            payment_order_ids[0].mode.company_id.initiating_party_issuer
         if initiating_party_identifier and initiating_party_issuer:
             iniparty_id = etree.SubElement(initiating_party_1_8, 'Id')
             iniparty_org_id = etree.SubElement(iniparty_id, 'OrgId')
@@ -295,7 +294,7 @@
             party_agent_bic = etree.SubElement(
                 party_agent_institution, gen_args.get('bic_xml_tag'))
             party_agent_bic.text = bic
-        except except_orm:
+        except osv.except_osv:
             if order == 'C':
                 if iban[0:2] != gen_args['initiating_party_country_code']:
                     raise osv.except_osv(
@@ -437,5 +436,5 @@
             csi_scheme_name, 'Prtry')
         csi_scheme_name_proprietary.text = scheme_name_proprietary
         return True
-    
+
 banking_export_pain()
 
=== modified file 'account_payment_sepa_credit_transfer/wizard/export_sepa.py'
--- account_payment_sepa_credit_transfer/wizard/export_sepa.py	2014-02-11 18:29:05 +0000
+++ account_payment_sepa_credit_transfer/wizard/export_sepa.py	2014-07-04 14:29:28 +0000
@@ -58,7 +58,7 @@
             "to be borne by the creditor. Borne by debtor : all transaction "
             "charges are to be borne by the debtor."),
         'nb_transactions': fields.related(
-            'file_id', 'nb_transactions', type='integer',
+            'file_id', 'nb_transactions', type='char',
             string='Number of Transactions', readonly=True),
         'total_amount': fields.related(
             'file_id', 'total_amount', type='float', string='Total Amount',
@@ -251,7 +251,7 @@
                 self.generate_party_block(
                     cr, uid, credit_transfer_transaction_info_2_27, 'Cdtr',
                     'C', 'line.partner_id.name', 'line.bank_id.iban',
-                    'line.bank_id.bank.bic', line.bank_id.id, 
+                    'line.bank_id.bank.bic', line.bank_id.id,
                     {'line': line}, gen_args, context=context)
 
                 self.generate_remittance_info_block(
@@ -268,6 +268,10 @@
         else:
             nb_of_transactions_1_6.text = str(transactions_count_1_6)
             control_sum_1_7.text = '%.2f' % amount_control_sum_1_7
+        # LLamada a  set_done en payment.order para hacer movimientos contables del pago
+        # cuando create_account_moves = 'direct-payment'
+        payment_order_ids = context.get('active_ids', [])
+        self.pool.get('payment.order').set_done(cr, uid, payment_order_ids, context)
         return self.finalize_sepa_file_creation(
             cr, uid, ids, xml_root, total_amount, transactions_count_1_6,
             gen_args, context=context)
 
=== modified file 'account_payment_sepa_direct_debit/wizard/export_sdd.py'
--- account_payment_sepa_direct_debit/wizard/export_sdd.py	2014-02-11 18:29:05 +0000
+++ account_payment_sepa_direct_debit/wizard/export_sdd.py	2014-07-04 14:29:28 +0000
@@ -58,7 +58,7 @@
             "borne by the creditor. Borne by debtor : all transaction "
             "charges are to be borne by the debtor."),
         'nb_transactions': fields.related(
-            'file_id', 'nb_transactions', type='integer',
+            'file_id', 'nb_transactions', type='char',
             string='Number of Transactions', readonly=True),
         'total_amount': fields.related(
             'file_id', 'total_amount', type='float', string='Total Amount',
@@ -400,7 +400,11 @@
             control_sum_2_5.text = '%.2f' % amount_control_sum_2_5
         nb_of_transactions_1_6.text = str(transactions_count_1_6)
         control_sum_1_7.text = '%.2f' % amount_control_sum_1_7
-        
+
+        # LLamada a  set_done en payment.order para hacer movimientos contables del adeudo
+        # cuando create_account_moves = 'direct-payment'
+        payment_order_ids = context.get('active_ids', [])
+        self.pool.get('payment.order').set_done(cr, uid, payment_order_ids, context)
         return self.finalize_sepa_file_creation(
             cr, uid, ids, xml_root, total_amount, transactions_count_1_6,
             gen_args, context=context)
@@ -451,4 +455,4 @@
                     'sepa_migrated': True,
                 }, context=context)
         return {'type': 'ir.actions.act_window_close'}
-banking_export_sdd_wizard()
 \ No newline at end of file
+banking_export_sdd_wizard()