Merge lp:~pedro-q/account-payment/7.0-account_payment_extension-IMP-payment-order-manual-moves into lp:~account-payment-team/account-payment/7.0

[Pedro Rodríguez Gil (Otherway)]

[IMP]-Added functionality which allows to make a payment order from manual moves for payable accounts which are not linked to an invoice line.

[IMP] - Added functionality which allows to make a payment order from manual moves for payable accounts which are not linked to an invoice line. For example when accounting salaries for employees and making an payment order for them.

[lp:~pedro-q/account-payment/7.0-account_payment_extension-IMP-payment-order-manual-moves]

106. By Pedro Rodríguez Gil (Otherway) on 2014-01-24

Removed logs

107. By Pedro Rodríguez Gil (Otherway) on 2014-02-25

Modified to search all payable accounts

108. By Pedro Rodríguez Gil (Otherway) on 2014-02-27

Main branch changes

[Pedro Manuel Baeza (pedro.baeza)]

This project is now hosted on https://github.com/OCA/account-payment. Please move your proposal there. This guide may help you https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub

Unmerged revisions

108. By Pedro Rodríguez Gil (Otherway) on 2014-02-27

Main branch changes

107. By Pedro Rodríguez Gil (Otherway) on 2014-02-25

Modified to search all payable accounts

106. By Pedro Rodríguez Gil (Otherway) on 2014-01-24

Removed logs

105. By Pedro Rodríguez Gil (Otherway) on 2014-01-24

Added functionality wich allows to add lines to a payment order related to payable accont moves wich are not linked to an invoice line but manually made by an accountant, such as human resources salaries

=== modified file 'account_payment_extension/account_move_line.py'
--- account_payment_extension/account_move_line.py	2013-11-10 17:00:26 +0000
+++ account_payment_extension/account_move_line.py	2014-02-27 07:41:09 +0000
@@ -27,7 +27,6 @@
 
 from openerp.osv import fields, orm
 
-
 class account_move_line(orm.Model):
     _inherit = 'account.move.line'
 
@@ -144,6 +143,7 @@
     def _payment_type_get(self, cr, uid, ids, field_name, arg, context={}):
         result = {}
         invoice_obj = self.pool.get('account.invoice')
+        partner_obj = self.pool.get('res.partner')
         for move_line in self.browse(cr, uid, ids, context):
             result[move_line.id] = (0, 0)
             invoice_id = invoice_obj.search(
@@ -155,6 +155,21 @@
                     result[move_line.id] = (inv.payment_type.id, self.pool.get(
                         'payment.type').browse(
                             cr, uid, inv.payment_type.id, context).name)
+            
+            else:
+                partner_id = partner_obj.search(
+                cr, uid, [('id', '=', move_line.partner_id.id)],
+                context=context)
+                if partner_id:
+                    partner = partner_obj.browse(cr, uid, partner_id[0], context)
+                    if partner.payment_type_supplier:
+                        result[move_line.id] = (partner.payment_type_supplier.id, self.pool.get(
+                            'payment.type').browse(
+                                cr, uid, partner.payment_type_supplier.id, context).name)
+                    elif partner.payment_type_customer:
+                        result[move_line.id] = (partner.payment_type_customer.id, self.pool.get(
+                            'payment.type').browse(
+                                cr, uid, partner.payment_type_customer.id, context).name)
         return result
 
     def _payment_type_search(self, cr, uid, obj, name, args, context={}):
@@ -173,13 +188,29 @@
             ids = self.pool.get('payment.type').search(
                 cr, uid, [('name', 'ilike', value)], context=context)
         if ids:
+            
             cr.execute("""SELECT l.id
                 FROM
                     account_move_line l, account_invoice i
                 WHERE
-                    l.move_id = i.move_id AND
-                    i.payment_type in (%s)""" % (','.join(map(str, ids))))
-            res = cr.fetchall()
+                    l.move_id = i.move_id AND i.payment_type in (%s)""" % (','.join(map(str, ids))))
+            res_invoice = cr.fetchall()
+            
+            cr.execute("""SELECT l.id
+                FROM
+                    account_move_line l, ir_property p
+                WHERE
+                    l.move_id NOT IN (SELECT i.move_id FROM account_invoice i WHERE i.move_id is not NULL)
+                    AND
+                    l.partner_id = CAST(replace(p.res_id, 'res.partner,', '') AS INTEGER)
+                    AND 
+                    (p.name = 'payment_type_supplier' OR p.name = 'payment_type_customer')
+                    AND 
+                    p.value_reference = '%s' """ % ('payment.type,' + map(str, ids)[0]))
+            res_move = cr.fetchall()
+            
+            res = res_invoice + res_move
+            
             if len(res):
                 result = [('id', 'in', [x[0] for x in res])]
         return result
 
=== modified file 'account_payment_extension/wizard/account_payment_order.py'
--- account_payment_extension/wizard/account_payment_order.py	2013-11-20 09:17:16 +0000
+++ account_payment_extension/wizard/account_payment_order.py	2014-02-27 07:41:09 +0000
@@ -152,7 +152,14 @@
                 amount_to_pay = line.amount_to_pay
             else:
                 amount_to_pay = -line.amount_to_pay
-
+            
+            ## Set move line currency. If not related to an invoice, set company`s default currency
+            currency_id = False
+            if(line.invoice and line.invoice.currency_id.id):
+                currency_id = line.invoice.currency_id.id
+            else:
+                currency_id = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.currency_id.id
+                
             payment_obj.create(cr, uid,{
                     'move_line_id': line.id,
                     'amount_currency': amount_to_pay,
@@ -162,7 +169,7 @@
                     'communication': (line.ref and line.name!='/' and line.ref+'. '+line.name) or line.ref or line.name or '/',
                     'communication2': data.communication2,
                     'date': date_to_pay,
-                    'currency': line.invoice and line.invoice.currency_id.id or False,
+                    'currency': currency_id,
                     'account_id': line.account_id.id,
                 }, context=context)
         return {'type': 'ir.actions.act_window_close'}