Merge lp:~vauxoo/openerp-mexico-localization/7.0-l10n_mx_facturae_lib-dev-murillo into lp:openerp-mexico-localization/7.0

Proposed by Alejandro Ramirez Murillo
Status: Merged
Approved by: Jorge Angel Naranjo Rogel - http://www.vauxoo.com
Approved revision: 380
Merged at revision: 380
Proposed branch: lp:~vauxoo/openerp-mexico-localization/7.0-l10n_mx_facturae_lib-dev-murillo
Merge into: lp:openerp-mexico-localization/7.0
Diff against target: 47 lines (+4/-5)
1 file modified
l10n_mx_facturae_lib/facturae_lib.py (+4/-5)
To merge this branch: bzr merge lp:~vauxoo/openerp-mexico-localization/7.0-l10n_mx_facturae_lib-dev-murillo
Reviewer Review Type Date Requested Status
Moisés López - http://www.vauxoo.com Pending
Jorge Angel Naranjo Rogel - http://www.vauxoo.com Pending
Review via email: mp+234166@code.launchpad.net

Description of the change

fixed up the bug of autoimport into file facturae_lib

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_mx_facturae_lib/facturae_lib.py'
2--- l10n_mx_facturae_lib/facturae_lib.py 2014-04-07 17:51:59 +0000
3+++ l10n_mx_facturae_lib/facturae_lib.py 2014-09-10 17:57:12 +0000
4@@ -37,7 +37,6 @@
5 import binascii
6 import logging
7 _logger = logging.getLogger(__name__)
8-from l10n_mx_facturae_lib import facturae_lib
9
10 all_paths = tools.config["addons_path"].split(",")
11 for my_path in all_paths:
12@@ -215,7 +214,7 @@
13 """
14 if context is None:
15 context = {}
16- msj, app_xsltproc_fullpath, app_openssl_fullpath, app_xmlstarlet_fullpath = facturae_lib.library_openssl_xsltproc_xmlstarlet(cr, uid, ids, context)
17+ msj, app_xsltproc_fullpath, app_openssl_fullpath, app_xmlstarlet_fullpath = library_openssl_xsltproc_xmlstarlet(cr, uid, ids, context)
18 if not app_xsltproc_fullpath:
19 raise osv.except_osv(_("Error!"), _(
20 "Failed to find in path '%s' app. This app is required for sign Mexican Electronic Invoice"%(app_xsltproc) ))
21@@ -282,7 +281,7 @@
22 """
23 if context is None:
24 context = {}
25- msj, app_xsltproc_fullpath, app_openssl_fullpath, app_xmlstarlet_fullpath = facturae_lib.library_openssl_xsltproc_xmlstarlet(cr, uid, ids, context)
26+ msj, app_xsltproc_fullpath, app_openssl_fullpath, app_xmlstarlet_fullpath = library_openssl_xsltproc_xmlstarlet(cr, uid, ids, context)
27 if not app_openssl_fullpath:
28 raise osv.except_osv(_("Error!"), _(
29 "Failed to find in path '%s' app. This app is required for sign Mexican Electronic Invoice"%(app_openssl) ))
30@@ -311,7 +310,7 @@
31 if context is None:
32 context = {}
33 msj, app_xsltproc_fullpath, app_openssl_fullpath, app_xmlstarlet_fullpath = \
34- facturae_lib.library_openssl_xsltproc_xmlstarlet(cr, uid, ids, context)
35+ library_openssl_xsltproc_xmlstarlet(cr, uid, ids, context)
36 result = ""
37 cmd = ''
38 if type_key == 'PEM':
39@@ -336,7 +335,7 @@
40 #xmlstarlet val -e --xsd cfdv2.xsd cfd_example.xml
41 if context is None:
42 context = {}
43- msj, app_xsltproc_fullpath, app_openssl_fullpath, app_xmlstarlet_fullpath = facturae_lib.library_openssl_xsltproc_xmlstarlet(cr, uid, ids, context)
44+ msj, app_xsltproc_fullpath, app_openssl_fullpath, app_xmlstarlet_fullpath = library_openssl_xsltproc_xmlstarlet(cr, uid, ids, context)
45 if app_xmlstarlet_fullpath:
46 cmd = ''
47 if type_scheme == 'xsd':