[MERGE]

Merge view chagnes

bzr revid: sbh@tinyerp.com-20120607094707-xia6j05d8txbsv2c

addons/hr_holidays/hr_holidays.py

@@ -81,7 +81,7 @@ class hr_holidays_status(osv.osv):
         'max_leaves': fields.function(_user_left_days, string='Maximum Allowed', help='This value is given by the sum of all holidays requests with a positive value.', multi='user_left_days'),
         'leaves_taken': fields.function(_user_left_days, string='Leaves Already Taken', help='This value is given by the sum of all holidays requests with a negative value.', multi='user_left_days'),
         'remaining_leaves': fields.function(_user_left_days, string='Remaining Leaves', help='Maximum Leaves Allowed - Leaves Already Taken', multi='user_left_days'),
-        'double_validation': fields.boolean('Apply Double Validation', help="If its True then its Allocation/Request have to be validated by second validator")
+        'double_validation': fields.boolean('Apply Double Validation', help="If its True then the Allocation/Leave Requests for this type will require a second validation to be approved")
     }
     _defaults = {
         'color_name': 'red',

addons/hr_holidays/i18n/hr_holidays.pot

@@ -401,8 +401,7 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"If its True then the Allocation/Leave Requests for this type will require a second validation to be approved"
 msgstr ""
 
 #. module: hr_holidays

addons/hr_timesheet/i18n/hr_timesheet.pot

@@ -446,7 +446,7 @@ msgstr ""
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet

addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot

@@ -761,7 +761,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet

addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml

@@ -6,7 +6,7 @@
         <field name="model">hr.timesheet.current.open</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="My Timesheet">
+            <form string="My Current Timesheet">
                <separator string="It will open your current timesheet" colspan="4" />
                <group colspan="4" col="6">
                     <button  icon="gtk-cancel" special="cancel" string="Cancel"/>
@@ -17,7 +17,7 @@
     </record>
 
     <record id="action_hr_timesheet_current_open" model="ir.actions.act_window">
-        <field name="name">My Timesheet</field>
+        <field name="name">My Current Timesheet</field>
         <field name="res_model">hr.timesheet.current.open</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
@@ -26,7 +26,7 @@
         <field name="help">My Timesheet opens your timesheet so that you can book your activities into the system. From the same form, you can register your attendances (Sign In/Out) and describe the working hours made on the different projects. At the end of the period defined in the company, the timesheet is confirmed by the user and can be validated by his manager. If required, as defined on the project, you can generate the invoices based on the timesheet.</field>
     </record>
 
-    <menuitem action="action_hr_timesheet_current_open" icon="STOCK_NEW" id="menu_act_hr_timesheet_sheet_form_my_current" name="My Timesheet" parent="hr_attendance.menu_hr_time_tracking" sequence="1"/>
+    <menuitem action="action_hr_timesheet_current_open" icon="STOCK_NEW" id="menu_act_hr_timesheet_sheet_form_my_current" name="My Current Timesheet" parent="hr_attendance.menu_hr_time_tracking" sequence="1"/>
 
     </data>
 </openerp>

addons/survey/wizard/survey_answer.py

@@ -358,7 +358,7 @@ class survey_question_wiz(osv.osv_memory):
                     fields['progress_bar_' + tools.ustr(page_number)] = {'type':'float', 'string':"Progress", 'views':{}}
                     etree.SubElement(xml_group, 'label', {'string': tools.ustr(page_number+ 1) + "/" + tools.ustr(total_pages)})
                     etree.SubElement(xml_group, 'button', {'icon': "gtk-cancel", 'special': "cancel",'string':"Cancel"})
-
+                    
                     if pre_button:
                         etree.SubElement(xml_group, 'button', {'colspan':"1",'icon':"gtk-go-back",'name':"action_previous",'string':"Previous",'type':"object"})
                     but_string = "Next"