Merge lp:~vauxoo/openerp-venezuela-localization/gaby_fiscal_reports into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

[Gabriela Quilarque]

Added search view:
-Sale Withholding Book
-Purchase Withholding Book
-Adjustment Book.
-Purchase Book.
-Sale Book.

[lp:~vauxoo/openerp-venezuela-localization/gaby_fiscal_reports]

609. By Vauxoo on 2012-02-08

[IMP] Deleted prints.

[Gabriela Quilarque (gabrielaquilarque97)]

Merge Realizado Gaby.

review: Approve

=== modified file 'l10n_ve_fiscal_reports/adjustment_book.xml'
--- l10n_ve_fiscal_reports/adjustment_book.xml	2011-12-29 04:02:48 +0000
+++ l10n_ve_fiscal_reports/adjustment_book.xml	2012-02-08 17:05:51 +0000
@@ -8,6 +8,29 @@
     =====================================================
     -->
 
+        <record id="view_adjustment_book_search" model="ir.ui.view">
+            <field name="name">adjustment.book.search</field>
+            <field name="model">adjustment.book</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Adjustment Book">
+                   <group col="10" colspan="4">
+                        <field name="name"/>
+                        <field name="type"/>
+                        <field name="period_id"/>
+                        <field name="note"/>
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By...">
+                        <separator orientation="vertical"/>
+                        <filter string="Periodo" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'period_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Tipo" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'type'}"/>
+                    </group>
+               </search>
+            </field>
+        </record>
+
         <record id="view_adjustment_book_line_line_form" model="ir.ui.view">
             <field name="name">adjustment.book.line.form</field>
             <field name="model">adjustment.book.line</field>
@@ -18,7 +41,7 @@
                         <field name="date_accounting" select="1"/>
                         <field name="date_admin" select="1"/>
                         <field name="vat" select="1"/>
-                        <field name="partner" select="1"/>
+                        <field name="partner"/>
                         <field name="invoice_number" select="1"/>
                         <field name="control_number" select="1"/>
                         <field name="amount"/>
@@ -184,6 +207,8 @@
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_adjustment_book_search"/>
+            <field name="help">A través del presente libro usted podrá registrar los montos que conllevan algun tipo de ajustes de acuerdo a un periodo seleccionado, asimismo podrá gestionar los datos relacionados al ajuste realizado. Los datos registrados a continuación serán mostrados en el libro de compras y ventas según sea el caso.</field>
         </record>
         
         <record model="ir.actions.act_window.view" id="action_adjustment_book_tree">

=== modified file 'l10n_ve_fiscal_reports/fiscal_report_purchase_view.xml'
--- l10n_ve_fiscal_reports/fiscal_report_purchase_view.xml	2012-01-30 17:27:11 +0000
+++ l10n_ve_fiscal_reports/fiscal_report_purchase_view.xml	2012-02-08 17:05:51 +0000
@@ -7,39 +7,24 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Purchase Invoices">
-                    <group colspan="6">
+                   <group col="10" colspan="4">
+                        <field name="rp_id"/>
                         <field name="ai_nro_ctrl"/>
+                        <field name="ai_id"/>
+                        <field name="rp_vat"/>
                         <field name="ai_reference"/>
-                        <field name="rp_vat"/>
-                        <field name="rp_id"/>
+                        <newline/>
+                        <field name="ai_amount_total"/>
+                        <field name="ai_amount_untaxed"/>
+                        <field name="ai_date_invoice"/>
+                        <field name="ar_date_document"/>
                     </group>
                     <newline/>
-                    <group colspan="6">
-                        <field name="ar_date_document"/>
-                        <field name="ai_date_invoice"/>
+                    <group expand="1" string="Group By...">
+                        <filter string="Empresa" icon="terp-partner" domain="[]" context="{'group_by':'rp_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Fecha Factura" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'ai_date_invoice'}"/>
                     </group>
