Commit Graph

34995 Commits

Author SHA1 Message Date
Sagar Vora
8ee1146f72
test: add stock to avoid NegativeStockError (#24941) 2021-03-18 17:45:25 +05:30
Mohammad Hasnain Mohsin Rajan
192ab05869
ci: use ubuntu 18 specifically (#24904) 2021-03-18 17:12:12 +05:30
Afshan
a04091aaf7
fix: exclude current doc while validation. (#24914) 2021-03-18 16:40:43 +05:30
Sagar Vora
b134b89fb0
test: fix NegativeStockError (#24936) 2021-03-18 16:36:40 +05:30
Sagar Vora
78e576ee6a
fix: default total_estimated_cost to zero (#24939)
Co-authored-by: walstanb <walstanb@gmail.com>
2021-03-18 15:23:52 +05:30
Ankush Menat
c0a9c391eb
fix: hide alt tag if item is not shown in website 2021-03-18 14:07:24 +05:30
Deepesh Garg
d39055785a
Merge pull request #24934 from Anuja-pawar/fix_report_issue_summary
fix: Report Issue Summary fix for zero issues
2021-03-18 12:24:43 +05:30
Anuja Pawar
9bf1083d9e
fix: payment references from disappearing on selecting cost center (#24831)
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
2021-03-18 11:22:24 +05:30
Rushabh Mehta
14c3c5172d fix(minor): rearrange the cards on home workspace 2021-03-18 10:45:38 +05:30
Anuja P
2c8a38d9fa fix: report issue summary fix for zero issues 2021-03-18 10:36:46 +05:30
Sagar Vora
500f54e515
test: fix shift type not found (#24929) 2021-03-17 23:25:04 +05:30
Sagar Vora
52bbd4e182
test: clear Leave Period before running Leave Allocation tests (#24928) 2021-03-17 22:37:59 +05:30
Mohammad Hasnain Mohsin Rajan
7f906f9aaa
chore: add sider config (#24892)
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2021-03-17 20:06:35 +05:30
Sagar Vora
c647b6088a
ci: update badge in README and add push event trigger (#24911) 2021-03-17 20:04:59 +05:30
Sagar Vora
19bb8c1137
ci: get branch name from GITHUB_REF if GITHUB_BASE_REF not available (#24913) 2021-03-17 20:03:54 +05:30
Sagar Vora
7645315424
test: set correct qty when creating subcontract transfer entry (#24903) 2021-03-17 20:01:21 +05:30
Sagar Vora
f4a6c7823a
test: create new item instead of using _Test Item to prevent error (#24915) 2021-03-17 19:57:53 +05:30
Sagar Vora
cf3fc99b12
test: fix salary component not found; other optimisation (#24920) 2021-03-17 19:54:08 +05:30
Rucha Mahabal
cbd67e662f
fix: calculate 80g certificate amount on validate for memberships (#24925) 2021-03-17 19:49:27 +05:30
Anurag Mishra
abf974daee fix: precision and formated document 2021-03-17 18:55:04 +05:30
Rohit Waghchaure
77add49c6a fix: don't club same free item 2021-03-17 18:49:54 +05:30
Deepesh Garg
f9f0e347ed fix: Remove print statement 2021-03-17 18:03:17 +05:30
Deepesh Garg
084ec9773e fix: Group nil exempted and non gst items separately 2021-03-17 18:00:08 +05:30
Anurag Mishra
23b6294f5c
Merge pull request #24842 from resilient-tech/allow-duplicate-additional
fix(payroll): allow duplicate additional salaries
2021-03-17 17:39:52 +05:30
Deepesh Garg
56c20fb79f fix(India): Incorrect Nil Exempt and Non GST amount in GSTR3B report 2021-03-17 15:47:03 +05:30
Rohit Waghchaure
a9b1347600 fix: nonetype object has no attribute options 2021-03-17 14:30:34 +05:30
Rohit Waghchaure
ff70e61d7a feat: recursive product discount 2021-03-17 14:30:34 +05:30
Deepesh Garg
22f5ff8492 fix: Allow user to update exchange rate in Multi-currency LCV 2021-03-17 10:56:52 +05:30
Sagar Vora
68aaf12902
test: use _Test Company to avoid Holiday List error (#24902) 2021-03-17 10:06:05 +05:30
Sagar Vora
bce904cf97
test: fix Employee Not Found errors (#24906) 2021-03-17 10:03:30 +05:30
Sagar Vora
65d7f2c798
fix(Project): get correct holiday list when calculating dates; test fixes (#24901) 2021-03-17 10:00:35 +05:30
Anurag Mishra
8fbb043190
Merge pull request #24824 from resilient-tech/fix-salary
refactor(payroll): simplified logic for additional salary
2021-03-16 21:42:10 +05:30
Rucha Mahabal
1482b2883f
fix(Non Profit): Membership and Donation API fixes (#24900)
* fix: Donation fixes

- differentiate between subscription payment and payment

- issue with donation amount

* fix: existing membership validation

* fix: ignore subscription payments while capturing donations
2021-03-16 20:08:51 +05:30
Prssanna Desai
b74436d535
Merge pull request #24896 from prssanna/redesign-fixes 2021-03-16 16:08:15 +05:30
prssanna
1cdef8bd97 style: missing semicolon 2021-03-16 15:39:16 +05:30
prssanna
b8b89a02af fix: item variant dialog dropdown issue 2021-03-16 14:16:22 +05:30
prssanna
f1dbc021fc fix: issue web list style 2021-03-16 14:15:59 +05:30
Anurag Mishra
5cc322e01d
Merge pull request #24877 from Anurag810/settings_for_eanbling_leave_notificstion
feat: Add checkbox for disabling leave notification in HR Settings
2021-03-16 13:23:16 +05:30
Afshan
46eb4b2f90
Merge branch 'develop' into settings_for_eanbling_leave_notificstion 2021-03-16 13:15:55 +05:30
Deepesh Garg
4470291243
Merge pull request #24893 from deepeshgarg007/add_account_method
fix: Add method for regional round off account back
2021-03-16 13:13:50 +05:30
Deepesh Garg
004f9e6b0c fix: Add method for regional round off account back 2021-03-16 13:09:59 +05:30
Anurag Mishra
6bafbffee0 fix: added also for leave applier as requested 2021-03-16 13:01:39 +05:30
Anurag Mishra
54482fd83f feat: added for disabling leave notification in HR settings 2021-03-16 13:01:39 +05:30
Rushabh Mehta
45735b35c4 fix(minor): login: set as Login to ERPNext 2021-03-16 12:22:31 +05:30
Rushabh Mehta
6ef213e5c6 fix(minor): patch add_state_code_for_ladakh 2021-03-16 11:59:54 +05:30
Marica
4d869906b6
Merge branch 'develop' into drop-shipping 2021-03-16 11:43:46 +05:30
Deepesh Garg
93f925fb98
fix: Unequal debit and credit issue on RCM Invoice (#24836)
* fix: Unequal debit and credit issue on RCM Invoice

* fix: Travis

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-03-15 18:04:42 +05:30
Anurag Mishra
4f6f224544
Merge pull request #24622 from Anurag810/suplier_portal_fixes
fix: supplier was not able to Submit RFQ due to insufficient permission
2021-03-15 16:33:49 +05:30
Anurag Mishra
5e475f85b9
Merge branch 'develop' into suplier_portal_fixes 2021-03-15 16:21:55 +05:30
Marica
3575314260
Merge branch 'develop' into drop-shipping 2021-03-15 12:53:45 +05:30