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

feat: shift depreciation for assets [v14] [backport of #38327] (#38404)

Browse Source 
feat: shift depreciation for assets
(cherry picked from commit d8c3935e64)
This commit is contained in:
Anand Baburajan
2023-11-29 06:15:22 +05:30
committed by Mergify
parent 47d37aa628
commit 53d083a121
15 changed files with 796 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/assets/doctype/asset/asset.js
View File

@@ -323,12 +323,15 @@ frappe.ui.form.on('Asset', {
make_schedules_editable: function(frm) {
if (frm.doc.finance_books) {
var is_editable = frm.doc.finance_books.filter(d => d.depreciation_method == "Manual").length > 0
var is_manual_hence_editable = frm.doc.finance_books.filter(d => d.depreciation_method == "Manual").length > 0
? true : false;
var is_shift_hence_editable = frm.doc.finance_books.filter(d => d.shift_based).length > 0
? true : false;
frm.toggle_enable("schedules", is_editable);
frm.fields_dict["schedules"].grid.toggle_enable("schedule_date", is_editable);
frm.fields_dict["schedules"].grid.toggle_enable("depreciation_amount", is_editable);
frm.toggle_enable("depreciation_schedule", is_manual_hence_editable || is_shift_hence_editable);
frm.fields_dict["depreciation_schedule"].grid.toggle_enable("schedule_date", is_manual_hence_editable);
frm.fields_dict["depreciation_schedule"].grid.toggle_enable("depreciation_amount", is_manual_hence_editable);
frm.fields_dict["depreciation_schedule"].grid.toggle_enable("shift", is_shift_hence_editable);
}
},

96
erpnext/assets/doctype/asset/asset.py
View File

@@ -43,6 +43,7 @@ class Asset(AccountsController):
self.validate_finance_books()
if not self.split_from:
self.prepare_depreciation_data()
self.update_shift_depr_schedule()
self.validate_gross_and_purchase_amount()
if self.get("schedules"):
self.validate_expected_value_after_useful_life()
@@ -104,6 +105,13 @@ class Asset(AccountsController):
self.opening_accumulated_depreciation
)
def update_shift_depr_schedule(self):
if not any(fb.get("shift_based") for fb in self.finance_books) or self.docstatus != 0:
return
self.make_depreciation_schedule()
self.set_accumulated_depreciation()
def should_prepare_depreciation_schedule(self):
if not self.get("schedules"):
return True
@@ -318,7 +326,7 @@ class Asset(AccountsController):
self.get_depreciation_rate(d, on_validate=True), d.precision("rate_of_depreciation")
)
def make_depreciation_schedule(self, date_of_disposal, value_after_depreciation=None):
def make_depreciation_schedule(self, date_of_disposal=None, value_after_depreciation=None):
if not self.get("schedules"):
self.schedules = []
@@ -410,13 +418,7 @@ class Asset(AccountsController):
)
if depreciation_amount > 0:
self._add_depreciation_row(
date_of_disposal,
depreciation_amount,
finance_book.depreciation_method,
finance_book.finance_book,
finance_book.idx,
)
self._add_depreciation_row(date_of_disposal, depreciation_amount, finance_book, n)
break
@@ -498,25 +500,27 @@ class Asset(AccountsController):
skip_row = True
if flt(depreciation_amount, self.precision("gross_purchase_amount")) > 0:
self._add_depreciation_row(
schedule_date,
depreciation_amount,
finance_book.depreciation_method,
finance_book.finance_book,
finance_book.idx,
)
self._add_depreciation_row(schedule_date, depreciation_amount, finance_book, n)
def _add_depreciation_row(self, schedule_date, depreciation_amount, finance_book, schedule_idx):
if finance_book.shift_based:
shift = (
self.schedules_before_clearing[schedule_idx].shift
if self.schedules_before_clearing and len(self.schedules_before_clearing) > schedule_idx
else frappe.get_cached_value("Asset Shift Factor", {"default": 1}, "shift_name")
)
else:
shift = None
def _add_depreciation_row(
self, schedule_date, depreciation_amount, depreciation_method, finance_book, finance_book_id
):
self.append(
"schedules",
{
"schedule_date": schedule_date,
"depreciation_amount": depreciation_amount,
"depreciation_method": depreciation_method,
"finance_book": finance_book,
"finance_book_id": finance_book_id,
"depreciation_method": finance_book.depreciation_method,
"finance_book": finance_book.finance_book,
"finance_book_id": finance_book.idx,
"shift": shift,
},
)
@@ -545,6 +549,8 @@ class Asset(AccountsController):
num_of_depreciations_completed = 0
depr_schedule = []
self.schedules_before_clearing = self.get("schedules")
for schedule in self.get("schedules"):
# to update start when there are JEs linked with all the schedule rows corresponding to an FB
if len(start) == (int(schedule.finance_book_id) - 2):
@@ -752,10 +758,12 @@ class Asset(AccountsController):
and not date_of_return
):
book = self.get("finance_books")[cint(d.finance_book_id) - 1]
depreciation_amount += flt(
value_after_depreciation - flt(book.expected_value_after_useful_life),
d.precision("depreciation_amount"),
)
if not book.shift_based:
depreciation_amount += flt(
value_after_depreciation - flt(book.expected_value_after_useful_life),
d.precision("depreciation_amount"),
)
d.depreciation_amount = depreciation_amount
accumulated_depreciation += d.depreciation_amount
@@ -1217,6 +1225,7 @@ def get_item_details(item_code, asset_category, gross_purchase_amount):
"total_number_of_depreciations": d.total_number_of_depreciations,
"frequency_of_depreciation": d.frequency_of_depreciation,
"daily_prorata_based": d.daily_prorata_based,
"shift_based": d.shift_based,
"salvage_value_percentage": d.salvage_value_percentage,
"expected_value_after_useful_life": flt(gross_purchase_amount)
* flt(d.salvage_value_percentage / 100),
@@ -1385,6 +1394,9 @@ def get_updated_rate_of_depreciation_for_wdv_and_dd(asset, depreciable_value, fb
def get_straight_line_or_manual_depr_amount(
asset, row, schedule_idx, number_of_pending_depreciations
):
if row.shift_based:
return get_shift_depr_amount(asset, row, schedule_idx)
# if the Depreciation Schedule is being modified after Asset Repair due to increase in asset life and value
if asset.flags.increase_in_asset_life:
return (flt(row.value_after_depreciation) - flt(row.expected_value_after_useful_life)) / (
@@ -1479,6 +1491,40 @@ def get_straight_line_or_manual_depr_amount(
) / flt(row.total_number_of_depreciations - asset.number_of_depreciations_booked)
def get_shift_depr_amount(asset, row, schedule_idx):
if asset.get("__islocal") and not asset.flags.shift_allocation:
return (
flt(asset.gross_purchase_amount)
- flt(asset.opening_accumulated_depreciation)
- flt(row.expected_value_after_useful_life)
) / flt(row.total_number_of_depreciations - asset.number_of_depreciations_booked)
asset_shift_factors_map = get_asset_shift_factors_map()
shift = (
asset.schedules_before_clearing[schedule_idx].shift
if len(asset.schedules_before_clearing) > schedule_idx
else None
)
shift_factor = asset_shift_factors_map.get(shift) if shift else 0
shift_factors_sum = sum(
flt(asset_shift_factors_map.get(schedule.shift)) for schedule in asset.schedules_before_clearing
)
return (
(
flt(asset.gross_purchase_amount)
- flt(asset.opening_accumulated_depreciation)
- flt(row.expected_value_after_useful_life)
)
/ flt(shift_factors_sum)
) * shift_factor
def get_asset_shift_factors_map():
return dict(frappe.db.get_all("Asset Shift Factor", ["shift_name", "shift_factor"], as_list=True))
def get_wdv_or_dd_depr_amount(
depreciable_value,
rate_of_depreciation,

1
erpnext/assets/doctype/asset/test_asset.py
View File

@@ -1706,6 +1706,7 @@ def create_asset(**args):
"expected_value_after_useful_life": args.expected_value_after_useful_life or 0,
"depreciation_start_date": args.depreciation_start_date,
"daily_prorata_based": args.daily_prorata_based or 0,
"shift_based": args.shift_based or 0,
},
)

10
erpnext/assets/doctype/asset_finance_book/asset_finance_book.json
View File

@@ -9,6 +9,7 @@
"depreciation_method",
"total_number_of_depreciations",
"daily_prorata_based",
"shift_based",
"column_break_5",
"frequency_of_depreciation",
"depreciation_start_date",
@@ -93,12 +94,19 @@
"fieldname": "daily_prorata_based",
"fieldtype": "Check",
"label": "Depreciate based on daily pro-rata"
},
{
"default": "0",
"depends_on": "eval:doc.depreciation_method == \"Straight Line\"",
"fieldname": "shift_based",
"fieldtype": "Check",
"label": "Depreciate based on shifts"
}
],
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
"modified": "2023-11-03 22:21:52.090191",
"modified": "2023-11-29 03:53:03.591098",
"modified_by": "Administrator",
"module": "Assets",
"name": "Asset Finance Book",

0
erpnext/assets/doctype/asset_shift_allocation/__init__.py Normal file
View File

15
erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.js Normal file
View File

@@ -0,0 +1,15 @@
// Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
frappe.ui.form.on('Asset Shift Allocation', {
onload: function(frm) {
frm.events.make_schedules_editable(frm);
},
make_schedules_editable: function(frm) {
frm.toggle_enable("depreciation_schedule", true);
frm.fields_dict["depreciation_schedule"].grid.toggle_enable("schedule_date", false);
frm.fields_dict["depreciation_schedule"].grid.toggle_enable("depreciation_amount", false);
frm.fields_dict["depreciation_schedule"].grid.toggle_enable("shift", true);
}
});

115
erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.json Normal file
View File

@@ -0,0 +1,115 @@
{
"actions": [],
"allow_rename": 1,
"autoname": "naming_series:",
"creation": "2023-11-29 04:01:33.796458",
"default_view": "List",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"section_break_esaa",
"asset",
"naming_series",
"column_break_tdae",
"finance_book",
"amended_from",
"depreciation_schedule_section",
"depreciation_schedule"
],
"fields": [
{
"fieldname": "section_break_esaa",
"fieldtype": "Section Break"
},
{
"fieldname": "asset",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Asset",
"options": "Asset",
"reqd": 1
},
{
"fieldname": "naming_series",
"fieldtype": "Select",
"in_list_view": 1,
"label": "Naming Series",
"options": "ACC-ASA-.YYYY.-",
"reqd": 1
},
{
"fieldname": "column_break_tdae",
"fieldtype": "Column Break"
},
{
"fieldname": "finance_book",
"fieldtype": "Link",
"label": "Finance Book",
"options": "Finance Book"
},
{
"depends_on": "eval:!doc.__islocal",
"fieldname": "depreciation_schedule_section",
"fieldtype": "Section Break",
"label": "Depreciation Schedule"
},
{
"fieldname": "depreciation_schedule",
"fieldtype": "Table",
"label": "Depreciation Schedule",
"options": "Depreciation Schedule"
},
{
"fieldname": "amended_from",
"fieldtype": "Link",
"label": "Amended From",
"no_copy": 1,
"options": "Asset Shift Allocation",
"print_hide": 1,
"read_only": 1
}
],
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
"modified": "2023-11-29 04:06:20.586168",
"modified_by": "Administrator",
"module": "Assets",
"name": "Asset Shift Allocation",
"naming_rule": "By \"Naming Series\" field",
"owner": "Administrator",
"permissions": [
{
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"print": 1,
"read": 1,
"report": 1,
"role": "System Manager",
"share": 1,
"write": 1
},
{
"amend": 1,
"cancel": 1,
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"print": 1,
"read": 1,
"report": 1,
"role": "Accounts User",
"share": 1,
"submit": 1,
"write": 1
}
],
"sort_field": "modified",
"sort_order": "DESC",
"states": [],
"track_changes": 1
}

