rename labels to be more clear

modify colspan to avoid scrolling on report timesheet

bzr revid: nel@tinyerp.com-20100503091940-ous2eyyz875op1ux

diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index af8ef08..062261f 100644 (file)
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -62,8 +62,8 @@ class account_invoice_report(osv.osv):
             ('cancel','Cancelled')
             ], 'Order State', readonly=True),
         'date_due': fields.date('Due Date', readonly=True),
-        'address_contact_id': fields.many2one('res.partner.address', 'Contact Address', readonly=True),
-        'address_invoice_id': fields.many2one('res.partner.address', 'Invoice Address', readonly=True),
+        'address_contact_id': fields.many2one('res.partner.address', 'Contact Address Name', readonly=True),
+        'address_invoice_id': fields.many2one('res.partner.address', 'Invoice Address Name', readonly=True),
         'account_id': fields.many2one('account.account', 'Account',readonly=True),
         'partner_bank': fields.many2one('res.partner.bank', 'Bank Account',readonly=True),
         'residual':fields.float('Total Residual', readonly=True),

diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index fea7dba..c36e231 100644 (file)
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -56,7 +56,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Invoices">
-               <group>
+              <group col="10" colspan="12">
                        <filter icon="terp-account" string="This Year"
                                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
                                    help="Invoices of the year"/>
@@ -119,7 +119,7 @@
                        <field name="address_invoice_id"/>
                        <separator orientation="vertical"/>
                        <field name="account_id"/>
-                       <field name="partner_bank"/>
+                       <field name="partner_bank" widget="selection"/>
                        <separator orientation="vertical"/>
                        <field name="period_id" widget="selection"/>
                        <field name="fiscal_position" widget="selection"/>
@@ -145,8 +145,8 @@
                     <filter string="Account" icon="terp-account" context="{'group_by':'account_id'}"/>
                     <filter string="Bank Account" icon="terp-account" context="{'group_by':'partner_bank'}"/>
                     <newline/>
-                    <filter string="Contact Address" icon="terp-account" context="{'group_by':'address_contact_id'}"/>
-                    <filter string="Invoice Address" icon="terp-account" context="{'group_by':'address_invoice_id'}"/>
+                    <filter string="Contact Address Name" icon="terp-account" context="{'group_by':'address_contact_id'}"/>
+                    <filter string="Invoice Address Name" icon="terp-account" context="{'group_by':'address_invoice_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Force Period" icon="terp-account" context="{'group_by':'period_id'}"/>
                     <filter string="Fiscal Position" icon="terp-account" context="{'group_by':'fiscal_position'}"/>

diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py
index 52fbc94..bbd2413 100644 (file)
--- a/addons/hr_recruitment/report/hr_recruitment_report.py
+++ b/addons/hr_recruitment/report/hr_recruitment_report.py
@@ -45,7 +45,7 @@ class hr_recruitment_report(osv.osv):
         'salary_prop' : fields.float("Salary Proposed"),
         'salary_exp' : fields.float("Salary Expected"),
         'partner_id': fields.many2one('res.partner', 'Partner',readonly=True),
-        'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact',readonly=True),
+        'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact Name',readonly=True),
         'available' : fields.float("Availability")
 
     }

diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 4cdaaca..3ec4137 100644 (file)
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -116,8 +116,8 @@
                     <field name="date_closed"/>
                     <separator orientation="vertical"/>
                        <field name="type_id" widget="selection"/>
-                       <field name="partner_id" widget="selection"/>
-                       <field name="partner_address_id" widget="selection"/>
+                       <field name="partner_id"/>
+                       <field name="partner_address_id"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By ..." colspan="10" col="12">
@@ -126,7 +126,7 @@
                    <filter string="Partner" icon="terp-hr" domain="[]" context="{'group_by':'partner_id'}" />
                    <filter string="Stage" icon="terp-hr" domain="[]" context="{'group_by':'stage_id'}" />
                    <separator orientation="vertical"/>
-                   <filter string="Partner Contact" icon="terp-hr" domain="[]" context="{'group_by':'partner_address_id'}" />
+                   <filter string="Partner Contact Name" icon="terp-hr" domain="[]" context="{'group_by':'partner_address_id'}" />
                    <filter string="Jobs" name="job" icon="terp-sale" domain="[]" context="{'group_by':'job_id'}"/>
                    <filter string="Department" name="department" icon="terp-hr" domain="[]" context="{'group_by':'department_id'}"/>
                    <filter string="Degree" name="degree" icon="terp-hr" domain="[]" context="{'group_by':'type_id'}"/>

diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index 57df8dc..305a27e 100644 (file)
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -45,7 +45,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet">
-                    <group col="10" colspan="4">
+                    <group col="10" colspan="12">
                         <filter icon="terp-hr" string="This Year"
                                    domain="[('date_current','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_current','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
                                    help="Timesheet in this year"/>