Nabin Hait
|
46753de6d7
|
fixed merge conflict
|
2016-11-17 15:55:11 +05:30 |
|
Kanchan Chauhan
|
98f499a43e
|
[Fix]Product thumbnail in Shopping Cart
|
2016-11-16 15:17:55 +05:30 |
|
Rushabh Mehta
|
4bfa0748cd
|
[merge] master
|
2016-11-16 11:28:23 +05:30 |
|
Rushabh Mehta
|
d51e1587d5
|
[fix] contact us page should create a opportunity by default (#6939)
|
2016-11-16 11:13:31 +05:30 |
|
Rushabh Mehta
|
440650d4a2
|
[fix] view shopping cart dropdown (#6928)
|
2016-11-14 13:13:53 +05:30 |
|
Rushabh Mehta
|
e855f53f08
|
[minor] fix ellipsis style
|
2016-11-02 07:34:17 +05:30 |
|
Nabin Hait
|
0702fa2fc6
|
Fixed version conflict
|
2016-10-19 16:49:36 +05:30 |
|
Faris Ansari
|
2acbb11923
|
[fix] print format image size
|
2016-10-19 12:08:00 +05:30 |
|
Rushabh Mehta
|
257bbbe588
|
[refactor] has_website_permission parameters
|
2016-10-12 10:53:34 +05:30 |
|
Rushabh Mehta
|
ac5b193100
|
[minor] direct student admission to the list page
|
2016-10-09 15:19:23 +05:30 |
|
Nabin Hait
|
558f526a68
|
Fixed version conflict
|
2016-10-05 17:18:36 +05:30 |
|
Nabin Hait
|
7c0fe7d9d3
|
Merge pull request #6534 from rohitwaghchaure/rfq_added_links_of_quotations
[Enhancement] Added supplier quotation link on rfq
|
2016-10-05 15:44:51 +05:30 |
|
Rohit Waghchaure
|
a26f685b9f
|
[Enhancement] Added supplier quotation link on rfq
|
2016-10-05 15:04:50 +05:30 |
|
Nabin Hait
|
7229b64128
|
Merge pull request #6516 from bcornwellmott/patch-6
Update request_for_quotation.html
|
2016-10-05 13:12:09 +05:30 |
|
Rushabh Mehta
|
3af3d7abe3
|
[fixes] admission-applicant link and student applicant fixes
|
2016-10-04 12:20:47 +05:30 |
|
Rushabh Mehta
|
aedad64445
|
[minor] fixes
|
2016-10-04 11:41:42 +05:30 |
|
Nabin Hait
|
7fb79d175f
|
Fixed version conflict
|
2016-10-03 18:05:34 +05:30 |
|
Faris Ansari
|
69ca382529
|
[fix] image size fix in print format
|
2016-10-03 17:15:42 +05:30 |
|
Neil Trini Lasrado
|
93d314c573
|
Merged introduction and eligibility into a single text field in Student Admission. (#6529)
|
2016-10-03 15:50:47 +05:30 |
|
bcornwellmott
|
47863a3049
|
Update request_for_quotation.html
Fixing spelling mistakes
|
2016-09-30 15:45:20 -07:00 |
|
Rushabh Mehta
|
2d4f3bb04a
|
[fix] space
|
2016-09-22 15:17:04 +05:30 |
|
Rohit Waghchaure
|
21499e820d
|
[Enhancement] Supplier quotation added on supplier portal
|
2016-09-21 17:07:25 +05:30 |
|
Nabin Hait
|
0be6073f10
|
Fixed version conflict
|
2016-09-21 13:06:19 +05:30 |
|
Nabin Hait
|
429a38f90b
|
Merge pull request #6415 from rmehta/hotfix
[minor] bring back old grid style in material request
|
2016-09-20 18:05:32 +05:30 |
|
Rushabh Mehta
|
57a1905576
|
[minor] bring back old grid style in material request
|
2016-09-20 17:22:54 +05:30 |
|
Neil Trini Lasrado
|
bb5eb7d6f4
|
Added title to Student Admission (#6379)
|
2016-09-15 16:44:25 +05:30 |
|
Neil Trini Lasrado
|
7e1b516103
|
fixes for student admission (#6377)
* fixes for student admission
* Added Application Route to Student Admission
|
2016-09-15 15:36:14 +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
|
d5ebd79ad7
|
Fixed version conflict
|
2016-09-14 15:50:22 +05:30 |
|
Rushabh Mehta
|
b6bca567ce
|
[fixes] [style] for web-form
|
2016-09-13 14:40:13 +05:30 |
|
Nabin Hait
|
9c82dd9157
|
Merge pull request #6332 from rmehta/item-group-paging
[fix] paging for item group
|
2016-09-12 13:01:54 +05:30 |
|
Rushabh Mehta
|
3aa315040f
|
[fix] paging for item group
|
2016-09-11 16:48:24 +05:30 |
|
Rohit Waghchaure
|
b34ba6bd6e
|
[RFQ] Web form alignment issue
|
2016-09-01 19:10:58 +05:30 |
|
Rushabh Mehta
|
9d1b56f423
|
[minor] validate permission in Process Payroll and all products fix for home page
|
2016-08-29 11:03:10 +05:30 |
|
Revant Nandgaonkar
|
5bbc68df8b
|
[fix] Issue #6046 group_name replaced with name
|
2016-08-10 11:06:31 +05:30 |
|
Rushabh Mehta
|
ec2d09c557
|
[minor] setting up website optional in setup wizard
|
2016-08-09 16:44:37 +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 |
|
Rushabh Mehta
|
ea5ad84c5e
|
[minor] fix image for demo
|
2016-08-02 21:26:04 +05:30 |
|
Neil Trini Lasrado
|
3f0a581b85
|
Merge ERPNext Schools into ERPNext
|
2016-07-20 19:25:02 +05:30 |
|
Anand Doshi
|
d9b3c5ca60
|
[fix] use base.html's title block in home.html
|
2016-07-13 11:29:50 +05:30 |
|
Kanchan Chauhan
|
6d76359c31
|
[WIP] Task statuses updated in website
|
2016-07-07 12:19:01 +05:30 |
|
Rohit Waghchaure
|
f154c611bb
|
[Fixes] RFQ contact and multiple creation of supplier quotation issue
|
2016-07-06 17:26:15 +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 |
|
Rushabh Mehta
|
5f5f0bec2c
|
[fix] buttons for rfq and material request
|
2016-07-04 11:39:25 +05:30 |
|
Rushabh Mehta
|
dc8067eb33
|
[demo] new cleaner, more-flexible demo
|
2016-07-04 11:39:25 +05:30 |
|
Rushabh Mehta
|
878dfec46a
|
[minor]
|
2016-07-04 11:39:25 +05:30 |
|
Kanchan Chauhan
|
a756e3f765
|
Reverted changes
|
2016-06-28 15:02:35 +05:30 |
|
Kanchan Chauhan
|
c8d47da6bc
|
Shopping cart and dropdown cart update
|
2016-06-28 11:29:43 +05:30 |
|
Rohit Waghchaure
|
d6c986da8f
|
[Enhancement] Time log wages and multiple active salary structure
|
2016-06-27 16:46:39 +05:30 |
|