Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: use payment's CC for gain/loss if company default is unset

Browse Source
This commit is contained in:
ruthra kumar 2023-09-03 07:21:09 +05:30
parent 79fa562004
commit d6a3b9a5c7
5 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,7 +116,7 @@ class PaymentReconciliation(Document):
"Journal Entry" as reference_type, t1.name as reference_name, "Journal Entry" as reference_type, t1.name as reference_name,
t1.posting_date, t1.remark as remarks, t2.name as reference_row, t1.posting_date, t1.remark as remarks, t2.name as reference_row,
{dr_or_cr} as amount, t2.is_advance, t2.exchange_rate, {dr_or_cr} as amount, t2.is_advance, t2.exchange_rate,
t2.account_currency as currency t2.account_currency as currency, t2.cost_center as cost_center
from from
`tabJournal Entry` t1, `tabJournal Entry Account` t2 `tabJournal Entry` t1, `tabJournal Entry Account` t2
where where
@ -209,6 +209,7 @@ class PaymentReconciliation(Document):
"amount": -(inv.outstanding_in_account_currency), "amount": -(inv.outstanding_in_account_currency),
"posting_date": inv.posting_date, "posting_date": inv.posting_date,
"currency": inv.currency, "currency": inv.currency,
"cost_center": inv.cost_center,
} }
) )
) )
@ -357,6 +358,7 @@ class PaymentReconciliation(Document):
"allocated_amount": allocated_amount, "allocated_amount": allocated_amount,
"difference_amount": pay.get("difference_amount"), "difference_amount": pay.get("difference_amount"),
"currency": inv.get("currency"), "currency": inv.get("currency"),
"cost_center": pay.get("cost_center"),
} }
) )
@ -431,6 +433,7 @@ class PaymentReconciliation(Document):
"allocated_amount": flt(row.get("allocated_amount")), "allocated_amount": flt(row.get("allocated_amount")),
"difference_amount": flt(row.get("difference_amount")), "difference_amount": flt(row.get("difference_amount")),
"difference_account": row.get("difference_account"), "difference_account": row.get("difference_account"),
"cost_center": row.get("cost_center"),
} }
) )
@ -603,7 +606,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,
"cost_center": erpnext.get_default_cost_center(company), "cost_center": inv.cost_center or erpnext.get_default_cost_center(company),
"exchange_rate": inv.exchange_rate, "exchange_rate": inv.exchange_rate,
"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}",
}, },
@ -618,7 +621,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,
"cost_center": erpnext.get_default_cost_center(company), "cost_center": inv.cost_center or erpnext.get_default_cost_center(company),
"exchange_rate": inv.exchange_rate, "exchange_rate": inv.exchange_rate,
"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}",
}, },
@ -657,4 +660,5 @@ def reconcile_dr_cr_note(dr_cr_notes, company):
inv.against_voucher_type, inv.against_voucher_type,
inv.against_voucher, inv.against_voucher,
None, None,
inv.cost_center,
) )

11
erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json
View File

@ -22,7 +22,8 @@
"column_break_7", "column_break_7",
"difference_account", "difference_account",
"exchange_rate", "exchange_rate",
"currency" "currency",
"cost_center"
], ],
"fields": [ "fields": [
{ {
@ -144,11 +145,17 @@
"fieldtype": "Float", "fieldtype": "Float",
"label": "Exchange Rate", "label": "Exchange Rate",
"read_only": 1 "read_only": 1
},
{
"fieldname": "cost_center",
"fieldtype": "Link",
"label": "Cost Center",
"options": "Cost Center"
} }
], ],
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2022-12-24 21:01:14.882747", "modified": "2023-09-03 07:52:33.684217",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Payment Reconciliation Allocation", "name": "Payment Reconciliation Allocation",

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

