Merge lp:~elbati/openobject-italia/7.0_fix_wizard_vat_statement into lp:~openobject-italia-core-devs/openobject-italia/italian-addons-7.0

Proposed by Lorenzo Battistini
Status: Merged
Merged at revision: 227
Proposed branch: lp:~elbati/openobject-italia/7.0_fix_wizard_vat_statement
Merge into: lp:~openobject-italia-core-devs/openobject-italia/italian-addons-7.0
Diff against target: 38 lines (+10/-5)
2 files modified
account_vat_period_end_statement/wizard/add_period.py (+1/-1)
account_vat_period_end_statement/wizard/add_period.xml (+9/-4)
To merge this branch: bzr merge lp:~elbati/openobject-italia/7.0_fix_wizard_vat_statement
Reviewer Review Type Date Requested Status
Alex Comba - Agile BG (community) Approve
Review via email: mp+167273@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alex Comba - Agile BG (tafaru) wrote :

LGTM, no test.

Revision history for this message
Alex Comba - Agile BG (tafaru) wrote :

LGTM, no test.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_vat_period_end_statement/wizard/add_period.py'
2--- account_vat_period_end_statement/wizard/add_period.py 2013-04-27 21:58:51 +0000
3+++ account_vat_period_end_statement/wizard/add_period.py 2013-06-04 13:45:38 +0000
4@@ -25,7 +25,7 @@
5 from openerp.osv import orm, fields
6 from tools.translate import _
7
8-class add_period(orm.Model):
9+class add_period(orm.TransientModel):
10
11 _name = 'add.period.to.vat.statement'
12
13
14=== modified file 'account_vat_period_end_statement/wizard/add_period.xml'
15--- account_vat_period_end_statement/wizard/add_period.xml 2013-03-16 13:18:33 +0000
16+++ account_vat_period_end_statement/wizard/add_period.xml 2013-06-04 13:45:38 +0000
17@@ -6,12 +6,17 @@
18 <field name="model">add.period.to.vat.statement</field>
19 <field name="type">form</field>
20 <field name="arch" type="xml">
21- <form string="Add period">
22- <field name="period_id"></field>
23- <group col="2" colspan="4">
24+ <form string="Add period" version="7.0">
25+ <group>
26+ <label for="period_id"/>
27+ <div>
28+ <field name="period_id" class="oe_inline"></field>
29+ </div>
30+ </group>
31+ <footer>
32 <button icon="gtk-cancel" special="cancel" string="Cancel"/>
33 <button icon="gtk-ok" name="add_period" string="Add" type="object"/>
34- </group>
35+ </footer>
36 </form>
37 </field>
38 </record>

Subscribers

People subscribed via source and target branches