[FIX] Update statement line

controllers/account_bank_statement.py

@@ -26,6 +26,9 @@ def search_account_bank_statement(statementId):
 def get_account_bank_statement( journalIds=None):
     make_info_log('GET Account Bank Statement all ')
     from account_bank_statement_line import get_line_statement
+    from res_users import get_name_users
+    from account_journal import get_name_journal, get_currencie_journal
+    from account_bank_statement_type import get_name_statement_type
 
     if (not journalIds):
         return False
@@ -44,7 +47,9 @@ def get_account_bank_statement( journalIds=None):
         WHERE statement.journal_id in %s
         ORDER BY statement.id
     '''
-    # WHERE statement.state = 'open' and statement.journal_id in %s
+        # WHERE
+            # statement.state = 'open'
+            # statement.journal_id in %s
     domainSQL = tuple(journalIds)
 
     request.cr.execute(statementSQL,[domainSQL])
@@ -53,11 +58,16 @@ def get_account_bank_statement( journalIds=None):
         'name': statement[1],
         'date': statement[2],
         'state': statement[3],
-        'balanceEnd': statement[4],
+        'balanceEnd': statement[4] or 0,
         'userId': statement[5],
+        'userName': get_name_users(statement[5]),
         'journalId': statement[6],
+        'journalName': get_name_journal(statement[6]),
+        'currency': get_currencie_journal(statement[6]),
         'typeStatementId': statement[7],
-        'userSession': request.env.user.id,
+        'typeStatementName': get_name_statement_type(statement[7]),
+        'userSessionID': request.env.user.id,
+        'userSessionName': request.env.user.name,
         'lines': get_line_statement(statement[0]),
     } for statement in request.cr.fetchall()]
 

controllers/account_bank_statement_line.py

@@ -8,6 +8,7 @@ _MODEL= 'account.bank.statement.line'
 
 ''' Get Line statement '''
 def get_line_statement(statementId):
+    from res_partner import get_partner_name
     lines= '''
         SELECT
             line.id as id,
@@ -28,6 +29,7 @@ def get_line_statement(statementId):
         'ref': line[3],
         'amount': line[4],
         'partnerId': line[5],
+        'partnerNane': get_partner_name(line[5]) or ''
     } for line in  request.cr.fetchall()]
 
 

controllers/account_bank_statement_type.py

@@ -4,6 +4,13 @@ from eiru_logging import make_info_log
 
 _MODEL = 'account.bank.statement.type'
 
+def get_name_statement_type(id):
+    type = request.env[_MODEL].browse(id)
+    if (not type):
+        return ''
+
+    return type.name
+
 def get_account_bank_statement_type():
     make_info_log('GET Statement Type')
     return[{

controllers/account_journal.py

@@ -3,6 +3,35 @@ from openerp.http import request
 from eiru_logging import make_info_log
 _MODEL='account.journal'
 
+def get_name_journal(id):
+    journals = request.env[_MODEL].browse(id)
+    if (not journals):
+        return ''
+    return journals.display_name
+
+
+def get_currencie_journal(journalId):
+    journal = request.env[_MODEL].browse(journalId)
+    if (not journal):
+        return {}
+
+    currency = journal.currency or journal.company_id.currency_id
+
+    if (not currency):
+        return {}
+
+    return {
+        'id': currency.id,
+        'name': currency.display_name,
+        'base': currency.base,
+        'symbol': currency.symbol,
+        'position': currency.position,
+        'rateSilent': currency.rate_silent,
+        'decimalSeparator': currency.decimal_separator,
+        'decimalPlaces': currency.decimal_places,
+        'thousandsSeparator': currency.thousands_separator
+    }
+
 def get_currencies_from_journal():
     make_info_log('GET currency the journal active in store')
 

controllers/res_partner.py

@@ -4,6 +4,13 @@ from eiru_logging import make_info_log
 
 _MODEL='res.partner'
 
+def get_partner_name(id):
+    partner = request.env[_MODEL].browse(id)
+    if (not partner):
+        return ''
+
+    return partner.display_name
+
 def get_res_partner():
     make_info_log('GET Res-Partner')
     domain = [('active', '=', True)]
@@ -11,5 +18,5 @@ def get_res_partner():
     return[{
         'id':  partner.id,
         'name': partner.display_name,
-        'ruc': partner.ruc
+        # 'ruc': partner.ruc
     } for partner in request.env[_MODEL].search(domain)]

controllers/res_users.py

@@ -4,6 +4,12 @@ from eiru_logging import make_info_log
 
 _MODEL='res.users'
 
+def get_name_users(id):
+    user = request.env[_MODEL].browse(id)
+    if (not user):
+        return " "
+    return user.display_name
+
 def get_res_users(store):
     make_info_log('GET user in store')
     domain = [('active', '=', True)]

src/components/common/CardGrid.vue

@@ -87,7 +87,6 @@
                     for (let k of key.split('.')) {
                         value = value[k]
                     }
-                    console.log(item)
                     return value
                 })
             },

