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 +4 -2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit aad8fb0a66 - Show all commits

2
db/changes/231001/00-newCompanyI18n.sql
View File

@ -1,4 +1,5 @@
-- vn.companyI18n definition -- vn.companyI18n definition
USE vn;
CREATE TABLE `companyI18n` ( CREATE TABLE `companyI18n` (
`companyFk` smallint(5) unsigned NOT NULL, `companyFk` smallint(5) unsigned NOT NULL,
@ -7,3 +8,4 @@ CREATE TABLE `companyI18n` (
PRIMARY KEY (`companyFk`,`lang`), PRIMARY KEY (`companyFk`,`lang`),
CONSTRAINT `companyI18n_FK` FOREIGN KEY (`companyFk`) REFERENCES `company` (`id`) ON UPDATE CASCADE CONSTRAINT `companyI18n_FK` FOREIGN KEY (`companyFk`) REFERENCES `company` (`id`) ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;

2
print/core/components/report-footer/report-footer.html
View File

@ -8,7 +8,7 @@
<p <p
v-if="company.footnotes" v-if="company.footnotes"
class="privacy" class="privacy"
v-html="$18n.locale(`${company.footnotes}`)"> v-html="$i18n.locale(`${company.footnotes}`)">
</p> </p>
</div> </div>
</div> </div>