From ef917a8499652a9174ae549106a47e481c8e1cfb Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Fri, 23 Apr 2010 17:37:48 +0530
Subject: [PATCH] [Add] account: convert account_third_party_ledger wizard to
 osv_memory

bzr revid: psi@tinyerp.co.in-20100423120748-93995imlwb5uxyo8
---
 addons/account/__openerp__.py                 |   1 +
 addons/account/account_wizard.xml             |   4 +-
 addons/account/report/third_party_ledger.py   |   8 +-
 addons/account/wizard/__init__.py             |   2 +-
 .../wizard/account_third_party_ledger.py      | 129 ++++++++++++++
 .../wizard/account_third_party_ledger.xml     |  66 +++++++
 .../wizard/wizard_third_party_ledger.py       | 161 ------------------
 7 files changed, 203 insertions(+), 168 deletions(-)
 create mode 100755 addons/account/wizard/account_third_party_ledger.py
 create mode 100644 addons/account/wizard/account_third_party_ledger.xml
 delete mode 100755 addons/account/wizard/wizard_third_party_ledger.py

diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 9196a463b1c..91f71f3b9e4 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -76,6 +76,7 @@ module named account_voucherss
         'wizard/account_balance_report_view.xml',
         'wizard/account_move_line_select_view.xml',
         'wizard/account_aged_trial_balance_view.xml',
+        'wizard/account_third_party_ledger.xml',
         'project/wizard/project_account_analytic_line_view.xml',
         'account_view.xml',
         'account_end_fy.xml',
diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml
index 5f006d52824..91de16d1a12 100644
--- a/addons/account/account_wizard.xml
+++ b/addons/account/account_wizard.xml
@@ -78,9 +78,9 @@
         <!-- report-related wizards -->
 <!--        <wizard id="wizard_partner_balance_report" menu="False" model="res.partner" name="account.partner.balance.report" string="Partner Balance"/>
         <menuitem icon="STOCK_PRINT" action="wizard_partner_balance_report" id="menu_partner_balance" parent="account.next_id_22" type="wizard"/> -->
-		<menuitem id="next_id_22" name="Partner Accounts" parent="menu_finance_generic_reporting" sequence="1"/>
+<!--	<menuitem id="next_id_22" name="Partner Accounts" parent="menu_finance_generic_reporting" sequence="1"/>
         <wizard id="wizard_third_party_ledger" menu="False" model="res.partner" name="account.third_party_ledger.report" string="Partner Ledger"/>
-        <menuitem icon="STOCK_PRINT" action="wizard_third_party_ledger" id="menu_third_party_ledger" parent="account.next_id_22" type="wizard"/>
+        <menuitem icon="STOCK_PRINT" action="wizard_third_party_ledger" id="menu_third_party_ledger" parent="account.next_id_22" type="wizard"/> -->
 
 <!--        <wizard id="wizard_general_ledger_report" keyword="client_print_multi" model="account.account" name="account.general.ledger.report" string="General Ledger"/>-->
 
diff --git a/addons/account/report/third_party_ledger.py b/addons/account/report/third_party_ledger.py
index 0ae5bf8ce1a..1dca4dfb64a 100644
--- a/addons/account/report/third_party_ledger.py
+++ b/addons/account/report/third_party_ledger.py
@@ -59,10 +59,10 @@ class third_party_ledger(rml_parse.rml_parse):
 	#
 	def transform_period_into_date_array(self,data):
 		## Get All Period Date
-		if not data['form']['periods'][0][2] :
+		if not data['form']['periods']:
 			periods_id =  self.pool.get('account.period').search(self.cr, self.uid, [('fiscalyear_id','=',data['form']['fiscalyear'])])
 		else:
-			periods_id = data['form']['periods'][0][2]
+			periods_id = data['form']['periods']
 		date_array = []
 		for period_id in periods_id:
 			period_obj = self.pool.get('account.period').browse(self.cr, self.uid, period_id)
@@ -77,10 +77,10 @@ class third_party_ledger(rml_parse.rml_parse):
 
 	def transform_both_into_date_array(self,data):
 
-		if not data['form']['periods'][0][2] :
+		if not data['form']['periods']:
 			periods_id =  self.pool.get('account.period').search(self.cr, self.uid, [('fiscalyear_id','=',data['form']['fiscalyear'])])
 		else:
-			periods_id = data['form']['periods'][0][2]
+			periods_id = data['form']['periods']
 		date_array = []
 		for period_id in periods_id:
 			period_obj = self.pool.get('account.period').browse(self.cr, self.uid, period_id)
