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

fix: Added permissions in GST Settings and added filters for accounts based on company

Browse Source
This commit is contained in:
Nabin Hait 2019-01-24 17:55:44 +05:30
parent 4b4265f8a7
commit 49b41e49ae
4 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/patches.txt
View File

@ -581,4 +581,5 @@ erpnext.patches.v10_0.repost_gle_for_purchase_receipts_with_rejected_items
erpnext.patches.v11_0.set_missing_gst_hsn_code erpnext.patches.v11_0.set_missing_gst_hsn_code
erpnext.patches.v11_0.rename_bom_wo_fields erpnext.patches.v11_0.rename_bom_wo_fields
erpnext.patches.v11_0.rename_additional_salary_component_additional_salary erpnext.patches.v11_0.rename_additional_salary_component_additional_salary
erpnext.patches.v11_0.renamed_from_to_fields_in_project erpnext.patches.v11_0.renamed_from_to_fields_in_project
erpnext.patches.v11_0.add_permissions_in_gst_settings

12
erpnext/patches/v11_0/add_permissions_in_gst_settings.py Normal file
View File

@ -0,0 +1,12 @@
import frappe
from frappe.permissions import add_permission, update_permission_property
def execute():
company = frappe.get_all('Company', filters = {'country': 'India'})
if not company:
return
for doctype in ('GST HSN Code', 'GST Settings'):
add_permission(doctype, 'Accounts Manager', 0)
update_permission_property(doctype, 'Accounts Manager', 0, 'write', 1)
update_permission_property(doctype, 'Accounts Manager', 0, 'create', 1)

18
erpnext/regional/doctype/gst_settings/gst_settings.js
View File

@ -21,5 +21,23 @@ frappe.ui.form.on('GST Settings', {
</tr> </tr>
</tbody></table>` </tbody></table>`
); );
},
setup: function(frm) {
$.each(["cgst_account", "sgst_account", "igst_account", "cess_account"], function(i, field) {
frm.events.filter_accounts(frm, field);
});
},
filter_accounts: function(frm, account_field) {
frm.set_query(account_field, "gst_accounts", function(doc, cdt, cdn) {
var row = locals[cdt][cdn];
return {
filters: {
company: row.company,
is_group: 0
}
};
});
} }
}); });

5
erpnext/regional/india/setup.py
View File

@ -5,7 +5,7 @@ from __future__ import unicode_literals
import frappe, os, json import frappe, os, json
from frappe.custom.doctype.custom_field.custom_field import create_custom_fields from frappe.custom.doctype.custom_field.custom_field import create_custom_fields
from frappe.permissions import add_permission from frappe.permissions import add_permission, update_permission_property
from erpnext.regional.india import states from erpnext.regional.india import states
from erpnext.accounts.utils import get_fiscal_year from erpnext.accounts.utils import get_fiscal_year
from frappe.utils import today from frappe.utils import today
@ -79,6 +79,9 @@ def add_custom_roles_for_reports():
def add_permissions(): def add_permissions():
for doctype in ('GST HSN Code', 'GST Settings'): for doctype in ('GST HSN Code', 'GST Settings'):
add_permission(doctype, 'All', 0) add_permission(doctype, 'All', 0)
add_permission(doctype, 'Accounts Manager', 0)
update_permission_property(doctype, 'Accounts Manager', 0, 'write', 1)
update_permission_property(doctype, 'Accounts Manager', 0, 'create', 1)
def add_print_formats(): def add_print_formats():
frappe.reload_doc("regional", "print_format", "gst_tax_invoice") frappe.reload_doc("regional", "print_format", "gst_tax_invoice")