From 9dd0c0b7a15f7b5be19cd2b2ef393779a7ad3c17 Mon Sep 17 00:00:00 2001 From: Ravi Dey Date: Wed, 13 Jul 2011 18:08:38 +0530 Subject: [PATCH] Salary Slip docfield update --- hr/doctype/salary_slip/salary_slip.txt | 146 +++++++------------------ patches/patch.py | 5 +- 2 files changed, 41 insertions(+), 110 deletions(-) diff --git a/hr/doctype/salary_slip/salary_slip.txt b/hr/doctype/salary_slip/salary_slip.txt index c9ba1dea3a..d2ce4e3fb3 100644 --- a/hr/doctype/salary_slip/salary_slip.txt +++ b/hr/doctype/salary_slip/salary_slip.txt @@ -5,14 +5,14 @@ { 'creation': '2010-08-08 17:09:20', 'docstatus': 0, - 'modified': '2011-06-27 14:39:16', + 'modified': '2011-07-13 17:38:55', 'modified_by': 'Administrator', 'owner': 'Administrator' }, # These values are common for all DocType { - '_last_update': '1308808105', + '_last_update': '1310019491', 'colour': 'White:FFF', 'doctype': 'DocType', 'module': 'HR', @@ -21,7 +21,7 @@ 'server_code_error': ' ', 'show_in_menu': 0, 'subject': 'For %(employee_name)s, %(designation)s', - 'version': 388 + 'version': 392 }, # These values are common for all DocField @@ -51,58 +51,24 @@ # DocPerm { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': 'DocPerm', - 'match': 'owner', - 'permlevel': 0, - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': 'DocPerm', - 'match': 'owner', - 'permlevel': 0, - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': 'DocPerm', - 'match': 'owner', - 'permlevel': 0, - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': 'DocPerm', - 'match': 'owner', - 'permlevel': 0, - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'amend': 0, + 'amend': 1, + 'cancel': 1, 'create': 1, 'doctype': 'DocPerm', - 'idx': 3, + 'idx': 1, + 'permlevel': 0, + 'role': 'System Manager', + 'submit': 1, + 'write': 1 + }, + + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 1, + 'doctype': 'DocPerm', + 'idx': 2, 'permlevel': 0, 'role': 'HR User', 'submit': 1, @@ -111,11 +77,11 @@ # DocPerm { - 'amend': 1, - 'cancel': 1, + 'amend': 0, + 'cancel': 0, 'create': 1, 'doctype': 'DocPerm', - 'idx': 4, + 'idx': 3, 'permlevel': 0, 'role': 'HR Manager', 'submit': 1, @@ -124,18 +90,28 @@ # 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 @@ -285,28 +261,6 @@ 'permlevel': 0 }, - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'letter_head', - 'fieldtype': 'Link', - 'idx': 11, - 'label': 'Letter Head', - 'options': 'Letter Head', - 'permlevel': 0 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'letter_head', - 'fieldtype': 'Link', - 'idx': 11, - 'label': 'Letter Head', - 'options': 'Letter Head', - 'permlevel': 0 - }, - # DocField { 'doctype': 'DocField', @@ -347,32 +301,6 @@ 'reqd': 1 }, - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'company', - 'fieldtype': 'Select', - 'idx': 14, - 'in_filter': 1, - 'label': 'Company', - 'options': 'link:Company', - 'permlevel': 0, - 'reqd': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'company', - 'fieldtype': 'Select', - 'idx': 14, - 'in_filter': 1, - 'label': 'Company', - 'options': 'link:Company', - 'permlevel': 0, - 'reqd': 1 - }, - # DocField { 'colour': 'White:FFF', @@ -396,7 +324,7 @@ { 'doctype': 'DocField', 'fieldname': 'total_days_in_month', - 'fieldtype': 'Int', + 'fieldtype': 'Data', 'idx': 16, 'label': 'Total days in month', 'oldfieldname': 'total_days_in_month', diff --git a/patches/patch.py b/patches/patch.py index 6b3f0af436..f1841971c8 100644 --- a/patches/patch.py +++ b/patches/patch.py @@ -1,7 +1,7 @@ # REMEMBER to update this # ======================== -last_patch = 324 +last_patch = 325 #------------------------------------------- @@ -1291,3 +1291,6 @@ def execute(patch_no): sql("delete from `tabDocField` where label = 'Get Current Stock' and parent = 'Stock Entry'") elif patch_no == 324: sql("delete from `tabDocField` where fieldname = 'test_field' and parent = 'Customer'") + elif patch_no == 325: + sql("update `tabDocField` set fieldtype = 'Data' where parent = 'Salary Slip' and fieldname = 'total_days_in_month'") + reload_doc('hr', 'doctype', 'salary_slip')