ソースを参照

[FIX] invoice name

Gogs 7 年 前
コミット
e9e8dfa33f
2 ファイル変更15 行追加7 行削除
  1. 12 4
      controllers/main.py
  2. 3 3
      src/App.vue

+ 12 - 4
controllers/main.py

@@ -520,7 +520,7 @@ class Purchases(http.Controller):
     '''
         Number to invoice
     '''
-    def validate_invoice(self, invoice_ids):
+    def validate_invoice(self, invoice_ids, type=None):
         assert len(invoice_ids) == 1
 
         invoice = request.env['account.invoice'].browse(invoice_ids)
@@ -528,6 +528,13 @@ class Purchases(http.Controller):
         invoice.action_number()
         invoice.invoice_validate()
 
+        if type != 'purchase':
+            name = 'GASTO' + invoice.name[invoice.name.index('/'):]
+            invoice.write({
+                'number': name,
+                'internal_number': name
+            })
+
     '''
         Create voucher
     '''
@@ -634,7 +641,8 @@ class Purchases(http.Controller):
     ''' 
     @http.route('/eiru_purchases/process', type='json', auth='user', methods=['POST'], cors='*')
     def process_purchase(self, **kw):
-        self.make_info_log('Processing purchase...')
+        mode = kw.get('mode')
+        self.make_info_log('Processing {}'.format(mode))
 
         # Get date
         date_now = datetime.now().strftime(DATE_FORMAT)
@@ -650,7 +658,7 @@ class Purchases(http.Controller):
 
         invoice = None
 
-        if kw.get('mode') == 'purchase':
+        if mode == 'purchase':
             # Create purchase order 
             purchase_order = self.create_purchase_order(kw.get('supplierId'), kw.get('items'), date_now, currency_id, pricelist_id, kw.get('paymentTermId'))
             self.make_info_log('Purchase order created')
@@ -679,7 +687,7 @@ class Purchases(http.Controller):
         self.make_info_log('Account move created')
 
         # Validate invoice
-        self.validate_invoice(invoice_ids)
+        self.validate_invoice(invoice_ids, mode)
         self.make_info_log('Invoice validated')
 
         # Create account voucher

+ 3 - 3
src/App.vue

@@ -3,7 +3,7 @@
         form-wizard(title='' subtitle='' finishButtonText='Finalizar' :hideButtons='isProcessing' color='#7c7bad' nextButtonText='Continuar' backButtonText='Volver' @on-complete='createPurchase' ref='wizard')
             tab-content(title='Cuál es su proveedor?' :before-change='checkSupplier')
                 supplier-step
-            tab-content(title='Qué productos comprarás?' :before-change='checkCart')
+            tab-content(:title="mode === 'purchase' ? 'Qué productos comprarás?' : 'En que gastarás?'" :before-change='checkCart')
                 product-step
             tab-content(title='Cómo quieres pagar?')
                 payment-method-step
@@ -33,8 +33,8 @@
         },
         computed: mapGetters([
             'isProcessing',
-            'state'
-
+            'state',
+            'mode'
         ]),
         methods: {
             ...mapActions([