Merge branch 'master' into 7969-plantTray

db/routines/vn/procedures/ticket_setVolume.sql

@@ -4,7 +4,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setVolume`(
 )
 BEGIN
 /**
- * Update the volume ticket
+ * Update the volume ticket.
  * 
  * @param vSelf Ticket id
  */

db/routines/vn/procedures/ticket_setVolumeItemCost.sql

@@ -4,26 +4,36 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setVolumeIte
 )
 BEGIN
 /**
- * Update the volume tickets of item
+ * Update the volume of tickets containing the item.
  *
- * @param vSelf Ticket id
+ * @param vItemFk Item id
  */
-	CREATE OR REPLACE TEMPORARY TABLE tTicket
+	DECLARE vTicket INT;
-		(PRIMARY KEY (id))
+	DECLARE vDone BOOL;
-		ENGINE = MEMORY
+
-		SELECT t.id, SUM(s.quantity * ic.cm3delivery / 1000000) volume
+	DECLARE vTickets CURSOR FOR
+		SELECT DISTINCT t.id
 			FROM sale s
 				JOIN ticket t ON t.id = s.ticketFk
 				JOIN itemCost ic ON ic.itemFk = s.itemFk
 					AND ic.warehouseFk = t.warehouseFk
 			WHERE s.itemFk = vItemFk
 				AND t.shipped >= util.VN_CURDATE()
-			GROUP BY t.id;
+				AND t.refFk IS NULL;
 
-	UPDATE ticket t
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-			JOIN tTicket tt ON tt.id = t.id
-		SET t.volume = tt.volume;
 
-	DROP TEMPORARY TABLE tTicket;
+	OPEN vTickets;
+	l: LOOP
+		FETCH vTickets INTO vTicket;
+
+		IF vDone THEN
+			LEAVE l;
+		END IF;
+
+		CALL ticket_setVolume(vTicket);
+
+	END LOOP l;
+	CLOSE vTickets;
 END$$
 DELIMITER ;

modules/ticket/front/descriptor-menu/index.html

@@ -349,13 +349,6 @@
     message="Recalculate components">
 </vn-confirm>
 
-<!-- Client balance popup-->
-<vn-client-balance-create
-    vn-id="balance-create"
-    company-fk="$ctrl.vnConfig.companyFk"
-    client-fk="$ctrl.ticket.client.id">
-</vn-client-balance-create>
-
 <!-- Send pdf to tablet -->
 <vn-confirm
     vn-id="pdfToTablet"