Merge lp:~santiago-pexego/account-payment/account-payment_improvments into lp:~account-payment-team/account-payment/6.1

[Santi Argüeso(Pexego)]

Adds a simple button and wizard for direct payment from account_move_line payments tree view. You can now manage your payments completly from this view (not only onformation)

Redefine the _invoice function for account_move_line so it can search for the related invoce if you have several chained payments.

Propose a change for fields_view get in accont_move_line in account_payment_extension

[Pedro Manuel Baeza (pedro.baeza)]

Santi, __openerp__.py references a payment_wizard.xml file, but it's not present. Can you fix it?

Regards.

[Santi Argüeso(Pexego) (santiago-pexego)]

Thanks Pedro. I have fixed it. I had forgotten to remove the reference so payment_wizard.xml has been removed in a previous revision.
Again, thanks for the early revision.

[Pedro Manuel Baeza (pedro.baeza)]

Now it's working correctly.

Maybe spanish translation for new button? ;) (or pot file updated)

[Santi Argüeso(Pexego) (santiago-pexego)]

Yes I have to update a few translations.... I'll do it as soon as posible

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Can you put the status of the proposal to 'Work in progress' if you still need to add the translations please?
Put it back to 'Needs review' when you are done.

Thanks

[Santi Argüeso(Pexego) (santiago-pexego)]

The traslations are done and another little improvements

review: Needs Resubmitting

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Santi:

I have proposed a MP to your branch to update some spanish translations. Please merge it with your branch and I will proceed with this MP.

For the rest of the things, it's working perfectly.

Cheers.

review: Approve

[lp:~santiago-pexego/account-payment/account-payment_improvments]

103. By Santi Argüeso(Pexego) on 2013-06-03

[IMP] account_payment_extension. Added translations form Pedro Baeza. Thanks. :)

[Pedro Manuel Baeza (pedro.baeza)]

All is working correctly and spanish translations are done, so I proceed with the merge.

Thanks for your contribution, Santi, and all the people involved in this review.

review: Approve

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2013-06-03 10:33:26 +0000
@@ -0,0 +1,1 @@
+*.orig

=== modified file 'account_payment_extension/__openerp__.py'
--- account_payment_extension/__openerp__.py	2013-04-04 17:22:38 +0000
+++ account_payment_extension/__openerp__.py	2013-06-03 10:33:26 +0000
@@ -58,6 +58,7 @@
                     "wizard/account_payment_order_view.xml",
                     "payment_view.xml",
                     "payment_sequence.xml",
+                    "wizard/account_move_line_payment_view.xml",
                     ],
     "active": False,
     "installable": True,

=== modified file 'account_payment_extension/account_move_line.py'
--- account_payment_extension/account_move_line.py	2012-11-01 21:49:33 +0000
+++ account_payment_extension/account_move_line.py	2013-06-03 10:33:26 +0000
@@ -25,13 +25,66 @@
 
 import netsvc
 from osv import fields, osv
+from tools.translate import _
 
 class account_move_line(osv.osv):
     _name = 'account.move.line'
     _inherit = 'account.move.line'
 
-    def _invoice(self, cr, uid, ids, name, arg, context=None):
-        return super(account_move_line, self)._invoice(cr, uid, ids, name, arg, context)
+    def _invoice(self, cursor, user, ids, name, arg, context=None):
+        invoice_obj = self.pool.get('account.invoice')
+        res = {}
+        for line_id in ids:
+            res[line_id] = False
+        cursor.execute('SELECT l.id, i.id ' \
+                        'FROM account_move_line l, account_invoice i ' \
+                        'WHERE l.move_id = i.move_id ' \
+                        'AND l.id IN %s',
+                        (tuple(ids),))
+        invoice_ids = []
+        
+ 
+        for line_id, invoice_id in cursor.fetchall():
+            res[line_id] = invoice_id
+            invoice_ids.append(invoice_id)
+        invoice_names = {False: ''}
+        for invoice_id, name in invoice_obj.name_get(cursor, user, invoice_ids, context=context):
+            invoice_names[invoice_id] = name
+        for line_id in res.keys():
+            invoice_id = res[line_id]
+            res[line_id] = (invoice_id, invoice_names[invoice_id])
+        
+        for key in res.keys():
+            if res[key][0] == False:   
+            # if there is no a direct invoice related
+                move_line_obj = self.pool.get('account.move.line')
+                line1 = move_line_obj.browse(cursor, user, key)
+                move = self.pool.get('account.move').browse (cursor, user, line1.move_id.id)
+                
+                if move:
+                    for line_in in move.line_id:
+                        if line_in.id <> key and (line_in.reconcile_id or line_in.reconcile_partial_id):
+                            if line_in.reconcile_id:
+                                for line_in2 in line_in.reconcile_id.line_id:
+                                    if line_in2.id <> line_in.id:
+                                        dict = self._invoice (cursor, user, [line_in2.id], name, arg, context)
+                                        for item in dict.keys():
+                                            res[key] = dict[item] 
+                            else:
+                                if line_in.reconcile_partial_id:
+                                   for line_in2 in line_in.reconcile_partial_id.line_partial_ids:
+                                       if line_in2.id <> line_in.id:
+                                           dict = self._invoice (cursor, user, [line_in2.id], name, arg, context)
+                                           for item in dict.keys():
+                                               res[key] = dict[item] 
+                                    
+                                    
+        return res
+
+    #===========================================================================
+    # def _invoice(self, cr, uid, ids, name, arg, context=None):
+    #    return super(account_move_line, self)._invoice(cr, uid, ids, name, arg, context)
+    #===========================================================================
 
     def _invoice_search(self, cr, uid, obj, name, args, context={}):
         """ Redefinition for searching account move lines without any invoice related ('invoice.id','=',False)"""
@@ -160,7 +213,7 @@
             type='many2one', relation='account.invoice', fnct_search=_invoice_search),
         'received_check': fields.boolean('Received check', help="To write down that a check in paper support has been received, for example."),
         'partner_bank_id': fields.many2one('res.partner.bank','Bank Account'),
-        'amount_to_pay' : fields.function(amount_to_pay, method=True, type='float', string='Amount to pay', fnct_search=_to_pay_search),
+        'amount_to_pay' : fields.function(amount_to_pay, method=True, type='float', string='Amount to pay', fnct_search=_to_pay_search, store=True),
         'payment_type': fields.function(_payment_type_get, fnct_search=_payment_type_search, method=True, type="many2one", relation="payment.type", string="Payment type"),
     }
 
@@ -173,20 +226,92 @@
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context={}, toolbar=False, submenu=False):
         menus = [
             self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_payment_extension', 'menu_action_invoice_payments'),
-            self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_payment_extension', 'menu_action_done_payments'),
-        ]
+            #self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_payment_extension', 'menu_action_done_payments'),
+        ]
+        views = [
+            self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_payment_extension', 'view_payments_tree'),
+    
+        ]
+        
         menus = [m[1] for m in menus]
