From a8b5bcfe02b774ef3c02df43b1da8a1beb8cfec4 Mon Sep 17 00:00:00 2001 From: "Nihantra C. Patel" <141945075+Nihantra-Patel@users.noreply.github.com> Date: Wed, 18 Sep 2024 21:36:02 +0530 Subject: [PATCH 1/2] fix: Translation for button SO to PO (cherry picked from commit a5275e9f28bb54c286cad7ae697ab37f9e5e8794) # Conflicts: # erpnext/selling/doctype/sales_order/sales_order.js --- erpnext/selling/doctype/sales_order/sales_order.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index 1a6658f54184..46f7325a3028 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -778,8 +778,13 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex ] } ], +<<<<<<< HEAD primary_action_label: 'Create Purchase Order', primary_action (args) { +======= + primary_action_label: __("Create Purchase Order"), + primary_action(args) { +>>>>>>> a5275e9f28 (fix: Translation for button SO to PO) if (!args) return; let selected_items = dialog.fields_dict.items_for_po.grid.get_selected_children(); From b6ce9222aa659b93ae752edfafeb0c3d19128075 Mon Sep 17 00:00:00 2001 From: "Nihantra C. Patel" <141945075+Nihantra-Patel@users.noreply.github.com> Date: Wed, 18 Sep 2024 21:47:30 +0530 Subject: [PATCH 2/2] fix: Translation for button SO to PO --conflicts --- erpnext/selling/doctype/sales_order/sales_order.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index 46f7325a3028..7bdaab75a536 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -778,13 +778,8 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex ] } ], -<<<<<<< HEAD - primary_action_label: 'Create Purchase Order', - primary_action (args) { -======= primary_action_label: __("Create Purchase Order"), primary_action(args) { ->>>>>>> a5275e9f28 (fix: Translation for button SO to PO) if (!args) return; let selected_items = dialog.fields_dict.items_for_po.grid.get_selected_children();