From 3dab6ea173a74418c7f2dd30054047e2c8e80271 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Fri, 8 Oct 2010 12:35:33 +0530
Subject: [PATCH] [IMP] l10n_be:-improvements in the view of wizards

bzr revid: mtr@mtr-20101008070533-xokjnmxlepeodjr6
---
 .../wizard/l10n_be_account_vat_declaration.py |  4 +-
 .../l10n_be_account_vat_declaration_view.xml  | 52 ++++++++++---------
 .../wizard/l10n_be_partner_vat_listing.xml    |  2 +-
 3 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
index ae23bf926e9..4d86d5dae2e 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
@@ -39,8 +39,8 @@ class l10n_be_vat_declaration(osv.osv_memory):
         'tax_code_id': fields.many2one('account.tax.code', 'Tax Code', domain=[('parent_id', '=', False)]),
         'msg': fields.text('File created', size=64, readonly=True),
         'file_save': fields.binary('Save File'),
-        'ask_resitution': fields.boolean('Ask Restitution'),
-        'ask_payment': fields.boolean('Ask Payment'),
+        'ask_resitution': fields.boolean('Ask Restitution',help='It indicates whether a resitution is to made or not?'),
+        'ask_payment': fields.boolean('Ask Payment',help='It indicates whether a payment is to made or not?'),
         'client_nihil': fields.boolean('Last Declaration of Enterprise',help='Tick this case only if it concerns only the last statement on the civil or cessation of activity'),
     }
     _defaults = {
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
index f7f9ff9ed32..fe81a4f9848 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
@@ -13,24 +13,29 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 			<form string="Periodical VAT Declaration" >
-					<group height="250" width="330">
-						<group>
- 							<separator string="Declare Periodical VAT" colspan="2" /><newline/>
-							<field name="period_id" /><newline/>
-							<field name="tax_code_id" string="Company" widget="selection"/><newline/>
-							<field name="ask_resitution" colspan="2" align="1"/><newline/>
-							<field name="ask_payment" colspan="2"/><newline/>
-							<field name="client_nihil" colspan="2" string="Is Last Declaration"/><newline/><label/>
-	            		</group>
-						<newline/>
 					<group>
+					   <group colspan="4">
+ 							<separator string="Declare Periodical VAT" colspan="4"/><newline/>
+    						<field name="period_id" widget="selection"/>
+							<field name="tax_code_id" string="Company" widget="selection" groups="base.group_multi_company"/>
+							<newline/>
+						</group>
+						<group>
+							<field name="ask_resitution" colspan="1"/>
+							<field name="ask_payment" colspan="1"/>
+							<field name="client_nihil" string="Is Last Declaration" colspan="1" /><label/>
+	            		</group>
+	            		<newline/>
+					<group>
+					<separator colspan="4"/>
+					<newline/>
 					<button special="cancel" string="Close" icon="gtk-cancel"/>
 					<button icon="gtk-execute"  name="create_xml" string="Create XML" type="object" default_focus="1" />
               		</group>
-              		</group>
-				</form>
-            </field>
-		</record>
+          		</group>
+			</form>
+        </field>
+	</record>
 
 		<record id="view_vat_save" model="ir.ui.view">
             <field name="name">Save XML</field>
@@ -38,17 +43,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 				<form string="Save xml">
-					<group height="200" width="400">
-						<separator colspan="2" string="Note: "/><newline/>
-							<label string="Save the File with '.xml' extension." colspan="2" align="0.0"/><newline/>
-								<field name="name"/><newline/>
-				    			<field name="file_save" readonly="True"/>
-				    			<newline/>
-			    			<label/>
-		              		<newline/>
-        		      		<label colspan="1"/>
-              				<button colspan="1" special="cancel" string="Close" icon="gtk-cancel" align="0.0"/>
-	              	</group>
+					<group colspan="3">
+						<label string="Save the File with '.xml' extension." colspan="2" align="0.0"/><newline/>
+							<field name="name"/><newline/>
+			    			<field name="file_save" readonly="True"/>
+              		<newline/>
+		      		<separator colspan="4"/><label/>
+          				<button special="cancel" string="Ok" icon="gtk-ok"/>
+      				</group>
 				</form>
 			</field>
 		</record>
diff --git a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
index 19ec96e8023..7ae3a0ab73e 100644
--- a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
+++ b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
@@ -15,7 +15,7 @@
 			<form string="Partner VAT Listing">
 			    <label string="This wizard will create an XML file for Vat details and total invoiced amounts per partner." colspan="4"/>
 				    <newline/>
-				    <field name="fyear" default_focus="1"/>
+				    <field name="fyear" default_focus="1" widget="selection"/>
 				    <newline/>
 				    <field name="mand_id"/>
 				    <newline/>