Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,690 Commits 3 Branches 0 Tags 1 GiB
557d9516ff
Commit Graph

184 Commits

Author SHA1 Message Date
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
Shivam Mishra
87ddec069e refactor: try block across the function 2020-08-14 13:46:58 +05:30
Shivam Mishra
6fbe9b5404 fix: remove payload 2020-08-14 13:46:58 +05:30
Shivam Mishra
3a67a78ece feat: add custom buttons for invoice and email 2020-08-14 13:46:58 +05:30
Shivam Mishra
8e0314e7f6 feat: separate invoice generation and email 2020-08-14 13:46:58 +05:30
Shivam Mishra
c8d9e7f77b feat: add message field 2020-08-14 13:46:58 +05:30
Shivam Mishra
1678eb9b50 feat: drop payload column 2020-08-14 13:46:58 +05:30
Shivam Mishra
62e344188a feat: update settings and link filters 2020-08-14 13:46:32 +05:30
Shivam Mishra
15340e0c7f feat: send invoice via email 2020-08-14 13:46:32 +05:30
Shivam Mishra
811ac909f9 feat: add auto invoice creation fields and controllers 2020-08-14 13:46:32 +05:30
Shivam Mishra
96dc67c35e feat: add copy button and docs link 2020-08-14 13:46:32 +05:30
Shivam Mishra
3a1868dae8 feat: add item field 2020-08-14 13:46:32 +05:30
Shivam Mishra
a16b24d50a feat: add enable or disable invoicing and print format field 2020-08-14 13:46:32 +05:30
Raffael Meyer
821eeb9852
fix(membership): currency should be a link 2020-08-09 14:07:32 +02:00
Shivam Mishra
11111cd9a9 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-07-30 21:29:02 +05:30
Shivam Mishra
97a316c09a feat: add create customer button to member 2020-07-27 15:27:09 +05:30
Shivam Mishra
9e3776e001 feat: improve webhook logging 2020-07-27 14:26:37 +05:30
Shivam Mishra
e43d362d53 feat: verbose logging for verification 2020-07-27 14:19:36 +05:30
Shivam Mishra
4e40b9bdbe feat: log everything 2020-07-27 14:19:36 +05:30
Shivam Mishra
1358efe896 feat: update icons 2020-07-23 17:02:32 +05:30
Shivam Mishra
8c24810f30 refactor: ignore mandatory for customer 2020-06-11 15:42:29 +05:30
Shivam Mishra
49d51b8ce7 feat: check duplicate contact explicitly 2020-06-11 14:24:07 +05:30
Shivam Mishra
84fcc55a36 refactor: do nothing if member is not found 2020-06-11 13:34:40 +05:30
Shivam Mishra
8d61a0abef fix: use string to verify webhook 2020-06-11 13:34:25 +05:30
Shivam Mishra
f460c17961
fix: syntax error (#22082) 2020-06-02 21:48:23 +05:30
Shivam Mishra
789df32683
feat: verify signature on webhook (#21872) 2020-06-02 19:18:22 +05:30
Shivam Mishra
e4bbdbbfe1
fix: get data from request directly (#21954) 2020-05-27 11:47:26 +05:30
Shivam Mishra
d76c5e83ca fix: elif block error 2020-04-30 22:39:03 +05:30
Shivam Mishra
357d11adbe
Merge branch 'develop' into razorpay-subscription 2020-04-29 11:17:44 +05:30
Raffael Meyer
49bb8ccd2e feat: add Bank Account to dashboards 2020-04-28 18:56:47 +02:00
Shivam Mishra
d445ffc458 feat: whitelist api 2020-04-28 16:04:31 +05:30
Shivam Mishra
7b836e9a92 refactor: update susbcription values all the time 2020-04-28 15:43:04 +05:30
Shivam Mishra
745b632ea1 fix: linting fixes 2020-04-20 18:25:51 +05:30
Shivam Mishra
4fdb4aa1d0 feat: use int for billing frequency 2020-04-14 12:00:15 +05:30
Shivam Mishra
cb354685d5 fix: linting issues 2020-04-14 12:00:02 +05:30
Shivam Mishra
affa2fba6b feat: updated non-profit.json 2020-04-13 13:42:01 +05:30
Shivam Mishra
31051679c8 feat: remove unused fields 2020-04-07 18:43:11 +05:30
Shivam Mishra
65e11a9640 refactor: razorpay subscription for memberships 2020-04-07 14:49:28 +05:30
Shivam Mishra
8d6cded07f feat: added subscription web hook 2020-04-06 15:01:30 +05:30
Shivam Mishra
d92b7ab258 fix: use false explicitly 2020-04-06 14:44:33 +05:30
Shivam Mishra
4b667160a0 feat: added razorpay details to membership 2020-04-06 14:44:17 +05:30
Shivam Mishra
3a2c8560ba feat: update desk page for Non Profits 2020-03-30 18:15:51 +05:30
Shivam Mishra
28fafd0dda feat: setup subscription API 2020-03-30 18:15:37 +05:30
Shivam Mishra
1281634306 feat: client code to handle razorpay fields 2020-03-30 18:15:22 +05:30
Shivam Mishra
e836cdec13 feat: update member and membership doctype 2020-03-30 18:14:10 +05:30
Shivam Mishra
1f20f6348d feat: added membership settings doctype 2020-03-30 18:13:29 +05:30
Shivam Mishra
451382e08e feat: update desk pages 2020-03-12 16:34:34 +05:30
Shivam Mishra
0310366d5a fix (cleanup): remove incomplete dependencies data 2020-03-05 11:28:40 +05:30
Shivam Mishra
1f151c1032 refactor: update restrict to domain data 2020-03-02 19:37:12 +05:30
Shivam Mishra
3f59af3ef1 feat: added base config for domains 2020-03-02 17:25:18 +05:30
Mangesh-Khairnar
b343407236 refactor: change validate email add to validate email address 2019-03-16 13:40:58 +05:30
Aditya Hase
f3c22f342c fix(unicode): Import unicode_literals in every file 2019-01-22 18:36:10 +05:30
Tyler Matteson
d14e46ef02 Doctypes in domains that are in beta are now restricted to that domain 
non-profit, agriculture, healthcare, hospitality, education

Please enter the commit message for your changes. Lines starting
 2018-11-04 08:39:52 -05:00
Ranjith
f01bf9048d fix: Membership - allow system users to create membership for existing Members 2018-10-31 14:33:28 +05:30
Shreya Shah
a5add289bb Refactor Naming Series (#15070) 
* Patch to create Property Setter for existing naming series

* Update existing naming series options with new

* Add patch link to patches.txt

* Update patch

* Fix codacy

* Fix as per suggestions

* Remove old patch for property setter

* Improve as per suggested

- Modified the naming
- Also refactored naming for doctypes having autoname with series
- Added a patch to make property setter for autoname

* Fix Travis

* Rebase with develop
 2018-08-28 13:44:48 +05:30
Rushabh Mehta
5f33b69f2f fixes(minor): clean item group html and hide image 2018-08-16 14:48:02 +05:30
Saurabh
1cfcf70905 Resolved merge conflicts 2018-07-06 13:18:44 +05:30
Deepak kumar
55cf6c5f7e Membership (#14688) 
* Correct the label and field name

* Update membership.json
 2018-06-27 09:17:33 +05:30
asbasawaraj
b0fafa9774 Additional fields in Certified Consultant DocType (#14573) 2018-06-19 10:43:55 +05:30
asbasawaraj
4c263480c9 Certfication Application Doctype and webform,Certfied Consultant DocType (#14528) 2018-06-15 10:04:19 +05:30
Rushabh Mehta
0d19744b17 [fix] for notification 2018-06-14 09:23:32 +05:30
asbasawaraj
1b16b772ab Report to Track Expiring Memberships - Monthwise (#14207) 2018-06-05 10:30:03 +05:30
Zarrar
c141eb00ee [Enhance] Department added wherever applicable (#14121) 
* set All Department as default parent_department

* add department field in employee_transfer

* copied data from options to fetch_from

* add department field wherever employee's link field present

* empty options field where fetch_from is added
 2018-05-23 11:11:36 +05:30
asbasawaraj
5f6b44e142 Formatted chapter member display (#14128) 2018-05-21 10:31:45 +05:30
Manas Solanki
0536baacc2
Remove the duplicate description 2018-04-27 12:46:56 +05:30
Shreya Shah
c3bf1fa009 [Fixes] Chapter DocType (#13213) 
* fetch chapter head from member doctype instead of user

* add enabled in grid view and set default as 1
 2018-03-07 16:27:30 +05:30
Zarrar
033eb779d4 minor fixes for member (#13101) 2018-02-27 11:00:47 +05:30
Shreya Shah
70a68897cc auto name on the basis of naming series (#13056) 2018-02-23 16:24:59 +05:30
Raghavendra Kamath
1a9388acbb Clean inline css found in chapter and grant for loops! (#13038) 
* Clean inline css found in chapter and grant for loops!

* Remove redundant css

* remove unwanted ide files and append gitignore

* remove unnecessary line from build.json

* restore import for variable.less

* remove kdev from gitignore
 2018-02-23 14:34:44 +05:30
Shreya Shah
f4b271a02e Customer and Supplier link fields in Member DocType (#12942) 
* added link fields customer and supplier

* fixed a typo
 2018-02-16 12:56:01 +05:30
Saurabh
fb2f97391f resolved merge conflicts 2018-01-24 11:24:10 +05:30
Vishal
a54815fd9d [new] Allow Rename and Member link with user 2018-01-22 16:02:45 +05:30
Saurabh
4b0dd8a159 Merge branch 'master' into develop 2018-01-15 18:36:35 +05:30
Vishal Dhayagude
eec0f7fd6b [non_profit][fix] Chapter listing and join and leave chapter issue (#12463) 
* [fix] Chapter listing and Join and leave chapter issue

* [minor] Changes in chapter html, chapter title to chapter name
 2018-01-15 14:10:23 +05:30
Vishal Dhayagude
e88f928f0f [fix] Image with name listing (#12479) 2018-01-15 12:29:39 +05:30
Vishal Dhayagude
d2d54826ab [minor] Minor Changes in Membership Doctype (#12384) 2018-01-09 10:56:17 +05:30
Vishal Dhayagude
ee7b4f00f8 [minor] Chapter head link with Member (#12003) 2017-12-14 13:26:22 +05:30
Zarrar
17fd6610dc Fix travis (#11882) 
* fieldname wrong

* bifurcated test into two - error when both were running async

* minor fixes with link and route

* move school domain rename up

* fix async creation of operations test

* edit-in-full-page is button, not link

* set_route issue in production order test

* minor changes

* fix task tree test

* more fixes

* fix server side issue

* improvising ui tests
 2017-12-08 14:57:38 +05:30
Nabin Hait
51ce1027de non-profit module cleanups 2017-12-06 12:58:04 +05:30
Nabin Hait
419db49806 non-profit module cleanups 2017-12-06 12:57:53 +05:30
Vishal
54f5b115a7 [new] Role added 2017-12-05 17:51:15 +05:30
Vishal
474d58cecf [fix] minor changes 2017-12-05 17:19:02 +05:30
Vishal
5ffbd4f492 [fix] Reviewed Modification in Grant Application 2017-12-05 16:41:09 +05:30
Vishal
91236fa9d6 [fix] Reviewed modification on donor and volunteer 2017-12-05 16:41:09 +05:30
Vishal
139545a0f7 [fix] Minor changes in membership 2017-12-05 16:41:09 +05:30
Vishal
74116172b8 [fix] Reviewed Chapter Doctype Modification 2017-12-05 16:41:09 +05:30
Vishal
55480491bf [minor] changes added in member and membership doctype 2017-12-05 16:41:09 +05:30