Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3316 from nabinhait/develop

Browse Source 
share permission and patch fix
This commit is contained in:
Nabin Hait 2015-05-22 11:51:49 +05:30
commit fc79e205f0
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/config/accounts.py
View File

@ -114,7 +114,7 @@ def get_data():
{ {
"type": "doctype", "type": "doctype",
"name": "POS Profile", "name": "POS Profile",
"label": _("Point-of-Sale Setting"), "label": _("Point-of-Sale Profile"),
"description": _("Rules to calculate shipping amount for a sale") "description": _("Rules to calculate shipping amount for a sale")
}, },
{ {

23
erpnext/patches/v4_2/party_model.py
View File

@ -19,20 +19,21 @@ def create_receivable_payable_account():
receivable_payable_accounts = frappe._dict() receivable_payable_accounts = frappe._dict()
def _create_account(args): def _create_account(args):
account_id = frappe.db.get_value("Account", if args["parent_account"]:
{"account_name": args["account_name"], "company": args["company"]}) account_id = frappe.db.get_value("Account",
if not account_id: {"account_name": args["account_name"], "company": args["company"]})
account = frappe.new_doc("Account") if not account_id:
account.is_group = 0 account = frappe.new_doc("Account")
account.update(args) account.is_group = 0
account.insert() account.update(args)
account.insert()
account_id = account.name account_id = account.name
frappe.db.set_value("Company", args["company"], ("default_receivable_account" frappe.db.set_value("Company", args["company"], ("default_receivable_account"
if args["account_type"]=="Receivable" else "default_payable_account"), account_id) 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"): for company in frappe.db.sql_list("select name from tabCompany"):
_create_account({ _create_account({

3
erpnext/utilities/transaction_base.py
View File

@ -51,7 +51,8 @@ class TransactionBase(StatusUpdater):
event.insert(ignore_permissions=True) event.insert(ignore_permissions=True)
if frappe.db.exists("User", self.contact_by): 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): def validate_uom_is_integer(self, uom_field, qty_fields):
validate_uom_is_integer(self, uom_field, qty_fields) validate_uom_is_integer(self, uom_field, qty_fields)