nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-16 03:29:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-34205

Browse Source
This commit is contained in:
Anand Baburajan
2023-02-27 12:41:45 +05:30
committed by GitHub
parent 9942a9d40a 4f7344c278
commit cbfa188d3d
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/sales_invoice/sales_invoice.js
View File

@@ -1078,7 +1078,7 @@ var select_loyalty_program = function(frm, loyalty_programs) {
] ]
}); });
dialog.set_primary_action(__("Set"), function() { dialog.set_primary_action(__("Set Loyalty Program"), function() {
dialog.hide(); dialog.hide();
return frappe.call({ return frappe.call({
method: "frappe.client.set_value", method: "frappe.client.set_value",

6
erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json
View File

@@ -64,8 +64,6 @@
"fieldtype": "Section Break" "fieldtype": "Section Break"
}, },
{ {
"fetch_from": "prevdoc_detail_docname.sales_person",
"fetch_if_empty": 1,
"fieldname": "service_person", "fieldname": "service_person",
"fieldtype": "Link", "fieldtype": "Link",
"in_list_view": 1, "in_list_view": 1,
@@ -110,13 +108,15 @@
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2021-05-27 17:47:21.474282", "modified": "2023-02-27 11:09:33.114458",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Maintenance", "module": "Maintenance",
"name": "Maintenance Visit Purpose", "name": "Maintenance Visit Purpose",
"naming_rule": "Random",
"owner": "Administrator", "owner": "Administrator",
"permissions": [], "permissions": [],
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",
"states": [],
"track_changes": 1 "track_changes": 1
} }

2
erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
View File

@@ -436,7 +436,7 @@ class PurchaseReceipt(BuyingController):
) )
divisional_loss = flt( divisional_loss = flt(
valuation_amount_as_per_doc - stock_value_diff, d.precision("base_net_amount") valuation_amount_as_per_doc - flt(stock_value_diff), d.precision("base_net_amount")
) )
if divisional_loss: if divisional_loss:

4
erpnext/translations/de.csv
View File

@@ -4047,7 +4047,7 @@ Server Error,Serverfehler,
Service Level Agreement has been changed to {0}.,Service Level Agreement wurde in {0} geändert., Service Level Agreement has been changed to {0}.,Service Level Agreement wurde in {0} geändert.,
Service Level Agreement was reset.,Service Level Agreement wurde zurückgesetzt., Service Level Agreement was reset.,Service Level Agreement wurde zurückgesetzt.,
Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Service Level Agreement mit Entitätstyp {0} und Entität {1} ist bereits vorhanden., Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Service Level Agreement mit Entitätstyp {0} und Entität {1} ist bereits vorhanden.,
Set,Menge, Set Loyalty Program,Treueprogramm eintragen,
Set Meta Tags,Festlegen von Meta-Tags, Set Meta Tags,Festlegen von Meta-Tags,
Set {0} in company {1},{0} in Firma {1} festlegen, Set {0} in company {1},{0} in Firma {1} festlegen,
Setup,Einstellungen, Setup,Einstellungen,
@@ -4227,10 +4227,8 @@ To date cannot be before From date,Bis-Datum kann nicht vor Von-Datum liegen,
Write Off,Abschreiben, Write Off,Abschreiben,
{0} Created,{0} Erstellt, {0} Created,{0} Erstellt,
Email Id,E-Mail-ID, Email Id,E-Mail-ID,
No,Kein,
Reference Doctype,Referenz-DocType, Reference Doctype,Referenz-DocType,
User Id,Benutzeridentifikation, User Id,Benutzeridentifikation,
Yes,Ja,
Actual ,Tatsächlich, Actual ,Tatsächlich,
Add to cart,In den Warenkorb legen, Add to cart,In den Warenkorb legen,
Budget,Budget, Budget,Budget,
Can't render this file because it is too large.