Nabin Hait
c642f76a4d
Fixed merge conflict
2017-02-27 14:40:53 +05:30
Rushabh Mehta
05ce7ec7bb
[enhance] desktop messages
2017-02-22 16:15:43 +05:30
Nabin Hait
391eca18c7
Fixed merge conflict
2017-02-20 19:38:22 +05:30
mbauskar
e1e25a0c9d
[minor] auto close opportunity after 7 days
2017-02-17 14:54:50 +05:30
pratu16x7
dee36e10ae
Add operations and items to website
2017-02-14 17:18:09 +05:30
pratu16x7
aad8257e20
Add template
2017-02-14 17:18:09 +05:30
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
