CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-13 07:18:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
ruthra kumar
2024-12-23 14:10:44 +05:30
parent 3ab4acfafa
commit cf4068d1a3
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,11 +125,7 @@
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2023-06-23 21:13:18.013816",
=======
"modified": "2024-12-20 12:04:46.729972",
>>>>>>> 225e56cbca (feat: add difference_posting_date field)
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice Advance",

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

@@ -126,11 +126,7 @@
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2023-06-23 21:12:57.557731",
=======
"modified": "2024-12-20 11:58:28.962370",
>>>>>>> 225e56cbca (feat: add difference_posting_date field)
"modified_by": "Administrator",
"module": "Accounts",
"name": "Sales Invoice Advance",