nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 19:59:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v12-pre-release' into version-12

Browse Source
This commit is contained in:
Saurabh
2020-10-01 12:54:23 +05:30
parent 24e5a6172a db4178b1e8
commit 3e0f488083
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@@ -5,7 +5,7 @@ import frappe
from erpnext.hooks import regional_overrides from erpnext.hooks import regional_overrides
from frappe.utils import getdate from frappe.utils import getdate
__version__ = '12.12.0' __version__ = '12.12.1'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

2
erpnext/accounts/doctype/gl_entry/gl_entry.py
View File

@@ -138,7 +138,7 @@ class GLEntry(Document):
frappe.throw(_("{0} {1}: Cost Center {2} does not belong to Company {3}") frappe.throw(_("{0} {1}: Cost Center {2} does not belong to Company {3}")
.format(self.voucher_type, self.voucher_no, self.cost_center, self.company)) .format(self.voucher_type, self.voucher_no, self.cost_center, self.company))
if self.cost_center and _check_is_group(): if not self.flags.from_repost and self.cost_center and _check_is_group():
frappe.throw(_("""{0} {1}: Cost Center {2} is a group cost center and group cost centers cannot frappe.throw(_("""{0} {1}: Cost Center {2} is a group cost center and group cost centers cannot
be used in transactions""").format(self.voucher_type, self.voucher_no, frappe.bold(self.cost_center))) be used in transactions""").format(self.voucher_type, self.voucher_no, frappe.bold(self.cost_center)))

4
erpnext/controllers/accounts_controller.py
View File

@@ -1195,7 +1195,7 @@ def update_child_qty_rate(parent_doctype, trans_items, parent_doctype_name, chil
try: try:
doc.check_permission(perm_type) doc.check_permission(perm_type)
except frappe.PermissionError: except frappe.PermissionError:
actions = { 'create': 'add', 'write': 'update', 'cancel': 'remove' } actions = { 'create': 'add', 'write': 'update'}
frappe.throw(_("You do not have permissions to {} items in a {}.") frappe.throw(_("You do not have permissions to {} items in a {}.")
.format(actions[perm_type], parent_doctype), title=_("Insufficient Permissions")) .format(actions[perm_type], parent_doctype), title=_("Insufficient Permissions"))
@@ -1238,7 +1238,7 @@ def update_child_qty_rate(parent_doctype, trans_items, parent_doctype_name, chil
sales_doctypes = ['Sales Order', 'Sales Invoice', 'Delivery Note', 'Quotation'] sales_doctypes = ['Sales Order', 'Sales Invoice', 'Delivery Note', 'Quotation']
parent = frappe.get_doc(parent_doctype, parent_doctype_name) parent = frappe.get_doc(parent_doctype, parent_doctype_name)
check_doc_permissions(parent, 'cancel') check_doc_permissions(parent, 'write')
validate_and_delete_children(parent, data) validate_and_delete_children(parent, data)
for d in data: for d in data:

2
erpnext/public/js/website_theme.js
View File

@@ -4,7 +4,7 @@
frappe.ui.form.on('Website Theme', { frappe.ui.form.on('Website Theme', {
validate(frm) { validate(frm) {
let theme_scss = frm.doc.theme_scss; let theme_scss = frm.doc.theme_scss;
if (theme_scss.includes('frappe/public/scss/website') if (theme_scss && theme_scss.includes('frappe/public/scss/website')
&& !theme_scss.includes('erpnext/public/scss/website') && !theme_scss.includes('erpnext/public/scss/website')
) { ) {
frm.set_value('theme_scss', frm.set_value('theme_scss',