Merge lp:~vauxoo/openerp-mexico-localization/7.0_l10n_mx_facturae_lib_raise_pakages_dev_carlos into lp:openerp-mexico-localization/7.0

[Juan Carlos Hernandez]

se agrego raise en el caso que no existan dichos paquetes instalados (xsltproc,openssl,xmlstarlet)

[Juan Carlos Hernandez (openerp1)]

se agregó raise en el caso que no existan dichos paquetes instalados (xsltproc,openssl,xmlstarlet)

review: Needs Resubmitting

[lp:~vauxoo/openerp-mexico-localization/7.0_l10n_mx_facturae_lib_raise_pakages_dev_carlos]

322. By Juan Carlos Hernandez on 2013-11-07

[IMP][l10n_mx_facturae_lib]change fron error to warning

323. By Juan Carlos Hernandez on 2013-11-07

[IMP][l10n_mx_facturae_lib]comment raise and change from error to warning

324. By Juan Carlos Hernandez on 2013-11-08

[IMP][l10n_mx_facturae]add function library_openssl_xsltproc_xmlstarlet

325. By Juan Carlos Hernandez on 2013-11-08

[IMP][l10n_mx_facturae_pac]corrected warning of library

326. By Isaac López Zúñiga on 2013-11-14

[MERGE] frm oml revno 929

=== modified file 'l10n_mx_facturae/invoice.py'
--- l10n_mx_facturae/invoice.py	2013-10-10 01:02:59 +0000
+++ l10n_mx_facturae/invoice.py	2013-11-14 19:53:26 +0000
@@ -781,7 +781,7 @@
         nodeComprobante.setAttribute("sello", sign_str)
         data_dict['Comprobante']['sello'] = sign_str
 
-        noCertificado = self._get_noCertificado(context['fname_cer'])
+        noCertificado = self._get_noCertificado(cr, uid, ids, context['fname_cer'])
         if not noCertificado:
             raise osv.except_osv(_('Error in No. Certificate !'), _(
                 "Can't get the Certificate Number of the voucher.\nCkeck your configuration.\n%s") % (msg2))
@@ -833,8 +833,8 @@
                     # If dir is in path, save it on real_path
                     fname_scheme = my_path and os.path.join(my_path, 'l10n_mx_facturae', 'SAT', facturae_type + facturae_version +  '.' + scheme_type) or ''
                     #fname_scheme = os.path.join(tools.config["addons_path"], u'l10n_mx_facturae', u'SAT', facturae_type + facturae_version +  '.' + scheme_type )
-                    fname_out = certificate_lib.b64str_to_tempfile( base64.encodestring(''), file_suffix='.txt', file_prefix='openerp__' + (False or '') + '__schema_validation_result__' )
-                    result = certificate_lib.check_xml_scheme(fname_data_xml, fname_scheme, fname_out)
+                    fname_out = certificate_lib.b64str_to_tempfile(cr, uid, ids, base64.encodestring(''), file_suffix='.txt', file_prefix='openerp__' + (False or '') + '__schema_validation_result__' )
+                    result = certificate_lib.check_xml_scheme(cr, uid, ids, fname_data_xml, fname_scheme, fname_out)
                     if result: #Valida el xml mediante el archivo xsd
                         raise osv.except_osv('Error al validar la estructura del xml!', 'Validación de XML versión %s:\n%s'%(facturae_version, result))
         return True
@@ -866,22 +866,26 @@
             self.write(cr, uid, [id], data, context=context)
         return True
 
-    def _get_noCertificado(self, fname_cer, pem=True):
+    def _get_noCertificado(self, cr, uid, ids, fname_cer, pem=True, context=None):
         """
         @param fname_cer : Path more name of file created whit information 
                     of certificate with suffix .pem
         @param pem : Boolean that indicate if file is .pem
         """
+        if context is None:
+            context = {}
         certificate_lib = self.pool.get('facturae.certificate.library')
