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

Merge branch 'develop' into depreciate-existing-asset

Browse Source
This commit is contained in:
Saqib 2021-12-02 12:13:12 +05:30 committed by GitHub
commit fa42cf796b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,20 +80,20 @@ frappe.ui.form.on('Asset', {
if (frm.doc.docstatus==1) { if (frm.doc.docstatus==1) {
if (in_list(["Submitted", "Partially Depreciated", "Fully Depreciated"], frm.doc.status)) { if (in_list(["Submitted", "Partially Depreciated", "Fully Depreciated"], frm.doc.status)) {
frm.add_custom_button("Transfer Asset", function() { frm.add_custom_button(__("Transfer Asset"), function() {
erpnext.asset.transfer_asset(frm); erpnext.asset.transfer_asset(frm);
}, __("Manage")); }, __("Manage"));
frm.add_custom_button("Scrap Asset", function() { frm.add_custom_button(__("Scrap Asset"), function() {
erpnext.asset.scrap_asset(frm); erpnext.asset.scrap_asset(frm);
}, __("Manage")); }, __("Manage"));
frm.add_custom_button("Sell Asset", function() { frm.add_custom_button(__("Sell Asset"), function() {
frm.trigger("make_sales_invoice"); frm.trigger("make_sales_invoice");
}, __("Manage")); }, __("Manage"));
} else if (frm.doc.status=='Scrapped') { } else if (frm.doc.status=='Scrapped') {
frm.add_custom_button("Restore Asset", function() { frm.add_custom_button(__("Restore Asset"), function() {
erpnext.asset.restore_asset(frm); erpnext.asset.restore_asset(frm);
}, __("Manage")); }, __("Manage"));
} }
@ -121,7 +121,7 @@ frappe.ui.form.on('Asset', {
} }
if (frm.doc.purchase_receipt || !frm.doc.is_existing_asset) { if (frm.doc.purchase_receipt || !frm.doc.is_existing_asset) {
frm.add_custom_button("View General Ledger", function() { frm.add_custom_button(__("View General Ledger"), function() {
frappe.route_options = { frappe.route_options = {
"voucher_no": frm.doc.name, "voucher_no": frm.doc.name,
"from_date": frm.doc.available_for_use_date, "from_date": frm.doc.available_for_use_date,

2
erpnext/public/js/controllers/transaction.js
View File

@ -1106,7 +1106,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
$.each(this.frm.doc.taxes || [], function(i, d) { $.each(this.frm.doc.taxes || [], function(i, d) {
if(d.charge_type == "Actual") { if(d.charge_type == "Actual") {
frappe.model.set_value(d.doctype, d.name, "tax_amount", frappe.model.set_value(d.doctype, d.name, "tax_amount",
flt(d.tax_amount) / flt(exchange_rate)); flt(d.base_tax_amount) / flt(exchange_rate));
} }
}); });
} }