[minor] [fix] fixed conflict
diff --git a/buying/doctype/purchase_order/purchase_order.txt b/buying/doctype/purchase_order/purchase_order.txt
index 4c58100..bb310aa 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-19 16:14:49",
+ "modified": "2013-07-19 22:04:17",
"modified_by": "Administrator",
"owner": "Administrator"
},
diff --git a/buying/page/buying_home/buying_home.js b/buying/page/buying_home/buying_home.js
index 1972ad9..d24f230 100644
--- a/buying/page/buying_home/buying_home.js
+++ b/buying/page/buying_home/buying_home.js
@@ -66,6 +66,11 @@
"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"),
"description": wn._("Supplier classification.")
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 94acf71..e18bed0 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 @@
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
diff --git a/public/js/conf.js b/public/js/conf.js
index 22e80c9..330a2be 100644
--- a/public/js/conf.js
+++ b/public/js/conf.js
@@ -15,9 +15,16 @@
// add toolbar icon
$(document).bind('toolbar_setup', function() {
- $('.navbar-brand').html('<div style="display: inline-block; cursor: pointer;">\
+ var brand = ($("<div></div>").append(wn.boot.website_settings.brand_html).text() || 'erpnext');
+ $('.navbar-brand').html('<div style="display: inline-block;">\
<object type="image/svg+xml" data="app/images/splash.svg" class="toolbar-splash"></object>\
- </div>' + ($("<div></div>").append(wn.boot.website_settings.brand_html).text() || 'erpnext'))
+ </div>' + 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"
+ });
});
diff --git a/selling/doctype/opportunity/opportunity.js b/selling/doctype/opportunity/opportunity.js
index 00acf55..7c647c3 100644
--- a/selling/doctype/opportunity/opportunity.js
+++ b/selling/doctype/opportunity/opportunity.js
@@ -67,10 +67,10 @@
}
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"}
};
});
diff --git a/website/helpers/contact.py b/website/helpers/contact.py
index bf1521e..0042c03 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