@ -16,7 +16,8 @@
"sec_break1", "sec_break1",
"remark", "remark",
"currency", "currency",
"exchange_rate" "exchange_rate",
"cost_center"
], ],
"fields": [ "fields": [
{ {
@ -98,11 +99,17 @@
"fieldtype": "Float", "fieldtype": "Float",
"hidden": 1, "hidden": 1,
"label": "Exchange Rate" "label": "Exchange Rate"
},
{
"fieldname": "cost_center",
"fieldtype": "Link",
"label": "Cost Center",
"options": "Cost Center"
} }
], ],
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2022-11-08 18:18:36.268760", "modified": "2023-09-03 07:43:29.965353",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Payment Reconciliation Payment", "name": "Payment Reconciliation Payment",

7
erpnext/accounts/utils.py
View File

@ -1754,6 +1754,7 @@ class QueryPaymentLedger(object):
ple.posting_date, ple.posting_date,
ple.due_date, ple.due_date,
ple.account_currency.as_("currency"), ple.account_currency.as_("currency"),
ple.cost_center.as_("cost_center"),
Sum(ple.amount).as_("amount"), Sum(ple.amount).as_("amount"),
Sum(ple.amount_in_account_currency).as_("amount_in_account_currency"), Sum(ple.amount_in_account_currency).as_("amount_in_account_currency"),
) )
@ -1816,6 +1817,7 @@ class QueryPaymentLedger(object):
).as_("paid_amount_in_account_currency"), ).as_("paid_amount_in_account_currency"),
Table("vouchers").due_date, Table("vouchers").due_date,
Table("vouchers").currency, Table("vouchers").currency,
Table("vouchers").cost_center.as_("cost_center"),
) )
.where(Criterion.all(filter_on_outstanding_amount)) .where(Criterion.all(filter_on_outstanding_amount))
) )
@ -1899,6 +1901,7 @@ def create_gain_loss_journal(
ref2_dt, ref2_dt,
ref2_dn, ref2_dn,
ref2_detail_no, ref2_detail_no,
cost_center,
) -> str: ) -> str:
journal_entry = frappe.new_doc("Journal Entry") journal_entry = frappe.new_doc("Journal Entry")
journal_entry.voucher_type = "Exchange Gain Or Loss" journal_entry.voucher_type = "Exchange Gain Or Loss"
@ -1924,7 +1927,7 @@ def create_gain_loss_journal(
"party": party, "party": party,
"account_currency": party_account_currency, "account_currency": party_account_currency,
"exchange_rate": 0, "exchange_rate": 0,
"cost_center": erpnext.get_default_cost_center(company), "cost_center": cost_center or erpnext.get_default_cost_center(company),
"reference_type": ref1_dt, "reference_type": ref1_dt,
"reference_name": ref1_dn, "reference_name": ref1_dn,
"reference_detail_no": ref1_detail_no, "reference_detail_no": ref1_detail_no,
@ -1940,7 +1943,7 @@ def create_gain_loss_journal(
"account": gain_loss_account, "account": gain_loss_account,
"account_currency": gain_loss_account_currency, "account_currency": gain_loss_account_currency,
"exchange_rate": 1, "exchange_rate": 1,
"cost_center": erpnext.get_default_cost_center(company), "cost_center": cost_center or erpnext.get_default_cost_center(company),
"reference_type": ref2_dt, "reference_type": ref2_dt,
"reference_name": ref2_dn, "reference_name": ref2_dn,
"reference_detail_no": ref2_detail_no, "reference_detail_no": ref2_detail_no,

2
erpnext/controllers/accounts_controller.py
View File

@ -1111,6 +1111,7 @@ class AccountsController(TransactionBase):
self.doctype, self.doctype,
self.name, self.name,
arg.get("referenced_row"), arg.get("referenced_row"),
arg.get("cost_center"),
) )
frappe.msgprint( frappe.msgprint(
_("Exchange Gain/Loss amount has been booked through {0}").format( _("Exchange Gain/Loss amount has been booked through {0}").format(
@ -1189,6 +1190,7 @@ class AccountsController(TransactionBase):
self.doctype, self.doctype,
self.name, self.name,
d.idx, d.idx,
self.cost_center,
) )
frappe.msgprint( frappe.msgprint(
_("Exchange Gain/Loss amount has been booked through {0}").format( _("Exchange Gain/Loss amount has been booked through {0}").format(