| @@ -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) { | 
| @@ -51,10 +51,10 @@ discard block | ||
| 51 | 51 | |
| 52 | 52 | |
| 53 | 53 | <?php $days = ["MONDAY", "TUESDAY", "WEDNESDAY", "THURSDAY", "FRIDAY"]; | 
| 54 | -                        foreach ($days as $day){ | |
| 55 | -                            echo "<p> $day : " .getDolGlobalString("MAIN_INFO_OPENINGHOURS_$day")  ."</p>";     | |
| 56 | - } | |
| 57 | - ?> | |
| 54 | +						foreach ($days as $day){ | |
| 55 | +							echo "<p> $day : " .getDolGlobalString("MAIN_INFO_OPENINGHOURS_$day")  ."</p>";     | |
| 56 | + } | |
| 57 | + ?> | |
| 58 | 58 | |
| 59 | 59 | <p> | 
| 60 | 60 | Tel: | 
| @@ -69,8 +69,8 @@ discard block | ||
| 69 | 69 | |
| 70 | 70 | <ul class="social-icon"> | 
| 71 | 71 |                               <?php foreach($mysoc->socialnetworks as $key => $value) { | 
| 72 | -                                print '<li> <a class="btn btn-perso2 btn-floating m-1" href="'. (preg_match('/^http/', $value) ? $value : 'https://www.'.$key.'.com/'.$value).'"><span class="fab fa-'.$key.'"></i></a> </li>'; | |
| 73 | - } ?> | |
| 72 | +								print '<li> <a class="btn btn-perso2 btn-floating m-1" href="'. (preg_match('/^http/', $value) ? $value : 'https://www.'.$key.'.com/'.$value).'"><span class="fab fa-'.$key.'"></i></a> </li>'; | |
| 73 | + } ?> | |
| 74 | 74 | |
| 75 | 75 | |
| 76 | 76 | </ul> | 
| @@ -1,7 +1,7 @@ | ||
| 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); | |
| 5 | - require_once '/home/ldestailleur/git/dolibarr_dev/htdocs/master.inc.php'; | |
| 4 | +	if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1); | |
| 5 | + require_once '/home/ldestailleur/git/dolibarr_dev/htdocs/master.inc.php'; | |
| 6 | 6 | } | 
| 7 | 7 | ?> | 
| @@ -71,32 +71,32 @@ | ||
| 71 | 71 | <br> | 
| 72 | 72 | |
| 73 | 73 | <?php | 
| 74 | -     $weblangs->load("main"); | |
| 74 | +	 $weblangs->load("main"); | |
| 75 | 75 | |
| 76 | -     if (function_exists('getPagesFromSearchCriterias')) | |
| 77 | -     { | |
| 78 | -         if (GETPOSTISSET('s')) | |
| 79 | -         { | |
| 80 | -             $listofpages = getPagesFromSearchCriterias('page', 'meta', GETPOST('s', 'alphanohtml')); | |
| 81 | - if ($listofpages['code'] == 'OK') | |
| 82 | -             { | |
| 83 | - foreach($listofpages['list'] as $websitepagefound) | |
| 84 | -                 { | |
| 85 | - print '<div class="rowsearchresult"><a href="'.$websitepagefound->ref.'.php">'.$websitepagefound->title.'</a> - '.$websitepagefound->description.'</div>'; | |
| 86 | - } | |
| 87 | - } | |
| 88 | - else | |
| 89 | -             { | |
| 90 | - // If error, show message | |
| 91 | - print $listofpages['message']; | |
| 92 | - } | |
| 93 | - } | |
| 94 | - } | |
| 95 | - else | |
| 96 | -     { | |
| 97 | -         print $weblangs->trans("FeatureNotYetAvailable"); | |
| 98 | - } | |
| 99 | - ?> | |
| 76 | +	 if (function_exists('getPagesFromSearchCriterias')) | |
| 77 | +	 { | |
| 78 | +		 if (GETPOSTISSET('s')) | |
| 79 | +		 { | |
| 80 | +			 $listofpages = getPagesFromSearchCriterias('page', 'meta', GETPOST('s', 'alphanohtml')); | |
| 81 | + if ($listofpages['code'] == 'OK') | |
| 82 | +			 { | |
| 83 | + foreach($listofpages['list'] as $websitepagefound) | |
| 84 | +				 { | |
| 85 | + print '<div class="rowsearchresult"><a href="'.$websitepagefound->ref.'.php">'.$websitepagefound->title.'</a> - '.$websitepagefound->description.'</div>'; | |
| 86 | + } | |
| 87 | + } | |
| 88 | + else | |
| 89 | +			 { | |
| 90 | + // If error, show message | |
| 91 | + print $listofpages['message']; | |
| 92 | + } | |
| 93 | + } | |
| 94 | + } | |
| 95 | + else | |
| 96 | +	 { | |
| 97 | +		 print $weblangs->trans("FeatureNotYetAvailable"); | |
| 98 | + } | |
| 99 | + ?> | |
| 100 | 100 | |
| 101 | 101 | <br><br><br><br><br><br> | 
| 102 | 102 | </center> | 
| @@ -99,8 +99,8 @@ | ||
| 99 | 99 | <p class="font-italic text-white">Follow Us:</p> | 
| 100 | 100 | <ul class="list-inline"> | 
| 101 | 101 |                            <?php foreach($mysoc->socialnetworks as $key => $value) { | 
| 102 | -                            print '<li><a class="icon icon-xxs-smallest" href="'.(preg_match('/^http/', $value) ? $value : 'https://www.'.$key.'.com/'.$value).'"><span class="fab fa-'.$key.'" style="margin-left: 5px; font-size: 1.6em"></span></a></li>'; | |
| 103 | - } ?> | |
| 102 | +							print '<li><a class="icon icon-xxs-smallest" href="'.(preg_match('/^http/', $value) ? $value : 'https://www.'.$key.'.com/'.$value).'"><span class="fab fa-'.$key.'" style="margin-left: 5px; font-size: 1.6em"></span></a></li>'; | |
| 103 | + } ?> | |
| 104 | 104 | </ul> | 
| 105 | 105 | </div> | 
| 106 | 106 | </div> | 
| @@ -59,45 +59,45 @@ | ||
| 59 | 59 | <div class="container"><div class="text-align: center"><br> | 
| 60 | 60 | <h2>The crew...</h2><br> <br><br> | 
| 61 | 61 | <?php | 
| 62 | - include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; | |
| 63 | - $websitepage = new WebsitePage($db); | |
| 64 | - $fuser = new User($db); | |
| 65 | - $arrayofusers = array(); | |
| 66 | - $MAXNB=10; | |
| 67 | - $sql='SELECT rowid FROM '.MAIN_DB_PREFIX.'user WHERE statut = 1 and fk_soc IS NULL ORDER BY fk_user DESC LIMIT '.$MAXNB; | |
| 68 | - $resql = $db->query($sql); | |
| 69 | - if (! $resql) dol_print_error($db); | |
| 70 | - while ($obj = $db->fetch_object($resql)) | |
| 71 | -            { | |
| 72 | - $arrayofusers[]=$obj->rowid; | |
| 73 | - } | |
| 62 | + include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; | |
| 63 | + $websitepage = new WebsitePage($db); | |
| 64 | + $fuser = new User($db); | |
| 65 | + $arrayofusers = array(); | |
| 66 | + $MAXNB=10; | |
| 67 | + $sql='SELECT rowid FROM '.MAIN_DB_PREFIX.'user WHERE statut = 1 and fk_soc IS NULL ORDER BY fk_user DESC LIMIT '.$MAXNB; | |
| 68 | + $resql = $db->query($sql); | |
| 69 | + if (! $resql) dol_print_error($db); | |
| 70 | + while ($obj = $db->fetch_object($resql)) | |
| 71 | +			{ | |
| 72 | + $arrayofusers[]=$obj->rowid; | |
| 73 | + } | |
| 74 | 74 | |
| 75 | - print '<div class="row justify-content-sm-center row-40">'; | |
| 76 | - foreach($arrayofusers as $id) | |
| 77 | -            { | |
| 78 | - $fuser->fetch($id); | |
| 75 | + print '<div class="row justify-content-sm-center row-40">'; | |
| 76 | + foreach($arrayofusers as $id) | |
| 77 | +			{ | |
| 78 | + $fuser->fetch($id); | |
| 79 | 79 | |
| 80 | - print '<div class="col-sm-8 col-md-7 col-lg-4">'; | |
| 81 | - print '<div class="container blog-box d-xl-inline-block" style="padding: 20px; box-shadow: -1px 0px 10px 0px rgba(65, 65, 65, 0.12); transition: .3s all ease;">'; | |
| 82 | - print '<div class="post-boxed-img-wrap" style="height: 164px">'; | |
| 83 | -                if ($fuser->photo) print Form::showphoto('userphoto', $fuser, 100, 0, 0, 'photowithmargin', '', 0); | |
| 84 | - //print '<img class="img-circle" src="/viewimage.php?modulepart=userphoto&file='.$fuser->photo.'" width="129" height="129" alt="">'; | |
| 85 | - else print '<img class="img-circle" src="/viewimage.php?modulepart=medias&file=image/template-corporate/daviddoe.png" width="129" height="129" alt="">'; | |
| 86 | - print '</div>'; | |
| 87 | - print '<div class="post-boxed-caption">'; | |
| 88 | - print '<div class="post-boxed-title font-weight-bold">'.$fuser->firstname.'</div>'; | |
| 89 | - print '<ul class="list-inline list-inline-dashed text-uppercase">'; | |
| 90 | - //print '<li>September 24, 2018</li>'; | |
| 91 | - if ($fuser->job) print '<li><span class="text-primary">'.$fuser->job.'</span></li>'; | |
| 92 | - else print '<li></li>'; | |
| 93 | - print '</ul>'; | |
| 94 | - print '</div>'; | |
| 95 | - print '</div>'; | |
| 96 | - print '</div>'; | |
| 97 | - } | |
| 98 | - print '</div>'; | |
| 80 | + print '<div class="col-sm-8 col-md-7 col-lg-4">'; | |
| 81 | + print '<div class="container blog-box d-xl-inline-block" style="padding: 20px; box-shadow: -1px 0px 10px 0px rgba(65, 65, 65, 0.12); transition: .3s all ease;">'; | |
| 82 | + print '<div class="post-boxed-img-wrap" style="height: 164px">'; | |
| 83 | +				if ($fuser->photo) print Form::showphoto('userphoto', $fuser, 100, 0, 0, 'photowithmargin', '', 0); | |
| 84 | + //print '<img class="img-circle" src="/viewimage.php?modulepart=userphoto&file='.$fuser->photo.'" width="129" height="129" alt="">'; | |
| 85 | + else print '<img class="img-circle" src="/viewimage.php?modulepart=medias&file=image/template-corporate/daviddoe.png" width="129" height="129" alt="">'; | |
| 86 | + print '</div>'; | |
| 87 | + print '<div class="post-boxed-caption">'; | |
| 88 | + print '<div class="post-boxed-title font-weight-bold">'.$fuser->firstname.'</div>'; | |
| 89 | + print '<ul class="list-inline list-inline-dashed text-uppercase">'; | |
| 90 | + //print '<li>September 24, 2018</li>'; | |
| 91 | + if ($fuser->job) print '<li><span class="text-primary">'.$fuser->job.'</span></li>'; | |
| 92 | + else print '<li></li>'; | |
| 93 | + print '</ul>'; | |
| 94 | + print '</div>'; | |
| 95 | + print '</div>'; | |
| 96 | + print '</div>'; | |
| 97 | + } | |
| 98 | + print '</div>'; | |
| 99 | 99 | |
| 100 | - ?> | |
| 100 | + ?> | |
| 101 | 101 | </div></div> | 
| 102 | 102 | </section> | 
| 103 | 103 | |