diff --git a/addons/account/wizard/__init__.py b/addons/account/wizard/__init__.py
index d71ed2e3415..836eeea512f 100644
--- a/addons/account/wizard/__init__.py
+++ b/addons/account/wizard/__init__.py
@@ -32,7 +32,7 @@ import account_move_bank_reconcile
 import account_subscription_generate
 import account_aged_trial_balance
 import account_general_ledger_report
-import wizard_third_party_ledger
+import account_third_party_ledger
 import account_partner_balance_report
 import account_balance_report
 import account_period_close
diff --git a/addons/account/wizard/account_third_party_ledger.py b/addons/account/wizard/account_third_party_ledger.py
new file mode 100755
index 00000000000..a40c469a184
--- /dev/null
+++ b/addons/account/wizard/account_third_party_ledger.py
@@ -0,0 +1,129 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+
+from tools.translate import _
+from osv import fields, osv
+
+class account_partner_ledger(osv.osv_memory):
+    """
+    This wizard will provide the partner Ledger report by periods, between any two dates.
+    """
+    _name = 'account.partner.ledger'
+    _description = 'Account Partner Ledger'
+    _columns = {
+        'company_id': fields.many2one('res.company', 'Company', required=True),
+        'state': fields.selection([('bydate','By Date'),
+                                 ('byperiod','By Period'),
+                                 ('all','By Date and Period'),
+                                 ('none','No Filter')
+                                 ],'Date/Period Filter'),
+        'fiscalyear': fields.many2one('account.fiscalyear', 'Fiscal year', help='Keep empty for all open fiscal year'),
+        'periods': fields.many2many('account.period', 'period_ledger_rel', 'report_id', 'period_id', 'Periods', help='All periods if empty', states={'none':[('readonly',True)],'bydate':[('readonly',True)]}),
+        'result_selection': fields.selection([('customer','Receivable Accounts'),
+                                              ('supplier','Payable Accounts'),
+                                              ('all','Receivable and Payable Accounts')],
+                                              'Partner', required=True),
+        'soldeinit': fields.boolean('Include initial balances'),
+        'reconcil': fields.boolean('Include Reconciled Entries'),
+        'page_split': fields.boolean('One Partner Per Page'),
+        'date1': fields.date('Start date', required=True),
+        'date2': fields.date('End date', required=True),
+            }
+
+    def _get_company(self, cr, uid, ids, context=None):
+        user_obj = self.pool.get('res.users')
+        company_obj = self.pool.get('res.company')
+        if context is None:
+            context = {}
+        user = user_obj.browse(cr, uid, uid, context=context)
+        if user.company_id:
+            return user.company_id.id
+        else:
+            return company_obj.search(cr, uid, [('parent_id', '=', False)])[0]
+
+    _defaults={
+               'state' :  'none',
+               'date1' : time.strftime('%Y-01-01'),
+               'date2' : time.strftime('%Y-%m-%d'),
+               'result_selection' : 'all',
+               'reconcile' : True,
+               'soldeinit' : True,
+               'page_split' : False,
+               'company_id' : _get_company,
+               'fiscalyear' : False,
+               }
+
+    def check_state(self, cr, uid, ids, context=None):
+        obj_fiscalyear = self.pool.get('account.fiscalyear')
+        obj_periods = self.pool.get('account.period')
+        if context is None:
+            context = {}
+        data={}
+        data['ids'] = context.get('active_ids',[])
+        data['form'] = self.read(cr, uid, ids, [])[0]
+        data['form']['fiscalyear'] = obj_fiscalyear.find(cr, uid)
+        data['form']['periods'] = obj_periods.search(cr, uid, [('fiscalyear_id','=',data['form']['fiscalyear'])])
+        data['form']['display_account']='bal_all'
+        data['model'] = 'ir.ui.menu'
+        acc_id = self.pool.get('account.invoice').search(cr, uid, [('state','=','open')])
+        if not acc_id:
+                raise osv.except_osv(_('No Data Available'), _('No records found for your selection!'))
+        if data['form']['state'] == 'bydate' or data['form']['state'] == 'all':
+           data['form']['fiscalyear'] = False
+        else :
+           data['form']['fiscalyear'] = True
+           return self._check_date(cr, uid, data, context)
+        if data['form']['page_split']:
+            return {
+                'type': 'ir.actions.report.xml',
+                'report_name': 'account.third_party_ledger',
+                'datas': data,
+            }
+        else:
+            return {
+                'type': 'ir.actions.report.xml',
+                'report_name': 'account.third_party_ledger_other',
+                'datas': data,
+            }
+
+    def _check_date(self, cr, uid, data, context=None):
+        if context is None:
+            context = {}
+        sql = """
+            SELECT f.id, f.date_start, f.date_stop FROM account_fiscalyear f  Where %s between f.date_start and f.date_stop """
+        cr.execute(sql,(data['form']['date1'],))
+        res = cr.dictfetchall()
+        if res:
+            if (data['form']['date2'] > res[0]['date_stop'] or data['form']['date2'] < res[0]['date_start']):
+                raise  osv.except_osv(_('UserError'),_('Date to must be set between %s and %s') % (str(res[0]['date_start']), str(res[0]['date_stop'])))
+            else:
+                return {
+                    'type': 'ir.actions.report.xml',
+                    'report_name': 'account.third_party_ledger',
+                    'datas': data,
+                }
+        else:
+            raise osv.except_osv(_('UserError'),_('Date not in a defined fiscal year'))
+
+account_partner_ledger()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_third_party_ledger.xml b/addons/account/wizard/account_third_party_ledger.xml
new file mode 100644
index 00000000000..6ddc9a1e847
--- /dev/null
+++ b/addons/account/wizard/account_third_party_ledger.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+     <data>
+
+        <record id="account_partner_ledger_view" model="ir.ui.view">
+             <field name="name">Select period</field>
+             <field name="model">account.partner.ledger</field>
+             <field name="type">form</field>
+             <field name="arch" type="xml">
+				<form string="Select Date-Period">
+				    <field name="company_id"/>
+				    <field name="result_selection"/>
+				    <newline/>
+				    <field name="fiscalyear"/>
+				    <label colspan="2" string="(Keep empty for all open fiscal years)" align="0.0"/>
+				    <group colspan = "4" >
+				    <field name="reconcil"/>
+				    <field name="page_split"/>
+				    </group>
+				    <newline/>
+				    <separator string="Filters" colspan="4"/>
+				    <field name="state" required="True"/>
+				    <newline/>
+				    <group attrs="{'invisible':[('state','=','none')]}" colspan="4">
+				        <group attrs="{'invisible':[('state','=','byperiod')]}" colspan="4">
+				            <separator string="Date Filter" colspan="4"/>
+				            <field name="date1"/>
+				            <field name="date2"/>
+				        </group>
+				        <group attrs="{'invisible':[('state','=','bydate')]}" colspan="4">
+				            <separator string="Filter on Periods" colspan="4"/>
+				            <field name="periods" colspan="4" nolabel="1"/>
+				        </group>
+				    </group>
+     				<group colspan="4" col="6">
+                       	<label string ="" colspan="2"/>
+     					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+               			<button name="check_state" string="Print" type="object" icon="gtk-print"/>
+ 					</group>
+ 				</form>
+             </field>
+ 		</record>
+
+ 		<record id="action_account_partner_ledger" model="ir.actions.act_window">
+             <field name="name">Select Period</field>
+             <field name="res_model">account.partner.ledger</field>
+             <field name="type">ir.actions.act_window</field>
+             <field name="view_type">form</field>
+             <field name="view_mode">tree,form</field>
+             <field name="view_id" ref="account_partner_ledger_view"/>
+             <field name="context">{'record_id':active_id}</field>
+             <field name="target">new</field>
+       </record>
+
+ 	   <menuitem icon="STOCK_PRINT"
+ 	   		name="Partner Ledger"
+ 	   		action="action_account_partner_ledger"
+ 			id="menu_account_partner_ledger"
+ 			parent="account.next_id_22"/>
+
+     </data>
+ </openerp>
+
+
+
+
diff --git a/addons/account/wizard/wizard_third_party_ledger.py b/addons/account/wizard/wizard_third_party_ledger.py
deleted file mode 100755
index 6bf415d0ca6..00000000000
--- a/addons/account/wizard/wizard_third_party_ledger.py
+++ /dev/null
@@ -1,161 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-import wizard
-import pooler
-from tools.translate import _
-
-
-period_form = '''<?xml version="1.0"?>
-<form string="Select Date-Period">
-
-    <field name="company_id"/>
-    <field name="result_selection"/>
-    <newline/>
-    <field name="fiscalyear"/>
-    <label colspan="2" string="(Keep empty for all open fiscal years)" align="0.0"/>
-    <group colspan = "4" >
-    <field name="reconcil"/>
-    <field name="page_split"/>
-    </group>
-    <newline/>
-    <separator string="Filters" colspan="4"/>
-    <field name="state" required="True"/>
-    <newline/>
-    <group attrs="{'invisible':[('state','=','none')]}" colspan="4">
-        <group attrs="{'invisible':[('state','=','byperiod')]}" colspan="4">
-            <separator string="Date Filter" colspan="4"/>
-            <field name="date1"/>
-            <field name="date2"/>
-        </group>
-        <group attrs="{'invisible':[('state','=','bydate')]}" colspan="4">
-            <separator string="Filter on Periods" colspan="4"/>
-            <field name="periods" colspan="4" nolabel="1"/>
-        </group>
-    </group>
-
-</form>'''
-
-period_fields = {
-    'company_id': {'string': 'Company', 'type': 'many2one', 'relation': 'res.company', 'required': True},
-    'state':{
-        'string':"Date/Period Filter",
-        'type':'selection',
-        'selection':[('bydate','By Date'),('byperiod','By Period'),('all','By Date and Period'),('none','No Filter')],
-        'default': lambda *a:'none'
-    },
-    'fiscalyear': {
-        'string':'Fiscal year', 'type': 'many2one', 'relation': 'account.fiscalyear',
-        'help': 'Keep empty for all open fiscal year',
-        'default': lambda *a:False,
-    },
-    'periods': {'string': 'Periods', 'type': 'many2many', 'relation': 'account.period', 'help': 'All periods if empty','states':{'none':[('readonly',True)],'bydate':[('readonly',True)]}},
-    'result_selection':{
-        'string':"Partner",
-        'type':'selection',
-        'selection':[('customer','Receivable Accounts'),('supplier','Payable Accounts'),('all','Receivable and Payable Accounts')],
-        'required':True
-    },
-    'soldeinit':{'string':"Include initial balances",'type':'boolean'},
-    'reconcil':{'string':"       Include Reconciled Entries",'type':'boolean'},
-    'page_split':{'string':"One Partner Per Page",'type':'boolean'},
-    'date1': {'string':'        Start date', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-01-01')},
-    'date2': {'string':'End date', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')},
-}
-
-
-class wizard_report(wizard.interface):
-
-    def _get_defaults(self, cr, uid, data, context):
-        fiscalyear_obj = pooler.get_pool(cr.dbname).get('account.fiscalyear')
-        data['form']['fiscalyear'] = fiscalyear_obj.find(cr, uid)
-        data['form']['display_account']='bal_all'
-        data['form']['result_selection'] = 'all'
-        user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid, context=context)
-        if user.company_id:
-            company_id = user.company_id.id
-        else:
-            company_id = pooler.get_pool(cr.dbname).get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
-        data['form']['company_id'] = company_id
-        periods_obj=pooler.get_pool(cr.dbname).get('account.period')
-        data['form']['periods'] =periods_obj.search(cr, uid, [('fiscalyear_id','=',data['form']['fiscalyear'])])
-        data['form']['fiscalyear'] =False
-        data['form']['page_split'] = False
-        data['form']['reconcil'] = False
-        data['form']['soldeinit'] = True
-        return data['form']
-
-    def _check(self, cr, uid, data, context):
-        if data['form']['page_split']:
-            return 'report'
-        else:
-            return 'report_other'
-
-    def _check_date(self, cr, uid, data, context):
-
-        sql = """
-            SELECT f.id, f.date_start, f.date_stop FROM account_fiscalyear f  Where %s between f.date_start and f.date_stop """
-        cr.execute(sql,(data['form']['date1'],))
-        res = cr.dictfetchall()
-        if res:
-            if (data['form']['date2'] > res[0]['date_stop'] or data['form']['date2'] < res[0]['date_start']):
-                raise  wizard.except_wizard(_('UserError'),_('Date to must be set between %s and %s') % (str(res[0]['date_start']) , str(res[0]['date_stop'])))
-            else:
-                return 'report'
-        else:
-            raise wizard.except_wizard(_('UserError'),_('Date not in a defined fiscal year'))
-
-    def _check_state(self, cr, uid, data, context):
-        if data['form']['state'] == 'bydate' or data['form']['state'] == 'all':
-           data['form']['fiscalyear'] = False
-        else :
-           data['form']['fiscalyear'] = True
-           self._check_date(cr, uid, data, context)
-        acc_id = pooler.get_pool(cr.dbname).get('account.invoice').search(cr, uid, [('state','=','open')])
-        if not acc_id:
-                raise wizard.except_wizard(_('No Data Available'), _('No records found for your selection!'))
-        return data['form']
-
-
-    states = {
-        'init': {
-            'actions': [_get_defaults],
-            'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel','gtk-cancel'),('checkreport','Print','gtk-print')]}
-        },
-        'checkreport': {
-            'actions': [],
-            'result': {'type':'choice','next_state':_check}
-        },
-        'report': {
-            'actions': [_check_state],
-            'result': {'type':'print', 'report':'account.third_party_ledger', 'state':'end'}
-        },
-        'report_other': {
-            'actions': [_check_state],
-            'result': {'type':'print', 'report':'account.third_party_ledger_other', 'state':'end'}
-        }
-
-    }
-wizard_report('account.third_party_ledger.report')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: