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

[Miguel Delgado (Vauxoo)]

fix bug 938354

=== 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 @@
 class inherited_invoice(osv.osv):
     _inherit = "account.invoice"
     _columns = {
-        'date_document': fields.date("Document Date", 
-                                help="Administrative date", 
-                                        select=True),
         'date_invoice': fields.date('Fecha Contable', 
                                     states={'open':[('readonly',True)],
                                     'close':[('readonly',True)],

=== 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record model="ir.ui.view" id="inherited_account_invoice_form_fiscal">
-            <field name="name">account.invoice.inherit.fiscal</field>
-            <field name="model">account.invoice</field>
-            <field name="inherit_id" ref="account.invoice_form"/>
-            <field name="arch" type="xml">
-                <data>
-                    <field name="date_invoice" position="after">
-                        <field name="date_document"/>
-                    </field>
-                </data>
-            </field>
-        </record>
-        
         <record model="ir.ui.view" id="inherited_account_invoice_form_fiscal2">
             <field name="name">account.invoice.inherit.fiscal2</field>
             <field name="model">account.invoice</field>
@@ -22,9 +9,6 @@
                 <xpath expr="/form/group/group" position="after">
                     <field name="expedient" attrs="{'readonly':[('type','in',['out_invoice','out_refund'])]}"/>
                 </xpath>
-                <xpath expr='//field[@name="date_due"]' position="after">
-                    <field name="date_document"/>
-                </xpath>
             </field>
         </record>
     </data>

=== 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 @@
         </record>
 
 
-
-
-
+        <record model="ir.ui.view" id="inherited_account_invoice_form_fiscal">
+            <field name="name">account.invoice.inherit.fiscal</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='date_invoice']" position="after">
+                    <field name="date_document"/>
+                </xpath>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="inherited_account_invoice_form_fiscal3">
+            <field name="name">account.invoice.inherit.fiscal3</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_supplier_form"/>
+            <field name="arch" type="xml">
+                <xpath expr='//field[@name="date_due"]' position="after">
+                    <field name="date_document"/>
+                </xpath>
+            </field>
+        </record>
 
     </data>
 </openerp>

=== 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 @@
         'sin_cred': fields.boolean('Tax-exempt?', readonly=False, help="Set it true if the invoice is V.A.T. exempt"),
         '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.'),
         'child_ids':fields.one2many('account.invoice', 'parent_id', 'Debit and Credit Notes', readonly=True, states={'draft':[('readonly',False)]}),
+        'date_document': fields.date("Document Date",help="Administrative date",select=True),
     }