From 59544ff542facf382325bb10fbd3f8d1b1f7bc4a Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 19 Jul 2013 16:25:32 +0530 Subject: [PATCH 1/6] [minor] [patch] [fix] commit after each repost in p07_repost_billed_amt_in_sales_cycle.py --- patches/july_2013/p07_repost_billed_amt_in_sales_cycle.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/patches/july_2013/p07_repost_billed_amt_in_sales_cycle.py b/patches/july_2013/p07_repost_billed_amt_in_sales_cycle.py index 94acf71f81..e18bed0c8e 100644 --- a/patches/july_2013/p07_repost_billed_amt_in_sales_cycle.py +++ b/patches/july_2013/p07_repost_billed_amt_in_sales_cycle.py @@ -20,4 +20,5 @@ def execute(): import webnotes for si in webnotes.conn.sql("""select name from `tabSales Invoice` where docstatus = 1"""): webnotes.get_obj("Sales Invoice", si[0], - with_children=1).update_qty(change_modified=False) \ No newline at end of file + with_children=1).update_qty(change_modified=False) + webnotes.conn.commit() \ No newline at end of file From 95391b176a1e7b73a48722407a39f7200c190a7a Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 19 Jul 2013 16:48:00 +0530 Subject: [PATCH 2/6] [minor] [fix] [issue] #618 --- selling/doctype/opportunity/opportunity.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/selling/doctype/opportunity/opportunity.js b/selling/doctype/opportunity/opportunity.js index 00acf55153..7c647c3f76 100644 --- a/selling/doctype/opportunity/opportunity.js +++ b/selling/doctype/opportunity/opportunity.js @@ -67,10 +67,10 @@ erpnext.selling.Opportunity = wn.ui.form.Controller.extend({ } this.frm.set_query("item_code", "enquiry_details", function() { - var key = (me.frm.doc.enquiry_type === "Maintenance" ? "is_service_item" : "is_sales_item"); return { query: "controllers.queries.item_query", - filters: { key: "Yes" } + filters: me.frm.doc.enquiry_type === "Maintenance" ? + {"is_service_item": "Yes"} : {"is_sales_item": "Yes"} }; }); From 28d59a046a4a725d24033ab97576d30903b5f3ae Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 19 Jul 2013 17:50:25 +0530 Subject: [PATCH 3/6] [minor] [fix] [navbar] replace overflow with ellipsis --- public/js/conf.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/public/js/conf.js b/public/js/conf.js index 22e80c98d8..330a2beaaf 100644 --- a/public/js/conf.js +++ b/public/js/conf.js @@ -15,9 +15,16 @@ wn.modules_path = 'erpnext'; // add toolbar icon $(document).bind('toolbar_setup', function() { - $('.navbar-brand').html('
\ + var brand = ($("
").append(wn.boot.website_settings.brand_html).text() || 'erpnext'); + $('.navbar-brand').html('
\ \ -
' + ($("
").append(wn.boot.website_settings.brand_html).text() || 'erpnext')) +
' + brand) + .attr("title", brand) .addClass("navbar-icon-home") - .css('max-width', '200px').css('overflow', 'hidden'); + .css({ + "max-width": "200px", + "overflow": "hidden", + "text-overflow": "ellipsis", + "white-space": "nowrap" + }); }); From 75b2d418c1600817d9a79da19c5902c125f29380 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 19 Jul 2013 22:05:17 +0530 Subject: [PATCH 4/6] [minor] [fix] conversion rate shoulld be copied when mapping --- buying/doctype/purchase_order/purchase_order.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buying/doctype/purchase_order/purchase_order.txt b/buying/doctype/purchase_order/purchase_order.txt index 1699c56cb1..bb310aacd1 100644 --- a/buying/doctype/purchase_order/purchase_order.txt +++ b/buying/doctype/purchase_order/purchase_order.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-21 16:16:39", "docstatus": 0, - "modified": "2013-07-09 12:50:00", + "modified": "2013-07-19 22:04:17", "modified_by": "Administrator", "owner": "Administrator" }, @@ -198,7 +198,7 @@ "fieldtype": "Float", "hidden": 0, "label": "Exchange Rate", - "no_copy": 1, + "no_copy": 0, "oldfieldname": "conversion_rate", "oldfieldtype": "Currency", "print_hide": 1, From e63d2552b7d2f16ff9f6f7dd9e9ab08a7a06e9c7 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 19 Jul 2013 22:14:33 +0530 Subject: [PATCH 5/6] [minor] [fix] [communication] sender should be formatted using formataddr so that the combination of fullname and email address is RFC 2822 compliant --- website/helpers/contact.py | 1 - 1 file changed, 1 deletion(-) diff --git a/website/helpers/contact.py b/website/helpers/contact.py index bf1521ee11..0042c03d33 100644 --- a/website/helpers/contact.py +++ b/website/helpers/contact.py @@ -17,7 +17,6 @@ from __future__ import unicode_literals import webnotes -from core.doctype.communication.communication import make from webnotes.utils import now max_communications_per_hour = 300 From 01c837cd2d9d17483746440f6cd406f89a55191e Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 19 Jul 2013 22:18:27 +0530 Subject: [PATCH 6/6] [minor] [buying] show price list link in buying home --- buying/page/buying_home/buying_home.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/buying/page/buying_home/buying_home.js b/buying/page/buying_home/buying_home.js index 1972ad9589..d24f2301d8 100644 --- a/buying/page/buying_home/buying_home.js +++ b/buying/page/buying_home/buying_home.js @@ -65,6 +65,11 @@ wn.module_page["Buying"] = [ "doctype":"Purchase Taxes and Charges Master", "description": wn._("Tax Template for Purchase") }, + { + label: wn._("Price List"), + description: wn._("Mupltiple Item prices."), + doctype:"Price List" + }, { "doctype":"Supplier Type", "label": wn._("Supplier Type"),