Nabin Hait
34c551d9a5
fix: Missing commits from hotfix branch ( #17997 )
...
* fix: merge conflict
* fix: restored missing set_gst_state_and_state_number function
* fix: style linting as per codacy
* fix: Fixes related to customer/lead merging
* fix: merge conflict
* fix: Fixes related to customer/lead merging
* fix: Assign isue/opportunity to user
* fix: Assign isue/opportunity to user
* fix: Replaced Invoice type by GST Category
* fix: merge conflict
* fix: merge conflict
* fix: test cases
* fix: test cases
2019-07-03 10:34:31 +05:30
Suraj Shetty
93fc6004ad
Merge pull request #17942 from netchampfaris/product-page-cart-disabled
...
fix: Show product page even if cart is not enabled
2019-06-17 12:36:09 +05:30
Suraj Shetty
f821b18a82
Merge pull request #17951 from netchampfaris/product-page-specification
...
fix: Remove Specifications label
2019-06-17 12:32:58 +05:30
Faris Ansari
22642a5f45
fix: Homepage products styling ( #17912 )
2019-06-14 18:15:40 +05:30
Faris Ansari
f472a49cf6
fix: Remove Specifications label
2019-06-14 16:32:21 +05:30
Faris Ansari
00578ba632
fix: Show product page even if cart is not enabled
2019-06-13 13:30:39 +05:30
John Clarke
8cb92e066d
Update demo.html
...
fix typo nit in page
2019-06-05 10:49:47 -06:00
Faris Ansari
b8eaa3d377
fix: Issue list portal styling
2019-06-01 20:56:37 +05:30
Rushabh Mehta
2df16b1f9b
fix(style): demo home page
2019-05-04 11:09:19 +05:30
Faris Ansari
358329d7df
fix: Hide button and cart after success
2019-05-01 14:56:50 +05:30
Faris Ansari
5f1eebec16
fix(cart): Don't use window.open as it can be blocked
...
window.open calls are interpreted as popups by some browsers and are
blocked.
Also, route to Quotation web view instead of printview.
2019-05-01 14:32:15 +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
Sagar Vora
f3cfad7595
Merge branch 'master' into staging-fixes
2019-01-29 17:20:46 +05:30
Nabin Hait
e8190473f5
Merge branch 'staging-fixes' into unicode
2019-01-29 11:13:04 +05:30
Aditya Hase
9acb885e60
fix(sqli): Avoid SQL Injection with sender param ( #16509 )
2019-01-29 10:52:37 +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
Frappe Bot
e415cce1a9
Merge branch 'staging' into develop
2019-01-23 08:19:00 +00:00
Aditya Hase
f79937d64b
style: Remove unused imports
2019-01-23 00:28:37 +05:30
Aditya Hase
f3c22f342c
fix(unicode): Import unicode_literals in every file
2019-01-22 18:36:10 +05:30
Sagar Vora
4d1a9b10ed
Merge branch 'staging' into develop
2019-01-22 15:56:39 +05:30
Rohit Waghchaure
425dff93d7
fix: Project update status code and design refactored
2019-01-17 19:21:44 +05:30
Frappe Bot
9e09b3adbe
Merge branch 'staging' into develop
2018-12-26 12:16:20 +00:00
Nabin Hait
5a9579bae4
feat(quality): Check quality status before receipt/delivery ( #16169 )
2018-12-24 14:54:42 +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
Ameya Shenoy
fe1f532bc0
Merge branch 'staging' into develop
2018-11-28 08:28:37 +00:00
deepeshgarg007
a9525de0da
paid amount fix in fees
2018-11-26 20:34:32 +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
Shreya
8aca56836b
fix(margin): Make user avatar display in line
2018-10-16 12:00:46 +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
Shreya
5c335550e3
Fetch item_group's name and image on website if children
2018-09-27 13:55:59 +05:30
Saurabh
75d90b9d8f
a[resolved] merge-conflicts
2018-09-20 13:28:23 +05:30
Zarrar
013493de7a
lable for discount_amount should be configurable ( #15408 )
2018-09-17 11:06:49 +05:30
Saurabh
393dd4286a
[resolved] merge-conflicts
2018-09-12 14:48:30 +05:30
Zarrar
0d931e1d7d
fix uom & stock_uom print hide logic ( #15327 )
2018-09-06 13:08:58 +05:30
Nabin Hait
a804d6d487
Fixed merge conflict
2018-08-29 13:34:58 +05:30
