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
=== modified file 'l10n_ve_fiscal_requirements/view/account_invoice_view.xml'
--- l10n_ve_fiscal_requirements/view/account_invoice_view.xml 2012-01-31 19:18:03 +0000
+++ l10n_ve_fiscal_requirements/view/account_invoice_view.xml 2012-02-10 16:36:42 +0000
@@ -34,8 +34,11 @@
34 <field name="type">form</field>34 <field name="type">form</field>
35 <field name="inherit_id" ref="account.invoice_supplier_form"/>35 <field name="inherit_id" ref="account.invoice_supplier_form"/>
36 <field name="arch" type="xml">36 <field name="arch" type="xml">
37 <xpath expr="/form/notebook/page/field[@name='date_due']" position="after">37 <xpath expr="/form/notebook/page/field[@name='check_total']" position="after">
38 <field name="nro_ctrl" required="1"/>38 <group colspan="2">
39 <field name="nro_ctrl" required="1"/>
40 <button name="%(action_wiz_nroctrl)d" type='action' string='Change control number' icon="gtk-execute" />
41 </group>
39 </xpath>42 </xpath>
40 </field>43 </field>
41 </record>44 </record>
@@ -63,7 +66,10 @@
63 <field name="inherit_id" ref="account.invoice_form"/>66 <field name="inherit_id" ref="account.invoice_form"/>
64 <field name="arch" type="xml">67 <field name="arch" type="xml">
65 <xpath expr="/form/notebook/page/field[@name='payment_term']" position="after">68 <xpath expr="/form/notebook/page/field[@name='payment_term']" position="after">
66 <field name="nro_ctrl" />69 <group colspan="2" >
70 <field name="nro_ctrl" />
71 <button name="%(action_wiz_nroctrl)d" type='action' string='Change control number' icon="gtk-execute" />
72 </group>
67 </xpath>73 </xpath>
68 </field>74 </field>
69 </record>75 </record>
7076
=== modified file 'l10n_ve_fiscal_requirements/wizard/wizard_nro_ctrl_view.xml'
--- l10n_ve_fiscal_requirements/wizard/wizard_nro_ctrl_view.xml 2011-10-25 20:33:16 +0000
+++ l10n_ve_fiscal_requirements/wizard/wizard_nro_ctrl_view.xml 2012-02-10 16:36:42 +0000
@@ -15,15 +15,16 @@
15 </form>15 </form>
16 </field>16 </field>
17 </record>17 </record>
18 <act_window 18
19 name="Change control number" 19 <record id="action_wiz_nroctrl" model="ir.actions.act_window">
20 res_model="wiz.nroctrl" 20 <field name="name">Change control number</field>
21 src_model="account.invoice"21 <field name="type">ir.actions.act_window</field>
22 view_mode="form"22 <field name="res_model">wiz.nroctrl</field>
23 key2="client_action_multi"23 <field name="view_type">form</field>
24 target="new" 24 <field name="view_mode">form</field>
25 id="action_wiz_nroctrl"25 <field name="target">new</field>
26 />26 </record>
27
27 </data>28 </data>
28</openerp>29</openerp>
2930