Rushabh Mehta
397e508fc0
[fix] sales_partner.js, fixes #7553
2017-01-21 16:58:57 +05:30
mnatalia
e09407571c
Added translations to the web page and item dashboard.
2017-01-20 12:00:25 +02:00
Felipe Orellana
ac81440a81
[FIX] Contact form breaks on existing lead
...
When an email address from the contacts form is from a existing lead utils.py tries to set new_lead(an undefined var) as the lead reference if a lead is found.
2017-01-12 12:08:20 -05:00
Rushabh Mehta
d40e661ebd
[style] better demo start page
2017-01-10 14:46:54 +05:30
Nabin Hait
d08c248642
Merge pull request #7354 from Scheercuzy/enlarge-item-image-website
...
Hyperlink on item image on website
2017-01-04 15:58:44 +05:30
Kanchan Chauhan
b7cc393eb8
Email ID renamed to Email Address
2017-01-03 16:45:38 +05:30
Scheercuzy
7c161cfff2
Merge remote-tracking branch 'frappe/develop' into enlarge-item-image-website
2017-01-03 16:03:43 +06:30
KanchanChauhan
4601fdd98d
Better Salary Slip logs in Process Payroll ( #7322 )
2016-12-30 16:26:55 +05:30
Scheercuzy
f483582957
Hyperlink Item Image
...
added hyperlink on item image
2016-12-29 18:56:44 +06:30
Rushabh Mehta
5cb1b6bf3f
[minor] translation fix
2016-12-27 16:30:20 +05:30
Rushabh Mehta
827588adf2
[minor] fixes to job opening
2016-12-19 17:06:26 +05:30
Rushabh Mehta
99c814b360
[fix] paging for products (support)
2016-12-19 11:55:10 +05:30
Rushabh Mehta
86f8ab95f6
[minor] font-awesome fixes
2016-12-05 15:02:24 +05:30
Rushabh Mehta
323c06ebbf
[minor] rename icons as per FontAwesome 4 ( #7136 )
2016-12-05 14:17:26 +05:30
Kanchan Chauhan
2c1f399479
Apply Pricing Rule in Shopping Cart
2016-11-22 22:23:31 +05:30
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
Rushabh Mehta
a2c4dad90e
[fix] product search
2016-06-27 14:55:01 +05:30
Anand Doshi
771ab0c8c3
[fix] [patch] re-route
2016-06-27 12:04:48 +05:30
Rushabh Mehta
a334062b03
[redesign] website routing system
2016-06-24 16:18:07 +05:30
Saurabh
ed0816832d
[enhance] ux fixes for payment request, added jinja for payment request message
2016-05-25 11:55:30 +05:30
Rushabh Mehta
ac123c57f3
[cleanup] website / portal css
2016-05-20 16:37:14 +05:30
Rushabh Mehta
532eedf411
[enhance] more editable grids
2016-05-19 18:22:49 +05:30
Rushabh Mehta
35047ac283
[ux] direct editing in material request
2016-05-18 18:17:38 +05:30
Rushabh Mehta
6471e178f6
Merge pull request #5321 from rohitwaghchaure/rfq_fixes
...
[Fixes] RFQ minor fixes
2016-05-16 11:57:35 +05:30
Rushabh Mehta
4b9238a03b
[cleanup] homepage
2016-05-12 15:23:17 +05:30
Rohit Waghchaure
29c7876e87
[Fixes] RFQ minor fixes
2016-05-11 19:38:29 +05:30
Kanchan Chauhan
1d79f350bc
Shopping Cart error messages issue resolved
2016-05-10 17:19:47 +05:30
Kanchan Chauhan
b3573a881e
Shopping cart dropdown changes
2016-05-09 12:30:58 +05:30
Rushabh Mehta
c711b82889
Merge pull request #5296 from KanchanChauhan/websitemakeover
...
New look to the website
2016-05-02 15:54:41 +05:30
Kanchan Chauhan
239b351367
New look to the website
2016-05-02 11:43:44 +05:30
Rushabh Mehta
be2ee18de4
[fixed] frappe.require is now async 💥
2016-04-29 17:22:42 +05:30
Anand Doshi
a6f48688bc
[enhancement] website: optionally show products as list
2016-04-22 19:10:49 +05:30
Anand Doshi
e3bd78e912
[css] portal
2016-04-22 18:53:21 +05:30
Kanchan Chauhan
e0818f8f46
Website Changes
2016-04-22 17:47:16 +05:30
Rushabh Mehta
c291ab64a6
Merge pull request #5197 from KanchanChauhan/UXChanges_ERPNext
...
[WIP] No not merge
2016-04-21 11:39:45 +05:30
Rushabh Mehta
f2c3cb85a9
Merge pull request #5164 from KanchanChauhan/project-permissions
...
Collaborate PM permission fixes and daily tme log fix
2016-04-21 11:37:31 +05:30
Kanchan Chauhan
11638ba358
Changes 3
2016-04-20 16:24:25 +05:30
Kanchan Chauhan
704f248952
Changes 2
2016-04-20 16:24:24 +05:30
Kanchan Chauhan
2dbf5294a9
[WIP] No not merge
2016-04-20 16:24:24 +05:30
Rohit Waghchaure
ae270d6648
[Fixes] Supplier can view their addresses, default buying price list issue
2016-04-11 13:58:33 +05:30
Kanchan Chauhan
a4ff5d3195
Collaborate PM permission fixes and daily tme log fix
2016-04-08 23:22:04 +05:30
Anand Doshi
e6e7cd90c9
Merge pull request #5143 from KanchanChauhan/somefixes
...
[Minor Fixes] Findings in setting up erpnext
2016-04-08 16:20:11 +05:30
Kanchan Chauhan
017d30f465
[Minor Fixes] Findings in setting up erpnext
2016-04-06 19:28:50 +05:30
Rushabh Mehta
78b7a53635
[cleanup] set default bold, print_hide for prints
2016-04-06 15:29:45 +05:30
rohitwaghchaure
62fea0374b
[Enhancement] Added currency symbol on RFQ form of supplier portal, currency validation for party
2016-03-31 21:49:07 +05:30
Rushabh Mehta
cb144bfcd4
[cleanup] projects
2016-03-31 14:27:35 +05:30
Rushabh Mehta
2d985e1973
[fix] edit-profile in frappe;
2016-03-30 17:15:33 +05:30
Rushabh Mehta
df7e523c3f
[fix] web forms for collaborative pm
2016-03-30 11:00:42 +05:30
Rushabh Mehta
8b43fd7f02
Merge pull request #5084 from KanchanChauhan/PM-UI-Edits
...
UI Changes
2016-03-29 18:45:58 +05:30
Kanchan Chauhan
b566d42d37
UI Changes
2016-03-29 18:21:59 +05:30
Rushabh Mehta
7a1b5da830
[cleanup] request for quotation cleanup
2016-03-29 16:04:43 +05:30
