From 846678a1e4aa57c54328a6d66c894c47cc79e010 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 10 Jan 2013 12:25:25 +0530 Subject: [PATCH] added links to open count in module + other minor fixes --- .../bank_reconciliation.txt | 73 ++++++----------- accounts/page/accounts_home/accounts_home.js | 6 +- hr/page/hr_home/hr_home.js | 2 +- .../notification_control.txt | 80 +++++++++---------- startup/open_count.py | 38 ++++----- stock/page/stock_home/stock_home.js | 7 +- 6 files changed, 91 insertions(+), 115 deletions(-) diff --git a/accounts/doctype/bank_reconciliation/bank_reconciliation.txt b/accounts/doctype/bank_reconciliation/bank_reconciliation.txt index 9914b488dd3..f04cd0a032c 100644 --- a/accounts/doctype/bank_reconciliation/bank_reconciliation.txt +++ b/accounts/doctype/bank_reconciliation/bank_reconciliation.txt @@ -2,25 +2,19 @@ { "owner": "Administrator", "docstatus": 0, - "creation": "2012-03-27 14:35:40", + "creation": "2012-07-03 13:30:49", "modified_by": "Administrator", - "modified": "2012-03-27 14:35:40" + "modified": "2013-01-10 12:15:49" }, { - "section_style": "Simple", "allow_print": 1, "module": "Accounts", - "doctype": "DocType", - "server_code_error": " ", "read_only": 1, "allow_email": 1, "hide_heading": 1, "issingle": 1, "name": "__common__", - "colour": "White:FFF", - "_last_update": "1294312169", - "show_in_menu": 0, - "version": 12, + "doctype": "DocType", "hide_toolbar": 1, "allow_copy": 1 }, @@ -32,10 +26,13 @@ "parentfield": "fields" }, { + "amend": 0, "name": "__common__", "parent": "Bank Reconciliation", "read": 1, + "submit": 0, "doctype": "DocPerm", + "cancel": 0, "parenttype": "DocType", "parentfield": "permissions" }, @@ -43,44 +40,15 @@ "name": "Bank Reconciliation", "doctype": "DocType" }, - { - "amend": 0, - "create": 1, - "doctype": "DocPerm", - "submit": 0, - "write": 1, - "role": "Accounts User", - "cancel": 0, - "permlevel": 0 - }, - { - "role": "All", - "permlevel": 1, - "doctype": "DocPerm" - }, - { - "create": 1, - "doctype": "DocPerm", - "write": 1, - "role": "Accounts Manager", - "permlevel": 0 - }, - { - "doctype": "DocField", - "label": "Head HTML", - "fieldname": "head_html", - "fieldtype": "HTML", - "permlevel": 0 - }, { "description": "Select account head of the bank where cheque was deposited.", "doctype": "DocField", "label": "Bank Account", - "permlevel": 0, + "options": "Account", "fieldname": "bank_account", "fieldtype": "Link", "reqd": 1, - "options": "Account" + "permlevel": 0 }, { "doctype": "DocField", @@ -99,29 +67,27 @@ "permlevel": 0 }, { - "colour": "White:FFF", "doctype": "DocField", "label": "Get Non Reconciled Entries", - "permlevel": 0, + "options": "get_details", "fieldname": "get_non_reconciled_entries", "fieldtype": "Button", - "options": "get_details" + "permlevel": 0 }, { - "colour": "White:FFF", "doctype": "DocField", "label": "Entries", - "permlevel": 0, + "options": "Bank Reconciliation Detail", "fieldname": "entries", "fieldtype": "Table", - "options": "Bank Reconciliation Detail" + "permlevel": 0 }, { "doctype": "DocField", + "label": "Update Clearance Date", "options": "update_details", "fieldname": "update_clearance_date", "fieldtype": "Button", - "label": "Update Clearance Date", "permlevel": 0 }, { @@ -130,5 +96,18 @@ "fieldname": "total_amount", "fieldtype": "Currency", "permlevel": 1 + }, + { + "create": 1, + "doctype": "DocPerm", + "write": 1, + "role": "Accounts User", + "permlevel": 0 + }, + { + "create": 0, + "doctype": "DocPerm", + "role": "All", + "permlevel": 1 } ] \ No newline at end of file diff --git a/accounts/page/accounts_home/accounts_home.js b/accounts/page/accounts_home/accounts_home.js index d207fafa62e..7e04ca970e4 100644 --- a/accounts/page/accounts_home/accounts_home.js +++ b/accounts/page/accounts_home/accounts_home.js @@ -46,13 +46,13 @@ wn.module_page["Accounts"] = [ icon: "icon-wrench", items: [ { - "route":"#Form/Bank Reconciliation/Bank Reconciliation", + "route":"Form/Bank Reconciliation/Bank Reconciliation", "label": wn._("Bank Reconciliation"), "description": wn._("Update bank payment dates with journals."), doctype: "Bank Reconciliation" }, { - "route":"#Form/Payment to Invoice Matching Tool/Payment to Invoice Matching Tool", + "route":"Form/Payment to Invoice Matching Tool/Payment to Invoice Matching Tool", "label": wn._("Payment Reconciliation"), "description": wn._("Match non-linked Invoices and Payments."), doctype: "Payment to Invoice Matching Tool" @@ -64,7 +64,7 @@ wn.module_page["Accounts"] = [ description: "Close Balance Sheet and book Profit or Loss." }, { - "route":"#Form/Sales and Purchase Return Tool/Sales and Purchase Return Tool", + "route":"Form/Sales and Purchase Return Tool/Sales and Purchase Return Tool", "label": wn._("Sales and Purchase Return Tool"), description: wn._("Manage sales or purchase returns"), "doctype": "Sales and Purchase Return Tool" diff --git a/hr/page/hr_home/hr_home.js b/hr/page/hr_home/hr_home.js index 79b8afc6e64..c2c5cd9f883 100644 --- a/hr/page/hr_home/hr_home.js +++ b/hr/page/hr_home/hr_home.js @@ -87,7 +87,7 @@ wn.module_page["HR"] = [ doctype: "Salary Structure" }, { - "route":"#Form/Salary Manager/Salary Manager", + "route":"Form/Salary Manager/Salary Manager", "label":wn._("Process Payroll"), "description":wn._("Generate Salary Slips"), doctype: "Salary Manager" diff --git a/setup/doctype/notification_control/notification_control.txt b/setup/doctype/notification_control/notification_control.txt index 3a17fb5b85a..be86a962ca6 100644 --- a/setup/doctype/notification_control/notification_control.txt +++ b/setup/doctype/notification_control/notification_control.txt @@ -2,22 +2,18 @@ { "owner": "Administrator", "docstatus": 0, - "creation": "2012-07-03 13:30:56", + "creation": "2012-07-12 23:29:45", "modified_by": "Administrator", - "modified": "2012-07-12 16:20:36" + "modified": "2013-01-10 12:22:45" }, { - "section_style": "Simple", - "description": "Send automatic emails to Contacts on Submitting transactions.", - "allow_print": 1, - "module": "Setup", "allow_email": 1, "issingle": 1, + "description": "Send automatic emails to Contacts on Submitting transactions.", "name": "__common__", - "colour": "White:FFF", + "allow_print": 1, "doctype": "DocType", - "server_code_error": " ", - "version": 1, + "module": "Setup", "allow_copy": 1 }, { @@ -42,26 +38,14 @@ "doctype": "DocType" }, { - "write": 0, - "create": 0, - "role": "Guest", - "doctype": "DocPerm" - }, - { - "write": 1, - "create": 1, - "role": "System Manager", - "doctype": "DocPerm" - }, - { - "description": "When any of the checked transactions are \"Submitted\", an email is automatically sent to the associated \"Contact\" in that transaction, with the transaction as an attachment.", - "colour": "White:FFF", + "description": "When any of the checked transactions are \"Submitted\", an email pop-up automatically opened to send an email to the associated \"Contact\" in that transaction, with the transaction as an attachment. The user may or may not send the email.", "doctype": "DocField", - "label": "Send Email Automatically on Submission of", + "label": "Prompt for Email on Submission of", "fieldname": "send_autonotification_for", "fieldtype": "Section Break" }, { + "print_width": "50%", "doctype": "DocField", "label": "Sales", "width": "50%", @@ -70,29 +54,30 @@ }, { "doctype": "DocField", + "label": "Quotation", "fieldname": "quotation", - "fieldtype": "Check", - "label": "Quotation" + "fieldtype": "Check" }, { "doctype": "DocField", + "label": "Sales Order", "fieldname": "sales_order", - "fieldtype": "Check", - "label": "Sales Order" + "fieldtype": "Check" }, { "doctype": "DocField", + "label": "Delivery Note", "fieldname": "delivery_note", - "fieldtype": "Check", - "label": "Delivery Note" + "fieldtype": "Check" }, { "doctype": "DocField", + "label": "Sales Invoice", "fieldname": "sales_invoice", - "fieldtype": "Check", - "label": "Sales Invoice" + "fieldtype": "Check" }, { + "print_width": "50%", "doctype": "DocField", "label": "Purchase", "width": "50%", @@ -101,44 +86,41 @@ }, { "doctype": "DocField", + "label": "Purchase Order", "fieldname": "purchase_order", - "fieldtype": "Check", - "label": "Purchase Order" + "fieldtype": "Check" }, { "doctype": "DocField", + "label": "Purchase Receipt", "fieldname": "purchase_receipt", - "fieldtype": "Check", - "label": "Purchase Receipt" + "fieldtype": "Check" }, { "doctype": "DocField", + "label": "Expense Claim", "fieldname": "expense_claim", - "fieldtype": "Check", - "label": "Expense Claim" + "fieldtype": "Check" }, { "description": "Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.", - "colour": "White:FFF", "doctype": "DocField", "label": "Customize the Notification", "fieldname": "customize_the_notification", "fieldtype": "Section Break" }, { - "colour": "White:FFF", "doctype": "DocField", "label": "Select Transaction", - "trigger": "Client", "fieldname": "select_transaction", "fieldtype": "Select", "options": "\nQuotation\nSales Order\nDelivery Note\nSales Invoice\nPurchase Order\nPurchase Receipt\nExpense Claim\nExpense Claim Approved\nExpense Claim Rejected" }, { "doctype": "DocField", + "label": "Custom Message", "fieldname": "custom_message", - "fieldtype": "Text Editor", - "label": "Custom Message" + "fieldtype": "Text Editor" }, { "doctype": "DocField", @@ -210,5 +192,17 @@ "fieldname": "expense_claim_rejected_message", "fieldtype": "Text", "hidden": 1 + }, + { + "create": 0, + "doctype": "DocPerm", + "write": 0, + "role": "Guest" + }, + { + "create": 1, + "doctype": "DocPerm", + "write": 1, + "role": "System Manager" } ] \ No newline at end of file diff --git a/startup/open_count.py b/startup/open_count.py index ad8adefcdd2..e0767c318d0 100644 --- a/startup/open_count.py +++ b/startup/open_count.py @@ -5,22 +5,24 @@ from __future__ import unicode_literals import webnotes queries = { - "Support Ticket": "select count(*) from `tabSupport Ticket` where status='Open'", - "Task": "select count(*) from `tabTask` where status='Open'", - "Lead": "select count(*) from `tabLead` where status='Open'", - "Opportunity": "docstatus", - "Quotation": "docstatus", - "Sales Order": "docstatus", - "Journal Voucher": "docstatus", - "Sales Invoice": "docstatus", - "Purchase Invoice": "docstatus", - "Leave Application": "docstatus", - "Expense Claim": "docstatus", - "Purchase Receipt": "docstatus", - "Delivery Note": "docstatus", - "Stock Entry": "docstatus", - "Purchase Request": "docstatus", - "Purchase Order": "docstatus", - "Production Order": "docstatus", - "Timesheet": "docstatus", + "Support Ticket": {"status":"Open"}, + "Customer Issue": {"status":"Open"}, + "Task": {"status":"Open"}, + "Lead": {"status":"Open"}, + "Opportunity": {"docstatus":0}, + "Quotation": {"docstatus":0}, + "Sales Order": {"docstatus":0}, + "Journal Voucher": {"docstatus":0}, + "Sales Invoice": {"docstatus":0}, + "Purchase Invoice": {"docstatus":0}, + "Leave Application": {"status":"Open"}, + "Expense Claim": {"approval_status":"Draft"}, + "Purchase Receipt": {"docstatus":0}, + "Delivery Note": {"docstatus":0}, + "Stock Entry": {"docstatus":0}, + "Purchase Request": {"docstatus":0}, + "Purchase Order": {"docstatus":0}, + "Production Order": {"docstatus":0}, + "BOM": {"docstatus":0}, + "Timesheet": {"docstatus":0}, } \ No newline at end of file diff --git a/stock/page/stock_home/stock_home.js b/stock/page/stock_home/stock_home.js index db083980587..7ea62de2546 100644 --- a/stock/page/stock_home/stock_home.js +++ b/stock/page/stock_home/stock_home.js @@ -84,18 +84,19 @@ wn.module_page["Stock"] = [ description: wn._("Transportatoin cost distribution template.") }, { - "route":"#Form/Landed Cost Wizard/Landed Cost Wizard", + "route":"Form/Landed Cost Wizard/Landed Cost Wizard", "label": wn._("Landed Cost Wizard"), description: wn._("Distribute transport overhead across items."), doctype: "Landed Cost Wizard" }, { - "route":"#Form/Stock UOM Replace Utility/Stock UOM Replace Utility", + "route":"Form/Stock UOM Replace Utility/Stock UOM Replace Utility", "label": wn._("UOM Replace Utility"), + description: wn._("Change UOM for an Item."), "doctype": "Stock UOM Replace Utility" }, { - "route":"#Form/Sales and Purchase Return Tool/Sales and Purchase Return Tool", + "route":"Form/Sales and Purchase Return Tool/Sales and Purchase Return Tool", "label": wn._("Sales and Purchase Return Tool"), doctype: "Sales and Purchase Return Tool", description: wn._("Manage sales or purchase returns")