From 3c3855ac8c5770d469ac09ca66d4d583ae7b62eb Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 27 Apr 2015 11:24:18 +0530 Subject: [PATCH 1/3] advance paid should not be copied and patch to fix affected records --- .../doctype/purchase_order/purchase_order.json | 3 ++- erpnext/patches.txt | 1 + erpnext/patches/v4_2/update_advance_paid.py | 13 +++++++++++++ .../selling/doctype/sales_order/sales_order.json | 3 ++- 4 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 erpnext/patches/v4_2/update_advance_paid.py diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json index a57f5441ee..28a50f57d0 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.json +++ b/erpnext/buying/doctype/purchase_order/purchase_order.json @@ -389,6 +389,7 @@ "fieldname": "advance_paid", "fieldtype": "Currency", "label": "Advance Paid", + "no_copy": 1, "permlevel": 0, "print_hide": 1, "read_only": 1 @@ -775,7 +776,7 @@ "icon": "icon-file-text", "idx": 1, "is_submittable": 1, - "modified": "2014-11-27 17:27:38.839440", + "modified": "2015-04-27 13:40:17.589085", "modified_by": "Administrator", "module": "Buying", "name": "Purchase Order", diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 60df4ce6d9..bccbe79686 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -98,3 +98,4 @@ erpnext.patches.v4_2.repost_reserved_qty erpnext.patches.v4_2.repost_sle_for_si_with_no_warehouse erpnext.patches.v4_2.fix_recurring_orders erpnext.patches.v4_2.delete_gl_entries_for_cancelled_invoices +erpnext.patches.v4_2.update_advance_paid diff --git a/erpnext/patches/v4_2/update_advance_paid.py b/erpnext/patches/v4_2/update_advance_paid.py new file mode 100644 index 0000000000..818735a4e4 --- /dev/null +++ b/erpnext/patches/v4_2/update_advance_paid.py @@ -0,0 +1,13 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors +# License: GNU General Public License v3. See license.txt + +from __future__ import unicode_literals +import frappe + +def execute(): + for dt in ("Sales Order", "Purchase Order"): + orders_with_advance = frappe.db.sql("""select name from `tab{0}` + where docstatus < 2 and ifnull(advance_paid, 0) != 0""".format(dt), as_dict=1) + + for order in orders_with_advance: + frappe.get_doc(dt, order.name).set_total_advance_paid() \ No newline at end of file diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json index 4ffc603466..1277e063fb 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -549,6 +549,7 @@ "fieldname": "advance_paid", "fieldtype": "Currency", "label": "Advance Paid", + "no_copy": 1, "options": "Company:company:default_currency", "permlevel": 0, "print_hide": 1, @@ -1033,7 +1034,7 @@ "idx": 1, "is_submittable": 1, "issingle": 0, - "modified": "2015-01-12 15:16:51.611467", + "modified": "2015-04-27 13:39:50.229026", "modified_by": "Administrator", "module": "Selling", "name": "Sales Order", From 31f6c984f011d62c834d854534356afe4dfec862 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 27 Apr 2015 16:48:33 +0530 Subject: [PATCH 2/3] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6f3325480c..2001af4017 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ install: - sudo service mysql stop - sudo apt-get install python-software-properties - sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db - - sudo add-apt-repository 'deb http://ftp.osuosl.org/pub/mariadb/repo/5.5/ubuntu precise main' + - sudo add-apt-repository 'deb http://ftp.osuosl.org/pub/mariadb/repo/10.0/ubuntu precise main' - sudo apt-get update - sudo apt-get purge -y mysql-common - sudo apt-get install mariadb-server mariadb-common libmariadbclient-dev From b17f056f8d4505e7519d98ad1cd684188cb71f9c Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Mon, 27 Apr 2015 17:59:52 +0600 Subject: [PATCH 3/3] bumped to version 4.25.2 --- erpnext/__version__.py | 2 +- erpnext/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/__version__.py b/erpnext/__version__.py index c41adc08a3..61e02d0885 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = '4.25.1' +__version__ = '4.25.2' diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 7f3d002066..57916db98e 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -5,7 +5,7 @@ app_publisher = "Web Notes 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 = "4.25.1" +app_version = "4.25.2" error_report_email = "support@erpnext.com" diff --git a/setup.py b/setup.py index b12ae36252..f6286626d9 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages import os -version = "4.25.1" +version = "4.25.2" with open("requirements.txt", "r") as f: install_requires = f.readlines()