Suraj Shetty
|
0a8939e1c1
|
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
|
2021-01-29 08:56:22 +05:30 |
|
Rucha Mahabal
|
02e424fae2
|
chore: Add description for settings
|
2021-01-21 20:16:17 +05:30 |
|
Rucha Mahabal
|
bcc0674d37
|
fix: test
|
2021-01-21 19:52:13 +05:30 |
|
Rucha Mahabal
|
eee71f37d8
|
fix: test
|
2021-01-21 17:47:20 +05:30 |
|
Rucha Mahabal
|
f1cca59d80
|
feat: update expiry for memberships
|
2021-01-21 16:36:15 +05:30 |
|
Rucha Mahabal
|
b9781a4675
|
fix: membership test cases
|
2021-01-21 15:13:29 +05:30 |
|
Rucha Mahabal
|
b48eab972e
|
fix: sider issues
|
2021-01-21 13:00:10 +05:30 |
|
Rucha Mahabal
|
3af46cc6cc
|
fix: show custom buttons after save
|
2021-01-21 11:59:34 +05:30 |
|
Rucha Mahabal
|
4284ad880b
|
fix: create member from membership for website users only
|
2021-01-21 11:54:14 +05:30 |
|
Rucha Mahabal
|
53d0eebbe8
|
fix: patch for renaming field in Membership Settings
|
2021-01-20 23:22:08 +05:30 |
|
Rucha Mahabal
|
bc49815d54
|
refactor: missing validations, code clean-up
|
2021-01-20 23:14:27 +05:30 |
|
Rucha Mahabal
|
fa4b3ba505
|
fix: basic validations for Membership Type Linked Item
|
2021-01-20 21:59:27 +05:30 |
|
Rucha Mahabal
|
3575939386
|
fix: sider issues
|
2021-01-20 20:48:51 +05:30 |
|
Rucha Mahabal
|
bd02a42904
|
Merge branch 'develop' into membership-enhancements-2
|
2021-01-20 12:49:37 +05:30 |
|
Your Name
|
3ebe511eb9
|
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
|
2020-12-16 08:19:47 +00:00 |
|
Shivam Mishra
|
fd044b032f
|
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into desk-enhancements
|
2020-12-16 13:21:10 +05:30 |
|
Mohammad Hasnain Mohsin Rajan
|
c553453825
|
fix: user is not a field (#24129)
|
2020-12-15 16:29:10 +05:30 |
|
Rushabh Mehta
|
fec8dba16c
|
fix(merge): merge develop
|
2020-12-08 16:23:09 +05:30 |
|
Shivam Mishra
|
2fa3cac814
|
feat: update workspace folders
|
2020-12-03 15:48:57 +05:30 |
|
Shivam Mishra
|
2895645f86
|
feat: rename desk page to workspace
|
2020-12-03 15:39:53 +05:30 |
|
Shivam Mishra
|
9aaca25edb
|
feat: update desk page json
|
2020-12-01 13:39:54 +05:30 |
|
Shivam Mishra
|
de68f74b4c
|
chore: update all desk pages
|
2020-12-01 12:51:38 +05:30 |
|
Shivam Mishra
|
27e7c264f2
|
fix: link type
|
2020-11-30 14:58:16 +05:30 |
|
Shivam Mishra
|
61388d412b
|
feat: update desk pages
|
2020-11-30 14:58:00 +05:30 |
|
Nabin Hait
|
93bb7b0000
|
Merge branch 'develop' into membership-enhancements-2
|
2020-11-19 13:05:17 +05:30 |
|
Anurag Mishra
|
a77f2ba0de
|
fix: validation for membership
|
2020-11-17 15:34:05 +05:30 |
|
Shivam Mishra
|
723e220a34
|
chore: remove commented code
|
2020-11-09 14:07:40 +05:30 |
|
Shivam Mishra
|
12fafa3e7a
|
chore: remove validation for old member field
|
2020-11-09 14:07:39 +05:30 |
|
Shivam Mishra
|
7e1cdf9b97
|
feat(breaking): update get_last_membership to fetch correct details
|
2020-11-09 14:07:39 +05:30 |
|
Shivam Mishra
|
c04321e645
|
test(membership): add test for invoicing and validation
|
2020-11-09 14:06:53 +05:30 |
|
Shivam Mishra
|
286ec04197
|
test(membership): setup test defaults
|
2020-11-09 14:06:23 +05:30 |
|
Shivam Mishra
|
e0f4dd0643
|
fix: fieldtype for auto_create_for_web_forms
|
2020-11-09 14:06:23 +05:30 |
|
Shivam Mishra
|
9d9fa74e6b
|
refactor(member): drop email column
* remove email column
* update controller methods
* add patch to add value from email to email_id
|
2020-11-09 14:06:23 +05:30 |
|
Shivam Mishra
|
d75ff1a93e
|
feat: generate invoice on payment authorized
|
2020-11-09 14:06:23 +05:30 |
|
Shivam Mishra
|
e927224fbc
|
feat: update membership setting doctype
* rename enable_auto_invoicing to enable_invoicing
* add option to make_payment entry
|
2020-11-09 14:05:39 +05:30 |
|
Shivam Mishra
|
55f52e8135
|
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
|
2020-10-13 20:09:22 +05:30 |
|
Shivam Mishra
|
86171a3fda
|
fix: translate error log
|
2020-09-30 12:01:35 +05:30 |
|
Shivam Mishra
|
3ec67077a9
|
chore: use .format for message
Co-authored-by: Sagar Vora <sagar@resilient.tech>
|
2020-09-30 12:00:46 +05:30 |
|
Shivam Mishra
|
9a4d603403
|
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
|
2020-09-25 11:44:37 +05:30 |
|
Shivam Mishra
|
cee891aa92
|
refactor: better logging for membership
|
2020-09-24 10:31:36 +05:30 |
|
Deepesh Garg
|
6bcfffda1d
|
Merge branch 'develop' into barredterra-patch-1
|
2020-09-19 18:33:14 +05:30 |
|
Deepesh Garg
|
c646a56d68
|
fix: Update modified timestamp
|
2020-09-19 18:28:20 +05:30 |
|
Rucha Mahabal
|
c78ca36ee5
|
fix(Non Profit): Hide Address and Contact section for unsaved docs
|
2020-09-16 23:47:33 +05:30 |
|
Shivam Mishra
|
4a238a2093
|
feat: don't allow guests
|
2020-09-04 15:18:16 +05:30 |
|
Shivam Mishra
|
3daa9de998
|
feat: add email option to field email_id
|
2020-08-14 13:46:58 +05:30 |
|
Shivam Mishra
|
6b68eaad1e
|
feat: use email template for membership acknowledgement
|
2020-08-14 13:46:58 +05:30 |
|
Shivam Mishra
|
b4d3666e69
|
feat: show send acknowledgement button if enabled in settings
|
2020-08-14 13:46:58 +05:30 |
|
Shivam Mishra
|
e4c58c37c8
|
feat: allow member creation via API
|
2020-08-14 13:46:58 +05:30 |
|
Shivam Mishra
|
98bcedd09c
|
feat: create member if not already exists
|
2020-08-14 13:46:58 +05:30 |
|
Shivam Mishra
|
d7139bbd43
|
fix: type error
|
2020-08-14 13:46:58 +05:30 |
|