-<!--                   <group col="10" colspan="4">-->
-<!--                        -->
-<!--                        <filter name="draft" icon="terp-gtk-media-pause" string="Draft" domain="[('state','=','draft')]" help="Draft Withholding Income"/>-->
-<!--                        <filter name="confirmed" icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Withholding Income"/>-->
-<!--                        <filter name="done" icon="terp-check" string="Done" domain="[('state','=','done')]" help="Done Withholding Income"/>-->
-<!--                        <filter name="cancel" icon="terp-dialog-close" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Withholding Income"/>-->
-<!--                        <separator orientation="vertical"/>-->
-<!--                        <field name="code"/>-->
-<!--                        <field name="partner_id"/>-->
-<!--                        <field name="journal_id"  select="1" widget="selection" string="Journal"/>-->
-<!--                        <field name="user_id" select="1" widget="selection" string="Salesman">-->
-<!--                        <filter domain="[('user_id','=',uid)]" help="My Withholding Income" icon="terp-personal" separator="1"/>-->
-<!--                        </field>-->
-<!--                    </group>-->
-<!--                    <newline/>-->
-<!--                    <group expand="1" string="Group By...">-->
-<!--                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>-->
-<!--                        <separator orientation="vertical"/>-->
-<!--                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>-->
-<!--                        <separator orientation="vertical"/>-->
-<!--                        <filter string="Accounting Date of Withhold" icon="terp-go-month" domain="[]"  context="{'group_by':'date_ret'}"/>-->
-<!--                    </group>-->
                </search>
             </field>
         </record>

=== modified file 'l10n_ve_fiscal_reports/fiscal_report_sale_view.xml'
--- l10n_ve_fiscal_reports/fiscal_report_sale_view.xml	2012-01-30 15:24:13 +0000
+++ l10n_ve_fiscal_reports/fiscal_report_sale_view.xml	2012-02-08 17:05:51 +0000
@@ -1,6 +1,34 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+        
+        <record id="view_fiscal_reports_sale_search" model="ir.ui.view">
+            <field name="name">fiscal.reports.sale.search</field>
+            <field name="model">fiscal.reports.sale</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Book Sale">
+                   <group col="10" colspan="4">
+                        <field name="rp_id"/>
+                        <field name="ai_nro_ctrl"/>
+                        <field name="ai_id"/>
+                        <field name="rp_vat"/>
+                        <field name="ai_reference"/>
+                        <newline/>
+                        <field name="ai_amount_total"/>
+                        <field name="ai_amount_untaxed"/>
+                        <field name="ai_date_invoice"/>
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By...">
+                        <filter string="Empresa" icon="terp-partner" domain="[]" context="{'group_by':'rp_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Fecha Factura" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'ai_date_invoice'}"/>
+                    </group>
+               </search>
+            </field>
+        </record>
+        
         <record model="ir.ui.view" id="view_fiscal_reports_sale_form">
             <field name="name">fiscal.reports.sale.form</field>
             <field name="model">fiscal.reports.sale</field>
@@ -50,6 +78,7 @@
         <field name="res_model">fiscal.reports.sale</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
+        <field name="search_view_id" ref="view_fiscal_reports_sale_search"/>
         <field name="help">In this list you will find all invoices in a period, this invoices are the ones that will be printed on Sales Book as SENIAT ask for</field>
     </record>
     <menuitem id="menu_fiscal_reports_sale_tree" name="Sales Book" parent="l10n_ve_fiscal_reports.menu_fr_main" action="action_fiscal_reports_sale_tree" groups="account.group_account_manager"/>

=== modified file 'l10n_ve_fiscal_reports/fiscal_report_whp.xml'
--- l10n_ve_fiscal_reports/fiscal_report_whp.xml	2011-12-29 04:02:48 +0000
+++ l10n_ve_fiscal_reports/fiscal_report_whp.xml	2012-02-08 17:05:51 +0000
@@ -1,7 +1,34 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-    
+
+        <record id="view_fiscal_reports_whp_search" model="ir.ui.view">
+            <field name="name">fiscal.reports.whp.search</field>
+            <field name="model">fiscal.reports.whp</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search List of Purchases">
+                   <group col="10" colspan="4">
+                        <field name="rp_id"/>
+                        <field name="rp_vat"/>
+                        <field name="ar_number"/>
+                        <field name="ai_reference"/>
+                        <field name="ai_amount_total"/>
+                        <newline/>
+                        <field name="ai_amount_untaxed"/>
+                        <field name="ai_amount_tax"/>
+                        <field name="ar_date_ret"/>
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By...">
+                        <filter string="Empresa" icon="terp-partner" domain="[]" context="{'group_by':'rp_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Fecha Factura" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'ar_date_ret'}"/>
+                    </group>
+               </search>
+            </field>
+        </record>
+
         <record model="ir.ui.view" id="view_fiscal_reports_whp_form">
             <field name="name">fiscal.reports.whp.form</field>
             <field name="model">fiscal.reports.whp</field>