-        fname_serial = certificate_lib.b64str_to_tempfile(base64.encodestring(
+        fname_serial = certificate_lib.b64str_to_tempfile(cr, uid, ids, base64.encodestring(
             ''), file_suffix='.txt', file_prefix='openerp__' + (False or '') + \
             '__serial__')
-        result = certificate_lib._get_param_serial(
+        result = certificate_lib._get_param_serial(cr, uid, ids,
             fname_cer, fname_out=fname_serial, type='PEM')
         return result
 
-    def _get_sello(self, cr=False, uid=False, ids=False, context={}):
+    def _get_sello(self, cr=False, uid=False, ids=False, context=None):
         # TODO: Put encrypt date dynamic
+        if context is None:
+            context = {}
         fecha = context['fecha']
         year = float(time.strftime('%Y', time.strptime(
             fecha, '%Y-%m-%dT%H:%M:%S')))
@@ -890,20 +894,20 @@
         if year <= 2010:
             encrypt = "md5"
         certificate_lib = self.pool.get('facturae.certificate.library')
-        fname_sign = certificate_lib.b64str_to_tempfile(base64.encodestring(
+        fname_sign = certificate_lib.b64str_to_tempfile(cr, uid, ids, base64.encodestring(
             ''), file_suffix='.txt', file_prefix='openerp__' + (False or '') + \
             '__sign__')
-        result = certificate_lib._sign(fname=context['fname_xml'],
+        result = certificate_lib._sign(cr, uid, ids, fname=context['fname_xml'],
             fname_xslt=context['fname_xslt'], fname_key=context['fname_key'],
             fname_out=fname_sign, encrypt=encrypt, type_key='PEM')
         return result
 
     def _xml2cad_orig(self, cr=False, uid=False, ids=False, context={}):
         certificate_lib = self.pool.get('facturae.certificate.library')
-        fname_tmp = certificate_lib.b64str_to_tempfile(base64.encodestring(
+        fname_tmp = certificate_lib.b64str_to_tempfile(cr, uid, ids, base64.encodestring(
             ''), file_suffix='.txt', file_prefix='openerp__' + (False or '') + \
             '__cadorig__')
-        cad_orig = certificate_lib._transform_xml(fname_xml=context['fname_xml'],
+        cad_orig = certificate_lib._transform_xml(cr, uid, ids, fname_xml=context['fname_xml'],
             fname_xslt=context['fname_xslt'], fname_out=fname_tmp)
         return fname_tmp, cad_orig
 

=== modified file 'l10n_mx_facturae_lib/facturae_lib.py'
--- l10n_mx_facturae_lib/facturae_lib.py	2013-10-10 01:02:59 +0000
+++ l10n_mx_facturae_lib/facturae_lib.py	2013-11-14 19:53:26 +0000
@@ -36,6 +36,7 @@
 import base64
 import logging
 _logger = logging.getLogger(__name__)
+from l10n_mx_facturae_lib import facturae_lib
 
 all_paths = tools.config["addons_path"].split(",")
 for my_path in all_paths:
@@ -63,26 +64,38 @@
     app_openssl = 'openssl'
     app_xmlstarlet = 'xmlstarlet'
 
-app_openssl_fullpath = os.path.join(openssl_path, app_openssl)
-if not os.path.isfile(app_openssl_fullpath):
-    app_openssl_fullpath = tools.find_in_path(app_openssl)
+def library_openssl_xsltproc_xmlstarlet(self, cr, uid, ids, context=None):
+    if context is None:
+        context = {}
+    msj = ''
+    app_openssl_fullpath = os.path.join(openssl_path, app_openssl)
     if not os.path.isfile(app_openssl_fullpath):
-        app_openssl_fullpath = False
-        _logger.warning("Failed to find in path 'openssl' app")
-
-app_xsltproc_fullpath = os.path.join(xsltproc_path, app_xsltproc)
-if not os.path.isfile(app_xsltproc_fullpath):
-    app_xsltproc_fullpath = tools.find_in_path(app_xsltproc)
+        app_openssl_fullpath = tools.find_in_path(app_openssl)
+        if not os.path.isfile(app_openssl_fullpath):
+            app_openssl_fullpath = False
+            _logger.warning('Install openssl "sudo apt-get install openssl" to use l10n_mx_facturae_lib module.')
+            msj += 'Install openssl "sudo apt-get install openssl" to use l10n_mx_facturae_lib module.'
+    
+    app_xsltproc_fullpath = os.path.join(xsltproc_path, app_xsltproc) or False
     if not os.path.isfile(app_xsltproc_fullpath):
-        app_xsltproc_fullpath = False
-        _logger.warning("Failed to find in path 'xsltproc' app")
+        app_xsltproc_fullpath = tools.find_in_path(app_xsltproc) or False
+        try:
+            if not os.path.isfile(app_xsltproc_fullpath):
+                app_xsltproc_fullpath = False
+                _logger.warning("Install xsltproc 'sudo apt-get install xsltproc' to use l10n_mx_facturae_lib module.")
+                msj =  "Install xsltproc 'sudo apt-get install xsltproc' to use l10n_mx_facturae_lib module."
+        except Exception, e:
+            _logger.warning("Install xsltproc 'sudo apt-get install xsltproc' to use l10n_mx_facturae_lib module.")
+            msj +=  "Install xsltproc 'sudo apt-get install xsltproc' to use l10n_mx_facturae_lib module."
 
-app_xmlstarlet_fullpath = os.path.join(xmlstarlet_path, app_xmlstarlet)
-if not os.path.isfile( app_xmlstarlet_fullpath ):
-    app_xmlstarlet_fullpath = tools.find_in_path( app_xmlstarlet )
-    if not app_xmlstarlet_fullpath:
-        app_xmlstarlet_fullpath = False
-        _logger.warning("Failed to find in path 'xmlstarlet' app")
+    app_xmlstarlet_fullpath = os.path.join(xmlstarlet_path, app_xmlstarlet)
+    if not os.path.isfile( app_xmlstarlet_fullpath ):
+        app_xmlstarlet_fullpath = tools.find_in_path( app_xmlstarlet )
+        if not app_xmlstarlet_fullpath:
+            app_xmlstarlet_fullpath = False
+            _logger.warning('Install xmlstarlet "sudo apt-get install xmlstarlet" to use l10n_mx_facturae_lib module.')
+            msj += 'Install xmlstarlet "sudo apt-get install xmlstarlet" to use l10n_mx_facturae_lib module.'
+    return msj, app_xsltproc_fullpath, app_openssl_fullpath, app_xmlstarlet_fullpath
         
 
 class facturae_certificate_library(osv.Model):
@@ -90,7 +103,7 @@
     _auto = False
     # Agregar find subpath
 
-    def b64str_to_tempfile(self, b64_str="", file_suffix="", file_prefix=""):
+    def b64str_to_tempfile(self, cr, uid, ids, b64_str="", file_suffix="", file_prefix=""):
         """
         @param b64_str : Text in Base_64 format for add in the file
         @param file_suffix : Sufix of the file
@@ -153,24 +166,29 @@
             output.close()
         return result
 
-    def _get_param_serial(self, fname, fname_out=None, type='DER'):
+    def _get_param_serial(self, cr, uid, ids, fname, fname_out=None, type='DER', context=None):
         """
         @param fname : File.PEM with the information of the certificate
         @param fname_out : File.xml that is send
         """
-        result = self._get_params(fname, params=[
-                                  'serial'], fname_out=fname_out, type=type)
+        if context is None:
+            context = {}
+        result = self._get_params(cr, uid, ids, fname, params=['serial'], 
+                                    fname_out=fname_out, type=type)
         result = result and result.replace('serial=', '').replace(
             '33', 'B').replace('3', '').replace('B', '3').replace(
             ' ', '').replace('\r', '').replace('\n', '').replace('\r\n', '') or ''
         return result
 
-    def _transform_xml(self, fname_xml, fname_xslt, fname_out):
+    def _transform_xml(self, cr, uid, ids, fname_xml, fname_xslt, fname_out, context=None):
         """
         @param fname_xml : Path and name of the XML of Facturae
         @param fname_xslt : Path where is located the file 'Cadena Original'.xslt
         @param fname_out : Path and name of the file.xml that is send to sign
         """
+        if context is None:
+            context = {}
+        msj, app_xsltproc_fullpath, app_openssl_fullpath, app_xmlstarlet_fullpath = facturae_lib.library_openssl_xsltproc_xmlstarlet(cr, uid, ids, context)
         if not app_xsltproc_fullpath:
             raise osv.except_osv(_("Error!"), _(
                 "Failed to find in path '%s' app. This app is required for sign Mexican Electronic Invoice"%(app_xsltproc) ))
@@ -183,15 +201,17 @@
         output.close()
         return result
 
-    def _get_param_dates(self, fname, fname_out=None,
-        date_fmt_return='%Y-%m-%d %H:%M:%S', type='DER'):
+    def _get_param_dates(self, cr, uid, ids, fname, fname_out=None,
+        date_fmt_return='%Y-%m-%d %H:%M:%S', type='DER', context=None):
         """
         @param fname : File.cer with the information of the certificate
         @params fname_out : Path and name of the file.txt with info encrypted
         @param date_fmt_return : Format of the date used
         @param type : Type of file
         """
-        result_dict = self._get_params_dict(fname, params=[
+        if context is None:
+            context = {}
+        result_dict = self._get_params_dict(cr, uid, ids, fname, params=[
                                     'dates'], fname_out=fname_out, type=type)
         translate_key = {
             'notAfter': 'enddate',
@@ -207,14 +227,16 @@
                 result2[translate_key[key]] = date_fmt
         return result2
 
-    def _get_params_dict(self, fname, params=None, fname_out=None, type='DER'):
+    def _get_params_dict(self, cr, uid, ids, fname, params=None, fname_out=None, type='DER', context=None):
         """
         @param fname : File.cer with the information of the certificate
         @param params : List of params used for this function
         @param fname_out : Path and name of the file.txt with info encrypted
         @param type : Type of file
         """
-        result = self._get_params(fname, params, fname_out, type)
+        if context is None:
+            context = {}
+        result = self._get_params(cr, uid, ids, fname, params, fname_out, type)
         result = result.replace('\r\n', '\n').replace(
             '\r', '\n')  # .replace('\n', '\n)
         result = result.rstrip('\n').lstrip('\n').rstrip(' ').lstrip(' ')
@@ -226,11 +248,14 @@
                 params_dict[key] = value
         return params_dict
 
-    def _get_params(self, fname, params=None, fname_out=None, type='DER'):
+    def _get_params(self, cr, uid, ids, fname, params=None, fname_out=None, type='DER', context=None):
         """
         @params: list [noout serial startdate enddate subject issuer dates]
         @type: str DER or PEM
         """
+        if context is None:
+            context = {}
+        msj, app_xsltproc_fullpath, app_openssl_fullpath, app_xmlstarlet_fullpath = facturae_lib.library_openssl_xsltproc_xmlstarlet(cr, uid, ids, context)
         if not app_openssl_fullpath:
             raise osv.except_osv(_("Error!"), _(
                 "Failed to find in path '%s' app. This app is required for sign Mexican Electronic Invoice"%(app_openssl) ))
@@ -246,8 +271,8 @@
         output.close()
         return result
 
-    def _sign(self, fname, fname_xslt, fname_key, fname_out, encrypt='sha1',
-        type_key='PEM'):
+    def _sign(self, cr, uid, ids, fname, fname_xslt, fname_key, fname_out, encrypt='sha1',
+        type_key='PEM', context=None):
         """
          @params fname : Path and name of the XML of Facturae
          @params fname_xslt : Path where is located the file 'Cadena Original'.xslt
@@ -256,6 +281,10 @@
          @params encrypt : Type of encryptation for file
          @params type_key : Type of KEY
         """
+        if context is None:
+            context = {}
+        msj, app_xsltproc_fullpath, app_openssl_fullpath, app_xmlstarlet_fullpath = \
+                    facturae_lib.library_openssl_xsltproc_xmlstarlet(cr, uid, ids, context)
         result = ""
         cmd = ''
         if type_key == 'PEM':
@@ -275,8 +304,12 @@
             output.close()
         return result
 
-    def check_xml_scheme(self, fname_xml, fname_scheme, fname_out, type_scheme="xsd"):
+    def check_xml_scheme(self, cr, uid, ids, fname_xml, fname_scheme, fname_out, type_scheme="xsd",
+                            context=None):
         #xmlstarlet val -e --xsd cfdv2.xsd cfd_example.xml
+        if context is None:
+            context = {}
+        msj, app_xsltproc_fullpath, app_openssl_fullpath, app_xmlstarlet_fullpath = facturae_lib.library_openssl_xsltproc_xmlstarlet(cr, uid, ids, context)
         if app_xmlstarlet_fullpath:
             cmd = ''
             if type_scheme == 'xsd':

=== modified file 'l10n_mx_facturae_pac/invoice.py'
--- l10n_mx_facturae_pac/invoice.py	2013-10-10 01:02:59 +0000
+++ l10n_mx_facturae_pac/invoice.py	2013-11-14 19:53:26 +0000
@@ -172,7 +172,7 @@
         nodeComprobante.setAttribute("sello", sign_str)
         data_dict[comprobante]['sello'] = sign_str
 
-        noCertificado = self._get_noCertificado(context['fname_cer'])
+        noCertificado = self._get_noCertificado(cr, uid, ids, context['fname_cer'])
         if not noCertificado:
             raise osv.except_osv(_('Error in No. Certificate !'), _(
                 "Can't get the Certificate Number of the voucher.\nCkeck your configuration.\n%s") % (msg2))
@@ -231,8 +231,8 @@
                     # If dir is in path, save it on real_path
                     fname_scheme = my_path and os.path.join(my_path, 'l10n_mx_facturae', 'SAT', facturae_type + facturae_version +  '.' + scheme_type) or ''
                     #fname_scheme = os.path.join(tools.config["addons_path"], u'l10n_mx_facturae', u'SAT', facturae_type + facturae_version +  '.' + scheme_type )
-                    fname_out = certificate_lib.b64str_to_tempfile( base64.encodestring(''), file_suffix='.txt', file_prefix='openerp__' + (False or '') + '__schema_validation_result__' )
-                    result = certificate_lib.check_xml_scheme(fname_data_xml, fname_scheme, fname_out)
+                    fname_out = certificate_lib.b64str_to_tempfile(cr, uid, ids, base64.encodestring(''), file_suffix='.txt', file_prefix='openerp__' + (False or '') + '__schema_validation_result__' )
+                    result = certificate_lib.check_xml_scheme(cr, uid, ids, fname_data_xml, fname_scheme, fname_out)
                     if result: #Valida el xml mediante el archivo xsd
                         raise osv.except_osv('Error al validar la estructura del xml!', 'Validación de XML versión %s:\n%s'%(facturae_version, result))
         return True

=== modified file 'l10n_mx_ir_attachment_facturae/__openerp__.py'
--- l10n_mx_ir_attachment_facturae/__openerp__.py	2013-08-16 18:47:52 +0000
+++ l10n_mx_ir_attachment_facturae/__openerp__.py	2013-11-14 19:53:26 +0000
@@ -36,6 +36,7 @@
                 "email_template_multicompany",
                 "l10n_mx_facturae_groups",
                 "account_cancel",
+                "l10n_mx_facturae_lib",
         ],
     "demo" : ["demo/l10n_mx_facturae_email_demo.xml",
     ],

=== modified file 'l10n_mx_ir_attachment_facturae/ir_attachment_facturae.py'
--- l10n_mx_ir_attachment_facturae/ir_attachment_facturae.py	2013-11-13 00:00:34 +0000
+++ l10n_mx_ir_attachment_facturae/ir_attachment_facturae.py	2013-11-14 19:53:26 +0000
@@ -117,9 +117,13 @@
         return True
 
     def signal_confirm(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        from l10n_mx_facturae_lib import facturae_lib
+        msj, app_xsltproc_fullpath, app_openssl_fullpath, app_xmlstarlet_fullpath = facturae_lib.library_openssl_xsltproc_xmlstarlet(cr, uid, ids, context)
+        if msj:
+            raise osv.except_osv(_('Warning'),_(msj))
         try:
-            if context is None:
-                context = {}
             invoice_obj = self.pool.get('account.invoice')
             attach = ''
             msj = ''