Merge branch 'develop' into crm-carry-forward-communication-comments
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index a6e16a0..8f93811 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -25,20 +25,6 @@
required: true
- type: dropdown
- id: version
- attributes:
- label: Version
- description: Affected versions.
- multiple: true
- options:
- - v12
- - v13
- - v14
- - develop
- validations:
- required: true
-
- - type: dropdown
id: module
attributes:
label: Module
@@ -86,7 +72,7 @@
- manual install
- FrappeCloud
validations:
- required: true
+ required: false
- type: textarea
id: logs
@@ -95,12 +81,7 @@
description: Please copy and paste any relevant log output. This will be automatically formatted.
render: shell
-
- - type: checkboxes
- id: terms
+ - type: markdown
attributes:
- label: Code of Conduct
- description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/frappe/erpnext/blob/develop/CODE_OF_CONDUCT.md)
- options:
- - label: I agree to follow this project's Code of Conduct
- required: true
+ value: |
+ By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/frappe/erpnext/blob/develop/CODE_OF_CONDUCT.md)
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 2651407..46ce9de 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
+++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -150,7 +150,7 @@
"fieldtype": "Float",
"in_filter": 1,
"in_list_view": 1,
- "label": "Actual Quantity",
+ "label": "Qty Change",
"oldfieldname": "actual_qty",
"oldfieldtype": "Currency",
"print_width": "150px",
@@ -189,7 +189,7 @@
"fieldname": "qty_after_transaction",
"fieldtype": "Float",
"in_filter": 1,
- "label": "Actual Qty After Transaction",
+ "label": "Qty After Transaction",
"oldfieldname": "bin_aqat",
"oldfieldtype": "Currency",
"print_width": "150px",
@@ -210,7 +210,7 @@
{
"fieldname": "stock_value",
"fieldtype": "Currency",
- "label": "Stock Value",
+ "label": "Balance Stock Value",
"oldfieldname": "stock_value",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -219,14 +219,14 @@
{
"fieldname": "stock_value_difference",
"fieldtype": "Currency",
- "label": "Stock Value Difference",
+ "label": "Change in Stock Value",
"options": "Company:company:default_currency",
"read_only": 1
},
{
"fieldname": "stock_queue",
"fieldtype": "Text",
- "label": "Stock Queue (FIFO)",
+ "label": "FIFO Stock Queue (qty, rate)",
"oldfieldname": "fcfs_stack",
"oldfieldtype": "Text",
"print_hide": 1,
@@ -317,10 +317,11 @@
"in_create": 1,
"index_web_pages_for_search": 1,
"links": [],
- "modified": "2021-10-08 13:42:51.857631",
+ "modified": "2021-12-21 06:25:30.040801",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Ledger Entry",
+ "naming_rule": "Expression (old style)",
"owner": "Administrator",
"permissions": [
{
@@ -338,5 +339,6 @@
}
],
"sort_field": "modified",
- "sort_order": "DESC"
-}
+ "sort_order": "DESC",
+ "states": []
+}
\ No newline at end of file
diff --git a/erpnext/support/doctype/issue/test_issue.py b/erpnext/support/doctype/issue/test_issue.py
index 14cec46..7a0a5e5 100644
--- a/erpnext/support/doctype/issue/test_issue.py
+++ b/erpnext/support/doctype/issue/test_issue.py
@@ -98,6 +98,7 @@
issue.save()
self.assertEqual(issue.on_hold_since, frappe.flags.current_time)
+ self.assertFalse(issue.resolution_by)
creation = get_datetime("2020-03-04 5:00")
frappe.flags.current_time = get_datetime("2020-03-04 5:00")
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 c94700b..b3348f1 100644
--- a/erpnext/support/doctype/service_level_agreement/service_level_agreement.py
+++ b/erpnext/support/doctype/service_level_agreement/service_level_agreement.py
@@ -476,7 +476,7 @@
priority = get_response_and_resolution_duration(doc)
start_date_time = get_datetime(doc.get("service_level_agreement_creation") or doc.creation)
set_response_by(doc, start_date_time, priority)
- if apply_sla_for_resolution:
+ if apply_sla_for_resolution and not doc.get('on_hold_since'): # resolution_by is reset if on hold
set_resolution_by(doc, start_date_time, priority)
@@ -624,9 +624,6 @@
if doc.meta.has_field("user_resolution_time"):
doc.user_resolution_time = None
- if doc.meta.has_field("agreement_status"):
- doc.agreement_status = "First Response Due"
-
# called via hooks on communication update
def on_communication_update(doc, status):