schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2022-03-08 09:55:36 +05:30
committed by GitHub
parent 9af14ec0d0
commit ba4d496404
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/selling/doctype/quotation/quotation.js
View File

@@ -38,7 +38,6 @@ frappe.ui.form.on('Quotation', {
} }
}); });
<<<<<<< HEAD
erpnext.selling.QuotationController = erpnext.selling.SellingController.extend({ erpnext.selling.QuotationController = erpnext.selling.SellingController.extend({
onload: function(doc, dt, dn) { onload: function(doc, dt, dn) {
var me = this; var me = this;
@@ -46,13 +45,6 @@ erpnext.selling.QuotationController = erpnext.selling.SellingController.extend({
}, },
party_name: function() { party_name: function() {
=======
erpnext.selling.QuotationController = class QuotationController extends erpnext.selling.SellingController {
onload(doc, dt, dn) {
super.onload(doc, dt, dn);
}
party_name() {
>>>>>>> 3a547cb0d9 (fix: Item discounts for quotation)
var me = this; var me = this;
erpnext.utils.get_party_details(this.frm, null, null, function() { erpnext.utils.get_party_details(this.frm, null, null, function() {
me.apply_price_list(); me.apply_price_list();