262 Commits

Author	SHA1	Message	Date
Francisco Roldán	85bfc05efa	Fix missing translations (#8871) ... * Fix missing translations * Fix	2017-05-17 19:42:04 +05:30
Saurabh	62c7deee00	[fix] don't allow string values in limits to avoid sql injection (#8779)	2017-05-11 18:03:12 +05:30
Kanchan Chauhan	0633df5872	Item variant searchable in website products	2017-04-19 20:51:43 +05:30
Rushabh Mehta	66272a168d	[minor] README.md + encode query parameter in search	2017-04-12 14:32:07 +05:30
Rushabh Mehta	9365641777	[added] frappe.safe_eval	2017-04-06 18:24:34 +05:30
Robert Kirschner	b8f5148a44	[minor] fix: translatable title, h1, button on product_search page. Address row in web view has translatable address type	2017-03-23 13:43:26 +01:00
Robert Kirschner	d162eb367c	[minor] fix translation strings in cart web view	2017-03-23 12:18:24 +01:00
pratu16x7	60fe77cc90	Website data from existing child tables, layout, images	2017-02-14 17:18:09 +05:30
Rushabh Mehta	4500f7b4d6	[cleanup] remove unused LMS (#7612)	2017-01-30 17:04:38 +05:30
rohitwaghchaure	ab65f6d8b1	Merge pull request #7547 from mnatalia/develop ... Added translations to the web page and item dashboard.	2017-01-23 15:57:33 +05:30
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
Rushabh Mehta	d40e661ebd	[style] better demo start page	2017-01-10 14:46:54 +05:30
Kanchan Chauhan	b7cc393eb8	Email ID renamed to Email Address	2017-01-03 16:45:38 +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
Rushabh Mehta	257bbbe588	[refactor] has_website_permission parameters	2016-10-12 10:53:34 +05:30
Rohit Waghchaure	a26f685b9f	[Enhancement] Added supplier quotation link on rfq	2016-10-05 15:04:50 +05:30
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
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
Rushabh Mehta	ec2d09c557	[minor] setting up website optional in setup wizard	2016-08-09 16:44:37 +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
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	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	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	239b351367	New look to the website	2016-05-02 11:43:44 +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
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
Kanchan Chauhan	017d30f465	[Minor Fixes] Findings in setting up erpnext	2016-04-06 19:28:50 +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
rohitwaghchaure	a1064a6149	[enhancement] request for quotation	2016-03-28 17:28:45 +05:30
Rushabh Mehta	c20c536f28	[fix] [wip] cleanup for collaborative pm	2016-03-25 17:22:17 +05:30
Kanchan Chauhan	53ce94f9bd	Minor fixes	2016-03-25 12:04:54 +05:30
Rushabh Mehta	b2269dd326	[fix] back links from project web view	2016-03-23 18:29:00 +05:30
Kanchan Chauhan	e14389ec6e	Added task and issue webforms and few fixes	2016-03-23 14:14:38 +05:30
Anand Doshi	1947b1784e	[minor] removed typo in order.html	2016-03-23 12:12:41 +05:30
Kanchan Chauhan	2ad801cfd8	Minor Updates	2016-03-22 16:00:41 +05:30
Kanchan Chauhan	b3fe6a45a7	WIP Collaborative Project Management first commit	2016-03-16 18:34:33 +05:30
Rushabh Mehta	3574b37ff3	[enhancement] sort links on basis of link_count (idx)	2016-03-11 14:33:04 +05:30
Saurabh	f54be2c7f0	[fixes] test case fixes for multi-currency check	2016-02-24 15:07:25 +05:30
Saurabh	da9e9cdb13	[fixes] minor get_payment_gateway_account	2016-02-24 15:07:24 +05:30
Saurabh	883cc04701	[fixes] compare attributes in lower case	2016-02-24 15:07:24 +05:30
Anand Doshi	0bcd9efa88	[fix] value returned by frappe._ will always be unicode	2016-01-18 12:30:31 +05:30
Saurabh	df2783dbb0	[enhance] i. facility to send PR email; ii. update cart, item view and order view;	2016-01-12 14:09:52 +05:30
Saurabh	0a0c78729f	[enhace] display payment status on order	2016-01-12 14:09:51 +05:30
Saurabh	276d3e60bd	[enhance] pay via cart	2016-01-12 14:09:51 +05:30
Rushabh Mehta	51008f2abc	[cleanup] [website]	2016-01-01 17:24:37 +05:30
Anand Doshi	dfdededcf0	[fix] product search limit = 12 instead of 10, since we show it in a grid of 12	2015-12-16 12:57:02 +05:30
Anand Doshi	4b12740e8d	[fix] Shipment in portal. Fixes #4291	2015-11-26 18:22:03 +05:30
Nabin Hait	7ba4d02444	[docs] First commit for docs	2015-11-09 14:40:29 +05:30
Anand Doshi	21e09a2bd8	[enhancement] Ability to disable an Item	2015-10-29 12:39:47 +05:30
Anand Doshi	6d69ca6bac	[fix] don't show expired items in website item list. Fixes #4210.	2015-10-29 11:35:16 +05:30
Saurabh	9f235b891f	[fix] order.html rate display	2015-10-14 18:03:07 +05:30
Rushabh Mehta	6e322d0a02	[enhancement] use thumbnails in grid views, patch to make thumbnails	2015-10-14 16:21:24 +05:30
Rushabh Mehta	80d2a55342	[enhancement] add variants in website	2015-10-14 16:16:00 +05:30
Anand Doshi	199d8a44fc	[fix] check doc.has_website_permission in order.html	2015-09-28 19:04:42 +05:30
Anand Doshi	06ad308ca1	[fixes] setup wizard and other fixes related to cart	2015-09-23 12:50:35 +05:30
Rushabh Mehta	8ffd483e24	[wip] shopping cart shipping rule, price list cleanup	2015-09-23 12:49:16 +05:30
Rushabh Mehta	3d76686b82	[shopping-cart] cart via Jinja WIP	2015-09-23 12:49:16 +05:30
Rushabh Mehta	156ce607e2	[cleanup] [wip] portal, shopping cart cleanup	2015-09-23 12:49:16 +05:30
Rushabh Mehta	69095e7285	[fix] website search	2015-08-07 15:48:53 +05:30
Anand Doshi	e6f7ac961f	[fix] Add to Cart visibility, Customer's Price List in Shopping Cart and Address creation from Shopping Cart	2015-07-13 16:24:37 +05:30
Rushabh Mehta	fc3d87181a	[fix] cart and general leger report	2015-07-10 10:11:07 +05:30
Rushabh Mehta	aded46d33e	[fix] product search in new block header_actions	2015-06-01 17:23:42 +05:30
Rushabh Mehta	a33d468d30	[fixes] portal, issues, addresses etc	2015-06-01 17:15:42 +05:30
Anand Doshi	8be3ba36d9	fixed relative urls in some web pages	2015-04-24 13:22:08 -04:00
Rushabh Mehta	f5f0d5a83a	[breadcrumbs] refactor	2015-03-09 15:48:16 +05:30
Anand Doshi	885e074697	Changed company name from Web Notes to Frappe Technologies	2015-03-03 14:56:43 +05:30
Anand Doshi	d35354cc06	Merge remote-tracking branch 'frappe/develop' into v5.0 ... Conflicts: erpnext/__version__.py erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py erpnext/accounts/doctype/chart_of_accounts/charts/account_properties.py erpnext/hooks.py erpnext/patches.txt erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py erpnext/stock/get_item_details.py erpnext/translations/ar.csv erpnext/translations/bs.csv erpnext/translations/ca.csv erpnext/translations/el.csv erpnext/translations/es.csv erpnext/translations/fr.csv erpnext/translations/hr.csv erpnext/translations/id.csv erpnext/translations/is.csv erpnext/translations/ja.csv erpnext/translations/nl.csv erpnext/translations/pl.csv erpnext/translations/pt-BR.csv erpnext/translations/ru.csv erpnext/translations/tr.csv erpnext/translations/zh-cn.csv erpnext/translations/zh-tw.csv setup.py	2015-02-24 18:12:17 +05:30
Anand Doshi	f9fc04ce8e	Website Listing	2015-02-23 22:34:27 +05:30
Anand Doshi	6dfd430a2f	Moved flags like ignore_mandatory, ignore_validate etc to doc.flags	2015-02-10 14:41:27 +05:30
Anand Doshi	b942cb86ae	[minor] auto-create Fiscal Year, loading, general ledger	2015-01-19 15:59:45 +05:30
Rushabh Mehta	bd9b62ff28	[rename] Support Ticket -> Issue	2014-11-28 11:46:10 +05:30
Neil Trini Lasrado	d718c93726	shopping cart fix	2014-10-27 11:03:09 +05:30
Rushabh Mehta	3daa49ac1f	[shopping-cart] i'm back	2014-10-21 16:16:30 +05:30
Anand Doshi	4211aa41a0	[hotfix] Product Search 'More' button	2014-09-04 15:16:13 +05:30
Anand Doshi	e0ffe7a575	[hotfix] Product Search	2014-08-25 18:38:08 +05:30
Rushabh Mehta	ebd30beee4	[route] redesigned	2014-08-20 11:44:30 +05:30
Anand Doshi	11ada53ed5	Fixes related to Website Route system and other misc fixes	2014-06-28 12:13:11 +05:30
Rushabh Mehta	151125e537	fixed for travis	2014-06-18 17:33:01 +05:30
Rushabh Mehta	3f51705ba4	website cleanups	2014-04-21 22:10:43 +05:30
Anand Doshi	5d591ebe83	Item, Item Group and Partner Web Page generators moved from Shopping Cart to ERPNext	2014-04-18 16:20:07 +05:30
Anand Doshi	9a4a13cb73	Moved Portal and Shopping Cart to Shopping Cart app, and some minor fixes	2013-12-31 17:38:21 +05:30
Rushabh Mehta	df200f305b	Redesigned templates. Now all templates must be inside templates/pages templates/generators	2013-12-25 15:19:22 +05:30