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

chore: resolve conflicts with backport

Browse Source
This commit is contained in:
Smit Vora
2024-09-09 06:51:30 +05:30
parent 202ebbe140
commit 9e77a0245a
2 changed files with 0 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json
View File

@@ -158,11 +158,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-08-11 10:56:51.699137",
=======
"modified": "2024-08-27 14:48:56.715320", "modified": "2024-08-27 14:48:56.715320",
>>>>>>> 143209f91a (fix: `default_advance_account` field in Process Payment Reconciliation)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Process Payment Reconciliation", "name": "Process Payment Reconciliation",

30
erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py
View File

@@ -1,4 +1,3 @@
# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt # For license information, please see license.txt
import json import json
@@ -11,35 +10,6 @@ from frappe.utils.scheduler import is_scheduler_inactive
class ProcessPaymentReconciliation(Document): class ProcessPaymentReconciliation(Document):
<<<<<<< HEAD
=======
# begin: auto-generated types
# This code is auto-generated. Do not modify anything in this block.
from typing import TYPE_CHECKING
if TYPE_CHECKING:
from frappe.types import DF
amended_from: DF.Link | None
bank_cash_account: DF.Link | None
company: DF.Link
cost_center: DF.Link | None
default_advance_account: DF.Link
error_log: DF.LongText | None
from_invoice_date: DF.Date | None
from_payment_date: DF.Date | None
party: DF.DynamicLink
party_type: DF.Link
receivable_payable_account: DF.Link
status: DF.Literal[
"", "Queued", "Running", "Paused", "Completed", "Partially Reconciled", "Failed", "Cancelled"
]
to_invoice_date: DF.Date | None
to_payment_date: DF.Date | None
# end: auto-generated types
>>>>>>> 143209f91a (fix: `default_advance_account` field in Process Payment Reconciliation)
def validate(self): def validate(self):
self.validate_receivable_payable_account() self.validate_receivable_payable_account()
self.validate_bank_cash_account() self.validate_bank_cash_account()