Merge branch 'master' into hotFix_orderCatalogFilter_values

Merge pull request 'HOTfix: use id instead description to open InvoiceOutDescriptor' (!980 ) from hotFix_customer_balance_email into master
Reviewed-on: #980
2024-11-21 08:27:13 +00:00 · 2024-11-21 06:52:01 +00:00 · 2024-11-20 22:43:04 +01:00
2 changed files with 4 additions and 4 deletions
--- a/src/pages/Claim/Card/ClaimLinesImport.vue
+++ b/src/pages/Claim/Card/ClaimLinesImport.vue
@ -130,7 +130,7 @@ function cancel() {
                <template #body-cell-description="{ row, value }">
                    <QTd auto-width align="right" class="link">
                        {{ value }}
-                        <ItemDescriptorProxy :id="row.itemFk"></ItemDescriptorProxy>
+                        <ItemDescriptorProxy :id="row.itemFk" />
                    </QTd>
                </template>
            </QTable>
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@ -256,10 +256,10 @@ const showBalancePdf = ({ id }) => {
            {{ toCurrency(balances[rowIndex]?.balance) }}
        </template>
        <template #column-description="{ row }">
-            <div class="link" v-if="row.isInvoice">
+            <span class="link" v-if="row.isInvoice" @click.stop>
                {{ t('bill', { ref: row.description }) }}
-                <InvoiceOutDescriptorProxy :id="row.description" />
+                <InvoiceOutDescriptorProxy :id="row.id" />
-            </div>
+            </span>
            <span v-else class="q-pa-xs dotted rounded-borders" :title="row.description">
                {{ row.description }}
            </span>
Author	SHA1	Message	Date
Javier Segarra	0434332ec4	Merge branch 'master' into hotFix_orderCatalogFilter_values gitea/salix-front/pipeline/pr-master This commit looks good Details	2024-11-21 08:27:13 +00:00
Javier Segarra	350c28eef0	Merge pull request 'HOTfix: use id instead description to open InvoiceOutDescriptor' (!980 ) from hotFix_customer_balance_email into master gitea/salix-front/pipeline/head This commit looks good Details Reviewed-on: #980	2024-11-21 06:52:01 +00:00
Javier Segarra	3b5d385d22	fix: use id instead description to open InvoiceOutDescriptor gitea/salix-front/pipeline/pr-master This commit looks good Details	2024-11-20 22:43:04 +01:00