From 7854f81ca091449e94d28c8295cf38ef1a11fd80 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 14 Mar 2012 12:01:13 +0530 Subject: [PATCH 01/14] show todo, calendar and support desktop notifications --- erpnext/home/page/desktop/desktop.css | 27 +++++----- erpnext/home/page/desktop/desktop.js | 34 +++++++++++-- .../home/page/event_updates/event_updates.js | 2 +- .../home/page/event_updates/event_updates.py | 49 +++++++++++++++++-- erpnext/startup/startup.js | 29 +++++++---- js/all-app.js | 6 +-- js/all-web.js | 4 +- version.num | 2 +- wnf.py | 10 ++++ 9 files changed, 129 insertions(+), 34 deletions(-) diff --git a/erpnext/home/page/desktop/desktop.css b/erpnext/home/page/desktop/desktop.css index e460c11607..cc6126e200 100644 --- a/erpnext/home/page/desktop/desktop.css +++ b/erpnext/home/page/desktop/desktop.css @@ -69,14 +69,14 @@ } /* Hover and click effects */ -.case-border:hover, .circle:hover { - box-shadow: 0 0 2px 0px black, 0 0 10px 1px white; - -moz-box-shadow: 0 0 2px 0px black, 0 0 10px 1px white; - -webkit-box-shadow: 0 0 2px 0px black, 0 0 10px 1px white; - -o-box-shadow: 0 0 2px 0px black, 0 0 10px 1px white; +.case-border:hover, .circle:hover, .hover-effect { + box-shadow: 0 0 2px 0px black, 0 0 10px 1px white !important; + -moz-box-shadow: 0 0 2px 0px black, 0 0 10px 1px white !important; + -webkit-box-shadow: 0 0 2px 0px black, 0 0 10px 1px white !important; + -o-box-shadow: 0 0 2px 0px black, 0 0 10px 1px white !important; } -.case-border:active, .case-border:focus, .circle:active, .circle:focus { +.case-border:active, .case-border:focus, .case-border-click { transform: scale(0.98, 0.98); -ms-transform: scale(0.98, 0.98); /* IE 9 */ -webkit-transform: scale(0.98, 0.98); /* Safari and Chrome */ @@ -84,6 +84,14 @@ -moz-transform: scale(0.98, 0.98); /* Firefox */ } +.circle:active, .circle:focus, .circle-click { + transform: scale(1, 1); + -ms-transform: scale(1, 1); /* IE 9 */ + -webkit-transform: scale(1, 1); /* Safari and Chrome */ + -o-transform: scale(1, 1); /* Opera */ + -moz-transform: scale(1, 1); /* Firefox */ +} + .circle { border-radius: 30px; -moz-border-radius: 30px; @@ -93,9 +101,8 @@ min-width: 15px; background: #B00D07; padding: 3px; - z-index: 2; float: right; - margin-top: -10px; + margin-top: -74px; margin-right: 10px; border: 2px solid white; box-shadow: 0 0 10px 1px black; @@ -106,10 +113,8 @@ .circle-text { color: white; - vertical-align: middle; text-align: center; display: inline-block; - margin-top: -3px; - text-shadow: 1px 1px 5px #000; + margin-top: 1px; } diff --git a/erpnext/home/page/desktop/desktop.js b/erpnext/home/page/desktop/desktop.js index dab1e761b0..7852ab23fa 100644 --- a/erpnext/home/page/desktop/desktop.js +++ b/erpnext/home/page/desktop/desktop.js @@ -95,9 +95,37 @@ erpnext.desktop.render = function() { } erpnext.desktop.show_pending_notifications = function() { - $('#messages a:first').prepend('
\ -
'); - $('#msg_count').toggle(false); + var add_circle = function(str_module, id, title) { + var module = $('#'+str_module); + module.find('a:first').append( + repl('', {id: id, title: title})); + + var case_border = module.find('.case-border'); + var circle = module.find('.circle'); + + var add_hover_and_click = function(primary, secondary, hover_class, click_class) { + primary + .hover( + function() { secondary.addClass(hover_class); }, + function() { secondary.removeClass(hover_class); }) + .mousedown(function() { secondary.addClass(click_class); }) + .mouseup(function() { secondary.removeClass(click_class); }) + .focusin(function() { $(this).mousedown(); }) + .focusout(function() { $(this).mouseup(); }) + } + + add_hover_and_click(case_border, circle, 'hover-effect', 'circle-click'); + add_hover_and_click(circle, case_border, 'hover-effect', 'case-border-click'); + + } + + add_circle('messages', 'unread_messages', 'Unread Messages'); + add_circle('support', 'open_support_tickets', 'Open Support Tickets'); + add_circle('todo', 'things_todo', 'Things To Do'); + add_circle('calendar', 'todays_events', 'Todays Events'); + update_messages(); } diff --git a/erpnext/home/page/event_updates/event_updates.js b/erpnext/home/page/event_updates/event_updates.js index d86a1d869c..b2825f31be 100644 --- a/erpnext/home/page/event_updates/event_updates.js +++ b/erpnext/home/page/event_updates/event_updates.js @@ -600,7 +600,7 @@ pscript.home_make_status = function() { // get values $c_page('home', 'event_updates', 'get_status_details', user, function(r,rt) { - page_body.wntoolbar.set_new_comments(r.message.unread_messages); + //page_body.wntoolbar.set_new_comments(r.message.unread_messages); // render online users pscript.online_users_obj.render(r.message.online_users); diff --git a/erpnext/home/page/event_updates/event_updates.py b/erpnext/home/page/event_updates/event_updates.py index 05f1cfc609..32d6756e8c 100644 --- a/erpnext/home/page/event_updates/event_updates.py +++ b/erpnext/home/page/event_updates/event_updates.py @@ -26,8 +26,7 @@ def get_online_users(arg=None): and t1.user not in ('Guest','Administrator') and TIMESTAMPDIFF(HOUR,t1.lastupdate,NOW()) <= 1""", as_list=1) or [] -@webnotes.whitelist() -def get_unread_messages(arg=None): +def get_unread_messages(): "returns unread (docstatus-0 messages for a user)" return webnotes.conn.sql("""\ SELECT name, comment @@ -37,6 +36,49 @@ def get_unread_messages(arg=None): AND ifnull(docstatus,0)=0 """, webnotes.user.name, as_list=1) +def get_open_support_tickets(): + """ + Returns a count of open support tickets + """ + from webnotes.utils import cint + open_support_tickets = webnotes.conn.sql("""\ + SELECT COUNT(*) FROM `tabSupport Ticket` + WHERE status = 'Open'""") + return open_support_tickets and cint(open_support_tickets[0][0]) or 0 + +def get_things_todo(): + """ + Returns a count of incomplete todos + """ + from webnotes.utils import cint + incomplete_todos = webnotes.conn.sql("""\ + SELECT COUNT(*) FROM `tabToDo Item` + WHERE IFNULL(checked, 0) = 0 + AND owner = %s""", webnotes.session.get('user')) + return incomplete_todos and cint(incomplete_todos[0][0]) or 0 + +def get_todays_events(): + """ + Returns a count of todays events in calendar + """ + from webnotes.utils import nowdate, cint + todays_events = webnotes.conn.sql("""\ + SELECT COUNT(*) FROM `tabEvent` + WHERE owner = %s + AND event_type != 'Cancel' + AND event_date = %s""", ( + webnotes.session.get('user'), nowdate())) + return todays_events and cint(todays_events[0][0]) or 0 + +@webnotes.whitelist() +def get_global_status_messages(arg=None): + return { + 'unread_messages': get_unread_messages(), + 'open_support_tickets': get_open_support_tickets(), + 'things_todo': get_things_todo(), + 'todays_events': get_todays_events(), + } + @webnotes.whitelist() def get_status_details(arg=None): """get toolbar items""" @@ -47,7 +89,8 @@ def get_status_details(arg=None): # system messages ret = { 'user_count': len(online) or 0, - 'unread_messages': get_unread_messages(), + #'unread_messages': get_unread_messages(), + #'open_support_tickets': get_open_support_tickets(), 'online_users': online or [], 'setup_status': get_setup_status(), 'registration_complete': cint(get_defaults('registration_complete')) and 'Yes' or 'No', diff --git a/erpnext/startup/startup.js b/erpnext/startup/startup.js index 0a2ac23e1d..c00770c4d9 100644 --- a/erpnext/startup/startup.js +++ b/erpnext/startup/startup.js @@ -110,20 +110,29 @@ var update_messages = function(reset) { if(inList(['Guest'], user)) { return; } if(!reset) { - $c_page('home', 'event_updates', 'get_unread_messages', null, + $c_page('home', 'event_updates', 'get_global_status_messages', null, function(r,rt) { if(!r.exc) { // This function is defined in toolbar.js - page_body.wntoolbar.set_new_comments(r.message); - var circle = $('#msg_count') - if(circle) { - if(r.message.length) { - circle.find('span:first').text(r.message.length); - circle.toggle(true); - } else { - circle.toggle(false); + page_body.wntoolbar.set_new_comments(r.message.unread_messages); + + var show_in_circle = function(parent_id, msg) { + var parent = $('#'+parent_id); + if(parent) { + if(msg) { + parent.find('span:first').text(msg); + parent.toggle(true); + } else { + parent.toggle(false); + } } } + + show_in_circle('unread_messages', r.message.unread_messages.length); + show_in_circle('open_support_tickets', r.message.open_support_tickets); + show_in_circle('things_todo', r.message.things_todo); + show_in_circle('todays_events', r.message.todays_events); + } else { clearInterval(wn.updates.id); } @@ -131,7 +140,7 @@ var update_messages = function(reset) { ); } else { page_body.wntoolbar.set_new_comments(0); - $('#msg_count').toggle(false); + $('#unread_messages').toggle(false); } } diff --git a/js/all-app.js b/js/all-app.js index 686b0b846e..612e78c748 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -2229,8 +2229,8 @@ else if(nm=='Accounts Browser') pscript.make_chart(chart_type);} loadpage(nm,call_back);} var update_messages=function(reset){if(inList(['Guest'],user)){return;} -if(!reset){$c_page('home','event_updates','get_unread_messages',null,function(r,rt){if(!r.exc){page_body.wntoolbar.set_new_comments(r.message);var circle=$('#msg_count') -if(circle){if(r.message.length){circle.find('span:first').text(r.message.length);circle.toggle(true);}else{circle.toggle(false);}}}else{clearInterval(wn.updates.id);}});}else{page_body.wntoolbar.set_new_comments(0);$('#msg_count').toggle(false);}} +if(!reset){$c_page('home','event_updates','get_global_status_messages',null,function(r,rt){if(!r.exc){page_body.wntoolbar.set_new_comments(r.message.unread_messages);var show_in_circle=function(parent_id,msg){var parent=$('#'+parent_id);if(parent){if(msg){parent.find('span:first').text(msg);parent.toggle(true);}else{parent.toggle(false);}}} +show_in_circle('unread_messages',r.message.unread_messages.length);show_in_circle('open_support_tickets',r.message.open_support_tickets);show_in_circle('things_todo',r.message.things_todo);show_in_circle('todays_events',r.message.todays_events);}else{clearInterval(wn.updates.id);}});}else{page_body.wntoolbar.set_new_comments(0);$('#unread_messages').toggle(false);}} erpnext.startup.set_periodic_updates=function(){wn.updates={};if(wn.updates.id){clearInterval(wn.updates.id);} wn.updates.id=setInterval(update_messages,60000);} erpnext.set_user_background=function(src){set_style(repl('body { background: url("files/%(src)s") repeat;}',{src:src}))} @@ -2279,7 +2279,7 @@ if(user_roles.indexOf("System Manager")!=-1){$('.navbar .modules').append('
  • Date: Wed, 14 Mar 2012 12:19:40 +0530 Subject: [PATCH 02/14] desktop notifications --- version.num | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.num b/version.num index 2f9aa03afc..8eb7bc41bd 100644 --- a/version.num +++ b/version.num @@ -1 +1 @@ -829 \ No newline at end of file +830 \ No newline at end of file From 0e2461fa7c99d309b650bb7d7a9b6523c1c4b213 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 14 Mar 2012 17:53:53 +0530 Subject: [PATCH 03/14] fix in qa inspection report link --- erpnext/stock/page/stock_home/stock_home.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/erpnext/stock/page/stock_home/stock_home.html b/erpnext/stock/page/stock_home/stock_home.html index ae677de296..03c5fabd43 100644 --- a/erpnext/stock/page/stock_home/stock_home.html +++ b/erpnext/stock/page/stock_home/stock_home.html @@ -49,7 +49,7 @@
    Incoming Inspection + href="#!List/QA Inspection Report">Incoming Inspection
    Sales or Purchase Returns
    -
    From 92da889d32392a285259128a6dcf1d732b79c961 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 15 Mar 2012 11:50:26 +0530 Subject: [PATCH 04/14] fix in report builder saving --- erpnext/startup/event_handlers.py | 1 + js/all-app.js | 4 ++-- js/all-web.js | 2 +- version.num | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/erpnext/startup/event_handlers.py b/erpnext/startup/event_handlers.py index 7db56bdb53..703399aaa1 100644 --- a/erpnext/startup/event_handlers.py +++ b/erpnext/startup/event_handlers.py @@ -87,6 +87,7 @@ def boot_session(bootinfo): import webnotes.model.doctype bootinfo['docs'] += webnotes.model.doctype.get('Event') + bootinfo['docs'] += webnotes.model.doctype.get('Search Criteria') bootinfo['modules_list'] = webnotes.conn.get_global('modules_list') diff --git a/js/all-app.js b/js/all-app.js index 612e78c748..abb3c085aa 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -686,7 +686,7 @@ var v=_f.get_value(this.doctype,this.docname,this.df.fieldname);else{if(this.opt var v=this.options_list[0];else var v=null;} this.input.set_input(v);} -this.input.set_input=function(v){if(!v){if(!me.input.multiple){if(me.docname){if(me.options_list&&me.options_list.length){me.set(me.options_list[0]);me.input.value=me.options_list[0];}else{me.input.value='';}}}}else{if(me.options_list){if(me.input.multiple){for(var i=0;i Date: Fri, 16 Mar 2012 15:11:02 +0530 Subject: [PATCH 05/14] cost center will be fetched from other charges master --- erpnext/selling/doctype/sales_common/sales_common.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/selling/doctype/sales_common/sales_common.py b/erpnext/selling/doctype/sales_common/sales_common.py index 9186bb831b..33a1d1d57d 100644 --- a/erpnext/selling/doctype/sales_common/sales_common.py +++ b/erpnext/selling/doctype/sales_common/sales_common.py @@ -209,13 +209,14 @@ class DocType(TransactionBase): if default: add_cond = 'ifnull(t2.is_default,0) = 1' else: add_cond = 't1.parent = "'+cstr(obj.doc.charge)+'"' idx = 0 - other_charge = webnotes.conn.sql("select t1.charge_type,t1.row_id,t1.description,t1.account_head,t1.rate,t1.tax_amount,t1.included_in_print_rate from `tabRV Tax Detail` t1, `tabOther Charges` t2 where t1.parent = t2.name and t2.company = '%s' and %s order by t1.idx" % (obj.doc.company, add_cond), as_dict = 1) + other_charge = webnotes.conn.sql("select t1.charge_type,t1.row_id,t1.description,t1.account_head,t1.rate,t1.tax_amount,t1.included_in_print_rate, t1.cost_center from `tabRV Tax Detail` t1, `tabOther Charges` t2 where t1.parent = t2.name and t2.company = '%s' and %s order by t1.idx" % (obj.doc.company, add_cond), as_dict = 1) for other in other_charge: d = addchild(obj.doc, 'other_charges', 'RV Tax Detail', 1, obj.doclist) d.charge_type = other['charge_type'] d.row_id = other['row_id'] d.description = other['description'] d.account_head = other['account_head'] + d.cost_center = other['cost_center'] d.rate = flt(other['rate']) d.tax_amount = flt(other['tax_amount']) d.included_in_print_rate = cint(other['included_in_print_rate']) From deac31fd2dd3b5c636038042ee40ac674c37a095 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 16 Mar 2012 15:14:27 +0530 Subject: [PATCH 06/14] Update erpnext/selling/doctype/sales_common/sales_common.py --- erpnext/selling/doctype/sales_common/sales_common.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/selling/doctype/sales_common/sales_common.py b/erpnext/selling/doctype/sales_common/sales_common.py index 33a1d1d57d..63f53eab7b 100644 --- a/erpnext/selling/doctype/sales_common/sales_common.py +++ b/erpnext/selling/doctype/sales_common/sales_common.py @@ -209,14 +209,14 @@ class DocType(TransactionBase): if default: add_cond = 'ifnull(t2.is_default,0) = 1' else: add_cond = 't1.parent = "'+cstr(obj.doc.charge)+'"' idx = 0 - other_charge = webnotes.conn.sql("select t1.charge_type,t1.row_id,t1.description,t1.account_head,t1.rate,t1.tax_amount,t1.included_in_print_rate, t1.cost_center from `tabRV Tax Detail` t1, `tabOther Charges` t2 where t1.parent = t2.name and t2.company = '%s' and %s order by t1.idx" % (obj.doc.company, add_cond), as_dict = 1) + other_charge = webnotes.conn.sql("select t1.charge_type,t1.row_id,t1.description,t1.account_head,t1.rate,t1.tax_amount,t1.included_in_print_rate, t1.cost_center_other_charges from `tabRV Tax Detail` t1, `tabOther Charges` t2 where t1.parent = t2.name and t2.company = '%s' and %s order by t1.idx" % (obj.doc.company, add_cond), as_dict = 1) for other in other_charge: d = addchild(obj.doc, 'other_charges', 'RV Tax Detail', 1, obj.doclist) d.charge_type = other['charge_type'] d.row_id = other['row_id'] d.description = other['description'] d.account_head = other['account_head'] - d.cost_center = other['cost_center'] + d.cost_center_other_charges = other['cost_center_other_charges'] d.rate = flt(other['rate']) d.tax_amount = flt(other['tax_amount']) d.included_in_print_rate = cint(other['included_in_print_rate']) From 9f5b2cd8d94458458752577fe2165e27292a36c0 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 19 Mar 2012 10:20:22 +0530 Subject: [PATCH 07/14] Update erpnext/stock/doctype/delivery_note/delivery_note.txt --- erpnext/stock/doctype/delivery_note/delivery_note.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.txt b/erpnext/stock/doctype/delivery_note/delivery_note.txt index 314d0d9481..4878c36bad 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.txt +++ b/erpnext/stock/doctype/delivery_note/delivery_note.txt @@ -31,11 +31,11 @@ 'module': u'Stock', 'name': '__common__', 'read_only_onload': 1, - 'search_fields': u'status,transaction_date,customer,customer_name, territory,grand_total', + 'search_fields': u'status,customer,customer_name, territory,grand_total', 'section_style': u'Tabbed', 'server_code_error': u' ', 'show_in_menu': 0, - 'subject': u'To %(customer_name)s on %(transaction_date)s | %(per_billed)s% billed', + 'subject': u'To %(customer_name)s on %(posting_date)s | %(per_billed)s% billed', 'tag_fields': u'billing_status', 'version': 475 }, From 15a02715573d36991c3b8532523bb8d5841d6dde Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 19 Mar 2012 10:22:32 +0530 Subject: [PATCH 08/14] Update erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt --- erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt index 525bcfcef2..6724b694ef 100755 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt @@ -21,11 +21,11 @@ 'module': u'Stock', 'name': '__common__', 'read_only_onload': 1, - 'search_fields': u'status, transaction_date, supplier', + 'search_fields': u'status, posting_date, supplier', 'section_style': u'Tabbed', 'server_code_error': u' ', 'show_in_menu': 0, - 'subject': u'From %(supplier_name)s against %(purchase_order)s on %(transaction_date)s', + 'subject': u'From %(supplier_name)s against %(purchase_order)s on %(posting_date)s', 'version': 325 }, From f02c9e7b6c14210b6234663186f9e8b59464a5ae Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 19 Mar 2012 11:43:24 +0530 Subject: [PATCH 09/14] fix in due_date fetching for receivable voucher --- .../receivable_voucher/receivable_voucher.js | 14 ++++++++++++-- version.num | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.js b/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.js index 391bbcd8ae..7b3c6eff1f 100644 --- a/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.js +++ b/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.js @@ -162,14 +162,24 @@ cur_frm.cscript.warehouse = function(doc, cdt , cdn) { cur_frm.cscript.customer = function(doc,dt,dn,onload) { var callback = function(r,rt) { + var callback2 = function(doc, dt, dn) { + doc = locals[dt][dn]; + if(doc.debit_to && doc.posting_date){ + get_server_fields('get_cust_and_due_date','','',doc,dt,dn,1, + function(doc, dt, dn) { + cur_frm.refresh(); + }); + + } + } var doc = locals[cur_frm.doctype][cur_frm.docname]; - get_server_fields('get_debit_to','','',doc, dt, dn, 0); - cur_frm.refresh(); + get_server_fields('get_debit_to','','',doc, dt, dn, 0, callback2); } var args = onload ? 'onload':'' if(doc.customer) $c_obj(make_doclist(doc.doctype, doc.name), 'get_default_customer_address', args, callback); if(doc.customer) unhide_field(['customer_address','contact_person','customer_name','address_display','contact_display','contact_mobile','contact_email','territory','customer_group']); + } diff --git a/version.num b/version.num index e7fd4bfbe1..f08bce7b1c 100644 --- a/version.num +++ b/version.num @@ -1 +1 @@ -838 \ No newline at end of file +841 \ No newline at end of file From b6cd3316c4e9c41bf05aa4557ea9b499120da9bc Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 19 Mar 2012 13:27:06 +0530 Subject: [PATCH 10/14] error fixed in lease receipts client wise --- .../lease_receipts_client_wise/lease_receipts_client_wise.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/search_criteria/lease_receipts_client_wise/lease_receipts_client_wise.sql b/erpnext/accounts/search_criteria/lease_receipts_client_wise/lease_receipts_client_wise.sql index f951388aaf..af49c813f1 100644 --- a/erpnext/accounts/search_criteria/lease_receipts_client_wise/lease_receipts_client_wise.sql +++ b/erpnext/accounts/search_criteria/lease_receipts_client_wise/lease_receipts_client_wise.sql @@ -1,5 +1,5 @@ SELECT gl.account,sum(gl.credit) as amount FROM `tabGL Entry` gl, `tabAccount` a -WHERE gl.account=a.name and a.master_type='Customer' and gl.posting_date between '%(date)s' and '%(date1)s' +WHERE gl.account=a.name and a.master_type='Customer' and gl.posting_date between '%(date)s' and '%(date1)s' and ifnull(gl.is_cancelled, 'No') = 'No' GROUP BY gl.account ORDER BY posting_date From e5d99f5ed1bc98418e254ef3e65225f7e681495e Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 19 Mar 2012 15:15:20 +0530 Subject: [PATCH 11/14] Update erpnext/setup/doctype/manage_account/manage_account.txt --- erpnext/setup/doctype/manage_account/manage_account.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/setup/doctype/manage_account/manage_account.txt b/erpnext/setup/doctype/manage_account/manage_account.txt index 18a9872d1c..1ff58ca525 100644 --- a/erpnext/setup/doctype/manage_account/manage_account.txt +++ b/erpnext/setup/doctype/manage_account/manage_account.txt @@ -231,7 +231,7 @@ 'doctype': 'DocField', 'fieldtype': 'HTML', 'label': 'IGHelp', - 'options': 'To manage Item Groups, click here' + 'options': 'To manage Item Groups, click here' }, # DocField From 9aa3777ba6c0fb9eb5cd7e9fc3ae6c601dae1a74 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 19 Mar 2012 15:21:30 +0530 Subject: [PATCH 12/14] Update erpnext/setup/doctype/sales_person/sales_person.txt --- erpnext/setup/doctype/sales_person/sales_person.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/setup/doctype/sales_person/sales_person.txt b/erpnext/setup/doctype/sales_person/sales_person.txt index 0680c3886f..9ae96bfc33 100644 --- a/erpnext/setup/doctype/sales_person/sales_person.txt +++ b/erpnext/setup/doctype/sales_person/sales_person.txt @@ -183,7 +183,7 @@ 'idx': 5, 'label': 'SPHelp', 'oldfieldtype': 'HTML', - 'options': 'To manage Sales Person, click here', + 'options': 'To manage Sales Person, click here', 'permlevel': 0 }, From 422f7e99db2e8953e8b97e3cac2a3e0028143e40 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 19 Mar 2012 15:37:03 +0530 Subject: [PATCH 13/14] Update erpnext/selling/doctype/customer/customer.txt --- erpnext/selling/doctype/customer/customer.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/selling/doctype/customer/customer.txt b/erpnext/selling/doctype/customer/customer.txt index 346b4d1029..993dc29f5e 100644 --- a/erpnext/selling/doctype/customer/customer.txt +++ b/erpnext/selling/doctype/customer/customer.txt @@ -203,7 +203,7 @@ # DocField { 'colour': u'White:FFF', - 'description': u'To manage Customer Groups, click here', + 'description': u'To manage Customer Groups, click here', 'doctype': u'DocField', 'fieldname': u'customer_group', 'fieldtype': u'Link', @@ -223,7 +223,7 @@ # DocField { 'colour': u'White:FFF', - 'description': u'To manage Territory, click here', + 'description': u'To manage Territory, click here', 'doctype': u'DocField', 'fieldname': u'territory', 'fieldtype': u'Link', From 16d9f4942a781c6383677f4fe5096f0bf45940fe Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 19 Mar 2012 15:48:08 +0530 Subject: [PATCH 14/14] Update erpnext/setup/doctype/manage_account/manage_account.txt --- erpnext/setup/doctype/manage_account/manage_account.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/setup/doctype/manage_account/manage_account.txt b/erpnext/setup/doctype/manage_account/manage_account.txt index 1ff58ca525..4077afe76e 100644 --- a/erpnext/setup/doctype/manage_account/manage_account.txt +++ b/erpnext/setup/doctype/manage_account/manage_account.txt @@ -391,7 +391,7 @@ 'doctype': 'DocField', 'fieldtype': 'HTML', 'label': 'CGHelp', - 'options': 'To manage Customer Groups, click here' + 'options': 'To manage Customer Groups, click here' }, # DocField @@ -408,7 +408,7 @@ 'doctype': 'DocField', 'fieldtype': 'HTML', 'label': 'TerritoryHelp', - 'options': 'To manage Territory, click here' + 'options': 'To manage Territory, click here' }, # DocField