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
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
4ceea333a7
fix: POS Opening Entry with empty balance detail rows ( #24876 )
2021-03-15 12:49:14 +05:30
Mohammad Hasnain Mohsin Rajan
46d5431bad
fix: Github Action not failing when tests fail ( #24867 )
...
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2021-03-15 11:17:19 +05:30
Anupam Kumar
ed42afc5e8
feat: price margin in buying ( #24685 )
2021-03-15 11:11:28 +05:30
Deepesh Garg
5165859e51
Merge pull request #24873 from GangaManoj/filter-bank-reconciliation
...
fix(Bank Reconciliation Tool): Filter Bank Account drop-down list
2021-03-15 10:21:14 +05:30
Ganga Manoj
ca03997ab5
fix(Bank Reconciliation): Filter Bank Account drop-down list
2021-03-13 22:21:07 +05:30
Deepesh Garg
e196be4d8a
Merge pull request #24866 from resilient-tech/fix-test-import
...
test: fix import_doc call in test_shopify_settings
2021-03-13 19:12:15 +05:30
Sagar Vora
c5869d5b47
test: fix import_doc call in test_shopify_settings
2021-03-12 16:21:45 +05:30
Afshan
5d66a2b326
fix: added correct path in hooks ( #24862 )
2021-03-12 15:51:34 +05:30
Mohammad Hasnain Mohsin Rajan
0f60f08f3e
ci: Port CI test from Travis to Github Actions ( #24846 )
2021-03-12 14:09:52 +05:30
Sagar Vora
6727792aaf
test: fix syntax error
2021-03-11 18:12:01 +05:30
Sagar Vora
514122bf6f
refactor(payroll): simplified logic for additional salary
2021-03-11 17:22:11 +05:30
Nabin Hait
b5792872e9
Merge branch 'Anurag810-gratuity' into develop
2021-03-11 16:14:45 +05:30
Nabin Hait
6e3668dc30
fix: merge conflict
2021-03-11 16:14:27 +05:30
Rucha Mahabal
d1e331f77f
fix(Membership): Generate Invoice for membership webhook only if automation is enabled ( #24849 )
2021-03-11 15:27:22 +05:30
Rucha Mahabal
be2c1fca7b
feat(Non Profit): 80G Certificates and Donations ( #24657 )
...
* feat: 80G Certificates
* feat: add non-profit custom fields for India
* feat: 80G Certificate print format for memberships
* feat: Donation doctype and API endpoint to capture donations via razorpay
* chore: Rename Membership Settings to Non Profit Settings
* chore: clean up Non Profit Settings
- Rename fields, better labels
- patch for renaming
* feat: Webhook secret generation for Razorpay donations in Non-Profit Settings
* feat: Payment Entry for donations
- added Donor as Party Type
- setting for automating payment entries for donations created via web form
* fix: linter and sider issues
* fix: translation syntax
* feat: PAN Details custom field for Indian donors
* feat: 80G certificates for Donations with Print Format
* fix: sider
* feat: validations for donor and donation
- create donor for website user from donations
- validate donor email
* feat: extract member name from subscription notes
* test: Donation
* test: Tax Exemption 80G Certificate
* chore: styling fixes
* fix: tests
* fix: sider
* feat: extract PAN number from additional subscription notes
* feat: Add creation user field in Non Profit Settings
fix: Payment Entry not generating for memberships and donations
* feat: update desk page
* fix: tests
2021-03-11 13:19:44 +05:30
Marica
63eb6bdb3c
Merge pull request #24643 from CaseSolvedUK/sinvfix-v13
...
fix: Don't throw exception on invoice lines when there is no item_code
2021-03-11 10:47:24 +05:30
Sagar Vora
5822b6d76f
fix(payroll): allow duplicate additional salaries
2021-03-10 21:45:32 +05:30
casesolved-co-uk
a780306ec7
fix: Don't throw exception on invoice lines when there is no item_code ( fixes #24640 )
2021-03-10 15:50:45 +00:00
Anupam Kumar
6f0fabc54e
fix: gle issue in internal transfer(Purchase) ( #24830 )
2021-03-10 18:36:46 +05:30
rohitwaghchaure
a2063b1337
Merge pull request #24832 from ankush/consolidated_report_acc_name_fix
...
fix: use account_name only in consolidated report
2021-03-10 17:41:19 +05:30
Ankush Menat
59fdee4dfa
Merge branch 'develop' into consolidated_report_acc_name_fix
2021-03-10 16:35:59 +05:30
Rucha Mahabal
c7fff34cf5
fix(travis): Customer Testcase Failing ( #24833 )
2021-03-10 15:51:44 +05:30
Ankush Menat
000fa824d3
fix: use account_name only in consolidated report
...
Don't use account_number and only rely on account_name for preparing
consolidated financial statement.
Related issue: ISS-20-21-10217
2021-03-10 15:23:48 +05:30
rohitwaghchaure
a0e7787f7b
fix: removed show cancelled entries checkbox from the stock ledger report ( #24826 )
2021-03-10 13:46:42 +05:30
Anupam Kumar
77eaf2939a
fix: rate of stock uom division by zero error ( #24829 )
2021-03-10 12:04:54 +05:30
Raffael Meyer
20cc2bb0d8
fix: autoname for Item Tax Template
...
* fix: autoname for Item Tax Template
Use title + company abbreviation instead of just title.
* fix: test records of Item Tax Template
* fix: rename item tax templates in test records
* Revert "fix: test records of Item Tax Template"
This reverts commit 53875c54ffe059c32d52b9ee60795d56f95473b1.
* fix: rename hardcoded item tax templates in tests
* fix: rename hardcoded Item Tax Templates in tests
(2)
* fix: delete Item Tax Template with company
2021-03-10 10:24:43 +05:30
Marica
6ccd64c2ec
Merge pull request #24464 from sgtpepper9907/feat-make-patient-age-translateable
...
feat: Make patient age translateable
2021-03-10 10:15:38 +05:30
David Angulo
fe0f46c5b3
fix sider
2021-03-09 13:28:08 -06:00
David Angulo
06e99dfe7b
fix sider
2021-03-09 13:23:48 -06:00
