diff --git a/payroll/templates/cbv/payslip/pay_display.html b/payroll/templates/cbv/payslip/pay_display.html index 7e0fb670f..bc586502b 100644 --- a/payroll/templates/cbv/payslip/pay_display.html +++ b/payroll/templates/cbv/payslip/pay_display.html @@ -1,3 +1,3 @@ {% load horillafilters %} -{{amount|floatformat:2|currency_symbol_position}} \ No newline at end of file +{{amount|floatformat:2|currency_symbol_position}} diff --git a/pms/templates/cbv/meetings/detail_action.html b/pms/templates/cbv/meetings/detail_action.html index b177dc77e..fa647e2e5 100644 --- a/pms/templates/cbv/meetings/detail_action.html +++ b/pms/templates/cbv/meetings/detail_action.html @@ -1,18 +1,45 @@ {% load i18n %} + {% if perms.pms.change_meetings or request.user.employee_get in instance.manager.all %} - - {% endif %} - {% if perms.pms.delete_meetings %} -
- {% csrf_token %} - -
+{% endif %} + +{% if perms.pms.delete_meetings %} +
+ {% csrf_token %} + +
{% endif %} diff --git a/pms/templates/cbv/meetings/mom_col.html b/pms/templates/cbv/meetings/mom_col.html new file mode 100644 index 000000000..bb43cae0e --- /dev/null +++ b/pms/templates/cbv/meetings/mom_col.html @@ -0,0 +1,6 @@ + +{% if perms.pms.view_meetings or request.user.employee_get in instance.manager.all or instance.show_response %} + {{ instance.response|truncatechars_html:100|default:"-"|safe }} +{% else %} + - +{% endif %} \ No newline at end of file