src/components/common/CardGridStatement.vue

@@ -10,9 +10,9 @@
                 :key='item.id'
                 :title='item.name'
                 :date='item.date'
-                :journalName='item.journal.displayName'
-                :typeStatement='item.typeStatement.name'
-                :countLine='item.line.length'
+                :journalName='item.journalName'
+                :typeStatement='item.typeStatementName'
+                :countLine='item.lines.length'
                 :state='item.state'
                 :isSelected='item.id === selectedId'
                 :details='computeDetails(item)'
@@ -119,7 +119,7 @@
             onClickCard(item) {
                 this.selectedId = item.id
                 this.$emit('onSelect', item)
-            }
+            },
         },
         data() {
             return {

src/components/common/CardStatement.vue

@@ -57,7 +57,6 @@
                 if (detail.format === 'currency') {
                     return this.$options.filters.currency(detail.value, {...this.options})
                 }
-
                 return detail.value
             },
             onClick() {

src/components/common/CartItem.vue

@@ -34,7 +34,7 @@
                     position: 'before',
                     thousandsSeparator: '.',
                     decimalPlaces: 2,
-                    decimalSeparator: ',' 
+                    decimalSeparator: ','
                 }
             }
         },
@@ -96,7 +96,7 @@
                 this.input = 0
             },
             onInputChange(e) {
-                console.log(e)
+                // console.log(e)
             },
             onChange(item) {
                 this.$emit('onChange', item)
@@ -233,4 +233,4 @@
                             color: #3f51b5
                         &.fa-trash:hover
                             color: #f44336
-</style>
+</style>

src/components/modal/BankStatementModal.vue

@@ -154,7 +154,6 @@
             },
             selectStatementJournal(journal) {
                 this.$emit('onSelectStatementJournal', journal)
-                // console.log(this.users);
             },
             selectTypestatement(type) {
                 this.$emit('onSelectStatementType', type)

src/components/modal/StatementLineModal.vue

@@ -128,7 +128,7 @@
                 set(value) {
                     this.update.partner = value
                     this.update.partnerId = !!value ?value.id : ""
-                    this.update.partnerName = !!value ?value.name :""
+                    this.update.partnerName = !!value ?value.name : ""
                 }
             },
         },
@@ -141,7 +141,10 @@
                 this.update.isDelete = value.isDelete
                 this.update.isUpdate = value.isUpdate
                 this.update.name = value.name
-                this.update.partner = value.partner
+                this.update.partner = {
+                    'id': value.partnerId,
+                    'name': value.partnerName,
+                },
                 this.update.partnerId = value.partnerId
                 this.update.partnerName = value.partnerName
                 this.update.ref = value.ref

src/components/steps/StatementStep.vue

@@ -74,6 +74,9 @@
             onCancel(){
                 this.showStatementAdd(false)
             },
