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 v13 #37154

Merged
merged 2 commits into from
Sep 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 @@ -6,7 +6,12 @@
frappe.ui.form.on('Loan Repayment', {
// refresh: function(frm) {

// }
// },

setup: function(frm) {
frm.add_fetch("against_loan", "repay_from_salary", "repay_from_salary");
},

onload: function(frm) {
frm.set_query('against_loan', function() {
return {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,6 @@
},
{
"default": "0",
"fetch_from": "against_loan.repay_from_salary",
"fetch_if_empty": 1,
"fieldname": "repay_from_salary",
"fieldtype": "Check",
"label": "Repay From Salary"
Expand Down Expand Up @@ -313,11 +311,10 @@
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
"modified": "2022-08-04 17:13:51.964203",
"modified": "2023-09-18 16:50:32.897005",
"modified_by": "Administrator",
"module": "Loan Management",
"name": "Loan Repayment",
"naming_rule": "Expression (old style)",
"owner": "Administrator",
"permissions": [
{
Expand Down Expand Up @@ -353,6 +350,5 @@
],
"sort_field": "modified",
"sort_order": "DESC",
"states": [],
"track_changes": 1
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,11 @@ def set_missing_values(self, amounts):
if amounts.get("due_date"):
self.due_date = amounts.get("due_date")

if self.repay_from_salary and not self.payroll_payable_account:
frappe.throw(_("Please set Payroll Payable Account in Loan Repayment"))
elif not self.repay_from_salary and self.payroll_payable_account:
self.repay_from_salary = 1

def check_future_entries(self):
future_repayment_date = frappe.db.get_value(
"Loan Repayment",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,42 +3,85 @@
/* eslint-disable */

const DIFFERNCE_FIELD_NAMES = [
"difference_in_qty",
"fifo_qty_diff",
"fifo_value_diff",
"fifo_valuation_diff",
"valuation_diff",
"fifo_difference_diff",
"diff_value_diff"
'difference_in_qty',
'fifo_qty_diff',
'fifo_value_diff',
'fifo_valuation_diff',
'valuation_diff',
'fifo_difference_diff',
'diff_value_diff'
];

frappe.query_reports["Stock Ledger Invariant Check"] = {
"filters": [
frappe.query_reports['Stock Ledger Invariant Check'] = {
'filters': [
{
"fieldname": "item_code",
"fieldtype": "Link",
"label": "Item",
"mandatory": 1,
"options": "Item",
'fieldname': 'item_code',
'fieldtype': 'Link',
'label': 'Item',
'mandatory': 1,
'options': 'Item',
get_query: function() {
return {
filters: {is_stock_item: 1, has_serial_no: 0}
}
}
},
{
"fieldname": "warehouse",
"fieldtype": "Link",
"label": "Warehouse",
"mandatory": 1,
"options": "Warehouse",
'fieldname': 'warehouse',
'fieldtype': 'Link',
'label': 'Warehouse',
'mandatory': 1,
'options': 'Warehouse',
}
],

formatter (value, row, column, data, default_formatter) {
value = default_formatter(value, row, column, data);
if (DIFFERNCE_FIELD_NAMES.includes(column.fieldname) && Math.abs(data[column.fieldname]) > 0.001) {
value = "<span style='color:red'>" + value + "</span>";
value = '<span style="color:red">' + value + '</span>';
}
return value;
},

get_datatable_options(options) {
return Object.assign(options, {
checkboxColumn: true,
});
},

onload(report) {
report.page.add_inner_button(__('Create Reposting Entry'), () => {
let message = `
<div>
<p>
Reposting Entry will change the value of
accounts Stock In Hand, and Stock Expenses
in the Trial Balance report and will also change
the Balance Value in the Stock Balance report.
</p>
<p>Are you sure you want to create a Reposting Entry?</p>
</div>`;
let indexes = frappe.query_report.datatable.rowmanager.getCheckedRows();
let selected_rows = indexes.map(i => frappe.query_report.data[i]);

if (!selected_rows.length) {
frappe.throw(__('Please select a row to create a Reposting Entry'));
}
else if (selected_rows.length > 1) {
frappe.throw(__('Please select only one row to create a Reposting Entry'));
}
else {
frappe.confirm(__(message), () => {
frappe.call({
method: 'erpnext.stock.report.stock_ledger_invariant_check.stock_ledger_invariant_check.create_reposting_entries',
args: {
rows: selected_rows,
item_code: frappe.query_report.get_filter_values().item_code,
warehouse: frappe.query_report.get_filter_values().warehouse,
}
});
});
}
});
},
};
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import json

import frappe
from frappe import _
from frappe.utils import get_link_to_form, parse_json

SLE_FIELDS = (
"name",
Expand Down Expand Up @@ -247,3 +249,35 @@ def get_columns():
"label": "H - J",
},
]


@frappe.whitelist()
def create_reposting_entries(rows, item_code=None, warehouse=None):
if isinstance(rows, str):
rows = parse_json(rows)

entries = []
for row in rows:
row = frappe._dict(row)

try:
doc = frappe.get_doc(
{
"doctype": "Repost Item Valuation",
"based_on": "Item and Warehouse",
"status": "Queued",
"item_code": item_code or row.item_code,
"warehouse": warehouse or row.warehouse,
"posting_date": row.posting_date,
"posting_time": row.posting_time,
"allow_nagative_stock": 1,
}
).submit()

entries.append(get_link_to_form("Repost Item Valuation", doc.name))
except frappe.DuplicateEntryError:
continue

if entries:
entries = ", ".join(entries)
frappe.msgprint(_("Reposting entries created: {0}").format(entries))
Loading