Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-34205
This commit is contained in:
@@ -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();
|
||||
return frappe.call({
|
||||
method: "frappe.client.set_value",
|
||||
|
||||
@@ -64,8 +64,6 @@
|
||||
"fieldtype": "Section Break"
|
||||
},
|
||||
{
|
||||
"fetch_from": "prevdoc_detail_docname.sales_person",
|
||||
"fetch_if_empty": 1,
|
||||
"fieldname": "service_person",
|
||||
"fieldtype": "Link",
|
||||
"in_list_view": 1,
|
||||
@@ -110,13 +108,15 @@
|
||||
"idx": 1,
|
||||
"istable": 1,
|
||||
"links": [],
|
||||
"modified": "2021-05-27 17:47:21.474282",
|
||||
"modified": "2023-02-27 11:09:33.114458",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Maintenance",
|
||||
"name": "Maintenance Visit Purpose",
|
||||
"naming_rule": "Random",
|
||||
"owner": "Administrator",
|
||||
"permissions": [],
|
||||
"sort_field": "modified",
|
||||
"sort_order": "DESC",
|
||||
"states": [],
|
||||
"track_changes": 1
|
||||
}
|
||||
@@ -436,7 +436,7 @@ class PurchaseReceipt(BuyingController):
|
||||
)
|
||||
|
||||
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:
|
||||
|
||||
@@ -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 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.,
|
||||
Set,Menge,
|
||||
Set Loyalty Program,Treueprogramm eintragen,
|
||||
Set Meta Tags,Festlegen von Meta-Tags,
|
||||
Set {0} in company {1},{0} in Firma {1} festlegen,
|
||||
Setup,Einstellungen,
|
||||
@@ -4227,10 +4227,8 @@ To date cannot be before From date,Bis-Datum kann nicht vor Von-Datum liegen,
|
||||
Write Off,Abschreiben,
|
||||
{0} Created,{0} Erstellt,
|
||||
Email Id,E-Mail-ID,
|
||||
No,Kein,
|
||||
Reference Doctype,Referenz-DocType,
|
||||
User Id,Benutzeridentifikation,
|
||||
Yes,Ja,
|
||||
Actual ,Tatsächlich,
|
||||
Add to cart,In den Warenkorb legen,
|
||||
Budget,Budget,
|
||||
|
||||
|
Can't render this file because it is too large.
|
Reference in New Issue
Block a user