From a59aa68eacfe5d5bc65ac24df3c49fbc4c292343 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 14 Dec 2012 10:27:10 +0530 Subject: [PATCH 1/5] added new reports --- .../ordered_items_to_be_billed/__init__.py | 0 .../ordered_items_to_be_billed.txt | 20 +++++++++++++++++++ .../ordered_items_to_be_delivered/__init__.py | 0 .../ordered_items_to_be_delivered.txt | 20 +++++++++++++++++++ 4 files changed, 40 insertions(+) create mode 100644 accounts/report/ordered_items_to_be_billed/__init__.py create mode 100644 accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.txt create mode 100644 stock/report/ordered_items_to_be_delivered/__init__.py create mode 100644 stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.txt diff --git a/accounts/report/ordered_items_to_be_billed/__init__.py b/accounts/report/ordered_items_to_be_billed/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.txt b/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.txt new file mode 100644 index 0000000000..bf410933f3 --- /dev/null +++ b/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.txt @@ -0,0 +1,20 @@ +[ + { + "owner": "Administrator", + "docstatus": 0, + "creation": "2012-12-14 10:22:40", + "modified_by": "Administrator", + "modified": "2012-12-14 10:24:16" + }, + { + "name": "__common__", + "ref_doctype": "Sales Invoice", + "doctype": "Report", + "is_standard": "Yes", + "query": "select \n `tabSales Order`.`name` as \"Sales Order:Link/Sales Order:120\",\n `tabSales Order`.`customer` as \"Customer:Link/Customer:120\",\n `tabSales Order`.`status` as \"Status\",\n `tabSales Order`.`transaction_date` as \"Date:Date\",\n `tabSales Order Item`.item_code as \"Item:Link/Item:120\",\n `tabSales Order Item`.description as \"Description\",\n `tabSales Order Item`.qty as \"Qty:Float\",\n `tabSales Order Item`.billed_qty as \"Billed Qty:Float\"\nfrom\n `tabSales Order`, `tabSales Order Item`\nwhere\n `tabSales Order Item`.`parent` = `tabSales Order`.`name`\n and `tabSales Order`.docstatus = 1\n and ifnull(`tabSales Order Item`.billed_qty,0) < ifnull(`tabSales Order Item`.qty,0)\norder by `tabSales Order`.transaction_date asc" + }, + { + "name": "Ordered Items To Be Billed", + "doctype": "Report" + } +] \ No newline at end of file diff --git a/stock/report/ordered_items_to_be_delivered/__init__.py b/stock/report/ordered_items_to_be_delivered/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.txt b/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.txt new file mode 100644 index 0000000000..840124a1d7 --- /dev/null +++ b/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.txt @@ -0,0 +1,20 @@ +[ + { + "owner": "Administrator", + "docstatus": 0, + "creation": "2012-12-14 10:18:14", + "modified_by": "Administrator", + "modified": "2012-12-14 10:19:13" + }, + { + "name": "__common__", + "ref_doctype": "Delivery Note", + "doctype": "Report", + "is_standard": "Yes", + "query": "select \n `tabSales Order`.`name` as \"Sales Order:Link/Sales Order:120\",\n `tabSales Order`.`customer` as \"Customer:Link/Customer:120\",\n `tabSales Order`.`status` as \"Status\",\n `tabSales Order`.`transaction_date` as \"Date:Date\",\n `tabSales Order Item`.item_code as \"Item:Link/Item:120\",\n `tabSales Order Item`.description as \"Description\",\n `tabSales Order Item`.qty as \"Qty:Float\",\n `tabSales Order Item`.delivered_qty as \"Delivered Qty:Float\"\nfrom\n `tabSales Order`, `tabSales Order Item`\nwhere\n `tabSales Order Item`.`parent` = `tabSales Order`.`name`\n and `tabSales Order`.docstatus = 1\n and ifnull(`tabSales Order Item`.delivered_qty,0) < ifnull(`tabSales Order Item`.qty,0)\norder by `tabSales Order`.transaction_date asc" + }, + { + "name": "Ordered Items To Be Delivered", + "doctype": "Report" + } +] \ No newline at end of file From 161cf87cc052af31557a058740c226631702cb79 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 14 Dec 2012 13:13:02 +0530 Subject: [PATCH 2/5] in mousetrap - do not save if cur_frm.save_disabled is set --- public/js/startup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/startup.js b/public/js/startup.js index c90aedd0d3..a5ed4c4416 100644 --- a/public/js/startup.js +++ b/public/js/startup.js @@ -168,7 +168,7 @@ erpnext.setup_mousetrap = function() { }); Mousetrap.bind(["command+s", "ctrl+s"], function() { - if(cur_frm) + if(cur_frm && !cur_frm.save_disabled) cur_frm.save(); else if(wn.container.page.save_action) wn.container.page.save_action(); From b0f6dde7bfe9801673774a70c9a41c548623879b Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 14 Dec 2012 16:23:33 +0530 Subject: [PATCH 3/5] permission control: get parent doctype doclist in get permissions --- setup/doctype/permission_control/permission_control.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/doctype/permission_control/permission_control.py b/setup/doctype/permission_control/permission_control.py index 8162c39c56..cb0575d938 100644 --- a/setup/doctype/permission_control/permission_control.py +++ b/setup/doctype/permission_control/permission_control.py @@ -51,7 +51,7 @@ class DocType: # ------------------------------------------------------------------- def get_permissions(self,doctype): import webnotes.model.doctype - doclist = webnotes.model.doctype.get(doctype) + doclist = webnotes.model.doctype.get(doctype).get_parent_doclist() ptype = [{ 'role': perm.role, From ff4e996a8fee071f91db80d544dd3f8eed641ab1 Mon Sep 17 00:00:00 2001 From: webnotes Date: Sat, 15 Dec 2012 17:51:24 +0530 Subject: [PATCH 4/5] fixed syntax error in recurring sales invoice code --- accounts/doctype/sales_invoice/sales_invoice.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/accounts/doctype/sales_invoice/sales_invoice.py b/accounts/doctype/sales_invoice/sales_invoice.py index a146e932ef..ef6f66ceec 100644 --- a/accounts/doctype/sales_invoice/sales_invoice.py +++ b/accounts/doctype/sales_invoice/sales_invoice.py @@ -719,7 +719,7 @@ def get_next_date(dt, mcount, day=None): if not day: day = getdate(dt).day if month > 12: - month, year = m-12, y+1 + month, year = month-12, year+1 try: next_month_date = datetime.date(year, month, day) except: @@ -909,4 +909,4 @@ def get_bank_cash_account(mode_of_payment): webnotes.msgprint("Default Bank / Cash Account not set in Mode of Payment: %s. Please add a Default Account in Mode of Payment master." % mode_of_payment) return { "cash_bank_account": val - } \ No newline at end of file + } From 5f17be83644cffe7978f05237e255e8fc1613246 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Sat, 15 Dec 2012 18:38:18 +0530 Subject: [PATCH 5/5] added payment link in expiry banner --- public/js/startup.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/public/js/startup.js b/public/js/startup.js index a5ed4c4416..1b9e3ea795 100644 --- a/public/js/startup.js +++ b/public/js/startup.js @@ -57,17 +57,18 @@ erpnext.startup.start = function() { var today = dateutil.str_to_obj(wn.boot.server_date); var expires_on = dateutil.str_to_obj(wn.boot.expires_on); var diff = dateutil.get_diff(expires_on, today); + var payment_link = "See Payment Options."; if (0 <= diff && diff <= 15) { var expiry_string = diff==0 ? "today" : repl("in %(diff)s day(s)", { diff: diff }); $('header').append(repl('
\ Your ERPNext subscription will expire %(expiry_string)s. \ Please renew your subscription to continue using ERPNext \ - (and remove this annoying banner). \ -
', { expiry_string: expiry_string })); + (and remove this annoying banner). %(payment_link)s\ + ', { expiry_string: expiry_string, payment_link: payment_link })); } else if (diff < 0) { $('header').append(repl('
\ - This ERPNext subscription has expired. \ -
', { expiry_string: expiry_string })); + This ERPNext subscription has expired. %(payment_link)s\ + ', { expiry_string: expiry_string, payment_link: payment_link })); } } erpnext.set_about(); @@ -179,4 +180,4 @@ erpnext.setup_mousetrap = function() { // start $(document).bind('startup', function() { erpnext.startup.start(); -}); \ No newline at end of file +});