From 4888a5dc0d1c0677405ae76aa34836a6619eddf7 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 21 May 2015 16:50:25 +0530 Subject: [PATCH 1/2] [patch][fix] party model - create debtors and creditors only if parent account exists --- erpnext/patches/v4_2/party_model.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/erpnext/patches/v4_2/party_model.py b/erpnext/patches/v4_2/party_model.py index cbb00cf031..03eec1682f 100644 --- a/erpnext/patches/v4_2/party_model.py +++ b/erpnext/patches/v4_2/party_model.py @@ -19,20 +19,21 @@ def create_receivable_payable_account(): receivable_payable_accounts = frappe._dict() def _create_account(args): - account_id = frappe.db.get_value("Account", - {"account_name": args["account_name"], "company": args["company"]}) - if not account_id: - account = frappe.new_doc("Account") - account.is_group = 0 - account.update(args) - account.insert() + if args["parent_account"]: + account_id = frappe.db.get_value("Account", + {"account_name": args["account_name"], "company": args["company"]}) + if not account_id: + account = frappe.new_doc("Account") + account.is_group = 0 + account.update(args) + account.insert() - account_id = account.name + account_id = account.name - frappe.db.set_value("Company", args["company"], ("default_receivable_account" - if args["account_type"]=="Receivable" else "default_payable_account"), account_id) + frappe.db.set_value("Company", args["company"], ("default_receivable_account" + if args["account_type"]=="Receivable" else "default_payable_account"), account_id) - receivable_payable_accounts.setdefault(args["company"], {}).setdefault(args["account_type"], account_id) + receivable_payable_accounts.setdefault(args["company"], {}).setdefault(args["account_type"], account_id) for company in frappe.db.sql_list("select name from tabCompany"): _create_account({ From 3b0adc5246950575216d8104d2035a3bedc1dad9 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 21 May 2015 16:51:15 +0530 Subject: [PATCH 2/2] [fix] ignore share permission while creating events on the background --- erpnext/config/accounts.py | 2 +- erpnext/utilities/transaction_base.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/config/accounts.py b/erpnext/config/accounts.py index 1b29002257..a5a4024215 100644 --- a/erpnext/config/accounts.py +++ b/erpnext/config/accounts.py @@ -114,7 +114,7 @@ def get_data(): { "type": "doctype", "name": "POS Profile", - "label": _("Point-of-Sale Setting"), + "label": _("Point-of-Sale Profile"), "description": _("Rules to calculate shipping amount for a sale") }, { diff --git a/erpnext/utilities/transaction_base.py b/erpnext/utilities/transaction_base.py index 9c73c60b14..60889c5415 100644 --- a/erpnext/utilities/transaction_base.py +++ b/erpnext/utilities/transaction_base.py @@ -51,7 +51,8 @@ class TransactionBase(StatusUpdater): event.insert(ignore_permissions=True) if frappe.db.exists("User", self.contact_by): - frappe.share.add("Event", event.name, self.contact_by) + frappe.share.add("Event", event.name, self.contact_by, + flags={"ignore_share_permission": True}) def validate_uom_is_integer(self, uom_field, qty_fields): validate_uom_is_integer(self, uom_field, qty_fields)