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

[Juan Carlos Hernandez]

se corrigio bug 1256142 de los cr,uid,ids

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

336. By Juan Carlos Hernandez on 2013-11-29

[IMP][l10n_mx_facturae_lib,l10n_mx_facturae_cer]add validation for cer and key and context

337. By Juan Carlos Hernandez on 2013-11-30

[IMP][l10n_mx_facturae_lib]corrected base64 to write

338. By Juan Carlos Hernandez on 2013-11-30

[IMP][l10n_mx_facturae_lib]add strict

339. By Juan Carlos Hernandez on 2013-11-30

[IMP][l10n_mx_facturae_lib]add base64.b64decode(b64_str, '-_')

340. By Juan Carlos Hernandez on 2013-12-02

[IMP][l10n_mx_facturae_lib]corrected decode_base64

341. By Juan Carlos Hernandez on 2013-12-02

[IMP][l10n_mx_facturae_lib]corrected decode_base64

342. By Juan Carlos Hernandez on 2013-12-03

[IMP][l10n_mx_facturae_lib]ADD base64.b64decode(data.encode('ascii'))

343. By Juan Carlos Hernandez on 2013-12-03

[IMP][l10n_mx_facturae_lib]add strict

344. By Juan Carlos Hernandez on 2013-12-03

[IMP][l10n_mx_facturae_lib]add data = base64.b64decode(data.decode('ascii'))

345. By Juan Carlos Hernandez on 2013-12-03

[IMP][l10n_mx_facturae_lib]add data = repr(data)

346. By Juan Carlos Hernandez on 2013-12-03

[IMP][l10n_mx_facturae_lib]corrected bug

347. By Isaac López Zúñiga on 2013-12-04

[IMP][l10n_mx_facturae_cer] encodestring added

=== modified file 'l10n_mx_facturae/invoice.py'
--- l10n_mx_facturae/invoice.py	2013-11-08 03:10:17 +0000
+++ l10n_mx_facturae/invoice.py	2013-12-04 17:14:19 +0000
@@ -483,14 +483,14 @@
         certificate_lib = self.pool.get('facturae.certificate.library')
         fname_repmensual_xslt = self._get_file_globals(
             cr, uid, ids, context=context)['fname_repmensual_xslt']
-        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 '') + \
             '__repmensual__')
         rep_mensual = ''
         for invoice in self.browse(cr, uid, ids, context=context):
             xml_b64 = invoice.cfd_xml_id and invoice.cfd_xml_id.datas or False
             if xml_b64:
-                fname_xml = certificate_lib.b64str_to_tempfile(
+                fname_xml = certificate_lib.b64str_to_tempfile(cr, uid, ids,
                     xml_b64 or '', file_suffix='.xml',
                     file_prefix='openerp__' + (False or '') + '__xml__')
                 rep_mensual += certificate_lib._transform_xml(

=== modified file 'l10n_mx_facturae_cer/res_company.py'
--- l10n_mx_facturae_cer/res_company.py	2013-05-30 21:28:32 +0000
+++ l10n_mx_facturae_cer/res_company.py	2013-12-04 17:14:19 +0000
@@ -96,13 +96,15 @@
                                  'title'], data['warning']['message'])
         return self.write(cr, uid, ids, data['value'], context)
 
-    def onchange_certificate_info(self, cr, uid, ids, cer_der_b64str,
-        key_der_b64str, password, context=None):
+    def onchange_certificate_info(self, cr, uid, ids, cer_der_b64str = None,
+        key_der_b64str = None, password = None, context = None):
         """
         @param cer_der_b64str : File .cer in Base 64
         @param key_der_b64str : File .key in Base 64
         @param password : Password inserted in the certificate configuration
         """
+        if context is None:
+            contex={}
         certificate_lib = self.pool.get('facturae.certificate.library')
         value = {}
         warning = {}
@@ -110,19 +112,18 @@
         certificate_key_file_pem = False
         invoice_obj = self.pool.get('account.invoice')
         if cer_der_b64str and key_der_b64str and password:
