Merge lp:~cmsa/openerp-pt/openerp-pt-cmsa into lp:openerp-pt/5.0

Proposed by Carlos Almeida
Status: Merged
Merged at revision: 38
Proposed branch: lp:~cmsa/openerp-pt/openerp-pt-cmsa
Merge into: lp:openerp-pt/5.0
Diff against target: 18 lines (+1/-2)
1 file modified
l10n_pt_certificacao_financas/certificacao.py (+1/-2)
To merge this branch: bzr merge lp:~cmsa/openerp-pt/openerp-pt-cmsa
Reviewer Review Type Date Requested Status
Carlos Almeida Approve
Review via email: mp+40085@code.launchpad.net

Description of the change

Teste 4

To post a comment you must log in.
Revision history for this message
Carlos Almeida (cmsa) wrote :

ok remoção de um comentário

review: Approve
lp:~cmsa/openerp-pt/openerp-pt-cmsa updated
38. By Carlos Almeida

Merge from openerp-pt-cmsa

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'l10n_pt_certificacao_financas/certificacao.py'
--- l10n_pt_certificacao_financas/certificacao.py 2010-10-27 02:22:11 +0000
+++ l10n_pt_certificacao_financas/certificacao.py 2010-11-04 13:07:34 +0000
@@ -21,7 +21,6 @@
21##############################################################################21##############################################################################
22from osv import osv22from osv import osv
23from M2Crypto import RSA23from M2Crypto import RSA
24#import M2Crypto
25import binascii24import binascii
2625
27# Key file must be found in openerp/server/bin/keys26# Key file must be found in openerp/server/bin/keys
@@ -112,4 +111,4 @@
112 for field in fixed:111 for field in fixed:
113 if field in vals:112 if field in vals:
114 vals.pop(field)113 vals.pop(field)
115"""
116\ No newline at end of file114\ No newline at end of file
115"""

Subscribers

People subscribed via source and target branches