Merge lp:~acysos-team/sepa-tools/sepa-tools-fix-odoo into lp:sepa-tools

Proposed by Ignacio Ibeas (www.acysos.com) on 2014-06-25
Status: Needs review
Proposed branch: lp:~acysos-team/sepa-tools/sepa-tools-fix-odoo
Merge into: lp:sepa-tools
Diff against target: 61 lines (+9/-9)
4 files modified
account_payment_direct_debit/model/account_payment.py (+2/-2)
account_payment_direct_debit/model/payment_line.py (+2/-2)
account_payment_sepa_direct_debit/__openerp__.py (+1/-1)
account_payment_sepa_direct_debit/security/ir.model.access.csv (+4/-4)
To merge this branch: bzr merge lp:~acysos-team/sepa-tools/sepa-tools-fix-odoo
Reviewer Review Type Date Requested Status
Pedro Manuel Baeza code review 2014-06-25 Approve on 2014-06-25
Review via email: mp+224444@code.launchpad.net

Description of the change

Added compatibility for Odoo.

To post a comment you must log in.
Pedro Manuel Baeza (pedro.baeza) wrote :

LGTM.

Un saludo.

review: Approve (code review)

Unmerged revisions

8. By Ignacio Ibeas (www.acysos.com) on 2014-06-25

[FIX] Compatibility with Odoo

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_payment_direct_debit/model/account_payment.py'
2--- account_payment_direct_debit/model/account_payment.py 2014-02-09 12:20:04 +0000
3+++ account_payment_direct_debit/model/account_payment.py 2014-06-25 13:09:16 +0000
4@@ -1,7 +1,7 @@
5 # -*- coding: utf-8 -*-
6 from openerp.osv import orm, fields
7-import netsvc
8-from tools.translate import _
9+from openerp import netsvc
10+from openerp.tools.translate import _
11
12 class payment_order(orm.Model):
13 _inherit = 'payment.order'
14
15=== modified file 'account_payment_direct_debit/model/payment_line.py'
16--- account_payment_direct_debit/model/payment_line.py 2014-02-09 12:20:04 +0000
17+++ account_payment_direct_debit/model/payment_line.py 2014-06-25 13:09:16 +0000
18@@ -1,7 +1,7 @@
19 # -*- coding: utf-8 -*-
20 from openerp.osv import orm, fields
21-import netsvc
22-from tools.translate import _
23+from openerp import netsvc
24+from openerp.tools.translate import _
25
26 class payment_line(orm.Model):
27 _inherit = 'payment.line'
28
29=== modified file 'account_payment_sepa_direct_debit/__openerp__.py'
30--- account_payment_sepa_direct_debit/__openerp__.py 2014-03-05 07:15:34 +0000
31+++ account_payment_sepa_direct_debit/__openerp__.py 2014-06-25 13:09:16 +0000
32@@ -34,6 +34,7 @@
33 # },
34 'data': [
35 'security/original_mandate_required_security.xml',
36+ 'security/ir.model.access.csv',
37 'account_banking_sdd_view.xml',
38 'sdd_mandate_view.xml',
39 'res_partner_bank_view.xml',
40@@ -44,7 +45,6 @@
41 'wizard/export_sdd_view.xml',
42 'data/payment_type_sdd.xml',
43 'data/mandate_reference_sequence.xml',
44- 'security/ir.model.access.csv',
45 'sdd_report.xml',
46 ],
47 'description': '''
48
49=== modified file 'account_payment_sepa_direct_debit/security/ir.model.access.csv'
50--- account_payment_sepa_direct_debit/security/ir.model.access.csv 2014-02-09 12:20:04 +0000
51+++ account_payment_sepa_direct_debit/security/ir.model.access.csv 2014-06-25 13:09:16 +0000
52@@ -1,4 +1,4 @@
53-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
54-"access_banking_export_sdd","Full access on banking.export.sdd","model_banking_export_sdd","account_payment.group_account_payment",1,1,1,1
55-"access_sdd_mandate","Full access on sdd.mandate","model_sdd_mandate","account_payment.group_account_payment",1,1,1,1
56-"access_sdd_mandate_read","Read access on sdd.mandate","model_sdd_mandate","base.group_user",1,0,0,0
57+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
58+access_banking_export_sdd,Full access on banking.export.sdd,model_banking_export_sdd,account_payment.group_account_payment,1,1,1,1
59+access_sdd_mandate,Full access on sdd.mandate,model_sdd_mandate,account_payment.group_account_payment,1,1,1,1
60+access_sdd_mandate_read,Read access on sdd.mandate,model_sdd_mandate,base.group_user,1,0,0,0
61\ No newline at end of file

Subscribers

People subscribed via source and target branches