Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: resolve merge confilcts

Browse Source
This commit is contained in:
barredterra 2024-01-11 14:56:20 +01:00
parent b2fc5e4988
commit 6b2e3503d9
3 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/doctype/bank_transaction/bank_transaction.py
View File

@ -3,11 +3,8 @@
import frappe import frappe
from frappe import _ from frappe import _
<<<<<<< HEAD
from frappe.model.document import Document
=======
from frappe.model.docstatus import DocStatus from frappe.model.docstatus import DocStatus
>>>>>>> 0a95b38166 (fix: unreconcile Bank Transaction on cancel of payment voucher) from frappe.model.document import Document
from frappe.utils import flt from frappe.utils import flt

16
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
View File

@ -35,11 +35,17 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
super.onload(); super.onload();
// Ignore linked advances // Ignore linked advances
<<<<<<< HEAD this.frm.ignore_doctypes_on_cancel_all = [
this.frm.ignore_doctypes_on_cancel_all = ['Journal Entry', 'Payment Entry', 'Purchase Invoice', "Repost Payment Ledger", "Repost Accounting Ledger", "Unreconcile Payment", "Unreconcile Payment Entries", "Serial and Batch Bundle"]; "Journal Entry",
======= "Payment Entry",
this.frm.ignore_doctypes_on_cancel_all = ['Journal Entry', 'Payment Entry', 'Purchase Invoice', "Repost Payment Ledger", "Repost Accounting Ledger", "Unreconcile Payment", "Unreconcile Payment Entries", "Bank Transaction"]; "Purchase Invoice",
>>>>>>> 0a95b38166 (fix: unreconcile Bank Transaction on cancel of payment voucher) "Repost Payment Ledger",
"Repost Accounting Ledger",
"Unreconcile Payment",
"Unreconcile Payment Entries",
"Serial and Batch Bundle",
"Bank Transaction",
];
if(!this.frm.doc.__islocal) { if(!this.frm.doc.__islocal) {
// show credit_to in print format // show credit_to in print format

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

@ -36,14 +36,20 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
var me = this; var me = this;
super.onload(); super.onload();
this.frm.ignore_doctypes_on_cancel_all = ['POS Invoice', 'Timesheet', 'POS Invoice Merge Log', this.frm.ignore_doctypes_on_cancel_all = [
<<<<<<< HEAD "POS Invoice",
'POS Closing Entry', 'Journal Entry', 'Payment Entry', "Repost Payment Ledger", "Repost Accounting Ledger", "Unreconcile Payment", "Unreconcile Payment Entries", "Timesheet",
'Serial and Batch Bundle' "POS Invoice Merge Log",
"POS Closing Entry",
"Journal Entry",
"Payment Entry",
"Repost Payment Ledger",
"Repost Accounting Ledger",
"Unreconcile Payment",
"Unreconcile Payment Entries",
"Serial and Batch Bundle",
"Bank Transaction",
]; ];
=======
'POS Closing Entry', 'Journal Entry', 'Payment Entry', "Repost Payment Ledger", "Repost Accounting Ledger", "Unreconcile Payment", "Unreconcile Payment Entries", "Bank Transaction"];
>>>>>>> 0a95b38166 (fix: unreconcile Bank Transaction on cancel of payment voucher)
if(!this.frm.doc.__islocal && !this.frm.doc.customer && this.frm.doc.debit_to) { if(!this.frm.doc.__islocal && !this.frm.doc.customer && this.frm.doc.debit_to) {
// show debit_to in print format // show debit_to in print format