Openerp Venezuela

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

  1. gaby_fiscal_reports
  2. Merge into 6.0-trunk
Proposed by Gabriela Quilarque
Status: Merged
Merged at revision: 610
Proposed branch: lp:~vauxoo/openerp-venezuela-localization/gaby_fiscal_reports
Merge into: lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk
Diff against target: 327 lines (+135/-49)
9 files modified
l10n_ve_fiscal_reports/adjustment_book.xml (+26/-1)
l10n_ve_fiscal_reports/fiscal_report_purchase_view.xml (+13/-28)
l10n_ve_fiscal_reports/fiscal_report_sale_view.xml (+29/-0)
l10n_ve_fiscal_reports/fiscal_report_whp.xml (+30/-12)
l10n_ve_fiscal_reports/fiscal_report_whs.xml (+30/-1)
l10n_ve_fiscal_reports/i18n/es.po (+2/-2)
l10n_ve_fiscal_reports/i18n/es_ES.po (+2/-2)
l10n_ve_fiscal_reports/i18n/es_VE.po (+2/-2)
l10n_ve_fiscal_reports/wizard/wh_book_wizard_view.xml (+1/-1)
To merge this branch: bzr merge lp:~vauxoo/openerp-venezuela-localization/gaby_fiscal_reports
Reviewer Review Type Date Requested Status
Gabriela Quilarque Approve
Review via email: mp+92054@code.launchpad.net

Description of the change

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

To post a comment you must log in.
lp:~vauxoo/openerp-venezuela-localization/gaby_fiscal_reports updated
609. By Vauxoo

[IMP] Deleted prints.

Revision history for this message
Gabriela Quilarque (gabrielaquilarque97) wrote :

Merge Realizado Gaby.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
8 =====================================================8 =====================================================
9 -->9 -->
1010
11 <record id="view_adjustment_book_search" model="ir.ui.view">
12 <field name="name">adjustment.book.search</field>
13 <field name="model">adjustment.book</field>
14 <field name="type">search</field>
15 <field name="arch" type="xml">
16 <search string="Search Adjustment Book">
17 <group col="10" colspan="4">
18 <field name="name"/>
19 <field name="type"/>
20 <field name="period_id"/>
21 <field name="note"/>
22 </group>
23 <newline/>
24 <group expand="1" string="Group By...">
25 <separator orientation="vertical"/>
26 <filter string="Periodo" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'period_id'}"/>
27 <separator orientation="vertical"/>
28 <filter string="Tipo" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'type'}"/>
29 </group>
30 </search>
31 </field>
32 </record>
33
11 <record id="view_adjustment_book_line_line_form" model="ir.ui.view">34 <record id="view_adjustment_book_line_line_form" model="ir.ui.view">
12 <field name="name">adjustment.book.line.form</field>35 <field name="name">adjustment.book.line.form</field>
13 <field name="model">adjustment.book.line</field>36 <field name="model">adjustment.book.line</field>
@@ -18,7 +41,7 @@
18 <field name="date_accounting" select="1"/>41 <field name="date_accounting" select="1"/>
19 <field name="date_admin" select="1"/>42 <field name="date_admin" select="1"/>
20 <field name="vat" select="1"/>43 <field name="vat" select="1"/>
21 <field name="partner" select="1"/>44 <field name="partner"/>
22 <field name="invoice_number" select="1"/>45 <field name="invoice_number" select="1"/>
23 <field name="control_number" select="1"/>46 <field name="control_number" select="1"/>
24 <field name="amount"/>47 <field name="amount"/>
@@ -184,6 +207,8 @@
184 <field name="type">ir.actions.act_window</field>207 <field name="type">ir.actions.act_window</field>
185 <field name="view_type">form</field>208 <field name="view_type">form</field>
186 <field name="view_mode">tree,form</field>209 <field name="view_mode">tree,form</field>
210 <field name="search_view_id" ref="view_adjustment_book_search"/>
211 <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>
187 </record>212 </record>
188 213
189 <record model="ir.actions.act_window.view" id="action_adjustment_book_tree">214 <record model="ir.actions.act_window.view" id="action_adjustment_book_tree">
190215
=== 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 @@
7 <field name="type">search</field>7 <field name="type">search</field>
8 <field name="arch" type="xml">8 <field name="arch" type="xml">
9 <search string="Search Purchase Invoices">9 <search string="Search Purchase Invoices">
10 <group colspan="6">10 <group col="10" colspan="4">
11 <field name="rp_id"/>
11 <field name="ai_nro_ctrl"/>12 <field name="ai_nro_ctrl"/>
13 <field name="ai_id"/>
14 <field name="rp_vat"/>
12 <field name="ai_reference"/>15 <field name="ai_reference"/>
13 <field name="rp_vat"/>16 <newline/>
14 <field name="rp_id"/>17 <field name="ai_amount_total"/>
18 <field name="ai_amount_untaxed"/>
19 <field name="ai_date_invoice"/>
20 <field name="ar_date_document"/>
15 </group>21 </group>
16 <newline/>22 <newline/>
17 <group colspan="6">23 <group expand="1" string="Group By...">
18 <field name="ar_date_document"/>24 <filter string="Empresa" icon="terp-partner" domain="[]" context="{'group_by':'rp_id'}"/>
19 <field name="ai_date_invoice"/>25 <separator orientation="vertical"/>
26 <filter string="Fecha Factura" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'ai_date_invoice'}"/>
20 </group>27 </group>
21<!-- <group col="10" colspan="4">-->
22<!-- -->
23<!-- <filter name="draft" icon="terp-gtk-media-pause" string="Draft" domain="[('state','=','draft')]" help="Draft Withholding Income"/>-->
24<!-- <filter name="confirmed" icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Withholding Income"/>-->
25<!-- <filter name="done" icon="terp-check" string="Done" domain="[('state','=','done')]" help="Done Withholding Income"/>-->
26<!-- <filter name="cancel" icon="terp-dialog-close" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Withholding Income"/>-->
27<!-- <separator orientation="vertical"/>-->
28<!-- <field name="code"/>-->
29<!-- <field name="partner_id"/>-->
30<!-- <field name="journal_id" select="1" widget="selection" string="Journal"/>-->
31<!-- <field name="user_id" select="1" widget="selection" string="Salesman">-->
32<!-- <filter domain="[('user_id','=',uid)]" help="My Withholding Income" icon="terp-personal" separator="1"/>-->
33<!-- </field>-->
34<!-- </group>-->
35<!-- <newline/>-->
36<!-- <group expand="1" string="Group By...">-->
37<!-- <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>-->
38<!-- <separator orientation="vertical"/>-->
39<!-- <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>-->
40<!-- <separator orientation="vertical"/>-->
41<!-- <filter string="Accounting Date of Withhold" icon="terp-go-month" domain="[]" context="{'group_by':'date_ret'}"/>-->
42<!-- </group>-->
43 </search>28 </search>
44 </field>29 </field>
45 </record>30 </record>
4631
=== 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 @@
1<?xml version="1.0"?>1<?xml version="1.0"?>
2<openerp>2<openerp>
3 <data>3 <data>
4
5 <record id="view_fiscal_reports_sale_search" model="ir.ui.view">
6 <field name="name">fiscal.reports.sale.search</field>
7 <field name="model">fiscal.reports.sale</field>
8 <field name="type">search</field>
9 <field name="arch" type="xml">
10 <search string="Search Book Sale">
11 <group col="10" colspan="4">
12 <field name="rp_id"/>
13 <field name="ai_nro_ctrl"/>
14 <field name="ai_id"/>
15 <field name="rp_vat"/>
16 <field name="ai_reference"/>
17 <newline/>
18 <field name="ai_amount_total"/>
19 <field name="ai_amount_untaxed"/>
20 <field name="ai_date_invoice"/>
21 </group>
22 <newline/>
23 <group expand="1" string="Group By...">
24 <filter string="Empresa" icon="terp-partner" domain="[]" context="{'group_by':'rp_id'}"/>
25 <separator orientation="vertical"/>
26 <filter string="Fecha Factura" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'ai_date_invoice'}"/>
27 </group>
28 </search>
29 </field>
30 </record>
31
4 <record model="ir.ui.view" id="view_fiscal_reports_sale_form">32 <record model="ir.ui.view" id="view_fiscal_reports_sale_form">
5 <field name="name">fiscal.reports.sale.form</field>33 <field name="name">fiscal.reports.sale.form</field>
6 <field name="model">fiscal.reports.sale</field>34 <field name="model">fiscal.reports.sale</field>
@@ -50,6 +78,7 @@
50 <field name="res_model">fiscal.reports.sale</field>78 <field name="res_model">fiscal.reports.sale</field>
51 <field name="view_type">form</field>79 <field name="view_type">form</field>
52 <field name="view_mode">tree,form</field>80 <field name="view_mode">tree,form</field>
81 <field name="search_view_id" ref="view_fiscal_reports_sale_search"/>
53 <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>82 <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>
54 </record>83 </record>
55 <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"/>84 <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"/>
5685
=== 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 @@
1<?xml version="1.0"?>1<?xml version="1.0"?>
2<openerp>2<openerp>
3 <data>3 <data>
4 4
5 <record id="view_fiscal_reports_whp_search" model="ir.ui.view">
6 <field name="name">fiscal.reports.whp.search</field>
7 <field name="model">fiscal.reports.whp</field>
8 <field name="type">search</field>
9 <field name="arch" type="xml">
10 <search string="Search List of Purchases">
11 <group col="10" colspan="4">
12 <field name="rp_id"/>
13 <field name="rp_vat"/>
14 <field name="ar_number"/>
15 <field name="ai_reference"/>
16 <field name="ai_amount_total"/>
17 <newline/>
18 <field name="ai_amount_untaxed"/>
19 <field name="ai_amount_tax"/>
20 <field name="ar_date_ret"/>
21 </group>
22 <newline/>
23 <group expand="1" string="Group By...">
24 <filter string="Empresa" icon="terp-partner" domain="[]" context="{'group_by':'rp_id'}"/>
25 <separator orientation="vertical"/>
26 <filter string="Fecha Factura" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'ar_date_ret'}"/>
27 </group>
28 </search>
29 </field>
30 </record>
31
5 <record model="ir.ui.view" id="view_fiscal_reports_whp_form">32 <record model="ir.ui.view" id="view_fiscal_reports_whp_form">
6 <field name="name">fiscal.reports.whp.form</field>33 <field name="name">fiscal.reports.whp.form</field>
7 <field name="model">fiscal.reports.whp</field>34 <field name="model">fiscal.reports.whp</field>
@@ -40,22 +67,13 @@
40 </tree>67 </tree>
41 </field>68 </field>
42 </record>69 </record>
43<!--
44 'ar_date_ret': fields.date('Date ret.'),
45 'rp_vat':fields.char('Vat Number', size=64, readonly=True),
46 'rp_id':fields.many2one('res.partner', 'Partner', required=False),
47 'ar_number':fields.char('Retention Number', size=64, required=False, readonly=False),
48 'ai_reference':fields.char('Invoice Number', size=64, required=False, readonly=False),
49 'ai_amount_total': fields.float('Amount Total', digits=(16, int(config['price_accuracy']))),
50 'ai_amount_untaxed': fields.float('Amount Untaxed', digits=(16, int(config['price_accuracy']))),
51 'ai_amount_tax': fields.float('Amount tax', digits=(16, int(config['price_accuracy']))),
52 'ar_line_id':fields.many2one('account.retention.line', 'Account Retention', required=False),
53-->
54 <record id="action_fiscal_reports_whp_tree" model="ir.actions.act_window">70 <record id="action_fiscal_reports_whp_tree" model="ir.actions.act_window">
55 <field name="name">Profit by Product</field>71 <field name="name">Profit by Product</field>
56 <field name="res_model">fiscal.reports.whp</field>72 <field name="res_model">fiscal.reports.whp</field>
57 <field name="view_type">form</field>73 <field name="view_type">form</field>
58 <field name="view_mode">tree,form</field>74 <field name="view_mode">tree,form</field>
75 <field name="search_view_id" ref="view_fiscal_reports_whp_search"/>
76 <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>
59 </record>77 </record>
60 <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"/>78 <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"/>
61 </data>79 </data>
6280
=== 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 @@
1<?xml version="1.0"?>1<?xml version="1.0"?>
2<openerp>2<openerp>
3 <data>3 <data>
4 4
5 <record id="view_fiscal_reports_whs_search" model="ir.ui.view">
6 <field name="name">fiscal.reports.whs.search</field>
7 <field name="model">fiscal.reports.whs</field>
8 <field name="type">search</field>
9 <field name="arch" type="xml">
10 <search string="Search List of Purchases">
11 <group col="10" colspan="4">
12 <field name="rp_id"/>
13 <field name="rp_vat"/>
14 <field name="ar_number"/>
15 <field name="ai_reference"/>
16 <field name="ai_amount_total"/>
17 <newline/>
18 <field name="ai_amount_untaxed"/>
19 <field name="ai_amount_tax"/>
20 <field name="ar_date_ret"/>
21 </group>
22 <newline/>
23 <group expand="1" string="Group By...">
24 <filter string="Empresa" icon="terp-partner" domain="[]" context="{'group_by':'rp_id'}"/>
25 <separator orientation="vertical"/>
26 <filter string="Fecha Factura" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'ar_date_ret'}"/>
27 </group>
28 </search>
29 </field>
30 </record>
31
5 <record model="ir.ui.view" id="view_fiscal_reports_whs_form">32 <record model="ir.ui.view" id="view_fiscal_reports_whs_form">
6 <field name="name">fiscal.reports.whs.form</field>33 <field name="name">fiscal.reports.whs.form</field>
7 <field name="model">fiscal.reports.whs</field>34 <field name="model">fiscal.reports.whs</field>
@@ -47,6 +74,8 @@
47 <field name="res_model">fiscal.reports.whs</field>74 <field name="res_model">fiscal.reports.whs</field>
48 <field name="view_type">form</field>75 <field name="view_type">form</field>
49 <field name="view_mode">tree,form</field>76 <field name="view_mode">tree,form</field>
77 <field name="search_view_id" ref="view_fiscal_reports_whs_search"/>
78 <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>
50 </record>79 </record>
51 <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"/>80 <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"/>
52 </data>81 </data>
5382
=== 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 @@
258#. module: l10n_ve_fiscal_reports258#. module: l10n_ve_fiscal_reports
259#: model:ir.ui.menu,name:l10n_ve_fiscal_reports.wh_book_wizard_menu259#: model:ir.ui.menu,name:l10n_ve_fiscal_reports.wh_book_wizard_menu
260#: view:wh.book.wizard:0260#: view:wh.book.wizard:0
261msgid "Print Report Witholding Sales or Purchase"261msgid "Report Witholding Sales/Purchase"
262msgstr "Imprimir Reporte de Retención de Ventas o Compras"262msgstr "Reporte Retención Ventas/Compras"
263263
264#. module: l10n_ve_fiscal_reports264#. module: l10n_ve_fiscal_reports
265#: field:fiscal.reports.purchase,ai_amount_total:0265#: field:fiscal.reports.purchase,ai_amount_total:0
266266
=== 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 @@
245245
246#. module: l10n_ve_fiscal_reports246#. module: l10n_ve_fiscal_reports
247#: model:ir.ui.menu,name:l10n_ve_fiscal_reports.menu_wizard_wh_book_report247#: model:ir.ui.menu,name:l10n_ve_fiscal_reports.menu_wizard_wh_book_report
248msgid "Print Report Witholding Sales or Purchase"248msgid "Report Witholding Sales/Purchase"
249msgstr "Imprimir Reporte de Retención de Ventas o Compras"249msgstr "Reporte Retención Ventas/Compras"
250250
251#. module: l10n_ve_fiscal_reports251#. module: l10n_ve_fiscal_reports
252#: field:fiscal.reports.purchase,ai_amount_total:0252#: field:fiscal.reports.purchase,ai_amount_total:0
253253
=== 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 @@
258#. module: l10n_ve_fiscal_reports258#. module: l10n_ve_fiscal_reports
259#: model:ir.ui.menu,name:l10n_ve_fiscal_reports.wh_book_wizard_menu259#: model:ir.ui.menu,name:l10n_ve_fiscal_reports.wh_book_wizard_menu
260#: view:wh.book.wizard:0260#: view:wh.book.wizard:0
261msgid "Print Report Witholding Sales or Purchase"261msgid "Report Witholding Sales/Purchase"
262msgstr "Imprimir Reporte de Retención de Ventas o Compras"262msgstr "Reporte Retención Ventas/Compras"
263263
264#. module: l10n_ve_fiscal_reports264#. module: l10n_ve_fiscal_reports
265#: field:fiscal.reports.purchase,ai_amount_total:0265#: field:fiscal.reports.purchase,ai_amount_total:0
266266
=== 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 @@
28 <field name="view_id" ref="wh_book_wizard_form"/>28 <field name="view_id" ref="wh_book_wizard_form"/>
29 <field name="target">new</field>29 <field name="target">new</field>
30 </record>30 </record>
31 <menuitem name="Print Report Witholding Sales or Purchase" id="wh_book_wizard_menu" 31 <menuitem name="Report Withholding Sale/Purchase" id="wh_book_wizard_menu"
32 parent="menu_fr_main" action="wh_book_wizard_act" />32 parent="menu_fr_main" action="wh_book_wizard_act" />
33 </data>33 </data>
34</openerp>34</openerp>