From c0820246d7e29de8edd4d8da9cf989da39e1b323 Mon Sep 17 00:00:00 2001
From: Thomas Zilio <Dasc3er@users.noreply.github.com>
Date: Fri, 1 Mar 2019 15:52:30 +0100
Subject: [PATCH] Fix filtro csv e movimentazione articoli

---
 modules/contratti/src/Components/Articolo.php | 21 +------------------
 modules/ddt/src/Components/Articolo.php       |  2 +-
 modules/import/add.php                        |  2 +-
 modules/ordini/src/Components/Articolo.php    |  2 +-
 .../preventivi/src/Components/Articolo.php    | 21 +------------------
 5 files changed, 5 insertions(+), 43 deletions(-)

diff --git a/modules/contratti/src/Components/Articolo.php b/modules/contratti/src/Components/Articolo.php
index 718e14057..1e45ecb44 100644
--- a/modules/contratti/src/Components/Articolo.php
+++ b/modules/contratti/src/Components/Articolo.php
@@ -29,26 +29,7 @@ class Articolo extends Article
 
     public function movimenta($qta)
     {
-        $contratto = $this->contratto;
-        $tipo = $contratto->tipo;
-
-        $numero = $contratto->numero_esterno ?: $contratto->numero;
-        $data = $contratto->data;
-
-        $carico = ($tipo->dir == 'entrata') ? tr('Ripristino articolo da _TYPE_ _NUM_') : tr('Carico magazzino da _TYPE_ numero _NUM_');
-        $scarico = ($tipo->dir == 'entrata') ? tr('Scarico magazzino per _TYPE_ numero _NUM_') : tr('Rimozione articolo da _TYPE_ _NUM_');
-
-        $qta = ($tipo->dir == 'uscita') ? -$qta : $qta;
-        $movimento = ($qta < 0) ? $carico : $scarico;
-
-        $movimento = replace($movimento, [
-            '_TYPE_' => $tipo->descrizione,
-            '_NUM_' => $numero,
-        ]);
-
-        $this->articolo->movimenta(-$qta, $movimento, $data, false, [
-            'iddocumento' => $contratto->id,
-        ]);
+        return;
     }
 
     public function getDirection()
diff --git a/modules/ddt/src/Components/Articolo.php b/modules/ddt/src/Components/Articolo.php
index 285a45ea3..6f7a94c29 100644
--- a/modules/ddt/src/Components/Articolo.php
+++ b/modules/ddt/src/Components/Articolo.php
@@ -48,7 +48,7 @@ class Articolo extends Article
         ]);
 
         $this->articolo->movimenta(-$qta, $movimento, $data, false, [
-            'iddocumento' => $ddt->id,
+            'idddt' => $ddt->id,
         ]);
     }
 
diff --git a/modules/import/add.php b/modules/import/add.php
index 9a17931ac..a14048541 100644
--- a/modules/import/add.php
+++ b/modules/import/add.php
@@ -18,7 +18,7 @@ foreach ($imports as $key => $value) {
 
 	<div class="row">
 		<div class="col-md-6">
-			{[ "type": "file", "label": "<?php echo tr('File'); ?>", "name": "blob", "required": 1 ]}
+			{[ "type": "file", "label": "<?php echo tr('File'); ?>", "name": "blob", "required": 1, "extra": "accept=\".csv\"" ]}
 		</div>
 
 		<div class="col-md-6">
diff --git a/modules/ordini/src/Components/Articolo.php b/modules/ordini/src/Components/Articolo.php
index d8c6be006..bb0dcbc89 100644
--- a/modules/ordini/src/Components/Articolo.php
+++ b/modules/ordini/src/Components/Articolo.php
@@ -48,7 +48,7 @@ class Articolo extends Article
         ]);
 
         $this->articolo->movimenta(-$qta, $movimento, $data, false, [
-            'iddocumento' => $ordine->id,
+            'idordine' => $ordine->id,
         ]);
     }
 
diff --git a/modules/preventivi/src/Components/Articolo.php b/modules/preventivi/src/Components/Articolo.php
index 518c9852d..273c06cc1 100644
--- a/modules/preventivi/src/Components/Articolo.php
+++ b/modules/preventivi/src/Components/Articolo.php
@@ -29,26 +29,7 @@ class Articolo extends Article
 
     public function movimenta($qta)
     {
-        $preventivo = $this->preventivo;
-        $tipo = $preventivo->tipo;
-
-        $numero = $preventivo->numero_esterno ?: $preventivo->numero;
-        $data = $preventivo->data;
-
-        $carico = ($tipo->dir == 'entrata') ? tr('Ripristino articolo da _TYPE_ _NUM_') : tr('Carico magazzino da _TYPE_ numero _NUM_');
-        $scarico = ($tipo->dir == 'entrata') ? tr('Scarico magazzino per _TYPE_ numero _NUM_') : tr('Rimozione articolo da _TYPE_ _NUM_');
-
-        $qta = ($tipo->dir == 'uscita') ? -$qta : $qta;
-        $movimento = ($qta < 0) ? $carico : $scarico;
-
-        $movimento = replace($movimento, [
-            '_TYPE_' => $tipo->descrizione,
-            '_NUM_' => $numero,
-        ]);
-
-        $this->articolo->movimenta(-$qta, $movimento, $data, false, [
-            'iddocumento' => $preventivo->id,
-        ]);
+        return;
     }
 
     public function getDirection()