Bladeren bron

[FIX] Transferencia, Entrada y Salida de dinero

adrielso 6 jaren geleden
bovenliggende
commit
30b9ee82e2

+ 1 - 1
controllers/account_bank_statement.py

@@ -44,7 +44,7 @@ def get_account_bank_statement( journalIds=None):
             statement.journal_id,
             statement.type_statement
         FROM account_bank_statement as statement
-        WHERE statement.journal_id in %s
+        WHERE statement.state = 'open' and statement.journal_id in %s
         ORDER BY statement.id
     '''
         # WHERE

+ 4 - 4
src/components/forms/OperationDetails.vue

@@ -7,8 +7,8 @@
             h3.details-title Origin
             CardOperationDetails(
                 :nameStatement='statementOrigin.name'
-                :userStatement='statementOrigin.user.name'
-                :typeStatement='statementOrigin.typeStatement.name'
+                :userStatement='statementOrigin.userName'
+                :typeStatement='statementOrigin.typeStatementName'
                 :amountStatement='statementOrigin.balanceEnd'
                 :currency='statementOrigin.currency'
             )
@@ -16,8 +16,8 @@
             h3.details-title Destino
             CardOperationDetails(
                 :nameStatement='statementDest.name'
-                :userStatement='statementDest.user.name'
-                :typeStatement='statementDest.typeStatement.name'
+                :userStatement='statementDest.userName'
+                :typeStatement='statementDest.typeStatementName'
                 :amountStatement='statementDest.balanceEnd'
                 :currency='statementDest.currency'
             )

+ 1 - 4
src/store/modules/statement.js

@@ -100,10 +100,7 @@ const mutations = {
         state.currencyStatement = payload.currency
     },
     setStatementsDest(state, payload) {
-        // if (!payload.length){
-        //     state.statementsDest = []
-        // }
-        state.statementsDest = state.statements.filter(item => item.id !== state.selectedStatement.id && item.journal.id === state.selectedStatement.journal.id && item.state === 'open')
+        state.statementsDest = state.statements.filter(item => item.id !== state.selectedStatement.id && item.journalId === state.selectedStatement.journalId && item.state === 'open')
     },
     setFilteredStatementsDest(state, payload) {
         state.filteredStatementDest = payload