Commit Graph

168 Commits

Author SHA1 Message Date
Saqib
40847aeac3
fix: cannot cancel assets with repair pending (#22440)
* fix: cannot cancel assets with repair pending

* fix: message

* Update asset.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-06-25 15:43:31 +05:30
Deepesh Garg
c2496a3600 fix: Asset maintenance test 2020-06-15 15:18:49 +05:30
Saqib
cd8b5d1e4c
fix: cannot assign same task to other asset maintenance (#22024) 2020-05-29 10:21:20 +05:30
Saqib Ansari
22aec57beb feat: asset onboarding, dashboards 2020-05-20 18:22:38 +05:30
Deepesh Garg
7d61c03af4
fix: Add missing dimensions in GL entries (#21689)
* fix: Add misssing dimensions in GL entries

* fix: Add project filter in trial balance report

* fix: Use current dimensions instead of dimensions from asset
2020-05-15 12:58:48 +05:30
Deepesh Garg
b52e40037a
fix: Remove domain restriction from Location doctype (#21659) 2020-05-11 20:01:57 +05:30
Saqib
d76f167e96
fix: handle make_gl_entry in case of cwip enable after puchasing (#21529)
* fix: handle make_gl_entry in case of cwip enable after puchasing

* fix: invalid variable assignment

* fix: make gl entries if cwip has been booked even if cwip is disabled
* add tests

* fix: conditions

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-05 16:14:45 +05:30
Saqib
d84a55313a
chore: add validation for gross purchase amount (#21534)
* chore: add validation for gross purchase amount

* fix: tests

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-03 13:20:24 +05:30
Saqib
4422ffdb22
chore: asset accounts should have company currency (#21524) 2020-04-30 18:39:13 +05:30
Deepesh Garg
2a9c5badc6
feat: Immutable ledger (#18740)
* fix: Reverse GL entry on cancellation of document

* fix: Removed set posting time field for multiple docs

* fix: Stop future reposting and reverse entry for purchase receipt and delivery note

* fix: Change is_cancelled field from select to check

* Revert "fix: Removed set posting time field for multiple docs"

This reverts commit 81fb808db7da69ab1e58ba226c0cd0b77e5b90c8.

* fix: Multiple fixes in GL Entry

* fix: Remove future reporting from doctypes

* fix: Canceled entry filters in Stock Ledger and General Ledger Report

* fix: Remove print statement

* fix: Validation for back dated entries

* fix: Codacy fixes

* fix: Add ignore links to multiple doctypes

* fix: Codacy Fixes

* fix: Ignore GL Entry and Stock Ledger entry while cancel

* fix: Test case fixes

* fix: Patch

* fix: Codacy

* fix: Budget Test Cases

* fix: Patch

* fix: Patch

* fix: Multiple test cases

* fix: changes in make_reverse_entry function

* fix: Update patch

* fix: Test Cases

* fix: Test Case fixes

* fix: Move patch upward in patches.txt

* fix: Budget Test Cases

* fix: Test Case and codacy

* fix: Patch

* fix: Minor label and UX fixes

* fix: Move freezing date check

* fix: Test Cases

* fix: Test cases

* fix: Test Cases

* fix: Test Case

* fix: Remove update_gl_entries_after function

* fix: Remove update_gl_entries_after function

* fix: Test Cases

* fix: Fiscal Year wise backdated entry

* fix: Update entries only for current SLE

* fix: Remove is_cancelled

* fix: Test Cases

* fix: Test cases

* fix: Test Cases

* fix: Uncomment account and stock balance sync logic

* fix: Stock balance and Account balance out of sync fixes

* fix: Test Cases

* fix: Test cases for POS, Stock Reco and Purchase Receipt

* fix: Stock Reco tests

* fix: Test stock reco precision

* fix: Test stock reco for fifo precision

* fix: Test stock reco for fifo precision

* fix: Stock Entry test case

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-30 10:38:58 +05:30
Saqib
9c494d3e72
fix: asset maintenance fixes (#21277)
* fix: asset maintenance fixes

* fix: tests
2020-04-22 11:48:19 +05:30
Saqib Ansari
33eb35d8b1 fix: incorrect transalation 2020-04-16 16:16:09 +05:30
Saqib Ansari
397f894a7c fix: cannot iterate over dict_keys 2020-04-11 18:10:59 +05:30
Saqib Ansari
debee1c977 fix: travis 2020-04-10 12:38:44 +05:30
Saqib Ansari
474222074b fix: tests 2020-04-06 12:40:41 +05:30
Saqib Ansari
0c8a0c9c3a fix: no server side validations for accounts in asset category 2020-03-31 18:19:31 +05:30
Deepesh Garg
fa6454b9c5
fix: Update is_tree field in Tree doctypes (#20981) 2020-03-19 11:01:23 +05:30
Shivam Mishra
1f151c1032 refactor: update restrict to domain data 2020-03-02 19:37:12 +05:30
Deepesh Garg
97669e975d
fix: Update condition 2020-02-11 10:18:39 +05:30
Ahmad M Abdelrahman
41e7163476
automatic booking of asset depreciation fix
Stop Automatic deprecation is not working
2020-02-05 08:33:53 +02:00
Pranav Nachnekar
6c14a08631
fix: disallow quick entry for doctypes with tree view (#20452) 2020-02-03 17:05:26 +05:30
Suraj Shetty
2f67647f7b Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations 2020-01-29 15:06:50 +05:30
Suraj Shetty
48e9bc3fc9 fix: Incorrect translation syntax 2020-01-29 15:06:18 +05:30
thefalconx33
e7154f155b fix: tuple index out of range error 2020-01-22 12:22:55 +05:30
Saqib
b0b179f1b7 fix: make jv depreciations only if calculate depr is checked (#20282) 2020-01-15 19:05:35 +05:30
Saqib
b8bcad5850 fix: gl not generated on manual asset creation (#20265) 2020-01-13 18:17:05 +05:30
thefalconx33
1e7a127dfa fix: auto cancel if movement exists 2020-01-11 14:19:02 +05:30
Saqib
06f9538e51 fix: bad condition while checking last asset movement entry (#20047) 2019-12-23 16:08:21 +05:30
thefalconx33
5da7e729a5 fix: remove mandatory purchase reference for existing asset 2019-12-13 15:44:39 +05:30
Saqib
5998034b02 fix: error message displays asset category as None (#19873)
* fix: error message displays asset category as None

* fix: asset gl_entries doesn't considers asset category's cwip account
2019-12-09 19:07:05 +05:30
Deepesh Garg
98a54355ae fix: Post GL entry fix for asset (#19751) 2019-12-01 10:06:16 +05:30
Anurag Mishra
f3b393f5e0 fix: UOM was not fetching in purchase invoice (#19732)
* fix: UOM was not fetching in purchase invoice

* fix: Changes requested

Co-authored-by: Marica <maricadsouza221197@gmail.com>
2019-11-28 18:52:16 +05:30
Nabin Hait
a7d168c05f fix: merge conflict 2019-11-25 18:12:56 +05:30
Saqib
cd3976f7d2 Asset cancellation fix (#19671)
* fix: remove asset movement mandatory fields

* fix: label for reference doctype
2019-11-25 12:24:34 +05:30
Saqib
c9203a1bee fix: asset movement ux fixes (#19637) 2019-11-22 16:35:15 +05:30
Saqib
f37a46edea Fixed Asset Refactor Review fixes (#19665)
* fix: fixed asset item creation ux fixes

* fix: auto creation of asset ux fixes

* fix: [LCV] incorrect condition when checking assets linked with PR

* fix: bulk update assets

* refac: remove company level cwip enabling
* cwip can be enabled only on category level

* fix: #19649
2019-11-22 16:32:50 +05:30
Saqib
1919af2ff1 Fixed Asset Refactor Review fixes (#19666)
* fix: fixed asset item creation ux fixes

* fix: auto creation of asset ux fixes

* fix: [LCV] incorrect condition when checking assets linked with PR

* fix: bulk update assets

* refac: remove company level cwip enabling
* cwip can be enabled only on category level

* fix: #19649
2019-11-22 16:32:34 +05:30
Saqib
150c44b350 fix: asset movement ux fixes (#19641) 2019-11-22 11:08:35 +05:30
Saqib
d995609ffa Fixed asset refactor (#19369)
* refactor: Asset Movement with multiple assets using table

* refactor: Create Asset Movement from Asset List & Linking PR/PI with Asset

* feat: Auto create asset on Purchase checkbox

* refactor: LCV for asset created via PR/PI

* refactor: get asset category accounts from item master

* refactor: Purchase Receipt for asset purchasing

* refactor: Purchase Invoice for asset purchasing

* fix: post-refactor delete fixes

* refactor: moved asset validation from pr/pi on asset submission

* fix: Asset Category should be defined for auto purchasing assets

* fix: undo serial_no_update removal (for non asset item) from LCV

* fix: remove duplicate calls from item.js

* fix: args position of all occurrence of get_asset_category_account()

* fix: test cases

* fix: landed cost voucher validations

* refactor: test case for auto creation of asset

* fix: removed invalid assertions

* fix: patch errors on travis

* fix: codacy fixes

* fix: PI Items not fetching details from item

* fix: asset movement from list view having default purpose 'Receipt'

* chore: msgprint for selecting item code first while creating asset manually

* fix: alert messages

* minor: asset movement fixes

* fix: lcv was made against submitted assets

* minor: ux fixes

* refac: move specific asset validation to SINV

* chore: remove make_purchase_invoice from asset form
* make asset movement on asset submission
* add PR & PI queries based on item code

* refac: not allow last movement cancellation
* move asset movement creation on asset submission
* asset movement naming series
* add tests

* fix: code review changes

* chore: remove unecessary asset movement updation

* refac: setting latest location while making asset movements
* Added extra validations

* fix: form dashboard make lcv button

* fix: auto asset movement creation validation

* fix: allow lcv against other items after removing submitted assets

* chore: remove unwanted condition

* fix: mismatch debit credit on  purchase of asset with valuation tax

* chore: toggle required field based on movement type

* chore: fix lcv error message

* fix: travis failing

* fix: travis failing test

* fix: wrong conditions after merge

* fix: cannot cancel assets

* fix: travis failing* fix change in deletion of assets

* fix: codacy

* fix: process cancellation of assets

* refac: cancellation of pr only deletes auto created assets

* fix: incorrect query
2019-11-18 11:46:55 +05:30
Saqib
3e515e704d Monthly distribution of depreciation amount (#19493)
* feat: allow monthly distribution of depreciation amount

* chore: added comments

* fix: monthly depr was not starting from use date's month
2019-11-13 19:00:24 +05:30
Marica
d00c59830e feat: Disable CWIP Accounting checkbox added in Company and Asset Category (#19262)
* feat: Disable CWIP Accounting checkbox added in Company and Asset Category

Asset Settings is removed completely
Disable CWIP Accounting checkbox will give priority to Asset Category

* fix: Changed checkbox name to 'Enable Capital Work in Progress Accounting'

- checkbox will be disabled by default
- Enabling it in Company will globally enable it
- When globally disabled , it's value on the asset category will be considered

* chore: Added patch to set pre-existing CWIP checkbox value into new checkbox

* fix(test): Asset

* fix: Asset Test and Patch

* fix(test): Opening Invoice Creation Tool

* Update asset.py

* fix: Patch and other fixes
2019-11-12 19:17:43 +05:30
deepeshgarg007
55eff16760 fix: Value after depreciation fixes in asset,
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2019-10-19 12:16:25 +05:30
Rucha Mahabal
1ba83427e5 fix: asset maintenance TypeError during date comparisons (#19098) 2019-09-18 20:04:15 +05:30
Deepesh Garg
c5c3860c5c fix: Mandatory accounting dimensions while creating asset depreciation entry (#19073)
* fix: Mandatory accounting dimensions while creating asset depreciation entry

* fix: Consider account types while assigning accounting dimensions
2019-09-17 12:50:28 +05:30
Mangesh-Khairnar
5d41e3848d fix: do not submit depreciation journal entry when workflow is enabled (#19000) 2019-09-17 12:45:14 +05:30
Rohit Waghchaure
40c5bf9e94 fix: naming series added in the asset movement 2019-09-16 16:42:42 +05:30
rohitwaghchaure
cdcff6c26d Multiple port from v11 hotfix (#18954)
* fix: circular dependency during asset cancellation

* fix: ImponibileImporto for On Previous Row Total

* fix: PrezzoUnitario decimal issue
2019-09-09 10:15:01 +05:30
deepeshgarg007
402d82b4c5 fix: Remove delete_doc from tests 2019-09-02 14:37:18 +05:30
Anurag Mishra
210317c0b5
fix: division by zero in asset Depereciation (#18637)
* fix: division by zero in asset Depereciation

* fix: requested changes
2019-08-23 00:21:26 +05:30
Rohit Waghchaure
53f5e2e066 fixed test cases and the logic for pro rata calculation 2019-07-26 13:21:46 +05:30