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

fix: Translation for button SO to PO --conflicts

Browse Source
This commit is contained in:
Nihantra C. Patel
2024-09-18 21:47:30 +05:30
committed by GitHub
parent a8b5bcfe02
commit b6ce9222aa
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/selling/doctype/sales_order/sales_order.js
View File

@@ -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_label: __("Create Purchase Order"),
primary_action(args) { primary_action(args) {
>>>>>>> a5275e9f28 (fix: Translation for button SO to PO)
if (!args) return; if (!args) return;
let selected_items = dialog.fields_dict.items_for_po.grid.get_selected_children(); let selected_items = dialog.fields_dict.items_for_po.grid.get_selected_children();