From c01db5fe9cc6bf6aae4e45117fec51da7803919c Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 9 Jun 2014 18:01:14 +0530 Subject: [PATCH 1/2] Save default letterhead --- erpnext/patches.txt | 1 + erpnext/patches/v4_0/save_default_letterhead.py | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 erpnext/patches/v4_0/save_default_letterhead.py diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 4d69a0fd4f..64cbc4033d 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -56,3 +56,4 @@ erpnext.patches.v4_0.update_tax_amount_after_discount execute:frappe.reset_perms("GL Entry") #2014-06-09 execute:frappe.reset_perms("Stock Ledger Entry") #2014-06-09 erpnext.patches.v4_0.create_custom_fields_for_india_specific_fields +erpnext.patches.v4_0.save_default_letterhead diff --git a/erpnext/patches/v4_0/save_default_letterhead.py b/erpnext/patches/v4_0/save_default_letterhead.py new file mode 100644 index 0000000000..a6db0cdece --- /dev/null +++ b/erpnext/patches/v4_0/save_default_letterhead.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(): + """save default letterhead to set default_letter_head_content""" + try: + letter_head = frappe.get_doc("Letter Head", {"is_default": 1}) + letter_head.save() + except frappe.DoesNotExistError: + pass From b527e548095081d9134eb6f03463f25fb6964b71 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 9 Jun 2014 18:08:46 +0530 Subject: [PATCH 2/2] Fixed report: Item wise Price List Rate --- erpnext/config/stock.py | 2 +- .../item_wise_price_list_rate.json | 30 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/erpnext/config/stock.py b/erpnext/config/stock.py index ace83fc447..30acc5b581 100644 --- a/erpnext/config/stock.py +++ b/erpnext/config/stock.py @@ -161,7 +161,7 @@ def get_data(): }, { "type": "report", - "is_query_report": True, + "is_query_report": False, "name": "Item-wise Price List Rate", "doctype": "Item Price", }, diff --git a/erpnext/stock/report/item_wise_price_list_rate/item_wise_price_list_rate.json b/erpnext/stock/report/item_wise_price_list_rate/item_wise_price_list_rate.json index d05a6a6010..ec8f599f36 100644 --- a/erpnext/stock/report/item_wise_price_list_rate/item_wise_price_list_rate.json +++ b/erpnext/stock/report/item_wise_price_list_rate/item_wise_price_list_rate.json @@ -1,17 +1,17 @@ { - "apply_user_permissions": 1, - "creation": "2013-09-25 10:21:15", - "docstatus": 0, - "doctype": "Report", - "idx": 1, - "is_standard": "Yes", - "json": "{\"filters\":[[\"Item Price\",\"price_list\",\"like\",\"%\"],[\"Item Price\",\"item_code\",\"like\",\"%\"]],\"columns\":[[\"name\",\"Item Price\"],[\"price_list\",\"Item Price\"],[\"item_code\",\"Item Price\"],[\"item_name\",\"Item Price\"],[\"item_description\",\"Item Price\"],[\"ref_rate\",\"Item Price\"],[\"buying\",\"Item Price\"],[\"selling\",\"Item Price\"],[\"currency\",\"Item Price\"]],\"sort_by\":\"Item Price.modified\",\"sort_order\":\"desc\",\"sort_by_next\":\"\",\"sort_order_next\":\"desc\"}", - "modified": "2014-06-03 07:18:17.097955", - "modified_by": "Administrator", - "module": "Stock", - "name": "Item-wise Price List Rate", - "owner": "Administrator", - "ref_doctype": "Price List", - "report_name": "Item-wise Price List Rate", + "apply_user_permissions": 1, + "creation": "2013-09-25 10:21:15", + "docstatus": 0, + "doctype": "Report", + "idx": 1, + "is_standard": "Yes", + "json": "{\"filters\":[[\"Item Price\",\"price_list\",\"like\",\"%\"],[\"Item Price\",\"item_code\",\"like\",\"%\"]],\"columns\":[[\"name\",\"Item Price\"],[\"price_list\",\"Item Price\"],[\"item_code\",\"Item Price\"],[\"item_name\",\"Item Price\"],[\"item_description\",\"Item Price\"],[\"price_list_rate\",\"Item Price\"],[\"buying\",\"Item Price\"],[\"selling\",\"Item Price\"],[\"currency\",\"Item Price\"]],\"sort_by\":\"Item Price.modified\",\"sort_order\":\"desc\",\"sort_by_next\":\"\",\"sort_order_next\":\"desc\"}", + "modified": "2014-06-09 10:21:15.097955", + "modified_by": "Administrator", + "module": "Stock", + "name": "Item-wise Price List Rate", + "owner": "Administrator", + "ref_doctype": "Price List", + "report_name": "Item-wise Price List Rate", "report_type": "Report Builder" -} \ No newline at end of file +}