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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2023-04-21 17:52:11 +05:30
committed by GitHub
parent 91b5a33564
commit 82b46f2bfe
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -315,12 +315,8 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
} }
}, },
<<<<<<< HEAD
make_inter_company_invoice: function() { make_inter_company_invoice: function() {
=======
make_inter_company_invoice() {
let me = this; let me = this;
>>>>>>> 19911b48fd (fix: validation for internal transfer entry)
frappe.model.open_mapped_doc({ frappe.model.open_mapped_doc({
method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.make_inter_company_purchase_invoice", method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.make_inter_company_purchase_invoice",
frm: me.frm frm: me.frm