Rushabh Mehta
a3d0bea375
Merge branch 'develop' into remove-party-status
2017-02-02 15:42:04 +05:30
Rushabh Mehta
4500f7b4d6
[cleanup] remove unused LMS ( #7612 )
2017-01-30 17:04:38 +05:30
Rushabh Mehta
87037bdd56
[minor] remove party status as it leads to duplicate notifications fixes #7346 , also fix for #7568
2017-01-30 13:22:51 +05:30
mbauskar
51b1d6de48
[minor] moved the address_and_contact utils to frappe
2017-01-30 10:45:28 +05:30
Neil Trini Lasrado
38bd62d82d
Merge branch 'develop' into assessment
2017-01-16 12:23:51 +05:30
Rushabh Mehta
95439db53f
[fixes] address and contact
2017-01-14 00:25:22 +05:30
Rushabh Mehta
b92087cb2d
[cleanup] move contact, address to frappe 💥
2017-01-13 18:54:47 +05:30
robert schouten
7a3d418aa5
Email inbox based off of frappe email inbox pr ( #7308 )
...
* email inbox
* inbox fixes
* separate email-inbox to pass tests
* separate email-inbox to pass tests
* fix import
* add more info to contact and address
2017-01-13 14:51:09 +05:30
Rushabh Mehta
d40e661ebd
[style] better demo start page
2017-01-10 14:46:54 +05:30
Neil Trini Lasrado
a56224c03a
Rename Assessment to Assessment Plan
2017-01-09 18:26:03 +05:30
Neil Trini Lasrado
577cfd559f
Removed LMS code in Course master
2017-01-09 18:26:03 +05:30
Rushabh Mehta
2167ff589c
[minor] update font awesome icons
2016-12-07 11:09:02 +05:30
Rushabh Mehta
9dd58d42df
[fix] test cases and final wiring for daily work summary
2016-11-18 12:40:18 +05:30
Rushabh Mehta
fe816c3852
[fix] [wip] daily work summary
2016-11-18 12:40:18 +05:30
Nabin Hait
ceca1b97c3
Fixed merge conflict
2016-11-09 14:58:36 +05:30
Saurabh
94c666ae46
[fix] added hook call to create payment gateway account record
2016-11-08 20:35:50 +05:30
Rohit Waghchaure
2f1db57fe1
Added status field in sales invoice and purchase invoice
2016-11-08 18:49:58 +05:30
Rohit Waghchaure
3844d2cc01
Remember last selected value for link field
2016-11-03 14:49:27 +05:30
Rushabh Mehta
fc800b3f2f
[enhance] added roles for portal users frappe/frappe#2091 ( #6452 )
2016-09-23 21:51:51 +05:30
Rohit Waghchaure
21499e820d
[Enhancement] Supplier quotation added on supplier portal
2016-09-21 17:07:25 +05:30
Neil Trini Lasrado
83d81203b2
Added Student Admissions ( #6359 )
...
* Added Student Admissions
* Fixes for Student Application
2016-09-15 14:48:13 +05:30
Nabin Hait
f44b5152d2
Portal settings for schools
2016-08-09 17:08:13 +05:30
Neil Trini Lasrado
50b2278eda
Renamed fields in Examination Doctype, Renamed examination doctype to Assessment, Added Assessment Group, added patch
2016-08-05 15:09:49 +05:30
Saurabh
e4e8954a19
[fix] make payment request without payment gateway
2016-07-22 15:43:26 +05:30
Neil Trini Lasrado
3f0a581b85
Merge ERPNext Schools into ERPNext
2016-07-20 19:25:02 +05:30
Rushabh Mehta
bc10431b7d
Merge pull request #5631 from KanchanChauhan/address-viewww-fixed
...
Address view fixed for website
2016-07-04 15:50:40 +05:30
Kanchan Chauhan
1605ff02c6
[WIP] Address view fixed
2016-07-04 15:41:07 +05:30
Saurabh
621247807a
[fix] BOM tree as default view
2016-06-30 15:05:06 +05:30
Rushabh Mehta
26a76fb2d9
Merge pull request #5566 from KanchanChauhan/moving-newsletter-to-frappe
...
Newsletter moved to Frappe
2016-06-29 12:11:25 +05:30
Kanchan Chauhan
65c8b5a216
Newsletter moved to Frappe
2016-06-28 17:28:40 +05:30
Rohit Waghchaure
d6c986da8f
[Enhancement] Time log wages and multiple active salary structure
2016-06-27 16:46:39 +05:30
Anand Doshi
f576f3b17b
implemented get_site_info for erpnext and patch to move setup complete to system settings
2016-06-25 19:52:26 +05:30
Rushabh Mehta
723cd64249
[fix] tree view hooks and patch fix
2016-06-25 18:30:03 +05:30
Valmik Jangla
2225decb2b
Restrict Newsletter lists
2016-06-15 16:04:17 +05:30
Anand Doshi
227b238fb1
[fix] change in versioning: store __version__ in __init__.py
2016-06-09 16:31:01 +05:30
Rushabh Mehta
e778e59e4c
[minor] always show issues in sidebar
2016-06-08 15:34:54 +05:30
Nabin Hait
3bc300a207
Merge branch 'master' into develop
2016-06-03 11:57:30 +05:30
Nabin Hait
ef7b6ab8ef
bumped to version 6.27.22
2016-06-03 12:20:19 +06:00
Nabin Hait
1ade5927c4
fixed conflict
2016-05-26 16:56:30 +05:30
Nabin Hait
01eb7d02cc
bumped to version 6.27.21
2016-05-26 17:25:34 +06:00
Nabin Hait
310d64d565
Fixed conflict
2016-05-26 16:10:02 +05:30
Nabin Hait
c5d186c497
bumped to version 6.27.20
2016-05-26 16:15:34 +06:00
Nabin Hait
66ee4d8cd7
Merge branch 'master' into develop
2016-05-20 15:15:21 +05:30
Nabin Hait
a54a2a99f4
bumped to version 6.27.19
2016-05-20 15:45:20 +06:00
Nabin Hait
563bd056d7
Merge branch 'master' into develop
2016-05-20 12:18:28 +05:30
Nabin Hait
6c5a9bbe6b
bumped to version 6.27.18
2016-05-20 12:48:27 +06:00
Nabin Hait
b81ed45b2b
fixed conflict
2016-05-11 12:52:31 +05:30
Nabin Hait
a1fcded0ba
bumped to version 6.27.17
2016-05-11 13:13:39 +06:00
Nabin Hait
332d29f166
Merge branch 'master' into develop
2016-05-06 16:13:35 +05:30
Nabin Hait
42800d24cc
bumped to version 6.27.16
2016-05-06 16:43:34 +06:00
Nabin Hait
f3bff49799
Merge branch 'master' into develop
2016-05-02 15:19:17 +05:30
Nabin Hait
d824fbbddd
bumped to version 6.27.15
2016-05-02 15:49:16 +06:00
Rushabh Mehta
764aa92da4
[minor] added remember_selected in hooks and doc update
2016-05-02 13:28:59 +05:30
Nabin Hait
b78adcf279
Merge branch 'master' into develop
2016-04-29 18:26:46 +05:30
Nabin Hait
ab7f6870cb
bumped to version 6.27.14
2016-04-29 18:56:45 +06:00
Nabin Hait
6146cc1e33
Merge branch 'master' into develop
2016-04-29 11:44:55 +05:30
Nabin Hait
cfe14d9814
bumped to version 6.27.13
2016-04-29 12:14:54 +06:00
Anand Doshi
79c536acb5
Merge branch 'master' into develop
2016-04-27 15:44:11 +05:30
Anand Doshi
08de396d46
bumped to version 6.27.12
2016-04-27 16:13:21 +06:00
Anand Doshi
e3bd78e912
[css] portal
2016-04-22 18:53:21 +05:30
Nabin Hait
d6bc490274
Merge branch 'master' into develop
2016-04-22 12:24:26 +05:30
Nabin Hait
054e2952c8
bumped to version 6.27.11
2016-04-22 12:45:35 +06:00
Anand Doshi
b2b02a574a
Merge branch 'master' into develop
2016-04-20 16:45:20 +05:30
Anand Doshi
25dd38c8f2
bumped to version 6.27.10
2016-04-20 17:13:00 +06:00
Nabin Hait
bd07ea43e8
fixed conflict
2016-04-15 11:06:41 +05:30
Nabin Hait
66953941ea
bumped to version 6.27.9
2016-04-15 11:31:32 +06:00
Nabin Hait
972c25f78d
Fixed conflict
2016-04-14 18:25:53 +05:30
Nabin Hait
ba7d8b0cac
bumped to version 6.27.8
2016-04-13 16:34:37 +06:00
Rushabh Mehta
5d0e8dee11
[fix] dashboard for customer, supplier
2016-04-11 17:34:49 +05:30
Rushabh Mehta
f4d1b18895
[hooks] notify party on_change
2016-04-11 11:34:59 +05:30
Rushabh Mehta
f16f9c569b
[enhancement] add status in customer, supplier
2016-04-08 17:21:00 +05:30
Anand Doshi
54910000d4
bumped to version 6.27.7
2016-04-07 18:11:48 +06:00
Anand Doshi
bcbfeb0d53
bumped to version 6.27.6
2016-04-04 18:24:48 +06:00
Rushabh Mehta
0c76f21f81
[minor] absolute links for portal menu
2016-04-01 11:54:01 +05:30
Rushabh Mehta
2d985e1973
[fix] edit-profile in frappe;
2016-03-30 17:15:33 +05:30
Rushabh Mehta
c78b3110b5
[enhancement] configurable portal menu;
2016-03-30 12:29:48 +05:30
Rushabh Mehta
1d05ada5e9
Merge pull request #4950 from nabinhait/fixed_asset_depreciation
...
Fixed asset depreciation
2016-03-29 16:39:31 +05:30
Rushabh Mehta
c9850f9e04
Merge pull request #5077 from frappe/master
...
Master
2016-03-29 11:59:32 +05:30
Nabin Hait
4fdb05228d
fixed asset depreciation
2016-03-29 11:54:37 +05:30
Rushabh Mehta
8573aee8b8
bumped to version 6.27.5
2016-03-29 11:19:46 +06:00
Rushabh Mehta
730b66b1dd
Merge pull request #4921 from rohitwaghchaure/new_rfq
...
[enhancement] request for quotation
2016-03-28 18:22:02 +05:30
rohitwaghchaure
a1064a6149
[enhancement] request for quotation
2016-03-28 17:28:45 +05:30
Rushabh Mehta
fe027b34a9
[bot] first bot
2016-03-28 13:21:48 +05:30
Rushabh Mehta
3becd4239f
bumped to version 6.27.4
2016-03-25 12:00:22 +06:00
Anand Doshi
a75fe1a4c3
Revert "[cleanup] PayPal payment UX and moved related methods to hooks of respective apps"
2016-03-23 11:59:24 +05:30
Rushabh Mehta
eec21d041c
Merge pull request #5028 from anandpdoshi/paypal-cleanup
...
[cleanup] PayPal payment UX and moved related methods to hooks of respective apps
2016-03-23 11:50:46 +05:30
Anand Doshi
71b90b7b7d
[cleanup] PayPal payment UX and moved related methods to hooks of respective apps
2016-03-21 17:50:02 +05:30
Rushabh Mehta
09ec13f7cf
bumped to version 6.27.3
2016-03-21 17:55:09 +06:00
Rushabh Mehta
cd04380149
bumped to version 6.27.2
2016-03-21 16:15:21 +06:00
Nabin Hait
6d27470401
bumped to version 6.27.1
2016-03-18 17:06:40 +06:00
Nabin Hait
eba2c4323e
bumped to version 6.27.0
2016-03-17 20:01:45 +06:00
Nabin Hait
d0723f8a96
bumped to version 6.26.0
2016-03-15 17:13:05 +06:00
Anand Doshi
39dda5cf49
bumped to version 6.25.5
2016-03-11 13:00:42 +06:00
Anand Doshi
06b3ecb99b
bumped to version 6.25.4
2016-03-10 16:21:35 +06:00
Anand Doshi
1bca0780a4
bumped to version 6.25.3
2016-03-10 13:18:52 +06:00
Anand Doshi
25e947bef6
bumped to version 6.25.2
2016-03-09 19:34:54 +06:00
Anand Doshi
a2d03c849f
bumped to version 6.25.1
2016-03-09 17:04:03 +06:00
Anand Doshi
1d0c5896c0
bumped to version 6.25.0
2016-03-09 16:17:14 +06:00
Rushabh Mehta
d3c04a3eda
bumped to version 6.24.5
2016-03-03 17:18:45 +06:00
Rushabh Mehta
563f023c11
bumped to version 6.24.4
2016-03-03 14:27:45 +06:00
Rushabh Mehta
369b9cf928
bumped to version 6.24.3
2016-03-03 13:43:21 +06:00
Rushabh Mehta
a8d04b11c3
bumped to version 6.24.2
2016-03-03 13:32:23 +06:00
Rushabh Mehta
14b83cf391
bumped to version 6.24.1
2016-03-03 11:57:42 +06:00
Rushabh Mehta
cf6b786950
bumped to version 6.24.0
2016-03-03 11:35:22 +06:00
Rushabh Mehta
fe6eadfe22
[cleanup] job opening and job applicant
2016-03-02 12:53:19 +05:30
Kanchan Chauhan
1f3d5b7ee9
[fix] added web form fixtures
2016-03-01 11:33:49 +05:30
Rushabh Mehta
ae7dc31d14
Merge pull request #4846 from KanchanChauhan/job-applicant
...
Added feature to allow people to apply for job from website
2016-02-29 17:22:01 +05:30
Rushabh Mehta
6fa497c87a
bumped to version 6.23.7
2016-02-29 15:20:54 +06:00
Anand Doshi
18e988e4ce
bumped to version 6.23.6
2016-02-26 21:28:26 +06:00
Nabin Hait
658b3260c2
bumped to version 6.23.5
2016-02-26 18:04:46 +06:00
Nabin Hait
eb0c08f328
bumped to version 6.23.4
2016-02-26 15:51:02 +06:00
Nabin Hait
cd3b37dcfe
bumped to version 6.23.3
2016-02-25 19:43:31 +06:00
Nabin Hait
6107ccd5ea
bumped to version 6.23.2
2016-02-25 15:48:42 +06:00
Nabin Hait
6c7c1223c3
bumped to version 6.23.1
2016-02-25 12:29:39 +06:00
Nabin Hait
ed08e88de4
bumped to version 6.23.0
2016-02-24 18:49:22 +06:00
Kanchan Chauhan
2e8cc89e34
Added webform for Job Opening
2016-02-19 17:31:13 +05:30
Anand Doshi
8fc643a815
bumped to version 6.22.1
2016-02-19 13:43:01 +06:00
Anand Doshi
1d77452fe0
bumped to version 6.22.0
2016-02-17 13:32:25 +06:00
Anand Doshi
0e553aa6b8
bumped to version 6.21.6
2016-02-15 12:23:57 +06:00
Rushabh Mehta
2e9f10934f
bumped to version 6.21.5
2016-02-12 13:42:48 +06:00
Rushabh Mehta
580933998e
bumped to version 6.21.4
2016-02-11 13:11:22 +06:00
Nabin Hait
1ec626f39b
bumped to version 6.21.3
2016-02-10 16:41:58 +06:00
Rushabh Mehta
477ddf9119
bumped to version 6.21.2
2016-02-10 15:21:18 +06:00
Anand Doshi
bec7e79ee8
bumped to version 6.21.1
2016-02-10 13:49:17 +06:00
Rushabh Mehta
826900822c
bumped to version 6.21.0
2016-02-09 13:15:24 +06:00
Nabin Hait
fba61abd2a
bumped to version 6.20.0
2016-02-03 15:53:56 +06:00
Anand Doshi
6e36a48521
bumped to version 6.19.0
2016-01-27 14:50:19 +06:00
Anand Doshi
04230cb656
bumped to version 6.18.4
2016-01-21 23:02:08 +06:00
Anand Doshi
dd74b5d44f
bumped to version 6.18.3
2016-01-21 21:36:34 +06:00
Nabin Hait
a1ccab81a0
bumped to version 6.18.2
2016-01-21 19:23:36 +06:00
Nabin Hait
3fc4e7c53f
bumped to version 6.18.1
2016-01-21 17:40:14 +06:00
Nabin Hait
c9b7824573
bumped to version 6.18.0
2016-01-21 17:22:22 +06:00
Rushabh Mehta
c85112b093
bumped to version 6.17.0
2016-01-12 12:55:17 +06:00
Anand Doshi
74dfabbe21
bumped to version 6.16.4
2016-01-07 18:57:21 +06:00
Anand Doshi
0eee6bbf7e
bumped to version 6.16.3
2016-01-06 19:26:03 +06:00
Anand Doshi
2076203fc1
bumped to version 6.16.2
2016-01-05 19:39:35 +06:00
Anand Doshi
988a1ab419
bumped to version 6.16.1
2016-01-04 18:28:13 +06:00
Anand Doshi
10be112e85
bumped to version 6.16.0
2016-01-04 17:25:20 +06:00
Nabin Hait
2d0ef63e72
bumped to version 6.15.1
2015-12-31 16:44:17 +06:00
Rushabh Mehta
d55bdcf921
[fix] before_install returns False if setup wizard has been completed, fixes frappe/frappe#1488
2015-12-31 11:12:48 +05:30
Nabin Hait
8efeea9c59
bumped to version 6.15.0
2015-12-28 15:39:43 +06:00
Rushabh Mehta
8681a95010
bumped to version 6.14.1
2015-12-23 16:59:34 +06:00
Anand Doshi
9fdf2a8bfe
bumped to version 6.14.0
2015-12-21 19:04:08 +06:00
Anand Doshi
5605f8f20e
bumped to version 6.13.1
2015-12-16 13:48:40 +06:00
Anand Doshi
a17ddcfe89
bumped to version 6.13.0
2015-12-15 18:03:01 +06:00
Nabin Hait
660f479ec8
bumped to version 6.12.11
2015-12-11 15:36:29 +06:00
Nabin Hait
83f9f93015
bumped to version 6.12.10
2015-12-11 15:05:41 +06:00
Nabin Hait
9cca3494c0
bumped to version 6.12.9
2015-12-10 15:11:02 +06:00
Rushabh Mehta
13ec41abb2
[enhancement] task status will be set to overdue when it crosses expected end date
2015-12-10 12:59:02 +05:30
Nabin Hait
7290c79fdf
bumped to version 6.12.8
2015-12-09 16:02:30 +06:00
Nabin Hait
1b0c797817
bumped to version 6.12.7
2015-12-09 15:29:44 +06:00
Nabin Hait
3931a35e27
bumped to version 6.12.6
2015-12-08 18:36:25 +06:00
Nabin Hait
d56ec92682
bumped to version 6.12.5
2015-12-08 16:10:17 +06:00
Anand Doshi
cc24d28ddc
[fix] address creation for new user
2015-12-08 12:34:13 +05:30
Nabin Hait
6a8ff42a5a
bumped to version 6.12.4
2015-12-07 14:54:59 +06:00
Rushabh Mehta
275b3eec0d
bumped to version 6.12.3
2015-12-03 18:28:57 +06:00
Rushabh Mehta
5dd1aa9f31
bumped to version 6.12.2
2015-12-02 15:24:45 +06:00
Rushabh Mehta
4496cc1e80
bumped to version 6.12.1
2015-12-01 18:48:28 +06:00
Rushabh Mehta
48b1633ff5
bumped to version 6.12.0
2015-12-01 16:54:13 +06:00
Anand Doshi
47e82d1a49
bumped to version 6.11.3
2015-11-27 18:08:46 +06:00
Anand Doshi
711e675987
bumped to version 6.11.2
2015-11-27 17:54:49 +06:00
Anand Doshi
b8591da62c
bumped to version 6.11.1
2015-11-27 15:38:57 +06:00
Anand Doshi
4b12740e8d
[fix] Shipment in portal. Fixes #4291
2015-11-26 18:22:03 +05:30
Anand Doshi
7c016d2ee2
bumped to version 6.11.0
2015-11-26 13:12:06 +06:00
Anand Doshi
c6d91b8fb2
bumped to version 6.10.2
2015-11-20 18:40:04 +06:00
Anand Doshi
56c605f36e
bumped to version 6.10.1
2015-11-20 01:12:15 +06:00
Nabin Hait
19ce11aa9c
bumped to version 6.10.0
2015-11-19 15:04:29 +06:00
Rushabh Mehta
edc8ab03b5
[minor] fixed description
2015-11-18 16:48:19 +05:30
Nabin Hait
d9e57978b8
bumped to version 6.9.2
2015-11-16 18:42:03 +06:00
Nabin Hait
6826ca19b1
bumped to version 6.9.1
2015-11-16 17:37:38 +06:00
Nabin Hait
8e2d76bd63
bumped to version 6.9.0
2015-11-16 17:12:56 +06:00
Rushabh Mehta
834b3e6f83
[fix] added missing address hook for website permissions
2015-11-13 14:38:12 +05:30
Anand Doshi
d4b05fbd51
bumped to version 6.8.4
2015-11-12 21:07:12 +06:00
Anand Doshi
f774f75c63
bumped to version 6.8.3
2015-11-12 21:05:48 +06:00
Anand Doshi
5f6546c8a5
bumped to version 6.8.2
2015-11-12 20:31:53 +06:00
Anand Doshi
87c0e9f03a
bumped to version 6.8.1
2015-11-12 18:12:41 +06:00
Anand Doshi
3fc1c44334
bumped to version 6.8.0
2015-11-12 17:40:48 +06:00
Rushabh Mehta
37b4d75e4a
[re-org] setup wizard in frappe
2015-11-12 11:45:47 +05:30
Anand Doshi
fe85b2ea17
Merge branch 'nabinhait-erpnext_docs' into develop
2015-11-10 18:59:55 +05:30
Anand Doshi
39982a5f02
bumped to version 6.7.8
2015-11-10 12:01:29 +06:00
Nabin Hait
7ba4d02444
[docs] First commit for docs
2015-11-09 14:40:29 +05:30
Anand Doshi
7489d29813
bumped to version 6.7.7
2015-11-09 13:47:49 +06:00
Anand Doshi
64949bfc4b
bumped to version 6.7.6
2015-11-07 16:10:22 +06:00
Rushabh Mehta
0d7213122a
bumped to version 6.7.5
2015-11-06 17:24:17 +06:00
Rushabh Mehta
1a8d4b6ea7
bumped to version 6.7.4
2015-11-06 12:15:09 +06:00
Rushabh Mehta
169089bdde
bumped to version 6.7.3
2015-11-06 11:19:53 +06:00
Rushabh Mehta
0d58501229
bumped to version 6.7.2
2015-11-06 11:11:06 +06:00
Rushabh Mehta
afd3209017
bumped to version 6.7.1
2015-11-05 11:21:31 +06:00
Rushabh Mehta
6a7edd32aa
bumped to version 6.7.0
2015-11-04 18:48:07 +06:00
Rushabh Mehta
7d23e4286e
[minor] move item to top in stock module page
2015-11-03 16:25:09 +05:30
Nabin Hait
02a56b4e1a
bumped to version 6.6.7
2015-10-29 17:05:06 +06:00
Nabin Hait
4757d0634a
bumped to version 6.6.6
2015-10-28 16:37:13 +06:00
Nabin Hait
99f4b43641
bumped to version 6.6.5
2015-10-27 11:59:35 +06:00
Anand Doshi
1c501b6aac
bumped to version 6.6.4
2015-10-22 22:32:59 +06:00
Anand Doshi
0fbf10797c
bumped to version 6.6.3
2015-10-22 22:29:21 +06:00
Anand Doshi
b64b461d53
bumped to version 6.6.2
2015-10-22 20:06:09 +06:00
Anand Doshi
0af146cea6
bumped to version 6.6.1
2015-10-22 19:23:19 +06:00
Anand Doshi
f9f0e2591f
bumped to version 6.6.0
2015-10-22 17:42:00 +06:00
Anand Doshi
2678135f5e
bumped to version 6.5.3
2015-10-20 19:05:49 +06:00
Anand Doshi
3c3d69f905
bumped to version 6.5.2
2015-10-20 18:23:37 +06:00
