Commit Graph

206 Commits

Author SHA1 Message Date
Jannat Patel
5173e74a04
fix: Project Portal Enhancements (#26290)
* fix: project portal enhancements

* fix: condition for pills
2021-07-02 11:48:46 +05:30
Nabin Hait
10c61376e3
fix: Backport missing commits to develop branch (#25305) 2021-04-13 15:46:01 +05:30
Anupam
d7f4aefd00 feat: added continue-shopping button on cart 2021-02-05 16:17:20 +05:30
Anupam
e6f925e5e6 review changes 2021-01-28 15:58:03 +05:30
prssanna
74feaf85dc fix: website order page style 2021-01-27 17:41:15 +05:30
Anupam
8541d9738f fix: review changes 2021-01-25 14:18:26 +05:30
Anupam
988ea8d61d feat: shopping portal changes 2021-01-22 10:53:50 +05:30
prssanna
b00eb1b0cc feat: shopping cart page 2021-01-20 17:52:54 +05:30
Shivam Mishra
bed717b442 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-11-12 11:32:59 +05:30
Anupam Kumar
3a9dc90695
fix: fix: replaced formatdate -> format_date (#23829) 2020-11-05 18:51:56 +05:30
Shivam Mishra
55f52e8135 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-10-13 20:09:22 +05:30
Anupam
a4df105813 fix: UI fixes 2020-09-24 13:21:54 +05:30
Anupam
c077fac2a6 feat: provision to draft quotation from portal 2020-09-23 22:02:31 +05:30
Suraj Shetty
b6ebcd7559 refactor: Replace darkgray indicator with gray indicator 2020-08-27 18:57:18 +05:30
prssanna
744169833c fix: replace indicator color darkgrey with darkgray 2020-08-27 17:06:10 +05:30
Vishal Dhayagude
24e79b14e1
fix(shopping cart): UX Improvements (#21034)
* fix: nontype error for resolved and moved place order button at bottom left

* fix: removed inline style

* fix: Request for quotation move to lower right

* fix: move buttons

Co-authored-by: Naren <patilnarendra3@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2020-04-07 12:18:47 +05:30
Suraj Shetty
48e9bc3fc9 fix: Incorrect translation syntax 2020-01-29 15:06:18 +05:30
thefalconx33
894c210027 fix: enable address without checkout feature
* fix add address form country link field
2019-12-11 17:43:04 +05:30
Faris Ansari
38ac7f7350 Enhancements to Supplier Portal (#19221)
* fix: Add Purchase Order to portal

* fix: Create Customer or Supplier on first login

Based on default role set in Portal Settings, a Customer or Supplier
will be created when the user logs in for the first time.

* fix: Styling for transaction_row

* fix: Styling for RFQ page

* fix: Add Purchase Invoice route

- Make Purchase Invoice from PO

* fix: minor

- Admissions for Student role
- Remove print statement
2019-10-09 11:41:33 +05:30
Suraj Shetty
83705af0b3 fix: Filters for portal quotation list (#18689)
* fix: Filters for portal quotation list

* fix: Remove unwanted import
2019-08-12 11:51:27 +05:30
Faris Ansari
82770d9152 fix: Project fixes (#18343)
* fix: Add fetch from in Full Name

* fix: Remove deprecated buttons

* fix: Show Project to Administrator
2019-07-16 09:40:09 +05:30
Faris Ansari
22642a5f45
fix: Homepage products styling (#17912) 2019-06-14 18:15:40 +05:30
John Clarke
8cb92e066d
Update demo.html
fix typo nit in page
2019-06-05 10:49:47 -06:00
Rushabh Mehta
2df16b1f9b fix(style): demo home page 2019-05-04 11:09:19 +05:30
scmmishra
a55d32236a fix: fixed trial details 2019-04-19 12:22:30 +05:30
Himanshu
20c17b8229 fix(Update GSTIN): remove '.__' from template (#17062)
'.__' Avoid Server Side Template Injection
2019-03-30 12:11:01 +05:30
Faris Ansari
d77fe38513 fix: Remove no_sitemap property 2019-03-20 14:11:05 +05:30
Faris Ansari
5f8b358fd4
Website: Product Configurator and Bootstrap 4 (#15965)
- Refactored Homepage with customisable Hero Section
- New Homepage Section to add content on Homepage as cards or using Custom HTML
- Products page at "/all-products" with customisable filters
- Item Configure dialog to find an Item Variant filtered by attribute values
- Contact Us dialog on Item page
- Customisable Item page content using the Website Content field
2019-03-19 11:48:32 +05:30
Rushabh Mehta
b94c8b1c77 fix(tests): add test for bulk complete / cancellation of project 2019-02-26 14:30:38 +05:30
Aditya Hase
691c166a56 fix(py3): Use six.text_type instead of unicode 2019-02-07 20:35:52 +05:30
Sagar Vora
da1dc7fa52 Merge branch 'master' into develop 2019-02-05 18:40:39 +05:30
Saurabh
bbebceb31a fix: access request parameter directly 2019-02-04 15:56:23 +05:30
Sagar Vora
7a1c40c7c1 Merge branch 'master' into develop 2019-01-30 20:09:45 +05:30
Aditya Hase
245b73b94f fix(search): Fix possible reflected XSS attack vector (#16522) 2019-01-30 19:56:04 +05:30
Sagar Vora
f97c5dad82 Merge branch 'staging' into develop 2019-01-29 18:39:14 +05:30
Nabin Hait
e8190473f5
Merge branch 'staging-fixes' into unicode 2019-01-29 11:13:04 +05:30
Faris Ansari
853d3fd1ab fix: Don't use .format in jinja templates
- Jinja doesn't allow unicode strings to be formatted in templates
2019-01-23 16:34:22 +05:30
Aditya Hase
f3c22f342c fix(unicode): Import unicode_literals in every file 2019-01-22 18:36:10 +05:30
Frappe Bot
1b7c583c48 Merge branch 'staging' into develop 2018-12-21 05:46:23 +00:00
Faris Ansari
907e9080c4 fix(product-search): Include variants in product search 2018-12-12 19:26:52 +05:30
Doridel Cahanap
2b14d6a058 Contract Manufacturing : Customer Provided Items (#15828)
* Material Request from Production Plan for Customer provided parts

* Test cases

* Customer web portal for their material requests
2018-11-13 12:07:16 +05:30
Ameya Shenoy
4fdbff7456
Merge pull request #15547 from Zlash65/demo-refactor
Demo data refactor
2018-10-16 17:34:09 +05:30
JodeQ
10dfd4a48f Show project attachments in portal view 2018-10-15 14:28:27 +02:00
Zlash65
d1fbaf8f32 custom field added for item - domainification, password changed 2018-10-10 14:28:17 +05:30
Shreya Shah
7d115183e4 Improvise and fix indicators in Portal list (#15552) 2018-10-02 12:46:26 +05:30
Charles-Henri Decultot
3b11debcd2 Gocardless correction (#15554) 2018-10-02 12:46:15 +05:30
Rushabh Mehta
8705371ef0 fix(product-listing): fix variant selection in website 2018-08-16 09:22:45 +05:30
Rushabh Mehta
708e47aadf optimize(various) 2018-08-08 16:37:31 +05:30
Prateeksha Singh
0c796229dc
prevent jinja exec in search title 2018-08-06 12:33:34 +05:30
Zarrar
7f8024c516 [Enhancement] Tax Withholding Category (#15064)
* add single, cumulative threshold, remove checkboxes

* remove tds child table from supplier & add tds link field

* add description field in tax withholding category

* add tax withholding data for indian setup, some fixes

* add a checkbox for tax withholding in purchase invoice

* remove supplier's child table for tds

* enable tds field if supplier has tds set inits master

* move rates data to child table - adding fiscal year support

* change bootstrap data according to child table config of tds

* show category name in list view

* loyalty program fixes

* moved tax calculation to tax_withholding.py
- calculation for tds amount for cumulative threshold from gl entry

* add fiscal year dependency in company test

* minor loyalty program fix

* minor tier calculation fix

* minor handling duplicate exception

* toggle apply_tds according to supplier, code rectify

* minor fixes for loyalty program

* test case for single and cumulative threshold

* codacy fix
2018-08-01 17:45:05 +05:30