-        if 'active_id' in context and context['active_id'] in menus:
-            # Use standard views for account.move.line object
-            if view_type == 'search':
-                # Get a specific search view (bug in 6.0RC1, it does not give the search view defined in the action window)
-                view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_payment_extension', 'view_payments_filter')[1]
+        views = [v[1] for v in views]
+        #=======================================================================
+        # if 'active_id' in context and context['active_id'] in menus:
+        #    # Use standard views for account.move.line object
+        #    if view_type == 'search':
+        #        # Get a specific search view (bug in 6.0RC1, it does not give the search view defined in the action window)
+        #        view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_payment_extension', 'view_payments_filter')[1]
+        #    result = super(osv.osv, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
+        # else:
+        #    # Use special views for account.move.line object (for ex. tree view contains user defined fields)
+        #    result = super(account_move_line, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
+        #=======================================================================
+        if view_id in views:
             result = super(osv.osv, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
         else:
-            # Use special views for account.move.line object (for ex. tree view contains user defined fields)
             result = super(account_move_line, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
+            
         return result
-
+        
+    def pay_move_lines(self, cr, uid, ids, context=None):
+        
+        #obj_move = self.pool.get('account.move')
+        amount = 0
+        name = ''
+        ttype = ''
+        invoice_type = ''
+        partner_id = False
+        inv_id = False 
+        several_invoices = False
+        if context is None:
+            context = {}
+        data_line = self.browse(cr, uid,ids, context)
+        for line in data_line:
+            #move_ids.append(line.move_id.id)
+            if not inv_id:
+                inv_id = line.invoice.id
+            if inv_id and (line.invoice.id <> inv_id):
+                several_invoices = True
+            if partner_id and (line.partner_id.id <> partner_id):
+                raise osv.except_osv(_('Warning'), _('The pay entries have to be for the same partner!!!'))
+            else :
+                amount += line.amount_to_pay
+                partner_id = line.partner_id.id
+                name += line.name + '/' 
+        if several_invoices:
+            inv_id = False 
+        if amount > 0:
+            ttype = 'payment'
+            invoice_type = 'in_invoice'
+        else: 
+            amount = -amount
+            ttype = 'receipt'
+            invoice_type = 'out_invoice'
+            
+        print amount
+            
+        return {
+            'name':_("Pay Moves"),
+            'view_mode': 'form',
+            'view_id': False,
+            'view_type': 'form',
+            'res_model': 'account.voucher',
+            'type': 'ir.actions.act_window',
+            'nodestroy': True,
+            'target': 'current',
+            'domain': '[]',
+            'context': {
+                'default_partner_id': partner_id,
+                'default_amount': amount,
+                'default_name': name,
+                'close_after_process': True,
+                'invoice_type': invoice_type,
+                'invoice_id':inv_id,
+                'default_type': ttype ,
+                'type':  ttype ,
+                'move_line_ids': ids
+                }
+        }
 account_move_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account_payment_extension/i18n/account_payment_extension.pot'
--- account_payment_extension/i18n/account_payment_extension.pot	2011-01-03 20:25:26 +0000
+++ account_payment_extension/i18n/account_payment_extension.pot	2013-06-03 10:33:26 +0000
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2010-12-17 20:52:45+0000\n"
-"PO-Revision-Date: 2010-12-17 20:52:45+0000\n"
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-15 16:13+0000\n"
+"PO-Revision-Date: 2013-05-15 16:13+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,64 +16,19 @@
 "Plural-Forms: \n"
 
 #. module: account_payment_extension
-#: selection:payment.order,type:0
-msgid "Receivable"
-msgstr "Receivable"
-
-#. module: account_payment_extension
-#: model:ir.actions.act_window,name:account_payment_extension.action_payment_type
-#: model:ir.ui.menu,name:account_payment_extension.menu_action_payment_type
-#: view:payment.type:0
-#: help:payment.type,name:0
-msgid "Payment Type"
-msgstr "Payment Type"
-
-#. module: account_payment_extension
-#: selection:payment.order,create_account_moves:0
-msgid "Direct Payment"
-msgstr "Direct Payment"
-
-#. module: account_payment_extension
-#: code:addons/account_payment_extension/payment.py:0
-#, python-format
-msgid "Payment order should create account moves but line with amount %.2f for partner \"%s\" has no account assigned."
-msgstr "Payment order should create account moves but line with amount %.2f for partner \"%s\" has no account assigned."
-
-#. module: account_payment_extension
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Invalid model name in the action definition."
-
-#. module: account_payment_extension
-#: help:payment.type,code:0
-msgid "Specify the Code for Payment Type"
-msgstr "Specify the Code for Payment Type"
-
-#. module: account_payment_extension
-#: view:account.move.line:0
-msgid "Pay"
-msgstr "Pay"
-
-#. module: account_payment_extension
-#: code:addons/account_payment_extension/payment.py:0
-#, python-format
-msgid "You cannot delete payment order(s) which are already confirmed or done!"
-msgstr "You cannot delete payment order(s) which are already confirmed or done!"
-
-#. module: account_payment_extension
-#: model:ir.model,name:account_payment_extension.model_payment_order
-msgid "Payment Order"
-msgstr "Payment Order"
-
-#. module: account_payment_extension
-#: view:account.move.line:0
-msgid "Receive"
-msgstr "Receive"
-
-#. module: account_payment_extension
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalid XML for View Architecture!"
+#: view:payment.order.create:0
+msgid "Extra message of payment communication"
+msgstr "Extra message of payment communication"
+
+#. module: account_payment_extension
+#: field:payment.mode,require_received_check:0
+msgid "Require Received Check"
+msgstr "Require Received Check"
+
+#. module: account_payment_extension
+#: model:ir.actions.act_window,help:account_payment_extension.action_pay_account_move_line
+msgid "with this wizard ypu can change the state of the selected entries. "
+msgstr "with this wizard ypu can change the state of the selected entries. "
 
 #. module: account_payment_extension
 #: field:payment.mode,require_bank_account:0
@@ -81,71 +36,9 @@
 msgstr "Require Bank Account"
 
 #. module: account_payment_extension
-#: model:ir.actions.wizard,name:account_payment_extension.wizard_populate_statement_ext
-msgid "Populate Statement with Payment lines"
-msgstr "Populate Statement with Payment lines"
-
-#. module: account_payment_extension
-#: wizard_field:populate_statement_ext,init,lines:0
-msgid "Payment Lines"
-msgstr "Payment Lines"
-
-#. module: account_payment_extension
-#: model:ir.model,name:account_payment_extension.model_payment_line
-msgid "Payment Line"
-msgstr "Payment Line"
-
-#. module: account_payment_extension
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Error ! You can not create recursive Menu."
-
-#. module: account_payment_extension
-#: model:ir.model,name:account_payment_extension.model_payment_mode
-msgid "Payment Mode"
-msgstr "Payment Mode"
-
-#. module: account_payment_extension
-#: wizard_field:populate_payment_ext,search,communication2:0
-msgid "Communication 2"
-msgstr "Communication 2"
-
-#. module: account_payment_extension
-#: help:payment.type,note:0
-msgid "Description of the payment type that will be shown in the invoices"
-msgstr "Description of the payment type that will be shown in the invoices"
-
-#. module: account_payment_extension
-#: field:payment.order,type:0
-msgid "Type"
-msgstr "Type"
-
-#. module: account_payment_extension
 #: view:account.move.line:0
-msgid "Search Invoice Payments"
-msgstr "Search Invoice Payments"
-
-#. module: account_payment_extension
-#: view:payment.type:0
-msgid "Suitable Bank Types"
-msgstr "Suitable Bank Types"
-
-#. module: account_payment_extension
-#: wizard_button:populate_statement_ext,init,add:0
-msgid "_Add"
-msgstr "_Add"
-
-#. module: account_payment_extension
-#: code:addons/account_payment_extension/payment.py:0
-#, python-format
-msgid "Error !"
-msgstr "Error !"
-
-#. module: account_payment_extension
-#: view:payment.type:0
-#: field:payment.type,note:0
-msgid "Description"
-msgstr "Description"
+msgid "Group By..."
+msgstr "Group By..."
 
 #. module: account_payment_extension
 #: field:payment.type,company_id:0
@@ -153,78 +46,36 @@
 msgstr "Company"
 
 #. module: account_payment_extension
-#: code:addons/account_payment_extension/payment.py:0
+#: code:addons/account_payment_extension/payment.py:298
 #, python-format
 msgid "Account move line \"%s\" is not valid"
 msgstr "Account move line \"%s\" is not valid"
 
 #. module: account_payment_extension
-#: wizard_button:populate_payment_ext,init,end:0
-#: wizard_button:populate_payment_ext,search,end:0
-#: wizard_button:populate_statement_ext,init,end:0
-msgid "_Cancel"
-msgstr "_Cancel"
-
-#. module: account_payment_extension
-#: field:payment.order,payment_type_name:0
-msgid "Payment type name"
-msgstr "Payment type name"
-
-#. module: account_payment_extension
-#: model:ir.actions.act_window,name:account_payment_extension.action_rec_payment_order_tree
-#: model:ir.ui.menu,name:account_payment_extension.menu_action_rec_payment_order_form
-msgid "Rec. payment order"
-msgstr "Rec. payment order"
-
-#. module: account_payment_extension
+#: selection:payment.line,type:0
 #: selection:payment.order,type:0
 msgid "Payable"
 msgstr "Payable"
 
 #. module: account_payment_extension
-#: model:ir.actions.wizard,name:account_payment_extension.wizard_populate_payment_ext
-msgid "Populate payment to pay"
-msgstr "Populate payment to pay"
-
-#. module: account_payment_extension
 #: field:res.partner,payment_type_customer:0
 msgid "Customer Payment Type"
 msgstr "Customer Payment Type"
 
 #. module: account_payment_extension
-#: help:populate_payment_ext,init,amount:0
-msgid "Next step will automatically select payments up to this amount."
-msgstr "Next step will automatically select payments up to this amount."
-
-#. module: account_payment_extension
-#: wizard_field:populate_payment_ext,search,entries:0
+#: view:payment.order.create:0
 msgid "Entries"
 msgstr "Entries"
 
 #. module: account_payment_extension
-#: field:payment.type,active:0
-msgid "Active"
-msgstr "Active"
-
-#. module: account_payment_extension
-#: view:payment.order:0
-msgid "Select invoices to pay/receive payment"
-msgstr "Select invoices to pay/receive payment"
-
-#. module: account_payment_extension
-#: help:payment.line,payment_move_id:0
-msgid "Account move that pays this debt."
-msgstr "Account move that pays this debt."
-
-#. module: account_payment_extension
-#: help:populate_payment_ext,search,communication2:0
-msgid "The successor message of payment communication."
-msgstr "The successor message of payment communication."
+#: view:account.move.line.payment:0
+msgid "Pay Journal Entries"
+msgstr "Pay Journal Entries"
 
 #. module: account_payment_extension
 #: view:account.move.line:0
-msgid "Payment"
-msgstr "Payment"
+msgid "Total Credit"
+msgstr "Total Credit"
 
 #. module: account_payment_extension
 #: field:payment.order,create_account_moves:0
@@ -232,75 +83,33 @@
 msgstr "Create Account Moves"
 
 #. module: account_payment_extension
-#: field:payment.line,payment_move_id:0
-msgid "Payment Move"
-msgstr "Payment Move"
-
-#. module: account_payment_extension
 #: field:payment.line,account_id:0
 msgid "Account"
 msgstr "Account"
 
 #. module: account_payment_extension
-#: field:payment.type,suitable_bank_types:0
-msgid "Suitable bank types"
-msgstr "Suitable bank types"
-
-#. module: account_payment_extension
 #: help:payment.mode,require_bank_account:0
 msgid "Ensure all lines in the payment order have a bank account when proposing lines to be added in the payment order."
 msgstr "Ensure all lines in the payment order have a bank account when proposing lines to be added in the payment order."
 
 #. module: account_payment_extension
-#: field:payment.order,name:0
-#: field:payment.type,name:0
-msgid "Name"
-msgstr "Name"
-
-#. module: account_payment_extension
-#: wizard_field:populate_payment_ext,init,duedate:0
+#: view:account.move.line:0
 msgid "Due Date"
 msgstr "Due Date"
 
 #. module: account_payment_extension
-#: field:res.partner.bank,default_bank:0
-msgid "Default"
-msgstr "Default"
-
-#. module: account_payment_extension
-#: wizard_button:populate_payment_ext,init,search:0
-msgid "_Search"
-msgstr "_Search"
-
-#. module: account_payment_extension
-#: field:account.move.line,partner_bank_id:0
-msgid "Bank Account"
-msgstr "Bank Account"
-
-#. module: account_payment_extension
-#: wizard_button:populate_payment_ext,search,create:0
-msgid "_Add to payment order"
-msgstr "_Add to payment order"
-
-#. module: account_payment_extension
-#: code:addons/account_payment_extension/payment.py:0
-#, python-format
-msgid "Invalid action!"
-msgstr "Invalid action!"
-
-#. module: account_payment_extension
 #: view:account.move.line:0
-msgid "Unreconciled"
-msgstr "Unreconciled"
+msgid "Total Debit"
+msgstr "Total Debit"
 
 #. module: account_payment_extension
-#: code:addons/account_payment_extension/payment.py:0
+#: code:addons/account_payment_extension/payment.py:223
 #, python-format
 msgid "Error!"
 msgstr "Error!"
 
 #. module: account_payment_extension
-#: wizard_field:populate_payment_ext,init,amount:0
+#: field:payment.order.create,amount:0
 msgid "Amount"
 msgstr "Amount"
 
@@ -310,14 +119,64 @@
 msgstr "Select the Payment Type for the Payment Mode."
 
 #. module: account_payment_extension
-#: view:account.bank.statement:0
-msgid "Import payment lines"
-msgstr "Import payment lines"
-
-#. module: account_payment_extension
-#: view:account.move.line:0
-msgid "Payments"
-msgstr "Payments"
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "Wrong credit or debit value in accounting entry !"
+
+#. module: account_payment_extension
+#: view:account.move.line:0
+msgid "Payable payments"
+msgstr "Payable payments"
+
+#. module: account_payment_extension
+#: sql_constraint:payment.line:0
+msgid "The payment line name must be unique!"
+msgstr "The payment line name must be unique!"
+
+#. module: account_payment_extension
+#: constraint:account.move.line:0
+msgid "The date of your Journal Entry is not in the defined period! You should change the date or remove this constraint from the journal."
+msgstr "The date of your Journal Entry is not in the defined period! You should change the date or remove this constraint from the journal."
+
+#. module: account_payment_extension
+#: code:addons/account_payment_extension/account_move_line.py:276
+#, python-format
+msgid "Warning"
+msgstr "Warning"
+
+#. module: account_payment_extension
+#: help:account.move.line,received_check:0
+msgid "To write down that a check in paper support has been received, for example."
+msgstr "To write down that a check in paper support has been received, for example."
+
+#. module: account_payment_extension
+#: field:payment.order.create,show_refunds:0
+msgid "Show Refunds"
+msgstr "Show Refunds"
+
+#. module: account_payment_extension
+#: view:account.move.line:0
+#: model:ir.model,name:account_payment_extension.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: account_payment_extension
+#: field:payment.type,suitable_bank_types:0
+msgid "Suitable bank types"
+msgstr "Suitable bank types"
+
+#. module: account_payment_extension
+#: model:ir.actions.act_window,name:account_payment_extension.action_payment_type
+#: model:ir.ui.menu,name:account_payment_extension.menu_action_payment_type
+#: view:payment.type:0
+#: help:payment.type,name:0
+msgid "Payment Type"
+msgstr "Payment Type"
+
+#. module: account_payment_extension
+#: model:ir.model,name:account_payment_extension.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Bank Accounts"
 
 #. module: account_payment_extension
 #: field:res.partner,payment_type_supplier:0
@@ -325,15 +184,178 @@
 msgstr "Supplier Payment Type"
 
 #. module: account_payment_extension
+#: view:account.move.line:0
+msgid "State"
+msgstr "State"
+
+#. module: account_payment_extension
+#: model:ir.actions.act_window,name:account_payment_extension.action_rec_payment_order_tree
+#: model:ir.ui.menu,name:account_payment_extension.menu_action_rec_payment_order_form
+msgid "Rec. payment order"
+msgstr "Rec. payment order"
+
+#. module: account_payment_extension
+#: model:ir.model,name:account_payment_extension.model_payment_mode
+msgid "Payment Mode"
+msgstr "Payment Mode"
+
+#. module: account_payment_extension
+#: field:payment.line,type:0
+#: field:payment.order,type:0
+msgid "Type"
+msgstr "Type"
+
+#. module: account_payment_extension
+#: help:res.partner,payment_type_supplier:0
+msgid "Payment type of the supplier"
+msgstr "Payment type of the supplier"
+
+#. module: account_payment_extension
+#: code:addons/account_payment_extension/payment.py:298
+#, python-format
+msgid "Error !"
+msgstr "Error !"
+
+#. module: account_payment_extension
+#: model:ir.model,name:account_payment_extension.model_account_move_line_payment
+msgid "Pay Account Move Lines"
+msgstr "Pay Account Move Lines"
+
+#. module: account_payment_extension
+#: code:addons/account_payment_extension/account_move_line.py:276
+#, python-format
+msgid "The pay entries have to be for the same partner!!!"
+msgstr "The pay entries have to be for the same partner!!!"
+
+#. module: account_payment_extension
+#: help:payment.order.create,communication2:0
+msgid "The successor message of payment communication."
+msgstr "The successor message of payment communication."
+
+#. module: account_payment_extension
+#: field:payment.line,payment_move_id:0
+msgid "Payment Move"
+msgstr "Payment Move"
+
+#. module: account_payment_extension
+#: view:account.move.line:0
+msgid "Receive"
+msgstr "Receive"
+
+#. module: account_payment_extension
+#: view:account.move.line:0
+msgid "Unreconciled payments"
+msgstr "Unreconciled payments"
+
+#. module: account_payment_extension
 #: help:res.partner,payment_type_customer:0
 msgid "Payment type of the customer"
 msgstr "Payment type of the customer"
 
 #. module: account_payment_extension
-#: model:ir.actions.act_window,name:account_payment_extension.action_pay_payment_order_tree
-#: model:ir.ui.menu,name:account_payment_extension.menu_action_pay_payment_order_form
-msgid "Pay. payment order"
-msgstr "Pay. payment order"
+#: view:account.move.line.payment:0
+msgid "Change payment entries"
+msgstr "Change payment entries"
+
+#. module: account_payment_extension
+#: code:addons/account_payment_extension/account_move_line.py:294
+#, python-format
+msgid "Pay Moves"
+msgstr "Pay Moves"
+
+#. module: account_payment_extension
+#: constraint:account.move.line:0
+msgid "The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account or select a multi-currency view on the journal."
+msgstr "The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account or select a multi-currency view on the journal."
+
+#. module: account_payment_extension
+#: selection:payment.order,create_account_moves:0
+msgid "Direct Payment"
+msgstr "Direct Payment"
+
+#. module: account_payment_extension
+#: code:addons/account_payment_extension/payment.py:196
+#, python-format
+msgid "You cannot delete payment order(s) which are already confirmed or done!"
+msgstr "You cannot delete payment order(s) which are already confirmed or done!"
+
+#. module: account_payment_extension
+#: view:account.move.line:0
+msgid "Total Amount to Pay"
+msgstr "Total Amount to Pay"
+
+#. module: account_payment_extension
+#: view:account.move.line:0
+msgid "Unreconciled"
+msgstr "Unreconciled"
+
+#. module: account_payment_extension
+#: model:ir.model,name:account_payment_extension.model_payment_line
+msgid "Payment Line"
+msgstr "Payment Line"
+
+#. module: account_payment_extension
+#: view:account.move.line:0
+msgid "Search Invoice Payments"
+msgstr "Search Invoice Payments"
+
+#. module: account_payment_extension
+#: view:account.move.line.payment:0
+msgid "Puede cambiar el estado de los efectos comerciales mediante el siguiente asistente"
+msgstr "Puede cambiar el estado de los efectos comerciales mediante el siguiente asistente"
+
+#. module: account_payment_extension
+#: view:payment.order:0
+msgid "Select invoices to pay/receive payment"
+msgstr "Select invoices to pay/receive payment"
+
+#. module: account_payment_extension
+#: field:payment.type,active:0
+msgid "Active"
+msgstr "Active"
+
+#. module: account_payment_extension
+#: help:payment.line,payment_move_id:0
+msgid "Account move that pays this debt."
+msgstr "Account move that pays this debt."
+
+#. module: account_payment_extension
+#: constraint:res.partner.bank:0
+msgid "\n"
+"Please define BIC/Swift code on bank for bank type IBAN Account to make valid payments"
+msgstr "\n"
+"Please define BIC/Swift code on bank for bank type IBAN Account to make valid payments"
+
+#. module: account_payment_extension
+#: field:res.partner.bank,default_bank:0
+msgid "Default"
+msgstr "Default"
+
+#. module: account_payment_extension
+#: code:addons/account_payment_extension/payment.py:196
+#, python-format
+msgid "Invalid action!"
+msgstr "Invalid action!"
+
+#. module: account_payment_extension
+#: model:ir.model,name:account_payment_extension.model_account_move_line
+msgid "Journal Items"
+msgstr "Journal Items"
+
+#. module: account_payment_extension
+#: help:payment.type,code:0
+msgid "Specify the Code for Payment Type"
+msgstr "Specify the Code for Payment Type"
+
+#. module: account_payment_extension
+#: help:payment.mode,require_received_check:0
+msgid "Ensure all lines in the payment order have the Received Check flag set."
+msgstr "Ensure all lines in the payment order have the Received Check flag set."
+
+#. module: account_payment_extension
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr "You can not create journal items on an account of type view."
 
 #. module: account_payment_extension
 #: model:ir.actions.act_window,name:account_payment_extension.action_invoice_payments
@@ -342,18 +364,14 @@
 msgstr "Invoice payments"
 
 #. module: account_payment_extension
-#: model:ir.actions.act_window,name:account_payment_extension.action_done_payments
-#: model:ir.ui.menu,name:account_payment_extension.menu_action_done_payments
-msgid "Done payments"
-msgstr "Done payments"
+#: help:payment.mode,require_same_bank_account:0
+msgid "Ensure all lines in the payment order and the payment mode have the same account number."
+msgstr "Ensure all lines in the payment order and the payment mode have the same account number."
 
 #. module: account_payment_extension
-#: field:account.invoice,payment_type:0
-#: field:account.move.line,payment_type:0
-#: model:ir.model,name:account_payment_extension.model_payment_type
-#: field:payment.mode,type:0
-msgid "Payment type"
-msgstr "Payment type"
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "Invoice Number must be unique per Company!"
 
 #. module: account_payment_extension
 #: field:payment.type,code:0
@@ -361,16 +379,12 @@
 msgstr "Code"
 
 #. module: account_payment_extension
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Bank Details"
-
-#. module: account_payment_extension
-#: model:ir.model,name:account_payment_extension.model_res_partner_bank
-msgid "Bank Accounts"
-msgstr "Bank Accounts"
-
-#. module: account_payment_extension
+#: help:payment.type,note:0
+msgid "Description of the payment type that will be shown in the invoices"
+msgstr "Description of the payment type that will be shown in the invoices"
+
+#. module: account_payment_extension
+#: view:account.move.line:0
 #: field:payment.order,period_id:0
 msgid "Period"
 msgstr "Period"
@@ -381,24 +395,9 @@
 msgstr "Bank Statement"
 
 #. module: account_payment_extension
-#: help:res.partner,payment_type_supplier:0
-msgid "Payment type of the supplier"
-msgstr "Payment type of the supplier"
-
-#. module: account_payment_extension
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "The Object name must start with x_ and not contain any special character !"
-
-#. module: account_payment_extension
-#: model:ir.model,name:account_payment_extension.model_account_move_line
-msgid "Journal Items"
-msgstr "Journal Items"
-
-#. module: account_payment_extension
-#: help:account.move.line,received_check:0
-msgid "To write down that a check in paper support has been received, for example."
-msgstr "To write down that a check in paper support has been received, for example."
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr "You can not create journal items on closed account."
 
 #. module: account_payment_extension
 #: model:ir.model,name:account_payment_extension.model_account_invoice
@@ -406,29 +405,15 @@
 msgstr "Invoice"
 
 #. module: account_payment_extension
-#: view:account.move.line:0
-msgid "Narration"
-msgstr "Narration"
-
-#. module: account_payment_extension
-#: model:ir.model,name:account_payment_extension.model_res_partner
-msgid "Partner"
-msgstr "Partner"
-
-#. module: account_payment_extension
-#: field:account.move.line,received_check:0
-msgid "Received check"
-msgstr "Received check"
-
-#. module: account_payment_extension
-#: wizard_view:populate_payment_ext,init:0
-msgid "Search Payment lines"
-msgstr "Search Payment lines"
-
-#. module: account_payment_extension
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Size of the field can never be less than 1 !"
+#: view:account.move.line.payment:0
+#: view:payment.order:0
+msgid "Cancel"
+msgstr "Cancel"
+
+#. module: account_payment_extension
+#: view:payment.type:0
+msgid "Suitable Bank Types"
+msgstr "Suitable Bank Types"
 
 #. module: account_payment_extension
 #: help:payment.order,create_account_moves:0
@@ -436,31 +421,134 @@
 msgstr "Indicates when account moves should be created for order payment lines. \"Bank Statement\" will wait until user introduces those payments in bank a bank statement. \"Direct Payment\" will mark all payment lines as payied once the order is done."
 
 #. module: account_payment_extension
-#: model:ir.module.module,description:account_payment_extension.module_meta_information
-msgid "Account payment extension.\n"
-"\n"
-"This module extends the account_payment module with a lot of features:\n"
-"    * Extension of payment types: The payment type has a translated name and note that can be shown in the invoices.\n"
-"    * Two default payment types for partners (client and supplier).\n"
-"    * Automatic selection of payment type in invoices. Now an invoice can have a payment term (30 days, 30/60 days, ...) and a payment type (cash, bank transfer, ...).\n"
-"    * A default check field in partner bank accounts. The default partner bank accounts are selected in invoices and payments.\n"
-"    * New menu/tree/forms to see payments to receive and payments to pay.\n"
-"    * The payments show tree editable fields: Due date, bank account and a check field (for example to write down if a bank check in paper support has been received).\n"
-"    * Two types of payment orders: Payable payment orders (from supplier invoices) and receivable payment orders (from client invoices). So we can make payment orders to receive the payments of our client invoices. Each payment order type has its own sequence.\n"
-"    * The payment orders allow negative payment amounts. So we can have payment orders for supplier invoices (pay money) and refund supplier invoices (return or receive money). Or for client invoices (receive money) and refund client invoices (return or pay money).\n"
-"    * Payment orders: Selected invoices are filtered by payment type, the second message communication can be set at the same time for several invoices.\n"
-"Based on previous work of Pablo Rocandio & Zikzakmedia (version for 4.2).\n"
-""
-msgstr ""
-
-#. module: account_payment_extension
-#: wizard_field:populate_payment_ext,init,show_refunds:0
-msgid "Show Refunds"
-msgstr "Show Refunds"
-
-#. module: account_payment_extension
-#: help:populate_payment_ext,init,show_refunds:0
+#: selection:payment.line,type:0
+#: selection:payment.order,type:0
+msgid "Receivable"
+msgstr "Receivable"
+
+#. module: account_payment_extension
+#: code:addons/account_payment_extension/payment.py:223
+#, python-format
+msgid "Payment order should create account moves but line with amount %.2f for partner \"%s\" has no account assigned."
+msgstr "Payment order should create account moves but line with amount %.2f for partner \"%s\" has no account assigned."
+
+#. module: account_payment_extension
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr "Company must be the same for its related account and period."
+
+#. module: account_payment_extension
+#: view:account.move.line:0
+msgid "Pay"
+msgstr "Pay"
+
+#. module: account_payment_extension
+#: model:ir.model,name:account_payment_extension.model_payment_order
+msgid "Payment Order"
+msgstr "Payment Order"
+
+#. module: account_payment_extension
+#: field:payment.order.create,communication2:0
+msgid "Communication 2"
+msgstr "Communication 2"
+
+#. module: account_payment_extension
+#: view:payment.type:0
+#: field:payment.type,note:0
+msgid "Description"
+msgstr "Description"
+
+#. module: account_payment_extension
+#: view:account.move.line:0
+msgid "Journal"
+msgstr "Journal"
+
+#. module: account_payment_extension
+#: field:payment.order,payment_type_name:0
+msgid "Payment type name"
+msgstr "Payment type name"
+
+#. module: account_payment_extension
+#: view:account.move.line:0
+msgid "Payment"
+msgstr "Payment"
+
+#. module: account_payment_extension
+#: field:payment.order,name:0
+#: field:payment.type,name:0
+msgid "Name"
+msgstr "Name"
+
+#. module: account_payment_extension
+#: field:account.move.line,partner_bank_id:0
+msgid "Bank Account"
+msgstr "Bank Account"
+
+#. module: account_payment_extension
+#: model:ir.actions.act_window,name:account_payment_extension.action_pay_account_move_line
+msgid "Change payment"
+msgstr "Change payment"
+
+#. module: account_payment_extension
+#: view:account.move.line:0
+msgid "Effective date"
+msgstr "Effective date"
+
+#. module: account_payment_extension
+#: model:ir.actions.act_window,name:account_payment_extension.action_create_payment_extension_order
+msgid "Seleccionar facturas a Pagar/Cobrar"
+msgstr "Seleccionar facturas a Pagar/Cobrar"
+
+#. module: account_payment_extension
+#: view:account.move.line:0
+msgid "Payments"
+msgstr "Payments"
+
+#. module: account_payment_extension
+#: model:ir.model,name:account_payment_extension.model_payment_order_create
+msgid "payment.order.create"
+msgstr "payment.order.create"
+
+#. module: account_payment_extension
+#: field:payment.mode,require_same_bank_account:0
+msgid "Require the Same Bank Account"
+msgstr "Require the Same Bank Account"
+
+#. module: account_payment_extension
+#: view:account.move.line.payment:0
+msgid "Approve"
+msgstr "Approve"
+
+#. module: account_payment_extension
+#: view:account.move.line:0
+msgid "Receivable payments"
+msgstr "Receivable payments"
+
+#. module: account_payment_extension
+#: field:account.invoice,payment_type:0
+#: field:account.move.line,payment_type:0
+#: model:ir.model,name:account_payment_extension.model_payment_type
+#: field:payment.mode,type:0
+msgid "Payment type"
+msgstr "Payment type"
+
+#. module: account_payment_extension
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Bank Details"
+
+#. module: account_payment_extension
+#: help:payment.order.create,amount:0
+msgid "Next step will automatically select payments up to this amount as long as account moves have bank account if that is required by the selected payment mode."
+msgstr "Next step will automatically select payments up to this amount as long as account moves have bank account if that is required by the selected payment mode."
+
+#. module: account_payment_extension
+#: help:payment.order.create,show_refunds:0
 msgid "Indicates if search should include refunds."
 msgstr "Indicates if search should include refunds."
 
+#. module: account_payment_extension
+#: field:account.move.line,received_check:0
+msgid "Received check"
+msgstr "Received check"
 

=== modified file 'account_payment_extension/i18n/es.po'
--- account_payment_extension/i18n/es.po	2013-05-15 05:52:59 +0000
+++ account_payment_extension/i18n/es.po	2013-06-03 10:33:26 +0000
@@ -1,88 +1,34 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# 	* account_payment_extension
+#	* account_payment_extension
 #
-# Albert Cervera i Areny <[e-mail]>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.10\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2010-12-17 20:52+0000\n"
-"PO-Revision-Date: 2012-11-22 18:31+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<[e-mail]>\n"
-"Language-Team: Catalan <[e-mail]>\n"
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-15 16:00+0000\n"
+"PO-Revision-Date: 2013-05-15 16:00+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-15 05:52+0000\n"
-"X-Generator: Launchpad (build 16617)\n"
-"Language: ca\n"
-
-#. module: account_payment_extension
-#: selection:payment.order,type:0
-msgid "Receivable"
-msgstr "A cobrar"
-
-#. module: account_payment_extension
-#: model:ir.actions.act_window,name:account_payment_extension.action_payment_type
-#: model:ir.ui.menu,name:account_payment_extension.menu_action_payment_type
-#: view:payment.type:0
-#: help:payment.type,name:0
-msgid "Payment Type"
-msgstr "Tipo de pago"
-
-#. module: account_payment_extension
-#: selection:payment.order,create_account_moves:0
-msgid "Direct Payment"
-msgstr "Por pago directo"
-
-#. module: account_payment_extension
-#: code:addons/account_payment_extension/payment.py:0
-#, python-format
-msgid ""
-"Payment order should create account moves but line with amount %.2f for "
-"partner \"%s\" has no account assigned."
-msgstr ""
-"La orden de pago debe generar los asientos pero la línea con importe %.2f y "
-"empresa \"%s\" no tiene cuenta asignada."
-
-#. module: account_payment_extension
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de la acción."
-
-#. module: account_payment_extension
-#: help:payment.type,code:0
-msgid "Specify the Code for Payment Type"
-msgstr "Indica el código del tipo de pago."
-
-#. module: account_payment_extension
-#: view:account.move.line:0
-msgid "Pay"
-msgstr "Efectos a pagar"
-
-#. module: account_payment_extension
-#: code:addons/account_payment_extension/payment.py:0
-#, python-format
-msgid ""
-"You cannot delete payment order(s) which are already confirmed or done!"
-msgstr "¡No puede borrar ordenes de pago ya confirmadas o realizadas!"
-
-#. module: account_payment_extension
-#: model:ir.model,name:account_payment_extension.model_payment_order
-msgid "Payment Order"
-msgstr "Orden de pago"
-
-#. module: account_payment_extension
-#: view:account.move.line:0
-msgid "Receive"
-msgstr "A cobrar"
-
-#. module: account_payment_extension
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_payment_extension
+#: view:payment.order.create:0
+msgid "Extra message of payment communication"
+msgstr "Mensaje extra de la comunicación de pagos"
+
+#. module: account_payment_extension
+#: field:payment.mode,require_received_check:0
+msgid "Require Received Check"
+msgstr "Requerir cheque recibido"
+
+#. module: account_payment_extension
+#: model:ir.actions.act_window,help:account_payment_extension.action_pay_account_move_line
+msgid "with this wizard ypu can change the state of the selected entries. "
+msgstr "Con este asistente puede cambiar el estado de los elementos seleccionados. "
 
 #. module: account_payment_extension
 #: field:payment.mode,require_bank_account:0
@@ -90,71 +36,9 @@
 msgstr "Requerir cuenta bancaria"
 
 #. module: account_payment_extension
-#: model:ir.actions.wizard,name:account_payment_extension.wizard_populate_statement_ext
-msgid "Populate Statement with Payment lines"
-msgstr "Rellenar extracto con líneas de pago"
-
-#. module: account_payment_extension
-#: wizard_field:populate_statement_ext,init,lines:0
-msgid "Payment Lines"
-msgstr "Pagos"
-
-#. module: account_payment_extension
-#: model:ir.model,name:account_payment_extension.model_payment_line
-msgid "Payment Line"
-msgstr "Línea de pago"
-
-#. module: account_payment_extension
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "¡Error! No puede crear menús recursivos."
-
-#. module: account_payment_extension
-#: model:ir.model,name:account_payment_extension.model_payment_mode
-msgid "Payment Mode"
-msgstr "Modo de pago"
-
-#. module: account_payment_extension
-#: wizard_field:populate_payment_ext,search,communication2:0
-msgid "Communication 2"
-msgstr "Comunicación 2"
-
-#. module: account_payment_extension
-#: help:payment.type,note:0
-msgid "Description of the payment type that will be shown in the invoices"
-msgstr "Descripción del tipo de pago que se mostrará en las facturas."
-
-#. module: account_payment_extension
-#: field:payment.order,type:0
-msgid "Type"
-msgstr "Tipo"
-
-#. module: account_payment_extension
 #: view:account.move.line:0
-msgid "Search Invoice Payments"
-msgstr "Buscar pagos de facturas"
-
-#. module: account_payment_extension
-#: view:payment.type:0
-msgid "Suitable Bank Types"
-msgstr "Tipos de banco adecuados"
-
-#. module: account_payment_extension
-#: wizard_button:populate_statement_ext,init,add:0
-msgid "_Add"
-msgstr "_Añadir"
-
-#. module: account_payment_extension
-#: code:addons/account_payment_extension/payment.py:0
-#, python-format
-msgid "Error !"
-msgstr "¡ Error !"
-
-#. module: account_payment_extension
-#: view:payment.type:0
-#: field:payment.type,note:0
-msgid "Description"
-msgstr "Descripción"
+msgid "Group By..."
+msgstr "Agrupar por..."
 
 #. module: account_payment_extension
 #: field:payment.type,company_id:0
@@ -162,80 +46,36 @@
 msgstr "Compañía"
 
 #. module: account_payment_extension
-#: code:addons/account_payment_extension/payment.py:0
+#: code:addons/account_payment_extension/payment.py:298
 #, python-format
 msgid "Account move line \"%s\" is not valid"
 msgstr "El apunte \"%s\" no es válido."
 
 #. module: account_payment_extension
-#: wizard_button:populate_payment_ext,init,end:0
-#: wizard_button:populate_payment_ext,search,end:0
-#: wizard_button:populate_statement_ext,init,end:0
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#. module: account_payment_extension
-#: field:payment.order,payment_type_name:0
-msgid "Payment type name"
-msgstr "Nombre tipo de pago"
-
-#. module: account_payment_extension
-#: model:ir.actions.act_window,name:account_payment_extension.action_rec_payment_order_tree
-#: model:ir.ui.menu,name:account_payment_extension.menu_action_rec_payment_order_form
-msgid "Rec. payment order"
-msgstr "Órdenes de cobro"
-
-#. module: account_payment_extension
+#: selection:payment.line,type:0
 #: selection:payment.order,type:0
 msgid "Payable"
 msgstr "A pagar"
 
 #. module: account_payment_extension
-#: model:ir.actions.wizard,name:account_payment_extension.wizard_populate_payment_ext
-msgid "Populate payment to pay"
-msgstr "Buscar pagos a pagar/cobrar"
-
-#. module: account_payment_extension
 #: field:res.partner,payment_type_customer:0
 msgid "Customer Payment Type"
 msgstr "Tipo de pago cliente"
 
 #. module: account_payment_extension
-#: help:populate_payment_ext,init,amount:0
-msgid "Next step will automatically select payments up to this amount."
-msgstr ""
-"El siguiente paso seleccionará automáticamente pagos hasta llegar a este "
-"importe."
-
-#. module: account_payment_extension
-#: wizard_field:populate_payment_ext,search,entries:0
+#: view:payment.order.create:0
 msgid "Entries"
-msgstr "Entradas"
-
-#. module: account_payment_extension
-#: field:payment.type,active:0
-msgid "Active"
-msgstr "Activo"
-
-#. module: account_payment_extension
-#: view:payment.order:0
-msgid "Select invoices to pay/receive payment"
-msgstr "Seleccionar facturas a pagar/cobrar"
-
-#. module: account_payment_extension
-#: help:payment.line,payment_move_id:0
-msgid "Account move that pays this debt."
-msgstr "Asiento que paga la deuda."
-
-#. module: account_payment_extension
-#: help:populate_payment_ext,search,communication2:0
-msgid "The successor message of payment communication."
-msgstr "El siguiente mensaje del comunicado del pago/cobro."
+msgstr "Asientos"
+
+#. module: account_payment_extension
+#: view:account.move.line.payment:0
+msgid "Pay Journal Entries"
+msgstr "Pagar/Cobrar efectos"
 
 #. module: account_payment_extension
 #: view:account.move.line:0
-msgid "Payment"
-msgstr "Pago"
+msgid "Total Credit"
+msgstr "Total haber"
 
 #. module: account_payment_extension
 #: field:payment.order,create_account_moves:0
@@ -243,79 +83,33 @@
 msgstr "Crear asientos contables"
 
 #. module: account_payment_extension
-#: field:payment.line,payment_move_id:0
-msgid "Payment Move"
-msgstr "Asiento del pago"
-
-#. module: account_payment_extension
 #: field:payment.line,account_id:0
 msgid "Account"
 msgstr "Cuenta"
 
 #. module: account_payment_extension
-#: field:payment.type,suitable_bank_types:0
-msgid "Suitable bank types"
-msgstr "Tipos de banco adecuados"
-
-#. module: account_payment_extension
 #: help:payment.mode,require_bank_account:0
-msgid ""
-"Ensure all lines in the payment order have a bank account when proposing "
-"lines to be added in the payment order."
-msgstr ""
-"Asegura que todas las línease propuestas para incluir en la orden tienen "
-"cuenta bancaria."
-
-#. module: account_payment_extension
-#: field:payment.order,name:0
-#: field:payment.type,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: account_payment_extension
-#: wizard_field:populate_payment_ext,init,duedate:0
+msgid "Ensure all lines in the payment order have a bank account when proposing lines to be added in the payment order."
+msgstr "Asegura que todas las líneas propuestas para incluir en la orden tienen cuenta bancaria."
+
+#. module: account_payment_extension
+#: view:account.move.line:0
 msgid "Due Date"
 msgstr "Fecha vencimiento"
 
 #. module: account_payment_extension
-#: field:res.partner.bank,default_bank:0
-msgid "Default"
-msgstr "Por defecto"
-
-#. module: account_payment_extension
-#: wizard_button:populate_payment_ext,init,search:0
-msgid "_Search"
-msgstr "_Buscar"
-
-#. module: account_payment_extension
-#: field:account.move.line,partner_bank_id:0
-msgid "Bank Account"
-msgstr "Cuenta bancaria"
-
-#. module: account_payment_extension
-#: wizard_button:populate_payment_ext,search,create:0
-msgid "_Add to payment order"
-msgstr "_Añadir a la orden de pago"
-
-#. module: account_payment_extension
-#: code:addons/account_payment_extension/payment.py:0
-#, python-format
-msgid "Invalid action!"
-msgstr "Acción no válida!"
-
-#. module: account_payment_extension
 #: view:account.move.line:0
-msgid "Unreconciled"
-msgstr "No conciliado"
+msgid "Total Debit"
+msgstr "Total debe"
 
 #. module: account_payment_extension
-#: code:addons/account_payment_extension/payment.py:0
+#: code:addons/account_payment_extension/payment.py:223
 #, python-format
 msgid "Error!"
 msgstr "¡Error!"
 
 #. module: account_payment_extension
-#: wizard_field:populate_payment_ext,init,amount:0
+#: field:payment.order.create,amount:0
 msgid "Amount"
 msgstr "Importe"
 
@@ -325,14 +119,64 @@
 msgstr "Seleccione el tipo de pago para el modo de pago."
 
 #. module: account_payment_extension
-#: view:account.bank.statement:0
-msgid "Import payment lines"
-msgstr "Importar líneas de pago"
-
-#. module: account_payment_extension
-#: view:account.move.line:0
-msgid "Payments"
-msgstr "Efectos"
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "¡Valor haber o debe erróneo en el asiento contable!"
+
+#. module: account_payment_extension
+#: view:account.move.line:0
+msgid "Payable payments"
+msgstr "Efectos a pagar"
+
+#. module: account_payment_extension
+#: sql_constraint:payment.line:0
+msgid "The payment line name must be unique!"
+msgstr "¡El nombre de la línea de pago debe ser única!"
+
+#. module: account_payment_extension
+#: constraint:account.move.line:0
+msgid "The date of your Journal Entry is not in the defined period! You should change the date or remove this constraint from the journal."
+msgstr "¡La fecha de su asiento no está en el periodo definido! Debería cambiar la fecha o borrar esta restricción del diario."
+
+#. module: account_payment_extension
+#: code:addons/account_payment_extension/account_move_line.py:276
+#, python-format
+msgid "Warning"
+msgstr "Aviso"
+
+#. module: account_payment_extension
+#: help:account.move.line,received_check:0
+msgid "To write down that a check in paper support has been received, for example."
+msgstr "Sirve para indicar que se ha recibido un cheque en soporte papel, por ejemplo."
+
+#. module: account_payment_extension
+#: field:payment.order.create,show_refunds:0
+msgid "Show Refunds"
+msgstr "Mostrar reembolsos"
+
+#. module: account_payment_extension
+#: view:account.move.line:0
+#: model:ir.model,name:account_payment_extension.model_res_partner
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: account_payment_extension
+#: field:payment.type,suitable_bank_types:0
+msgid "Suitable bank types"
+msgstr "Tipos de banco adecuados"
+
+#. module: account_payment_extension
+#: model:ir.actions.act_window,name:account_payment_extension.action_payment_type
+#: model:ir.ui.menu,name:account_payment_extension.menu_action_payment_type
+#: view:payment.type:0
+#: help:payment.type,name:0
+msgid "Payment Type"
+msgstr "Tipo de pago"
+
+#. module: account_payment_extension
+#: model:ir.model,name:account_payment_extension.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Cuentas bancarias"
 
 #. module: account_payment_extension
 #: field:res.partner,payment_type_supplier:0
@@ -340,15 +184,178 @@
 msgstr "Tipo de pago proveedor"
 
 #. module: account_payment_extension
+#: view:account.move.line:0
+msgid "State"
+msgstr "Estado"
+
+#. module: account_payment_extension
+#: model:ir.actions.act_window,name:account_payment_extension.action_rec_payment_order_tree
+#: model:ir.ui.menu,name:account_payment_extension.menu_action_rec_payment_order_form
+msgid "Rec. payment order"
+msgstr "Órdenes de cobro"
+
+#. module: account_payment_extension
+#: model:ir.model,name:account_payment_extension.model_payment_mode
+msgid "Payment Mode"
+msgstr "Modo de pago"
+
+#. module: account_payment_extension
+#: field:payment.line,type:0
+#: field:payment.order,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: account_payment_extension
+#: help:res.partner,payment_type_supplier:0
+msgid "Payment type of the supplier"
+msgstr "Tipo de pago como proveedor."
+
+#. module: account_payment_extension
+#: code:addons/account_payment_extension/payment.py:298
+#, python-format
+msgid "Error !"
+msgstr "¡ Error !"
+
+#. module: account_payment_extension
+#: model:ir.model,name:account_payment_extension.model_account_move_line_payment
+msgid "Pay Account Move Lines"
+msgstr "Pagar/cobrar apuntes"
+
+#. module: account_payment_extension
+#: code:addons/account_payment_extension/account_move_line.py:276
+#, python-format
+msgid "The pay entries have to be for the same partner!!!"
+msgstr "¡Los efectos tienen que ser de la misma empresa!"
+
+#. module: account_payment_extension
+#: help:payment.order.create,communication2:0
+msgid "The successor message of payment communication."
+msgstr "Mensaje del sucesor de la comunicación del pago."
+
+#. module: account_payment_extension
+#: field:payment.line,payment_move_id:0
+msgid "Payment Move"
+msgstr "Asiento del pago"
+
+#. module: account_payment_extension
+#: view:account.move.line:0
+msgid "Receive"
+msgstr "A cobrar"
+
+#. module: account_payment_extension
+#: view:account.move.line:0
+msgid "Unreconciled payments"
+msgstr "Pagos no conciliados"
+
+#. module: account_payment_extension
 #: help:res.partner,payment_type_customer:0
 msgid "Payment type of the customer"
 msgstr "Tipo de pago como cliente."
 
 #. module: account_payment_extension
-#: model:ir.actions.act_window,name:account_payment_extension.action_pay_payment_order_tree
-#: model:ir.ui.menu,name:account_payment_extension.menu_action_pay_payment_order_form
-msgid "Pay. payment order"
-msgstr "Órdenes de pago"
+#: view:account.move.line.payment:0
+msgid "Change payment entries"
+msgstr "Cambiar efectos"
+
+#. module: account_payment_extension
+#: code:addons/account_payment_extension/account_move_line.py:294
+#, python-format
+msgid "Pay Moves"
+msgstr "Movimientos de pago/cobro"
+
+#. module: account_payment_extension
+#: constraint:account.move.line:0
+msgid "The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account or select a multi-currency view on the journal."
+msgstr "La cuenta selecionada de su diario obliga a tener una moneda secundaria. Debería eliminar la moneda secundaria de la cuenta o asignar una vista de multi-moneda al diario."
+
+#. module: account_payment_extension
+#: selection:payment.order,create_account_moves:0
+msgid "Direct Payment"
+msgstr "Por pago directo"
+
+#. module: account_payment_extension
+#: code:addons/account_payment_extension/payment.py:196
+#, python-format
+msgid "You cannot delete payment order(s) which are already confirmed or done!"
+msgstr "¡No puede borrar órdenes de pago ya confirmadas o realizadas!"
+
+#. module: account_payment_extension
+#: view:account.move.line:0
+msgid "Total Amount to Pay"
+msgstr "Cantidad total a pagar/cobrar"
+
+#. module: account_payment_extension
+#: view:account.move.line:0
+msgid "Unreconciled"
+msgstr "No conciliado"
+
+#. module: account_payment_extension
+#: model:ir.model,name:account_payment_extension.model_payment_line
+msgid "Payment Line"
+msgstr "Línea de pago"
+
+#. module: account_payment_extension
+#: view:account.move.line:0
+msgid "Search Invoice Payments"
+msgstr "Buscar pagos de facturas"
+
+#. module: account_payment_extension
+#: view:account.move.line.payment:0
+msgid "Puede cambiar el estado de los efectos comerciales mediante el siguiente asistente"
+msgstr "Puede cambiar el estado de los efectos comerciales mediante el siguiente asistente"
+
+#. module: account_payment_extension
+#: view:payment.order:0
+msgid "Select invoices to pay/receive payment"
+msgstr "Seleccionar facturas a pagar/cobrar"
+
+#. module: account_payment_extension
+#: field:payment.type,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: account_payment_extension
+#: help:payment.line,payment_move_id:0
+msgid "Account move that pays this debt."
+msgstr "Asiento que paga la deuda."
+
+#. module: account_payment_extension
+#: constraint:res.partner.bank:0
+msgid "\n"
+"Please define BIC/Swift code on bank for bank type IBAN Account to make valid payments"
+msgstr "\n"
+"Por favor especifique el código BIC/Swift en el banco para el tipo de cuenta IBAN para realizar pagos válidos"
+
+#. module: account_payment_extension
+#: field:res.partner.bank,default_bank:0
+msgid "Default"
+msgstr "Por defecto"
+
+#. module: account_payment_extension
+#: code:addons/account_payment_extension/payment.py:196
+#, python-format
+msgid "Invalid action!"
+msgstr "¡Acción no válida!"
+
+#. module: account_payment_extension
+#: model:ir.model,name:account_payment_extension.model_account_move_line
+msgid "Journal Items"
+msgstr "Apuntes contables"
+
+#. module: account_payment_extension
+#: help:payment.type,code:0
+msgid "Specify the Code for Payment Type"
+msgstr "Indica el código del tipo de pago."
+
+#. module: account_payment_extension
+#: help:payment.mode,require_received_check:0
+msgid "Ensure all lines in the payment order have the Received Check flag set."
+msgstr "Asegúrese de que todos los elementos de la orden de cobro tienen marcado el campo cheque recibido."
+
+#. module: account_payment_extension
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr "No puede crear asientos en una cuenta de tipo vista"
 
 #. module: account_payment_extension
 #: model:ir.actions.act_window,name:account_payment_extension.action_invoice_payments
@@ -357,18 +364,14 @@
 msgstr "Efectos"
 
 #. module: account_payment_extension
-#: model:ir.actions.act_window,name:account_payment_extension.action_done_payments
-#: model:ir.ui.menu,name:account_payment_extension.menu_action_done_payments
-msgid "Done payments"
-msgstr "Pagos/cobros realizados"
+#: help:payment.mode,require_same_bank_account:0
+msgid "Ensure all lines in the payment order and the payment mode have the same account number."
+msgstr "Asegúrese de que todas las líneas de la orden de cobro tienen el mismo número de cuenta."
 
 #. module: account_payment_extension
-#: field:account.invoice,payment_type:0
-#: field:account.move.line,payment_type:0
-#: model:ir.model,name:account_payment_extension.model_payment_type
-#: field:payment.mode,type:0
-msgid "Payment type"
-msgstr "Tipo de pago"
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "¡El número de factura debe ser único por compañía!"
 
 #. module: account_payment_extension
 #: field:payment.type,code:0
@@ -376,16 +379,12 @@
 msgstr "Código"
 
 #. module: account_payment_extension
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Detalles del banco"
-
-#. module: account_payment_extension
-#: model:ir.model,name:account_payment_extension.model_res_partner_bank
-msgid "Bank Accounts"
-msgstr "Cuentas bancarias"
-
-#. module: account_payment_extension
+#: help:payment.type,note:0
+msgid "Description of the payment type that will be shown in the invoices"
+msgstr "Descripción del tipo de pago que se mostrará en las facturas."
+
+#. module: account_payment_extension
+#: view:account.move.line:0
 #: field:payment.order,period_id:0
 msgid "Period"
 msgstr "Período"
@@ -396,30 +395,9 @@
 msgstr "Por extracto bancario"
 
 #. module: account_payment_extension
-#: help:res.partner,payment_type_supplier:0
-msgid "Payment type of the supplier"
-msgstr "Tipo de pago como proveedor."
-
-#. module: account_payment_extension
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
-#. module: account_payment_extension
-#: model:ir.model,name:account_payment_extension.model_account_move_line
-msgid "Journal Items"
-msgstr "Apuntes"
-
-#. module: account_payment_extension
-#: help:account.move.line,received_check:0
-msgid ""
-"To write down that a check in paper support has been received, for example."
-msgstr ""
-"Sirve para indicar que se ha recibido un cheque en soporte papel, por "
-"ejemplo."
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr "No puede crear asientos en cuentas cerradas"
 
 #. module: account_payment_extension
 #: model:ir.model,name:account_payment_extension.model_account_invoice
@@ -427,114 +405,150 @@
 msgstr "Factura"
 
 #. module: account_payment_extension
+#: view:account.move.line.payment:0
+#: view:payment.order:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: account_payment_extension
+#: view:payment.type:0
+msgid "Suitable Bank Types"
+msgstr "Tipos de banco adecuados"
+
+#. module: account_payment_extension
+#: help:payment.order,create_account_moves:0
+msgid "Indicates when account moves should be created for order payment lines. \"Bank Statement\" will wait until user introduces those payments in bank a bank statement. \"Direct Payment\" will mark all payment lines as payied once the order is done."
+msgstr "Indica cuándo se deben generar los asientos contables para las líneas de la orden de pago. \"Por extracto bancario\" esperará a que el usuario introduzca los pagos en el extracto bancario. \"Por pago directo\" marcará todas las líneas como pagadas cuando se realice la orden."
+
+#. module: account_payment_extension
+#: selection:payment.line,type:0
+#: selection:payment.order,type:0
+msgid "Receivable"
+msgstr "A cobrar"
+
+#. module: account_payment_extension
+#: code:addons/account_payment_extension/payment.py:223
+#, python-format
+msgid "Payment order should create account moves but line with amount %.2f for partner \"%s\" has no account assigned."
+msgstr "La orden de pago debe generar los asientos pero la línea con importe %.2f y empresa \"%s\" no tiene cuenta asignada."
+
+#. module: account_payment_extension
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr "La compañía debe ser la misma para su cuenta y periodos relacionados"
+
+#. module: account_payment_extension
 #: view:account.move.line:0
-msgid "Narration"
+msgid "Pay"
+msgstr "Efectos a pagar"
+
+#. module: account_payment_extension
+#: model:ir.model,name:account_payment_extension.model_payment_order
+msgid "Payment Order"
+msgstr "Orden de pago"
+
+#. module: account_payment_extension
+#: field:payment.order.create,communication2:0
+msgid "Communication 2"
+msgstr "Comunicación 2"
+
+#. module: account_payment_extension
+#: view:payment.type:0
+#: field:payment.type,note:0
+msgid "Description"
 msgstr "Descripción"
 
 #. module: account_payment_extension
-#: model:ir.model,name:account_payment_extension.model_res_partner
-msgid "Partner"
-msgstr "Empresa"
+#: view:account.move.line:0
+msgid "Journal"
+msgstr "Diario"
+
+#. module: account_payment_extension
+#: field:payment.order,payment_type_name:0
+msgid "Payment type name"
+msgstr "Nombre tipo de pago"
+
+#. module: account_payment_extension
+#: view:account.move.line:0
+msgid "Payment"
+msgstr "Pago"
+
+#. module: account_payment_extension
+#: field:payment.order,name:0
+#: field:payment.type,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: account_payment_extension
+#: field:account.move.line,partner_bank_id:0
+msgid "Bank Account"
+msgstr "Cuenta bancaria"
+
+#. module: account_payment_extension
+#: model:ir.actions.act_window,name:account_payment_extension.action_pay_account_move_line
+msgid "Change payment"
+msgstr "Modificar efectos"
+
+#. module: account_payment_extension
+#: view:account.move.line:0
+msgid "Effective date"
+msgstr "Fecha de efecto"
+
+#. module: account_payment_extension
+#: model:ir.actions.act_window,name:account_payment_extension.action_create_payment_extension_order
+msgid "Seleccionar facturas a Pagar/Cobrar"
+msgstr "Seleccionar facturas a pagar/cobrar"
+
+#. module: account_payment_extension
+#: view:account.move.line:0
+msgid "Payments"
+msgstr "Efectos"
+
+#. module: account_payment_extension
+#: model:ir.model,name:account_payment_extension.model_payment_order_create
+msgid "payment.order.create"
+msgstr "pago.orden.crear"
+
+#. module: account_payment_extension
+#: field:payment.mode,require_same_bank_account:0
+msgid "Require the Same Bank Account"
+msgstr "Requerir la misma cuenta bancaria"
+
+#. module: account_payment_extension
+#: view:account.move.line.payment:0
+msgid "Approve"
+msgstr "Aprobar"
+
+#. module: account_payment_extension
+#: view:account.move.line:0
+msgid "Receivable payments"
+msgstr "Efectos a cobrar"
+
+#. module: account_payment_extension
+#: field:account.invoice,payment_type:0
+#: field:account.move.line,payment_type:0
+#: model:ir.model,name:account_payment_extension.model_payment_type
+#: field:payment.mode,type:0
+msgid "Payment type"
+msgstr "Tipo de pago"
+
+#. module: account_payment_extension
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Detalles del banco"
+
+#. module: account_payment_extension
+#: help:payment.order.create,amount:0
+msgid "Next step will automatically select payments up to this amount as long as account moves have bank account if that is required by the selected payment mode."
+msgstr "El siguiente paso seleccionará automáticamente pagos/cobros hasta esta cantidad siempre que los apuntes tengan cuenta bancaria si ésta es requerida en el modo de pago seleccionado."
+
+#. module: account_payment_extension
+#: help:payment.order.create,show_refunds:0
+msgid "Indicates if search should include refunds."
+msgstr "Indica si la búsqueda debe incluir devoluciones."
 
 #. module: account_payment_extension
 #: field:account.move.line,received_check:0
 msgid "Received check"
 msgstr "Cheque recibido"
 
-#. module: account_payment_extension
-#: wizard_view:populate_payment_ext,init:0
-msgid "Search Payment lines"
-msgstr "Buscar líneas de pago"
-
-#. module: account_payment_extension
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo no puede ser menor que 1!"
-
-#. module: account_payment_extension
-#: help:payment.order,create_account_moves:0
-msgid ""
-"Indicates when account moves should be created for order payment lines. "
-"\"Bank Statement\" will wait until user introduces those payments in bank a "
-"bank statement. \"Direct Payment\" will mark all payment lines as payied "
-"once the order is done."
-msgstr ""
-"Indica cuando se deben generar los asientos contables para las líneas de la "
-"orden de pago. \"Por extracto bancario\" esperará a que el usuario "
-"introduzca los pagos en el extracto bancario. \"Por pago directo\" marcará "
-"todas las líneas como pagadas cuando se realice la orden."
-
-#. module: account_payment_extension
-#: model:ir.module.module,description:account_payment_extension.module_meta_information
-msgid ""
-"Account payment extension.\n"
-"\n"
-"This module extends the account_payment module with a lot of features:\n"
-"    * Extension of payment types: The payment type has a translated name and "
-"note that can be shown in the invoices.\n"
-"    * Two default payment types for partners (client and supplier).\n"
-"    * Automatic selection of payment type in invoices. Now an invoice can "
-"have a payment term (30 days, 30/60 days, ...) and a payment type (cash, "
-"bank transfer, ...).\n"
-"    * A default check field in partner bank accounts. The default partner "
-"bank accounts are selected in invoices and payments.\n"
-"    * New menu/tree/forms to see payments to receive and payments to pay.\n"
-"    * The payments show tree editable fields: Due date, bank account and a "
-"check field (for example to write down if a bank check in paper support has "
-"been received).\n"
-"    * Two types of payment orders: Payable payment orders (from supplier "
-"invoices) and receivable payment orders (from client invoices). So we can "
-"make payment orders to receive the payments of our client invoices. Each "
-"payment order type has its own sequence.\n"
-"    * The payment orders allow negative payment amounts. So we can have "
-"payment orders for supplier invoices (pay money) and refund supplier "
-"invoices (return or receive money). Or for client invoices (receive money) "
-"and refund client invoices (return or pay money).\n"
-"    * Payment orders: Selected invoices are filtered by payment type, the "
-"second message communication can be set at the same time for several "
-"invoices.\n"
-"Based on previous work of Pablo Rocandio & Zikzakmedia (version for 4.2).\n"
-msgstr ""
-"Extensión de pagos contables (Tesorería).\n"
-"\n"
-"Este módulo extiende el módulo account_payment con muchas características:\n"
-"    * Extensión de los tipos de pago: El tipo de pago tiene un nombre y una "
-"descripción traducibles que se pueden mostrar en las facturas.\n"
-"    * Dos tipos de pago por defecto para las empresas (cliente y "
-"proveedor).\n"
-"    * Selección automática del tipo de pago en las facturas. Ahora, una "
-"factura puede tener un plazo de pago (30 días, 30/60 días, ...) y un tipo de "
-"pago (efectivo, transferencia bancaria, ...).\n"
-"    * Un campo seleccionable por defecto en las cuentas bancarias de las "
-"empresas. Se selecciona la cuenta bancaria por defecto de la empresa en las "
-"facturas y los pagos.\n"
-"    * Nuevos menús / listas / formularios para consultar los pagos (efectos) "
-"a cobrar y a pagar.\n"
-"    * Los pagos muestran campos editables en la lista: Fecha de vencimiento, "
-"cuenta bancaria y un campo de verificación (por ejemplo, para indicar que se "
-"ha recibido un cheque bancario en soporte papel).\n"
-"    * Dos tipos de órdenes de pago/cobro: las órdenes de pago (a partir de "
-"las facturas de proveedor) y las órdenes de cobro (a partir de las facturas "
-"de cliente). Ahora se puede hacer órdenes de cobro (remesas de recibos) para "
-"recibir los pagos de las facturas de nuestros clientes. Cada tipo de orden "
-"de pago tiene su propia secuencia.\n"
-"    * Las órdenes de pago/cobro permiten cantidades en negativo. Podemos "
-"incluir en las órdenes de pago facturas de proveedor (pago de dinero) y "
-"facturas de abono de proveedor (devolución o recibir dinero). O las facturas "
-"de cliente (recepción de dinero) y las facturas de abono de cliente "
-"(devolución o pago de dinero).\n"
-"    * En las órdenes de pago: Las facturas seleccionadas son filtradas por "
-"tipo de pago. Se puede indicar el segundo mensaje de la comunicación de la "
-"remesa al mismo tiempo para varias facturas.\n"
-"Basado en el trabajo anterior de Pablo Rocandio y Zikzakmedia (versión "
-"4.2).\n"
-
-#. module: account_payment_extension
-#: wizard_field:populate_payment_ext,init,show_refunds:0
-msgid "Show Refunds"
-msgstr "Mostrar abonos"
-
-#. module: account_payment_extension
-#: help:populate_payment_ext,init,show_refunds:0
-msgid "Indicates if search should include refunds."
-msgstr "Indica si la búsqueda debe incluir abonos."

=== modified file 'account_payment_extension/payment_view.xml'
--- account_payment_extension/payment_view.xml	2012-12-31 10:14:41 +0000
+++ account_payment_extension/payment_view.xml	2013-06-03 10:33:26 +0000
@@ -2,6 +2,9 @@
 <openerp>
 <data>
 
+
+   
+        
     <!--
     ========================================================================================================
         PARTNERS - default bank
@@ -190,6 +193,7 @@
         </field>
     </record>
 
+
     <!--************ account.move.line extension to show additional fields **********-->
     <!--
     <record model="ir.ui.view" id="payments_move_line_tree">
@@ -313,6 +317,8 @@
     </record>
 
 
+
+
     <!--
     ====================================================================================================
         PAYABLE PAYMENT ORDER
@@ -346,7 +352,7 @@
     =========================================================================================
      PAYMENTS
     =========================================================================================
-
+    -->
     <record id="view_payments_tree" model="ir.ui.view">
         <field name="name">Payments</field>
         <field name="model">account.move.line</field>
@@ -369,6 +375,9 @@
                 <field name="move_id" readonly="1"/>
                 <field name="reconcile_id" readonly="1"/>
                 <field name="reconcile_partial_id" readonly="1"/>
+		<field name="journal_id" invisible="1"/>
+		<field name="period_id" invisible="1"/>
+               <button name="pay_move_lines" type="object" string="Payment" icon="gtk-go-forward"/>
             </tree>
         </field>
     </record>
@@ -394,8 +403,8 @@
                     <field name="payment_type" widget="selection"/>
                     <field name="partner_bank_id"/>
                     <field name="received_check"/>
-                </group>
-                <newline/>
+               </group>
+               <newline/>
                 <group expand="0" string="Group By...">
                     <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                     <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
@@ -403,12 +412,14 @@
                     <separator orientation="vertical"/>
                     <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
                     <filter string="Effective date" icon="terp-go-month" domain="[]" context="{'group_by':'date_maturity'}"/>
+                    <filter string="Due Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_maturity'}"/>
+
                 </group>
            </search>
         </field>
     </record>
-	-->
-    <!-- Invoice Payments
+
+    <!--Invoice Payments-->
     <record model="ir.actions.act_window" id="action_invoice_payments">
         <field name="name">Invoice payments</field>
         <field name="res_model">account.move.line</field>
@@ -418,7 +429,7 @@
         <field name="domain">[('account_id.type','in',['receivable','payable']),('invoice','&lt;&gt;',False)]</field>
     </record>
     <menuitem name="Invoice payments" parent="account_payment.menu_main_payment" action="action_invoice_payments" id="menu_action_invoice_payments" sequence="4"/>
-	-->
+	
     <!-- Done Payments
     <record model="ir.actions.act_window" id="action_done_payments">
         <field name="name">Done payments</field>

=== modified file 'account_payment_extension/wizard/__init__.py'
--- account_payment_extension/wizard/__init__.py	2012-11-01 21:49:33 +0000
+++ account_payment_extension/wizard/__init__.py	2013-06-03 10:33:26 +0000
@@ -24,6 +24,7 @@
 ##############################################################################
 
 import account_payment_order
+import account_move_line_payment
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

=== added file 'account_payment_extension/wizard/account_move_line_payment.py'
--- account_payment_extension/wizard/account_move_line_payment.py	1970-01-01 00:00:00 +0000
+++ account_payment_extension/wizard/account_move_line_payment.py	2013-06-03 10:33:26 +0000
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import fields, osv
+from tools.translate import _
+
+
+class account_move_line_payment(osv.osv_memory):
+    _name = "account.move.line.payment"
+    _description = "Pay Account Move Lines"
+
+    def pay_move_lines(self, cr, uid, ids, context=None):
+        obj_move_line = self.pool.get('account.move.line')
+        if context is None:
+            context = {}
+        res = obj_move_line.pay_move_lines(cr, uid, context['active_ids'], context)
+        res ['nodestroy'] =False
+        return res
+        
+account_move_line_payment()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

=== added file 'account_payment_extension/wizard/account_move_line_payment_view.xml'
--- account_payment_extension/wizard/account_move_line_payment_view.xml	1970-01-01 00:00:00 +0000
+++ account_payment_extension/wizard/account_move_line_payment_view.xml	2013-06-03 10:33:26 +0000
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!--Account Move lines-->
+        <record id="pay_account_move_line_view" model="ir.ui.view">
+            <field name="name">Pay Journal Entries</field>
+            <field name="model">account.move.line.payment</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <form string="Change payment entries">
+                <separator string="Pay Journal Entries" colspan="4"/>
+                <label string="Puede cambiar el estado de los efectos comerciales mediante el siguiente asistente" colspan="4"/>
+                <separator colspan="4"/>
+                <group colspan="4" col="6">
+                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    <button icon="terp-camera_test" string="Approve" name="pay_move_lines" type="object" default_focus="1"/>
+               </group>
+            </form>
+            </field>
+        </record>
+
+        <record id="action_pay_account_move_line" model="ir.actions.act_window">
+            <field name="name">Change payment</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.move.line.payment</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="pay_account_move_line_view"/>
+            <field name="context">{}</field>
+            <field name="target">new</field>
+            <field name="help">with this wizard ypu can change the state of the selected entries. </field>
+        </record>
+
+        <record model="ir.values" id="account_move_line_payment_values">
+            <field name="model_id" ref="account.model_account_move_line" />
+            <field name="name">Change payment entries</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_pay_account_move_line'))" />
+            <field name="key">action</field>
+            <field name="model">account.move.line</field>
+        </record>
+
+    </data>
+</openerp>