From d4872483e4d1fb94f1067ca1f9660801414e6c88 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 2 Jan 2013 15:29:37 +0530 Subject: [PATCH 1/3] fixes to permission manager / user property setter --- .../journal_voucher/journal_voucher.js | 4 ++-- projects/doctype/task/task.txt | 15 ++++++++++--- .../timesheet_detail/timesheet_detail.txt | 22 ++++++++++++++----- 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/accounts/doctype/journal_voucher/journal_voucher.js b/accounts/doctype/journal_voucher/journal_voucher.js index 8c60838376..b00fc25aed 100644 --- a/accounts/doctype/journal_voucher/journal_voucher.js +++ b/accounts/doctype/journal_voucher/journal_voucher.js @@ -52,11 +52,11 @@ cur_frm.cscript.is_opening = function(doc, cdt, cdn) { } cur_frm.fields_dict['entries'].grid.get_field('account').get_query = function(doc) { - return "SELECT `tabAccount`.name FROM `tabAccount` WHERE `tabAccount`.company='"+doc.company+"' AND tabAccount.group_or_ledger = 'Ledger' AND tabAccount.docstatus != 2 AND `tabAccount`.%(key)s LIKE '%s' ORDER BY `tabAccount`.name DESC LIMIT 50"; + return "SELECT `tabAccount`.name, `tabAccount`.parent_account FROM `tabAccount` WHERE `tabAccount`.company='"+doc.company+"' AND tabAccount.group_or_ledger = 'Ledger' AND tabAccount.docstatus != 2 AND `tabAccount`.%(key)s LIKE '%s' ORDER BY `tabAccount`.name DESC LIMIT 50"; } cur_frm.fields_dict["entries"].grid.get_field("cost_center").get_query = function(doc, cdt, cdn) { - return 'SELECT `tabCost Center`.`name` FROM `tabCost Center` WHERE `tabCost Center`.`company_name` = "' +doc.company+'" AND `tabCost Center`.%(key)s LIKE "%s" AND `tabCost Center`.`group_or_ledger` = "Ledger" AND `tabCost Center`.docstatus != 2 ORDER BY `tabCost Center`.`name` ASC LIMIT 50'; + return 'SELECT `tabCost Center`.`name`, `tabCost Center`.parent_cost_center FROM `tabCost Center` WHERE `tabCost Center`.`company_name` = "' +doc.company+'" AND `tabCost Center`.%(key)s LIKE "%s" AND `tabCost Center`.`group_or_ledger` = "Ledger" AND `tabCost Center`.docstatus != 2 ORDER BY `tabCost Center`.`name` ASC LIMIT 50'; } // Restrict Voucher based on Account diff --git a/projects/doctype/task/task.txt b/projects/doctype/task/task.txt index f47d2eb9d5..9b8c2eb2ca 100644 --- a/projects/doctype/task/task.txt +++ b/projects/doctype/task/task.txt @@ -4,7 +4,7 @@ "docstatus": 0, "creation": "2012-10-29 14:30:00", "modified_by": "Administrator", - "modified": "2012-12-24 10:46:06" + "modified": "2013-01-02 12:40:26" }, { "autoname": "TASK.#####", @@ -37,6 +37,7 @@ "doctype": "DocType" }, { + "print_width": "50%", "oldfieldtype": "Section Break", "doctype": "DocField", "label": "Task Details", @@ -76,6 +77,7 @@ "in_filter": 1 }, { + "print_width": "50%", "oldfieldtype": "Column Break", "doctype": "DocField", "width": "50%", @@ -121,6 +123,7 @@ "options": "Simple" }, { + "print_width": "300px", "oldfieldtype": "Text Editor", "doctype": "DocField", "label": "Details", @@ -138,6 +141,7 @@ "fieldtype": "Section Break" }, { + "print_width": "50%", "oldfieldtype": "Column Break", "doctype": "DocField", "label": "Expected", @@ -163,6 +167,7 @@ "fieldtype": "Currency" }, { + "print_width": "50%", "oldfieldtype": "Column Break", "doctype": "DocField", "label": "Actual", @@ -216,7 +221,7 @@ "fieldname": "review_date", "fieldtype": "Date", "depends_on": "eval:doc.status == \"Closed\" || doc.status == \"Pending Review\"", - "hidden": 1 + "hidden": 0 }, { "oldfieldtype": "Date", @@ -226,7 +231,7 @@ "fieldname": "closing_date", "fieldtype": "Date", "depends_on": "eval:doc.status == \"Closed\"", - "hidden": 1 + "hidden": 0 }, { "print_hide": 1, @@ -245,7 +250,11 @@ "permlevel": 0 }, { + "amend": 0, + "create": 0, "doctype": "DocPerm", + "submit": 0, + "cancel": 0, "permlevel": 1 } ] \ No newline at end of file diff --git a/projects/doctype/timesheet_detail/timesheet_detail.txt b/projects/doctype/timesheet_detail/timesheet_detail.txt index 88e2880c6a..6d55d4bdb1 100644 --- a/projects/doctype/timesheet_detail/timesheet_detail.txt +++ b/projects/doctype/timesheet_detail/timesheet_detail.txt @@ -2,11 +2,12 @@ { "owner": "Administrator", "docstatus": 0, - "creation": "2012-11-30 18:13:54", + "creation": "2012-12-03 10:31:04", "modified_by": "Administrator", - "modified": "2012-12-03 09:33:28" + "modified": "2013-01-02 12:46:48" }, { + "istable": 1, "autoname": "TSD.#####", "name": "__common__", "doctype": "DocType", @@ -24,6 +25,7 @@ "doctype": "DocType" }, { + "print_width": "160px", "oldfieldtype": "Time", "doctype": "DocField", "label": "Actual Start Time", @@ -35,6 +37,7 @@ "permlevel": 0 }, { + "print_width": "160px", "oldfieldtype": "Time", "doctype": "DocField", "label": "Actual End Time", @@ -46,17 +49,19 @@ "permlevel": 0 }, { + "print_width": "200px", + "permlevel": 0, "search_index": 0, "doctype": "DocField", "label": "Activity Type", "width": "200px", - "options": "Activity Type", "fieldname": "activity_type", "fieldtype": "Link", "reqd": 1, - "permlevel": 0 + "options": "Activity Type" }, { + "print_width": "200px", "oldfieldtype": "Text", "doctype": "DocField", "label": "Additional Info", @@ -67,6 +72,7 @@ "permlevel": 0 }, { + "print_width": "100px", "oldfieldtype": "Data", "doctype": "DocField", "label": "Total Hours (Actual)", @@ -77,6 +83,7 @@ "permlevel": 1 }, { + "print_width": "150px", "oldfieldtype": "Data", "doctype": "DocField", "label": "Customer Name", @@ -88,6 +95,7 @@ "permlevel": 0 }, { + "print_width": "150px", "permlevel": 0, "oldfieldtype": "Link", "doctype": "DocField", @@ -102,19 +110,21 @@ "in_filter": 1 }, { + "print_width": "150px", + "permlevel": 0, "oldfieldtype": "Link", "doctype": "DocField", "label": "Task Id", "oldfieldname": "task_id", "width": "150px", - "options": "Task", "fieldname": "task_id", "fieldtype": "Link", "search_index": 1, - "permlevel": 0, + "options": "Task", "in_filter": 1 }, { + "print_width": "250px", "oldfieldtype": "Link", "doctype": "DocField", "label": "Task Name", From aea7370a678a25a576a0acfb4ad17dae7a92a28b Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 2 Jan 2013 15:35:19 +0530 Subject: [PATCH 2/3] updated latest_updates.js --- home/page/latest_updates/latest_updates.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/page/latest_updates/latest_updates.js b/home/page/latest_updates/latest_updates.js index 99a4bf99c5..926d607e8f 100644 --- a/home/page/latest_updates/latest_updates.js +++ b/home/page/latest_updates/latest_updates.js @@ -1,4 +1,8 @@ erpnext.updates = [ + ["2nd January 2013", [ + "Permission Manager: New Design with better help and better advanced permission selection.", + "User Properties: Better way to set User Properties (defaults).", + ]], ["1st January 2013", [ "Trial Balance: Added an option to see the report without period closing entry\ You will find this checkbox at the bottom of the report.", From 7590650a735c1785953276bce410cb377b81a509 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 2 Jan 2013 16:46:01 +0530 Subject: [PATCH 3/3] patch_list merge --- patches/patch_list.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/patches/patch_list.py b/patches/patch_list.py index 778f6fc1a9..08f0253985 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py @@ -568,19 +568,10 @@ patch_list = [ }, { 'patch_module': 'patches.january_2013', -<<<<<<< HEAD 'patch_file': 'remove_bad_permissions', }, { 'patch_module': 'patches.january_2013', 'patch_file': 'deprecate_stock_search_criteria', }, -======= - 'patch_file': 'deprecate_stock_search_criteria', - }, - { - 'patch_module': 'patches.january_2013', - 'patch_file': 'remove_bad_permissions', - }, ->>>>>>> 93a02a3995e93ec0915d99ecfeabf456b65591b4 ] \ No newline at end of file