Merge lp:~juan-pimentel/openerp-venezuela-localization/juan-pimentel_openerp-venezuela-localization_bug919314 into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

[Juan José Pimentel (Digisolution)]

In order to fix this bug, witholding book wizard have been changed from wizard.interface to osv_memory.

[lp:~juan-pimentel/openerp-venezuela-localization/juan-pimentel_openerp-venezuela-localization_bug919314]

566. By Juan José Pimentel (Digisolution) on 2012-01-27

[REM] removed old wizards style file wiz_book.py

[Javier Duran (javieredm)]

Unidoo a la rama principal:

revno: 584 [merge]
revision-id: javier@squezee-vir-20120127194548-kma9e2nzhqdyb5mm

review: Approve

=== modified file 'l10n_ve_fiscal_reports/__openerp__.py'
--- l10n_ve_fiscal_reports/__openerp__.py	2011-12-29 22:13:12 +0000
+++ l10n_ve_fiscal_reports/__openerp__.py	2012-01-27 16:30:42 +0000
@@ -58,6 +58,7 @@
         "fiscal_report_report.xml",
         "fiscal_report_wizard.xml",
         "wizard/sales_book_wizard_view.xml",
+        "wizard/wh_book_wizard_view.xml",
         "invoice_view.xml",
         "adjustment_book.xml",
     ],

=== modified file 'l10n_ve_fiscal_reports/fiscal_report_wizard.xml'
--- l10n_ve_fiscal_reports/fiscal_report_wizard.xml	2011-12-29 04:02:48 +0000
+++ l10n_ve_fiscal_reports/fiscal_report_wizard.xml	2012-01-27 16:30:42 +0000
@@ -2,21 +2,6 @@
 <openerp>
     <data>
 
-        <wizard
-            id="wizard_wh_book"
-            model="fiscal.reports.whp"
-            name="fiscal.reports.whp.wh_book"
-            string="Witholding Book"/>
-
-		<menuitem
-			name="Print Report Witholding Sales or Purchase"
-			parent="l10n_ve_fiscal_reports.menu_fr_main"
-			action="wizard_wh_book"
-			type="wizard"
-			icon="STOCK_PRINT"
-			id="menu_wizard_wh_book_report"
-            groups="account.group_account_manager"
-            sequence="50"/>
 
         <wizard
             id="wizard_recalc_taxes"

=== modified file 'l10n_ve_fiscal_reports/i18n/es.po'
--- l10n_ve_fiscal_reports/i18n/es.po	2012-01-05 17:04:56 +0000
+++ l10n_ve_fiscal_reports/i18n/es.po	2012-01-27 16:30:42 +0000
@@ -573,11 +573,6 @@
 msgstr "Correspodiente al Mes de"
 
 #. module: l10n_ve_fiscal_reports
-#: selection:fiscal.reports.whp.wh_book_HG,init,model:0
-msgid "Witholding Purchase"
-msgstr "Retención Compra"
-
-#. module: l10n_ve_fiscal_reports
 #: model:ir.module.module,description:l10n_ve_fiscal_reports.module_meta_information
 msgid "\n"
 "    What this module does:\n"
@@ -605,11 +600,7 @@
 msgid "Date"
 msgstr "Fecha"
 
-#. module: l10n_ve_fiscal_reports
-#: code:addons/l10n_ve_fiscal_reports/wizard/sales_book_wizard.py:0
-#, python-format
-msgid "No period defined for this date !\nPlease create a fiscal year."
-msgstr "No period defined for this date !\nPlease create a fiscal year."
+
 
 #. module: l10n_ve_fiscal_reports
 #: rml:fiscal.reports.whp.whp_seniat_HG:0
@@ -939,10 +930,6 @@
 msgid "sales.book.wizard"
 msgstr "sales.book.wizard"
 
-#. module: l10n_ve_fiscal_reports
-#: selection:fiscal.reports.whp.wh_book_HG,init,model:0
-msgid "Witholding Sales"
-msgstr "Retención Ventas"
 
 #. module: l10n_ve_fiscal_reports
 #: model:ir.actions.wizard,name:l10n_ve_fiscal_reports.wizard_sale_purchase_book
@@ -986,3 +973,37 @@
 msgid "Recompute Taxes."
 msgstr "Recalcule Impuestos."
 
+#. module: l10n_ve_fiscal_reports
+#: field:fiscal.reports.purchase,ar_date_document:0
+#: field:fiscal.reports.sale,ar_date_document:0
+#: field:fiscal.reports.whp,ar_date_document:0
+#: field:fiscal.reports.whs,ar_date_document:0
+msgid "Date Account Retencion"
+msgstr "Fecha Contable de la Retencion"
+
+#. module: l10n_ve_fiscal_reports
+#: code:addons/l10n_ve_fiscal_reports/wizard/wh_book_wizard.py:45
+#: selection:wh.book.wizard,model:0
+#, python-format
+msgid "Witholding Purchase"
+msgstr "Retenciones en Compras"
+
+#. module: l10n_ve_fiscal_reports
+#: sql_constraint:adjustment.book:0
+msgid "The period and type combination must be unique!"
+msgstr "El periodo y el tipo deben ser unicos"
+
+#. module: l10n_ve_fiscal_reports
+#: code:addons/l10n_ve_fiscal_reports/wizard/sales_book_wizard.py:46
+#, python-format
+msgid "No period defined for this date !\n"
+"Please create a fiscal year."
+msgstr "No se han definido periodos para esta fecha!\n"
+
+#. module: l10n_ve_fiscal_reports
+#: code:addons/l10n_ve_fiscal_reports/wizard/wh_book_wizard.py:46
+#: selection:wh.book.wizard,model:0
+#, python-format
+msgid "Witholding Sales"
+msgstr "Retenciones en Ventas"
+

=== modified file 'l10n_ve_fiscal_reports/i18n/es_ES.po'
--- l10n_ve_fiscal_reports/i18n/es_ES.po	2011-12-29 04:02:48 +0000
+++ l10n_ve_fiscal_reports/i18n/es_ES.po	2012-01-27 16:30:42 +0000
@@ -572,10 +572,7 @@
 msgid "Correspodiente al Mes de"
 msgstr "Correspodiente al Mes de"
 
-#. module: l10n_ve_fiscal_reports
-#: selection:fiscal.reports.whp.wh_book_HG,init,model:0
-msgid "Witholding Purchase"
-msgstr "Retención Compra"
+
 
 #. module: l10n_ve_fiscal_reports
 #: model:ir.module.module,description:l10n_ve_fiscal_reports.module_meta_information
@@ -605,11 +602,6 @@
 msgid "Date"
 msgstr "Fecha"
 
-#. module: l10n_ve_fiscal_reports
-#: code:addons/l10n_ve_fiscal_reports/wizard/sales_book_wizard.py:0
-#, python-format
-msgid "No period defined for this date !\nPlease create a fiscal year."
-msgstr "No period defined for this date !\nPlease create a fiscal year."
 
 #. module: l10n_ve_fiscal_reports
 #: rml:fiscal.reports.whp.whp_seniat_HG:0
@@ -939,10 +931,7 @@
 msgid "sales.book.wizard"
 msgstr "sales.book.wizard"
 
-#. module: l10n_ve_fiscal_reports
-#: selection:fiscal.reports.whp.wh_book_HG,init,model:0
-msgid "Witholding Sales"
-msgstr "Retención Ventas"
+
 
 #. module: l10n_ve_fiscal_reports
 #: model:ir.actions.wizard,name:l10n_ve_fiscal_reports.wizard_sale_purchase_book
@@ -986,3 +975,38 @@
 msgid "Recompute Taxes."
 msgstr "Recalcule Impuestos."
 
+#. module: l10n_ve_fiscal_reports
+#: field:fiscal.reports.purchase,ar_date_document:0
+#: field:fiscal.reports.sale,ar_date_document:0
+#: field:fiscal.reports.whp,ar_date_document:0
+#: field:fiscal.reports.whs,ar_date_document:0
+msgid "Date Account Retencion"
+msgstr "Fecha Contable de la Retencion"
+
+#. module: l10n_ve_fiscal_reports
+#: code:addons/l10n_ve_fiscal_reports/wizard/wh_book_wizard.py:45
+#: selection:wh.book.wizard,model:0
+#, python-format
+msgid "Witholding Purchase"
+msgstr "Retenciones en Compras"
+
+#. module: l10n_ve_fiscal_reports
+#: sql_constraint:adjustment.book:0
+msgid "The period and type combination must be unique!"
+msgstr "El periodo y el tipo deben ser unicos"
+
+#. module: l10n_ve_fiscal_reports
+#: code:addons/l10n_ve_fiscal_reports/wizard/sales_book_wizard.py:46
+#, python-format
+msgid "No period defined for this date !\n"
+"Please create a fiscal year."
+msgstr "No se han definido periodos para esta fecha!\n"
+
+#. module: l10n_ve_fiscal_reports
+#: code:addons/l10n_ve_fiscal_reports/wizard/wh_book_wizard.py:46
+#: selection:wh.book.wizard,model:0
+#, python-format
+msgid "Witholding Sales"
+msgstr "Retenciones en Ventas"
+
+

=== modified file 'l10n_ve_fiscal_reports/wizard/__init__.py'
--- l10n_ve_fiscal_reports/wizard/__init__.py	2011-12-29 23:10:47 +0000
+++ l10n_ve_fiscal_reports/wizard/__init__.py	2012-01-27 16:30:42 +0000
@@ -29,4 +29,4 @@
 ##############################################################################
 
 import sales_book_wizard
-import wiz_wh_book
+import wh_book_wizard

