Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,544 Commits 3 Branches 0 Tags 1 GiB
75fdf79376
Commit Graph

36544 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
rohitwaghchaure
e838d1c7f0
Merge pull request #24882 from rohitwaghchaure/fixed-validation-for-job-card-v13-beta 
fix: validation of job card in stock entry
 2021-03-15 17:35:35 +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
Raffael Meyer
6d5ea4cee8
Merge branch 'develop' into improve_taxes_setup 2021-03-15 11:40:39 +01:00
Rohit Waghchaure
00a0e8da10 fix: validation of job card in stock entry 2021-03-15 14:15:10 +05:30
Marica
3575314260
Merge branch 'develop' into drop-shipping 2021-03-15 12:53:45 +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
Marica
5499401fcb
Merge branch 'develop' into drop-shipping 2021-03-15 11:09:04 +05:30
Deepesh Garg
a2e4564464 fix: Prevent non sequential repayment entries 2021-03-15 10:32:38 +05:30
Anupam
d8f7a75eae feat: add total available stock field 2021-03-15 10:31:53 +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
Deepesh Garg
61fb9bf869 fix: Loan Repayment entry cancellation on salary slip cancel 2021-03-14 21:25:21 +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
Marica
51c500d446
fix: Don't throw exception on invoice lines when there is no item_code (fixes #24640) (#24864) 
Co-authored-by: casesolved-co-uk <richard@casesolved.co.uk>
 2021-03-12 15:51:45 +05:30
Afshan
5d66a2b326
fix: added correct path in hooks (#24862) 2021-03-12 15:51:34 +05:30
Afshan
9ab3bedd0a
fix: added correct path in hooks (#24865) 2021-03-12 15:51:23 +05:30
marination
e685c787d2 fix: Sider (unused variables) 2021-03-12 14:24:09 +05:30
marination
86725a6580 fix: PO not created against all selected suppliers (drop shipping) 
- Return list of created POs instead of first doc
- test case added
 2021-03-12 14:12:46 +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
rohitwaghchaure
90ea17fbd6
Merge pull request #24825 from rohitwaghchaure/allow-to-set-item-in-batch-naming-pre 
fix: allow to select item code in batch naming
 2021-03-12 11:52:43 +05:30
Sagar Vora
6727792aaf test: fix syntax error 2021-03-11 18:12:01 +05:30
Raffael Meyer
fb68aba30d
Merge branch 'develop' into improve_taxes_setup 2021-03-11 13:17:44 +01:00
Sagar Vora
514122bf6f refactor(payroll): simplified logic for additional salary 2021-03-11 17:22:11 +05:30
Nabin Hait
fe3529b194 fix: merge conflict 2021-03-11 16:45:41 +05:30