From 2861955632cb371cf83899ea51dd3bd6318628eb Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Tue, 4 Apr 2017 09:59:29 +0530 Subject: [PATCH 01/11] [fix] Customer edit issue in offline POS --- erpnext/accounts/doctype/sales_invoice/pos.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/pos.py b/erpnext/accounts/doctype/sales_invoice/pos.py index 59766bd7b2..c659212d20 100644 --- a/erpnext/accounts/doctype/sales_invoice/pos.py +++ b/erpnext/accounts/doctype/sales_invoice/pos.py @@ -182,6 +182,7 @@ def get_customers_address(customers): address_data = address[0] address_data.update({'full_name': data.customer_name}) customer_address[data.name] = address_data + return customer_address def get_child_nodes(group_type, root): @@ -337,11 +338,14 @@ def add_customer(name): def make_address(args, customer): if not args.get('address_line1'): return - name = args.get('name') or get_customers_address(customer)[customer].get("name") + name = args.get('name') + + if not name: + data = get_customers_address(customer) + name = data[customer].get('name') if data else None if name: - address = frappe.get_doc('Address', name) - frappe.errprint(address) + address = frappe.get_doc('Address', name) else: address = frappe.new_doc('Address') address.country = frappe.db.get_value('Company', args.get('company'), 'country') From ba6559c2e950b94fedd6bf2b7e682a2aea0b14d1 Mon Sep 17 00:00:00 2001 From: Manas Solanki Date: Wed, 5 Apr 2017 11:52:23 +0530 Subject: [PATCH 02/11] Route to newsletter listview --- erpnext/schools/doctype/student_batch/student_batch.js | 3 --- erpnext/schools/doctype/student_group/student_group.js | 3 --- 2 files changed, 6 deletions(-) diff --git a/erpnext/schools/doctype/student_batch/student_batch.js b/erpnext/schools/doctype/student_batch/student_batch.js index 7fad5d7894..00b261e3a1 100644 --- a/erpnext/schools/doctype/student_batch/student_batch.js +++ b/erpnext/schools/doctype/student_batch/student_batch.js @@ -14,9 +14,6 @@ frappe.ui.form.on('Student Batch', { }); }); frm.add_custom_button(__("Newsletter"), function() { - frappe.route_options = { - email_group: frm.doc.name - } frappe.set_route("List", "Newsletter"); }); } diff --git a/erpnext/schools/doctype/student_group/student_group.js b/erpnext/schools/doctype/student_group/student_group.js index 1dcbc3acfb..595fa08d9d 100644 --- a/erpnext/schools/doctype/student_group/student_group.js +++ b/erpnext/schools/doctype/student_group/student_group.js @@ -26,9 +26,6 @@ frappe.ui.form.on("Student Group", { }); }); frm.add_custom_button(__("Newsletter"), function() { - frappe.route_options = { - email_group: frm.doc.name - } frappe.set_route("List", "Newsletter"); }); } From ffc807cd57c729b8709ef99b286b7a6f9f1923b9 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 5 Apr 2017 12:27:34 +0530 Subject: [PATCH 03/11] [minor] check below posting date in delivery note --- .../crm/doctype/opportunity/opportunity.json | 4 +- .../doctype/delivery_note/delivery_note.json | 62 +++++++++---------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/erpnext/crm/doctype/opportunity/opportunity.json b/erpnext/crm/doctype/opportunity/opportunity.json index 90be78190e..3f7a814a53 100644 --- a/erpnext/crm/doctype/opportunity/opportunity.json +++ b/erpnext/crm/doctype/opportunity/opportunity.json @@ -574,7 +574,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_global_search": 0, - "in_list_view": 1, + "in_list_view": 0, "in_standard_filter": 0, "label": "Territory", "length": 0, @@ -1152,7 +1152,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-03-12 21:55:21.598112", + "modified": "2017-04-04 01:21:02.165730", "modified_by": "Administrator", "module": "CRM", "name": "Opportunity", diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json index dc6de955eb..5d544bb6b4 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.json +++ b/erpnext/stock/doctype/delivery_note/delivery_note.json @@ -287,36 +287,6 @@ "unique": 0, "width": "150px" }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "eval:doc.docstatus==0", - "fieldname": "set_posting_time", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Edit Posting Date and Time", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, { "allow_on_submit": 0, "bold": 0, @@ -385,6 +355,36 @@ "unique": 0, "width": "100px" }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "depends_on": "eval:doc.docstatus==0", + "fieldname": "set_posting_time", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Edit Posting Date and Time", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, { "allow_on_submit": 0, "bold": 0, @@ -3288,7 +3288,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2017-03-29 04:55:45.044810", + "modified": "2017-04-03 03:13:58.051782", "modified_by": "Administrator", "module": "Stock", "name": "Delivery Note", From 9264313f0e0d2a547059b383744d0cfa12350d7b Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 5 Apr 2017 12:48:44 +0530 Subject: [PATCH 04/11] [fix] ordering for Edit Posting Time check --- erpnext/stock/doctype/item/item_list.js | 2 +- .../purchase_receipt/purchase_receipt.json | 62 +++++++++---------- .../doctype/stock_entry/stock_entry.json | 62 +++++++++---------- 3 files changed, 63 insertions(+), 63 deletions(-) diff --git a/erpnext/stock/doctype/item/item_list.js b/erpnext/stock/doctype/item/item_list.js index 40319e506c..cc46177f53 100644 --- a/erpnext/stock/doctype/item/item_list.js +++ b/erpnext/stock/doctype/item/item_list.js @@ -11,7 +11,7 @@ frappe.listview_settings['Item'] = { } else if (doc.end_of_life && doc.end_of_life < frappe.datetime.get_today()) { return [__("Expired"), "grey", "end_of_life,<,Today"]; } else if (doc.has_variants) { - return [__("Template"), "blue", "has_variants,=,Yes"]; + return [__("Template"), "orange", "has_variants,=,Yes"]; } else if (doc.variant_of) { return [__("Variant"), "green", "variant_of,=," + doc.variant_of]; } diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json index 73367e3fab..4c13a56da6 100755 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -225,36 +225,6 @@ "unique": 0, "width": "50%" }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "eval:doc.docstatus==0", - "fieldname": "set_posting_time", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Edit Posting Date and Time", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, { "allow_on_submit": 0, "bold": 0, @@ -323,6 +293,36 @@ "unique": 0, "width": "100px" }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "depends_on": "eval:doc.docstatus==0", + "fieldname": "set_posting_time", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Edit Posting Date and Time", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, { "allow_on_submit": 0, "bold": 0, @@ -2846,7 +2846,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2017-03-14 16:10:58.769483", + "modified": "2017-04-05 03:17:55.726121", "modified_by": "Administrator", "module": "Stock", "name": "Purchase Receipt", diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.json b/erpnext/stock/doctype/stock_entry/stock_entry.json index a6dd825501..5e73de9dae 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.json +++ b/erpnext/stock/doctype/stock_entry/stock_entry.json @@ -383,36 +383,6 @@ "unique": 0, "width": "50%" }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "eval:doc.docstatus==0", - "fieldname": "set_posting_time", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Edit Posting Date and Time", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, { "allow_on_submit": 0, "bold": 0, @@ -476,6 +446,36 @@ "set_only_once": 0, "unique": 0 }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "depends_on": "eval:doc.docstatus==0", + "fieldname": "set_posting_time", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Edit Posting Date and Time", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, { "allow_on_submit": 0, "bold": 0, @@ -1654,7 +1654,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-03-14 16:11:11.741704", + "modified": "2017-04-05 03:18:05.437204", "modified_by": "Administrator", "module": "Stock", "name": "Stock Entry", From 08a42e00ae0679476235ba7332342806acc4a3b0 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 5 Apr 2017 12:59:10 +0530 Subject: [PATCH 05/11] [fix] salary slip eval, remove access to globals, #8313 --- erpnext/hr/doctype/salary_slip/salary_slip.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py index a4d6460a35..6840f2503c 100644 --- a/erpnext/hr/doctype/salary_slip/salary_slip.py +++ b/erpnext/hr/doctype/salary_slip/salary_slip.py @@ -76,7 +76,7 @@ class SalarySlip(TransactionBase): def eval_condition_and_formula(self, d, data): try: if d.condition: - if not eval(d.condition, None, data): + if not eval(d.condition, {}, data): return None amount = d.amount if d.amount_based_on_formula: From faf51d91b656bfbe820b91ab332a4c81ed02ffcc Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Tue, 4 Apr 2017 11:35:22 +0530 Subject: [PATCH 06/11] [fix] stock qty issue in purchase trends report --- erpnext/controllers/trends.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/erpnext/controllers/trends.py b/erpnext/controllers/trends.py index c5db2239b3..23bc531cf0 100644 --- a/erpnext/controllers/trends.py +++ b/erpnext/controllers/trends.py @@ -140,16 +140,20 @@ def period_wise_columns_query(filters, trans): else: trans_date = 'transaction_date' + qty_field = "t2.stock_qty" + if trans == 'Purchase Invoice': + qty_field = "t2.qty" + if filters.get("period") != 'Yearly': for dt in bet_dates: get_period_wise_columns(dt, filters.get("period"), pwc) - query_details = get_period_wise_query(dt, trans_date, query_details) + query_details = get_period_wise_query(dt, trans_date, query_details, qty_field) else: pwc = [_(filters.get("fiscal_year")) + " ("+_("Qty") + "):Float:120", _(filters.get("fiscal_year")) + " ("+ _("Amt") + "):Currency:120"] - query_details = " SUM(t2.stock_qty), SUM(t2.base_net_amount)," + query_details = " SUM(%s), SUM(t2.base_net_amount),"%(qty_field) - query_details += 'SUM(t2.stock_qty), SUM(t2.base_net_amount)' + query_details += 'SUM(%s), SUM(t2.base_net_amount)'%(qty_field) return pwc, query_details def get_period_wise_columns(bet_dates, period, pwc): @@ -160,10 +164,10 @@ def get_period_wise_columns(bet_dates, period, pwc): pwc += [_(get_mon(bet_dates[0])) + "-" + _(get_mon(bet_dates[1])) + " (" + _("Qty") + "):Float:120", _(get_mon(bet_dates[0])) + "-" + _(get_mon(bet_dates[1])) + " (" + _("Amt") + "):Currency:120"] -def get_period_wise_query(bet_dates, trans_date, query_details): - query_details += """SUM(IF(t1.%(trans_date)s BETWEEN '%(sd)s' AND '%(ed)s', t2.stock_qty, NULL)), +def get_period_wise_query(bet_dates, trans_date, query_details, qty_field): + query_details += """SUM(IF(t1.%(trans_date)s BETWEEN '%(sd)s' AND '%(ed)s', %(qty_field)s, NULL)), SUM(IF(t1.%(trans_date)s BETWEEN '%(sd)s' AND '%(ed)s', t2.base_net_amount, NULL)), - """ % {"trans_date": trans_date, "sd": bet_dates[0],"ed": bet_dates[1]} + """ % {"trans_date": trans_date, "sd": bet_dates[0],"ed": bet_dates[1], "qty_field": qty_field} return query_details @frappe.whitelist(allow_guest=True) From fc11fce990d5aa3b8fff8e7f50fc249cce680a29 Mon Sep 17 00:00:00 2001 From: Javier Wong Date: Thu, 6 Apr 2017 17:26:44 +0800 Subject: [PATCH 07/11] [enhancement] Changed Issue Description and Resolution to Text Editor (#8346) --- erpnext/support/doctype/issue/issue.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/erpnext/support/doctype/issue/issue.json b/erpnext/support/doctype/issue/issue.json index 476e3a8159..6ee0e85b5d 100644 --- a/erpnext/support/doctype/issue/issue.json +++ b/erpnext/support/doctype/issue/issue.json @@ -1,5 +1,6 @@ { "allow_copy": 0, + "allow_guest_to_view": 0, "allow_import": 1, "allow_rename": 1, "autoname": "naming_series:", @@ -285,7 +286,7 @@ "columns": 0, "depends_on": "", "fieldname": "description", - "fieldtype": "Text", + "fieldtype": "Text Editor", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, @@ -607,7 +608,7 @@ "columns": 0, "depends_on": "eval:!doc.__islocal", "fieldname": "resolution_details", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, @@ -808,18 +809,18 @@ "unique": 0 } ], + "has_web_view": 0, "hide_heading": 0, "hide_toolbar": 0, "icon": "fa fa-ticket", "idx": 7, "image_view": 0, "in_create": 0, - "in_dialog": 0, "is_submittable": 0, "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-02-20 13:32:31.898423", + "modified": "2017-04-05 21:42:23.740187", "modified_by": "Administrator", "module": "Support", "name": "Issue", From d681c88d798597e14d95b837a6f1fc21db0d327b Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 6 Apr 2017 13:09:40 +0530 Subject: [PATCH 08/11] validate returned qty only if there is reference qty --- .../controllers/sales_and_purchase_return.py | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/erpnext/controllers/sales_and_purchase_return.py b/erpnext/controllers/sales_and_purchase_return.py index 4ea2a5f341..d8f28af1d6 100644 --- a/erpnext/controllers/sales_and_purchase_return.py +++ b/erpnext/controllers/sales_and_purchase_return.py @@ -106,24 +106,25 @@ def validate_returned_items(doc): def validate_quantity(doc, args, ref, valid_items, already_returned_items): fields = ['qty'] - if doc.doctype in ['Purchase Invoice', 'Purchase Receipt']: + if doc.doctype in ['Purchase Receipt', 'Purchase Invoice']: fields.extend(['received_qty', 'rejected_qty']) already_returned_data = already_returned_items.get(args.item_code) or {} for column in fields: - return_qty = flt(already_returned_data.get(column, 0)) if len(already_returned_data) > 0 else 0 - referenced_qty = ref.get(column) - max_return_qty = flt(referenced_qty) - return_qty + returned_qty = flt(already_returned_data.get(column, 0)) if len(already_returned_data) > 0 else 0 + reference_qty = ref.get(column) + max_returnable_qty = flt(reference_qty) - returned_qty label = column.replace('_', ' ').title() - - if flt(args.get(column)) > 0: - frappe.throw(_("{0} must be negative in return document").format(label)) - elif return_qty >= referenced_qty and flt(args.get(column)) != 0: - frappe.throw(_("Item {0} has already been returned").format(args.item_code), StockOverReturnError) - elif abs(args.get(column)) > max_return_qty: - frappe.throw(_("Row # {0}: Cannot return more than {1} for Item {2}") - .format(args.idx, referenced_qty, args.item_code), StockOverReturnError) + if reference_qty: + if flt(args.get(column)) > 0: + frappe.throw(_("{0} must be negative in return document").format(label)) + elif returned_qty >= reference_qty and args.get(column): + frappe.throw(_("Item {0} has already been returned") + .format(args.item_code), StockOverReturnError) + elif abs(args.get(column)) > max_returnable_qty: + frappe.throw(_("Row # {0}: Cannot return more than {1} for Item {2}") + .format(args.idx, reference_qty, args.item_code), StockOverReturnError) def get_ref_item_dict(valid_items, ref_item_row): from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos From aa6f00c403a115877ff43f329f1b4eaec8e8f320 Mon Sep 17 00:00:00 2001 From: Kanchan Chauhan Date: Thu, 6 Apr 2017 12:38:13 +0530 Subject: [PATCH 09/11] Added default 'All' option to filters to differentiate all and empty filter --- .../employee_attendance_tool.js | 1 + .../employee_attendance_tool.py | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js b/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js index de8e17c366..c0c0ef0fe0 100644 --- a/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +++ b/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js @@ -4,6 +4,7 @@ frappe.ui.form.on("Employee Attendance Tool", { }, onload: function(frm) { + frm.doc.department = frm.doc.branch = frm.doc.company = "All"; frm.set_value("date", get_today()); erpnext.employee_attendance_tool.load_employees(frm); }, diff --git a/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.py b/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.py index 7438737028..6ddb722c1b 100644 --- a/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.py +++ b/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.py @@ -13,11 +13,18 @@ class EmployeeAttendanceTool(Document): @frappe.whitelist() -def get_employees(date, department=None, branch=None, company=None): +def get_employees(date, department = None, branch = None, company = None): attendance_not_marked = [] attendance_marked = [] - employee_list = frappe.get_list("Employee", fields=["employee", "employee_name"], filters={ - "status": "Active", "department": department, "branch": branch, "company": company}, order_by="employee_name") + filters = {"status": "Active"} + if department != "All": + filters["department"] = department + if branch != "All": + filters["branch"] = branch + if company != "All": + filters["company"] = company + + employee_list = frappe.get_list("Employee", fields=["employee", "employee_name"], filters=filters, order_by="employee_name") marked_employee = {} for emp in frappe.get_list("Attendance", fields=["employee", "status"], filters={"attendance_date": date}): From a906b3f11c81c5488554f7e631f1157fd3ed0ade Mon Sep 17 00:00:00 2001 From: Makis Etzoglou Date: Thu, 30 Mar 2017 10:39:29 +0300 Subject: [PATCH 10/11] add delivery date to print format Fix #8111 --- erpnext/selling/doctype/sales_order/sales_order.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json index b118e5565d..36af20fe4c 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -371,7 +371,7 @@ "oldfieldname": "delivery_date", "oldfieldtype": "Date", "permlevel": 0, - "print_hide": 1, + "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, "remember_last_selected_value": 0, @@ -3516,7 +3516,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-03-29 04:38:25.247179", + "modified": "2017-03-30 03:23:30.487992", "modified_by": "Administrator", "module": "Selling", "name": "Sales Order", From 0d230afd22485f349938359ee1e84563a23cfc48 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 6 Apr 2017 17:02:03 +0600 Subject: [PATCH 11/11] bumped to version 8.0.8 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 881087a311..9d3e162d11 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals import frappe -__version__ = '8.0.7' +__version__ = '8.0.8' def get_default_company(user=None): '''Get default company for user'''