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

chore: Resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2022-10-29 11:06:53 +05:30
parent 85f48dd6bd
commit d73237e896
3 changed files with 2 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/loan_management/doctype/loan/loan.json
View File

@@ -415,35 +415,18 @@
"label": "Is NPA"
},
{
<<<<<<< HEAD
"allow_on_submit": 1,
"default": "0",
"depends_on": "repay_from_salary",
"fieldname": "manually_update_paid_amount_in_salary_slip",
"fieldtype": "Check",
"label": "Manually Update Paid Amount in Salary Slip"
=======
"depends_on": "is_term_loan",
"fetch_from": "loan_type.repayment_schedule_type",
"fieldname": "repayment_schedule_type",
"fieldtype": "Data",
"label": "Repayment Schedule Type",
"read_only": 1
>>>>>>> 2ddee50f27 (chore: Update labels as per repayment type)
}
],
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
<<<<<<< HEAD
<<<<<<< HEAD
"modified": "2022-09-13 02:05:25.017190",
=======
"modified": "2022-09-29 11:50:31.957360",
>>>>>>> 76c6ccab5d (feat: Repayment schedule types for term loans)
=======
"modified": "2022-09-30 10:36:47.902903",
>>>>>>> 2ddee50f27 (chore: Update labels as per repayment type)
"modified_by": "Administrator",
"module": "Loan Management",
"name": "Loan",

6
erpnext/loan_management/doctype/loan/loan.py
View File

@@ -7,10 +7,6 @@ import math
import frappe
from frappe import _
<<<<<<< HEAD
from frappe.utils import add_months, flt, get_last_day, getdate, now_datetime, nowdate
from six import string_types
=======
from frappe.utils import (
add_days,
add_months,
@@ -21,7 +17,7 @@ from frappe.utils import (
now_datetime,
nowdate,
)
>>>>>>> 76c6ccab5d (feat: Repayment schedule types for term loans)
from six import string_types
import erpnext
from erpnext.accounts.doctype.journal_entry.journal_entry import get_payment_entry

10
erpnext/patches.txt
View File

@@ -370,16 +370,8 @@ erpnext.patches.v13_0.job_card_status_on_hold
erpnext.patches.v13_0.add_cost_center_in_loans
erpnext.patches.v13_0.show_india_localisation_deprecation_warning
erpnext.patches.v13_0.fix_number_and_frequency_for_monthly_depreciation
<<<<<<< HEAD
erpnext.patches.v13_0.reset_corrupt_defaults
erpnext.patches.v13_0.show_hr_payroll_deprecation_warning
erpnext.patches.v13_0.create_accounting_dimensions_for_asset_repair
execute:frappe.db.set_value("Naming Series", "Naming Series", {"select_doc_for_series": "", "set_options": "", "prefix": "", "current_value": 0, "user_must_always_select": 0})
=======
erpnext.patches.v14_0.remove_hr_and_payroll_modules # 20-07-2022
erpnext.patches.v14_0.fix_crm_no_of_employees
erpnext.patches.v14_0.create_accounting_dimensions_in_subcontracting_doctypes
erpnext.patches.v14_0.fix_subcontracting_receipt_gl_entries
erpnext.patches.v14_0.migrate_remarks_from_gl_to_payment_ledger
erpnext.patches.v13_0.update_schedule_type_in_loans
>>>>>>> 679b5ed551 (chore: Add patch to update repayment schedule type in loan documents)
erpnext.patches.v13_0.update_schedule_type_in_loans