[IMP]:improved accounting wizards

bzr revid: pap@tinyerp.co.in-20100622103255-mroqq9v3zw11hs2s

10 files changed, 84 insertions, 29 deletions

diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index dd577f98458..51c26706446 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -11,7 +11,7 @@
         	<menuitem id="periodical_processing_journal_entries_validation" name="Journal Entries Validation" parent="menu_finance_periodical_processing"/>
         	<menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
 <!--        	<menuitem id="periodical_processing_recurrent_entries" name="Recurrent Entries" parent="menu_finance_periodical_processing"/>-->
-        	<menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
+<!--        	<menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>-->
 <!--        	<menuitem id="periodical_processing_end_of_period" name="End of Period" parent="menu_finance_periodical_processing"/>-->
         <menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" sequence="10"/>
         <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="12"/>
diff --git a/addons/account/wizard/account_balance_report_view.xml b/addons/account/wizard/account_balance_report_view.xml
index f50cce039cc..77c615611d3 100644
--- a/addons/account/wizard/account_balance_report_view.xml
+++ b/addons/account/wizard/account_balance_report_view.xml
@@ -8,6 +8,7 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
               	<form string="Select period">
+              		<group width="650" height="200">
 				    <field name="company_id" groups="base.group_multi_company"/>
 				    <field name="display_account" required = "True"/>
 				    <newline/>
@@ -30,10 +31,12 @@
 				    </group>
 				    <newline/>
      				<group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
+                       	<separator colspan="4"/>
+                       	<newline/>
      					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
                			<button name="check_state" string="Print" type="object" icon="gtk-print" default_focus="1"/>
  					</group>
+ 					</group>
 				</form>
              </field>
  		</record>
diff --git a/addons/account/wizard/account_central_journal_view.xml b/addons/account/wizard/account_central_journal_view.xml
index b833af4a9dd..6a9526c415e 100644
--- a/addons/account/wizard/account_central_journal_view.xml
+++ b/addons/account/wizard/account_central_journal_view.xml
@@ -8,14 +8,19 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 			<form string="Print Central Journal">
-			    <group col="4" colspan="6">
-				    <field name="journal_id"/>
-				    <field name="period_id"/>
-				</group>
-				<separator colspan="4"/>
-			    <group col="2" colspan="4">
+				<group height="370" width="400">
+				    <group>
+					    <separator string="Journals"/><newline/>
+					    <field name="journal_id" nolabel="1"/><newline/>
+					    <separator string="Periods"/><newline/>
+					    <field name="period_id" nolabel="1"/><newline/>
+					</group>
+					<newline/>
+				    <group>
+			    		<separator colspan="4"/>
 	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-						<button name="check_data" string="Print" colspan="1" type="object" icon="gtk-print"/>
+						<button name="check_data" string="Print" colspan="1" type="object" icon="gtk-ok"/>
+					</group>
 				</group>
 			</form>
             </field>
diff --git a/addons/account/wizard/account_compare_account_balance_report_view.xml b/addons/account/wizard/account_compare_account_balance_report_view.xml
index 2467928a584..31978dc3e98 100644
--- a/addons/account/wizard/account_compare_account_balance_report_view.xml
+++ b/addons/account/wizard/account_compare_account_balance_report_view.xml
@@ -31,7 +31,8 @@
 
 				    <newline/>
      				<group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
+                       	<separator colspan="4"/>
+                       	<newline/>
      					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
                			<button name="check" string="Print" type="object" icon="gtk-print" default_focus="1"/>
  					</group>
diff --git a/addons/account/wizard/account_general_journal_view.xml b/addons/account/wizard/account_general_journal_view.xml
index fc39300d390..a3a54843396 100644
--- a/addons/account/wizard/account_general_journal_view.xml
+++ b/addons/account/wizard/account_general_journal_view.xml
@@ -8,14 +8,19 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 			<form string="Print General Journal">
-			    <group col="4" colspan="6">
-				    <field name="journal_id"/>
-				    <field name="period_id"/>
-				</group>
-				<separator colspan="4"/>
-			    <group col="2" colspan="4">
+				<group height="380" width="400">
+				    <group>
+					    <separator string="Journals"/><newline/>
+					    <field name="journal_id" nolabel="1"/><newline/>
+					    <separator string="Periods"/><newline/>
+					    <field name="period_id" nolabel="1"/><newline/>
+					</group>
+					<newline/>
+				    <group>
+			    		<separator colspan="4"/>
 	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
 						<button name="check_data" string="Print" colspan="1" type="object" icon="gtk-ok"/>
+					</group>
 				</group>
 			</form>
             </field>
diff --git a/addons/account/wizard/account_general_ledger_report_view.xml b/addons/account/wizard/account_general_ledger_report_view.xml
index a2ff3accf5f..b06c24d501d 100644
--- a/addons/account/wizard/account_general_ledger_report_view.xml
+++ b/addons/account/wizard/account_general_ledger_report_view.xml
@@ -8,6 +8,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 			<form string="Select Date-Period">
+				<group width="650" height="230">
 			    <field name="company_id" colspan="4" groups="base.group_multi_company"/>
 			    <newline/>
 			    <field name="fiscalyear"/>
@@ -39,9 +40,11 @@
     				<newline/>
     				<group colspan="4" col="6">
 	     				<separator colspan="4"/>
+	     				<newline/>
 	     				<button special="cancel" string="Cancel" icon="gtk-cancel"/>
 	               		<button name="check_report" string="Print" type="object" icon="gtk-print"/>
                		</group>
