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

chore: resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2022-07-14 17:06:01 +05:30
parent 0b3958d692
commit bdd15895ff
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
View File

@@ -388,11 +388,7 @@ class LoanRepayment(AccountsController):
def make_gl_entries(self, cancel=0, adv_adj=0): def make_gl_entries(self, cancel=0, adv_adj=0):
gle_map = [] gle_map = []
if self.shortfall_amount and self.amount_paid > self.shortfall_amount: if self.shortfall_amount and self.amount_paid > self.shortfall_amount:
<<<<<<< HEAD
remarks = _("Shortfall Repayment of {0}.\nRepayment against Loan: {1}").format(
=======
remarks = "Shortfall repayment of {0}.<br>Repayment against loan {1}".format( remarks = "Shortfall repayment of {0}.<br>Repayment against loan {1}".format(
>>>>>>> 74dbf8c5d9 (Add reference number to repayment remarks)
self.shortfall_amount, self.against_loan self.shortfall_amount, self.against_loan
) )
elif self.shortfall_amount: elif self.shortfall_amount:
@@ -400,14 +396,10 @@ class LoanRepayment(AccountsController):
self.shortfall_amount, self.against_loan self.shortfall_amount, self.against_loan
) )
else: else:
<<<<<<< HEAD
remarks = _("Repayment against Loan: ") + self.against_loan
=======
remarks = "Repayment against loan " + self.against_loan remarks = "Repayment against loan " + self.against_loan
if self.reference_number: if self.reference_number:
remarks += "with reference no. {}".format(self.reference_number) remarks += "with reference no. {}".format(self.reference_number)
>>>>>>> 74dbf8c5d9 (Add reference number to repayment remarks)
if self.repay_from_salary: if self.repay_from_salary:
payment_account = self.payroll_payable_account payment_account = self.payroll_payable_account