verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 73 Releases Wiki Activity

test → dev #1701

Merged
guillermo merged 10 commits from test into dev 2023-08-04 09:39:34 +00:00
Conversation 0 Commits 10 Files Changed 12 +3 -2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 688a72ddb3 - Show all commits

2
print/templates/reports/cmr/cmr.html
View File

@ -202,7 +202,7 @@
</span> </span>
<hr> <hr>
<div class="imgSection"> <div class="imgSection">
<img v-bind:src="signPath"/> <img :src="signPath"/>
</div> </div>
</td> </td>
</tr> </tr>

3
print/templates/reports/cmr/sql/data.sql
View File

@ -1,5 +1,5 @@
SELECT c.id cmrFk, SELECT c.id cmrFk,
c.ticketFk, t.id ticketFk,
c.truckPlate, c.truckPlate,
c.observations, c.observations,
c.senderInstruccions, c.senderInstruccions,
@ -48,4 +48,5 @@ SELECT c.id cmrFk,
LEFT JOIN `address` a2 ON a2.id = c.addressFromFk LEFT JOIN `address` a2 ON a2.id = c.addressFromFk
LEFT JOIN province p2 ON p2.id = a2.provinceFk LEFT JOIN province p2 ON p2.id = a2.provinceFk
LEFT JOIN country cou4 ON cou4.id = p2.countryFk LEFT JOIN country cou4 ON cou4.id = p2.countryFk
LEFT JOIN ticket t ON t.cmrFk = c.id
WHERE c.id = ? WHERE c.id = ?