Skip to content
Code-Schnipsel Gruppen Projekte
Commit 07228d07 erstellt von Henning Leutz's avatar Henning Leutz :martial_arts_uniform:
Dateien durchsuchen

Merge branch 'dev' into 'next'

fix: quiqqer/quiqqer locale and paths adapted to quiqqer/core

See merge request !52
Übergeordnete cab1c6bc 4c25c8fa
Keine zugehörigen Branchen gefunden
Keine zugehörigen Tags gefunden
2 Merge Requests!53Next,!52fix: quiqqer/quiqqer locale and paths adapted to quiqqer/core
Pipeline-Nr. 7698 bestanden
......@@ -62,7 +62,7 @@ define('package/quiqqer/invoice/bin/backend/controls/address/Create', [
this.$Elm = new Element('div', {
html: Mustache.render(template, {
message : QUILocale.get(lg, 'invoice.create.address.message'),
textData : QUILocale.get('quiqqer/quiqqer', 'data'),
textData : QUILocale.get('quiqqer/core', 'data'),
textCompany : QUILocale.get('quiqqer/system', 'company'),
textSalutation: QUILocale.get('quiqqer/system', 'salutation'),
textFirstName : QUILocale.get('quiqqer/system', 'firstname'),
......
......@@ -422,7 +422,7 @@ define('package/quiqqer/invoice/bin/backend/controls/panels/Invoice', [
*/
$showLockMessage: function() {
const self = this;
let btnText = QUILocale.get('quiqqer/quiqqer', 'submit');
let btnText = QUILocale.get('quiqqer/core', 'submit');
if (window.USER.isSU) {
btnText = QUILocale.get(lg, 'button.unlock.invoice.is.locked');
......
......@@ -549,7 +549,7 @@ define(
width: 90
},
{
header: QUILocale.get('quiqqer/quiqqer', 'project'),
header: QUILocale.get('quiqqer/core', 'project'),
dataIndex: 'project_name',
dataType: 'string',
width: 160
......
......@@ -1642,7 +1642,7 @@ define('package/quiqqer/invoice/bin/backend/controls/panels/TemporaryInvoice', [
*/
$showLockMessage: function() {
const self = this;
let btnText = QUILocale.get('quiqqer/quiqqer', 'submit');
let btnText = QUILocale.get('quiqqer/core', 'submit');
if (window.USER.isSU) {
btnText = QUILocale.get(lg, 'button.unlock.invoice.is.locked');
......
......@@ -362,7 +362,7 @@ define('package/quiqqer/invoice/bin/backend/controls/panels/TemporaryInvoices',
width: 100
},
{
header: QUILocale.get('quiqqer/quiqqer', 'name'),
header: QUILocale.get('quiqqer/core', 'name'),
dataIndex: 'customer_name',
dataType: 'string',
width: 200,
......@@ -383,13 +383,13 @@ define('package/quiqqer/invoice/bin/backend/controls/panels/TemporaryInvoices',
className: 'grid-align-center'
},
{
header: QUILocale.get('quiqqer/quiqqer', 'date'),
header: QUILocale.get('quiqqer/core', 'date'),
dataIndex: 'date',
dataType: 'date',
width: 90
},
{
header: QUILocale.get('quiqqer/quiqqer', 'project'),
header: QUILocale.get('quiqqer/core', 'project'),
dataIndex: 'project_name',
dataType: 'string',
width: 160
......@@ -460,13 +460,13 @@ define('package/quiqqer/invoice/bin/backend/controls/panels/TemporaryInvoices',
width: 105
},
{
header: QUILocale.get('quiqqer/quiqqer', 'c_date'),
header: QUILocale.get('quiqqer/core', 'c_date'),
dataIndex: 'c_date',
dataType: 'date',
width: 140
},
{
header: QUILocale.get('quiqqer/quiqqer', 'c_user'),
header: QUILocale.get('quiqqer/core', 'c_user'),
dataIndex: 'c_username',
dataType: 'integer',
width: 180
......@@ -914,7 +914,7 @@ define('package/quiqqer/invoice/bin/backend/controls/panels/TemporaryInvoices',
maxWidth: 600,
autoclose: false,
ok_button: {
text: QUILocale.get('quiqqer/quiqqer', 'delete'),
text: QUILocale.get('quiqqer/core', 'delete'),
textimage: 'fa fa-trash'
},
events: {
......@@ -971,7 +971,7 @@ define('package/quiqqer/invoice/bin/backend/controls/panels/TemporaryInvoices',
maxWidth: 600,
autoclose: false,
ok_button: {
text: QUILocale.get('quiqqer/quiqqer', 'copy'),
text: QUILocale.get('quiqqer/core', 'copy'),
textimage: 'fa fa-copy'
},
events: {
......
......@@ -292,7 +292,7 @@ define('package/quiqqer/invoice/bin/backend/controls/settings/ProcessingStatus',
maxWidth : 600,
autoclose: false,
ok_button: {
text : QUILocale.get('quiqqer/quiqqer', 'edit'),
text : QUILocale.get('quiqqer/core', 'edit'),
textimage: 'fa fa-edit'
},
events : {
......@@ -392,7 +392,7 @@ define('package/quiqqer/invoice/bin/backend/controls/settings/ProcessingStatus',
maxWidth : 600,
autoclose : false,
ok_button : {
text : QUILocale.get('quiqqer/quiqqer', 'remove'),
text : QUILocale.get('quiqqer/core', 'remove'),
textimage: 'fa fa-trash'
},
events : {
......
0% Lade oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren