Commit Graph

41105 Commits

Author SHA1 Message Date
Saqib Ansari
fc42041f8f fix(psoa): add company filter to account 2022-03-09 18:04:35 +05:30
Chillar Anand
fe4b6771b5
refactor: Remove dead code (#30140) 2022-03-09 17:16:05 +05:30
Chillar Anand
b1c8a4543d
test: Added test for monthly attendance report (#29989)
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2022-03-09 17:05:00 +05:30
Rucha Mahabal
921d6b25d7 chore: linter issue 2022-03-09 16:58:15 +05:30
Deepesh Garg
45eed7167c
Merge pull request #29654 from alyf-de/revert-bu-schluessel
revert: BU Schlüssel (a21f76f)
2022-03-09 16:48:54 +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
4d8798b0ea
fix: ignore non-unique swift numbers while migrating (#30132) 2022-03-09 16:41:54 +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
Rucha Mahabal
9b152e93cf
Merge branch 'develop' into leave-opening-balance 2022-03-09 16:40:26 +05:30
Rucha Mahabal
97b7b5012e test: separate leave ledger entries for leave applications across allocations 2022-03-09 16:35:25 +05:30
Deepesh Garg
7643963ff4
Merge pull request #30136 from deepeshgarg007/remove_field
fix: Remove tax invoice no field
2022-03-09 16:19:59 +05:30
Rucha Mahabal
70239158b9 fix: boundary determination for separate ledger entries 2022-03-09 16:18:23 +05:30
marination
7b37a74023 fix: Linter 2022-03-09 16:04:12 +05:30
Rucha Mahabal
6755d6e6f5 test: leave application validations 2022-03-09 15:48:57 +05:30
Deepesh Garg
9b8258479c fix: Update timestamp 2022-03-09 15:43:26 +05:30
Deepesh Garg
8a2fe7a2e3 fix: Remove tax invoice no field 2022-03-09 15:42:06 +05:30
Ankush Menat
64905188c4
fix: dont fetch entire barcode table in get_item_details (#30131) 2022-03-09 15:37:14 +05:30
Deepesh Garg
e192956520
Merge pull request #30096 from deepeshgarg007/debit_note_ux
fix(ux): Improve label for better understanding
2022-03-09 15:34:11 +05:30
Marica
7555e1548b
Merge branch 'develop' into item-group-filters-listing 2022-03-09 15:33:04 +05:30
Deepesh Garg
23ce6fb8de
Merge pull request #30000 from HarryPaulo/asset-translates
fix(translation) - correction for assets translation
2022-03-09 14:44:13 +05:30
Deepesh Garg
5526f852e8
Merge branch 'develop' into asset-translates 2022-03-09 14:43:57 +05:30
marination
3507cf5985 test: Test include_descendants in Item Group Product Listing
- Also made include_descendants field's visibility dependant on show_in_website
2022-03-09 13:50:24 +05:30
Rucha Mahabal
a504ffcc4c fix: clearer validation/warning messages for insufficient balance in leave application 2022-03-09 13:49:07 +05:30
Saqib Ansari
a02e39e986
Merge branch 'develop' into fix-#23231 2022-03-09 12:31:23 +05:30
Mohammed Yusuf Shaikh
700e65959a
fix: default log date needed to query records (#29951) 2022-03-09 11:42:50 +05:30
Saqib Ansari
8a52f59199
Merge branch 'develop' into fix-#23231 2022-03-09 11:42:46 +05:30
Saqib Ansari
baee5d109e
Merge pull request #30110 from nextchamp-saqib/fix-customer-credit-limit-update
fix: customer credit limit validation on update
2022-03-09 11:42:14 +05:30
mergify[bot]
aadca02018
fix: add filters in default_discount_account (#30095) (#30125)
(cherry picked from commit 3d8eaa5392fcc420820ac86eb01a6cf67cec1cc7)

Co-authored-by: Mohamed-D-Ouf <65343412+Mohamed-D-Ouf@users.noreply.github.com>
2022-03-09 11:27:15 +05:30
Saqib Ansari
e6666609e3
Merge branch 'develop' into fix-#23231 2022-03-09 11:08:45 +05:30
Rucha Mahabal
c0f1e269e4 feat: split ledger entries for applications created across allocations
- fix: ledger entry for expiring cf leaves not considering holidays
2022-03-09 10:25:49 +05:30
Deepesh Garg
9be3bc1dbf
Merge pull request #30080 from deepeshgarg007/item_wise_sales_history
fix: Item-wise sales history report
2022-03-09 10:18:14 +05:30
Deepesh Garg
e829f65fde
Merge pull request #30102 from deepeshgarg007/pick_list_query
fix: Ambigous column in picklist query
2022-03-09 10:17:26 +05:30
Rucha Mahabal
096092f173
fix: leave allocation records query (#30118) 2022-03-08 23:16:40 +05:30
Chillar Anand
ce27cdb121
test: Fix flaky tests (#30107) 2022-03-08 23:07:23 +05:30
Deepesh Garg
edf043261e
Merge pull request #29954 from frappe/mergify/bp/develop/pr-29714
fix: Fetch valuation rate for stock items consumed during asset repair (backport #29714)
2022-03-08 23:02:15 +05:30
Deepesh Garg
816e12dafc
Merge branch 'develop' into mergify/bp/develop/pr-29714 2022-03-08 21:40:00 +05:30
Saqib Ansari
0840acc653
Merge branch 'develop' into fix-#23231 2022-03-08 17:29:26 +05:30
Saqib Ansari
1061256358
Merge branch 'develop' into fix-customer-credit-limit-update 2022-03-08 16:01:17 +05:30
Saqib Ansari
66f20209f6 perf(asset): fetch only distinct depreciable assets 2022-03-08 15:57:54 +05:30
Saqib Ansari
a0dc79332d fix: customer credit limit validation on update 2022-03-08 15:21:27 +05:30
Rucha Mahabal
430bf00458 fix: add type hints for employee leave balance report 2022-03-08 13:36:08 +05:30
Saqib Ansari
56eb485eec
Merge pull request #30097 from nextchamp-saqib/fix-pos-round-off
fix(pos): multiple pos round off cases
2022-03-08 11:24:47 +05:30
mergify[bot]
7a3d30161f
fix: translate error message titles (#30105)
(cherry picked from commit 456ebc32f00be56cc9972cc76ac412776581060a)

Co-authored-by: Türker Tunalı <turker.tunali@gmail.com>
2022-03-08 10:42:30 +05:30
Chillar Anand
282e9f83b9
Merge branch 'develop' into party 2022-03-08 09:53:03 +05:30
Deepesh Garg
83dd3bd7fc
Merge pull request #29940 from deepeshgarg007/item_discounts_quotation
fix: Item discounts for quotation and other docs
2022-03-08 09:08:51 +05:30
ChillarAnand
9ace7d606c fix: Ignore missing customer group while fetching price list 2022-03-08 08:44:48 +05:30
Deepesh Garg
d9d4c2ce79 fix: Remove unintentional changes 2022-03-08 07:56:44 +05:30
Deepesh Garg
517fbf1d1f fix: Ambigous column in picklist query 2022-03-07 22:31:42 +05:30
Saqib Ansari
72fab9ba1e
Merge branch 'develop' into fix-pos-round-off 2022-03-07 20:22:20 +05:30
Dany Robert
748d5c4873
fix: wrong payment days in salary slip for employees joining/leaving during mid payroll dates (#29082)
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2022-03-07 19:57:57 +05:30