Merge lp:~vauxoo/openerp-venezuela-localization/rodolfo-l10n_ve_wh_islr-logs into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

[Rodolfo Alvarez(Vauxoo)]

logs added in vouchers and xml lines generation. File es_VE.po hass been modified, the translation to spanish has been improved.

[lp:~vauxoo/openerp-venezuela-localization/rodolfo-l10n_ve_wh_islr-logs]

481. By Gabriela Quilarque on 2011-11-18

[IMP] Optimized Code.

=== modified file 'l10n_ve_withholding_islr/i18n/es_VE.po'
--- l10n_ve_withholding_islr/i18n/es_VE.po	2011-11-17 23:15:16 +0000
+++ l10n_ve_withholding_islr/i18n/es_VE.po	2011-11-18 18:56:24 +0000
@@ -1423,6 +1423,7 @@
 msgid "Impossible withholding income, because the lines of the invoice has not concept withholding!"
 msgstr "Imposible realizar retención de ISLR, porque las lineas de la factura no tienen concepto de retención asociado!"
 
+<<<<<<< TREE
 #. module: l10n_ve_withholding_islr
 #: view:wh.islr.config:0
 msgid "Withholding income Configuration"
@@ -1446,3 +1447,22 @@
 #: model:ir.actions.act_window,name:l10n_ve_withholding_islr.action_config_wh_islr
 msgid "Configure Income Withholding"
 msgstr "Configuración de la Retención de ISLR"
+=======
+#. module: l10n_ve_withholding_islr
+#: code:addons/l10n_ve_withholding_islr/invoice.py:305
+#, python-format
+msgid "Withholding income xml line generated."
+msgstr "Línea xml de retención de ISLR generada."
+
+#. module: l10n_ve_withholding_islr
+#: code:addons/l10n_ve_withholding_islr/invoice.py:574
+#, python-format
+msgid "Withholding income voucher %s generated."
+msgstr "Comprobante de retención de ISLR %s generado."
+
+#. module: l10n_ve_withholding_islr
+#: code:addons/l10n_ve_withholding_islr/islr_wh_doc.py:318
+#, python-format
+msgid "Withholding income voucher %s validated and accounting entry generated."
+msgstr "Comprobante de retención de ISLR %s validado y asiento contable generado."
+>>>>>>> MERGE-SOURCE

=== modified file 'l10n_ve_withholding_islr/invoice.py'
--- l10n_ve_withholding_islr/invoice.py	2011-11-17 22:24:35 +0000
+++ l10n_ve_withholding_islr/invoice.py	2011-11-18 18:56:24 +0000
@@ -302,6 +302,8 @@
                 self.pool.get('account.invoice.line').write(cr, uid, line, {'apply_wh': apply})
             else:
                 self.pool.get('account.invoice.line').write(cr, uid, line, {'apply_wh': apply,'wh_xml_id':self._create_islr_xml_wh_line(cr, uid,line,dict)})
+                message = _("Withholding income xml line generated.")
+                self.log(cr, uid, line, message)
                 
     def _create_islr_xml_wh_line(self,cr, uid, line, dict):
         '''
@@ -567,6 +569,9 @@
                     self._create_doc_invoices(cr,uid,key,islr_wh_doc_id)
                         
                 self.pool.get('account.invoice').write(cr,uid,inv_brw.invoice_id.id,{'islr_wh_doc_id':islr_wh_doc_id})
+                
+                message = _("Withholding income voucher '%s' generated.") % self.pool.get('islr.wh.doc').browse(cr,uid,islr_wh_doc_id).name
+                self.log(cr, uid, islr_wh_doc_id, message)
             else:
                 pass
         else:

=== modified file 'l10n_ve_withholding_islr/islr_wh_doc.py'
--- l10n_ve_withholding_islr/islr_wh_doc.py	2011-10-25 20:33:16 +0000
+++ l10n_ve_withholding_islr/islr_wh_doc.py	2011-11-18 18:56:24 +0000
@@ -141,7 +141,7 @@
         for wh_doc in wh_doc_brw:
             for wh_doc_line in wh_doc.islr_wh_doc_id: 
                 inv_ids.append(wh_doc_line.id)
-
+               
         context["wh_doc_id"]=ids[0]
         inv_obj.action_ret_islr(cr, uid, inv_ids,context)
         return True
@@ -254,6 +254,7 @@
         wh_doc_obj = self.pool.get('islr.wh.doc.line')
         context = {}
         inv_id = None
+        doc_brw = None
         
         for ret in self.browse(cr, uid, ids):
             if not ret.date_uid:
@@ -303,6 +304,10 @@
                     lines = [(1, line.id, rl)]
                     self.write(cr, uid, [ret.id], {'concept_ids':lines})
                   
+                    if lines:
+                        message = _("Withholding income voucher '%s' validated and accounting entry generated.") % self.browse(cr, uid, ids[0]).name
+                        self.log(cr, uid, ids[0], message) 
+                  
                     for line in ret.concept_ids:
                         for xml in line.xml_ids:
                             if xml.islr_xml_wh_doc.state!='done':
@@ -310,7 +315,6 @@
                                     self.pool.get('islr.xml.wh.line').write(cr,uid,xml.id,{'period_id':period_id, 'islr_xml_wh_doc':None})
                             else:
                                 raise osv.except_osv(_('Invalid action !'),_("Impossible change the period accountig to a withholding that has already been declared."))
-                            
 #                    inv_obj.write(cr, uid, line.invoice_id.id, {'retention':True}, context=context)
         return True