247
erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.py Normal file
View File

@@ -0,0 +1,247 @@
# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
import frappe
from frappe import _
from frappe.model.document import Document
from frappe.utils import add_months, cint, flt, get_last_day
from erpnext.assets.doctype.asset.asset import get_asset_shift_factors_map
from erpnext.assets.doctype.asset.depreciation import is_last_day_of_the_month
class AssetShiftAllocation(Document):
def after_insert(self):
self.fetch_and_set_depr_schedule()
def validate(self):
self.asset_doc = frappe.get_doc("Asset", self.asset)
self.validate_invalid_shift_change()
self.update_depr_schedule()
def on_submit(self):
self.update_asset_schedule()
def fetch_and_set_depr_schedule(self):
if len(self.asset_doc.finance_books) != 1:
frappe.throw(_("Only assets with one finance book allowed in v14."))
if not any(fb.get("shift_based") for fb in self.asset_doc.finance_books):
frappe.throw(_("Asset {0} is not using shift based depreciation").format(self.asset))
for schedule in self.asset_doc.get("schedules"):
self.append(
"depreciation_schedule",
{
"schedule_date": schedule.schedule_date,
"depreciation_amount": schedule.depreciation_amount,
"accumulated_depreciation_amount": schedule.accumulated_depreciation_amount,
"journal_entry": schedule.journal_entry,
"shift": schedule.shift,
"depreciation_method": self.asset_doc.finance_books[0].depreciation_method,
"finance_book": self.asset_doc.finance_books[0].finance_book,
"finance_book_id": self.asset_doc.finance_books[0].idx,
},
)
self.flags.ignore_validate = True
self.save()
def validate_invalid_shift_change(self):
if not self.get("depreciation_schedule") or self.docstatus == 1:
return
for i, sch in enumerate(self.depreciation_schedule):
if sch.journal_entry and self.asset_doc.schedules[i].shift != sch.shift:
frappe.throw(
_(
"Row {0}: Shift cannot be changed since the depreciation has already been processed"
).format(i)
)
def update_depr_schedule(self):
if not self.get("depreciation_schedule") or self.docstatus == 1:
return
self.allocate_shift_diff_in_depr_schedule()
temp_asset_doc = frappe.copy_doc(self.asset_doc)
temp_asset_doc.flags.shift_allocation = True
temp_asset_doc.schedules = []
for schedule in self.depreciation_schedule:
temp_asset_doc.append(
"schedules",
{
"schedule_date": schedule.schedule_date,
"depreciation_amount": schedule.depreciation_amount,
"accumulated_depreciation_amount": schedule.accumulated_depreciation_amount,
"journal_entry": schedule.journal_entry,
"shift": schedule.shift,
"depreciation_method": self.asset_doc.finance_books[0].depreciation_method,
"finance_book": self.asset_doc.finance_books[0].finance_book,
"finance_book_id": self.asset_doc.finance_books[0].idx,
},
)
temp_asset_doc.prepare_depreciation_data()
self.depreciation_schedule = []
for schedule in temp_asset_doc.get("schedules"):
self.append(
"depreciation_schedule",
{
"schedule_date": schedule.schedule_date,
"depreciation_amount": schedule.depreciation_amount,
"accumulated_depreciation_amount": schedule.accumulated_depreciation_amount,
"journal_entry": schedule.journal_entry,
"shift": schedule.shift,
"depreciation_method": self.asset_doc.finance_books[0].depreciation_method,
"finance_book": self.asset_doc.finance_books[0].finance_book,
"finance_book_id": self.asset_doc.finance_books[0].idx,
},
)
def allocate_shift_diff_in_depr_schedule(self):
asset_shift_factors_map = get_asset_shift_factors_map()
reverse_asset_shift_factors_map = {
asset_shift_factors_map[k]: k for k in asset_shift_factors_map
}
original_shift_factors_sum = sum(
flt(asset_shift_factors_map.get(schedule.shift)) for schedule in self.asset_doc.schedules
)
new_shift_factors_sum = sum(
flt(asset_shift_factors_map.get(schedule.shift)) for schedule in self.depreciation_schedule
)
diff = new_shift_factors_sum - original_shift_factors_sum
if diff > 0:
for i, schedule in reversed(list(enumerate(self.depreciation_schedule))):
if diff <= 0:
break
shift_factor = flt(asset_shift_factors_map.get(schedule.shift))
if shift_factor <= diff:
self.depreciation_schedule.pop()
diff -= shift_factor
else:
try:
self.depreciation_schedule[i].shift = reverse_asset_shift_factors_map.get(
shift_factor - diff
)
diff = 0
except Exception:
frappe.throw(_("Could not auto update shifts. Shift with shift factor {0} needed.")).format(
shift_factor - diff
)
elif diff < 0:
shift_factors = list(asset_shift_factors_map.values())
desc_shift_factors = sorted(shift_factors, reverse=True)
depr_schedule_len_diff = self.asset_doc.total_number_of_depreciations - len(
self.depreciation_schedule
)
subsets_result = []
if depr_schedule_len_diff > 0:
num_rows_to_add = depr_schedule_len_diff
while not subsets_result and num_rows_to_add > 0:
find_subsets_with_sum(shift_factors, num_rows_to_add, abs(diff), [], subsets_result)
if subsets_result:
break
num_rows_to_add -= 1
if subsets_result:
for i in range(num_rows_to_add):
schedule_date = add_months(
self.depreciation_schedule[-1].schedule_date,
cint(self.asset_doc.frequency_of_depreciation),
)
if is_last_day_of_the_month(self.depreciation_schedule[-1].schedule_date):
schedule_date = get_last_day(schedule_date)
self.append(
"depreciation_schedule",
{
"schedule_date": schedule_date,
"shift": reverse_asset_shift_factors_map.get(subsets_result[0][i]),
"depreciation_method": self.asset_doc.finance_books[0].depreciation_method,
"finance_book": self.asset_doc.finance_books[0].finance_book,
"finance_book_id": self.asset_doc.finance_books[0].idx,
},
)
if depr_schedule_len_diff <= 0 or not subsets_result:
for i, schedule in reversed(list(enumerate(self.depreciation_schedule))):
diff = abs(diff)
if diff <= 0:
break
shift_factor = flt(asset_shift_factors_map.get(schedule.shift))
if shift_factor <= diff:
for sf in desc_shift_factors:
if sf - shift_factor <= diff:
self.depreciation_schedule[i].shift = reverse_asset_shift_factors_map.get(sf)
diff -= sf - shift_factor
break
else:
try:
self.depreciation_schedule[i].shift = reverse_asset_shift_factors_map.get(
shift_factor + diff
)
diff = 0
except Exception:
frappe.throw(_("Could not auto update shifts. Shift with shift factor {0} needed.")).format(
shift_factor + diff
)
def update_asset_schedule(self):
self.asset_doc.flags.shift_allocation = True
self.asset_doc.schedules = []
for schedule in self.depreciation_schedule:
self.asset_doc.append(
"schedules",
{
"schedule_date": schedule.schedule_date,
"depreciation_amount": schedule.depreciation_amount,
"accumulated_depreciation_amount": schedule.accumulated_depreciation_amount,
"journal_entry": schedule.journal_entry,
"shift": schedule.shift,
"depreciation_method": self.asset_doc.finance_books[0].depreciation_method,
"finance_book": self.asset_doc.finance_books[0].finance_book,
"finance_book_id": self.asset_doc.finance_books[0].idx,
},
)
self.asset_doc.flags.ignore_validate_update_after_submit = True
self.asset_doc.prepare_depreciation_data()
self.asset_doc.save()
def find_subsets_with_sum(numbers, k, target_sum, current_subset, result):
if k == 0 and target_sum == 0:
result.append(current_subset.copy())
return
if k <= 0 or target_sum <= 0 or not numbers:
return
# Include the current number in the subset
find_subsets_with_sum(
numbers, k - 1, target_sum - numbers[0], current_subset + [numbers[0]], result
)
# Exclude the current number from the subset
find_subsets_with_sum(numbers[1:], k, target_sum, current_subset, result)

