Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: release v14 #37654

Merged
merged 27 commits into from
Oct 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
8660faa
fix(delivery): rename dt fetch stop action (backport #37605) (#37606)
mergify[bot] Oct 20, 2023
50daf70
fix: incorrect cost center in the purchase invoice (backport #37591) …
mergify[bot] Oct 20, 2023
1cb9f4c
fix(minor): filter bank accounts in bank statement import (#37525)
mergify[bot] Oct 23, 2023
ec208b8
fix: set empty value for tax template in item details (#37496)
mergify[bot] Oct 23, 2023
c05e0a4
fix(minor): filter tax template based on company in subscription (#37…
mergify[bot] Oct 23, 2023
8e31379
fix: Cash flow mapping fix (#37522)
saeedkola Oct 23, 2023
78b7c26
fix: remove from or target warehouse for non internal transfer entrie…
mergify[bot] Oct 23, 2023
ca13816
Revert "fix: set empty value for tax template in item details (#37496)"
deepeshgarg007 Oct 23, 2023
fa7fa85
refactor: gain_loss posting date fields in the allocation table
ruthra-kumar Oct 20, 2023
063d658
refactor: introduce fields in popup
ruthra-kumar Oct 22, 2023
515bed8
refactor: pass gain loss posting date to controller
ruthra-kumar Oct 22, 2023
ae788e8
test: varying posting date for gain loss journal
ruthra-kumar Oct 23, 2023
f413530
Merge pull request #37643 from frappe/mergify/bp/version-14-hotfix/pr…
ruthra-kumar Oct 24, 2023
d71b885
fix: overallocation on Payment with PO/SO
ruthra-kumar Oct 19, 2023
c8922ad
test: overalloction on reconciliation when PO is involved
ruthra-kumar Oct 19, 2023
c921d7d
refactor(test): make use of utility methods
ruthra-kumar Oct 19, 2023
7b9daef
chore: fix flakiness `test_sales_order_partial_advance_payment`
ruthra-kumar Oct 24, 2023
d576fc7
chore: resolve conflict
ruthra-kumar Oct 24, 2023
920de79
Merge pull request #37646 from frappe/mergify/bp/version-14-hotfix/pr…
ruthra-kumar Oct 24, 2023
922ace4
fix: close employee loan on write off (#37638)
anandbaburajan Oct 24, 2023
be90be3
refactor: button on PE to filter associated Journals
ruthra-kumar Sep 22, 2023
0b082f0
chore: resolve conflict
ruthra-kumar Oct 24, 2023
356b1bd
Merge pull request #37647 from frappe/mergify/copy/version-14-hotfix/…
ruthra-kumar Oct 24, 2023
638c271
fix: incorrect process loss validation for multiple finished items (b…
mergify[bot] Oct 24, 2023
72d32a4
chore: fixed test cases related to Internal Transfer (#37659)
rohitwaghchaure Oct 24, 2023
80774e2
fix: GL Entries for receiving non CWIP assets using Purchase Receipt …
deepeshgarg007 Oct 25, 2023
fa5780c
fix: wrong german translation (#37658)
barredterra Oct 25, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@
// For license information, please see license.txt

frappe.ui.form.on("Bank Statement Import", {
onload(frm) {
frm.set_query("bank_account", function (doc) {
return {
filters: {
company: doc.company,
},
};
});
},

setup(frm) {
frappe.realtime.on("data_import_refresh", ({ data_import }) => {
frm.import_in_progress = false;
Expand Down
6 changes: 6 additions & 0 deletions erpnext/accounts/doctype/payment_entry/payment_entry.js
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,12 @@ frappe.ui.form.on('Payment Entry', {
frm.events.hide_unhide_fields(frm);
frm.events.set_dynamic_labels(frm);
frm.events.show_general_ledger(frm);
if(frm.doc.references.find((elem) => {return elem.exchange_gain_loss != 0})) {
frm.add_custom_button(__("View Exchange Gain/Loss Journals"), function() {
frappe.set_route("List", "Journal Entry", {"voucher_type": "Exchange Gain Or Loss", "reference_name": frm.doc.name});
}, __('Actions'));

}
erpnext.accounts.unreconcile_payments.add_unreconcile_btn(frm);
},

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
this.data = [];
const dialog = new frappe.ui.Dialog({
title: __("Select Difference Account"),
size: 'extra-large',
fields: [
{
fieldname: "allocation",
Expand All @@ -239,6 +240,13 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
in_list_view: 1,
read_only: 1
}, {
fieldtype:'Date',
fieldname:"gain_loss_posting_date",
label: __("Posting Date"),
in_list_view: 1,
reqd: 1,
}, {

fieldtype:'Link',
options: 'Account',
in_list_view: 1,
Expand Down Expand Up @@ -272,6 +280,9 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
args.forEach(d => {
frappe.model.set_value("Payment Reconciliation Allocation", d.docname,
"difference_account", d.difference_account);
frappe.model.set_value("Payment Reconciliation Allocation", d.docname,
"gain_loss_posting_date", d.gain_loss_posting_date);

});

this.reconcile_payment_entries();
Expand All @@ -287,6 +298,7 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
'reference_name': d.reference_name,
'difference_amount': d.difference_amount,
'difference_account': d.difference_account,
'gain_loss_posting_date': d.gain_loss_posting_date
});
}
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,7 @@ def allocate_entries(self, args):
res.difference_amount = self.get_difference_amount(pay, inv, res["allocated_amount"])
res.difference_account = default_exchange_gain_loss_account
res.exchange_rate = inv.get("exchange_rate")
res.update({"gain_loss_posting_date": pay.get("posting_date")})

if pay.get("amount") == 0:
entries.append(res)
Expand Down Expand Up @@ -421,6 +422,7 @@ def get_payment_details(self, row, dr_or_cr):
"allocated_amount": flt(row.get("allocated_amount")),
"difference_amount": flt(row.get("difference_amount")),
"difference_account": row.get("difference_account"),
"difference_posting_date": row.get("gain_loss_posting_date"),
"cost_center": row.get("cost_center"),
}
)
Expand Down
Loading
Loading