| @@ -126,8 +126,8 @@ | ||
| 126 | 126 | public $usage_bill_time; // Is the time spent on project must be invoiced or not | 
| 127 | 127 | |
| 128 | 128 | /** | 
| 129 | - * @var integer Event organization: Use Event Organization | |
| 130 | - */ | |
| 129 | + * @var integer Event organization: Use Event Organization | |
| 130 | + */ | |
| 131 | 131 | public $usage_organize_event; | 
| 132 | 132 | |
| 133 | 133 | /** | 
| @@ -916,7 +916,7 @@ | ||
| 916 | 916 | /** | 
| 917 | 917 | * @var array $suffix2numAsked map HTTP query parameter suffixes (like '1_0') to line indices so that | 
| 918 | 918 | * extrafields from HTTP query can be assigned to the correct dispatch line | 
| 919 | - */ | |
| 919 | + */ | |
| 920 | 920 | $suffix2numAsked = array(); | 
| 921 | 921 | $dispatchLines = array(); | 
| 922 | 922 | |
| @@ -156,7 +156,7 @@ | ||
| 156 | 156 | * $price Can be set to update AWP (Average Weighted Price) when you make a stock increase | 
| 157 | 157 | * $dlc Eat-by date. Will be used if lot does not exists yet and will be created. | 
| 158 | 158 | * $dluo Sell-by date. Will be used if lot does not exists yet and will be created. | 
| 159 | - * | |
| 159 | + * | |
| 160 | 160 |  	 * @param int $product_id Id product id {@min 1} {@from body} {@required true} | 
| 161 | 161 |  	 * @param int $warehouse_id Id warehouse {@min 1} {@from body} {@required true} | 
| 162 | 162 |  	 * @param float $qty Qty to add (Use negative value for a stock decrease) {@from body} {@required true} | 
| @@ -2387,14 +2387,14 @@ | ||
| 2387 | 2387 | } | 
| 2388 | 2388 | |
| 2389 | 2389 | /** | 
| 2390 | - * Export format : iSuite Expert | |
| 2391 | - * | |
| 2392 | - * by OpenSolus [https://opensolus.fr] | |
| 2393 | - * | |
| 2390 | + * Export format : iSuite Expert | |
| 2391 | + * | |
| 2392 | + * by OpenSolus [https://opensolus.fr] | |
| 2393 | + * | |
| 2394 | 2394 | * @param array $objectLines data | 
| 2395 | 2395 | * @param resource $exportFile [=null] File resource to export or print if null | 
| 2396 | 2396 | * @return void | 
| 2397 | - */ | |
| 2397 | + */ | |
| 2398 | 2398 | public function exportiSuiteExpert($objectLines, $exportFile = null) | 
| 2399 | 2399 |  	{ | 
| 2400 | 2400 | $separator = ';'; | 
| @@ -21,11 +21,11 @@ | ||
| 21 | 21 | protected $openned = false; | 
| 22 | 22 | protected $filename; | 
| 23 | 23 | protected $pclzip; | 
| 24 | - /** | |
| 25 | - * Class constructor | |
| 26 | - * | |
| 27 | - * @throws PclZipProxyException | |
| 28 | - */ | |
| 24 | + /** | |
| 25 | + * Class constructor | |
| 26 | + * | |
| 27 | + * @throws PclZipProxyException | |
| 28 | + */ | |
| 29 | 29 | public function __construct($forcedir='') | 
| 30 | 30 |  	{ | 
| 31 | 31 |  		if (! class_exists('PclZip')) { | 
| @@ -17,11 +17,11 @@ | ||
| 17 | 17 |  { | 
| 18 | 18 | protected $zipArchive; | 
| 19 | 19 | protected $filename; | 
| 20 | - /** | |
| 21 | - * Class constructor | |
| 22 | - * | |
| 23 | - * @throws PhpZipProxyException | |
| 24 | - */ | |
| 20 | + /** | |
| 21 | + * Class constructor | |
| 22 | + * | |
| 23 | + * @throws PhpZipProxyException | |
| 24 | + */ | |
| 25 | 25 | public function __construct() | 
| 26 | 26 |  	{ | 
| 27 | 27 |  		if (! class_exists('ZipArchive')) { | 
| @@ -10,41 +10,41 @@ | ||
| 10 | 10 | */ | 
| 11 | 11 | class SegmentIterator implements RecursiveIterator | 
| 12 | 12 |  { | 
| 13 | - private $ref; | |
| 14 | - private $key; | |
| 15 | - public function __construct(array $ref) | |
| 16 | -    { | |
| 17 | - $this->ref = $ref; | |
| 18 | - $this->key = 0; | |
| 19 | - $this->keys = array_keys($this->ref); | |
| 20 | - } | |
| 21 | - public function hasChildren() | |
| 22 | -    { | |
| 23 | - return $this->valid() && $this->current() instanceof Segment; | |
| 24 | - } | |
| 25 | - public function current() | |
| 26 | -    { | |
| 27 | - return $this->ref[$this->keys[$this->key]]; | |
| 28 | - } | |
| 29 | - function getChildren() | |
| 30 | -    { | |
| 31 | - return new self($this->current()->children); | |
| 32 | - } | |
| 33 | - public function key() | |
| 34 | -    { | |
| 35 | - return $this->key; | |
| 36 | - } | |
| 37 | - public function valid() | |
| 38 | -    { | |
| 39 | - return array_key_exists($this->key, $this->keys); | |
| 40 | - } | |
| 41 | - public function rewind() | |
| 42 | -    { | |
| 43 | - $this->key = 0; | |
| 44 | - } | |
| 45 | - public function next() | |
| 46 | -    { | |
| 47 | - $this->key ++; | |
| 48 | - } | |
| 13 | + private $ref; | |
| 14 | + private $key; | |
| 15 | + public function __construct(array $ref) | |
| 16 | +	{ | |
| 17 | + $this->ref = $ref; | |
| 18 | + $this->key = 0; | |
| 19 | + $this->keys = array_keys($this->ref); | |
| 20 | + } | |
| 21 | + public function hasChildren() | |
| 22 | +	{ | |
| 23 | + return $this->valid() && $this->current() instanceof Segment; | |
| 24 | + } | |
| 25 | + public function current() | |
| 26 | +	{ | |
| 27 | + return $this->ref[$this->keys[$this->key]]; | |
| 28 | + } | |
| 29 | + function getChildren() | |
| 30 | +	{ | |
| 31 | + return new self($this->current()->children); | |
| 32 | + } | |
| 33 | + public function key() | |
| 34 | +	{ | |
| 35 | + return $this->key; | |
| 36 | + } | |
| 37 | + public function valid() | |
| 38 | +	{ | |
| 39 | + return array_key_exists($this->key, $this->keys); | |
| 40 | + } | |
| 41 | + public function rewind() | |
| 42 | +	{ | |
| 43 | + $this->key = 0; | |
| 44 | + } | |
| 45 | + public function next() | |
| 46 | +	{ | |
| 47 | + $this->key ++; | |
| 48 | + } | |
| 49 | 49 | } | 
| 50 | 50 | |
| @@ -156,17 +156,17 @@ | ||
| 156 | 156 | } | 
| 157 | 157 | |
| 158 | 158 | /** | 
| 159 | - * Function to replace macros for invoice short and long month, invoice year | |
| 160 | - * | |
| 161 | - * Substitution occur when the invoice is generated, not considering the invoice date | |
| 162 | - * so do not (re)generate in a diferent date than the one that the invoice belongs to | |
| 163 | - * Perhaps it would be better to use the invoice issued date but I still do not know | |
| 164 | - * how to get it here | |
| 165 | - * | |
| 166 | - * Miguel Erill 09/04/2017 | |
| 167 | - * | |
| 168 | - * @param string $value String to convert | |
| 169 | - */ | |
| 159 | + * Function to replace macros for invoice short and long month, invoice year | |
| 160 | + * | |
| 161 | + * Substitution occur when the invoice is generated, not considering the invoice date | |
| 162 | + * so do not (re)generate in a diferent date than the one that the invoice belongs to | |
| 163 | + * Perhaps it would be better to use the invoice issued date but I still do not know | |
| 164 | + * how to get it here | |
| 165 | + * | |
| 166 | + * Miguel Erill 09/04/2017 | |
| 167 | + * | |
| 168 | + * @param string $value String to convert | |
| 169 | + */ | |
| 170 | 170 | public function macroReplace($text) | 
| 171 | 171 |  	{ | 
| 172 | 172 | include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; | 
| @@ -15,5 +15,5 @@ | ||
| 15 | 15 | // If possible, use a disk cache to enable attaching large attachments etc. | 
| 16 | 16 | // You can override the default temporary directory by setting the TMPDIR environment variable. | 
| 17 | 17 |  if (@is_writable($tmpDir = sys_get_temp_dir())) { | 
| 18 | -    $preferences->setTempDir($tmpDir)->setCacheType('disk'); | |
| 18 | +	$preferences->setTempDir($tmpDir)->setCacheType('disk'); | |
| 19 | 19 | } |