소스 검색

[FIX] some features

robert 6 년 전
부모
커밋
1aef54b5a0

+ 1 - 1
controllers/account_bank_statement.py

@@ -18,7 +18,7 @@ def create_bank_statement_lines(account_voucher_id, reference=None):
         'account_id': account_voucher.account_id.id,
         'journal_entry_id': account_voucher.move_id.id,
         'currency_id': account_voucher.currency_id.id,
-        'ref': 'POS/' + (reference or '')
+        'ref': 'POS/' + (reference or account_voucher.reference)
     }]]
 
 '''

+ 1 - 1
controllers/main.py

@@ -156,7 +156,7 @@ class PosSales(http.Controller):
         
         # Create bank payment statement
         if kw.get('paymentMethod', 'Efectivo') == 'Banco':
-            create_bank_payment_statement(bank_payment_data, currency_id, invoice.date_invoice, journal_id, customer_id)
+            create_bank_payment_statement(bank_payment_data, invoice.id, account_voucher.id)
             self.make_info_log('[OK] Creating bank payment statement')
 
         return {

+ 19 - 7
controllers/res_bank_payment.py

@@ -7,22 +7,34 @@ _MODEL = 'res.bank.payments'
 
 '''
 '''
-def create_bank_payment_statement(data, currency_id, date, journal_id=None, partner_id=None, supplier_id=None):
-    bank_payments_type_id = request.env['res.bank.payments.type'].get_bank_payments_type_id(journal_id)
+def create_bank_payment_statement(data, invoice_id, account_voucher_id):
+    invoice = request.env['account.invoice'].browse(invoice_id)
+    account_voucher = request.env['account.voucher'].browse(account_voucher_id)
+    bank_statement_line = request.env['account.bank.statement.line'].search([('voucher_id', '=', account_voucher_id)])
+
+    bank_payments_type_id = request.env['res.bank.payments.type'].get_bank_payments_type_id(account_voucher.journal_id.id)
 
     values = {
         'bank_payments_type_id': bank_payments_type_id,
         'bank_id': data.get('bank_id', None),
-        'currency_id': currency_id,
-        'date': date,
-        'customer_id': partner_id,
+        'currency_id': invoice.currency_id.id,
+        'date': invoice.date_invoice,
+        'customer_id': invoice.partner_id.id,
         'number_cta': data.get('number_cta', None),
         'number_cta_origin': data.get('number_cta_origin', None),
         'name_holder': data.get('name_holder', None),
         'number': data.get('number'),
         'date_maturity': data.get('date_maturity', '') or get_date(),
-        'supplier_id': supplier_id,
-        'amount_total': data.get('amount', None)
+        'amount_total': data.get('amount', None),
+        'payments_line': [[0, False, {
+            'amount': abs(account_voucher.amount),
+            'amount_currency': 0.0, 
+            'date': invoice.date_invoice,
+            'statement_line_id': bank_statement_line.id,
+            'statement_id': bank_statement_line.statement_id.id,
+            'type_operation': ('payment', 'receipt')[invoice.type == 'out_invoice'],
+            'currency_id': invoice.currency_id.id
+        }]]
     }
 
     request.env['res.bank.payments'].create(values)

+ 7 - 2
controllers/res_config.py

@@ -28,7 +28,7 @@ def get_pos_config():
 
 '''
 '''
-def save_pos_config(**kw):
+def save_pos_config(kw):
     values = {}
     
     if kw.get('setting') == 'imageType':
@@ -41,7 +41,12 @@ def save_pos_config(**kw):
         values['view_currency_exchanges'] = kw.get('value', False)
 
     settings = request.env[_MODEL].search([], limit=1, order='id desc')
-    settings.write(values)
+
+    if settings:
+        settings.write(values)
+    else:
+        settings = settings.create(values)
+
     settings.execute()
     
     return get_pos_config()

+ 4 - 4
controllers/res_partner.py

@@ -26,11 +26,11 @@ def get_customers(image_type='small'):
 '''
     Create and get customer
 '''
-def create_customer(**kw):
+def create_customer(values):
     customer = request.env[_MODEL].create({
-        'name': kw.get('name'),
-        'ruc': kw.get('ruc'),
-        'mobile': kw.get('mobile'),
+        'name': values.get('name'),
+        'ruc': values.get('ruc'),
+        'mobile': values.get('mobile'),
         'customer': True
     })
 

+ 3 - 2
src/App.vue

@@ -117,14 +117,15 @@
             handleKeyboard({key}) {
                this.handleNavigation(key)
             },
+            // TODO: Improve navigation
             handleNavigation(key) {
                 if (key === 'ArrowRight') {
-                    this.goNext()
+                    // this.goNext()
                     return
                 }
 
                 if (key === 'ArrowLeft') {
-                    this.goBack()
+                    // this.goBack()
                 }
             },
             ...mapActions([

+ 3 - 1
src/components/forms/CustomerForm.vue

@@ -75,9 +75,11 @@
             },
             onAccept() {
                 this.$emit('onAccept', this.customer)
+                this.customer = {}
             },
             onCancel() {
                 this.$emit('onCancel')
+                this.customer = {}
             }
         }
     }
@@ -122,7 +124,7 @@
                     margin-top: 5px
             .form-item
                 width: 100%
-                margin-bottom: 10px
+                margin-bottom: 15px
                 &.form-item-small
                     height: 35px
                 &.form-item-medium

+ 7 - 1
src/components/modals/CustomerModal.vue

@@ -6,7 +6,7 @@
         @before-close='beforeClose'
     )
         customer-form(
-            :type='medium'
+            type='small'
             @onAccept='onAccept'
             @onCancel='onCancel'
         )
@@ -57,4 +57,10 @@
 
 <style lang="sass">
     .customer-modal
+        .customer-form-small
+            width: 100% !important
+            .form-display-small
+                width: 100% !important
+                .form-label-small, .form-input-small
+                    font-size: 12pt
 </style>

+ 1 - 1
src/store/actions.js

@@ -45,7 +45,7 @@ const actions = {
         })
     },
     createCustomer({ dispatch }, payload) {
-        return axios.post('createCustomerUrl', {
+        return axios.post('/eiru_sales/create_customer', {
             jsonrpc: '2.0',
             method: 'call',
             params: {

+ 1 - 1
templates.xml

@@ -53,7 +53,7 @@
         <record id="eiru_pos.action_settings" model="ir.actions.act_window">
             <field name="name">Preferencias Eiru POS</field>
             <field name="type">ir.actions.act_window</field>
-            <field name="res_model">base.config.settings</field>
+            <field name="res_model">res.config.settings</field>
             <field name="view_id" ref="eiru_pos.settings_form"></field>
             <field name="view_mode">form</field>
             <field name="target">inline</field>