Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,822 Commits 3 Branches 0 Tags 1 GiB
3386d4948e
Commit Graph

35822 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
95e9b2fd6e
refactor(payroll): simplified logic for additional salary (#24907) 2021-03-17 19:58:56 +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
bacfaa4396
fix: calculate 80g certificate amount on validate for memberships (#24925) (#24926) 2021-03-17 19:51:59 +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
438d9cad90 fix: Remove print statement 2021-03-17 18:04:05 +05:30
Deepesh Garg
f9519c7e13 fix: Group nil exempted and non gst items separately 2021-03-17 18:03:58 +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
a5987782bd fix(India): Incorrect Nil Exempt and Non GST amount in GSTR3B report 2021-03-17 15:49:44 +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
Andy Zhu
6117ac5aff
fix: copy_parent_value_in_all_row function error 2021-03-17 13:53:02 +13:00
Raffael Meyer
344cb11a21
Merge branch 'develop' into improve_taxes_setup 2021-03-16 18:38:16 +01:00
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
00cce433a5
fix(Non Profit): Membership and Donation API fixes (#24900) (#24905) 
* 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:52:53 +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
Deepesh Garg
65165fcc80
Merge pull request #24894 from deepeshgarg007/add_account_method_v13 
fix: Add method for regional round off account back
 2021-03-16 13:25:24 +05:30
Deepesh Garg
d4a3cf1395 Merge branch 'version-13-beta-pre-release' of https://github.com/frappe/erpnext into add_account_method_v13 2021-03-16 13:24:33 +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
Deepesh Garg
635c480771 fix: Add method for regional round off account back 2021-03-16 13:22:20 +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
Marica
3f14aafa67
Merge pull request #24891 from marination/pos-opening-entry-pre-release 
fix: POS Opening Entry with empty balance detail rows
 2021-03-16 12:44:22 +05:30
Rushabh Mehta
45735b35c4 fix(minor): login: set as Login to ERPNext 2021-03-16 12:22:31 +05:30
marination
dd7d71ca2e fix: POS Opening Entry with empty balance detail rows 2021-03-16 12:05:37 +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
7f2e45e0f4
fix: Unequal debit and credit issue on RCM Invoice (#24838) 
* fix: Unequal debit and credit issue on RCM Invoice

* fix: Travis
 2021-03-15 18:04:47 +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
Raffael Meyer
db24b13a7d
Merge branch 'develop' into improve_taxes_setup 2021-03-15 13:27:56 +01:00