Преглед изворни кода

[ADD] Seleccion de Clientes en la liena de la caja

adrielso пре 6 година
родитељ
комит
d8870cf6fd

+ 1 - 1
controllers/account_bank_statement.py

@@ -65,7 +65,7 @@ def get_account_bank_statement( journalIds=None):
             'partner':[{
                 'id': partner.id,
                 'name': partner.name,
-                'displayName': partner.display_name
+                'ruc': partner.ruc,
             }for partner in request.env['res.partner'].browse(line.partner_id.id)],
         } for line in statement.line_ids],
         'typeStatement': {

+ 22 - 3
src/components/modal/StatementLineModal.vue

@@ -20,7 +20,8 @@
                 )
             .form-item
                 label.form-label Cliente / Proveedor
-                input.form-input
+                select.form-input(v-model='resPartnerId')
+                    option(v-for='partner in partners' :value='partner') {{ partner.name }}
             .form-item
                 label.form-label Valor de la operación
                 input-dropdown.form-input(
@@ -47,13 +48,14 @@
 
 <script>
     import DatePicker from 'vue2-datepicker'
-    import {InputDropdown } from '../common'
+    import {InputDropdown, DropdownSearcher } from '../common'
 
 
     export default {
         components: {
             DatePicker,
-            InputDropdown
+            InputDropdown,
+            DropdownSearcher,
         },
         props: {
             show: {
@@ -69,6 +71,7 @@
                     isDelete: false,
                     isUpdate: false,
                     name: '',
+                    partner: {},
                     partnerId: '',
                     partnerName: '',
                     ref:'',
@@ -78,6 +81,10 @@
                 type: Object,
                 default: {}
             },
+            partners: {
+                type: Array,
+                default: []
+            },
         },
         watch: {
             show(value) {
@@ -114,6 +121,16 @@
                     this.update.ref = value.trim()
                 }
             },
+            resPartnerId: {
+                get () {
+                    return this.update.partner
+                },
+                set(value) {
+                    this.update.partner = value
+                    this.update.partnerId = !!value ?value.id : ""
+                    this.update.partnerName = !!value ?value.name :""
+                }
+            },
         },
         methods: {
             setLineUpdate(value){
@@ -124,6 +141,7 @@
                 this.update.isDelete = value.isDelete
                 this.update.isUpdate = value.isUpdate
                 this.update.name = value.name
+                this.update.partner = value.partner
                 this.update.partnerId = value.partnerId
                 this.update.partnerName = value.partnerName
                 this.update.ref = value.ref
@@ -152,6 +170,7 @@
                     isDelete: false,
                     isUpdate: false,
                     name: null,
+                    partner: {},
                     partnerId: null,
                     partnerName: null,
                     ref:null,

+ 2 - 0
src/components/steps/StatementModify.vue

@@ -24,6 +24,7 @@
             :show='showStatementLine'
             :line='lineSelected'
             :currencyStatement='currencyStatement'
+            :partners='resPartners'
             @onCancel='onCancel'
             @onAcept='onWriter'
         )
@@ -71,6 +72,7 @@
             'showStatementLine',
             'lineSelected',
             'currencyStatement',
+            'resPartners',
         ]),
     }
 </script>

+ 1 - 4
src/store/actions.js

@@ -65,10 +65,8 @@ const actions = {
             }
             commit('setDataEndProcess', data)
             dispatch('createCasboxMove')
-            commit('setCompleted', true)
         }
         if (getters.isStatmentConfirm) {
-
             let data = {}
             if (!getters.description.trim()) {
                 dispatch('notify', 'Necesitas ingresar una observación para el cierre de caja.')
@@ -82,11 +80,9 @@ const actions = {
             }
             commit('setDataEndProcess', data)
             dispatch('processClosingStatement')
-            commit('setCompleted', true)
         }
 
         if (getters.isStatmentModify) {
-            console.log("Modificar");
             let data= {}
             data = {
                 lineUpdate: !!getters.linesUpdate.length ? getters.linesUpdate : [],
@@ -128,6 +124,7 @@ const actions = {
             }
         }).then(({data}) => {
             dispatch('notify', data.result.message)
+            commit('setCompleted', true)
         }).catch(error => {
             console.error(error)
         })

+ 10 - 3
src/store/modules/statementLine.js

@@ -5,6 +5,7 @@ const initialState = {
     linesUpdate: [],
     showStatementLine: false
 }
+
 const state = {
     lines: initialState.lines,
     lineSelected: initialState.lineSelected,
@@ -12,6 +13,7 @@ const state = {
     linesUpdate: initialState.linesUpdate,
     showStatementLine: initialState.showStatementLine,
 }
+
 const getters = {
     statementLines(state) {
         return state.lines
@@ -29,6 +31,7 @@ const getters = {
         return  state.lineSelected;
     }
 }
+
 const mutations = {
     setLines(state, payload) {
         let data = []
@@ -39,8 +42,9 @@ 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].displayName,
+                partnerName: item.partner.length === 0 ? '' : item.partner[0].name,
                 isDelete: false,
                 isUpdate: false,
             })
@@ -82,8 +86,9 @@ const mutations = {
             updateLine.date = payload.date
             updateLine.name = payload.name
             updateLine.isUpdate = true
-            updateLine.partnerId = payload.partnerId
-            updateLine.partnerName = payload.partnerName
+            updateLine.partner = payload.partner
+            updateLine.partnerId = payload.partner.id
+            updateLine.partnerName = payload.partner.name
             updateLine.ref = payload.ref
         }
 
@@ -100,6 +105,7 @@ const mutations = {
             'isDelete': payload.isDelete,
             'isUpdate': true,
             'name': payload.name,
+            'partner': payload.partner,
             'partnerId': payload.partnerId,
             'partnerName': payload.partnerName,
             'ref':payload.ref,
@@ -121,6 +127,7 @@ const mutations = {
         state.showStatementLine = false
     },
 }
+
 const actions = {
     initLines({ commit, getters }) {
         if (!!getters.selectedStatement) {