+            // selectedStatement(){
+                // this.selectedStatements()
+            // },
             ...mapActions([
                 'filteredStatements',
                 'selectedStatements',

src/store/modules/journals.js

@@ -23,6 +23,7 @@ const getters = {
     selectedJournalName(state) {
         return state.selectedJournalName
     }
+    // getJournalName(state)
 }
 const mutations = {
     setJournals(state, payload) {
@@ -51,7 +52,6 @@ const actions = {
         commit('setLoadingJournals', false)
         commit('setSelectedJournal', null)
     },
-
 }
 export default {
     state,

src/store/modules/statement.js

@@ -63,17 +63,17 @@ const getters = {
         return !state.selectedStatement ? "" : state.selectedStatement.state
     },
     getJournalSelectedStatement(state) {
-        return !state.selectedStatement || !state.selectedStatement.journal ? '' : state.selectedStatement.journal.displayName
+        return !!state.selectedStatement ?state.selectedStatement.journalName  :''
     },
     getTypeSelectedStatement(state) {
-        return !state.selectedStatement || !state.selectedStatement.typeStatement ? '' : state.selectedStatement.typeStatement.name
+        return !!state.selectedStatement ?state.selectedStatement.typeStatementName : ''
     },
     getUserSelectedStatement(state) {
-        return !state.selectedStatement || !state.selectedStatement.user ? '' : state.selectedStatement.user.displayName
-
+        return !!state.selectedStatement  ?state.selectedStatement.userName :''
     },
 }
 
+
 const mutations = {
     setStatements(state, payload) {
         state.statements = payload
@@ -130,11 +130,9 @@ const actions = {
     },
     /* Selected */
     selectedStatements({ dispatch, commit }, payload) {
+
         commit('setSelectedStatement', payload)
         commit('setCurrencyStatement', payload)
-        // commit('setStatementsDest', payload)
-
-        // dispatch('initLines', payload.line)
         dispatch('verifyActionCashbox', payload)
     },
     filteredStatementsDest({ commit, getters }){

src/store/modules/statementConfig.js

@@ -73,19 +73,19 @@ const mutations = {
         }
 
         //  @Transfer
-        let resultTransfer = !!config.transfer.userIds.find(item => item === payload.userSession) && !!config.transfer.statementIds.find(item => item === payload.typeStatement.id)
+        let resultTransfer = !!config.transfer.userIds.find(item => item === payload.userSessionID) && !!config.transfer.statementIds.find(item => item === payload.typeStatementId)
         state.actionTransfer = resultTransfer
 
         // @Input
-        let resultInput = !!config.inputCashBox.userIds.find(item => item === payload.userSession) && !!config.inputCashBox.statementIds.find(item => item === payload.typeStatement.id)
+        let resultInput = !!config.inputCashBox.userIds.find(item => item === payload.userSessionID) && !!config.inputCashBox.statementIds.find(item => item === payload.typeStatementId)
         state.actionInputCashbox = resultInput
 
         // @Output
-        let resultOutput = !!config.outputCashBox.userIds.find(item => item === payload.userSession) && !!config.outputCashBox.statementIds.find(item => item === payload.typeStatement.id)
+        let resultOutput = !!config.outputCashBox.userIds.find(item => item === payload.userSessionID) && !!config.outputCashBox.statementIds.find(item => item === payload.typeStatementId)
         state.actionOutputCashbox = resultOutput
 
         // @Confirm
-        let resultConfirm = !!config.statementConfirm.userIds.find(item => item === payload.userSession)
+        let resultConfirm = !!config.statementConfirm.userIds.find(item => item === payload.userSessionID)
         state.actionStatementConfirm = resultConfirm
     },
 }

src/store/modules/statementLine.js

@@ -42,9 +42,13 @@ const mutations = {
                 name: item.name,
                 ref: item.ref,
                 amount: item.amount,
-                partner: item.partner.length === 0 ? '' : item.partner[0],
-                partnerId: item.partner.length === 0 ? '' : item.partner[0].id,
-                partnerName: item.partner.length === 0 ? '' : item.partner[0].name,
+                // partner: {
+                //     'id': item.partnerId,
+                //     'name': item.partnerNane,
+                //     'ruc': '',
+                //  },
+                partnerId: item.partnerId,
+                partnerName: item.partnerNane,
                 isDelete: false,
                 isUpdate: false,
             })
@@ -86,7 +90,7 @@ const mutations = {
             updateLine.date = payload.date
             updateLine.name = payload.name
             updateLine.isUpdate = true
-            updateLine.partner = payload.partner
+            // updateLine.partner = payload.partner
             updateLine.partnerId = payload.partner.id
             updateLine.partnerName = payload.partner.name
             updateLine.ref = payload.ref
@@ -105,7 +109,7 @@ const mutations = {
             'isDelete': payload.isDelete,
             'isUpdate': true,
             'name': payload.name,
-            'partner': payload.partner,
+            // 'partner': payload.partner,
             'partnerId': payload.partnerId,
             'partnerName': payload.partnerName,
             'ref':payload.ref,
@@ -131,7 +135,7 @@ const mutations = {
 const actions = {
     initLines({ commit, getters }) {
         if (!!getters.selectedStatement) {
-            commit('setLines', getters.selectedStatement.line)
+            commit('setLines', getters.selectedStatement.lines)
         }
     },
     selectLineSelected({ commit },payload) {