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
Deepesh Garg
5526f852e8
Merge branch 'develop' into asset-translates
2022-03-09 14:43:57 +05:30
Saqib Ansari
e6666609e3
Merge branch 'develop' into fix-#23231
2022-03-09 11:08:45 +05:30
Deepesh Garg
816e12dafc
Merge branch 'develop' into mergify/bp/develop/pr-29714
2022-03-08 21:40:00 +05:30
Saqib Ansari
66f20209f6
perf(asset): fetch only distinct depreciable assets
2022-03-08 15:57:54 +05:30
hrzzz
16de29a3cb
fix(translation) - correction for translation
2022-02-25 16:56:23 -03:00
Sagar Vora
5159e2e6c5
refactor: remove India specific code
2022-02-25 11:36:18 +05:30
Ankush Menat
9c7df2eec5
fix: ignore duplicates explicitly
2022-02-23 14:27:45 +05:30
Saqib Ansari
8743e39469
fix: sider
...
(cherry picked from commit bc28755978c17d7e85cdc5ffd4a45a629183e2c8)
2022-02-23 03:55:49 +00:00
Saqib Ansari
3dcc3a349e
fix: cannot edit valutaion_rate in asset repair
...
(cherry picked from commit 2aba6c38b36e5fce373800eb129a93eb010c691f)
2022-02-23 03:55:49 +00:00
Saqib Ansari
414c3b8dd2
fix: remove redundant method
...
(cherry picked from commit 57d5a027fb929803ffd62463da3e5b4611b17ff4)
2022-02-23 03:55:48 +00:00
GangaManoj
5d3b65b944
fix: Pass value instead of array
...
(cherry picked from commit e1a9b61103e27099696ae4b186a6575b28c16b06)
2022-02-23 03:55:48 +00:00
GangaManoj
3d6ed4ebde
fix: Fetch valuation rate
...
(cherry picked from commit df71907be453a481a43d2c62a5c076602ab8af07)
2022-02-23 03:55:48 +00:00
Saqib Ansari
780694f6e2
test: number_of_depr_booked = total_number_of_depr
2022-02-21 12:45:52 +05:30
Saqib Ansari
c5808543c8
fix(asset): no. of depreciation booked cannot be equal to total no. of depreciations
2022-02-21 12:41:08 +05:30
Himanshu
319322228a
fix: fetch image form item ( #29523 )
2022-01-31 10:56:00 +05:30
Deepesh Garg
5090959dc1
Merge branch 'develop' of https://github.com/frappe/erpnext into asset_split
2022-01-29 12:12:52 +05:30
Saqib Ansari
58cc3b32fa
Merge pull request #29334 from nextchamp-saqib/grouped-asset-purchase
2022-01-21 15:33:13 +05:30
Saqib Ansari
c7e75f9551
Merge pull request #29385 from nextchamp-saqib/asset-fix-depr-fix
...
fix: first depreciation amount in asset
2022-01-21 14:25:43 +05:30
Saqib Ansari
a09259f175
Merge branch 'develop' into grouped-asset-purchase
2022-01-21 14:20:27 +05:30
Saqib Ansari
ae580d116c
fix: failing test cases
2022-01-21 12:19:53 +05:30
Saqib Ansari
0bbde4819b
fix: depreciation amount on selling an asset
2022-01-21 11:44:05 +05:30
Saqib Ansari
60bfead773
fix: first depreciation amount in asset
2022-01-21 11:32:55 +05:30
Saqib Ansari
4390adcaa1
fix: cost center validation of asset
2022-01-20 11:54:14 +05:30
Saqib Ansari
a5643d500e
test: purchase of grouped assets
2022-01-19 15:31:31 +05:30
Saqib Ansari
7d8eef5c4e
fix: cannot set asset quantity for existing assets
2022-01-19 15:31:20 +05:30
