nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 16:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
ruthra kumar
2024-10-30 10:28:30 +05:30
parent 93243b1d95
commit 15881ea718
2 changed files with 0 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,11 +110,7 @@
"is_virtual": 1, "is_virtual": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-11-17 17:33:34.818530",
=======
"modified": "2024-10-29 16:24:43.021230", "modified": "2024-10-29 16:24:43.021230",
>>>>>>> 2d5b079949 (fix: remarks field in payment reconciliation)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Payment Reconciliation Payment", "name": "Payment Reconciliation Payment",

27
erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.py
View File

@@ -6,33 +6,6 @@ from frappe.model.document import Document
class PaymentReconciliationPayment(Document): class PaymentReconciliationPayment(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
amount: DF.Currency
cost_center: DF.Link | None
currency: DF.Link | None
difference_amount: DF.Currency
exchange_rate: DF.Float
is_advance: DF.Data | None
parent: DF.Data
parentfield: DF.Data
parenttype: DF.Data
posting_date: DF.Date | None
reference_name: DF.DynamicLink | None
reference_row: DF.Data | None
reference_type: DF.Link | None
remarks: DF.SmallText | None
# end: auto-generated types
>>>>>>> 2d5b079949 (fix: remarks field in payment reconciliation)
@staticmethod @staticmethod
def get_list(args): def get_list(args):
pass pass