112
erpnext/assets/doctype/asset_shift_allocation/test_asset_shift_allocation.py Normal file
View File

@@ -0,0 +1,112 @@
# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and Contributors
# See license.txt
import frappe
from frappe.tests.utils import FrappeTestCase
from frappe.utils import cstr
from erpnext.assets.doctype.asset.test_asset import create_asset
class TestAssetShiftAllocation(FrappeTestCase):
@classmethod
def setUpClass(cls):
create_asset_shift_factors()
@classmethod
def tearDownClass(cls):
frappe.db.rollback()
def test_asset_shift_allocation(self):
asset = create_asset(
calculate_depreciation=1,
available_for_use_date="2023-01-01",
purchase_date="2023-01-01",
gross_purchase_amount=120000,
depreciation_start_date="2023-01-31",
total_number_of_depreciations=12,
frequency_of_depreciation=1,
shift_based=1,
submit=1,
)
expected_schedules = [
["2023-01-31", 10000.0, 10000.0, "Single"],
["2023-02-28", 10000.0, 20000.0, "Single"],
["2023-03-31", 10000.0, 30000.0, "Single"],
["2023-04-30", 10000.0, 40000.0, "Single"],
["2023-05-31", 10000.0, 50000.0, "Single"],
["2023-06-30", 10000.0, 60000.0, "Single"],
["2023-07-31", 10000.0, 70000.0, "Single"],
["2023-08-31", 10000.0, 80000.0, "Single"],
["2023-09-30", 10000.0, 90000.0, "Single"],
["2023-10-31", 10000.0, 100000.0, "Single"],
["2023-11-30", 10000.0, 110000.0, "Single"],
["2023-12-31", 10000.0, 120000.0, "Single"],
]
schedules = [
[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount, d.shift]
for d in asset.get("schedules")
]
self.assertEqual(schedules, expected_schedules)
asset_shift_allocation = frappe.get_doc(
{"doctype": "Asset Shift Allocation", "asset": asset.name}
).insert()
schedules = [
[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount, d.shift]
for d in asset_shift_allocation.get("depreciation_schedule")
]
self.assertEqual(schedules, expected_schedules)
asset_shift_allocation = frappe.get_doc("Asset Shift Allocation", asset_shift_allocation.name)
asset_shift_allocation.depreciation_schedule[4].shift = "Triple"
asset_shift_allocation.save()
schedules = [
[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount, d.shift]
for d in asset_shift_allocation.get("depreciation_schedule")
]
expected_schedules = [
["2023-01-31", 10000.0, 10000.0, "Single"],
["2023-02-28", 10000.0, 20000.0, "Single"],
["2023-03-31", 10000.0, 30000.0, "Single"],
["2023-04-30", 10000.0, 40000.0, "Single"],
["2023-05-31", 20000.0, 60000.0, "Triple"],
["2023-06-30", 10000.0, 70000.0, "Single"],
["2023-07-31", 10000.0, 80000.0, "Single"],
["2023-08-31", 10000.0, 90000.0, "Single"],
["2023-09-30", 10000.0, 100000.0, "Single"],
["2023-10-31", 10000.0, 110000.0, "Single"],
["2023-11-30", 10000.0, 120000.0, "Single"],
]
self.assertEqual(schedules, expected_schedules)
asset_shift_allocation.submit()
asset.reload()
schedules = [
[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount, d.shift]
for d in asset.get("schedules")
]
self.assertEqual(schedules, expected_schedules)
def create_asset_shift_factors():
shifts = [
{"doctype": "Asset Shift Factor", "shift_name": "Half", "shift_factor": 0.5, "default": 0},
{"doctype": "Asset Shift Factor", "shift_name": "Single", "shift_factor": 1, "default": 1},
{"doctype": "Asset Shift Factor", "shift_name": "Double", "shift_factor": 1.5, "default": 0},
{"doctype": "Asset Shift Factor", "shift_name": "Triple", "shift_factor": 2, "default": 0},
]
for s in shifts:
frappe.get_doc(s).insert()

