refs #6681 - PR3 - Resolve conflicts #166

Merged
alexm merged 88 commits from hyervoni-PR-3 into dev 2024-01-29 08:29:45 +00:00
3 changed files with 3 additions and 1 deletions
Showing only changes of commit a888472ad2 - Show all commits

View File

@ -1017,6 +1017,7 @@ export default {
m3Price: 'M3 Price',
routePrice: 'Route price',
minimumKm: 'Minimum Km',
addRow: 'Add row',
},
consumption: {
entry: 'Entry',

View File

@ -1017,6 +1017,7 @@ export default {
m3Price: 'Precio M3',
routePrice: 'Precio ruta',
minimumKm: 'Km mínimos',
addRow: 'Añadir fila',
},
consumption: {
entry: 'Entrada',

View File

@ -128,7 +128,7 @@ onMounted(() => {
<QPageSticky :offset="[20, 20]">
<QBtn fab icon="add" color="primary" @click="redirectToCreateView()" />
<QTooltip>
{{ t('supplier.list.newSupplier') }}
{{ t('supplier.agencyTerms.addRow') }}
</QTooltip>
</QPageSticky>
</template>