Merge branch 'develop'

2015-05-29 14:17:15 +05:30 · 2015-05-29 14:17:15 +05:30 · 97d2a00d91
commit 97d2a00d91
parent 618fefea73 1749406514
15 changed files with 124 additions and 39 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -6,6 +6,10 @@ python:
 services:
  - mysql

+before_install:
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+
 install:
  - sudo apt-get purge -y mysql-common
  - wget https://raw.githubusercontent.com/frappe/bench/master/install_scripts/setup_frappe.sh
@ -22,7 +26,9 @@ script:
  - bench use test_site
  - bench reinstall
  - bench build-website
-  - bench --verbose run-tests
+  - bench serve &
+  - sleep 10
+  - bench --verbose run-tests --driver Firefox

 before_script:
  - mysql -e 'create database test_frappe'
--- a/erpnext/version.py
+++ b/erpnext/version.py
@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '5.0.11'
+__version__ = '5.0.12'
--- a/erpnext/accounts/print_format/cheque_printing_format/cheque_printing_format.json
+++ b/erpnext/accounts/print_format/cheque_printing_format/cheque_printing_format.json
@ -1,13 +1,13 @@
 {
 "creation": "2012-04-11 13:16:56", 
+ "custom_format": 1, 
 "doc_type": "Journal Entry", 
 "docstatus": 0, 
 "doctype": "Print Format", 
- "html": "<div style=\"position: relative\">\n\n\t{%- from \"templates/print_formats/standard_macros.html\" import add_header -%}\n<div class=\"page-break\">\n    {%- if not doc.get(\"print_heading\") and not doc.get(\"select_print_heading\") \n        and doc.set(\"select_print_heading\", _(\"Payment Advice\")) -%}{%- endif -%}\n    {{ add_header(0, 1, doc, letter_head, no_letterhead) }}\n\n{%- for label, value in (\n        (_(\"Voucher Date\"), frappe.utils.formatdate(doc.voucher_date)),\n        (_(\"Reference / Cheque No.\"), doc.cheque_no),\n        (_(\"Reference / Cheque Date\"), frappe.utils.formatdate(doc.cheque_date))\n    ) -%}\n    <div class=\"row\">\n        <div class=\"col-xs-4\"><label class=\"text-right\">{{ label }}</label></div>\n        <div class=\"col-xs-8\">{{ value }}</div>\n    </div>\n{%- endfor -%}\n\t<hr>\n\t<p>{{ _(\"This amount is in full / part settlement of the listed bills\") }}:</p>\n{%- for label, value in (\n         (_(\"Amount\"), \"<strong>\" + doc.get_formatted(\"total_amount\") + \"</strong><br>\" + (doc.total_amount_in_words or \"\") + \"<br>\"),\n        (_(\"References\"), doc.remark)\n    ) -%}\n    <div class=\"row\">\n        <div class=\"col-xs-4\"><label class=\"text-right\">{{ label }}</label></div>\n        <div class=\"col-xs-8\">{{ value }}</div>\n    </div>\n    {%- endfor -%}\n    <hr>\n\t<div style=\"position: absolute; top: 14cm; left: 0cm;\">\n\t\tPrepared By</div>\n\t<div style=\"position: absolute; top: 14cm; left: 5.5cm;\">\n\t\tAuthorised Signatory</div>\n\t<div style=\"position: absolute; top: 14cm; left: 11cm;\">\n\t\tReceived Payment as Above</div>\n\t<div style=\"position: absolute; top: 16.4cm; left: 5.9cm;\">\n\t\t<strong>_____________</strong></div>\n\t<div style=\"position: absolute; top: 16.7cm; left: 6cm;\">\n\t\t<strong>A/C Payee</strong></div>\n\t<div style=\"position: absolute; top: 16.7cm; left: 5.9cm;\">\n\t\t<strong>_____________</strong></div>\n\t<div style=\"position: absolute; top: 16.9cm; left: 12cm;\">\n\t\t{{ frappe.utils.formatdate(doc.cheque_date) }}</div>\n\t<div style=\"position: absolute; top: 17.9cm; left: 1cm;\">\n\t\t{{ doc.pay_to_recd_from }}</div>\n\t<div style=\"position: absolute; top: 18.6cm; left: 1cm; width: 7cm;\">\n\t\t{{ doc.total_amount_in_words }}</div>\n\t<div style=\"position: absolute; top: 19.7cm; left: 12cm;\">\n\t\t{{ doc.total_amount }}</div>\n</div>",
+ "html": "<div style=\"position: relative\">\n\n\t{%- from \"templates/print_formats/standard_macros.html\" import add_header -%}\n<div class=\"page-break\">\n    {%- if not doc.get(\"print_heading\") and not doc.get(\"select_print_heading\") \n        and doc.set(\"select_print_heading\", _(\"Payment Advice\")) -%}{%- endif -%}\n    {{ add_header(0, 1, doc, letter_head, no_letterhead) }}\n\n{%- for label, value in (\n        (_(\"Voucher Date\"), frappe.utils.formatdate(doc.voucher_date)),\n        (_(\"Reference / Cheque No.\"), doc.cheque_no),\n        (_(\"Reference / Cheque Date\"), frappe.utils.formatdate(doc.cheque_date))\n    ) -%}\n    <div class=\"row\">\n        <div class=\"col-xs-4\"><label class=\"text-right\">{{ label }}</label></div>\n        <div class=\"col-xs-8\">{{ value }}</div>\n    </div>\n{%- endfor -%}\n\t<hr>\n\t<p>{{ _(\"This amount is in full / part settlement of the listed bills\") }}:</p>\n{%- for label, value in (\n         (_(\"Amount\"), \"<strong>\" + doc.get_formatted(\"total_amount\") + \"</strong><br>\" + (doc.total_amount_in_words or \"\") + \"<br>\"),\n        (_(\"References\"), doc.remark)\n    ) -%}\n    <div class=\"row\">\n        <div class=\"col-xs-4\"><label class=\"text-right\">{{ label }}</label></div>\n        <div class=\"col-xs-8\">{{ value }}</div>\n    </div>\n    {%- endfor -%}\n    <hr>\n\t<div style=\"position: absolute; top: 14cm; left: 0cm;\">\n\t\tPrepared By</div>\n\t<div style=\"position: absolute; top: 14cm; left: 5.5cm;\">\n\t\tAuthorised Signatory</div>\n\t<div style=\"position: absolute; top: 14cm; left: 11cm;\">\n\t\tReceived Payment as Above</div>\n\t<div style=\"position: absolute; top: 16.4cm; left: 5.9cm;\">\n\t\t<strong>_____________</strong></div>\n\t<div style=\"position: absolute; top: 16.7cm; left: 6cm;\">\n\t\t<strong>A/C Payee</strong></div>\n\t<div style=\"position: absolute; top: 16.7cm; left: 5.9cm;\">\n\t\t<strong>_____________</strong></div>\n\t<div style=\"position: absolute; top: 16.9cm; left: 12cm;\">\n\t\t{{ frappe.utils.formatdate(doc.cheque_date) }}</div>\n\t<div style=\"position: absolute; top: 17.9cm; left: 1cm;\">\n\t\t{{ doc.pay_to_recd_from }}</div>\n\t<div style=\"position: absolute; top: 18.6cm; left: 1cm; width: 7cm;\">\n\t\t{{ doc.total_amount_in_words }}</div>\n\t<div style=\"position: absolute; top: 19.7cm; left: 12cm;\">\n\t\t{{ doc.get_formatted(\"total_amount\") }}</div>\n</div>", 
 "idx": 1, 
- "modified": "2015-01-12 11:03:17.032512",
+ "modified": "2015-05-29 01:57:51.203850", 
 "modified_by": "Administrator", 
- "module": "Accounts",
 "name": "Cheque Printing Format", 
 "owner": "Administrator", 
 "print_format_type": "Server", 
--- a/erpnext/buying/doctype/purchase_order/purchase_order_list.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order_list.js
@ -12,7 +12,6 @@ frappe.listview_settings['Purchase Order'] = {
 			return [__("Completed"), "green", "per_received,=,100|per_billed,=,100|status,!=,Stopped"];
 		}
 	},
-	order_by: "per_received asc, modified desc",
 	onload: function(listview) {
 		var method = "erpnext.buying.doctype.purchase_order.purchase_order.stop_or_unstop_purchase_orders";

--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@ -5,7 +5,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd. and Contributors"
 app_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations"
 app_icon = "icon-th"
 app_color = "#e74c3c"
-app_version = "5.0.11"
+app_version = "5.0.12"

 error_report_email = "support@erpnext.com"

--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@ -160,3 +160,4 @@ erpnext.patches.v5_0.update_operation_description
 erpnext.patches.v5_0.set_footer_address
 execute:frappe.db.set_value("Backup Manager", None, "send_backups_to_dropbox", 1 if frappe.db.get_value("Backup Manager", None, "upload_backups_to_dropbox") in ("Daily", "Weekly") else 0)
 execute:frappe.db.sql_list("delete from `tabDocPerm` where parent='Issue' and modified_by='Administrator' and role='Guest'")
+erpnext.patches.v5_0.update_item_and_description_again
--- a/erpnext/patches/v5_0/update_item_and_description_again.py
+++ b/erpnext/patches/v5_0/update_item_and_description_again.py
@ -0,0 +1,49 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+import frappe
+from frappe.utils import cstr
+import re
+
+def execute():
+	item_details = frappe._dict()
+	for d in frappe.db.sql("select name, description from `tabItem`", as_dict=1):
+		description = cstr(d.description).strip()
+		new_desc = extract_description(description)
+
+		item_details.setdefault(d.name, frappe._dict({
+			"old_description": description,
+			"new_description": new_desc
+		}))
+
+
+	dt_list= ["Purchase Order Item","Supplier Quotation Item", "BOM", "BOM Explosion Item" , \
+	"BOM Item", "Opportunity Item" , "Quotation Item" , "Sales Order Item" , "Delivery Note Item" , \
+	"Material Request Item" , "Purchase Receipt Item" , "Stock Entry Detail"]
+	for dt in dt_list:
+		frappe.reload_doctype(dt)
+		records = frappe.db.sql("""select name, `{0}` as item_code, description from `tab{1}`
+			where description is not null and description like '%%<table%%'"""
+			.format("item" if dt=="BOM" else "item_code", dt), as_dict=1)
+
+		count = 1
+		for d in records:
+			if d.item_code and item_details.get(d.item_code) \
+					and cstr(d.description) == item_details.get(d.item_code).old_description:
+				desc = item_details.get(d.item_code).new_description
+			else:
+				desc = extract_description(cstr(d.description))
+
+			frappe.db.sql("""update `tab{0}` set description = %s
+				where name = %s """.format(dt), (desc, d.name))
+
+			count += 1
+			if count % 500 == 0:
+				frappe.db.commit()
+
+
+def extract_description(desc):
+	for tag in ("img", "table", "tr", "td"):
+		desc =  re.sub("\</*{0}[^>]*\>".format(tag), "", desc)
+
+	return desc
--- a/erpnext/selling/doctype/sales_order/sales_order_list.js
+++ b/erpnext/selling/doctype/sales_order/sales_order_list.js
@ -14,7 +14,6 @@ frappe.listview_settings['Sales Order'] = {
 			return [__("Completed"), "green", "per_delivered,=,100|per_billed,=,100|status,!=,Stopped"];
 		}
 	},
-	order_by: "per_delivered asc, modified desc",
 	onload: function(listview) {
 		var method = "erpnext.selling.doctype.sales_order.sales_order.stop_or_unstop_sales_orders";

--- a/erpnext/stock/doctype/serial_no/serial_no.json
+++ b/erpnext/stock/doctype/serial_no/serial_no.json
@ -151,19 +151,20 @@
  }, 
  {
   "fieldname": "purchase_document_type", 
-   "fieldtype": "Select", 
+   "fieldtype": "Link", 
   "label": "Creation Document Type", 
   "no_copy": 1, 
-   "options": "\nPurchase Receipt\nStock Entry\nSerial No", 
+   "options": "DocType", 
   "permlevel": 0, 
   "read_only": 1
  }, 
  {
   "fieldname": "purchase_document_no", 
-   "fieldtype": "Data", 
+   "fieldtype": "Dynamic Link", 
   "hidden": 0, 
   "label": "Creation Document No", 
   "no_copy": 1, 
+   "options": "purchase_document_type", 
   "permlevel": 0, 
   "read_only": 1
  }, 
@ -417,7 +418,7 @@
 "icon": "icon-barcode", 
 "idx": 1, 
 "in_create": 0, 
- "modified": "2015-02-20 05:08:12.961403", 
+ "modified": "2015-05-28 21:35:58.378231", 
 "modified_by": "Administrator", 
 "module": "Stock", 
 "name": "Serial No", 
--- a/erpnext/stock/doctype/serial_no/serial_no.py
+++ b/erpnext/stock/doctype/serial_no/serial_no.py
@ -34,6 +34,9 @@ class SerialNo(StockController):
 		self.validate_item()
 		self.on_stock_ledger_entry()

+		valid_purchase_document_type = ("Purchase Receipt", "Stock Entry", "Serial No")
+		self.validate_value("purchase_document_type", "in", valid_purchase_document_type)
+
 	def set_maintenance_status(self):
 		if not self.warranty_expiry_date and not self.amc_expiry_date:
 			self.maintenance_status = None
--- a/erpnext/templates/print_formats/includes/item_table_description.html
+++ b/erpnext/templates/print_formats/includes/item_table_description.html
@ -1,5 +1,5 @@
 {% if doc.in_format_data("image") and doc.get("image") and not doc.is_print_hide("image")-%}
-<div class="pull-left" style="max-width: 20%; margin-right: 10px;">
+<div class="pull-left" style="max-width: 38.2%; margin-right: 10px;">
    <img src="{{ doc.image }}" style="max-width: 100%">
 </div>
 {%- endif %}
--- a/erpnext/tests/test_client.py
+++ b/erpnext/tests/test_client.py
@ -0,0 +1,25 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
+
+import unittest, frappe
+from frappe.utils import sel
+from frappe.utils import formatdate
+
+selenium_tests = True
+
+class TestLogin(unittest.TestCase):
+	def setUp(self):
+		sel.login()
+
+	def test_material_request(self):
+		sel.new_doc("Stock", "Material Request")
+		sel.set_field("company", "_Test Company")
+		sel.add_child("items")
+		sel.set_field("item_code", "_Test Item")
+		sel.set_field("qty", "1")
+		sel.set_field("warehouse", "_Test Warehouse - _TC")
+		sel.set_field("schedule_date", formatdate())
+		sel.done_add_child("items")
+		sel.primary_action()
+		sel.wait_for_state("clean")
--- a/setup.py
+++ b/setup.py
@ -1,6 +1,6 @@
 from setuptools import setup, find_packages

-version = "5.0.11"
+version = "5.0.12"

 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()
--- a/test_sites/test_site/site_config.json
+++ b/test_sites/test_site/site_config.json
@ -1,10 +1,12 @@
 {
 "db_name": "test_frappe",
 "db_password": "test_frappe",
+ "auto_email_id": "test@example.com",
+ "mail_server": "smtp.example.com",
+ "mail_login": "test@example.com",
+ "mail_password": "test",
 "admin_password": "admin",
- "auto_email_id": "admin@example.com",
- "host_name": "http://localhost:8888",
- "auto_email_id": "admin@example.com",
- "mute_emails": 1,
+ "run_selenium_tests": 1,
+ "host_name": "http://localhost:8000",
 "install_apps": ["erpnext"]
 }