@@ -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} |
@@ -623,15 +623,15 @@ |
||
| 623 | 623 | */ |
| 624 | 624 | |
| 625 | 625 | /** |
| 626 | - * Close a shipment (Classify it as "Delivered") |
|
| 627 | - * |
|
| 628 | - * @param int $id Expedition ID |
|
| 629 | - * @param int $notrigger Disabled triggers |
|
| 630 | - * |
|
| 631 | - * @url POST {id}/close |
|
| 632 | - * |
|
| 633 | - * @return object |
|
| 634 | - */ |
|
| 626 | + * Close a shipment (Classify it as "Delivered") |
|
| 627 | + * |
|
| 628 | + * @param int $id Expedition ID |
|
| 629 | + * @param int $notrigger Disabled triggers |
|
| 630 | + * |
|
| 631 | + * @url POST {id}/close |
|
| 632 | + * |
|
| 633 | + * @return object |
|
| 634 | + */ |
|
| 635 | 635 | public function close($id, $notrigger = 0) |
| 636 | 636 | { |
| 637 | 637 | if (!DolibarrApiAccess::$user->rights->expedition->creer) { |
@@ -25,9 +25,11 @@ |
||
| 25 | 25 | * |
| 26 | 26 | * @return void |
| 27 | 27 | */ |
| 28 | - public function do() |
|
| 28 | + public function do { |
|
| 29 | + () |
|
| 29 | 30 | { |
| 30 | 31 | global $globalaaa, $globalbbb; |
| 32 | + } |
|
| 31 | 33 | echo 'dobbb'."\n"; |
| 32 | 34 | $globalaaa.='+bbb'; |
| 33 | 35 | $globalbbb.='+bbb'; |
@@ -27,8 +27,10 @@ |
||
| 27 | 27 | * |
| 28 | 28 | * @return void |
| 29 | 29 | */ |
| 30 | - public function do() |
|
| 30 | + public function do { |
|
| 31 | + () |
|
| 31 | 32 | { |
| 32 | 33 | echo 'doaaa'."\n"; |
| 33 | 34 | } |
| 35 | + } |
|
| 34 | 36 | } |
@@ -1,4 +1,8 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | // File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page |
| 3 | 3 | global $dolibarr_main_data_root; |
| 4 | -if (empty($dolibarr_main_data_root)) require './page80.tpl.php'; else require $dolibarr_main_data_root.'/website/'.$website->ref.'/page80.tpl.php'; |
|
| 4 | +if (empty($dolibarr_main_data_root)) { |
|
| 5 | + require './page80.tpl.php'; |
|
| 6 | +} else { |
|
| 7 | + require $dolibarr_main_data_root.'/website/'.$website->ref.'/page80.tpl.php'; |
|
| 8 | +} |
|
@@ -1,6 +1,8 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | // File generated to link to the master file - DO NOT MODIFY - It is just an include |
| 3 | 3 | if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { |
| 4 | - if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1); |
|
| 4 | + if (! defined('USEEXTERNALSERVER')) { |
|
| 5 | + define('USEEXTERNALSERVER', 1); |
|
| 6 | + } |
|
| 5 | 7 | require_once '/var/www/html/dolibarr_dev/htdocs/master.inc.php'; |
| 6 | 8 | } |
@@ -1,5 +1,7 @@ discard block |
||
| 1 | 1 | <?php // BEGIN PHP |
| 2 | -$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__; |
|
| 2 | +$websitekey=basename(__DIR__); if (empty($websitepagefile)) { |
|
| 3 | + $websitepagefile=__FILE__; |
|
| 4 | +} |
|
| 3 | 5 | if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { |
| 4 | 6 | $pathdepth = count(explode('/', $_SERVER['SCRIPT_NAME'])) - 2; |
| 5 | 7 | require_once $pathdepth ? str_repeat('../', $pathdepth) : './'.'master.inc.php'; |
@@ -26,7 +28,10 @@ discard block |
||
| 26 | 28 | <!-- Include link to JS file --> |
| 27 | 29 | <script async src="/javascript.js.php"></script> |
| 28 | 30 | <!-- Include HTML header from common file --> |
| 29 | -<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html"; ?> |
|
| 31 | +<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) { |
|
| 32 | + include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html"; |
|
| 33 | +} |
|
| 34 | +?> |
|
| 30 | 35 | <!-- Include HTML header from page header block --> |
| 31 | 36 | <head> |
| 32 | 37 | <meta charset="UTF-8" /> |