From bc6ad0f255c400cbf93862144107fce384f45971 Mon Sep 17 00:00:00 2001
From: Gautam Panday <gautam.panday@openlabs.co.in>
Date: Fri, 15 May 2015 14:10:26 +0530
Subject: [PATCH 1/2] Added return item option #7746

---
 templates/webshop/sale.jinja | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/templates/webshop/sale.jinja b/templates/webshop/sale.jinja
index 38cedb1..1cf930a 100644
--- a/templates/webshop/sale.jinja
+++ b/templates/webshop/sale.jinja
@@ -19,7 +19,7 @@
 
       {% if not current_user.is_anonymous() %}
         {{ account_header(_('My Account / Order #') + sale.reference, 'orders') }}
-        <div class="col-md-10">
+        <div class="col-md-10 no-pad-xs">
       {% else %}
         <h4 class="text-center">{{ _('Order #') + sale.reference }}</h4>
         <br>
@@ -113,10 +113,20 @@
                       <br>
                       Qty: {{ line.quantity|int }} {{ line.unit.name }}
                     </td>
-                    <td class="col-md-6">
+                    <td class="col-md-4">
                       {{ line.amount|currencyformat(sale.currency.code) }}
                     </td>
-                    <td class="action">{% block line_actions %}{% endblock %}</td>
+                    <td class="action">
+                    {% block line_actions scoped %}
+                      {% if line.complaints %}
+                        <i class="fa fa-info"></i>
+                        <a class="text-muted" href="{{ url_for('sale.complaint.render', active_id=line.complaints[0].id) }}">{{ _('View Return') }}</a>
+                      {% elif line.is_returnable_under_any_term %}
+                        <i class="fa fa-truck"></i>
+                        <a class="text-muted" href="{{ url_for('sale.line.return_line', active_id=line.id) }}">{{ _('Return Item') }}</a>
+                      {% endif %}
+                    {% endblock %}
+                    </td>
                   </tr>
                   {% endfor %}
                   {% endblock sale_lines_content %}

From 17da6de5af4f6dff1256ef2d64183b39185178f9 Mon Sep 17 00:00:00 2001
From: Tarun Bhardwaj <tarun.bhardwaj@openlabs.co.in>
Date: Mon, 18 May 2015 16:00:46 +0530
Subject: [PATCH 2/2] Released version 3.4.1.11

---
 tryton.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tryton.cfg b/tryton.cfg
index 116b343..a3f987e 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.4.1.10
+version=3.4.1.11
 depends:
     nereid
     nereid_cms