anandbaburajan
fc175e2b1f
fix: use is_last_day_of_the_month in test_scrap_asset
2022-12-01 13:01:23 +05:30
anandbaburajan
0fe5e9a9d1
fix: precision in asset test_scrap_asset
...
(cherry picked from commit 0e726609f1
2022-11-24 10:44:31 +00:00
anandbaburajan
ecd4eab2da
fix: add missing commas and brackets
...
(cherry picked from commit 218da1217a
2022-11-17 12:22:41 +00:00
anandbaburajan
444f241263
fix: precision in asset tests
...
(cherry picked from commit b5e5d3b3af
2022-11-17 12:22:41 +00:00
Ankush Menat
1db83247ce
chore: hardcode doctype
2022-11-17 12:01:11 +05:30
anandbaburajan
01a1c96314
fix: for asset's purchase_date, if bill_date is set, use that instead of posting_date
...
(cherry picked from commit f322c608cf
2022-11-03 04:22:14 +00:00
anandbaburajan
d1b2786f24
fix: pro_rata_amount calculation in assets tests
...
(cherry picked from commit 65e855bfff
2022-11-01 09:48:04 +00:00
Hossein Yousefian
4035873295
fix: Pass project to stock entry items
...
fix: Pass project to stock entry items
(cherry picked from commit 54c2ffc36b
2022-10-29 16:55:25 +00:00
Deepesh Garg
34845b7630
Merge pull request #32459 from frappe/mergify/bp/version-14-hotfix/pr-32454
...
fix: test_scrap_asset not working on end of month (backport #32454 )
2022-10-03 09:04:01 +05:30
anandbaburajan
c0a141bfcd
fix: asset requiring maintenance sold status and added test [v14-hotfix]
2022-10-02 18:27:37 +05:30
anandbaburajan
fd232d1db7
fix: test_scrap_asset
...
(cherry picked from commit 47bd4be71b
2022-10-02 12:15:55 +00:00
anandbaburajan
381231257b
chore: fix merge conflicts
2022-09-29 11:59:53 +05:30
anandbaburajan
b3b7650ac8
chore: add blank lines
...
(cherry picked from commit c6a7de0e54
2022-09-28 08:59:43 +00:00
anandbaburajan
86052450a5
fix: fix restore asset value after depreciation
...
(cherry picked from commit 43a3400221
2022-09-28 08:59:42 +00:00
anandbaburajan
bad3b330f4
fix: refactor asset capitilization
...
(cherry picked from commit 5a8b28c194
2022-09-28 08:59:42 +00:00
anandbaburajan
671033755f
fix: asset tests
...
(cherry picked from commit 11ac20e5ee
2022-09-28 08:59:41 +00:00
anandbaburajan
f5f13c4611
fix: calculate depreciation properly on asset sale entry and scrap entry
...
(cherry picked from commit ff5cad1cd6
2022-09-28 08:59:41 +00:00
mergify[bot]
a28ae4d653
fix: Scrap Asset Accounting Dimensions (backport #31949 ) ( #32376 )
...
fix: Scrap Asset Accounting Dimensions (#31949 )
* fix: Scrap Asset Accounting Dimensions
(cherry picked from commit c760ca232339730881+maharshivpatel@users.noreply.github.com >
2022-09-27 17:07:38 +05:30
Deepesh Garg
4939153f8c
fix: Depreciation posting date only when calculate depreciation is checked
...
(cherry picked from commit fac82cf69b
2022-09-20 09:18:22 +00:00
Nabin Hait
5cab0aa1d7
fix: disable cwip in asset repair tests
2022-09-16 11:44:25 +05:30
Nabin Hait
f126e88e5e
fix: test cases
2022-09-14 18:31:15 +05:30
Nabin Hait
38c31077c9
feat: Asset Capitalization
...
- manual selection of entry type
- GLE cleanup with smaller functions
- GLE considering periodical inventory
- test cases
2022-09-13 16:21:06 +05:30
Nabin Hait
cd613c6033
fix: merge conflict
2022-09-13 16:20:42 +05:30
Deepesh Garg
4f832678cf
chore: fix against account
...
(cherry picked from commit c1f6dd46d1
2022-08-25 07:55:08 +00:00
Nabin Hait
f0f7afa669
fix: gl entries for asset repair
...
(cherry picked from commit b4a2eb2e65
2022-08-25 07:55:08 +00:00
Gavin D'souza
cb73528c9c
test: Use assertSequenceEqual for comparision between Tuple / Lists
...
Use AssertSequence for type agnostic checks
2022-07-25 11:54:49 +05:30
Rucha Mahabal
f222284c33
Merge branch 'develop' into hr-separation
2022-07-20 15:47:40 +05:30
Nabin Hait
b26438ccf7
test: Fixed test for WDV method depreciation schedule
2022-07-20 14:27:06 +05:30
Nabin Hait
6c29146c91
fix: Removed 'Allow Monthly Depreciation' checkbox
2022-07-20 14:27:06 +05:30
Rucha Mahabal
ef02e58859
Merge branch 'develop' into hr-separation
2022-07-07 13:46:54 +05:30
Rucha Mahabal
6a65c8aff4
Merge branch 'develop' into hr-separation
2022-06-28 11:51:59 +05:30
Sagar Vora
0810674c8a
Merge remote-tracking branch 'upstream/develop' into remove-india
2022-06-24 13:08:40 +05:30
GangaManoj
416d578290
fix: Add missing comma
2022-06-23 15:14:31 +05:30
GangaManoj
1b1786532a
test: Test monthly depreciation by Written Down Value method
2022-06-23 15:14:31 +05:30
GangaManoj
2b7ab72a72
fix: Convert string to datetime object
2022-06-23 15:14:31 +05:30
GangaManoj
e62beaefc1
test: Test if final day of the month is taken if depr_start_date is the last day of its month
2022-06-23 15:14:31 +05:30
GangaManoj
154e258ad0
fix: Get last day of the monthif depr posting date is the last day of its month
2022-06-23 15:14:31 +05:30
GangaManoj
b07aae4da5
fix: Correct pro-rata amount calculation
2022-06-23 15:14:31 +05:30
GangaManoj
2d9153ea30
fix: Remove misleading comment
2022-06-23 15:14:31 +05:30
GangaManoj
ab13a178b5
fix: Replace asset life with total no of depreciations
2022-06-23 15:14:31 +05:30
Sagar Vora
ec9861266e
Merge remote-tracking branch 'upstream/develop' into remove-india
2022-06-19 22:57:22 +05:30
Conor
74a782d81d
refactor: DB independent quoting and truthy/falsy values ( #31358 )
...
* refactor: DB independent quoting and truthy/falsy values
* style: reformat to black spec
* fix: ifnull -> coalesce
* fix: coalesce -> Coalesce
* fix: revert pypika comparison
* refactor: convert queries to QB
* fix: incorrect value types for query
`=` query makes no sense with list of values
* fix: remove warehouse docstatus condition
* fix: keep using base rate as rate
Co-authored-by: Ankush Menat <ankush@frappe.io >
2022-06-17 17:01:27 +05:30
Rucha Mahabal
3fe2ef6790
chore: update import paths for HR
2022-06-15 12:43:45 +05:30
Rucha Mahabal
512c82f76d
chore: Update imports/paths for doctypes moved to erpnext setup module
2022-06-10 15:06:54 +05:30
Ankush Menat
a896895a9e
fix: bulk fix (~330) missing translations
2022-04-04 13:59:51 +05:30
Saqib Ansari
4623a1bc57
fix(test): Item MacBook does not exist
2022-03-31 12:48:00 +05:30
Ankush Menat
494bd9ef78
style: format code with black
2022-03-28 18:52:46 +05:30
Marica
2661cb2c14
Merge pull request #30091 from marination/item-group-filters-listing
...
feat: Include child item group products in Item Group Page & cleanup
2022-03-09 16:46:01 +05:30
Saqib Ansari
17e16247b1
Merge pull request #30114 from nextchamp-saqib/fix-#23231
...
perf(asset): fetch only distinct depreciable assets
2022-03-09 16:41:08 +05:30
marination
7b37a74023
fix: Linter
2022-03-09 16:04:12 +05:30