+               		</group>
 			</form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_partner_balance_report_view.xml b/addons/account/wizard/account_partner_balance_report_view.xml
index 35a2556982d..f5a8043673f 100644
--- a/addons/account/wizard/account_partner_balance_report_view.xml
+++ b/addons/account/wizard/account_partner_balance_report_view.xml
@@ -8,6 +8,7 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
               	<form string="Select Date-Period">
+              		<group width="620" height="210">
      				<field name="company_id" groups="base.group_multi_company"/>
      				<field name="result_selection" required = "True"/>
     	 			<newline/>
@@ -30,10 +31,12 @@
      				</group>
      				<newline/>
      				<group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
+                       	<separator colspan="4"/>
+                       	<newline/>
      					<button special="cancel" string="Cancel" icon="terp-gtk-stop"/>
                			<button name="check_state" string="Print" type="object" icon="gtk-print"/>
  					</group>
+ 					</group>
  				</form>
              </field>
  		</record>
diff --git a/addons/account/wizard/account_print_journal_view.xml b/addons/account/wizard/account_print_journal_view.xml
index 69a5b5dee39..3c08fa5f697 100644
--- a/addons/account/wizard/account_print_journal_view.xml
+++ b/addons/account/wizard/account_print_journal_view.xml
@@ -1,6 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+<!---->
+<!--		<record id="view_account_print_journal" model="ir.ui.view">-->
+<!--            <field name="name">Account Print Journal</field>-->
+<!--            <field name="model">account.print.journal</field>-->
+<!--            <field name="type">form</field>-->
+<!--            <field name="arch" type="xml">-->
+<!--			<form string="Print Journal">-->
+<!--			    <group col="4" colspan="6">-->
+<!--				    <field name="journal_id"/>-->
+<!--				    <field name="period_id"/>-->
+<!--				    <newline/>-->
+<!--				    <field name="sort_selection"/>-->
+<!--				</group>-->
+<!--				<separator colspan="4"/>-->
+<!--			    <group col="2" colspan="4">-->
+<!--	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>-->
+<!--						<button name="check_data" string="Print" colspan="1" type="object" icon="gtk-ok"/>-->
+<!--				</group>-->
+<!--			</form>-->
+<!--            </field>-->
+<!--        </record>-->
+
 
 		<record id="view_account_print_journal" model="ir.ui.view">
             <field name="name">Account Print Journal</field>
@@ -8,21 +30,26 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 			<form string="Print Journal">
-			    <group col="4" colspan="6">
-				    <field name="journal_id"/>
-				    <field name="period_id"/>
-				    <newline/>
+				<group height="400" width="400">
+			    <group>
+			    	<separator string="Journals"/><newline/>
+				    <field name="journal_id" nolabel="1"/><newline/>
+				    <separator string="Periods"/><newline/>
+				    <field name="period_id" nolabel="1"/><newline/>
+				</group>
+				<newline/>
+				<group>
 				    <field name="sort_selection"/>
+				    <newline/>
+					<separator colspan="4"/>
+            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+					<button name="check_data" string="Print" colspan="1" type="object" icon="gtk-ok"/>
 				</group>
-				<separator colspan="4"/>
-			    <group col="2" colspan="4">
-	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-						<button name="check_data" string="Print" colspan="1" type="object" icon="gtk-ok"/>
 				</group>
 			</form>
             </field>
         </record>
-
+        
         <record id="action_account_print_journal" model="ir.actions.act_window">
             <field name="name">Account Print Journal</field>
             <field name="type">ir.actions.act_window</field>
diff --git a/addons/account/wizard/account_third_party_ledger.xml b/addons/account/wizard/account_third_party_ledger.xml
index e731086af2c..9cb0463ea48 100644
--- a/addons/account/wizard/account_third_party_ledger.xml
+++ b/addons/account/wizard/account_third_party_ledger.xml
@@ -8,6 +8,7 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
 				<form string="Select Date-Period">
+					<group width="650" height="230">
 				    <field name="company_id" groups="base.group_multi_company"/>
 				    <field name="result_selection"/>
 				    <newline/>
@@ -33,10 +34,12 @@
 				        </group>
 				    </group>
      				<group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
+                       	<separator colspan="2"/>
+                       	<newline/>
      					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
                			<button name="check_state" string="Print" type="object" icon="gtk-print"/>
  					</group>
+ 					</group>
  				</form>
              </field>
  		</record>
diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index fa53ac97a17..8978dc50ee3 100644
--- a/addons/account/wizard/account_vat_view.xml
+++ b/addons/account/wizard/account_vat_view.xml
@@ -8,14 +8,19 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 			<form string="Select Period">
+				<group width="650" height="230">
 				    <field name="company_id" groups="base.group_multi_company"/>
 					<newline/>
 				    <field name="based_on"/>
 				    <newline/>
-				    <field name="periods"/>
-			    <group col="2" colspan="4">
+				    <separator string="Periods" colspan="4"/>
+				    <field name="periods" nolabel="1"/>
+			    	<group>
+			    		<separator colspan="4"/>
+			    		<newline/>
 	            		<button icon='gtk-cancel' special="cancel"  string="Cancel" />
 						<button name="create_vat" string="Print VAT Decl." colspan="1" type="object" icon="gtk-ok"/>
+					</group>
 				</group>
 			</form>
             </field>