From eaf144a545699b13affabdaef5e0fa9ad3d29fce Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 1 Mar 2012 13:05:04 +0530 Subject: [PATCH 1/6] form cleanup in pur cycle --- .../payable_voucher/payable_voucher.js | 13 +++-- .../payable_voucher/payable_voucher.py | 3 - .../purchase_common/purchase_common.js | 55 ++++++++++--------- .../purchase_common/purchase_common.py | 5 -- .../doctype/purchase_order/purchase_order.js | 11 ++-- .../doctype/purchase_order/purchase_order.py | 4 -- .../purchase_receipt/purchase_receipt.js | 14 +++-- .../purchase_receipt/purchase_receipt.py | 4 -- 8 files changed, 53 insertions(+), 56 deletions(-) diff --git a/erpnext/accounts/doctype/payable_voucher/payable_voucher.js b/erpnext/accounts/doctype/payable_voucher/payable_voucher.js index a465ec07db..99bd24c6b8 100644 --- a/erpnext/accounts/doctype/payable_voucher/payable_voucher.js +++ b/erpnext/accounts/doctype/payable_voucher/payable_voucher.js @@ -45,11 +45,14 @@ cur_frm.cscript.onload = function(doc,dt,dn) { //------------------------ cur_frm.cscript.onload_post_render = function(doc, dt, dn) { var callback = function(doc, dt, dn) { - if(doc.__islocal && doc.supplier) cur_frm.cscript.supplier(doc,dt,dn); + var callback1 = function(doc, dt, dn) { + if(doc.__islocal && doc.supplier) cur_frm.cscript.supplier(doc,dt,dn); + } + + // defined in purchase_common.js + cur_frm.cscript.update_item_details(doc, dt, dn, callback1); } - - // defined in purchase_common.js - cur_frm.cscript.update_item_details(doc, cdt, cdn, callback); + cur_frm.cscript.dynamic_label(doc, dt, dn, callback); } // Refresh @@ -58,7 +61,7 @@ cur_frm.cscript.refresh = function(doc, dt, dn) { cur_frm.clear_custom_buttons(); - cur_frm.cscript.dynamic_label(doc, cdt, cdn); + if (!cur_frm.cscript.is_onload) cur_frm.cscript.dynamic_label(doc, dt, dn); // Show / Hide button diff --git a/erpnext/accounts/doctype/payable_voucher/payable_voucher.py b/erpnext/accounts/doctype/payable_voucher/payable_voucher.py index fe733f7782..1a09a451c7 100644 --- a/erpnext/accounts/doctype/payable_voucher/payable_voucher.py +++ b/erpnext/accounts/doctype/payable_voucher/payable_voucher.py @@ -168,9 +168,6 @@ class DocType(TransactionBase): return ret - def get_comp_base_currency(self): - return get_obj('Purchase Common').get_comp_base_currency(self.doc.company) - # *************************** Server Utility Functions ***************************** # Get Company abbr diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.js b/erpnext/buying/doctype/purchase_common/purchase_common.js index 52f8e539fc..317df513c2 100644 --- a/erpnext/buying/doctype/purchase_common/purchase_common.js +++ b/erpnext/buying/doctype/purchase_common/purchase_common.js @@ -92,39 +92,36 @@ var set_dynamic_label_par = function(doc, cdt, cdn, base_curr) { var set_dynamic_label_child = function(doc, cdt, cdn, base_curr) { - // item table flds - item_cols_base = {'purchase_ref_rate': 'Ref Rate', 'amount': 'Amount'}; - item_cols_import = {'import_rate': 'Rate', 'import_ref_rate': 'Ref Rate', 'import_amount': 'Amount'}; + // item table flds + item_cols_base = {'purchase_ref_rate': 'Ref Rate', 'amount': 'Amount'}; + item_cols_import = {'import_rate': 'Rate', 'import_ref_rate': 'Ref Rate', 'import_amount': 'Amount'}; - for (d in item_cols_base) $('[data-grid-fieldname="'+cur_frm.cscript.tname+'-'+d+'"]').html(item_cols_base[d]+' ('+base_curr+')'); - for (d in item_cols_import) $('[data-grid-fieldname="'+cur_frm.cscript.tname+'-'+d+'"]').html(item_cols_import[d]+' ('+doc.currency+')'); + for (d in item_cols_base) $('[data-grid-fieldname="'+cur_frm.cscript.tname+'-'+d+'"]').html(item_cols_base[d]+' ('+base_curr+')'); + for (d in item_cols_import) $('[data-grid-fieldname="'+cur_frm.cscript.tname+'-'+d+'"]').html(item_cols_import[d]+' ('+doc.currency+')'); - var hide = (doc.currency == sys_defaults['currency']) ? false : true; - for (f in item_cols_base) cur_frm.fields_dict[cur_frm.cscript.fname].grid.set_column_disp(f, hide); - - if (doc.doctype == 'Payable Voucher') { - $('[data-grid-fieldname="'+cur_frm.cscript.tname+'-rate"]').html('Rate ('+base_curr+')'); - cur_frm.fields_dict[cur_frm.cscript.fname].grid.set_column_disp('rate', hide); - // advance table flds - adv_cols = {'advance_amount': 'Advance Amount', 'allocated_amount': 'Allocated Amount', 'tds_amount': 'TDS Amount', 'tds_allocated': 'TDS Allocated'} - for (d in adv_cols) $('[data-grid-fieldname="Advance Allocation Detail-'+d+'"]').html(adv_cols[d]+' ('+base_curr+')'); - } - else { - $('[data-grid-fieldname="'+cur_frm.cscript.tname+'-purchase_rate"]').html('Rate ('+base_curr+')'); - cur_frm.fields_dict[cur_frm.cscript.fname].grid.set_column_disp('purchase_rate', hide); - } - - //tax table flds - tax_cols = {'tax_amount': 'Amount', 'total': 'Aggregate Total'}; - for (d in tax_cols) $('[data-grid-fieldname="Purchase Tax Detail-'+d+'"]').html(tax_cols[d]+' ('+base_curr+')'); - + var hide = (doc.currency == sys_defaults['currency']) ? false : true; + for (f in item_cols_base) cur_frm.fields_dict[cur_frm.cscript.fname].grid.set_column_disp(f, hide); + if (doc.doctype == 'Payable Voucher') { + $('[data-grid-fieldname="'+cur_frm.cscript.tname+'-rate"]').html('Rate ('+base_curr+')'); + cur_frm.fields_dict[cur_frm.cscript.fname].grid.set_column_disp('rate', hide); + // advance table flds + adv_cols = {'advance_amount': 'Advance Amount', 'allocated_amount': 'Allocated Amount', 'tds_amount': 'TDS Amount', 'tds_allocated': 'TDS Allocated'} + for (d in adv_cols) $('[data-grid-fieldname="Advance Allocation Detail-'+d+'"]').html(adv_cols[d]+' ('+base_curr+')'); + } + else { + $('[data-grid-fieldname="'+cur_frm.cscript.tname+'-purchase_rate"]').html('Rate ('+base_curr+')'); + cur_frm.fields_dict[cur_frm.cscript.fname].grid.set_column_disp('purchase_rate', hide); + } + //tax table flds + tax_cols = {'tax_amount': 'Amount', 'total': 'Aggregate Total'}; + for (d in tax_cols) $('[data-grid-fieldname="Purchase Tax Detail-'+d+'"]').html(tax_cols[d]+' ('+base_curr+')'); } // Change label dynamically based on currency //------------------------------------------------------------------ -cur_frm.cscript.dynamic_label = function(doc, cdt, cdn) { +cur_frm.cscript.dynamic_label = function(doc, cdt, cdn, callback1) { var callback = function(r, rt) { if (r.message) base_curr = r.message; else base_curr = sys_defaults['currency']; @@ -136,10 +133,16 @@ cur_frm.cscript.dynamic_label = function(doc, cdt, cdn) { set_dynamic_label_par(doc, cdt, cdn, base_curr); set_dynamic_label_child(doc, cdt, cdn, base_curr); + + if(callback1) callback1(doc, cdt, cdn); } if (doc.company == sys_defaults['company']) callback('', ''); - else $c_obj(make_doclist(doc.doctype, doc.name), 'get_comp_base_currency', '', callback); + else wn.call({ + method: 'selling.doctype.sales_common.sales_common.get_comp_base_currency', + args: {company: doc.company}, + callback: callback + }); } cur_frm.cscript.currency = function(doc, cdt, cdn) { diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.py b/erpnext/buying/doctype/purchase_common/purchase_common.py index 16afb02ccf..ca9181f154 100644 --- a/erpnext/buying/doctype/purchase_common/purchase_common.py +++ b/erpnext/buying/doctype/purchase_common/purchase_common.py @@ -197,11 +197,6 @@ class DocType(TransactionBase): msgprint("%s has no Last Purchase Rate."% d.item_code) - def get_comp_base_currency(self, comp): - """ get default currency of company""" - return webnotes.conn.sql("select default_currency from `tabCompany` where name = %s", comp)[0][0] - - # validation # ------------------------------------------------------------------------------------------------------- diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js index 0a6c547978..7af1204fa4 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.js +++ b/erpnext/buying/doctype/purchase_order/purchase_order.js @@ -41,9 +41,12 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) { } cur_frm.cscript.onload_post_render = function(doc, cdt, cdn) { - if(doc.__islocal){ - cur_frm.cscript.get_default_schedule_date(doc); - } + var callback = function(doc, cdt, cdn) { + if(doc.__islocal){ + cur_frm.cscript.get_default_schedule_date(doc); + } + } + cur_frm.cscript.dynamic_label(doc, cdt, cdn, callback); } // ================================== Refresh ========================================== @@ -52,7 +55,7 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { // --------------------------------- cur_frm.clear_custom_buttons(); - cur_frm.cscript.dynamic_label(doc, cdt, cdn); + if (!cur_frm.cscript.is_onload) cur_frm.cscript.dynamic_label(doc, cdt, cdn); if(doc.docstatus == 1 && doc.status != 'Stopped'){ var ch = getchildren('PO Detail',doc.name,'po_details'); diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py index efa05244c0..794580724b 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.py +++ b/erpnext/buying/doctype/purchase_order/purchase_order.py @@ -100,10 +100,6 @@ class DocType(TransactionBase): return get_obj('Purchase Common').get_tc_details(self) - def get_comp_base_currency(self): - return get_obj('Purchase Common').get_comp_base_currency(self.doc.company) - - # validate if indent has been pulled twice def validate_prev_docname(self): diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js index 0f6d1a8a80..7ad9d91928 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js @@ -40,12 +40,15 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) { cur_frm.cscript.onload_post_render = function(doc, dt, dn) { var callback = function(doc, dt, dn) { - if(doc.__islocal){ - cur_frm.cscript.get_default_schedule_date(doc); + var callback1 = function(doc, dt, dn) { + if(doc.__islocal){ + cur_frm.cscript.get_default_schedule_date(doc); + } } + // defined in purchase_common.js + cur_frm.cscript.update_item_details(doc, dt, dn, callback1); } - // defined in purchase_common.js - cur_frm.cscript.update_item_details(doc, cdt, cdn, callback); + cur_frm.cscript.dynamic_label(doc, dt, dn, callback); } //========================== Refresh =============================================================== @@ -55,7 +58,8 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { // --------------------------------- cur_frm.clear_custom_buttons(); - cur_frm.cscript.dynamic_label(doc, cdt, cdn); + if (!cur_frm.cscript.is_onload) cur_frm.cscript.dynamic_label(doc, cdt, cdn); + if(doc.docstatus == 1){ var ch = getchildren('Purchase Receipt Detail',doc.name,'purchase_receipt_details'); diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py index 530afcf09d..f3e5d7737d 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py @@ -88,10 +88,6 @@ class DocType(TransactionBase): def get_tc_details(self): return get_obj('Purchase Common').get_tc_details(self) - def get_comp_base_currency(self): - return get_obj('Purchase Common').get_comp_base_currency(self.doc.company) - - # get available qty at warehouse def get_bin_details(self, arg = ''): From 4c1e9e7db4d8a6e0bb04553870df0e9a6993f6a2 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 1 Mar 2012 13:30:34 +0530 Subject: [PATCH 2/6] added attributions pages --- css/all-app.css | 4 +- css/all-web.css | 4 +- erpnext/home/page/activity/activity.js | 3 +- erpnext/home/page/attributions/__init__.py | 0 .../home/page/attributions/attributions.css | 0 .../home/page/attributions/attributions.html | 91 +++++++++++++++++++ .../home/page/attributions/attributions.js | 1 + .../home/page/attributions/attributions.py | 1 + .../home/page/attributions/attributions.txt | 28 ++++++ erpnext/startup/startup.css | 2 +- erpnext/startup/startup.js | 2 +- js/all-app.js | 2 +- js/all-web.js | 2 +- version.num | 2 +- 14 files changed, 132 insertions(+), 10 deletions(-) create mode 100644 erpnext/home/page/attributions/__init__.py create mode 100644 erpnext/home/page/attributions/attributions.css create mode 100644 erpnext/home/page/attributions/attributions.html create mode 100644 erpnext/home/page/attributions/attributions.js create mode 100644 erpnext/home/page/attributions/attributions.py create mode 100644 erpnext/home/page/attributions/attributions.txt diff --git a/css/all-app.css b/css/all-app.css index b2fd2e5732..97dc509fb9 100644 --- a/css/all-app.css +++ b/css/all-app.css @@ -1043,7 +1043,7 @@ div.dialog_head { } div.dialog_body { - padding: 8px 4px 16px 4px; + padding: 8px 8px 16px; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; @@ -2812,7 +2812,7 @@ body { } .erpnext-footer { - margin: 3px auto; + margin: 11px auto; text-align: center; } diff --git a/css/all-web.css b/css/all-web.css index 9359de898e..c8eb20fd76 100644 --- a/css/all-web.css +++ b/css/all-web.css @@ -362,7 +362,7 @@ div.dialog_head { } div.dialog_body { - padding: 8px 4px 16px 4px; + padding: 8px 8px 16px; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; @@ -1620,7 +1620,7 @@ body { } .erpnext-footer { - margin: 3px auto; + margin: 11px auto; text-align: center; } diff --git a/erpnext/home/page/activity/activity.js b/erpnext/home/page/activity/activity.js index d8e22ce809..feea380e62 100644 --- a/erpnext/home/page/activity/activity.js +++ b/erpnext/home/page/activity/activity.js @@ -15,8 +15,9 @@ erpnext.ActivityFeed = Class.extend({ this.scrub_data(data); this.add_date_separator(row, data); $(row).append(sprintf('
\ + \ + max-width: 24px;"> \ %(feed_type)s\ %(link)s %(subject)s
', data)); }, diff --git a/erpnext/home/page/attributions/__init__.py b/erpnext/home/page/attributions/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/erpnext/home/page/attributions/attributions.css b/erpnext/home/page/attributions/attributions.css new file mode 100644 index 0000000000..e69de29bb2 diff --git a/erpnext/home/page/attributions/attributions.html b/erpnext/home/page/attributions/attributions.html new file mode 100644 index 0000000000..72703c85e6 --- /dev/null +++ b/erpnext/home/page/attributions/attributions.html @@ -0,0 +1,91 @@ +
+ × +

Attributions

+
+

Source Code: + https://github.com/webnotes/erpnext

+

Website: + https://erpnext.com

+
+

ERPNext is an Open Source project and is possible because of the work of + thousands of software developers, companies and designers who have contributed their + work to the community. We have tried to list as many projects as possible that are + used by ERPNext, but this list may not be exhaustive.

+ + +

Server

+
    +
  • Linux (GNU)
    • +
  • Apache HTTPD server (web server)
    • +
  • MySQL (database, Percona build)
    • +
  • Git (source code control via Github)
    • +
+ +

Programming Languages & Libraries

+
    +
  • Python
    • +
      +
    • Python-MySQL
      • +
    • pytz (timezones)
      • +
    • jinja2 (templating)
      • +
    • markdown2 (markdown parser)
      • +
    • jsmin (javascript minifier)
      • +
    +
  • Javascript
    • +
      +
    • JQuery
      • +
    • JQuery UI (datepicker, sortable)
      • +
    • TinyMCE - text editor
      • +
    • Twitter Bootstrap
      • +
    • jQPlot - graphs
      • +
    • JSON2 - JSON builder, parser
      • +
    • JSColor - color picker
      • +
    • sprintf - string formatting
      • +
    • historyjs - AJAX history
      • +
    +
+ +

CSS Frameworks

+
    +
  • Twitter Bootstrap
    • +
+ +

Icons

+
    +
  • The Noun Project
    • +
  • Glyphicons
    • +
+ +

Web Frameworks

+
    +
  • wnframework
    • +
+ +

Web Browsers

+
    +
  • Mozilla Firefox
    • +
      +
    • Firebug (debugger)
      • +
    +
  • Apple Safari
    • +
  • Google Chorme
    • +
+
+

ERPNext License

+

ERPNext - Open Source, web based ERP

+

Copyright © 2008 onwards, Web Notes Technologies Pvt Ltd, India

+ +

This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version.

+ +

This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details.

+ +

For complete license see http://www.gnu.org/licenses/

+
+

For more information please write to us at support@erpnext.com

+
\ No newline at end of file diff --git a/erpnext/home/page/attributions/attributions.js b/erpnext/home/page/attributions/attributions.js new file mode 100644 index 0000000000..fc56784431 --- /dev/null +++ b/erpnext/home/page/attributions/attributions.js @@ -0,0 +1 @@ +wn.pages['attributions'].onload = function(wrapper) { } \ No newline at end of file diff --git a/erpnext/home/page/attributions/attributions.py b/erpnext/home/page/attributions/attributions.py new file mode 100644 index 0000000000..f807eb0a4d --- /dev/null +++ b/erpnext/home/page/attributions/attributions.py @@ -0,0 +1 @@ +import webnotes \ No newline at end of file diff --git a/erpnext/home/page/attributions/attributions.txt b/erpnext/home/page/attributions/attributions.txt new file mode 100644 index 0000000000..a15adb97b7 --- /dev/null +++ b/erpnext/home/page/attributions/attributions.txt @@ -0,0 +1,28 @@ +# Page, attributions +[ + + # These values are common in all dictionaries + { + 'creation': '2012-03-01 12:30:42', + 'docstatus': 0, + 'modified': '2012-03-01 12:30:42', + 'modified_by': u'Administrator', + 'owner': u'Administrator' + }, + + # These values are common for all Page + { + 'doctype': 'Page', + 'module': u'Home', + 'name': '__common__', + 'page_name': u'attributions', + 'standard': u'Yes', + 'title': u'Attributions' + }, + + # Page, attributions + { + 'doctype': 'Page', + 'name': u'attributions' + } +] \ No newline at end of file diff --git a/erpnext/startup/startup.css b/erpnext/startup/startup.css index ae0ef606f1..1ce026449b 100644 --- a/erpnext/startup/startup.css +++ b/erpnext/startup/startup.css @@ -16,7 +16,7 @@ body { } .erpnext-footer { - margin: 3px auto; + margin: 11px auto; text-align: center; } diff --git a/erpnext/startup/startup.js b/erpnext/startup/startup.js index 9a281e25e8..0de1704df8 100644 --- a/erpnext/startup/startup.js +++ b/erpnext/startup/startup.js @@ -73,7 +73,7 @@ erpnext.startup.start = function() { // border to the body // ------------------ $('footer').html('
\ - Powered by ERPNext
'); + ERPNext | Attributions and License'); // complete registration if(in_list(user_roles,'System Manager') && (wn.boot.setup_complete=='No')) { diff --git a/js/all-app.js b/js/all-app.js index 3c65618e1a..5d37f478a8 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -2236,7 +2236,7 @@ erpnext.startup.start=function(){$('#startup_div').html('Starting up...').toggle if(wn.boot.user_background){erpnext.set_user_background(wn.boot.user_background);} if(user=='Guest'){if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity']) erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();$('footer').html('
\ - Powered by ERPNext
');if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup();}} + ERPNext | Attributions and License');if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup();}} $('#startup_div').toggle(false);} show_chart_browser=function(nm,chart_type){var call_back=function(){if(nm=='Sales Browser'){var sb_obj=new SalesBrowser();sb_obj.set_val(chart_type);} else if(nm=='Accounts Browser') diff --git a/js/all-web.js b/js/all-web.js index e802a17e9d..b7c9f358b6 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -1084,7 +1084,7 @@ erpnext.startup.start=function(){$('#startup_div').html('Starting up...').toggle if(wn.boot.user_background){erpnext.set_user_background(wn.boot.user_background);} if(user=='Guest'){if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity']) erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();$('footer').html('
\ - Powered by ERPNext
');if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup();}} + ERPNext | Attributions and License');if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup();}} $('#startup_div').toggle(false);} show_chart_browser=function(nm,chart_type){var call_back=function(){if(nm=='Sales Browser'){var sb_obj=new SalesBrowser();sb_obj.set_val(chart_type);} else if(nm=='Accounts Browser') diff --git a/version.num b/version.num index 19e03cffa3..eb90589d8d 100644 --- a/version.num +++ b/version.num @@ -1 +1 @@ -776 \ No newline at end of file +780 \ No newline at end of file From cc131af77a63e1c42881086738b7f454a68edda9 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 1 Mar 2012 13:35:07 +0530 Subject: [PATCH 3/6] add messages to always show --- erpnext/startup/startup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/startup/startup.js b/erpnext/startup/startup.js index 0de1704df8..568714561d 100644 --- a/erpnext/startup/startup.js +++ b/erpnext/startup/startup.js @@ -62,7 +62,7 @@ erpnext.startup.start = function() { } else { // always allow apps wn.boot.profile.allow_modules = wn.boot.profile.allow_modules.concat( - ['To Do', 'Knowledge Base', 'Calendar', 'Activity']) + ['To Do', 'Knowledge Base', 'Calendar', 'Activity', 'Messages']) // setup toolbar erpnext.toolbar.setup(); From fe521fdbc2b18c301bc5b37a103e9dc2d646f728 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 1 Mar 2012 13:39:09 +0530 Subject: [PATCH 4/6] add messages to always show and add attribution to patch --- erpnext/patches/jan_mar_2012/navupdate.py | 1 + js/all-app.js | 2 +- js/all-web.js | 2 +- version.num | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/erpnext/patches/jan_mar_2012/navupdate.py b/erpnext/patches/jan_mar_2012/navupdate.py index 8f5250ef9e..1cfa879ad3 100644 --- a/erpnext/patches/jan_mar_2012/navupdate.py +++ b/erpnext/patches/jan_mar_2012/navupdate.py @@ -35,6 +35,7 @@ def execute(): reload_doc('setup', 'page', 'modules_setup') reload_doc('utilities', 'page', 'users') reload_doc('home', 'page', 'activity') + reload_doc('home', 'page', 'attributions') reload_doc('core', 'doctype', 'profile') # update user_image in profile diff --git a/js/all-app.js b/js/all-app.js index 5d37f478a8..fc177258b8 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -2234,7 +2234,7 @@ erpnext.startup.set_globals=function(){pscript.is_erpnext_saas=cint(wn.control_p if(inList(user_roles,'System Manager'))is_system_manager=1;} erpnext.startup.start=function(){$('#startup_div').html('Starting up...').toggle(true);erpnext.startup.set_globals();if(wn.boot.custom_css){set_style(wn.boot.custom_css);} if(wn.boot.user_background){erpnext.set_user_background(wn.boot.user_background);} -if(user=='Guest'){if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity']) +if(user=='Guest'){if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity','Messages']) erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();$('footer').html('
\ ERPNext | Attributions and License
');if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup();}} $('#startup_div').toggle(false);} diff --git a/js/all-web.js b/js/all-web.js index b7c9f358b6..b98ae580f6 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -1082,7 +1082,7 @@ erpnext.startup.set_globals=function(){pscript.is_erpnext_saas=cint(wn.control_p if(inList(user_roles,'System Manager'))is_system_manager=1;} erpnext.startup.start=function(){$('#startup_div').html('Starting up...').toggle(true);erpnext.startup.set_globals();if(wn.boot.custom_css){set_style(wn.boot.custom_css);} if(wn.boot.user_background){erpnext.set_user_background(wn.boot.user_background);} -if(user=='Guest'){if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity']) +if(user=='Guest'){if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity','Messages']) erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();$('footer').html('
\ ERPNext | Attributions and License
');if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup();}} $('#startup_div').toggle(false);} diff --git a/version.num b/version.num index 699ec1b9ee..17863f9c51 100644 --- a/version.num +++ b/version.num @@ -1 +1 @@ -781 \ No newline at end of file +782 \ No newline at end of file From df33cb3a39b6cdfd905e964398dee06cc81cf733 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 1 Mar 2012 13:44:09 +0530 Subject: [PATCH 5/6] added activity avatar and removed menus.css --- build.json | 2 - css/all-app.css | 59 ++++---------------------- css/all-web.css | 59 ++++---------------------- erpnext/home/page/activity/activity.js | 4 +- version.num | 2 +- 5 files changed, 18 insertions(+), 108 deletions(-) diff --git a/build.json b/build.json index 17d38b3141..635e73d9dc 100644 --- a/build.json +++ b/build.json @@ -37,7 +37,6 @@ { "css/all-web.css": [ "lib/css/legacy/body.css", - "lib/css/legacy/menus.css", "lib/css/legacy/messages.css", "lib/css/legacy/dialog.css", "lib/css/bootstrap/headings.css", @@ -53,7 +52,6 @@ { "css/all-app.css": [ "lib/css/legacy/body.css", - "lib/css/legacy/menus.css", "lib/css/legacy/messages.css", "lib/css/legacy/forms.css", "lib/css/legacy/grid.css", diff --git a/css/all-app.css b/css/all-app.css index 97dc509fb9..f3a07ec9da 100644 --- a/css/all-app.css +++ b/css/all-app.css @@ -230,59 +230,16 @@ div.std-footer-item { box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); } -/* - * lib/css/legacy/menus.css - */ -/******** Menus - menu.js ************/ - -ul.menu_toolbar { - z-index: 30; - padding: 0px; - margin: 0px; - margin-top: 1px; +.avatar-small { + display: inline-block; + min-width: 29px; +} +.avatar-small img { + height: 24px; + margin-bottom: -7px; + max-width: 24px; } -ul.menu_toolbar li { - list-style: none; - margin: 0px; - float: left; -} - -.top_menu { - margin: 0px; - padding: 4px; - cursor: pointer; - color: #FFF; - margin-right: 8px; -} - -.top_menu_mo { - background-color: #000; - - -moz-border-radius: 5px; - -webkit-border-radius: 5px; -} - -div.menu_toolbar_dropdown { - position: absolute; - margin-top: 4px; - margin-left: 8px; - width: 140px; - background-color: #FFF; - color: #000; - display: none; - border: 2px solid #333; - z-index: 31; - overflow-y: auto; - overflow-x: hidden; -} - -div.dd_item { - cursor: pointer; - padding: 4px; - background-color: #FFF; -} -div.dd_item_mo { background-color: #FE8; } /* * lib/css/legacy/messages.css */ diff --git a/css/all-web.css b/css/all-web.css index c8eb20fd76..967c32b65c 100644 --- a/css/all-web.css +++ b/css/all-web.css @@ -230,59 +230,16 @@ div.std-footer-item { box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); } -/* - * lib/css/legacy/menus.css - */ -/******** Menus - menu.js ************/ - -ul.menu_toolbar { - z-index: 30; - padding: 0px; - margin: 0px; - margin-top: 1px; +.avatar-small { + display: inline-block; + min-width: 29px; +} +.avatar-small img { + height: 24px; + margin-bottom: -7px; + max-width: 24px; } -ul.menu_toolbar li { - list-style: none; - margin: 0px; - float: left; -} - -.top_menu { - margin: 0px; - padding: 4px; - cursor: pointer; - color: #FFF; - margin-right: 8px; -} - -.top_menu_mo { - background-color: #000; - - -moz-border-radius: 5px; - -webkit-border-radius: 5px; -} - -div.menu_toolbar_dropdown { - position: absolute; - margin-top: 4px; - margin-left: 8px; - width: 140px; - background-color: #FFF; - color: #000; - display: none; - border: 2px solid #333; - z-index: 31; - overflow-y: auto; - overflow-x: hidden; -} - -div.dd_item { - cursor: pointer; - padding: 4px; - background-color: #FFF; -} -div.dd_item_mo { background-color: #FE8; } /* * lib/css/legacy/messages.css */ diff --git a/erpnext/home/page/activity/activity.js b/erpnext/home/page/activity/activity.js index feea380e62..9a323d3ec1 100644 --- a/erpnext/home/page/activity/activity.js +++ b/erpnext/home/page/activity/activity.js @@ -15,9 +15,7 @@ erpnext.ActivityFeed = Class.extend({ this.scrub_data(data); this.add_date_separator(row, data); $(row).append(sprintf('
\ - - \ + \ %(feed_type)s\ %(link)s %(subject)s
', data)); }, diff --git a/version.num b/version.num index 17863f9c51..d0af645045 100644 --- a/version.num +++ b/version.num @@ -1 +1 @@ -782 \ No newline at end of file +783 \ No newline at end of file From b6023a4d3428c66b937d78323d97958ea29bc5cc Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 1 Mar 2012 13:47:51 +0530 Subject: [PATCH 6/6] users - list condition --- erpnext/utilities/page/messages/messages.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/utilities/page/messages/messages.py b/erpnext/utilities/page/messages/messages.py index 8e92ff9ec9..b28299164c 100644 --- a/erpnext/utilities/page/messages/messages.py +++ b/erpnext/utilities/page/messages/messages.py @@ -48,7 +48,8 @@ def get_list(arg=None): @webnotes.whitelist() def get_active_users(arg=None): return webnotes.conn.sql("""select name from tabProfile - where enabled=1 and + where ifnull(enabled,0)=1 and + docstatus < 2 and name not in ('Administrator', 'Guest') order by first_name""", as_dict=1)