diff --git a/erpnext/templates/pages/order.html b/erpnext/templates/pages/order.html index 315478fc649..f5e7dadde7f 100644 --- a/erpnext/templates/pages/order.html +++ b/erpnext/templates/pages/order.html @@ -40,7 +40,11 @@

+<<<<<<< HEAD {{ _("Pay", null, "Amount") }} {{doc.get_formatted("grand_total") }} +======= + {{ _("Pay") }} {{ pay_amount }} +>>>>>>> 7efb5a8cb5 (fix(portal): context pay_amount for button)