From e647c1f3cb40d21a91007222f468b9a60e33d64a Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Fri, 15 Jun 2018 13:06:28 +0530 Subject: [PATCH] Renamed asset adjustment to asset value adjustment (#14532) --- .../doctype/journal_entry/journal_entry.py | 2 +- erpnext/assets/doctype/asset/asset.js | 2 +- erpnext/assets/doctype/asset/asset.py | 2 +- .../__init__.py | 0 .../asset_value_adjustment.js} | 2 +- .../asset_value_adjustment.json} | 40 ++++++++++++------- .../asset_value_adjustment.py} | 2 +- .../test_asset_value_adjustment.js} | 6 +-- .../test_asset_value_adjustment.py} | 2 +- erpnext/config/assets.py | 2 +- erpnext/patches.txt | 1 + .../v11_0/rename_asset_adjustment_doctype.py | 10 +++++ 12 files changed, 47 insertions(+), 24 deletions(-) rename erpnext/assets/doctype/{asset_adjustment => asset_value_adjustment}/__init__.py (100%) rename erpnext/assets/doctype/{asset_adjustment/asset_adjustment.js => asset_value_adjustment/asset_value_adjustment.js} (95%) rename erpnext/assets/doctype/{asset_adjustment/asset_adjustment.json => asset_value_adjustment/asset_value_adjustment.json} (92%) rename erpnext/assets/doctype/{asset_adjustment/asset_adjustment.py => asset_value_adjustment/asset_value_adjustment.py} (99%) rename erpnext/assets/doctype/{asset_adjustment/test_asset_adjustment.js => asset_value_adjustment/test_asset_value_adjustment.js} (68%) rename erpnext/assets/doctype/{asset_adjustment/test_asset_adjustment.py => asset_value_adjustment/test_asset_value_adjustment.py} (78%) create mode 100644 erpnext/patches/v11_0/rename_asset_adjustment_doctype.py diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index 2e787d1fe0..ba13ea4bd9 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -126,7 +126,7 @@ class JournalEntry(AccountsController): "inter_company_journal_entry_reference", "") def unlink_asset_adjustment_entry(self): - frappe.db.sql(""" update `tabAsset Adjustment` + frappe.db.sql(""" update `tabAsset Value Adjustment` set journal_entry = null where journal_entry = %s""", self.name) def validate_party(self): diff --git a/erpnext/assets/doctype/asset/asset.js b/erpnext/assets/doctype/asset/asset.js index 658107bb18..4137866098 100644 --- a/erpnext/assets/doctype/asset/asset.js +++ b/erpnext/assets/doctype/asset/asset.js @@ -81,7 +81,7 @@ frappe.ui.form.on('Asset', { }, __("Make")); } if (frm.doc.status != 'Fully Depreciated') { - frm.add_custom_button(__("Asset Adjustment"), function() { + frm.add_custom_button(__("Asset Value Adjustment"), function() { frm.trigger("create_asset_adjustment"); }, __("Make")); } diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py index cef5b0abb9..39915d898f 100644 --- a/erpnext/assets/doctype/asset/asset.py +++ b/erpnext/assets/doctype/asset/asset.py @@ -434,7 +434,7 @@ def create_asset_maintenance(asset, item_code, item_name, asset_category, compan @frappe.whitelist() def create_asset_adjustment(asset, asset_category, company): - asset_maintenance = frappe.new_doc("Asset Adjustment") + asset_maintenance = frappe.new_doc("Asset Value Adjustment") asset_maintenance.update({ "asset": asset, "company": company, diff --git a/erpnext/assets/doctype/asset_adjustment/__init__.py b/erpnext/assets/doctype/asset_value_adjustment/__init__.py similarity index 100% rename from erpnext/assets/doctype/asset_adjustment/__init__.py rename to erpnext/assets/doctype/asset_value_adjustment/__init__.py diff --git a/erpnext/assets/doctype/asset_adjustment/asset_adjustment.js b/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.js similarity index 95% rename from erpnext/assets/doctype/asset_adjustment/asset_adjustment.js rename to erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.js index 346a2f1d71..73e84b35ac 100644 --- a/erpnext/assets/doctype/asset_adjustment/asset_adjustment.js +++ b/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.js @@ -1,7 +1,7 @@ // Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors // For license information, please see license.txt -frappe.ui.form.on('Asset Adjustment', { +frappe.ui.form.on('Asset Value Adjustment', { setup: function(frm) { frm.add_fetch('company', 'cost_center', 'cost_center'); frm.set_query('cost_center', function() { diff --git a/erpnext/assets/doctype/asset_adjustment/asset_adjustment.json b/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json similarity index 92% rename from erpnext/assets/doctype/asset_adjustment/asset_adjustment.json rename to erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json index 9e8899df82..7d963eb6a9 100644 --- a/erpnext/assets/doctype/asset_adjustment/asset_adjustment.json +++ b/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json @@ -14,6 +14,7 @@ "fields": [ { "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -41,11 +42,12 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, - "translatable": 0, + "translatable": 0, "unique": 0 }, { "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -73,16 +75,17 @@ "reqd": 1, "search_index": 0, "set_only_once": 0, - "translatable": 0, + "translatable": 0, "unique": 0 }, { "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, "columns": 0, - "fetch_from": "asset.asset_category", + "fetch_from": "asset.asset_category", "fieldname": "asset_category", "fieldtype": "Read Only", "hidden": 0, @@ -106,11 +109,12 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, - "translatable": 0, + "translatable": 0, "unique": 0 }, { "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -138,11 +142,12 @@ "reqd": 1, "search_index": 0, "set_only_once": 0, - "translatable": 0, + "translatable": 0, "unique": 0 }, { "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -170,11 +175,12 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, - "translatable": 0, + "translatable": 0, "unique": 0 }, { "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -200,11 +206,12 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, - "translatable": 0, + "translatable": 0, "unique": 0 }, { "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -231,11 +238,12 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, - "translatable": 0, + "translatable": 0, "unique": 0 }, { "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -262,11 +270,12 @@ "reqd": 1, "search_index": 0, "set_only_once": 0, - "translatable": 0, + "translatable": 0, "unique": 0 }, { "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -293,11 +302,12 @@ "reqd": 1, "search_index": 0, "set_only_once": 0, - "translatable": 0, + "translatable": 0, "unique": 0 }, { "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -329,6 +339,7 @@ }, { "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -361,6 +372,7 @@ }, { "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -377,7 +389,7 @@ "label": "Amended From", "length": 0, "no_copy": 1, - "options": "Asset Adjustment", + "options": "Asset Value Adjustment", "permlevel": 0, "print_hide": 1, "print_hide_if_no_value": 0, @@ -387,7 +399,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, - "translatable": 0, + "translatable": 0, "unique": 0 } ], @@ -401,10 +413,10 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2018-05-17 12:12:38.110774", + "modified": "2018-06-15 11:48:52.880894", "modified_by": "Administrator", "module": "Assets", - "name": "Asset Adjustment", + "name": "Asset Value Adjustment", "name_case": "", "owner": "Administrator", "permissions": [ diff --git a/erpnext/assets/doctype/asset_adjustment/asset_adjustment.py b/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.py similarity index 99% rename from erpnext/assets/doctype/asset_adjustment/asset_adjustment.py rename to erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.py index af806e4a8d..cbab6309b8 100644 --- a/erpnext/assets/doctype/asset_adjustment/asset_adjustment.py +++ b/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.py @@ -9,7 +9,7 @@ from frappe.utils import flt, getdate, cint, date_diff from erpnext.assets.doctype.asset.depreciation import get_depreciation_accounts from frappe.model.document import Document -class AssetAdjustment(Document): +class AssetValueAdjustment(Document): def validate(self): self.set_difference_amount() self.set_current_asset_value() diff --git a/erpnext/assets/doctype/asset_adjustment/test_asset_adjustment.js b/erpnext/assets/doctype/asset_value_adjustment/test_asset_value_adjustment.js similarity index 68% rename from erpnext/assets/doctype/asset_adjustment/test_asset_adjustment.js rename to erpnext/assets/doctype/asset_value_adjustment/test_asset_value_adjustment.js index 29d070af52..32831c61d2 100644 --- a/erpnext/assets/doctype/asset_adjustment/test_asset_adjustment.js +++ b/erpnext/assets/doctype/asset_value_adjustment/test_asset_value_adjustment.js @@ -2,15 +2,15 @@ // rename this file from _test_[name] to test_[name] to activate // and remove above this line -QUnit.test("test: Asset Adjustment", function (assert) { +QUnit.test("test: Asset Value Adjustment", function (assert) { let done = assert.async(); // number of asserts assert.expect(1); frappe.run_serially([ - // insert a new Asset Adjustment - () => frappe.tests.make('Asset Adjustment', [ + // insert a new Asset Value Adjustment + () => frappe.tests.make('Asset Value Adjustment', [ // values to be set {key: 'value'} ]), diff --git a/erpnext/assets/doctype/asset_adjustment/test_asset_adjustment.py b/erpnext/assets/doctype/asset_value_adjustment/test_asset_value_adjustment.py similarity index 78% rename from erpnext/assets/doctype/asset_adjustment/test_asset_adjustment.py rename to erpnext/assets/doctype/asset_value_adjustment/test_asset_value_adjustment.py index 209692e04c..26dad48f58 100644 --- a/erpnext/assets/doctype/asset_adjustment/test_asset_adjustment.py +++ b/erpnext/assets/doctype/asset_value_adjustment/test_asset_value_adjustment.py @@ -6,5 +6,5 @@ from __future__ import unicode_literals import frappe import unittest -class TestAssetAdjustment(unittest.TestCase): +class TestAssetValueAdjustment(unittest.TestCase): pass diff --git a/erpnext/config/assets.py b/erpnext/config/assets.py index d52f1420cd..08e28a0548 100644 --- a/erpnext/config/assets.py +++ b/erpnext/config/assets.py @@ -45,7 +45,7 @@ def get_data(): }, { "type": "doctype", - "name": "Asset Adjustment", + "name": "Asset Value Adjustment", }, { "type": "doctype", diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 302422566a..e036228cb6 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -550,3 +550,4 @@ erpnext.patches.v11_0.set_update_field_and_value_in_workflow_state erpnext.patches.v11_0.update_total_qty_field erpnext.patches.v11_0.update_sales_partner_type erpnext.patches.v11_0.add_hra_fields_for_india +erpnext.patches.v11_0.rename_asset_adjustment_doctype diff --git a/erpnext/patches/v11_0/rename_asset_adjustment_doctype.py b/erpnext/patches/v11_0/rename_asset_adjustment_doctype.py new file mode 100644 index 0000000000..e32149ec44 --- /dev/null +++ b/erpnext/patches/v11_0/rename_asset_adjustment_doctype.py @@ -0,0 +1,10 @@ +# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors +# License: GNU General Public License v3. See license.txt + +import frappe +from frappe.model.rename_doc import rename_doc + +def execute(): + if frappe.db.table_exists("Asset Adjustment") and not frappe.db.table_exists("Asset Value Adjustment"): + rename_doc('DocType', 'Asset Adjustment', 'Asset Value Adjustment', force=True) + frappe.reload_doc('assets', 'doctype', 'asset_value_adjustment') \ No newline at end of file