@@ -40,22 +67,13 @@
                 </tree>
             </field>
         </record>
-<!--
-    'ar_date_ret': fields.date('Date ret.'),
-    'rp_vat':fields.char('Vat Number', size=64, readonly=True),
-    'rp_id':fields.many2one('res.partner', 'Partner', required=False),
-    'ar_number':fields.char('Retention Number', size=64, required=False, readonly=False),
-    'ai_reference':fields.char('Invoice Number', size=64, required=False, readonly=False),
-    'ai_amount_total': fields.float('Amount Total', digits=(16, int(config['price_accuracy']))),
-    'ai_amount_untaxed': fields.float('Amount Untaxed', digits=(16, int(config['price_accuracy']))),
-    'ai_amount_tax': fields.float('Amount tax', digits=(16, int(config['price_accuracy']))),
-    'ar_line_id':fields.many2one('account.retention.line', 'Account Retention', required=False),
--->
     <record id="action_fiscal_reports_whp_tree" model="ir.actions.act_window">
     <field name="name">Profit by Product</field>
     <field name="res_model">fiscal.reports.whp</field>
     <field name="view_type">form</field>
     <field name="view_mode">tree,form</field>
+    <field name="search_view_id" ref="view_fiscal_reports_whp_search"/>
+    <field name="help">Esta lista de elementos muestra las retenciones de impuesto sobre la renta para proveedores. De acuerdo a los datos mostrados a continuación se generará el reporte para el Libro de Retenciones de Compra.</field>
     </record>
     <menuitem id="menu_fiscal_reports_whp_tree" name="Purchase Witholding Book" parent="l10n_ve_fiscal_reports.menu_fr_main" action="action_fiscal_reports_whp_tree" groups="account.group_account_manager"/>
     </data>

=== modified file 'l10n_ve_fiscal_reports/fiscal_report_whs.xml'
--- l10n_ve_fiscal_reports/fiscal_report_whs.xml	2011-12-29 04:02:48 +0000
+++ l10n_ve_fiscal_reports/fiscal_report_whs.xml	2012-02-08 17:05:51 +0000
@@ -1,7 +1,34 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-    
+
+        <record id="view_fiscal_reports_whs_search" model="ir.ui.view">
+            <field name="name">fiscal.reports.whs.search</field>
+            <field name="model">fiscal.reports.whs</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search List of Purchases">
+                   <group col="10" colspan="4">
+                        <field name="rp_id"/>
+                        <field name="rp_vat"/>
+                        <field name="ar_number"/>
+                        <field name="ai_reference"/>
+                        <field name="ai_amount_total"/>
+                        <newline/>
+                        <field name="ai_amount_untaxed"/>
+                        <field name="ai_amount_tax"/>
+                        <field name="ar_date_ret"/>
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By...">
+                        <filter string="Empresa" icon="terp-partner" domain="[]" context="{'group_by':'rp_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Fecha Factura" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'ar_date_ret'}"/>
+                    </group>
+               </search>
+            </field>
+        </record>
+
         <record model="ir.ui.view" id="view_fiscal_reports_whs_form">
             <field name="name">fiscal.reports.whs.form</field>
             <field name="model">fiscal.reports.whs</field>
@@ -47,6 +74,8 @@
     <field name="res_model">fiscal.reports.whs</field>
     <field name="view_type">form</field>
     <field name="view_mode">tree,form</field>
