Merge pull request #1898 from rmehta/pdf-etc

sales order status bugfix, add leading / in website_image and removed se...

erpnext/patches/v4_0/split_email_settings.py

@@ -18,8 +18,7 @@ def map_outgoing_email_settings(email_settings):
 	outgoing_email_settings = frappe.get_doc("Outgoing Email Settings")
 	for fieldname in (("outgoing_mail_server", "mail_server"),
 		"use_ssl", "mail_port", "mail_login", "mail_password",
-		"always_use_login_id_as_sender",
-		"auto_email_id", "send_print_in_body_and_attachment"):
+		"always_use_login_id_as_sender", "auto_email_id"):
 
 		if isinstance(fieldname, tuple):
 			from_fieldname, to_fieldname = fieldname

erpnext/selling/doctype/sales_order/sales_order.json

@@ -762,7 +762,7 @@
    "hidden": 1, 
    "label": "Delivery Status", 
    "no_copy": 1, 
-   "options": "Delivered\nNot Delivered\nPartly Delivered\nClosed\nNot Applicable",
+   "options": "Fully Delivered\nNot Delivered\nPartly Delivered\nClosed\nNot Applicable", 
    "permlevel": 0, 
    "print_hide": 1
   }, 
@@ -809,7 +809,7 @@
    "hidden": 1, 
    "label": "Billing Status", 
    "no_copy": 1, 
-   "options": "Billed\nNot Billed\nPartly Billed\nClosed",
+   "options": "Fully Billed\nNot Billed\nPartly Billed\nClosed", 
    "permlevel": 0, 
    "print_hide": 1
   }, 
@@ -883,7 +883,7 @@
  "idx": 1, 
  "is_submittable": 1, 
  "issingle": 0, 
- "modified": "2014-06-27 07:55:52.555192",
+ "modified": "2014-07-04 17:16:36.889948", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Sales Order", 

erpnext/setup/doctype/item_group/item_group.py

@@ -79,6 +79,10 @@ def get_child_groups(item_group_name):
 			and show_in_website = 1""", {"lft": item_group.lft, "rgt": item_group.rgt})
 
 def get_item_for_list_in_html(context):
+	# add missing absolute link in files
+	# user may forget it during upload
+	if context.get("website_image", "").startswith("files/"):
+		context["website_image"] = "/" + context["website_image"]
 	return frappe.get_template("templates/includes/product_in_grid.html").render(context)
 
 def get_group_item_count(item_group):

erpnext/setup/page/setup_wizard/setup_wizard.py

@@ -216,10 +216,6 @@ def set_defaults(args):
 	hr_settings.emp_created_by = "Naming Series"
 	hr_settings.save()
 
-	email_settings = frappe.get_doc("Outgoing Email Settings")
-	email_settings.send_print_in_body_and_attachment = 1
-	email_settings.save()
-
 def create_feed_and_todo():
 	"""update activty feed and create todo for creation of item, customer, vendor"""
 	from erpnext.home import make_feed