Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(notification): align with https://github.com/frappe/frappe/pull/22595 #38157

Merged
merged 7 commits into from
Jan 30, 2024
Merged

fix(notification): align with https://github.com/frappe/frappe/pull/22595 #38157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1662a4c
fix(notification): align with https://github.com/frappe/frappe/pull/2…
blaggacao Nov 17, 2023
083da7d
Merge remote-tracking branch 'upstream/develop' into fix/notification…
blaggacao Dec 4, 2023
c619255
fix: translatable strings
blaggacao Dec 15, 2023
6a63a89
Merge branch 'develop' into fix/notification-comply-with-upstream
mergify[bot] Jan 28, 2024
e9dfb45
Merge branch 'develop' into fix/notification-comply-with-upstream
mergify[bot] Jan 30, 2024
3fd43cd
chore: remove old md files
blaggacao Jan 30, 2024
d86186e
fix: correct receiver field
blaggacao Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...ounts/notification/notification_for_new_fiscal_year/notification_for_new_fiscal_year.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<h3>{{ _("Fiscal Year") }}</h3>

<p>{{ _("New fiscal year created :- ") }} {{ doc.name }}</p>
12 changes: 7 additions & 5 deletions ...ounts/notification/notification_for_new_fiscal_year/notification_for_new_fiscal_year.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,21 @@
"event": "New",
"idx": 0,
"is_standard": 1,
"message": "<h3>{{_(\"Fiscal Year\")}}</h3>\n\n<p>{{ _(\"New fiscal year created :- \") }} {{ doc.name }}</p>",
"modified": "2018-04-25 14:30:38.588534",
"message_type": "HTML",
"modified": "2023-11-17 08:54:51.532104",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Notification for new fiscal year",
"owner": "Administrator",
"recipients": [
{
"email_by_role": "Accounts User"
"receiver_by_role": "Accounts User"
},
{
"email_by_role": "Accounts Manager"
"receiver_by_role": "Accounts Manager"
}
],
"send_system_notification": 0,
"send_to_all_assignees": 0,
"subject": "Notification for new fiscal year {{ doc.name }}"
}
}
3 changes: 0 additions & 3 deletions ...tification/notification_for_new_fiscal_year/notification_for_new_fiscal_year.md
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions .../material_request_receipt_notification.md → ...aterial_request_receipt_notification.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<b>Material Request Type</b>: {{ doc.material_request_type }}<br>
<b>Company</b>: {{ doc.company }}
<p><b>{{ _("Material Request Type") }}</b>: {{ doc.material_request_type }}<br>
<b>{{ _("Company") }}</b>: {{ doc.company }}</p>

<h3>Order Summary</h3>
<h3>{{ _("Order Summary") }}</h3>

<table border=2 >
<tr align="center">
<th>Item Name</th>
<th>Received Quantity</th>
<th>{{ _("Item Name") }}</th>
<th>{{ _("Received Quantity") }}</th>
</tr>
{% for item in doc.items %}
{% if frappe.utils.flt(item.received_qty, 2) > 0.0 %}
Expand All @@ -16,4 +16,4 @@ <h3>Order Summary</h3>
</tr>
{% endif %}
{% endfor %}
</table>
</table>
10 changes: 6 additions & 4 deletions ...fication/material_request_receipt_notification/material_request_receipt_notification.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,21 @@
"event": "Value Change",
"idx": 0,
"is_standard": 1,
"message": "<b>Material Request Type</b>: {{ doc.material_request_type }}<br>\n<b>Company</b>: {{ doc.company }}\n\n<h3>Order Summary</h3>\n\n<table border=2 >\n <tr align=\"center\">\n <th>Item Name</th>\n <th>Received Quantity</th>\n </tr>\n {% for item in doc.items %}\n {% if frappe.utils.flt(item.received_qty, 2) > 0.0 %}\n <tr align=\"center\">\n <td>{{ item.item_code }}</td>\n <td>{{ frappe.utils.flt(item.received_qty, 2) }}</td>\n </tr>\n {% endif %}\n {% endfor %}\n</table>",
"message_type": "HTML",
"method": "",
"modified": "2019-05-01 18:02:51.090037",
"modified": "2023-11-17 08:53:29.525296",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Material Request Receipt Notification",
"owner": "Administrator",
"recipients": [
{
"email_by_document_field": "requested_by"
"receiver_by_document_field": "requested_by"
}
],
"send_system_notification": 0,
"send_to_all_assignees": 0,
"sender_email": "",
"subject": "{{ doc.name }} has been received",
"value_changed": "status"
}
}
Loading