From 97a4241d2676573506cd046b17852a2cd7078ef8 Mon Sep 17 00:00:00 2001
From: Najlaa <nel@silver>
Date: Thu, 6 Nov 2008 12:22:44 +0100
Subject: [PATCH] small changes in labels

bzr revid: nel@silver-20081106112244-hsj10lwq1wxe8fag
---
 addons/account/report/partner_balance.py      |   9 +-
 addons/account/report/partner_balance.rml     |   2 +-
 .../wizard/wizard_account_balance_report.py   |   3 +-
 .../wizard/wizard_aged_trial_balance.py       |   2 +-
 .../wizard/wizard_general_ledger_report.py    |   3 +-
 .../wizard/wizard_partner_balance_report.py   |   4 +-
 .../wizard/wizard_third_party_ledger.py       | 135 +++++++++---------
 7 files changed, 81 insertions(+), 77 deletions(-)

diff --git a/addons/account/report/partner_balance.py b/addons/account/report/partner_balance.py
index 22cb2479c87..0e286d61805 100644
--- a/addons/account/report/partner_balance.py
+++ b/addons/account/report/partner_balance.py
@@ -345,8 +345,6 @@ class partner_balance(report_sxw.rml_parse):
                     tot_scredit = r['scredit']
                     tot_sdebit = r['sdebit']
                     tot_enlitige = (r['enlitige'] or 0.0)
-
-                    
                     #
                     ##
                     new_header = {}
@@ -362,7 +360,7 @@ class partner_balance(report_sxw.rml_parse):
                     new_header['type'] = 3
                     ##
                     ##
-                   
+
                     completearray.append(new_header)
                     ##
                     #
@@ -371,7 +369,7 @@ class partner_balance(report_sxw.rml_parse):
                     r['balance'] = float(r['sdebit']) - float(r['scredit'])
 
                     #
-                    
+                    print "=========r",r
                     completearray.append(r)
 
                 if cleanarray[i]['account_id'] == cleanarray[i-1]['account_id']:
@@ -403,6 +401,7 @@ class partner_balance(report_sxw.rml_parse):
                     #
                     r['balance'] = float(r['sdebit']) - float(r['scredit'])
                     #
+
                     completearray.append(r)
 
             i = i + 1
@@ -604,4 +603,4 @@ class partner_balance(report_sxw.rml_parse):
 
 report_sxw.report_sxw('report.account.partner.balance', 'res.partner',
     'account/report/partner_balance.rml',parser=partner_balance,
-    header=False)
\ No newline at end of file
+    header=False)
diff --git a/addons/account/report/partner_balance.rml b/addons/account/report/partner_balance.rml
index 32cea05fc3a..1548831e22a 100644
--- a/addons/account/report/partner_balance.rml
+++ b/addons/account/report/partner_balance.rml
@@ -381,4 +381,4 @@
       </tr>
     </blockTable>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/account/wizard/wizard_account_balance_report.py b/addons/account/wizard/wizard_account_balance_report.py
index c730ec53685..5037b4c23c2 100644
--- a/addons/account/wizard/wizard_account_balance_report.py
+++ b/addons/account/wizard/wizard_account_balance_report.py
@@ -54,7 +54,7 @@ period_fields = {
         'string':"Date/Period Filter",
         'type':'selection',
         'selection':[('bydate','By Date'),('byperiod','By Period'),('all','By Date and Period'),('none','No Filter')],
-        'default': lambda *a:'bydate'
+        'default': lambda *a:'none'
     },
     'fiscalyear': {
         'string':'Fiscal year',
@@ -89,6 +89,7 @@ class wizard_report(wizard.interface):
         periods_obj=pooler.get_pool(cr.dbname).get('account.period')
         data['form']['fiscalyear'] = fiscalyear_obj.find(cr, uid)
         data['form']['periods'] =periods_obj.search(cr, uid, [('fiscalyear_id','=',data['form']['fiscalyear'])])
+        data['form']['fiscalyear'] = False
         data['form']['display_account']='bal_all'
         return data['form']
 
diff --git a/addons/account/wizard/wizard_aged_trial_balance.py b/addons/account/wizard/wizard_aged_trial_balance.py
index 51c7994f9df..3de86d2653e 100755
--- a/addons/account/wizard/wizard_aged_trial_balance.py
+++ b/addons/account/wizard/wizard_aged_trial_balance.py
@@ -48,7 +48,7 @@ _aged_trial_fields = {
         'type':'selection',
         'selection':[('customer','Receivable'),('supplier','Payable'),('all','Receivable and Payable')],
         'required':True,
-        'default': lambda *a: 'customer',
+        'default': lambda *a: 'all',
     },
     'direction_selection':{
         'string':"Analysis Direction",
diff --git a/addons/account/wizard/wizard_general_ledger_report.py b/addons/account/wizard/wizard_general_ledger_report.py
index 0f5c92fa9f4..1d5896204db 100644
--- a/addons/account/wizard/wizard_general_ledger_report.py
+++ b/addons/account/wizard/wizard_general_ledger_report.py
@@ -100,7 +100,7 @@ period_fields = {
         'string':"Date/Period Filter",
         'type':'selection',
         'selection':[('bydate','By Date'),('byperiod','By Period'),('all','By Date and Period'),('none','No Filter')],
-        'default': lambda *a:'bydate'
+        'default': lambda *a:'none'
     },
     'fiscalyear': {'string': 'Fiscal year', 'type': 'many2one', 'relation': 'account.fiscalyear',
         'help': 'Keep empty for all open fiscal year'},
@@ -168,6 +168,7 @@ class wizard_report(wizard.interface):
         data['form']['sortbydate'] = 'sort_date'
         data['form']['display_account']='bal_all'
         data['form']['landscape']=True
+        data['form']['fiscalyear'] = False
         data['form']['amount_currency'] = True
         return data['form']
 
diff --git a/addons/account/wizard/wizard_partner_balance_report.py b/addons/account/wizard/wizard_partner_balance_report.py
index 500e1dbb224..697b08fd16b 100644
--- a/addons/account/wizard/wizard_partner_balance_report.py
+++ b/addons/account/wizard/wizard_partner_balance_report.py
@@ -54,10 +54,11 @@ period_fields = {
         'string':"Date/Period Filter",
         'type':'selection',
         'selection':[('bydate','By Date'),('byperiod','By Period'),('all','By Date and Period'),('none','No Filter')],
-        'default': lambda *a:'bydate'
+        'default': lambda *a:'none'
     },
     'fiscalyear': {
         'string':'Fiscal year', 'type': 'many2one', 'relation': 'account.fiscalyear',
+        'default': lambda *a:False,
         'help': 'Keep empty for all open fiscal year'
     },
     'periods': {'string': 'Periods', 'type': 'many2many', 'relation': 'account.period', 'help': 'All periods if empty','states':{'none':[('readonly',True)],'bydate':[('readonly',True)]}},
@@ -87,6 +88,7 @@ class wizard_report(wizard.interface):
         data['form']['periods'] =periods_obj.search(cr, uid, [('fiscalyear_id','=',data['form']['fiscalyear'])])
         data['form']['company_id'] = company_id
         data['form']['soldeinit'] = True
+        data['form']['fiscalyear'] = False
         data['form']['result_selection'] = 'all'
         return data['form']
     
diff --git a/addons/account/wizard/wizard_third_party_ledger.py b/addons/account/wizard/wizard_third_party_ledger.py
index 6497958fee6..80827378e0f 100755
--- a/addons/account/wizard/wizard_third_party_ledger.py
+++ b/addons/account/wizard/wizard_third_party_ledger.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution	
+#    OpenERP, Open Source Management Solution    
 #    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -27,16 +27,16 @@ import pooler
 
 period_form = '''<?xml version="1.0"?>
 <form string="Select Date-Period">
-	
-	<field name="company_id"/>
+    
+    <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>
+    <field name="reconcil"/>
+    <field name="page_split"/>
+    </group>
     <newline/>
     <separator string="Filters" colspan="4"/>
     <field name="state" required="True"/>
@@ -55,16 +55,17 @@ period_form = '''<?xml version="1.0"?>
 </form>'''
 
 period_fields = {
-	'company_id': {'string': 'Company', 'type': 'many2one', 'relation': 'res.company', 'required': True},
+    '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:'bydate'
+        'default': lambda *a:'none'
     },
     'fiscalyear': {
         'string':'Fiscal year', 'type': 'many2one', 'relation': 'account.fiscalyear',
-        'help': 'Keep empty for all open fiscal year'
+        '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':{
@@ -73,70 +74,70 @@ period_fields = {
         'selection':[('customer','Receivable Accounts'),('supplier','Payable Accounts'),('all','Receivable and Payable Accounts')],
         'required':True
     },
-	'soldeinit':{'string':"Inclure les soldes initiaux",'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')},
+    'soldeinit':{'string':"Inclure les soldes initiaux",'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']['page_split'] = False
-		data['form']['reconcil'] = False
-		data['form']['soldeinit'] = True
-		return data['form']
-	
-	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 """%(data['form']['date1'])
-		cr.execute(sql)
-		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 ' + res[0]['date_start'] + " and " + 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' or data['form']['state'] == 'none':
-		   data['form']['fiscalyear'] = False
-		else :
-		   data['form']['fiscalyear'] = True
-		   self._check_date(cr, uid, data, context)
-		return data['form']
+    
+    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_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 """%(data['form']['date1'])
+        cr.execute(sql)
+        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 ' + res[0]['date_start'] + " and " + 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)
+        return data['form']
 
 
-	states = {
-		'init': {
-			'actions': [_get_defaults],
-			'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel','gtk-cancel'),('report','Print','gtk-print')]}
-		},
-		'report': {
-			'actions': [_check_state],
-			'result': {'type':'print', 'report':'account.third_party_ledger', 'state':'end'}
-		}
-	}
+    states = {
+        'init': {
+            'actions': [_get_defaults],
+            'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel','gtk-cancel'),('report','Print','gtk-print')]}
+        },
+        'report': {
+            'actions': [_check_state],
+            'result': {'type':'print', 'report':'account.third_party_ledger', 'state':'end'}
+        }
+    }
 wizard_report('account.third_party_ledger.report')