Merge lp:~vauxoo/openerp-venezuela-localization/hbto_wh_base into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

[hbto [Vauxoo] http://www.vauxoo.com]

[IMP] Improved socket method for creating moves in invoice
so that other modules could use it in a easier way.

[hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha)]

review: Approve

=== modified file 'l10n_ve_withholding/invoice.py'
--- l10n_ve_withholding/invoice.py	2011-10-30 22:07:10 +0000
+++ l10n_ve_withholding/invoice.py	2011-12-21 23:50:28 +0000
@@ -31,11 +31,19 @@
 
 class account_invoice(osv.osv):
     _inherit = 'account.invoice'
-
+    
+    
+    def _get_move_lines(self, cr, uid, ids, to_wh, period_id, 
+                            pay_journal_id, writeoff_acc_id, 
+                            writeoff_period_id, writeoff_journal_id, date, 
+                            name, context=None):
+        if context is None: context = {}
+        return []
+        
     def ret_and_reconcile(self, cr, uid, ids, pay_amount, pay_account_id, 
                             period_id, pay_journal_id, writeoff_acc_id, 
                             writeoff_period_id, writeoff_journal_id, date, 
-                            name, context=None):
+                            name, to_wh, context=None):
         if context is None:
             context = {}
         #TODO check if we can use different period for payment and the writeoff line
@@ -53,21 +61,18 @@
             'ref':invoice.number,
             'date': date,
             'currency_id': False,
-        }
-        l2 = {
-            'debit': direction * pay_amount<0 and - direction * pay_amount,
-            'credit': direction * pay_amount>0 and direction * pay_amount,
-            'account_id': pay_account_id,
-            'partner_id': invoice.partner_id.id,
-            'ref':invoice.number,
-            'date': date,
-            'currency_id': False,
-        }
-
-        l1['name'] = name
-        l2['name'] = name
-
-        lines = [(0, 0, l1), (0, 0, l2)]
+            'name':name
+        }
+        lines = [(0, 0, l1)]
+
+        l2 = self._get_move_lines(cr, uid, ids, to_wh, period_id, 
+                            pay_journal_id, writeoff_acc_id, 
+                            writeoff_period_id, writeoff_journal_id, date, 
+                            name, context=context)
+        if not l2:
+            raise osv.except_osv(_('Warning !'), _('No accounting moves were created.\n Please, Check if there are Taxes/Concepts to withhold in the Invoices!'))
+        lines += l2
+
         move = {'ref': invoice.number, 'line_id': lines, 'journal_id': pay_journal_id, 'period_id': period_id, 'date': date}
         move_id = self.pool.get('account.move').create(cr, uid, move, context=context)