-
-            fname_cer_der = certificate_lib.b64str_to_tempfile(
+            fname_cer_der = certificate_lib.b64str_to_tempfile(cr, uid, ids,
                 cer_der_b64str, file_suffix='.der.cer',
-                file_prefix='openerp__' + (False or '') + '__ssl__', )
-            fname_key_der = certificate_lib.b64str_to_tempfile(
+                file_prefix='openerp__' + (False or '') + '__ssl__', context=context )
+            fname_key_der = certificate_lib.b64str_to_tempfile(cr, uid, ids,
                 key_der_b64str, file_suffix='.der.key',
-                file_prefix='openerp__' + (False or '') + '__ssl__', )
-            fname_password = certificate_lib.b64str_to_tempfile(
-                base64.encodestring(password), file_suffix='der.txt',
-                file_prefix='openerp__' + (False or '') + '__ssl__', )
-            fname_tmp = certificate_lib.b64str_to_tempfile(
+                file_prefix='openerp__' + (False or '') + '__ssl__', context=context)
+            fname_password = certificate_lib.b64str_to_tempfile(cr, uid, ids, 
+                base64.encodestring(password), file_suffix='der.txt', 
+                file_prefix='openerp__' + (False or '') + '__ssl__', context=context)
+            fname_tmp = certificate_lib.b64str_to_tempfile(cr, uid, ids,
                 '', file_suffix='tmp.txt', file_prefix='openerp__' + (
-                False or '') + '__ssl__', )
+                False or '') + '__ssl__', context=context)
 
             cer_pem = certificate_lib._transform_der_to_pem(
                 fname_cer_der, fname_tmp, type_der='cer')
@@ -132,11 +133,10 @@
                 fname_key_der, fname_tmp, fname_password, type_der='key')
             key_pem_b64 = base64.encodestring(key_pem)
 
-            # date_fmt_return='%Y-%m-%d %H:%M:%S'
             date_fmt_return = '%Y-%m-%d'
             serial = False
             try:
-                serial = certificate_lib._get_param_serial(
+                serial = certificate_lib._get_param_serial(cr, uid, ids,
                     fname_cer_der, fname_tmp, type='DER')
                 value.update({
                     'serial_number': serial,
@@ -146,7 +146,7 @@
             date_start = False
             date_end = False
             try:
-                dates = certificate_lib._get_param_dates(fname_cer_der,
+                dates = certificate_lib._get_param_dates(cr, uid, ids, fname_cer_der,
                     fname_tmp, date_fmt_return=date_fmt_return, type='DER')
                 date_start = dates.get('startdate', False)
                 date_end = dates.get('enddate', False)

=== modified file 'l10n_mx_facturae_lib/facturae_lib.py'
--- l10n_mx_facturae_lib/facturae_lib.py	2013-11-08 03:10:17 +0000
+++ l10n_mx_facturae_lib/facturae_lib.py	2013-12-04 17:14:19 +0000
@@ -34,6 +34,7 @@
 import time
 import tempfile
 import base64
+import binascii
 import logging
 _logger = logging.getLogger(__name__)
 from l10n_mx_facturae_lib import facturae_lib
@@ -64,6 +65,30 @@
     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)
+    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.')
+
+app_xsltproc_fullpath = os.path.join(xsltproc_path, app_xsltproc) or False
+try:
+    if not os.path.isfile(app_xsltproc_fullpath):
+        app_xsltproc_fullpath = tools.find_in_path(app_xsltproc) or False
+        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.')
+except Exception, e:
+    _logger.warning("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('Install xmlstarlet "sudo apt-get install xmlstarlet" to use l10n_mx_facturae_lib module.')
+
 def library_openssl_xsltproc_xmlstarlet(self, cr, uid, ids, context=None):
     if context is None:
         context = {}
@@ -103,12 +128,14 @@
     _auto = False
     # Agregar find subpath
 
-    def b64str_to_tempfile(self, cr, uid, ids, b64_str="", file_suffix="", file_prefix=""):
+    def b64str_to_tempfile(self, cr, uid, ids, b64_str=None, file_suffix=None, file_prefix=None, context=None):
         """
         @param b64_str : Text in Base_64 format for add in the file
         @param file_suffix : Sufix of the file
         @param file_prefix : Name of file in TempFile
         """
+        if context is None:
+            context = {}
         (fileno, fname) = tempfile.mkstemp(file_suffix, file_prefix)
         f = open(fname, 'wb')
         f.write(base64.decodestring(b64_str or ''))