0
erpnext/assets/doctype/asset_shift_factor/__init__.py Normal file
View File

8
erpnext/assets/doctype/asset_shift_factor/asset_shift_factor.js Normal file
View File

@@ -0,0 +1,8 @@
// Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
frappe.ui.form.on('Asset Shift Factor', {
// refresh: function(frm) {
// }
});

76
erpnext/assets/doctype/asset_shift_factor/asset_shift_factor.json Normal file
View File

@@ -0,0 +1,76 @@
{
"actions": [],
"allow_rename": 1,
"autoname": "field:shift_name",
"creation": "2023-11-29 03:45:13.247372",
"default_view": "List",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"shift_name",
"shift_factor",
"default"
],
"fields": [
{
"fieldname": "shift_name",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Shift Name",
"reqd": 1,
"unique": 1
},
{
"fieldname": "shift_factor",
"fieldtype": "Float",
"in_list_view": 1,
"label": "Shift Factor",
"reqd": 1
},
{
"default": "0",
"fieldname": "default",
"fieldtype": "Check",
"in_list_view": 1,
"label": "Default"
}
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2023-11-29 04:06:31.723038",
"modified_by": "Administrator",
"module": "Assets",
"name": "Asset Shift Factor",
"naming_rule": "By fieldname",
"owner": "Administrator",
"permissions": [
{
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"print": 1,
"read": 1,
"report": 1,
"role": "System Manager",
"share": 1,
"write": 1
},
{
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"print": 1,
"read": 1,
"report": 1,
"role": "Accounts User",
"share": 1,
"write": 1
}
],
"sort_field": "modified",
"sort_order": "DESC",
"states": []
}

