Merge pull request #32190 from maharshivpatel/fix-item-wise-sales-register
fix: item wise sales register taxes and charges
diff --git a/erpnext/controllers/employee_boarding_controller.py b/erpnext/controllers/employee_boarding_controller.py
deleted file mode 100644
index c06fb59..0000000
--- a/erpnext/controllers/employee_boarding_controller.py
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-import frappe
-from frappe import _
-from frappe.desk.form import assign_to
-from frappe.model.document import Document
-from frappe.utils import add_days, flt, unique
-
-from erpnext.setup.doctype.employee.employee import get_holiday_list_for_employee
-from erpnext.setup.doctype.holiday_list.holiday_list import is_holiday
-
-
-class EmployeeBoardingController(Document):
- """
- Create the project and the task for the boarding process
- Assign to the concerned person and roles as per the onboarding/separation template
- """
-
- def validate(self):
- # remove the task if linked before submitting the form
- if self.amended_from:
- for activity in self.activities:
- activity.task = ""
-
- def on_submit(self):
- # create the project for the given employee onboarding
- project_name = _(self.doctype) + " : "
- if self.doctype == "Employee Onboarding":
- project_name += self.job_applicant
- else:
- project_name += self.employee
-
- project = frappe.get_doc(
- {
- "doctype": "Project",
- "project_name": project_name,
- "expected_start_date": self.date_of_joining
- if self.doctype == "Employee Onboarding"
- else self.resignation_letter_date,
- "department": self.department,
- "company": self.company,
- }
- ).insert(ignore_permissions=True, ignore_mandatory=True)
-
- self.db_set("project", project.name)
- self.db_set("boarding_status", "Pending")
- self.reload()
- self.create_task_and_notify_user()
-
- def create_task_and_notify_user(self):
- # create the task for the given project and assign to the concerned person
- holiday_list = self.get_holiday_list()
-
- for activity in self.activities:
- if activity.task:
- continue
-
- dates = self.get_task_dates(activity, holiday_list)
-
- task = frappe.get_doc(
- {
- "doctype": "Task",
- "project": self.project,
- "subject": activity.activity_name + " : " + self.employee_name,
- "description": activity.description,
- "department": self.department,
- "company": self.company,
- "task_weight": activity.task_weight,
- "exp_start_date": dates[0],
- "exp_end_date": dates[1],
- }
- ).insert(ignore_permissions=True)
- activity.db_set("task", task.name)
-
- users = [activity.user] if activity.user else []
- if activity.role:
- user_list = frappe.db.sql_list(
- """
- SELECT
- DISTINCT(has_role.parent)
- FROM
- `tabHas Role` has_role
- LEFT JOIN `tabUser` user
- ON has_role.parent = user.name
- WHERE
- has_role.parenttype = 'User'
- AND user.enabled = 1
- AND has_role.role = %s
- """,
- activity.role,
- )
- users = unique(users + user_list)
-
- if "Administrator" in users:
- users.remove("Administrator")
-
- # assign the task the users
- if users:
- self.assign_task_to_users(task, users)
-
- def get_holiday_list(self):
- if self.doctype == "Employee Separation":
- return get_holiday_list_for_employee(self.employee)
- else:
- if self.employee:
- return get_holiday_list_for_employee(self.employee)
- else:
- if not self.holiday_list:
- frappe.throw(_("Please set the Holiday List."), frappe.MandatoryError)
- else:
- return self.holiday_list
-
- def get_task_dates(self, activity, holiday_list):
- start_date = end_date = None
-
- if activity.begin_on is not None:
- start_date = add_days(self.boarding_begins_on, activity.begin_on)
- start_date = self.update_if_holiday(start_date, holiday_list)
-
- if activity.duration is not None:
- end_date = add_days(self.boarding_begins_on, activity.begin_on + activity.duration)
- end_date = self.update_if_holiday(end_date, holiday_list)
-
- return [start_date, end_date]
-
- def update_if_holiday(self, date, holiday_list):
- while is_holiday(holiday_list, date):
- date = add_days(date, 1)
- return date
-
- def assign_task_to_users(self, task, users):
- for user in users:
- args = {
- "assign_to": [user],
- "doctype": task.doctype,
- "name": task.name,
- "description": task.description or task.subject,
- "notify": self.notify_users_by_email,
- }
- assign_to.add(args)
-
- def on_cancel(self):
- # delete task project
- project = self.project
- for task in frappe.get_all("Task", filters={"project": project}):
- frappe.delete_doc("Task", task.name, force=1)
- frappe.delete_doc("Project", project, force=1)
- self.db_set("project", "")
- for activity in self.activities:
- activity.db_set("task", "")
-
- frappe.msgprint(
- _("Linked Project {} and Tasks deleted.").format(project), alert=True, indicator="blue"
- )
-
-
-@frappe.whitelist()
-def get_onboarding_details(parent, parenttype):
- return frappe.get_all(
- "Employee Boarding Activity",
- fields=[
- "activity_name",
- "role",
- "user",
- "required_for_employee_creation",
- "description",
- "task_weight",
- "begin_on",
- "duration",
- ],
- filters={"parent": parent, "parenttype": parenttype},
- order_by="idx",
- )
-
-
-def update_employee_boarding_status(project):
- employee_onboarding = frappe.db.exists("Employee Onboarding", {"project": project.name})
- employee_separation = frappe.db.exists("Employee Separation", {"project": project.name})
-
- if not (employee_onboarding or employee_separation):
- return
-
- status = "Pending"
- if flt(project.percent_complete) > 0.0 and flt(project.percent_complete) < 100.0:
- status = "In Process"
- elif flt(project.percent_complete) == 100.0:
- status = "Completed"
-
- if employee_onboarding:
- frappe.db.set_value("Employee Onboarding", employee_onboarding, "boarding_status", status)
- elif employee_separation:
- frappe.db.set_value("Employee Separation", employee_separation, "boarding_status", status)
diff --git a/erpnext/e_commerce/doctype/website_item/website_item.json b/erpnext/e_commerce/doctype/website_item/website_item.json
index a416aac..c5775ee 100644
--- a/erpnext/e_commerce/doctype/website_item/website_item.json
+++ b/erpnext/e_commerce/doctype/website_item/website_item.json
@@ -345,7 +345,8 @@
"image_field": "website_image",
"index_web_pages_for_search": 1,
"links": [],
- "modified": "2022-06-28 17:10:30.613251",
+ "make_attachments_public": 1,
+ "modified": "2022-09-13 04:05:11.614087",
"modified_by": "Administrator",
"module": "E-commerce",
"name": "Website Item",
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index d780213..2a0ca8c 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -307,6 +307,7 @@
erpnext.patches.v14_0.copy_is_subcontracted_value_to_is_old_subcontracting_flow
erpnext.patches.v14_0.migrate_gl_to_payment_ledger
erpnext.patches.v14_0.crm_ux_cleanup
+erpnext.patches.v14_0.migrate_existing_lead_notes_as_per_the_new_format
erpnext.patches.v14_0.remove_india_localisation # 14-07-2022
erpnext.patches.v13_0.fix_number_and_frequency_for_monthly_depreciation
erpnext.patches.v14_0.remove_hr_and_payroll_modules # 20-07-2022
diff --git a/erpnext/patches/v14_0/migrate_existing_lead_notes_as_per_the_new_format.py b/erpnext/patches/v14_0/migrate_existing_lead_notes_as_per_the_new_format.py
new file mode 100644
index 0000000..032aecc
--- /dev/null
+++ b/erpnext/patches/v14_0/migrate_existing_lead_notes_as_per_the_new_format.py
@@ -0,0 +1,23 @@
+import frappe
+from frappe.utils import cstr, strip_html
+
+
+def execute():
+ for doctype in ("Lead", "Prospect", "Opportunity"):
+ if not frappe.db.has_column(doctype, "notes"):
+ continue
+
+ dt = frappe.qb.DocType(doctype)
+ records = (
+ frappe.qb.from_(dt)
+ .select(dt.name, dt.notes, dt.modified_by, dt.modified)
+ .where(dt.notes.isnotnull() & dt.notes != "")
+ ).run()
+
+ for d in records:
+ if strip_html(cstr(d.notes)).strip():
+ doc = frappe.get_doc(doctype, d.name)
+ doc.append("notes", {"note": d.notes, "added_by": d.modified_by, "added_on": d.modified})
+ doc.update_child_table("notes")
+
+ frappe.db.sql_ddl(f"alter table `tab{doctype}` drop column `notes`")
diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py
index a2be936..d80133c 100644
--- a/erpnext/projects/doctype/project/project.py
+++ b/erpnext/projects/doctype/project/project.py
@@ -10,7 +10,6 @@
from frappe.utils import add_days, flt, get_datetime, get_time, get_url, nowtime, today
from erpnext import get_default_company
-from erpnext.controllers.employee_boarding_controller import update_employee_boarding_status
from erpnext.controllers.queries import get_filters_cond
from erpnext.setup.doctype.holiday_list.holiday_list import is_holiday
@@ -43,7 +42,6 @@
self.send_welcome_email()
self.update_costing()
self.update_percent_complete()
- update_employee_boarding_status(self)
def copy_from_template(self):
"""
@@ -145,7 +143,6 @@
def update_project(self):
"""Called externally by Task"""
self.update_percent_complete()
- update_employee_boarding_status(self)
self.update_costing()
self.db_update()
diff --git a/erpnext/setup/doctype/employee/employee.json b/erpnext/setup/doctype/employee/employee.json
index 39e0acd..99693d9 100644
--- a/erpnext/setup/doctype/employee/employee.json
+++ b/erpnext/setup/doctype/employee/employee.json
@@ -396,7 +396,7 @@
"collapsible": 1,
"fieldname": "salary_information",
"fieldtype": "Tab Break",
- "label": "Salary Details",
+ "label": "Salary",
"oldfieldtype": "Section Break",
"width": "50%"
},
@@ -428,7 +428,7 @@
"collapsible": 1,
"fieldname": "contact_details",
"fieldtype": "Tab Break",
- "label": "Contact"
+ "label": "Address & Contacts"
},
{
"fieldname": "cell_number",
@@ -507,7 +507,7 @@
"collapsible": 1,
"fieldname": "personal_details",
"fieldtype": "Tab Break",
- "label": "Personal Details"
+ "label": "Personal"
},
{
"fieldname": "passport_number",
@@ -701,7 +701,7 @@
"collapsible": 1,
"fieldname": "attendance_and_leave_details",
"fieldtype": "Tab Break",
- "label": "Attendance and Leave Details"
+ "label": "Attendance & Leaves"
},
{
"fieldname": "column_break_44",
@@ -726,7 +726,7 @@
{
"fieldname": "basic_details_tab",
"fieldtype": "Tab Break",
- "label": "Basic Details"
+ "label": "Overview"
},
{
"fieldname": "company_details_section",
@@ -810,7 +810,7 @@
"idx": 24,
"image_field": "image",
"links": [],
- "modified": "2022-08-23 13:47:46.944993",
+ "modified": "2022-09-13 10:27:14.579197",
"modified_by": "Administrator",
"module": "Setup",
"name": "Employee",
diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index 247140b..d1d228d 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -910,7 +910,8 @@
"image_field": "image",
"index_web_pages_for_search": 1,
"links": [],
- "modified": "2022-09-12 15:00:10.130340",
+ "make_attachments_public": 1,
+ "modified": "2022-09-13 04:08:17.431731",
"modified_by": "Administrator",
"module": "Stock",
"name": "Item",
diff --git a/erpnext/support/doctype/service_level_agreement/service_level_agreement.py b/erpnext/support/doctype/service_level_agreement/service_level_agreement.py
index e49f212..7f4e9ef 100644
--- a/erpnext/support/doctype/service_level_agreement/service_level_agreement.py
+++ b/erpnext/support/doctype/service_level_agreement/service_level_agreement.py
@@ -776,6 +776,9 @@
if not parent.meta.has_field("service_level_agreement"):
return
+ if not parent.get("service_level_agreement"):
+ return
+
if (
doc.sent_or_received == "Received" # a reply is received
and parent.get("status") == "Open" # issue status is set as open from communication.py