Merge lp:~vauxoo/openerp-venezuela-localization/jose-control-number into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

Status: Merged
Merged at revision: 612
Proposed branch: lp:~vauxoo/openerp-venezuela-localization/jose-control-number
Merge into: lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk
Diff against target: 58 lines (+19/-12)
2 files modified
l10n_ve_fiscal_requirements/view/account_invoice_view.xml (+9/-3)
l10n_ve_fiscal_requirements/wizard/wizard_nro_ctrl_view.xml (+10/-9)
To merge this branch: bzr merge lp:~vauxoo/openerp-venezuela-localization/jose-control-number
Reviewer Review Type Date Requested Status
Gabriela Quilarque Approve
Review via email: mp+92511@code.launchpad.net

Description of the change

control number button

To post a comment you must log in.
Revision history for this message
Gabriela Quilarque (gabrielaquilarque97) wrote :

Merge realizado a la localización.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_ve_fiscal_requirements/view/account_invoice_view.xml'
2--- l10n_ve_fiscal_requirements/view/account_invoice_view.xml 2012-01-31 19:18:03 +0000
3+++ l10n_ve_fiscal_requirements/view/account_invoice_view.xml 2012-02-10 16:36:42 +0000
4@@ -34,8 +34,11 @@
5 <field name="type">form</field>
6 <field name="inherit_id" ref="account.invoice_supplier_form"/>
7 <field name="arch" type="xml">
8- <xpath expr="/form/notebook/page/field[@name='date_due']" position="after">
9- <field name="nro_ctrl" required="1"/>
10+ <xpath expr="/form/notebook/page/field[@name='check_total']" position="after">
11+ <group colspan="2">
12+ <field name="nro_ctrl" required="1"/>
13+ <button name="%(action_wiz_nroctrl)d" type='action' string='Change control number' icon="gtk-execute" />
14+ </group>
15 </xpath>
16 </field>
17 </record>
18@@ -63,7 +66,10 @@
19 <field name="inherit_id" ref="account.invoice_form"/>
20 <field name="arch" type="xml">
21 <xpath expr="/form/notebook/page/field[@name='payment_term']" position="after">
22- <field name="nro_ctrl" />
23+ <group colspan="2" >
24+ <field name="nro_ctrl" />
25+ <button name="%(action_wiz_nroctrl)d" type='action' string='Change control number' icon="gtk-execute" />
26+ </group>
27 </xpath>
28 </field>
29 </record>
30
31=== modified file 'l10n_ve_fiscal_requirements/wizard/wizard_nro_ctrl_view.xml'
32--- l10n_ve_fiscal_requirements/wizard/wizard_nro_ctrl_view.xml 2011-10-25 20:33:16 +0000
33+++ l10n_ve_fiscal_requirements/wizard/wizard_nro_ctrl_view.xml 2012-02-10 16:36:42 +0000
34@@ -15,15 +15,16 @@
35 </form>
36 </field>
37 </record>
38- <act_window
39- name="Change control number"
40- res_model="wiz.nroctrl"
41- src_model="account.invoice"
42- view_mode="form"
43- key2="client_action_multi"
44- target="new"
45- id="action_wiz_nroctrl"
46- />
47+
48+ <record id="action_wiz_nroctrl" model="ir.actions.act_window">
49+ <field name="name">Change control number</field>
50+ <field name="type">ir.actions.act_window</field>
51+ <field name="res_model">wiz.nroctrl</field>
52+ <field name="view_type">form</field>
53+ <field name="view_mode">form</field>
54+ <field name="target">new</field>
55+ </record>
56+
57 </data>
58 </openerp>
59