@@ -20,7 +20,6 @@ |
||
20 | 20 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; |
21 | 21 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
22 | 22 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
23 | - |
|
24 | 23 | use AppBundle\Entity\Inventory; |
25 | 24 | use AppBundle\Form\Type\InventoryType; |
26 | 25 | use AppBundle\Entity\InventoryArticles; |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | */ |
291 | 291 | public function printAction(Inventory $inventory) |
292 | 292 | { |
293 | - $file = $inventory->getDate()->format('Ymd') . '-inventory.pdf'; |
|
293 | + $file = $inventory->getDate()->format('Ymd').'-inventory.pdf'; |
|
294 | 294 | // Créer et enregistrer le fichier PDF à imprimer |
295 | 295 | $html = $this->renderView( |
296 | 296 | 'AppBundle:Inventory:print.pdf.twig', |
@@ -307,7 +307,7 @@ discard block |
||
307 | 307 | 200, |
308 | 308 | array( |
309 | 309 | 'Content-Type' => 'application/pdf', |
310 | - 'Content-Disposition' => 'attachment; filename="' . $file . '"' |
|
310 | + 'Content-Disposition' => 'attachment; filename="'.$file.'"' |
|
311 | 311 | ) |
312 | 312 | ); |
313 | 313 | } |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | /** |
155 | 155 | * Get amount |
156 | 156 | * |
157 | - * @return string |
|
157 | + * @return double |
|
158 | 158 | */ |
159 | 159 | public function getAmount() |
160 | 160 | { |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | /** |
178 | 178 | * Get status |
179 | 179 | * |
180 | - * @return integer |
|
180 | + * @return boolean |
|
181 | 181 | */ |
182 | 182 | public function getStatus() |
183 | 183 | { |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | /** |
211 | 211 | * Get articles |
212 | 212 | * |
213 | - * @return \Doctrine\Common\Collections\Collection |
|
213 | + * @return string |
|
214 | 214 | */ |
215 | 215 | public function getArticles() |
216 | 216 | { |
@@ -209,7 +209,7 @@ |
||
209 | 209 | /** |
210 | 210 | * Get unit_storage |
211 | 211 | * |
212 | - * @return \AppBundle\Entity\UnitStorage |
|
212 | + * @return string |
|
213 | 213 | */ |
214 | 214 | public function getUnitStorage() |
215 | 215 | { |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace AppBundle\Entity; |
4 | 4 | |
5 | 5 | use Doctrine\ORM\Mapping as ORM; |
6 | -use Doctrine\Common\Collections\ArrayCollection; |
|
7 | 6 | |
8 | 7 | /** |
9 | 8 | * InventoryArticles |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | */ |
34 | 34 | protected function setOrder($name, $field, $type = 'ASC') |
35 | 35 | { |
36 | - $this->getRequest()->getSession()->set('sort.' . $name, array('field' => $field, 'type' => $type)); |
|
36 | + $this->getRequest()->getSession()->set('sort.'.$name, array('field' => $field, 'type' => $type)); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | /** |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | { |
47 | 47 | $session = $this->getRequest()->getSession(); |
48 | 48 | |
49 | - return $session->has('sort.' . $name) ? $session->get('sort.' . $name) : null; |
|
49 | + return $session->has('sort.'.$name) ? $session->get('sort.'.$name) : null; |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | /** |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | { |
60 | 60 | $alias = current($qb->getDQLPart('from'))->getAlias(); |
61 | 61 | if (is_array($order = $this->getOrder($name))) { |
62 | - $qb->orderBy($alias . '.' . $order['field'], $order['type']); |
|
62 | + $qb->orderBy($alias.'.'.$order['field'], $order['type']); |
|
63 | 63 | } |
64 | 64 | } |
65 | 65 | |
@@ -92,9 +92,9 @@ discard block |
||
92 | 92 | $url = null; |
93 | 93 | // Go to installActions |
94 | 94 | } else { |
95 | - foreach ($inventories as $inventory){ |
|
95 | + foreach ($inventories as $inventory) { |
|
96 | 96 | if ($inventory->getstatus() === 1 || $inventory->getStatus() === 2) { |
97 | - $message = $this->get('translator')->trans('yet',array(),'gs_inventories'); |
|
97 | + $message = $this->get('translator')->trans('yet', array(), 'gs_inventories'); |
|
98 | 98 | $this->addFlash('danger', $message); |
99 | 99 | $url = 'inventory'; |
100 | 100 | break; |