Merge lp:~agilebg/openobject-italia/hurrinico-fix into lp:~a-camilli/openobject-italia/7.0_abi_cab

Proposed by Nicola Malcontenti - Agile BG
Status: Approved
Approved by: Alessandro Camilli
Approved revision: 225
Proposed branch: lp:~agilebg/openobject-italia/hurrinico-fix
Merge into: lp:~a-camilli/openobject-italia/7.0_abi_cab
Diff against target: 69 lines (+12/-9)
3 files modified
l10n_it_abicab/__init__.py (+1/-1)
l10n_it_abicab/__openerp__.py (+4/-5)
l10n_it_abicab/abicab.py (+7/-3)
To merge this branch: bzr merge lp:~agilebg/openobject-italia/hurrinico-fix
Reviewer Review Type Date Requested Status
Lorenzo Battistini (community) code review Approve
Alessandro Camilli Pending
Review via email: mp+218377@code.launchpad.net

Description of the change

Ciao,
Ho effettuato le modifiche richieste da Lorenzo nell'ultimo messaggio,
seguendo gli standard per la versione 7.

A presto.
-N.

To post a comment you must log in.
Revision history for this message
Lorenzo Battistini (elbati) :
review: Approve (code review)
Revision history for this message
Lorenzo Battistini (elbati) wrote :

Alessandro,
se vuoi mergiare devi eseguire
bzr merge lp:~agilebg/openobject-italia/hurrinico-fix
dentro il tuo branch

Unmerged revisions

225. By Hurrinico

[FIX] PEP8 Mod

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_it_abicab/__init__.py'
2--- l10n_it_abicab/__init__.py 2013-08-22 07:59:43 +0000
3+++ l10n_it_abicab/__init__.py 2014-05-06 10:24:20 +0000
4@@ -20,4 +20,4 @@
5 #
6 #############################################################################
7
8-import abicab
9\ No newline at end of file
10+import abicab
11
12=== modified file 'l10n_it_abicab/__openerp__.py'
13--- l10n_it_abicab/__openerp__.py 2013-08-22 07:59:43 +0000
14+++ l10n_it_abicab/__openerp__.py 2014-05-06 10:24:20 +0000
15@@ -26,13 +26,12 @@
16 'category': 'Localisation/Italy',
17 'description': """
18 Insert in the res.bank model the proprieties of the ABI/CAB
19- Utility to import italian bank from txt file
20+ Utility to import italian bank from txt file
21 """,
22 'author': 'OpenERP Italian Community',
23+ 'license': 'AGPL-3',
24 'depends': ['base'],
25 'website': 'http://www.openerp-italia.org/',
26- 'update_xml': ['abicab_view.xml'],
27+ 'data': ['abicab_view.xml'],
28 'installable': True,
29- 'active': False,
30- 'certificate': '',
31-}
32\ No newline at end of file
33+}
34
35=== modified file 'l10n_it_abicab/abicab.py'
36--- l10n_it_abicab/abicab.py 2013-08-22 07:59:43 +0000
37+++ l10n_it_abicab/abicab.py 2014-05-06 10:24:20 +0000
38@@ -22,6 +22,7 @@
39
40 from osv import fields, orm
41
42+
43 class res_bank(orm.Model):
44 _inherit = "res.bank"
45 _columns = {
46@@ -29,6 +30,7 @@
47 'cab': fields.char('CAB', size=5),
48 }
49
50+
51 class res_partner_bank(orm.Model):
52 _inherit = "res.partner.bank"
53 _columns = {
54@@ -37,10 +39,12 @@
55 }
56
57 def onchange_bank_id(self, cr, uid, ids, bank_id, context=None):
58- result = super(res_partner_bank, self).onchange_bank_id(cr, uid, ids, bank_id, context=context)
59+ result = super(
60+ res_partner_bank, self).onchange_bank_id(
61+ cr, uid, ids, bank_id, context=context)
62 if bank_id:
63- bank = self.pool.get('res.bank').browse(cr, uid, bank_id, context=context)
64+ bank = self.pool.get('res.bank').browse(
65+ cr, uid, bank_id, context=context)
66 result['value']['bank_abi'] = bank.abi
67 result['value']['bank_cab'] = bank.cab
68 return result
69-

Subscribers

People subscribed via source and target branches