Fixed asset refactor #19369
Merged
Fixed asset refactor #19369
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
nextchamp-saqib
commented
Oct 21, 2019
•
nextchamp-saqib
commented
- Item Master & Asset
- Serial No, Serial Number Series is now disabled for Fixed Asset Item
- Auto Create Asset on Purchase Checkbox for Fixed Asset Item
- Mandatory Asset Category & Naming Series for auto creation
- Manual Asset creation should be linked with a purchase document
- Asset Movement
- Has table for list of assets
- List has Make Asset Movement Action for a selected no. of assets
- Employee is linked to Asset Custodian field
- Purchase Receipt
- Asset are created based on qty when auto create checked in item. Initial Asset Movement is created
- Cancelling of PR requires deletion of Asset Movement and cancelling of Linked Asset
- Purchase Invoice
- Asset are created based on qty when auto create checked in item & update stock is checked on PI. Initial Asset Movement is created
- Cancelling of PI is same as Purchase Receipt
- Landed Cost Voucher for Asset
- Validates assets created is same as purchase receipt/invoice item quantity
- Removed serialised assets rate updation
- Asset gross amount are updated when GL Entries are created
nabinhait
requested changes
Nov 7, 2019
| @@ -302,6 +333,65 @@ frappe.ui.form.on('Asset', { | |||
| }) | |||
| }, | |||
|
|
|||
| purchase_receipt: function(frm) { | |||
There was a problem hiding this comment.
Write set_query for purchase receipt and invoice link fields. it should only show the receipts/invoices where item used.
|
|
||
| if asset_movement: | ||
| doc = frappe.get_doc('Asset Movement', asset_movement) | ||
| # should this be hard coded ? |
There was a problem hiding this comment.
remove naming series from asset movement
| @@ -439,11 +453,12 @@ def make_purchase_invoice(asset, item_code, gross_purchase_amount, company, post | |||
| pi.currency = frappe.get_cached_value('Company', company, "default_currency") | |||
| pi.set_posting_time = 1 | |||
| pi.posting_date = posting_date | |||
|
|
|||
There was a problem hiding this comment.
remove entire make_purchase_invoice functionality
| if latest_movement_entry: | ||
| location = latest_movement_entry[0][0] | ||
| employee = latest_movement_entry[0][1] | ||
| elif self.purpose in ['Transfer', 'Receipt']: |
There was a problem hiding this comment.
Refactor this function. On cancellation, ensure atleast one movement entry always exists
| elif asset.status in ("Scrapped", "Cancelled", "Sold"): | ||
| frappe.throw(_("Row #{0}: Asset {1} cannot be submitted, it is already {2}") | ||
| .format(d.idx, d.asset, asset.status)) | ||
| if d.is_fixed_asset and d.meta.get_field("asset") and d.asset: |
There was a problem hiding this comment.
move function to sales_invoice.py
|
|
||
| cwip_disabled = is_cwip_accounting_disabled() | ||
| return gl_entries |
| if asset_rbnb_currency == self.company_currency else asset_amount) | ||
| }, item=item)) | ||
|
|
||
| return gl_entries |
|
|
||
| if not expenses_included_in_valuation: | ||
| expenses_included_in_valuation = self.get_company_default("expenses_included_in_valuation") | ||
| return gl_entries |
|
|
||
| return gl_entries | ||
| for asset in assets: | ||
| doc = frappe.get_doc("Asset", asset.name) |
| }, account_currency, item=item)) | ||
|
|
||
| # If asset is bought through this document and not linked to PR | ||
| if self.update_stock: |
There was a problem hiding this comment.
and item.landed_cost_voucher_amount
* make asset movement on asset submission * add PR & PI queries based on item code
* Added extra validations
nextchamp-saqib
force-pushed
the
fixed-asset-refactor
branch
from
1649aaf
to
617a308
Compare
nabinhait
requested changes
Nov 14, 2019
| @@ -380,7 +382,7 @@ def add_asset_gl_entries(self, item, gl_entries): | |||
|
|
|||
| def add_lcv_gl_entries(self, item, gl_entries): | |||
| expenses_included_in_asset_valuation = self.get_company_default("expenses_included_in_asset_valuation") | |||
| if is_cwip_accounting_disabled(): | |||
| if is_cwip_accounting_enabled(self.company, item.asset_category): | |||
There was a problem hiding this comment.
if not is_cwip_accounting_enabled?
| if not is_cwip_accounting_disabled(): | ||
| if not item.asset_category: | ||
| item.asset_category = frappe.get_cached_value("Item", item.item_code, "asset_category") | ||
| if not is_cwip_accounting_enabled(self.company, item.asset_category): |
There was a problem hiding this comment.
if is_cwip_accounting_enabled?
nextchamp-saqib
force-pushed
the
fixed-asset-refactor
branch
from
e44919e
to
40d5679
Compare
nabinhait
approved these changes
Nov 18, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.