Openerp Venezuela

Merge lp:~vauxoo/openerp-venezuela-localization/miguel-bug-938354 into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

  1. miguel-bug-938354
  2. Merge into 6.0-trunk
Proposed by Miguel Delgado (Vauxoo)
Status: Merged
Merge reported by: hbto [Vauxoo] http://www.vauxoo.com
Merged at revision: not available
Proposed branch: lp:~vauxoo/openerp-venezuela-localization/miguel-bug-938354
Merge into: lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk
Diff against target: 92 lines (+22/-22)
4 files modified
l10n_ve_fiscal_reports/invoice.py (+0/-3)
l10n_ve_fiscal_reports/invoice_view.xml (+0/-16)
l10n_ve_fiscal_requirements/account_invoice_view.xml (+21/-3)
l10n_ve_fiscal_requirements/invoice.py (+1/-0)
To merge this branch: bzr merge lp:~vauxoo/openerp-venezuela-localization/miguel-bug-938354
Reviewer Review Type Date Requested Status
Gabriela Quilarque Pending
Review via email: mp+94260@code.launchpad.net

Description of the change

fix bug 938354

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_fiscal_reports/invoice.py'
--- l10n_ve_fiscal_reports/invoice.py 2011-12-29 04:02:48 +0000
+++ l10n_ve_fiscal_reports/invoice.py 2012-02-22 19:37:03 +0000
@@ -33,9 +33,6 @@
33class inherited_invoice(osv.osv):33class inherited_invoice(osv.osv):
34 _inherit = "account.invoice"34 _inherit = "account.invoice"
35 _columns = {35 _columns = {
36 'date_document': fields.date("Document Date",
37 help="Administrative date",
38 select=True),
39 'date_invoice': fields.date('Fecha Contable', 36 'date_invoice': fields.date('Fecha Contable',
40 states={'open':[('readonly',True)],37 states={'open':[('readonly',True)],
41 'close':[('readonly',True)],38 'close':[('readonly',True)],
4239
=== modified file 'l10n_ve_fiscal_reports/invoice_view.xml'
--- l10n_ve_fiscal_reports/invoice_view.xml 2012-02-07 03:14:19 +0000
+++ l10n_ve_fiscal_reports/invoice_view.xml 2012-02-22 19:37:03 +0000
@@ -1,19 +1,6 @@
1<?xml version="1.0" encoding="utf-8"?>1<?xml version="1.0" encoding="utf-8"?>
2<openerp>2<openerp>
3 <data>3 <data>
4 <record model="ir.ui.view" id="inherited_account_invoice_form_fiscal">
5 <field name="name">account.invoice.inherit.fiscal</field>
6 <field name="model">account.invoice</field>
7 <field name="inherit_id" ref="account.invoice_form"/>
8 <field name="arch" type="xml">
9 <data>
10 <field name="date_invoice" position="after">
11 <field name="date_document"/>
12 </field>
13 </data>
14 </field>
15 </record>
16
17 <record model="ir.ui.view" id="inherited_account_invoice_form_fiscal2">4 <record model="ir.ui.view" id="inherited_account_invoice_form_fiscal2">
18 <field name="name">account.invoice.inherit.fiscal2</field>5 <field name="name">account.invoice.inherit.fiscal2</field>
19 <field name="model">account.invoice</field>6 <field name="model">account.invoice</field>
@@ -22,9 +9,6 @@
22 <xpath expr="/form/group/group" position="after">9 <xpath expr="/form/group/group" position="after">
23 <field name="expedient" attrs="{'readonly':[('type','in',['out_invoice','out_refund'])]}"/>10 <field name="expedient" attrs="{'readonly':[('type','in',['out_invoice','out_refund'])]}"/>
24 </xpath>11 </xpath>
25 <xpath expr='//field[@name="date_due"]' position="after">
26 <field name="date_document"/>
27 </xpath>
28 </field>12 </field>
29 </record>13 </record>
30 </data>14 </data>
3115
=== modified file 'l10n_ve_fiscal_requirements/account_invoice_view.xml'
--- l10n_ve_fiscal_requirements/account_invoice_view.xml 2012-01-26 22:12:56 +0000
+++ l10n_ve_fiscal_requirements/account_invoice_view.xml 2012-02-22 19:37:03 +0000
@@ -90,9 +90,27 @@
90 </record>90 </record>
9191
9292
9393 <record model="ir.ui.view" id="inherited_account_invoice_form_fiscal">
9494 <field name="name">account.invoice.inherit.fiscal</field>
9595 <field name="model">account.invoice</field>
96 <field name="inherit_id" ref="account.invoice_form"/>
97 <field name="arch" type="xml">
98 <xpath expr="//field[@name='date_invoice']" position="after">
99 <field name="date_document"/>
100 </xpath>
101 </field>
102 </record>
103
104 <record model="ir.ui.view" id="inherited_account_invoice_form_fiscal3">
105 <field name="name">account.invoice.inherit.fiscal3</field>
106 <field name="model">account.invoice</field>
107 <field name="inherit_id" ref="account.invoice_supplier_form"/>
108 <field name="arch" type="xml">
109 <xpath expr='//field[@name="date_due"]' position="after">
110 <field name="date_document"/>
111 </xpath>
112 </field>
113 </record>
96114
97 </data>115 </data>
98</openerp>116</openerp>
99117
=== modified file 'l10n_ve_fiscal_requirements/invoice.py'
--- l10n_ve_fiscal_requirements/invoice.py 2012-01-02 16:27:26 +0000
+++ l10n_ve_fiscal_requirements/invoice.py 2012-02-22 19:37:03 +0000
@@ -33,6 +33,7 @@
33 'sin_cred': fields.boolean('Tax-exempt?', readonly=False, help="Set it true if the invoice is V.A.T. exempt"),33 'sin_cred': fields.boolean('Tax-exempt?', readonly=False, help="Set it true if the invoice is V.A.T. exempt"),
34 'parent_id':fields.many2one('account.invoice', 'Parent Invoice', readonly=True, states={'draft':[('readonly',False)]}, help='When this field has information, this invoice is a credit note or debit note. This field is used to reference to the invoice that originated this credit note or debit note.'),34 'parent_id':fields.many2one('account.invoice', 'Parent Invoice', readonly=True, states={'draft':[('readonly',False)]}, help='When this field has information, this invoice is a credit note or debit note. This field is used to reference to the invoice that originated this credit note or debit note.'),
35 'child_ids':fields.one2many('account.invoice', 'parent_id', 'Debit and Credit Notes', readonly=True, states={'draft':[('readonly',False)]}),35 'child_ids':fields.one2many('account.invoice', 'parent_id', 'Debit and Credit Notes', readonly=True, states={'draft':[('readonly',False)]}),
36 'date_document': fields.date("Document Date",help="Administrative date",select=True),
36 }37 }
37 38
38 39