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

8144-devToTest_2448 #3216

Merged
alexm merged 256 commits from 8144-devToTest_2448 into test 2024-11-19 07:36:04 +00:00
Conversation 0 Commits 256 Files Changed 376 +4 -1
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8569bec34a - Show all commits

3
db/versions/11321-wheatChrysanthemum/00-firstScript.sql Normal file
View File

@ -0,0 +1,3 @@
INSERT INTO vn.report (name, `method`)
VALUES ('LabelItemBarcode','Items/{id}/label-barcode-pdf'),
('LabelItemQr','Items/{id}/label-qr-pdf');

2
print/templates/reports/item-label-barcode/item-label-barcode.js
View File

@ -4,7 +4,7 @@ const moment = require('moment');
const jsbarcode = require('jsbarcode'); const jsbarcode = require('jsbarcode');
module.exports = { module.exports = {
name: 'item-label-qr', name: 'item-label-barcode',
async serverPrefetch() { async serverPrefetch() {
this.company = await this.findOneFromDef('company', [this.warehouseId]); this.company = await this.findOneFromDef('company', [this.warehouseId]);
if (!this.company) if (!this.company)