Size: Small
", "image": "/assets/erpnext_demo/images/wind-turbine-1.jpg", "item_code": "Wind Turbine-S", @@ -177,7 +213,9 @@ }, { "default_supplier": null, - "default_warehouse": "Finished Goods", + "item_defaults": [{ + "default_warehouse": "Finished Goods" + }], "description": "Small Wind Turbine for Home Use\n\n\n\nSize: Medium
", "image": "/assets/erpnext_demo/images/wind-turbine-1.jpg", "item_code": "Wind Turbine-M", @@ -194,7 +232,9 @@ }, { "default_supplier": null, - "default_warehouse": "Finished Goods", + "item_defaults": [{ + "default_warehouse": "Finished Goods" + }], "description": "Small Wind Turbine for Home Use\n\n\n\nSize: Large
", "image": "/assets/erpnext_demo/images/wind-turbine-1.jpg", "item_code": "Wind Turbine-L", @@ -218,7 +258,9 @@ }, { "default_supplier": "HomeBase", - "default_warehouse": "Stores", + "item_defaults": [{ + "default_warehouse": "Stores" + }], "description": "3/4 in. x 2 ft. x 4 ft. Pine Plywood", "image": null, "item_code": "Base Plate Un Painted", @@ -284,7 +326,9 @@ "has_batch_no": 1, "create_new_batch": 1, "valuation_rate": 200, - "default_warehouse": "Stores", + "item_defaults": [{ + "default_warehouse": "Stores" + }], "description": "Corrugated Box", "item_code": "Corrugated Box", "item_name": "Corrugated Box", diff --git a/erpnext/demo/data/item_education.json b/erpnext/demo/data/item_education.json index 077fcaacdaf..40e4701596a 100644 --- a/erpnext/demo/data/item_education.json +++ b/erpnext/demo/data/item_education.json @@ -1,63 +1,90 @@ [ { "default_supplier": "Asiatic Solutions", - "default_warehouse": "Stores", + "item_defaults": [{ + "default_warehouse": "Stores", + "company": "Whitmore College" + }], "item_code": "Books", "item_group": "Raw Material", "item_name": "Books" }, { "default_supplier": "HomeBase", - "default_warehouse": "Stores", + "item_defaults": [{ + "default_warehouse": "Stores", + "company": "Whitmore College" + }], "item_code": "Pencil", "item_group": "Raw Material", "item_name": "Pencil" }, { "default_supplier": "New World Realty", - "default_warehouse": "Stores", + "item_defaults": [{ + "default_warehouse": "Stores", + "company": "Whitmore College" + }], "item_code": "Tables", "item_group": "Raw Material", "item_name": "Tables" }, { "default_supplier": "Eagle Hardware", - "default_warehouse": "Stores", + "item_defaults": [{ + "default_warehouse": "Stores", + "company": "Whitmore College" + }], "item_code": "Chair", "item_group": "Raw Material", "item_name": "Chair" }, { "default_supplier": "Asiatic Solutions", - "default_warehouse": "Stores", + "item_defaults": [{ + "default_warehouse": "Stores", + "company": "Whitmore College" + }], "item_code": "Black Board", "item_group": "Sub Assemblies", "item_name": "Black Board" }, { "default_supplier": "HomeBase", - "default_warehouse": "Stores", + "item_defaults": [{ + "default_warehouse": "Stores", + "company": "Whitmore College" + }], "item_code": "Chalk", "item_group": "Raw Material", "item_name": "Chalk" }, { "default_supplier": "HomeBase", - "default_warehouse": "Stores", + "item_defaults": [{ + "default_warehouse": "Stores", + "company": "Whitmore College" + }], "item_code": "Notepad", "item_group": "Raw Material", "item_name": "Notepad" }, { "default_supplier": "Ks Merchandise", - "default_warehouse": "Stores", + "item_defaults": [{ + "default_warehouse": "Stores", + "company": "Whitmore College" + }], "item_code": "Uniform", "item_group": "Raw Material", "item_name": "Uniform" }, { "is_stock_item": 0, - "default_warehouse": "Stores", + "item_defaults": [{ + "default_warehouse": "Stores", + "company": "Whitmore College" + }], "description": "Computer", "item_code": "Computer", "item_name": "Computer", @@ -65,7 +92,10 @@ }, { "is_stock_item": 0, - "default_warehouse": "Stores", + "item_defaults": [{ + "default_warehouse": "Stores", + "company": "Whitmore College" + }], "description": "Mobile", "item_code": "Mobile", "item_name": "Mobile", @@ -73,7 +103,10 @@ }, { "is_stock_item": 0, - "default_warehouse": "Stores", + "item_defaults": [{ + "default_warehouse": "Stores", + "company": "Whitmore College" + }], "description": "ERP", "item_code": "ERP", "item_name": "ERP", @@ -81,15 +114,20 @@ }, { "is_stock_item": 0, - "default_warehouse": "Stores", + "item_defaults": [{ + "default_warehouse": "Stores", + "company": "Whitmore College" + }], "description": "Autocad", "item_code": "Autocad", "item_name": "Autocad", "item_group": "All Item Groups" }, { - "default_warehouse": "Stores", - "default_warehouse": "Stores", + "item_defaults": [{ + "default_warehouse": "Stores", + "company": "Whitmore College" + }], "item_code": "Service", "item_group": "Services", "item_name": "Service", diff --git a/erpnext/demo/setup/education.py b/erpnext/demo/setup/education.py index 2a894f79d10..0403c06411e 100644 --- a/erpnext/demo/setup/education.py +++ b/erpnext/demo/setup/education.py @@ -36,7 +36,8 @@ def setup_item(): item = frappe.new_doc('Item') item.update(i) item.min_order_qty = random.randint(10, 30) - item.default_warehouse = frappe.get_all('Warehouse', filters={'warehouse_name': item.default_warehouse}, limit=1)[0].name + item.item_defaults[0].default_warehouse = frappe.get_all('Warehouse', + filters={'warehouse_name': item.item_defaults[0].default_warehouse}, limit=1)[0].name item.insert() def make_student_applicants(): diff --git a/erpnext/demo/setup/manufacture.py b/erpnext/demo/setup/manufacture.py index 4d8c450d4b6..4db510a18d5 100644 --- a/erpnext/demo/setup/manufacture.py +++ b/erpnext/demo/setup/manufacture.py @@ -4,6 +4,7 @@ import random, json import frappe from frappe.utils import nowdate, add_days from erpnext.demo.setup.setup_data import import_json +from erpnext.demo.domains import data from six import iteritems @@ -65,10 +66,11 @@ def setup_item(): for i in items: item = frappe.new_doc('Item') item.update(i) - if item.default_warehouse: - warehouse = frappe.get_all('Warehouse', filters={'warehouse_name': item.default_warehouse}, limit=1) + if item.item_defaults[0].default_warehouse: + item.item_defaults[0].company = data.get("Manufacturing").get('company_name') + warehouse = frappe.get_all('Warehouse', filters={'warehouse_name': item.item_defaults[0].default_warehouse}, limit=1) if warehouse: - item.default_warehouse = warehouse[0].name + item.item_defaults[0].default_warehouse = warehouse[0].name item.insert() def setup_product_bundle(): diff --git a/erpnext/hr/doctype/appraisal_goal/appraisal_goal.json b/erpnext/hr/doctype/appraisal_goal/appraisal_goal.json index 49fe105cb1f..f22969b7c14 100644 --- a/erpnext/hr/doctype/appraisal_goal/appraisal_goal.json +++ b/erpnext/hr/doctype/appraisal_goal/appraisal_goal.json @@ -202,7 +202,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/hr/doctype/appraisal_template/appraisal_template.json b/erpnext/hr/doctype/appraisal_template/appraisal_template.json index 97402ac3d6c..ac6e400e09f 100644 --- a/erpnext/hr/doctype/appraisal_template/appraisal_template.json +++ b/erpnext/hr/doctype/appraisal_template/appraisal_template.json @@ -108,7 +108,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 0, diff --git a/erpnext/hr/doctype/appraisal_template_goal/appraisal_template_goal.json b/erpnext/hr/doctype/appraisal_template_goal/appraisal_template_goal.json index d11ec64a55d..34ea5d82255 100644 --- a/erpnext/hr/doctype/appraisal_template_goal/appraisal_template_goal.json +++ b/erpnext/hr/doctype/appraisal_template_goal/appraisal_template_goal.json @@ -73,7 +73,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/hr/doctype/branch/branch.json b/erpnext/hr/doctype/branch/branch.json index 609456c4fe4..221b52267e2 100644 --- a/erpnext/hr/doctype/branch/branch.json +++ b/erpnext/hr/doctype/branch/branch.json @@ -44,7 +44,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 0, diff --git a/erpnext/hr/doctype/compensatory_leave_request/test_compensatory_leave_request.py b/erpnext/hr/doctype/compensatory_leave_request/test_compensatory_leave_request.py index f062325f5fe..f2ca1f4f5f0 100644 --- a/erpnext/hr/doctype/compensatory_leave_request/test_compensatory_leave_request.py +++ b/erpnext/hr/doctype/compensatory_leave_request/test_compensatory_leave_request.py @@ -6,36 +6,36 @@ from __future__ import unicode_literals import frappe import unittest -class TestCompensatoryLeaveRequest(unittest.TestCase): - def get_compensatory_leave_request(self): - return frappe.get_doc('Compensatory Leave Request', dict( - employee = employee, - work_from_date = today, - work_to_date = today, - reason = 'test' - )).insert() - - def test_creation_of_leave_allocation(self): - employee = get_employee() - today = get_today() - - compensatory_leave_request = self.get_compensatory_leave_request(today) - - before = get_leave_balance(employee, compensatory_leave_request.leave_type) - - compensatory_leave_request.submit() - - self.assertEqual(get_leave_balance(employee, compensatory_leave_request.leave_type), before + 1) - - def test_max_compensatory_leave(self): - employee = get_employee() - today = get_today() - - compensatory_leave_request = self.get_compensatory_leave_request() - - frappe.db.set_value('Leave Type', compensatory_leave_request.leave_type, 'max_leaves_allowed', 0) - - self.assertRaises(MaxLeavesLimitCrossed, compensatory_leave_request.submit) - - frappe.db.set_value('Leave Type', compensatory_leave_request.leave_type, 'max_leaves_allowed', 10) - +# class TestCompensatoryLeaveRequest(unittest.TestCase): +# def get_compensatory_leave_request(self): +# return frappe.get_doc('Compensatory Leave Request', dict( +# employee = employee, +# work_from_date = today, +# work_to_date = today, +# reason = 'test' +# )).insert() +# +# def test_creation_of_leave_allocation(self): +# employee = get_employee() +# today = get_today() +# +# compensatory_leave_request = self.get_compensatory_leave_request(today) +# +# before = get_leave_balance(employee, compensatory_leave_request.leave_type) +# +# compensatory_leave_request.submit() +# +# self.assertEqual(get_leave_balance(employee, compensatory_leave_request.leave_type), before + 1) +# +# def test_max_compensatory_leave(self): +# employee = get_employee() +# today = get_today() +# +# compensatory_leave_request = self.get_compensatory_leave_request() +# +# frappe.db.set_value('Leave Type', compensatory_leave_request.leave_type, 'max_leaves_allowed', 0) +# +# self.assertRaises(MaxLeavesLimitCrossed, compensatory_leave_request.submit) +# +# frappe.db.set_value('Leave Type', compensatory_leave_request.leave_type, 'max_leaves_allowed', 10) +# diff --git a/erpnext/hr/doctype/department/test_records.json b/erpnext/hr/doctype/department/test_records.json index 5bb5871d4cd..654925ef93f 100644 --- a/erpnext/hr/doctype/department/test_records.json +++ b/erpnext/hr/doctype/department/test_records.json @@ -1,4 +1,4 @@ [ - {"doctype":"Department", "department_name":"_Test Department"}, - {"doctype":"Department", "department_name":"_Test Department 1"} + {"doctype":"Department", "department_name":"_Test Department", "company": "_Test Company"}, + {"doctype":"Department", "department_name":"_Test Department 1", "company": "_Test Company"} ] \ No newline at end of file diff --git a/erpnext/hr/doctype/designation/designation.json b/erpnext/hr/doctype/designation/designation.json index 9315cfd6b82..1d4a3cf7b79 100644 --- a/erpnext/hr/doctype/designation/designation.json +++ b/erpnext/hr/doctype/designation/designation.json @@ -77,7 +77,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 0, diff --git a/erpnext/hr/doctype/employee/employee.py b/erpnext/hr/doctype/employee/employee.py index 93f65324081..824ddf5aa7f 100755 --- a/erpnext/hr/doctype/employee/employee.py +++ b/erpnext/hr/doctype/employee/employee.py @@ -318,26 +318,26 @@ def get_employee_emails(employee_list): @frappe.whitelist() def get_children(doctype, parent=None, company=None, is_root=False, is_tree=False): - filters = [['company', '=', company]] - fields = ['name as value', 'employee_name as title'] + condition = '' if is_root: - parent = '' + parent = "" if parent and company and parent!=company: - filters.append(['reports_to', '=', parent]) + condition = ' and reports_to = "{0}"'.format(frappe.db.escape(parent)) else: - filters.append(['reports_to', '=', '']) + condition = ' and ifnull(reports_to, "")=""' - employees = frappe.get_list(doctype, fields=fields, - filters=filters, order_by='name') + employee = frappe.db.sql(""" + select + name as value, employee_name as title, + exists(select name from `tabEmployee` where reports_to=emp.name) as expandable + from + `tabEmployee` emp + where company='{company}' {condition} order by name""" + .format(company=company, condition=condition), as_dict=1) - for employee in employees: - is_expandable = frappe.get_all(doctype, filters=[ - ['reports_to', '=', employee.get('value')] - ]) - employee.expandable = 1 if is_expandable else 0 - - return employees + # return employee + return employee def on_doctype_update(): diff --git a/erpnext/hr/doctype/employee/test_records.json b/erpnext/hr/doctype/employee/test_records.json index 087265fa481..0bfd2aa12a3 100644 --- a/erpnext/hr/doctype/employee/test_records.json +++ b/erpnext/hr/doctype/employee/test_records.json @@ -3,7 +3,7 @@ "company": "_Test Company", "date_of_birth": "1980-01-01", "date_of_joining": "2010-01-01", - "department": "_Test Department", + "department": "_Test Department - _TC", "doctype": "Employee", "employee_name": "_Test Employee", "gender": "Female", @@ -15,7 +15,7 @@ "company": "_Test Company", "date_of_birth": "1980-01-01", "date_of_joining": "2010-01-01", - "department": "_Test Department 1", + "department": "_Test Department 1 - _TC", "doctype": "Employee", "employee_name": "_Test Employee 1", "gender": "Male", @@ -27,7 +27,7 @@ "company": "_Test Company", "date_of_birth": "1980-01-01", "date_of_joining": "2010-01-01", - "department": "_Test Department 1", + "department": "_Test Department 1 - _TC", "doctype": "Employee", "employee_name": "_Test Employee 2", "gender": "Male", diff --git a/erpnext/hr/doctype/employee_advance/employee_advance.js b/erpnext/hr/doctype/employee_advance/employee_advance.js index a9407be435e..f4285a2ca21 100644 --- a/erpnext/hr/doctype/employee_advance/employee_advance.js +++ b/erpnext/hr/doctype/employee_advance/employee_advance.js @@ -84,15 +84,17 @@ frappe.ui.form.on('Employee Advance', { }, employee: function (frm) { - return frappe.call({ - method: "erpnext.hr.doctype.employee_advance.employee_advance.get_due_advance_amount", - args: { - "employee": frm.doc.employee, - "posting_date": frm.doc.posting_date - }, - callback: function(r) { - frm.set_value("due_advance_amount",r.message); - } - }); + if (frm.doc.employee) { + return frappe.call({ + method: "erpnext.hr.doctype.employee_advance.employee_advance.get_due_advance_amount", + args: { + "employee": frm.doc.employee, + "posting_date": frm.doc.posting_date + }, + callback: function(r) { + frm.set_value("due_advance_amount",r.message); + } + }); + } } }); diff --git a/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.json b/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.json index f31bcf8e990..256e056ec1a 100644 --- a/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.json +++ b/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.json @@ -235,7 +235,7 @@ "hide_toolbar": 1, "idx": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 1, "istable": 0, diff --git a/erpnext/hr/doctype/employee_education/employee_education.json b/erpnext/hr/doctype/employee_education/employee_education.json index e41c6ca9434..ef216e37031 100644 --- a/erpnext/hr/doctype/employee_education/employee_education.json +++ b/erpnext/hr/doctype/employee_education/employee_education.json @@ -174,7 +174,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/hr/doctype/employee_external_work_history/employee_external_work_history.json b/erpnext/hr/doctype/employee_external_work_history/employee_external_work_history.json index fcabbbc295b..f357b20227c 100644 --- a/erpnext/hr/doctype/employee_external_work_history/employee_external_work_history.json +++ b/erpnext/hr/doctype/employee_external_work_history/employee_external_work_history.json @@ -172,7 +172,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/hr/doctype/employee_internal_work_history/employee_internal_work_history.json b/erpnext/hr/doctype/employee_internal_work_history/employee_internal_work_history.json index 3d277afc255..98632b6b253 100644 --- a/erpnext/hr/doctype/employee_internal_work_history/employee_internal_work_history.json +++ b/erpnext/hr/doctype/employee_internal_work_history/employee_internal_work_history.json @@ -148,7 +148,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/hr/doctype/employee_onboarding/employee_onboarding.json b/erpnext/hr/doctype/employee_onboarding/employee_onboarding.json index bd2ec4ce9da..257ee32b0f3 100644 --- a/erpnext/hr/doctype/employee_onboarding/employee_onboarding.json +++ b/erpnext/hr/doctype/employee_onboarding/employee_onboarding.json @@ -19,38 +19,7 @@ "bold": 0, "collapsible": 0, "columns": 0, - "fieldname": "employee_name", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Employee Name", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "employee", + "fieldname": "job_applicant", "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, @@ -59,18 +28,18 @@ "in_global_search": 0, "in_list_view": 0, "in_standard_filter": 0, - "label": "Employee", + "label": "Job Applicant", "length": 0, "no_copy": 0, - "options": "Employee", + "options": "Job Applicant", "permlevel": 0, "precision": "", "print_hide": 0, "print_hide_if_no_value": 0, - "read_only": 1, + "read_only": 0, "remember_last_selected_value": 0, "report_hide": 0, - "reqd": 0, + "reqd": 1, "search_index": 0, "set_only_once": 0, "translatable": 0, @@ -114,19 +83,19 @@ "bold": 0, "collapsible": 0, "columns": 0, - "fieldname": "job_applicant", - "fieldtype": "Link", + "fieldname": "employee_name", + "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, "in_global_search": 0, - "in_list_view": 0, + "in_list_view": 1, "in_standard_filter": 0, - "label": "Job Applicant", + "label": "Employee Name", "length": 0, "no_copy": 0, - "options": "Job Applicant", + "options": "job_applicant.applicant_name", "permlevel": 0, "precision": "", "print_hide": 0, @@ -140,6 +109,38 @@ "translatable": 0, "unique": 0 }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "employee", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Employee", + "length": 0, + "no_copy": 0, + "options": "Employee", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, { "allow_bulk_edit": 0, "allow_on_submit": 0, @@ -530,7 +531,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2018-05-10 06:34:21.103617", + "modified": "2018-05-16 05:01:09.897011", "modified_by": "Administrator", "module": "HR", "name": "Employee Onboarding", @@ -557,7 +558,7 @@ "write": 1 } ], - "quick_entry": 1, + "quick_entry": 0, "read_only": 0, "read_only_onload": 0, "show_name_in_global_search": 0, diff --git a/erpnext/hr/doctype/employee_tax_exemption_proof_submission/test_employee_tax_exemption_proof_submission.py b/erpnext/hr/doctype/employee_tax_exemption_proof_submission/test_employee_tax_exemption_proof_submission.py index 4b5777bcabb..e54d9193ba7 100644 --- a/erpnext/hr/doctype/employee_tax_exemption_proof_submission/test_employee_tax_exemption_proof_submission.py +++ b/erpnext/hr/doctype/employee_tax_exemption_proof_submission/test_employee_tax_exemption_proof_submission.py @@ -5,50 +5,50 @@ from __future__ import unicode_literals import frappe import unittest -from erpnext.hr.doctype.employee_tax_exemption_declaration.test_employee_tax_exemption_declaration import create_exemption_category, create_payroll_period - -class TestEmployeeTaxExemptionProofSubmission(unittest.TestCase): - def setup(self): - make_employee("employee@proofsubmission.com") - create_payroll_period() - create_exemption_category() - frappe.db.sql("""delete from `tabEmployee Tax Exemption Proof Submission`""") - - def test_exemption_amount_lesser_than_category_max(self): - declaration = frappe.get_doc({ - "doctype": "Employee Tax Exemption Proof Submission", - "employee": frappe.get_value("Employee", {"user_id":"employee@proofsubmission.com"}, "name"), - "payroll_period": "Test Payroll Period", - "tax_exemption_proofs": [dict(exemption_sub_category = "_Test Sub Category", - type_of_proof = "Test Proof", - exemption_category = "_Test Category", - amount = 150000)] - }) - self.assertRaises(frappe.ValidationError, declaration.save) - declaration = frappe.get_doc({ - "doctype": "Employee Tax Exemption Proof Submission", - "payroll_period": "Test Payroll Period", - "employee": frappe.get_value("Employee", {"user_id":"employee@proofsubmission.com"}, "name"), - "tax_exemption_proofs": [dict(exemption_sub_category = "_Test Sub Category", - type_of_proof = "Test Proof", - exemption_category = "_Test Category", - amount = 100000)] - }) - self.assertTrue(declaration.save) - self.assertTrue(declaration.submit) - - def test_duplicate_category_in_proof_submission(self): - declaration = frappe.get_doc({ - "doctype": "Employee Tax Exemption Proof Submission", - "employee": frappe.get_value("Employee", {"user_id":"employee@proofsubmission.com"}, "name"), - "payroll_period": "Test Payroll Period", - "tax_exemption_proofs": [dict(exemption_sub_category = "_Test Sub Category", - exemption_category = "_Test Category", - type_of_proof = "Test Proof", - amount = 100000), - dict(exemption_sub_category = "_Test Sub Category", - exemption_category = "_Test Category", - amount = 50000), - ] - }) - self.assertRaises(frappe.ValidationError, declaration.save) +# from erpnext.hr.doctype.employee_tax_exemption_declaration.test_employee_tax_exemption_declaration import create_exemption_category, create_payroll_period +# +# class TestEmployeeTaxExemptionProofSubmission(unittest.TestCase): +# def setup(self): +# make_employee("employee@proofsubmission.com") +# create_payroll_period() +# create_exemption_category() +# frappe.db.sql("""delete from `tabEmployee Tax Exemption Proof Submission`""") +# +# def test_exemption_amount_lesser_than_category_max(self): +# declaration = frappe.get_doc({ +# "doctype": "Employee Tax Exemption Proof Submission", +# "employee": frappe.get_value("Employee", {"user_id":"employee@proofsubmission.com"}, "name"), +# "payroll_period": "Test Payroll Period", +# "tax_exemption_proofs": [dict(exemption_sub_category = "_Test Sub Category", +# type_of_proof = "Test Proof", +# exemption_category = "_Test Category", +# amount = 150000)] +# }) +# self.assertRaises(frappe.ValidationError, declaration.save) +# declaration = frappe.get_doc({ +# "doctype": "Employee Tax Exemption Proof Submission", +# "payroll_period": "Test Payroll Period", +# "employee": frappe.get_value("Employee", {"user_id":"employee@proofsubmission.com"}, "name"), +# "tax_exemption_proofs": [dict(exemption_sub_category = "_Test Sub Category", +# type_of_proof = "Test Proof", +# exemption_category = "_Test Category", +# amount = 100000)] +# }) +# self.assertTrue(declaration.save) +# self.assertTrue(declaration.submit) +# +# def test_duplicate_category_in_proof_submission(self): +# declaration = frappe.get_doc({ +# "doctype": "Employee Tax Exemption Proof Submission", +# "employee": frappe.get_value("Employee", {"user_id":"employee@proofsubmission.com"}, "name"), +# "payroll_period": "Test Payroll Period", +# "tax_exemption_proofs": [dict(exemption_sub_category = "_Test Sub Category", +# exemption_category = "_Test Category", +# type_of_proof = "Test Proof", +# amount = 100000), +# dict(exemption_sub_category = "_Test Sub Category", +# exemption_category = "_Test Category", +# amount = 50000), +# ] +# }) +# self.assertRaises(frappe.ValidationError, declaration.save) diff --git a/erpnext/hr/doctype/employment_type/employment_type.json b/erpnext/hr/doctype/employment_type/employment_type.json index da84ce43f38..9dcae3c2303 100644 --- a/erpnext/hr/doctype/employment_type/employment_type.json +++ b/erpnext/hr/doctype/employment_type/employment_type.json @@ -48,7 +48,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 0, diff --git a/erpnext/hr/doctype/expense_claim_account/expense_claim_account.json b/erpnext/hr/doctype/expense_claim_account/expense_claim_account.json index a2bbe0b86fc..c7d71d31c1a 100644 --- a/erpnext/hr/doctype/expense_claim_account/expense_claim_account.json +++ b/erpnext/hr/doctype/expense_claim_account/expense_claim_account.json @@ -68,7 +68,7 @@ "idx": 0, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json index f59111af78c..b60ba5f48ae 100644 --- a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json +++ b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json @@ -101,7 +101,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 0, diff --git a/erpnext/hr/doctype/holiday/holiday.json b/erpnext/hr/doctype/holiday/holiday.json index cc65631738a..6498530eb16 100644 --- a/erpnext/hr/doctype/holiday/holiday.json +++ b/erpnext/hr/doctype/holiday/holiday.json @@ -68,7 +68,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/hr/doctype/identification_document_type/__init__.py b/erpnext/hr/doctype/identification_document_type/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/hr/doctype/identification_document_type/identification_document_type.js b/erpnext/hr/doctype/identification_document_type/identification_document_type.js new file mode 100644 index 00000000000..351cf9d9ff9 --- /dev/null +++ b/erpnext/hr/doctype/identification_document_type/identification_document_type.js @@ -0,0 +1,8 @@ +// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Identification Document Type', { + refresh: function(frm) { + + } +}); diff --git a/erpnext/hr/doctype/identification_document_type/identification_document_type.json b/erpnext/hr/doctype/identification_document_type/identification_document_type.json new file mode 100644 index 00000000000..33cbde74099 --- /dev/null +++ b/erpnext/hr/doctype/identification_document_type/identification_document_type.json @@ -0,0 +1,93 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "autoname": "field:identification_document_type", + "beta": 0, + "creation": "2018-05-15 07:13:28.620570", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "identification_document_type", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Identification Document Type", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 0, + "max_attachments": 0, + "modified": "2018-05-16 04:34:00.448680", + "modified_by": "Administrator", + "module": "HR", + "name": "Identification Document Type", + "name_case": "", + "owner": "Administrator", + "permissions": [ + { + "amend": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + } + ], + "quick_entry": 1, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 0, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/hr/doctype/identification_document_type/identification_document_type.py b/erpnext/hr/doctype/identification_document_type/identification_document_type.py new file mode 100644 index 00000000000..d9d81d2fa8f --- /dev/null +++ b/erpnext/hr/doctype/identification_document_type/identification_document_type.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document + +class IdentificationDocumentType(Document): + pass diff --git a/erpnext/hr/doctype/identification_document_type/test_identification_document_type.js b/erpnext/hr/doctype/identification_document_type/test_identification_document_type.js new file mode 100644 index 00000000000..65879098e87 --- /dev/null +++ b/erpnext/hr/doctype/identification_document_type/test_identification_document_type.js @@ -0,0 +1,23 @@ +/* eslint-disable */ +// rename this file from _test_[name] to test_[name] to activate +// and remove above this line + +QUnit.test("test: Identification Document Type", function (assert) { + let done = assert.async(); + + // number of asserts + assert.expect(1); + + frappe.run_serially([ + // insert a new Identification Document Type + () => frappe.tests.make('Identification Document Type', [ + // values to be set + {key: 'value'} + ]), + () => { + assert.equal(cur_frm.doc.key, 'value'); + }, + () => done() + ]); + +}); diff --git a/erpnext/hr/doctype/identification_document_type/test_identification_document_type.py b/erpnext/hr/doctype/identification_document_type/test_identification_document_type.py new file mode 100644 index 00000000000..1265afaf457 --- /dev/null +++ b/erpnext/hr/doctype/identification_document_type/test_identification_document_type.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors +# See license.txt +from __future__ import unicode_literals + +import frappe +import unittest + +class TestIdentificationDocumentType(unittest.TestCase): + pass diff --git a/erpnext/hr/doctype/interest/interest.json b/erpnext/hr/doctype/interest/interest.json index 955c40f54dc..d6d2342ab69 100644 --- a/erpnext/hr/doctype/interest/interest.json +++ b/erpnext/hr/doctype/interest/interest.json @@ -42,7 +42,7 @@ "idx": 0, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 0, diff --git a/erpnext/hr/doctype/job_applicant/job_applicant.json b/erpnext/hr/doctype/job_applicant/job_applicant.json index 2a97f2804b7..dc8d82c082d 100644 --- a/erpnext/hr/doctype/job_applicant/job_applicant.json +++ b/erpnext/hr/doctype/job_applicant/job_applicant.json @@ -249,7 +249,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 0, diff --git a/erpnext/hr/doctype/leave_application/leave_application.js b/erpnext/hr/doctype/leave_application/leave_application.js index 5f1c8830fb3..7a6b24658b3 100755 --- a/erpnext/hr/doctype/leave_application/leave_application.js +++ b/erpnext/hr/doctype/leave_application/leave_application.js @@ -50,8 +50,11 @@ frappe.ui.form.on("Leave Application", { date: frm.doc.posting_date }, callback: function(r) { - if (!r.exc && r.message) { - leave_details = r.message; + if (!r.exc && r.message['leave_allocation']) { + leave_details = r.message['leave_allocation']; + } + if (!r.exc && r.message['leave_approver']) { + frm.set_value('leave_approver', r.message['leave_approver']); } } }); @@ -74,6 +77,13 @@ frappe.ui.form.on("Leave Application", { if(frm.doc.__islocal && !in_list(frappe.user_roles, "Employee")) { frm.set_intro(__("Fill the form and save it")); } + + if (!frm.doc.employee && frappe.defaults.get_user_permissions()) { + const perm = frappe.defaults.get_user_permissions(); + if (perm && perm['Employee']) { + frm.set_value('employee', perm['Employee']["docs"][0]) + } + } }, employee: function(frm) { diff --git a/erpnext/hr/doctype/leave_application/leave_application.py b/erpnext/hr/doctype/leave_application/leave_application.py index d0305c39027..c58e0cf5cc7 100755 --- a/erpnext/hr/doctype/leave_application/leave_application.py +++ b/erpnext/hr/doctype/leave_application/leave_application.py @@ -374,7 +374,12 @@ def get_leave_details(employee, date): "pending_leaves": leaves_pending, "remaining_leaves": remaining_leaves} - return leave_allocation + ret = { + 'leave_allocation': leave_allocation, + 'leave_approver': get_leave_approver(employee) + } + + return ret @frappe.whitelist() def get_leave_balance_on(employee, leave_type, date, allocation_records=None, @@ -603,3 +608,10 @@ def get_approved_leaves_for_period(employee, leave_type, from_date, to_date): return leave_days +def get_leave_approver(employee, department=None): + if not department: + department = frappe.db.get_value('Employee', employee, 'department') + + if department: + return frappe.db.get_value('Department Approver', {'parent': department, + 'parentfield': 'leave_approver', 'idx': 1}, 'approver') diff --git a/erpnext/hr/doctype/leave_application/test_leave_application.py b/erpnext/hr/doctype/leave_application/test_leave_application.py index eb43d5a9edb..9b0255983d6 100644 --- a/erpnext/hr/doctype/leave_application/test_leave_application.py +++ b/erpnext/hr/doctype/leave_application/test_leave_application.py @@ -71,7 +71,7 @@ class TestLeaveApplication(unittest.TestCase): add_role("test1@example.com", "Leave Approver") clear_user_permissions_for_doctype("Employee") - frappe.db.set_value("Department", "_Test Department", + frappe.db.set_value("Department", "_Test Department - _TC", "leave_block_list", "_Test Leave Block List") make_allocation_record() @@ -214,7 +214,7 @@ class TestLeaveApplication(unittest.TestCase): frappe.db.set_value("Leave Block List", "_Test Leave Block List", "applies_to_all_departments", 1) frappe.db.set_value("Employee", "_T-Employee-00002", "department", - "_Test Department") + "_Test Department - _TC") frappe.set_user("test1@example.com") application.insert() @@ -387,24 +387,24 @@ class TestLeaveApplication(unittest.TestCase): self.assertRaises(frappe.ValidationError, leave_application.insert) - def test_earned_leave(self): - leave_period = get_leave_period() - employee = get_employee() - - leave_type = frappe.get_doc(dict( - leave_type_name = 'Test Earned Leave Type', - doctype = 'Leave Type', - is_earned_leave = 1, - earned_leave_frequency = 'Monthly', - rounding = 0.5 - )).insert() - - allocate_leaves(employee, leave_period, leave_type.name, 0, eligible_leaves = 12) - - # this method will be called by scheduler - allocate_earned_leaves(leave_type.name, leave_period, as_on = half_of_leave_period) - - self.assertEqual(get_leave_balance(employee, leave_period, leave_type.name), 6) + # def test_earned_leave(self): + # leave_period = get_leave_period() + # employee = get_employee() + # + # leave_type = frappe.get_doc(dict( + # leave_type_name = 'Test Earned Leave Type', + # doctype = 'Leave Type', + # is_earned_leave = 1, + # earned_leave_frequency = 'Monthly', + # rounding = 0.5 + # )).insert() + # + # allocate_leaves(employee, leave_period, leave_type.name, 0, eligible_leaves = 12) + # + # # this method will be called by scheduler + # allocate_earned_leaves(leave_type.name, leave_period, as_on = half_of_leave_period) + # + # self.assertEqual(get_leave_balance(employee, leave_period, leave_type.name), 6) def make_allocation_record(employee=None, leave_type=None): diff --git a/erpnext/hr/doctype/leave_block_list/leave_block_list.json b/erpnext/hr/doctype/leave_block_list/leave_block_list.json index 16dbda8898d..fdb975ba850 100644 --- a/erpnext/hr/doctype/leave_block_list/leave_block_list.json +++ b/erpnext/hr/doctype/leave_block_list/leave_block_list.json @@ -207,7 +207,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 0, diff --git a/erpnext/hr/doctype/leave_block_list/test_leave_block_list.py b/erpnext/hr/doctype/leave_block_list/test_leave_block_list.py index 3abe4062bae..0eb69a55a70 100644 --- a/erpnext/hr/doctype/leave_block_list/test_leave_block_list.py +++ b/erpnext/hr/doctype/leave_block_list/test_leave_block_list.py @@ -14,20 +14,20 @@ class TestLeaveBlockList(unittest.TestCase): def test_get_applicable_block_dates(self): frappe.set_user("test@example.com") - frappe.db.set_value("Department", "_Test Department", "leave_block_list", + frappe.db.set_value("Department", "_Test Department - _TC", "leave_block_list", "_Test Leave Block List") self.assertTrue(getdate("2013-01-02") in [d.block_date for d in get_applicable_block_dates("2013-01-01", "2013-01-03")]) def test_get_applicable_block_dates_for_allowed_user(self): frappe.set_user("test1@example.com") - frappe.db.set_value("Department", "_Test Department 1", "leave_block_list", + frappe.db.set_value("Department", "_Test Department 1 - _TC", "leave_block_list", "_Test Leave Block List") self.assertEqual([], [d.block_date for d in get_applicable_block_dates("2013-01-01", "2013-01-03")]) def test_get_applicable_block_dates_all_lists(self): frappe.set_user("test1@example.com") - frappe.db.set_value("Department", "_Test Department 1", "leave_block_list", + frappe.db.set_value("Department", "_Test Department 1 - _TC", "leave_block_list", "_Test Leave Block List") self.assertTrue(getdate("2013-01-02") in [d.block_date for d in get_applicable_block_dates("2013-01-01", "2013-01-03", all_lists=True)]) diff --git a/erpnext/hr/doctype/leave_block_list_allow/leave_block_list_allow.json b/erpnext/hr/doctype/leave_block_list_allow/leave_block_list_allow.json index fbc2991345f..fe10c7823c2 100644 --- a/erpnext/hr/doctype/leave_block_list_allow/leave_block_list_allow.json +++ b/erpnext/hr/doctype/leave_block_list_allow/leave_block_list_allow.json @@ -42,7 +42,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/hr/doctype/leave_block_list_date/leave_block_list_date.json b/erpnext/hr/doctype/leave_block_list_date/leave_block_list_date.json index 1d0ac01c4b5..dbb903969f3 100644 --- a/erpnext/hr/doctype/leave_block_list_date/leave_block_list_date.json +++ b/erpnext/hr/doctype/leave_block_list_date/leave_block_list_date.json @@ -67,7 +67,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/hr/doctype/leave_encashment/test_leave_encashment.py b/erpnext/hr/doctype/leave_encashment/test_leave_encashment.py index a5052582a4c..4af23b17178 100644 --- a/erpnext/hr/doctype/leave_encashment/test_leave_encashment.py +++ b/erpnext/hr/doctype/leave_encashment/test_leave_encashment.py @@ -6,37 +6,37 @@ from __future__ import unicode_literals import frappe import unittest -class TestLeaveEncashment(unittest.TestCase): - def test_leave_balance_value_and_amount(self): - employee = get_employee() - leave_period = get_leave_period() - today = get_today() - - leave_type = frappe.get_doc(dict( - leave_type_name = 'Test Leave Type', - doctype = 'Leave Type', - allow_encashment = 1, - encashment_threshold_days = 3, - earning_component = 'Leave Encashment' - )).insert() - - allocate_leave(employee, leave_period, leave_type.name, 5) - - leave_encashment = frappe.get_doc(dict( - doctype = 'Leave Encashment', - employee = employee, - leave_period = leave_period, - leave_type = leave_type.name, - payroll_date = today - )).insert() - - self.assertEqual(leave_encashment.leave_balance, 5) - self.assertEqual(leave_encashment.encashable_days, 2) - - # TODO; validate value - salary_structure = get_current_structure(employee, today) - self.assertEqual(leave_encashment.encashment_value, - 2 * frappe.db.get_value('Salary Structure', salary_structure, 'leave_encashment_amount_per_day')) +# class TestLeaveEncashment(unittest.TestCase): +# def test_leave_balance_value_and_amount(self): +# employee = get_employee() +# leave_period = get_leave_period() +# today = get_today() +# +# leave_type = frappe.get_doc(dict( +# leave_type_name = 'Test Leave Type', +# doctype = 'Leave Type', +# allow_encashment = 1, +# encashment_threshold_days = 3, +# earning_component = 'Leave Encashment' +# )).insert() +# +# allocate_leave(employee, leave_period, leave_type.name, 5) +# +# leave_encashment = frappe.get_doc(dict( +# doctype = 'Leave Encashment', +# employee = employee, +# leave_period = leave_period, +# leave_type = leave_type.name, +# payroll_date = today +# )).insert() +# +# self.assertEqual(leave_encashment.leave_balance, 5) +# self.assertEqual(leave_encashment.encashable_days, 2) +# +# # TODO; validate value +# salary_structure = get_current_structure(employee, today) +# self.assertEqual(leave_encashment.encashment_value, +# 2 * frappe.db.get_value('Salary Structure', salary_structure, 'leave_encashment_amount_per_day')) + - diff --git a/erpnext/hr/doctype/leave_period/test_leave_period.py b/erpnext/hr/doctype/leave_period/test_leave_period.py index dcf6293f111..3de9e60594c 100644 --- a/erpnext/hr/doctype/leave_period/test_leave_period.py +++ b/erpnext/hr/doctype/leave_period/test_leave_period.py @@ -6,26 +6,26 @@ from __future__ import unicode_literals import frappe import unittest -class TestLeavePeriod(unittest.TestCase): - def test_leave_grant(self): - employee = get_employee() - leave_policy = get_leave_policy() - leave_period = get_leave_period() - - frappe.db.set_value('Employee', employee, 'leave_policy', leave_policy) - - leave_period.employee = employee - - clear_leave_allocation(employee) - - leave_period.grant_leaves() - - for d in leave_policy: - self.assertEqual(get_leave_balance(employee, d.leave_type), d.annual_allocation) - - return leave_period - - def test_duplicate_grant(self): - leave_period = self.test_leave_grant() - self.assertRaises(DuplicateLeaveGrant, leave_period.grant_leaves) - +# class TestLeavePeriod(unittest.TestCase): +# def test_leave_grant(self): +# employee = get_employee() +# leave_policy = get_leave_policy() +# leave_period = get_leave_period() +# +# frappe.db.set_value('Employee', employee, 'leave_policy', leave_policy) +# +# leave_period.employee = employee +# +# clear_leave_allocation(employee) +# +# leave_period.grant_leaves() +# +# for d in leave_policy: +# self.assertEqual(get_leave_balance(employee, d.leave_type), d.annual_allocation) +# +# return leave_period +# +# def test_duplicate_grant(self): +# leave_period = self.test_leave_grant() +# self.assertRaises(DuplicateLeaveGrant, leave_period.grant_leaves) +# diff --git a/erpnext/hr/doctype/offer_term/offer_term.json b/erpnext/hr/doctype/offer_term/offer_term.json index cb059a130c2..3b7bd4250d9 100644 --- a/erpnext/hr/doctype/offer_term/offer_term.json +++ b/erpnext/hr/doctype/offer_term/offer_term.json @@ -42,7 +42,7 @@ "idx": 0, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 0, diff --git a/erpnext/hr/doctype/purpose_of_travel/__init__.py b/erpnext/hr/doctype/purpose_of_travel/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/hr/doctype/purpose_of_travel/purpose_of_travel.js b/erpnext/hr/doctype/purpose_of_travel/purpose_of_travel.js new file mode 100644 index 00000000000..a9424d6175f --- /dev/null +++ b/erpnext/hr/doctype/purpose_of_travel/purpose_of_travel.js @@ -0,0 +1,8 @@ +// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Purpose of Travel', { + refresh: function(frm) { + + } +}); diff --git a/erpnext/hr/doctype/purpose_of_travel/purpose_of_travel.json b/erpnext/hr/doctype/purpose_of_travel/purpose_of_travel.json new file mode 100644 index 00000000000..68d2d6b5706 --- /dev/null +++ b/erpnext/hr/doctype/purpose_of_travel/purpose_of_travel.json @@ -0,0 +1,93 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "autoname": "field:purpose_of_travel", + "beta": 0, + "creation": "2018-05-15 07:00:30.933908", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "purpose_of_travel", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Purpose of Travel", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 0, + "max_attachments": 0, + "modified": "2018-05-15 07:05:26.219209", + "modified_by": "Administrator", + "module": "HR", + "name": "Purpose of Travel", + "name_case": "", + "owner": "Administrator", + "permissions": [ + { + "amend": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + } + ], + "quick_entry": 1, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 0, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/hr/doctype/purpose_of_travel/purpose_of_travel.py b/erpnext/hr/doctype/purpose_of_travel/purpose_of_travel.py new file mode 100644 index 00000000000..62f62a5c249 --- /dev/null +++ b/erpnext/hr/doctype/purpose_of_travel/purpose_of_travel.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document + +class PurposeofTravel(Document): + pass diff --git a/erpnext/hr/doctype/purpose_of_travel/test_purpose_of_travel.js b/erpnext/hr/doctype/purpose_of_travel/test_purpose_of_travel.js new file mode 100644 index 00000000000..936c21ccf05 --- /dev/null +++ b/erpnext/hr/doctype/purpose_of_travel/test_purpose_of_travel.js @@ -0,0 +1,23 @@ +/* eslint-disable */ +// rename this file from _test_[name] to test_[name] to activate +// and remove above this line + +QUnit.test("test: Purpose of Travel", function (assert) { + let done = assert.async(); + + // number of asserts + assert.expect(1); + + frappe.run_serially([ + // insert a new Purpose of Travel + () => frappe.tests.make('Purpose of Travel', [ + // values to be set + {key: 'value'} + ]), + () => { + assert.equal(cur_frm.doc.key, 'value'); + }, + () => done() + ]); + +}); diff --git a/erpnext/hr/doctype/purpose_of_travel/test_purpose_of_travel.py b/erpnext/hr/doctype/purpose_of_travel/test_purpose_of_travel.py new file mode 100644 index 00000000000..ccd950dff3a --- /dev/null +++ b/erpnext/hr/doctype/purpose_of_travel/test_purpose_of_travel.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors +# See license.txt +from __future__ import unicode_literals + +import frappe +import unittest + +class TestPurposeofTravel(unittest.TestCase): + pass diff --git a/erpnext/hr/doctype/retention_bonus/retention_bonus.json b/erpnext/hr/doctype/retention_bonus/retention_bonus.json index b21d3098a1a..c1f46e590af 100644 --- a/erpnext/hr/doctype/retention_bonus/retention_bonus.json +++ b/erpnext/hr/doctype/retention_bonus/retention_bonus.json @@ -172,6 +172,37 @@ "translatable": 0, "unique": 0 }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "bonus_amount", + "fieldtype": "Currency", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Bonus Amount", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, { "allow_bulk_edit": 0, "allow_on_submit": 0, @@ -214,7 +245,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2018-05-13 15:00:55.913521", + "modified": "2018-05-16 05:20:19.226522", "modified_by": "Administrator", "module": "HR", "name": "Retention Bonus", diff --git a/erpnext/hr/doctype/salary_slip_timesheet/salary_slip_timesheet.json b/erpnext/hr/doctype/salary_slip_timesheet/salary_slip_timesheet.json index 52f829e8b56..7a9393c332a 100644 --- a/erpnext/hr/doctype/salary_slip_timesheet/salary_slip_timesheet.json +++ b/erpnext/hr/doctype/salary_slip_timesheet/salary_slip_timesheet.json @@ -67,7 +67,7 @@ "idx": 0, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/hr/doctype/salary_structure_employee/salary_structure_employee.json b/erpnext/hr/doctype/salary_structure_employee/salary_structure_employee.json index 0e238d32332..6c7a61cabbc 100644 --- a/erpnext/hr/doctype/salary_structure_employee/salary_structure_employee.json +++ b/erpnext/hr/doctype/salary_structure_employee/salary_structure_employee.json @@ -194,7 +194,7 @@ "idx": 0, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/hr/doctype/training_feedback/training_feedback.json b/erpnext/hr/doctype/training_feedback/training_feedback.json index ece6ed1d904..80c1005223e 100644 --- a/erpnext/hr/doctype/training_feedback/training_feedback.json +++ b/erpnext/hr/doctype/training_feedback/training_feedback.json @@ -309,7 +309,7 @@ "idx": 0, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 1, "issingle": 0, "istable": 0, diff --git a/erpnext/hr/doctype/training_result_employee/training_result_employee.json b/erpnext/hr/doctype/training_result_employee/training_result_employee.json index 477a8e6b2d3..c5e791a2c9e 100644 --- a/erpnext/hr/doctype/training_result_employee/training_result_employee.json +++ b/erpnext/hr/doctype/training_result_employee/training_result_employee.json @@ -233,7 +233,7 @@ "idx": 0, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/hr/doctype/travel_itinerary/__init__.py b/erpnext/hr/doctype/travel_itinerary/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/hr/doctype/travel_itinerary/travel_itinerary.json b/erpnext/hr/doctype/travel_itinerary/travel_itinerary.json new file mode 100644 index 00000000000..f887027b287 --- /dev/null +++ b/erpnext/hr/doctype/travel_itinerary/travel_itinerary.json @@ -0,0 +1,512 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "beta": 0, + "creation": "2018-05-15 07:40:59.181192", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "travel_from", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Travel From", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "travel_to", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Travel To", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "mode_of_travel", + "fieldtype": "Select", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Mode of Travel", + "length": 0, + "no_copy": 0, + "options": "\nFlight\nTrain\nTaxi\nRented Car", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "meal_preference", + "fieldtype": "Select", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Meal Preference", + "length": 0, + "no_copy": 0, + "options": "\nVegetarian\nNon-Vegetarian\nGluten Free\nNon Diary", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "travel_advance_required", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Travel Advance Required", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "depends_on": "travel_advance_required", + "fieldname": "advance_amount", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Advance Amount", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_6", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "description": "", + "fieldname": "departure_date", + "fieldtype": "Datetime", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Departure Datetime", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "description": "", + "fieldname": "arrival_date", + "fieldtype": "Datetime", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Arrival Datetime", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "lodging_required", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Lodging Required", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "depends_on": "lodging_required", + "fieldname": "preferred_area_for_lodging", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Preferred Area for Lodging", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "depends_on": "lodging_required", + "fieldname": "check_in_date", + "fieldtype": "Date", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Check-in Date", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "depends_on": "lodging_required", + "fieldname": "check_out_date", + "fieldtype": "Date", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Check-out Date", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_14", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "other_details", + "fieldtype": "Small Text", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Other Details", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 1, + "max_attachments": 0, + "modified": "2018-05-15 09:55:20.138108", + "modified_by": "Administrator", + "module": "HR", + "name": "Travel Itinerary", + "name_case": "", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/hr/doctype/travel_itinerary/travel_itinerary.py b/erpnext/hr/doctype/travel_itinerary/travel_itinerary.py new file mode 100644 index 00000000000..0b369beb134 --- /dev/null +++ b/erpnext/hr/doctype/travel_itinerary/travel_itinerary.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document + +class TravelItinerary(Document): + pass diff --git a/erpnext/hr/doctype/travel_request/__init__.py b/erpnext/hr/doctype/travel_request/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/hr/doctype/travel_request/test_travel_request.js b/erpnext/hr/doctype/travel_request/test_travel_request.js new file mode 100644 index 00000000000..7e645918239 --- /dev/null +++ b/erpnext/hr/doctype/travel_request/test_travel_request.js @@ -0,0 +1,23 @@ +/* eslint-disable */ +// rename this file from _test_[name] to test_[name] to activate +// and remove above this line + +QUnit.test("test: Travel Request", function (assert) { + let done = assert.async(); + + // number of asserts + assert.expect(1); + + frappe.run_serially([ + // insert a new Travel Request + () => frappe.tests.make('Travel Request', [ + // values to be set + {key: 'value'} + ]), + () => { + assert.equal(cur_frm.doc.key, 'value'); + }, + () => done() + ]); + +}); diff --git a/erpnext/hr/doctype/travel_request/test_travel_request.py b/erpnext/hr/doctype/travel_request/test_travel_request.py new file mode 100644 index 00000000000..dac5517aab0 --- /dev/null +++ b/erpnext/hr/doctype/travel_request/test_travel_request.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors +# See license.txt +from __future__ import unicode_literals + +import frappe +import unittest + +class TestTravelRequest(unittest.TestCase): + pass diff --git a/erpnext/hr/doctype/travel_request/travel_request.js b/erpnext/hr/doctype/travel_request/travel_request.js new file mode 100644 index 00000000000..9dd48eb38e9 --- /dev/null +++ b/erpnext/hr/doctype/travel_request/travel_request.js @@ -0,0 +1,8 @@ +// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Travel Request', { + refresh: function(frm) { + + } +}); diff --git a/erpnext/hr/doctype/travel_request/travel_request.json b/erpnext/hr/doctype/travel_request/travel_request.json new file mode 100644 index 00000000000..fffb50a24ef --- /dev/null +++ b/erpnext/hr/doctype/travel_request/travel_request.json @@ -0,0 +1,909 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "autoname": "TRQ.#####", + "beta": 0, + "creation": "2018-05-15 06:32:33.950356", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "travel_type", + "fieldtype": "Select", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Travel Type", + "length": 0, + "no_copy": 0, + "options": "\nDomestic\nInternational", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "travel_funding", + "fieldtype": "Select", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Travel Funding", + "length": 0, + "no_copy": 0, + "options": "\nRequire Full Funding\nFully Sponsored\nPartially Sponsored, Require Partial Funding", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "travel_proof", + "fieldtype": "Attach", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Copy of Invitation/Announcement", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_2", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "purpose_of_travel", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Purpose of Travel", + "length": 0, + "no_copy": 0, + "options": "Purpose of Travel", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "details_of_sponsor", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Details of Sponsor (Name, Location)", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 1, + "columns": 0, + "fieldname": "section_break_4", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Description", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "description", + "fieldtype": "Small Text", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Any other details", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 1, + "columns": 0, + "fieldname": "employee_details", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Employee Details", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "employee", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Employee", + "length": 0, + "no_copy": 0, + "options": "Employee", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "employee_name", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Employee Name", + "length": 0, + "no_copy": 0, + "options": "employee.employee_name", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "cell_number", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Contact Number", + "length": 0, + "no_copy": 0, + "options": "employee.cell_number", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "prefered_email", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Contact Email", + "length": 0, + "no_copy": 0, + "options": "employee.prefered_email", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_7", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "date_of_birth", + "fieldtype": "Date", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Date of Birth", + "length": 0, + "no_copy": 0, + "options": "employee.date_of_birth", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "personal_id_type", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Identification Document Type", + "length": 0, + "no_copy": 0, + "options": "Identification Document Type", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "personal_id_number", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Identification Document Number", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "passport_number", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Passport Number", + "length": 0, + "no_copy": 0, + "options": "employee.passport_number", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "travel_itinerary", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Travel Itinerary", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "itinerary", + "fieldtype": "Table", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "options": "Travel Itinerary", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "costing_details", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Costing Details", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "cost_center", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Cost Center", + "length": 0, + "no_copy": 0, + "options": "Cost Center", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "costings", + "fieldtype": "Table", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Costing", + "length": 0, + "no_copy": 0, + "options": "Travel Request Costing", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 1, + "columns": 0, + "fieldname": "event_details", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Event Details", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "name_of_organizer", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Name of Organizer", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "address_of_organizer", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Address of Organizer", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "other_details", + "fieldtype": "Text", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Other Details", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 0, + "max_attachments": 0, + "modified": "2018-05-16 08:38:22.543808", + "modified_by": "Administrator", + "module": "HR", + "name": "Travel Request", + "name_case": "", + "owner": "Administrator", + "permissions": [ + { + "amend": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + } + ], + "quick_entry": 0, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/hr/doctype/travel_request/travel_request.py b/erpnext/hr/doctype/travel_request/travel_request.py new file mode 100644 index 00000000000..01d3f347061 --- /dev/null +++ b/erpnext/hr/doctype/travel_request/travel_request.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document + +class TravelRequest(Document): + pass diff --git a/erpnext/hr/doctype/travel_request_costing/__init__.py b/erpnext/hr/doctype/travel_request_costing/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/hr/doctype/travel_request_costing/travel_request_costing.json b/erpnext/hr/doctype/travel_request_costing/travel_request_costing.json new file mode 100644 index 00000000000..b64b1a93439 --- /dev/null +++ b/erpnext/hr/doctype/travel_request_costing/travel_request_costing.json @@ -0,0 +1,257 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "beta": 0, + "creation": "2018-05-15 10:28:37.429581", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "expense_type", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Expense Type", + "length": 0, + "no_copy": 0, + "options": "Expense Claim Type", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_2", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "sponsored_amount", + "fieldtype": "Currency", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Sponsored Amount", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "funded_amount", + "fieldtype": "Currency", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Funded Amount", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "total_amount", + "fieldtype": "Currency", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Total Amount", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_4", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "comments", + "fieldtype": "Small Text", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Comments", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 1, + "max_attachments": 0, + "modified": "2018-05-15 10:42:07.960530", + "modified_by": "Administrator", + "module": "HR", + "name": "Travel Request Costing", + "name_case": "", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/hr/doctype/travel_request_costing/travel_request_costing.py b/erpnext/hr/doctype/travel_request_costing/travel_request_costing.py new file mode 100644 index 00000000000..9fa85e84c28 --- /dev/null +++ b/erpnext/hr/doctype/travel_request_costing/travel_request_costing.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document + +class TravelRequestCosting(Document): + pass diff --git a/erpnext/hr/doctype/vehicle_service/vehicle_service.json b/erpnext/hr/doctype/vehicle_service/vehicle_service.json index 635a0b63393..7d9d0df44cc 100644 --- a/erpnext/hr/doctype/vehicle_service/vehicle_service.json +++ b/erpnext/hr/doctype/vehicle_service/vehicle_service.json @@ -131,7 +131,7 @@ "idx": 0, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json b/erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json index 0a7443671d7..7cd30861556 100644 --- a/erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json +++ b/erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json @@ -202,7 +202,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json b/erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json index e55f562dd05..d2a0ffa84a7 100644 --- a/erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json +++ b/erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json @@ -328,7 +328,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py index 559bbdf5cd2..bbf8f71a36d 100644 --- a/erpnext/manufacturing/doctype/bom/bom.py +++ b/erpnext/manufacturing/doctype/bom/bom.py @@ -544,14 +544,16 @@ def get_bom_items_as_dict(bom, company, qty=1, fetch_exploded=1, fetch_scrap_ite item.image, item.stock_uom, item.allow_alternative_item, - item.default_warehouse, - item.expense_account as expense_account, - item.buying_cost_center as cost_center + item_default.default_warehouse, + item_default.expense_account as expense_account, + item_default.buying_cost_center as cost_center {select_columns} from - `tab{table}` bom_item, `tabBOM` bom, `tabItem` item + `tab{table}` bom_item, `tabBOM` bom, `tabItem` item, `tabItem Default` item_default where bom_item.docstatus < 2 + and item_default.parent = item.name + and item_default.company = %(company)s and bom.name = %(bom)s and bom_item.parent = bom.name and item.name = bom_item.item_code @@ -564,14 +566,14 @@ def get_bom_items_as_dict(bom, company, qty=1, fetch_exploded=1, fetch_scrap_ite query = query.format(table="BOM Explosion Item", where_conditions="", select_columns = ", bom_item.source_warehouse, (Select idx from `tabBOM Item` where item_code = bom_item.item_code and parent = %(parent)s ) as idx") - items = frappe.db.sql(query, { "parent": bom, "qty": qty, "bom": bom }, as_dict=True) + items = frappe.db.sql(query, { "parent": bom, "qty": qty, "bom": bom, "company": company }, as_dict=True) elif fetch_scrap_items: query = query.format(table="BOM Scrap Item", where_conditions="", select_columns=", bom_item.idx") - items = frappe.db.sql(query, { "qty": qty, "bom": bom }, as_dict=True) + items = frappe.db.sql(query, { "qty": qty, "bom": bom, "company": company }, as_dict=True) else: query = query.format(table="BOM Item", where_conditions="", select_columns = ", bom_item.source_warehouse, bom_item.idx") - items = frappe.db.sql(query, { "qty": qty, "bom": bom }, as_dict=True) + items = frappe.db.sql(query, { "qty": qty, "bom": bom, "company": company }, as_dict=True) for item in items: if item.item_code in item_dict: @@ -624,28 +626,18 @@ def get_children(doctype, parent=None, is_root=False, **filters): return if frappe.form_dict.parent: - bom_items = frappe.get_list('BOM Item', - fields=['item_code', 'bom_no as value', 'stock_qty'], - filters=[['parent', '=', frappe.form_dict.parent]], - order_by='idx') - - item_names = tuple(d.get('item_code') for d in bom_items) - - items = frappe.get_list('Item', - fields=['image', 'description', 'name'], - filters=[['name', 'in', item_names]]) # to get only required item dicts - - for bom_item in bom_items: - # extend bom_item dict with respective item dict - bom_item.update( - # returns an item dict from items list which matches with item_code - (item for item in items if item.get('name') - == bom_item.get('item_code')).next() - ) - bom_item.expandable = 0 if bom_item.value in ('', None) else 1 - - return bom_items - + return frappe.db.sql("""select + bom_item.item_code, + bom_item.bom_no as value, + bom_item.stock_qty, + if(ifnull(bom_item.bom_no, "")!="", 1, 0) as expandable, + item.image, + item.description + from `tabBOM Item` bom_item, tabItem item + where bom_item.parent=%s + and bom_item.item_code = item.name + order by bom_item.idx + """, frappe.form_dict.parent, as_dict=True) def get_boms_in_bottom_up_order(bom_no=None): def _get_parent(bom_no): diff --git a/erpnext/manufacturing/doctype/bom_website_item/bom_website_item.json b/erpnext/manufacturing/doctype/bom_website_item/bom_website_item.json index 7df728b1cd2..b6e20afa049 100644 --- a/erpnext/manufacturing/doctype/bom_website_item/bom_website_item.json +++ b/erpnext/manufacturing/doctype/bom_website_item/bom_website_item.json @@ -154,7 +154,7 @@ "idx": 0, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/manufacturing/doctype/bom_website_operation/bom_website_operation.json b/erpnext/manufacturing/doctype/bom_website_operation/bom_website_operation.json index 8f28dd7c453..3fad2efc0a1 100644 --- a/erpnext/manufacturing/doctype/bom_website_operation/bom_website_operation.json +++ b/erpnext/manufacturing/doctype/bom_website_operation/bom_website_operation.json @@ -154,7 +154,7 @@ "idx": 0, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/manufacturing/doctype/operation/operation.json b/erpnext/manufacturing/doctype/operation/operation.json index 69eb4498650..c231fba2faa 100644 --- a/erpnext/manufacturing/doctype/operation/operation.json +++ b/erpnext/manufacturing/doctype/operation/operation.json @@ -103,7 +103,7 @@ "idx": 0, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 0, diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.py b/erpnext/manufacturing/doctype/production_plan/production_plan.py index ee64a1670c7..006e542e4d5 100644 --- a/erpnext/manufacturing/doctype/production_plan/production_plan.py +++ b/erpnext/manufacturing/doctype/production_plan/production_plan.py @@ -293,14 +293,15 @@ class ProductionPlan(Document): for d in frappe.db.sql("""select bei.item_code, item.default_bom as bom, ifnull(sum(bei.stock_qty/ifnull(bom.quantity, 1)), 0) as qty, item.item_name, bei.description, bei.stock_uom, item.min_order_qty, bei.source_warehouse, - item.default_material_request_type, item.min_order_qty, item.default_warehouse + item.default_material_request_type, item.min_order_qty, item_default.default_warehouse from - `tabBOM Explosion Item` bei, `tabBOM` bom, `tabItem` item + `tabBOM Explosion Item` bei, `tabBOM` bom, `tabItem` item, `tabItem Default` item_default where - bom.name = bei.parent and item.name = bei.item_code - and bei.docstatus < 2 and bom.name=%s and item.is_stock_item in (1, {0}) + bom.name = bei.parent and item.name = bei.item_code and bei.docstatus < 2 + and item_default.parent = item.name and item_default.company=%s + and bom.name=%s and item.is_stock_item in (1, {0}) group by bei.item_code, bei.stock_uom""".format(self.include_non_stock_items), - data.bom_no, as_dict=1): + (self.company, data.bom_no), as_dict=1): bom_wise_item_details.setdefault(d.item_code, d) else: bom_wise_item_details = self.get_subitems(data, bom_wise_item_details, data.bom_no, 1) @@ -317,16 +318,18 @@ class ProductionPlan(Document): item.is_sub_contracted_item as is_sub_contracted, bom_item.source_warehouse, item.default_bom as default_bom, bom_item.description as description, bom_item.stock_uom as stock_uom, item.min_order_qty as min_order_qty, - item.default_warehouse + item_default.default_warehouse FROM - `tabBOM Item` bom_item, `tabBOM` bom, tabItem item + `tabBOM Item` bom_item, `tabBOM` bom, tabItem item, `tabItem Default` item_default where bom.name = bom_item.parent and bom.name = %(bom)s and bom_item.docstatus < 2 and bom_item.item_code = item.name + and item.name = item_default.parent and item_default.company = %(company)s and item.is_stock_item in (1, {0}) group by bom_item.item_code""".format(self.include_non_stock_items),{ 'bom': bom_no, - 'parent_qty': parent_qty + 'parent_qty': parent_qty, + 'company': self.company }, as_dict=1) for d in items: diff --git a/erpnext/manufacturing/doctype/workstation_working_hour/workstation_working_hour.json b/erpnext/manufacturing/doctype/workstation_working_hour/workstation_working_hour.json index 89ca7145b8f..a79182fb31b 100644 --- a/erpnext/manufacturing/doctype/workstation_working_hour/workstation_working_hour.json +++ b/erpnext/manufacturing/doctype/workstation_working_hour/workstation_working_hour.json @@ -129,7 +129,7 @@ "idx": 0, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/patches.txt b/erpnext/patches.txt index f1d36779464..97c6dd6014c 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -541,3 +541,4 @@ erpnext.patches.v11_0.make_location_from_warehouse erpnext.patches.v11_0.make_asset_finance_book_against_old_entries erpnext.patches.v11_0.check_buying_selling_in_currency_exchange erpnext.patches.v11_0.refactor_erpnext_shopify +erpnext.patches.v11_0.move_item_defaults_to_child_table_for_multicompany diff --git a/erpnext/patches/v11_0/move_item_defaults_to_child_table_for_multicompany.py b/erpnext/patches/v11_0/move_item_defaults_to_child_table_for_multicompany.py new file mode 100644 index 00000000000..8e17ea61dd4 --- /dev/null +++ b/erpnext/patches/v11_0/move_item_defaults_to_child_table_for_multicompany.py @@ -0,0 +1,59 @@ +# Copyright (c) 2018, Frappe and Contributors +# License: GNU General Public License v3. See license.txt + +from __future__ import unicode_literals +import frappe + +def execute(): + ''' + + Fields to move from the item to item defaults child table + [ default_warehouse, buying_cost_center, expense_account, selling_cost_center, income_account ] + + ''' + + frappe.reload_doc('stock', 'doctype', 'item_default') + frappe.reload_doc('stock', 'doctype', 'item') + + companies = frappe.get_all("Company") + if len(companies) == 1: + frappe.db.sql(''' + INSERT INTO `tabItem Default` + (name, parent, parenttype, parentfield, idx, company, default_warehouse, + buying_cost_center, selling_cost_center, expense_account, income_account, default_supplier) + SELECT + SUBSTRING(SHA2(name,224), 1, 10) as name, name as parent, 'Item' as parenttype, + 'item_defaults' as parentfield, 1 as idx, %s as company, default_warehouse, + buying_cost_center, selling_cost_center, expense_account, income_account, default_supplier + FROM `tabItem`; + ''', companies[0].name) + else: + item_details = frappe.get_all("Item", fields=["name", "default_warehouse", "buying_cost_center", + "expense_account", "selling_cost_center", "income_account"], limit=100) + + for item in item_details: + item_defaults = [] + + def insert_into_item_defaults(doc_field_name, doc_field_value, company): + for d in item_defaults: + if d.get("company") == company: + d[doc_field_name] = doc_field_value + return + item_defaults.append({ + "company": company, + doc_field_name: doc_field_value + }) + + for d in [ + ["default_warehouse", "Warehouse"], ["expense_account", "Account"], ["expense_account", "Account"], + ["buying_cost_center", "Cost Center"], ["selling_cost_center", "Cost Center"] + ]: + if item.get(d[0]): + company = frappe.get_value(d[1], item.get(d[0]), "company", cache=True) + insert_into_item_defaults(d[0], item.get(d[0]), company) + + doc = frappe.get_doc("Item", item.name) + doc.extend("item_defaults", item_defaults) + + for child_doc in doc.item_defaults: + child_doc.db_insert() \ No newline at end of file diff --git a/erpnext/portal/doctype/homepage/homepage.json b/erpnext/portal/doctype/homepage/homepage.json index e0e47d11f80..81433b1c5d8 100644 --- a/erpnext/portal/doctype/homepage/homepage.json +++ b/erpnext/portal/doctype/homepage/homepage.json @@ -199,7 +199,6 @@ "idx": 0, "image_view": 0, "in_create": 0, - "in_dialog": 0, "is_submittable": 0, "issingle": 1, "istable": 0, diff --git a/erpnext/portal/doctype/homepage_featured_product/homepage_featured_product.json b/erpnext/portal/doctype/homepage_featured_product/homepage_featured_product.json index 870c8b194ac..c8b4ae9b74e 100644 --- a/erpnext/portal/doctype/homepage_featured_product/homepage_featured_product.json +++ b/erpnext/portal/doctype/homepage_featured_product/homepage_featured_product.json @@ -280,7 +280,7 @@ "idx": 0, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/projects/doctype/activity_cost/activity_cost.json b/erpnext/projects/doctype/activity_cost/activity_cost.json index 9d812dd3bbf..78a66c4fef9 100644 --- a/erpnext/projects/doctype/activity_cost/activity_cost.json +++ b/erpnext/projects/doctype/activity_cost/activity_cost.json @@ -274,7 +274,7 @@ "idx": 0, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 0, diff --git a/erpnext/projects/doctype/dependent_task/dependent_task.json b/erpnext/projects/doctype/dependent_task/dependent_task.json index 18e6c0d4783..e00a2b287a4 100644 --- a/erpnext/projects/doctype/dependent_task/dependent_task.json +++ b/erpnext/projects/doctype/dependent_task/dependent_task.json @@ -43,7 +43,7 @@ "idx": 0, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/projects/doctype/project_user/project_user.json b/erpnext/projects/doctype/project_user/project_user.json index ea5758953dd..a7cc810a0a6 100644 --- a/erpnext/projects/doctype/project_user/project_user.json +++ b/erpnext/projects/doctype/project_user/project_user.json @@ -67,7 +67,7 @@ "idx": 0, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py index c86e6996fc0..fcaa344dfa7 100644 --- a/erpnext/projects/doctype/task/task.py +++ b/erpnext/projects/doctype/task/task.py @@ -186,25 +186,27 @@ def set_tasks_as_overdue(): @frappe.whitelist() def get_children(doctype, parent, task=None, project=None, is_root=False): - - filters = [['docstatus', '<', '2']] + conditions = '' if task: - filters.append(['parent_task', '=', task]) + # via filters + conditions += ' and parent_task = "{0}"'.format(frappe.db.escape(task)) elif parent and not is_root: # via expand child - filters.append(['parent_task', '=', parent]) + conditions += ' and parent_task = "{0}"'.format(frappe.db.escape(parent)) else: - filters.append(['parent_task', '=', '']) + conditions += ' and ifnull(parent_task, "")=""' if project: - filters.append(['project', '=', project]) + conditions += ' and project = "{0}"'.format(frappe.db.escape(project)) - tasks = frappe.get_list(doctype, fields=[ - 'name as value', - 'subject as title', - 'is_group as expandable' - ], filters=filters, order_by='name') + tasks = frappe.db.sql("""select name as value, + subject as title, + is_group as expandable + from `tabTask` + where docstatus < 2 + {conditions} + order by name""".format(conditions=conditions), as_dict=1) # return tasks return tasks diff --git a/erpnext/projects/doctype/task_depends_on/task_depends_on.json b/erpnext/projects/doctype/task_depends_on/task_depends_on.json index 25657afa92d..dbbe9d3c7b5 100644 --- a/erpnext/projects/doctype/task_depends_on/task_depends_on.json +++ b/erpnext/projects/doctype/task_depends_on/task_depends_on.json @@ -133,7 +133,7 @@ "idx": 0, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/selling/doctype/industry_type/industry_type.json b/erpnext/selling/doctype/industry_type/industry_type.json index 027626ca421..f4fcae428ec 100644 --- a/erpnext/selling/doctype/industry_type/industry_type.json +++ b/erpnext/selling/doctype/industry_type/industry_type.json @@ -44,7 +44,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 0, diff --git a/erpnext/selling/doctype/installation_note_item/installation_note_item.json b/erpnext/selling/doctype/installation_note_item/installation_note_item.json index 17bf2788270..79bcf105af2 100644 --- a/erpnext/selling/doctype/installation_note_item/installation_note_item.json +++ b/erpnext/selling/doctype/installation_note_item/installation_note_item.json @@ -238,7 +238,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/selling/doctype/lead_source/lead_source.json b/erpnext/selling/doctype/lead_source/lead_source.json index e6779158751..868f6d11d04 100644 --- a/erpnext/selling/doctype/lead_source/lead_source.json +++ b/erpnext/selling/doctype/lead_source/lead_source.json @@ -69,7 +69,7 @@ "idx": 0, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 0, diff --git a/erpnext/selling/doctype/product_bundle_item/product_bundle_item.json b/erpnext/selling/doctype/product_bundle_item/product_bundle_item.json index d31b5fb18ff..38f51dead49 100644 --- a/erpnext/selling/doctype/product_bundle_item/product_bundle_item.json +++ b/erpnext/selling/doctype/product_bundle_item/product_bundle_item.json @@ -169,7 +169,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/selling/doctype/quotation/test_quotation.py b/erpnext/selling/doctype/quotation/test_quotation.py index ced5ebf4fb4..3b36a2dca5b 100644 --- a/erpnext/selling/doctype/quotation/test_quotation.py +++ b/erpnext/selling/doctype/quotation/test_quotation.py @@ -150,12 +150,10 @@ class TestQuotation(unittest.TestCase): from erpnext.stock.doctype.item.test_item import make_item first_item = make_item("_Test Laptop", - {"is_stock_item": 1, "expense_account": "_Test Account Cost for Goods Sold - _TC", - "cost_center": "_Test Cost Center - _TC"}) + {"is_stock_item": 1}) second_item = make_item("_Test CPU", - {"is_stock_item": 1, "expense_account": "_Test Account Cost for Goods Sold - _TC", - "cost_center": "_Test Cost Center - _TC"}) + {"is_stock_item": 1}) qo_item1 = [ { diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 7e6c3dcbae8..7fe61c99e50 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -15,6 +15,8 @@ from frappe.contacts.doctype.address.address import get_company_address from erpnext.controllers.selling_controller import SellingController from frappe.desk.doctype.auto_repeat.auto_repeat import get_next_schedule_date from erpnext.selling.doctype.customer.customer import check_credit_limit +from erpnext.stock.doctype.item.item import get_item_defaults + form_grid_templates = { "items": "templates/form_grid/item_grid.html" @@ -493,11 +495,11 @@ def make_delivery_note(source_name, target_doc=None): target.amount = (flt(source.qty) - flt(source.delivered_qty)) * flt(source.rate) target.qty = flt(source.qty) - flt(source.delivered_qty) - item = frappe.db.get_value("Item", target.item_code, ["item_group", "selling_cost_center"], as_dict=1) + item = get_item_defaults(target.item_code, source_parent.company) if item: target.cost_center = frappe.db.get_value("Project", source_parent.project, "cost_center") \ - or item.selling_cost_center \ + or item.get("selling_cost_center") \ or frappe.db.get_value("Item Group", item.item_group, "default_cost_center") target_doc = get_mapped_doc("Sales Order", source_name, { @@ -557,8 +559,8 @@ def make_sales_invoice(source_name, target_doc=None, ignore_permissions=False): if source_parent.project: target.cost_center = frappe.db.get_value("Project", source_parent.project, "cost_center") if not target.cost_center and target.item_code: - item = frappe.db.get_value("Item", target.item_code, ["item_group", "selling_cost_center"], as_dict=1) - target.cost_center = item.selling_cost_center \ + item = get_item_defaults(target.item_code, target.company) + target.cost_center = item.get("selling_cost_center") \ or frappe.db.get_value("Item Group", item.item_group, "default_cost_center") doclist = get_mapped_doc("Sales Order", source_name, { diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py index c5f7ef22ec2..83889412f40 100644 --- a/erpnext/selling/doctype/sales_order/test_sales_order.py +++ b/erpnext/selling/doctype/sales_order/test_sales_order.py @@ -359,14 +359,9 @@ class TestSalesOrder(unittest.TestCase): make_stock_entry(target="_Test Warehouse - _TC", qty=10, rate=100) - po_item = make_item("_Test Item for Drop Shipping", {"is_stock_item": 1, "delivered_by_supplier": 1, - 'default_supplier': '_Test Supplier', - "expense_account": "_Test Account Cost for Goods Sold - _TC", - "cost_center": "_Test Cost Center - _TC" - }) + po_item = make_item("_Test Item for Drop Shipping", {"is_stock_item": 1, "delivered_by_supplier": 1}) - dn_item = make_item("_Test Regular Item", {"is_stock_item": 1, "expense_account": "_Test Account Cost for Goods Sold - _TC", - "cost_center": "_Test Cost Center - _TC"}) + dn_item = make_item("_Test Regular Item", {"is_stock_item": 1}) so_items = [ { diff --git a/erpnext/selling/doctype/sales_team/sales_team.json b/erpnext/selling/doctype/sales_team/sales_team.json index fcd61a19673..c77f9f4b2b4 100644 --- a/erpnext/selling/doctype/sales_team/sales_team.json +++ b/erpnext/selling/doctype/sales_team/sales_team.json @@ -157,7 +157,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/setup/doctype/authorization_control/authorization_control.json b/erpnext/setup/doctype/authorization_control/authorization_control.json index 43afc0610dc..823ff26f5bc 100644 --- a/erpnext/setup/doctype/authorization_control/authorization_control.json +++ b/erpnext/setup/doctype/authorization_control/authorization_control.json @@ -11,7 +11,7 @@ "hide_toolbar": 0, "idx": 1, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 1, "istable": 0, diff --git a/erpnext/setup/doctype/authorization_rule/authorization_rule.json b/erpnext/setup/doctype/authorization_rule/authorization_rule.json index 70047bc4dea..56df330795f 100644 --- a/erpnext/setup/doctype/authorization_rule/authorization_rule.json +++ b/erpnext/setup/doctype/authorization_rule/authorization_rule.json @@ -558,7 +558,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 0, diff --git a/erpnext/setup/doctype/brand/brand.json b/erpnext/setup/doctype/brand/brand.json index 8d4ba746289..064eff6e528 100644 --- a/erpnext/setup/doctype/brand/brand.json +++ b/erpnext/setup/doctype/brand/brand.json @@ -79,7 +79,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 0, diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py index a2feddc529c..9e9ac5594fc 100644 --- a/erpnext/setup/doctype/company/company.py +++ b/erpnext/setup/doctype/company/company.py @@ -291,9 +291,6 @@ class Company(NestedSet): Trash accounts and cost centers for this company if no gl entry exists """ self.update_nsm_model() - accounts = frappe.db.sql_list("select name from tabAccount where company=%s", self.name) - cost_centers = frappe.db.sql_list("select name from `tabCost Center` where company=%s", self.name) - warehouses = frappe.db.sql_list("select name from tabWarehouse where company=%s", self.name) rec = frappe.db.sql("SELECT name from `tabGL Entry` where company = %s", self.name) if not rec: @@ -308,33 +305,19 @@ class Company(NestedSet): frappe.db.sql("""delete from `tabWarehouse` where company=%s""", self.name) frappe.defaults.clear_default("company", value=self.name) - frappe.db.sql("delete from `tabMode of Payment Account` where company=%s", self.name) + for doctype in ["Mode of Payment Account", "Item Default"]: + frappe.db.sql("delete from `tab{0}` where company = %s".format(doctype), self.name) # clear default accounts, warehouses from item + warehouses = frappe.db.sql_list("select name from tabWarehouse where company=%s", self.name) if warehouses: - for f in ["default_warehouse", "website_warehouse"]: - frappe.db.sql("""update tabItem set %s=NULL where %s in (%s)""" - % (f, f, ', '.join(['%s']*len(warehouses))), tuple(warehouses)) - frappe.db.sql("""delete from `tabItem Reorder` where warehouse in (%s)""" % ', '.join(['%s']*len(warehouses)), tuple(warehouses)) - if accounts: - for f in ["income_account", "expense_account"]: - frappe.db.sql("""update tabItem set %s=NULL where %s in (%s)""" - % (f, f, ', '.join(['%s']*len(accounts))), tuple(accounts)) - - if cost_centers: - for f in ["selling_cost_center", "buying_cost_center"]: - frappe.db.sql("""update tabItem set %s=NULL where %s in (%s)""" - % (f, f, ', '.join(['%s']*len(cost_centers))), tuple(cost_centers)) - # reset default company frappe.db.sql("""update `tabSingles` set value="" where doctype='Global Defaults' and field='default_company' and value=%s""", self.name) - # delete mode of payment account - frappe.db.sql("delete from `tabMode of Payment Account` where company=%s", self.name) # delete BOMs boms = frappe.db.sql_list("select name from tabBOM where company=%s", self.name) diff --git a/erpnext/setup/doctype/customer_group/customer_group.json b/erpnext/setup/doctype/customer_group/customer_group.json index 062a49a9ada..3392c6c4f03 100644 --- a/erpnext/setup/doctype/customer_group/customer_group.json +++ b/erpnext/setup/doctype/customer_group/customer_group.json @@ -379,7 +379,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 0, diff --git a/erpnext/setup/doctype/email_digest/email_digest.json b/erpnext/setup/doctype/email_digest/email_digest.json index a75a59a0582..12f275c75dd 100644 --- a/erpnext/setup/doctype/email_digest/email_digest.json +++ b/erpnext/setup/doctype/email_digest/email_digest.json @@ -1073,7 +1073,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 0, diff --git a/erpnext/setup/doctype/global_defaults/global_defaults.json b/erpnext/setup/doctype/global_defaults/global_defaults.json index ce3f2cf1eae..a6c59649e81 100644 --- a/erpnext/setup/doctype/global_defaults/global_defaults.json +++ b/erpnext/setup/doctype/global_defaults/global_defaults.json @@ -225,7 +225,7 @@ "icon": "fa fa-cog", "idx": 1, "in_create": 1, - "in_dialog": 0, + "is_submittable": 0, "is_transaction_doc": 0, "issingle": 1, diff --git a/erpnext/setup/doctype/item_group/item_group.json b/erpnext/setup/doctype/item_group/item_group.json index 6230706affb..29486b2d1cb 100644 --- a/erpnext/setup/doctype/item_group/item_group.json +++ b/erpnext/setup/doctype/item_group/item_group.json @@ -525,7 +525,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 0, diff --git a/erpnext/setup/doctype/print_heading/print_heading.json b/erpnext/setup/doctype/print_heading/print_heading.json index d992fcb901f..dc07f0c8d83 100644 --- a/erpnext/setup/doctype/print_heading/print_heading.json +++ b/erpnext/setup/doctype/print_heading/print_heading.json @@ -71,7 +71,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 0, diff --git a/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json b/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json index b95a936090a..5d778eec0b4 100644 --- a/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json +++ b/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json @@ -44,7 +44,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 0, diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.json b/erpnext/setup/doctype/sales_partner/sales_partner.json index 6c2d70545ca..3c31c23fc88 100644 --- a/erpnext/setup/doctype/sales_partner/sales_partner.json +++ b/erpnext/setup/doctype/sales_partner/sales_partner.json @@ -712,7 +712,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 0, diff --git a/erpnext/setup/doctype/sales_person/sales_person.json b/erpnext/setup/doctype/sales_person/sales_person.json index 9f46501516a..b25f6a79170 100644 --- a/erpnext/setup/doctype/sales_person/sales_person.json +++ b/erpnext/setup/doctype/sales_person/sales_person.json @@ -412,7 +412,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 0, diff --git a/erpnext/setup/doctype/target_detail/target_detail.json b/erpnext/setup/doctype/target_detail/target_detail.json index 9bc8550e15a..509733b1aaa 100644 --- a/erpnext/setup/doctype/target_detail/target_detail.json +++ b/erpnext/setup/doctype/target_detail/target_detail.json @@ -122,7 +122,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json index 40e54d87530..5f254063b8b 100644 --- a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json +++ b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json @@ -138,7 +138,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 0, diff --git a/erpnext/setup/doctype/territory/territory.json b/erpnext/setup/doctype/territory/territory.json index b123d5e1acb..81c2839f230 100644 --- a/erpnext/setup/doctype/territory/territory.json +++ b/erpnext/setup/doctype/territory/territory.json @@ -357,7 +357,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 0, diff --git a/erpnext/setup/doctype/uom/uom.json b/erpnext/setup/doctype/uom/uom.json index e752d0f5a06..e4322fe48ab 100644 --- a/erpnext/setup/doctype/uom/uom.json +++ b/erpnext/setup/doctype/uom/uom.json @@ -77,7 +77,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 0, diff --git a/erpnext/setup/doctype/website_item_group/website_item_group.json b/erpnext/setup/doctype/website_item_group/website_item_group.json index 73084b556d3..8176e4026e6 100644 --- a/erpnext/setup/doctype/website_item_group/website_item_group.json +++ b/erpnext/setup/doctype/website_item_group/website_item_group.json @@ -43,7 +43,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js index fbf0deddc72..cdfbcaeb4a3 100644 --- a/erpnext/stock/doctype/item/item.js +++ b/erpnext/stock/doctype/item/item.js @@ -216,25 +216,25 @@ var set_customer_group = function(frm, cdt, cdn) { $.extend(erpnext.item, { setup_queries: function(frm) { - frm.fields_dict['expense_account'].get_query = function(doc) { + frm.fields_dict["item_defaults"].grid.get_field("expense_account").get_query = function(doc) { return { query: "erpnext.controllers.queries.get_expense_account", } } - frm.fields_dict['income_account'].get_query = function(doc) { + frm.fields_dict["item_defaults"].grid.get_field("income_account").get_query = function(doc) { return { query: "erpnext.controllers.queries.get_income_account" } } - frm.fields_dict['buying_cost_center'].get_query = function(doc) { + frm.fields_dict["item_defaults"].grid.get_field("buying_cost_center").get_query = function(doc) { return { filters: { "is_group": 0 } } } - frm.fields_dict['selling_cost_center'].get_query = function(doc) { + frm.fields_dict["item_defaults"].grid.get_field("selling_cost_center").get_query = function(doc) { return { filters: { "is_group": 0 } } @@ -267,7 +267,7 @@ $.extend(erpnext.item, { return { query: "erpnext.controllers.queries.supplier_query" } } - frm.fields_dict['default_warehouse'].get_query = function(doc) { + frm.fields_dict["item_defaults"].grid.get_field("default_warehouse").get_query = function(doc) { return { filters: { "is_group": 0 } } @@ -472,7 +472,8 @@ $.extend(erpnext.item, { fields: ["attribute_value"], limit_start: 0, limit_page_length: 500, - parent: "Item" + parent: "Item", + order_by: "idx" } }).then((r) => { if(r.message) { diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json index 5013e23837e..c4a3fc1b4f2 100644 --- a/erpnext/stock/doctype/item/item.json +++ b/erpnext/stock/doctype/item/item.json @@ -496,6 +496,38 @@ "translatable": 0, "unique": 0 }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "depends_on": "is_fixed_asset", + "fieldname": "asset_naming_series", + "fieldtype": "Select", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Asset Naming Series", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, { "allow_bulk_edit": 0, "allow_on_submit": 0, @@ -755,41 +787,6 @@ "translatable": 0, "unique": 0 }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "is_stock_item", - "description": "", - "fieldname": "default_warehouse", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 1, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Default Warehouse", - "length": 0, - "no_copy": 0, - "oldfieldname": "default_warehouse", - "oldfieldtype": "Link", - "options": "Warehouse", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, { "allow_bulk_edit": 0, "allow_on_submit": 0, @@ -888,38 +885,6 @@ "translatable": 0, "unique": 0 }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "is_stock_item", - "fieldname": "column_break1", - "fieldtype": "Column Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "length": 0, - "no_copy": 0, - "oldfieldtype": "Column Break", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0, - "width": "50%" - }, { "allow_bulk_edit": 0, "allow_on_submit": 0, @@ -952,6 +917,38 @@ "translatable": 0, "unique": 0 }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "depends_on": "is_stock_item", + "fieldname": "column_break1", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "oldfieldtype": "Column Break", + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0, + "width": "50%" + }, { "allow_bulk_edit": 0, "allow_on_submit": 0, @@ -1187,7 +1184,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, - "collapsible_depends_on": "eval:doc.has_batch_no || doc.has_serial_no", + "collapsible_depends_on": "eval:doc.has_batch_no || doc.has_serial_no || doc.is_fixed_asset", "columns": 0, "depends_on": "is_stock_item", "fieldname": "serial_nos_and_batches", @@ -1417,7 +1414,7 @@ "collapsible": 0, "columns": 0, "default": "", - "depends_on": "eval:doc.is_stock_item", + "depends_on": "eval:doc.is_stock_item || doc.is_fixed_asset", "description": "", "fieldname": "has_serial_no", "fieldtype": "Check", @@ -1452,7 +1449,7 @@ "bold": 0, "collapsible": 0, "columns": 0, - "depends_on": "has_serial_no", + "depends_on": "eval:doc.is_stock_item || doc.is_fixed_asset", "description": "Example: ABCD.#####\nIf series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.", "fieldname": "serial_no_series", "fieldtype": "Data", @@ -1613,6 +1610,69 @@ "translatable": 0, "unique": 0 }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 1, + "columns": 0, + "fieldname": "defaults", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Defaults", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "item_defaults", + "fieldtype": "Table", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Item Defaults", + "length": 0, + "no_copy": 0, + "options": "Item Default", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, { "allow_bulk_edit": 0, "allow_on_submit": 0, @@ -1840,76 +1900,6 @@ "translatable": 0, "unique": 0 }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "", - "description": "", - "fieldname": "buying_cost_center", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 1, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Default Buying Cost Center", - "length": 0, - "no_copy": 0, - "oldfieldname": "cost_center", - "oldfieldtype": "Link", - "options": "Cost Center", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "", - "description": "", - "fieldname": "expense_account", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 1, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Default Expense Account", - "length": 0, - "no_copy": 0, - "oldfieldname": "purchase_account", - "oldfieldtype": "Link", - "options": "Account", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, { "allow_bulk_edit": 0, "allow_on_submit": 0, @@ -1975,38 +1965,6 @@ "translatable": 0, "unique": 0 }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "", - "fieldname": "default_supplier", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 1, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Default Supplier", - "length": 0, - "no_copy": 0, - "options": "Supplier", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, { "allow_bulk_edit": 0, "allow_on_submit": 0, @@ -2355,38 +2313,6 @@ "translatable": 0, "unique": 0 }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "", - "fieldname": "income_account", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 1, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Default Income Account", - "length": 0, - "no_copy": 0, - "options": "Account", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, { "allow_bulk_edit": 0, "allow_on_submit": 0, @@ -2452,38 +2378,6 @@ "unique": 0, "width": "50%" }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "", - "fieldname": "selling_cost_center", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 1, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Default Selling Cost Center", - "length": 0, - "no_copy": 0, - "options": "Cost Center", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, { "allow_bulk_edit": 0, "allow_on_submit": 0, @@ -3666,402 +3560,370 @@ "search_index": 0, "set_only_once": 0, "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 1, - "collapsible": 0, - "columns": 0, - "depends_on": "eval:(doc.__islocal&&doc.is_stock_item && !doc.has_serial_no && !doc.has_batch_no)", - "fieldname": "opening_stock", - "fieldtype": "Float", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Opening Stock", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "is_stock_item", - "fieldname": "valuation_rate", - "fieldtype": "Currency", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Valuation Rate", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 1, + "collapsible": 0, + "columns": 0, + "depends_on": "eval:(doc.__islocal&&doc.is_stock_item && !doc.has_serial_no && !doc.has_batch_no)", + "fieldname": "opening_stock", + "fieldtype": "Float", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Opening Stock", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 1, - "collapsible": 0, - "columns": 0, - "depends_on": "eval:doc.__islocal", - "fieldname": "standard_rate", - "fieldtype": "Currency", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Standard Selling Rate", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "depends_on": "is_stock_item", + "fieldname": "valuation_rate", + "fieldtype": "Currency", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Valuation Rate", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "is_fixed_asset", - "fieldname": "asset_naming_series", - "fieldtype": "Select", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Asset Naming Series", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 1, + "collapsible": 0, + "columns": 0, + "depends_on": "eval:doc.__islocal", + "fieldname": "standard_rate", + "fieldtype": "Currency", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Standard Selling Rate", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "hub_category_to_publish", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Hub Category to Publish", - "length": 0, - "no_copy": 0, - "options": "", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "hub_category_to_publish", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Hub Category to Publish", + "length": 0, + "no_copy": 0, + "options": "", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "description": "Publish \"In Stock\" or \"Not in Stock\" on Hub based on stock available in this warehouse.", - "fieldname": "hub_warehouse", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 1, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Hub Warehouse", - "length": 0, - "no_copy": 0, - "options": "Warehouse", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "description": "Publish \"In Stock\" or \"Not in Stock\" on Hub based on stock available in this warehouse.", + "fieldname": "hub_warehouse", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 1, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Hub Warehouse", + "length": 0, + "no_copy": 0, + "options": "Warehouse", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 - }, + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "0", - "fieldname": "synced_with_hub", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Synced With Hub", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": "0", + "fieldname": "synced_with_hub", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Synced With Hub", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 } - ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "icon": "fa fa-tag", - "idx": 2, - "image_field": "image", - "image_view": 0, - "in_create": 0, - "is_submittable": 0, - "issingle": 0, - "istable": 0, - "max_attachments": 1, - "modified": "2018-05-14 14:54:24.479267", - "modified_by": "Administrator", - "module": "Stock", - "name": "Item", - "owner": "Administrator", + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "icon": "fa fa-tag", + "idx": 2, + "image_field": "image", + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 0, + "max_attachments": 1, + "modified": "2018-05-16 16:35:09.518294", + "modified_by": "Administrator", + "module": "Stock", + "name": "Item", + "owner": "Administrator", "permissions": [ { - "amend": 0, - "cancel": 0, - "create": 1, - "delete": 1, - "email": 1, - "export": 0, - "if_owner": 0, - "import": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Item Manager", - "set_user_permissions": 0, - "share": 1, - "submit": 0, + "amend": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 0, + "if_owner": 0, + "import": 1, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Item Manager", + "set_user_permissions": 0, + "share": 1, + "submit": 0, "write": 1 - }, + }, { - "amend": 0, - "cancel": 0, - "create": 0, - "delete": 0, - "email": 1, - "export": 0, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Stock Manager", - "set_user_permissions": 0, - "share": 0, - "submit": 0, + "amend": 0, + "cancel": 0, + "create": 0, + "delete": 0, + "email": 1, + "export": 0, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Stock Manager", + "set_user_permissions": 0, + "share": 0, + "submit": 0, "write": 0 - }, + }, { - "amend": 0, - "cancel": 0, - "create": 0, - "delete": 0, - "email": 1, - "export": 0, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Stock User", - "set_user_permissions": 0, - "share": 0, - "submit": 0, + "amend": 0, + "cancel": 0, + "create": 0, + "delete": 0, + "email": 1, + "export": 0, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Stock User", + "set_user_permissions": 0, + "share": 0, + "submit": 0, "write": 0 - }, + }, { - "amend": 0, - "cancel": 0, - "create": 0, - "delete": 0, - "email": 0, - "export": 0, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 0, - "read": 1, - "report": 0, - "role": "Sales User", - "set_user_permissions": 0, - "share": 0, - "submit": 0, + "amend": 0, + "cancel": 0, + "create": 0, + "delete": 0, + "email": 0, + "export": 0, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 0, + "read": 1, + "report": 0, + "role": "Sales User", + "set_user_permissions": 0, + "share": 0, + "submit": 0, "write": 0 - }, + }, { - "amend": 0, - "cancel": 0, - "create": 0, - "delete": 0, - "email": 0, - "export": 0, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 0, - "read": 1, - "report": 0, - "role": "Purchase User", - "set_user_permissions": 0, - "share": 0, - "submit": 0, + "amend": 0, + "cancel": 0, + "create": 0, + "delete": 0, + "email": 0, + "export": 0, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 0, + "read": 1, + "report": 0, + "role": "Purchase User", + "set_user_permissions": 0, + "share": 0, + "submit": 0, "write": 0 - }, + }, { - "amend": 0, - "cancel": 0, - "create": 0, - "delete": 0, - "email": 0, - "export": 0, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 0, - "read": 1, - "report": 0, - "role": "Maintenance User", - "set_user_permissions": 0, - "share": 0, - "submit": 0, + "amend": 0, + "cancel": 0, + "create": 0, + "delete": 0, + "email": 0, + "export": 0, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 0, + "read": 1, + "report": 0, + "role": "Maintenance User", + "set_user_permissions": 0, + "share": 0, + "submit": 0, "write": 0 - }, + }, { - "amend": 0, - "cancel": 0, - "create": 0, - "delete": 0, - "email": 0, - "export": 0, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 0, - "read": 1, - "report": 0, - "role": "Accounts User", - "set_user_permissions": 0, - "share": 0, - "submit": 0, + "amend": 0, + "cancel": 0, + "create": 0, + "delete": 0, + "email": 0, + "export": 0, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 0, + "read": 1, + "report": 0, + "role": "Accounts User", + "set_user_permissions": 0, + "share": 0, + "submit": 0, "write": 0 - }, + }, { - "amend": 0, - "cancel": 0, - "create": 0, - "delete": 0, - "email": 0, - "export": 0, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 0, - "read": 1, - "report": 0, - "role": "Manufacturing User", - "set_user_permissions": 0, - "share": 0, - "submit": 0, + "amend": 0, + "cancel": 0, + "create": 0, + "delete": 0, + "email": 0, + "export": 0, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 0, + "read": 1, + "report": 0, + "role": "Manufacturing User", + "set_user_permissions": 0, + "share": 0, + "submit": 0, "write": 0 } ], diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py index 945bde36fe6..068b9136821 100644 --- a/erpnext/stock/doctype/item/item.py +++ b/erpnext/stock/doctype/item/item.py @@ -81,7 +81,8 @@ class Item(WebsiteGenerator): def after_insert(self): '''set opening stock and item price''' if self.standard_rate: - self.add_price() + for default in self.item_defaults: + self.add_price(default.default_price_list) if self.opening_stock: self.set_opening_stock() @@ -124,6 +125,9 @@ class Item(WebsiteGenerator): self.old_website_item_groups = frappe.db.sql_list("""select item_group from `tabWebsite Item Group` where parentfield='website_item_groups' and parenttype='Item' and parent=%s""", self.name) + elif not self.item_defaults: + self.append("item_defaults", {"company": frappe.defaults.get_defaults().company}) + def on_update(self): invalidate_cache_for_item(self) @@ -166,15 +170,16 @@ class Item(WebsiteGenerator): from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry # default warehouse, or Stores - default_warehouse = (self.default_warehouse - or frappe.db.get_single_value('Stock Settings', 'default_warehouse') - or frappe.db.get_value('Warehouse', {'warehouse_name': _('Stores')})) + for default in self.item_defaults: + default_warehouse = (default.default_warehouse + or frappe.db.get_single_value('Stock Settings', 'default_warehouse') + or frappe.db.get_value('Warehouse', {'warehouse_name': _('Stores')})) - if default_warehouse: - stock_entry = make_stock_entry(item_code=self.name, target=default_warehouse, - qty=self.opening_stock, rate=self.valuation_rate) + if default_warehouse: + stock_entry = make_stock_entry(item_code=self.name, target=default_warehouse, qty=self.opening_stock, + rate=self.valuation_rate, company=default.company) - stock_entry.add_comment("Comment", _("Opening Stock")) + stock_entry.add_comment("Comment", _("Opening Stock")) def make_route(self): if not self.route: @@ -880,3 +885,19 @@ def check_stock_uom_with_bin(item, stock_uom): if not matched: frappe.throw( _("Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.").format(item)) + +def get_item_defaults(item, company): + item_defaults = frappe.db.sql(''' + select + i.item_name, i.description, i.stock_uom, i.name, i.is_stock_item, i.item_code, i.item_group, + id.expense_account, id.buying_cost_center, id.default_warehouse, id.selling_cost_center + from + `tabItem` i, `tabItem Default` id + where + i.name = id.parent and i.name = %s and id.company = %s + ''', (item, company), as_dict=1) + if item_defaults: + return item_defaults[0] + else: + return frappe.db.get_value("Item", item, ["name", "item_name", "description", "stock_uom", + "is_stock_item", "item_code", "item_group"], as_dict=1) diff --git a/erpnext/stock/doctype/item/test_item.py b/erpnext/stock/doctype/item/test_item.py index 3f0d7fac5e9..1c915ee8f23 100644 --- a/erpnext/stock/doctype/item/test_item.py +++ b/erpnext/stock/doctype/item/test_item.py @@ -35,8 +35,9 @@ def make_item(item_code, properties=None): item.update(properties) - if item.is_stock_item and not item.default_warehouse: - item.default_warehouse = "_Test Warehouse - _TC" + if item.is_stock_item: + for item_default in [doc for doc in item.item_defaults if not doc.default_warehouse]: + item_default.default_warehouse = "_Test Warehouse - _TC" item.insert() @@ -199,7 +200,12 @@ class TestItem(unittest.TestCase): "increment": 0.5 } ], - "default_warehouse": "_Test Warehouse - _TC", + "item_defaults": [ + { + "default_warehouse": "_Test Warehouse - _TC", + "company": "_Test Company" + } + ], "has_variants": 1 }) @@ -305,5 +311,8 @@ def create_item(item_code, is_stock_item=None, valuation_rate=0, warehouse=None) item.item_group = "All Item Groups" item.is_stock_item = is_stock_item or 1 item.valuation_rate = valuation_rate or 0.0 - item.default_warehouse = warehouse or '_Test Warehouse - _TC' + item.append("item_defaults", { + "default_warehouse": warehouse or '_Test Warehouse - _TC', + "company": "_Test Company" + }) item.save() diff --git a/erpnext/stock/doctype/item_attribute/item_attribute.json b/erpnext/stock/doctype/item_attribute/item_attribute.json index 8c02928cda7..4b23cf06047 100644 --- a/erpnext/stock/doctype/item_attribute/item_attribute.json +++ b/erpnext/stock/doctype/item_attribute/item_attribute.json @@ -226,7 +226,7 @@ "hide_toolbar": 0, "icon": "fa fa-edit", "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 0, diff --git a/erpnext/stock/doctype/item_attribute_value/item_attribute_value.json b/erpnext/stock/doctype/item_attribute_value/item_attribute_value.json index 68edfc95537..2807600f08c 100644 --- a/erpnext/stock/doctype/item_attribute_value/item_attribute_value.json +++ b/erpnext/stock/doctype/item_attribute_value/item_attribute_value.json @@ -69,7 +69,7 @@ "idx": 0, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/stock/doctype/item_default/__init__.py b/erpnext/stock/doctype/item_default/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/stock/doctype/item_default/item_default.json b/erpnext/stock/doctype/item_default/item_default.json new file mode 100644 index 00000000000..8ef6de7d681 --- /dev/null +++ b/erpnext/stock/doctype/item_default/item_default.json @@ -0,0 +1,449 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "beta": 0, + "creation": "2018-05-03 02:29:24.444341", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "company", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Company", + "length": 0, + "no_copy": 0, + "options": "Company", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "default_warehouse", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Default Warehouse", + "length": 0, + "no_copy": 0, + "options": "Warehouse", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_3", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "default_price_list", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Default Price List", + "length": 0, + "no_copy": 0, + "options": "Price List", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "purchase_defaults", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Purchase Defaults", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "buying_cost_center", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Default Buying Cost Center", + "length": 0, + "no_copy": 0, + "options": "Cost Center", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "default_supplier", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Default Supplier", + "length": 0, + "no_copy": 0, + "options": "Supplier", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_8", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "expense_account", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Default Expense Account", + "length": 0, + "no_copy": 0, + "options": "Account", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "selling_defaults", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Sales Defaults", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "selling_cost_center", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Default Selling Cost Center", + "length": 0, + "no_copy": 0, + "options": "Cost Center", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_12", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "income_account", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Default Income Account", + "length": 0, + "no_copy": 0, + "options": "Account", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 1, + "max_attachments": 0, + "modified": "2018-05-16 05:58:28.182186", + "modified_by": "Administrator", + "module": "Stock", + "name": "Item Default", + "name_case": "", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/stock/doctype/item_default/item_default.py b/erpnext/stock/doctype/item_default/item_default.py new file mode 100644 index 00000000000..935f0ffb0ff --- /dev/null +++ b/erpnext/stock/doctype/item_default/item_default.py @@ -0,0 +1,9 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +from frappe.model.document import Document + +class ItemDefault(Document): + pass diff --git a/erpnext/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.json b/erpnext/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.json index 6147db9d4b4..f1e1fd36794 100644 --- a/erpnext/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.json +++ b/erpnext/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.json @@ -70,7 +70,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/stock/doctype/item_reorder/item_reorder.json b/erpnext/stock/doctype/item_reorder/item_reorder.json index 43eb98d9a04..fb4c558cfd7 100644 --- a/erpnext/stock/doctype/item_reorder/item_reorder.json +++ b/erpnext/stock/doctype/item_reorder/item_reorder.json @@ -142,7 +142,7 @@ "idx": 1, "image_view": 0, "in_create": 1, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/stock/doctype/item_supplier/item_supplier.json b/erpnext/stock/doctype/item_supplier/item_supplier.json index 163b427fd5a..6cff8e0892e 100644 --- a/erpnext/stock/doctype/item_supplier/item_supplier.json +++ b/erpnext/stock/doctype/item_supplier/item_supplier.json @@ -75,7 +75,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/stock/doctype/item_tax/item_tax.json b/erpnext/stock/doctype/item_tax/item_tax.json index e9c9d6265cc..6c1bd0999a8 100644 --- a/erpnext/stock/doctype/item_tax/item_tax.json +++ b/erpnext/stock/doctype/item_tax/item_tax.json @@ -68,7 +68,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/stock/doctype/item_variant/item_variant.json b/erpnext/stock/doctype/item_variant/item_variant.json index 9da66a2c1c8..93005c0aa3d 100644 --- a/erpnext/stock/doctype/item_variant/item_variant.json +++ b/erpnext/stock/doctype/item_variant/item_variant.json @@ -70,7 +70,7 @@ "idx": 0, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/stock/doctype/item_website_specification/item_website_specification.json b/erpnext/stock/doctype/item_website_specification/item_website_specification.json index 3c32adbe3d1..618c9f0f918 100644 --- a/erpnext/stock/doctype/item_website_specification/item_website_specification.json +++ b/erpnext/stock/doctype/item_website_specification/item_website_specification.json @@ -68,7 +68,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json b/erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json index d65da882dec..f49c1476825 100644 --- a/erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json +++ b/erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json @@ -168,7 +168,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/stock/doctype/packed_item/packed_item.json b/erpnext/stock/doctype/packed_item/packed_item.json index f9c163511fd..6c8b2b1d050 100644 --- a/erpnext/stock/doctype/packed_item/packed_item.json +++ b/erpnext/stock/doctype/packed_item/packed_item.json @@ -665,7 +665,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/stock/doctype/packed_item/packed_item.py b/erpnext/stock/doctype/packed_item/packed_item.py index 74dfa057aa4..7ca5ead20e4 100644 --- a/erpnext/stock/doctype/packed_item/packed_item.py +++ b/erpnext/stock/doctype/packed_item/packed_item.py @@ -18,9 +18,10 @@ def get_product_bundle_items(item_code): from `tabProduct Bundle Item` t1, `tabProduct Bundle` t2 where t2.new_item_code=%s and t1.parent = t2.name order by t1.idx""", item_code, as_dict=1) -def get_packing_item_details(item): - return frappe.db.sql("""select item_name, description, stock_uom, default_warehouse from `tabItem` - where name = %s""", item, as_dict = 1)[0] +def get_packing_item_details(item, company): + return frappe.db.sql("""select i.item_name, i.description, i.stock_uom, id.default_warehouse + from `tabItem` i, `tabItem Default` id where id.parent=i.name and i.name = %s and id.company""", + (item, company), as_dict = 1)[0] def get_bin_qty(item, warehouse): det = frappe.db.sql("""select actual_qty, projected_qty from `tabBin` @@ -28,12 +29,13 @@ def get_bin_qty(item, warehouse): return det and det[0] or frappe._dict() def update_packing_list_item(doc, packing_item_code, qty, main_item_row, description): - item = get_packing_item_details(packing_item_code) + item = get_packing_item_details(packing_item_code, doc.company) # check if exists exists = 0 for d in doc.get("packed_items"): - if d.parent_item == main_item_row.item_code and d.item_code == packing_item_code and d.parent_detail_docname == main_item_row.name and d.description == description: + if d.parent_item == main_item_row.item_code and d.item_code == packing_item_code and\ + d.parent_detail_docname == main_item_row.name and d.description == description: pi, exists = d, 1 break diff --git a/erpnext/stock/doctype/packing_slip_item/packing_slip_item.json b/erpnext/stock/doctype/packing_slip_item/packing_slip_item.json index 009244ce5e0..1b22f138916 100644 --- a/erpnext/stock/doctype/packing_slip_item/packing_slip_item.json +++ b/erpnext/stock/doctype/packing_slip_item/packing_slip_item.json @@ -430,7 +430,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/stock/doctype/price_list_country/price_list_country.json b/erpnext/stock/doctype/price_list_country/price_list_country.json index a7cef6f6eb7..a0020c5a829 100644 --- a/erpnext/stock/doctype/price_list_country/price_list_country.json +++ b/erpnext/stock/doctype/price_list_country/price_list_country.json @@ -42,7 +42,7 @@ "idx": 0, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js index c55013ea960..1a73ae5c4ff 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js @@ -62,9 +62,8 @@ erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend this._super(); if(this.frm.doc.docstatus===1) { this.show_stock_ledger(); - if (erpnext.is_perpetual_inventory_enabled(this.frm.doc.company)) { - this.show_general_ledger(); - } + //removed for temporary + this.show_general_ledger(); this.frm.add_custom_button(__('Asset'), function() { frappe.route_options = { diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py index 573f7ed8f35..a91d39fd833 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py @@ -254,40 +254,7 @@ class PurchaseReceipt(BuyingController): d.rejected_warehouse not in warehouse_with_no_account: warehouse_with_no_account.append(d.warehouse) - elif d.is_fixed_asset: - asset_accounts = self.get_company_default(["capital_work_in_progress_account", - "asset_received_but_not_billed"]) - - # CWIP entry - cwip_account = get_asset_category_account(d.asset, - 'capital_work_in_progress_account') or asset_accounts[0] - - asset_amount = flt(d.net_amount) + flt(d.item_tax_amount/self.conversion_rate) - base_asset_amount = flt(d.base_net_amount + d.item_tax_amount) - - cwip_account_currency = get_account_currency(cwip_account) - gl_entries.append(self.get_gl_dict({ - "account": cwip_account, - "against": asset_accounts[1], - "cost_center": d.cost_center, - "remarks": self.get("remarks") or _("Accounting Entry for Asset"), - "debit": base_asset_amount, - "debit_in_account_currency": (base_asset_amount - if cwip_account_currency == self.company_currency else asset_amount) - })) - - # Asset received but not billed - asset_rbnb_currency = get_account_currency(asset_accounts[1]) - gl_entries.append(self.get_gl_dict({ - "account": asset_accounts[1], - "against": asset_accounts[0], - "cost_center": d.cost_center, - "remarks": self.get("remarks") or _("Accounting Entry for Asset"), - "credit": base_asset_amount, - "credit_in_account_currency": (base_asset_amount - if asset_rbnb_currency == self.company_currency else asset_amount) - })) - + self.get_asset_gl_entry(gl_entries) # Cost center-wise amount breakup for other charges included for valuation valuation_tax = {} for tax in self.get("taxes"): @@ -340,6 +307,44 @@ class PurchaseReceipt(BuyingController): "\n".join(warehouse_with_no_account)) return process_gl_map(gl_entries) + + def get_asset_gl_entry(self, gl_entries): + for d in self.get("items"): + if d.is_fixed_asset: + asset_accounts = self.get_company_default(["capital_work_in_progress_account", + "asset_received_but_not_billed"]) + + # CWIP entry + cwip_account = get_asset_category_account(d.asset, + 'capital_work_in_progress_account') or asset_accounts[0] + + asset_amount = flt(d.net_amount) + flt(d.item_tax_amount/self.conversion_rate) + base_asset_amount = flt(d.base_net_amount + d.item_tax_amount) + + cwip_account_currency = get_account_currency(cwip_account) + gl_entries.append(self.get_gl_dict({ + "account": cwip_account, + "against": asset_accounts[1], + "cost_center": d.cost_center, + "remarks": self.get("remarks") or _("Accounting Entry for Asset"), + "debit": base_asset_amount, + "debit_in_account_currency": (base_asset_amount + if cwip_account_currency == self.company_currency else asset_amount) + })) + + # Asset received but not billed + asset_rbnb_currency = get_account_currency(asset_accounts[1]) + gl_entries.append(self.get_gl_dict({ + "account": asset_accounts[1], + "against": asset_accounts[0], + "cost_center": d.cost_center, + "remarks": self.get("remarks") or _("Accounting Entry for Asset"), + "credit": base_asset_amount, + "credit_in_account_currency": (base_asset_amount + if asset_rbnb_currency == self.company_currency else asset_amount) + })) + + return gl_entries def update_status(self, status): self.set_status(update=True, status = status) diff --git a/erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json b/erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json index a3b43e98cb3..94aecfe7e7b 100644 --- a/erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json +++ b/erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json @@ -395,7 +395,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index 233138f0c76..849a294be55 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -10,6 +10,7 @@ from erpnext.stock.utils import get_incoming_rate from erpnext.stock.stock_ledger import get_previous_sle, NegativeStockError, get_valuation_rate from erpnext.stock.get_item_details import get_bin_details, get_default_cost_center, get_conversion_factor from erpnext.stock.doctype.batch.batch import get_batch_no, set_batch_nos, get_batch_qty +from erpnext.stock.doctype.item.item import get_item_defaults from erpnext.manufacturing.doctype.bom.bom import validate_bom_no from erpnext.stock.utils import get_bin import json @@ -562,14 +563,14 @@ class StockEntry(StockController): pro_doc.run_method("update_planned_qty") def get_item_details(self, args=None, for_update=False): - item = frappe.db.sql("""select stock_uom, description, image, item_name, - expense_account, buying_cost_center, item_group, has_serial_no, - has_batch_no, sample_quantity - from `tabItem` - where name = %s - and disabled=0 - and (end_of_life is null or end_of_life='0000-00-00' or end_of_life > %s)""", - (args.get('item_code'), nowdate()), as_dict = 1) + item = frappe.db.sql("""select i.stock_uom, i.description, i.image, i.item_name, i.item_group, + i.has_batch_no, i.sample_quantity, i.has_serial_no, + id.expense_account, id.buying_cost_center + from `tabItem`, `tabItem Default` id + where i.name=%s and i.name=id.parent and id.company=%s + and i.disabled=0 + and (i.end_of_life is null or i.end_of_life='0000-00-00' or i.end_of_life > %s)""", + (args.get('item_code'), self.company, nowdate()), as_dict = 1) if not item: frappe.throw(_("Item {0} is not active or end of life has been reached").format(args.get("item_code"))) @@ -716,12 +717,11 @@ class StockEntry(StockController): item_code = frappe.db.get_value("BOM", self.bom_no, "item") to_warehouse = self.to_warehouse - item = frappe.db.get_value("Item", item_code, ["item_name", - "description", "stock_uom", "expense_account", "buying_cost_center", "name", "default_warehouse"], as_dict=1) + item = get_item_defaults(item_code, self.company) if not self.work_order and not to_warehouse: # in case of BOM - to_warehouse = item.default_warehouse + to_warehouse = item.get("default_warehouse") self.add_to_stock_entry_detail({ item.name: { @@ -731,8 +731,8 @@ class StockEntry(StockController): "item_name": item.item_name, "description": item.description, "stock_uom": item.stock_uom, - "expense_account": item.expense_account, - "cost_center": item.buying_cost_center, + "expense_account": item.get("expense_account"), + "cost_center": item.get("buying_cost_center"), } }, bom_no = self.bom_no) @@ -782,8 +782,8 @@ class StockEntry(StockController): for item in wo_items: qty = item.required_qty - item_account_details = frappe.db.get_value("Item", item.item_code, ["item_name", - "description", "stock_uom", "expense_account", "buying_cost_center", "name", "default_warehouse"], as_dict=1) + + item_account_details = get_item_defaults(item.item_code, self.company) # Take into account consumption if there are any. if self.purpose == 'Manufacture': req_qty_each = flt(item.required_qty / wo.qty) @@ -807,8 +807,8 @@ class StockEntry(StockController): "item_name": item.item_name, "description": item.description, "stock_uom": item_account_details.stock_uom, - "expense_account": item_account_details.expense_account, - "cost_center": item_account_details.buying_cost_center, + "expense_account": item_account_details.get("expense_account"), + "cost_center": item_account_details.get("buying_cost_center"), } }) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_utils.py b/erpnext/stock/doctype/stock_entry/stock_entry_utils.py index 8bf261060e1..8647d0f14ef 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry_utils.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry_utils.py @@ -12,6 +12,7 @@ def make_stock_entry(**args): :item_code: Item to be moved :qty: Qty to be moved + :company: Company Name (optional) :from_warehouse: Optional :to_warehouse: Optional :rate: Optional diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json index 8275c844160..b6892f1d809 100644 --- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json +++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json @@ -689,7 +689,7 @@ "idx": 1, "image_view": 0, "in_create": 1, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 0, diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js index 33427682618..ce32e01d33a 100644 --- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js +++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js @@ -49,7 +49,8 @@ frappe.ui.form.on("Stock Reconciliation", { args: { warehouse: data.warehouse, posting_date: frm.doc.posting_date, - posting_time: frm.doc.posting_time + posting_time: frm.doc.posting_time, + company:frm.doc.company }, callback: function(r) { var items = []; diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py index 938173deb8f..e4342339e0c 100644 --- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py @@ -268,12 +268,12 @@ class StockReconciliation(StockController): self._cancel() @frappe.whitelist() -def get_items(warehouse, posting_date, posting_time): +def get_items(warehouse, posting_date, posting_time, company): items = frappe.get_list("Bin", fields=["item_code"], filters={"warehouse": warehouse}, as_list=1) - items += frappe.get_list("Item", fields=["name"], filters= {"is_stock_item": 1, "has_serial_no": 0, - "has_batch_no": 0, "has_variants": 0, "disabled": 0, "default_warehouse": warehouse}, - as_list=1) + items += frappe.db.sql_list('''select i.name from `tabItem` i, `tabItem Default` id where i.name = id.parent + and i.is_stock_item=1 and i.has_serial_no=0 and i.has_batch_no=0 and i.has_variants=0 and i.disabled=0 + and id.default_warehouse=%s and id.company=%s''', (warehouse, company)) res = [] for item in set(items): diff --git a/erpnext/stock/doctype/uom_conversion_detail/uom_conversion_detail.json b/erpnext/stock/doctype/uom_conversion_detail/uom_conversion_detail.json index a17cc2dd0aa..6f28651b99b 100644 --- a/erpnext/stock/doctype/uom_conversion_detail/uom_conversion_detail.json +++ b/erpnext/stock/doctype/uom_conversion_detail/uom_conversion_detail.json @@ -69,7 +69,7 @@ "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 1, diff --git a/erpnext/stock/doctype/warehouse/warehouse.py b/erpnext/stock/doctype/warehouse/warehouse.py index b90ee3276b1..9c47f988476 100644 --- a/erpnext/stock/doctype/warehouse/warehouse.py +++ b/erpnext/stock/doctype/warehouse/warehouse.py @@ -144,19 +144,17 @@ def get_children(doctype, parent=None, company=None, is_root=False): if is_root: parent = "" - fields = ['name as value', 'is_group as expandable'] - filters = [ - ['docstatus', '<', '2'], - ['parent_warehouse', '=', parent], - ['company', 'in', (company, None,'')] - ] - - warehouses = frappe.get_list(doctype, fields=fields, filters=filters, order_by='name') + warehouses = frappe.db.sql("""select name as value, + is_group as expandable + from `tabWarehouse` + where docstatus < 2 + and ifnull(`parent_warehouse`,'') = %s + and (`company` = %s or company is null or company = '') + order by name""", (parent, company), as_dict=1) # return warehouses for wh in warehouses: wh["balance"] = get_stock_value_on(warehouse=wh.value) - return warehouses @frappe.whitelist() diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py index b33656570d8..562ac688087 100644 --- a/erpnext/stock/get_item_details.py +++ b/erpnext/stock/get_item_details.py @@ -11,6 +11,8 @@ from erpnext.setup.utils import get_exchange_rate from frappe.model.meta import get_field_precision from erpnext.stock.doctype.batch.batch import get_batch_no from erpnext import get_company_currency +from erpnext.stock.doctype.item.item import get_item_defaults + from six import string_types, iteritems @@ -52,7 +54,7 @@ def get_item_details(args): for bundle_item in bundled_items.items: valuation_rate += \ - flt(get_valuation_rate(bundle_item.item_code, out.get("warehouse")).get("valuation_rate") \ + flt(get_valuation_rate(bundle_item.item_code, args.company, out.get("warehouse")).get("valuation_rate") \ * bundle_item.qty) out.update({ @@ -60,7 +62,7 @@ def get_item_details(args): }) else: - out.update(get_valuation_rate(args.item_code, out.get("warehouse"))) + out.update(get_valuation_rate(args.item_code, args.company, out.get("warehouse"))) get_price_list_rate(args, item_doc, out) @@ -204,7 +206,8 @@ def get_basic_details(args, item): user_default_warehouse = user_default_warehouse_list[0] \ if len(user_default_warehouse_list) == 1 else "" - warehouse = user_default_warehouse or item.default_warehouse or args.warehouse + item_defaults = get_item_defaults(item.name, args.company) + warehouse = user_default_warehouse or item_defaults.get("default_warehouse") or args.warehouse material_request_type = '' if args.get('doctype') == "Material Request": @@ -227,9 +230,9 @@ def get_basic_details(args, item): "description": cstr(item.description).strip(), "image": cstr(item.image).strip(), "warehouse": warehouse, - "income_account": get_default_income_account(args, item), - "expense_account": get_default_expense_account(args, item), - "cost_center": get_default_cost_center(args, item), + "income_account": get_default_income_account(args, item_defaults), + "expense_account": get_default_expense_account(args, item_defaults), + "cost_center": get_default_cost_center(args, item_defaults), 'has_serial_no': item.has_serial_no, 'has_batch_no': item.has_batch_no, "batch_no": None, @@ -297,12 +300,12 @@ def get_basic_details(args, item): def get_default_income_account(args, item): - return (item.income_account + return (item.get("income_account") or args.income_account or frappe.db.get_value("Item Group", item.item_group, "default_income_account")) def get_default_expense_account(args, item): - return (item.expense_account + return (item.get("expense_account") or args.expense_account or frappe.db.get_value("Item Group", item.item_group, "default_expense_account")) @@ -316,7 +319,7 @@ def get_default_deferred_revenue_account(args, item): def get_default_cost_center(args, item): return (frappe.db.get_value("Project", args.get("project"), "cost_center") - or (item.selling_cost_center if args.get("customer") else item.buying_cost_center) + or (item.get("selling_cost_center") if args.get("customer") else item.get("buying_cost_center")) or frappe.db.get_value("Item Group", item.item_group, "default_cost_center") or args.get("cost_center")) @@ -677,16 +680,17 @@ def get_default_bom(item_code=None): if bom: return bom -def get_valuation_rate(item_code, warehouse=None): - item = frappe.get_doc("Item", item_code) - if item.is_stock_item: +def get_valuation_rate(item_code, company, warehouse=None): + item = get_item_defaults(item_code, company) + # item = frappe.get_doc("Item", item_code) + if item.get("is_stock_item"): if not warehouse: - warehouse = item.default_warehouse + warehouse = item.get("default_warehouse") return frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": warehouse}, ["valuation_rate"], as_dict=True) or {"valuation_rate": 0} - elif not item.is_stock_item: + elif not item.get("is_stock_item"): valuation_rate =frappe.db.sql("""select sum(base_net_amount) / sum(qty*conversion_factor) from `tabPurchase Invoice Item` where item_code = %s and docstatus=1""", item_code) diff --git a/erpnext/support/doctype/support_settings/support_settings.json b/erpnext/support/doctype/support_settings/support_settings.json index 1ca03c774ab..7adfd4d08f5 100644 --- a/erpnext/support/doctype/support_settings/support_settings.json +++ b/erpnext/support/doctype/support_settings/support_settings.json @@ -48,7 +48,7 @@ "idx": 0, "image_view": 0, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 1, "istable": 0, diff --git a/erpnext/utilities/doctype/rename_tool/rename_tool.json b/erpnext/utilities/doctype/rename_tool/rename_tool.json index f9aac1cedc4..617354d91ce 100644 --- a/erpnext/utilities/doctype/rename_tool/rename_tool.json +++ b/erpnext/utilities/doctype/rename_tool/rename_tool.json @@ -78,7 +78,7 @@ "icon": "fa fa-magic", "idx": 1, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 1, "istable": 0, diff --git a/erpnext/utilities/doctype/sms_log/sms_log.json b/erpnext/utilities/doctype/sms_log/sms_log.json index ffd9a7f2a0d..d8f3146c0a5 100644 --- a/erpnext/utilities/doctype/sms_log/sms_log.json +++ b/erpnext/utilities/doctype/sms_log/sms_log.json @@ -256,7 +256,7 @@ "icon": "fa fa-mobile-phone", "idx": 1, "in_create": 0, - "in_dialog": 0, + "is_submittable": 0, "issingle": 0, "istable": 0, diff --git a/erpnext/utilities/user_progress_utils.py b/erpnext/utilities/user_progress_utils.py index 20e533e91a1..0377a0a1f1f 100644 --- a/erpnext/utilities/user_progress_utils.py +++ b/erpnext/utilities/user_progress_utils.py @@ -110,7 +110,10 @@ def create_items(args_data): "is_stock_item": 1, "item_group": _("Products"), "stock_uom": _(args.get("item_uom_" + str(i))), - "default_warehouse": default_warehouse + "item_defaults": [{ + "default_warehouse": default_warehouse, + "company": defaults.get("company_name") + }] }).insert() except frappe.NameError: