sort date, display account fields must be required

Put an uppercase in the 'l': General ledger -> General Ledger (in the menu)
In General Ledger, fiscal year field must be False by default

bzr revid: patelamit2003@gmail.com-20081023065057-o4pomcwzn4s1rrm7

4 files changed, 25 insertions, 15 deletions

diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml
index 1ec5d25aa4f..e4f9ca21b02 100644
--- a/addons/account/account_report.xml
+++ b/addons/account/account_report.xml
@@ -2,20 +2,20 @@
 <openerp>
     <data>
         <report auto="False" id="account_general_ledger" menu="False" model="account.account" name="account.general.ledger" rml="account/report/general_ledger.rml" string="General Ledger"/>
-        <report auto="False" id="account_3rdparty_ledger" menu="False" model="res.partner" name="account.third_party_ledger" rml="account/report/third_party_ledger.rml" string="Partner ledger"/>
-        <report auto="False" id="account_account_balance" menu="False" model="account.account" name="account.account.balance" rml="account/report/account_balance.rml" string="Account balance"/>
-        <report auto="False" id="account_3rdparty_account_balance" menu="False" model="account.account" name="account.partner.balance" rml="account/report/partner_balance.rml" string="Partner balance"/>
+        <report auto="False" id="account_3rdparty_ledger" menu="False" model="res.partner" name="account.third_party_ledger" rml="account/report/third_party_ledger.rml" string="Partner Ledger"/>
+        <report auto="False" id="account_account_balance" menu="False" model="account.account" name="account.account.balance" rml="account/report/account_balance.rml" string="Account Balance"/>
+        <report auto="False" id="account_3rdparty_account_balance" menu="False" model="account.account" name="account.partner.balance" rml="account/report/partner_balance.rml" string="Partner Balance"/>
         <report auto="False" id="account_central_journal" model="account.journal.period" name="account.central.journal" rml="account/report/central_journal.rml" string="Print Central Journal"/>
         <report auto="False" id="account_general_journal" model="account.journal.period" name="account.general.journal" rml="account/report/general_journal.rml" string="Print General Journal"/>
         <report auto="False" id="account_journal" model="account.journal.period" name="account.journal.period.print" rml="account/report/account_journal.rml" string="Print Journal"/>
-        <report auto="False" id="account_overdue" model="res.partner" name="account.overdue" rml="account/report/overdue.rml" string="Overdue payments"/>
+        <report auto="False" id="account_overdue" model="res.partner" name="account.overdue" rml="account/report/overdue.rml" string="Overdue Payments"/>
         <report auto="False" id="account_invoices" model="account.invoice" name="account.invoice" rml="account/report/invoice.rml" string="Invoices" attachment="print-"/>
         <report id="account_transfers" model="account.transfer" name="account.transfer" string="Transfers" xml="account/report/transfer.xml" xsl="account/report/transfer.xsl"/>
         <report auto="False" id="account_intracom" menu="False" model="account.move.line" name="account.intracom" string="IntraCom"/>
 
         <report id="account_move_line_list" model="account.tax.code" name="account.tax.code.entries" rml="account/report/account_tax_code.rml" string="All Entries"/>
 
-        <report auto="False" id="account_vat_declaration" menu="False" model="account.tax.code" name="account.vat.declaration" rml="account/report/tax_report.rml" string="Taxes report"/>
+        <report auto="False" id="account_vat_declaration" menu="False" model="account.tax.code" name="account.vat.declaration" rml="account/report/tax_report.rml" string="Taxes Report"/>
 
 		<menuitem
 			id="menu_tax_report"
diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml
index 01a7f2759dd..2b7303c6454 100644
--- a/addons/account/account_wizard.xml
+++ b/addons/account/account_wizard.xml
@@ -80,16 +80,16 @@
 	    <wizard string="Open State" model="account.invoice" name="account.wizard_paid_open" menu="False" id="wizard_paid_open"/>
 
 	    <!-- generic report wizard -->
-	    <wizard id="wizard_account_balance_report" menu="False" model="account.account" name="account.account.balance.report" string="Account balance"/>
+	    <wizard id="wizard_account_balance_report" menu="False" model="account.account" name="account.account.balance.report" string="Account Balance"/>
         <menuitem icon="STOCK_PRINT" action="wizard_account_balance_report" id="menu_account_balance_report" parent="account.menu_generic_report" type="wizard"/>
 
-		<wizard id="wizard_general_ledger" menu="False" model="account.account" name="account.general.ledger.report" string="General ledger"/>
+		<wizard id="wizard_general_ledger" menu="False" model="account.account" name="account.general.ledger.report" string="General Ledger"/>
         <menuitem icon="STOCK_PRINT" action="wizard_general_ledger" id="menu_general_ledger" parent="account.menu_generic_report" type="wizard"/>
 
-        <wizard id="wizard_print_journal" menu="False" model="account.journal.period" name="account.print.journal.report" string="Print journal" />
+        <wizard id="wizard_print_journal" menu="False" model="account.journal.period" name="account.print.journal.report" string="Print Journal" />
 		<menuitem icon="STOCK_PRINT" action="wizard_print_journal" id="menu_print_journal" parent="account.menu_generic_report" type="wizard" />
 
-        <wizard id="wizard_central_journal" menu="False" model="account.journal.period" name="account.central.journal.report" string="Central journal" />
+        <wizard id="wizard_central_journal" menu="False" model="account.journal.period" name="account.central.journal.report" string="Central Journal" />
 		<menuitem icon="STOCK_PRINT" action="wizard_central_journal" id="menu_cetral_journal" parent="account.menu_generic_report" type="wizard" />
 
 
diff --git a/addons/account/i18n/fr_FR.po b/addons/account/i18n/fr_FR.po
index 2a888155ce6..c43dfd58cc7 100644
--- a/addons/account/i18n/fr_FR.po
+++ b/addons/account/i18n/fr_FR.po
@@ -237,7 +237,7 @@ msgstr "Taxes fournisseurs"
 #. module: account
 #: rml:account.vat.declaration:0
 msgid "Tax Report"
-msgstr "Déclaration TVA"
+msgstr "Taxes Statement"
 
 #. module: account
 #: selection:account.tax.template,type:0
@@ -727,7 +727,7 @@ msgstr "Grand livre analytique"
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_vat_declaration
 msgid "VAT Declaration"
-msgstr "Déclaration TVA"
+msgstr "Taxes Statement"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
diff --git a/addons/account/wizard/wizard_general_ledger_report.py b/addons/account/wizard/wizard_general_ledger_report.py
index a03162cf11d..0bfec00f87b 100644
--- a/addons/account/wizard/wizard_general_ledger_report.py
+++ b/addons/account/wizard/wizard_general_ledger_report.py
@@ -68,11 +68,13 @@ period_form = '''<?xml version="1.0"?>
 <form string="Select Date-Period">
     <field name="company_id" colspan="4"/>
     <newline/>
-    <field name="fiscalyear"/>
+    <field name="fiscalyear" attrs="{'readonly':[('state','=','bydate')]}"/>
     <label colspan="2" string="(Keep empty for all open fiscal years)" align="0.0"/>
     <newline/>
-    <field name="display_account"/>
-    <field name="sortbydate"/>
+
+    <field name="display_account" required="True"/>
+    <field name="sortbydate" required="True"/>
+  
     <field name="landscape"/>
     <field name="amount_currency"/>
     <newline/>
@@ -141,6 +143,14 @@ def _check_date(self, cr, uid, data, context):
 
     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':
+           data['form']['fiscalyear'] = False
+        else :
+           self._check_date(cr, uid, data, context)
+           data['form']['fiscalyear'] = True
+        return data['form']
 
 
 class wizard_report(wizard.interface):
@@ -184,7 +194,7 @@ class wizard_report(wizard.interface):
             'result': {'type':'print', 'report':'account.general.ledger_landscape', 'state':'end'}
         },
         'report': {
-            'actions': [],
+            'actions': [_check_state],
             'result': {'type':'print', 'report':'account.general.ledger', 'state':'end'}
         }
     }