verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity

3352-docuware #880

Merged
joan merged 16 commits from 3352-docuware into dev 2022-02-28 13:44:49 +00:00
Conversation 0 Commits 16 Files Changed 17 +2 -8
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 87aee55898 - Show all commits

7
front/core/styles/icons/salixfont.css
View File

@ -74,7 +74,6 @@
} }
.icon-bucket:before { .icon-bucket:before {
content: "\e97a"; content: "\e97a";
color: #000;
} }
.icon-buscaman:before { .icon-buscaman:before {
content: "\e93b"; content: "\e93b";
@ -84,32 +83,26 @@
} }
.icon-calc_volum .path1:before { .icon-calc_volum .path1:before {
content: "\e915"; content: "\e915";
color: rgb(0, 0, 0);
} }
.icon-calc_volum .path2:before { .icon-calc_volum .path2:before {
content: "\e916"; content: "\e916";
margin-left: -1em; margin-left: -1em;
color: rgb(0, 0, 0);
} }
.icon-calc_volum .path3:before { .icon-calc_volum .path3:before {
content: "\e917"; content: "\e917";
margin-left: -1em; margin-left: -1em;
color: rgb(0, 0, 0);
} }
.icon-calc_volum .path4:before { .icon-calc_volum .path4:before {
content: "\e918"; content: "\e918";
margin-left: -1em; margin-left: -1em;
color: rgb(0, 0, 0);
} }
.icon-calc_volum .path5:before { .icon-calc_volum .path5:before {
content: "\e919"; content: "\e919";
margin-left: -1em; margin-left: -1em;
color: rgb(0, 0, 0);
} }
.icon-calc_volum .path6:before { .icon-calc_volum .path6:before {
content: "\e91a"; content: "\e91a";
margin-left: -1em; margin-left: -1em;
color: rgb(255, 255, 255);
} }
.icon-calendar:before { .icon-calendar:before {
content: "\e93d"; content: "\e93d";

3
print/templates/reports/invoice/invoice.js
View File

@ -27,7 +27,8 @@ module.exports = {
for (let sale of sales) { for (let sale of sales) {
const ticket = map.get(sale.ticketFk); const ticket = map.get(sale.ticketFk);
ticket.sales.push(sale);
if (ticket) ticket.sales.push(sale);
} }
this.tickets = tickets; this.tickets = tickets;