Pārlūkot izejas kodu

[FIX] alive widget

Gogs 7 gadi atpakaļ
vecāks
revīzija
6cb8e33430
6 mainītis faili ar 56 papildinājumiem un 10 dzēšanām
  1. 32 2
      controllers/main.py
  2. 1 1
      package.json
  3. 1 1
      src/App.vue
  4. 2 2
      src/components/common/CardGrid.vue
  5. 1 0
      src/index.js
  6. 19 4
      yarn.lock

+ 32 - 2
controllers/main.py

@@ -145,7 +145,7 @@ class Purchases(http.Controller):
                 'quantity': 1,
                 'price': variant.standard_price
             } for variant in product.product_variant_ids if variant.active]
-        } for product in request.env['product.template'].search([('purchase_ok', '=', True), ('standard_price', '>', 0), ('active', '=', True)])]
+        } for product in request.env['product.template'].search([('purchase_ok', '=', True), ('standard_price', '>=', 0), ('active', '=', True)])]
         
     '''
         Get all incoming and active picking types
@@ -210,7 +210,7 @@ class Purchases(http.Controller):
     def init_purchase(self, **kw):
         self.make_info_log('Sending JSON response')
 
-        return self.make_response({
+        return self.make_gzip_response({
             'date': self.get_server_date(),
             'user': self.get_user(),
             'currencies': self.get_currencies(),
@@ -319,6 +319,36 @@ class Purchases(http.Controller):
             'state': 'draft'
         })
 
+    '''
+        Confirm purchase order
+    '''
+    def confirm_purchase_order(self, purchase_order_id):
+        purchase_order = request.env['purchase.order'].browse(purchase_order_id)
+        purchase_order.write({
+            'state': 'manual'
+        })
+
+        return purchase_order.action_confirm()
+
+    '''
+        Create invoice from purchase order
+    '''
+    def create_invoice(self, purchase_order_id, currency_id, date_now):
+        purchase_order = request.env['purchase.order'].browse(purchase_order_id)
+        invoice_id = purchase_order.action_invoice_create()
+        invoice = request.env['account.invoice'].browse(invoice_id)
+
+        date_due = parse(date_now) + rd(days=max(invoice.payment_term.line_ids.mapped(lambda x: x.days + x.days2)))
+
+        invoice.write({
+            'currency_id': currency_id,
+            'date_invoice': date_now,
+            'date_due': date_due.strftime(DATE_FORMAT),
+            'state': 'open'
+        })
+
+        return invoice
+
     '''
         Purchase processing resource route
     ''' 

+ 1 - 1
package.json

@@ -27,11 +27,11 @@
 		"webpack-livereload-plugin": "^0.11.0"
 	},
 	"dependencies": {
+		"axios": "^0.17.1",
 		"fuse.js": "^3.2.0",
 		"vue": "^2.4.1",
 		"vue-form-wizard": "^0.7.0",
 		"vue-js-modal": "^1.3.1",
-		"vue-simple-spinner": "^1.2.1",
 		"vuex": "^2.3.1"
 	}
 }

+ 1 - 1
src/App.vue

@@ -91,7 +91,7 @@
                 width: 100%
                 height: 50px
                 position: absolute
-                bottom: 0
+                bottom: 10px
                 .wizard-btn
                     width: 160px
                     height: 40px

+ 2 - 2
src/components/common/CardGrid.vue

@@ -59,8 +59,8 @@
 <style lang="sass">
     .card-grid-wrapper
         width: 100%
-        height: calc(100% - 100px)
-        margin-top: 15px
+        height: calc(100% - 50px)
+        margin-top: 10px
         overflow-y: auto
         .card-grid-loading
             width: 100%

+ 1 - 0
src/index.js

@@ -17,6 +17,7 @@ openerp.eiru_purchases = (instance, local) => {
 
     local.PurchasesWidget = instance.Widget.extend({
         init(parent, action) {
+            this._super(parent)
             this.mode = action.params.mode
         },
         start() {

+ 19 - 4
yarn.lock

@@ -197,6 +197,13 @@ aws4@^1.2.1, aws4@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
 
+axios@^0.17.1:
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.17.1.tgz#2d8e3e5d0bdbd7327f91bc814f5c57660f81824d"
+  dependencies:
+    follow-redirects "^1.2.5"
+    is-buffer "^1.1.5"
+
 babel-code-frame@^6.11.0, babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
@@ -1394,6 +1401,12 @@ debug@^2.2.0, debug@^2.6.8:
   dependencies:
     ms "2.0.0"
 
+debug@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  dependencies:
+    ms "2.0.0"
+
 debug@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
@@ -1726,6 +1739,12 @@ flatten@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
 
+follow-redirects@^1.2.5:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.2.6.tgz#4dcdc7e4ab3dd6765a97ff89c3b4c258117c79bf"
+  dependencies:
+    debug "^3.1.0"
+
 for-in@^0.1.3:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
@@ -4211,10 +4230,6 @@ vue-loader@^12.2.2:
     vue-style-loader "^3.0.0"
     vue-template-es2015-compiler "^1.2.2"
 
-vue-simple-spinner@^1.2.1:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/vue-simple-spinner/-/vue-simple-spinner-1.2.8.tgz#638249e9b25b43424ff906c14f1b7c7ed441ce9d"
-
 vue-style-loader@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-3.0.3.tgz#623658f81506aef9d121cdc113a4f5c9cac32df7"