From cd5712d3906ff2fe96c5e531e7b72c8cbefaa050 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 2 Mar 2012 15:10:20 +0530 Subject: [PATCH 1/6] fix in get_base_url method of dom.js --- js/all-app.js | 2 +- js/all-web.js | 2 +- version.num | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/all-app.js b/js/all-app.js index 424cc14c22..b8c4f7359e 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -433,7 +433,7 @@ wn.urllib={get_arg:function(name){name=name.replace(/[\[]/,"\\\[").replace(/[\]] return"";else return decodeURIComponent(results[1]);},get_dict:function(){var d={} var t=window.location.href.split('?')[1];if(!t)return d;if(t.indexOf('#')!=-1)t=t.split('#')[0];if(!t)return d;t=t.split('&');for(var i=0;i Date: Fri, 2 Mar 2012 15:10:51 +0530 Subject: [PATCH 2/6] print hide issue --- .../sales_order_detail/sales_order_detail.txt | 43 ++----------------- 1 file changed, 4 insertions(+), 39 deletions(-) diff --git a/erpnext/selling/doctype/sales_order_detail/sales_order_detail.txt b/erpnext/selling/doctype/sales_order_detail/sales_order_detail.txt index 25521c4e53..9ad98902bd 100644 --- a/erpnext/selling/doctype/sales_order_detail/sales_order_detail.txt +++ b/erpnext/selling/doctype/sales_order_detail/sales_order_detail.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:09:22', 'docstatus': 0, - 'modified': '2012-02-24 10:38:06', + 'modified': '2012-03-02 15:10:24', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -22,7 +22,7 @@ 'section_style': u'Tray', 'server_code_error': u' ', 'show_in_menu': 0, - 'version': 49 + 'version': 50 }, # These values are common for all DocField @@ -125,7 +125,7 @@ 'oldfieldname': u'ref_rate', 'oldfieldtype': u'Currency', 'permlevel': 0, - 'print_hide': 1, + 'print_hide': 0, 'reqd': 0, 'trigger': u'Client', 'width': u'70px' @@ -141,7 +141,7 @@ 'oldfieldname': u'adj_rate', 'oldfieldtype': u'Float', 'permlevel': 0, - 'print_hide': 1, + 'print_hide': 0, 'trigger': u'Client', 'width': u'70px' }, @@ -398,41 +398,6 @@ 'report_hide': 1 }, - # DocField - { - 'colour': u'White:FFF', - 'description': u'required for production. will be used later.', - 'doctype': u'DocField', - 'fieldname': u'delivery_date', - 'fieldtype': u'Date', - 'hidden': 1, - 'label': u'Expected Delivery Date', - 'oldfieldname': u'delivery_date', - 'oldfieldtype': u'Date', - 'permlevel': 1, - 'print_hide': 1, - 'report_hide': 1 - }, - - # DocField - { - 'allow_on_submit': 1, - 'colour': u'White:FFF', - 'description': u'required for production. will be used later.', - 'doctype': u'DocField', - 'fieldname': u'confirmation_date', - 'fieldtype': u'Date', - 'hidden': 0, - 'in_filter': 1, - 'label': u'Confirmed Delivery Date', - 'oldfieldname': u'confirmation_date', - 'oldfieldtype': u'Date', - 'permlevel': 0, - 'print_hide': 1, - 'report_hide': 1, - 'search_index': 0 - }, - # DocField { 'colour': u'White:FFF', From 7e6b62eafdc40f3d9b07468e77bf443428d2d548 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 2 Mar 2012 15:12:52 +0530 Subject: [PATCH 3/6] print hide issue --- .../doctype/sales_order_detail/sales_order_detail.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/erpnext/selling/doctype/sales_order_detail/sales_order_detail.txt b/erpnext/selling/doctype/sales_order_detail/sales_order_detail.txt index 9ad98902bd..95b998d98e 100644 --- a/erpnext/selling/doctype/sales_order_detail/sales_order_detail.txt +++ b/erpnext/selling/doctype/sales_order_detail/sales_order_detail.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:09:22', 'docstatus': 0, - 'modified': '2012-03-02 15:10:24', + 'modified': '2012-03-02 15:12:45', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -22,7 +22,7 @@ 'section_style': u'Tray', 'server_code_error': u' ', 'show_in_menu': 0, - 'version': 50 + 'version': 51 }, # These values are common for all DocField @@ -125,7 +125,7 @@ 'oldfieldname': u'ref_rate', 'oldfieldtype': u'Currency', 'permlevel': 0, - 'print_hide': 0, + 'print_hide': 1, 'reqd': 0, 'trigger': u'Client', 'width': u'70px' @@ -141,7 +141,7 @@ 'oldfieldname': u'adj_rate', 'oldfieldtype': u'Float', 'permlevel': 0, - 'print_hide': 0, + 'print_hide': 1, 'trigger': u'Client', 'width': u'70px' }, From 5cc8cd7dc1995d29a8efe1c8dafb73795f2dde48 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 2 Mar 2012 15:42:08 +0530 Subject: [PATCH 4/6] do not record logins by demo@webnotestech.com --- erpnext/startup/event_handlers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/startup/event_handlers.py b/erpnext/startup/event_handlers.py index dca9e0c6f6..7db56bdb53 100644 --- a/erpnext/startup/event_handlers.py +++ b/erpnext/startup/event_handlers.py @@ -48,7 +48,7 @@ def on_login_post_session(login_manager): sid!=%s""", \ (webnotes.session['user'], webnotes.session['sid']), as_list=1) - if webnotes.session['user'] not in ('Guest') and webnotes.conn.cur_db_name!='accounts': + if webnotes.session['user'] not in ('Guest', 'demo@webnotestech.com') and webnotes.conn.cur_db_name!='accounts': # create feed from webnotes.utils import nowtime home.make_feed('Login', 'Profile', login_manager.user, login_manager.user, From 40c514612ba08c8bee80a3a78fd672c295f406e6 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 2 Mar 2012 16:06:33 +0530 Subject: [PATCH 5/6] price list rate hiding issue --- .../sales_order_detail/sales_order_detail.txt | 106 +++++++++--------- erpnext/startup/js/feature_setup.js | 2 +- js/all-app.js | 2 +- version.num | 2 +- 4 files changed, 56 insertions(+), 56 deletions(-) diff --git a/erpnext/selling/doctype/sales_order_detail/sales_order_detail.txt b/erpnext/selling/doctype/sales_order_detail/sales_order_detail.txt index 95b998d98e..3205d6e4a2 100644 --- a/erpnext/selling/doctype/sales_order_detail/sales_order_detail.txt +++ b/erpnext/selling/doctype/sales_order_detail/sales_order_detail.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:09:22', 'docstatus': 0, - 'modified': '2012-03-02 15:12:45', + 'modified': '2012-03-02 15:49:26', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -22,7 +22,7 @@ 'section_style': u'Tray', 'server_code_error': u' ', 'show_in_menu': 0, - 'version': 51 + 'version': 53 }, # These values are common for all DocField @@ -117,18 +117,15 @@ # DocField { - 'default': u'0.00', 'doctype': u'DocField', - 'fieldname': u'ref_rate', + 'fieldname': u'base_ref_rate', 'fieldtype': u'Currency', - 'label': u'Price List Rate', - 'oldfieldname': u'ref_rate', + 'label': u'Price List Rate*', + 'oldfieldname': u'base_ref_rate', 'oldfieldtype': u'Currency', - 'permlevel': 0, + 'permlevel': 1, 'print_hide': 1, - 'reqd': 0, - 'trigger': u'Client', - 'width': u'70px' + 'width': u'100px' }, # DocField @@ -146,49 +143,6 @@ 'width': u'70px' }, - # DocField - { - 'default': u'0.00', - 'doctype': u'DocField', - 'fieldname': u'export_rate', - 'fieldtype': u'Currency', - 'label': u'Rate', - 'oldfieldname': u'export_rate', - 'oldfieldtype': u'Currency', - 'permlevel': 0, - 'reqd': 0, - 'trigger': u'Client', - 'width': u'100px' - }, - - # DocField - { - 'default': u'0.00', - 'doctype': u'DocField', - 'fieldname': u'export_amount', - 'fieldtype': u'Currency', - 'label': u'Amount', - 'no_copy': 0, - 'oldfieldname': u'export_amount', - 'oldfieldtype': u'Currency', - 'permlevel': 1, - 'reqd': 0, - 'width': u'100px' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'base_ref_rate', - 'fieldtype': u'Currency', - 'label': u'Price List Rate*', - 'oldfieldname': u'base_ref_rate', - 'oldfieldtype': u'Currency', - 'permlevel': 1, - 'print_hide': 1, - 'width': u'100px' - }, - # DocField { 'default': u'0.00', @@ -221,6 +175,52 @@ 'width': u'100px' }, + # DocField + { + 'default': u'0.00', + 'doctype': u'DocField', + 'fieldname': u'ref_rate', + 'fieldtype': u'Currency', + 'label': u'Price List Rate', + 'oldfieldname': u'ref_rate', + 'oldfieldtype': u'Currency', + 'permlevel': 0, + 'print_hide': 1, + 'reqd': 0, + 'trigger': u'Client', + 'width': u'70px' + }, + + # DocField + { + 'default': u'0.00', + 'doctype': u'DocField', + 'fieldname': u'export_rate', + 'fieldtype': u'Currency', + 'label': u'Rate', + 'oldfieldname': u'export_rate', + 'oldfieldtype': u'Currency', + 'permlevel': 0, + 'reqd': 0, + 'trigger': u'Client', + 'width': u'100px' + }, + + # DocField + { + 'default': u'0.00', + 'doctype': u'DocField', + 'fieldname': u'export_amount', + 'fieldtype': u'Currency', + 'label': u'Amount', + 'no_copy': 0, + 'oldfieldname': u'export_amount', + 'oldfieldtype': u'Currency', + 'permlevel': 1, + 'reqd': 0, + 'width': u'100px' + }, + # DocField { 'doctype': u'DocField', diff --git a/erpnext/startup/js/feature_setup.js b/erpnext/startup/js/feature_setup.js index 70674ee070..c5518ab751 100644 --- a/erpnext/startup/js/feature_setup.js +++ b/erpnext/startup/js/feature_setup.js @@ -128,7 +128,7 @@ pscript.feature_dict = { 'Receivable Voucher': {'fields':['conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'entries':['ref_rate','export_amount','export_rate']}, 'Item': {'ref_rate_details':['ref_currency']}, 'Sales BOM': {'fields':['currency']}, - 'Sales Order': {'fields':['Note1','OT Notes','conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'sales_order_details':['base_ref_rate','export_amount','export_rate']} + 'Sales Order': {'fields':['Note1','OT Notes','conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'sales_order_details':['ref_rate','export_amount','export_rate']} }, 'fs_imports': { 'Payable Voucher': {'fields':['conversion_rate','currency','grand_total_import','in_words_import','net_total_import','other_charges_added_import','other_charges_deducted_import'],'entries':['import_amount','import_rate']}, diff --git a/js/all-app.js b/js/all-app.js index 424cc14c22..c9c6087b93 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -2279,7 +2279,7 @@ if(user_roles.indexOf("System Manager")!=-1){$('.navbar .modules').append('
  • Date: Fri, 2 Mar 2012 16:25:22 +0530 Subject: [PATCH 6/6] activity date fix --- erpnext/home/page/activity/activity.js | 9 +++++---- js/all-app.js | 2 +- js/all-web.js | 2 +- version.num | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/erpnext/home/page/activity/activity.js b/erpnext/home/page/activity/activity.js index 9a323d3ec1..62604b79a8 100644 --- a/erpnext/home/page/activity/activity.js +++ b/erpnext/home/page/activity/activity.js @@ -48,12 +48,13 @@ erpnext.ActivityFeed = Class.extend({ var date = dateutil.str_to_obj(data.modified); var last = erpnext.last_feed_date; - if((last && dateutil.get_diff(last, date)>1) || (!last)) { - var pdate = dateutil.comment_when(date); - var diff = dateutil.get_diff(new Date(), date); + if((last && dateutil.obj_to_str(last) != dateutil.obj_to_str(date)) || (!last)) { + var diff = dateutil.get_day_diff(new Date(), date); if(diff < 1) { pdate = 'Today'; - } else if(diff > 6) { + } else if(diff < 2) { + pdate = 'Yesterday'; + } else { pdate = dateutil.global_date_format(date); } $(row).html(repl('
    %(date)s
    ', {date: pdate})); diff --git a/js/all-app.js b/js/all-app.js index b8c4f7359e..95ceaf1b4b 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -313,7 +313,7 @@ function same_day(d1,d2){if(d1.getFullYear()==d2.getFullYear()&&d1.getMonth()==d var month_list=['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'];var month_last={1:31,2:28,3:31,4:30,5:31,6:30,7:31,8:31,9:30,10:31,11:30,12:31} var month_list_full=['January','February','March','April','May','June','July','August','September','October','November','December'];var week_list=['Sun','Mon','Tue','Wed','Thu','Fri','Sat'];var week_list_full=['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday'];function int_to_str(i,len){i=''+i;if(i.length