Skip to content

Commit

Permalink
feat: composite WIP asset (backport #37352) (#37360)
Browse files Browse the repository at this point in the history 
feat: composite WIP asset (#37352)

feat: wip composite asset
(cherry picked from commit 0ecd7d2)

Co-authored-by: Anand Baburajan <[email protected]>
  • Loading branch information
@mergify @anandbaburajan
mergify[bot] and anandbaburajan authored Oct 4, 2023
1 parent 9f1b932 commit 6947686
Show file tree
Hide file tree
Showing 12 changed files with 406 additions and 54 deletions.
6 changes: 6 additions & 0 deletions erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,12 @@ cur_frm.set_query("expense_account", "items", function(doc) {
}
});

cur_frm.set_query("wip_composite_asset", "items", function() {
return {
filters: {'is_composite_asset': 1, 'docstatus': 0 }
}
});

cur_frm.cscript.expense_account = function(doc, cdt, cdn){
var d = locals[cdt][cdn];
if(d.idx == 1 && d.expense_account){
Expand Down
11 changes: 9 additions & 2 deletions erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
"manufacturer_part_no",
"accounting",
"expense_account",
"wip_composite_asset",
"col_break5",
"is_fixed_asset",
"asset_location",
Expand Down Expand Up @@ -877,12 +878,18 @@
"fieldname": "apply_tds",
"fieldtype": "Check",
"label": "Apply TDS"
},
{
"fieldname": "wip_composite_asset",
"fieldtype": "Link",
"label": "WIP Composite Asset",
"options": "Asset"
}
],
"idx": 1,
"istable": 1,
"links": [],
"modified": "2023-07-04 17:22:21.501152",
"modified": "2023-10-03 21:01:01.824892",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice Item",
Expand All @@ -892,4 +899,4 @@
"sort_field": "modified",
"sort_order": "DESC",
"states": []
}
}
44 changes: 39 additions & 5 deletions erpnext/assets/doctype/asset/asset.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,15 @@ frappe.ui.form.on('Asset', {

if (frm.doc.docstatus == 0) {
frm.toggle_reqd("finance_books", frm.doc.calculate_depreciation);

if (frm.doc.is_composite_asset && !frm.doc.capitalized_in) {
$('.primary-action').prop('hidden', true);
$('.form-message').text('Capitalize this asset to confirm');

frm.add_custom_button(__("Capitalize Asset"), function() {
frm.trigger("create_asset_capitalization");
});
}
}
},

Expand All @@ -168,7 +177,7 @@ frappe.ui.form.on('Asset', {
frm.set_df_property('purchase_invoice', 'read_only', 1);
frm.set_df_property('purchase_receipt', 'read_only', 1);
}
else if (frm.doc.is_existing_asset) {
else if (frm.doc.is_existing_asset || frm.doc.is_composite_asset) {
frm.toggle_reqd('purchase_receipt', 0);
frm.toggle_reqd('purchase_invoice', 0);
}
Expand Down Expand Up @@ -300,7 +309,17 @@ frappe.ui.form.on('Asset', {

is_existing_asset: function(frm) {
frm.trigger("toggle_reference_doc");
// frm.toggle_reqd("next_depreciation_date", (!frm.doc.is_existing_asset && frm.doc.calculate_depreciation));
},

is_composite_asset: function(frm) {
if(frm.doc.is_composite_asset) {
frm.set_value('gross_purchase_amount', 0);
frm.set_df_property('gross_purchase_amount', 'read_only', 1);
} else {
frm.set_df_property('gross_purchase_amount', 'read_only', 0);
}

frm.trigger("toggle_reference_doc");
},

make_schedules_editable: function(frm) {
Expand Down Expand Up @@ -361,6 +380,19 @@ frappe.ui.form.on('Asset', {
});
},

create_asset_capitalization: function(frm) {
frappe.call({
args: {
"asset": frm.doc.name,
},
method: "erpnext.assets.doctype.asset.asset.create_asset_capitalization",
callback: function(r) {
var doclist = frappe.model.sync(r.message);
frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
}
});
},

split_asset: function(frm) {
const title = __('Split Asset');

Expand Down Expand Up @@ -424,9 +456,11 @@ frappe.ui.form.on('Asset', {
},

gross_purchase_amount: function(frm) {
frm.doc.finance_books.forEach(d => {
frm.events.set_depreciation_rate(frm, d);
})
if (frm.doc.finance_books) {
frm.doc.finance_books.forEach(d => {
frm.events.set_depreciation_rate(frm, d);
})
}
},

purchase_receipt: (frm) => {
Expand Down
29 changes: 24 additions & 5 deletions erpnext/assets/doctype/asset/asset.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"asset_owner",
"asset_owner_company",
"is_existing_asset",
"is_composite_asset",
"supplier",
"customer",
"image",
Expand Down Expand Up @@ -72,7 +73,8 @@
"purchase_receipt_amount",
"default_finance_book",
"depr_entry_posting_status",
"amended_from"
"amended_from",
"capitalized_in"
],
"fields": [
{
Expand Down Expand Up @@ -199,7 +201,7 @@
"fieldtype": "Date",
"label": "Purchase Date",
"read_only": 1,
"read_only_depends_on": "eval:!doc.is_existing_asset",
"read_only_depends_on": "eval:!doc.is_existing_asset && !doc.is_composite_asset",
"reqd": 1
},
{
Expand Down Expand Up @@ -237,10 +239,12 @@
"default": "0",
"fieldname": "calculate_depreciation",
"fieldtype": "Check",
"label": "Calculate Depreciation"
"label": "Calculate Depreciation",
"read_only_depends_on": "eval:doc.is_composite_asset && !doc.gross_purchase_amount"
},
{
"default": "0",
"depends_on": "eval:!doc.is_composite_asset",
"fieldname": "is_existing_asset",
"fieldtype": "Check",
"label": "Is Existing Asset"
Expand Down Expand Up @@ -492,7 +496,7 @@
"fieldname": "asset_quantity",
"fieldtype": "Int",
"label": "Asset Quantity",
"read_only_depends_on": "eval:!doc.is_existing_asset"
"read_only_depends_on": "eval:!doc.is_existing_asset && !doc.is_composite_asset"
},
{
"fieldname": "depr_entry_posting_status",
Expand All @@ -510,6 +514,21 @@
"fieldname": "is_fully_depreciated",
"fieldtype": "Check",
"label": "Is Fully Depreciated"
},
{
"default": "0",
"depends_on": "eval:!doc.is_existing_asset",
"fieldname": "is_composite_asset",
"fieldtype": "Check",
"label": "Is Composite Asset"
},
{
"fieldname": "capitalized_in",
"fieldtype": "Link",
"hidden": 1,
"label": "Capitalized In",
"options": "Asset Capitalization",
"read_only": 1
}
],
"idx": 72,
Expand Down Expand Up @@ -538,7 +557,7 @@
"table_fieldname": "accounts"
}
],
"modified": "2023-08-10 20:25:09.913073",
"modified": "2023-10-03 23:28:26.732269",
"modified_by": "Administrator",
"module": "Assets",
"name": "Asset",
Expand Down
11 changes: 10 additions & 1 deletion erpnext/assets/doctype/asset/asset.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ def validate_asset_values(self):
if not self.asset_category:
self.asset_category = frappe.get_cached_value("Item", self.item_code, "asset_category")

if not flt(self.gross_purchase_amount):
if not flt(self.gross_purchase_amount) and not self.is_composite_asset:
frappe.throw(_("Gross Purchase Amount is mandatory"), frappe.MandatoryError)

if is_cwip_accounting_enabled(self.asset_category):
Expand Down Expand Up @@ -1166,6 +1166,15 @@ def create_asset_repair(asset, asset_name):
return asset_repair


@frappe.whitelist()
def create_asset_capitalization(asset):
asset_capitalization = frappe.new_doc("Asset Capitalization")
asset_capitalization.update(
{"target_asset": asset, "capitalization_method": "Choose a WIP composite asset"}
)
return asset_capitalization


@frappe.whitelist()
def create_asset_value_adjustment(asset, asset_category, company):
asset_value_adjustment = frappe.new_doc("Asset Value Adjustment")
Expand Down
1 change: 1 addition & 0 deletions erpnext/assets/doctype/asset/test_asset.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1686,6 +1686,7 @@ def create_asset(**args):
"location": args.location or "Test Location",
"asset_owner": args.asset_owner or "Company",
"is_existing_asset": args.is_existing_asset or 1,
"is_composite_asset": args.is_composite_asset or 0,
"asset_quantity": args.get("asset_quantity") or 1,
"depr_entry_posting_status": args.depr_entry_posting_status or "",
}
Expand Down
72 changes: 61 additions & 11 deletions erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,15 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s

refresh() {
this.show_general_ledger();

if ((this.frm.doc.stock_items && this.frm.doc.stock_items.length) || !this.frm.doc.target_is_fixed_asset) {
this.show_stock_ledger();
}

if (this.frm.doc.stock_items && !this.frm.doc.stock_items.length && this.frm.doc.target_asset && this.frm.doc.capitalization_method === "Choose a WIP composite asset") {
this.set_consumed_stock_items_tagged_to_wip_composite_asset(this.frm.doc.target_asset);
this.get_target_asset_details();
}
}

setup_queries() {
Expand All @@ -34,18 +40,9 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s
});

me.frm.set_query("target_asset", function() {
var filters = {};

if (me.frm.doc.target_item_code) {
filters['item_code'] = me.frm.doc.target_item_code;
}

filters['status'] = ["not in", ["Draft", "Scrapped", "Sold", "Capitalized", "Decapitalized"]];
filters['docstatus'] = 1;

return {
filters: filters
};
filters: {'is_composite_asset': 1, 'docstatus': 0 }
}
});

me.frm.set_query("asset", "asset_items", function() {
Expand Down Expand Up @@ -104,6 +101,39 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s
return this.get_target_item_details();
}

target_asset() {
if (this.frm.doc.target_asset && this.frm.doc.capitalization_method === "Choose a WIP composite asset") {
this.set_consumed_stock_items_tagged_to_wip_composite_asset(this.frm.doc.target_asset);
this.get_target_asset_details();
}
}

set_consumed_stock_items_tagged_to_wip_composite_asset(asset) {
var me = this;

if (asset) {
return me.frm.call({
method: "erpnext.assets.doctype.asset_capitalization.asset_capitalization.get_items_tagged_to_wip_composite_asset",
args: {
asset: asset,
},
callback: function (r) {
if (!r.exc && r.message) {
me.frm.clear_table("stock_items");

for (let item of r.message) {
me.frm.add_child("stock_items", item);
}

refresh_field("stock_items");

me.calculate_totals();
}
}
});
}
}

item_code(doc, cdt, cdn) {
var row = frappe.get_doc(cdt, cdn);
if (cdt === "Asset Capitalization Stock Item") {
Expand Down Expand Up @@ -218,6 +248,26 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s
}
}

get_target_asset_details() {
var me = this;

if (me.frm.doc.target_asset) {
return me.frm.call({
method: "erpnext.assets.doctype.asset_capitalization.asset_capitalization.get_target_asset_details",
child: me.frm.doc,
args: {
asset: me.frm.doc.target_asset,
company: me.frm.doc.company,
},
callback: function (r) {
if (!r.exc) {
me.frm.refresh_fields();
}
}
});
}
}

get_consumed_stock_item_details(row) {
var me = this;

Expand Down
Loading

0 comments on commit 6947686

Please sign in to comment.