24
erpnext/assets/doctype/asset_shift_factor/asset_shift_factor.py Normal file
View File

@@ -0,0 +1,24 @@
# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
import frappe
from frappe import _
from frappe.model.document import Document
class AssetShiftFactor(Document):
def validate(self):
self.validate_default()
def validate_default(self):
if self.default:
existing_default_shift_factor = frappe.db.get_value(
"Asset Shift Factor", {"default": 1}, "name"
)
if existing_default_shift_factor:
frappe.throw(
_("Asset Shift Factor {0} is set as default currently. Please change it first.").format(
frappe.bold(existing_default_shift_factor)
)
)

9
erpnext/assets/doctype/asset_shift_factor/test_asset_shift_factor.py Normal file
View File

@@ -0,0 +1,9 @@
# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and Contributors
# See license.txt
# import frappe
from frappe.tests.utils import FrappeTestCase
class TestAssetShiftFactor(FrappeTestCase):
pass

407
erpnext/assets/doctype/depreciation_schedule/depreciation_schedule.json
View File

@@ -1,318 +1,115 @@
{
"allow_copy": 0,
"allow_guest_to_view": 0,
"allow_import": 0,
"allow_rename": 1,
"autoname": "",
"beta": 0,
"creation": "2016-03-02 15:11:01.278862",
"custom": 0,
"docstatus": 0,
"doctype": "DocType",
"document_type": "Document",
"editable_grid": 1,
"engine": "InnoDB",
"actions": [],
"allow_rename": 1,
"creation": "2016-03-02 15:11:01.278862",
"doctype": "DocType",
"document_type": "Document",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"finance_book",
"schedule_date",
"depreciation_amount",
"column_break_3",
"accumulated_depreciation_amount",
"journal_entry",
"shift",
"make_depreciation_entry",
"finance_book_id",
"depreciation_method"
],
"fields": [
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "finance_book",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 1,
"in_standard_filter": 0,
"label": "Finance Book",
"length": 0,
"no_copy": 0,
"options": "Finance Book",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
"fieldname": "finance_book",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Finance Book",
"options": "Finance Book",
"read_only": 1
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "schedule_date",
"fieldtype": "Date",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 1,
"in_standard_filter": 0,
"label": "Schedule Date",
"length": 0,
"no_copy": 1,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
"fieldname": "schedule_date",
"fieldtype": "Date",
"in_list_view": 1,
"label": "Schedule Date",
"no_copy": 1,
"reqd": 1
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "depreciation_amount",
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 1,
"in_standard_filter": 0,
"label": "Depreciation Amount",
"length": 0,
"no_copy": 1,
"options": "Company:company:default_currency",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
"fieldname": "depreciation_amount",
"fieldtype": "Currency",
"in_list_view": 1,
"label": "Depreciation Amount",
"no_copy": 1,
"options": "Company:company:default_currency",
"reqd": 1
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "column_break_3",
"fieldtype": "Column Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
"fieldname": "column_break_3",
"fieldtype": "Column Break"
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "accumulated_depreciation_amount",
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 1,
"in_standard_filter": 0,
"label": "Accumulated Depreciation Amount",
"length": 0,
"no_copy": 1,
"options": "Company:company:default_currency",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
"fieldname": "accumulated_depreciation_amount",
"fieldtype": "Currency",
"in_list_view": 1,
"label": "Accumulated Depreciation Amount",
"no_copy": 1,
"options": "Company:company:default_currency",
"read_only": 1
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"depends_on": "eval:doc.docstatus==1",
"fieldname": "journal_entry",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 1,
"in_standard_filter": 0,
"label": "Journal Entry",
"length": 0,
"no_copy": 1,
"options": "Journal Entry",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
"depends_on": "eval:doc.docstatus==1",
"fieldname": "journal_entry",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Journal Entry",
"no_copy": 1,
"options": "Journal Entry",
"read_only": 1
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 1,
"bold": 0,
"collapsible": 0,
"columns": 0,
"depends_on": "eval:(doc.docstatus==1 && !doc.journal_entry && doc.schedule_date <= get_today())",
"fieldname": "make_depreciation_entry",
"fieldtype": "Button",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Make Depreciation Entry",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
"allow_on_submit": 1,
"depends_on": "eval:(doc.docstatus==1 && !doc.journal_entry && doc.schedule_date <= get_today())",
"fieldname": "make_depreciation_entry",
"fieldtype": "Button",
"label": "Make Depreciation Entry"
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "finance_book_id",
"fieldtype": "Data",
"hidden": 1,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Finance Book Id",
"length": 0,
"no_copy": 1,
"permlevel": 0,
"precision": "",
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
"fieldname": "finance_book_id",
"fieldtype": "Data",
"hidden": 1,
"label": "Finance Book Id",
"no_copy": 1,
"print_hide": 1,
"read_only": 1
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "depreciation_method",
"fieldtype": "Select",
"hidden": 1,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Depreciation Method",
"length": 0,
"no_copy": 1,
"options": "\nStraight Line\nDouble Declining Balance\nWritten Down Value\nManual",
"permlevel": 0,
"precision": "",
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
"fieldname": "depreciation_method",
"fieldtype": "Select",
"hidden": 1,
"label": "Depreciation Method",
"no_copy": 1,
"options": "\nStraight Line\nDouble Declining Balance\nWritten Down Value\nManual",
"print_hide": 1,
"read_only": 1
},
{
"fieldname": "shift",
"fieldtype": "Link",
"label": "Shift",
"options": "Asset Shift Factor"
}
],
"has_web_view": 0,
"hide_heading": 0,
"hide_toolbar": 0,
"idx": 0,
"image_view": 0,
"in_create": 0,
"is_submittable": 0,
"issingle": 0,
"istable": 1,
"max_attachments": 0,
"modified": "2018-05-10 15:12:41.679436",
"modified_by": "Administrator",
"module": "Assets",
"name": "Depreciation Schedule",
"name_case": "",
"owner": "Administrator",
"permissions": [],
"quick_entry": 1,
"read_only": 0,
"read_only_onload": 0,
"show_name_in_global_search": 0,
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 0,
"track_seen": 0
],
"istable": 1,
"links": [],
"modified": "2023-11-29 04:43:04.218580",
"modified_by": "Administrator",
"module": "Assets",
"name": "Depreciation Schedule",
"owner": "Administrator",
"permissions": [],
"quick_entry": 1,
"sort_field": "modified",
"sort_order": "DESC",
"states": []
}