=== added file 'l10n_ve_fiscal_reports/wizard/wh_book_wizard.py'
--- l10n_ve_fiscal_reports/wizard/wh_book_wizard.py	1970-01-01 00:00:00 +0000
+++ l10n_ve_fiscal_reports/wizard/wh_book_wizard.py	2012-01-27 16:30:42 +0000
@@ -0,0 +1,69 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+# Copyright (c) 2011 OpenERP Venezuela (http://openerp.com.ve)
+# All Rights Reserved.
+# Programmed by: Israel Fermín Montilla  <[e-mail]>
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+###############################################################################
+from osv import osv
+from osv import fields
+import sys
+from tools.translate import _
+import time
+
+
+class wh_book_wizard(osv.osv_memory):
+    """
+    Withholding book wizard implemented using the osv_memory wizard system
+    """
+    _name = "wh.book.wizard"
+
+    _columns = {
+            "date_start": fields.date("Start Date", required=True),
+            "date_end": fields.date("End Date", required=True),
+            "model": fields.selection([
+                        ("wh_p", _("Witholding Purchase")),
+                        ("wh_s", _("Witholding Sales")),
+                    ],"Type", required=True,
+                ),
+        }
+        
+    def check_report(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        data = {}
+        data['ids'] = context.get('active_ids', [])
+        data['model'] = context.get('active_model', 'ir.ui.menu')
+        data['form'] = self.read(cr, uid, ids, ['date_start',  'date_end', 'model'])[0]
+        return self._print_report(cr, uid, ids, data, context=context)
+
+    def _print_report(self, cr, uid, ids,data, context=None):
+        return { 'type': 'ir.actions.report.xml', 'report_name': 'fiscal.reports.whp.whp_seniat', 'datas': data}        
+        
+        
+    _defaults = {
+        'date_start': lambda *a: time.strftime('%Y-%m-%d'),
+        'date_end': lambda *a: time.strftime('%Y-%m-%d'),
+        'model': lambda *a: 'wh_p',
+    }
+wh_book_wizard()

=== added file 'l10n_ve_fiscal_reports/wizard/wh_book_wizard_view.xml'
--- l10n_ve_fiscal_reports/wizard/wh_book_wizard_view.xml	1970-01-01 00:00:00 +0000
+++ l10n_ve_fiscal_reports/wizard/wh_book_wizard_view.xml	2012-01-27 16:30:42 +0000
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="wh_book_wizard_form">
+            <field name="name">wh.book.wizard.form</field>
+            <field name="model">wh.book.wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Print Report Witholding Sales or Purchase">
+                <notebook colspan="4">
+                    <page string="General">
+                        <field name="date_start" />
+                        <field name="date_end" />
+                        <field name="model" />
+                        <button special="cancel" string="Cancel" icon="gtk-cancel" />
+                        <button name="check_report" string="Print Report" type="object" icon="gtk-print" />
+                    </page>
+                </notebook>
+                </form>
+            </field>
+        </record>
+        <record model="ir.actions.act_window" id="wh_book_wizard_act">
+            <field name="name">Report Witholding Sales or Purchase</field>
+            <field name="res_model">wh.book.wizard</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <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" 
+            parent="menu_fr_main" action="wh_book_wizard_act" />
+    </data>
+</openerp>

=== removed file 'l10n_ve_fiscal_reports/wizard/wiz_book.py'
--- l10n_ve_fiscal_reports/wizard/wiz_book.py	2011-12-29 04:02:48 +0000
+++ l10n_ve_fiscal_reports/wizard/wiz_book.py	1970-01-01 00:00:00 +0000
@@ -1,83 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-# Copyright (c) 2010 Vauxoo C.A. (http://openerp.com.ve/) All Rights Reserved.
-#                    Javier Duran <[e-mail]>
-# 
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-'''
-Fiscal Report For Venezuela
-'''
-
-from osv import fields
-from osv import osv
-import time
-import ir
-from mx import DateTime
-import datetime
-import pooler
-from tools import config
-import wizard
-import netsvc
-
-
-book_form= """<?xml version="1.0"?>
-<form string="Seniat Book">
-     <field name="date_start" />
-     <field name="date_end" />
-     <field name="model" />
-</form>
-"""
-
-book_field= {
-    'date_start': {'string':'Start Date','type':'date','required': True},
-    'date_end': {'string':'End Date','type':'date','required': True},
-    'model':{'string':"Type of Report", 'type':'selection', 'selection':[('b_p','Book Purchase'),('b_s','Book Sales')]},
-
-}
-
-
-class wiz_invoice_list(wizard.interface):
-    '''
-    Wizzard invoice list
-    '''
-
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'form',
-                    'arch' : book_form,
-                    'fields' : book_field,
-                    'state' : [('end', 'Cancel','gtk-cancel'),('print_report', 'Print Report','gtk-print') ]}
-        },
-        'print_report' : {
-            'actions' : [],
-            'result' : {'type' : 'print',
-                   'report':'fiscal.reports.purchase.purchase_seniat',
-                    'state' : 'end'}
-        },
-    }
-wiz_invoice_list("fiscal.reports.purchase.book_seniat")