Openerp Venezuela

Merge lp:~vauxoo/openerp-venezuela-localization/ovl70-wh-rev-yani into lp:~vauxoo/openerp-venezuela-localization/ovl70-wh-rev-hbto

  1. ovl70-wh-rev-yani
  2. Merge into ovl70-wh-rev-hbto
Proposed by hbto [Vauxoo] http://www.vauxoo.com
Status: Merged
Merged at revision: 768
Proposed branch: lp:~vauxoo/openerp-venezuela-localization/ovl70-wh-rev-yani
Merge into: lp:~vauxoo/openerp-venezuela-localization/ovl70-wh-rev-hbto
Diff against target: 98 lines (+3/-13)
2 files modified
l10n_ve_withholding/view/account_view.xml (+3/-7)
l10n_ve_withholding/view/l10n_ve_withholding_view.xml (+0/-6)
To merge this branch: bzr merge lp:~vauxoo/openerp-venezuela-localization/ovl70-wh-rev-yani
Reviewer Review Type Date Requested Status
Vauxoo Pending
Review via email: mp+139040@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'l10n_ve_withholding/view/account_view.xml'
--- l10n_ve_withholding/view/account_view.xml 2012-12-05 10:06:09 +0000
+++ l10n_ve_withholding/view/account_view.xml 2012-12-10 17:15:25 +0000
@@ -5,7 +5,6 @@
5 <record id="view_move_line_form_iva" model="ir.ui.view">5 <record id="view_move_line_form_iva" model="ir.ui.view">
6 <field name="name">account.move.line.form.iva</field>6 <field name="name">account.move.line.form.iva</field>
7 <field name="model">account.move.line</field>7 <field name="model">account.move.line</field>
8 <field name="type">form</field>
9 <field name="inherit_id" ref="account.view_move_line_form"/>8 <field name="inherit_id" ref="account.view_move_line_form"/>
10 <field name="arch" type="xml">9 <field name="arch" type="xml">
11 <field name="state" position="after">10 <field name="state" position="after">
@@ -17,7 +16,6 @@
17 <record id="view_move_line_form_iva2" model="ir.ui.view">16 <record id="view_move_line_form_iva2" model="ir.ui.view">
18 <field name="name">account.move.line.form.iva2</field>17 <field name="name">account.move.line.form.iva2</field>
19 <field name="model">account.move.line</field>18 <field name="model">account.move.line</field>
20 <field name="type">form</field>
21 <field name="inherit_id" ref="account.view_move_line_form2"/>19 <field name="inherit_id" ref="account.view_move_line_form2"/>
22 <field name="arch" type="xml">20 <field name="arch" type="xml">
23 <field name="state" position="after">21 <field name="state" position="after">
@@ -29,8 +27,7 @@
29 <record id="view_move_line_tax_tree_iva" model="ir.ui.view">27 <record id="view_move_line_tax_tree_iva" model="ir.ui.view">
30 <field name="name">account.move.line.tax.tree.iva</field>28 <field name="name">account.move.line.tax.tree.iva</field>
31 <field name="model">account.move.line</field>29 <field name="model">account.move.line</field>
32 <field name="type">tree</field>30 <field name="inherit_id" ref="account.view_move_line_tree"/>
33 <field name="inherit_id" ref="account.view_move_line_tax_tree"/>
34 <field name="arch" type="xml">31 <field name="arch" type="xml">
35 <field name="state" position="after">32 <field name="state" position="after">
36 <field name="res_id" />33 <field name="res_id" />
@@ -44,14 +41,13 @@
44 <record id="view_move_form_iva" model="ir.ui.view">41 <record id="view_move_form_iva" model="ir.ui.view">
45 <field name="name">account.move.form.iva</field>42 <field name="name">account.move.form.iva</field>
46 <field name="model">account.move</field>43 <field name="model">account.move</field>
47 <field name="type">form</field>
48 <field name="inherit_id" ref="account.view_move_form"/>44 <field name="inherit_id" ref="account.view_move_form"/>
49 <field name="arch" type="xml">45 <field name="arch" type="xml">
50 <xpath expr='/form/notebook/page[@string="Journal Items"]/field[@name="line_id"]/form[@string="Journal Item"]/notebook/page[@string="Information"]/group/field[@name="blocked"]' position="after">46 <xpath expr='//sheet[@string="Journal Entries"]/notebook/page[@string="Journal Items"]/field[@name="line_id"]/form[@string="Journal Item"]/notebook/page[@string="Information"]/group/group[@string="States"]/field[@name="blocked"]' position="after">
51 <field name='res_id'/> 47 <field name='res_id'/>
52 </xpath>48 </xpath>
53 49
54 <xpath expr='/form/notebook/page[@string="Journal Items"]/field[@name="line_id"]/tree[@string="Journal Items"]/field[@name="state"]' position="after">50 <xpath expr='//sheet[@string="Journal Entries"]/notebook/page[@string="Journal Items"]/field[@name="line_id"]/tree[@string="Journal Items"]/field[@name="state"]' position="after">
55 <field name='res_id'/> 51 <field name='res_id'/>
56 </xpath>52 </xpath>
5753
5854
=== modified file 'l10n_ve_withholding/view/l10n_ve_withholding_view.xml'
--- l10n_ve_withholding/view/l10n_ve_withholding_view.xml 2012-12-05 10:06:09 +0000
+++ l10n_ve_withholding/view/l10n_ve_withholding_view.xml 2012-12-10 17:15:25 +0000
@@ -17,7 +17,6 @@
17 <record id="wh_inv_supplier" model="ir.ui.view">17 <record id="wh_inv_supplier" model="ir.ui.view">
18 <field name="name">account.invoice.supplier.wh.form</field>18 <field name="name">account.invoice.supplier.wh.form</field>
19 <field name="model">account.invoice</field>19 <field name="model">account.invoice</field>
20 <field name="type">form</field>
21 <field name="inherit_id" ref="account.invoice_supplier_form"/>20 <field name="inherit_id" ref="account.invoice_supplier_form"/>
22 <field name="arch" type="xml">21 <field name="arch" type="xml">
23 <xpath expr="//notebook/page[@string='Invoice']" position="after">22 <xpath expr="//notebook/page[@string='Invoice']" position="after">
@@ -37,7 +36,6 @@
37 <record id="wh_inv_customer" model="ir.ui.view">36 <record id="wh_inv_customer" model="ir.ui.view">
38 <field name="name">account.invoice.customer.wh.form</field>37 <field name="name">account.invoice.customer.wh.form</field>
39 <field name="model">account.invoice</field>38 <field name="model">account.invoice</field>
40 <field name="type">form</field>
41 <field name="inherit_id" ref="account.invoice_form"/>39 <field name="inherit_id" ref="account.invoice_form"/>
42 <field name="arch" type="xml">40 <field name="arch" type="xml">
43 <xpath expr="//page[@string='Invoice Lines']" position="after">41 <xpath expr="//page[@string='Invoice Lines']" position="after">
@@ -57,7 +55,6 @@
57 <record id="wh_partner" model="ir.ui.view">55 <record id="wh_partner" model="ir.ui.view">
58 <field name="name">res.partner.form.wh</field>56 <field name="name">res.partner.form.wh</field>
59 <field name="model">res.partner</field>57 <field name="model">res.partner</field>
60 <field name="type">form</field>
61 <field name="inherit_id" ref="base.view_partner_form"/>58 <field name="inherit_id" ref="base.view_partner_form"/>
62 <field name="arch" type="xml">59 <field name="arch" type="xml">
63 <xpath expr="//page[@string='Internal Notes']" position="after">60 <xpath expr="//page[@string='Internal Notes']" position="after">
@@ -81,7 +78,6 @@
81 <record id="view_account_wh_doc_tree" model="ir.ui.view">78 <record id="view_account_wh_doc_tree" model="ir.ui.view">
82 <field name="name">account.wh.doc.tree</field>79 <field name="name">account.wh.doc.tree</field>
83 <field name="model">account.wh.doc</field>80 <field name="model">account.wh.doc</field>
84 <field name="type">tree</field>
85 <field name="arch" type="xml">81 <field name="arch" type="xml">
86 <tree string="Documents">82 <tree string="Documents">
87 <field name="model_parent" select="1"/>83 <field name="model_parent" select="1"/>
@@ -92,7 +88,6 @@
92 <record id="view_account_wh_doc_form" model="ir.ui.view">88 <record id="view_account_wh_doc_form" model="ir.ui.view">
93 <field name="name">account.wh.doc.form</field>89 <field name="name">account.wh.doc.form</field>
94 <field name="model">account.wh.doc</field>90 <field name="model">account.wh.doc</field>
95 <field name="type">form</field>
96 <field name="arch" type="xml">91 <field name="arch" type="xml">
97 <form string="Documents">92 <form string="Documents">
98 <field name="model_parent" select="1"/>93 <field name="model_parent" select="1"/>
@@ -105,7 +100,6 @@
105 <field name="name">Withholdings Document</field>100 <field name="name">Withholdings Document</field>
106 <field name="type">ir.actions.act_window</field> 101 <field name="type">ir.actions.act_window</field>
107 <field name="res_model">account.wh.doc</field>102 <field name="res_model">account.wh.doc</field>
108 <field name="view_type">form</field>
109 <field name="view_mode">tree,form</field>103 <field name="view_mode">tree,form</field>
110 <field name="help">Create and manage the withholding documents in account move line.</field> 104 <field name="help">Create and manage the withholding documents in account move line.</field>
111 </record>105 </record>

Subscribers

People subscribed via source and target branches

to all changes: