Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,457 Commits 3 Branches 0 Tags 1 GiB
81472e4c08
Commit Graph

120 Commits

Author SHA1 Message Date
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
Rohit Waghchaure
3844a98c42 fix: Pro rata calculation is not working for WDV depreciation method 2019-07-26 13:21:33 +05:30
Anurag Mishra
23d4b7cc46 fis: mapped cost center in gl entries (#18404) 2019-07-22 11:22:03 +05:30
Nabin Hait
34c551d9a5
fix: Missing commits from hotfix branch (#17997) 
* fix: merge conflict

* fix: restored missing set_gst_state_and_state_number function

* fix: style linting as per codacy

* fix: Fixes related to customer/lead merging

* fix: merge conflict

* fix: Fixes related to customer/lead merging

* fix: Assign isue/opportunity to user

* fix: Assign isue/opportunity to user

* fix: Replaced Invoice type by GST Category

* fix: merge conflict

* fix: merge conflict

* fix: test cases

* fix: test cases
 2019-07-03 10:34:31 +05:30
rohitwaghchaure
f949c5ddf7
Merge pull request #18104 from rohitwaghchaure/incorrect_value_of_accumualated_depreciation_in_the_sales_invoice_develop 
fix: incorrect value booked in the accumulated depreciation account on sell of the asset
 2019-07-02 01:23:56 +05:30
Rohit Waghchaure
8847ecfe25 fix: incorrect value booked in the accumulated depreciation account on sell of the asset 2019-07-01 20:47:35 +05:30
Rohit Waghchaure
7729fcea19 fix: asset status not shwoing in the list view 2019-07-01 12:26:34 +05:30
Aditya Hase
2f4f9a2af0
Merge branch 'develop' into not_able_to_save_asset_for_manual_method_develop 2019-06-21 06:11:13 +05:30
Aditya Hase
645afe16c3 fix(tests): Do not test order of features in Location 2019-06-18 23:01:20 +05:30
Rohit Waghchaure
b5f94e5f71 fix: not able to save asset if depreciation method is manual 2019-06-17 13:34:44 +05:30
deepeshgarg007
6f6636abfe fix: Add dimension section in multiple doctypes 2019-05-26 12:31:01 +05:30
Aditya Hase
1db334317d fix(py3): Undefined variable 2019-05-01 11:51:04 +05:30
Rohit Waghchaure
9c1fa77f4e fixed test cases 2019-04-25 11:57:27 +05:30
Rohit Waghchaure
691e03a36b fix: Straight line asset depreciation not working if Expected Value After Useful Life is defined 2019-04-25 11:57:20 +05:30
Himanshu Warekar
3e503f213b fix: remove user permission for emp in asset 2019-04-15 22:50:22 +05:30
Nabin Hait
89206e74d0 fixed merge conflict 2019-04-11 12:31:14 +05:30
Rohit Waghchaure
45d0b31d44 fix: test cases 2019-04-10 17:25:08 +05:30
Rohit Waghchaure
bb0d4e37b9 fix: Asset depreciation formula for WDV method, user was not able to edit schedule table for Manula method 2019-04-10 03:14:11 +05:30
Frappe Bot
b07a5d449d Merge branch 'master' into develop 2019-03-23 07:25:03 +00:00
Rushabh Mehta
199aae0fe8
Merge pull request #16861 from Anurag810/asset_fixes 
fix: passing the correct argument in get_depreciation_amount
 2019-03-22 12:42:46 +05:30
Saurabh
3c95387926 Merge branch 'master' into develop 2019-03-20 14:39:49 +05:30
Rohit Waghchaure
821a002125 feat: added provision to disable CWIP accounting in asset settings 2019-03-08 10:51:37 +05:30
Anurag Mishra
1b0f5fd430 fix: pass correct argument to method get_deprication_amount 2019-03-07 16:17:00 +05:30
Sagar Vora
551f52fd25 Merge branch 'master' into develop 2019-02-12 16:41:24 +05:30
Zlash65
b614fb1d45 fix: make finance book field as link field and rectify fetch_from 2019-02-12 11:30:58 +05:30
Sagar Vora
f97c5dad82 Merge branch 'staging' into develop 2019-01-29 18:39:14 +05:30
Sagar Vora
f3cfad7595 Merge branch 'master' into staging-fixes 2019-01-29 17:20:46 +05:30
Aditya Hase
f3c22f342c fix(unicode): Import unicode_literals in every file 2019-01-22 18:36:10 +05:30
Nabin Hait
bef2c22d23 Fix: merge conflict 2019-01-18 10:15:47 +05:30
Zlash65
cef56b5147 fixes asset category field as link type and read only 2019-01-15 16:26:58 +05:30
Nabin Hait
0f3ccba741
Update test_asset.py 2019-01-08 20:23:01 +05:30
Anurag Mishra
772e2c4e20 test cases 2019-01-02 15:59:58 +05:30
Suraj Shetty
146be9f6a6 Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes 2018-12-24 16:08:43 +05:30
Suraj Shetty
b2965001d1 Replace 'Make' with 'Create' 2018-12-23 13:25:58 +05:30
Rohit Waghchaure
f6f503a1f6 [Fix] Is fixed asset checkbox not checked if user duplicate the existing invoice 2018-12-19 15:15:35 +05:30
Frappe Bot
b5c7b96a73 Merge branch 'staging' into develop 2018-11-13 11:33:31 +00:00
Nabin Hait
ee887f4db7
Merge pull request #15796 from Alsum/set_current_asset_value 
trigger set_current_asset_value when make asset_value_adjustment from asset form
 2018-11-13 12:42:28 +05:30
Nabin Hait
ee190e34c2
Update asset_value_adjustment.js 2018-11-13 12:41:36 +05:30
alsum
852bd76a58 add set_current_asset_value to onload func 2018-11-08 11:12:33 +02:00
Ameya Shenoy
ea42980de6
Merge branch 'staging' into develop 2018-11-06 11:17:24 +00:00
rohitwaghchaure
1b2ceadc93 [Fix] Asset date validation (#15887) 
* [Fix] Asset date validation

* Update asset.py
 2018-11-05 16:04:04 +05:30
alsum
27e7c15c16 trigger set_current_asset_value when make asset_value_adjustment from asset form 2018-10-24 13:23:34 +02:00
Ameya Shenoy
da10f6ebd8
Merge branch 'staging' into develop 2018-10-04 11:51:30 +00:00
Ameya Shenoy
7d929c508f
Merge branch 'master' into staging-fixes 2018-10-04 09:25:07 +00:00
rohitwaghchaure
0cf0ebf08b [Refactored] Asset Depreciation Ledger report based on GL entries (#15415) 
* [Refactored] Asset Depreciation Ledger report is based on GL entries

* Provision to make manual JV from the asset if Calculate Depreciation is disabled
 2018-09-26 15:24:49 +05:30
Suraj Shetty
bfc195dd8b Changes to support refactor in frappe pg-poc branch (#15287) 
* Remove quotes from sql to make it compatible with postgres as well

* Fix queries
- Replace mysql specifc queries with standard ones

* Make repo URL chages to test pg-poc

* Add root passowrd to test site config

* Fix quotes issue

* Remove debug flag from a pricing rule query

* Remove python 3.6 version from travis.yml

* Fix improper query issue

* Fix incorrect query

* Fix a query

- This fix need to be changed when we will  start supporting postgres
since date_format is not supported by postgres

* Get price list map as dict

* Convert price_list_currency_map to dict
 2018-09-21 10:20:52 +05:30
Nabin Hait
a804d6d487 Fixed merge conflict 2018-08-29 13:34:58 +05:30
Shreya Shah
a5add289bb Refactor Naming Series (#15070) 
* Patch to create Property Setter for existing naming series

* Update existing naming series options with new

* Add patch link to patches.txt

* Update patch

* Fix codacy

* Fix as per suggestions

* Remove old patch for property setter

* Improve as per suggested

- Modified the naming
- Also refactored naming for doctypes having autoname with series
- Added a patch to make property setter for autoname

* Fix Travis

* Rebase with develop
 2018-08-28 13:44:48 +05:30
Ahmed Madi
1516b8d54a Update asset_category.js (#15222) 2018-08-27 12:04:12 +05:30