nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 11:19:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve merge conflict

Browse Source
This commit is contained in:
ruthra kumar
2023-09-03 10:26:23 +05:30
parent c8d81cc52d
commit 5523bc5081
2 changed files with 0 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
View File

@@ -593,12 +593,7 @@ def reconcile_dr_cr_note(dr_cr_notes, company):
inv.dr_or_cr: abs(inv.allocated_amount), inv.dr_or_cr: abs(inv.allocated_amount),
"reference_type": inv.against_voucher_type, "reference_type": inv.against_voucher_type,
"reference_name": inv.against_voucher, "reference_name": inv.against_voucher,
<<<<<<< HEAD
"cost_center": erpnext.get_default_cost_center(company),
=======
"cost_center": inv.cost_center or erpnext.get_default_cost_center(company), "cost_center": inv.cost_center or erpnext.get_default_cost_center(company),
"exchange_rate": inv.exchange_rate,
>>>>>>> d6a3b9a5c7 (refactor: use payment's CC for gain/loss if company default is unset)
"user_remark": f"{fmt_money(flt(inv.allocated_amount), currency=company_currency)} against {inv.against_voucher}", "user_remark": f"{fmt_money(flt(inv.allocated_amount), currency=company_currency)} against {inv.against_voucher}",
"exchange_rate": inv.exchange_rate, "exchange_rate": inv.exchange_rate,
}, },
@@ -613,12 +608,7 @@ def reconcile_dr_cr_note(dr_cr_notes, company):
), ),
"reference_type": inv.voucher_type, "reference_type": inv.voucher_type,
"reference_name": inv.voucher_no, "reference_name": inv.voucher_no,
<<<<<<< HEAD
"cost_center": erpnext.get_default_cost_center(company),
=======
"cost_center": inv.cost_center or erpnext.get_default_cost_center(company), "cost_center": inv.cost_center or erpnext.get_default_cost_center(company),
"exchange_rate": inv.exchange_rate,
>>>>>>> d6a3b9a5c7 (refactor: use payment's CC for gain/loss if company default is unset)
"user_remark": f"{fmt_money(flt(inv.allocated_amount), currency=company_currency)} from {inv.voucher_no}", "user_remark": f"{fmt_money(flt(inv.allocated_amount), currency=company_currency)} from {inv.voucher_no}",
"exchange_rate": inv.exchange_rate, "exchange_rate": inv.exchange_rate,
}, },

30
erpnext/controllers/accounts_controller.py
View File

@@ -969,35 +969,6 @@ class AccountsController(TransactionBase):
d.exchange_gain_loss = difference d.exchange_gain_loss = difference
<<<<<<< HEAD
=======
def make_precision_loss_gl_entry(self, gl_entries):
round_off_account, round_off_cost_center = get_round_off_account_and_cost_center(
self.company, "Purchase Invoice", self.name, self.use_company_roundoff_cost_center
)
precision_loss = self.get("base_net_total") - flt(
self.get("net_total") * self.conversion_rate, self.precision("net_total")
)
credit_or_debit = "credit" if self.doctype == "Purchase Invoice" else "debit"
against = self.supplier if self.doctype == "Purchase Invoice" else self.customer
if precision_loss:
gl_entries.append(
self.get_gl_dict(
{
"account": round_off_account,
"against": against,
credit_or_debit: precision_loss,
"cost_center": round_off_cost_center
if self.use_company_roundoff_cost_center
else self.cost_center or round_off_cost_center,
"remarks": _("Net total calculation precision loss"),
}
)
)
def gain_loss_journal_already_booked( def gain_loss_journal_already_booked(
self, self,
gain_loss_account, gain_loss_account,
@@ -1036,7 +1007,6 @@ class AccountsController(TransactionBase):
return True return True
return False return False
>>>>>>> 79c6f0165b (fix: deduplicate gain/loss JE creation for journals as payment)
def make_exchange_gain_loss_journal(self, args: dict = None) -> None: def make_exchange_gain_loss_journal(self, args: dict = None) -> None:
""" """
Make Exchange Gain/Loss journal for Invoices and Payments Make Exchange Gain/Loss journal for Invoices and Payments