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

231801_test_to_master #1519

Merged
alexm merged 490 commits from 231801_test_to_master into master 2023-05-12 06:29:59 +00:00
Conversation 0 Commits 490 Files Changed 557 -9
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3c639b9a2b - Show all commits

4
print/templates/reports/invoice/invoice.html
View File

@ -240,11 +240,7 @@
</tfoot> </tfoot>
</table> </table>
</div> </div>
<<<<<<< HEAD
<div class="columns vn-mt-xl" v-if="invoice.payMethodCode == 'wireTransfer' && invoice.iban"> <div class="columns vn-mt-xl" v-if="invoice.payMethodCode == 'wireTransfer' && invoice.iban">
=======
<div class="columns vn-mt-xl" v-if="invoice.payMethodCode == 'wireTransfer' || ticketObservations">
>>>>>>> 2a8383f9ccaaa9c2dde10af42936f64de9436deb
<div class="size50 pull-left no-page-break"> <div class="size50 pull-left no-page-break">
<div class="panel"> <div class="panel">
<div class="header">{{$t('observations')}}</div> <div class="header">{{$t('observations')}}</div>

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

@ -11,17 +11,12 @@ module.exports = {
this.client = await this.findOneFromDef('client', [this.reference]); this.client = await this.findOneFromDef('client', [this.reference]);
this.taxes = await this.rawSqlFromDef(`taxes`, [this.reference]); this.taxes = await this.rawSqlFromDef(`taxes`, [this.reference]);
this.hasIntrastat = await this.findValueFromDef(`hasIntrastat`, [this.reference]); this.hasIntrastat = await this.findValueFromDef(`hasIntrastat`, [this.reference]);
<<<<<<< HEAD
this.intrastat = await this.rawSqlFromDef(`intrastat`, [ this.intrastat = await this.rawSqlFromDef(`intrastat`, [
this.reference, this.reference,
this.reference, this.reference,
this.reference, this.reference,
this.reference this.reference
]); ]);
=======
this.intrastat = await this.rawSqlFromDef(`intrastat`,
[this.reference, this.reference, this.reference, this.reference]);
>>>>>>> 2a8383f9ccaaa9c2dde10af42936f64de9436deb
this.rectified = await this.rawSqlFromDef(`rectified`, [this.reference]); this.rectified = await this.rawSqlFromDef(`rectified`, [this.reference]);
this.hasIncoterms = await this.findValueFromDef(`hasIncoterms`, [this.reference]); this.hasIncoterms = await this.findValueFromDef(`hasIncoterms`, [this.reference]);