Merge pull request 'refs #4764 hotfix' (!1780) from 4764-ticketRefundhotFix into master

Reviewed-on: #1780
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

modules/ticket/front/services/index.html

@@ -29,7 +29,7 @@
                 disabled="watcher.dataChanged() || !$ctrl.checkeds.length"
                 label="Pay"
                 ng-click="$ctrl.createRefund()"
-                vn-acl="invoicing, claimManager, salesAssistant"
+                vn-acl="invoicing, claimManager, salesAssistant, buyer"
                 vn-acl-action="remove">
         </vn-button>
         </vn-button-bar>
@@ -37,7 +37,9 @@
             <vn-check
                 tabindex="1"
                 on-change="$ctrl.addChecked(service.id)"
-                disabled="!service.id">
+                disabled="!service.id"
+                vn-acl="invoicing, claimManager, salesAssistant, buyer"
+                vn-acl-action="remove">
             </vn-check>
             <vn-autocomplete vn-two vn-focus
                 data="ticketServiceTypes"
@@ -68,7 +70,8 @@
                 vn-one
                 label="Price"
                 ng-model="service.price"
-                step="0.01">
+                step="0.01"
+                min="0">
             </vn-input-number>
             <vn-auto>
                 <vn-icon-button

print/templates/reports/delivery-note/delivery-note.html

@@ -117,7 +117,7 @@
                                 <td class="number">{{service.price | currency('EUR', $i18n.locale)}}</td>
                                 <td class="centered" width="5%"></td>
                                 <td class="centered">{{service.taxDescription}}</td>
-                                <td class="number">{{service.price | currency('EUR', $i18n.locale)}}</td>
+                                <td class="number">{{service.total | currency('EUR', $i18n.locale)}}</td>
                             </tr>
                         </tbody>
                         <tfoot>

print/templates/reports/delivery-note/sql/services.sql

@@ -1,8 +1,9 @@
 SELECT 
     tc.code taxDescription,
     ts.description,
-    ts.quantity, 
-    ts.price
+    ts.quantity,
+    ts.price, 
+    ts.quantity * ts.price total
 FROM ticketService ts
     JOIN taxClass tc ON tc.id = ts.taxClassFk
 WHERE ts.ticketFk = ?