+    <field name="search_view_id" ref="view_fiscal_reports_whs_search"/>
+    <field name="help">Esta lista de elementos muestra las retenciones de impuesto sobre la renta para clientes. De acuerdo a los datos mostrados a continuación se generará el reporte para el Libro de Retenciones de Venta.</field>
     </record>
     <menuitem id="menu_fiscal_reports_whs_tree" name="Sale Witholding Book" parent="l10n_ve_fiscal_reports.menu_fr_main" action="action_fiscal_reports_whs_tree" groups="account.group_account_manager"/>
     </data>

=== modified file 'l10n_ve_fiscal_reports/i18n/es.po'
--- l10n_ve_fiscal_reports/i18n/es.po	2012-01-30 17:36:30 +0000
+++ l10n_ve_fiscal_reports/i18n/es.po	2012-02-08 17:05:51 +0000
@@ -258,8 +258,8 @@
 #. module: l10n_ve_fiscal_reports
 #: model:ir.ui.menu,name:l10n_ve_fiscal_reports.wh_book_wizard_menu
 #: view:wh.book.wizard:0
-msgid "Print Report Witholding Sales or Purchase"
-msgstr "Imprimir Reporte de Retención de Ventas o Compras"
+msgid "Report Witholding Sales/Purchase"
+msgstr "Reporte Retención Ventas/Compras"
 
 #. module: l10n_ve_fiscal_reports
 #: field:fiscal.reports.purchase,ai_amount_total:0

=== modified file 'l10n_ve_fiscal_reports/i18n/es_ES.po'
--- l10n_ve_fiscal_reports/i18n/es_ES.po	2012-01-30 17:36:30 +0000
+++ l10n_ve_fiscal_reports/i18n/es_ES.po	2012-02-08 17:05:51 +0000
@@ -245,8 +245,8 @@
 
 #. module: l10n_ve_fiscal_reports
 #: model:ir.ui.menu,name:l10n_ve_fiscal_reports.menu_wizard_wh_book_report
-msgid "Print Report Witholding Sales or Purchase"
-msgstr "Imprimir Reporte de Retención de Ventas o Compras"
+msgid "Report Witholding Sales/Purchase"
+msgstr "Reporte Retención Ventas/Compras"
 
 #. module: l10n_ve_fiscal_reports
 #: field:fiscal.reports.purchase,ai_amount_total:0

=== modified file 'l10n_ve_fiscal_reports/i18n/es_VE.po'
--- l10n_ve_fiscal_reports/i18n/es_VE.po	2012-01-30 17:36:30 +0000
+++ l10n_ve_fiscal_reports/i18n/es_VE.po	2012-02-08 17:05:51 +0000
@@ -258,8 +258,8 @@
 #. module: l10n_ve_fiscal_reports
 #: model:ir.ui.menu,name:l10n_ve_fiscal_reports.wh_book_wizard_menu
 #: view:wh.book.wizard:0
-msgid "Print Report Witholding Sales or Purchase"
-msgstr "Imprimir Reporte de Retención de Ventas o Compras"
+msgid "Report Witholding Sales/Purchase"
+msgstr "Reporte Retención Ventas/Compras"
 
 #. module: l10n_ve_fiscal_reports
 #: field:fiscal.reports.purchase,ai_amount_total:0

=== modified file 'l10n_ve_fiscal_reports/wizard/wh_book_wizard_view.xml'
--- l10n_ve_fiscal_reports/wizard/wh_book_wizard_view.xml	2012-01-26 16:03:21 +0000
+++ l10n_ve_fiscal_reports/wizard/wh_book_wizard_view.xml	2012-02-08 17:05:51 +0000
@@ -28,7 +28,7 @@
             <field name="view_id" ref="wh_book_wizard_form"/>
             <field name="target">new</field>
         </record>
-        <menuitem name="Print Report Witholding Sales or Purchase" id="wh_book_wizard_menu" 
+        <menuitem name="Report Withholding Sale/Purchase" id="wh_book_wizard_menu" 
             parent="menu_fr_main" action="wh_book_wizard_act" />
     </data>
 </openerp>