From fac96e19f592279d47dfd6dc19e00e67deacace2 Mon Sep 17 00:00:00 2001 From: Ravi Dey Date: Fri, 8 Jul 2011 13:38:16 +0530 Subject: [PATCH] leave_application letter head fix --- .../leave_application/leave_application.txt | 68 ++++++++++--------- patches/patch.py | 4 +- 2 files changed, 40 insertions(+), 32 deletions(-) diff --git a/hr/doctype/leave_application/leave_application.txt b/hr/doctype/leave_application/leave_application.txt index a95f4ce89a..11d01e6ba1 100644 --- a/hr/doctype/leave_application/leave_application.txt +++ b/hr/doctype/leave_application/leave_application.txt @@ -3,16 +3,16 @@ # These values are common in all dictionaries { - 'creation': '2011-02-10 14:10:08', + 'creation': '2011-02-17 13:25:56', 'docstatus': 0, - 'modified': '2011-02-17 13:44:37', + 'modified': '2011-07-08 13:28:15', 'modified_by': 'Administrator', 'owner': 'Administrator' }, # These values are common for all DocType { - '_last_update': '1305714022', + '_last_update': '1310019491', 'autoname': 'LAP/.#####', 'colour': 'White:FFF', 'doctype': 'DocType', @@ -24,7 +24,7 @@ 'show_in_menu': 0, 'subject': 'From %(employee_name)s, %(designation)s', 'tag_fields': 'leave_type', - 'version': 18 + 'version': 17 }, # These values are common for all DocField @@ -54,37 +54,24 @@ # DocPerm { - 'amend': 1, - 'cancel': 1, + 'amend': 0, + 'cancel': 0, 'create': 1, 'doctype': 'DocPerm', 'idx': 1, - 'match': 'owner', 'permlevel': 0, - 'submit': 1, + 'role': 'Employee', + 'submit': 0, 'write': 1 }, - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': 'DocPerm', - 'idx': 2, - 'match': 'owner', - 'permlevel': 0, - 'submit': 0, - 'write': 0 - }, - # DocPerm { 'amend': 1, 'cancel': 1, 'create': 1, 'doctype': 'DocPerm', - 'idx': 3, + 'idx': 2, 'permlevel': 0, 'role': 'HR User', 'submit': 1, @@ -97,7 +84,7 @@ 'cancel': 1, 'create': 1, 'doctype': 'DocPerm', - 'idx': 4, + 'idx': 3, 'permlevel': 0, 'role': 'HR Manager', 'submit': 1, @@ -106,24 +93,33 @@ # DocPerm { + 'amend': 0, + 'cancel': 0, + 'create': 0, 'doctype': 'DocPerm', - 'idx': 5, + 'idx': 4, 'permlevel': 1, - 'role': 'HR User' + 'role': 'HR User', + 'submit': 0, + 'write': 0 }, # DocPerm { + 'amend': 0, + 'cancel': 0, + 'create': 0, 'doctype': 'DocPerm', - 'idx': 6, + 'idx': 5, 'permlevel': 1, - 'role': 'HR Manager' + 'role': 'HR Manager', + 'submit': 0, + 'write': 0 }, # DocField { 'doctype': 'DocField', - 'fieldname': 'column_break1', 'fieldtype': 'Column Break', 'idx': 1, 'permlevel': 0, @@ -211,7 +207,6 @@ # DocField { 'doctype': 'DocField', - 'fieldname': 'column_break8', 'fieldtype': 'Column Break', 'idx': 8, 'permlevel': 0, @@ -275,12 +270,23 @@ 'width': '300px' }, + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'letter_head', + 'fieldtype': 'Link', + 'idx': 14, + 'label': 'Letter Head', + 'options': 'Letter Head', + 'permlevel': 0 + }, + # DocField { 'doctype': 'DocField', 'fieldname': 'amended_from', 'fieldtype': 'Data', - 'idx': 14, + 'idx': 15, 'label': 'Amended From', 'permlevel': 1 }, @@ -290,7 +296,7 @@ 'doctype': 'DocField', 'fieldname': 'amendment_date', 'fieldtype': 'Date', - 'idx': 15, + 'idx': 16, 'label': 'Amendment Date', 'permlevel': 1 } diff --git a/patches/patch.py b/patches/patch.py index 56004a8317..c66067581c 100644 --- a/patches/patch.py +++ b/patches/patch.py @@ -1,7 +1,7 @@ # REMEMBER to update this # ======================== -last_patch = 320 +last_patch = 321 #------------------------------------------- @@ -1281,3 +1281,5 @@ def execute(patch_no): sql("delete from tabFeed where doc_name like 'New %'") elif patch_no == 320: reload_doc('setup', 'doctype', 'series_detail') + elif patch_no == 321: + reload_doc('hr','doctype','leave_application')