[minor] [fix] fixed conflict

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"
  }, 

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"),

patches/july_2013/p07_repost_billed_amt_in_sales_cycle.py

@@ -21,3 +21,4 @@ def execute():
 	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)
+		webnotes.conn.commit()

public/js/conf.js

@@ -15,9 +15,16 @@ wn.modules_path = 'erpnext';
 
 // 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"
+	});
 });

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"}
 			};
 		});
 		

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