[IMP] hr_holidays: improve English, and fix a few views
bzr revid: rco@openerp.com-20120613142605-vbw88dogd8n83ru7
This commit is contained in:
Raphael Collet
parent
68440940dc
commit
faad7a978a
|
|
@ -3,7 +3,7 @@
|
|||
<data>
|
||||
|
||||
<record id="action_view_holiday_status_manager_board" model="ir.actions.act_window">
|
||||
<field name="name">Leaves To Approved</field>
|
||||
<field name="name">Leaves to Approve</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">hr.holidays</field>
|
||||
<field name="view_type">form</field>
|
||||
|
|
|
|||
|
|
@ -76,12 +76,12 @@ class hr_holidays_status(osv.osv):
|
|||
'name': fields.char('Leave Type', size=64, required=True, translate=True),
|
||||
'categ_id': fields.many2one('crm.case.categ', 'Meeting', domain="[('object_id.model', '=', 'crm.meeting')]", help='If you set a meeting type, OpenERP will create a meeting in the calendar once a leave is validated.'),
|
||||
'color_name': fields.selection([('red', 'Red'),('blue','Blue'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color in Report', required=True, help='This color will be used in the leaves summary located in Reporting\Leaves by Departement'),
|
||||
'limit': fields.boolean('Allow to Override Limit', help='If you select this checkbox, the system will allow the employees to take more leaves than the available ones for this type.'),
|
||||
'limit': fields.boolean('Allow to Override Limit', help='If you select this checkbox, the system allows the employees to take more leaves than the available ones for this type.'),
|
||||
'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the leave type without removing it."),
|
||||
'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 the Allocation/Leave Requests for this type will require a second validation to be approved")
|
||||
'double_validation': fields.boolean('Apply Double Validation', help="When selected, the Allocation/Leave Requests for this type require a second validation to be approved."),
|
||||
}
|
||||
_defaults = {
|
||||
'color_name': 'red',
|
||||
|
|
@ -397,11 +397,11 @@ class hr_holidays(osv.osv):
|
|||
for obj in self.browse(cr, uid, ids):
|
||||
if obj.holiday_status_id.double_validation:
|
||||
self.message_append_note(cr, uid, [obj.id], _('System notification'),
|
||||
_("The %s request has been <b>Approved</b>. A second validation is necessary and is now pending.")
|
||||
_("The %s request has been <b>approved</b>. A second validation is necessary and is now pending.")
|
||||
% ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
|
||||
else:
|
||||
self.message_append_note(cr, uid, [obj.id], _('System notification'),
|
||||
_("The %s request has been <b>Approved</b>. The validation process is now over.")
|
||||
_("The %s request has been <b>approved</b>. The validation process is now over.")
|
||||
% ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
|
||||
|
||||
def holidays_valid2_notificate(self, cr, uid, ids, context=None):
|
||||
|
|
@ -521,6 +521,7 @@ hr_employee()
|
|||
class crm_meeting(osv.osv):
|
||||
_inherit = 'crm.meeting'
|
||||
_columns = {
|
||||
'leave_id': fields.many2one('hr.holidays','Leave Meeting'),
|
||||
'leave_id': fields.many2one('hr.holidays','Leave'),
|
||||
}
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -525,12 +525,12 @@
|
|||
</field>
|
||||
</record>
|
||||
|
||||
<act_window
|
||||
domain="[('leave_id', '=', active_id)]"
|
||||
<act_window
|
||||
id="act_hr_leave_request_to_meeting"
|
||||
name="Leave Meetings"
|
||||
res_model="crm.meeting"
|
||||
src_model="hr.holidays"
|
||||
res_model="crm.meeting"
|
||||
domain="[('leave_id', '=', active_id)]"
|
||||
view_mode="tree,form,calendar,gantt"
|
||||
view_type="form"/>
|
||||
|
||||
|
|
|
|||
|
|
@ -401,7 +401,8 @@ msgstr ""
|
|||
#. module: hr_holidays
|
||||
#: help:hr.holidays.status,double_validation:0
|
||||
msgid ""
|
||||
"If its True then the Allocation/Leave Requests for this type will require a second validation to be approved"
|
||||
"When selected, the Allocation/Leave Requests for this type require a second "
|
||||
"validation to be approved."
|
||||
msgstr ""
|
||||
|
||||
#. module: hr_holidays
|
||||
|
|
@ -766,8 +767,8 @@ msgstr ""
|
|||
#. module: hr_holidays
|
||||
#: help:hr.holidays.status,limit:0
|
||||
msgid ""
|
||||
"If you select this checkbox, the system will allow the "
|
||||
"employees to take more leaves than the available ones for this type. "
|
||||
"If you select this checkbox, the system allows the employees to take more "
|
||||
"leaves than the available ones for this type."
|
||||
msgstr ""
|
||||
|
||||
#. module: hr_holidays
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@
|
|||
<spacer length="1.0cm" />
|
||||
<para style="title" t="1">Leaves Summary <xsl:value-of select="report/name" /></para>
|
||||
<spacer length="0.5cm" />
|
||||
<para style="normal-title" t="1">Analyze from <u><xsl:value-of select="report/from" /></u> to <u> <xsl:value-of select="report/to" /> </u> of the <u><xsl:value-of select="report/type" /></u> Leaves. </para>
|
||||
<para style="normal-title" t="1">Analyze from <u><xsl:value-of select="report/from" /></u> to <u> <xsl:value-of select="report/to" /> </u> of the <u><xsl:value-of select="report/type" /></u> leaves. </para>
|
||||
<spacer length="1.0cm" />
|
||||
<xsl:variable name="cols_legend">
|
||||
<xsl:text>0.7cm,5.0cm</xsl:text>
|
||||
|
|
@ -236,7 +236,7 @@
|
|||
<xsl:attribute name="colWidths"><xsl:value-of select="$cols_legend"/></xsl:attribute>
|
||||
<tr>
|
||||
<td>Color</td>
|
||||
<td>Leaves Type</td>
|
||||
<td>Leave Type</td>
|
||||
|
||||
</tr>
|
||||
<xsl:for-each select="report/legend">
|
||||
|
|
|
|||
|
|
@ -107,9 +107,9 @@ class report_custom(report_rml):
|
|||
day_diff=eom-som
|
||||
|
||||
name = ''
|
||||
if data['form'].has_key('emp') and len(data['form']['emp']) == 1:
|
||||
name = 'of'+' '+obj_emp.read(cr, uid, data['form']['emp'][0], ['name'])['name']
|
||||
|
||||
if len(data['form'].get('emp', ())) == 1:
|
||||
name = obj_emp.read(cr, uid, data['form']['emp'][0], ['name'])['name']
|
||||
|
||||
if data['form']['holiday_type']!='both':
|
||||
type=data['form']['holiday_type']
|
||||
if data['form']['holiday_type']=='Confirmed':
|
||||
|
|
|
|||
|
|
@ -30,12 +30,12 @@
|
|||
<field name="target">new</field>
|
||||
</record>
|
||||
|
||||
<menuitem
|
||||
name="Leaves by Department"
|
||||
parent="menu_hr_reporting_holidays"
|
||||
action="action_hr_holidays_summary_dept"
|
||||
id="menu_account_central_journal"
|
||||
icon="STOCK_PRINT"/>
|
||||
<menuitem
|
||||
name="Leaves by Department"
|
||||
parent="menu_hr_reporting_holidays"
|
||||
action="action_hr_holidays_summary_dept"
|
||||
id="menu_account_central_journal"
|
||||
icon="STOCK_PRINT"/>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
|
|
@ -7,20 +7,20 @@
|
|||
<field name="model">hr.holidays.summary.employee</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Leaves Summary">
|
||||
<group col="4" colspan="6">
|
||||
<field name="date_from"/>
|
||||
<newline/>
|
||||
<field name="holiday_type"/>
|
||||
<newline/>
|
||||
<field name="emp" invisible="True"/>
|
||||
</group>
|
||||
<separator colspan="4"/>
|
||||
<group col="2" colspan="4">
|
||||
<button special="cancel" string="Cancel" icon='gtk-cancel'/>
|
||||
<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
|
||||
</group>
|
||||
</form>
|
||||
<form string="Leaves Summary">
|
||||
<group col="4" colspan="6">
|
||||
<field name="date_from"/>
|
||||
<newline/>
|
||||
<field name="holiday_type"/>
|
||||
<newline/>
|
||||
<field name="emp" invisible="True"/>
|
||||
</group>
|
||||
<separator colspan="4"/>
|
||||
<group col="2" colspan="4">
|
||||
<button special="cancel" string="Cancel" icon='gtk-cancel'/>
|
||||
<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue