fix: refs #6900 fine tunning wip

@@ -29,6 +29,15 @@ onMounted(async () => {
     getRoutes();
 });
 
+watch(

@@ -0,0 +1,10 @@
+import { toCurrency } from 'src/filters';

@@ -223,6 +223,10 @@ async function onSubmit() {
                     autofocus
                 />
             </VnRow>
+            <VnRow>

@@ -21,2 +23,4 @@
     ],
 };
+
+onBeforeRouteUpdate(async (to) => {

@@ -360,3 +359,1 @@
-                :label="t('invoiceIn.card.amount')"
-                :value="toCurrency(totalAmount, entity.currency?.code)"
-            />
+            <VnLv :label="t('invoiceIn.card.amount')" :value="toCurrency(totalAmount)" />

@@ -36,3 +36,3 @@
         label: 'invoiceIn.summary.taxableBase',
         field: (row) => row.taxableBase,
-        format: (value) => toCurrency(value, currency.value),
+        format: (value) => toCurrency(value),

@@ -73,3 +73,3 @@
         label: 'invoiceIn.summary.currency',
         field: (row) => row.foreignValue,
-        format: (value) => value,
+        format: (val) => val && toCurrency(val, currency.value),

@@ -298,3 +292,1 @@
-                    <VnLv
-                        label="Total"
-                        :value="toCurrency(entity.totals.totalVat, currency)"
+                        :value="toCurrency(entity.totals.totalTaxableBase)"

@@ -63,6 +64,22 @@ export default {
             path: ':id',
             component: () => import('src/pages/InvoiceIn/Card/InvoiceInCard.vue'),
             redirect: { name: 'InvoiceInSummary' },
+            beforeEnter: async (to, from, next) => {

@@ -56,6 +56,7 @@ export const useNavigationStore = defineStore('navigationStore', () => {
     function addMenuItem(module, route, parent) {
         const { meta } = route;
         let { menuChildren = null } = meta;
+        if (meta.hidden) return;

@@ -132,40 +123,6 @@ function taxRate(invoiceInTax) {
     return (taxTypeSage / 100) * taxableBase;
 }
 
-async function addExpense() {

@@ -162,4 +126,0 @@
-        });
-    }
-}
-const getTotalTaxableBase = (rows) =>

@@ -442,44 +401,6 @@ const formatOpt = (row, { model, options }, prop) => {
             </QTable>
         </template>
     </CrudModel>
-    <QDialog ref="newExpenseRef">

@@ -38,3 +38,2 @@
     it('should throw an error creating a new dms if a file is not attached', () => {
-        cy.get(formInputs).eq(5).click();
-        cy.get(formInputs).eq(5).type('{selectall}{backspace}');
+        cy.get(formInputs).eq(7).type('{selectall}{backspace}');

@@ -11,2 +10,4 @@
         cy.login('developer');
         cy.visit(`/#/invoice-in/1/vat`);
+        cy.intercept('GET', '/api/InvoiceIns/1/getTotals').as('lastCall');
+        cy.wait('@lastCall');

@@ -29,4 +30,0 @@
-        cy.removeRow(2);
-    });
-
-    it('should throw an error if there are fields undefined', () => {

@@ -0,0 +5,4 @@
+import FormModelPopup from './FormModelPopup.vue';
+
+const emit = defineEmits(['onDataSaved']);
+const { t } = useI18n();

@@ -0,0 +2,4 @@
+
+export function getTotal(rows, key, opts = {}) {
+    const { currency, cb } = opts;
+    const total = rows.reduce((acc, row) => acc + +(cb ? cb(row) : row[key] || 0), 0);

@@ -22,1 +24,4 @@
 };
+
+onBeforeRouteUpdate(async (to) => {
+    const card = to.matched.find((route) => route.name === 'InvoiceInCard');

@@ -155,3 +153,3 @@
                             <QTd />
                             <QTd>
-                                {{ toCurrency(getTotal(rows, 'amount'), currency) }}
+                                {{ getTotal(rows, 'amount', { currency: 'default' }) }}

@@ -0,0 +18,4 @@
+        <template #form-inputs="{ data, validate }">
+            <VnRow>
+                <VnInput
+                    :label="`${t('Code')}`"

@@ -0,0 +33,4 @@
+            </VnRow>
+            <VnRow>
+                <VnInput
+                    :label="`${t('Description')}`"

@@ -2,18 +2,17 @@
 import { ref, computed } from 'vue';

@@ -226,2 +179,2 @@
-                                    class="cursor-pointer"
-                                    size="xs"
+                            <template #form>
+                                <CreateNewExpenseForm