Skip to content
Snippets Groups Projects
Commit 1ebb4159 authored by Juanjo Menent's avatar Juanjo Menent
Browse files

Merge pull request #5261 from simnandez/develop

Fix Travis error introduced in commit '236ecf01'
parents a5d7c303 99a28a9d
No related branches found
No related tags found
No related merge requests found
<?php <?php
/* Copyright (C) 2013 Cédric Salvador <csalvador@gpcsolutions.fr> /* Copyright (C) 2013 Cédric Salvador <csalvador@gpcsolutions.fr>
* Copyright (C) 2013-2015 Laurent Destaileur <ely@users.sourceforge.net> * Copyright (C) 2013-2016 Laurent Destaileur <ely@users.sourceforge.net>
* Copyright (C) 2014 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2014 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2016 Juanjo Menent <jmenent@2byte.es>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -73,7 +74,7 @@ if (!$sortorder) { ...@@ -73,7 +74,7 @@ if (!$sortorder) {
$virtualdiffersfromphysical=0; $virtualdiffersfromphysical=0;
if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)
|| ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) || ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)
|| ! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE) || ! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE))
{ {
$virtualdiffersfromphysical=1; // According to increase/decrease stock options, virtual and physical stock may differs. $virtualdiffersfromphysical=1; // According to increase/decrease stock options, virtual and physical stock may differs.
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment