From 6a92612e4593952a9fd3e8eec478e29dc54c4dd2 Mon Sep 17 00:00:00 2001 From: tundebabzy Date: Fri, 19 May 2017 06:05:14 +0100 Subject: [PATCH 01/16] changes mysql-python to mysqlclient for py3 support (#3301) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ddd3aaba0e..ec94a769f4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ httplib2 jinja2 markdown2 markupsafe -mysql-python==1.2.5 +mysqlclient==1.3.8 python-geoip python-geoip-geolite2 python-dateutil From bec6b5c8275412300b8959030e9f60f6c683c2f9 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Fri, 19 May 2017 10:37:43 +0530 Subject: [PATCH 02/16] Update Custom Field background color in Customize Form (frappe/erpnext#6432) (#3334) --- frappe/custom/doctype/customize_form/customize_form.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/custom/doctype/customize_form/customize_form.js b/frappe/custom/doctype/customize_form/customize_form.js index d9b1496877..8308d5a85a 100644 --- a/frappe/custom/doctype/customize_form/customize_form.js +++ b/frappe/custom/doctype/customize_form/customize_form.js @@ -149,6 +149,7 @@ frappe.customize_form.set_primary_action = function(frm) { callback: function(r) { if(!r.exc) { frappe.customize_form.clear_locals_and_refresh(frm); + frm.script_manager.trigger("doc_type"); } } }); From 70e8e007f115334f0b5ebf8b5b7e7396adf9971c Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Fri, 19 May 2017 10:40:14 +0530 Subject: [PATCH 03/16] [Printview] Show Landscape view if columns more than 10 (#3336) - frappe/erpnext#6596 --- frappe/public/html/print_template.html | 6 +++++- frappe/public/js/lib/microtemplate.js | 10 ++++++++++ frappe/templates/styles/standard.css | 5 +++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/frappe/public/html/print_template.html b/frappe/public/html/print_template.html index 0cf8a343a3..78df4aca94 100644 --- a/frappe/public/html/print_template.html +++ b/frappe/public/html/print_template.html @@ -29,7 +29,11 @@ {% endif %} -