From 0bbf09016d27372da49a0b72b7150d3f674b7419 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 13 Jul 2010 17:18:47 +0530
Subject: [PATCH] [IMP] Account: Third party ledger report converted to commot
 report and improve its report file

bzr revid: mra@mra-laptop-20100713114847-cpxvetpm0aqsi5j0
---
 addons/account/report/third_party_ledger.py   |  72 ++++--------
 .../wizard/account_third_party_ledger.py      | 107 +++++-------------
 .../wizard/account_third_party_ledger.xml     |  59 +++-------
 3 files changed, 64 insertions(+), 174 deletions(-)

diff --git a/addons/account/report/third_party_ledger.py b/addons/account/report/third_party_ledger.py
index 07e3dc39b18..4a41b5a51b9 100644
--- a/addons/account/report/third_party_ledger.py
+++ b/addons/account/report/third_party_ledger.py
@@ -19,14 +19,16 @@
 #
 ##############################################################################
 
-import pooler
 import time
 import re
-import rml_parse
 import datetime
+
+import pooler
+import rml_parse
 from report import report_sxw
 
 class third_party_ledger(rml_parse.rml_parse):
+
 	def __init__(self, cr, uid, name, context):
 		self.date_lst = []
 		self.date_lst_string = ''
@@ -38,10 +40,11 @@ class third_party_ledger(rml_parse.rml_parse):
 			'sum_credit_partner': self._sum_credit_partner,
 			'sum_debit': self._sum_debit,
 			'sum_credit': self._sum_credit,
-			'get_company': self._get_company,
+#			'get_company': self._get_company,
 			'get_currency': self._get_currency,
 			'comma_me' : self.comma_me,
 		})
+
 	def date_range(self, start, end):
 		if not start or not end:
 			return []
@@ -70,41 +73,11 @@ class third_party_ledger(rml_parse.rml_parse):
 		self.date_lst = date_array
 		self.date_lst.sort()
 
-	def transform_date_into_date_array(self,data):
-		return_array = self.date_range(data['form']['date1'], data['form']['date2'])
+	def transform_date_into_date_array(self, data):
+		return_array = self.date_range(data['form']['date_from'], data['form']['date_to'])
 		self.date_lst = return_array
 		self.date_lst.sort()
 
-	def transform_both_into_date_array(self,data):
-
-		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']
-		date_array = []
-		for period_id in periods_id:
-			period_obj = self.pool.get('account.period').browse(self.cr, self.uid, period_id)
-			date_array = date_array + self.date_range(period_obj.date_start, period_obj.date_stop)
-
-		period_start_date = date_array[0]
-		date_start_date = data['form']['date1']
-		period_stop_date = date_array[-1]
-		date_stop_date = data['form']['date2']
-
-		if period_start_date<date_start_date:
-			start_date = period_start_date
-		else :
-			start_date = date_start_date
-
-		if date_stop_date<period_stop_date:
-			stop_date = period_stop_date
-		else :
-			stop_date = date_stop_date
-		final_date_array = []
-		final_date_array = final_date_array + self.date_range(start_date, stop_date)
-		self.date_lst = final_date_array
-		self.date_lst.sort()
-
 	def transform_none_into_date_array(self, data):
 		sql = "SELECT min(date) as start_date from account_move_line"
 		self.cr.execute(sql)
@@ -117,7 +90,6 @@ class third_party_ledger(rml_parse.rml_parse):
 		self.date_lst = array
 		self.date_lst.sort()
 
-
 	def comma_me(self, amount):
 		if  type(amount) is float :
 			amount = str('%.2f'%amount)
@@ -152,14 +124,12 @@ class third_party_ledger(rml_parse.rml_parse):
 #		else:
 #			self.transform_date_into_date_array(data)
 		##
-		if data['form']['state'] == 'none':
+		if data['form']['filter'] == 'filter_no':
 			self.transform_none_into_date_array(data)
-		elif data['form']['state'] == 'bydate':
+		elif data['form']['filter'] == 'filter_date':
 			self.transform_date_into_date_array(data)
-		elif data['form']['state'] == 'byperiod':
+		elif data['form']['filter'] == 'filter_period':
 			self.transform_period_into_date_array(data)
-		elif data['form']['state'] == 'all':
-			self.transform_both_into_date_array(data)
 
 		self.date_lst_string = ''
 		if self.date_lst:
@@ -170,7 +140,7 @@ class third_party_ledger(rml_parse.rml_parse):
 			self.ACCOUNT_TYPE = ['payable']
 		elif data['form']['result_selection'] == 'customer':
 			self.ACCOUNT_TYPE = ['receivable']
-		elif data['form']['result_selection'] == 'all':
+		else:
 			self.ACCOUNT_TYPE = ['payable','receivable']
 
 		self.cr.execute(
@@ -178,16 +148,15 @@ class third_party_ledger(rml_parse.rml_parse):
 			"FROM account_account a " \
 			"LEFT JOIN account_account_type t " \
 				"ON (a.type=t.code) " \
-			"WHERE a.company_id = %s " \
-				'AND a.type IN %s' \
-				"AND a.active", (data['form']['company_id'],tuple(self.ACCOUNT_TYPE)))
+#			"WHERE a.company_id = %s " \
+				'WHERE a.type IN %s' \
+				"AND a.active", (tuple(self.ACCOUNT_TYPE), ))
 		self.account_ids = [a for (a,) in self.cr.fetchall()]
 
 		account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')
 		partner_to_use = []
 
 		if self.date_lst and data['form']['soldeinit'] :
-
 			self.cr.execute(
 				"SELECT DISTINCT line.partner_id " \
 				"FROM account_move_line AS line, account_account AS account " \
@@ -198,9 +167,9 @@ class third_party_ledger(rml_parse.rml_parse):
 					"AND line.reconcile_id IS NULL " \
 					"AND line.account_id IN %s" \
 					" " + PARTNER_REQUEST + " " \
-					"AND account.company_id = %s " \
+#					"AND account.company_id = %s " \
 					"AND account.active " ,
-				(self.date_lst[0],self.date_lst[len(self.date_lst)-1],tuple(self.account_ids),data['form']['company_id'],))
+				(self.date_lst[0],self.date_lst[len(self.date_lst)-1],tuple(self.account_ids),))
 #		else:
 #
 #			self.cr.execute(
@@ -432,11 +401,10 @@ class third_party_ledger(rml_parse.rml_parse):
 				result_tmp = contemp[0] or 0.0
 			else:
 				result_tmp = result_tmp + 0.0
-
 		return result_tmp
-
-	def _get_company(self, form):
-		return pooler.get_pool(self.cr.dbname).get('res.company').browse(self.cr, self.uid, form['company_id']).name
+#
+#	def _get_company(self, form):
+#		return pooler.get_pool(self.cr.dbname).get('res.company').browse(self.cr, self.uid, form['company_id']).name
 
 	def _get_currency(self, form):
 		return pooler.get_pool(self.cr.dbname).get('res.company').browse(self.cr, self.uid, form['company_id']).currency_id.name
diff --git a/addons/account/wizard/account_third_party_ledger.py b/addons/account/wizard/account_third_party_ledger.py
index daff801f3bd..fca8c3f6a01 100644
--- a/addons/account/wizard/account_third_party_ledger.py
+++ b/addons/account/wizard/account_third_party_ledger.py
@@ -28,105 +28,54 @@ 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'
+    _inherit = 'account.common.partner.report'
     _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, 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',
+                }
+    _defaults = {
                '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,
-                'nodestroy':True,
-            }
-        else:
-            return {
-                'type': 'ir.actions.report.xml',
-                'report_name': 'account.third_party_ledger_other',
-                'datas': data,
-                'nodestroy':True,
-            }
-
     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'],))
+        cr.execute(sql, (data['form']['date_from'],))
         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,
-                    'nodestroy':True,
-                }
+            if (data['form']['date_to'] > res[0]['date_stop'] or data['form']['date_to'] < 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:
             raise osv.except_osv(_('UserError'),_('Date not in a defined fiscal year'))
+        return True
 
+    def _print_report(self, cr, uid, ids, data, query_line, context=None):
+        if context is None:
+            context = {}
+        data = self.pre_print_report(cr, uid, ids, data, query_line, context=context)
+        data['form'].update(self.read(cr, uid, ids, ['soldeinit', 'reconcil', 'page_split'])[0])
+        if data['form']['filter'] == 'filter_date':
+            self._check_date(cr, uid, data, context)
+        data['form']['query_line'] = query_line
+        if data['form']['page_split']:
+            return {
+                'type': 'ir.actions.report.xml',
+                'report_name': 'account.third_party_ledger',
+                'datas': data,
+                'nodestroy':True,
+                    }
+        return {
+                'type': 'ir.actions.report.xml',
+                'report_name': 'account.third_party_ledger_other',
+                'datas': data,
+                'nodestroy':True,
+                }
 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
index e731086af2c..d3e75ff2926 100644
--- a/addons/account/wizard/account_third_party_ledger.xml
+++ b/addons/account/wizard/account_third_party_ledger.xml
@@ -2,44 +2,21 @@
 <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" groups="base.group_multi_company"/>
-				    <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="account_partner_ledger_view" model="ir.ui.view">
+            <field name="name">Partner Ledger</field>
+            <field name="model">account.partner.ledger</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account_common_report_view" />
+            <field name="arch" type="xml">
+               <field name="fiscalyear_id" position="after">
+               		<field name="result_selection"/>
+					<field name="soldeinit"/>
+					<field name="reconcil"/>
+					<field name="page_split"/>
+					<newline/>
+               </field>
+            </field>
+        </record>
 
  		<record id="action_account_partner_ledger" model="ir.actions.act_window">
              <field name="name">Select Period</field>
@@ -59,8 +36,4 @@
  			parent="account.next_id_22"/>
 
      </data>
- </openerp>
-
-
-
-
+ </openerp>
\ No newline at end of file