\n"; $this->createTranslationFile($destPath, $my_destlang); } - else - { + else { echo "Updating file: " . $destPath . "
\n"; } // Translate lines $fileContentDest = file($destPath, FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES); $newlines=0; - foreach($fileContent as $line){ + foreach ($fileContent as $line){ $key = $this->getLineKey($line); $value = $this->getLineValue($line); if ($key && $value) @@ -167,7 +166,7 @@ class autoTranslator fwrite($fp, "\n"); fwrite($fp, "// START - Lines generated via autotranslator.php tool (".$this->_time.").\n"); fwrite($fp, "// Reference language: ".$this->_refLang." -> ".$my_destlang."\n"); - foreach($this->_translatedFiles[$file] as $line) { + foreach ($this->_translatedFiles[$file] as $line) { fwrite($fp, $line . "\n"); } fwrite($fp, "// STOP - Lines generated via autotranslator.php tool (".$this->_time_end.").\n"); @@ -209,7 +208,7 @@ class autoTranslator { //print "key =".$key."\n"; - foreach($content as $line) { + foreach ($content as $line) { $destKey = $this->getLineKey($line); $destValue = $this->getLineValue($line); // If translated return @@ -273,8 +272,8 @@ class autoTranslator private function getTranslationFilesArray($lang) { $dir = new DirectoryIterator($this->_langDir.$lang); - while($dir->valid()) { - if(!$dir->isDot() && $dir->isFile() && ! preg_match('/^\./', $dir->getFilename())) { + while ($dir->valid()) { + if (!$dir->isDot() && $dir->isFile() && ! preg_match('/^\./', $dir->getFilename())) { $files[] = $dir->getFilename(); } $dir->next(); diff --git a/dev/translation/sanity_check_en_langfiles.php b/dev/translation/sanity_check_en_langfiles.php index f568ba2b04b..0268fc94ed8 100755 --- a/dev/translation/sanity_check_en_langfiles.php +++ b/dev/translation/sanity_check_en_langfiles.php @@ -360,16 +360,14 @@ if ((! empty($_REQUEST['unused']) && $_REQUEST['unused'] == 'true') || (isset($a $unused[$value] = $line; echo $line; // $trad contains the \n } - else - { + else { unset($output); //print 'X'.$output.'Y'; } } if (empty($unused)) print "No string not used found.\n"; - else - { + else { $filetosave='/tmp/'.($argv[2]?$argv[2]:"").'notused.lang'; print "Strings in en_US that are never used are saved into file ".$filetosave.":\n"; file_put_contents($filetosave, implode("", $unused)); diff --git a/dev/translation/strip_language_file.php b/dev/translation/strip_language_file.php index ce28ca5de63..adc5a706d06 100755 --- a/dev/translation/strip_language_file.php +++ b/dev/translation/strip_language_file.php @@ -80,8 +80,8 @@ $aEnglish = array(); if ($filesToProcess == 'all') { $dir = new DirectoryIterator('htdocs/langs/'.$lPrimary); - while($dir->valid()) { - if(!$dir->isDot() && $dir->isFile() && ! preg_match('/^\./', $dir->getFilename())) { + while ($dir->valid()) { + if (!$dir->isDot() && $dir->isFile() && ! preg_match('/^\./', $dir->getFilename())) { $files[] = $dir->getFilename(); } $dir->next(); @@ -94,7 +94,7 @@ else $filesToProcess=explode(',', $filesToProcess); // Loop on each file -foreach($filesToProcess as $fileToProcess) +foreach ($filesToProcess as $fileToProcess) { $lPrimaryFile = 'htdocs/langs/'.$lPrimary.'/'.$fileToProcess; $lSecondaryFile = 'htdocs/langs/'.$lSecondary.'/'.$fileToProcess; @@ -250,11 +250,11 @@ foreach($filesToProcess as $fileToProcess) { if ( ! $oh = fopen($output, 'w') ) { - print "ERROR in writing to file $output\n"; + print "ERROR in writing to file ".$output."\n"; exit; } - print "Read Primary File $lPrimaryFile and write ".$output.":\n"; + print "Read Primary File ".$lPrimaryFile." and write ".$output.":\n"; fwrite($oh, "# Dolibarr language file - Source file is en_US - ".(preg_replace('/\.lang$/', '', $fileToProcess))."\n"); @@ -285,8 +285,7 @@ foreach($filesToProcess as $fileToProcess) print "Key $key is redundant in file $lPrimaryFile (line: $cnt) - Already found into ".$fileFirstFound[$key]." (line: ".$lineFirstFound[$key].").\n"; continue; } - else - { + else { $fileFirstFound[$key] = $fileToProcess; $lineFirstFound[$key] = $cnt; } diff --git a/dev/translation/txpull.sh b/dev/translation/txpull.sh index fcccae98221..1b0ce7614c5 100755 --- a/dev/translation/txpull.sh +++ b/dev/translation/txpull.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash #------------------------------------------------------ # Script to pull language files to Transifex # @@ -33,8 +33,16 @@ if [ "x$1" = "xall" ] then if [ "x$2" = "x" ] then - echo "tx pull" - tx pull + echo "tx pull -a" + tx pull -a + + echo "Remove some language directories (not enough translated)" + rm -fr htdocs/langs/ach + rm -fr htdocs/langs/br_FR + rm -fr htdocs/langs/en + rm -fr htdocs/langs/frp + rm -fr htdocs/langs/fy_NL + else for dir in `find htdocs/langs/* -type d` do diff --git a/dev/translation/txpush.sh b/dev/translation/txpush.sh index 428f7b8cbc2..ef8da74dde9 100755 --- a/dev/translation/txpush.sh +++ b/dev/translation/txpush.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash #------------------------------------------------------ # Script to push language files to Transifex # diff --git a/doc/images/dolibarr.gif b/doc/images/dolibarr.gif deleted file mode 100644 index 7e6ac330fb1..00000000000 Binary files a/doc/images/dolibarr.gif and /dev/null differ diff --git a/doc/images/dolibarr.ico b/doc/images/dolibarr.ico deleted file mode 100644 index 611e4bf150e..00000000000 Binary files a/doc/images/dolibarr.ico and /dev/null differ diff --git a/doc/images/dolibarr_120x90.png b/doc/images/dolibarr_120x90.png deleted file mode 100644 index 88335ae1849..00000000000 Binary files a/doc/images/dolibarr_120x90.png and /dev/null differ diff --git a/doc/images/dolibarr_124x124.png b/doc/images/dolibarr_124x124.png deleted file mode 100644 index 43608028278..00000000000 Binary files a/doc/images/dolibarr_124x124.png and /dev/null differ diff --git a/doc/images/dolibarr_192x192.png b/doc/images/dolibarr_192x192.png deleted file mode 100644 index 8b4c4a27622..00000000000 Binary files a/doc/images/dolibarr_192x192.png and /dev/null differ diff --git a/doc/images/dolibarr_256x256.png b/doc/images/dolibarr_256x256.png deleted file mode 100644 index 3c3c61008ad..00000000000 Binary files a/doc/images/dolibarr_256x256.png and /dev/null differ diff --git a/doc/images/dolibarr_256x256_black.png b/doc/images/dolibarr_256x256_black.png new file mode 100644 index 00000000000..d89b44bf6ca Binary files /dev/null and b/doc/images/dolibarr_256x256_black.png differ diff --git a/doc/images/dolibarr_256x256_black.svg b/doc/images/dolibarr_256x256_black.svg new file mode 100644 index 00000000000..727387b5068 --- /dev/null +++ b/doc/images/dolibarr_256x256_black.svg @@ -0,0 +1,313 @@ + + + + diff --git a/doc/images/dolibarr_256x256_color.png b/doc/images/dolibarr_256x256_color.png new file mode 100644 index 00000000000..417387d6a27 Binary files /dev/null and b/doc/images/dolibarr_256x256_color.png differ diff --git a/doc/images/dolibarr_256x256_color.svg b/doc/images/dolibarr_256x256_color.svg new file mode 100644 index 00000000000..5115a8f7b91 --- /dev/null +++ b/doc/images/dolibarr_256x256_color.svg @@ -0,0 +1,123 @@ + + + + diff --git a/doc/images/dolibarr_256x256_white.jpg b/doc/images/dolibarr_256x256_white.jpg new file mode 100644 index 00000000000..e5c4e260ba7 Binary files /dev/null and b/doc/images/dolibarr_256x256_white.jpg differ diff --git a/doc/images/dolibarr_256x256_white.png b/doc/images/dolibarr_256x256_white.png new file mode 100644 index 00000000000..b8fa1fef076 Binary files /dev/null and b/doc/images/dolibarr_256x256_white.png differ diff --git a/doc/images/dolibarr_256x256_white.svg b/doc/images/dolibarr_256x256_white.svg new file mode 100644 index 00000000000..79a8c9d1241 --- /dev/null +++ b/doc/images/dolibarr_256x256_white.svg @@ -0,0 +1,327 @@ + + + + diff --git a/doc/images/dolibarr_48x48.png b/doc/images/dolibarr_48x48.png deleted file mode 100644 index 557eed6a7c0..00000000000 Binary files a/doc/images/dolibarr_48x48.png and /dev/null differ diff --git a/doc/images/dolibarr_512x512.png b/doc/images/dolibarr_512x512.png deleted file mode 100644 index bbe16cbc6db..00000000000 Binary files a/doc/images/dolibarr_512x512.png and /dev/null differ diff --git a/doc/images/dolibarr_512x512_color.png b/doc/images/dolibarr_512x512_color.png new file mode 100644 index 00000000000..a1766d07fe3 Binary files /dev/null and b/doc/images/dolibarr_512x512_color.png differ diff --git a/doc/images/dolibarr_73x73.png b/doc/images/dolibarr_73x73.png deleted file mode 100644 index 8c86522a37a..00000000000 Binary files a/doc/images/dolibarr_73x73.png and /dev/null differ diff --git a/doc/images/dolibarr_favicon.ico b/doc/images/dolibarr_favicon.ico new file mode 100644 index 00000000000..b93a86747d6 Binary files /dev/null and b/doc/images/dolibarr_favicon.ico differ diff --git a/doc/images/dolibarr_logo.jpg b/doc/images/dolibarr_logo.jpg index 69de0129523..a4a0611067d 100644 Binary files a/doc/images/dolibarr_logo.jpg and b/doc/images/dolibarr_logo.jpg differ diff --git a/doc/images/dolibarr_logo.png b/doc/images/dolibarr_logo.png old mode 100644 new mode 100755 index 48e71a064cc..9a0781ce2ea Binary files a/doc/images/dolibarr_logo.png and b/doc/images/dolibarr_logo.png differ diff --git a/doc/images/dolibarr_logo.svg b/doc/images/dolibarr_logo.svg new file mode 100644 index 00000000000..9c9259d0b33 --- /dev/null +++ b/doc/images/dolibarr_logo.svg @@ -0,0 +1,209 @@ + + + + diff --git a/doc/images/dolibarr_screenshot11_1024x768.jpg b/doc/images/dolibarr_screenshot11_1024x768.jpg new file mode 100644 index 00000000000..65c246353a7 Binary files /dev/null and b/doc/images/dolibarr_screenshot11_1024x768.jpg differ diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php index cf00519e9d7..f6a4adac21e 100644 --- a/htdocs/accountancy/admin/account.php +++ b/htdocs/accountancy/admin/account.php @@ -119,8 +119,7 @@ if (empty($reshook)) { $obj = $db->fetch_object($resql); $country_code = $obj->code; - } - else dol_print_error($db); + } else dol_print_error($db); // Try to load sql file if ($country_code) @@ -143,9 +142,7 @@ if (empty($reshook)) if ($result > 0) { setEventMessages($langs->trans("ChartLoaded"), null, 'mesgs'); - } - else - { + } else { setEventMessages($langs->trans("ErrorDuringChartLoad"), null, 'warnings'); } } @@ -235,8 +232,7 @@ if (strlen(trim($search_account))) { } $sql .= " AND (aa.account_number LIKE '".$startchar.$search_account_tmp_clean."'"; $sql .= " OR aa.account_number LIKE '".$startchar.$search_account_clean."%')"; - } - else $sql .= natural_search("aa.account_number", $search_account_tmp); + } else $sql .= natural_search("aa.account_number", $search_account_tmp); } } if (strlen(trim($search_label))) $sql .= natural_search("aa.label", $search_label); @@ -267,7 +263,7 @@ if ($resql) { $num = $db->num_rows($resql); - $param = ''; + $param = ''; if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage; if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit; if ($search_account) $param .= '&search_account='.urlencode($search_account); @@ -328,8 +324,7 @@ if ($resql) $i++; } - } - else dol_print_error($db); + } else dol_print_error($db); print ""; print ajax_combobox("chartofaccounts"); print ''; @@ -431,9 +426,7 @@ if ($resql) print $accountparent->getNomUrl(1); print "\n"; if (!$i) $totalarray['nbfield']++; - } - else - { + } else { print '
'; + if ($productstatic->id > 0) print $productstatic->getNomUrl(1); + if ($productstatic->id > 0 && $objp->product_label) print '
'; if ($objp->product_label) print ''.$objp->product_label.''; print '
'.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NoAccountSelected").'
';
$ko++;
- }
- else
- {
+ } else {
$sql = " UPDATE ".MAIN_DB_PREFIX."facturedet";
$sql .= " SET fk_code_ventilation = ".$monCompte;
$sql .= " WHERE rowid = ".$monId;
@@ -629,8 +627,7 @@ if ($result) {
$suggestedid = $tmpaccount->id;
}
$accountingaccount_codetotid_cache[$objp->code_sell_l] = $tmpaccount->id;
- }
- else {
+ } else {
$suggestedid = $accountingaccount_codetotid_cache[$objp->code_sell_l];
}
}
diff --git a/htdocs/accountancy/expensereport/card.php b/htdocs/accountancy/expensereport/card.php
index 36d587e0c99..8b04ca74c81 100644
--- a/htdocs/accountancy/expensereport/card.php
+++ b/htdocs/accountancy/expensereport/card.php
@@ -63,9 +63,7 @@ if ($action == 'ventil' && $user->rights->accounting->bind->write)
$resql = $db->query($sql);
if (!$resql) {
setEventMessages($db->lasterror(), null, 'errors');
- }
- else
- {
+ } else {
setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
if ($backtopage)
{
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index 387cfd0fb8e..9fe07b18a37 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -43,8 +43,7 @@ if (!$user->rights->accounting->bind->write)
$month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
if (GETPOST("year", 'int')) $year_start = GETPOST("year", 'int');
-else
-{
+else {
$year_start = dol_print_date(dol_now(), '%Y');
if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--; // If current month is lower that starting fiscal month, we start last year
}
@@ -190,15 +189,13 @@ if ($resql) {
if ($row[0] == 'tobind')
{
print $langs->trans("Unknown");
- }
- else print length_accountg($row[0]);
+ } else print length_accountg($row[0]);
print '';
print '';
if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CB']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CB'] < 0)
{
$langs->load("errors");
print 'transnoentitiesnoconv("CashDesk"))).'" />';
- }
- else print '';
+ } else print '';
print '
';
print '';
if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE'] < 0)
{
$langs->load("errors");
print 'transnoentitiesnoconv("CashDesk")).'" />';
- }
- else print '';
+ } else print '';
print '
';
print '';
print '
';
diff --git a/htdocs/cashdesk/tpl/liste_articles.tpl.php b/htdocs/cashdesk/tpl/liste_articles.tpl.php
index 6fffbd3ed52..bd73954f6a0 100644
--- a/htdocs/cashdesk/tpl/liste_articles.tpl.php
+++ b/htdocs/cashdesk/tpl/liste_articles.tpl.php
@@ -49,8 +49,7 @@ $tab = (!empty($_SESSION['poscart']) ? $_SESSION['poscart'] : array());
$tab_size = count($tab);
if ($tab_size <= 0) print '
'; -else -{ +else { for ($i = 0; $i < $tab_size; $i++) { echo ('
'.$langs->trans("NoArticle").'
'; -else -{ +else { for ($i = 0; $i < $tab_size; $i++) { echo ('
'."\n");
diff --git a/htdocs/cashdesk/tpl/validation1.tpl.php b/htdocs/cashdesk/tpl/validation1.tpl.php
index 3b38aba3159..6fe42b35aa4 100644
--- a/htdocs/cashdesk/tpl/validation1.tpl.php
+++ b/htdocs/cashdesk/tpl/validation1.tpl.php
@@ -40,9 +40,7 @@ $langs->loadLangs(array("main", "bills", "banks"));
// Affichage de la tva par taux
if ($obj_facturation->montantTva()) {
echo (''.$langs->trans("VAT").' '.price(price2num($obj_facturation->montantTva(), 'MT'), 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("VAT").' '.$langs->trans("NoVAT").' ';
if ($conf->use_javascript_ajax)
{
print ajax_constantonoff('CATEGORIE_RECURSIV_ADD');
-}
-else
-{
+} else {
if (empty($conf->global->CATEGORIE_RECURSIV_ADD))
{
print ''.img_picto($langs->trans("Disabled"), 'off').'';
- }
- else
- {
+ } else {
print ''.img_picto($langs->trans("Enabled"), 'on').'';
}
}
diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php
index 67adacb5aae..8eb6c3d8eda 100644
--- a/htdocs/categories/card.php
+++ b/htdocs/categories/card.php
@@ -88,39 +88,31 @@ if ($action == 'add' && $user->rights->categorie->creer)
{
header("Location: ".$urlfrom);
exit;
- }
- elseif ($idProdOrigin)
+ } elseif ($idProdOrigin)
{
header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProdOrigin.'&type='.$type);
exit;
- }
- elseif ($idCompanyOrigin)
+ } elseif ($idCompanyOrigin)
{
header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idCompanyOrigin.'&type='.$type);
exit;
- }
- elseif ($idSupplierOrigin)
+ } elseif ($idSupplierOrigin)
{
header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idSupplierOrigin.'&type='.$type);
exit;
- }
- elseif ($idMemberOrigin)
+ } elseif ($idMemberOrigin)
{
header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idMemberOrigin.'&type='.$type);
exit;
- }
- elseif ($idContactOrigin)
+ } elseif ($idContactOrigin)
{
header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idContactOrigin.'&type='.$type);
exit;
- }
- elseif ($idProjectOrigin)
+ } elseif ($idProjectOrigin)
{
header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProjectOrigin.'&type='.$type);
exit;
- }
- else
- {
+ } else {
header("Location: ".DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type);
exit;
}
@@ -155,9 +147,7 @@ if ($action == 'add' && $user->rights->categorie->creer)
{
$action = 'confirmed';
$_POST["addcat"] = '';
- }
- else
- {
+ } else {
setEventMessages($object->error, $object->errors, 'errors');
}
}
@@ -173,38 +163,31 @@ if (($action == 'add' || $action == 'confirmed') && $user->rights->categorie->cr
{
header("Location: ".$urlfrom);
exit;
- }
- elseif ($backtopage)
+ } elseif ($backtopage)
{
header("Location: ".$backtopage);
exit;
- }
- elseif ($idProdOrigin)
+ } elseif ($idProdOrigin)
{
header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProdOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
exit;
- }
- elseif ($idCompanyOrigin)
+ } elseif ($idCompanyOrigin)
{
header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idCompanyOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
exit;
- }
- elseif ($idSupplierOrigin)
+ } elseif ($idSupplierOrigin)
{
header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idSupplierOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
exit;
- }
- elseif ($idMemberOrigin)
+ } elseif ($idMemberOrigin)
{
header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idMemberOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
exit;
- }
- elseif ($idContactOrigin)
+ } elseif ($idContactOrigin)
{
header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idContactOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
exit;
- }
- elseif ($idProjectOrigin)
+ } elseif ($idProjectOrigin)
{
header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProjectOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
exit;
diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index d6eff682908..1cbaf4cbe14 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -179,8 +179,7 @@ class Categories extends DolibarrApi
}
$i++;
}
- }
- else {
+ } else {
throw new RestException(503, 'Error when retrieve category list : '.$db->lasterror());
}
if (!count($obj_ret)) {
@@ -243,9 +242,7 @@ class Categories extends DolibarrApi
if ($this->category->update(DolibarrApiAccess::$user) > 0)
{
return $this->get($id);
- }
- else
- {
+ } else {
throw new RestException(500, $this->category->error);
}
}
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index dc451855c0a..3076b9ecacd 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -64,9 +64,7 @@ class Categorie extends CommonObject
/**
- * @var array ID mapping from type string
- *
- * @note This array should be removed in future, once previous constants are moved to the string value. Deprecated
+ * @var array Table of mapping between type string and ID used for field 'type' in table llx_categories
*/
protected $MAP_ID = array(
'product' => 0,
@@ -79,7 +77,8 @@ class Categorie extends CommonObject
'user' => 7,
'bank_line' => 8,
'warehouse' => 9,
- 'actioncomm' => 10
+ 'actioncomm' => 10,
+ 'website_page' => 11
);
/**
@@ -316,13 +315,10 @@ class Categorie extends CommonObject
if ($id > 0)
{
$sql .= " WHERE rowid = ".$id;
- }
- elseif (!empty($ref_ext))
+ } elseif (!empty($ref_ext))
{
$sql .= " WHERE ref_ext LIKE '".$this->db->escape($ref_ext)."'";
- }
- else
- {
+ } else {
$sql .= " WHERE label = '".$this->db->escape($label)."' AND entity IN (".getEntity('category').")";
if (!is_null($type)) $sql .= " AND type = ".$this->db->escape($type);
}
@@ -361,14 +357,10 @@ class Categorie extends CommonObject
if (!empty($conf->global->MAIN_MULTILANGS)) $this->getMultiLangs();
return 1;
- }
- else
- {
+ } else {
return 0;
}
- }
- else
- {
+ } else {
dol_print_error($this->db);
return -1;
}
@@ -482,21 +474,15 @@ class Categorie extends CommonObject
{
$this->db->commit();
return $id;
- }
- else
- {
+ } else {
$this->db->rollback();
return -3;
}
- }
- else
- {
+ } else {
$this->db->rollback();
return -2;
}
- }
- else
- {
+ } else {
$this->error = $this->db->error();
$this->db->rollback();
return -1;
@@ -573,9 +559,7 @@ class Categorie extends CommonObject
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
dol_print_error($this->db);
return -1;
@@ -660,9 +644,7 @@ class Categorie extends CommonObject
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
@@ -673,10 +655,10 @@ class Categorie extends CommonObject
* Link an object to the category
*
* @param CommonObject $obj Object to link to category
- * @param string $type Type of category ('product', ...)
+ * @param string $type Type of category ('product', ...). Use '' to take $obj->element.
* @return int 1 : OK, -1 : erreur SQL, -2 : id not defined, -3 : Already linked
*/
- public function add_type($obj, $type)
+ public function add_type($obj, $type = '')
{
// phpcs:enable
global $user, $langs, $conf;
@@ -685,6 +667,8 @@ class Categorie extends CommonObject
if ($this->id == -1) return -2;
+ if (empty($type)) $type = $obj->element;
+
$this->db->begin();
$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_".(empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type]);
@@ -721,9 +705,7 @@ class Categorie extends CommonObject
}
}
}
- }
- else
- {
+ } else {
$error++;
$this->error = $this->db->lasterror();
}
@@ -747,23 +729,17 @@ class Categorie extends CommonObject
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
return -2;
}
- }
- else
- {
+ } else {
$this->db->rollback();
if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
{
$this->error = $this->db->lasterrno();
return -3;
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
}
return -1;
@@ -814,15 +790,11 @@ class Categorie extends CommonObject
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
return -2;
}
- }
- else
- {
+ } else {
$this->db->rollback();
$this->error = $this->db->lasterror();
return -1;
@@ -873,18 +845,14 @@ class Categorie extends CommonObject
if ($onlyids)
{
$objs[] = $rec['fk_'.(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])];
- }
- else
- {
+ } else {
$obj = new $this->MAP_OBJ_CLASS[$type]($this->db);
$obj->fetch($rec['fk_'.(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])]);
$objs[] = $obj;
}
}
return $objs;
- }
- else
- {
+ } else {
$this->error = $this->db->error().' sql='.$sql;
return -1;
}
@@ -1009,8 +977,7 @@ class Categorie extends CommonObject
}
$i++;
}
- }
- else {
+ } else {
$this->error = $this->db->lasterror();
return -1;
}
@@ -1045,9 +1012,7 @@ class Categorie extends CommonObject
$cats[] = $cat;
}
return $cats;
- }
- else
- {
+ } else {
dol_print_error($this->db);
return -1;
}
@@ -1079,9 +1044,7 @@ class Categorie extends CommonObject
$this->motherof[$obj->id_son] = $obj->id_parent;
}
return 1;
- }
- else
- {
+ } else {
dol_print_error($this->db);
return -1;
}
@@ -1113,23 +1076,23 @@ class Categorie extends CommonObject
global $conf, $langs;
if (!is_numeric($type)) $type = $this->MAP_ID[$type];
+ if (is_null($type)) {
+ $this->error = 'BadValueForParameterType';
+ return -1;
+ }
if (is_string($markafterid))
{
$markafterid = explode(',', $markafterid);
- }
- elseif (is_numeric($markafterid))
+ } elseif (is_numeric($markafterid))
{
if ($markafterid > 0)
{
$markafterid = array($markafterid);
- }
- else
- {
+ } else {
$markafterid = array();
}
- }
- elseif (!is_array($markafterid))
+ } elseif (!is_array($markafterid))
{
$markafterid = array();
}
@@ -1165,9 +1128,7 @@ class Categorie extends CommonObject
$this->cats[$obj->rowid]['ref_ext'] = $obj->ref_ext;
$i++;
}
- }
- else
- {
+ } else {
dol_print_error($this->db);
return -1;
}
@@ -1311,9 +1272,7 @@ class Categorie extends CommonObject
$cats[$rec['rowid']] = $cat;
}
return $cats;
- }
- else
- {
+ } else {
dol_print_error($this->db);
return -1;
}
@@ -1375,9 +1334,7 @@ class Categorie extends CommonObject
}
dol_syslog(get_class($this)."::already_exists no category with same name=".$this->label." and same parent ".$this->fk_parent." than category id=".$this->id, LOG_DEBUG);
return 0;
- }
- else
- {
+ } else {
$this->error = $this->db->error();
return -1;
}
@@ -1429,9 +1386,7 @@ class Categorie extends CommonObject
$link = '';
$linkend = '';
$w[] = $link.($addpicto ? img_object('', 'category', 'class="paddingright"') : '').$cat->label.$linkend;
- }
- else
- {
+ } else {
$w[] = "".($addpicto ? img_object('', 'category') : '').$cat->label."";
}
}
@@ -1472,9 +1427,7 @@ class Categorie extends CommonObject
}
}
return $parents;
- }
- else
- {
+ } else {
dol_print_error($this->db);
return -1;
}
@@ -1553,15 +1506,11 @@ class Categorie extends CommonObject
$cats[] = $cat;
}
}
- }
- else
- {
+ } else {
dol_print_error($this->db);
return -1;
}
- }
- else
- {
+ } else {
$sql = "SELECT ct.fk_categorie, c.label, c.rowid";
$sql .= " FROM ".MAIN_DB_PREFIX."categorie_".(empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type])." as ct, ".MAIN_DB_PREFIX."categorie as c";
$sql .= " WHERE ct.fk_categorie = c.rowid AND ct.fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])." = ".(int) $id." AND c.type = ".$this->MAP_ID[$type];
@@ -1582,9 +1531,7 @@ class Categorie extends CommonObject
$cats[] = $cat;
}
}
- }
- else
- {
+ } else {
dol_print_error($this->db);
return -1;
}
@@ -1632,8 +1579,7 @@ class Categorie extends CommonObject
$nom = '%'.str_replace('*', '%', $nom).'%';
if (!$case)
$sql .= " AND label LIKE '".$this->db->escape($nom)."'";
- else
- $sql .= " AND label LIKE BINARY '".$this->db->escape($nom)."'";
+ else $sql .= " AND label LIKE BINARY '".$this->db->escape($nom)."'";
}
if ($id)
{
@@ -1651,9 +1597,7 @@ class Categorie extends CommonObject
}
return $cats;
- }
- else
- {
+ } else {
$this->error = $this->db->error().' sql='.$sql;
return -1;
}
@@ -1878,9 +1822,7 @@ class Categorie extends CommonObject
$sql2 .= " SET label='".$this->db->escape($this->label)."',";
$sql2 .= " description='".$this->db->escape($this->description)."'";
$sql2 .= " WHERE fk_category=".$this->id." AND lang='".$this->db->escape($key)."'";
- }
- else
- {
+ } else {
$sql2 = "INSERT INTO ".MAIN_DB_PREFIX."categorie_lang (fk_category, lang, label, description)";
$sql2 .= " VALUES(".$this->id.",'".$key."','".$this->db->escape($this->label);
$sql2 .= "','".$this->db->escape($this->multilangs["$key"]["description"])."')";
@@ -1891,8 +1833,7 @@ class Categorie extends CommonObject
$this->error = $this->db->lasterror();
return -1;
}
- }
- elseif (isset($this->multilangs["$key"]))
+ } elseif (isset($this->multilangs["$key"]))
{
if ($this->db->num_rows($result)) // si aucune ligne dans la base
{
@@ -1900,9 +1841,7 @@ class Categorie extends CommonObject
$sql2 .= " SET label='".$this->db->escape($this->multilangs["$key"]["label"])."',";
$sql2 .= " description='".$this->db->escape($this->multilangs["$key"]["description"])."'";
$sql2 .= " WHERE fk_category=".$this->id." AND lang='".$this->db->escape($key)."'";
- }
- else
- {
+ } else {
$sql2 = "INSERT INTO ".MAIN_DB_PREFIX."categorie_lang (fk_category, lang, label, description)";
$sql2 .= " VALUES(".$this->id.",'".$key."','".$this->db->escape($this->multilangs["$key"]["label"]);
$sql2 .= "','".$this->db->escape($this->multilangs["$key"]["description"])."')";
@@ -1960,9 +1899,7 @@ class Categorie extends CommonObject
$this->multilangs["$obj->lang"]["description"] = $obj->description;
}
return 1;
- }
- else
- {
+ } else {
$this->error = $langs->trans("Error")." : ".$this->db->error()." - ".$sql;
return -1;
}
@@ -2054,8 +1991,7 @@ class Categorie extends CommonObject
if (intval($searchCategory) == -2)
{
$searchCategorySqlList[] = " cp.fk_categorie IS NULL";
- }
- elseif (intval($searchCategory) > 0)
+ } elseif (intval($searchCategory) > 0)
{
$searchCategorySqlList[] = " ".$rowIdName
." IN (SELECT fk_".$type." FROM ".MAIN_DB_PREFIX."categorie_".$type
@@ -2066,9 +2002,7 @@ class Categorie extends CommonObject
if (!empty($searchCategorySqlList))
{
return " AND (".implode(' AND ', $searchCategorySqlList).")";
- }
- else
- {
+ } else {
return "";
}
}
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index 48bd82b9326..53a343046b7 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -90,8 +90,7 @@ if ($action == 'update' && $user->rights->categorie->creer)
if ($parent != "-1")
$object->fk_parent = $parent;
- else
- $object->fk_parent = "";
+ else $object->fk_parent = "";
if (empty($object->label))
@@ -109,14 +108,10 @@ if ($action == 'update' && $user->rights->categorie->creer)
{
header('Location: '.DOL_URL_ROOT.'/categories/viewcat.php?id='.$object->id.'&type='.$type);
exit;
- }
- else
- {
+ } else {
setEventMessages($object->error, $object->errors, 'errors');
}
- }
- else
- {
+ } else {
setEventMessages($object->error, $object->errors, 'errors');
}
}
diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index b36101750f2..ccdd8be58b9 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -54,7 +54,10 @@ $typetext = $type;
if ($type == Categorie::TYPE_ACCOUNT) $title = $langs->trans('AccountsCategoriesArea');
elseif ($type == Categorie::TYPE_WAREHOUSE) $title = $langs->trans('StocksCategoriesArea');
elseif ($type == Categorie::TYPE_ACTIONCOMM) $title = $langs->trans('ActionCommCategoriesArea');
-else $title = $langs->trans(ucfirst($type).'sCategoriesArea');
+elseif ($type == Categorie::TYPE_WEBSITE_PAGE) $title = $langs->trans('WebsitePagesCategoriesArea');
+else {
+ $title = $langs->trans(ucfirst($type).'sCategoriesArea');
+}
$arrayofjs = array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.js', '/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js');
$arrayofcss = array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css');
@@ -69,8 +72,6 @@ if (!empty($user->rights->categorie->creer)) {
print load_fiche_titre($title, $newcardbutton, 'object_category');
-//print '';
-//print '
';
-//print ' ';
print '
| ';
print ' ';
@@ -88,20 +89,9 @@ print ' '.$langs->trans("Search").' | ';
print ' | ||
| '; print $langs->trans("Name").': | |||
| '; -print $langs->trans("SubCatOf").': | '; - -print $form->select_all_categories('','subcatof'); -print ' | '; -print '||
';
@@ -134,11 +124,9 @@ if ($catname || $id > 0)
print "\t
'; @@ -206,9 +194,7 @@ if ($nbofentries > 0) print '
| '.img_picto_common('', 'treemenu/branchbottom.gif').' | '; print '';
diff --git a/htdocs/categories/info.php b/htdocs/categories/info.php
index 644886c7387..bef54f9dd6b 100644
--- a/htdocs/categories/info.php
+++ b/htdocs/categories/info.php
@@ -60,10 +60,10 @@ llxHeader('', $langs->trans('Categories'), '');
//$object->info($object->id);
-$head = categories_prepare_head($object, $type);
-
$title = Categorie::$MAP_TYPE_TITLE_AREA[$type];
+$head = categories_prepare_head($object, $type);
+
dol_fiche_head($head, 'info', $langs->trans($title), -1, 'category');
$backtolist = (GETPOST('backtolist') ? GETPOST('backtolist') : DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type);
$linkback = ''.$langs->trans("BackToList").'';
@@ -78,14 +78,21 @@ $morehtmlref .= '';
dol_banner_tab($object, 'label', $linkback, ($user->socid ? 0 : 1), 'label', 'label', $morehtmlref, '&type='.$type, 0, '', '', 1);
+print ' '; + print ' ';
print '';
print ' ';
dol_fiche_end();
diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php
index 07e5d56d268..e8b3da0a525 100644
--- a/htdocs/categories/photos.php
+++ b/htdocs/categories/photos.php
@@ -144,7 +144,7 @@ if ($object->id)
print ''; -print '
';
print '';
- print '
| |||||||||||||||||||||
| '.$langs->trans("ThisCategoryHasNoItems").' | ||||||||||||||||||||||
'; $eventarray[$daykey][] = $event; @@ -675,17 +676,14 @@ if ($resql) $daykey += 60 * 60 * 24; if ($daykey > $event->date_end_in_calendar) $loop = false; - } - while ($loop); + } while ($loop); //print 'Event '.$i.' id='.$event->id.' (start='.dol_print_date($event->datep).'-end='.dol_print_date($event->datef); //print ' startincalendar='.dol_print_date($event->date_start_in_calendar).'-endincalendar='.dol_print_date($event->date_end_in_calendar).') was added in '.$j.' different index key of array
'; } $i++; } -} -else -{ +} else { dol_print_error($db); } @@ -701,9 +699,7 @@ if ($showbirthday) { $sql .= ' AND MONTH(birthday) = '.$month; $sql .= ' AND DAY(birthday) = '.$day; - } - else - { + } else { $sql .= ' AND MONTH(birthday) = '.$month; } $sql .= ' ORDER BY birthday'; @@ -718,7 +714,10 @@ if ($showbirthday) { $obj = $db->fetch_object($resql); $event = new ActionComm($db); + $event->id = $obj->rowid; // We put contact id in action id for birthdays events + $event->ref = $event->id; + $datebirth = dol_stringtotime($obj->birthday, 1); //print 'ee'.$obj->birthday.'-'.$datebirth; $datearray = dol_getdate($datebirth, true); @@ -741,18 +740,14 @@ if ($showbirthday) $loop = true; $daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee); - do - { + do { $eventarray[$daykey][] = $event; $daykey += 60 * 60 * 24; if ($daykey > $event->date_end_in_calendar) $loop = false; - } - while ($loop); + } while ($loop); $i++; } - } - else - { + } else { dol_print_error($db); } } @@ -769,12 +764,10 @@ if ($conf->global->AGENDA_SHOW_HOLIDAYS) { // Request only leaves for the current selected day $sql .= " AND '".$year."-".$month."-".$day."' BETWEEN x.date_debut AND x.date_fin"; - } - elseif ($action == 'show_week') + } elseif ($action == 'show_week') { // TODO: Add filter to reduce database request - } - elseif ($action == 'show_month') + } elseif ($action == 'show_month') { // TODO: Add filter to reduce database request } @@ -796,6 +789,7 @@ if ($conf->global->AGENDA_SHOW_HOLIDAYS) // Need the id of the leave object for link to it $event->id = $obj->rowid; + $event->ref = $event->id; $event->type_code = 'HOLIDAY'; $event->datep = dol_mktime(0, 0, 0, $dateStartArray['mon'], $dateStartArray['mday'], $dateStartArray['year'], true); @@ -807,8 +801,7 @@ if ($conf->global->AGENDA_SHOW_HOLIDAYS) { // Show no symbol for leave with state "leave approved" $event->percentage = -1; - } - elseif ($obj->status == 2) + } elseif ($obj->status == 2) { // Show TO-DO symbol for leave with state "leave wait for approval" $event->percentage = 0; @@ -817,13 +810,10 @@ if ($conf->global->AGENDA_SHOW_HOLIDAYS) if ($obj->halfday == 1) { $event->label = $obj->lastname.' ('.$langs->trans("Morning").')'; - } - elseif ($obj->halfday == -1) + } elseif ($obj->halfday == -1) { $event->label = $obj->lastname.' ('.$langs->trans("Afternoon").')'; - } - else - { + } else { $event->label = $obj->lastname; } @@ -832,14 +822,11 @@ if ($conf->global->AGENDA_SHOW_HOLIDAYS) $jour = date('d', $event->date_start_in_calendar); $daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee); - do - { + do { $eventarray[$daykey][] = $event; $daykey += 60 * 60 * 24; - } - - while ($daykey <= $event->date_end_in_calendar); + } while ($daykey <= $event->date_end_in_calendar); $i++; } @@ -881,8 +868,7 @@ if (count($listofextcals)) { $datecurstart = dol_stringtotime($icalevent['DTSTART;VALUE=DATE'], 1); $datecurend = dol_stringtotime($icalevent['DTEND;VALUE=DATE'], 1) - 1; // We remove one second to get last second of day - } - elseif (is_array($icalevent['DTSTART']) && !empty($icalevent['DTSTART']['unixtime'])) + } elseif (is_array($icalevent['DTSTART']) && !empty($icalevent['DTSTART']['unixtime'])) { $datecurstart = $icalevent['DTSTART']['unixtime']; $datecurend = $icalevent['DTEND']['unixtime']; @@ -902,9 +888,7 @@ if (count($listofextcals)) } // datecurstart and datecurend are now GMT date //var_dump($datecurstart); var_dump($datecurend); exit; - } - else - { + } else { // Not a recongized record dol_syslog("Found a not recognized repeatable record with unknown date start", LOG_ERR); continue; @@ -928,9 +912,7 @@ if (count($listofextcals)) { $newevent['DTSTART;VALUE=DATE'] = dol_print_date($datecurstart, '%Y%m%d'); $newevent['DTEND;VALUE=DATE'] = dol_print_date($datecurend + 1, '%Y%m%d'); - } - else - { + } else { $newevent['DTSTART'] = $datecurstart; $newevent['DTEND'] = $datecurend; } @@ -948,13 +930,11 @@ if (count($listofextcals)) { $datecurstart = dol_time_plus_duree($datecurstart, $interval, 'w'); $datecurend = dol_time_plus_duree($datecurend, $interval, 'w'); - } - elseif ($icalevent['RRULE']['FREQ'] == 'MONTHLY') + } elseif ($icalevent['RRULE']['FREQ'] == 'MONTHLY') { $datecurstart = dol_time_plus_duree($datecurstart, $interval, 'm'); $datecurend = dol_time_plus_duree($datecurend, $interval, 'm'); - } - elseif ($icalevent['RRULE']['FREQ'] == 'YEARLY') + } elseif ($icalevent['RRULE']['FREQ'] == 'YEARLY') { $datecurstart = dol_time_plus_duree($datecurstart, $interval, 'y'); $datecurend = dol_time_plus_duree($datecurend, $interval, 'y'); @@ -991,8 +971,7 @@ if (count($listofextcals)) //print dol_print_date($dateend,'dayhour','gmt'); $event->fulldayevent = 1; $addevent = true; - } - elseif (!is_array($icalevent['DTSTART'])) // not fullday event (DTSTART is not array. It is a value like '19700101T000000Z' for 00:00 in greenwitch) + } elseif (!is_array($icalevent['DTSTART'])) // not fullday event (DTSTART is not array. It is a value like '19700101T000000Z' for 00:00 in greenwitch) { $datestart = $icalevent['DTSTART']; $dateend = $icalevent['DTEND']; @@ -1003,8 +982,7 @@ if (count($listofextcals)) $addevent = true; //var_dump($offsettz); //var_dump(dol_print_date($datestart, 'dayhour', 'gmt')); - } - elseif (isset($icalevent['DTSTART']['unixtime'])) // File contains a local timezone + a TZ (for example when using bluemind) + } elseif (isset($icalevent['DTSTART']['unixtime'])) // File contains a local timezone + a TZ (for example when using bluemind) { $datestart = $icalevent['DTSTART']['unixtime']; $dateend = $icalevent['DTEND']['unixtime']; @@ -1036,6 +1014,8 @@ if (count($listofextcals)) if ($addevent) { $event->id = $icalevent['UID']; + $event->ref = $event->id; + $event->icalname = $namecal; $event->icalcolor = $colorcal; $usertime = 0; // We dont modify date because we want to have date into memory datep and datef stored as GMT date. Compensation will be done during output. @@ -1066,9 +1046,7 @@ if (count($listofextcals)) //print 'x'.$datestart.'-'.$dateend;exit; //print 'x'.$datestart.'-'.$dateend;exit; // This record is out of visible range - } - else - { + } else { if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar = $firstdaytoshow; if ($event->date_end_in_calendar >= $lastdaytoshow) $event->date_end_in_calendar = ($lastdaytoshow - 1); @@ -1083,14 +1061,12 @@ if (count($listofextcals)) // daykey must be date that represent day box in calendar so must be a user time $daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee); $daykeygmt = dol_mktime(0, 0, 0, $mois, $jour, $annee, true, 0); - do - { + do { //if ($event->fulldayevent) print dol_print_date($daykeygmt,'dayhour','gmt').'-'.dol_print_date($daykey,'dayhour','gmt').'-'.dol_print_date($event->date_end_in_calendar,'dayhour','gmt').' '; $eventarray[$daykey][] = $event; $daykey += 60 * 60 * 24; $daykeygmt += 60 * 60 * 24; // Add one day if (($event->fulldayevent ? $daykeygmt : $daykey) > $event->date_end_in_calendar) $loop = false; - } - while ($loop); + } while ($loop); } } } @@ -1159,8 +1135,7 @@ if (empty($action) || $action == 'show_month') // View by month { $labelshort = array(0=>'SundayMin', 1=>'MondayMin', 2=>'TuesdayMin', 3=>'WednesdayMin', 4=>'ThursdayMin', 5=>'FridayMin', 6=>'SaturdayMin'); print $langs->trans($labelshort[$numdayinweek]); - } - else print $langs->trans("Day".$numdayinweek); + } else print $langs->trans("Day".$numdayinweek); print ' '."\n"; $i++; } @@ -1171,23 +1146,18 @@ if (empty($action) || $action == 'show_month') // View by month // In loops, tmpday contains day nb in current month (can be zero or negative for days of previous month) //var_dump($eventarray); - for ($iter_week = 0; $iter_week < 6; $iter_week++) - { + for ($iter_week = 0; $iter_week < 6; $iter_week++) { echo "
| '.$langs->trans("Day".(($i + (isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1)) % 7))." | \n"; $i++; } @@ -1246,8 +1212,7 @@ elseif ($action == 'show_week') // View by week echo "
'.$langs->trans("LocalAgenda").'
';
//$newtitle=$langs->trans($title);
@@ -418,8 +479,7 @@ if ($resql)
if (empty($reshook))
{
$s .= $hookmanager->resPrint;
- }
- elseif ($reshook > 1)
+ } elseif ($reshook > 1)
{
$s = $hookmanager->resPrint;
}
@@ -436,7 +496,9 @@ if ($resql)
$newcardbutton .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.sprintf("%04d%02d%02d", $tmpforcreatebutton['year'], $tmpforcreatebutton['mon'], $tmpforcreatebutton['mday']).$hourminsec.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam ? '?'.$newparam : '')));
}
- print_barre_liste($s, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, -1 * $nbtotalofrecords, '', 0, $nav.$newcardbutton, '', $limit, 0, 0, 1);
+ print_barre_liste($s, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, -1 * $nbtotalofrecords, '', 0, $nav.$newcardbutton, '', $limit, 0, 0, 1);
+
+ include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
$moreforfilter = '';
@@ -569,8 +631,7 @@ if ($resql)
{
$userstatic->fetch($obj->fk_user_action);
print $userstatic->getNomUrl(-1);
- }
- else print ' ';
+ } else print ' ';
print ''."\n"; $event->fetch_userassigned(); // This load $event->userassigned @@ -527,8 +514,7 @@ if ($resql) // Loop on each day covered by action to prepare an index to show on calendar $loop = true; $j = 0; $daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee); - do - { + do { //if ($event->id==408) print 'daykey='.$daykey.' '.$event->datep.' '.$event->datef.'
'; $eventarray[$daykey][] = $event; @@ -536,17 +522,14 @@ if ($resql) $daykey += 60 * 60 * 24; if ($daykey > $event->date_end_in_calendar) $loop = false; - } - while ($loop); + } while ($loop); //print 'Event '.$i.' id='.$event->id.' (start='.dol_print_date($event->datep).'-end='.dol_print_date($event->datef); //print ' startincalendar='.dol_print_date($event->date_start_in_calendar).'-endincalendar='.dol_print_date($event->date_end_in_calendar).') was added in '.$j.' different index key of array
'; } $i++; } -} -else -{ +} else { dol_print_error($db); } @@ -808,8 +791,7 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s { $nummytasks++; $cssclass = 'family_mytasks'; if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) $color = $event->type_color; - } - elseif ($event->type_code == 'ICALEVENT') + } elseif ($event->type_code == 'ICALEVENT') { $numical++; if (!empty($event->icalname)) @@ -822,13 +804,10 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s $color = $event->icalcolor; $cssclass = (!empty($event->icalname) ? 'family_ext'.md5($event->icalname) : 'family_other unsortable'); - } - elseif ($event->type_code == 'BIRTHDAY') + } elseif ($event->type_code == 'BIRTHDAY') { $numbirthday++; $colorindex = 2; $cssclass = 'family_birthday unsortable'; $color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]); - } - else - { + } else { $numother++; $cssclass = 'family_other'; if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) $color = $event->type_color; } @@ -840,9 +819,7 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s if (isset($colorindexused[$idusertouse])) { $colorindex = $colorindexused[$idusertouse]; // Color already assigned to this user - } - else - { + } else { $colorindex = $nextindextouse; $colorindexused[$idusertouse] = $colorindex; if (!empty($theme_datacolor[$nextindextouse + 1])) $nextindextouse++; // Prepare to use next color @@ -960,9 +937,7 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s $cases2[$h][$event->id]['string'] .= ', '.$cachecontacts[$event->contactid]->getFullName($langs); } } - } - else - { + } else { $busy = $event->transparency; $cases1[$h][$event->id]['busy'] = $busy; $cases2[$h][$event->id]['busy'] = $busy; @@ -1025,8 +1000,7 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s $title1 = $langs->trans("Ref").' '.$ids1.($title1 ? ' - '.$title1 : ''); if ($output[0]['string']) $title1 .= ($title1 ? ' - ' : '').$output[0]['string']; if ($output[0]['color']) $color1 = $output[0]['color']; - } - elseif (count($cases1[$h]) > 1) + } elseif (count($cases1[$h]) > 1) { $title1 = $langs->trans("Ref").' '.$ids1.($title1 ? ' - '.$title1 : ''); $color1 = '222222'; @@ -1038,8 +1012,7 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s $title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : ''); if ($output[0]['string']) $title2 .= ($title2 ? ' - ' : '').$output[0]['string']; if ($output[0]['color']) $color2 = $output[0]['color']; - } - elseif (count($cases2[$h]) > 1) + } elseif (count($cases2[$h]) > 1) { $title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : ''); $color2 = '222222'; diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php index f2cce5c8023..ef2c60e5ae6 100644 --- a/htdocs/comm/action/peruser.php +++ b/htdocs/comm/action/peruser.php @@ -94,9 +94,7 @@ if (GETPOST('search_actioncode', 'array')) { $actioncode = GETPOST('search_actioncode', 'array', 3); if (!count($actioncode)) $actioncode = '0'; -} -else -{ +} else { $actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode", "alpha") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE)); } if ($actioncode == '' && empty($actioncodearray)) $actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE); @@ -376,8 +374,7 @@ if ($conf->use_javascript_ajax) if (empty($reshook)) { $s .= $hookmanager->resPrint; - } - elseif ($reshook > 1) + } elseif ($reshook > 1) { $s = $hookmanager->resPrint; } @@ -431,24 +428,18 @@ if (!empty($actioncode)) { if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'"; elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'"; - else - { + else { if ($actioncode == 'AC_OTH') $sql .= " AND ca.type != 'systemauto'"; if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND ca.type = 'systemauto'"; } - } - else - { + } else { if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'"; elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'"; - else - { + else { if (is_array($actioncode)) { $sql .= " AND ca.code IN ('".implode("','", $actioncode)."')"; - } - else - { + } else { $sql .= " AND ca.code IN ('".implode("','", explode(',', $actioncode))."')"; } } @@ -472,9 +463,7 @@ if ($action == 'show_day') $sql .= " (a.datep < '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'"; $sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')"; $sql .= ')'; -} -else -{ +} else { // To limit array $sql .= " AND ("; $sql .= " (a.datep BETWEEN '".$db->idate($firstdaytoshow - (60 * 60 * 24 * 2))."'"; // Start 2 day before $firstdaytoshow @@ -557,9 +546,7 @@ if ($resql) $event->date_start_in_calendar = $datep; if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2; else $event->date_end_in_calendar = $datep; - } - else - { + } else { $event->date_start_in_calendar = $datep; if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2; else $event->date_end_in_calendar = $datep; @@ -576,9 +563,7 @@ if ($resql) { // This record is out of visible range unset($event); - } - else - { + } else { //print $i.' - '.dol_print_date($this->date_start_in_calendar, 'dayhour').' - '.dol_print_date($this->date_end_in_calendar, 'dayhour').'
'."\n"; $event->fetch_userassigned(); // This load $event->userassigned @@ -594,8 +579,7 @@ if ($resql) // Loop on each day covered by action to prepare an index to show on calendar $loop = true; $j = 0; $daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee); - do - { + do { //if ($event->id==408) print 'daykey='.$daykey.' '.$event->datep.' '.$event->datef.'
'; $eventarray[$daykey][] = $event; @@ -603,8 +587,7 @@ if ($resql) $daykey += 60 * 60 * 24; if ($daykey > $event->date_end_in_calendar) $loop = false; - } - while ($loop); + } while ($loop); //print 'Event '.$i.' id='.$event->id.' (start='.dol_print_date($event->datep).'-end='.dol_print_date($event->datef); //print ' startincalendar='.dol_print_date($event->date_start_in_calendar).'-endincalendar='.dol_print_date($event->date_end_in_calendar).') was added in '.$j.' different index key of array
'; @@ -612,9 +595,7 @@ if ($resql) $i++; } $db->free($resql); -} -else -{ +} else { dol_print_error($db); } @@ -713,16 +694,13 @@ while ($currentdaytoshow < $lastdaytoshow) { { $event->fetch_userassigned(); $listofuserid = $event->userassigned; - foreach ($listofuserid as $userid => $tmp) - { + foreach ($listofuserid as $userid => $tmp) { if (!in_array($userid, $usernamesid)) $usernamesid[$userid] = $userid; } } } - } - /* Use this list to have for all users */ - else - { + } else { + /* Use this list to have for all users */ $sql = "SELECT u.rowid, u.lastname as lastname, u.firstname, u.statut, u.login, u.admin, u.entity"; $sql .= " FROM ".MAIN_DB_PREFIX."user as u"; if ($usergroup > 0) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug ON u.rowid = ug.fk_user"; @@ -730,8 +708,7 @@ while ($currentdaytoshow < $lastdaytoshow) { if ($usergroup > 0) $sql .= " AND ug.fk_usergroup = ".$usergroup; //print $sql; $resql = $db->query($sql); - if ($resql) - { + if ($resql) { $num = $db->num_rows($resql); $i = 0; if ($num) @@ -743,8 +720,7 @@ while ($currentdaytoshow < $lastdaytoshow) { $i++; } } - } - else dol_print_error($db); + } else dol_print_error($db); } //var_dump($usernamesid); foreach ($usernamesid as $id) @@ -992,8 +968,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, & if (!empty($cacheusers[$event->userownerid]->color)) $color = $cacheusers[$event->userownerid]->color; if (!empty($conf->global->AGENDA_USE_COLOR_PER_EVENT_TYPE)) $color = $event->type_color; - } - elseif ($event->type_code == 'ICALEVENT') + } elseif ($event->type_code == 'ICALEVENT') { $numical++; if (!empty($event->icalname)) @@ -1006,13 +981,10 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, & $color = $event->icalcolor; $cssclass = (!empty($event->icalname) ? 'family_ext'.md5($event->icalname) : 'family_other unsortable'); - } - elseif ($event->type_code == 'BIRTHDAY') + } elseif ($event->type_code == 'BIRTHDAY') { $numbirthday++; $colorindex = 2; $cssclass = 'family_birthday unsortable'; $color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]); - } - else - { + } else { $numother++; $color = ($event->icalcolor ? $event->icalcolor : -1); $cssclass = (!empty($event->icalname) ? 'family_ext'.md5($event->icalname) : 'family_other'); @@ -1038,9 +1010,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, & if (isset($colorindexused[$idusertouse])) { $colorindex = $colorindexused[$idusertouse]; // Color already assigned to this user - } - else - { + } else { $colorindex = $nextindextouse; $colorindexused[$idusertouse] = $colorindex; if (!empty($theme_datacolor[$nextindextouse + 1])) $nextindextouse++; // Prepare to use next color @@ -1158,9 +1128,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, & $cases2[$h][$event->id]['string'] .= ', '.$cachecontacts[$event->contactid]->getFullName($langs); } } - } - else - { + } else { $busy = $event->transparency; $cases1[$h][$event->id]['busy'] = $busy; $cases2[$h][$event->id]['busy'] = $busy; @@ -1224,8 +1192,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, & $title1 = $langs->trans("Ref").' '.$ids1.($title1 ? ' - '.$title1 : ''); if ($output[0]['string']) $title1 .= ($title1 ? ' - ' : '').$output[0]['string']; if ($output[0]['color']) $color1 = $output[0]['color']; - } - elseif (is_array($cases1[$h]) && count($cases1[$h]) > 1) + } elseif (is_array($cases1[$h]) && count($cases1[$h]) > 1) { $title1 = $langs->trans("Ref").' '.$ids1.($title1 ? ' - '.$title1 : ''); $color1 = '222222'; @@ -1237,8 +1204,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, & $title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : ''); if ($output[0]['string']) $title2 .= ($title2 ? ' - ' : '').$output[0]['string']; if ($output[0]['color']) $color2 = $output[0]['color']; - } - elseif (is_array($cases2[$h]) && count($cases2[$h]) > 1) + } elseif (is_array($cases2[$h]) && count($cases2[$h]) > 1) { $title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : ''); $color2 = '222222'; diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php index 82477d307fc..35c0f7a890e 100644 --- a/htdocs/comm/action/rapport/index.php +++ b/htdocs/comm/action/rapport/index.php @@ -186,8 +186,7 @@ if ($resql) print ''; print '
"; $db->free($resql); - } - else - { + } else { dol_print_error($db); } } @@ -297,22 +292,17 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa if ($num > $nbofloop) { print '
"; $db->free($resql); - } - else - { + } else { dol_print_error($db); } } @@ -379,8 +369,7 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire) print ''; if (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) { print '
"; $db->free($resql); - } - else - { + } else { dol_print_error($db); } } @@ -472,8 +456,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU print ''; if (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) { print '
"; } - } - else - { + } else { dol_print_error($db); } } @@ -805,8 +779,7 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire) print dol_print_date($db->jdate($obj->dp), 'day').''."\n"; if (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) { print '
"; } - } - else - { + } else { dol_print_error($db); } } @@ -913,8 +883,7 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire) print dol_print_date($db->jdate($obj->dp), 'day').''."\n"; if (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) { print '
"; } - } - else - { + } else { dol_print_error($db); } } diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php index d4db9fc6ea9..da24f7bcb4f 100644 --- a/htdocs/comm/mailing/advtargetemailing.php +++ b/htdocs/comm/mailing/advtargetemailing.php @@ -87,9 +87,7 @@ if (empty($template_id)) { if ($result < 0) { setEventMessages($advTarget->error, $advTarget->errors, 'errors'); -} -else -{ +} else { if (!empty($advTarget->id)) { $array_query = json_decode($advTarget->filtervalue, true); } diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php index e3cb5a9ad97..ea81c4e35b9 100644 --- a/htdocs/comm/mailing/card.php +++ b/htdocs/comm/mailing/card.php @@ -93,17 +93,13 @@ if (empty($reshook)) if (!GETPOST("clone_content", 'alpha') && !GETPOST("clone_receivers", 'alpha')) { setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors'); - } - else - { + } else { $result = $object->createFromClone($user, $object->id, GETPOST("clone_content", 'alpha'), GETPOST("clone_receivers", 'alpha')); if ($result > 0) { header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result); exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } @@ -120,14 +116,11 @@ if (empty($reshook)) setEventMessages('', null, 'warnings'); setEventMessages($langs->trans("MailingNeedCommand2"), null, 'warnings'); $action = ''; - } - elseif ($conf->global->MAILING_LIMIT_SENDBYWEB < 0) + } elseif ($conf->global->MAILING_LIMIT_SENDBYWEB < 0) { setEventMessages($langs->trans("NotEnoughPermissions"), null, 'warnings'); $action = ''; - } - else - { + } else { $upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing'); if ($object->statut == 0) @@ -235,9 +228,7 @@ if (empty($reshook)) $substitutionarray['__SECUREKEYPAYMENT_ORDER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2); $substitutionarray['__SECUREKEYPAYMENT_INVOICE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2); $substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2); - } - else - { + } else { $substitutionarray['__SECUREKEYPAYMENT_MEMBER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$obj->source_id, 2); $substitutionarray['__SECUREKEYPAYMENT_ORDER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'order'.$obj->source_id, 2); $substitutionarray['__SECUREKEYPAYMENT_INVOICE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'invoice'.$obj->source_id, 2); @@ -316,9 +307,7 @@ if (empty($reshook)) if (!$resql2) { dol_print_error($db); - } - else - { + } else { //if cheack read is use then update prospect contact status if (strpos($message, '__CHECK_READ__') !== false) { @@ -350,9 +339,7 @@ if (empty($reshook)) } //test if CHECK READ change statut prospect contact - } - else - { + } else { // Mail failed $nbko++; @@ -369,9 +356,7 @@ if (empty($reshook)) $i++; } - } - else - { + } else { setEventMessages($langs->transnoentitiesnoconv("NoMoreRecipientToSendTo"), null, 'mesgs'); } @@ -381,16 +366,12 @@ if (empty($reshook)) $statut = 2; // Status 'sent partially' (because at least one error) if ($nbok > 0) setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs'); else setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs'); - } - else - { + } else { if ($nbok >= $num) { $statut = 3; // Send to everybody setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs'); - } - else - { + } else { $statut = 2; // Status 'sent partially' (because not send to everybody) setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs'); } @@ -403,9 +384,7 @@ if (empty($reshook)) { dol_print_error($db); } - } - else - { + } else { dol_syslog($db->error()); dol_print_error($db); } @@ -472,9 +451,7 @@ if (empty($reshook)) { setEventMessages($langs->trans("MailSuccessfulySent", $mailfile->getValidAddress($object->email_from, 2), $mailfile->getValidAddress($object->sendto, 2)), null, 'mesgs'); $action = ''; - } - else - { + } else { setEventMessages($langs->trans("ResultKo").'
'.$mailfile->error.' '.$result, null, 'errors'); $action = 'test'; } @@ -611,9 +588,7 @@ if (empty($reshook)) setEventMessages($mesg, $mesgs, 'errors'); $action = "edit"; - } - else - { + } else { $action = "edit"; } } @@ -627,9 +602,7 @@ if (empty($reshook)) setEventMessages($langs->trans("MailingSuccessfullyValidated"), null, 'mesgs'); header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); exit; - } - else - { + } else { dol_print_error($db); } } @@ -645,14 +618,10 @@ if (empty($reshook)) //setEventMessages($langs->trans("MailingSuccessfullyValidated"), null, 'mesgs'); header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } - } - else - { + } else { dol_print_error($db); } } @@ -675,15 +644,11 @@ if (empty($reshook)) $db->commit(); header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); $db->rollback(); } - } - else - { + } else { dol_print_error($db); } } @@ -783,9 +748,7 @@ if ($action == 'create') print ''; print ''; -} -else -{ +} else { if ($object->id > 0) { $upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing'); @@ -801,13 +764,11 @@ else if ($action == 'valid') { print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("ValidMailing"), $langs->trans("ConfirmValidMailing"), "confirm_valid", '', '', 1); - } - // Confirm reset + } // Confirm reset elseif ($action == 'reset') { print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("ResetMailing"), $langs->trans("ConfirmResetMailing", $object->ref), "confirm_reset", '', '', 2); - } - // Confirm delete + } // Confirm delete elseif ($action == 'delete') { print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id.(!empty($urlfrom) ? '&urlfrom='.urlencode($urlfrom) : ''), $langs->trans("DeleteAMailing"), $langs->trans("ConfirmDeleteMailing"), "confirm_delete", '', '', 1); @@ -841,8 +802,7 @@ else setEventMessages($langs->trans("MailSendSetupIs2", $linktoadminemailbefore, $linktoadminemailend, $langs->transnoentitiesnoconv("MAIN_MAIL_SENDMODE"), $listofmethods['smtps']), null, 'warnings'); if (!empty($conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS)) setEventMessages($langs->trans("MailSendSetupIs3", $conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS), null, 'warnings'); $_GET["action"] = ''; - } - elseif ($conf->global->MAILING_LIMIT_SENDBYWEB < 0) + } elseif ($conf->global->MAILING_LIMIT_SENDBYWEB < 0) { if (!empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings'); if (!empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings'); @@ -855,9 +815,7 @@ else setEventMessages($langs->trans("MailingNeedCommand2"), null, 'warnings'); // You can send online with constant... } $_GET["action"] = ''; - } - else - { + } else { if (!empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings'); if (!empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings'); @@ -939,9 +897,7 @@ else if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0) { $text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB); - } - else - { + } else { $text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed'); } } @@ -949,9 +905,7 @@ else if ($text) { print $form->textwithpicto($nbemail, $text, 1, 'warning'); - } - else - { + } else { print $nbemail; } } @@ -998,9 +952,7 @@ else if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_ENABLE_MAILING)) { print ''.$langs->trans("EditWithEditor").''; - } - else - { + } else { print ''.$langs->trans("EditWithTextEditor").''; } @@ -1012,9 +964,7 @@ else if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send) { print ''.$langs->trans("TestMailing").''; - } - else - { + } else { print ''.$langs->trans("TestMailing").''; } @@ -1023,13 +973,10 @@ else if ($object->nbemail <= 0) { print ''.$langs->trans("ValidMailing").''; - } - elseif (empty($user->rights->mailing->valider)) + } elseif (empty($user->rights->mailing->valider)) { print ''.$langs->trans("ValidMailing").''; - } - else - { + } else { print ''.$langs->trans("ValidMailing").''; } } @@ -1039,13 +986,10 @@ else if ($conf->global->MAILING_LIMIT_SENDBYWEB < 0) { print ''.$langs->trans("SendMailing").''; - } - elseif (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send) + } elseif (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send) { print ''.$langs->trans("SendMailing").''; - } - else - { + } else { print ''.$langs->trans("SendMailing").''; } } @@ -1060,9 +1004,7 @@ else if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send) { print ''.$langs->trans("ResetMailing").''; - } - else - { + } else { print ''.$langs->trans("ResetMailing").''; } } @@ -1072,9 +1014,7 @@ else if ($object->statut > 0 && (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->delete)) { print ''.$langs->trans("DeleteMailing").''; - } - else - { + } else { print ''.$langs->trans("DeleteMailing").''; } } @@ -1153,9 +1093,7 @@ else print img_mime($listofpaths[$key]['name']).' '.$listofpaths[$key]['name']; print '
'; } - } - else - { + } else { print ''.$langs->trans("NoAttachedFiles").'
'; } print ''; @@ -1176,14 +1114,11 @@ else require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor = new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', false, true, empty($conf->global->FCKEDITOR_ENABLE_MAILING) ? 0 : 1, 20, '90%', $readonly); $doleditor->Create(); - } - else print dol_htmlentitiesbr($object->body); + } else print dol_htmlentitiesbr($object->body); print ''; dol_fiche_end(); - } - else - { + } else { /* * Mailing en mode edition (CKeditor or HTML source) */ @@ -1229,9 +1164,7 @@ else if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0) { $text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB); - } - else - { + } else { $text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed'); } } @@ -1239,9 +1172,7 @@ else if ($text) { print $form->textwithpicto($nbemail, $text, 1, 'warning'); - } - else - { + } else { print $nbemail; } } @@ -1315,9 +1246,7 @@ else $out .= ' '; $out .= '
'; } - } - else - { + } else { $out .= $langs->trans("NoAttachedFiles").'
'; } // Add link to add file @@ -1366,9 +1295,7 @@ else print ''; print '
'; } - } - else - { + } else { dol_print_error($db, $object->error); } } diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index d8d9873b88b..27e0c2e5b0c 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -160,9 +160,7 @@ if (GETPOST('exportcsv', 'int')) } exit; - } - else - { + } else { dol_print_error($db); } exit; @@ -181,15 +179,11 @@ if ($action == 'delete') $obj->update_nb($id); setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs'); - } - else - { + } else { header("Location: list.php"); exit; } - } - else - { + } else { dol_print_error($db); } } @@ -293,9 +287,7 @@ if ($object->fetch($id) >= 0) if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0) { $text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB); - } - else - { + } else { $text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed'); } } @@ -303,9 +295,7 @@ if ($object->fetch($id) >= 0) if ($text) { print $form->textwithpicto($nbemail, $text, 1, 'warning'); - } - else - { + } else { print $nbemail; } } @@ -405,9 +395,7 @@ if ($object->fetch($id) >= 0) { print ''; $db->free($resql); -} -else -{ +} else { dol_print_error($db); } diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php index 6d80626242d..cd5d5c9ace9 100644 --- a/htdocs/comm/multiprix.php +++ b/htdocs/comm/multiprix.php @@ -152,9 +152,7 @@ if ($_socid > 0) } $db->free($resql); print ""; - } - else - { + } else { dol_print_error($db); } } diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index bd5430c440a..e737aa1d8c3 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -161,9 +161,7 @@ if (empty($reshook)) if (!GETPOST('socid', 3)) { setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors'); - } - else - { + } else { if ($object->id > 0) { if (!empty($conf->global->PROPAL_CLONE_DATE_DELIVERY)) { //Get difference between old and new delivery date and change lines according to difference @@ -204,9 +202,7 @@ if (empty($reshook)) } } } - } - - // Delete proposal + } // Delete proposal elseif ($action == 'confirm_delete' && $confirm == 'yes' && $usercandelete) { $result = $object->delete($user); @@ -217,9 +213,7 @@ if (empty($reshook)) $langs->load("errors"); setEventMessages($object->error, $object->errors, 'errors'); } - } - - // Remove line + } // Remove line elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $usercancreate) { $result = $object->deleteline($lineid); @@ -241,9 +235,7 @@ if (empty($reshook)) header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id); exit(); - } - - // Validation + } // Validation elseif ($action == 'confirm_validate' && $confirm == 'yes' && $usercanvalidate) { $result = $object->valid($user); @@ -269,9 +261,7 @@ if (empty($reshook)) if (count($object->errors) > 0) setEventMessages($object->error, $object->errors, 'errors'); else setEventMessages($langs->trans($object->error), null, 'errors'); } - } - - elseif ($action == 'setdate' && $usercancreate) + } elseif ($action == 'setdate' && $usercancreate) { $datep = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']); @@ -285,21 +275,17 @@ if (empty($reshook)) if ($result < 0) dol_print_error($db, $object->error); } - } - elseif ($action == 'setecheance' && $usercancreate) + } elseif ($action == 'setecheance' && $usercancreate) { $result = $object->set_echeance($user, dol_mktime(12, 0, 0, $_POST['echmonth'], $_POST['echday'], $_POST['echyear'])); if ($result < 0) dol_print_error($db, $object->error); - } - elseif ($action == 'setdate_livraison' && $usercancreate) + } elseif ($action == 'setdate_livraison' && $usercancreate) { $result = $object->set_date_livraison($user, dol_mktime(12, 0, 0, $_POST['date_livraisonmonth'], $_POST['date_livraisonday'], $_POST['date_livraisonyear'])); if ($result < 0) dol_print_error($db, $object->error); - } - - // Positionne ref client + } // Positionne ref client elseif ($action == 'setref_client' && $usercancreate) { $result = $object->set_ref_client($user, GETPOST('ref_client')); @@ -307,15 +293,11 @@ if (empty($reshook)) { setEventMessages($object->error, $object->errors, 'errors'); } - } - - // Set incoterm + } // Set incoterm elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled) && $usercancreate) { $result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha')); - } - - // Create proposal + } // Create proposal elseif ($action == 'add' && $usercancreate) { $object->socid = $socid; @@ -549,9 +531,8 @@ if (empty($reshook)) setEventMessages($object->error, $object->errors, 'errors'); $error++; } - } // Standard creation - else - { + } // Standard creation + else { $id = $object->create($user); } @@ -602,24 +583,18 @@ if (empty($reshook)) header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id); exit(); - } - else - { + } else { $db->rollback(); $action = 'create'; } - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); $db->rollback(); $action = 'create'; } } } - } - - // Classify billed + } // Classify billed elseif ($action == 'classifybilled' && $usercanclose) { $db->begin(); @@ -634,14 +609,10 @@ if (empty($reshook)) if (!$error) { $db->commit(); - } - else - { + } else { $db->rollback(); } - } - - // Close proposal + } // Close proposal elseif ($action == 'setstatut' && $usercanclose && !GETPOST('cancel', 'alpha')) { if (!(GETPOST('statut', 'int') > 0)) { setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CloseAs")), null, 'errors'); @@ -662,16 +633,12 @@ if (empty($reshook)) if (!$error) { $db->commit(); - } - else - { + } else { $db->rollback(); } } } - } - - // Reopen proposal + } // Reopen proposal elseif ($action == 'confirm_reopen' && $usercanclose && !GETPOST('cancel', 'alpha')) { // prevent browser refresh from reopening proposal several times if ($object->statut == Propal::STATUS_SIGNED || $object->statut == Propal::STATUS_NOTSIGNED || $object->statut == Propal::STATUS_BILLED) @@ -688,15 +655,11 @@ if (empty($reshook)) if (!$error) { $db->commit(); - } - else - { + } else { $db->rollback(); } } - } - - // add lines from objectlinked + } // add lines from objectlinked elseif ($action == 'import_lines_from_object' && $user->rights->propal->creer && $object->statut == Propal::STATUS_DRAFT @@ -712,8 +675,7 @@ if (empty($reshook)) { dol_include_once('/'.$fromElement.'/class/'.$fromElement.'.class.php'); $lineClassName = 'OrderLine'; - } - elseif ($fromElement == 'propal') + } elseif ($fromElement == 'propal') { dol_include_once('/comm/'.$fromElement.'/class/'.$fromElement.'.class.php'); $lineClassName = 'PropaleLigne'; @@ -765,8 +727,7 @@ if (empty($reshook)) } else { $error++; } - } - else { + } else { $error++; } } @@ -805,9 +766,7 @@ if (empty($reshook)) $ret = $object->fetch($id); // Reload to get new records $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } - } - - elseif ($action == "setabsolutediscount" && $usercancreate) { + } elseif ($action == "setabsolutediscount" && $usercancreate) { if ($_POST["remise_id"]) { if ($object->id > 0) { $result = $object->insert_discount($_POST["remise_id"]); @@ -816,9 +775,7 @@ if (empty($reshook)) } } } - } - - // Add line + } // Add line elseif ($action == 'addline' && $usercancreate) { // Set if we used free entry or predefined product $predef = ''; @@ -830,9 +787,7 @@ if (empty($reshook)) { $idprod = 0; $tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0); - } - else - { + } else { $idprod = GETPOST('idprod', 'int'); $tva_tx = ''; } @@ -924,8 +879,7 @@ if (empty($reshook)) if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) $tva_tx = $prod->multiprices_tva_tx[$object->thirdparty->price_level]; if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) $tva_npr = $prod->multiprices_recuperableonly[$object->thirdparty->price_level]; } - } - // If price per customer + } // If price per customer elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php'; @@ -947,8 +901,7 @@ if (empty($reshook)) if (empty($tva_tx)) $tva_npr = 0; } } - } - // If price per quantity + } // If price per quantity elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) { if ($prod->prices_by_qty[0]) // yes, this product has some prices per quantity @@ -964,17 +917,14 @@ if (empty($reshook)) if ($priceforthequantityarray['price_base_type'] == 'HT') { $pu_ht = $priceforthequantityarray['unitprice']; - } - else - { + } else { $pu_ttc = $priceforthequantityarray['unitprice']; } // Note: the remise_percent or price by qty is used to set data on form, so we will use value from POST. break; } } - } - // If price per quantity and customer + } // If price per quantity and customer elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) { if ($prod->prices_by_qty[$object->thirdparty->price_level]) // yes, this product has some prices per quantity @@ -990,9 +940,7 @@ if (empty($reshook)) if ($priceforthequantityarray['price_base_type'] == 'HT') { $pu_ht = $priceforthequantityarray['unitprice']; - } - else - { + } else { $pu_ttc = $priceforthequantityarray['unitprice']; } // Note: the remise_percent or price by qty is used to set data on form, so we will use value from POST. @@ -1008,8 +956,7 @@ if (empty($reshook)) if (!empty($price_ht)) { $pu_ht = price2num($price_ht, 'MU'); $pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU'); - } - // On reevalue prix selon taux tva car taux tva transaction peut etre different + } // On reevalue prix selon taux tva car taux tva transaction peut etre different // de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur). elseif ($tmpvat != $tmpprodvat) { if ($price_base_type != 'HT') { @@ -1180,9 +1127,7 @@ if (empty($reshook)) } } } - } - - // Update a line within proposal + } // Update a line within proposal elseif ($action == 'updateline' && $usercancreate && GETPOST('save')) { // Define info_bits @@ -1319,62 +1264,38 @@ if (empty($reshook)) } elseif ($action == 'updateline' && $usercancreate && GETPOST('cancel', 'alpha')) { header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition exit(); - } - - elseif ($action == 'classin' && $usercancreate) { + } elseif ($action == 'classin' && $usercancreate) { // Set project $object->setProject(GETPOST('projectid', 'int')); - } - - // Delivery time + } // Delivery time elseif ($action == 'setavailability' && $usercancreate) { $result = $object->set_availability($user, GETPOST('availability_id', 'int')); - } - - // Origin of the commercial proposal + } // Origin of the commercial proposal elseif ($action == 'setdemandreason' && $usercancreate) { $result = $object->set_demand_reason($user, GETPOST('demand_reason_id', 'int')); - } - - // Terms of payment + } // Terms of payment elseif ($action == 'setconditions' && $usercancreate) { $result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int')); - } - - elseif ($action == 'setremisepercent' && $usercancreate) { + } elseif ($action == 'setremisepercent' && $usercancreate) { $result = $object->set_remise_percent($user, $_POST['remise_percent']); - } - - elseif ($action == 'setremiseabsolue' && $usercancreate) { + } elseif ($action == 'setremiseabsolue' && $usercancreate) { $result = $object->set_remise_absolue($user, $_POST['remise_absolue']); - } - - // Payment choice + } // Payment choice elseif ($action == 'setmode' && $usercancreate) { $result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int')); - } - - // Multicurrency Code + } // Multicurrency Code elseif ($action == 'setmulticurrencycode' && $usercancreate) { $result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha')); - } - - // Multicurrency rate + } // Multicurrency rate elseif ($action == 'setmulticurrencyrate' && $usercancreate) { $result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx'))); - } - - // bank account + } // bank account elseif ($action == 'setbankaccount' && $usercancreate) { $result = $object->setBankAccount(GETPOST('fk_account', 'int')); - } - - // shipping method + } // shipping method elseif ($action == 'setshippingmethod' && $usercancreate) { $result = $object->setShippingMethod(GETPOST('shipping_method_id', 'int')); - } - - elseif ($action == 'update_extras') { + } elseif ($action == 'update_extras') { $object->oldcopy = dol_clone($object); // Fill array 'array_options' with data from update form @@ -1412,18 +1333,14 @@ if (empty($reshook)) setEventMessages($object->error, $object->errors, 'errors'); } } - } - - // Toggle the status of a contact + } // Toggle the status of a contact elseif ($action == 'swapstatut') { if ($object->fetch($id) > 0) { $result = $object->swapContactStatus(GETPOST('ligne')); } else { dol_print_error($db); } - } - - // Delete a contact + } // Delete a contact elseif ($action == 'deletecontact') { $object->fetch($id); $result = $object->delete_contact($lineid); @@ -1533,9 +1450,7 @@ if ($action == 'create') if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx)) $currency_tx = $objectsrc->multicurrency_tx; } } - } - else - { + } else { if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) $currency_code = $soc->multicurrency_code; } @@ -1908,24 +1823,16 @@ if ($action == 'create') } $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('SetAcceptedRefused'), $text, 'setstatut', $formquestion, '', 1, 250); - } - - // Confirm delete + } // Confirm delete elseif ($action == 'delete') { $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteProp'), $langs->trans('ConfirmDeleteProp', $object->ref), 'confirm_delete', '', 0, 1); - } - - // Confirm reopen + } // Confirm reopen elseif ($action == 'reopen') { $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ReOpen'), $langs->trans('ConfirmReOpenProp', $object->ref), 'confirm_reopen', '', 0, 1); - } - - // Confirmation delete product/service line + } // Confirmation delete product/service line elseif ($action == 'ask_deleteline') { $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 0, 1); - } - - // Confirm validate proposal + } // Confirm validate proposal elseif ($action == 'validate') { $error = 0; @@ -2309,9 +2216,7 @@ if ($action == 'create') if ($action != 'editincoterm') { print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1); - } - else - { + } else { print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id); } print ''; @@ -2478,9 +2383,7 @@ if ($action == 'create') if ($usercanvalidate) { print ''.$langs->trans('Validate').''; - } - else - print ''.$langs->trans('Validate').''; + } else print ''.$langs->trans('Validate').''; } // Create event /*if ($conf->agenda->enabled && ! empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD)) // Add hidden condition because this is not a "workflow" action so should appears somewhere else on page. @@ -2503,8 +2406,7 @@ if ($action == 'create') if ($object->statut == Propal::STATUS_VALIDATED || $object->statut == Propal::STATUS_SIGNED || !empty($conf->global->PROPOSAL_SENDBYEMAIL_FOR_ALL_STATUS)) { if ($usercansend) { print ''.$langs->trans('SendMail').''; - } else - print ''.$langs->trans('SendMail').''; + } else print ''.$langs->trans('SendMail').''; } } @@ -2556,9 +2458,7 @@ if ($action == 'create') if ($usercanclose) { print 'socid.'">'.$langs->trans("ClassifyBilled").''; - } - else - { + } else { print ''.$langs->trans("ClassifyBilled").''; } } @@ -2596,13 +2496,13 @@ if ($action == 'create') /* * Documents generes */ - $filename = dol_sanitizeFileName($object->ref); + $objref = dol_sanitizeFileName($object->ref); $filedir = $conf->propal->multidir_output[$object->entity]."/".dol_sanitizeFileName($object->ref); $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id; $genallowed = $usercanread; $delallowed = $usercancreate; - print $formfile->showdocuments('propal', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang, '', $object); + print $formfile->showdocuments('propal', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang, '', $object); // Show links to link elements $linktoelem = $form->showLinkToObjectBlock($object, null, array('propal')); diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php index 87c91d0f621..8efc4aa5c19 100644 --- a/htdocs/comm/propal/class/api_proposals.class.php +++ b/htdocs/comm/propal/class/api_proposals.class.php @@ -220,8 +220,7 @@ class Proposals extends DolibarrApi } $i++; } - } - else { + } else { throw new RestException(503, 'Error when retrieve propal list : '.$db->lasterror()); } if (!count($obj_ret)) { @@ -456,9 +455,7 @@ class Proposals extends DolibarrApi $updateRes = $this->propal->deleteline($lineid); if ($updateRes > 0) { return $this->get($id); - } - else - { + } else { throw new RestException(405, $this->propal->error); } } @@ -588,9 +585,7 @@ class Proposals extends DolibarrApi if ($this->propal->update(DolibarrApiAccess::$user) > 0) { return $this->get($id); - } - else - { + } else { throw new RestException(500, $this->propal->error); } } diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 3c7cfe0006c..63e3864245b 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -390,9 +390,7 @@ class Propal extends CommonObject if ($conf->global->PRODUIT_MULTIPRICES && $this->thirdparty->price_level) { $price = $prod->multiprices[$this->thirdparty->price_level]; - } - else - { + } else { $price = $prod->price; } @@ -473,22 +471,16 @@ class Propal extends CommonObject { $this->db->commit(); return 1; - } - else - { + } else { $this->db->rollback(); return -1; } - } - else - { + } else { $this->error = $line->error; $this->db->rollback(); return -2; } - } - else - { + } else { $this->db->rollback(); return -2; } @@ -561,9 +553,7 @@ class Propal extends CommonObject if ($price_base_type == 'HT') { $pu = $pu_ht; - } - else - { + } else { $pu = $pu_ttc; } @@ -715,23 +705,17 @@ class Propal extends CommonObject { $this->db->commit(); return $this->line->id; - } - else - { + } else { $this->error = $this->db->error(); $this->db->rollback(); return -1; } - } - else - { + } else { $this->error = $this->line->error; $this->db->rollback(); return -2; } - } - else - { + } else { dol_syslog(get_class($this)."::addline status of proposal must be Draft to allow use of ->addline()", LOG_ERR); return -3; } @@ -917,17 +901,13 @@ class Propal extends CommonObject $this->db->commit(); return $result; - } - else - { + } else { $this->error = $this->line->error; $this->db->rollback(); return -1; } - } - else - { + } else { dol_syslog(get_class($this)."::updateline Erreur -2 Propal en mode incompatible pour cette action"); return -2; } @@ -959,15 +939,11 @@ class Propal extends CommonObject $this->db->commit(); return 1; - } - else - { + } else { $this->db->rollback(); return -1; } - } - else - { + } else { $this->error = 'ErrorDeleteLineNotAllowedByObjectStatus'; return -2; } @@ -1141,8 +1117,7 @@ class Propal extends CommonObject $error++; } } - } - else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1)) + } else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1)) { $origin_id = $tmp_origin_id; $ret = $this->add_object_linked($origin, $origin_id); @@ -1169,9 +1144,7 @@ class Propal extends CommonObject if (!is_object($this->lines[$i])) // If this->lines is not array of objects, coming from REST API { // Convert into object this->lines[$i]. $line = (object) $this->lines[$i]; - } - else - { + } else { $line = $this->lines[$i]; } // Reset fk_parent_line for line that are not child lines or special product @@ -1267,16 +1240,12 @@ class Propal extends CommonObject if ($result < 0) { $error++; } // End call triggers } - } - else - { + } else { $this->error = $this->db->lasterror(); $error++; } } - } - else - { + } else { $this->error = $this->db->lasterror(); $error++; } @@ -1286,15 +1255,11 @@ class Propal extends CommonObject $this->db->commit(); dol_syslog(get_class($this)."::create done id=".$this->id); return $this->id; - } - else - { + } else { $this->db->rollback(); return -2; } - } - else - { + } else { $this->error = $this->db->lasterror(); $this->db->rollback(); return -1; @@ -1374,9 +1339,7 @@ class Propal extends CommonObject $object->ref_client = ''; // TODO Change product price if multi-prices - } - else - { + } else { $objsoc->fetch($object->socid); } @@ -1444,9 +1407,7 @@ class Propal extends CommonObject { $this->db->commit(); return $object->id; - } - else - { + } else { $this->db->rollback(); return -1; } @@ -1500,8 +1461,7 @@ class Propal extends CommonObject if ($ref) { $sql .= " WHERE p.entity IN (".getEntity('propal').")"; // Dont't use entity if you use rowid $sql .= " AND p.ref='".$this->db->escape($ref)."'"; - } - else $sql .= " WHERE p.rowid=".$rowid; + } else $sql .= " WHERE p.rowid=".$rowid; dol_syslog(get_class($this)."::fetch", LOG_DEBUG); $resql = $this->db->query($sql); @@ -1611,9 +1571,7 @@ class Propal extends CommonObject $this->error = "Record Not Found"; return 0; - } - else - { + } else { $this->error = $this->db->lasterror(); return -1; } @@ -1707,9 +1665,7 @@ class Propal extends CommonObject } $this->db->rollback(); return -1 * $error; - } - else - { + } else { $this->db->commit(); return 1; } @@ -1837,9 +1793,7 @@ class Propal extends CommonObject $this->db->free($result); return $num; - } - else - { + } else { $this->error = $this->db->lasterror(); return -3; } @@ -1887,9 +1841,7 @@ class Propal extends CommonObject if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life { $num = $this->getNextNumRef($soc); - } - else - { + } else { $num = $this->ref; } $this->newref = dol_sanitizeFileName($num); @@ -1962,9 +1914,7 @@ class Propal extends CommonObject $this->db->commit(); return 1; - } - else - { + } else { $this->db->rollback(); return -1; } @@ -2026,9 +1976,7 @@ class Propal extends CommonObject { $this->db->commit(); return 1; - } - else - { + } else { foreach ($this->errors as $errmsg) { dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR); @@ -2088,9 +2036,7 @@ class Propal extends CommonObject { $this->db->commit(); return 1; - } - else - { + } else { foreach ($this->errors as $errmsg) { dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR); @@ -2150,9 +2096,7 @@ class Propal extends CommonObject { $this->db->commit(); return 1; - } - else - { + } else { foreach ($this->errors as $errmsg) { dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR); @@ -2213,9 +2157,7 @@ class Propal extends CommonObject { $this->db->commit(); return 1; - } - else - { + } else { foreach ($this->errors as $errmsg) { dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR); @@ -2224,9 +2166,7 @@ class Propal extends CommonObject $this->db->rollback(); return -1 * $error; } - } - else - { + } else { $error_str = 'Propal status do not meet requirement '.$this->statut; dol_syslog(__METHOD__.$error_str, LOG_ERR); $this->error = $error_str; @@ -2286,9 +2226,7 @@ class Propal extends CommonObject { $this->db->commit(); return 1; - } - else - { + } else { foreach ($this->errors as $errmsg) { dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR); @@ -2297,9 +2235,7 @@ class Propal extends CommonObject $this->db->rollback(); return -1 * $error; } - } - else - { + } else { $error_str = 'Propal status do not meet requirement '.$this->statut; dol_syslog(__METHOD__.$error_str, LOG_ERR); $this->error = $error_str; @@ -2355,9 +2291,7 @@ class Propal extends CommonObject { $this->db->commit(); return 1; - } - else - { + } else { foreach ($this->errors as $errmsg) { dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR); @@ -2366,9 +2300,7 @@ class Propal extends CommonObject $this->db->rollback(); return -1 * $error; } - } - else - { + } else { return -1; } } @@ -2425,9 +2357,7 @@ class Propal extends CommonObject { $this->db->commit(); return 1; - } - else - { + } else { foreach ($this->errors as $errmsg) { dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR); @@ -2493,9 +2423,7 @@ class Propal extends CommonObject { $this->db->commit(); return 1; - } - else - { + } else { foreach ($this->errors as $errmsg) { dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR); @@ -2561,9 +2489,7 @@ class Propal extends CommonObject } $this->db->rollback(); return -1 * $error; - } - else - { + } else { $this->db->commit(); return 1; } @@ -2656,9 +2582,7 @@ class Propal extends CommonObject { $this->db->commit(); return 1; - } - else - { + } else { $this->statut = $this->oldcopy->statut; $this->date_cloture = $this->oldcopy->date_cloture; $this->note_private = $this->oldcopy->note_private; @@ -2666,9 +2590,7 @@ class Propal extends CommonObject $this->db->rollback(); return -1; } - } - else - { + } else { $this->error = $this->db->lasterror(); $this->db->rollback(); return -1; @@ -2717,9 +2639,7 @@ class Propal extends CommonObject { $this->db->commit(); return 1; - } - else - { + } else { foreach ($this->errors as $errmsg) { dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR); @@ -2784,9 +2704,7 @@ class Propal extends CommonObject $this->db->commit(); return 1; - } - else - { + } else { foreach ($this->errors as $errmsg) { dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR); @@ -2852,13 +2770,10 @@ class Propal extends CommonObject if ($shortlist == 1) { $ga[$obj->propalid] = $obj->ref; - } - elseif ($shortlist == 2) + } elseif ($shortlist == 2) { $ga[$obj->propalid] = $obj->ref.' ('.$obj->name.')'; - } - else - { + } else { $ga[$i]['id'] = $obj->propalid; $ga[$i]['ref'] = $obj->ref; $ga[$i]['name'] = $obj->name; @@ -2868,9 +2783,7 @@ class Propal extends CommonObject } } return $ga; - } - else - { + } else { dol_print_error($this->db); return -1; } @@ -2910,10 +2823,8 @@ class Propal extends CommonObject if ($objecttype == 'facture') { $linkedInvoices[] = $object; - } - // Cas des factures liees par un autre objet (ex: commande) - else - { + } // Cas des factures liees par un autre objet (ex: commande) + else { $this->fetchObjectLinked($object, $objecttype); foreach ($this->linkedObjectsIds as $subobjecttype => $subobjectid) { @@ -2964,13 +2875,10 @@ class Propal extends CommonObject } } return $ga; - } - else - { + } else { return -1; } - } - else return $ga; + } else return $ga; } /** @@ -3067,30 +2975,22 @@ class Propal extends CommonObject dol_syslog(get_class($this)."::delete ".$this->id." by ".$user->id, LOG_DEBUG); $this->db->commit(); return 1; - } - else - { + } else { $this->error = $this->db->lasterror(); $this->db->rollback(); return 0; } - } - else - { + } else { $this->error = $this->db->lasterror(); $this->db->rollback(); return -3; } - } - else - { + } else { $this->error = $this->db->lasterror(); $this->db->rollback(); return -2; } - } - else - { + } else { $this->db->rollback(); return -1; } @@ -3144,9 +3044,7 @@ class Propal extends CommonObject { $this->db->commit(); return 1; - } - else - { + } else { foreach ($this->errors as $errmsg) { dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR); @@ -3155,9 +3053,7 @@ class Propal extends CommonObject $this->db->rollback(); return -1 * $error; } - } - else - { + } else { $error_str = 'Propal status do not meet requirement '.$this->statut; dol_syslog(__METHOD__.$error_str, LOG_ERR); $this->error = $error_str; @@ -3216,9 +3112,7 @@ class Propal extends CommonObject { $this->db->commit(); return 1; - } - else - { + } else { foreach ($this->errors as $errmsg) { dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR); @@ -3227,9 +3121,7 @@ class Propal extends CommonObject $this->db->rollback(); return -1 * $error; } - } - else - { + } else { $error_str = 'Propal status do not meet requirement '.$this->statut; dol_syslog(__METHOD__.$error_str, LOG_ERR); $this->error = $error_str; @@ -3286,9 +3178,7 @@ class Propal extends CommonObject } } $this->db->free($result); - } - else - { + } else { dol_print_error($this->db); } } @@ -3423,9 +3313,7 @@ class Propal extends CommonObject } return $response; - } - else - { + } else { $this->error = $this->db->error(); return -1; } @@ -3503,9 +3391,7 @@ class Propal extends CommonObject $line->total_ttc = 60; $line->total_tva = 10; $line->remise_percent = 50; - } - else - { + } else { $line->total_ht = 100; $line->total_ttc = 120; $line->total_tva = 20; @@ -3564,9 +3450,7 @@ class Propal extends CommonObject } $this->db->free($resql); return 1; - } - else - { + } else { dol_print_error($this->db); $this->error = $this->db->error(); return -1; @@ -3616,16 +3500,12 @@ class Propal extends CommonObject if ($numref != "") { return $numref; - } - else - { + } else { $this->error = $obj->error; //dol_print_error($db,"Propale::getNextNumRef ".$obj->error); return ""; } - } - else - { + } else { $langs->load("errors"); print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Proposal")); return ""; @@ -3673,14 +3553,11 @@ class Propal extends CommonObject if ($option == '') { $url = DOL_URL_ROOT.'/comm/propal/card.php?id='.$this->id.$get_params; - } - elseif ($option == 'compta') { // deprecated + } elseif ($option == 'compta') { // deprecated $url = DOL_URL_ROOT.'/comm/propal/card.php?id='.$this->id.$get_params; - } - elseif ($option == 'expedition') { + } elseif ($option == 'expedition') { $url = DOL_URL_ROOT.'/expedition/propal.php?id='.$this->id.$get_params; - } - elseif ($option == 'document') { + } elseif ($option == 'document') { $url = DOL_URL_ROOT.'/comm/propal/document.php?id='.$this->id.$get_params; } @@ -4028,14 +3905,10 @@ class PropaleLigne extends CommonObjectLine $this->db->free($result); return 1; - } - else - { + } else { return 0; } - } - else - { + } else { return -1; } } @@ -4084,9 +3957,7 @@ class PropaleLigne extends CommonObjectLine if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0) { return $result; - } - else - { + } else { $this->pa_ht = $result; } } @@ -4173,9 +4044,7 @@ class PropaleLigne extends CommonObjectLine $this->db->commit(); return 1; - } - else - { + } else { $this->error = $this->db->error()." sql=".$sql; $this->db->rollback(); return -1; @@ -4227,9 +4096,7 @@ class PropaleLigne extends CommonObjectLine $this->db->commit(); return 1; - } - else - { + } else { $this->error = $this->db->error()." sql=".$sql; $this->db->rollback(); return -1; @@ -4276,9 +4143,7 @@ class PropaleLigne extends CommonObjectLine if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0) { return $result; - } - else - { + } else { $this->pa_ht = $result; } } @@ -4355,9 +4220,7 @@ class PropaleLigne extends CommonObjectLine $this->db->commit(); return 1; - } - else - { + } else { $this->error = $this->db->error(); $this->db->rollback(); return -2; @@ -4390,9 +4253,7 @@ class PropaleLigne extends CommonObjectLine { $this->db->commit(); return 1; - } - else - { + } else { $this->error = $this->db->error(); $this->db->rollback(); return -2; diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php index da86625b78f..c2f60516f1c 100644 --- a/htdocs/comm/propal/contact.php +++ b/htdocs/comm/propal/contact.php @@ -55,8 +55,7 @@ if ($id > 0 || !empty($ref)) $langs->load("errors"); setEventMessages($langs->trans('ErrorRecordNotFound'), null, 'errors'); $error++; - } - elseif ($ret < 0) + } elseif ($ret < 0) { setEventMessages($object->error, $object->errors, 'errors'); $error++; @@ -65,9 +64,7 @@ if ($id > 0 || !empty($ref)) if (!$error) { $object->fetch_thirdparty(); -} -else -{ +} else { header('Location: '.DOL_URL_ROOT.'/comm/propal/list.php'); exit; } @@ -89,31 +86,23 @@ if ($action == 'addcontact' && $user->rights->propale->creer) { header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); exit; - } - else - { + } else { if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') { $langs->load("errors"); setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors'); - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } -} - -// Toggle the status of a contact +} // Toggle the status of a contact elseif ($action == 'swapstatut' && $user->rights->propale->creer) { if ($object->id > 0) { $result = $object->swapContactStatus(GETPOST('ligne')); } -} - -// Deletes a contact +} // Deletes a contact elseif ($action == 'deletecontact' && $user->rights->propale->creer) { $result = $object->delete_contact($lineid); @@ -122,9 +111,7 @@ elseif ($action == 'deletecontact' && $user->rights->propale->creer) { header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); exit; - } - else - { + } else { dol_print_error($db); } } diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php index d9d12c5efb4..70c67566091 100644 --- a/htdocs/comm/propal/document.php +++ b/htdocs/comm/propal/document.php @@ -179,9 +179,7 @@ if ($object->id > 0) $permtoedit = $user->rights->propal->creer; $param = '&id='.$object->id; include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php'; -} -else -{ +} else { print $langs->trans("ErrorUnknown"); } diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php index a320d2b83b9..9e138c52cbe 100644 --- a/htdocs/comm/propal/index.php +++ b/htdocs/comm/propal/index.php @@ -163,9 +163,7 @@ if ($resql) //print '
"; -} -else -{ +} else { dol_print_error($db); } @@ -220,8 +218,7 @@ if (!empty($conf->propal->enabled)) if ($num > $nbofloop) { print '
"; -} -else dol_print_error($db); +} else dol_print_error($db); /* @@ -394,17 +390,14 @@ if (!empty($conf->propal->enabled) && $user->rights->propale->lire) if ($num > $nbofloop) { print '
"; } - } - else - { + } else { dol_print_error($db); } } diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 76914e2c13a..6710ac56b58 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -414,9 +414,7 @@ if ($resql) $soc->fetch($socid); $title = $langs->trans('ListOfProposals').' - '.$soc->name; if (empty($search_societe)) $search_societe = $soc->name; - } - else - { + } else { $title = $langs->trans('ListOfProposals'); } @@ -1028,9 +1026,7 @@ if ($resql) { print '
';
// Show graphs
print '
"; } - } - else - { + } else { dol_print_error($db); } } diff --git a/htdocs/comm/prospect/recap-prospect.php b/htdocs/comm/prospect/recap-prospect.php index b3b852c591a..e393f5fce56 100644 --- a/htdocs/comm/prospect/recap-prospect.php +++ b/htdocs/comm/prospect/recap-prospect.php @@ -83,9 +83,7 @@ if ($socid > 0) print $langs->trans("FeatureNotYetAvailable"); -} -else -{ +} else { dol_print_error($db); } diff --git a/htdocs/comm/recap-client.php b/htdocs/comm/recap-client.php index 09f5e46f94b..284c248f1f0 100644 --- a/htdocs/comm/recap-client.php +++ b/htdocs/comm/recap-client.php @@ -83,9 +83,7 @@ if ($socid > 0) print $langs->trans("FeatureNotYetAvailable"); -} -else -{ +} else { dol_print_error($db); } diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php index dc41845516a..a7517c9cb60 100644 --- a/htdocs/comm/remise.php +++ b/htdocs/comm/remise.php @@ -70,15 +70,11 @@ if (GETPOST('action', 'aZ09') == 'setremise') { header("Location: ".$backtopage); exit; - } - else - { + } else { header("Location: remise.php?id=".$_GET["id"]); exit; } - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } @@ -252,16 +248,12 @@ if ($socid > 0) print ''; $i++; } - } - else - { + } else { print ''.$langs->trans("None").' '.$langs->trans("None").' ';
$facturestatic->id = $obj->fk_facture_source;
@@ -498,8 +481,7 @@ if ($socid > 0)
$facturestatic->type = $obj->type;
print preg_replace('/\(DEPOSIT\)/', $langs->trans("InvoiceDeposit"), $obj->description).' '.$facturestatic->getNomURl(1);
print ' ';
- }
- elseif (preg_match('/\(EXCESS RECEIVED\)/', $obj->description))
+ } elseif (preg_match('/\(EXCESS RECEIVED\)/', $obj->description))
{
print '';
$facturestatic->id = $obj->fk_facture_source;
@@ -507,9 +489,7 @@ if ($socid > 0)
$facturestatic->type = $obj->type;
print preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("ExcessReceived"), $obj->description).' '.$facturestatic->getNomURl(1);
print ' ';
- }
- else
- {
+ } else {
print '';
print $obj->description;
print ' ';
@@ -535,8 +515,7 @@ if ($socid > 0)
print 'rowid.($backtopage ? '&backtopage='.urlencode($backtopage) : '').'">'.img_split($langs->trans("SplitDiscount")).'';
print 'rowid.($backtopage ? '&backtopage='.urlencode($backtopage) : '').'">'.img_delete($langs->trans("RemoveDiscount")).'';
print '';
- }
- else print ' ';
+ } else print ' ';
print '';
if ($_GET["action"] == 'split' && GETPOST('remid') == $obj->rowid)
@@ -546,9 +525,7 @@ if ($socid > 0)
}
$i++;
}
- }
- else
- {
+ } else {
$colspan = 8;
if (!empty($conf->multicurrency->enabled)) $colspan += 2;
print ''.$langs->trans("None").' ';
$facturefournstatic->id = $obj->fk_invoice_supplier_source;
@@ -655,8 +629,7 @@ if ($socid > 0)
$facturefournstatic->type = $obj->type;
print preg_replace('/\(DEPOSIT\)/', $langs->trans("InvoiceDeposit"), $obj->description).' '.$facturefournstatic->getNomURl(1);
print ' ';
- }
- elseif (preg_match('/\(EXCESS PAID\)/', $obj->description))
+ } elseif (preg_match('/\(EXCESS PAID\)/', $obj->description))
{
print '';
$facturefournstatic->id = $obj->fk_invoice_supplier_source;
@@ -664,9 +637,7 @@ if ($socid > 0)
$facturefournstatic->type = $obj->type;
print preg_replace('/\(EXCESS PAID\)/', $langs->trans("ExcessPaid"), $obj->description).' '.$facturefournstatic->getNomURl(1);
print ' ';
- }
- else
- {
+ } else {
print '';
print $obj->description;
print ' ';
@@ -692,8 +663,7 @@ if ($socid > 0)
print 'rowid.($backtopage ? '&backtopage='.urlencode($backtopage) : '').'">'.img_split($langs->trans("SplitDiscount")).'';
print 'rowid.($backtopage ? '&backtopage='.urlencode($backtopage) : '').'">'.img_delete($langs->trans("RemoveDiscount")).'';
print '';
- }
- else print ' ';
+ } else print ' ';
print '';
if ($_GET["action"] == 'split' && GETPOST('remid') == $obj->rowid)
@@ -703,9 +673,7 @@ if ($socid > 0)
}
$i++;
}
- }
- else
- {
+ } else {
$colspan = 8;
if (!empty($conf->multicurrency->enabled)) $colspan += 2;
print ''.$langs->trans("None").' ';
$facturestatic->id = $obj->fk_facture_source;
@@ -866,8 +831,7 @@ if ($socid > 0)
$facturestatic->type = $obj->type;
print preg_replace('/\(DEPOSIT\)/', $langs->trans("InvoiceDeposit"), $obj->description).' '.$facturestatic->getNomURl(1);
print ' ';
- }
- elseif (preg_match('/\(EXCESS RECEIVED\)/', $obj->description))
+ } elseif (preg_match('/\(EXCESS RECEIVED\)/', $obj->description))
{
print '';
$facturestatic->id = $obj->fk_facture_source;
@@ -875,9 +839,7 @@ if ($socid > 0)
$facturestatic->type = $obj->type;
print preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("Invoice"), $obj->description).' '.$facturestatic->getNomURl(1);
print ' ';
- }
- else
- {
+ } else {
print '';
print $obj->description;
print ' ';
@@ -906,9 +868,7 @@ if ($socid > 0)
print '';
$i++;
}
- }
- else
- {
+ } else {
$colspan = 8;
if (!empty($conf->multicurrency->enabled)) $colspan += 2;
print ''.$langs->trans("None").'
';
- }
- else
- {
+ } else {
dol_print_error($db);
}
}
@@ -1035,8 +993,7 @@ if ($socid > 0)
$facturefournstatic->type = $obj->type;
print preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $obj->description).' '.$facturefournstatic->getNomURl(1);
print '';
- }
- elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
+ } elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
{
print '| ';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
print $px1->show();
print " \n"; print $px2->show(); diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php index ff0beef4037..b49f334dadd 100644 --- a/htdocs/comm/prospect/index.php +++ b/htdocs/comm/prospect/index.php @@ -223,9 +223,7 @@ if (!empty($conf->propal->enabled) && $user->rights->propale->lire) } print " |
"; } - } - else - { + } else { dol_print_error($db); } } diff --git a/htdocs/comm/prospect/recap-prospect.php b/htdocs/comm/prospect/recap-prospect.php index b3b852c591a..e393f5fce56 100644 --- a/htdocs/comm/prospect/recap-prospect.php +++ b/htdocs/comm/prospect/recap-prospect.php @@ -83,9 +83,7 @@ if ($socid > 0) print $langs->trans("FeatureNotYetAvailable"); -} -else -{ +} else { dol_print_error($db); } diff --git a/htdocs/comm/recap-client.php b/htdocs/comm/recap-client.php index 09f5e46f94b..284c248f1f0 100644 --- a/htdocs/comm/recap-client.php +++ b/htdocs/comm/recap-client.php @@ -83,9 +83,7 @@ if ($socid > 0) print $langs->trans("FeatureNotYetAvailable"); -} -else -{ +} else { dol_print_error($db); } diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php index dc41845516a..a7517c9cb60 100644 --- a/htdocs/comm/remise.php +++ b/htdocs/comm/remise.php @@ -70,15 +70,11 @@ if (GETPOST('action', 'aZ09') == 'setremise') { header("Location: ".$backtopage); exit; - } - else - { + } else { header("Location: remise.php?id=".$_GET["id"]); exit; } - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } @@ -252,16 +248,12 @@ if ($socid > 0) print ''; $i++; } - } - else - { + } else { print '
';
print ''; // ancre
// Documents
- $comref = dol_sanitizeFileName($object->ref);
- $relativepath = $comref.'/'.$comref.'.pdf';
- $filedir = $conf->commande->multidir_output[$object->entity].'/'.$comref;
+ $objref = dol_sanitizeFileName($object->ref);
+ $relativepath = $objref.'/'.$objref.'.pdf';
+ $filedir = $conf->commande->multidir_output[$object->entity].'/'.$objref;
$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
$genallowed = $usercanread;
$delallowed = $usercancreate;
- print $formfile->showdocuments('commande', $comref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang, '', $object);
+ print $formfile->showdocuments('commande', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang, '', $object);
// Show links to link elements
diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index ab0abb3d151..cc7db3db852 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -223,8 +223,7 @@ class Orders extends DolibarrApi
}
$i++;
}
- }
- else {
+ } else {
throw new RestException(503, 'Error when retrieve commande list : '.$db->lasterror());
}
if (!count($obj_ret)) {
@@ -569,9 +568,7 @@ class Orders extends DolibarrApi
if ($this->commande->update(DolibarrApiAccess::$user) > 0)
{
return $this->get($id);
- }
- else
- {
+ } else {
throw new RestException(500, $this->commande->error);
}
}
@@ -699,7 +696,7 @@ class Orders extends DolibarrApi
$result = $this->commande->set_reopen(DolibarrApiAccess::$user);
if ($result < 0) {
throw new RestException(405, $this->commande->error);
- }elseif ($result == 0) {
+ } elseif ($result == 0) {
throw new RestException(304);
}
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index b911a03e3ad..1c3c44dce93 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -406,16 +406,12 @@ class Commande extends CommonOrder
if ($numref != "")
{
return $numref;
- }
- else
- {
+ } else {
$this->error = $obj->error;
//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
return "";
}
- }
- else
- {
+ } else {
print $langs->trans("Error")." ".$langs->trans("Error_COMMANDE_ADDON_NotDefined");
return "";
}
@@ -468,9 +464,7 @@ class Commande extends CommonOrder
if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
{
$num = $this->getNextNumRef($soc);
- }
- else
- {
+ } else {
$num = $this->ref;
}
$this->newref = dol_sanitizeFileName($num);
@@ -581,9 +575,7 @@ class Commande extends CommonOrder
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
@@ -668,9 +660,7 @@ class Commande extends CommonOrder
$this->db->rollback();
return -1;
}
- }
- else
- {
+ } else {
$this->error = $this->db->error();
$this->db->rollback();
return -1;
@@ -711,9 +701,7 @@ class Commande extends CommonOrder
$result = $this->call_trigger('ORDER_REOPEN', $user);
if ($result < 0) $error++;
// End call triggers
- }
- else
- {
+ } else {
$error++;
$this->error = $this->db->lasterror();
dol_print_error($this->db);
@@ -726,9 +714,7 @@ class Commande extends CommonOrder
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
foreach ($this->errors as $errmsg)
{
dol_syslog(get_class($this)."::set_reopen ".$errmsg, LOG_ERR);
@@ -783,15 +769,11 @@ class Commande extends CommonOrder
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
$this->db->rollback();
@@ -861,9 +843,7 @@ class Commande extends CommonOrder
$this->statut = self::STATUS_CANCELED;
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
foreach ($this->errors as $errmsg)
{
dol_syslog(get_class($this)."::cancel ".$errmsg, LOG_ERR);
@@ -872,9 +852,7 @@ class Commande extends CommonOrder
$this->db->rollback();
return -1 * $error;
}
- }
- else
- {
+ } else {
$this->error = $this->db->error();
$this->db->rollback();
return -1;
@@ -1100,8 +1078,7 @@ class Commande extends CommonOrder
$error++;
}
}
- }
- else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+ } else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
{
$origin_id = $tmp_origin_id;
$ret = $this->add_object_linked($origin, $origin_id);
@@ -1147,8 +1124,7 @@ class Commande extends CommonOrder
//print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n";
$this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source); // May failed because of duplicate key or because code of contact type does not exists for new object
}
- }
- else dol_print_error($resqlcontact);
+ } else dol_print_error($resqlcontact);
}
if (!$error)
@@ -1169,23 +1145,17 @@ class Commande extends CommonOrder
{
$this->db->commit();
return $this->id;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1 * $error;
}
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
$this->db->rollback();
return -1;
}
}
- }
- else
- {
+ } else {
dol_print_error($this->db);
$this->db->rollback();
return -1;
@@ -1288,9 +1258,7 @@ class Commande extends CommonOrder
{
$this->db->commit();
return $this->id;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
@@ -1421,10 +1389,8 @@ class Commande extends CommonOrder
$this->valid($user);
}
return $ret;
- }
- else return -1;
- }
- else return -1;
+ } else return -1;
+ } else return -1;
}
@@ -1504,9 +1470,7 @@ class Commande extends CommonOrder
if ($price_base_type == 'HT')
{
$pu = $pu_ht;
- }
- else
- {
+ } else {
$pu = $pu_ttc;
}
$label = trim($label);
@@ -1665,23 +1629,17 @@ class Commande extends CommonOrder
{
$this->db->commit();
return $this->line->id;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
- }
- else
- {
+ } else {
$this->error = $this->line->error;
dol_syslog(get_class($this)."::addline error=".$this->error, LOG_ERR);
$this->db->rollback();
return -2;
}
- }
- else
- {
+ } else {
dol_syslog(get_class($this)."::addline status of order must be Draft to allow use of ->addline()", LOG_ERR);
return -3;
}
@@ -1920,15 +1878,11 @@ class Commande extends CommonOrder
return -3;
}
return 1;
- }
- else
- {
+ } else {
$this->error = 'Order with id '.$id.' not found sql='.$sql;
return 0;
}
- }
- else
- {
+ } else {
$this->error = $this->db->error();
return -1;
}
@@ -1992,22 +1946,16 @@ class Commande extends CommonOrder
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
- }
- else
- {
+ } else {
$this->error = $line->error;
$this->db->rollback();
return -2;
}
- }
- else
- {
+ } else {
$this->db->rollback();
return -2;
}
@@ -2018,7 +1966,7 @@ class Commande extends CommonOrder
/**
* Load array lines
*
- * @param int $only_product Return only physical products
+ * @param int $only_product Return only physical products, not services
* @param int $loadalsotranslation Return translation for products
* @return int <0 if KO, >0 if OK
*/
@@ -2132,9 +2080,7 @@ class Commande extends CommonOrder
$this->db->free($result);
return 1;
- }
- else
- {
+ } else {
$this->error = $this->db->error();
return -3;
}
@@ -2197,9 +2143,7 @@ class Commande extends CommonOrder
$this->db->free($resql);
return $nb;
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
return -1;
}
@@ -2244,9 +2188,7 @@ class Commande extends CommonOrder
}
$this->db->free($resql);
return $num;
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
return -1;
}
@@ -2275,8 +2217,7 @@ class Commande extends CommonOrder
{
$row = $this->db->fetch_row($resql);
return $row[0];
- }
- else dol_print_error($this->db);
+ } else dol_print_error($this->db);
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -2362,36 +2303,26 @@ class Commande extends CommonOrder
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
$this->error = $this->db->lasterror();
return -1;
}
- }
- else
- {
+ } else {
$this->db->rollback();
$this->error = $line->error;
return -1;
}
- }
- else
- {
+ } else {
$this->db->rollback();
return 0;
}
- }
- else
- {
+ } else {
$this->db->rollback();
$this->error = $this->db->lasterror();
return -1;
}
- }
- else
- {
+ } else {
$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
return -1;
}
@@ -2450,9 +2381,7 @@ class Commande extends CommonOrder
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
foreach ($this->errors as $errmsg)
{
dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2518,9 +2447,7 @@ class Commande extends CommonOrder
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
foreach ($this->errors as $errmsg)
{
dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2581,9 +2508,7 @@ class Commande extends CommonOrder
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
foreach ($this->errors as $errmsg)
{
dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2592,9 +2517,7 @@ class Commande extends CommonOrder
$this->db->rollback();
return -1 * $error;
}
- }
- else
- {
+ } else {
return -2;
}
}
@@ -2647,9 +2570,7 @@ class Commande extends CommonOrder
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
foreach ($this->errors as $errmsg)
{
dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2658,9 +2579,7 @@ class Commande extends CommonOrder
$this->db->rollback();
return -1 * $error;
}
- }
- else
- {
+ } else {
return -2;
}
}
@@ -2717,13 +2636,10 @@ class Commande extends CommonOrder
if ($shortlist == 1)
{
$ga[$obj->cid] = $obj->ref;
- }
- elseif ($shortlist == 2)
+ } elseif ($shortlist == 2)
{
$ga[$obj->cid] = $obj->ref.' ('.$obj->name.')';
- }
- else
- {
+ } else {
$ga[$i]['id'] = $obj->cid;
$ga[$i]['ref'] = $obj->ref;
$ga[$i]['name'] = $obj->name;
@@ -2732,9 +2648,7 @@ class Commande extends CommonOrder
}
}
return $ga;
- }
- else
- {
+ } else {
dol_print_error($this->db);
return -1;
}
@@ -2788,9 +2702,7 @@ class Commande extends CommonOrder
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
foreach ($this->errors as $errmsg)
{
dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2799,9 +2711,7 @@ class Commande extends CommonOrder
$this->db->rollback();
return -1 * $error;
}
- }
- else
- {
+ } else {
$error_str = 'Command status do not meet requirement '.$this->statut;
dol_syslog(__METHOD__.$error_str, LOG_ERR);
$this->error = $error_str;
@@ -2860,9 +2770,7 @@ class Commande extends CommonOrder
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
foreach ($this->errors as $errmsg)
{
dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2871,9 +2779,7 @@ class Commande extends CommonOrder
$this->db->rollback();
return -1 * $error;
}
- }
- else
- {
+ } else {
$error_str = 'order status do not meet requirement '.$this->statut;
dol_syslog(__METHOD__.$error_str, LOG_ERR);
$this->error = $error_str;
@@ -2929,9 +2835,7 @@ class Commande extends CommonOrder
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
foreach ($this->errors as $errmsg)
{
dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2940,9 +2844,7 @@ class Commande extends CommonOrder
$this->db->rollback();
return -1 * $error;
}
- }
- else
- {
+ } else {
return -1;
}
}
@@ -2984,9 +2886,7 @@ class Commande extends CommonOrder
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
foreach ($this->errors as $errmsg)
{
dol_syslog(get_class($this)."::classifyBilled ".$errmsg, LOG_ERR);
@@ -2995,9 +2895,7 @@ class Commande extends CommonOrder
$this->db->rollback();
return -1 * $error;
}
- }
- else
- {
+ } else {
$this->error = $this->db->error();
$this->db->rollback();
return -1;
@@ -3039,9 +2937,7 @@ class Commande extends CommonOrder
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
foreach ($this->errors as $errmsg)
{
dol_syslog(get_class($this)."::classifyUnBilled ".$errmsg, LOG_ERR);
@@ -3050,9 +2946,7 @@ class Commande extends CommonOrder
$this->db->rollback();
return -1 * $error;
}
- }
- else
- {
+ } else {
$this->error = $this->db->error();
$this->db->rollback();
return -1;
@@ -3160,9 +3054,7 @@ class Commande extends CommonOrder
if ($price_base_type == 'TTC')
{
$subprice = $pu_ttc;
- }
- else
- {
+ } else {
$subprice = $pu_ht;
}
$remise = 0;
@@ -3265,17 +3157,13 @@ class Commande extends CommonOrder
$this->db->commit();
return $result;
- }
- else
- {
+ } else {
$this->error = $this->line->error;
$this->db->rollback();
return -1;
}
- }
- else
- {
+ } else {
$this->error = get_class($this)."::updateline Order status makes operation forbidden";
$this->errors = array('OrderStatusMakeOperationForbidden');
return -2;
@@ -3369,9 +3257,7 @@ class Commande extends CommonOrder
}
$this->db->rollback();
return -1 * $error;
- }
- else
- {
+ } else {
$this->db->commit();
return 1;
}
@@ -3503,9 +3389,7 @@ class Commande extends CommonOrder
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
foreach ($this->errors as $errmsg)
{
$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
@@ -3570,9 +3454,7 @@ class Commande extends CommonOrder
}
return $response;
- }
- else
- {
+ } else {
$this->error = $this->db->error();
return -1;
}
@@ -3626,38 +3508,31 @@ class Commande extends CommonOrder
$labelStatus = $langs->trans('StatusOrderCanceled');
$labelStatusShort = $langs->trans('StatusOrderCanceledShort');
$statusType = 'status9';
- }
- elseif ($status == self::STATUS_DRAFT) {
+ } elseif ($status == self::STATUS_DRAFT) {
$labelStatus = $langs->trans('StatusOrderDraft');
$labelStatusShort = $langs->trans('StatusOrderDraftShort');
$statusType = 'status0';
- }
- elseif ($status == self::STATUS_VALIDATED) {
+ } elseif ($status == self::STATUS_VALIDATED) {
$labelStatus = $langs->trans('StatusOrderValidated').$billedtext;
$labelStatusShort = $langs->trans('StatusOrderValidatedShort').$billedtext;
$statusType = 'status1';
- }
- elseif ($status == self::STATUS_SHIPMENTONPROCESS) {
+ } elseif ($status == self::STATUS_SHIPMENTONPROCESS) {
$labelStatus = $langs->trans('StatusOrderSentShort').$billedtext;
$labelStatusShort = $langs->trans('StatusOrderSentShort').$billedtext;
$statusType = 'status4';
- }
- elseif ($status == self::STATUS_CLOSED && (!$billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
+ } elseif ($status == self::STATUS_CLOSED && (!$billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
$labelStatus = $langs->trans('StatusOrderToBill');
$labelStatusShort = $langs->trans('StatusOrderToBillShort');
$statusType = 'status4';
- }
- elseif ($status == self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
+ } elseif ($status == self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
$labelStatus = $langs->trans('StatusOrderProcessed').$billedtext;
$labelStatusShort = $langs->trans('StatusOrderProcessed').$billedtext;
$statusType = 'status6';
- }
- elseif ($status == self::STATUS_CLOSED && (!empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
+ } elseif ($status == self::STATUS_CLOSED && (!empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
$labelStatus = $langs->trans('StatusOrderDelivered');
$labelStatusShort = $langs->trans('StatusOrderDelivered');
$statusType = 'status6';
- }
- else {
+ } else {
$labelStatus = $langs->trans('Unknown');
$labelStatusShort = '';
$statusType = '';
@@ -3819,9 +3694,7 @@ class Commande extends CommonOrder
}
$this->db->free($result);
- }
- else
- {
+ } else {
dol_print_error($this->db);
}
}
@@ -3895,9 +3768,7 @@ class Commande extends CommonOrder
$line->total_ttc = 60;
$line->total_tva = 10;
$line->remise_percent = 50;
- }
- else
- {
+ } else {
$line->total_ht = 100;
$line->total_ttc = 120;
$line->total_tva = 20;
@@ -3955,9 +3826,7 @@ class Commande extends CommonOrder
}
$this->db->free($resql);
return 1;
- }
- else
- {
+ } else {
dol_print_error($this->db);
$this->error = $this->db->error();
return -1;
@@ -4208,9 +4077,7 @@ class OrderLine extends CommonOrderLine
$this->db->free($result);
return 1;
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
return -1;
}
@@ -4296,9 +4163,7 @@ class OrderLine extends CommonOrderLine
}
$this->db->rollback();
return -1 * $error;
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
return -1;
}
@@ -4343,9 +4208,7 @@ class OrderLine extends CommonOrderLine
if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
{
return $result;
- }
- else
- {
+ } else {
$this->pa_ht = $result;
}
}
@@ -4440,9 +4303,7 @@ class OrderLine extends CommonOrderLine
}
$this->db->rollback();
return -1 * $error;
- }
- else
- {
+ } else {
$this->error = $this->db->error();
$this->db->rollback();
return -2;
@@ -4489,9 +4350,7 @@ class OrderLine extends CommonOrderLine
if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
{
return $result;
- }
- else
- {
+ } else {
$this->pa_ht = $result;
}
}
@@ -4574,9 +4433,7 @@ class OrderLine extends CommonOrderLine
}
$this->db->rollback();
return -1 * $error;
- }
- else
- {
+ } else {
$this->error = $this->db->error();
$this->db->rollback();
return -2;
@@ -4615,9 +4472,7 @@ class OrderLine extends CommonOrderLine
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->error = $this->db->error();
$this->db->rollback();
return -2;
diff --git a/htdocs/commande/class/commandestats.class.php b/htdocs/commande/class/commandestats.class.php
index cbb93b940de..5af5fb23060 100644
--- a/htdocs/commande/class/commandestats.class.php
+++ b/htdocs/commande/class/commandestats.class.php
@@ -78,8 +78,7 @@ class CommandeStats extends Stats
$this->field = 'total_ht';
$this->field_line = 'total_ht';
$this->where .= " c.fk_statut > 0"; // Not draft and not cancelled
- }
- elseif ($mode == 'supplier')
+ } elseif ($mode == 'supplier')
{
$object = new CommandeFournisseur($this->db);
$this->from = MAIN_DB_PREFIX.$object->table_element." as c";
diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php
index 6b9e3ae039a..2d11feeeee2 100644
--- a/htdocs/commande/contact.php
+++ b/htdocs/commande/contact.php
@@ -63,16 +63,12 @@ if ($action == 'addcontact' && $user->rights->commande->creer)
{
header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit;
- }
- else
- {
+ } else {
if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
{
$langs->load("errors");
setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
- }
- else
- {
+ } else {
setEventMessages($object->error, $object->errors, 'errors');
}
}
@@ -84,9 +80,7 @@ elseif ($action == 'swapstatut' && $user->rights->commande->creer)
if ($object->fetch($id))
{
$result = $object->swapContactStatus(GETPOST('ligne'));
- }
- else
- {
+ } else {
dol_print_error($db);
}
}
@@ -101,8 +95,7 @@ elseif ($action == 'deletecontact' && $user->rights->commande->creer)
{
header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit;
- }
- else {
+ } else {
dol_print_error($db);
}
}
@@ -206,9 +199,7 @@ if ($id > 0 || !empty($ref))
$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
if ($res) break;
}
- }
- else
- {
+ } else {
// Contact not found
print "ErrorRecordNotFound";
}
diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index 1e445a602f7..f78d6ce2e84 100644
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -184,9 +184,7 @@ if ($resql)
print '';
$db->free($resql);
-}
-else
-{
+} else {
dol_print_error($db);
}
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index 9d188cda104..27d38378bcb 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -182,14 +182,10 @@ if ($id > 0 || !empty($ref))
$permtoedit = $user->rights->commande->creer;
$param = '&id='.$object->id.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity);
include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
- }
- else
- {
+ } else {
dol_print_error($db);
}
-}
-else
-{
+} else {
header('Location: index.php');
exit;
}
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 13d67c942ed..96476caeeed 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -173,9 +173,7 @@ if ($resql)
//if ($totalinprocess != $total)
print ''.$langs->trans("Total").' '.$total.'
"; -} -else -{ +} else { dol_print_error($db); } @@ -232,9 +230,7 @@ if (!empty($conf->commande->enabled)) print ''; $i++; } - } - else - { + } else { print '
"; @@ -323,8 +319,7 @@ if ($resql) } } print "
"; -} -else dol_print_error($db); +} else dol_print_error($db); $max = 10; @@ -410,8 +405,7 @@ if (!empty($conf->commande->enabled)) } print "
"; - } - else dol_print_error($db); + } else dol_print_error($db); } /* @@ -495,8 +489,7 @@ if (!empty($conf->commande->enabled)) } } print "
"; - } - else dol_print_error($db); + } else dol_print_error($db); } diff --git a/htdocs/commande/info.php b/htdocs/commande/info.php index 6de602c22d4..9b45bf66312 100644 --- a/htdocs/commande/info.php +++ b/htdocs/commande/info.php @@ -20,7 +20,7 @@ /** * \file htdocs/commande/info.php * \ingroup commande - * \brief Page des informations d'une commande + * \brief Sale Order info page */ require '../main.inc.php'; diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 3b83e04fe3c..5770df78a82 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -395,9 +395,7 @@ if ($resql) $soc->fetch($socid); $title = $langs->trans('ListOfOrders').' - '.$soc->name; if (empty($search_company)) $search_company = $soc->name; - } - else - { + } else { $title = $langs->trans('ListOfOrders'); } if (strval($search_status) == '0') @@ -541,9 +539,7 @@ if ($resql) { print $form->selectyesno('validate_invoices', 0, 1, 1); print ' ('.$langs->trans("AutoValidationNotPossibleWhenStockIsDecreasedOnInvoiceValidation").')'; - } - else - { + } else { print $form->selectyesno('validate_invoices', 0, 1); } if (!empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER)) print ' '.$langs->trans("IfValidateInvoiceIsNoOrderStayUnbilled").''; @@ -962,8 +958,7 @@ if ($resql) { $notshippable++; } - } - else { // Detailed code, looks bugged + } else { // Detailed code, looks bugged // stock order and stock order_supplier $stock_order = 0; $stock_order_supplier = 0; @@ -1147,7 +1142,7 @@ if ($resql) if (!empty($arrayfields['c.date_delivery']['checked'])) { print '
';
// Show graphs
print '
";
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 593893878e0..c99f303210b 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -99,9 +99,7 @@ if ($action == 'add')
if (empty($account_number) || $account_number == '-1')
{
$object->account_number = '';
- }
- else
- {
+ } else {
$object->account_number = $account_number;
}
$fk_accountancy_journal = GETPOST('fk_accountancy_journal', 'int');
@@ -155,8 +153,7 @@ if ($action == 'add')
$_GET["id"] = $id; // Force chargement page en mode visu
$action = '';
- }
- else {
+ } else {
$error++;
setEventMessages($object->error, $object->errors, 'errors');
@@ -167,9 +164,7 @@ if ($action == 'add')
if (!$error)
{
$db->commit();
- }
- else
- {
+ } else {
$db->rollback();
}
}
@@ -205,9 +200,7 @@ if ($action == 'update')
if (empty($account_number) || $account_number == '-1')
{
$object->account_number = '';
- }
- else
- {
+ } else {
$object->account_number = $account_number;
}
$fk_accountancy_journal = GETPOST('fk_accountancy_journal', 'int');
@@ -259,9 +252,7 @@ if ($action == 'update')
$object->setCategories($categories);
$_GET["id"] = $_POST["id"]; // Force chargement page en mode visu
- }
- else
- {
+ } else {
$error++;
setEventMessages($object->error, $object->errors, 'errors');
$action = 'edit'; // Force chargement page edition
@@ -271,9 +262,7 @@ if ($action == 'update')
if (!$error)
{
$db->commit();
- }
- else
- {
+ } else {
$db->rollback();
}
}
@@ -290,9 +279,7 @@ if ($action == 'confirm_delete' && $_POST["confirm"] == "yes" && $user->rights->
setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
header("Location: ".DOL_URL_ROOT."/compta/bank/list.php");
exit;
- }
- else
- {
+ } else {
setEventMessages($object->error, $object->errors, 'errors');
$action = '';
}
@@ -383,8 +370,7 @@ if ($action == 'create')
if (isset($_POST["account_country_id"]))
{
$selectedcode = $_POST["account_country_id"] ? $_POST["account_country_id"] : $object->country_code;
- }
- elseif (empty($selectedcode)) $selectedcode = $mysoc->country_code;
+ } elseif (empty($selectedcode)) $selectedcode = $mysoc->country_code;
$object->country_code = getCountry($selectedcode, 2); // Force country code on account to have following field on bank fields matching country rules
print ''.$langs->trans("BankAccountCountry").' ';
@@ -398,9 +384,7 @@ if ($action == 'create')
if ($selectedcode)
{
$formcompany->select_departement(isset($_POST["account_state_id"]) ? $_POST["account_state_id"] : '', $selectedcode, 'account_state_id');
- }
- else
- {
+ } else {
print $countrynotdefined;
}
print '';
print $formaccounting->select_account($object->account_number, 'account_number', 1, '', 1, 1);
print ' ';
- }
- else
- {
+ } else {
print ''.$langs->trans("AccountancyCode").' ';
print 'account_number).'">
';
print '';
-}
-/* ************************************************************************** */
-/* */
-/* Visu et edition */
-/* */
-/* ************************************************************************** */
-else
-{
- if (($_GET["id"] || $_GET["ref"]) && $action != 'edit')
- {
+} else {
+ /* ************************************************************************** */
+ /* */
+ /* Visu et edition */
+ /* */
+ /* ************************************************************************** */
+
+ if (($_GET["id"] || $_GET["ref"]) && $action != 'edit') {
$object = new Account($db);
if ($_GET["id"])
{
@@ -886,9 +866,7 @@ else
if ($selectedcode)
{
print $formcompany->select_state(isset($_POST["account_state_id"]) ? $_POST["account_state_id"] : $object->state_id, $selectedcode, 'account_state_id');
- }
- else
- {
+ } else {
print $countrynotdefined;
}
print '';
diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php
index 308dad5dbca..0f71134d08a 100644
--- a/htdocs/compta/bank/categ.php
+++ b/htdocs/compta/bank/categ.php
@@ -132,9 +132,7 @@ if ($result)
print '';
print '';
print "";
- }
- else
- {
+ } else {
print "| ';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
print $px1->show();
print " \n"; print $px2->show(); diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php index faf2feeb7a0..0c20e46e316 100644 --- a/htdocs/compta/accounting-files.php +++ b/htdocs/compta/accounting-files.php @@ -334,9 +334,7 @@ if (($action == 'searchfiles' || $action == 'dl')) { $nofile['sens'] = $objd->sens; $filesarray[$nofile['item'].'_'.$nofile['id']] = $nofile; - } - else - { + } else { foreach ($files as $key => $file) { $file['id'] = $objd->id; @@ -383,15 +381,12 @@ if (($action == 'searchfiles' || $action == 'dl')) { $i++; } - } - else - { + } else { dol_print_error($db); } $db->free($resd); - } - else { + } else { setEventMessages($langs->trans("ErrorSelectAtLeastOne"), null, 'errors'); $error++; } @@ -491,9 +486,7 @@ if ($result && $action == "dl" && !$error) dol_delete_file($zipname); exit(); - } - else - { + } else { setEventMessages($langs->trans("FailedToOpenFile", $zipname), null, 'errors'); } } @@ -625,9 +618,7 @@ if (!empty($date_start) && !empty($date_stop)) if (empty($TData)) { print ' | ||||||
| '.$langs->trans("NoItem").' | '.price($balancebefore).' | '; - } - else - { + } else { print ''.price($balancebefore).' | '; } - } - else - { + } else { print '- | '; } if (!$i) $totalarray['nbfield']++; @@ -1469,14 +1417,10 @@ if ($resql) if ($balance >= 0) { print ''.price($balance).' | '; - } - else - { + } else { print ''.price($balance).' | '; } - } - else - { + } else { print '- | '; } if (!$i) $totalarray['nbfield']++; @@ -1522,17 +1466,13 @@ if ($resql) print ''; print img_edit(); print ''; - } - else - { + } else { if ($user->rights->banque->modifier || $user->rights->banque->consolidate) { print ''; print img_edit(); print ''; - } - else - { + } else { print ''; print img_view(); print ''; @@ -1582,16 +1522,14 @@ if ($resql) { if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").' | '; else print ''.$langs->trans("Totalforthispage").' | '; - } - elseif ($totalarray['totaldebfield'] == $i) print ''.price(-1 * $totalarray['totaldeb']).' | '; + } elseif ($totalarray['totaldebfield'] == $i) print ''.price(-1 * $totalarray['totaldeb']).' | '; elseif ($totalarray['totalcredfield'] == $i) print ''.price($totalarray['totalcred']).' | '; elseif ($i == $posconciliatecol) { print ''; if ($user->rights->banque->consolidate && $action == 'reconcile') print ''; print ' | '; - } - else print ''; + } else print ' | '; } print ''; } @@ -1609,9 +1547,7 @@ if ($resql) print ''; $db->free($resql); -} -else -{ +} else { dol_print_error($db); } diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php index 042117808d5..8559096477d 100644 --- a/htdocs/compta/bank/budget.php +++ b/htdocs/compta/bank/budget.php @@ -89,9 +89,7 @@ if ($result) print ' |
| '.$langs->trans("Total").' | '; print ''.price($total).' | '; print ''.price($totalnb ?price2num($total / $totalnb, 'MT') : 0).' | ||||
- ".$objc->label.""; $ii++; } - } - else - { + } else { dol_print_error($db); } } @@ -638,9 +611,7 @@ else { $totald = $totald + abs($objp->amount); print '
"; - } - else - { + } else { dol_print_error($db); } } diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php index 6c1439d5466..5632e8ebc1a 100644 --- a/htdocs/compta/clients.php +++ b/htdocs/compta/clients.php @@ -196,9 +196,7 @@ if ($resql) print ''; $db->free($resql); -} -else -{ +} else { dol_print_error($db); } diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php index 463d9ea699f..4d3ec6b1ee6 100644 --- a/htdocs/compta/deplacement/card.php +++ b/htdocs/compta/deplacement/card.php @@ -70,15 +70,11 @@ if ($action == 'validate' && $user->rights->deplacement->creer) { header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id); exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } -} - -elseif ($action == 'classifyrefunded' && $user->rights->deplacement->creer) +} elseif ($action == 'classifyrefunded' && $user->rights->deplacement->creer) { $object->fetch($id); if ($object->statut == Deplacement::STATUS_VALIDATED) @@ -88,29 +84,21 @@ elseif ($action == 'classifyrefunded' && $user->rights->deplacement->creer) { header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id); exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } -} - -elseif ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->deplacement->supprimer) +} elseif ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->deplacement->supprimer) { $result = $object->delete($id); if ($result >= 0) { header("Location: index.php"); exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } -} - -elseif ($action == 'add' && $user->rights->deplacement->creer) +} elseif ($action == 'add' && $user->rights->deplacement->creer) { if (!GETPOST('cancel', 'alpha')) { @@ -149,26 +137,18 @@ elseif ($action == 'add' && $user->rights->deplacement->creer) { header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id); exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); $action = 'create'; } - } - else - { + } else { $action = 'create'; } - } - else - { + } else { header("Location: index.php"); exit; } -} - -// Update record +} // Update record elseif ($action == 'update' && $user->rights->deplacement->creer) { if (!GETPOST('cancel', 'alpha')) @@ -189,36 +169,27 @@ elseif ($action == 'update' && $user->rights->deplacement->creer) { header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id); exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } - } - else - { + } else { header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id); exit; } -} - -// Set into a project +} // Set into a project elseif ($action == 'classin' && $user->rights->deplacement->creer) { $object->fetch($id); $result = $object->setProject(GETPOST('projectid', 'int')); if ($result < 0) dol_print_error($db, $object->error); -} - -// Set fields +} // Set fields elseif ($action == 'setdated' && $user->rights->deplacement->creer) { $dated = dol_mktime(GETPOST('datedhour', 'int'), GETPOST('datedmin', 'int'), GETPOST('datedsec', 'int'), GETPOST('datedmonth', 'int'), GETPOST('datedday', 'int'), GETPOST('datedyear', 'int')); $object->fetch($id); $result = $object->setValueFrom('dated', $dated, '', '', 'date', '', $user, 'DEPLACEMENT_MODIFY'); if ($result < 0) dol_print_error($db, $object->error); -} -elseif ($action == 'setkm' && $user->rights->deplacement->creer) +} elseif ($action == 'setkm' && $user->rights->deplacement->creer) { $object->fetch($id); $result = $object->setValueFrom('km', GETPOST('km', 'int'), '', null, 'text', '', $user, 'DEPLACEMENT_MODIFY'); @@ -313,8 +284,7 @@ if ($action == 'create') print ''; print ''; -} -elseif ($id) +} elseif ($id) { $result = $object->fetch($id); if ($result > 0) @@ -412,9 +382,7 @@ elseif ($id) print ''; print ''; - } - else - { + } else { /* * Confirm delete trip */ @@ -492,9 +460,7 @@ elseif ($id) if ($action == 'classify') { $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1); - } - else - { + } else { $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0); } print ''; @@ -528,9 +494,7 @@ elseif ($id) if ($user->rights->deplacement->creer) { print ''.$langs->trans('Modify').''; - } - else - { + } else { print ''.$langs->trans('Modify').''; } } @@ -540,9 +504,7 @@ elseif ($id) if ($user->rights->deplacement->creer) { print ''.$langs->trans('Validate').''; - } - else - { + } else { print ''.$langs->trans('Validate').''; } } @@ -552,9 +514,7 @@ elseif ($id) if ($user->rights->deplacement->creer) { print ''.$langs->trans('ClassifyRefunded').''; - } - else - { + } else { print ''.$langs->trans('ClassifyRefunded').''; } } @@ -562,17 +522,13 @@ elseif ($id) if ($user->rights->deplacement->supprimer) { print ''.$langs->trans('Delete').''; - } - else - { + } else { print ''.$langs->trans('Delete').''; } print ''; } - } - else - { + } else { dol_print_error($db); } } diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php index ec4610179e2..69baf710b95 100644 --- a/htdocs/compta/deplacement/class/deplacement.class.php +++ b/htdocs/compta/deplacement/class/deplacement.class.php @@ -199,16 +199,12 @@ class Deplacement extends CommonObject { $this->db->commit(); return $this->id; - } - else - { + } else { $this->error = $this->db->error(); $this->db->rollback(); return $result; } - } - else - { + } else { $this->error = $this->db->error()." sql=".$sql; $this->db->rollback(); return -1; @@ -267,9 +263,7 @@ class Deplacement extends CommonObject { $this->db->commit(); return 1; - } - else - { + } else { $this->error = $this->db->lasterror(); $this->db->rollback(); return -1; @@ -312,9 +306,7 @@ class Deplacement extends CommonObject $this->extraparams = (array) json_decode($obj->extraparams, true); return 1; - } - else - { + } else { $this->error = $this->db->error(); return -1; } @@ -338,9 +330,7 @@ class Deplacement extends CommonObject { $this->db->commit(); return 1; - } - else - { + } else { $this->error = $this->db->error(); $this->db->rollback(); return -1; @@ -375,30 +365,25 @@ class Deplacement extends CommonObject if ($mode == 0) { return $langs->trans($this->statuts[$status]); - } - elseif ($mode == 1) + } elseif ($mode == 1) { return $langs->trans($this->statuts_short[$status]); - } - elseif ($mode == 2) + } elseif ($mode == 2) { if ($status == 0) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts_short[$status]); elseif ($status == 1) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts_short[$status]); elseif ($status == 2) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts_short[$status]); - } - elseif ($mode == 3) + } elseif ($mode == 3) { if ($status == 0 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0'); elseif ($status == 1 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4'); elseif ($status == 2 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6'); - } - elseif ($mode == 4) + } elseif ($mode == 4) { if ($status == 0 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts[$status]); elseif ($status == 1 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]); elseif ($status == 2 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]); - } - elseif ($mode == 5) + } elseif ($mode == 5) { if ($status == 0 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut0'); elseif ($status == 1 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut4'); @@ -460,9 +445,7 @@ class Deplacement extends CommonObject $ret[$obj->code] = (($langs->trans($obj->code) != $obj->code) ? $langs->trans($obj->code) : $obj->label); $i++; } - } - else - { + } else { dol_print_error($this->db); } @@ -507,9 +490,7 @@ class Deplacement extends CommonObject $this->date_modification = $this->db->jdate($obj->tms); } $this->db->free($result); - } - else - { + } else { dol_print_error($this->db); } } diff --git a/htdocs/compta/deplacement/document.php b/htdocs/compta/deplacement/document.php index 2cef0b3e6cd..889eb390ca2 100644 --- a/htdocs/compta/deplacement/document.php +++ b/htdocs/compta/deplacement/document.php @@ -123,9 +123,7 @@ if ($object->id) $permission = $user->rights->deplacement->creer; $param = '&id='.$object->id; include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php'; -} -else -{ +} else { print $langs->trans("ErrorUnknown"); } diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php index 9d45bafd20f..0cea847f9ce 100644 --- a/htdocs/compta/deplacement/index.php +++ b/htdocs/compta/deplacement/index.php @@ -192,14 +192,11 @@ if ($result) $i++; } - } - else - { + } else { print '
'; -} -else dol_print_error($db); +} else dol_print_error($db); print ''; diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php index a4cc8f24019..78c1f32556d 100644 --- a/htdocs/compta/deplacement/list.php +++ b/htdocs/compta/deplacement/list.php @@ -196,9 +196,7 @@ if ($resql) print ""; print "\n"; $db->free($resql); -} -else -{ +} else { dol_print_error($db); } diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php index cf745b784fc..7707cb40786 100644 --- a/htdocs/compta/deplacement/stats/index.php +++ b/htdocs/compta/deplacement/stats/index.php @@ -167,9 +167,7 @@ if (!$user->rights->societe->client->voir || $user->socid) $filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png'; if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png'; if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png'; -} -else -{ +} else { $filename_avg = $dir.'/ordersaverage-'.$year.'.png'; if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png'; if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png'; @@ -294,8 +292,7 @@ print '
';
// Show graphs
print '
';
- }
- else
- {
+ } else {
if ($object->frequency > 0)
{
print $langs->trans('FrequencyPer_'.$object->unit_frequency, $object->frequency);
- }
- else
- {
+ } else {
print $langs->trans("NotARecurringInvoiceTemplate");
}
}
@@ -1555,9 +1489,7 @@ else
if ($action == 'date_when' || $object->frequency > 0)
{
print $form->editfieldkey($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $user->rights->facture->creer, 'day');
- }
- else
- {
+ } else {
print $langs->trans("NextDateToExecution");
}
print '';
@@ -1569,9 +1501,7 @@ else
if (!$object->isMaxNbGenReached())
{
if (!$object->suspended && $action != 'editdate_when' && $object->frequency > 0 && $object->date_when && $object->date_when < $now) print img_warning($langs->trans("Late"));
- }
- else
- {
+ } else {
print img_info($langs->trans("MaxNumberOfGenerationReached"));
}
print ' ';
@@ -1582,18 +1512,14 @@ else
if ($action == 'nb_gen_max' || $object->frequency > 0)
{
print $form->editfieldkey($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $user->rights->facture->creer);
- }
- else
- {
+ } else {
print $langs->trans("MaxPeriodNumber");
}
print '';
if ($action == 'nb_gen_max' || $object->frequency > 0)
{
print $form->editfieldval($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max ? $object->nb_gen_max : '', $object, $user->rights->facture->creer);
- }
- else
- {
+ } else {
print '';
}
print ' ';
@@ -1603,8 +1529,7 @@ else
print '';
if ($action == 'auto_validate' || $object->frequency > 0)
print $form->editfieldkey($langs->trans("StatusOfGeneratedInvoices"), 'auto_validate', $object->auto_validate, $object, $user->rights->facture->creer);
- else
- print $langs->trans("StatusOfGeneratedInvoices");
+ else print $langs->trans("StatusOfGeneratedInvoices");
print ' ';
$select = 'select;0:'.$langs->trans('BillStatusDraft').',1:'.$langs->trans('BillStatusValidated');
if ($action == 'auto_validate' || $object->frequency > 0)
@@ -1619,8 +1544,7 @@ else
print ' ';
if ($action == 'generate_pdf' || $object->frequency > 0)
print $form->editfieldkey($langs->trans("StatusOfGeneratedDocuments"), 'generate_pdf', $object->generate_pdf, $object, $user->rights->facture->creer);
- else
- print $langs->trans("StatusOfGeneratedDocuments");
+ else print $langs->trans("StatusOfGeneratedDocuments");
print ' ';
print '';
$select = 'select;0:'.$langs->trans('DoNotGenerateDoc').',1:'.$langs->trans('AutogenerateDoc');
@@ -1630,9 +1554,7 @@ else
}
print ' ';
print '
'; + + // If there is some credit note between last situation invoice and invoice used for credit note generation (note: credit notes are stored as delta) + $maxPrevSituationPercent = 0; + foreach ($tab_jumped_credit_notes as $index => $creditnoteid) { + foreach ($facture_source->tab_previous_situation_invoice[$index]->lines as $prevLine) + { + if ($prevLine->fk_prev_id == $source_fk_prev_id) + { + $maxPrevSituationPercent = $prevLine->situation_percent; + + $line->total_ht -= $prevLine->total_ht; + $line->total_tva -= $prevLine->total_tva; + $line->total_ttc -= $prevLine->total_ttc; + $line->total_localtax1 -= $prevLine->total_localtax1; + $line->total_localtax2 -= $prevLine->total_localtax2; + + $line->multicurrency_subprice -= $prevLine->multicurrency_subprice; + $line->multicurrency_total_ht -= $prevLine->multicurrency_total_ht; + $line->multicurrency_total_tva -= $prevLine->multicurrency_total_tva; + $line->multicurrency_total_ttc -= $prevLine->multicurrency_total_ttc; + } + } + } + + // prorata + $line->situation_percent += $maxPrevSituationPercent; + + //print 'New line based on invoice id '.$facture_source->tab_previous_situation_invoice[$lineIndex]->id.' fk_prev_id='.$source_fk_prev_id.' will be fk_prev_id='.$line->fk_prev_id.' '.$line->total_ht.' '.$line->situation_percent.'
'; } } @@ -1253,7 +1219,7 @@ if (empty($reshook)) } // Add link between credit note and origin - if (!empty($object->fk_facture_source)) { + if (!empty($object->fk_facture_source) && $id > 0) { $facture_source->fetch($object->fk_facture_source); $facture_source->fetchObjectLinked(); @@ -1269,7 +1235,7 @@ if (empty($reshook)) // Standard invoice or Deposit invoice, created from a Predefined template invoice if (($_POST['type'] == Facture::TYPE_STANDARD || $_POST['type'] == Facture::TYPE_DEPOSIT) && GETPOST('fac_rec', 'int') > 0) { - $dateinvoice = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']); + $dateinvoice = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int')); if (empty($dateinvoice)) { $error++; @@ -1320,7 +1286,7 @@ if (empty($reshook)) $action = 'create'; } - $dateinvoice = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']); + $dateinvoice = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int')); if (empty($dateinvoice)) { $error++; @@ -1365,8 +1331,7 @@ if (empty($reshook)) if (in_array($object->type, $retainedWarrantyInvoiceAvailableType)) { $object->retained_warranty = GETPOST('retained_warranty', 'int'); $object->retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int'); - } - else { + } else { $object->retained_warranty = 0; $object->retained_warranty_fk_cond_reglement = 0; } @@ -1469,14 +1434,11 @@ if (empty($reshook)) $amount_ttc_diff += $am; $amountdeposit[$tva] += $am / (1 + $tva / 100); // Convert into HT for the addline } - } - else - { + } else { if ($typeamount == 'amount') { $amountdeposit[0] = $valuedeposit; - } - elseif ($typeamount == 'variable') + } elseif ($typeamount == 'variable') { if ($result > 0) { @@ -1724,9 +1686,7 @@ if (empty($reshook)) setEventMessages($object->error, $object->errors, 'errors'); $error++; } - } - else - { // If some invoice's lines coming from page + } else { // If some invoice's lines coming from page $id = $object->create($user); for ($i = 1; $i <= $NBLINES; $i++) { @@ -1745,7 +1705,7 @@ if (empty($reshook)) // Situation invoices if (GETPOST('type') == Facture::TYPE_SITUATION && (!empty($_POST['situations']))) { - $datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']); + $datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int')); if (empty($datefacture)) { $error++; $mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")); @@ -1852,9 +1812,7 @@ if (empty($reshook)) if ($id <= 0) { $mesg = $object->error; - } - else - { + } else { $nextSituationInvoice = new Facture($db); $nextSituationInvoice->fetch($id); @@ -1894,18 +1852,14 @@ if (empty($reshook)) header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id); exit(); - } - else - { + } else { $db->rollback(); $action = 'create'; $_GET["origin"] = $_POST["origin"]; $_GET["originid"] = $_POST["originid"]; setEventMessages($object->error, $object->errors, 'errors'); } - } - - // Add a new line + } // Add a new line elseif ($action == 'addline' && $usercancreate) { $langs->load('errors'); @@ -1921,9 +1875,7 @@ if (empty($reshook)) { $idprod = 0; $tva_tx = (GETPOST('tva_tx', 'alpha') ? GETPOST('tva_tx', 'alpha') : 0); - } - else - { + } else { $idprod = GETPOST('idprod', 'int'); $tva_tx = ''; } @@ -1970,9 +1922,7 @@ if (empty($reshook)) setEventMessages($langs->trans("ErrorFieldCantBeNegativeOnInvoice", $langs->transnoentitiesnoconv("UnitPriceHT"), $langs->transnoentitiesnoconv("CustomerAbsoluteDiscountShort")), null, 'errors'); } $error++; - } - else - { + } else { setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), null, 'errors'); $error++; } @@ -1998,9 +1948,7 @@ if (empty($reshook)) if ($res = $prodcomb->fetchByProductCombination2ValuePairs($idprod, $combinations)) { $idprod = $res->fk_product_child; - } - else - { + } else { setEventMessages($langs->trans('ErrorProductCombinationNotFound'), null, 'errors'); $error++; } @@ -2056,17 +2004,14 @@ if (empty($reshook)) { $pu_ht = price2num($price_ht, 'MU'); $pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU'); - } - // On reevalue prix selon taux tva car taux tva transaction peut etre different + } // On reevalue prix selon taux tva car taux tva transaction peut etre different // de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur). elseif ($tmpvat != $tmpprodvat) { if ($price_base_type != 'HT') { $pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU'); - } - else - { + } else { $pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU'); } } @@ -2233,9 +2178,7 @@ if (empty($reshook)) $action = ''; } } - } - - elseif ($action == 'updateline' && $usercancreate && !GETPOST('cancel', 'alpha')) + } elseif ($action == 'updateline' && $usercancreate && !GETPOST('cancel', 'alpha')) { if (!$object->fetch($id) > 0) dol_print_error($db); $object->fetch_thirdparty(); @@ -2292,16 +2235,14 @@ if (empty($reshook)) setEventMessages($mesg, null, 'warnings'); $error++; $result = -1; - } - elseif (GETPOST('progress') < $line->situation_percent) // TODO : use a modified $line->get_prev_progress($object->id) result + } elseif (GETPOST('progress') < $line->situation_percent) // TODO : use a modified $line->get_prev_progress($object->id) result { $mesg = $langs->trans("CantBeLessThanMinPercent"); setEventMessages($mesg, null, 'warnings'); $error++; $result = -1; } - } - elseif (GETPOST('progress') < $percent) + } elseif (GETPOST('progress') < $percent) { $mesg = ''.$langs->trans('Customer').' ';
print '';
print $form->select_company($soc->id, 'socid', '((s.client = 1 OR s.client = 3) AND s.status=1)', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
@@ -3134,10 +3056,10 @@ if ($action == 'create')
print '';
// Next situation invoice
- $opt = $form->selectSituationInvoices(GETPOST('originid'), $socid);
+ $opt = $form->selectSituationInvoices(GETPOST('originid', 'int'), $socid);
print '';
}
- }
- else
- {
+ } else {
if (!empty($conf->global->INVOICE_USE_SITUATION))
{
print '';
}
- }
- else
- {
+ } else {
print ' ';
print '';
+ $result .= ''.$objectstatic->getNomUrl(1).' ';
+ $result .= ''.$companystatic->getNomUrl(1, 'customer', 24).' ';
+ $result .= ''.price($obj->total_ttc).' ';
+ $result .= ' ';
+
+ $i++;
+ $total += $obj->total_ttc;
+ }
+
+ if ($num > $nbofloop)
+ {
+ $result .= '';
+ $result .= ''.$langs->trans("XMoreLines", ($num - $nbofloop)).' ';
+ $result .= ' ';
+ }
+ elseif ($total > 0)
+ {
+ $result .= '';
+ $result .= ''.$langs->trans("Total").' ';
+ $result .= ''.price($total).' ';
+ $result .= ' ';
+ }
+
+ $result .= '
';
+ $result .= '';
+ return $result;
+}
+
+/**
+ * Return a HTML table that contains a list with latest edited customer invoices
+ *
+ * @param int $maxCount (Optional) The maximum count of elements inside the table
+ * @param int $socid (Optional) Show only results from the customer with this id
+ * @return string A HTML table that contains a list with latest edited customer invoices
+ */
+function getLatestEditTable($maxCount = 5, $socid = 0)
+{
+ global $conf, $db, $langs, $user;
+
+ $sql = "SELECT f.rowid, f.entity, f.ref, f.fk_statut as status, f.paye, s.nom as socname, s.rowid as socid, s.canvas, s.client,";
+ $sql .= " f.datec";
+ $sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
+ $sql .= ", ".MAIN_DB_PREFIX."societe as s";
+ if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ $sql .= " WHERE f.fk_soc = s.rowid";
+ $sql .= " AND f.entity IN (".getEntity('facture').")";
+ if ($socid) $sql .= " AND f.fk_soc = ".$socid;
+ if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+ $sql .= " ORDER BY f.tms DESC";
+ $sql .= $db->plimit($maxCount, 0);
+
+ $resql = $db->query($sql);
+ if (!$resql)
+ {
+ dol_print_error($db);
+ }
+
+ $num = $db->num_rows($resql);
+
+ $result = ' ';
+
+ $result .= '';
+ $result .= '';
+ $result .= '
';
+ $result .= ' ';
+
+ $result .= ''.$companystatic->getNomUrl(1, 'customer').' ';
+ $result .= ''.dol_print_date($db->jdate($obj->datec), 'day').' ';
+ $result .= ''.$objectstatic->getLibStatut(5).' ';
+
+ $result .= ' ';
+
+ $i++;
+ }
+
+ $result .= '';
+ $result .= '
';
+ return $result;
+}
+
+/**
+ * Return a HTML table that contains a list with open (unpaid) customer invoices
+ *
+ * @param int $maxCount (Optional) The maximum count of elements inside the table
+ * @param int $socid (Optional) Show only results from the customer with this id
+ * @return string A HTML table that conatins a list with open (unpaid) customer invoices
+ */
+function getOpenTable($maxCount = 500, $socid = 0)
+{
+ global $conf, $db, $langs, $user;
+
+ $sql = "SELECT s.nom as socname, s.rowid as socid, s.canvas, s.client";
+ $sql .= ", f.rowid as id, f.entity, f.total as total_ttc, f.total as total_ht, f.ref, f.fk_statut";
+ $sql .= ", f.datef as df, f.date_lim_reglement as datelimite";
+ $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+ $sql .= ", ".MAIN_DB_PREFIX."facture as f";
+ if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ $sql .= " WHERE f.fk_soc = s.rowid";
+ $sql .= " AND f.entity IN (".getEntity('facture').")";
+ $sql .= " AND f.fk_statut = ".Facture::STATUS_VALIDATED;
+ if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+ if ($socid) $sql .= " AND s.rowid = ".$socid;
+ $sql .= " ORDER BY f.rowid DESC";
+ $sql .= $db->plimit($maxCount, 0);
+
+ $resql = $db->query($sql);
+ if (!$resql)
+ {
+ dol_print_error($db);
+ }
+
+ $num = $db->num_rows($resql);
+
+ $result = '| ';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
print $px1->show();
print " \n"; print $px2->show(); diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php index cad443940f4..cc3a0769e70 100644 --- a/htdocs/compta/facture/card-rec.php +++ b/htdocs/compta/facture/card-rec.php @@ -238,9 +238,7 @@ if (empty($reshook)) setEventMessages($oldinvoice->error, $oldinvoice->errors, 'errors'); $action = "create"; } - } - else - { + } else { $error++; setEventMessages($object->error, $object->errors, 'errors'); $action = "create"; @@ -252,9 +250,7 @@ if (empty($reshook)) header("Location: ".$_SERVER['PHP_SELF'].'?facid='.$object->id); exit; - } - else - { + } else { $db->rollback(); $error++; @@ -279,18 +275,15 @@ if (empty($reshook)) if ($action == 'setconditions' && $user->rights->facture->creer) { $result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int')); - } - // Set mode + } // Set mode elseif ($action == 'setmode' && $user->rights->facture->creer) { $result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int')); - } - // Set project + } // Set project elseif ($action == 'classin' && $user->rights->facture->creer) { $object->setProject(GETPOST('projectid', 'int')); - } - // Set bank account + } // Set bank account elseif ($action == 'setref' && $user->rights->facture->creer) { //var_dump(GETPOST('ref', 'alpha'));exit; @@ -300,47 +293,37 @@ if (empty($reshook)) $object->titre = GETPOST('ref', 'alpha'); // deprecated $object->title = GETPOST('ref', 'alpha'); $object->ref = $object->title; - } - else dol_print_error($db, $object->error, $object->errors); - } - // Set bank account + } else dol_print_error($db, $object->error, $object->errors); + } // Set bank account elseif ($action == 'setbankaccount' && $user->rights->facture->creer) { $result = $object->setBankAccount(GETPOST('fk_account', 'int')); - } - // Set frequency and unit frequency + } // Set frequency and unit frequency elseif ($action == 'setfrequency' && $user->rights->facture->creer) { $object->setFrequencyAndUnit(GETPOST('frequency', 'int'), GETPOST('unit_frequency', 'alpha')); - } - // Set next date of execution + } // Set next date of execution elseif ($action == 'setdate_when' && $user->rights->facture->creer) { $date = dol_mktime(GETPOST('date_whenhour'), GETPOST('date_whenmin'), 0, GETPOST('date_whenmonth'), GETPOST('date_whenday'), GETPOST('date_whenyear')); if (!empty($date)) $object->setNextDate($date); - } - // Set max period + } // Set max period elseif ($action == 'setnb_gen_max' && $user->rights->facture->creer) { $object->setMaxPeriod(GETPOST('nb_gen_max', 'int')); - } - // Set auto validate + } // Set auto validate elseif ($action == 'setauto_validate' && $user->rights->facture->creer) { $object->setAutoValidate(GETPOST('auto_validate', 'int')); - } - // Set generate pdf + } // Set generate pdf elseif ($action == 'setgenerate_pdf' && $user->rights->facture->creer) { $object->setGeneratepdf(GETPOST('generate_pdf', 'int')); - } - // Set model pdf + } // Set model pdf elseif ($action == 'setmodelpdf' && $user->rights->facture->creer) { $object->setModelpdf(GETPOST('modelpdf', 'alpha')); - } - - // Set status disabled + } // Set status disabled elseif ($action == 'disable' && $user->rights->facture->creer) { $db->begin(); @@ -356,15 +339,11 @@ if (empty($reshook)) if (!$error) { $db->commit(); - } - else - { + } else { $db->rollback(); setEventMessages($object->error, $object->errors, 'errors'); } - } - - // Set status enabled + } // Set status enabled elseif ($action == 'enable' && $user->rights->facture->creer) { $db->begin(); @@ -380,19 +359,14 @@ if (empty($reshook)) if (!$error) { $db->commit(); - } - else - { + } else { $db->rollback(); setEventMessages($object->error, $object->errors, 'errors'); } - } - // Multicurrency Code + } // Multicurrency Code elseif ($action == 'setmulticurrencycode' && $usercancreate) { $result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha')); - } - - // Multicurrency rate + } // Multicurrency rate elseif ($action == 'setmulticurrencyrate' && $usercancreate) { $result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')), GETPOST('calculation_mode', 'int')); } @@ -418,20 +392,15 @@ if (empty($reshook)) { $db->commit(); $object->fetch($object->id); // Reload lines - } - else - { + } else { $db->rollback(); setEventMessages($db->lasterror(), null, 'errors'); } - } - else - { + } else { $db->rollback(); setEventMessages($line->error, $line->errors, 'errors'); } - } - elseif ($action == 'update_extras') + } elseif ($action == 'update_extras') { $object->oldcopy = dol_clone($object); @@ -466,9 +435,7 @@ if (empty($reshook)) { $idprod = 0; $tva_tx = (GETPOST('tva_tx', 'alpha') ? GETPOST('tva_tx', 'alpha') : 0); - } - else - { + } else { $idprod = GETPOST('idprod', 'int'); $tva_tx = ''; } @@ -570,17 +537,14 @@ if (empty($reshook)) { $pu_ht = price2num($price_ht, 'MU'); $pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU'); - } - // On reevalue prix selon taux tva car taux tva transaction peut etre different + } // On reevalue prix selon taux tva car taux tva transaction peut etre different // de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur). elseif ($tmpvat != $tmpprodvat) { if ($price_base_type != 'HT') { $pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU'); - } - else - { + } else { $pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU'); } } @@ -603,9 +567,7 @@ if (empty($reshook)) } $desc = (!empty($prod->multilangs [$outputlangs->defaultlang] ["description"])) ? $prod->multilangs [$outputlangs->defaultlang] ["description"] : $prod->description; - } - else - { + } else { $desc = $prod->description; } @@ -640,9 +602,7 @@ if (empty($reshook)) $type = $prod->type; $fk_unit = $prod->fk_unit; - } - else - { + } else { $pu_ht = price2num($price_ht, 'MU'); $pu_ttc = price2num(GETPOST('price_ttc'), 'MU'); $tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0); @@ -672,9 +632,7 @@ if (empty($reshook)) if ($usercanproductignorepricemin && (!empty($price_min) && (price2num($pu_ht) * (1 - price2num($remise_percent) / 100) < price2num($price_min)))) { $mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency)); setEventMessages($mesg, null, 'errors'); - } - else - { + } else { // Insert line $result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $price_base_type, $info_bits, '', $pu_ttc, $type, - 1, $special_code, $label, $fk_unit, 0, $date_start_fill, $date_end_fill, $fournprice, $buyingprice); @@ -738,18 +696,14 @@ if (empty($reshook)) unset($_POST['situations']); unset($_POST['progress']); - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } $action = ''; } } - } - - elseif ($action == 'updateline' && $usercancreate && !GETPOST('cancel', 'alpha')) + } elseif ($action == 'updateline' && $usercancreate && !GETPOST('cancel', 'alpha')) { if (!$object->fetch($id) > 0) dol_print_error($db); $object->fetch_thirdparty(); @@ -947,9 +901,7 @@ if (empty($reshook)) unset($_POST['situations']); unset($_POST['progress']); - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } @@ -1144,9 +1096,7 @@ if ($action == 'create') $select = array('0'=>$langs->trans('DoNotGenerateDoc'), '1'=>$langs->trans('AutoGenerateDoc')); print $form->selectarray('generate_pdf', $select, GETPOST('generate_pdf')); print " | '; print ' |
'; + + // If there is some credit note between last situation invoice and invoice used for credit note generation (note: credit notes are stored as delta) + $maxPrevSituationPercent = 0; + foreach ($tab_jumped_credit_notes as $index => $creditnoteid) { + foreach ($facture_source->tab_previous_situation_invoice[$index]->lines as $prevLine) + { + if ($prevLine->fk_prev_id == $source_fk_prev_id) + { + $maxPrevSituationPercent = $prevLine->situation_percent; + + $line->total_ht -= $prevLine->total_ht; + $line->total_tva -= $prevLine->total_tva; + $line->total_ttc -= $prevLine->total_ttc; + $line->total_localtax1 -= $prevLine->total_localtax1; + $line->total_localtax2 -= $prevLine->total_localtax2; + + $line->multicurrency_subprice -= $prevLine->multicurrency_subprice; + $line->multicurrency_total_ht -= $prevLine->multicurrency_total_ht; + $line->multicurrency_total_tva -= $prevLine->multicurrency_total_tva; + $line->multicurrency_total_ttc -= $prevLine->multicurrency_total_ttc; + } + } + } + + // prorata + $line->situation_percent += $maxPrevSituationPercent; + + //print 'New line based on invoice id '.$facture_source->tab_previous_situation_invoice[$lineIndex]->id.' fk_prev_id='.$source_fk_prev_id.' will be fk_prev_id='.$line->fk_prev_id.' '.$line->total_ht.' '.$line->situation_percent.'
'; } } @@ -1253,7 +1219,7 @@ if (empty($reshook)) } // Add link between credit note and origin - if (!empty($object->fk_facture_source)) { + if (!empty($object->fk_facture_source) && $id > 0) { $facture_source->fetch($object->fk_facture_source); $facture_source->fetchObjectLinked(); @@ -1269,7 +1235,7 @@ if (empty($reshook)) // Standard invoice or Deposit invoice, created from a Predefined template invoice if (($_POST['type'] == Facture::TYPE_STANDARD || $_POST['type'] == Facture::TYPE_DEPOSIT) && GETPOST('fac_rec', 'int') > 0) { - $dateinvoice = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']); + $dateinvoice = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int')); if (empty($dateinvoice)) { $error++; @@ -1320,7 +1286,7 @@ if (empty($reshook)) $action = 'create'; } - $dateinvoice = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']); + $dateinvoice = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int')); if (empty($dateinvoice)) { $error++; @@ -1365,8 +1331,7 @@ if (empty($reshook)) if (in_array($object->type, $retainedWarrantyInvoiceAvailableType)) { $object->retained_warranty = GETPOST('retained_warranty', 'int'); $object->retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int'); - } - else { + } else { $object->retained_warranty = 0; $object->retained_warranty_fk_cond_reglement = 0; } @@ -1469,14 +1434,11 @@ if (empty($reshook)) $amount_ttc_diff += $am; $amountdeposit[$tva] += $am / (1 + $tva / 100); // Convert into HT for the addline } - } - else - { + } else { if ($typeamount == 'amount') { $amountdeposit[0] = $valuedeposit; - } - elseif ($typeamount == 'variable') + } elseif ($typeamount == 'variable') { if ($result > 0) { @@ -1724,9 +1686,7 @@ if (empty($reshook)) setEventMessages($object->error, $object->errors, 'errors'); $error++; } - } - else - { // If some invoice's lines coming from page + } else { // If some invoice's lines coming from page $id = $object->create($user); for ($i = 1; $i <= $NBLINES; $i++) { @@ -1745,7 +1705,7 @@ if (empty($reshook)) // Situation invoices if (GETPOST('type') == Facture::TYPE_SITUATION && (!empty($_POST['situations']))) { - $datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']); + $datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int')); if (empty($datefacture)) { $error++; $mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")); @@ -1852,9 +1812,7 @@ if (empty($reshook)) if ($id <= 0) { $mesg = $object->error; - } - else - { + } else { $nextSituationInvoice = new Facture($db); $nextSituationInvoice->fetch($id); @@ -1894,18 +1852,14 @@ if (empty($reshook)) header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id); exit(); - } - else - { + } else { $db->rollback(); $action = 'create'; $_GET["origin"] = $_POST["origin"]; $_GET["originid"] = $_POST["originid"]; setEventMessages($object->error, $object->errors, 'errors'); } - } - - // Add a new line + } // Add a new line elseif ($action == 'addline' && $usercancreate) { $langs->load('errors'); @@ -1921,9 +1875,7 @@ if (empty($reshook)) { $idprod = 0; $tva_tx = (GETPOST('tva_tx', 'alpha') ? GETPOST('tva_tx', 'alpha') : 0); - } - else - { + } else { $idprod = GETPOST('idprod', 'int'); $tva_tx = ''; } @@ -1970,9 +1922,7 @@ if (empty($reshook)) setEventMessages($langs->trans("ErrorFieldCantBeNegativeOnInvoice", $langs->transnoentitiesnoconv("UnitPriceHT"), $langs->transnoentitiesnoconv("CustomerAbsoluteDiscountShort")), null, 'errors'); } $error++; - } - else - { + } else { setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), null, 'errors'); $error++; } @@ -1998,9 +1948,7 @@ if (empty($reshook)) if ($res = $prodcomb->fetchByProductCombination2ValuePairs($idprod, $combinations)) { $idprod = $res->fk_product_child; - } - else - { + } else { setEventMessages($langs->trans('ErrorProductCombinationNotFound'), null, 'errors'); $error++; } @@ -2056,17 +2004,14 @@ if (empty($reshook)) { $pu_ht = price2num($price_ht, 'MU'); $pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU'); - } - // On reevalue prix selon taux tva car taux tva transaction peut etre different + } // On reevalue prix selon taux tva car taux tva transaction peut etre different // de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur). elseif ($tmpvat != $tmpprodvat) { if ($price_base_type != 'HT') { $pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU'); - } - else - { + } else { $pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU'); } } @@ -2233,9 +2178,7 @@ if (empty($reshook)) $action = ''; } } - } - - elseif ($action == 'updateline' && $usercancreate && !GETPOST('cancel', 'alpha')) + } elseif ($action == 'updateline' && $usercancreate && !GETPOST('cancel', 'alpha')) { if (!$object->fetch($id) > 0) dol_print_error($db); $object->fetch_thirdparty(); @@ -2292,16 +2235,14 @@ if (empty($reshook)) setEventMessages($mesg, null, 'warnings'); $error++; $result = -1; - } - elseif (GETPOST('progress') < $line->situation_percent) // TODO : use a modified $line->get_prev_progress($object->id) result + } elseif (GETPOST('progress') < $line->situation_percent) // TODO : use a modified $line->get_prev_progress($object->id) result { $mesg = $langs->trans("CantBeLessThanMinPercent"); setEventMessages($mesg, null, 'warnings'); $error++; $result = -1; } - } - elseif (GETPOST('progress') < $percent) + } elseif (GETPOST('progress') < $percent) { $mesg = '
'.$langs->trans("CantBeLessThanMinPercent").'
';
setEventMessages($mesg, null, 'warnings');
@@ -2356,9 +2297,7 @@ if (empty($reshook))
setEventMessages($langs->trans("ErrorFieldCantBeNegativeOnInvoice", $langs->transnoentitiesnoconv("UnitPriceHT"), $langs->transnoentitiesnoconv("CustomerAbsoluteDiscountShort")), null, 'errors');
}
$error++;
- }
- else
- {
+ } else {
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), null, 'errors');
$error++;
}
@@ -2443,9 +2382,7 @@ if (empty($reshook))
setEventMessages($object->error, $object->errors, 'errors');
}
}
- }
-
- elseif ($action == 'updatealllines' && $usercancreate && $_POST['all_percent'] == $langs->trans('Modifier')) // Update all lines of situation invoice
+ } elseif ($action == 'updatealllines' && $usercancreate && $_POST['all_percent'] == $langs->trans('Modifier')) // Update all lines of situation invoice
{
if (!$object->fetch($id) > 0) dol_print_error($db);
if (GETPOST('all_progress') != "")
@@ -2458,18 +2395,13 @@ if (empty($reshook))
$mesg = $langs->trans("Line").' '.$i.' : '.$langs->trans("CantBeLessThanMinPercent");
setEventMessages($mesg, null, 'warnings');
$result = -1;
- } else
- $object->update_percent($line, $_POST['all_progress']);
+ } else $object->update_percent($line, $_POST['all_progress']);
}
}
- }
-
- elseif ($action == 'updateline' && $usercancreate && $_POST['cancel'] == $langs->trans('Cancel')) {
+ } elseif ($action == 'updateline' && $usercancreate && $_POST['cancel'] == $langs->trans('Cancel')) {
header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id); // To show again edited page
exit();
- }
-
- // Outing situation invoice from cycle
+ } // Outing situation invoice from cycle
elseif ($action == 'confirm_situationout' && $confirm == 'yes' && $usercancreate)
{
$object->fetch($id, '', '', '', true);
@@ -2539,9 +2471,7 @@ if (empty($reshook))
{
$searchPreviousInvoice = false; // find, exit;
break;
- }
- else
- {
+ } else {
$lineIndex--; // go to previous invoice in cycle
}
}
@@ -2568,25 +2498,17 @@ if (empty($reshook))
{
setEventMessages($langs->trans('Updated'), '', 'mesgs');
header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
- }
- else
- {
+ } else {
setEventMessages($langs->trans('ErrorOutingSituationInvoiceCreditNote'), array(), 'errors');
}
- }
- else
- {
+ } else {
setEventMessages($langs->trans('ErrorOutingSituationInvoiceOnUpdate'), array(), 'errors');
}
- }
- else
- {
+ } else {
setEventMessages($langs->trans('ErrorFindNextSituationInvoice'), array(), 'errors');
}
}
- }
-
- // add lines from objectlinked
+ } // add lines from objectlinked
elseif ($action == 'import_lines_from_object'
&& $usercancreate
&& $object->statut == Facture::STATUS_DRAFT
@@ -2602,8 +2524,7 @@ if (empty($reshook))
{
dol_include_once('/'.$fromElement.'/class/'.$fromElement.'.class.php');
$lineClassName = 'OrderLine';
- }
- elseif ($fromElement == 'propal')
+ } elseif ($fromElement == 'propal')
{
dol_include_once('/comm/'.$fromElement.'/class/'.$fromElement.'.class.php');
$lineClassName = 'PropaleLigne';
@@ -2645,8 +2566,7 @@ if (empty($reshook))
$array_options = $originLine->array_options;
if ($object->type == Facture::TYPE_SITUATION) {
$situation_percent = 0;
- }
- else {
+ } else {
$situation_percent = 100;
}
$fk_prev_id = '';
@@ -2660,8 +2580,7 @@ if (empty($reshook))
} else {
$error++;
}
- }
- else {
+ } else {
$error++;
}
}
@@ -2874,9 +2793,7 @@ if ($action == 'create')
//Replicate extrafields
$expesrc->fetch_optionals();
$object->array_options = $expesrc->array_options;
- }
- else
- {
+ } else {
$cond_reglement_id = (!empty($objectsrc->cond_reglement_id) ? $objectsrc->cond_reglement_id : (!empty($soc->cond_reglement_id) ? $soc->cond_reglement_id : 0));
$mode_reglement_id = (!empty($objectsrc->mode_reglement_id) ? $objectsrc->mode_reglement_id : (!empty($soc->mode_reglement_id) ? $soc->mode_reglement_id : 0));
$fk_account = (!empty($objectsrc->fk_account) ? $objectsrc->fk_account : (!empty($soc->fk_account) ? $soc->fk_account : 0));
@@ -2894,9 +2811,7 @@ if ($action == 'create')
$object->array_options = $objectsrc->array_options;
}
}
- }
- else
- {
+ } else {
$cond_reglement_id = $soc->cond_reglement_id;
$mode_reglement_id = $soc->mode_reglement_id;
$fk_account = $soc->fk_account;
@@ -2907,12 +2822,21 @@ if ($action == 'create')
if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) $currency_code = $soc->multicurrency_code;
}
+ // when payment condition is empty (means not override by payment condition form a other object, like third-party), try to use default value
+ if (empty($cond_reglement_id)) {
+ $cond_reglement_id = GETPOST("cond_reglement_id");
+ }
+
+ // when payment mode is empty (means not override by payment mode form a other object, like third-party), try to use default value
+ if (empty($mode_reglement_id)) {
+ $mode_reglement_id = GETPOST("mode_reglement_id");
+ }
+
if (!empty($soc->id)) $absolute_discount = $soc->getAvailableDiscounts();
$note_public = $object->getDefaultCreateValueFor('note_public', ((!empty($origin) && !empty($originid) && is_object($objectsrc) && !empty($conf->global->FACTURE_REUSE_NOTES_ON_CREATE_FROM)) ? $objectsrc->note_public : null));
$note_private = $object->getDefaultCreateValueFor('note_private', ((!empty($origin) && !empty($originid) && is_object($objectsrc) && !empty($conf->global->FACTURE_REUSE_NOTES_ON_CREATE_FROM)) ? $objectsrc->note_private : null));
- if (!empty($conf->use_javascript_ajax))
- {
+ if (!empty($conf->use_javascript_ajax)) {
require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
print ajax_combobox('fac_replacement');
print ajax_combobox('fac_avoir');
@@ -2978,9 +2902,7 @@ if ($action == 'create')
print ')';
print '';
print ''."\n";
- }
- else
- {
+ } else {
print '';
- $tmp = ''.$langs->trans('NoSituations').'') || (GETPOST('origin') && GETPOST('origin') != 'facture' && GETPOST('origin') != 'commande'))
$tmp .= ' disabled';
$tmp .= '> ';
@@ -3203,9 +3125,7 @@ if ($action == 'create')
print $desc;
print '
';
@@ -3310,9 +3230,7 @@ if ($action == 'create')
print '
';
if (empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE)) $tmp = ' ';
else $tmp = ' ';
@@ -3679,8 +3597,7 @@ if ($action == 'create')
}
print '
'; -} -elseif ($id > 0 || !empty($ref)) +} elseif ($id > 0 || !empty($ref)) { /* * Show object in view mode @@ -3789,9 +3706,7 @@ elseif ($id > 0 || !empty($ref)) array('type' => 'other', 'name' => 'idwarehouse', 'label' => $label, 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse') ?GETPOST('idwarehouse') : 'ifone', 'idwarehouse', '', 1, 0, 0, $langs->trans("NoStockAction"), 0, $forcecombo)) ); $formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id, $langs->trans('DeleteBill'), $text, 'confirm_delete', $formquestion, "yes", 1); - } - else - { + } else { $formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id, $langs->trans('DeleteBill'), $text, 'confirm_delete', '', 'no', 1); } } else { @@ -4128,8 +4043,7 @@ elseif ($id > 0 || !empty($ref)) foreach ($facidavoir as $id) { if ($i == 0) print ' '; - else - print ','; + else print ','; $facavoir = new Facture($db); $facavoir->fetch($id); print $facavoir->getNomUrl(1); @@ -4273,9 +4187,7 @@ elseif ($id > 0 || !empty($ref)) if ($action == 'editmode') { $form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT', 1, 1); - } - else - { + } else { $form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'none', 'CRDT'); } print '
'; -} -elseif ($id > 0 || !empty($ref)) +} elseif ($id > 0 || !empty($ref)) { /* * Show object in view mode @@ -3789,9 +3706,7 @@ elseif ($id > 0 || !empty($ref)) array('type' => 'other', 'name' => 'idwarehouse', 'label' => $label, 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse') ?GETPOST('idwarehouse') : 'ifone', 'idwarehouse', '', 1, 0, 0, $langs->trans("NoStockAction"), 0, $forcecombo)) ); $formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id, $langs->trans('DeleteBill'), $text, 'confirm_delete', $formquestion, "yes", 1); - } - else - { + } else { $formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id, $langs->trans('DeleteBill'), $text, 'confirm_delete', '', 'no', 1); } } else { @@ -4128,8 +4043,7 @@ elseif ($id > 0 || !empty($ref)) foreach ($facidavoir as $id) { if ($i == 0) print ' '; - else - print ','; + else print ','; $facavoir = new Facture($db); $facavoir->fetch($id); print $facavoir->getNomUrl(1); @@ -4273,9 +4187,7 @@ elseif ($id > 0 || !empty($ref)) if ($action == 'editmode') { $form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT', 1, 1); - } - else - { + } else { $form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'none', 'CRDT'); } print '
| '; @@ -4397,9 +4305,7 @@ elseif ($id > 0 || !empty($ref)) print ''; print ''; print ''; - } - else - { + } else { print price($object->retained_warranty).'%'; } print ' | ||
| '; if ($object->type != Facture::TYPE_DEPOSIT) print $langs->trans('AlreadyPaidNoCreditNotesNoDeposits'); - else - print $langs->trans('AlreadyPaid'); + else print $langs->trans('AlreadyPaid'); print ' : | '.price($totalpaye).' | '.price($retainedWarranty).' | '; } - } - else // Credit note + } else // Credit note { $cssforamountpaymentcomplete = 'amountpaymentneutral'; @@ -5118,9 +5016,7 @@ elseif ($id > 0 || !empty($ref)) print ''.$langs->trans('Modify').''; } } - } - else - { + } else { print ''.$langs->trans('Modify').''; } } @@ -5159,8 +5055,7 @@ elseif ($id > 0 || !empty($ref)) } else { if ($usercansend) { print ''.$langs->trans('SendMail').''; - } else - print ''.$langs->trans('SendMail').''; + } else print ''.$langs->trans('SendMail').''; } } } @@ -5178,14 +5073,10 @@ elseif ($id > 0 || !empty($ref)) } else { print ''.$langs->trans('MakeWithdrawRequest').''; } - } - else - { + } else { //print ''.$langs->trans("MakeWithdrawRequest").''; } - } - else - { + } else { //print ''.$langs->trans("MakeWithdrawRequest").''; } } @@ -5219,9 +5110,7 @@ elseif ($id > 0 || !empty($ref)) if ($resteapayer == 0) { print ''.$langs->trans('DoPaymentBack').''; - } - else - { + } else { print ''.$langs->trans('DoPaymentBack').''; } } @@ -5260,17 +5149,13 @@ elseif ($id > 0 || !empty($ref)) { // If one payment or one credit note was linked to this invoice print ''.$langs->trans('ClassifyPaidPartially').''; - } - else - { + } else { if (empty($conf->global->INVOICE_CAN_NEVER_BE_CANCELED)) { if ($objectidnext) { print ''.$langs->trans('ClassifyCanceled').''; - } - else - { + } else { print ''.$langs->trans('ClassifyCanceled').''; } } @@ -5282,7 +5167,7 @@ elseif ($id > 0 || !empty($ref)) { if (!$objectidnext) { - print ''.$langs->trans("CreateCreditNote").''; + print ''.$langs->trans("CreateCreditNote").''; } } @@ -5332,9 +5217,7 @@ elseif ($id > 0 || !empty($ref)) if (($object->total_ttc - $totalcreditnotes) == 0) { print ''.$langs->trans("RemoveSituationFromCycle").''; - } - else - { + } else { print ''.$langs->trans("RemoveSituationFromCycle").''; } } @@ -5357,26 +5240,19 @@ elseif ($id > 0 || !empty($ref)) //var_dump($isErasable); if ($isErasable == -4) { print ''.$langs->trans('Delete').''; - } - elseif ($isErasable == -3) { + } elseif ($isErasable == -3) { print ''.$langs->trans('Delete').''; - } - elseif ($isErasable == -2) { + } elseif ($isErasable == -2) { print ''.$langs->trans('Delete').''; - } - elseif ($isErasable == -1) { + } elseif ($isErasable == -1) { print ''.$langs->trans('Delete').''; - } - elseif ($isErasable <= 0) // Any other cases + } elseif ($isErasable <= 0) // Any other cases { print ''.$langs->trans('Delete').''; - } - elseif ($objectidnext) + } elseif ($objectidnext) { print ''.$langs->trans('Delete').''; - } - else - { + } else { print ''.$langs->trans('Delete').''; } } else { diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php index 85da9cd5c37..c1ed5b809da 100644 --- a/htdocs/compta/facture/class/api_invoices.class.php +++ b/htdocs/compta/facture/class/api_invoices.class.php @@ -244,8 +244,7 @@ class Invoices extends DolibarrApi } $i++; } - } - else { + } else { throw new RestException(503, 'Error when retrieve invoice list : '.$db->lasterror()); } if (!count($obj_ret)) { @@ -548,9 +547,7 @@ class Invoices extends DolibarrApi $updateRes = $this->invoice->deleteline($lineid); if ($updateRes > 0) { return $this->get($id); - } - else - { + } else { throw new RestException(405, $this->invoice->error); } } @@ -1041,14 +1038,11 @@ class Invoices extends DolibarrApi $discount = new DiscountAbsolute($this->db); if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) { $discount->description = '(CREDIT_NOTE)'; - } - elseif ($this->invoice->type == Facture::TYPE_DEPOSIT) { + } elseif ($this->invoice->type == Facture::TYPE_DEPOSIT) { $discount->description = '(DEPOSIT)'; - } - elseif ($this->invoice->type == Facture::TYPE_STANDARD || $this->invoice->type == Facture::TYPE_REPLACEMENT || $this->invoice->type == Facture::TYPE_SITUATION) { + } elseif ($this->invoice->type == Facture::TYPE_STANDARD || $this->invoice->type == Facture::TYPE_REPLACEMENT || $this->invoice->type == Facture::TYPE_SITUATION) { $discount->description = '(EXCESS RECEIVED)'; - } - else { + } else { throw new RestException(500, 'Cant convert to reduc an Invoice of this type'); } @@ -1124,18 +1118,14 @@ class Invoices extends DolibarrApi if ($result >= 0) { $this->db->commit(); - } - else - { + } else { $this->db->rollback(); throw new RestException(500, 'Could not set paid'); } } else { $this->db->commit(); } - } - else - { + } else { $this->db->rollback(); throw new RestException(500, 'Discount creation error'); } diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php index 71be89f30f5..581e63be08a 100644 --- a/htdocs/compta/facture/class/facture-rec.class.php +++ b/htdocs/compta/facture/class/facture-rec.class.php @@ -336,8 +336,7 @@ class FactureRec extends CommonInvoice if ($result_insert < 0) { $error++; - } - else { + } else { $objectline = new FactureLigneRec($this->db); if ($objectline->fetch($result_insert)) { @@ -377,8 +376,7 @@ class FactureRec extends CommonInvoice $error++; } } - } - else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1)) + } else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1)) { $origin_id = $tmp_origin_id; $ret = $this->add_object_linked($origin, $origin_id); @@ -394,22 +392,16 @@ class FactureRec extends CommonInvoice if ($error) { $this->db->rollback(); - } - else - { + } else { $this->db->commit(); return $this->id; } - } - else - { + } else { $this->error = $this->db->lasterror(); $this->db->rollback(); return -2; } - } - else - { + } else { $this->db->rollback(); return -1; } @@ -460,9 +452,7 @@ class FactureRec extends CommonInvoice } $this->db->commit(); return 1; - } - else - { + } else { $this->error = $this->db->lasterror(); $this->db->rollback(); return -2; @@ -584,16 +574,12 @@ class FactureRec extends CommonInvoice return -3; } return 1; - } - else - { + } else { $this->error = 'Bill with id '.$rowid.' or ref '.$ref.' not found sql='.$sql; dol_syslog('Facture::Fetch Error '.$this->error, LOG_ERR); return -2; } - } - else - { + } else { $this->error = $this->db->error(); return -1; } @@ -722,9 +708,7 @@ class FactureRec extends CommonInvoice $this->db->free($result); return 1; - } - else - { + } else { $this->error = $this->db->lasterror(); return -3; } @@ -766,15 +750,11 @@ class FactureRec extends CommonInvoice // Delete extrafields $res = $this->deleteExtraFields(); if ($res < 0) $error = -4; - } - else - { + } else { $this->error = $this->db->lasterror(); $error = -1; } - } - else - { + } else { $this->error = $this->db->lasterror(); $error = -2; } @@ -783,9 +763,7 @@ class FactureRec extends CommonInvoice { $this->db->commit(); return 1; - } - else - { + } else { $this->db->rollback(); return $error; } @@ -860,9 +838,7 @@ class FactureRec extends CommonInvoice if ($price_base_type == 'HT') { $pu = $pu_ht; - } - else - { + } else { $pu = $pu_ttc; } @@ -969,9 +945,7 @@ class FactureRec extends CommonInvoice $this->id = $facid; $this->update_price(); return $lineId; - } - else - { + } else { $this->error = $this->db->lasterror(); return -1; } @@ -1045,9 +1019,7 @@ class FactureRec extends CommonInvoice if ($price_base_type == 'HT') { $pu = $pu_ht; - } - else - { + } else { $pu = $pu_ttc; } @@ -1131,9 +1103,7 @@ class FactureRec extends CommonInvoice $this->id = $facid; $this->update_price(); return 1; - } - else - { + } else { $this->error = $this->db->lasterror(); return -1; } @@ -1226,8 +1196,7 @@ class FactureRec extends CommonInvoice if ($num) $this->output .= $langs->trans("FoundXQualifiedRecurringInvoiceTemplate", $num)."\n"; - else - $this->output .= $langs->trans("NoQualifiedRecurringInvoiceTemplateFound"); + else $this->output .= $langs->trans("NoQualifiedRecurringInvoiceTemplateFound"); $saventity = $conf->entity; @@ -1288,9 +1257,7 @@ class FactureRec extends CommonInvoice $error++; } } - } - else - { + } else { $error++; $this->error = "Failed to load invoice template with id=".$line->rowid.", entity=".$conf->entity."\n"; $this->errors[] = "Failed to load invoice template with id=".$line->rowid.", entity=".$conf->entity; @@ -1303,9 +1270,7 @@ class FactureRec extends CommonInvoice dol_syslog("createRecurringInvoices Process invoice template ".$facturerec->ref." is finished with a success generation"); $nb_create++; $this->output .= $langs->trans("InvoiceGeneratedFromTemplate", $facture->ref, $facturerec->ref)."\n"; - } - else - { + } else { $db->rollback("createRecurringInvoices Process invoice template id=".$facturerec->id.", ref=".$facturerec->ref); } @@ -1323,8 +1288,7 @@ class FactureRec extends CommonInvoice } $conf->entity = $saventity; // Restore entity context - } - else dol_print_error($db); + } else dol_print_error($db); $this->output = trim($this->output); @@ -1430,69 +1394,54 @@ class FactureRec extends CommonInvoice { if ($status == self::STATUS_SUSPENDED) { $labelStatus = $langs->trans('Disabled'); - } - else { + } else { $labelStatus = $langs->trans('Active'); } - } - else - { + } else { if ($status == self::STATUS_SUSPENDED) { $labelStatus = $langs->trans('Disabled'); - } - else { + } else { $labelStatus = $langs->trans("Draft"); } } - } - elseif ($mode == 1) + } elseif ($mode == 1) { $prefix = 'Short'; if ($recur) { if ($status == self::STATUS_SUSPENDED) { $labelStatus = $langs->trans('Disabled'); - } - else { + } else { $labelStatus = $langs->trans('Active'); } - } - else - { + } else { if ($status == self::STATUS_SUSPENDED) { $labelStatus = $langs->trans('Disabled'); - } - else { + } else { $labelStatus = $langs->trans("Draft"); } } - } - elseif ($mode == 2) + } elseif ($mode == 2) { if ($recur) { if ($status == self::STATUS_SUSPENDED) { $statusType = 'status6'; $labelStatus = $langs->trans('Disabled'); - } - else { + } else { $statusType = 'status4'; $labelStatus = $langs->trans('Active'); } - } - else - { + } else { if ($status == self::STATUS_SUSPENDED) { $statusType = 'status6'; $labelStatus = $langs->trans('Disabled'); - } - else { + } else { $statusType = 'status0'; $labelStatus = $langs->trans('Draft'); } } - } - elseif ($mode == 3) + } elseif ($mode == 3) { if ($recur) { @@ -1500,25 +1449,20 @@ class FactureRec extends CommonInvoice if ($status == self::STATUS_SUSPENDED) { $statusType = 'status6'; $labelStatus = $langs->trans('Disabled'); - } - else { + } else { $statusType = 'status4'; $labelStatus = $langs->trans('Active'); } - } - else - { + } else { if ($status == self::STATUS_SUSPENDED) { $statusType = 'status6'; $labelStatus = $langs->trans('Disabled'); - } - else { + } else { $statusType = 'status0'; $labelStatus = $langs->trans('Draft'); } } - } - elseif ($mode == 4) + } elseif ($mode == 4) { $prefix = ''; if ($recur) @@ -1526,25 +1470,20 @@ class FactureRec extends CommonInvoice if ($status == self::STATUS_SUSPENDED) { $statusType = 'status6'; $labelStatus = $langs->trans('Disabled'); - } - else { + } else { $statusType = 'status4'; $labelStatus = $langs->trans('Active'); } - } - else - { + } else { if ($status == self::STATUS_SUSPENDED) { $statusType = 'status6'; $labelStatus = $langs->trans('Disabled'); - } - else { + } else { $statusType = 'status0'; $labelStatus = $langs->trans('Draft'); } } - } - elseif ($mode == 5 || $mode == 6) + } elseif ($mode == 5 || $mode == 6) { $prefix = ''; if ($mode == 5) $prefix = 'Short'; @@ -1553,19 +1492,15 @@ class FactureRec extends CommonInvoice if ($status == self::STATUS_SUSPENDED) { $statusType = 'status6'; $labelStatus = $langs->trans('Disabled'); - } - else { + } else { $statusType = 'status4'; $labelStatus = $langs->trans('Active'); } - } - else - { + } else { if ($status == self::STATUS_SUSPENDED) { $statusType = 'status6'; $labelStatus = $langs->trans('Disabled'); - } - else { + } else { $statusType = 'status0'; $labelStatus = $langs->trans('Draft'); } @@ -1654,16 +1589,14 @@ class FactureRec extends CommonInvoice $line->total_ht = -100; $line->total_ttc = -119.6; $line->total_tva = -19.6; - } - elseif ($xnbp == 2) // UP is negative (free line) + } elseif ($xnbp == 2) // UP is negative (free line) { $line->subprice = -100; $line->total_ht = -100; $line->total_ttc = -119.6; $line->total_tva = -19.6; $line->remise_percent = 0; - } - elseif ($xnbp == 3) // Discount is 50% (product line) + } elseif ($xnbp == 3) // Discount is 50% (product line) { $prodid = mt_rand(1, $num_prods); $line->fk_product = $prodids[$prodid]; @@ -1671,8 +1604,7 @@ class FactureRec extends CommonInvoice $line->total_ttc = 59.8; $line->total_tva = 9.8; $line->remise_percent = 50; - } - else // (product line) + } else // (product line) { $prodid = mt_rand(1, $num_prods); $line->fk_product = $prodids[$prodid]; @@ -1761,9 +1693,7 @@ class FactureRec extends CommonInvoice $this->frequency = $frequency; if (!empty($unit)) $this->unit_frequency = $unit; return 1; - } - else - { + } else { dol_print_error($this->db); return -1; } @@ -1794,9 +1724,7 @@ class FactureRec extends CommonInvoice $this->date_when = $date; if ($increment_nb_gen_done > 0) $this->nb_gen_done++; return 1; - } - else - { + } else { dol_print_error($this->db); return -1; } @@ -1827,9 +1755,7 @@ class FactureRec extends CommonInvoice { $this->nb_gen_max = $nb; return 1; - } - else - { + } else { dol_print_error($this->db); return -1; } @@ -1858,9 +1784,7 @@ class FactureRec extends CommonInvoice { $this->auto_validate = $validate; return 1; - } - else - { + } else { dol_print_error($this->db); return -1; } @@ -1889,9 +1813,7 @@ class FactureRec extends CommonInvoice { $this->generate_pdf = $validate; return 1; - } - else - { + } else { dol_print_error($this->db); return -1; } @@ -1920,9 +1842,7 @@ class FactureRec extends CommonInvoice { $this->modelpdf = $model; return 1; - } - else - { + } else { dol_print_error($this->db); return -1; } @@ -2067,9 +1987,7 @@ class FactureLigneRec extends CommonInvoiceLine $this->db->free($result); return 1; - } - else - { + } else { $this->error = $this->db->lasterror(); return -3; } @@ -2149,9 +2067,7 @@ class FactureLigneRec extends CommonInvoiceLine } $this->db->commit(); return 1; - } - else - { + } else { $this->error = $this->db->lasterror(); $this->db->rollback(); return -2; diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index fd6a6d32642..791273a4fda 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -678,8 +678,7 @@ class Facture extends CommonInvoice $error++; } } - } - else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1)) + } else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1)) { $origin_id = $tmp_origin_id; $ret = $this->add_object_linked($origin, $origin_id); @@ -726,8 +725,7 @@ class Facture extends CommonInvoice //print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n"; $this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source); // May failed because of duplicate key or because code of contact type does not exists for new object } - } - else dol_print_error($resqlcontact); + } else dol_print_error($resqlcontact); } /* @@ -787,8 +785,7 @@ class Facture extends CommonInvoice break; } } - } - elseif (!$error && empty($this->fac_rec)) // If this->lines is an array of invoice line arrays + } elseif (!$error && empty($this->fac_rec)) // If this->lines is an array of invoice line arrays { $fk_parent_line = 0; @@ -987,29 +984,21 @@ class Facture extends CommonInvoice { $this->db->commit(); return $this->id; - } - else - { + } else { $this->db->rollback(); return -4; } - } - else - { + } else { $this->error = $langs->trans('FailedToUpdatePrice'); $this->db->rollback(); return -3; } - } - else - { + } else { dol_syslog(get_class($this)."::create error ".$this->error, LOG_ERR); $this->db->rollback(); return -2; } - } - else - { + } else { $this->error = $this->db->error(); $this->db->rollback(); return -1; @@ -1094,8 +1083,7 @@ class Facture extends CommonInvoice { $this->error = $facture->error; $this->errors = $facture->errors; - } - elseif ($this->type == self::TYPE_SITUATION && !empty($conf->global->INVOICE_USE_SITUATION)) + } elseif ($this->type == self::TYPE_SITUATION && !empty($conf->global->INVOICE_USE_SITUATION)) { $this->fetchObjectLinked('', '', $this->id, 'facture'); @@ -1240,9 +1228,7 @@ class Facture extends CommonInvoice { $this->db->commit(); return $object->id; - } - else - { + } else { $this->db->rollback(); return -1; } @@ -1367,10 +1353,8 @@ class Facture extends CommonInvoice if (!$error) { return 1; - } - else return -1; - } - else return -1; + } else return -1; + } else return -1; } /** @@ -1645,16 +1629,12 @@ class Facture extends CommonInvoice return -3; } return 1; - } - else - { + } else { $this->error = 'Invoice with id='.$rowid.' or ref='.$ref.' or ref_ext='.$ref_ext.' not found'; dol_syslog(get_class($this)."::fetch Error ".$this->error, LOG_ERR); return 0; } - } - else - { + } else { $this->error = $this->db->error(); return -1; } @@ -1775,16 +1755,15 @@ class Facture extends CommonInvoice } $this->db->free($result); return 1; - } - else - { + } else { $this->error = $this->db->error(); return -3; } } /** - * Fetch previous and next situations invoices + * Fetch previous and next situations invoices. + * Return all previous and next invoices (both standard and credit notes). * * @return void */ @@ -1795,7 +1774,7 @@ class Facture extends CommonInvoice $this->tab_previous_situation_invoice = array(); $this->tab_next_situation_invoice = array(); - $sql = 'SELECT rowid, situation_counter FROM '.MAIN_DB_PREFIX.'facture'; + $sql = 'SELECT rowid, type, situation_cycle_ref, situation_counter FROM '.MAIN_DB_PREFIX.'facture'; $sql .= ' WHERE rowid <> '.$this->id; $sql .= ' AND entity = '.$this->entity; $sql .= ' AND situation_cycle_ref = '.(int) $this->situation_cycle_ref; @@ -1815,9 +1794,7 @@ class Facture extends CommonInvoice ) { $this->tab_previous_situation_invoice[] = $invoice; - } - else - { + } else { $this->tab_next_situation_invoice[] = $invoice; } } @@ -1933,9 +1910,7 @@ class Facture extends CommonInvoice } $this->db->rollback(); return -1 * $error; - } - else - { + } else { $this->db->commit(); return 1; } @@ -2021,23 +1996,17 @@ class Facture extends CommonInvoice $this->db->commit(); return 1; - } - else - { + } else { $this->error = $facligne->error; $this->db->rollback(); return -1; } - } - else - { + } else { $this->error = $facligne->error; $this->db->rollback(); return -2; } - } - else - { + } else { $this->db->rollback(); return -3; } @@ -2063,8 +2032,7 @@ class Facture extends CommonInvoice $sql = 'UPDATE '.MAIN_DB_PREFIX.'facture'; if (empty($ref_client)) $sql .= ' SET ref_client = NULL'; - else - $sql .= ' SET ref_client = \''.$this->db->escape($ref_client).'\''; + else $sql .= ' SET ref_client = \''.$this->db->escape($ref_client).'\''; $sql .= ' WHERE rowid = '.$this->id; dol_syslog(__METHOD__.' this->id='.$this->id.', ref_client='.$ref_client, LOG_DEBUG); @@ -2094,9 +2062,7 @@ class Facture extends CommonInvoice $this->db->commit(); return 1; - } - else - { + } else { foreach ($this->errors as $errmsg) { dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR); @@ -2260,23 +2226,17 @@ class Facture extends CommonInvoice $this->db->commit(); return 1; - } - else - { + } else { $this->error = $this->db->lasterror()." sql=".$sql; $this->db->rollback(); return -6; } - } - else - { + } else { $this->error = $this->db->lasterror()." sql=".$sql; $this->db->rollback(); return -4; } - } - else - { + } else { $this->db->rollback(); return -2; } @@ -2321,9 +2281,7 @@ class Facture extends CommonInvoice $result = $this->call_trigger('BILL_PAYED', $user); if ($result < 0) $error++; // End call triggers - } - else - { + } else { $error++; $this->error = $this->db->lasterror(); } @@ -2332,15 +2290,11 @@ class Facture extends CommonInvoice { $this->db->commit(); return 1; - } - else - { + } else { $this->db->rollback(); return -1; } - } - else - { + } else { return 0; } } @@ -2376,9 +2330,7 @@ class Facture extends CommonInvoice $result = $this->call_trigger('BILL_UNPAYED', $user); if ($result < 0) $error++; // End call triggers - } - else - { + } else { $error++; $this->error = $this->db->error(); dol_print_error($this->db); @@ -2388,9 +2340,7 @@ class Facture extends CommonInvoice { $this->db->commit(); return 1; - } - else - { + } else { $this->db->rollback(); return -1; } @@ -2445,16 +2395,12 @@ class Facture extends CommonInvoice $this->db->commit(); return 1; - } - else - { + } else { $this->error = $this->db->error()." sql=".$sql; $this->db->rollback(); return -1; } - } - else - { + } else { $this->error = $this->db->error()." sql=".$sql; $this->db->rollback(); return -2; @@ -2563,8 +2509,7 @@ class Facture extends CommonInvoice if ($force_number) { $num = $force_number; - } - elseif (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life + } elseif (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life { if (!empty($conf->global->FAC_FORCE_DATE_VALIDATION)) // If option enabled, we force invoice date { @@ -2572,9 +2517,7 @@ class Facture extends CommonInvoice $this->date_lim_reglement = $this->calculate_date_lim_reglement(); } $num = $this->getNextNumRef($this->thirdparty); - } - else - { + } else { $num = $this->ref; } $this->newref = dol_sanitizeFileName($num); @@ -2803,9 +2746,7 @@ class Facture extends CommonInvoice $this->setFinal($user); } } - } - else - { + } else { $error++; } @@ -2813,9 +2754,7 @@ class Facture extends CommonInvoice { $this->db->commit(); return 1; - } - else - { + } else { $this->db->rollback(); return -1; } @@ -2942,15 +2881,11 @@ class Facture extends CommonInvoice { $this->db->commit(); return 1; - } - else - { + } else { $this->db->rollback(); return -1; } - } - else - { + } else { $this->error = $this->db->error(); $this->db->rollback(); return -1; @@ -3069,9 +3004,7 @@ class Facture extends CommonInvoice if ($price_base_type == 'HT') { $pu = $pu_ht; - } - else - { + } else { $pu = $pu_ttc; } @@ -3212,23 +3145,17 @@ class Facture extends CommonInvoice { $this->db->commit(); return $this->line->id; - } - else - { + } else { $this->error = $this->db->lasterror(); $this->db->rollback(); return -1; } - } - else - { + } else { $this->error = $this->line->error; $this->db->rollback(); return -2; } - } - else - { + } else { dol_syslog(get_class($this)."::addline status of order must be Draft to allow use of ->addline()", LOG_ERR); return -3; } @@ -3443,16 +3370,12 @@ class Facture extends CommonInvoice $this->update_price(1); $this->db->commit(); return $result; - } - else - { + } else { $this->error = $this->line->error; $this->db->rollback(); return -1; } - } - else - { + } else { $this->error = "Invoice statut makes operation forbidden"; return -2; } @@ -3572,16 +3495,12 @@ class Facture extends CommonInvoice { $this->db->commit(); return 1; - } - else - { + } else { $this->db->rollback(); $this->error = $this->db->lasterror(); return -1; } - } - else - { + } else { $this->db->rollback(); $this->error = $line->error; return -1; @@ -3639,9 +3558,7 @@ class Facture extends CommonInvoice $this->db->commit(); return 1; - } - else - { + } else { foreach ($this->errors as $errmsg) { dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR); @@ -3708,9 +3625,7 @@ class Facture extends CommonInvoice { $this->db->commit(); return 1; - } - else - { + } else { foreach ($this->errors as $errmsg) { dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR); @@ -3868,9 +3783,7 @@ class Facture extends CommonInvoice $this->date_closing = $this->db->jdate($obj->dateclosing); } $this->db->free($result); - } - else - { + } else { dol_print_error($this->db); } } @@ -3928,13 +3841,10 @@ class Facture extends CommonInvoice if ($shortlist == 1) { $ga[$obj->fid] = $obj->ref; - } - elseif ($shortlist == 2) + } elseif ($shortlist == 2) { $ga[$obj->fid] = $obj->ref.' ('.$obj->name.')'; - } - else - { + } else { $ga[$i]['id'] = $obj->fid; $ga[$i]['ref'] = $obj->ref; $ga[$i]['name'] = $obj->name; @@ -3943,9 +3853,7 @@ class Facture extends CommonInvoice } } return $ga; - } - else - { + } else { dol_print_error($this->db); return -1; } @@ -3993,9 +3901,7 @@ class Facture extends CommonInvoice } //print_r($return); return $return; - } - else - { + } else { $this->error = $this->db->error(); return -1; } @@ -4041,9 +3947,7 @@ class Facture extends CommonInvoice $sqlSit .= " GROUP BY fs.situation_cycle_ref"; $sqlSit .= " ORDER BY fs.situation_counter"; $sql .= " AND ( f.type != ".self::TYPE_SITUATION." OR f.rowid IN (".$sqlSit.") )"; // Type non 5 si facture non avoir - } - else - { + } else { $sql .= " AND f.type != ".self::TYPE_SITUATION; // Type non 5 si facture non avoir } @@ -4068,9 +3972,7 @@ class Facture extends CommonInvoice } return $return; - } - else - { + } else { $this->error = $this->db->error(); return -1; } @@ -4146,9 +4048,7 @@ class Facture extends CommonInvoice dol_syslog(get_class($this).'::demandeprelevement Erreur'); $error++; } - } - else - { + } else { $this->error = 'WithdrawRequestErrorNilAmount'; dol_syslog(get_class($this).'::demandeprelevement WithdrawRequestErrorNilAmount'); $error++; @@ -4166,23 +4066,17 @@ class Facture extends CommonInvoice if ($error) return -1; return 1; - } - else - { + } else { $this->error = "A request already exists"; dol_syslog(get_class($this).'::demandeprelevement Impossible de creer une demande, demande deja en cours'); return 0; } - } - else - { + } else { $this->error = $this->db->error(); dol_syslog(get_class($this).'::demandeprelevement Erreur -2'); return -2; } - } - else - { + } else { $this->error = "Status of invoice does not allow this"; dol_syslog(get_class($this)."::demandeprelevement ".$this->error." $this->statut, $this->paye, $this->mode_reglement_id"); return -3; @@ -4206,9 +4100,7 @@ class Facture extends CommonInvoice if ($this->db->query($sql)) { return 0; - } - else - { + } else { $this->error = $this->db->lasterror(); dol_syslog(get_class($this).'::demande_prelevement_delete Error '.$this->error); return -1; @@ -4273,9 +4165,7 @@ class Facture extends CommonInvoice } return $response; - } - else - { + } else { dol_print_error($this->db); $this->error = $this->db->error(); return -1; @@ -4395,8 +4285,7 @@ class Facture extends CommonInvoice $line->multicurrency_total_ht = -200; $line->multicurrency_total_ttc = -239.2; $line->multicurrency_total_tva = -39.2; - } - elseif ($xnbp == 2) // UP is negative (free line) + } elseif ($xnbp == 2) // UP is negative (free line) { $line->subprice = -100; $line->total_ht = -100; @@ -4406,8 +4295,7 @@ class Facture extends CommonInvoice $line->multicurrency_total_ht = -200; $line->multicurrency_total_ttc = -239.2; $line->multicurrency_total_tva = -39.2; - } - elseif ($xnbp == 3) // Discount is 50% (product line) + } elseif ($xnbp == 3) // Discount is 50% (product line) { $prodid = mt_rand(1, $num_prods); $line->fk_product = $prodids[$prodid]; @@ -4418,8 +4306,7 @@ class Facture extends CommonInvoice $line->multicurrency_total_ttc = 119.6; $line->multicurrency_total_tva = 19.6; $line->remise_percent = 50; - } - else // (product line) + } else // (product line) { $prodid = mt_rand(1, $num_prods); $line->fk_product = $prodids[$prodid]; @@ -4505,9 +4392,7 @@ class Facture extends CommonInvoice } $this->db->free($resql); return 1; - } - else - { + } else { dol_print_error($this->db); $this->error = $this->db->error(); return -1; @@ -4668,9 +4553,7 @@ class Facture extends CommonInvoice { $this->db->commit(); return 1; - } - else - { + } else { foreach ($this->errors as $errmsg) { dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR); @@ -4755,13 +4638,10 @@ class Facture extends CommonInvoice if (($totalpaye < $this->total_ttc - $RetainedWarrantyAmount) && $this->date_lim_reglement < ($now - $conf->facture->client->warning_delay)) { $hasDelay = 1; - } - elseif ($totalpaye < $this->total_ttc && $this->retained_warranty_date_limit < ($now - $conf->facture->client->warning_delay)) + } elseif ($totalpaye < $this->total_ttc && $this->retained_warranty_date_limit < ($now - $conf->facture->client->warning_delay)) { $hasDelay = 1; - } - else - { + } else { $hasDelay = 0; } } @@ -4847,13 +4727,10 @@ class Facture extends CommonInvoice $total2BillWT += $this->total_ttc; $retainedWarrantyAmount = $total2BillWT * $this->retained_warranty / 100; - } - else { + } else { return -1; } - } - else - { + } else { // Because one day retained warranty could be used on standard invoices $retainedWarrantyAmount = $this->total_ttc * $this->retained_warranty / 100; } @@ -4889,16 +4766,12 @@ class Facture extends CommonInvoice { $this->retained_warranty = floatval($value); return 1; - } - else - { + } else { dol_syslog(get_class($this).'::setRetainedWarranty Erreur '.$sql.' - '.$this->db->error()); $this->error = $this->db->error(); return -1; } - } - else - { + } else { dol_syslog(get_class($this).'::setRetainedWarranty, status of the object is incompatible'); $this->error = 'Status of the object is incompatible '.$this->statut; return -2; @@ -4932,16 +4805,12 @@ class Facture extends CommonInvoice { $this->retained_warranty_date_limit = $timestamp; return 1; - } - else - { + } else { dol_syslog(get_class($this).'::setRetainedWarrantyDateLimit Erreur '.$sql.' - '.$this->db->error()); $this->error = $this->db->error(); return -1; } - } - else - { + } else { dol_syslog(get_class($this).'::setRetainedWarrantyDateLimit, status of the object is incompatible'); $this->error = 'Status of the object is incompatible '.$this->statut; return -2; @@ -5122,9 +4991,7 @@ class FactureLigne extends CommonInvoiceLine $this->db->free($result); return 1; - } - else - { + } else { $this->error = $this->db->lasterror(); return -1; } @@ -5177,9 +5044,7 @@ class FactureLigne extends CommonInvoiceLine if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0) { return $result; - } - else - { + } else { $this->pa_ht = $result; } } @@ -5295,9 +5160,7 @@ class FactureLigne extends CommonInvoiceLine $this->db->rollback(); return -3; } - } - else - { + } else { $result = $discount->link_to_invoice($this->rowid, 0); if ($result < 0) { @@ -5307,17 +5170,13 @@ class FactureLigne extends CommonInvoiceLine return -3; } } - } - else - { + } else { $this->error = $langs->trans("ErrorADiscountThatHasBeenRemovedIsIncluded"); dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR); $this->db->rollback(); return -3; } - } - else - { + } else { $this->error = $discount->error; dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR); $this->db->rollback(); @@ -5339,9 +5198,7 @@ class FactureLigne extends CommonInvoiceLine $this->db->commit(); return $this->id; - } - else - { + } else { $this->error = $this->db->lasterror(); $this->db->rollback(); return -2; @@ -5394,9 +5251,7 @@ class FactureLigne extends CommonInvoiceLine if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0) { return $result; - } - else - { + } else { $this->pa_ht = $result; } } @@ -5474,9 +5329,7 @@ class FactureLigne extends CommonInvoiceLine } $this->db->commit(); return 1; - } - else - { + } else { $this->error = $this->db->error(); $this->db->rollback(); return -2; @@ -5518,9 +5371,7 @@ class FactureLigne extends CommonInvoiceLine { $this->db->commit(); return 1; - } - else - { + } else { $this->error = $this->db->error()." sql=".$sql; $this->db->rollback(); return -1; @@ -5560,9 +5411,7 @@ class FactureLigne extends CommonInvoiceLine { $this->db->commit(); return 1; - } - else - { + } else { $this->error = $this->db->error(); $this->db->rollback(); return -2; diff --git a/htdocs/compta/facture/class/paymentterm.class.php b/htdocs/compta/facture/class/paymentterm.class.php index 427daf445c5..9888bd23d13 100644 --- a/htdocs/compta/facture/class/paymentterm.class.php +++ b/htdocs/compta/facture/class/paymentterm.class.php @@ -145,9 +145,7 @@ class PaymentTerm // extends CommonObject } $this->db->rollback(); return -1 * $error; - } - else - { + } else { $this->db->commit(); return $this->id; } @@ -202,9 +200,7 @@ class PaymentTerm // extends CommonObject $this->db->free($resql); return 1; - } - else - { + } else { $this->error = "Error ".$this->db->lasterror(); return -1; } @@ -239,9 +235,7 @@ class PaymentTerm // extends CommonObject } $this->db->free($resql); return $ret; - } - else - { + } else { $this->error = "Error ".$this->db->lasterror(); return -1; } @@ -305,9 +299,7 @@ class PaymentTerm // extends CommonObject } $this->db->rollback(); return -1 * $error; - } - else - { + } else { $this->db->commit(); return 1; } @@ -345,9 +337,7 @@ class PaymentTerm // extends CommonObject } $this->db->rollback(); return -1 * $error; - } - else - { + } else { $this->db->commit(); return 1; } @@ -396,9 +386,7 @@ class PaymentTerm // extends CommonObject { $this->db->commit(); return $object->id; - } - else - { + } else { $this->db->rollback(); return -1; } diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php index 8eb47268186..c88fef5015c 100644 --- a/htdocs/compta/facture/contact.php +++ b/htdocs/compta/facture/contact.php @@ -69,35 +69,25 @@ if ($action == 'addcontact' && $user->rights->facture->creer) { header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); exit; - } - else - { + } else { if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') { $langs->load("errors"); setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors'); - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } -} - -// Toggle the status of a contact +} // Toggle the status of a contact elseif ($action == 'swapstatut' && $user->rights->facture->creer) { if ($object->fetch($id)) { $result = $object->swapContactStatus(GETPOST('ligne')); - } - else - { + } else { dol_print_error($db); } -} - -// Deletes a contact +} // Deletes a contact elseif ($action == 'deletecontact' && $user->rights->facture->creer) { $object->fetch($id); @@ -107,8 +97,7 @@ elseif ($action == 'deletecontact' && $user->rights->facture->creer) { header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); exit; - } - else { + } else { dol_print_error($db); } } @@ -207,9 +196,7 @@ if ($id > 0 || !empty($ref)) $res = @include dol_buildpath($reldir.'/contacts.tpl.php'); if ($res) break; } - } - else - { + } else { // Record not found print "ErrorRecordNotFound"; } diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php index a901b985342..ed9b032ae90 100644 --- a/htdocs/compta/facture/document.php +++ b/htdocs/compta/facture/document.php @@ -181,14 +181,10 @@ if ($id > 0 || !empty($ref)) $permtoedit = $user->rights->facture->creer; $param = '&id='.$object->id; include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php'; - } - else - { + } else { dol_print_error($db); } -} -else -{ +} else { print $langs->trans("ErrorUnknown"); } diff --git a/htdocs/compta/facture/index.php b/htdocs/compta/facture/index.php new file mode 100644 index 00000000000..5c0aacfdb35 --- /dev/null +++ b/htdocs/compta/facture/index.php @@ -0,0 +1,534 @@ + + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see |
| '.$langs->trans("Statistics").' - '.$langs->trans("CustomerInvoice").' | '; + $result .= '|
| '.$objectstatic->getLibStatut(0).' | '; + $result .= ''.(isset($vals[$status]) ? $vals[$status] : 0).' | '; + $result .= '
| '.$dolgraph->show($total ? 0 : 1).' | '; + $result .= '|
| '.$langs->trans("Total").' | '; + $result .= ''.$total.' | '; + $result .= '
';
+ $result .= '';
+
+ $result .= '
';
+ $result .= '
';
+ return $result;
+ }
+
+ $objectstatic = new Facture($db);
+ $companystatic = new Societe($db);
+ $nbofloop = min($num, $maxCount);
+ $total = 0;
+ $i = 0;
+
+ while ($i < $nbofloop)
+ {
+ $obj = $db->fetch_object($resql);
+
+ $objectstatic->id = $obj->rowid;
+ $objectstatic->ref = $obj->ref;
+
+ $companystatic->id = $obj->socid;
+ $companystatic->name = $obj->socname;
+ $companystatic->client = $obj->client;
+ $companystatic->canvas = $obj->canvas;
+
+ $result .= '| '; + $result .= $langs->trans("CustomersDraftInvoices"); + $result .= ' '; + $result .= ''.$num.''; + $result .= ''; + $result .= ' | '; + $result .= '
';
+ $result .= '';
+
+ $result .= '
';
+ $result .= '
';
+ return $result;
+ }
+
+ $formfile = new FormFile($db);
+ $objectstatic = new Facture($db);
+ $companystatic = new Societe($db);
+ $i = 0;
+
+ while ($i < $num)
+ {
+ $obj = $db->fetch_object($resql);
+
+ $objectstatic->id = $obj->rowid;
+ $objectstatic->ref = $obj->ref;
+ $objectstatic->paye = $obj->paye;
+ $objectstatic->statut = $obj->status;
+
+ $companystatic->id = $obj->socid;
+ $companystatic->name = $obj->socname;
+ $companystatic->client = $obj->client;
+ $companystatic->canvas = $obj->canvas;
+
+ $filename = dol_sanitizeFileName($obj->ref);
+ $filedir = $conf->propal->multidir_output[$obj->entity].'/'.$filename;
+
+ $result .= '| '.$langs->trans("LastCustomersBills", $maxCount).' | '; + $result .= '
| '.$objectstatic->getNomUrl(1).' | '; + $result .= ''; + $result .= ' | '.$formfile->getDocumentsLink($objectstatic->element, $filename, $filedir).' | '; + + $result .= '
';
+ $result .= '';
+
+ $result .= '
';
+ $result .= '
';
+ return $result;
+ }
+
+ $objectstatic = new Facture($db);
+ $companystatic = new Societe($db);
+ $formfile = new FormFile($db);
+ $nbofloop = min($num, $maxCount);
+ $now = dol_now();
+ $total = 0;
+ $i = 0;
+
+ while ($i < $nbofloop)
+ {
+ $obj = $db->fetch_object($resql);
+
+ $objectstatic->id= $obj->id;
+ $objectstatic->ref = $obj->ref;
+
+ $companystatic->id = $obj->socid;
+ $companystatic->name = $obj->socname;
+ $companystatic->client = $obj->client;
+ $companystatic->canvas = $obj->canvas;
+
+ $filename = dol_sanitizeFileName($obj->ref);
+ $filedir = $conf->propal->multidir_output[$obj->entity].'/'.dol_sanitizeFileName($obj->ref);
+
+ $result .= '| '; + $result .= $langs->trans("BillsCustomersUnpaid"); + $result .= ' '; + $result .= ''.$num.''; + $result .= ''; + $result .= ' | '; + $result .= '
| '.$objectstatic->getNomUrl(1).' | '; + + $result .= ''; + + if ($db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) + { + $result .= img_warning($langs->trans("Late")); + } + + $result .= ' | '; + + $result .= ''.$formfile->getDocumentsLink($objectstatic->element, $filename, $filedir).' | '; + + $result .= '
\n"; @@ -593,13 +582,17 @@ if ($object->id > 0) print '
';
// Show graphs
print '
| ';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
print $px1->show();
print " \n"; print $px2->show(); diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php index a02a0fc1682..ef35c03eb54 100644 --- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php +++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php @@ -78,9 +78,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) // If not abandonned $total = $total + $sign * $objectlink->total_ht; echo price($objectlink->total_ht); - } - else - { + } else { echo ' | ||
| '.$langs->trans("Total").' | '; print ''.price($tot_ttc).' | '; print '|
| '.$langs->trans("NoInvoice").' | ||
"; $db->free($resql); - } - else - { + } else { dol_print_error($db); } } @@ -302,16 +298,12 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU print '
"; $db->free($resql); - } - else - { + } else { dol_print_error($db); } } @@ -428,18 +420,14 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire) $i++; } - } - else - { + } else { $colspan = 5; if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++; print '
'; $db->free($resql); - } - else - { + } else { dol_print_error($db); } } @@ -529,17 +517,13 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU $totalam += $obj->am; $i++; } - } - else - { + } else { $colspan = 5; if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++; print '
'; - } - else - { + } else { dol_print_error($db); } } @@ -608,14 +592,11 @@ if (!empty($conf->don->enabled) && $user->rights->don->lire) $i++; } - } - else - { + } else { print '
'; - } - else dol_print_error($db); + } else dol_print_error($db); } /** @@ -686,16 +667,12 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) print '
"; $db->free($resql); - } - else - { + } else { dol_print_error($db); } } @@ -815,9 +792,7 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user print '
'; } $db->free($resql); - } - else - { + } else { dol_print_error($db); } } @@ -939,18 +914,14 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire) print '
'; $db->free($resql); - } - else - { + } else { dol_print_error($db); } } @@ -1049,17 +1020,13 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU print '
'; - } - else - { + } else { dol_print_error($db); } } diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php index 1459bbf2402..78ef32072d6 100644 --- a/htdocs/compta/journal/purchasesjournal.php +++ b/htdocs/compta/journal/purchasesjournal.php @@ -91,7 +91,7 @@ $exportlink = ''; $builddate = dol_now(); $description = $langs->trans("DescPurchasesJournal").'
'; if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded"); -else $description .= $langs->trans("DepositsAreIncluded"); +else $description .= $langs->trans("DepositsAreIncluded"); $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0); report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink); @@ -168,8 +168,7 @@ if ($result) $i++; } -} -else { +} else { dol_print_error($db); } @@ -238,9 +237,7 @@ foreach ($tabfac as $key => $val) { print '
'; if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded"); -else $description .= $langs->trans("DepositsAreIncluded"); +else $description .= $langs->trans("DepositsAreIncluded"); $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0); report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink); @@ -114,8 +114,7 @@ $sql .= " WHERE f.entity IN (".getEntity('invoice').")"; $sql .= " AND f.fk_statut > 0"; if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) { $sql .= " AND f.type IN (".Facture::TYPE_STANDARD.",".Facture::TYPE_REPLACEMENT.",".Facture::TYPE_CREDIT_NOTE.",".Facture::TYPE_SITUATION.")"; -} -else { +} else { $sql .= " AND f.type IN (".Facture::TYPE_STANDARD.",".Facture::TYPE_STANDARD.",".Facture::TYPE_CREDIT_NOTE.",".Facture::TYPE_DEPOSIT.",".Facture::TYPE_SITUATION.")"; } @@ -195,8 +194,7 @@ if ($result) $tabcompany[$obj->rowid] = array('id'=>$obj->socid, 'name'=>$obj->name, 'client'=>$obj->client); $i++; } -} -else { +} else { dol_print_error($db); } @@ -268,9 +266,7 @@ foreach ($tabfac as $key => $val) { print '
'; print ''; } -} -else -{ +} else { $paymentstatic = new Paiement($db); $accountlinestatic = new AccountLine($db); $accountstatic = new Account($db); @@ -587,9 +555,7 @@ else print $form->selectDate($object->date_bordereau, 'datecreate_', '', '', '', "setdate"); print ''; print ''; - } - else - { + } else { print $object->date_bordereau ? dol_print_date($object->date_bordereau, 'day') : ' '; } @@ -699,9 +665,7 @@ else if ($paymentstatic->id) { print $paymentstatic->getNomUrl(1); - } - else - { + } else { print ' '; } print ''; @@ -711,9 +675,7 @@ else if ($accountlinestatic->rowid) { print $accountlinestatic->getNomUrl(1); - } - else - { + } else { print ' '; } print ''; @@ -736,9 +698,7 @@ else $i++; } - } - else - { + } else { print '
';
print '';
print '
| '.$langs->trans("Statistics").' | |
|---|---|
| '.$langs->trans("NbOfInvoiceToWithdraw").' | '; +print '|
| '.$langs->trans("NbOfInvoiceToPayByBankTransfer").' | '; print ''; -print ''; -print $bprev->NbFactureAPrelever(); +print ''; +print $bprev->nbOfInvoiceToPay('credit-transfer'); print ''; print ' |
| '.$langs->trans("AmountToWithdraw").' | '; print ''; -print price($bprev->SommeAPrelever(), '', '', 1, -1, -1, 'auto'); +print price($bprev->SommeAPrelever('credit-transfer'), '', '', 1, -1, -1, 'auto'); print ' |
'; @@ -100,11 +100,11 @@ $sql .= " ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql .= " , ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd"; $sql .= " WHERE s.rowid = f.fk_soc"; -$sql .= " AND f.entity IN (".getEntity('invoice').")"; +$sql .= " AND f.entity IN (".getEntity('supplier_invoice').")"; $sql .= " AND f.total_ttc > 0"; if (empty($conf->global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS)) { - $sql .= " AND f.fk_statut = ".Facture::STATUS_VALIDATED; + $sql .= " AND f.fk_statut = ".FactureFournisseur::STATUS_VALIDATED; } $sql .= " AND pfd.traite = 0 AND pfd.fk_facture_fourn = f.rowid"; if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id; @@ -158,15 +158,11 @@ if ($resql) print ''; $i++; } - } - else - { + } else { print '
"; -} -else -{ +} else { dol_print_error($db); } @@ -177,9 +173,11 @@ print '
';
/*
* Withdraw receipts
*/
+
$limit = 5;
$sql = "SELECT p.rowid, p.ref, p.amount, p.datec, p.statut";
$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
+$sql .= " WHERE p.type = 'bank-transfer'";
$sql .= " ORDER BY datec DESC";
$sql .= $db->plimit($limit);
@@ -198,31 +196,33 @@ if ($result)
print ''.$langs->trans("Status").' ';
print '';
- while ($i < min($num, $limit))
- {
- $obj = $db->fetch_object($result);
+ if ($num > 0) {
+ while ($i < min($num, $limit))
+ {
+ $obj = $db->fetch_object($result);
+ print '';
- print ' ';
+ print "";
+ $bprev->id = $obj->rowid;
+ $bprev->ref = $obj->ref;
+ $bprev->statut = $obj->statut;
+ print $bprev->getNomUrl(1);
+ print " \n";
+ print ''.dol_print_date($db->jdate($obj->datec), "dayhour")." \n";
+ print ''.price($obj->amount)." \n";
+ print ''.$bprev->getLibStatut(3)." \n";
- print "";
- $bprev->id = $obj->rowid;
- $bprev->ref = $obj->ref;
- $bprev->statut = $obj->statut;
- print $bprev->getNomUrl(1);
- print " \n";
- print ''.dol_print_date($db->jdate($obj->datec), "dayhour")." \n";
- print ''.price($obj->amount)." \n";
- print ''.$bprev->getLibStatut(3)." \n";
-
- print " \n";
- $i++;
+ print "\n";
+ $i++;
+ }
+ } else {
+ print ''.$langs->trans("None").'
"; $db->free($result); -} -else -{ +} else { dol_print_error($db); } diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php index c7c717e702b..608c9fe594d 100644 --- a/htdocs/compta/prelevement/bons.php +++ b/htdocs/compta/prelevement/bons.php @@ -38,6 +38,8 @@ $socid = GETPOST('socid', 'int'); if ($user->socid) $socid = $user->socid; $result = restrictedArea($user, 'prelevement', '', '', 'bons'); +$type = GETPOST('type', 'aZ09'); + $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit; $sortfield = GETPOST('sortfield', 'alpha'); $sortorder = GETPOST('sortorder', 'alpha'); @@ -57,6 +59,11 @@ $search_amount = GETPOST('search_amount', 'alpha'); $bon = new BonPrelevement($db); $hookmanager->initHooks(array('withdrawalsreceiptslist')); +$usercancreate = $user->rights->prelevement->bons->creer; +if ($type == 'bank-transfer') { + $usercancreate = $user->rights->paymentbybanktransfer->create; +} + /* * Actions @@ -78,6 +85,11 @@ llxHeader('', $langs->trans("WithdrawalsReceipts")); $sql = "SELECT p.rowid, p.ref, p.amount, p.statut, p.datec"; $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p"; $sql .= " WHERE p.entity IN (".getEntity('invoice').")"; +if ($type == 'bank-transfer') { + $sql .= " AND p.type = 'bank-transfer'"; +} else { + $sql .= " AND p.type = 'debit-order'"; +} if ($search_ref) $sql .= natural_search("p.ref", $search_ref); if ($search_amount) $sql .= natural_search("p.amount", $search_amount, 1); @@ -112,7 +124,7 @@ if ($result) $selectedfields = ''; $newcardbutton = ''; - if ($user->rights->prelevement->bons->creer) + if ($usercancreate) { $newcardbutton .= dolGetButtonTitle($langs->trans('NewStandingOrder'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/prelevement/create.php'); } @@ -127,7 +139,14 @@ if ($result) print ''; print ''; - print_barre_liste($langs->trans("WithdrawalsReceipts"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'generic', 0, $newcardbutton, '', $limit, 0, 0, 1); + $titlekey = "WithdrawalsReceipts"; + $title = $langs->trans("WithdrawalsReceipts"); + if ($type == 'bank-transfer') { + $titlekey = "BankTransferReceipts"; + $title = $langs->trans("BankTransferReceipts"); + } + + print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'generic', 0, $newcardbutton, '', $limit, 0, 0, 1); $moreforfilter = ''; @@ -146,7 +165,7 @@ if ($result) print ''; print '
'; - print '
'; print ''; print ''; @@ -294,7 +292,7 @@ if ($id > 0 || $ref) print $form->selectDate('', '', '', '', '', "infocredit", 1, 1); print ''; print ''; - print '
'.$langs->trans("ThisWillAlsoAddPaymentOnInvoice"); + print '
'.$langs->trans("ThisWillAlsoAddPaymentOnInvoice").'
';
print '';
print '';
print ''; @@ -407,15 +405,26 @@ if ($id > 0 || $ref) print '
'; $label .= ''.$langs->trans('Ref').': '.$this->ref; if (isset($this->statut)) { @@ -1232,6 +1197,9 @@ class BonPrelevement extends CommonObject } $url = DOL_URL_ROOT.'/compta/prelevement/card.php?id='.$this->id; + if ($this->type == 'bank-transfer') { + $url = DOL_URL_ROOT.'/compta/paymentbybanktransfer/card.php?id='.$this->id; + } if ($option != 'nolink') { @@ -1258,8 +1226,7 @@ class BonPrelevement extends CommonObject $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks if ($reshook > 0) $linkclose = $hookmanager->resPrint; */ - } - else $linkclose = ($morecss ? ' class="'.$morecss.'"' : ''); + } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : ''); $linkstart = ''; @@ -1272,7 +1239,7 @@ class BonPrelevement extends CommonObject //if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : ''); global $action, $hookmanager; - $hookmanager->initHooks(array('myobjectdao')); + $hookmanager->initHooks(array('banktransferdao')); $parameters = array('id'=>$this->id, 'getnomurl'=>$result); $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks if ($reshook > 0) $result = $hookmanager->resPrint; @@ -1300,9 +1267,7 @@ class BonPrelevement extends CommonObject if ($this->db->query($sql)) { return 0; - } - else - { + } else { return -1; } } @@ -1326,9 +1291,7 @@ class BonPrelevement extends CommonObject if ($this->db->query($sql)) { return 0; - } - else - { + } else { return -1; } } @@ -1358,9 +1321,7 @@ class BonPrelevement extends CommonObject if ($this->db->query($sql)) { $result = 0; - } - else - { + } else { $result = -1; dol_syslog(get_class($this)."::AddNotification Error $result"); } @@ -1463,9 +1424,7 @@ class BonPrelevement extends CommonObject $i++; } $nbtotalDrctDbtTxInf = $i; - } - else - { + } else { fputs($this->file, 'ERROR DEBITOR '.$sql.$CrLf); // DEBITOR = Customers $result = -2; } @@ -1474,9 +1433,7 @@ class BonPrelevement extends CommonObject if ($result != -2) { $fileEmetteurSection .= $this->EnregEmetteurSEPA($conf, $date_actu, $nbtotalDrctDbtTxInf, $this->total, $CrLf, $format); - } - else - { + } else { fputs($this->file, 'ERROR CREDITOR'.$CrLf); // CREDITOR = My company } @@ -1542,9 +1499,7 @@ class BonPrelevement extends CommonObject $this->total = $this->total + $obj->amount; $i++; } - } - else - { + } else { $result = -2; } @@ -1914,9 +1869,7 @@ class BonPrelevement extends CommonObject $XML_SEPA_INFO .= ' '.$CrLf; $XML_SEPA_INFO .= ' '.$CrLf; $XML_SEPA_INFO .= ' '.$CrLf; - } - else - { + } else { fputs($this->file, 'INCORRECT EMETTEUR '.$XML_SEPA_INFO.$CrLf); $result = -2; } diff --git a/htdocs/compta/prelevement/class/ligneprelevement.class.php b/htdocs/compta/prelevement/class/ligneprelevement.class.php index 88b612554df..78e364c1abc 100644 --- a/htdocs/compta/prelevement/class/ligneprelevement.class.php +++ b/htdocs/compta/prelevement/class/ligneprelevement.class.php @@ -66,14 +66,14 @@ class LignePrelevement /** * Recupere l'objet prelevement * - * @param int $rowid id de la facture a recuperer - * @return integer + * @param int $rowid Id de la facture a recuperer + * @return integer <0 if KO, >=0 if OK */ public function fetch($rowid) { global $conf; - $result = 0; + $error = 0; $sql = "SELECT pl.rowid, pl.amount, p.ref, p.rowid as bon_rowid"; $sql .= ", pl.statut, pl.fk_soc"; @@ -96,23 +96,19 @@ class LignePrelevement $this->statut = $obj->statut; $this->bon_ref = $obj->ref; $this->bon_rowid = $obj->bon_rowid; - } - else - { - $result++; + } else { + $error++; dol_syslog("LignePrelevement::Fetch rowid=$rowid numrows=0"); } $this->db->free($resql); - } - else - { - $result++; + } else { + $error++; dol_syslog("LignePrelevement::Fetch rowid=$rowid"); dol_syslog($this->db->error()); } - return $result; + return $error; } /** @@ -142,20 +138,17 @@ class LignePrelevement if ($mode == 0) { return $langs->trans($this->statuts[$status]); - } - elseif ($mode == 1) + } elseif ($mode == 1) { if ($status == 0) return img_picto($langs->trans($this->statuts[$status]), 'statut1').' '.$langs->trans($this->statuts[$status]); // Waiting elseif ($status == 2) return img_picto($langs->trans($this->statuts[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]); // Credited elseif ($status == 3) return img_picto($langs->trans($this->statuts[$status]), 'statut8').' '.$langs->trans($this->statuts[$status]); // Refused - } - elseif ($mode == 2) + } elseif ($mode == 2) { if ($status == 0) return img_picto($langs->trans($this->statuts[$status]), 'statut1'); elseif ($status == 2) return img_picto($langs->trans($this->statuts[$status]), 'statut6'); elseif ($status == 3) return img_picto($langs->trans($this->statuts[$status]), 'statut8'); - } - elseif ($mode == 3) + } elseif ($mode == 3) { if ($status == 0) return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts[$status]), 'statut1'); elseif ($status == 2) return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts[$status]), 'statut6'); diff --git a/htdocs/compta/prelevement/class/rejetprelevement.class.php b/htdocs/compta/prelevement/class/rejetprelevement.class.php index 8c033353637..8599987fb23 100644 --- a/htdocs/compta/prelevement/class/rejetprelevement.class.php +++ b/htdocs/compta/prelevement/class/rejetprelevement.class.php @@ -160,9 +160,7 @@ class RejetPrelevement { $error++; dol_syslog("RejetPrelevement::Create Error creation payment invoice ".$facs[$i][0]); - } - else - { + } else { $result = $pai->addPaymentToBank($user, 'payment', '(InvoiceRefused)', $bankaccount, '', ''); if ($result < 0) { @@ -191,9 +189,7 @@ class RejetPrelevement { dol_syslog("RejetPrelevement::Create Commit"); $this->db->commit(); - } - else - { + } else { dol_syslog("RejetPrelevement::Create Rollback"); $this->db->rollback(); } @@ -227,9 +223,7 @@ class RejetPrelevement $row = $this->db->fetch_row($resql); $userid = $row[0]; } - } - else - { + } else { dol_syslog("RejetPrelevement::_send_email Erreur lecture user"); } @@ -265,14 +259,10 @@ class RejetPrelevement if ($result) { dol_syslog("RejetPrelevement::_send_email email envoye"); - } - else - { + } else { dol_syslog("RejetPrelevement::_send_email Erreur envoi email"); } - } - else - { + } else { dol_syslog("RejetPrelevement::_send_email Userid invalide"); } } @@ -310,8 +300,7 @@ class RejetPrelevement { $row = $this->db->fetch_row($resql); if (!$amounts) $arr[$i] = $row[0]; - else - { + else { $arr[$i] = array( $row[0], $row[1] @@ -321,9 +310,7 @@ class RejetPrelevement } } $this->db->free($resql); - } - else - { + } else { dol_syslog("getListInvoices", LOG_ERR); } @@ -358,15 +345,11 @@ class RejetPrelevement $this->db->free($resql); return 0; - } - else - { + } else { dol_syslog("RejetPrelevement::Fetch Erreur rowid=$rowid numrows=0"); return -1; } - } - else - { + } else { dol_syslog("RejetPrelevement::Fetch Erreur rowid=$rowid"); return -2; } diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index 5306b6799b9..b52a657ae3f 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -43,6 +43,8 @@ $langs->loadLangs(array('banks', 'categories', 'withdrawals', 'companies', 'bill if ($user->socid) $socid = $user->socid; $result = restrictedArea($user, 'prelevement', '', '', 'bons'); +$type = GETPOST('type', 'aZ09'); + // Get supervariables $action = GETPOST('action', 'alpha'); $mode = GETPOST('mode', 'alpha') ?GETPOST('mode', 'alpha') : 'real'; @@ -83,8 +85,7 @@ if (empty($reshook)) if ($result < 0) { setEventMessages($bprev->error, $bprev->errors, 'errors'); - } - elseif ($result == 0) + } elseif ($result == 0) { $mesg = $langs->trans("NoInvoiceCouldBeWithdrawed", $format); setEventMessages($mesg, null, 'errors'); @@ -93,10 +94,11 @@ if (empty($reshook)) { $mesg .= ''.$val."
\n"; } - } - else - { + } else { setEventMessages($langs->trans("DirectDebitOrderCreated", $bprev->getNomUrl(1)), null); + + header("Location: ".DOL_URL_ROOT.'/compta/prelevement/card.php?id='.$bprev->id); + exit; } } } @@ -130,26 +132,34 @@ $h++; dol_fiche_head($head, $hselected, $langs->trans("StandingOrders"), 0, 'payment'); */ -print load_fiche_titre($langs->trans("NewStandingOrder")); +$title = $langs->trans("NewStandingOrder"); +if ($type == 'bank-transfer') { + $title = $langs->trans("NewPaymentByBankTransfer"); +} + +print load_fiche_titre($title); dol_fiche_head(); -$nb = $bprev->NbFactureAPrelever(); -$nb1 = $bprev->NbFactureAPrelever(1); -$nb11 = $bprev->NbFactureAPrelever(1, 1); -$pricetowithdraw = $bprev->SommeAPrelever(); -if ($nb < 0 || $nb1 < 0 || $nb11 < 0) +$nb = $bprev->nbOfInvoiceToPay($type); +$pricetowithdraw = $bprev->SommeAPrelever($type); +if ($nb < 0) { dol_print_error($bprev->error); } print '
| '.$langs->trans("NbOfInvoiceToWithdraw").' | '; +$title = $langs->trans("NbOfInvoiceToWithdraw"); +if ($type == 'bank-transfer') { + $title = $langs->trans("NbOfInvoiceToPayByBankTransfer"); +} + +print '|||||||||||
| '.$title.' | '; print ''; print $nb; print ' | ||||||||||
| '.$langs->trans("AmountToWithdraw").' | '; +print '|||||||||||
| '.$langs->trans("AmountTotal").' | '; print ''; print price($pricetowithdraw); print ' | '; @@ -160,7 +170,7 @@ print ''; if ($mesg) print $mesg; -print "||||||||||
| '; $invoicestatic->id = $obj->rowid; $invoicestatic->ref = $obj->ref; print $invoicestatic->getNomUrl(1, 'withdraw'); print ' | '; + // Thirdparty print ''; $thirdpartystatic->fetch($obj->socid); print $thirdpartystatic->getNomUrl(1, 'ban'); print ' | '; + // RIB print ''; - print $thirdpartystatic->display_rib(); - $bac->fetch(0, $obj->socid); + print $bac->iban.(($bac->iban && $bac->bic) ? ' / ' : '').$bac->bic; if ($bac->verif() <= 0) print img_warning('Error on default bank number for IBAN : '.$bac->error_message); print ' | '; + // RUM print ''; print $thirdpartystatic->display_rib('rum'); @@ -307,17 +354,13 @@ if ($resql) print ' | ||
| '.$langs->trans("None").' | |||||
\n"; -} -else -{ +} else { dol_print_error($db); } diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php index 181f71a678c..3bbc5c8b2bc 100644 --- a/htdocs/compta/prelevement/demandes.php +++ b/htdocs/compta/prelevement/demandes.php @@ -21,12 +21,13 @@ /** * \file htdocs/compta/prelevement/demandes.php * \ingroup prelevement - * \brief Page to list withdraw requests + * \brief Page to list bank transfer requests (debit order or payments of vendors) */ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/modules/modPrelevement.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; @@ -43,6 +44,8 @@ $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'myo $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print') +$type = GETPOST('type', 'aZ09'); + $search_facture = GETPOST('search_facture', 'alpha'); $search_societe = trim(GETPOST('search_societe', 'alpha')); @@ -85,13 +88,18 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x' * View */ -if (!$status) -{ - $title = $langs->trans("RequestStandingOrderToTreat"); -} -else -{ - $title = $langs->trans("RequestStandingOrderTreated"); +if ($type != 'bank-transfer') { + if (!$status) { + $title = $langs->trans("RequestStandingOrderToTreat"); + } else { + $title = $langs->trans("RequestStandingOrderTreated"); + } +} else { + if (!$status) { + $title = $langs->trans("RequestPaymentsByBankTransferToTreat"); + } else { + $title = $langs->trans("RequestPaymentsByBankTransferTreated"); + } } llxHeader('', $title); @@ -105,7 +113,11 @@ $sql = "SELECT f.ref, f.rowid, f.total_ttc,"; $sql .= " s.nom as name, s.rowid as socid,"; $sql .= " pfd.date_demande as date_demande,"; $sql .= " pfd.fk_user_demande"; -$sql .= " FROM ".MAIN_DB_PREFIX."facture as f,"; +if ($type != 'bank-transfer') { + $sql .= " FROM ".MAIN_DB_PREFIX."facture as f,"; +} else { + $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f,"; +} $sql .= " ".MAIN_DB_PREFIX."societe as s,"; $sql .= " ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd"; if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -120,7 +132,11 @@ if (empty($conf->global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS)) { $sql .= " AND f.fk_statut = ".Facture::STATUS_VALIDATED; } -$sql .= " AND pfd.fk_facture = f.rowid"; +if ($type != 'bank-transfer') { + $sql .= " AND pfd.fk_facture = f.rowid"; +} else { + $sql .= " AND pfd.fk_facture_fourn = f.rowid"; +} if ($search_facture) $sql .= natural_search("f.ref", $search_facture); if ($search_societe) $sql .= natural_search("s.nom", $search_societe); $sql .= $db->order($sortfield, $sortorder); @@ -142,9 +158,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords) { $num = $nbtotalofrecords; -} -else -{ +} else { $sql .= $db->plimit($limit + 1, $offset); $resql = $db->query($sql); @@ -160,6 +174,9 @@ else $newcardbutton = ''.$langs->trans("Back").''; +if ($type == 'bank-transfer') { + $newcardbutton = ''.$langs->trans("Back").''; +} print '
'; @@ -158,15 +158,11 @@ if ($resql) print '
"; -} -else -{ +} else { dol_print_error($db); } @@ -180,6 +176,7 @@ print '
';
$limit = 5;
$sql = "SELECT p.rowid, p.ref, p.amount, p.datec, p.statut";
$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
+$sql .= " WHERE p.type = 'debit-order'";
$sql .= " ORDER BY datec DESC";
$sql .= $db->plimit($limit);
@@ -198,31 +195,34 @@ if ($result)
print ''.$langs->trans("Status").' ';
print '';
- while ($i < min($num, $limit))
- {
- $obj = $db->fetch_object($result);
+ if ($num > 0) {
+ while ($i < min($num, $limit))
+ {
+ $obj = $db->fetch_object($result);
- print '';
+ print ' ';
- print "";
- $bprev->id = $obj->rowid;
- $bprev->ref = $obj->ref;
- $bprev->statut = $obj->statut;
- print $bprev->getNomUrl(1);
- print " \n";
- print ''.dol_print_date($db->jdate($obj->datec), "dayhour")." \n";
- print ''.price($obj->amount)." \n";
- print ''.$bprev->getLibStatut(3)." \n";
+ print "";
+ $bprev->id = $obj->rowid;
+ $bprev->ref = $obj->ref;
+ $bprev->statut = $obj->statut;
+ print $bprev->getNomUrl(1);
+ print " \n";
+ print ''.dol_print_date($db->jdate($obj->datec), "dayhour")." \n";
+ print ''.price($obj->amount)." \n";
+ print ''.$bprev->getLibStatut(3)." \n";
- print " \n";
- $i++;
+ print "\n";
+ $i++;
+ }
+ } else {
+ print ''.$langs->trans("None").'
"; $db->free($result); -} -else -{ +} else { dol_print_error($db); } diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php index 9169f71a377..ae146522f39 100644 --- a/htdocs/compta/prelevement/line.php +++ b/htdocs/compta/prelevement/line.php @@ -43,6 +43,8 @@ $action = GETPOST('action', 'alpha'); $id = GETPOST('id', 'int'); $socid = GETPOST('socid', 'int'); +$type = GETPOST('type', 'aZ09'); + $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit; $sortorder = GETPOST('sortorder', 'alpha'); $sortfield = GETPOST('sortfield', 'alpha'); @@ -73,9 +75,7 @@ if ($action == 'confirm_rejet') { $error++; setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors'); - } - - elseif ($daterej > dol_now()) + } elseif ($daterej > dol_now()) { $error++; $langs->load("error"); @@ -102,14 +102,10 @@ if ($action == 'confirm_rejet') header("Location: line.php?id=".$id); exit; } - } - else - { + } else { $action = "rejet"; } - } - else - { + } else { header("Location: line.php?id=".$id); exit; } @@ -122,11 +118,18 @@ if ($action == 'confirm_rejet') $invoicestatic = new Facture($db); -llxHeader('', $langs->trans("StandingOrder")); +$title = $langs->trans("WithdrawalsLine"); +if ($type == 'bank-transfer') { + $title = $langs->trans("CreditTransferLine"); +} + +llxHeader('', $title); + +$head = array(); $h = 0; $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/line.php?id='.$id; -$head[$h][1] = $langs->trans("StandingOrder"); +$head[$h][1] = $title; $hselected = $h; $h++; @@ -134,20 +137,24 @@ if ($id) { $lipre = new LignePrelevement($db); - if ($lipre->fetch($id) == 0) + if ($lipre->fetch($id) >= 0) { $bon = new BonPrelevement($db); $bon->fetch($lipre->bon_rowid); - dol_fiche_head($head, $hselected, $langs->trans("StandingOrder")); + dol_fiche_head($head, $hselected, $title); - print '
| '.$langs->trans("WithdrawalsReceipts").' | '; + print ' |
| '.$langs->trans("Ref").' | '; + print $id.' |
| '.$langs->trans("WithdrawalsReceipts").' | '; print $bon->getNomUrl(1).' |
| '.$langs->trans("Date").' | '.dol_print_date($bon->datec, 'day').' |
| '.$langs->trans("Amount").' | '.price($lipre->amount).' |
| '.$langs->trans("Status").' | '.$lipre->LibStatut($lipre->statut, 1).' |
| '.$langs->trans("Date").' | '.dol_print_date($bon->datec, 'day').' |
| '.$langs->trans("Amount").' | '.price($lipre->amount).' |
| '.$langs->trans("Status").' | '.$lipre->LibStatut($lipre->statut, 1).' |
| '.$langs->trans("RefusedReason").' | '.$rej->motif.' |
| '.$langs->trans("RefusedData").' | '; + print ' |
| '.$langs->trans("RefusedReason").' | '.$rej->motif.' |
| '.$langs->trans("RefusedData").' | '; if ($rej->date_rejet == 0) { /* Historique pour certaines install */ print $langs->trans("Unknown"); - } - else - { + } else { print dol_print_date($rej->date_rejet, 'day'); } print ' |
| '.$langs->trans("RefusedInvoicing").' | '.$rej->invoicing.' |
| '.$resf.' | |
| '.$langs->trans("RefusedInvoicing").' | '.$rej->invoicing.' |
| '.$resf.' |
| '; - print $line->LibStatut($obj->statut, 2).' '; - print ''; + print ' | '; + print $line->LibStatut($obj->statut, 2).' '; + print ''; + print substr('000000'.$obj->rowid, -6)." | "; - print substr('000000'.$obj->rowid, -6).""; + print ''.$obj->nom." | \n"; - print ''.stripslashes($obj->nom)." | \n"; + print ''.$rej->motifs[$obj->motif].' | '; - print ''.$rej->motifs[$obj->motif].' | '; - print "
| '.$langs->trans("None").' | |||||
'; -print load_fiche_titre($langs->trans("WithdrawStatistics"), '', ''); +print load_fiche_titre($langs->trans("ByStatus"), '', ''); $ligne = new LignePrelevement($db); @@ -80,6 +92,11 @@ $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl"; $sql .= ", ".MAIN_DB_PREFIX."prelevement_bons as pb"; $sql .= " WHERE pl.fk_prelevement_bons = pb.rowid"; $sql .= " AND pb.entity = ".$conf->entity; +if ($type == 'bank-transfer') { + $sql .= " AND pb.type = 'bank-transfer'"; +} else { + $sql .= " AND pb.type = 'debit-order'"; +} $sql .= " GROUP BY pl.statut"; $resql = $db->query($sql); @@ -125,9 +142,7 @@ if ($resql) print '
'; -print load_fiche_titre($langs->trans("WithdrawRejectStatistics"), '', ''); +print load_fiche_titre($langs->trans("Rejects"), '', ''); // Define total and nbtotal @@ -147,6 +162,11 @@ $sql .= ", ".MAIN_DB_PREFIX."prelevement_bons as pb"; $sql .= " WHERE pl.fk_prelevement_bons = pb.rowid"; $sql .= " AND pb.entity = ".$conf->entity; $sql .= " AND pl.statut = 3"; +if ($type == 'bank-transfer') { + $sql .= " AND pb.type = 'bank-transfer'"; +} else { + $sql .= " AND pb.type = 'debit-order'"; +} $resql = $db->query($sql); if ($resql) { @@ -164,6 +184,7 @@ if ($resql) /* * Stats sur les rejets */ + $sql = "SELECT sum(pl.amount), count(pl.amount) as cc, pr.motif"; $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl"; $sql .= ", ".MAIN_DB_PREFIX."prelevement_bons as pb"; @@ -172,6 +193,11 @@ $sql .= " WHERE pl.fk_prelevement_bons = pb.rowid"; $sql .= " AND pb.entity = ".$conf->entity; $sql .= " AND pl.statut = 3"; $sql .= " AND pr.fk_prelevement_lignes = pl.rowid"; +if ($type == 'bank-transfer') { + $sql .= " AND pb.type = 'bank-transfer'"; +} else { + $sql .= " AND pb.type = 'debit-order'"; +} $sql .= " GROUP BY pr.motif"; $sql .= " ORDER BY cc DESC"; @@ -219,9 +245,7 @@ if ($resql) print '
'.$langs->trans("RulesResultDue"); if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= "
".$langs->trans("DepositsAreNotIncluded"); - else $description .= "
".$langs->trans("DepositsAreIncluded"); + else $description .= "
".$langs->trans("DepositsAreIncluded"); $builddate = dol_now(); //$exportlink=$langs->trans("NotYetAvailable"); -} -elseif ($modecompta == "RECETTES-DEPENSES") { +} elseif ($modecompta == "RECETTES-DEPENSES") { $name = $langs->trans("ReportInOut").', '.$langs->trans("ByYear"); $calcmode = $langs->trans("CalcModeEngagement"); $calcmode .= '
('.$langs->trans("SeeReportInDueDebtMode", '', '').')'; @@ -146,8 +144,7 @@ elseif ($modecompta == "RECETTES-DEPENSES") { $description .= '
'.$langs->trans("RulesResultInOut"); $builddate = dol_now(); //$exportlink=$langs->trans("NotYetAvailable"); -} -elseif ($modecompta == "BOOKKEEPING") +} elseif ($modecompta == "BOOKKEEPING") { $name = $langs->trans("ReportInOut").', '.$langs->trans("ByYear"); $calcmode = $langs->trans("CalcModeBookkeeping"); @@ -191,8 +188,7 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod else $sql .= " AND f.type IN (0,1,2,3,5)"; if (!empty($date_start) && !empty($date_end)) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'"; - } - elseif ($modecompta == "RECETTES-DEPENSES") + } elseif ($modecompta == "RECETTES-DEPENSES") { /* * Liste des paiements (les anciens paiements ne sont pas vus par cette requete car, sur les @@ -228,12 +224,10 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod $i++; } $db->free($result); - } - else { + } else { dol_print_error($db); } -} -elseif ($modecompta == "BOOKKEEPING") +} elseif ($modecompta == "BOOKKEEPING") { // Nothing from this table } @@ -274,17 +268,14 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod $i++; } - } - else { + } else { dol_print_error($db); } - } - elseif ($modecompta == "RECETTES-DEPENSES") + } elseif ($modecompta == "RECETTES-DEPENSES") { // Nothing from this table } -} -elseif ($modecompta == "BOOKKEEPING") +} elseif ($modecompta == "BOOKKEEPING") { // Nothing from this table } @@ -307,8 +298,7 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod else $sql .= " AND f.type IN (0,1,2,3)"; if (!empty($date_start) && !empty($date_end)) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'"; - } - elseif ($modecompta == "RECETTES-DEPENSES") + } elseif ($modecompta == "RECETTES-DEPENSES") { $sql = "SELECT sum(pf.amount) as amount_ttc, date_format(p.datep,'%Y-%m') as dm"; $sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn as p"; @@ -343,12 +333,10 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod $i++; } $db->free($result); - } - else { + } else { dol_print_error($db); } -} -elseif ($modecompta == "BOOKKEEPING") +} elseif ($modecompta == "BOOKKEEPING") { // Nothing from this table } @@ -429,8 +417,7 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom } else { dol_print_error($db); } - } - elseif ($modecompta == "RECETTES-DEPENSES") + } elseif ($modecompta == "RECETTES-DEPENSES") { // TVA really already paid $sql = "SELECT sum(t.amount) as amount, date_format(t.datev,'%Y-%m') as dm"; @@ -493,8 +480,7 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom dol_print_error($db); } } -} -elseif ($modecompta == "BOOKKEEPING") +} elseif ($modecompta == "BOOKKEEPING") { // Nothing from this table } @@ -516,8 +502,7 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom $sql .= " AND c.deductible = 0"; if (!empty($date_start) && !empty($date_end)) $sql .= " AND cs.date_ech >= '".$db->idate($date_start)."' AND cs.date_ech <= '".$db->idate($date_end)."'"; - } - elseif ($modecompta == "RECETTES-DEPENSES") + } elseif ($modecompta == "RECETTES-DEPENSES") { $sql = "SELECT c.libelle as nom, date_format(p.datep,'%Y-%m') as dm, sum(p.amount) as amount"; $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c"; @@ -554,8 +539,7 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom } else { dol_print_error($db); } -} -elseif ($modecompta == "BOOKKEEPING") +} elseif ($modecompta == "BOOKKEEPING") { // Nothing from this table } @@ -578,8 +562,7 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom $sql .= " AND c.deductible = 1"; if (!empty($date_start) && !empty($date_end)) $sql .= " AND cs.date_ech >= '".$db->idate($date_start)."' AND cs.date_ech <= '".$db->idate($date_end)."'"; - } - elseif ($modecompta == "RECETTES-DEPENSES") + } elseif ($modecompta == "RECETTES-DEPENSES") { $sql = "SELECT c.libelle as nom, date_format(p.datep,'%Y-%m') as dm, sum(p.amount) as amount"; $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c"; @@ -616,8 +599,7 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom } else { dol_print_error($db); } -} -elseif ($modecompta == "BOOKKEEPING") +} elseif ($modecompta == "BOOKKEEPING") { // Nothing from this table } @@ -664,8 +646,7 @@ if (!empty($conf->salaries->enabled) && ($modecompta == 'CREANCES-DETTES' || $mo } else { dol_print_error($db); } -} -elseif ($modecompta == "BOOKKEEPING") +} elseif ($modecompta == "BOOKKEEPING") { // Nothing from this table } @@ -723,13 +704,10 @@ if (!empty($conf->expensereport->enabled) && ($modecompta == 'CREANCES-DETTES' | $decaiss_ttc[$obj->dm] += $obj->amount_ttc; } } - } - else - { + } else { dol_print_error($db); } -} -elseif ($modecompta == 'BOOKKEEPING') { +} elseif ($modecompta == 'BOOKKEEPING') { // Nothing from this table } @@ -785,13 +763,10 @@ if (!empty($conf->don->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom $i++; } } - } - else - { + } else { dol_print_error($db); } -} -elseif ($modecompta == 'BOOKKEEPING') { +} elseif ($modecompta == 'BOOKKEEPING') { // Nothing from this table } @@ -825,9 +800,7 @@ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->ba $i++; } } - } - else - { + } else { dol_print_error($db); } @@ -855,9 +828,7 @@ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->ba $i++; } } - } - else - { + } else { dol_print_error($db); } } @@ -893,9 +864,7 @@ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && !empty($conf->loan $i++; } } - } - else - { + } else { dol_print_error($db); } } @@ -960,9 +929,7 @@ if (!empty($conf->accounting->enabled) && ($modecompta == 'BOOKKEEPING')) $i++; } } - } - else - { + } else { dol_print_error($db); } } @@ -1041,9 +1008,7 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++) if (!isset($totsorties[$annee])) $totsorties[$annee] = 0; $totsorties[$annee] += $decaiss[$case]; } - } - else - { + } else { if (isset($decaiss_ttc[$case]) && $decaiss_ttc[$case] != 0) { print ''.price(price2num($decaiss_ttc[$case], 'MT')).''; @@ -1062,9 +1027,7 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++) if (!isset($totentrees[$annee])) $totentrees[$annee] = 0; $totentrees[$annee] += $encaiss[$case]; } - } - else - { + } else { if (isset($encaiss_ttc[$case])) { print ''.price(price2num($encaiss_ttc[$case], 'MT')).''; diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php index 66adea3371f..48cb8b1154e 100644 --- a/htdocs/compta/resultat/result.php +++ b/htdocs/compta/resultat/result.php @@ -90,8 +90,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end $month_end = $month_start - 1; if ($month_end < 1) $month_end = 12; else $year_end++; - } - else $month_end = $month_start; + } else $month_end = $month_start; $date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false); } if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); } @@ -178,11 +177,10 @@ if ($modecompta == "CREANCES-DETTES") //$periodlink=''.img_previous().' '.img_next().''; $description = $langs->trans("RulesResultDue"); if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded"); - else $description .= $langs->trans("DepositsAreIncluded"); + else $description .= $langs->trans("DepositsAreIncluded"); $builddate = dol_now(); //$exportlink=$langs->trans("NotYetAvailable"); -} -elseif ($modecompta == "RECETTES-DEPENSES") { +} elseif ($modecompta == "RECETTES-DEPENSES") { $name = $langs->trans("AnnualByAccountInputOutputMode"); $calcmode = $langs->trans("CalcModeEngagement"); $calcmode .= '
('.$langs->trans("SeeReportInDueDebtMode", '', '').')'; @@ -192,8 +190,7 @@ elseif ($modecompta == "RECETTES-DEPENSES") { $description = $langs->trans("RulesResultInOut"); $builddate = dol_now(); //$exportlink=$langs->trans("NotYetAvailable"); -} -elseif ($modecompta == "BOOKKEEPING") +} elseif ($modecompta == "BOOKKEEPING") { $name = $langs->trans("ReportInOut").', '.$langs->trans("ByPersonalizedAccountGroups"); $calcmode = $langs->trans("CalcModeBookkeeping"); @@ -248,13 +245,11 @@ if ($modecompta == 'CREANCES-DETTES') { //if (! empty($date_start) && ! empty($date_end)) // $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'"; -} -elseif ($modecompta == "RECETTES-DEPENSES") +} elseif ($modecompta == "RECETTES-DEPENSES") { //if (! empty($date_start) && ! empty($date_end)) // $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'"; -} -elseif ($modecompta == "BOOKKEEPING") +} elseif ($modecompta == "BOOKKEEPING") { // Get array of all report groups that are active $cats = $AccCat->getCats(); // WARNING: Computed groups must be after group they include @@ -375,7 +370,7 @@ elseif ($modecompta == "BOOKKEEPING") print "
';
print ''."\n";
@@ -313,9 +309,7 @@ if ($resql)
if ($obj->periode)
{
print 'jdate($obj->periode)).'">'.dol_print_date($db->jdate($obj->periode), 'day').'';
- }
- else
- {
+ } else {
print ' ';
}
print "\n";
@@ -345,9 +339,7 @@ if ($resql)
print '';
}
print '';
-}
-else
-{
+} else {
dol_print_error($db);
}
diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index 5cfa5df06ed..fc1f66d5e2c 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -92,9 +92,7 @@ if ($mode != 'sconly')
{
$center = ($year ? ''.img_previous($langs->trans("Previous"), 'class="valignbottom"')." ".$langs->trans("Year").' '.$year.' '.img_next($langs->trans("Next"), 'class="valignbottom"')."" : "");
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'title_accountancy', 0, '', '', $limit, 1);
-}
-else
-{
+} else {
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'title_accountancy', 0, '', '', $limit);
}
@@ -208,9 +206,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
print '
';
@@ -287,9 +283,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
print "";
$db->free($result);
- }
- else
- {
+ } else {
dol_print_error($db);
}
}
@@ -300,19 +294,15 @@ if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
{
$j = 1;
$numlt = 3;
-}
-elseif ($mysoc->localtax1_assuj == "1")
+} elseif ($mysoc->localtax1_assuj == "1")
{
$j = 1;
$numlt = 2;
-}
-elseif ($mysoc->localtax2_assuj == "1")
+} elseif ($mysoc->localtax2_assuj == "1")
{
$j = 2;
$numlt = 3;
-}
-else
-{
+} else {
$j = 0;
$numlt = 0;
}
@@ -388,9 +378,7 @@ while ($j < $numlt)
print "";
$db->free($result);
- }
- else
- {
+ } else {
dol_print_error($db);
}
}
@@ -472,9 +460,7 @@ if (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))
$db->free($result);
print "
"; - } - else - { + } else { dol_print_error($db); } } diff --git a/htdocs/compta/stats/byratecountry.php b/htdocs/compta/stats/byratecountry.php index acd58f90217..ee859965552 100644 --- a/htdocs/compta/stats/byratecountry.php +++ b/htdocs/compta/stats/byratecountry.php @@ -77,9 +77,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end else $year_end++; } $date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false); - } - else - { + } else { if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); } if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); } if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); } @@ -209,8 +207,7 @@ if ($modecompta == "CREANCES-DETTES") { } $builddate = dol_now(); -} -elseif ($modecompta == "RECETTES-DEPENSES") +} elseif ($modecompta == "RECETTES-DEPENSES") { $name = $langs->trans("TurnoverCollected").', '.$langs->trans("ByVatRate"); $calcmode = $langs->trans("CalcModeEngagement"); @@ -220,11 +217,9 @@ elseif ($modecompta == "RECETTES-DEPENSES") $description .= $langs->trans("DepositsAreIncluded"); $builddate = dol_now(); -} -elseif ($modecompta == "BOOKKEEPING") +} elseif ($modecompta == "BOOKKEEPING") { -} -elseif ($modecompta == "BOOKKEEPINGCOLLECTED") +} elseif ($modecompta == "BOOKKEEPINGCOLLECTED") { } $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0); @@ -275,7 +270,9 @@ if ($modecompta == 'CREANCES-DETTES') { $sql .= " AND f.type IN (0,1,2,3,5)"; } $sql .= " AND f.entity IN (".getEntity('invoice', 0).")"; - $sql .= " GROUP BY fd.tva_tx,fd.product_type, cc.label "; + $sql .= " GROUP BY fd.tva_tx,fd.product_type, cc.label, cc.code "; + $sql .= " ORDER BY country, product_type, vatrate"; + dol_syslog("htdocs/compta/tva/index.php sql=".$sql, LOG_DEBUG); $resql = $db->query($sql); @@ -356,7 +353,8 @@ if ($modecompta == 'CREANCES-DETTES') { $sql .= " AND ff.type IN (0,1,2,3,5)"; } $sql2 .= " AND ff.entity IN (".getEntity("facture_fourn", 0).")"; - $sql2 .= " GROUP BY ffd.tva_tx, ffd.product_type, cc.label"; + $sql2 .= " GROUP BY ffd.tva_tx, ffd.product_type, cc.label, cc.code "; + $sql2 .= " ORDER BY country, product_type, vatrate"; //print $sql2; dol_syslog("htdocs/compta/tva/index.php sql=".$sql, LOG_DEBUG); diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php index 5831467ce63..ab2c1dcadb1 100644 --- a/htdocs/compta/stats/cabyprodserv.php +++ b/htdocs/compta/stats/cabyprodserv.php @@ -103,9 +103,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end else $year_end++; } $date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false); - } - else - { + } else { if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); } if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); } if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); } @@ -181,8 +179,7 @@ if ($modecompta == "CREANCES-DETTES") { } $builddate = dol_now(); -} -elseif ($modecompta == "RECETTES-DEPENSES") +} elseif ($modecompta == "RECETTES-DEPENSES") { $name = $langs->trans("TurnoverCollected").', '.$langs->trans("ByProductsAndServices"); $calcmode = $langs->trans("CalcModeEngagement"); @@ -192,11 +189,9 @@ elseif ($modecompta == "RECETTES-DEPENSES") $description .= $langs->trans("DepositsAreIncluded"); $builddate = dol_now(); -} -elseif ($modecompta == "BOOKKEEPING") +} elseif ($modecompta == "BOOKKEEPING") { -} -elseif ($modecompta == "BOOKKEEPINGCOLLECTED") +} elseif ($modecompta == "BOOKKEEPINGCOLLECTED") { } @@ -232,8 +227,7 @@ if ($modecompta == 'CREANCES-DETTES') if ($selected_cat === -2) // Without any category { $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product"; - } - elseif ($selected_cat) // Into a specific category + } elseif ($selected_cat) // Into a specific category { $sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_product as cp"; } @@ -255,8 +249,7 @@ if ($modecompta == 'CREANCES-DETTES') if ($selected_cat === -2) // Without any category { $sql .= " AND cp.fk_product is null"; - } - elseif ($selected_cat) { // Into a specific category + } elseif ($selected_cat) { // Into a specific category $sql .= " AND (c.rowid = ".$selected_cat; if ($subcat) $sql .= " OR c.fk_parent = ".$selected_cat; $sql .= ")"; diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php index 4d4f56a1354..8b6caa89a8f 100644 --- a/htdocs/compta/stats/cabyuser.php +++ b/htdocs/compta/stats/cabyuser.php @@ -96,9 +96,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); } if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); } if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); } -} -else -{ +} else { // TODO We define q } // $date_start and $date_end are defined. We force $year_start and $nbofyear @@ -154,11 +152,10 @@ if ($modecompta == "CREANCES-DETTES") { //$calcmode.='
('.$langs->trans("SeeReportInInputOutputMode",'','').')'; $description = $langs->trans("RulesCADue"); if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded"); - else $description .= $langs->trans("DepositsAreIncluded"); + else $description .= $langs->trans("DepositsAreIncluded"); $builddate = dol_now(); //$exportlink=$langs->trans("NotYetAvailable"); -} -elseif ($modecompta == "RECETTES-DEPENSES") +} elseif ($modecompta == "RECETTES-DEPENSES") { $name = $langs->trans("TurnoverCollected").', '.$langs->trans("ByUserAuthorOfInvoice"); $calcmode = $langs->trans("CalcModeEngagement"); @@ -167,12 +164,10 @@ elseif ($modecompta == "RECETTES-DEPENSES") $description .= $langs->trans("DepositsAreIncluded"); $builddate = dol_now(); //$exportlink=$langs->trans("NotYetAvailable"); -} -elseif ($modecompta == "BOOKKEEPING") +} elseif ($modecompta == "BOOKKEEPING") { // TODO -} -elseif ($modecompta == "BOOKKEEPINGCOLLECTED") +} elseif ($modecompta == "BOOKKEEPINGCOLLECTED") { // TODO } @@ -396,8 +391,7 @@ if (count($amount)) { } else { //print ''; } - } - elseif ($modecompta == 'CREANCES-DETTES') { + } elseif ($modecompta == 'CREANCES-DETTES') { if ($key > 0) { print ''; } else { @@ -416,8 +410,7 @@ if (count($amount)) { } else { //print ''; } - } - elseif ($modecompta == 'CREANCES-DETTES') { + } elseif ($modecompta == 'CREANCES-DETTES') { if ($key > 0) { print ''; } else { @@ -431,8 +424,7 @@ if (count($amount)) { } else { //print ''; } - } - elseif ($modecompta == 'CREANCES-DETTES') { + } elseif ($modecompta == 'CREANCES-DETTES') { if ($key > 0) { print ''; } diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php index bec20998cfa..ab71b147b50 100644 --- a/htdocs/compta/stats/casoc.php +++ b/htdocs/compta/stats/casoc.php @@ -113,9 +113,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); } if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); } if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); } -} -else -{ +} else { // TODO We define q } @@ -180,11 +178,10 @@ if ($modecompta == "CREANCES-DETTES") //$calcmode.='
('.$langs->trans("SeeReportInInputOutputMode",'','').')'; $description = $langs->trans("RulesCADue"); if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded"); - else $description .= $langs->trans("DepositsAreIncluded"); + else $description .= $langs->trans("DepositsAreIncluded"); $builddate = dol_now(); //$exportlink=$langs->trans("NotYetAvailable"); -} -elseif ($modecompta == "RECETTES-DEPENSES") +} elseif ($modecompta == "RECETTES-DEPENSES") { $name = $langs->trans("TurnoverCollected").', '.$langs->trans("ByThirdParties"); $calcmode = $langs->trans("CalcModeEngagement"); @@ -193,11 +190,9 @@ elseif ($modecompta == "RECETTES-DEPENSES") $description .= $langs->trans("DepositsAreIncluded"); $builddate = dol_now(); //$exportlink=$langs->trans("NotYetAvailable"); -} -elseif ($modecompta == "BOOKKEEPING") +} elseif ($modecompta == "BOOKKEEPING") { -} -elseif ($modecompta == "BOOKKEEPINGCOLLECTED") +} elseif ($modecompta == "BOOKKEEPINGCOLLECTED") { } $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0); @@ -223,8 +218,7 @@ if ($modecompta == 'CREANCES-DETTES') { if ($selected_cat === -2) // Without any category { $sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc"; - } - elseif ($selected_cat) // Into a specific category + } elseif ($selected_cat) // Into a specific category { $sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs"; } @@ -241,8 +235,7 @@ if ($modecompta == 'CREANCES-DETTES') { if ($selected_cat === -2) // Without any category { $sql .= " AND cs.fk_soc is null"; - } - elseif ($selected_cat) { // Into a specific category + } elseif ($selected_cat) { // Into a specific category $sql .= " AND (c.rowid = ".$db->escape($selected_cat); if ($subcat) $sql .= " OR c.fk_parent = ".$db->escape($selected_cat); $sql .= ")"; @@ -261,8 +254,7 @@ if ($modecompta == 'CREANCES-DETTES') { if ($selected_cat === -2) // Without any category { $sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc"; - } - elseif ($selected_cat) // Into a specific category + } elseif ($selected_cat) // Into a specific category { $sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs"; } @@ -275,8 +267,7 @@ if ($modecompta == 'CREANCES-DETTES') { if ($selected_cat === -2) // Without any category { $sql .= " AND cs.fk_soc is null"; - } - elseif ($selected_cat) { // Into a specific category + } elseif ($selected_cat) { // Into a specific category $sql .= " AND (c.rowid = ".$selected_cat; if ($subcat) $sql .= " OR c.fk_parent = ".$selected_cat; $sql .= ")"; diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php index d1a64e218d2..796ce2cc6a6 100644 --- a/htdocs/compta/stats/index.php +++ b/htdocs/compta/stats/index.php @@ -73,8 +73,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end } $month_end = $month_start - 1; if ($month_end < 1) $month_end = 12; - } - else $month_end = $month_start; + } else $month_end = $month_start; $date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false); } if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); } @@ -124,11 +123,10 @@ if ($modecompta == "CREANCES-DETTES") $periodlink = ($year_start ? "".img_previous()." ".img_next()."" : ""); $description = $langs->trans("RulesCADue"); if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded"); - else $description .= $langs->trans("DepositsAreIncluded"); + else $description .= $langs->trans("DepositsAreIncluded"); $builddate = dol_now(); //$exportlink=$langs->trans("NotYetAvailable"); -} -elseif ($modecompta == "RECETTES-DEPENSES") +} elseif ($modecompta == "RECETTES-DEPENSES") { $name = $langs->trans("TurnoverCollected"); $calcmode = $langs->trans("CalcModeEngagement"); @@ -140,8 +138,7 @@ elseif ($modecompta == "RECETTES-DEPENSES") $description .= $langs->trans("DepositsAreIncluded"); $builddate = dol_now(); //$exportlink=$langs->trans("NotYetAvailable"); -} -elseif ($modecompta == "BOOKKEEPING") +} elseif ($modecompta == "BOOKKEEPING") { $name = $langs->trans("Turnover"); $calcmode = $langs->trans("CalcModeBookkeeping"); @@ -173,8 +170,7 @@ if ($modecompta == 'CREANCES-DETTES') else $sql .= " AND f.type IN (0,1,2,3,5)"; $sql .= " AND f.entity IN (".getEntity('invoice').")"; if ($socid) $sql .= " AND f.fk_soc = ".$socid; -} -elseif ($modecompta == "RECETTES-DEPENSES") +} elseif ($modecompta == "RECETTES-DEPENSES") { /* * Liste des paiements (les anciens paiements ne sont pas vus par cette requete car, sur les @@ -188,8 +184,7 @@ elseif ($modecompta == "RECETTES-DEPENSES") $sql .= " AND pf.fk_facture = f.rowid"; $sql .= " AND f.entity IN (".getEntity('invoice').")"; if ($socid) $sql .= " AND f.fk_soc = ".$socid; -} -elseif ($modecompta == "BOOKKEEPING") +} elseif ($modecompta == "BOOKKEEPING") { $sql = "SELECT date_format(b.doc_date,'%Y-%m') as dm, sum(b.credit) as amount_ttc"; $sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b, ".MAIN_DB_PREFIX."accounting_journal as aj"; @@ -223,8 +218,7 @@ if ($result) $i++; } $db->free($result); -} -else { +} else { dol_print_error($db); } @@ -259,9 +253,7 @@ if ($modecompta == 'RECETTES-DEPENSES') } $i++; } - } - else - { + } else { dol_print_error($db); } } @@ -339,11 +331,8 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++) { $now_show_delta = 1; // On a trouve le premier mois de la premiere annee generant du chiffre. print ''.price($cum_ht[$case], 1).''; - } - else - { - if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; } - else { print ' '; } + } else { + if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; } else { print ' '; } } print ""; } @@ -356,11 +345,8 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++) if ($modecompta != 'BOOKKEEPING') print ''; print price($cum[$case], 1); if ($modecompta != 'BOOKKEEPING') print ''; - } - else - { - if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; } - else { print ' '; } + } else { + if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; } else { print ' '; } } print ""; @@ -390,12 +376,9 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++) { print '- ';
}
- }
- else
- {
+ } else {
print '';
- if ($minyearmonth <= $case && $case <= $maxyearmonth) { print '-'; }
- else { print ' '; }
+ if ($minyearmonth <= $case && $case <= $maxyearmonth) { print '-'; } else { print ' '; }
print ' ';
}
@@ -483,9 +466,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
if ($total_ht[$annee] || ($annee >= $minyear && $annee <= max($nowyear, $maxyear)))
{
print ''.($total_ht[$annee] ?price($total_ht[$annee]) : "0")." ";
- }
- else
- {
+ } else {
print ' ';
}
}
@@ -494,9 +475,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
if ($total[$annee] || ($annee >= $minyear && $annee <= max($nowyear, $maxyear)))
{
print ''.($total[$annee] ?price($total[$annee]) : "0")." ";
- }
- else
- {
+ } else {
print ' ';
}
@@ -519,12 +498,9 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
{
print '+0% ';
}
- }
- else
- {
+ } else {
print '';
- if ($total[$annee] || ($minyear <= $annee && $annee <= max($nowyear, $maxyear))) { print '-'; }
- else { print ' '; }
+ if ($total[$annee] || ($minyear <= $annee && $annee <= max($nowyear, $maxyear))) { print '-'; } else { print ' '; }
print ' ';
}
diff --git a/htdocs/compta/stats/supplier_turnover.php b/htdocs/compta/stats/supplier_turnover.php
index 3ff41f4d114..c257d5d1f73 100644
--- a/htdocs/compta/stats/supplier_turnover.php
+++ b/htdocs/compta/stats/supplier_turnover.php
@@ -69,8 +69,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
}
$month_end = $month_start - 1;
if ($month_end < 1) $month_end = 12;
- }
- else $month_end = $month_start;
+ } else $month_end = $month_start;
$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
}
if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
@@ -121,8 +120,7 @@ if ($modecompta == "CREANCES-DETTES")
$description = $langs->trans("RulesPurchaseTurnoverDue");
$builddate = dol_now();
//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
{
$name = $langs->trans("PurchaseTurnoverCollected");
$calcmode = $langs->trans("CalcModeEngagement");
@@ -133,8 +131,7 @@ elseif ($modecompta == "RECETTES-DEPENSES")
$description = $langs->trans("RulesPurchaseTurnoverIn");
$builddate = dol_now();
//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
{
$name = $langs->trans("PurchaseTurnover");
$calcmode = $langs->trans("CalcModeBookkeeping");
@@ -165,8 +162,7 @@ if ($modecompta == 'CREANCES-DETTES')
$sql .= " AND f.type IN (0,2)";
$sql .= " AND f.entity IN (".getEntity('supplier_invoice').")";
if ($socid) $sql .= " AND f.fk_soc = ".$socid;
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
{
$sql = "SELECT date_format(p.datep,'%Y-%m') as dm, sum(pf.amount) as amount_ttc";
$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
@@ -176,8 +172,7 @@ elseif ($modecompta == "RECETTES-DEPENSES")
$sql .= " AND pf.fk_facturefourn = f.rowid";
$sql .= " AND f.entity IN (".getEntity('supplier_invoice').")";
if ($socid) $sql .= " AND f.fk_soc = ".$socid;
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
{
$sql = "SELECT date_format(b.doc_date,'%Y-%m') as dm, sum(b.debit) as amount_ttc";
$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b, ".MAIN_DB_PREFIX."accounting_journal as aj";
@@ -211,8 +206,7 @@ if ($result)
$i++;
}
$db->free($result);
-}
-else {
+} else {
dol_print_error($db);
}
@@ -289,11 +283,8 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
{
$now_show_delta = 1; // On a trouve le premier mois de la premiere annee generant du chiffre.
print ''.price($cum_ht[$case], 1).'';
- }
- else
- {
- if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; }
- else { print ' '; }
+ } else {
+ if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; } else { print ' '; }
}
print "";
}
@@ -306,11 +297,8 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
if ($modecompta != 'BOOKKEEPING') print '';
print price($cum[$case], 1);
if ($modecompta != 'BOOKKEEPING') print '';
- }
- else
- {
- if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; }
- else { print ' '; }
+ } else {
+ if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; } else { print ' '; }
}
print "";
@@ -340,12 +328,9 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
{
print '- ';
}
- }
- else
- {
+ } else {
print '';
- if ($minyearmonth <= $case && $case <= $maxyearmonth) { print '-'; }
- else { print ' '; }
+ if ($minyearmonth <= $case && $case <= $maxyearmonth) { print '-'; } else { print ' '; }
print ' ';
}
@@ -368,9 +353,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
if ($total_ht[$annee] || ($annee >= $minyear && $annee <= max($nowyear, $maxyear)))
{
print ''.($total_ht[$annee] ?price($total_ht[$annee]) : "0")." ";
- }
- else
- {
+ } else {
print ' ';
}
}
@@ -379,9 +362,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
if ($total[$annee] || ($annee >= $minyear && $annee <= max($nowyear, $maxyear)))
{
print ''.($total[$annee] ?price($total[$annee]) : "0")." ";
- }
- else
- {
+ } else {
print ' ';
}
@@ -404,12 +385,9 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
{
print '+0% ';
}
- }
- else
- {
+ } else {
print '';
- if ($total[$annee] || ($minyear <= $annee && $annee <= max($nowyear, $maxyear))) { print '-'; }
- else { print ' '; }
+ if ($total[$annee] || ($minyear <= $annee && $annee <= max($nowyear, $maxyear))) { print '-'; } else { print ' '; }
print ' ';
}
diff --git a/htdocs/compta/stats/supplier_turnover_by_prodserv.php b/htdocs/compta/stats/supplier_turnover_by_prodserv.php
index fafb967ace1..5911daaba45 100644
--- a/htdocs/compta/stats/supplier_turnover_by_prodserv.php
+++ b/htdocs/compta/stats/supplier_turnover_by_prodserv.php
@@ -100,9 +100,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
else $year_end++;
}
$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
- }
- else
- {
+ } else {
if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
@@ -172,8 +170,7 @@ if ($modecompta == "CREANCES-DETTES") {
$description = $langs->trans("RulesPurchaseTurnoverDue");
$builddate = dol_now();
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
{
$name = $langs->trans("PurchaseTurnoverCollected").', '.$langs->trans("ByProductsAndServices");
$calcmode = $langs->trans("CalcModeEngagement");
@@ -181,11 +178,9 @@ elseif ($modecompta == "RECETTES-DEPENSES")
$description = $langs->trans("RulesPurchaseTurnoverIn");
$builddate = dol_now();
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
{
-}
-elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
+} elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
{
}
@@ -221,8 +216,7 @@ if ($modecompta == 'CREANCES-DETTES')
if ($selected_cat === -2) // Without any category
{
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product";
- }
- elseif ($selected_cat) // Into a specific category
+ } elseif ($selected_cat) // Into a specific category
{
$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_product as cp";
}
@@ -240,8 +234,7 @@ if ($modecompta == 'CREANCES-DETTES')
if ($selected_cat === -2) // Without any category
{
$sql .= " AND cp.fk_product is null";
- }
- elseif ($selected_cat) { // Into a specific category
+ } elseif ($selected_cat) { // Into a specific category
$sql .= " AND (c.rowid = ".$selected_cat;
if ($subcat) $sql .= " OR c.fk_parent = ".$selected_cat;
$sql .= ")";
diff --git a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
index fcae12f744b..60d65049800 100644
--- a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
+++ b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
@@ -107,9 +107,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
-}
-else
-{
+} else {
// TODO We define q
}
@@ -175,8 +173,7 @@ if ($modecompta == "CREANCES-DETTES")
$description = $langs->trans("RulesPurchaseTurnoverDue");
$builddate = dol_now();
//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
{
$name = $langs->trans("PurchaseTurnoverCollected").', '.$langs->trans("ByThirdParties");
$calcmode = $langs->trans("CalcModeEngagement");
@@ -184,11 +181,9 @@ elseif ($modecompta == "RECETTES-DEPENSES")
$description = $langs->trans("RulesPurchaseTurnoverIn");
$builddate = dol_now();
//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
{
-}
-elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
+} elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
{
}
$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
@@ -215,8 +210,7 @@ if ($modecompta == 'CREANCES-DETTES') {
if ($selected_cat === -2) // Without any category
{
$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
- }
- elseif ($selected_cat) // Into a specific category
+ } elseif ($selected_cat) // Into a specific category
{
$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
}
@@ -229,8 +223,7 @@ if ($modecompta == 'CREANCES-DETTES') {
if ($selected_cat === -2) // Without any category
{
$sql .= " AND cs.fk_soc is null";
- }
- elseif ($selected_cat) { // Into a specific category
+ } elseif ($selected_cat) { // Into a specific category
$sql .= " AND (c.rowid = ".$db->escape($selected_cat);
if ($subcat) $sql .= " OR c.fk_parent = ".$db->escape($selected_cat);
$sql .= ")";
@@ -245,8 +238,7 @@ if ($modecompta == 'CREANCES-DETTES') {
if ($selected_cat === -2) // Without any category
{
$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
- }
- elseif ($selected_cat) // Into a specific category
+ } elseif ($selected_cat) // Into a specific category
{
$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
}
@@ -259,8 +251,7 @@ if ($modecompta == 'CREANCES-DETTES') {
if ($selected_cat === -2) // Without any category
{
$sql .= " AND cs.fk_soc is null";
- }
- elseif ($selected_cat) { // Into a specific category
+ } elseif ($selected_cat) { // Into a specific category
$sql .= " AND (c.rowid = ".$selected_cat;
if ($subcat) $sql .= " OR c.fk_parent = ".$selected_cat;
$sql .= ")";
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index 658c9353a00..6fa22885dee 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -131,9 +131,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
$db->commit();
header("Location: list.php");
exit;
- }
- else
- {
+ } else {
$db->rollback();
setEventMessages($object->error, $object->errors, 'errors');
$action = "create";
@@ -166,22 +164,16 @@ if ($action == 'delete')
$db->commit();
header("Location: ".DOL_URL_ROOT.'/compta/tva/list.php');
exit;
- }
- else
- {
+ } else {
$object->error = $accountline->error;
$db->rollback();
setEventMessages($object->error, $object->errors, 'errors');
}
- }
- else
- {
+ } else {
$db->rollback();
setEventMessages($object->error, $object->errors, 'errors');
}
- }
- else
- {
+ } else {
$mesg = 'Error try do delete a line linked to a conciliated bank transaction';
setEventMessages($mesg, null, 'errors');
}
@@ -388,14 +380,10 @@ if ($id)
if (!empty($user->rights->tax->charges->supprimer))
{
print '';
- }
- else
- {
+ } else {
print '';
}
- }
- else
- {
+ } else {
print '';
}
print "
";
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index c01408f3c9a..3274a3eaebd 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -150,15 +150,11 @@ class Tva extends CommonObject
{
$this->db->commit();
return $this->id;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
- }
- else
- {
+ } else {
$this->error = "Error ".$this->db->lasterror();
$this->db->rollback();
return -1;
@@ -224,9 +220,7 @@ class Tva extends CommonObject
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
@@ -293,9 +287,7 @@ class Tva extends CommonObject
$this->db->free($resql);
return 1;
- }
- else
- {
+ } else {
$this->error = "Error ".$this->db->lasterror();
return -1;
}
@@ -404,15 +396,11 @@ class Tva extends CommonObject
$ret = $obj->amount;
$this->db->free($result);
return $ret;
- }
- else
- {
+ } else {
$this->db->free($result);
return 0;
}
- }
- else
- {
+ } else {
print $this->db->lasterror();
return -1;
}
@@ -445,15 +433,11 @@ class Tva extends CommonObject
$ret = $obj->total_tva;
$this->db->free($result);
return $ret;
- }
- else
- {
+ } else {
$this->db->free($result);
return 0;
}
- }
- else
- {
+ } else {
print $this->db->lasterror();
return -1;
}
@@ -488,15 +472,11 @@ class Tva extends CommonObject
$ret = $obj->amount;
$this->db->free($result);
return $ret;
- }
- else
- {
+ } else {
$this->db->free($result);
return 0;
}
- }
- else
- {
+ } else {
print $this->db->lasterror();
return -1;
}
@@ -612,9 +592,7 @@ class Tva extends CommonObject
if ($bank_line_id > 0)
{
$this->update_fk_bank($bank_line_id);
- }
- else
- {
+ } else {
$this->error = $acc->error;
$ok = 0;
}
@@ -632,21 +610,15 @@ class Tva extends CommonObject
{
$this->db->commit();
return $this->id;
- }
- else
- {
+ } else {
$this->db->rollback();
return -3;
}
- }
- else
- {
+ } else {
$this->db->rollback();
return -2;
}
- }
- else
- {
+ } else {
$this->error = $this->db->error();
$this->db->rollback();
return -1;
@@ -669,9 +641,7 @@ class Tva extends CommonObject
if ($result)
{
return 1;
- }
- else
- {
+ } else {
dol_print_error($this->db);
return -1;
}
@@ -710,8 +680,7 @@ class Tva extends CommonObject
}
$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
- }
- else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+ } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
$linkstart = '';
@@ -752,9 +721,7 @@ class Tva extends CommonObject
$this->db->free($resql);
return $amount;
- }
- else
- {
+ } else {
return -1;
}
}
@@ -799,9 +766,7 @@ class Tva extends CommonObject
}
$this->db->free($result);
- }
- else
- {
+ } else {
dol_print_error($this->db);
}
}
diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php
index bcedba7a074..52466e33d84 100644
--- a/htdocs/compta/tva/clients.php
+++ b/htdocs/compta/tva/clients.php
@@ -66,14 +66,11 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
$q = GETPOST("q", "int");
if (empty($q))
{
- if (GETPOST("month", 'int')) { $date_start = dol_get_first_day($year_start, GETPOST("month", 'int'), false); $date_end = dol_get_last_day($year_start, GETPOST("month", 'int'), false); }
- else
- {
+ if (GETPOST("month", 'int')) { $date_start = dol_get_first_day($year_start, GETPOST("month", 'int'), false); $date_end = dol_get_last_day($year_start, GETPOST("month", 'int'), false); } else {
if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) { // quaterly vat, we take last past complete quarter
$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -3 - (($current_date['mon'] - $conf->global->SOCIETE_FISCAL_MONTH_START) % 3), 'm');
$date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
- }
- elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) { // yearly vat
+ } elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) { // yearly vat
if ($current_date['mon'] < $conf->global->SOCIETE_FISCAL_MONTH_START) {
if (($conf->global->SOCIETE_FISCAL_MONTH_START - $current_date['mon']) > 6) { // If period started from less than 6 years, we show past year
$year_start--;
@@ -85,15 +82,12 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
}
$date_start = dol_get_first_day($year_start, $conf->global->SOCIETE_FISCAL_MONTH_START, false);
$date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
- }
- elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) { // monthly vat, we take last past complete month
+ } elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) { // monthly vat, we take last past complete month
$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -1, 'm');
$date_end = dol_time_plus_duree($date_start, 1, 'm') - 1;
}
}
- }
- else
- {
+ } else {
if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
@@ -321,9 +315,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
'vat' =>$x_paye[$my_paye_thirdpartyid]['vat_list'][$id],
'link' =>$expensereport->getNomUrl(1)
);
- }
- else
- {
+ } else {
$invoice_supplier->id = $x_paye[$my_paye_thirdpartyid]['facid'][$id];
$invoice_supplier->ref = $x_paye[$my_paye_thirdpartyid]['facnum'][$id];
$invoice_supplier->type = $x_paye[$my_paye_thirdpartyid]['type'][$id];
@@ -693,9 +685,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
|| ($type == 1 && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
{
print $langs->trans("NA");
- }
- else
- {
+ } else {
if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) {
$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
}
diff --git a/htdocs/compta/tva/document.php b/htdocs/compta/tva/document.php
index fabaf1ee705..cb26304cde5 100644
--- a/htdocs/compta/tva/document.php
+++ b/htdocs/compta/tva/document.php
@@ -148,9 +148,7 @@ if ($object->id)
$permtoedit = $user->rights->fournisseur->facture->creer;
$param = '&id='.$object->id;
include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
print $langs->trans("ErrorUnknown");
}
diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index 0a785aa78cd..43db8353c4c 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -57,14 +57,11 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
$q = GETPOST("q", "int");
if (empty($q))
{
- if (GETPOST("month", "int")) { $date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false); }
- else
- {
+ if (GETPOST("month", "int")) { $date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false); } else {
if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) { // quaterly vat, we take last past complete quarter
$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -3 - (($current_date['mon'] - $conf->global->SOCIETE_FISCAL_MONTH_START) % 3), 'm');
$date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
- }
- elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) { // yearly vat
+ } elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) { // yearly vat
if ($current_date['mon'] < $conf->global->SOCIETE_FISCAL_MONTH_START) {
if (($conf->global->SOCIETE_FISCAL_MONTH_START - $current_date['mon']) > 6) { // If period started from less than 6 years, we show past year
$year_start--;
@@ -76,15 +73,12 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
}
$date_start = dol_get_first_day($year_start, $conf->global->SOCIETE_FISCAL_MONTH_START, false);
$date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
- }
- elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) { // monthly vat, we take last past complete month
+ } elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) { // monthly vat, we take last past complete month
$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -1, 'm');
$date_end = dol_time_plus_duree($date_start, 1, 'm') - 1;
}
}
- }
- else
- {
+ } else {
if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
@@ -176,9 +170,7 @@ function pt($db, $sql, $date)
$amountpaid = 0;
$previousmode = '';
$previousmonth = '';
- }
- else
- {
+ } else {
$previousmode = $obj->mode;
$previousmonth = $obj->dm;
}
@@ -207,8 +199,7 @@ function pt($db, $sql, $date)
print "";
$db->free($result);
- }
- else {
+ } else {
dol_print_error($db);
}
}
@@ -371,9 +362,7 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000) // $mc
'vat' =>$x_paye[$my_paye_rate]['vat_list'][$id],
//'link' =>$expensereport->getNomUrl(1)
);
- }
- else
- {
+ } else {
//$invoice_supplier->id=$x_paye[$my_paye_rate]['facid'][$id];
//$invoice_supplier->ref=$x_paye[$my_paye_rate]['facnum'][$id];
//$invoice_supplier->type=$x_paye[$my_paye_rate]['type'][$id];
diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index 003a7eabcad..5b09da5305c 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -72,9 +72,7 @@ if (empty($_REQUEST['typeid']))
$part = explode(':', $val);
if ($part[0] == 't.fk_typepayment') $typeid = $part[1];
}
-}
-else
-{
+} else {
$typeid = $_REQUEST['typeid'];
}
@@ -228,9 +226,7 @@ if ($result)
if ($obj->payment_code <> '')
{
$type = '| '; print ' | '.price($totalpaye)." | "; print ""; - } - else - { + } else { dol_print_error($db); } print '
"; - } - else - { + } else { dol_print_error($db); } } diff --git a/htdocs/compta/stats/byratecountry.php b/htdocs/compta/stats/byratecountry.php index acd58f90217..ee859965552 100644 --- a/htdocs/compta/stats/byratecountry.php +++ b/htdocs/compta/stats/byratecountry.php @@ -77,9 +77,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end else $year_end++; } $date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false); - } - else - { + } else { if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); } if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); } if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); } @@ -209,8 +207,7 @@ if ($modecompta == "CREANCES-DETTES") { } $builddate = dol_now(); -} -elseif ($modecompta == "RECETTES-DEPENSES") +} elseif ($modecompta == "RECETTES-DEPENSES") { $name = $langs->trans("TurnoverCollected").', '.$langs->trans("ByVatRate"); $calcmode = $langs->trans("CalcModeEngagement"); @@ -220,11 +217,9 @@ elseif ($modecompta == "RECETTES-DEPENSES") $description .= $langs->trans("DepositsAreIncluded"); $builddate = dol_now(); -} -elseif ($modecompta == "BOOKKEEPING") +} elseif ($modecompta == "BOOKKEEPING") { -} -elseif ($modecompta == "BOOKKEEPINGCOLLECTED") +} elseif ($modecompta == "BOOKKEEPINGCOLLECTED") { } $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0); @@ -275,7 +270,9 @@ if ($modecompta == 'CREANCES-DETTES') { $sql .= " AND f.type IN (0,1,2,3,5)"; } $sql .= " AND f.entity IN (".getEntity('invoice', 0).")"; - $sql .= " GROUP BY fd.tva_tx,fd.product_type, cc.label "; + $sql .= " GROUP BY fd.tva_tx,fd.product_type, cc.label, cc.code "; + $sql .= " ORDER BY country, product_type, vatrate"; + dol_syslog("htdocs/compta/tva/index.php sql=".$sql, LOG_DEBUG); $resql = $db->query($sql); @@ -356,7 +353,8 @@ if ($modecompta == 'CREANCES-DETTES') { $sql .= " AND ff.type IN (0,1,2,3,5)"; } $sql2 .= " AND ff.entity IN (".getEntity("facture_fourn", 0).")"; - $sql2 .= " GROUP BY ffd.tva_tx, ffd.product_type, cc.label"; + $sql2 .= " GROUP BY ffd.tva_tx, ffd.product_type, cc.label, cc.code "; + $sql2 .= " ORDER BY country, product_type, vatrate"; //print $sql2; dol_syslog("htdocs/compta/tva/index.php sql=".$sql, LOG_DEBUG); diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php index 5831467ce63..ab2c1dcadb1 100644 --- a/htdocs/compta/stats/cabyprodserv.php +++ b/htdocs/compta/stats/cabyprodserv.php @@ -103,9 +103,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end else $year_end++; } $date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false); - } - else - { + } else { if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); } if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); } if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); } @@ -181,8 +179,7 @@ if ($modecompta == "CREANCES-DETTES") { } $builddate = dol_now(); -} -elseif ($modecompta == "RECETTES-DEPENSES") +} elseif ($modecompta == "RECETTES-DEPENSES") { $name = $langs->trans("TurnoverCollected").', '.$langs->trans("ByProductsAndServices"); $calcmode = $langs->trans("CalcModeEngagement"); @@ -192,11 +189,9 @@ elseif ($modecompta == "RECETTES-DEPENSES") $description .= $langs->trans("DepositsAreIncluded"); $builddate = dol_now(); -} -elseif ($modecompta == "BOOKKEEPING") +} elseif ($modecompta == "BOOKKEEPING") { -} -elseif ($modecompta == "BOOKKEEPINGCOLLECTED") +} elseif ($modecompta == "BOOKKEEPINGCOLLECTED") { } @@ -232,8 +227,7 @@ if ($modecompta == 'CREANCES-DETTES') if ($selected_cat === -2) // Without any category { $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product"; - } - elseif ($selected_cat) // Into a specific category + } elseif ($selected_cat) // Into a specific category { $sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_product as cp"; } @@ -255,8 +249,7 @@ if ($modecompta == 'CREANCES-DETTES') if ($selected_cat === -2) // Without any category { $sql .= " AND cp.fk_product is null"; - } - elseif ($selected_cat) { // Into a specific category + } elseif ($selected_cat) { // Into a specific category $sql .= " AND (c.rowid = ".$selected_cat; if ($subcat) $sql .= " OR c.fk_parent = ".$selected_cat; $sql .= ")"; diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php index 4d4f56a1354..8b6caa89a8f 100644 --- a/htdocs/compta/stats/cabyuser.php +++ b/htdocs/compta/stats/cabyuser.php @@ -96,9 +96,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); } if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); } if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); } -} -else -{ +} else { // TODO We define q } // $date_start and $date_end are defined. We force $year_start and $nbofyear @@ -154,11 +152,10 @@ if ($modecompta == "CREANCES-DETTES") { //$calcmode.='
('.$langs->trans("SeeReportInInputOutputMode",'','').')'; $description = $langs->trans("RulesCADue"); if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded"); - else $description .= $langs->trans("DepositsAreIncluded"); + else $description .= $langs->trans("DepositsAreIncluded"); $builddate = dol_now(); //$exportlink=$langs->trans("NotYetAvailable"); -} -elseif ($modecompta == "RECETTES-DEPENSES") +} elseif ($modecompta == "RECETTES-DEPENSES") { $name = $langs->trans("TurnoverCollected").', '.$langs->trans("ByUserAuthorOfInvoice"); $calcmode = $langs->trans("CalcModeEngagement"); @@ -167,12 +164,10 @@ elseif ($modecompta == "RECETTES-DEPENSES") $description .= $langs->trans("DepositsAreIncluded"); $builddate = dol_now(); //$exportlink=$langs->trans("NotYetAvailable"); -} -elseif ($modecompta == "BOOKKEEPING") +} elseif ($modecompta == "BOOKKEEPING") { // TODO -} -elseif ($modecompta == "BOOKKEEPINGCOLLECTED") +} elseif ($modecompta == "BOOKKEEPINGCOLLECTED") { // TODO } @@ -396,8 +391,7 @@ if (count($amount)) { } else { //print ''; } - } - elseif ($modecompta == 'CREANCES-DETTES') { + } elseif ($modecompta == 'CREANCES-DETTES') { if ($key > 0) { print ''; } else { @@ -416,8 +410,7 @@ if (count($amount)) { } else { //print ''; } - } - elseif ($modecompta == 'CREANCES-DETTES') { + } elseif ($modecompta == 'CREANCES-DETTES') { if ($key > 0) { print ''; } else { @@ -431,8 +424,7 @@ if (count($amount)) { } else { //print ''; } - } - elseif ($modecompta == 'CREANCES-DETTES') { + } elseif ($modecompta == 'CREANCES-DETTES') { if ($key > 0) { print ''; } diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php index bec20998cfa..ab71b147b50 100644 --- a/htdocs/compta/stats/casoc.php +++ b/htdocs/compta/stats/casoc.php @@ -113,9 +113,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); } if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); } if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); } -} -else -{ +} else { // TODO We define q } @@ -180,11 +178,10 @@ if ($modecompta == "CREANCES-DETTES") //$calcmode.='
('.$langs->trans("SeeReportInInputOutputMode",'','').')'; $description = $langs->trans("RulesCADue"); if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded"); - else $description .= $langs->trans("DepositsAreIncluded"); + else $description .= $langs->trans("DepositsAreIncluded"); $builddate = dol_now(); //$exportlink=$langs->trans("NotYetAvailable"); -} -elseif ($modecompta == "RECETTES-DEPENSES") +} elseif ($modecompta == "RECETTES-DEPENSES") { $name = $langs->trans("TurnoverCollected").', '.$langs->trans("ByThirdParties"); $calcmode = $langs->trans("CalcModeEngagement"); @@ -193,11 +190,9 @@ elseif ($modecompta == "RECETTES-DEPENSES") $description .= $langs->trans("DepositsAreIncluded"); $builddate = dol_now(); //$exportlink=$langs->trans("NotYetAvailable"); -} -elseif ($modecompta == "BOOKKEEPING") +} elseif ($modecompta == "BOOKKEEPING") { -} -elseif ($modecompta == "BOOKKEEPINGCOLLECTED") +} elseif ($modecompta == "BOOKKEEPINGCOLLECTED") { } $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0); @@ -223,8 +218,7 @@ if ($modecompta == 'CREANCES-DETTES') { if ($selected_cat === -2) // Without any category { $sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc"; - } - elseif ($selected_cat) // Into a specific category + } elseif ($selected_cat) // Into a specific category { $sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs"; } @@ -241,8 +235,7 @@ if ($modecompta == 'CREANCES-DETTES') { if ($selected_cat === -2) // Without any category { $sql .= " AND cs.fk_soc is null"; - } - elseif ($selected_cat) { // Into a specific category + } elseif ($selected_cat) { // Into a specific category $sql .= " AND (c.rowid = ".$db->escape($selected_cat); if ($subcat) $sql .= " OR c.fk_parent = ".$db->escape($selected_cat); $sql .= ")"; @@ -261,8 +254,7 @@ if ($modecompta == 'CREANCES-DETTES') { if ($selected_cat === -2) // Without any category { $sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc"; - } - elseif ($selected_cat) // Into a specific category + } elseif ($selected_cat) // Into a specific category { $sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs"; } @@ -275,8 +267,7 @@ if ($modecompta == 'CREANCES-DETTES') { if ($selected_cat === -2) // Without any category { $sql .= " AND cs.fk_soc is null"; - } - elseif ($selected_cat) { // Into a specific category + } elseif ($selected_cat) { // Into a specific category $sql .= " AND (c.rowid = ".$selected_cat; if ($subcat) $sql .= " OR c.fk_parent = ".$selected_cat; $sql .= ")"; diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php index d1a64e218d2..796ce2cc6a6 100644 --- a/htdocs/compta/stats/index.php +++ b/htdocs/compta/stats/index.php @@ -73,8 +73,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end } $month_end = $month_start - 1; if ($month_end < 1) $month_end = 12; - } - else $month_end = $month_start; + } else $month_end = $month_start; $date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false); } if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); } @@ -124,11 +123,10 @@ if ($modecompta == "CREANCES-DETTES") $periodlink = ($year_start ? "".img_previous()." ".img_next()."" : ""); $description = $langs->trans("RulesCADue"); if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded"); - else $description .= $langs->trans("DepositsAreIncluded"); + else $description .= $langs->trans("DepositsAreIncluded"); $builddate = dol_now(); //$exportlink=$langs->trans("NotYetAvailable"); -} -elseif ($modecompta == "RECETTES-DEPENSES") +} elseif ($modecompta == "RECETTES-DEPENSES") { $name = $langs->trans("TurnoverCollected"); $calcmode = $langs->trans("CalcModeEngagement"); @@ -140,8 +138,7 @@ elseif ($modecompta == "RECETTES-DEPENSES") $description .= $langs->trans("DepositsAreIncluded"); $builddate = dol_now(); //$exportlink=$langs->trans("NotYetAvailable"); -} -elseif ($modecompta == "BOOKKEEPING") +} elseif ($modecompta == "BOOKKEEPING") { $name = $langs->trans("Turnover"); $calcmode = $langs->trans("CalcModeBookkeeping"); @@ -173,8 +170,7 @@ if ($modecompta == 'CREANCES-DETTES') else $sql .= " AND f.type IN (0,1,2,3,5)"; $sql .= " AND f.entity IN (".getEntity('invoice').")"; if ($socid) $sql .= " AND f.fk_soc = ".$socid; -} -elseif ($modecompta == "RECETTES-DEPENSES") +} elseif ($modecompta == "RECETTES-DEPENSES") { /* * Liste des paiements (les anciens paiements ne sont pas vus par cette requete car, sur les @@ -188,8 +184,7 @@ elseif ($modecompta == "RECETTES-DEPENSES") $sql .= " AND pf.fk_facture = f.rowid"; $sql .= " AND f.entity IN (".getEntity('invoice').")"; if ($socid) $sql .= " AND f.fk_soc = ".$socid; -} -elseif ($modecompta == "BOOKKEEPING") +} elseif ($modecompta == "BOOKKEEPING") { $sql = "SELECT date_format(b.doc_date,'%Y-%m') as dm, sum(b.credit) as amount_ttc"; $sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b, ".MAIN_DB_PREFIX."accounting_journal as aj"; @@ -223,8 +218,7 @@ if ($result) $i++; } $db->free($result); -} -else { +} else { dol_print_error($db); } @@ -259,9 +253,7 @@ if ($modecompta == 'RECETTES-DEPENSES') } $i++; } - } - else - { + } else { dol_print_error($db); } } @@ -339,11 +331,8 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++) { $now_show_delta = 1; // On a trouve le premier mois de la premiere annee generant du chiffre. print ''.price($cum_ht[$case], 1).''; - } - else - { - if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; } - else { print ' '; } + } else { + if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; } else { print ' '; } } print ""; } @@ -356,11 +345,8 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++) if ($modecompta != 'BOOKKEEPING') print ''; print price($cum[$case], 1); if ($modecompta != 'BOOKKEEPING') print ''; - } - else - { - if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; } - else { print ' '; } + } else { + if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; } else { print ' '; } } print ""; @@ -390,12 +376,9 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++) { print '
'; - } - else - { + } else { print $objp->label ? $objp->label.'
' : ''; } @@ -1801,9 +1715,7 @@ else } $db->free($result); - } - else - { + } else { dol_print_error($db); } @@ -1873,9 +1785,7 @@ else if (empty($dateactend)) { setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateEndReal")), null, 'errors'); - } - else - { + } else { print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne', 'int')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment), $langs->trans("CloseService"), $langs->trans("ConfirmCloseService", dol_print_date($dateactend, "%A %d %B %Y")), "confirm_closeline", '', 0, 1); } print '
"; $db->free($resql); - } - else - { + } else { dol_print_error($db); } } @@ -383,9 +375,7 @@ if ($result) $db->free($result); print ""; -} -else -{ +} else { dol_print_error($db); } @@ -439,9 +429,7 @@ if ($resql) $productstatic->ref = $obj->pref; $productstatic->entity = $obj->pentity; print $productstatic->getNomUrl(1, '', 20); - } - else - { + } else { print ''.img_object($langs->trans("ShowService"), "service"); if ($obj->label) print ' '.dol_trunc($obj->label, 20).''; else print ' '.dol_trunc($obj->note, 20); @@ -462,9 +450,7 @@ if ($resql) $db->free(); print ""; -} -else -{ +} else { dol_print_error($db); } @@ -519,9 +505,7 @@ if ($resql) $productstatic->ref = $obj->pref; $productstatic->entity = $obj->pentity; print $productstatic->getNomUrl(1, '', 20); - } - else - { + } else { print ''.img_object($langs->trans("ShowService"), "service"); if ($obj->label) print ' '.dol_trunc($obj->label, 20).''; else print ' '.dol_trunc($obj->note, 20); @@ -541,9 +525,7 @@ if ($resql) $db->free(); print ""; -} -else -{ +} else { dol_print_error($db); } @@ -599,9 +581,7 @@ if ($resql) $productstatic->ref = $obj->pref; $productstatic->entity = $obj->pentity; print $productstatic->getNomUrl(1, '', 20); - } - else - { + } else { print ''.img_object($langs->trans("ShowService"), "service"); if ($obj->label) print ' '.dol_trunc($obj->label, 20).''; else print ' '.dol_trunc($obj->note, 20); @@ -621,9 +601,7 @@ if ($resql) $db->free(); print ""; -} -else -{ +} else { dol_print_error($db); } diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php index a7205730817..3627661c727 100644 --- a/htdocs/contrat/list.php +++ b/htdocs/contrat/list.php @@ -708,8 +708,7 @@ while ($i < min($num, $limit)) if ($nbofsalesrepresentative > 3) { // We print only number print $nbofsalesrepresentative; - } - elseif ($nbofsalesrepresentative > 0) + } elseif ($nbofsalesrepresentative > 0) { $userstatic = new User($db); $j = 0; @@ -731,9 +730,7 @@ while ($i < min($num, $limit)) } } //else print $langs->trans("NoSalesRepresentativeAffected"); - } - else - { + } else { print ' '; } print ''; diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php index 2b81ceff5fa..fd46b8eba98 100644 --- a/htdocs/contrat/services_list.php +++ b/htdocs/contrat/services_list.php @@ -98,14 +98,11 @@ if ($search_status != '') $tmp = explode('&', $search_status); $mode = $tmp[0]; if (empty($tmp[1])) $filter = ''; - else - { + else { if ($tmp[1] == 'filter=notexpired') $filter = 'notexpired'; if ($tmp[1] == 'filter=expired') $filter = 'expired'; } -} -else -{ +} else { $search_status = $mode; if ($filter == 'expired') $search_status .= '&filter=expired'; if ($filter == 'notexpired') $search_status .= '&filter=notexpired'; @@ -597,9 +594,7 @@ while ($i < min($num, $limit)) print $productstatic->getNomUrl(1, '', 24); print $obj->label ? ' - '.dol_trunc($obj->label, 16) : ''; if (!empty($obj->description) && !empty($conf->global->PRODUCT_DESC_IN_LIST)) print '
'.dol_nl2br($obj->description); - } - else - { + } else { if ($obj->type == 0) print img_object($obj->description, 'product').' '.dol_trunc($obj->description, 24); if ($obj->type == 1) print img_object($obj->description, 'service').' '.dol_trunc($obj->description, 24); } @@ -682,8 +677,7 @@ while ($i < min($num, $limit)) $warning_delay = $conf->contrat->services->expires->warning_delay / 3600 / 24; $textlate = $langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($warning_delay) >= 0 ? '+' : '').ceil($warning_delay).' '.$langs->trans("days"); print img_warning($textlate); - } - else print ' '; + } else print ' '; print ''; if (!$i) $totalarray['nbfield']++; } @@ -724,9 +718,7 @@ while ($i < min($num, $limit)) { // If contract is draft, we say line is also draft print $contractstatic->LibStatut(0, 5); - } - else - { + } else { print $staticcontratligne->LibStatut($obj->statut, 5, ($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < $now) ? 1 : 0); } print ''; diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php index 66ed09413ef..f9f10f636ca 100644 --- a/htdocs/core/actions_addupdatedelete.inc.php +++ b/htdocs/core/actions_addupdatedelete.inc.php @@ -40,8 +40,7 @@ if ($cancel) { header("Location: ".$backtopageforcancel); exit; - } - elseif (!empty($backtopage)) + } elseif (!empty($backtopage)) { header("Location: ".$backtopage); exit; @@ -57,8 +56,7 @@ if ($action == 'add' && !empty($permissiontoadd)) { if ($object->fields[$key]['type'] == 'duration') { if (GETPOST($key.'hour') == '' && GETPOST($key.'min') == '') continue; // The field was not submited to be edited - } - else { + } else { if (!GETPOSTISSET($key)) continue; // The field was not submited to be edited } // Ignore special fields @@ -106,17 +104,13 @@ if ($action == 'add' && !empty($permissiontoadd)) $urltogo = preg_replace('/--IDFORBACKTOPAGE--/', $object->id, $urltogo); // New method to autoselect project after a New on another form object creation header("Location: ".$urltogo); exit; - } - else - { + } else { // Creation KO if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors'); - else setEventMessages($object->error, null, 'errors'); + else setEventMessages($object->error, null, 'errors'); $action = 'create'; } - } - else - { + } else { $action = 'create'; } } @@ -129,15 +123,12 @@ if ($action == 'update' && !empty($permissiontoadd)) // Check if field was submited to be edited if ($object->fields[$key]['type'] == 'duration') { if (!GETPOSTISSET($key.'hour') || !GETPOSTISSET($key.'min')) continue; // The field was not submited to be edited - } - elseif ($object->fields[$key]['type'] == 'boolean') { + } elseif ($object->fields[$key]['type'] == 'boolean') { if (!GETPOSTISSET($key)) { $object->$key = 0; // use 0 instead null if the field is defined as not null continue; } - } - - else { + } else { if (!GETPOSTISSET($key)) continue; // The field was not submited to be edited } // Ignore special fields @@ -180,16 +171,12 @@ if ($action == 'update' && !empty($permissiontoadd)) if ($result > 0) { $action = 'view'; - } - else - { + } else { // Creation KO setEventMessages($object->error, $object->errors, 'errors'); $action = 'edit'; } - } - else - { + } else { $action = 'edit'; } } @@ -208,9 +195,7 @@ if ($action == "update_extras" && !empty($permissiontoadd)) { setEventMessages($langs->trans('RecordSaved'), null, 'mesgs'); $action = 'view'; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); $action = 'edit_extras'; } @@ -232,9 +217,7 @@ if ($action == 'confirm_delete' && !empty($permissiontodelete)) setEventMessages("RecordDeleted", null, 'mesgs'); header("Location: ".$backurlforlist); exit; - } - else - { + } else { if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors'); else setEventMessages($object->error, null, 'errors'); } @@ -269,9 +252,7 @@ if ($action == 'confirm_deleteline' && $confirm == 'yes' && !empty($permissionto setEventMessages($langs->trans('RecordDeleted'), null, 'mesgs'); header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id); exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } @@ -298,9 +279,7 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $permissiontoadd) $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); } - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } @@ -327,9 +306,7 @@ if ($action == 'confirm_close' && $confirm == 'yes' && $permissiontoadd) $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); } - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } @@ -341,9 +318,7 @@ if ($action == 'confirm_setdraft' && $confirm == 'yes' && $permissiontoadd) if ($result >= 0) { // Nothing else done - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } @@ -370,9 +345,7 @@ if ($action == 'confirm_reopen' && $confirm == 'yes' && $permissiontoadd) $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); } - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } @@ -383,9 +356,7 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && !empty($permissiontoadd)) if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers')) { setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors'); - } - else - { + } else { $objectutil = dol_clone($object, 1); // To avoid to denaturate loaded object when setting some properties for clone or if createFromClone modifies the object. We use native clone to keep this->db valid. //$objectutil->date = dol_mktime(12, 0, 0, GETPOST('newdatemonth', 'int'), GETPOST('newdateday', 'int'), GETPOST('newdateyear', 'int')); // ... @@ -397,9 +368,7 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && !empty($permissiontoadd)) else $newid = $result; header("Location: ".$_SERVER['PHP_SELF'].'?id='.$newid); // Open record of new object exit; - } - else - { + } else { setEventMessages($objectutil->error, $objectutil->errors, 'errors'); $action = ''; } diff --git a/htdocs/core/actions_builddoc.inc.php b/htdocs/core/actions_builddoc.inc.php index ce582040ac9..eb51796eccd 100644 --- a/htdocs/core/actions_builddoc.inc.php +++ b/htdocs/core/actions_builddoc.inc.php @@ -37,9 +37,7 @@ if ($action == 'builddoc' && $permissiontoadd) if (is_numeric(GETPOST('model', 'alpha'))) { $error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Model")); - } - else - { + } else { // Reload to get all modified line records and be ready for hooks $ret = $object->fetch($id); $ret = $object->fetch_thirdparty(); @@ -89,9 +87,7 @@ if ($action == 'builddoc' && $permissiontoadd) { setEventMessages($object->error, $object->errors, 'errors'); $action = ''; - } - else - { + } else { if (empty($donotredirect)) // This is set when include is done by bulk action "Bill Orders" { setEventMessages($langs->trans("FileGenerated"), null); @@ -134,8 +130,7 @@ if ($action == 'remove_file' && $permissiontoadd) header('Location: '.$urltoredirect); exit; - } - else { + } else { setEventMessages('BugFoundVarUploaddirnotDefined', null, 'errors'); } } diff --git a/htdocs/core/actions_comments.inc.php b/htdocs/core/actions_comments.inc.php index 07829999c10..c352f07f9f7 100644 --- a/htdocs/core/actions_comments.inc.php +++ b/htdocs/core/actions_comments.inc.php @@ -49,9 +49,7 @@ if ($action == 'addcomment') setEventMessages($langs->trans("CommentAdded"), null, 'mesgs'); header('Location: '.$varpage.'?id='.$id.($withproject ? '&withproject=1' : '')); exit; - } - else - { + } else { setEventMessages($comment->error, $comment->errors, 'errors'); $action = ''; } @@ -67,9 +65,7 @@ if ($action === 'updatecomment') setEventMessages($langs->trans("CommentAdded"), null, 'mesgs'); header('Location: '.$varpage.'?id='.$id.($withproject ? '&withproject=1#comment' : '')); exit; - } - else - { + } else { setEventMessages($comment->error, $comment->errors, 'errors'); $action = ''; } @@ -84,9 +80,7 @@ if ($action == 'deletecomment') setEventMessages($langs->trans("CommentDeleted"), null, 'mesgs'); header('Location: '.$varpage.'?id='.$id.($withproject ? '&withproject=1' : '')); exit; - } - else - { + } else { setEventMessages($comment->error, $comment->errors, 'errors'); $action = ''; } diff --git a/htdocs/core/actions_extrafields.inc.php b/htdocs/core/actions_extrafields.inc.php index bb5a7516fb2..46a6a31c202 100644 --- a/htdocs/core/actions_extrafields.inc.php +++ b/htdocs/core/actions_extrafields.inc.php @@ -122,9 +122,7 @@ if ($action == 'add') $mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne); $action = 'create'; } - } - else - { + } else { $error++; $langs->load("errors"); $mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne); @@ -149,9 +147,7 @@ if ($action == 'add') { $params['options'] = array($parameters=>null); } - } - else - { + } else { //Esle it's separated key/value and coma list foreach ($parameters_array as $param_ligne) { @@ -191,25 +187,19 @@ if ($action == 'add') setEventMessages($langs->trans('SetupSaved'), null, 'mesgs'); header("Location: ".$_SERVER["PHP_SELF"]); exit; - } - else - { + } else { $error++; $mesg = $extrafields->error; setEventMessages($mesg, null, 'errors'); } - } - else - { + } else { $error++; $langs->load("errors"); $mesg = $langs->trans("ErrorFieldCanNotContainSpecialNorUpperCharacters", $langs->transnoentities("AttributeCode")); setEventMessages($mesg, null, 'errors'); $action = 'create'; } - } - else - { + } else { setEventMessages($mesg, null, 'errors'); } } @@ -293,9 +283,7 @@ if ($action == 'update') $mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne); $action = 'edit'; } - } - else - { + } else { $error++; $langs->load("errors"); $mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne); @@ -319,9 +307,7 @@ if ($action == 'update') { $params['options'] = array($parameters=>null); } - } - else - { + } else { //Esle it's separated key/value and coma list foreach ($parameters_array as $param_ligne) { @@ -361,24 +347,18 @@ if ($action == 'update') setEventMessages($langs->trans('SetupSaved'), null, 'mesgs'); header("Location: ".$_SERVER["PHP_SELF"]); exit; - } - else - { + } else { $error++; $mesg = $extrafields->error; setEventMessages($mesg, null, 'errors'); } - } - else - { + } else { $error++; $langs->load("errors"); $mesg = $langs->trans("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities("AttributeCode")); setEventMessages($mesg, null, 'errors'); } - } - else - { + } else { setEventMessages($mesg, null, 'errors'); } } @@ -394,11 +374,8 @@ if ($action == 'delete') { header("Location: ".$_SERVER["PHP_SELF"]); exit; - } - else $mesg = $extrafields->error; - } - else - { + } else $mesg = $extrafields->error; + } else { $error++; $langs->load("errors"); $mesg = $langs->trans("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities("AttributeCode")); diff --git a/htdocs/core/actions_fetchobject.inc.php b/htdocs/core/actions_fetchobject.inc.php index 268d37d92d2..a77fc6e5ff6 100644 --- a/htdocs/core/actions_fetchobject.inc.php +++ b/htdocs/core/actions_fetchobject.inc.php @@ -37,17 +37,14 @@ if (($id > 0 || (!empty($ref) && !in_array($action, array('create', 'createtask' { $object->fetch_thirdparty(); $id = $object->id; - } - else - { + } else { if (empty($object->error) && !count($object->errors)) { if ($ret < 0) // if $ret == 0, it means not found. { setEventMessages('Fetch on object (type '.get_class($object).') return an error without filling $object->error nor $object->errors', null, 'errors'); } - } - else setEventMessages($object->error, $object->errors, 'errors'); + } else setEventMessages($object->error, $object->errors, 'errors'); $action = ''; } } diff --git a/htdocs/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php index 2542cf23268..ea55052f880 100644 --- a/htdocs/core/actions_linkedfiles.inc.php +++ b/htdocs/core/actions_linkedfiles.inc.php @@ -41,8 +41,7 @@ if (GETPOST('sendit', 'alpha') && !empty($conf->global->MAIN_UPLOAD_DOC)) $error++; if ($_FILES['userfile']['error'][$key] == 1 || $_FILES['userfile']['error'][$key] == 2) { setEventMessages($langs->trans('ErrorFileSizeTooLarge'), null, 'errors'); - } - else { + } else { setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("File")), null, 'errors'); } } @@ -58,15 +57,13 @@ if (GETPOST('sendit', 'alpha') && !empty($conf->global->MAIN_UPLOAD_DOC)) if (!empty($upload_dirold) && !empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) { $result = dol_add_file_process($upload_dirold, $allowoverwrite, 1, 'userfile', GETPOST('savingdocmask', 'alpha'), null, '', $generatethumbs); - } - elseif (!empty($upload_dir)) + } elseif (!empty($upload_dir)) { $result = dol_add_file_process($upload_dir, $allowoverwrite, 1, 'userfile', GETPOST('savingdocmask', 'alpha'), null, '', $generatethumbs); } } } -} -elseif (GETPOST('linkit', 'none') && !empty($conf->global->MAIN_UPLOAD_DOC)) +} elseif (GETPOST('linkit', 'none') && !empty($conf->global->MAIN_UPLOAD_DOC)) { $link = GETPOST('link', 'alpha'); if ($link) @@ -86,8 +83,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes') if (GETPOST('section', 'alpha')) { // For a delete from the ECM module, upload_dir is ECM root dir and urlfile contains relative path from upload_dir $file = $upload_dir.(preg_match('/\/$/', $upload_dir) ? '' : '/').$urlfile; - } - else // For a delete from the file manager into another module, or from documents pages, upload_dir contains already path to file from module dir, so we clean path into urlfile. + } else // For a delete from the file manager into another module, or from documents pages, upload_dir contains already path to file from module dir, so we clean path into urlfile. { $urlfile = basename($urlfile); $file = $upload_dir.(preg_match('/\/$/', $upload_dir) ? '' : '/').$urlfile; @@ -124,8 +120,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes') } else { setEventMessages($langs->trans("ErrorFailToDeleteFile", $urlfile), null, 'errors'); } - } - elseif ($linkid) // delete of external link + } elseif ($linkid) // delete of external link { require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php'; $link = new Link($db); @@ -148,16 +143,13 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes') if ($backtopage) { header('Location: '.$backtopage); exit; - } - else - { + } else { $tmpurl = $_SERVER["PHP_SELF"].'?id='.$object->id.(GETPOST('section_dir', 'alpha') ? '§ion_dir='.urlencode(GETPOST('section_dir', 'alpha')) : '').(!empty($withproject) ? '&withproject=1' : ''); header('Location: '.$tmpurl); exit; } } -} -elseif ($action == 'confirm_updateline' && GETPOST('save', 'alpha') && GETPOST('link', 'alpha')) +} elseif ($action == 'confirm_updateline' && GETPOST('save', 'alpha') && GETPOST('link', 'alpha')) { require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php'; $langs->load('link'); @@ -176,13 +168,10 @@ elseif ($action == 'confirm_updateline' && GETPOST('save', 'alpha') && GETPOST(' { setEventMessages($langs->trans("ErrorFailedToUpdateLink", $link->label), null, 'mesgs'); } - } - else - { + } else { //error fetching } -} -elseif ($action == 'renamefile' && GETPOST('renamefilesave', 'alpha')) +} elseif ($action == 'renamefile' && GETPOST('renamefilesave', 'alpha')) { // For documents pages, upload_dir contains already path to file from module dir, so we clean path into urlfile. if (!empty($upload_dir)) @@ -235,15 +224,11 @@ elseif ($action == 'renamefile' && GETPOST('renamefilesave', 'alpha')) } setEventMessages($langs->trans("FileRenamed"), null); - } - else - { + } else { $langs->load("errors"); // key must be loaded because we can't rely on loading during output, we need var substitution to be done now. setEventMessages($langs->trans("ErrorFailToRenameFile", $filenamefrom, $filenameto), null, 'errors'); } - } - else - { + } else { $langs->load("errors"); // key must be loaded because we can't rely on loading during output, we need var substitution to be done now. setEventMessages($langs->trans("ErrorDestinationAlreadyExists", $filenameto), null, 'errors'); } @@ -269,9 +254,7 @@ elseif ($action == 'renamefile' && GETPOST('renamefilesave', 'alpha')) require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php'; $ecmfile->share = getRandomPassword(true); } - } - else - { + } else { $ecmfile->share = ''; } $result = $ecmfile->update($user); diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php index ebae28e9582..8e4a3d6e384 100644 --- a/htdocs/core/actions_massactions.inc.php +++ b/htdocs/core/actions_massactions.inc.php @@ -46,7 +46,7 @@ if (empty($objectclass) || empty($uploaddir)) // For backward compatibility if (!empty($permtoread) && empty($permissiontoread)) $permissiontoread = $permtoread; if (!empty($permtocreate) && empty($permissiontoadd)) $permissiontoadd = $permtocreate; -if (!empty($permtodelete) && empty($permissiontodelete)) $permissiontoread = $permtodelete; +if (!empty($permtodelete) && empty($permissiontodelete)) $permissiontodelete = $permtodelete; // Mass actions. Controls on number of lines checked. @@ -180,8 +180,7 @@ if (!$error && $massaction == 'confirm_presend') if ($val == 'thirdparty') // Id of third party or user { $tmparray[] = $thirdparty->name.' <'.$thirdparty->email.'>'; - } - elseif ($val && method_exists($thirdparty, 'contact_get_property')) // Id of contact + } elseif ($val && method_exists($thirdparty, 'contact_get_property')) // Id of contact { $tmparray[] = $thirdparty->contact_get_property((int) $val, 'email'); $sendtoid[] = $val; @@ -210,8 +209,7 @@ if (!$error && $massaction == 'confirm_presend') if ($val == 'thirdparty') // Id of third party { $tmparray[] = $thirdparty->name.' <'.$thirdparty->email.'>'; - } - elseif ($val) // Id du contact + } elseif ($val) // Id du contact { $tmparray[] = $thirdparty->contact_get_property((int) $val, 'email'); //$sendtoid[] = $val; TODO Add also id of contact in CC ? @@ -256,20 +254,17 @@ if (!$error && $massaction == 'confirm_presend') if ($objectobj->element == 'societe') { $sendto = $objectobj->email; - } - elseif ($objectobj->element == 'expensereport') + } elseif ($objectobj->element == 'expensereport') { $fuser = new User($db); $fuser->fetch($objectobj->fk_user_author); $sendto = $fuser->email; - } - elseif ($objectobj->element == 'holiday') + } elseif ($objectobj->element == 'holiday') { $fuser = new User($db); $fuser->fetch($objectobj->fk_user); $sendto = $fuser->email; - } - elseif ($objectobj->element == 'facture' && !empty($listofobjectcontacts[$objectid])) + } elseif ($objectobj->element == 'facture' && !empty($listofobjectcontacts[$objectid])) { $emails_to_sends = array(); $objectobj->fetch_thirdparty(); @@ -283,9 +278,7 @@ if (!$error && $massaction == 'confirm_presend') if (count($emails_to_sends) > 0) { $sendto = implode(',', $emails_to_sends); } - } - else - { + } else { $objectobj->fetch_thirdparty(); $sendto = $objectobj->thirdparty->email; } @@ -336,9 +329,7 @@ if (!$error && $massaction == 'confirm_presend') 'names'=>array($filename), 'mimes'=>array($mime) ); - } - else - { + } else { $nbignored++; $langs->load("errors"); $resaction .= '
'.$langs->trans('ErrorCantReadFile', $file).'
'; @@ -364,19 +355,15 @@ if (!$error && $massaction == 'confirm_presend') $fromtype = GETPOST('fromtype'); if ($fromtype === 'user') { $from = $user->getFullName($langs).' <'.$user->email.'>'; - } - elseif ($fromtype === 'company') { + } elseif ($fromtype === 'company') { $from = $conf->global->MAIN_INFO_SOCIETE_NOM.' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>'; - } - elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) { + } elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) { $tmp = explode(',', $user->email_aliases); $from = trim($tmp[($reg[1] - 1)]); - } - elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) { + } elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) { $tmp = explode(',', $conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES); $from = trim($tmp[($reg[1] - 1)]); - } - elseif (preg_match('/senderprofile_(\d+)_(\d+)/', $fromtype, $reg)) { + } elseif (preg_match('/senderprofile_(\d+)_(\d+)/', $fromtype, $reg)) { $sql = 'SELECT rowid, label, email FROM '.MAIN_DB_PREFIX.'c_email_senderprofile WHERE rowid = '.(int) $reg[1]; $resql = $db->query($sql); $obj = $db->fetch_object($resql); @@ -384,8 +371,7 @@ if (!$error && $massaction == 'confirm_presend') { $from = $obj->label.' <'.$obj->email.'>'; } - } - else { + } else { $from = $_POST['fromname'].' <'.$_POST['frommail'].'>'; } @@ -412,9 +398,7 @@ if (!$error && $massaction == 'confirm_presend') { $looparray[$key]->thirdparty = $thirdparty; // Force thirdparty on object } - } - else - { + } else { $objectforloop = new $objectclass($db); $objectforloop->thirdparty = $thirdparty; // Force thirdparty on object (even if object was not loaded) $looparray[0] = $objectforloop; @@ -464,8 +448,7 @@ if (!$error && $massaction == 'confirm_presend') ); } } - } - elseif (!empty($attachedfilesThirdpartyObj[$thirdparty->id][$objectid])) { + } elseif (!empty($attachedfilesThirdpartyObj[$thirdparty->id][$objectid])) { // Create form object // if "one email per recipient" isn't check we must separate $attachedfiles by object $attachedfiles = $attachedfilesThirdpartyObj[$thirdparty->id][$objectid]; @@ -481,9 +464,7 @@ if (!$error && $massaction == 'confirm_presend') $trackid = 'thi'.$thirdparty->id; if ($objecttmp->element == 'expensereport') $trackid = 'use'.$thirdparty->id; if ($objecttmp->element == 'holiday') $trackid = 'use'.$thirdparty->id; - } - else - { + } else { $trackid = strtolower(get_class($objecttmp)); if (get_class($objecttmp) == 'Contrat') $trackid = 'con'; if (get_class($objecttmp) == 'Propal') $trackid = 'pro'; @@ -507,9 +488,7 @@ if (!$error && $massaction == 'confirm_presend') if ($mailfile->error) { $resaction .= '
'.$mailfile->error.'
';
- }
- else
- {
+ } else {
$result = $mailfile->sendfile();
if ($result)
{
@@ -574,17 +553,13 @@ if (!$error && $massaction == 'confirm_presend')
$nbsent++; // Nb of object sent
}
- }
- else
- {
+ } else {
$langs->load("other");
if ($mailfile->error)
{
$resaction .= $langs->trans('ErrorFailedToSendMail', $from, $sendto);
$resaction .= ''.$mailfile->error.'
';
- }
- else
- {
+ } else {
$resaction .= 'No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS
';
}
}
@@ -605,9 +580,7 @@ if (!$error && $massaction == 'confirm_presend')
//setEventMessages($langs->trans("EMailSentToNRecipients", $nbsent.'/'.count($toselect)), null, 'mesgs');
setEventMessages($langs->trans("EMailSentForNElements", $nbsent.'/'.count($toselect)), null, 'mesgs');
setEventMessages($resaction, null, 'mesgs');
- }
- else
- {
+ } else {
//setEventMessages($langs->trans("EMailSentToNRecipients", 0), null, 'warnings'); // May be object has no generated PDF file
setEventMessages($resaction, null, 'warnings');
}
@@ -722,16 +695,12 @@ if ($massaction == 'confirm_createbills') // Create bills from orders
{
$result = $objecttmp->insert_discount($discountid);
//$result=$discount->link_to_invoice($lineid,$id);
- }
- else
- {
+ } else {
setEventMessages($discount->error, $discount->errors, 'errors');
$error++;
break;
}
- }
- else
- {
+ } else {
// Positive line
$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
// Date start
@@ -789,9 +758,7 @@ if ($massaction == 'confirm_createbills') // Create bills from orders
if ($result > 0)
{
$lineid = $result;
- }
- else
- {
+ } else {
$lineid = 0;
$error++;
break;
@@ -881,9 +848,7 @@ if ($massaction == 'confirm_createbills') // Create bills from orders
header("Location: ".$_SERVER['PHP_SELF'].'?'.$param);
exit;
- }
- else
- {
+ } else {
$db->rollback();
$action = 'create';
$_GET["origin"] = $_POST["origin"];
@@ -913,29 +878,25 @@ if (!$error && $massaction == 'cancelorders')
setEventMessages($langs->trans("ErrorObjectMustHaveStatusValidToBeCanceled", $cmd->ref), null, 'errors');
$error++;
break;
- }
- else
+ } else {
+ // TODO We do not provide warehouse so no stock change here for the moment.
$result = $cmd->cancel();
+ }
if ($result < 0)
{
setEventMessages($cmd->error, $cmd->errors, 'errors');
$error++;
break;
- }
- else
- $nbok++;
+ } else $nbok++;
}
if (!$error)
{
if ($nbok > 1)
setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
- else
- setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+ else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
$db->commit();
- }
- else
- {
+ } else {
$db->rollback();
}
}
@@ -1028,21 +989,23 @@ if (!$error && $massaction == "builddoc" && $permissiontoread && !GETPOST('butto
$input_files .= ' '.escapeshellarg($f);
}
- $cmd = 'pdftk '.escapeshellarg($input_files).' cat output '.escapeshellarg($file);
+ $cmd = 'pdftk '.$input_files.' cat output '.escapeshellarg($file);
exec($cmd);
- if (!empty($conf->global->MAIN_UMASK))
- @chmod($file, octdec($conf->global->MAIN_UMASK));
+ // check if pdftk is installed
+ if (file_exists($file)) {
+ if (!empty($conf->global->MAIN_UMASK))
+ @chmod($file, octdec($conf->global->MAIN_UMASK));
- $langs->load("exports");
- setEventMessages($langs->trans('FileSuccessfullyBuilt', $filename.'_'.dol_print_date($now, 'dayhourlog')), null, 'mesgs');
- }
- else
- {
+ $langs->load("exports");
+ setEventMessages($langs->trans('FileSuccessfullyBuilt', $filename.'_'.dol_print_date($now, 'dayhourlog')), null, 'mesgs');
+ } else {
+ setEventMessages($langs->trans('ErrorPDFTkOutputFileNotFound'), null, 'errors');
+ }
+ } else {
setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
}
- }
- else {
+ } else {
// Create empty PDF
$formatarray = pdf_getFormat();
$page_largeur = $formatarray['width'];
@@ -1099,9 +1062,7 @@ if (!$error && $massaction == "builddoc" && $permissiontoread && !GETPOST('butto
$langs->load("exports");
setEventMessages($langs->trans('FileSuccessfullyBuilt', $filename.'_'.dol_print_date($now, 'dayhourlog')), null, 'mesgs');
- }
- else
- {
+ } else {
setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
}
}
@@ -1157,17 +1118,13 @@ if (!$error && $massaction == 'validate' && $permissiontoadd)
setEventMessages($langs->trans("ErrorObjectMustHaveStatusDraftToBeValidated", $objecttmp->ref), null, 'errors');
$error++;
break;
- }
- elseif ($result < 0)
+ } elseif ($result < 0)
{
setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
$error++;
break;
- }
- else $nbok++;
- }
- else
- {
+ } else $nbok++;
+ } else {
setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
$error++;
break;
@@ -1179,9 +1136,7 @@ if (!$error && $massaction == 'validate' && $permissiontoadd)
if ($nbok > 1) setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
$db->commit();
- }
- else
- {
+ } else {
$db->rollback();
}
//var_dump($listofobjectthirdparties);exit;
@@ -1202,10 +1157,8 @@ if (!$error && $massaction == 'closed' && $objectclass == "Propal" && $permissio
setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
$error++;
break;
- } else
- $nbok++;
- }
- else {
+ } else $nbok++;
+ } else {
setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
$error++;
break;
@@ -1215,11 +1168,9 @@ if (!$error && $massaction == 'closed' && $objectclass == "Propal" && $permissio
if (!$error) {
if ($nbok > 1)
setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
- else
- setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+ else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
$db->commit();
- }
- else {
+ } else {
$db->rollback();
}
}
@@ -1266,11 +1217,8 @@ if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == '
setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
$error++;
break;
- }
- else $nbok++;
- }
- else
- {
+ } else $nbok++;
+ } else {
setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
$error++;
break;
@@ -1282,9 +1230,7 @@ if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == '
if ($nbok > 1) setEventMessages($langs->trans("RecordsDeleted", $nbok), null, 'mesgs');
else setEventMessages($langs->trans("RecordDeleted", $nbok), null, 'mesgs');
$db->commit();
- }
- else
- {
+ } else {
$db->rollback();
}
//var_dump($listofobjectthirdparties);exit;
@@ -1328,11 +1274,8 @@ if (!$error && $massaction == 'generate_doc' && $permissiontoread)
setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
$error++;
break;
- }
- else $nbok++;
- }
- else
- {
+ } else $nbok++;
+ } else {
setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
$error++;
break;
@@ -1344,9 +1287,7 @@ if (!$error && $massaction == 'generate_doc' && $permissiontoread)
if ($nbok > 1) setEventMessages($langs->trans("RecordsGenerated", $nbok), null, 'mesgs');
else setEventMessages($langs->trans("RecordGenerated", $nbok), null, 'mesgs');
$db->commit();
- }
- else
- {
+ } else {
$db->rollback();
}
}
diff --git a/htdocs/core/actions_printing.inc.php b/htdocs/core/actions_printing.inc.php
index e2da8a4170c..e88fc937e38 100644
--- a/htdocs/core/actions_printing.inc.php
+++ b/htdocs/core/actions_printing.inc.php
@@ -75,8 +75,7 @@ if ($action == 'print_file' && $user->rights->printing->read) {
setEventMessages($printer->error, $printer->errors);
setEventMessages($langs->transnoentitiesnoconv("FileWasSentToPrinter", basename(GETPOST('file', 'alpha'))).' '.$langs->transnoentitiesnoconv("ViaModule").' '.$printer->name, null);
}
- }
- catch (Exception $e)
+ } catch (Exception $e)
{
$ret = 1;
setEventMessages($e->getMessage(), null, 'errors');
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index e23d2ce01a9..bc38d9839af 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -120,38 +120,32 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
if ($object->element == 'user' && $result == 0) $result = 1; // Even if not found, we consider ok
$thirdparty = $object->thirdparty;
$sendtosocid = $thirdparty->id;
- }
- elseif ($object->element == 'member' || $object->element == 'user')
+ } elseif ($object->element == 'member' || $object->element == 'user')
{
$thirdparty = $object;
if ($object->socid > 0) $sendtosocid = $object->socid;
- }
- elseif ($object->element == 'expensereport')
+ } elseif ($object->element == 'expensereport')
{
$tmpuser = new User($db);
$tmpuser->fetch($object->fk_user_author);
$thirdparty = $tmpuser;
if ($object->socid > 0) $sendtosocid = $object->socid;
- }
- elseif ($object->element == 'societe')
+ } elseif ($object->element == 'societe')
{
$thirdparty = $object;
if ($thirdparty->id > 0) $sendtosocid = $thirdparty->id;
- }
- elseif ($object->element == 'contact')
+ } elseif ($object->element == 'contact')
{
$contact = $object;
if ($contact->id > 0) $sendtosocid = $contact->fetch_thirdparty()->id;
- }
- else dol_print_error('', "Use actions_sendmails.in.php for an element/object '".$object->element."' that is not supported");
+ } else dol_print_error('', "Use actions_sendmails.in.php for an element/object '".$object->element."' that is not supported");
if (is_object($hookmanager))
{
$parameters = array();
$reshook = $hookmanager->executeHooks('initSendToSocid', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
}
- }
- else $thirdparty = $mysoc;
+ } else $thirdparty = $mysoc;
if ($result > 0)
{
@@ -189,8 +183,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
elseif ($val == 'contact') // Key selected means current contact
{
$tmparray[] = dol_string_nospecial($contact->getFullName($langs), ' ', array(",")).' <'.$contact->email.'>';
- }
- elseif ($val) // $val is the Id of a contact
+ } elseif ($val) // $val is the Id of a contact
{
$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
$sendtoid[] = $val;
@@ -239,8 +232,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
elseif ($val == 'contact') // Key selected means current contact
{
$tmparray[] = dol_string_nospecial($contact->name, ' ', array(",")).' <'.$contact->email.'>';
- }
- elseif ($val) // $val is the Id of a contact
+ } elseif ($val) // $val is the Id of a contact
{
$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
//$sendtoid[] = $val; TODO Add also id of contact in CC ?
@@ -277,22 +269,17 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
$fromtype = GETPOST('fromtype', 'alpha');
if ($fromtype === 'robot') {
$from = dol_string_nospecial($conf->global->MAIN_MAIL_EMAIL_FROM, ' ', array(",")).' <'.$conf->global->MAIN_MAIL_EMAIL_FROM.'>';
- }
- elseif ($fromtype === 'user') {
+ } elseif ($fromtype === 'user') {
$from = dol_string_nospecial($user->getFullName($langs), ' ', array(",")).' <'.$user->email.'>';
- }
- elseif ($fromtype === 'company') {
+ } elseif ($fromtype === 'company') {
$from = dol_string_nospecial($conf->global->MAIN_INFO_SOCIETE_NOM, ' ', array(",")).' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
- }
- elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
+ } elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
$tmp = explode(',', $user->email_aliases);
$from = trim($tmp[($reg[1] - 1)]);
- }
- elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
+ } elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
$tmp = explode(',', $conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
$from = trim($tmp[($reg[1] - 1)]);
- }
- elseif (preg_match('/senderprofile_(\d+)_(\d+)/', $fromtype, $reg)) {
+ } elseif (preg_match('/senderprofile_(\d+)_(\d+)/', $fromtype, $reg)) {
$sql = 'SELECT rowid, label, email FROM '.MAIN_DB_PREFIX.'c_email_senderprofile';
$sql .= ' WHERE rowid = '.(int) $reg[1];
$resql = $db->query($sql);
@@ -301,8 +288,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
{
$from = dol_string_nospecial($obj->label, ' ', array(",")).' <'.$obj->email.'>';
}
- }
- else {
+ } else {
$from = dol_string_nospecial($_POST['fromname'], ' ', array(",")).' <'.$_POST['frommail'].'>';
}
@@ -419,9 +405,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
{
setEventMessages($mailfile->error, $mailfile->errors, 'errors');
$action = 'presend';
- }
- else
- {
+ } else {
$result = $mailfile->sendfile();
if ($result)
{
@@ -479,18 +463,14 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
if (isset($paramname2) || isset($paramval2)) $moreparam .= '&'.($paramname2 ? $paramname2 : 'mid').'='.$paramval2;
header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname ? $paramname : 'id').'='.(is_object($object) ? $object->id : '').$moreparam);
exit;
- }
- else
- {
+ } else {
$langs->load("other");
$mesg = '';
if ($mailfile->error)
{
$mesg .= $langs->transnoentities('ErrorFailedToSendMail', dol_escape_htmltag($from), dol_escape_htmltag($sendto));
$mesg .= '
'.$mailfile->error; - } - else - { + } else { $mesg .= 'No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS'; } $mesg .= '
';
@@ -499,17 +479,13 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
$action = 'presend';
}
}
- }
- else
- {
+ } else {
$langs->load("errors");
setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("MailTo")), null, 'warnings');
dol_syslog('Try to send email with no recipient defined', LOG_WARNING);
$action = 'presend';
}
- }
- else
- {
+ } else {
$langs->load("other");
setEventMessages($langs->trans('ErrorFailedToReadObject', $object->element), null, 'errors');
dol_syslog('Failed to read data of object id='.$object->id.' element='.$object->element);
diff --git a/htdocs/core/actions_setmoduleoptions.inc.php b/htdocs/core/actions_setmoduleoptions.inc.php
index 313375d1aa1..05be4a31d18 100644
--- a/htdocs/core/actions_setmoduleoptions.inc.php
+++ b/htdocs/core/actions_setmoduleoptions.inc.php
@@ -50,9 +50,7 @@ if ($action == 'update' && is_array($arrayofparameters))
{
$db->commit();
if (empty($nomessageinupdate)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
- }
- else
- {
+ } else {
$db->rollback();
if (empty($nomessageinupdate)) setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
}
@@ -96,8 +94,7 @@ if ($action == 'setModuleOptions')
unset($listofdir[$key]); continue;
}
if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
- else
- {
+ else {
$upload_dir = $tmpdir;
}
}
@@ -112,9 +109,7 @@ if ($action == 'setModuleOptions')
{
$db->commit();
if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
- }
- else
- {
+ } else {
$db->rollback();
if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
}
diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index bb6a8de30d4..e2a7ae83326 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -61,15 +61,16 @@ if (!isset($mode) || $mode != 'noajax') // For ajax call
$upload_dir = dirname(str_replace("../", "/", $rootdirfordoc.'/'.$file));
- $ecmdir = new EcmDirectory($db);
- $result = $ecmdir->fetch($section);
- if (!$result > 0)
- {
- //dol_print_error($db,$ecmdir->error);
- //exit;
- }
-}
-else // For no ajax call
+ $ecmdir = new EcmDirectory($db);
+ if ($section > 0) {
+ $result = $ecmdir->fetch($section);
+ if (!$result > 0)
+ {
+ //dol_print_error($db,$ecmdir->error);
+ //exit;
+ }
+ }
+} else // For no ajax call
{
$rootdirfordoc = $conf->ecm->dir_output;
@@ -85,8 +86,7 @@ else // For no ajax call
}
$relativepath = $ecmdir->getRelativePath(); // Example 'mydir/'
- }
- elseif (GETPOST('section_dir'))
+ } elseif (GETPOST('section_dir'))
{
$relativepath = GETPOST('section_dir');
}
@@ -234,8 +234,7 @@ if ($type == 'directory')
$formfile->list_of_autoecmfiles($upload_dir, $filearray, $module, $param, 1, '', $perm, 1, $textifempty, $maxlengthname, $url, 1);
}
// Manual list
- else
- {
+ else {
if ($module == 'medias')
{
/*
@@ -259,9 +258,7 @@ if ($type == 'directory')
if (!preg_match('/pageid=/', $param)) $param .= '&pageid='.urlencode(GETPOST('pageid', 'int'));
//if (!preg_match('/backtopage=/',$param)) $param.='&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid);
}
- }
- else
- {
+ } else {
$relativepath = $ecmdir->getRelativePath();
$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
}
@@ -270,9 +267,7 @@ if ($type == 'directory')
if (($section === '0' || empty($section)) && ($module != 'medias'))
{
$filearray = array();
- }
- else
- {
+ } else {
$filearray = dol_dir_list($upload_dir, "files", 0, '', array('^\.', '(\.meta|_preview.*\.png)$', '^temp$', '^CVS$'), $sortfield, $sorting, 1);
}
@@ -282,13 +277,11 @@ if ($type == 'directory')
if (isset($search_doc_ref) && $search_doc_ref != '') $param .= '&search_doc_ref='.$search_doc_ref;
$textifempty = $langs->trans('NoFileFound');
- }
- elseif ($section === '0')
+ } elseif ($section === '0')
{
if ($module == 'ecm') $textifempty = ''.$mailfile->error; - } - else - { + } else { $mesg .= 'No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS'; } $mesg .= '
'.$langs->trans("DirNotSynchronizedSyncFirst").'
'; else $textifempty = $langs->trans('NoFileFound'); - } - else $textifempty = ($showonrightsize == 'featurenotyetavailable' ? $langs->trans("FeatureNotYetAvailable") : $langs->trans("ECMSelectASection")); + } else $textifempty = ($showonrightsize == 'featurenotyetavailable' ? $langs->trans("FeatureNotYetAvailable") : $langs->trans("ECMSelectASection")); if ($module == 'medias') { @@ -296,8 +289,7 @@ if ($type == 'directory') $modulepart = 'medias'; $perm = ($user->rights->website->write || $user->rights->emailing->creer); $title = 'none'; - } - elseif ($module == 'ecm') // DMS/ECM -> manual structure + } elseif ($module == 'ecm') // DMS/ECM -> manual structure { if ($user->rights->ecm->read) { @@ -320,9 +312,7 @@ if ($type == 'directory') $perm = $user->rights->ecm->upload; $modulepart = 'ecm'; $title = ''; // Use default - } - else - { + } else { $useinecm = 5; $modulepart = 'ecm'; $perm = $user->rights->ecm->upload; @@ -331,7 +321,7 @@ if ($type == 'directory') // When we show list of files for ECM files, $filearray contains file list, and directory is defined with modulepart + section into $param // When we show list of files for a directory, $filearray ciontains file list, and directory is defined with modulepart + $relativepath - //var_dump("title=".$title." modulepart=".$modulepart." useinecm=".$useinecm." perm=".$perm." relativepath=".$relativepath." param=".$param." url=".$url); + //var_dump("section=".$section." title=".$title." modulepart=".$modulepart." useinecm=".$useinecm." perm=".$perm." relativepath=".$relativepath." param=".$param." url=".$url); $formfile->list_of_documents($filearray, '', $modulepart, $param, 1, $relativepath, $perm, $useinecm, $textifempty, $maxlengthname, $title, $url, 0, $perm); } } @@ -355,7 +345,7 @@ if ($useajax || $action == 'delete') $section_id = $section; require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; - $useglobalvars = 1; + $form = new Form($db); $formquestion['urlfile'] = array('type'=>'hidden', 'value'=>$urlfile, 'name'=>'urlfile'); // We must always put field, even if empty because it is filled by javascript later $formquestion['section'] = array('type'=>'hidden', 'value'=>$section, 'name'=>'section'); // We must always put field, even if empty because it is filled by javascript later diff --git a/htdocs/core/ajax/ajaxdirtree.php b/htdocs/core/ajax/ajaxdirtree.php index 3e54532668a..620643da8f2 100644 --- a/htdocs/core/ajax/ajaxdirtree.php +++ b/htdocs/core/ajax/ajaxdirtree.php @@ -49,8 +49,7 @@ if (!isset($mode) || $mode != 'noajax') // For ajax call $preopened = GETPOST('preopened'); if ($selecteddir != '/') $selecteddir = preg_replace('/\/$/', '', $selecteddir); // We removed last '/' except if it is '/' -} -else // For no ajax call +} else // For no ajax call { //if (GETPOST('preopened')) { $_GET['dir'] = $_POST['dir'] = GETPOST('preopened'); } @@ -73,8 +72,7 @@ if ($modulepart == 'ecm') { $fullpathselecteddir = $conf->ecm->dir_output.'/'.($selecteddir != '/' ? $selecteddir : ''); $fullpathpreopened = $conf->ecm->dir_output.'/'.($preopened != '/' ? $preopened : ''); -} -elseif ($modulepart == 'medias') +} elseif ($modulepart == 'medias') { $fullpathselecteddir = $dolibarr_main_data_root.'/medias/'.($selecteddir != '/' ? $selecteddir : ''); $fullpathpreopened = $dolibarr_main_data_root.'/medias/'.($preopened != '/' ? $preopened : ''); @@ -95,8 +93,7 @@ if (preg_match('/\.\./', $fullpathselecteddir) || preg_match('/[<>|]/', $fullpat if ($modulepart == 'ecm') { if (!$user->rights->ecm->read) accessforbidden(); -} -elseif ($modulepart == 'medias') +} elseif ($modulepart == 'medias') { // Always allowed } @@ -471,8 +468,7 @@ function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir, if ($modulepart == 'ecm') { $newfullpathselecteddir = $conf->ecm->dir_output.'/'.($val['fullrelativename'] != '/' ? $val['fullrelativename'] : ''); - } - elseif ($modulepart == 'medias') + } elseif ($modulepart == 'medias') { $newfullpathselecteddir = $dolibarr_main_data_root.'/medias/'.($val['fullrelativename'] != '/' ? $val['fullrelativename'] : ''); } @@ -486,7 +482,6 @@ function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir, echo "\n"; } - } - else print "PermissionDenied"; + } else print "PermissionDenied"; } } diff --git a/htdocs/core/ajax/check_notifications.php b/htdocs/core/ajax/check_notifications.php index d8f4985f6d8..98d7d00a8dc 100644 --- a/htdocs/core/ajax/check_notifications.php +++ b/htdocs/core/ajax/check_notifications.php @@ -60,9 +60,7 @@ if ($time >= $_SESSION['auto_check_events_not_before']) dol_syslog("We ask to check browser notification on a too large period. We fix this with current date."); $starttime = $time; } - } - else - { + } else { $starttime = $time; } @@ -109,9 +107,7 @@ if ($time >= $_SESSION['auto_check_events_not_before']) $eventfound[] = $event; } - } - else - { + } else { dol_syslog("Error sql = ".$db->lasterror(), LOG_ERR); } } diff --git a/htdocs/core/ajax/constantonoff.php b/htdocs/core/ajax/constantonoff.php index c7e5bbd8991..1ed8ca34076 100644 --- a/htdocs/core/ajax/constantonoff.php +++ b/htdocs/core/ajax/constantonoff.php @@ -57,8 +57,7 @@ if (!empty($action) && !empty($name)) if ($action == 'set') { dolibarr_set_const($db, $name, $value, 'chaine', 0, '', $entity); - } - elseif ($action == 'del') + } elseif ($action == 'del') { dolibarr_del_const($db, $name, $entity); } diff --git a/htdocs/core/ajax/extraparams.php b/htdocs/core/ajax/extraparams.php index a3db4505f70..16f39af9bde 100644 --- a/htdocs/core/ajax/extraparams.php +++ b/htdocs/core/ajax/extraparams.php @@ -51,20 +51,38 @@ if (!empty($id) && !empty($element) && !empty($htmlelement) && !empty($type)) $classpath = $subelement = $element; // For compatibility - if ($element == 'order' || $element == 'commande') { $classpath = $subelement = 'commande'; } - elseif ($element == 'propal') { $classpath = 'comm/propal'; $subelement = 'propal'; } - elseif ($element == 'facture') { $classpath = 'compta/facture'; $subelement = 'facture'; } - elseif ($element == 'contract') { $classpath = $subelement = 'contrat'; } - elseif ($element == 'shipping') { $classpath = $subelement = 'expedition'; } - elseif ($element == 'deplacement') { $classpath = 'compta/deplacement'; $subelement = 'deplacement'; } - elseif ($element == 'order_supplier') { $classpath = 'fourn'; $subelement = 'fournisseur.commande'; } - elseif ($element == 'invoice_supplier') { $classpath = 'fourn'; $subelement = 'fournisseur.facture'; } + if ($element == 'order' || $element == 'commande') { + $classpath = $subelement = 'commande'; + } elseif ($element == 'propal') { + $classpath = 'comm/propal'; + $subelement = 'propal'; + } elseif ($element == 'facture') { + $classpath = 'compta/facture'; + $subelement = 'facture'; + } elseif ($element == 'contract') { + $classpath = $subelement = 'contrat'; + } elseif ($element == 'shipping') { + $classpath = $subelement = 'expedition'; + } elseif ($element == 'deplacement') { + $classpath = 'compta/deplacement'; + $subelement = 'deplacement'; + } elseif ($element == 'order_supplier') { + $classpath = 'fourn'; + $subelement = 'fournisseur.commande'; + } elseif ($element == 'invoice_supplier') { + $classpath = 'fourn'; + $subelement = 'fournisseur.facture'; + } dol_include_once('/'.$classpath.'/class/'.$subelement.'.class.php'); - if ($element == 'order_supplier') { $classname = 'CommandeFournisseur'; } - elseif ($element == 'invoice_supplier') { $classname = 'FactureFournisseur'; } - else $classname = ucfirst($subelement); + if ($element == 'order_supplier') { + $classname = 'CommandeFournisseur'; + } elseif ($element == 'invoice_supplier') { + $classname = 'FactureFournisseur'; + } else { + $classname = ucfirst($subelement); + } $object = new $classname($db); $object->fetch($id); diff --git a/htdocs/core/ajax/loadinplace.php b/htdocs/core/ajax/loadinplace.php index 14258e1ebb1..b1a72868312 100644 --- a/htdocs/core/ajax/loadinplace.php +++ b/htdocs/core/ajax/loadinplace.php @@ -62,8 +62,7 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e elseif ($element == 'order_supplier') { $element = 'fournisseur'; $subelement = 'commande'; - } - elseif ($element == 'invoice_supplier') { + } elseif ($element == 'invoice_supplier') { $element = 'fournisseur'; $subelement = 'facture'; } @@ -83,8 +82,7 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e { $ret = $form->$methodname(); if ($ret > 0) echo json_encode($form->$cachename); - } - elseif (!empty($ext_element)) + } elseif (!empty($ext_element)) { $module = $subelement = $ext_element; if (preg_match('/^([^_]+)_([^_]+)/i', $ext_element, $regs)) @@ -99,16 +97,12 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e $ret = $object->$methodname($fk_element); if ($ret > 0) echo json_encode($object->$cachename); } - } - else - { + } else { $object = new GenericObject($db); $value = $object->$loadmethod($table_element, $fk_element, $field); echo $value; } - } - else - { + } else { echo $langs->transnoentities('NotEnoughPermissions'); } } diff --git a/htdocs/core/ajax/objectonoff.php b/htdocs/core/ajax/objectonoff.php index 6466df89a07..6c9f97bfbb0 100644 --- a/htdocs/core/ajax/objectonoff.php +++ b/htdocs/core/ajax/objectonoff.php @@ -58,11 +58,9 @@ print '\n"; $this->fetchValuesForExtraLanguages(); if (!is_object($form)) $form = new Form($this->db); $htmltext = ''; @@ -705,8 +717,7 @@ abstract class CommonObject { if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 && $this->region) { $out .= ($outdone ? ' - ' : '').$this->region.' - '.$this->state; - } - else { + } else { $out .= ($outdone ? ' - ' : '').$this->state; } $outdone++; @@ -833,10 +844,8 @@ abstract class CommonObject $this->errors = $ecmfile->errors; } */ - } - else return ''; - } - elseif (empty($ecmfile->share)) + } else return ''; + } elseif (empty($ecmfile->share)) { // Add entry into index if ($initsharekey) @@ -844,8 +853,7 @@ abstract class CommonObject require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php'; $ecmfile->share = getRandomPassword(true); $ecmfile->update($user); - } - else return ''; + } else return ''; } // Define $urlwithroot $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root)); @@ -867,9 +875,7 @@ abstract class CommonObject if ($relativelink) { $linktoreturn = 'document.php'.($paramlink ? '?'.$paramlink : ''); - } - else - { + } else { $linktoreturn = $urlwithroot.'/document.php'.($paramlink ? '?'.$paramlink : ''); } @@ -916,9 +922,7 @@ abstract class CommonObject if (is_numeric($type_contact)) { $id_type_contact = $type_contact; - } - else - { + } else { // We look for id type_contact $sql = "SELECT tc.rowid"; $sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc"; @@ -981,18 +985,14 @@ abstract class CommonObject $this->db->commit(); return 1; - } - else - { + } else { if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') { $this->error = $this->db->errno(); $this->db->rollback(); echo 'err rollback'; return -2; - } - else - { + } else { $this->error = $this->db->error(); $this->db->rollback(); return -1; @@ -1047,9 +1047,7 @@ abstract class CommonObject if ($resql) { return 0; - } - else - { + } else { $this->error = $this->db->lasterror(); return -1; } @@ -1085,9 +1083,7 @@ abstract class CommonObject $this->db->commit(); return 1; - } - else - { + } else { $this->error = $this->db->lasterror(); $this->db->rollback(); return -1; @@ -1123,9 +1119,7 @@ abstract class CommonObject if ($this->db->query($sql)) { return 1; - } - else - { + } else { $this->error = $this->db->lasterror(); return -1; } @@ -1185,9 +1179,7 @@ abstract class CommonObject 'nom'=>$obj->lastname, // For backward compatibility 'civility'=>$obj->civility, 'lastname'=>$obj->lastname, 'firstname'=>$obj->firstname, 'email'=>$obj->email, 'login'=>$obj->login, 'photo'=>$obj->photo, 'statuscontact'=>$obj->statuscontact, 'rowid'=>$obj->rowid, 'code'=>$obj->code, 'libelle'=>$libelle_type, 'status'=>$obj->statuslink, 'fk_c_type_contact'=>$obj->fk_c_type_contact); - } - else - { + } else { $tab[$i] = $obj->id; } @@ -1195,9 +1187,7 @@ abstract class CommonObject } return $tab; - } - else - { + } else { $this->error = $this->db->lasterror(); dol_print_error($this->db); return -1; @@ -1231,9 +1221,7 @@ abstract class CommonObject $result = $this->update_contact($rowid, $newstatut); $this->db->free($resql); return $result; - } - else - { + } else { $this->error = $this->db->error(); dol_print_error($this->db); return -1; @@ -1285,9 +1273,7 @@ abstract class CommonObject $i++; } return $tab; - } - else - { + } else { $this->error = $this->db->lasterror(); //dol_print_error($this->db); return null; @@ -1368,9 +1354,7 @@ abstract class CommonObject } } return $tab; - } - else - { + } else { $this->error = $this->db->lasterror(); return null; } @@ -1430,9 +1414,7 @@ abstract class CommonObject $result[$i] = $obj->fk_socpeople; $i++; } - } - else - { + } else { $this->error = $this->db->error(); return null; } @@ -1493,8 +1475,7 @@ abstract class CommonObject } return $result; - } else - return -1; + } else return -1; } @@ -1564,9 +1545,7 @@ abstract class CommonObject $this->barcode_type_label = $obj->label; $this->barcode_type_coder = $obj->coder; return 1; - } - else - { + } else { dol_print_error($this->db); return -1; } @@ -1773,9 +1752,7 @@ abstract class CommonObject if (empty($this->fields) && method_exists($this, 'fetch')) { $result = $this->fetch($id); - } - else - { + } else { $result = $this->fetchCommon($id); } if ($result >= 0) $result = $this->call_trigger($trigkey, (!empty($fuser) && is_object($fuser)) ? $fuser : $user); // This may set this->errors @@ -1787,15 +1764,11 @@ abstract class CommonObject if (property_exists($this, $field)) $this->$field = $value; $this->db->commit(); return 1; - } - else - { + } else { $this->db->rollback(); return -2; } - } - else - { + } else { $this->error = $this->db->lasterror(); $this->db->rollback(); return -1; @@ -1840,11 +1813,10 @@ abstract class CommonObject if (isset($this->ismultientitymanaged) && !is_numeric($this->ismultientitymanaged)) { $tmparray = explode('@', $this->ismultientitymanaged); $sql .= ", ".MAIN_DB_PREFIX.$tmparray[1]." as ".($tmparray[1] == 'societe' ? 's' : 'parenttable'); // If we need to link to this table to limit select to entity - } - elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid + } elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$aliastablesociete.".rowid = sc.fk_soc"; - $sql .= " WHERE te.".$fieldid." < '".$this->db->escape($this->ref)."'"; // ->ref must always be defined (set to id if field does not exists) + $sql .= " WHERE te.".$fieldid." < '".$this->db->escape($fieldid=='rowid' ? $this->id : $this->ref)."'"; // ->ref must always be defined (set to id if field does not exists) if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = ".$user->id; if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND (sc.fk_user = ".$user->id.' OR te.fk_soc IS NULL)'; if (!empty($filter)) @@ -1855,8 +1827,7 @@ abstract class CommonObject if (isset($this->ismultientitymanaged) && !is_numeric($this->ismultientitymanaged)) { $tmparray = explode('@', $this->ismultientitymanaged); $sql .= ' AND te.'.$tmparray[0].' = '.($tmparray[1] == 'societe' ? 's' : 'parenttable').'.rowid'; // If we need to link to this table to limit select to entity - } - elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid + } elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) { if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) { if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) { @@ -1897,7 +1868,7 @@ abstract class CommonObject elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$aliastablesociete.".rowid = sc.fk_soc"; - $sql .= " WHERE te.".$fieldid." > '".$this->db->escape($this->ref)."'"; // ->ref must always be defined (set to id if field does not exists) + $sql .= " WHERE te.".$fieldid." > '".$this->db->escape($fieldid=='rowid' ? $this->id : $this->ref)."'"; // ->ref must always be defined (set to id if field does not exists) if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = ".$user->id; if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND (sc.fk_user = ".$user->id.' OR te.fk_soc IS NULL)'; if (!empty($filter)) @@ -1954,7 +1925,7 @@ abstract class CommonObject while ($i < $num) { if ($source == 'thirdparty') $contactAlreadySelected[$i] = $tab[$i]['socid']; - else $contactAlreadySelected[$i] = $tab[$i]['id']; + else $contactAlreadySelected[$i] = $tab[$i]['id']; $i++; } return $contactAlreadySelected; @@ -1981,14 +1952,12 @@ abstract class CommonObject if ($projectid) $sql .= ' SET fk_project = '.$projectid; else $sql .= ' SET fk_project = NULL'; $sql .= ' WHERE rowid = '.$this->id; - } - elseif ($this->table_element == 'actioncomm') // Special case for actioncomm + } elseif ($this->table_element == 'actioncomm') // Special case for actioncomm { if ($projectid) $sql .= ' SET fk_project = '.$projectid; else $sql .= ' SET fk_project = NULL'; $sql .= ' WHERE id = '.$this->id; - } - else // Special case for old architecture objects + } else // Special case for old architecture objects { if ($projectid) $sql .= ' SET fk_projet = '.$projectid; else $sql .= ' SET fk_projet = NULL'; @@ -2000,9 +1969,7 @@ abstract class CommonObject { $this->fk_project = $projectid; return 1; - } - else - { + } else { dol_print_error($this->db); return -1; } @@ -2034,16 +2001,12 @@ abstract class CommonObject // for supplier if (get_class($this) == 'Fournisseur') $this->mode_reglement_supplier_id = $id; return 1; - } - else - { + } else { dol_syslog(get_class($this).'::setPaymentMethods Erreur '.$sql.' - '.$this->db->error()); $this->error = $this->db->error(); return -1; } - } - else - { + } else { dol_syslog(get_class($this).'::setPaymentMethods, status of the object is incompatible'); $this->error = 'Status of the object is incompatible '.$this->statut; return -2; @@ -2075,16 +2038,12 @@ abstract class CommonObject if ($rate) $this->setMulticurrencyRate($rate, 2); return 1; - } - else - { + } else { dol_syslog(get_class($this).'::setMulticurrencyCode Erreur '.$sql.' - '.$this->db->error()); $this->error = $this->db->error(); return -1; } - } - else - { + } else { dol_syslog(get_class($this).'::setMulticurrencyCode, status of the object is incompatible'); $this->error = 'Status of the object is incompatible '.$this->statut; return -2; @@ -2183,16 +2142,12 @@ abstract class CommonObject } return 1; - } - else - { + } else { dol_syslog(get_class($this).'::setMulticurrencyRate Erreur '.$sql.' - '.$this->db->error()); $this->error = $this->db->error(); return -1; } - } - else - { + } else { dol_syslog(get_class($this).'::setMulticurrencyRate, status of the object is incompatible'); $this->error = 'Status of the object is incompatible '.$this->statut; return -2; @@ -2226,16 +2181,12 @@ abstract class CommonObject if (get_class($this) == 'Fournisseur') $this->cond_reglement_supplier_id = $id; $this->cond_reglement = $id; // for compatibility return 1; - } - else - { + } else { dol_syslog(get_class($this).'::setPaymentTerms Erreur '.$sql.' - '.$this->db->error()); $this->error = $this->db->error(); return -1; } - } - else - { + } else { dol_syslog(get_class($this).'::setPaymentTerms, status of the object is incompatible'); $this->error = 'Status of the object is incompatible '.$this->statut; return -2; @@ -2264,16 +2215,12 @@ abstract class CommonObject { $this->retained_warranty_fk_cond_reglement = $id; return 1; - } - else - { + } else { dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms Erreur '.$sql.' - '.$this->db->error()); $this->error = $this->db->error(); return -1; } - } - else - { + } else { dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms, status of the object is incompatible'); $this->error = 'Status of the object is incompatible '.$this->statut; return -2; @@ -2299,9 +2246,7 @@ abstract class CommonObject { $this->fk_delivery_address = $id; return 1; - } - else - { + } else { $this->error = $this->db->error(); dol_syslog(get_class($this).'::setDeliveryAddress Erreur '.$sql.' - '.$this->error); return -1; @@ -2425,9 +2370,7 @@ abstract class CommonObject { $this->modelpdf = $modelpdf; return 1; - } - else - { + } else { dol_print_error($this->db); return 0; } @@ -2469,9 +2412,7 @@ abstract class CommonObject dol_syslog(get_class($this).'::setBankAccount Error '.$sql.' - '.$this->db->error()); $this->error = $this->db->lasterror(); $error++; - } - else - { + } else { if (!$notrigger) { // Call trigger @@ -2485,9 +2426,7 @@ abstract class CommonObject { $this->db->rollback(); return -1; - } - else - { + } else { $this->fk_account = ($fk_account == 'NULL') ?null:$fk_account; $this->db->commit(); return 1; @@ -2534,8 +2473,7 @@ abstract class CommonObject { $row = $this->db->fetch_row($resql); $nl = $row[0]; - } - else dol_print_error($this->db); + } else dol_print_error($this->db); if ($nl > 0) { // The goal of this part is to reorder all lines, with all children lines sharing the same @@ -2577,9 +2515,7 @@ abstract class CommonObject $this->updateRangOfLine($row, ($key + 1)); } } - } - else - { + } else { dol_print_error($this->db); } } @@ -2725,9 +2661,7 @@ abstract class CommonObject { dol_print_error($this->db); } - } - else - { + } else { dol_print_error($this->db); } } @@ -2759,9 +2693,7 @@ abstract class CommonObject { dol_print_error($this->db); } - } - else - { + } else { dol_print_error($this->db); } } @@ -2834,16 +2766,13 @@ abstract class CommonObject if (!empty($row[0])) { return $row[0]; - } - else - { + } else { return $this->getRangOfLine($fk_parent_line); } } } // If not, search the last rang of element - else - { + else { $sql = 'SELECT max('.$positionfield.') FROM '.MAIN_DB_PREFIX.$this->table_element_line; $sql .= ' WHERE '.$this->fk_element.' = '.$this->id; @@ -2882,9 +2811,7 @@ abstract class CommonObject { $this->ref_ext = $ref_ext; return 1; - } - else - { + } else { $this->error = $this->db->error(); return -1; } @@ -2929,15 +2856,12 @@ abstract class CommonObject { if ($suffix == '_public') $this->note_public = $note; elseif ($suffix == '_private') $this->note_private = $note; - else - { + else { $this->note = $note; // deprecated $this->note_private = $note; } return 1; - } - else - { + } else { $this->error = $this->db->lasterror(); return -1; } @@ -3119,7 +3043,12 @@ abstract class CommonObject //print 'Line '.$i.' rowid='.$obj->rowid.' vat_rate='.$obj->vatrate.' total_ht='.$obj->total_ht.' total_tva='.$obj->total_tva.' total_ttc='.$obj->total_ttc.' total_ht_by_vats='.$total_ht_by_vats[$obj->vatrate].' total_tva_by_vats='.$total_tva_by_vats[$obj->vatrate].' (new calculation = '.$tmpvat.') total_ttc_by_vats='.$total_ttc_by_vats[$obj->vatrate].($diff?" => DIFF":"")."
\n"; if ($diff) { - if (abs($diff) > 0.1) { dol_syslog('A rounding difference was detected into TOTAL but is too high to be corrected', LOG_WARNING); exit; } + if (abs($diff) > 0.1) { + $errmsg = 'A rounding difference was detected into TOTAL but is too high to be corrected. Some data in your line may be corrupted. Try to edit each line manually.'; + dol_syslog($errmsg, LOG_WARNING); + dol_print_error('', $errmsg); + exit; + } $sqlfix = "UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".($obj->total_tva - $diff).", total_ttc = ".($obj->total_ttc - $diff)." WHERE rowid = ".$obj->rowid; dol_syslog('We found a difference of '.$diff.' for line rowid = '.$obj->rowid.". We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix); $resqlfix = $this->db->query($sqlfix); @@ -3197,14 +3126,10 @@ abstract class CommonObject if (!$error) { return 1; - } - else - { + } else { return -1; } - } - else - { + } else { dol_print_error($this->db, 'Bad request in update_price'); return -1; } @@ -3249,9 +3174,7 @@ abstract class CommonObject { $this->db->commit(); return 1; - } - else - { + } else { $this->error = $this->db->lasterror(); $this->db->rollback(); return 0; @@ -3324,15 +3247,12 @@ abstract class CommonObject { $sql .= "fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."'"; if ($withtargettype) $sql .= " AND targettype = '".$targettype."'"; - } - elseif ($justtarget) + } elseif ($justtarget) { $sql .= "fk_target = ".$targetid." AND targettype = '".$targettype."'"; if ($withsourcetype) $sql .= " AND sourcetype = '".$sourcetype."'"; } - } - else - { + } else { $sql .= "(fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."')"; $sql .= " ".$clause." (fk_target = ".$targetid." AND targettype = '".$targettype."')"; } @@ -3352,14 +3272,11 @@ abstract class CommonObject if ($justsource) { $this->linkedObjectsIds[$obj->targettype][$obj->rowid] = $obj->fk_target; - } - elseif ($justtarget) + } elseif ($justtarget) { $this->linkedObjectsIds[$obj->sourcetype][$obj->rowid] = $obj->fk_source; } - } - else - { + } else { if ($obj->fk_source == $sourceid && $obj->sourcetype == $sourcetype) { $this->linkedObjectsIds[$obj->targettype][$obj->rowid] = $obj->fk_target; @@ -3390,32 +3307,23 @@ abstract class CommonObject // To work with non standard classpath or module name if ($objecttype == 'facture') { $classpath = 'compta/facture/class'; - } - elseif ($objecttype == 'facturerec') { + } elseif ($objecttype == 'facturerec') { $classpath = 'compta/facture/class'; $module = 'facture'; - } - elseif ($objecttype == 'propal') { + } elseif ($objecttype == 'propal') { $classpath = 'comm/propal/class'; - } - elseif ($objecttype == 'supplier_proposal') { + } elseif ($objecttype == 'supplier_proposal') { $classpath = 'supplier_proposal/class'; - } - elseif ($objecttype == 'shipping') { + } elseif ($objecttype == 'shipping') { $classpath = 'expedition/class'; $subelement = 'expedition'; $module = 'expedition_bon'; - } - elseif ($objecttype == 'delivery') { + } elseif ($objecttype == 'delivery') { $classpath = 'livraison/class'; $subelement = 'livraison'; $module = 'livraison_bon'; - } - elseif ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier') { + } elseif ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier') { $classpath = 'fourn/class'; $module = 'fournisseur'; - } - elseif ($objecttype == 'fichinter') { + } elseif ($objecttype == 'fichinter') { $classpath = 'fichinter/class'; $subelement = 'fichinter'; $module = 'ficheinter'; - } - elseif ($objecttype == 'subscription') { + } elseif ($objecttype == 'subscription') { $classpath = 'adherents/class'; $module = 'adherent'; - } - elseif ($objecttype == 'contact') { + } elseif ($objecttype == 'contact') { $module = 'societe'; } @@ -3424,23 +3332,17 @@ abstract class CommonObject if ($objecttype == 'order') { $classfile = 'commande'; $classname = 'Commande'; - } - elseif ($objecttype == 'invoice_supplier') { + } elseif ($objecttype == 'invoice_supplier') { $classfile = 'fournisseur.facture'; $classname = 'FactureFournisseur'; - } - elseif ($objecttype == 'order_supplier') { + } elseif ($objecttype == 'order_supplier') { $classfile = 'fournisseur.commande'; $classname = 'CommandeFournisseur'; - } - elseif ($objecttype == 'supplier_proposal') { + } elseif ($objecttype == 'supplier_proposal') { $classfile = 'supplier_proposal'; $classname = 'SupplierProposal'; - } - elseif ($objecttype == 'facturerec') { + } elseif ($objecttype == 'facturerec') { $classfile = 'facture-rec'; $classname = 'FactureRec'; - } - elseif ($objecttype == 'subscription') { + } elseif ($objecttype == 'subscription') { $classfile = 'subscription'; $classname = 'Subscription'; - } - elseif ($objecttype == 'project' || $objecttype == 'projet') { + } elseif ($objecttype == 'project' || $objecttype == 'projet') { $classpath = 'projet/class'; $classfile = 'project'; $classname = 'Project'; } @@ -3464,17 +3366,13 @@ abstract class CommonObject } } } - } - else - { + } else { unset($this->linkedObjectsIds[$objecttype]); } } } return 1; - } - else - { + } else { dol_print_error($this->db); return -1; } @@ -3505,8 +3403,7 @@ abstract class CommonObject $sql .= ", sourcetype = '".$this->db->escape($sourcetype)."'"; $sql .= " WHERE fk_target = ".$this->id; $sql .= " AND targettype = '".$this->db->escape($this->element)."'"; - } - elseif ($updatetarget) + } elseif ($updatetarget) { $sql .= "fk_target = ".$targetid; $sql .= ", targettype = '".$this->db->escape($targettype)."'"; @@ -3518,9 +3415,7 @@ abstract class CommonObject if ($this->db->query($sql)) { return 1; - } - else - { + } else { $this->error = $this->db->lasterror(); return -1; } @@ -3555,21 +3450,16 @@ abstract class CommonObject if ($rowid > 0) { $sql .= " rowid = ".$rowid; - } - else - { + } else { if ($deletesource) { $sql .= " fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."'"; $sql .= " AND fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."'"; - } - elseif ($deletetarget) + } elseif ($deletetarget) { $sql .= " fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."'"; $sql .= " AND fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."'"; - } - else - { + } else { $sql .= " (fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."')"; $sql .= " OR"; $sql .= " (fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."')"; @@ -3580,9 +3470,7 @@ abstract class CommonObject if ($this->db->query($sql)) { return 1; - } - else - { + } else { $this->error = $this->db->lasterror(); $this->errors[] = $this->error; return -1; @@ -3659,16 +3547,12 @@ abstract class CommonObject } return 1; - } - else - { + } else { $this->db->rollback(); dol_syslog(get_class($this)."::setStatut ".$this->error, LOG_ERR); return -1; } - } - else - { + } else { $this->error = $this->db->lasterror(); $this->db->rollback(); return -1; @@ -3707,11 +3591,8 @@ abstract class CommonObject { $this->canvas = $obj->canvas; return 1; - } - else return 0; - } - else - { + } else return 0; + } else { dol_print_error($this->db); return -1; } @@ -3784,16 +3665,13 @@ abstract class CommonObject if (is_numeric($elementname)) // old usage { $this->errors[] = $langs->trans("ErrorRecordHasAtLeastOneChildOfType", $table); - } - else // new usage: $elementname=Translation key + } else // new usage: $elementname=Translation key { $this->errors[] = $langs->trans("ErrorRecordHasAtLeastOneChildOfType", $langs->transnoentitiesnoconv($elementname)); } break; // We found at least one, we stop here } - } - else - { + } else { $this->errors[] = $this->db->lasterror(); return -1; } @@ -3802,8 +3680,7 @@ abstract class CommonObject { $this->errors[] = "ErrorRecordHasChildren"; return $haschild; - } - else return 0; + } else return 0; } /** @@ -3895,8 +3772,7 @@ abstract class CommonObject { if (empty($totalToShip)) $totalToShip = 0; // Avoid warning because $totalToShip is '' $totalToShip += $line->qty_shipped; // defined for shipment only - } - elseif ($line->element == 'commandefournisseurdispatch' && isset($line->qty)) + } elseif ($line->element == 'commandefournisseurdispatch' && isset($line->qty)) { if (empty($totalToShip)) $totalToShip = 0; $totalToShip += $line->qty; // defined for reception only @@ -3906,8 +3782,7 @@ abstract class CommonObject if ($this->element == 'shipping') { // for shipments $qty = $line->qty_shipped ? $line->qty_shipped : 0; - } - else { + } else { $qty = $line->qty ? $line->qty : 0; } @@ -3934,8 +3809,7 @@ abstract class CommonObject { $trueWeightUnit = pow(10, $weightUnit); $totalWeight += $weight * $qty * $trueWeightUnit; - } - else { + } else { if ($weight_units == 99) { // conversion 1 Pound = 0.45359237 KG $trueWeightUnit = 0.45359237; @@ -3944,8 +3818,7 @@ abstract class CommonObject // conversion 1 Ounce = 0.0283495 KG $trueWeightUnit = 0.0283495; $totalWeight += $weight * $qty * $trueWeightUnit; - } - else { + } else { $totalWeight += $weight * $qty; // This may be wrong if we mix different units } } @@ -3955,9 +3828,7 @@ abstract class CommonObject $trueVolumeUnit = pow(10, $volumeUnit); //print $line->volume; $totalVolume += $volume * $qty * $trueVolumeUnit; - } - else - { + } else { $totalVolume += $volume * $qty; // This may be wrong if we mix different units } } @@ -3988,9 +3859,7 @@ abstract class CommonObject $this->error = $this->db->lasterror(); $this->db->rollback(); return -1; - } - else - { + } else { $this->db->commit(); return 1; } @@ -4041,14 +3910,10 @@ abstract class CommonObject { $res = $this->db->fetch_object($resql); return 'Incoterm : '.$res->code.' - '.$this->location_incoterms; - } - else - { + } else { return ''; } - } - else - { + } else { $this->errors[] = $this->db->lasterror(); return false; } @@ -4084,14 +3949,11 @@ abstract class CommonObject $this->label_incoterms = $obj->libelle; } return 1; - } - else - { + } else { $this->errors[] = $this->db->lasterror(); return -1; } - } - else return -1; + } else return -1; } @@ -4132,9 +3994,7 @@ abstract class CommonObject if (!empty($module)) { $tpl = dol_buildpath($reldir.'/objectline_create.tpl.php'); - } - else - { + } else { $tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_create.tpl.php'; } @@ -4199,9 +4059,7 @@ abstract class CommonObject if (!empty($module)) { $tpl = dol_buildpath($reldir.'/objectline_title.tpl.php'); - } - else - { + } else { $tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_title.tpl.php'; } if (empty($conf->file->strict_mode)) { @@ -4228,9 +4086,7 @@ abstract class CommonObject { $parameters = array('line'=>$line, 'num'=>$num, 'i'=>$i, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer, 'selected'=>$selected, 'table_element_line'=>$line->table_element); $reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks - } - else - { + } else { $parameters = array('line'=>$line, 'num'=>$num, 'i'=>$i, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer, 'selected'=>$selected, 'table_element_line'=>$line->table_element, 'fk_parent_line'=>$line->fk_parent_line); $reshook = $hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks } @@ -4311,9 +4167,7 @@ abstract class CommonObject } $label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $line->product_label; - } - else - { + } else { $label = $line->product_label; } @@ -4332,9 +4186,7 @@ abstract class CommonObject if (!empty($module)) { $tpl = dol_buildpath($reldir.'/objectline_view.tpl.php'); - } - else - { + } else { $tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_view.tpl.php'; } @@ -4363,9 +4215,7 @@ abstract class CommonObject if (!empty($module)) { $tpl = dol_buildpath($reldir.'/objectline_edit.tpl.php'); - } - else - { + } else { $tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_edit.tpl.php'; } @@ -4425,9 +4275,7 @@ abstract class CommonObject $action = ''; $hookmanager->executeHooks('printOriginObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks } - } - else - { + } else { $this->printOriginLine($line, '', $restrictlist, '/core/tpl', $selectedLines); } @@ -4457,18 +4305,14 @@ abstract class CommonObject if (!empty($line->date_start)) { $date_start = $line->date_start; - } - else - { + } else { $date_start = $line->date_debut_prevue; if ($line->date_debut_reel) $date_start = $line->date_debut_reel; } if (!empty($line->date_end)) { $date_end = $line->date_end; - } - else - { + } else { $date_end = $line->date_fin_prevue; if ($line->date_fin_reel) $date_end = $line->date_fin_reel; } @@ -4483,8 +4327,7 @@ abstract class CommonObject $discount = new DiscountAbsolute($this->db); $discount->fk_soc = $this->socid; $this->tpl['label'] .= $discount->getNomUrl(0, 'discount'); - } - elseif (!empty($line->fk_product)) + } elseif (!empty($line->fk_product)) { $productstatic = new Product($this->db); $productstatic->id = $line->fk_product; @@ -4502,9 +4345,7 @@ abstract class CommonObject { $this->tpl['label'] .= get_date_range($date_start, $date_end); } - } - else - { + } else { $this->tpl['label'] .= ($line->product_type == -1 ? ' ' : ($line->product_type == 1 ? img_object($langs->trans(''), 'service') : img_object($langs->trans(''), 'product'))); if (!empty($line->desc)) { $this->tpl['label'] .= $line->desc; @@ -4526,32 +4367,25 @@ abstract class CommonObject $discount = new DiscountAbsolute($this->db); $discount->fetch($line->fk_remise_except); $this->tpl['description'] = $langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0)); - } - elseif ($line->desc == '(DEPOSIT)') // TODO Not sure this is used for source object + } elseif ($line->desc == '(DEPOSIT)') // TODO Not sure this is used for source object { $discount = new DiscountAbsolute($this->db); $discount->fetch($line->fk_remise_except); $this->tpl['description'] = $langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0)); - } - elseif ($line->desc == '(EXCESS RECEIVED)') + } elseif ($line->desc == '(EXCESS RECEIVED)') { $discount = new DiscountAbsolute($this->db); $discount->fetch($line->fk_remise_except); $this->tpl['description'] = $langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0)); - } - elseif ($line->desc == '(EXCESS PAID)') + } elseif ($line->desc == '(EXCESS PAID)') { $discount = new DiscountAbsolute($this->db); $discount->fetch($line->fk_remise_except); $this->tpl['description'] = $langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0)); - } - else - { + } else { $this->tpl['description'] = dol_trunc($line->desc, 60); } - } - else - { + } else { $this->tpl['description'] = ' '; } @@ -4578,9 +4412,7 @@ abstract class CommonObject if (!empty($module)) { $tpl = dol_buildpath($reldir.'/originproductline.tpl.php'); - } - else - { + } else { $tpl = DOL_DOCUMENT_ROOT.$reldir.'/originproductline.tpl.php'; } @@ -4631,9 +4463,7 @@ abstract class CommonObject { $this->db->commit(); return 1; - } - else - { + } else { $this->error = $this->db->lasterror(); $this->db->rollback(); return 0; @@ -4667,9 +4497,7 @@ abstract class CommonObject $this->error = $this->db->lasterror(); $this->db->rollback(); return -1; - } - else - { + } else { if (!$notrigger) { $result = $this->call_trigger(strtoupper($element).'_DELETE_RESOURCE', $user); @@ -4742,7 +4570,7 @@ abstract class CommonObject // Search template files $file = ''; $classname = ''; - $filefound = 0; + $filefound = ''; $dirmodels = array('/'); if (is_array($conf->modules_parts['models'])) $dirmodels = array_merge($dirmodels, $conf->modules_parts['models']); foreach ($dirmodels as $reldir) @@ -4756,7 +4584,7 @@ abstract class CommonObject $file = dol_buildpath($reldir.$modelspath.$file, 0); if (file_exists($file)) { - $filefound = 1; + $filefound = $file; $classname = $prefix.'_'.$modele; break; } @@ -4832,9 +4660,7 @@ abstract class CommonObject { $arrayofrecords = array(); // The write_file of templates of adherent class need this var $resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, $moreparams); - } - else - { + } else { $resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $moreparams); } // After call of write_file $obj->result['fullpath'] is set with generated file. It will be used to update the ECM database index. @@ -4902,9 +4728,7 @@ abstract class CommonObject if ($result < 0) { setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings'); } - } - else - { + } else { $ecmfile->entity = $conf->entity; $ecmfile->filepath = $rel_dir; $ecmfile->filename = $filename; @@ -4943,9 +4767,7 @@ abstract class CommonObject } } } - } - else - { + } else { dol_syslog('Method ->write_file was called on object '.get_class($obj).' and return a success but the return array ->result["fullpath"] was not set.', LOG_WARNING); } @@ -4953,22 +4775,22 @@ abstract class CommonObject dol_meta_create($this); return 1; - } - else - { + } else { $outputlangs->charset_output = $sav_charset_output; dol_print_error($this->db, "Error generating document for ".__CLASS__.". Error: ".$obj->error, $obj->errors); return -1; } - } - else - { - $this->error = $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file); - dol_print_error('', $this->error); + } else { + if (! $filefound) { + $this->error = $langs->trans("Error").' Failed to load doc generator with modelpaths='.$modelspath.' - modele='.$modele; + dol_print_error('', $this->error); + } else { + $this->error = $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $filefound); + dol_print_error('', $this->error); + } return -1; } - } - else return $reshook; + } else return $reshook; } /** @@ -5073,9 +4895,7 @@ abstract class CommonObject if (!empty($this->errors)) { $this->errors = array_unique(array_merge($this->errors, $interface->errors)); // We use array_unique because when a trigger call another trigger on same object, this->errors is added twice. - } - else - { + } else { $this->errors = $interface->errors; } } @@ -5136,9 +4956,7 @@ abstract class CommonObject if (preg_match('/date/', $type)) { $this->array_languages[$key][$codelang] = $this->db->jdate($value); - } - else - { + } else { $this->array_languages[$key][$codelang] = $value; } @@ -5150,9 +4968,7 @@ abstract class CommonObject if ($numrows) return $numrows; else return 0; - } - else - { + } else { dol_print_error($this->db); return -1; } @@ -5201,14 +5017,12 @@ abstract class CommonObject // Clean parameters // TODO GMT date in memory must be GMT so we should add gm=true in parameters $value_key = dol_mktime(0, 0, 0, $_POST[$postfieldkey."month"], $_POST[$postfieldkey."day"], $_POST[$postfieldkey."year"]); - } - elseif (in_array($key_type, array('datetime'))) + } elseif (in_array($key_type, array('datetime'))) { // Clean parameters // TODO GMT date in memory must be GMT so we should add gm=true in parameters $value_key = dol_mktime($_POST[$postfieldkey."hour"], $_POST[$postfieldkey."min"], 0, $_POST[$postfieldkey."month"], $_POST[$postfieldkey."day"], $_POST[$postfieldkey."year"]); - } - elseif (in_array($key_type, array('checkbox', 'chkbxlst'))) + } elseif (in_array($key_type, array('checkbox', 'chkbxlst'))) { $value_arr = GETPOST($postfieldkey, 'array'); // check if an array if (!empty($value_arr)) { @@ -5216,14 +5030,11 @@ abstract class CommonObject } else { $value_key = ''; } - } - elseif (in_array($key_type, array('price', 'double'))) + } elseif (in_array($key_type, array('price', 'double'))) { $value_arr = GETPOST($postfieldkey, 'alpha'); $value_key = price2num($value_arr); - } - else - { + } else { $value_key = GETPOST($postfieldkey); if (in_array($key_type, array('link')) && $value_key == '-1') $value_key = ''; } @@ -5303,9 +5114,7 @@ abstract class CommonObject $extrafields->fetch_name_optionals_label($this->table_element); } $optionsArray = (!empty($extrafields->attributes[$this->table_element]['label']) ? $extrafields->attributes[$this->table_element]['label'] : null); - } - else - { + } else { global $extrafields; dol_syslog("Warning: fetch_optionals was called with param optionsArray defined when you should pass null now", LOG_WARNING); } @@ -5346,9 +5155,7 @@ abstract class CommonObject { //var_dump($extrafields->attributes[$this->table_element]['type'][$key]); $this->array_options["options_".$key] = $this->db->jdate($value); - } - else - { + } else { $this->array_options["options_".$key] = $value; } @@ -5372,9 +5179,7 @@ abstract class CommonObject if ($numrows) return $numrows; else return 0; - } - else - { + } else { dol_print_error($this->db); return -1; } @@ -5407,9 +5212,7 @@ abstract class CommonObject $this->error = $this->db->lasterror(); $this->db->rollback(); return -1; - } - else - { + } else { $this->db->commit(); return 1; } @@ -5484,9 +5287,7 @@ abstract class CommonObject $value = dol_eval($attrfieldcomputed, 1, 0); dol_syslog($langs->trans("Extrafieldcomputed")." sur ".$attributeLabel."(".$value.")", LOG_DEBUG); $new_array_options[$key] = $value; - } - else - { + } else { $new_array_options[$key] = null; } } @@ -5498,8 +5299,7 @@ abstract class CommonObject { $this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel); return -1; - } - elseif ($value == '') + } elseif ($value == '') { $new_array_options[$key] = null; } @@ -5511,8 +5311,7 @@ abstract class CommonObject dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG); $this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel); return -1; - } - elseif ($value == '') + } elseif ($value == '') { $new_array_options[$key] = null; } @@ -5543,21 +5342,16 @@ abstract class CommonObject if ($this->array_options[$key] == $this->oldcopy->array_options[$key]) // If old value crypted in database is same than submited new value, it means we don't change it, so we don't update. { $new_array_options[$key] = $this->array_options[$key]; // Value is kept - } - else - { + } else { // var_dump($algo); $newvalue = dol_hash($this->array_options[$key], $algo); $new_array_options[$key] = $newvalue; } - } - else - { + } else { $new_array_options[$key] = $this->array_options[$key]; // Value is kept } } - } - else // Common usage + } else // Common usage { $new_array_options[$key] = $this->array_options[$key]; } @@ -5584,24 +5378,20 @@ abstract class CommonObject if ($value == '-1') // -1 is key for no defined in combo list of objects { $new_array_options[$key] = ''; - } - elseif ($value) + } elseif ($value) { $object = new $InfoFieldList[0]($this->db); if (is_numeric($value)) $res = $object->fetch($value); else $res = $object->fetch('', $value); if ($res > 0) $new_array_options[$key] = $object->id; - else - { + else { $this->error = "Id/Ref '".$value."' for object '".$object->element."' not found"; $this->db->rollback(); return -1; } } - } - else - { + } else { dol_syslog('Error bad setup of extrafield', LOG_WARNING); } break; @@ -5648,9 +5438,7 @@ abstract class CommonObject if ($new_array_options[$key] != '' || $new_array_options[$key] == '0') { $sql .= ",'".$this->db->escape($new_array_options[$key])."'"; - } - else - { + } else { $sql .= ",null"; } } @@ -5691,14 +5479,11 @@ abstract class CommonObject { $this->db->rollback(); return -1; - } - else - { + } else { $this->db->commit(); return 1; } - } - else return 0; + } else return 0; } /** @@ -5741,8 +5526,7 @@ abstract class CommonObject { $this->errors[] = $langs->trans("ExtraLanguageHasWrongValue", $attributeLabel); return -1; - } - elseif ($value == '') + } elseif ($value == '') { $new_array_languages[$key] = null; } @@ -5754,8 +5538,7 @@ abstract class CommonObject dol_syslog($langs->trans("ExtraLanguageHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG); $this->errors[] = $langs->trans("ExtraLanguageHasWrongValue", $attributeLabel); return -1; - } - elseif ($value == '') + } elseif ($value == '') { $new_array_languages[$key] = null; } @@ -5814,14 +5597,11 @@ abstract class CommonObject { $this->db->rollback(); return -1; - } - else - { + } else { $this->db->commit(); return 1; } - } - else return 0; + } else return 0; } /** @@ -5869,8 +5649,7 @@ abstract class CommonObject { $this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel); return -1; - } - elseif ($value === '') + } elseif ($value === '') { $this->array_options["options_".$key] = null; } @@ -5882,8 +5661,7 @@ abstract class CommonObject dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG); $this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel); return -1; - } - elseif ($value === '') + } elseif ($value === '') { $this->array_options["options_".$key] = null; } @@ -5944,14 +5722,11 @@ abstract class CommonObject dol_syslog(__METHOD__.$this->error, LOG_ERR); $this->db->rollback(); return -1; - } - else - { + } else { $this->db->commit(); return 1; } - } - else return 0; + } else return 0; } /** @@ -6046,6 +5821,7 @@ abstract class CommonObject $computed = $this->fields[$key]['computed']; $unique = $this->fields[$key]['unique']; $required = $this->fields[$key]['required']; + $autofocusoncreate = $this->fields[$key]['autofocusoncreate']; $langfile = $this->fields[$key]['langfile']; $list = $this->fields[$key]['list']; @@ -6063,39 +5839,30 @@ abstract class CommonObject if (empty($morecss) && !empty($val['css'])) { $morecss = $val['css']; - } - elseif (empty($morecss)) + } elseif (empty($morecss)) { if ($type == 'date') { $morecss = 'minwidth100imp'; - } - elseif ($type == 'datetime' || $type == 'link') + } elseif ($type == 'datetime' || $type == 'link') { $morecss = 'minwidth200imp'; - } - elseif (in_array($type, array('int', 'integer', 'price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type)) + } elseif (in_array($type, array('int', 'integer', 'price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type)) { $morecss = 'maxwidth75'; } elseif ($type == 'url') { $morecss = 'minwidth400'; - } - elseif ($type == 'boolean') + } elseif ($type == 'boolean') { $morecss = ''; - } - else - { + } else { if (round($size) < 12) { $morecss = 'minwidth100'; - } - elseif (round($size) <= 48) + } elseif (round($size) <= 48) { $morecss = 'minwidth200'; - } - else - { + } else { $morecss = 'minwidth400'; } } @@ -6113,56 +5880,44 @@ abstract class CommonObject // TODO Must also support $moreparam $out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1); - } - elseif (in_array($type, array('duration'))) + } elseif (in_array($type, array('duration'))) { $out = $form->select_duration($keyprefix.$key.$keysuffix, $value, 0, 'text', 0, 1); - } - elseif (in_array($type, array('int', 'integer'))) + } elseif (in_array($type, array('int', 'integer'))) { $tmp = explode(',', $size); $newsize = $tmp[0]; - $out = ''; - } - elseif (in_array($type, array('real'))) + $out = ''; + } elseif (in_array($type, array('real'))) { - $out = ''; - } - elseif (preg_match('/varchar/', $type)) + $out = ''; + } elseif (preg_match('/varchar/', $type)) { - $out = ''; - } - elseif (in_array($type, array('mail', 'phone', 'url'))) + $out = ''; + } elseif (in_array($type, array('mail', 'phone', 'url'))) { - $out = ''; - } - elseif ($type == 'text') + $out = ''; + } elseif ($type == 'text') { if (!preg_match('/search_/', $keyprefix)) // If keyprefix is search_ or search_options_, we must just use a simple text field { require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%'); $out = $doleditor->Create(1); - } - else - { + } else { $out = ''; } - } - elseif ($type == 'html') + } elseif ($type == 'html') { if (!preg_match('/search_/', $keyprefix)) // If keyprefix is search_ or search_options_, we must just use a simple text field { require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%'); $out = $doleditor->Create(1); - } - else - { + } else { $out = ''; } - } - elseif ($type == 'boolean') + } elseif ($type == 'boolean') { $checked = ''; if (!empty($value)) { @@ -6171,22 +5926,19 @@ abstract class CommonObject $checked = ' value="1" '; } $out = ''; - } - elseif ($type == 'price') + } elseif ($type == 'price') { if (!empty($value)) { // $value in memory is a php numeric, we format it into user number format. $value = price($value); } $out = ' '.$langs->getCurrencySymbol($conf->currency); - } - elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type)) + } elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type)) { if (!empty($value)) { // $value in memory is a php numeric, we format it into user number format. $value = price($value); } $out = ' '; - } - elseif ($type == 'select') + } elseif ($type == 'select') { $out = ''; if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) @@ -6207,8 +5959,7 @@ abstract class CommonObject $out .= '>'.$val.''; } $out .= ''; - } - elseif ($type == 'sellist') + } elseif ($type == 'sellist') { $out = ''; if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) @@ -6275,14 +6026,10 @@ abstract class CommonObject { $sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra'; $sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4]; - } - else - { + } else { $sqlwhere .= ' WHERE '.$InfoFieldList[4]; } - } - else - { + } else { $sqlwhere .= ' WHERE 1=1'; } // Some tables may have field, some other not. For the moment we disable it. @@ -6310,16 +6057,14 @@ abstract class CommonObject // Several field into label (eq table:code|libelle:rowid) $notrans = false; $fields_label = explode('|', $InfoFieldList[1]); - if (is_array($fields_label)) + if (count($fields_label) > 1) { $notrans = true; foreach ($fields_label as $field_toshow) { $labeltoshow .= $obj->$field_toshow.' '; } - } - else - { + } else { $labeltoshow = $obj->{$InfoFieldList[1]}; } $labeltoshow = dol_trunc($labeltoshow, 45); @@ -6336,16 +6081,13 @@ abstract class CommonObject } } $out .= ''; - } - else - { + } else { if (!$notrans) { $translabel = $langs->trans($obj->{$InfoFieldList[1]}); if ($translabel != $obj->{$InfoFieldList[1]}) { $labeltoshow = dol_trunc($translabel, 18); - } - else { + } else { $labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18); } } @@ -6369,19 +6111,16 @@ abstract class CommonObject $i++; } $this->db->free($resql); - } - else { + } else { print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.
'; } } $out .= ''; - } - elseif ($type == 'checkbox') + } elseif ($type == 'checkbox') { $value_arr = explode(',', $value); $out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ?null:$param['options']), $value_arr, '', 0, '', 0, '100%'); - } - elseif ($type == 'radio') + } elseif ($type == 'radio') { $out = ''; foreach ($param['options'] as $keyopt => $val) @@ -6392,13 +6131,11 @@ abstract class CommonObject $out .= ($value == $keyopt ? 'checked' : ''); $out .= '/>
'; } - } - elseif ($type == 'chkbxlst') + } elseif ($type == 'chkbxlst') { if (is_array($value)) { $value_arr = $value; - } - else { + } else { $value_arr = explode(',', $value); } @@ -6482,7 +6219,7 @@ abstract class CommonObject $notrans = false; // Several field into label (eq table:code|libelle:rowid) $fields_label = explode('|', $InfoFieldList[1]); - if (is_array($fields_label)) { + if (count($fields_label) > 1) { $notrans = true; foreach ($fields_label as $field_toshow) { $labeltoshow .= $obj->$field_toshow.' '; @@ -6536,8 +6273,7 @@ abstract class CommonObject print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.
'; } } - } - elseif ($type == 'link') + } elseif ($type == 'link') { $param_list = array_keys($param['options']); // $param_list='ObjectName:classPath[:AddCreateButtonOrNot[:Filter]]' $param_list_array = explode(':', $param_list[0]); @@ -6560,13 +6296,11 @@ abstract class CommonObject $out .= ''; } } - } - elseif ($type == 'password') + } elseif ($type == 'password') { // If prefix is 'search_', field is used as a filter, we use a common text field. $out = ''; - } - elseif ($type == 'array') + } elseif ($type == 'array') { $newval = $val; $newval['type'] = 'varchar(256)'; @@ -6645,8 +6379,7 @@ abstract class CommonObject { $type = 'varchar'; // convert varchar(xx) int varchar $size = $reg[1]; - } - elseif (preg_match('/varchar/', $type)) $type = 'varchar'; // convert varchar(xx) int varchar + } elseif (preg_match('/varchar/', $type)) $type = 'varchar'; // convert varchar(xx) int varchar if (is_array($val['arrayofkeyval'])) $type = 'select'; if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) $type = 'link'; @@ -6662,8 +6395,7 @@ abstract class CommonObject { $type = 'link'; $param['options'] = array($reg[1].':'.$reg[2]=>$reg[1].':'.$reg[2]); - } - elseif (preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) { + } elseif (preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) { $param['options'] = array($reg[1].':'.$reg[2].':'.$reg[3].':'.$reg[4] => 'N'); $type = 'sellist'; } @@ -6688,35 +6420,26 @@ abstract class CommonObject if ($type == 'date') { $morecss = 'minwidth100imp'; - } - elseif ($type == 'datetime' || $type == 'timestamp') + } elseif ($type == 'datetime' || $type == 'timestamp') { $morecss = 'minwidth200imp'; - } - elseif (in_array($type, array('int', 'double', 'price'))) + } elseif (in_array($type, array('int', 'double', 'price'))) { $morecss = 'maxwidth75'; - } - elseif ($type == 'url') + } elseif ($type == 'url') { $morecss = 'minwidth400'; - } - elseif ($type == 'boolean') + } elseif ($type == 'boolean') { $morecss = ''; - } - else - { + } else { if (round($size) < 12) { $morecss = 'minwidth100'; - } - elseif (round($size) <= 48) + } elseif (round($size) <= 48) { $morecss = 'minwidth200'; - } - else - { + } else { $morecss = 'minwidth400'; } } @@ -6732,59 +6455,49 @@ abstract class CommonObject } else { $value = ''; } - } - elseif ($type == 'datetime' || $type == 'timestamp') + } elseif ($type == 'datetime' || $type == 'timestamp') { if (!empty($value)) { $value = dol_print_date($value, 'dayhour'); } else { $value = ''; } - } - elseif ($type == 'duration') + } elseif ($type == 'duration') { include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; if (!is_null($value) && $value !== '') { $value = convertSecondToTime($value, 'allhourmin'); } - } - elseif ($type == 'double' || $type == 'real') + } elseif ($type == 'double' || $type == 'real') { if (!is_null($value) && $value !== '') { $value = price($value); } - } - elseif ($type == 'boolean') + } elseif ($type == 'boolean') { $checked = ''; if (!empty($value)) { $checked = ' checked '; } $value = ''; - } - elseif ($type == 'mail') + } elseif ($type == 'mail') { $value = dol_print_email($value, 0, 0, 0, 64, 1, 1); - } - elseif ($type == 'url') + } elseif ($type == 'url') { $value = dol_print_url($value, '_blank', 32, 1); - } - elseif ($type == 'phone') + } elseif ($type == 'phone') { $value = dol_print_phone($value, '', 0, 0, '', ' ', 1); - } - elseif ($type == 'price') + } elseif ($type == 'price') { if (!is_null($value) && $value !== '') { $value = price($value, 0, $langs, 0, 0, -1, $conf->currency); } - } - elseif ($type == 'select') + } elseif ($type == 'select') { $value = $param['options'][$value]; - } - elseif ($type == 'sellist') + } elseif ($type == 'sellist') { $param_list = array_keys($param['options']); $InfoFieldList = explode(":", $param_list[0]); @@ -6845,9 +6558,7 @@ abstract class CommonObject $value .= $obj->$field_toshow.' '; } } - } - else - { + } else { $translabel = ''; if (!empty($obj->{$InfoFieldList[1]})) { $translabel = $langs->trans($obj->{$InfoFieldList[1]}); @@ -6858,14 +6569,11 @@ abstract class CommonObject $value = $obj->{$InfoFieldList[1]}; } } - } - else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING); - } - elseif ($type == 'radio') + } else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING); + } elseif ($type == 'radio') { $value = $param['options'][$value]; - } - elseif ($type == 'checkbox') + } elseif ($type == 'checkbox') { $value_arr = explode(',', $value); $value = ''; @@ -6877,8 +6585,7 @@ abstract class CommonObject } $value = ''; } - } - elseif ($type == 'chkbxlst') + } elseif ($type == 'chkbxlst') { $value_arr = explode(',', $value); @@ -6945,8 +6652,7 @@ abstract class CommonObject } else { dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING); } - } - elseif ($type == 'link') + } elseif ($type == 'link') { $out = ''; @@ -6968,24 +6674,18 @@ abstract class CommonObject $object->fetch($value); $value = $object->getNomUrl($getnomurlparam); } - } - else - { + } else { dol_syslog('Error bad setup of extrafield', LOG_WARNING); return 'Error bad setup of extrafield'; } - } - else $value = ''; - } - elseif ($type == 'text' || $type == 'html') + } else $value = ''; + } elseif ($type == 'text' || $type == 'html') { $value = dol_htmlentitiesbr($value); - } - elseif ($type == 'password') + } elseif ($type == 'password') { $value = preg_replace('/./i', '*', $value); - } - elseif ($type == 'array') + } elseif ($type == 'array') { $value = implode('
', $value); } @@ -7063,13 +6763,11 @@ abstract class CommonObject if (is_array($params) && count($params) > 0) { if (array_key_exists('cols', $params)) { $colspan = $params['cols']; - } - elseif (array_key_exists('colspan', $params)) { // For backward compatibility. Use cols instead now. + } elseif (array_key_exists('colspan', $params)) { // For backward compatibility. Use cols instead now. $reg = array(); if (preg_match('/colspan="(\d+)"/', $params['colspan'], $reg)) { $colspan = $reg[1]; - } - else { + } else { $colspan = $params['colspan']; } } @@ -7115,9 +6813,7 @@ abstract class CommonObject } $out .= $extrafields->showSeparator($key, $this, ($colspan + 1)); - } - else - { + } else { $class = (!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : ''); $csstyle = ''; if (is_array($params) && count($params) > 0) { @@ -7314,9 +7010,7 @@ abstract class CommonObject if (($unitPrice > 0) && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) // In most cases, test here is false { $buyPrice = $unitPrice * (1 - $discountPercent / 100); - } - else - { + } else { // Get cost price for margin calculation if (!empty($fk_product)) { @@ -7333,13 +7027,11 @@ abstract class CommonObject if ($product->cost_price > 0) { $buyPrice = $product->cost_price; - } - elseif ($product->pmp > 0) + } elseif ($product->pmp > 0) { $buyPrice = $product->pmp; } - } - elseif (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'pmp') + } elseif (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'pmp') { require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; $product = new Product($this->db); @@ -7362,8 +7054,7 @@ abstract class CommonObject if (($result = $productFournisseur->find_min_price_product_fournisseur($fk_product)) > 0) { $buyPrice = $productFournisseur->fourn_unitprice; - } - elseif ($result < 0) + } elseif ($result < 0) { $this->errors[] = $productFournisseur->error; return -2; @@ -7476,8 +7167,7 @@ abstract class CommonObject if ($nbphoto % $nbbyrow == 1) $return .= '
';
+ } elseif ($nbbyrow < 0) $return .= '
';
$return .= "\n";
@@ -7503,26 +7193,20 @@ abstract class CommonObject
{
$return .= '';
$return .= '.' "'.dol_escape_htmltag($alt).'")
';
- }
- else {
+ } else {
$return .= '';
$return .= '';
}
- }
- else
- {
+ } else {
$return .= '';
$return .= '
';
}
- }
- else
- {
+ } else {
if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)
{
$return .= '';
$return .= '.' "'.dol_escape_htmltag($alt).'")
';
- }
- else {
+ } else {
$return .= '';
$return .= '.' "'.dol_escape_htmltag($alt).'")
';
}
@@ -7557,8 +7241,7 @@ abstract class CommonObject
{
$return .= '
';
}
- }
- else
- {
+ } else {
if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)
{
$return .= '';
$return .= ''; } - } - elseif ($type == 'chkbxlst') + } elseif ($type == 'chkbxlst') { if (is_array($value)) { $value_arr = $value; - } - else { + } else { $value_arr = explode(',', $value); } @@ -1547,14 +1479,12 @@ class ExtraFields $out = $form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%'); } } - } - elseif ($type == 'link') + } elseif ($type == 'link') { $param_list = array_keys($param['options']); // $param_list='ObjectName:classPath' $showempty = (($required && $default != '') ? 0 : 1); $out = $form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss); - } - elseif ($type == 'password') + } elseif ($type == 'password') { // If prefix is 'search_', field is used as a filter, we use a common text field. $out = ''; // Hidden field to reduce impact of evil Google Chrome autopopulate bug. @@ -1602,8 +1532,7 @@ class ExtraFields $list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1); $help = $this->attributes[$extrafieldsobjectkey]['help'][$key]; $hidden = (empty($list) ? 1 : 0); // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller) - } - else // Old usage + } else // Old usage { //dol_syslog("Warning: parameter 'extrafieldsobjectkey' is missing", LOG_WARNING); $label = $this->attribute_label[$key]; @@ -1630,17 +1559,14 @@ class ExtraFields { $showsize = 10; $value = dol_print_date($value, 'day'); - } - elseif ($type == 'datetime') + } elseif ($type == 'datetime') { $showsize = 19; $value = dol_print_date($value, 'dayhour'); - } - elseif ($type == 'int') + } elseif ($type == 'int') { $showsize = 10; - } - elseif ($type == 'double') + } elseif ($type == 'double') { if (!empty($value)) { //$value=price($value); @@ -1648,39 +1574,35 @@ class ExtraFields $number_decimals = $sizeparts[1]; $value = price($value, 0, $langs, 0, 0, $number_decimals, ''); } - } - elseif ($type == 'boolean') + } elseif ($type == 'boolean') { $checked = ''; if (!empty($value)) { $checked = ' checked '; } $value = ''; - } - elseif ($type == 'mail') + } elseif ($type == 'mail') { $value = dol_print_email($value, 0, 0, 0, 64, 1, 1); - } - elseif ($type == 'url') + } elseif ($type == 'url') { $value = dol_print_url($value, '_blank', 32, 1); - } - elseif ($type == 'phone') + } elseif ($type == 'phone') { $value = dol_print_phone($value, '', 0, 0, '', ' ', 'phone'); - } - elseif ($type == 'price') + } elseif ($type == 'price') { //$value = price($value, 0, $langs, 0, 0, -1, $conf->currency); if ($value || $value == '0') $value = price($value, 0, $langs, 0, 0, -1); - } - elseif ($type == 'select') - { - if ($langfile && $param['options'][$value]) $value = $langs->trans($param['options'][$value]); - else $value = $param['options'][$value]; - } - elseif ($type == 'sellist') - { + } elseif ($type == 'select') { + $valstr = $param['options'][$value]; + if (($pos = strpos($valstr, "|")) !== false) + { + $valstr = substr($valstr, 0, $pos); + } + if ($langfile && $valstr) $value = $langs->trans($valstr); + else $value = $valstr; + } elseif ($type == 'sellist') { $param_list = array_keys($param['options']); $InfoFieldList = explode(":", $param_list[0]); @@ -1740,9 +1662,7 @@ class ExtraFields $value .= $obj->$field_toshow.' '; } } - } - else - { + } else { $translabel = ''; if (!empty($obj->{$InfoFieldList[1]})) { $translabel = $langs->trans($obj->{$InfoFieldList[1]}); @@ -1753,14 +1673,11 @@ class ExtraFields $value = $obj->{$InfoFieldList[1]}; } } - } - else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING); - } - elseif ($type == 'radio') + } else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING); + } elseif ($type == 'radio') { $value = $param['options'][$value]; - } - elseif ($type == 'checkbox') + } elseif ($type == 'checkbox') { $value_arr = explode(',', $value); $value = ''; @@ -1772,8 +1689,7 @@ class ExtraFields } } $value = ''; - } - elseif ($type == 'chkbxlst') + } elseif ($type == 'chkbxlst') { $value_arr = explode(',', $value); @@ -1840,8 +1756,7 @@ class ExtraFields } else { dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING); } - } - elseif ($type == 'link') + } elseif ($type == 'link') { $out = ''; @@ -1862,28 +1777,21 @@ class ExtraFields $object->fetch($value); $value = $object->getNomUrl(3); } - } - else - { + } else { dol_syslog('Error bad setup of extrafield', LOG_WARNING); return 'Error bad setup of extrafield'; } } - } - elseif ($type == 'text') + } elseif ($type == 'text') { $value = dol_htmlentitiesbr($value); - } - elseif ($type == 'html') + } elseif ($type == 'html') { $value = dol_htmlentitiesbr($value); - } - elseif ($type == 'password') + } elseif ($type == 'password') { $value = dol_trunc(preg_replace('/./i', '*', $value), 8, 'right', 'UTF-8', 1); - } - else - { + } else { $showsize = round($size); if ($showsize > 48) $showsize = 48; } @@ -1913,36 +1821,28 @@ class ExtraFields if ($type == 'date') { $align = "center"; - } - elseif ($type == 'datetime') + } elseif ($type == 'datetime') { $align = "center"; - } - elseif ($type == 'int') + } elseif ($type == 'int') { $align = "right"; - } - elseif ($type == 'price') + } elseif ($type == 'price') { $align = "right"; - } - elseif ($type == 'double') + } elseif ($type == 'double') { $align = "right"; - } - elseif ($type == 'boolean') + } elseif ($type == 'boolean') { $align = "center"; - } - elseif ($type == 'radio') + } elseif ($type == 'radio') { $align = "center"; - } - elseif ($type == 'checkbox') + } elseif ($type == 'checkbox') { $align = "center"; - } - elseif ($type == 'price') + } elseif ($type == 'price') { $align = "right"; } @@ -2065,14 +1965,12 @@ class ExtraFields // Clean parameters // TODO GMT date in memory must be GMT so we should add gm=true in parameters $value_key = dol_mktime(0, 0, 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]); - } - elseif (in_array($key_type, array('datetime'))) + } elseif (in_array($key_type, array('datetime'))) { // Clean parameters // TODO GMT date in memory must be GMT so we should add gm=true in parameters $value_key = dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]); - } - elseif (in_array($key_type, array('checkbox', 'chkbxlst'))) + } elseif (in_array($key_type, array('checkbox', 'chkbxlst'))) { $value_arr = GETPOST("options_".$key, 'array'); // check if an array if (!empty($value_arr)) { @@ -2080,14 +1978,11 @@ class ExtraFields } else { $value_key = ''; } - } - elseif (in_array($key_type, array('price', 'double'))) + } elseif (in_array($key_type, array('price', 'double'))) { $value_arr = GETPOST("options_".$key, 'alpha'); $value_key = price2num($value_arr); - } - else - { + } else { $value_key = GETPOST("options_".$key); if (in_array($key_type, array('link')) && $value_key == '-1') $value_key = ''; } @@ -2099,12 +1994,10 @@ class ExtraFields $langs->load('errors'); setEventMessages($langs->trans('ErrorFieldsRequired').' : '.implode(', ', $error_field_required), null, 'errors'); return -1; - } - else { + } else { return 1; } - } - else { + } else { return 0; } } @@ -2124,9 +2017,7 @@ class ExtraFields if (is_string($extrafieldsobjectkey) && is_array($this->attributes[$extrafieldsobjectkey]['label'])) { $extralabels = $this->attributes[$extrafieldsobjectkey]['label']; - } - else - { + } else { $extralabels = $extrafieldsobjectkey; } @@ -2148,23 +2039,19 @@ class ExtraFields if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix."year")) continue; // Value was not provided, we should not set it. // Clean parameters $value_key = dol_mktime(GETPOST($keysuffix."options_".$key.$keyprefix."hour", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."min", 'int'), 0, GETPOST($keysuffix."options_".$key.$keyprefix."month", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."day", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."year", 'int')); - } - elseif (in_array($key_type, array('checkbox', 'chkbxlst'))) + } elseif (in_array($key_type, array('checkbox', 'chkbxlst'))) { if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) continue; // Value was not provided, we should not set it. $value_arr = GETPOST($keysuffix."options_".$key.$keyprefix); // Make sure we get an array even if there's only one checkbox $value_arr = (array) $value_arr; $value_key = implode(',', $value_arr); - } - elseif (in_array($key_type, array('price', 'double', 'int'))) + } elseif (in_array($key_type, array('price', 'double', 'int'))) { if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) continue; // Value was not provided, we should not set it. $value_arr = GETPOST($keysuffix."options_".$key.$keyprefix); $value_key = price2num($value_arr); - } - else - { + } else { if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) continue; // Value was not provided, we should not set it. $value_key = GETPOST($keysuffix."options_".$key.$keyprefix); } diff --git a/htdocs/core/class/extralanguages.class.php b/htdocs/core/class/extralanguages.class.php index 71a6fa8c1aa..a57fa20f510 100644 --- a/htdocs/core/class/extralanguages.class.php +++ b/htdocs/core/class/extralanguages.class.php @@ -18,7 +18,7 @@ /** * \file htdocs/core/class/extralanguages.class.php * \ingroup core - * \brief File of class to manage extra fields + * \brief File of class to manage extra languages for some fields */ @@ -69,8 +69,9 @@ class ExtraLanguages // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps /** - * Load array this->attributes with list of fields per object that need an alternate translation. - * You can set variable MAIN_USE_ALTERNATE_TRANSLATION_FOR=elementA:fieldname,fieldname2;elementB:... + * Load array this->attributes with list of fields per object that need an alternate translation. The object and field must be managed with + * the widgetForTranslation() method. + * You must set variable MAIN_USE_ALTERNATE_TRANSLATION_FOR=elementA:fieldname,fieldname2;elementB:... * Example: MAIN_USE_ALTERNATE_TRANSLATION_FOR=societe:name,town;contact:firstname,lastname * * @param string $elementtype Type of element ('' = all, 'adherent', 'commande', 'thirdparty', 'facture', 'propal', 'product', ...). @@ -119,16 +120,16 @@ class ExtraLanguages * * @param string $key Key of attribute * @param string $value Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value) + * @param string $extrafieldsobjectkey If defined (for example $object->table_element), use the new method to get extrafields data * @param string $moreparam To add more parametes on html input tag * @param string $keysuffix Prefix string to add after name and id of field (can be used to avoid duplicate names) * @param string $keyprefix Suffix string to add before name and id of field (can be used to avoid duplicate names) * @param string $morecss More css (to defined size of field. Old behaviour: may also be a numeric) * @param int $objectid Current object id - * @param string $extrafieldsobjectkey If defined (for example $object->table_element), use the new method to get extrafields data * @param string $mode 1=Used for search filters * @return string */ - public function showInputField($key, $value, $moreparam = '', $keysuffix = '', $keyprefix = '', $morecss = '', $objectid = 0, $extrafieldsobjectkey = '', $mode = 0) + public function showInputField($key, $value, $extrafieldsobjectkey, $moreparam = '', $keysuffix = '', $keyprefix = '', $morecss = '', $objectid = 0, $mode = 0) { global $conf, $langs, $form; @@ -145,601 +146,6 @@ class ExtraLanguages $keyprefix = $keyprefix.'options_'; } - if (!empty($extrafieldsobjectkey)) - { - $label = $this->attributes[$extrafieldsobjectkey]['label'][$key]; - $type = $this->attributes[$extrafieldsobjectkey]['type'][$key]; - $size = $this->attributes[$extrafieldsobjectkey]['size'][$key]; - $default = $this->attributes[$extrafieldsobjectkey]['default'][$key]; - $computed = $this->attributes[$extrafieldsobjectkey]['computed'][$key]; - $unique = $this->attributes[$extrafieldsobjectkey]['unique'][$key]; - $required = $this->attributes[$extrafieldsobjectkey]['required'][$key]; - $param = $this->attributes[$extrafieldsobjectkey]['param'][$key]; - $perms = dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1); - $langfile = $this->attributes[$extrafieldsobjectkey]['langfile'][$key]; - $list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1); - $totalizable = $this->attributes[$extrafieldsobjectkey]['totalizable'][$key]; - $help = $this->attributes[$extrafieldsobjectkey]['help'][$key]; - $hidden = (empty($list) ? 1 : 0); // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller) - } - else // Old usage - { - $label = $this->attribute_label[$key]; - $type = $this->attribute_type[$key]; - $size = $this->attribute_size[$key]; - $elementtype = $this->attribute_elementtype[$key]; // Seems not used - $default = $this->attribute_default[$key]; - $computed = $this->attribute_computed[$key]; - $unique = $this->attribute_unique[$key]; - $required = $this->attribute_required[$key]; - $param = $this->attribute_param[$key]; - $langfile = $this->attribute_langfile[$key]; - $list = $this->attribute_list[$key]; - $totalizable = $this->attribute_totalizable[$key]; - $hidden = (empty($list) ? 1 : 0); // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller) - } - - if ($computed) - { - if (!preg_match('/^search_/', $keyprefix)) return ''.$langs->trans("AutomaticallyCalculated").''; - else return ''; - } - - if (empty($morecss)) - { - if ($type == 'date') - { - $morecss = 'minwidth100imp'; - } - elseif ($type == 'datetime' || $type == 'link') - { - $morecss = 'minwidth200imp'; - } - elseif (in_array($type, array('int', 'integer', 'double', 'price'))) - { - $morecss = 'maxwidth75'; - } - elseif ($type == 'password') - { - $morecss = 'maxwidth100'; - } - elseif ($type == 'url') - { - $morecss = 'minwidth400'; - } - elseif ($type == 'boolean') - { - $morecss = ''; - } - else - { - if (round($size) < 12) - { - $morecss = 'minwidth100'; - } - elseif (round($size) <= 48) - { - $morecss = 'minwidth200'; - } - else - { - $morecss = 'minwidth400'; - } - } - } - - if (in_array($type, array('date', 'datetime'))) - { - $tmp = explode(',', $size); - $newsize = $tmp[0]; - - $showtime = in_array($type, array('datetime')) ? 1 : 0; - - // Do not show current date when field not required (see selectDate() method) - if (!$required && $value == '') $value = '-1'; - - // TODO Must also support $moreparam - $out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1); - } - elseif (in_array($type, array('int', 'integer'))) - { - $tmp = explode(',', $size); - $newsize = $tmp[0]; - $out = ''; - } - elseif (preg_match('/varchar/', $type)) - { - $out = ''; - } - elseif (in_array($type, array('mail', 'phone', 'url'))) - { - $out = ''; - } - elseif ($type == 'text') - { - if (!preg_match('/search_/', $keyprefix)) // If keyprefix is search_ or search_options_, we must just use a simple text field - { - require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; - $doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%'); - $out = $doleditor->Create(1); - } - else - { - $out = ''; - } - } - elseif ($type == 'html') - { - if (!preg_match('/search_/', $keyprefix)) // If keyprefix is search_ or search_options_, we must just use a simple text field - { - require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; - $doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%'); - $out = $doleditor->Create(1); - } - else - { - $out = ''; - } - } - elseif ($type == 'boolean') - { - if (empty($mode)) - { - $checked = ''; - if (!empty($value)) { - $checked = ' checked value="1" '; - } else { - $checked = ' value="1" '; - } - $out = ''; - } - else - { - $out .= $form->selectyesno($keyprefix.$key.$keysuffix, $value, 1, false, 1); - } - } - elseif ($type == 'price') - { - if (!empty($value)) { // $value in memory is a php numeric, we format it into user number format. - $value = price($value); - } - $out = ' '.$langs->getCurrencySymbol($conf->currency); - } - elseif ($type == 'double') - { - if (!empty($value)) { // $value in memory is a php numeric, we format it into user number format. - $value = price($value); - } - $out = ' '; - } - elseif ($type == 'select') - { - $out = ''; - if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) - { - include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php'; - $out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0); - } - - $out .= ''; - } - elseif ($type == 'sellist') - { - $out = ''; - if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) - { - include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php'; - $out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0); - } - - $out .= ''; - } - elseif ($type == 'checkbox') - { - $value_arr = explode(',', $value); - $out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ?null:$param['options']), $value_arr, '', 0, '', 0, '100%'); - } - elseif ($type == 'radio') - { - $out = ''; - foreach ($param['options'] as $keyopt => $val) - { - $out .= ''.$val.'
'; - } - } - elseif ($type == 'chkbxlst') - { - if (is_array($value)) { - $value_arr = $value; - } - else { - $value_arr = explode(',', $value); - } - - if (is_array($param['options'])) { - $param_list = array_keys($param['options']); - $InfoFieldList = explode(":", $param_list[0]); - $parentName = ''; - $parentField = ''; - // 0 : tableName - // 1 : label field name - // 2 : key fields name (if differ of rowid) - // 3 : key field parent (for dependent lists) - // 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value - // 5 : id category type - // 6 : ids categories list separated by comma for category root - $keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid'); - - if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) { - list ($parentName, $parentField) = explode('|', $InfoFieldList[3]); - $keyList .= ', '.$parentField; - } - if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) { - if (strpos($InfoFieldList[4], 'extra.') !== false) { - $keyList = 'main.'.$InfoFieldList[2].' as rowid'; - } else { - $keyList = $InfoFieldList[2].' as rowid'; - } - } - - $filter_categorie = false; - if (count($InfoFieldList) > 5) { - if ($InfoFieldList[0] == 'categorie') { - $filter_categorie = true; - } - } - - if ($filter_categorie === false) { - $fields_label = explode('|', $InfoFieldList[1]); - if (is_array($fields_label)) { - $keyList .= ', '; - $keyList .= implode(', ', $fields_label); - } - - $sqlwhere = ''; - $sql = 'SELECT '.$keyList; - $sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0]; - if (!empty($InfoFieldList[4])) { - // can use SELECT request - if (strpos($InfoFieldList[4], '$SEL$') !== false) { - $InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]); - } - - // current object id can be use into filter - if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) { - $InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]); - } elseif (preg_match("#^.*list.php$#", $_SERVER["PHP_SELF"])) { - // Pattern for word=$ID$ - $word = '\b[a-zA-Z0-9-\.-_]+\b=\$ID\$'; - - // Removing space arount =, ( and ) - $InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]); - - $nbPreg = 1; - // While we have parenthesis - while ($nbPreg != 0) { - // Init des compteurs - $nbPregRepl = $nbPregSel = 0; - // On retire toutes les parenthèses sans = avant - $InfoFieldList[4] = preg_replace('#([^=])(\([^)^(]*('.$word.')[^)^(]*\))#', '$1 $3 ', $InfoFieldList[4], -1, $nbPregRepl); - // On retire les espaces autour des = et parenthèses - $InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]); - // On retire toutes les parenthèses avec = avant - $InfoFieldList[4] = preg_replace('#\b[a-zA-Z0-9-\.-_]+\b=\([^)^(]*('.$word.')[^)^(]*\)#', '$1 ', $InfoFieldList[4], -1, $nbPregSel); - // On retire les espaces autour des = et parenthèses - $InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]); - - // Calcul du compteur général pour la boucle - $nbPreg = $nbPregRepl + $nbPregSel; - } - - // Si l'on a un AND ou un OR, avant ou après - preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#', $InfoFieldList[4], $matchCondition); - while (!empty($matchCondition[0])) { - // If the two sides differ but are not empty - if (!empty($matchCondition[1]) && !empty($matchCondition[3]) && $matchCondition[1] != $matchCondition[3]) { - // Nobody sain would do that without parentheses - $InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]); - } else { - if (!empty($matchCondition[1])) { - $boolCond = (($matchCondition[1] == "AND") ? ' AND TRUE ' : ' OR FALSE '); - $InfoFieldList[4] = str_replace($matchCondition[0], $boolCond.$matchCondition[3], $InfoFieldList[4]); - } elseif (!empty($matchCondition[3])) { - $boolCond = (($matchCondition[3] == "AND") ? ' TRUE AND ' : ' FALSE OR'); - $InfoFieldList[4] = str_replace($matchCondition[0], $boolCond, $InfoFieldList[4]); - } else { - $InfoFieldList[4] = " TRUE "; - } - } - - // Si l'on a un AND ou un OR, avant ou après - preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#', $InfoFieldList[4], $matchCondition); - } - } else { - $InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]); - } - - // We have to join on extrafield table - if (strpos($InfoFieldList[4], 'extra.') !== false) { - $sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra'; - $sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4]; - } else { - $sqlwhere .= ' WHERE '.$InfoFieldList[4]; - } - } else { - $sqlwhere .= ' WHERE 1=1'; - } - // Some tables may have field, some other not. For the moment we disable it. - if (in_array($InfoFieldList[0], array('tablewithentity'))) { - $sqlwhere .= ' AND entity = '.$conf->entity; - } - // $sql.=preg_replace('/^ AND /','',$sqlwhere); - // print $sql; - - $sql .= $sqlwhere; - dol_syslog(get_class($this).'::showInputField type=chkbxlst', LOG_DEBUG); - $resql = $this->db->query($sql); - if ($resql) { - $num = $this->db->num_rows($resql); - $i = 0; - - $data = array(); - - while ($i < $num) { - $labeltoshow = ''; - $obj = $this->db->fetch_object($resql); - - $notrans = false; - // Several field into label (eq table:code|libelle:rowid) - $fields_label = explode('|', $InfoFieldList[1]); - if (is_array($fields_label)) { - $notrans = true; - foreach ($fields_label as $field_toshow) { - $labeltoshow .= $obj->$field_toshow.' '; - } - } else { - $labeltoshow = $obj->{$InfoFieldList[1]}; - } - $labeltoshow = dol_trunc($labeltoshow, 45); - - if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) { - foreach ($fields_label as $field_toshow) { - $translabel = $langs->trans($obj->$field_toshow); - if ($translabel != $obj->$field_toshow) { - $labeltoshow = dol_trunc($translabel, 18).' '; - } else { - $labeltoshow = dol_trunc($obj->$field_toshow, 18).' '; - } - } - - $data[$obj->rowid] = $labeltoshow; - } else { - if (!$notrans) { - $translabel = $langs->trans($obj->{$InfoFieldList[1]}); - if ($translabel != $obj->{$InfoFieldList[1]}) { - $labeltoshow = dol_trunc($translabel, 18); - } else { - $labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18); - } - } - if (empty($labeltoshow)) - $labeltoshow = '(not defined)'; - - if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) { - $data[$obj->rowid] = $labeltoshow; - } - - if (!empty($InfoFieldList[3]) && $parentField) { - $parent = $parentName.':'.$obj->{$parentField}; - } - - $data[$obj->rowid] = $labeltoshow; - } - - $i++; - } - $this->db->free($resql); - - $out = $form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%'); - } else { - print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.
'; - } - } else { - require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; - $data = $form->select_all_categories(Categorie::$MAP_ID_TO_CODE[$InfoFieldList[5]], '', 'parent', 64, $InfoFieldList[6], 1, 1); - $out = $form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%'); - } - } - } - elseif ($type == 'link') - { - $param_list = array_keys($param['options']); // $param_list='ObjectName:classPath' - $showempty = (($required && $default != '') ? 0 : 1); - $out = $form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss); - } - elseif ($type == 'password') - { - // If prefix is 'search_', field is used as a filter, we use a common text field. - $out = ''; // Hidden field to reduce impact of evil Google Chrome autopopulate bug. - $out .= ''; - } - if (!empty($hidden)) { - $out = ''; - } - /* Add comments - if ($type == 'date') $out.=' (YYYY-MM-DD)'; - elseif ($type == 'datetime') $out.=' (YYYY-MM-DD HH:MM:SS)'; - */ - /*if (! empty($help) && $keyprefix != 'search_options_') { - $out .= $form->textwithpicto('', $help, 1, 'help', '', 0, 3); - }*/ return $out; } @@ -749,601 +155,16 @@ class ExtraLanguages * * @param string $key Key of attribute * @param string $value Value to show - * @param string $moreparam To add more parameters on html input tag (only checkbox use html input for output rendering) * @param string $extrafieldsobjectkey If defined (for example $object->table_element), function uses the new method to get extrafields data + * @param string $moreparam To add more parameters on html input tag (only checkbox use html input for output rendering) * @return string Formated value */ - public function showOutputField($key, $value, $moreparam = '', $extrafieldsobjectkey = '') + public function showOutputField($key, $value, $extrafieldsobjectkey, $moreparam = '') { global $conf, $langs; - if (!empty($extrafieldsobjectkey)) - { - $label = $this->attributes[$extrafieldsobjectkey]['label'][$key]; - $type = $this->attributes[$extrafieldsobjectkey]['type'][$key]; - $size = $this->attributes[$extrafieldsobjectkey]['size'][$key]; - $default = $this->attributes[$extrafieldsobjectkey]['default'][$key]; - $computed = $this->attributes[$extrafieldsobjectkey]['computed'][$key]; - $unique = $this->attributes[$extrafieldsobjectkey]['unique'][$key]; - $required = $this->attributes[$extrafieldsobjectkey]['required'][$key]; - $param = $this->attributes[$extrafieldsobjectkey]['param'][$key]; - $perms = dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1); - $langfile = $this->attributes[$extrafieldsobjectkey]['langfile'][$key]; - $list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1); - $help = $this->attributes[$extrafieldsobjectkey]['help'][$key]; - $hidden = (empty($list) ? 1 : 0); // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller) - } - else // Old usage - { - //dol_syslog("Warning: parameter 'extrafieldsobjectkey' is missing", LOG_WARNING); - $label = $this->attribute_label[$key]; - $type = $this->attribute_type[$key]; - $size = $this->attribute_size[$key]; - $default = $this->attribute_default[$key]; - $computed = $this->attribute_computed[$key]; - $unique = $this->attribute_unique[$key]; - $required = $this->attribute_required[$key]; - $param = $this->attribute_param[$key]; - $perms = dol_eval($this->attribute_perms[$key], 1); - $langfile = $this->attribute_langfile[$key]; - $list = dol_eval($this->attribute_list[$key], 1); - $help = ''; // Not supported with old syntax - $hidden = (empty($list) ? 1 : 0); // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller) - } - - if ($hidden) return ''; // This is a protection. If field is hidden, we should just not call this method. - - //if ($computed) $value = // $value is already calculated into $value before calling this method - - $showsize = 0; - if ($type == 'date') - { - $showsize = 10; - $value = dol_print_date($value, 'day'); - } - elseif ($type == 'datetime') - { - $showsize = 19; - $value = dol_print_date($value, 'dayhour'); - } - elseif ($type == 'int') - { - $showsize = 10; - } - elseif ($type == 'double') - { - if (!empty($value)) { - //$value=price($value); - $sizeparts = explode(",", $size); - $number_decimals = $sizeparts[1]; - $value = price($value, 0, $langs, 0, 0, $number_decimals, ''); - } - } - elseif ($type == 'boolean') - { - $checked = ''; - if (!empty($value)) { - $checked = ' checked '; - } - $value = ''; - } - elseif ($type == 'mail') - { - $value = dol_print_email($value, 0, 0, 0, 64, 1, 1); - } - elseif ($type == 'url') - { - $value = dol_print_url($value, '_blank', 32, 1); - } - elseif ($type == 'phone') - { - $value = dol_print_phone($value, '', 0, 0, '', ' ', 'phone'); - } - elseif ($type == 'price') - { - $value = price($value, 0, $langs, 0, 0, -1, $conf->currency); - } - elseif ($type == 'select') - { - if ($langfile && $param['options'][$value]) $value = $langs->trans($param['options'][$value]); - else $value = $param['options'][$value]; - } - elseif ($type == 'sellist') - { - $param_list = array_keys($param['options']); - $InfoFieldList = explode(":", $param_list[0]); - - $selectkey = "rowid"; - $keyList = 'rowid'; - - if (count($InfoFieldList) >= 3) - { - $selectkey = $InfoFieldList[2]; - $keyList = $InfoFieldList[2].' as rowid'; - } - - $fields_label = explode('|', $InfoFieldList[1]); - if (is_array($fields_label)) { - $keyList .= ', '; - $keyList .= implode(', ', $fields_label); - } - - $sql = 'SELECT '.$keyList; - $sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0]; - if (strpos($InfoFieldList[4], 'extra') !== false) - { - $sql .= ' as main'; - } - if ($selectkey == 'rowid' && empty($value)) { - $sql .= " WHERE ".$selectkey."=0"; - } elseif ($selectkey == 'rowid') { - $sql .= " WHERE ".$selectkey."=".$this->db->escape($value); - } else { - $sql .= " WHERE ".$selectkey."='".$this->db->escape($value)."'"; - } - - //$sql.= ' AND entity = '.$conf->entity; - - dol_syslog(get_class($this).':showOutputField:$type=sellist', LOG_DEBUG); - $resql = $this->db->query($sql); - if ($resql) - { - $value = ''; // value was used, so now we reste it to use it to build final output - - $obj = $this->db->fetch_object($resql); - - // Several field into label (eq table:code|libelle:rowid) - $fields_label = explode('|', $InfoFieldList[1]); - - if (is_array($fields_label) && count($fields_label) > 1) - { - foreach ($fields_label as $field_toshow) - { - $translabel = ''; - if (!empty($obj->$field_toshow)) { - $translabel = $langs->trans($obj->$field_toshow); - } - if ($translabel != $field_toshow) { - $value .= dol_trunc($translabel, 18).' '; - } else { - $value .= $obj->$field_toshow.' '; - } - } - } - else - { - $translabel = ''; - if (!empty($obj->{$InfoFieldList[1]})) { - $translabel = $langs->trans($obj->{$InfoFieldList[1]}); - } - if ($translabel != $obj->{$InfoFieldList[1]}) { - $value = dol_trunc($translabel, 18); - } else { - $value = $obj->{$InfoFieldList[1]}; - } - } - } - else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING); - } - elseif ($type == 'radio') - { - $value = $param['options'][$value]; - } - elseif ($type == 'checkbox') - { - $value_arr = explode(',', $value); - $value = ''; - $toprint = array(); - if (is_array($value_arr)) - { - foreach ($value_arr as $keyval=>$valueval) { - $toprint[] = '
';
print '';
-}
-else
-{
+} else {
print '';
print '';
print '';
@@ -116,8 +114,7 @@ if ((!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
$formfile = new FormFile($db);
$formfile->form_attach_new_file($_SERVER["PHP_SELF"], 'none', 0, ($section ? $section : -1), $permtoupload, 48, null, '', 0, '', 0, $nameforformuserfile, '', $sectiondir);
-}
-else print ' ';
+} else print ' ';
print '';
// End "Add new file" area
@@ -133,7 +130,7 @@ print '';
// Start left area
-// Confirmation de la suppression d'une ligne categorie
+// Ask confirmation of deletion of directory
if ($action == 'delete_section')
{
print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.$section, $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', $ecmdir->label), 'confirm_deletesection', '', '', 1);
@@ -177,9 +174,7 @@ if (empty($action) || $action == 'editfile' || $action == 'file_manager' || preg
if ($action == 'deletefile') print $form->formconfirm('eeeee', $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 'deletefile');
print '
'.price($totalarray['val'][$totalarray['pos'][$i]]).'
'.get_date_range($line->date_start, $line->date_end, $format).'
';
//print get_date_range($line->date_start, $line->date_end, $format);
}
@@ -177,9 +166,7 @@ if ($user->rights->fournisseur->lire && $line->fk_fournprice > 0)
if ($user->rights->produit->creer || $user->rights->service->creer) // change required right here
{
print $productfourn->getNomUrl();
- }
- else
- {
+ } else {
print $productfourn->ref_supplier;
}
}
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index 63ff6a8a0a7..ad62ad43686 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -120,8 +120,7 @@ if (!empty($morelogincontent)) {
echo $option;
}
}
- }
- else {
+ } else {
echo '';
echo $morelogincontent;
}
@@ -214,8 +213,7 @@ if (!empty($morelogincontent)) {
echo $option."\n";
}
}
-}
-elseif (!empty($moreloginextracontent)) {
+} elseif (!empty($moreloginextracontent)) {
echo '';
echo $moreloginextracontent;
}
diff --git a/htdocs/core/tpl/resource_view.tpl.php b/htdocs/core/tpl/resource_view.tpl.php
index 2680a763a59..50eb0167f36 100644
--- a/htdocs/core/tpl/resource_view.tpl.php
+++ b/htdocs/core/tpl/resource_view.tpl.php
@@ -49,9 +49,7 @@ if ((array) $linked_resources && count($linked_resources) > 0)
print ''.$form->selectyesno('mandatory', $linked_resource['mandatory'] ? 1 : 0, 1).'
';
print '';
print '';
- }
- else
- {
+ } else {
$class = '';
if ($linked_resource['rowid'] == GETPOST('lineid'))
$class = 'highlight';
@@ -87,8 +85,7 @@ if ((array) $linked_resources && count($linked_resources) > 0)
print '';
}
}
-}
-else {
+} else {
print '';
print '
'.$weblangs->trans("YouTryToAccessToAFileThatIsNotAWebsitePage").'
'.$weblangs->trans("YouTryToAccessToAFileThatIsNotAWebsitePage", $websitepage->pageurl, $websitepage->type_container, $websitepage->status).'";
if (!empty($object->dateend)) {
print $form->selectDate($object->dateend, 'dateend', 1, 1, '', "cronform");
- }
- else {
+ } else {
print $form->selectDate(-1, 'dateend', 1, 1, 1, "cronform");
}
print " ";
@@ -526,9 +500,7 @@ if (($action == "create") || ($action == "edit"))
if (!empty($object->datenextrun))
{
print $form->selectDate($object->datenextrun, 'datenextrun', 1, 1, '', "cronform");
- }
- else
- {
+ } else {
print $form->selectDate(-1, 'datenextrun', 1, 1, '', "cronform");
}
print "";
@@ -547,9 +519,7 @@ if (($action == "create") || ($action == "edit"))
print "
";
print "\n";
-}
-else
-{
+} else {
/*
* view card
*/
@@ -621,9 +591,7 @@ else
if (!$object->entity)
{
print $langs->trans("AllEntities");
- }
- else
- {
+ } else {
$mc->getInfo($object->entity);
print $mc->label;
}
@@ -681,8 +649,7 @@ else
print ' ('.$langs->trans('CronFrom').')';
print "'.$langs->trans('NoResourceLinked').'
';
print '';
diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php
index fceb1552f0b..4f368f95473 100644
--- a/htdocs/core/triggers/interface_20_all_Logevents.class.php
+++ b/htdocs/core/triggers/interface_20_all_Logevents.class.php
@@ -106,8 +106,7 @@ class InterfaceLogevents extends DolibarrTriggers
// Initialisation donnees (date,duree,texte,desc)
$text = $langs->transnoentities("NewUserCreated", $object->login);
$desc = $langs->transnoentities("NewUserCreated", $object->login);
- }
- elseif ($action == 'USER_MODIFY')
+ } elseif ($action == 'USER_MODIFY')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
$langs->load("users");
@@ -115,8 +114,7 @@ class InterfaceLogevents extends DolibarrTriggers
// Initialisation donnees (date,duree,texte,desc)
$text = $langs->transnoentities("EventUserModified", $object->login);
$desc = $langs->transnoentities("EventUserModified", $object->login);
- }
- elseif ($action == 'USER_NEW_PASSWORD')
+ } elseif ($action == 'USER_NEW_PASSWORD')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
$langs->load("users");
@@ -124,8 +122,7 @@ class InterfaceLogevents extends DolibarrTriggers
// Initialisation donnees (date,duree,texte,desc)
$text = $langs->transnoentities("NewUserPassword", $object->login);
$desc = $langs->transnoentities("NewUserPassword", $object->login);
- }
- elseif ($action == 'USER_ENABLEDISABLE')
+ } elseif ($action == 'USER_ENABLEDISABLE')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
$langs->load("users");
@@ -140,8 +137,7 @@ class InterfaceLogevents extends DolibarrTriggers
$text = $langs->transnoentities("UserDisabled", $object->login);
$desc = $langs->transnoentities("UserDisabled", $object->login);
}
- }
- elseif ($action == 'USER_DELETE')
+ } elseif ($action == 'USER_DELETE')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
$langs->load("users");
@@ -158,16 +154,14 @@ class InterfaceLogevents extends DolibarrTriggers
// Initialisation donnees (date,duree,texte,desc)
$text = $langs->transnoentities("NewGroupCreated", $object->name);
$desc = $langs->transnoentities("NewGroupCreated", $object->name);
- }
- elseif ($action == 'USERGROUP_MODIFY')
+ } elseif ($action == 'USERGROUP_MODIFY')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
$langs->load("users");
// Initialisation donnees (date,duree,texte,desc)
$text = $langs->transnoentities("GroupModified", $object->name);
$desc = $langs->transnoentities("GroupModified", $object->name);
- }
- elseif ($action == 'USERGROUP_DELETE')
+ } elseif ($action == 'USERGROUP_DELETE')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
$langs->load("users");
@@ -202,9 +196,7 @@ class InterfaceLogevents extends DolibarrTriggers
if ($result > 0)
{
return 1;
- }
- else
- {
+ } else {
$error = "Failed to insert security event: ".$event->error;
$this->errors[] = $error;
$this->error = $error;
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 3206e9377d3..2807a3b5a56 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -96,8 +96,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->sendtoid = 0;
$object->socid = $object->id;
- }
- elseif ($action == 'COMPANY_SENTBYMAIL')
+ } elseif ($action == 'COMPANY_SENTBYMAIL')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "orders"));
@@ -106,8 +105,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
// Parameters $object->sendtoid defined by caller
//$object->sendtoid=0;
- }
- elseif ($action == 'CONTRACT_VALIDATE')
+ } elseif ($action == 'CONTRACT_VALIDATE')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "contracts"));
@@ -116,8 +114,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg = $langs->transnoentities("ContractValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
$object->sendtoid = 0;
- }
- elseif ($action == 'CONTRACT_SENTBYMAIL')
+ } elseif ($action == 'CONTRACT_SENTBYMAIL')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "contracts"));
@@ -130,8 +127,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
// Parameters $object->sendtoid defined by caller
//$object->sendtoid=0;
- }
- elseif ($action == 'PROPAL_VALIDATE')
+ } elseif ($action == 'PROPAL_VALIDATE')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "propal"));
@@ -140,8 +136,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
$object->sendtoid = 0;
- }
- elseif ($action == 'PROPAL_SENTBYMAIL')
+ } elseif ($action == 'PROPAL_SENTBYMAIL')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "propal"));
@@ -154,8 +149,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
// Parameters $object->sendtoid defined by caller
//$object->sendtoid=0;
- }
- elseif ($action == 'PROPAL_CLOSE_SIGNED')
+ } elseif ($action == 'PROPAL_CLOSE_SIGNED')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "propal"));
@@ -164,8 +158,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg = $langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
$object->sendtoid = 0;
- }
- elseif ($action == 'PROPAL_CLASSIFY_BILLED')
+ } elseif ($action == 'PROPAL_CLASSIFY_BILLED')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "propal"));
@@ -174,8 +167,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg = $langs->transnoentities("PropalClassifiedBilledInDolibarr", $object->ref);
$object->sendtoid = 0;
- }
- elseif ($action == 'PROPAL_CLOSE_REFUSED')
+ } elseif ($action == 'PROPAL_CLOSE_REFUSED')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "propal"));
@@ -184,8 +176,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg = $langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
$object->sendtoid = 0;
- }
- elseif ($action == 'ORDER_VALIDATE')
+ } elseif ($action == 'ORDER_VALIDATE')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "orders"));
@@ -194,8 +185,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
$object->sendtoid = 0;
- }
- elseif ($action == 'ORDER_CLOSE')
+ } elseif ($action == 'ORDER_CLOSE')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "orders"));
@@ -204,8 +194,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg = $langs->transnoentities("OrderDeliveredInDolibarr", $object->ref);
$object->sendtoid = 0;
- }
- elseif ($action == 'ORDER_CLASSIFY_BILLED')
+ } elseif ($action == 'ORDER_CLASSIFY_BILLED')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "orders"));
@@ -214,8 +203,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg = $langs->transnoentities("OrderBilledInDolibarr", $object->ref);
$object->sendtoid = 0;
- }
- elseif ($action == 'ORDER_CANCEL')
+ } elseif ($action == 'ORDER_CANCEL')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "orders"));
@@ -224,8 +212,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg = $langs->transnoentities("OrderCanceledInDolibarr", $object->ref);
$object->sendtoid = 0;
- }
- elseif ($action == 'ORDER_SENTBYMAIL')
+ } elseif ($action == 'ORDER_SENTBYMAIL')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "orders"));
@@ -238,8 +225,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
// Parameters $object->sendtoid defined by caller
//$object->sendtoid=0;
- }
- elseif ($action == 'BILL_VALIDATE')
+ } elseif ($action == 'BILL_VALIDATE')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "bills"));
@@ -248,8 +234,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
$object->sendtoid = 0;
- }
- elseif ($action == 'BILL_UNVALIDATE')
+ } elseif ($action == 'BILL_UNVALIDATE')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "bills"));
@@ -258,8 +243,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
$object->sendtoid = 0;
- }
- elseif ($action == 'BILL_SENTBYMAIL')
+ } elseif ($action == 'BILL_SENTBYMAIL')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "bills"));
@@ -272,8 +256,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
// Parameters $object->sendtoid defined by caller
//$object->sendtoid=0;
- }
- elseif ($action == 'BILL_PAYED')
+ } elseif ($action == 'BILL_PAYED')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "bills"));
@@ -283,8 +266,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg = $langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
$object->sendtoid = 0;
- }
- elseif ($action == 'BILL_CANCEL')
+ } elseif ($action == 'BILL_CANCEL')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "bills"));
@@ -293,8 +275,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg = $langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
$object->sendtoid = 0;
- }
- elseif ($action == 'FICHINTER_CREATE')
+ } elseif ($action == 'FICHINTER_CREATE')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "interventions"));
@@ -305,8 +286,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->sendtoid = 0;
$object->fk_element = 0;
$object->elementtype = '';
- }
- elseif ($action == 'FICHINTER_VALIDATE')
+ } elseif ($action == 'FICHINTER_VALIDATE')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "interventions"));
@@ -317,8 +297,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->sendtoid = 0;
$object->fk_element = 0;
$object->elementtype = '';
- }
- elseif ($action == 'FICHINTER_MODIFY')
+ } elseif ($action == 'FICHINTER_MODIFY')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "interventions"));
@@ -329,8 +308,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->sendtoid = 0;
$object->fk_element = 0;
$object->elementtype = '';
- }
- elseif ($action == 'FICHINTER_SENTBYMAIL')
+ } elseif ($action == 'FICHINTER_SENTBYMAIL')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "interventions"));
@@ -343,8 +321,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
// Parameters $object->sendtoid defined by caller
//$object->sendtoid=0;
- }
- elseif ($action == 'FICHINTER_CLASSIFY_BILLED')
+ } elseif ($action == 'FICHINTER_CLASSIFY_BILLED')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "interventions"));
@@ -353,8 +330,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg = $langs->transnoentities("InterventionClassifiedBilledInDolibarr", $object->ref);
$object->sendtoid = 0;
- }
- elseif ($action == 'FICHINTER_CLASSIFY_UNBILLED')
+ } elseif ($action == 'FICHINTER_CLASSIFY_UNBILLED')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "interventions"));
@@ -363,8 +339,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg = $langs->transnoentities("InterventionClassifiedUnbilledInDolibarr", $object->ref);
$object->sendtoid = 0;
- }
- elseif ($action == 'FICHINTER_DELETE')
+ } elseif ($action == 'FICHINTER_DELETE')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "interventions"));
@@ -375,8 +350,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->sendtoid = 0;
$object->fk_element = 0;
$object->elementtype = '';
- }
- elseif ($action == 'SHIPPING_VALIDATE')
+ } elseif ($action == 'SHIPPING_VALIDATE')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "sendings"));
@@ -389,8 +363,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
// Parameters $object->sendtoid defined by caller
//$object->sendtoid=0;
- }
- elseif ($action == 'SHIPPING_SENTBYMAIL')
+ } elseif ($action == 'SHIPPING_SENTBYMAIL')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "sendings"));
@@ -417,8 +390,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
// Parameters $object->sendtoid defined by caller
//$object->sendtoid=0;
- }
- elseif ($action == 'RECEPTION_SENTBYMAIL')
+ } elseif ($action == 'RECEPTION_SENTBYMAIL')
{
$langs->load("agenda");
$langs->load("other");
@@ -432,8 +404,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
// Parameters $object->sendtoid defined by caller
//$object->sendtoid=0;
- }
- elseif ($action == 'PROPOSAL_SUPPLIER_VALIDATE')
+ } elseif ($action == 'PROPOSAL_SUPPLIER_VALIDATE')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "propal"));
@@ -442,8 +413,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
$object->sendtoid = 0;
- }
- elseif ($action == 'PROPOSAL_SUPPLIER_SENTBYMAIL')
+ } elseif ($action == 'PROPOSAL_SUPPLIER_SENTBYMAIL')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "propal"));
@@ -456,8 +426,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
// Parameters $object->sendtoid defined by caller
//$object->sendtoid=0;
- }
- elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_SIGNED')
+ } elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_SIGNED')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "propal"));
@@ -466,8 +435,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg = $langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
$object->sendtoid = 0;
- }
- elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_REFUSED')
+ } elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_REFUSED')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "propal"));
@@ -476,8 +444,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg = $langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
$object->sendtoid = 0;
- }
- elseif ($action == 'ORDER_SUPPLIER_CREATE')
+ } elseif ($action == 'ORDER_SUPPLIER_CREATE')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "orders"));
@@ -486,8 +453,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg = $langs->transnoentities("OrderCreatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
$object->sendtoid = 0;
- }
- elseif ($action == 'ORDER_SUPPLIER_VALIDATE')
+ } elseif ($action == 'ORDER_SUPPLIER_VALIDATE')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "orders"));
@@ -496,8 +462,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
$object->sendtoid = 0;
- }
- elseif ($action == 'ORDER_SUPPLIER_APPROVE')
+ } elseif ($action == 'ORDER_SUPPLIER_APPROVE')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "orders"));
@@ -506,8 +471,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg = $langs->transnoentities("OrderApprovedInDolibarr", $object->ref);
$object->sendtoid = 0;
- }
- elseif ($action == 'ORDER_SUPPLIER_REFUSE')
+ } elseif ($action == 'ORDER_SUPPLIER_REFUSE')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "orders"));
@@ -516,8 +480,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg = $langs->transnoentities("OrderRefusedInDolibarr", $object->ref);
$object->sendtoid = 0;
- }
- elseif ($action == 'ORDER_SUPPLIER_SUBMIT')
+ } elseif ($action == 'ORDER_SUPPLIER_SUBMIT')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "orders"));
@@ -526,8 +489,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg = $langs->transnoentities("SupplierOrderSubmitedInDolibarr", ($object->newref ? $object->newref : $object->ref));
$object->sendtoid = 0;
- }
- elseif ($action == 'ORDER_SUPPLIER_RECEIVE')
+ } elseif ($action == 'ORDER_SUPPLIER_RECEIVE')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "orders"));
@@ -536,8 +498,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg = $langs->transnoentities("SupplierOrderReceivedInDolibarr", ($object->newref ? $object->newref : $object->ref));
$object->sendtoid = 0;
- }
- elseif ($action == 'ORDER_SUPPLIER_SENTBYMAIL')
+ } elseif ($action == 'ORDER_SUPPLIER_SENTBYMAIL')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "bills", "orders"));
@@ -550,8 +511,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
// Parameters $object->sendtoid defined by caller
//$object->sendtoid=0;
- }
- elseif ($action == 'ORDER_SUPPLIER_CLASSIFY_BILLED')
+ } elseif ($action == 'ORDER_SUPPLIER_CLASSIFY_BILLED')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "bills", "orders"));
@@ -563,8 +523,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
}
$object->sendtoid = 0;
- }
- elseif ($action == 'BILL_SUPPLIER_VALIDATE')
+ } elseif ($action == 'BILL_SUPPLIER_VALIDATE')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "bills"));
@@ -573,8 +532,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
$object->sendtoid = 0;
- }
- elseif ($action == 'BILL_SUPPLIER_UNVALIDATE')
+ } elseif ($action == 'BILL_SUPPLIER_UNVALIDATE')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "bills"));
@@ -583,8 +541,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
$object->sendtoid = 0;
- }
- elseif ($action == 'BILL_SUPPLIER_SENTBYMAIL')
+ } elseif ($action == 'BILL_SUPPLIER_SENTBYMAIL')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "bills", "orders"));
@@ -597,8 +554,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
// Parameters $object->sendtoid defined by caller
//$object->sendtoid=0;
- }
- elseif ($action == 'BILL_SUPPLIER_PAYED')
+ } elseif ($action == 'BILL_SUPPLIER_PAYED')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "bills"));
@@ -607,8 +563,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg = $langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
$object->sendtoid = 0;
- }
- elseif ($action == 'BILL_SUPPLIER_CANCELED')
+ } elseif ($action == 'BILL_SUPPLIER_CANCELED')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "bills"));
@@ -631,8 +586,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
$object->sendtoid = 0;
- }
- elseif ($action == 'MEMBER_MODIFY')
+ } elseif ($action == 'MEMBER_MODIFY')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "members"));
@@ -643,8 +597,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
$object->sendtoid = 0;
- }
- elseif ($action == 'MEMBER_SUBSCRIPTION_CREATE')
+ } elseif ($action == 'MEMBER_SUBSCRIPTION_CREATE')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "members"));
@@ -666,8 +619,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->sendtoid = 0;
if ($object->fk_soc > 0) $object->socid = $object->fk_soc;
- }
- elseif ($action == 'MEMBER_SUBSCRIPTION_MODIFY')
+ } elseif ($action == 'MEMBER_SUBSCRIPTION_MODIFY')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "members"));
@@ -689,8 +641,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->sendtoid = 0;
if ($object->fk_soc > 0) $object->socid = $object->fk_soc;
- }
- elseif ($action == 'MEMBER_SUBSCRIPTION_DELETE')
+ } elseif ($action == 'MEMBER_SUBSCRIPTION_DELETE')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "members"));
@@ -704,8 +655,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->sendtoid = 0;
if ($object->fk_soc > 0) $object->socid = $object->fk_soc;
- }
- elseif ($action == 'MEMBER_RESILIATE')
+ } elseif ($action == 'MEMBER_RESILIATE')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "members"));
@@ -716,8 +666,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
$object->sendtoid = 0;
- }
- elseif ($action == 'MEMBER_DELETE')
+ } elseif ($action == 'MEMBER_DELETE')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "members"));
@@ -741,8 +690,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg .= "\n".$langs->transnoentities("Project").': '.$object->ref;
$object->sendtoid = 0;
- }
- elseif ($action == 'PROJECT_VALIDATE')
+ } elseif ($action == 'PROJECT_VALIDATE')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "projects"));
@@ -752,8 +700,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg .= "\n".$langs->transnoentities("Project").': '.$object->ref;
$object->sendtoid = 0;
- }
- elseif ($action == 'PROJECT_MODIFY')
+ } elseif ($action == 'PROJECT_MODIFY')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "projects"));
@@ -776,8 +723,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg .= "\n".$langs->transnoentities("Task").': '.$object->ref;
$object->sendtoid = 0;
- }
- elseif ($action == 'TASK_MODIFY')
+ } elseif ($action == 'TASK_MODIFY')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "projects"));
@@ -787,8 +733,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg .= "\n".$langs->transnoentities("Task").': '.$object->ref;
$object->sendtoid = 0;
- }
- elseif ($action == 'TASK_DELETE')
+ } elseif ($action == 'TASK_DELETE')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "projects"));
@@ -798,8 +743,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg .= "\n".$langs->transnoentities("Task").': '.$object->ref;
$object->sendtoid = 0;
- }
- elseif ($action == 'TICKET_ASSIGNED')
+ } elseif ($action == 'TICKET_ASSIGNED')
{
// Load translation files required by the page
$langs->loadLangs(array("agenda", "other", "projects"));
@@ -811,9 +755,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
$tmpuser = new User($this->db);
$tmpuser->fetch($object->oldcopy->fk_user_assign);
$object->actionmsg .= "\n".$langs->transnoentities("OldUser").': '.$tmpuser->getFullName($langs);
- }
- else
- {
+ } else {
$object->actionmsg .= "\n".$langs->transnoentities("OldUser").': '.$langs->trans("None");
}
if ($object->fk_user_assign > 0)
@@ -821,15 +763,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
$tmpuser = new User($this->db);
$tmpuser->fetch($object->fk_user_assign);
$object->actionmsg .= "\n".$langs->transnoentities("NewUser").': '.$tmpuser->getFullName($langs);
- }
- else
- {
+ } else {
$object->actionmsg .= "\n".$langs->transnoentities("NewUser").': '.$langs->trans("None");
}
$object->sendtoid = 0;
}
// TODO Merge all previous cases into this generic one
- else // $action = BILL_DELETE, TICKET_CREATE, TICKET_MODIFY, TICKET_DELETE, ...
+ else // $action = BILL_DELETE, TICKET_CREATE, TICKET_MODIFY, TICKET_DELETE, ...
{
// Note: We are here only if $conf->global->MAIN_AGENDA_ACTIONAUTO_action is on (tested at begining of this function).
// Note that these key can be set in agenda setup, only if defined into c_action_trigger
@@ -866,9 +806,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
if (is_array($object->sendtoid))
{
if (count($object->sendtoid) == 1) $contactforaction->fetch(reset($object->sendtoid));
- }
- else
- {
+ } else {
if ($object->sendtoid > 0) $contactforaction->fetch($object->sendtoid);
}
// Set societeforaction.
@@ -898,7 +836,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
$actioncomm->datep = $now;
$actioncomm->datef = $now;
$actioncomm->durationp = 0;
- $actioncomm->punctual = 1;
$actioncomm->percentage = -1; // Not applicable
$actioncomm->socid = $societeforaction->id;
$actioncomm->contactid = $contactforaction->id;
@@ -952,9 +889,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
{
$_SESSION['LAST_ACTION_CREATED'] = $ret;
return 1;
- }
- else
- {
+ } else {
$this->error = "Failed to insert event : ".$actioncomm->error." ".join(',', $actioncomm->errors);
$this->errors = $actioncomm->errors;
diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
index 2135f463ca7..19eab2e5974 100644
--- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
+++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
@@ -93,8 +93,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
elseif ($action == 'CASHCONTROL_VALIDATE')
{
$amounts = (double) $object->cash + (double) $object->cheque + (double) $object->card;
- }
- else $amounts = (double) $object->total_ttc;
+ } else $amounts = (double) $object->total_ttc;
}
/*if ($action === 'BILL_PAYED' || $action==='BILL_UNPAYED'
|| $action === 'BILL_SUPPLIER_PAYED' || $action === 'BILL_SUPPLIER_UNPAYED')
@@ -112,8 +111,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
$amounts += price2num($amount);
}
}
- }
- elseif (strpos($action, 'PAYMENT') !== false && !in_array($action, array('PAYMENT_ADD_TO_BANK')))
+ } elseif (strpos($action, 'PAYMENT') !== false && !in_array($action, array('PAYMENT_ADD_TO_BANK')))
{
$qualified++;
$amounts = (double) $object->amount;
@@ -142,9 +140,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
$this->error = $b->error;
$this->errors = $b->errors;
return -1;
- }
- else
- {
+ } else {
return 1;
}
}
diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
index 8b8c392615a..9c3987cbeb1 100644
--- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
@@ -91,8 +91,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
}
- }
- elseif ($action == 'USER_MODIFY')
+ } elseif ($action == 'USER_MODIFY')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
@@ -130,8 +129,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
}
- }
- elseif ($action == 'USER_NEW_PASSWORD')
+ } elseif ($action == 'USER_NEW_PASSWORD')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
@@ -167,12 +165,10 @@ class InterfaceLdapsynchro extends DolibarrTriggers
if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
}
- }
- elseif ($action == 'USER_ENABLEDISABLE')
+ } elseif ($action == 'USER_ENABLEDISABLE')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
- }
- elseif ($action == 'USER_DELETE')
+ } elseif ($action == 'USER_DELETE')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
@@ -190,8 +186,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
}
- }
- elseif ($action == 'USER_SETINGROUP')
+ } elseif ($action == 'USER_SETINGROUP')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
@@ -228,8 +223,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
}
- }
- elseif ($action == 'USER_REMOVEFROMGROUP')
+ } elseif ($action == 'USER_REMOVEFROMGROUP')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
@@ -292,8 +286,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
}
- }
- elseif ($action == 'USERGROUP_MODIFY')
+ } elseif ($action == 'USERGROUP_MODIFY')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
@@ -329,8 +322,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
}
- }
- elseif ($action == 'USERGROUP_DELETE')
+ } elseif ($action == 'USERGROUP_DELETE')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
@@ -369,8 +361,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
}
- }
- elseif ($action == 'CONTACT_MODIFY')
+ } elseif ($action == 'CONTACT_MODIFY')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
if (!empty($conf->global->LDAP_CONTACT_ACTIVE))
@@ -406,8 +397,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
}
- }
- elseif ($action == 'CONTACT_DELETE')
+ } elseif ($action == 'CONTACT_DELETE')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
if (!empty($conf->global->LDAP_CONTACT_ACTIVE))
@@ -475,8 +465,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
}
- }
- elseif ($action == 'MEMBER_VALIDATE')
+ } elseif ($action == 'MEMBER_VALIDATE')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
@@ -499,8 +488,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
}
}
- }
- elseif ($action == 'MEMBER_SUBSCRIPTION')
+ } elseif ($action == 'MEMBER_SUBSCRIPTION')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
@@ -527,8 +515,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
}
}
- }
- elseif ($action == 'MEMBER_MODIFY')
+ } elseif ($action == 'MEMBER_MODIFY')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
@@ -626,8 +613,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
$this->errors[] = "ErrorLDAP ".$ldap->error;
}
}
- }
- elseif ($action == 'MEMBER_NEW_PASSWORD')
+ } elseif ($action == 'MEMBER_NEW_PASSWORD')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
@@ -653,8 +639,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
}
}
}
- }
- elseif ($action == 'MEMBER_RESILIATE')
+ } elseif ($action == 'MEMBER_RESILIATE')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
@@ -680,8 +665,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
}
}
}
- }
- elseif ($action == 'MEMBER_DELETE')
+ } elseif ($action == 'MEMBER_DELETE')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
@@ -764,8 +748,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
$this->errors[] = "ErrorLDAP ".$ldap->error;
}
}
- }
- elseif ($action == 'MEMBER_TYPE_MODIFY')
+ } elseif ($action == 'MEMBER_TYPE_MODIFY')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
@@ -807,8 +790,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
$this->errors[] = "ErrorLDAP ".$ldap->error;
}
}
- }
- elseif ($action == 'MEMBER_TYPE_DELETE')
+ } elseif ($action == 'MEMBER_TYPE_DELETE')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
diff --git a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
index be5465c06f2..59005b2f34d 100644
--- a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
@@ -71,15 +71,12 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
$this->error = $object->context['linkto']->error;
$this->errors = $object->context['linkto']->errors;
$return = -1;
- }
- else
- {
+ } else {
$return = 1;
}
return $return;
- }
- elseif ($action == 'CATEGORY_UNLINK')
+ } elseif ($action == 'CATEGORY_UNLINK')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
@@ -89,9 +86,7 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
$this->error = $object->context['unlinkoff']->error;
$this->errors = $object->context['unlinkoff']->errors;
$return = -1;
- }
- else
- {
+ } else {
$return = 1;
}
@@ -109,15 +104,12 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
$this->errors = $object->errors;
if (!empty($object->error)) $this->errors[] = $object->error;
$return = -1;
- }
- else
- {
+ } else {
$return = 1;
}
return $return;
- }
- elseif ($action == 'MEMBER_MODIFY')
+ } elseif ($action == 'MEMBER_MODIFY')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
@@ -132,9 +124,7 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
$this->errors = $object->oldcopy->errors;
if (!empty($object->oldcopy->error)) $this->errors[] = $object->oldcopy->error;
$return = -1;
- }
- else
- {
+ } else {
$return = 1;
}
}
@@ -144,16 +134,13 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
$this->errors = $object->errors;
if (!empty($object->error)) $this->errors[] = $object->error;
$return = -1;
- }
- else
- {
+ } else {
$return = 1;
}
}
return $return;
- }
- elseif ($action == 'MEMBER_RESILIATE' || $action == 'MEMBER_DELETE')
+ } elseif ($action == 'MEMBER_RESILIATE' || $action == 'MEMBER_DELETE')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
@@ -164,9 +151,7 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
$this->errors = $object->errors;
if (!empty($object->error)) $this->errors[] = $object->error;
$return = -1;
- }
- else
- {
+ } else {
$return = 1;
}
diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
index 760a2101087..a7157ea866a 100644
--- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
+++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
@@ -140,8 +140,7 @@ class InterfaceNotification extends DolibarrTriggers
$i++;
}
- }
- else dol_print_error($this->db);
+ } else dol_print_error($this->db);
return $ret;
}
diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
index 6bd33c5b2f9..3b915dee032 100644
--- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
+++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
@@ -170,9 +170,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
}
$ok = 1;
- }
- else
- {
+ } else {
$this->error = $userstat->error;
$this->errors = $userstat->errors;
}
diff --git a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
index e6c2df36ee1..5c0f17dd90d 100644
--- a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
+++ b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
@@ -177,9 +177,7 @@ class InterfaceStripe extends DolibarrTriggers
//$taxids = $customer->allTaxIds($customer->id);
$customer->createTaxId($customer->id, array('type'=>'eu_vat', 'value'=>$vatcleaned));
}
- }
- else
- {
+ } else {
$taxids = $customer->allTaxIds($customer->id);
if (is_array($taxids->data))
{
@@ -193,8 +191,7 @@ class InterfaceStripe extends DolibarrTriggers
// Update Customer on Stripe
$customer->save();
- }
- catch (Exception $e)
+ } catch (Exception $e)
{
//var_dump(\Stripe\Stripe::getApiVersion());
$this->errors[] = $e->getMessage();
@@ -214,8 +211,7 @@ class InterfaceStripe extends DolibarrTriggers
{
try {
$customer->delete();
- }
- catch (Exception $e)
+ } catch (Exception $e)
{
dol_syslog("Failed to delete Stripe customer ".$e->getMessage(), LOG_WARNING);
}
@@ -254,8 +250,7 @@ class InterfaceStripe extends DolibarrTriggers
$card->metadata = array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR']));
try {
$card->save();
- }
- catch (Exception $e)
+ } catch (Exception $e)
{
$ok = -1;
$this->error = $e->getMessages();
diff --git a/htdocs/core/website.inc.php b/htdocs/core/website.inc.php
index 5c618b089a3..31d4d45723f 100644
--- a/htdocs/core/website.inc.php
+++ b/htdocs/core/website.inc.php
@@ -71,11 +71,11 @@ if ($pageid > 0)
$weblangs->setDefaultLang(GETPOSTISSET('lang') ? GETPOST('lang', 'aZ09') : (empty($_COOKIE['weblangs-shortcode']) ? 'auto' : $_COOKIE['weblangs-shortcode']));
$pagelangs->setDefaultLang($websitepage->lang ? $websitepage->lang : $weblangs->shortlang);
- if (!defined('USEDOLIBARREDITOR') && in_array($websitepage->type_container, array('menu', 'other')))
+ if (!defined('USEDOLIBARREDITOR') && (in_array($websitepage->type_container, array('menu', 'other')) || empty($websitepage->status)))
{
$weblangs->load("website");
http_response_code(404);
- print ''.$weblangs->trans("YouTryToAccessToAFileThatIsNotAWebsitePage").'
'.$weblangs->trans("YouTryToAccessToAFileThatIsNotAWebsitePage", $websitepage->pageurl, $websitepage->type_container, $websitepage->status).'
'.$langs->trans('CronArgs').': '.$obj->params; $texttoshow .= '
'.$langs->trans('Comment').': '.$langs->trans($obj->note); - } - elseif ($obj->jobtype == 'command') + } elseif ($obj->jobtype == 'command') { $text = $langs->trans('CronCommand'); $texttoshow = $langs->trans('CronCommand').': '.dol_trunc($obj->command); @@ -586,9 +577,7 @@ if ($num > 0) $i++; } -} -else -{ +} else { print '
'.$langs->trans('DoPayment').'
';
- }
- else
- {
+ } else {
print '';
}
}
@@ -833,14 +817,10 @@ if (!empty($id) && $action != 'edit')
if ($object->statut == -1 || $object->statut == 0)
{
print '";
- }
- else
- {
+ } else {
print '";
}
- }
- else
- {
+ } else {
print '";
}
diff --git a/htdocs/don/class/api_donations.class.php b/htdocs/don/class/api_donations.class.php
index 872e2009b9b..5d35b24707f 100644
--- a/htdocs/don/class/api_donations.class.php
+++ b/htdocs/don/class/api_donations.class.php
@@ -157,8 +157,7 @@ class Donations extends DolibarrApi
}
$i++;
}
- }
- else {
+ } else {
throw new RestException(503, 'Error when retrieve donation list : '.$db->lasterror());
}
if (!count($obj_ret)) {
@@ -230,9 +229,7 @@ class Donations extends DolibarrApi
if ($this->don->update(DolibarrApiAccess::$user) > 0)
{
return $this->get($id);
- }
- else
- {
+ } else {
throw new RestException(500, $this->don->error);
}
}
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 59c293e6386..6b6cbb3d36e 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -314,9 +314,7 @@ class Don extends CommonObject
{
$error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Amount'));
$err++;
- }
- else
- {
+ } else {
if ($this->amount < $minimum && $minimum > 0)
{
$error_string[] = $langs->trans('MinimumAmount', $langs->transnoentitiesnoconv('$minimum'));
@@ -329,9 +327,7 @@ class Don extends CommonObject
{
$this->errors = $error_string;
return 0;
- }
- else
- {
+ } else {
return 1;
}
}
@@ -422,9 +418,7 @@ class Don extends CommonObject
if ($result < 0) { $error++; }
// End call triggers
}
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
$this->errno = $this->db->lasterrno();
$error++;
@@ -452,9 +446,7 @@ class Don extends CommonObject
{
$this->db->commit();
return $ret;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
@@ -533,15 +525,11 @@ class Don extends CommonObject
{
$this->db->commit();
$result = 1;
- }
- else
- {
+ } else {
$this->db->rollback();
$result = -1;
}
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
$this->errors[] = $this->error;
$this->db->rollback();
@@ -612,9 +600,7 @@ class Don extends CommonObject
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
foreach ($this->errors as $errmsg)
{
dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
@@ -652,8 +638,7 @@ class Don extends CommonObject
if (!empty($id))
{
$sql .= " AND d.rowid=".$id;
- }
- elseif (!empty($ref))
+ } elseif (!empty($ref))
{
$sql .= " AND d.ref='".$this->db->escape($ref)."'";
}
@@ -708,9 +693,7 @@ class Don extends CommonObject
$this->fetch_optionals();
}
return 1;
- }
- else
- {
+ } else {
dol_print_error($this->db);
return -1;
}
@@ -761,9 +744,7 @@ class Don extends CommonObject
// End call triggers
}
}
- }
- else
- {
+ } else {
$error++;
$this->error = $this->db->lasterror();
}
@@ -772,9 +753,7 @@ class Don extends CommonObject
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
@@ -804,14 +783,10 @@ class Don extends CommonObject
if ($this->db->affected_rows($resql))
{
return 1;
- }
- else
- {
+ } else {
return 0;
}
- }
- else
- {
+ } else {
dol_print_error($this->db);
return -1;
}
@@ -835,14 +810,10 @@ class Don extends CommonObject
if ($this->db->affected_rows($resql))
{
return 1;
- }
- else
- {
+ } else {
return 0;
}
- }
- else
- {
+ } else {
dol_print_error($this->db);
return -1;
}
@@ -904,9 +875,7 @@ class Don extends CommonObject
}
$this->db->free($resql);
return 1;
- }
- else
- {
+ } else {
dol_print_error($this->db);
$this->error = $this->db->error();
return -1;
@@ -990,9 +959,7 @@ class Don extends CommonObject
$this->date_modification = $this->db->jdate($obj->tms);
}
$this->db->free($result);
- }
- else
- {
+ } else {
dol_print_error($this->db);
}
}
@@ -1088,17 +1055,13 @@ class Don extends CommonObject
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
dol_delete_preview($object);
return 1;
- }
- else
- {
+ } else {
$outputlangs->charset_output = $sav_charset_output;
dol_syslog("Erreur dans don_create");
dol_print_error($this->db, $obj->error);
return 0;
}
- }
- else
- {
+ } else {
print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file);
return 0;
}
diff --git a/htdocs/don/class/paymentdonation.class.php b/htdocs/don/class/paymentdonation.class.php
index 64644d18971..e9a38c50bef 100644
--- a/htdocs/don/class/paymentdonation.class.php
+++ b/htdocs/don/class/paymentdonation.class.php
@@ -167,9 +167,7 @@ class PaymentDonation extends CommonObject
{
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_donation");
$this->ref = $this->id;
- }
- else
- {
+ } else {
$error++;
}
}
@@ -188,9 +186,7 @@ class PaymentDonation extends CommonObject
$this->total = $totalamount; // deprecated
$this->db->commit();
return $this->id;
- }
- else
- {
+ } else {
$this->error = $this->db->error();
$this->db->rollback();
return -1;
@@ -258,9 +254,7 @@ class PaymentDonation extends CommonObject
$this->db->free($resql);
return 1;
- }
- else
- {
+ } else {
$this->error = "Error ".$this->db->lasterror();
return -1;
}
@@ -341,9 +335,7 @@ class PaymentDonation extends CommonObject
}
$this->db->rollback();
return -1 * $error;
- }
- else
- {
+ } else {
$this->db->commit();
return 1;
}
@@ -411,9 +403,7 @@ class PaymentDonation extends CommonObject
}
$this->db->rollback();
return -1 * $error;
- }
- else
- {
+ } else {
$this->db->commit();
return 1;
}
@@ -466,9 +456,7 @@ class PaymentDonation extends CommonObject
{
$this->db->commit();
return $object->id;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
@@ -592,9 +580,7 @@ class PaymentDonation extends CommonObject
dol_print_error($this->db);
}
}
- }
- else
- {
+ } else {
$this->error = $acc->error;
$error++;
}
@@ -603,9 +589,7 @@ class PaymentDonation extends CommonObject
if (!$error)
{
return 1;
- }
- else
- {
+ } else {
return -1;
}
}
@@ -628,9 +612,7 @@ class PaymentDonation extends CommonObject
if ($result)
{
return 1;
- }
- else
- {
+ } else {
$this->error = $this->db->error();
return 0;
}
diff --git a/htdocs/don/document.php b/htdocs/don/document.php
index f2994b95577..0d56ff5bd63 100644
--- a/htdocs/don/document.php
+++ b/htdocs/don/document.php
@@ -186,9 +186,7 @@ if ($object->id)
$permtoedit = $user->rights->don->creer;
$param = '&id='.$object->id;
include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
print $langs->trans("ErrorUnknown");
}
diff --git a/htdocs/don/index.php b/htdocs/don/index.php
index d8df1f910fc..030d61d03de 100644
--- a/htdocs/don/index.php
+++ b/htdocs/don/index.php
@@ -246,8 +246,7 @@ if ($resql)
}
}
print ""; -} -else dol_print_error($db); +} else dol_print_error($db); print ''; diff --git a/htdocs/don/list.php b/htdocs/don/list.php index 65ec24b1458..cc12daabb6c 100644 --- a/htdocs/don/list.php +++ b/htdocs/don/list.php @@ -269,8 +269,7 @@ if ($resql) $projectstatic->public = $objp->public; $projectstatic->title = $objp->title; print $projectstatic->getNomUrl(1); - } - else print ' '; + } else print ' '; print "\n"; } print '
';
// Show graphs
print '
';
- }
- else
- {
+ } else {
// Qty to ship or shipped
print ''.$lines[$i]->qty_shipped.' ';
@@ -2379,8 +2268,7 @@ elseif ($id || $ref)
$entrepot = new Entrepot($db);
$entrepot->fetch($lines[$i]->entrepot_id);
print $entrepot->getNomUrl(1);
- }
- elseif (count($lines[$i]->details_entrepot) > 1)
+ } elseif (count($lines[$i]->details_entrepot) > 1)
{
$detail = '';
foreach ($lines[$i]->details_entrepot as $detail_entrepot)
@@ -2416,9 +2304,7 @@ elseif ($id || $ref)
$detail .= '
'; } print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"), $detail); - } - else - { + } else { print $langs->trans("NA"); } print ''; @@ -2449,8 +2335,7 @@ elseif ($id || $ref) print '
'; print '
'; print ''; - } - elseif ($object->statut == Expedition::STATUS_DRAFT) + } elseif ($object->statut == Expedition::STATUS_DRAFT) { // edit-delete buttons print '';
@@ -2483,9 +2368,7 @@ elseif ($id || $ref)
if ($action == 'editline' && $line->id == $line_id)
{
print $lines[$i]->showOptionals($extrafields, 'edit', array('colspan'=>$colspan), $indiceAsked);
- }
- else
- {
+ } else {
print $lines[$i]->showOptionals($extrafields, 'view', array('colspan'=>$colspan), $indiceAsked);
}
}
@@ -2525,9 +2408,7 @@ elseif ($id || $ref)
|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->shipping_advance->validate)))
{
print ''.$langs->trans("Validate").'';
- }
- else
- {
+ } else {
print ''.$langs->trans("Validate").'';
}
}
@@ -2539,9 +2420,7 @@ elseif ($id || $ref)
if (!empty($conf->facture->enabled) && !empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
{
print ''.$langs->trans("ClassifyUnbilled").'';
- }
- else
- {
+ } else {
print ''.$langs->trans("ReOpen").'';
}
}
@@ -2553,8 +2432,7 @@ elseif ($id || $ref)
if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->expedition->shipping_advance->send)
{
print ''.$langs->trans('SendMail').'';
- }
- else print ''.$langs->trans('SendMail').'';
+ } else print ''.$langs->trans('SendMail').'';
}
}
diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php
index e337ee5ffb8..7bc4db0a511 100644
--- a/htdocs/expedition/class/api_shipments.class.php
+++ b/htdocs/expedition/class/api_shipments.class.php
@@ -166,8 +166,7 @@ class Shipments extends DolibarrApi
}
$i++;
}
- }
- else {
+ } else {
throw new RestException(503, 'Error when retrieve commande list : '.$db->lasterror());
}
if (!count($obj_ret)) {
@@ -398,9 +397,7 @@ class Shipments extends DolibarrApi
$updateRes = $this->shipment->deleteline(DolibarrApiAccess::$user, $lineid);
if ($updateRes > 0) {
return $this->get($id);
- }
- else
- {
+ } else {
throw new RestException(405, $this->shipment->error);
}
}
@@ -435,9 +432,7 @@ class Shipments extends DolibarrApi
if ($this->shipment->update(DolibarrApiAccess::$user) > 0)
{
return $this->get($id);
- }
- else
- {
+ } else {
throw new RestException(500, $this->shipment->error);
}
}
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 1ccfe9944f7..6b08d4db5e6 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -251,15 +251,11 @@ class Expedition extends CommonObject
if ($numref != "")
{
return $numref;
- }
- else
- {
+ } else {
dol_print_error($this->db, get_class($this)."::getNextNumRef ".$obj->error);
return "";
}
- }
- else
- {
+ } else {
print $langs->trans("Error")." ".$langs->trans("Error_EXPEDITION_ADDON_NUMBER_NotDefined");
return "";
}
@@ -296,6 +292,7 @@ class Expedition extends CommonObject
$sql .= ", entity";
$sql .= ", ref_customer";
$sql .= ", ref_int";
+ $sql .= ", ref_ext";
$sql .= ", date_creation";
$sql .= ", fk_user_author";
$sql .= ", date_expedition";
@@ -320,6 +317,7 @@ class Expedition extends CommonObject
$sql .= ", ".$conf->entity;
$sql .= ", ".($this->ref_customer ? "'".$this->db->escape($this->ref_customer)."'" : "null");
$sql .= ", ".($this->ref_int ? "'".$this->db->escape($this->ref_int)."'" : "null");
+ $sql .= ", ".($this->ref_ext ? "'".$this->db->escape($this->ref_ext)."'" : "null");
$sql .= ", '".$this->db->idate($now)."'";
$sql .= ", ".$user->id;
$sql .= ", ".($this->date_expedition > 0 ? "'".$this->db->idate($this->date_expedition)."'" : "null");
@@ -365,9 +363,7 @@ class Expedition extends CommonObject
{
$error++;
}
- }
- else
- { // with batch management
+ } else { // with batch management
if (!$this->create_line_batch($this->lines[$i], $this->lines[$i]->array_options) > 0)
{
$error++;
@@ -405,9 +401,7 @@ class Expedition extends CommonObject
{
$this->db->commit();
return $this->id;
- }
- else
- {
+ } else {
foreach ($this->errors as $errmsg)
{
dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
@@ -416,25 +410,19 @@ class Expedition extends CommonObject
$this->db->rollback();
return -1 * $error;
}
- }
- else
- {
+ } else {
$error++;
$this->error = $this->db->lasterror()." - sql=$sql";
$this->db->rollback();
return -3;
}
- }
- else
- {
+ } else {
$error++;
$this->error = $this->db->lasterror()." - sql=$sql";
$this->db->rollback();
return -2;
}
- }
- else
- {
+ } else {
$error++;
$this->error = $this->db->error()." - sql=$sql";
$this->db->rollback();
@@ -503,9 +491,7 @@ class Expedition extends CommonObject
if (($line_id = $this->create_line($stockLocation, $line_ext->origin_line_id, $qty, $line_ext->rang, $array_options)) < 0)
{
$error++;
- }
- else
- {
+ } else {
// create shipment batch lines for stockLocation
foreach ($tab as $detbatch)
{
@@ -646,16 +632,12 @@ class Expedition extends CommonObject
}
return 1;
- }
- else
- {
+ } else {
dol_syslog(get_class($this).'::Fetch no expedition found', LOG_ERR);
$this->error = 'Delivery with id '.$id.' not found';
return 0;
}
- }
- else
- {
+ } else {
$this->error = $this->db->error();
return -1;
}
@@ -706,9 +688,7 @@ class Expedition extends CommonObject
if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
{
$numref = $this->getNextNumRef($soc);
- }
- else
- {
+ } else {
$numref = "EXP".$this->id;
}
$this->newref = dol_sanitizeFileName($numref);
@@ -759,9 +739,7 @@ class Expedition extends CommonObject
if (empty($obj->edbrowid))
{
$qty = $obj->qty;
- }
- else
- {
+ } else {
$qty = $obj->edbqty;
}
if ($qty <= 0) continue;
@@ -783,9 +761,7 @@ class Expedition extends CommonObject
$this->errors = array_merge($this->errors, $mouvS->errors);
break;
}
- }
- else
- {
+ } else {
// line with batch detail
// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record.
@@ -799,9 +775,7 @@ class Expedition extends CommonObject
}
}
}
- }
- else
- {
+ } else {
$this->db->rollback();
$this->error = $this->db->error();
return -2;
@@ -875,9 +849,7 @@ class Expedition extends CommonObject
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1 * $error;
}
@@ -907,16 +879,12 @@ class Expedition extends CommonObject
if ($result > 0)
{
return $result;
- }
- else
- {
+ } else {
$this->error = $delivery->error;
return $result;
}
- }
- else return 0;
- }
- else return 0;
+ } else return 0;
+ } else return 0;
}
/**
@@ -967,9 +935,7 @@ class Expedition extends CommonObject
if ($entrepot_id > 0) {
$product->load_stock('warehouseopen');
$product_stock = $product->stock_warehouse[$entrepot_id]->real;
- }
- else
- $product_stock = $product->stock_reel;
+ } else $product_stock = $product->stock_reel;
$product_type = $product->type;
if ($product_type == 0 && $product_stock < $qty)
@@ -1111,6 +1077,7 @@ class Expedition extends CommonObject
$sql .= " tms=".(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
$sql .= " ref=".(isset($this->ref) ? "'".$this->db->escape($this->ref)."'" : "null").",";
+ $sql .= " ref_ext=".(isset($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null").",";
$sql .= " ref_customer=".(isset($this->ref_customer) ? "'".$this->db->escape($this->ref_customer)."'" : "null").",";
$sql .= " fk_soc=".(isset($this->socid) ? $this->socid : "null").",";
$sql .= " date_creation=".(dol_strlen($this->date_creation) != 0 ? "'".$this->db->idate($this->date_creation)."'" : 'null').",";
@@ -1164,9 +1131,7 @@ class Expedition extends CommonObject
}
$this->db->rollback();
return -1 * $error;
- }
- else
- {
+ } else {
$this->db->commit();
return 1;
}
@@ -1260,9 +1225,7 @@ class Expedition extends CommonObject
$error++; $this->errors = $this->errors + $mouvS->errors;
break;
}
- }
- else
- {
+ } else {
// We increment stock of batches
// We use warehouse selected for each line
foreach ($lotArray as $lot)
@@ -1277,9 +1240,7 @@ class Expedition extends CommonObject
if ($error) break; // break for loop incase of error
}
}
- }
- else
- {
+ } else {
$error++; $this->errors[] = "Error ".$this->db->lasterror();
}
}
@@ -1357,36 +1318,26 @@ class Expedition extends CommonObject
}
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror()." - sql=$sql";
$this->db->rollback();
return -3;
}
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror()." - sql=$sql";
$this->db->rollback();
return -2;
}//*/
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror()." - sql=$sql";
$this->db->rollback();
return -1;
}
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
@@ -1480,9 +1431,7 @@ class Expedition extends CommonObject
$error++; $this->errors = $this->errors + $mouvS->errors;
break;
}
- }
- else
- {
+ } else {
// We increment stock of batches
// We use warehouse selected for each line
foreach ($lotArray as $lot)
@@ -1497,9 +1446,7 @@ class Expedition extends CommonObject
if ($error) break; // break for loop incase of error
}
}
- }
- else
- {
+ } else {
$error++; $this->errors[] = "Error ".$this->db->lasterror();
}
}
@@ -1583,36 +1530,26 @@ class Expedition extends CommonObject
}
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror()." - sql=$sql";
$this->db->rollback();
return -3;
}
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror()." - sql=$sql";
$this->db->rollback();
return -2;
}
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror()." - sql=$sql";
$this->db->rollback();
return -1;
}
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
@@ -1769,9 +1706,7 @@ class Expedition extends CommonObject
if ($originline != $obj->fk_origin_line)
{
$line->detail_batch = $newdetailbatch;
- }
- else
- {
+ } else {
$line->detail_batch = array_merge($line->detail_batch, $newdetailbatch);
}
}
@@ -1781,9 +1716,7 @@ class Expedition extends CommonObject
{
$this->lines[$lineindex] = $line;
$lineindex++;
- }
- else
- {
+ } else {
$line->total_ht += $tabprice[0];
$line->total_localtax1 += $tabprice[9];
$line->total_localtax2 += $tabprice[10];
@@ -1796,9 +1729,7 @@ class Expedition extends CommonObject
}
$this->db->free($resql);
return 1;
- }
- else
- {
+ } else {
$this->error = $this->db->error();
return -3;
}
@@ -1830,15 +1761,11 @@ class Expedition extends CommonObject
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
- }
- else
- {
+ } else {
$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
return -2;
}
@@ -2038,15 +1965,11 @@ class Expedition extends CommonObject
{
$this->date_delivery = $date_livraison;
return 1;
- }
- else
- {
+ } else {
$this->error = $this->db->error();
return -1;
}
- }
- else
- {
+ } else {
return -2;
}
}
@@ -2131,9 +2054,7 @@ class Expedition extends CommonObject
$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_shipment_mode (code, libelle, description, tracking)";
$sql .= " VALUES ('".$this->db->escape($this->update['code'])."','".$this->db->escape($this->update['libelle'])."','".$this->db->escape($this->update['description'])."','".$this->db->escape($this->update['tracking'])."')";
$resql = $this->db->query($sql);
- }
- else
- {
+ } else {
$sql = "UPDATE ".MAIN_DB_PREFIX."c_shipment_mode SET";
$sql .= " code='".$this->db->escape($this->update['code'])."'";
$sql .= ",libelle='".$this->db->escape($this->update['libelle'])."'";
@@ -2207,9 +2128,7 @@ class Expedition extends CommonObject
{
$url = str_replace('{TRACKID}', $value, $tracking);
$this->tracking_url = sprintf(''.($value ? $value : 'url').'', $url, $url);
- }
- else
- {
+ } else {
$this->tracking_url = $value;
}
}
@@ -2299,9 +2218,7 @@ class Expedition extends CommonObject
if (empty($obj->edbrowid))
{
$qty = $obj->qty;
- }
- else
- {
+ } else {
$qty = $obj->edbqty;
}
if ($qty <= 0) continue;
@@ -2321,9 +2238,7 @@ class Expedition extends CommonObject
$this->errors = $mouvS->errors;
$error++; break;
}
- }
- else
- {
+ } else {
// line with batch detail
// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
@@ -2335,9 +2250,7 @@ class Expedition extends CommonObject
}
}
}
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
$error++;
}
@@ -2351,9 +2264,7 @@ class Expedition extends CommonObject
$error++;
}
}
- }
- else
- {
+ } else {
dol_print_error($this->db);
$error++;
}
@@ -2362,9 +2273,7 @@ class Expedition extends CommonObject
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->statut = self::STATUS_VALIDATED;
$this->db->rollback();
return -1;
@@ -2407,9 +2316,7 @@ class Expedition extends CommonObject
if (empty($error)) {
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->statut = self::STATUS_VALIDATED;
$this->billed = 0;
$this->db->rollback();
@@ -2476,9 +2383,7 @@ class Expedition extends CommonObject
if (empty($obj->edbrowid))
{
$qty = $obj->qty;
- }
- else
- {
+ } else {
$qty = $obj->edbqty;
}
if ($qty <= 0) continue;
@@ -2499,9 +2404,7 @@ class Expedition extends CommonObject
$this->errors = $mouvS->errors;
$error++; break;
}
- }
- else
- {
+ } else {
// line with batch detail
// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
@@ -2513,9 +2416,7 @@ class Expedition extends CommonObject
}
}
}
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
$error++;
}
@@ -2537,9 +2438,7 @@ class Expedition extends CommonObject
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->statut = self::STATUS_CLOSED;
$this->billed = $oldbilled;
$this->db->rollback();
@@ -2791,9 +2690,7 @@ class ExpeditionLigne extends CommonObjectLine
$this->db->free($result);
return 1;
- }
- else
- {
+ } else {
$this->errors[] = $this->db->lasterror();
$this->error = $this->db->lasterror();
return -1;
@@ -2885,9 +2782,7 @@ class ExpeditionLigne extends CommonObjectLine
$this->db->rollback();
return -1 * $error;
- }
- else
- {
+ } else {
$error++;
}
}
@@ -2946,9 +2841,7 @@ class ExpeditionLigne extends CommonObjectLine
}
// End call triggers
}
- }
- else
- {
+ } else {
$this->errors[] = $this->db->lasterror()." - sql=$sql";
$error++;
}
@@ -2956,9 +2849,7 @@ class ExpeditionLigne extends CommonObjectLine
if (!$error) {
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
foreach ($this->errors as $errmsg)
{
dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
@@ -3000,9 +2891,7 @@ class ExpeditionLigne extends CommonObjectLine
dol_syslog(get_class($this).'::update only possible for one batch', LOG_ERR);
$this->errors[] = 'ErrorBadParameters';
$error++;
- }
- else
- {
+ } else {
$batch = $this->detail_batch[0]->batch;
$batch_id = $this->detail_batch[0]->fk_origin_stock;
$expedition_batch_id = $this->detail_batch[0]->id;
@@ -3014,8 +2903,7 @@ class ExpeditionLigne extends CommonObjectLine
}
$qty = price2num($this->detail_batch[0]->qty);
}
- }
- elseif (!empty($this->detail_batch))
+ } elseif (!empty($this->detail_batch))
{
$batch = $this->detail_batch->batch;
$batch_id = $this->detail_batch->fk_origin_stock;
@@ -3056,9 +2944,7 @@ class ExpeditionLigne extends CommonObjectLine
{
$this->errors[] = $this->db->lasterror()." - ExpeditionLineBatch::fetchAll";
$error++;
- }
- else
- {
+ } else {
// caculate new total line qty
foreach ($lotArray as $lot)
{
@@ -3155,9 +3041,7 @@ class ExpeditionLigne extends CommonObjectLine
if (!$error) {
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
foreach ($this->errors as $errmsg)
{
dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
diff --git a/htdocs/expedition/class/expeditionbatch.class.php b/htdocs/expedition/class/expeditionbatch.class.php
index 6c9942dd9a8..703d44e6896 100644
--- a/htdocs/expedition/class/expeditionbatch.class.php
+++ b/htdocs/expedition/class/expeditionbatch.class.php
@@ -90,9 +90,7 @@ class ExpeditionLineBatch extends CommonObject
$this->db->free($resql);
return 1;
- }
- else
- {
+ } else {
$this->error = "Error ".$this->db->lasterror();
return -1;
}
@@ -135,9 +133,7 @@ class ExpeditionLineBatch extends CommonObject
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.self::$_table_element);
$this->fk_expeditiondet = $id_line_expdet;
return $this->id;
- }
- else
- {
+ } else {
foreach ($this->errors as $errmsg)
{
dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
@@ -166,9 +162,7 @@ class ExpeditionLineBatch extends CommonObject
if ($db->query($sql))
{
return 1;
- }
- else
- {
+ } else {
return -1;
}
}
@@ -230,9 +224,7 @@ class ExpeditionLineBatch extends CommonObject
}
$db->free($resql);
return $ret;
- }
- else
- {
+ } else {
dol_print_error($db);
return -1;
}
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index 36d471b59d3..c20e2bb4088 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -87,9 +87,7 @@ if ($action == 'addcontact' && $user->rights->expedition->creer)
{
header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit;
- }
- else
- {
+ } else {
if ($objectsrc->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
{
$langs->load("errors");
@@ -117,8 +115,7 @@ elseif ($action == 'deletecontact' && $user->rights->expedition->creer)
{
header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit;
- }
- else {
+ } else {
dol_print_error($db);
}
}
diff --git a/htdocs/expedition/document.php b/htdocs/expedition/document.php
index 6047be5fe0e..69f59cb3385 100644
--- a/htdocs/expedition/document.php
+++ b/htdocs/expedition/document.php
@@ -176,12 +176,10 @@ if ($id > 0 || !empty($ref)) {
$permtoedit = $user->rights->expedition->creer;
$param = '&id='.$object->id;
include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
- }
- else {
+ } else {
dol_print_error($db);
}
-}
-else {
+} else {
header('Location: index.php');
exit;
}
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index d3fec260d95..849e2054cd6 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -120,8 +120,7 @@ if ($resql)
print ' ';
$i++;
}
- } else
- {
+ } else {
print ''.$langs->trans("None").'
| ';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
print $px1->show();
print " \n"; /*print $px2->show(); diff --git a/htdocs/ecm/ajax/ecmdatabase.php b/htdocs/ecm/ajax/ecmdatabase.php index 9f4820cd723..5ba61c53a8d 100644 --- a/htdocs/ecm/ajax/ecmdatabase.php +++ b/htdocs/ecm/ajax/ecmdatabase.php @@ -114,15 +114,11 @@ if (isset($action) && !empty($action)) //print "Yes with id ".$parentdirisindatabase." \n"; $fk_parent = $parentdirisindatabase; //break; // We found parent, we can stop the while loop - } - else - { + } else { dol_syslog("No"); //print "No \n"; } - } - else - { + } else { dol_syslog("Parent is root"); $fk_parent = 0; // Parent is root } @@ -148,13 +144,10 @@ if (isset($action) && !empty($action)) $sqltree[] = $newdirsql; // We complete fulltree for following loops //var_dump($sqltree); $adirwascreated = 1; - } - else - { + } else { dol_syslog("Failed to create directory ".$ecmdirtmp->label, LOG_ERR); } - } - else { + } else { $txt = "Parent of ".$dirdesc['fullname']." not found"; dol_syslog($txt); //print $txt." \n"; diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php index 3bddd70bfaa..9c09ee0f534 100644 --- a/htdocs/ecm/class/ecmdirectory.class.php +++ b/htdocs/ecm/class/ecmdirectory.class.php @@ -164,9 +164,7 @@ class EcmDirectory // extends CommonObject $this->error = "ErrorDirAlreadyExists"; dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING); return -1; - } - else - { + } else { $this->db->begin(); // Insert request @@ -207,15 +205,11 @@ class EcmDirectory // extends CommonObject { $this->db->commit(); return $this->id; - } - else - { + } else { $this->db->rollback(); return -1; } - } - else - { + } else { $this->error = "Error ".$this->db->lasterror(); $this->db->rollback(); return -1; @@ -273,9 +267,7 @@ class EcmDirectory // extends CommonObject { $this->db->commit(); return 1; - } - else - { + } else { $this->db->rollback(); return -1; } @@ -302,9 +294,7 @@ class EcmDirectory // extends CommonObject { $this->error = "Error ".$this->db->lasterror(); return -1; - } - else - { + } else { if (preg_match('/[0-9]+/', $value)) $this->cachenbofdoc = (int) $value; elseif ($value == '+') $this->cachenbofdoc++; elseif ($value == '-') $this->cachenbofdoc--; @@ -358,9 +348,7 @@ class EcmDirectory // extends CommonObject $this->db->free($resql); return $obj ? 1 : 0; - } - else - { + } else { $this->error = "Error ".$this->db->lasterror(); return -1; } @@ -398,9 +386,7 @@ class EcmDirectory // extends CommonObject $this->db->rollback(); $this->error = "Error ".$this->db->lasterror(); return -2; - } - else - { + } else { // Call trigger $result = $this->call_trigger('MYECMDIR_DELETE', $user); if ($result < 0) @@ -417,9 +403,7 @@ class EcmDirectory // extends CommonObject if ($deletedirrecursive) { $result = @dol_delete_dir_recursive($file, 0, 0); - } - else - { + } else { $result = @dol_delete_dir($file, 0); } } @@ -427,9 +411,7 @@ class EcmDirectory // extends CommonObject if ($result || !@is_dir(dol_osencode($file))) { $this->db->commit(); - } - else - { + } else { $this->error = 'ErrorFailToDeleteDir'; dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR); $this->db->rollback(); @@ -529,8 +511,7 @@ class EcmDirectory // extends CommonObject $idtosearch = $this->cats[$cursorindex]['id_mere']; $i++; } - } - while ($cursorindex >= 0 && !empty($idtosearch) && $i < 100); // i avoid infinite loop + } while ($cursorindex >= 0 && !empty($idtosearch) && $i < 100); // i avoid infinite loop return $ret; } @@ -564,9 +545,7 @@ class EcmDirectory // extends CommonObject $this->motherof[$obj->id_son] = $obj->id_parent; } return 1; - } - else - { + } else { dol_print_error($this->db); return -1; } @@ -672,18 +651,14 @@ class EcmDirectory // extends CommonObject $newelempos = count($this->cats[$obj->rowid]['id_children']); //print "this->cats[$i]['id_children'] est deja un tableau de $newelem elements "; $this->cats[$obj->rowid]['id_children'][$newelempos] = $obj->rowid_fille; - } - else - { + } else { //print "this->cats[".$obj->rowid."]['id_children'] n'est pas encore un tableau "; $this->cats[$obj->rowid]['id_children'] = array($obj->rowid_fille); } } $i++; } - } - else - { + } else { dol_print_error($this->db); return -1; } @@ -722,9 +697,7 @@ class EcmDirectory // extends CommonObject $this->cats[$id_categ]['fullrelativename'] .= '/'.$this->cats[$id_categ]['label']; $this->cats[$id_categ]['fulllabel'] = $this->cats[$this->cats[$id_categ]['id_mere']]['fulllabel']; $this->cats[$id_categ]['fulllabel'] .= ' >> '.$this->cats[$id_categ]['label']; - } - else - { + } else { $this->cats[$id_categ]['fullpath'] = '_'.$id_categ; $this->cats[$id_categ]['fullrelativename'] = $this->cats[$id_categ]['label']; $this->cats[$id_categ]['fulllabel'] = $this->cats[$id_categ]['label']; @@ -767,9 +740,7 @@ class EcmDirectory // extends CommonObject if (empty($all)) // By default { $sql .= " WHERE rowid = ".$this->id; - } - else - { + } else { $sql .= " WHERE entity = ".$conf->entity; } @@ -779,9 +750,7 @@ class EcmDirectory // extends CommonObject { $this->cachenbofdoc = count($filelist); return $this->cachenbofdoc; - } - else - { + } else { $this->error = "Error ".$this->db->lasterror(); return -1; } @@ -812,9 +781,7 @@ class EcmDirectory // extends CommonObject if (!empty($this->errors)) { $this->errors = array_merge($this->errors, $interface->errors); - } - else - { + } else { $this->errors = $interface->errors; } } diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php index 6921b8aabd6..5021054bcc0 100644 --- a/htdocs/ecm/class/ecmfiles.class.php +++ b/htdocs/ecm/class/ecmfiles.class.php @@ -138,7 +138,7 @@ class EcmFiles extends CommonObject $this->entity = trim($this->entity); } if (isset($this->filename)) { - $this->filename = trim($this->filename); + $this->filename = preg_replace('/\.noexe$/', '', trim($this->filename)); } if (isset($this->filepath)) { $this->filepath = trim($this->filepath); @@ -182,8 +182,7 @@ class EcmFiles extends CommonObject if (!empty($this->ref)) { $ref = $this->ref; - } - else { + } else { include_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php'; $ref = dol_hash($this->filepath.'/'.$this->filename, 3); } @@ -199,16 +198,12 @@ class EcmFiles extends CommonObject { $obj = $this->db->fetch_object($resql); $maxposition = (int) $obj->maxposition; - } - else - { + } else { $this->errors[] = 'Error '.$this->db->lasterror(); return --$error; } $maxposition = $maxposition + 1; - } - else - { + } else { $maxposition = $this->position; } @@ -346,33 +341,29 @@ class EcmFiles extends CommonObject $sql .= " t.src_object_id"; $sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t'; $sql .= ' WHERE 1 = 1'; - /* Fetching this table depends on filepath+filename, it must not depends on entity + /* Fetching this table depends on filepath+filename, it must not depends on entity because filesystem on disk does not know what is Dolibarr entities if (! empty($conf->multicompany->enabled)) { $sql .= " AND entity IN (" . getEntity('ecmfiles') . ")"; }*/ if ($relativepath) { - $sql .= " AND t.filepath = '".$this->db->escape(dirname($relativepath))."' AND t.filename = '".$this->db->escape(basename($relativepath))."'"; + $relativepathwithnoexe = preg_replace('/\.noexe$/', '', $relativepath); // We must never have the .noexe into the database + $sql .= " AND t.filepath = '".$this->db->escape(dirname($relativepath))."' AND t.filename = '".$this->db->escape(basename($relativepathwithnoexe))."'"; $sql .= " AND t.entity = ".$conf->entity; // unique key include the entity so each company has its own index - } - elseif (!empty($ref)) { // hash of file path + } elseif (!empty($ref)) { // hash of file path $sql .= " AND t.ref = '".$this->db->escape($ref)."'"; $sql .= " AND t.entity = ".$conf->entity; // unique key include the entity so each company has its own index - } - elseif (!empty($hashoffile)) { // hash of content + } elseif (!empty($hashoffile)) { // hash of content $sql .= " AND t.label = '".$this->db->escape($hashoffile)."'"; $sql .= " AND t.entity = ".$conf->entity; // unique key include the entity so each company has its own index - } - elseif (!empty($hashforshare)) { + } elseif (!empty($hashforshare)) { $sql .= " AND t.share = '".$this->db->escape($hashforshare)."'"; //$sql .= " AND t.entity = ".$conf->entity; // hashforshare already unique - } - elseif ($src_object_type && $src_object_id) + } elseif ($src_object_type && $src_object_id) { // Warning: May return several record, and only first one is returned ! $sql .= " AND t.src_object_type ='".$this->db->escape($src_object_type)."' AND t.src_object_id = ".$this->db->escape($src_object_id); $sql .= " AND t.entity = ".$conf->entity; - } - else { + } else { $sql .= ' AND t.rowid = '.$this->db->escape($id); // rowid already unique } @@ -552,46 +543,47 @@ class EcmFiles extends CommonObject // Clean parameters if (isset($this->ref)) { - $this->ref = trim($this->ref); + $this->ref = trim($this->ref); } if (isset($this->label)) { - $this->label = trim($this->label); + $this->label = trim($this->label); } if (isset($this->share)) { - $this->share = trim($this->share); + $this->share = trim($this->share); } if (isset($this->entity)) { - $this->entity = trim($this->entity); + $this->entity = trim($this->entity); } if (isset($this->filename)) { - $this->filename = trim($this->filename); + $this->filename = preg_replace('/\.noexe$/', '', trim($this->filename)); } if (isset($this->filepath)) { - $this->filepath = trim($this->filepath); + $this->filepath = trim($this->filepath); + $this->filepath = preg_replace('/[\\/]+$/', '', $this->filepath); // Remove last / } if (isset($this->fullpath_orig)) { - $this->fullpath_orig = trim($this->fullpath_orig); + $this->fullpath_orig = trim($this->fullpath_orig); } if (isset($this->description)) { - $this->description = trim($this->description); + $this->description = trim($this->description); } if (isset($this->keywords)) { - $this->keywords = trim($this->keywords); + $this->keywords = trim($this->keywords); } if (isset($this->cover)) { - $this->cover = trim($this->cover); + $this->cover = trim($this->cover); } if (isset($this->gen_or_uploaded)) { - $this->gen_or_uploaded = trim($this->gen_or_uploaded); + $this->gen_or_uploaded = trim($this->gen_or_uploaded); } if (isset($this->extraparams)) { - $this->extraparams = trim($this->extraparams); + $this->extraparams = trim($this->extraparams); } if (isset($this->fk_user_m)) { - $this->fk_user_m = trim($this->fk_user_m); + $this->fk_user_m = trim($this->fk_user_m); } if (isset($this->acl)) { - $this->acl = trim($this->acl); + $this->acl = trim($this->acl); } if (isset($this->src_object_type)) { $this->src_object_type = trim($this->src_object_type); @@ -789,8 +781,7 @@ class EcmFiles extends CommonObject } $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"'; $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"'; - } - else $linkclose = ($morecss ? ' class="'.$morecss.'"' : ''); + } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : ''); $linkstart = ''; diff --git a/htdocs/ecm/class/htmlecm.form.class.php b/htdocs/ecm/class/htmlecm.form.class.php index de9f289eb79..5c84cade8e4 100644 --- a/htdocs/ecm/class/htmlecm.form.class.php +++ b/htdocs/ecm/class/htmlecm.form.class.php @@ -69,8 +69,7 @@ class FormEcm { $cat = new EcmDirectory($this->db); $cate_arbo = $cat->get_full_arbo(); - } - elseif ($module == 'medias') + } elseif ($module == 'medias') { include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $path = $conf->medias->multidir_output[$conf->entity]; @@ -81,8 +80,7 @@ class FormEcm if (is_array($cate_arbo)) { if (!count($cate_arbo)) $output .= ''; - else - { + else { $output .= ''; foreach ($cate_arbo as $key => $value) { @@ -90,9 +88,7 @@ class FormEcm if ($selected && $valueforoption == $selected) { $add = 'selected '; - } - else - { + } else { $add = ''; } $output .= ''; diff --git a/htdocs/ecm/dir_add_card.php b/htdocs/ecm/dir_add_card.php index 4d6f2bdce5a..e17892097af 100644 --- a/htdocs/ecm/dir_add_card.php +++ b/htdocs/ecm/dir_add_card.php @@ -56,8 +56,7 @@ if (empty($urlsection)) $urlsection = 'misc'; if ($module == 'ecm') { $upload_dir = $conf->ecm->dir_output.'/'.$urlsection; -} -else // For example $module == 'medias' +} else // For example $module == 'medias' { $upload_dir = $conf->medias->multidir_output[$conf->entity]; } @@ -115,9 +114,7 @@ if ($action == 'add' && $permtoadd) { header("Location: ".$backtopage); exit; - } - else - { + } else { header("Location: ".DOL_URL_ROOT.'/ecm/index.php?action=file_manager'.($module ? '&module='.$module : '')); exit; } @@ -155,8 +152,7 @@ if ($action == 'add' && $permtoadd) setEventMessages($ecmdir->error, $ecmdir->errors, 'errors'); $action = 'create'; } - } - else // For example $module == 'medias' + } else // For example $module == 'medias' { $dirfornewdir = ''; if ($module == 'medias') @@ -177,9 +173,7 @@ if ($action == 'add' && $permtoadd) { setEventMessages($langs->trans('ErrorFailToCreateDir', $label), null, 'errors'); $error++; - } - else - { + } else { setEventMessages($langs->trans("ECMSectionWasCreated", $label), null, 'mesgs'); } } @@ -192,9 +186,7 @@ if ($action == 'add' && $permtoadd) { header("Location: ".$backtopage); exit; - } - else - { + } else { header("Location: ".DOL_URL_ROOT.'/ecm/index.php?action=file_manager'); exit; } @@ -241,7 +233,7 @@ if ($action == 'create') print '
".$sectioncur['label'].': | ';
print ' | | ';
print ' | '.$langs->trans("Warehouse").' ('.$langs->trans("Stock").') | '; - } - else - { + } else { print ''.$langs->trans("Warehouse").' / '.$langs->trans("Batch").' ('.$langs->trans("Stock").') | '; } } @@ -1194,9 +1141,7 @@ if ($action == 'create') } print ''; - } - else - { + } else { print ""; if ($type == 1) $text = img_object($langs->trans('Service'), 'service'); else $text = img_object($langs->trans('Product'), 'product'); @@ -1231,9 +1176,7 @@ if ($action == 'create') if ($line->product_type == 1 && empty($conf->global->STOCK_SUPPORTS_SERVICES)) { $quantityToBeDelivered = 0; - } - else - { + } else { $quantityToBeDelivered = $quantityAsked - $quantityDelivered; } $warehouse_id = GETPOST('entrepot_id', 'int'); @@ -1255,8 +1198,7 @@ if ($action == 'create') if (GETPOST('qtyl'.$indiceAsked, 'int')) $deliverableQty = GETPOST('qtyl'.$indiceAsked, 'int'); print ''; print ''; - } - else print $langs->trans("NA"); + } else print $langs->trans("NA"); print ' | '; // Stock @@ -1288,9 +1230,7 @@ if ($action == 'create') } } } - } - else - { + } else { print $langs->trans("Service"); } print ''; @@ -1320,9 +1260,7 @@ if ($action == 'create') } } } - } - else - { + } else { // Product need lot print ''; // end line and start a new one for lot/serial print ''; @@ -1376,9 +1314,7 @@ if ($action == 'create') $subj++; print ''; } - } - else - { + } else { print ''; print ' | |||||||||||||||||||||||||||||||||
| '; print ' '; @@ -1389,9 +1325,7 @@ if ($action == 'create') print ' | '; // end line and start a new one for lot/serial @@ -1552,9 +1481,7 @@ if ($action == 'create') $disabled = 'disabled="disabled"'; } print ' '; - } - else - { + } else { print $langs->trans("NA"); } print ''; @@ -1568,15 +1495,11 @@ if ($action == 'create') $warehouseObject = new Entrepot($db); $warehouseObject->fetch($warehouse_selected_id); print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $warehouseObject->label); - } - else - { + } else { if ($line->fk_product) print img_warning().' '.$langs->trans("StockTooLow"); else print ''; } - } - else - { + } else { print $langs->trans("Service"); } print ''; @@ -1616,14 +1539,11 @@ if ($action == 'create') print ''; print ' | '.$langs->trans("QtyToShip").' | '; - } - else - { + } else { print ''.$langs->trans("QtyShipped").' | '; } if (!empty($conf->stock->enabled)) @@ -2195,9 +2096,7 @@ elseif ($id || $ref) $prod = new Product($db); $prod->fetch($lines[$i]->fk_product); $label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $lines[$i]->product_label; - } - else - $label = (!empty($lines[$i]->label) ? $lines[$i]->label : $lines[$i]->product_label); + } else $label = (!empty($lines[$i]->label) ? $lines[$i]->label : $lines[$i]->product_label); print '';
@@ -2230,9 +2129,7 @@ elseif ($id || $ref)
print (!empty($lines[$i]->description) && $lines[$i]->description != $lines[$i]->product) ? ' '.dol_htmlentitiesbr($lines[$i]->description) : ''; } print " | \n";
- }
- else
- {
+ } else {
print ''; if ($lines[$i]->product_type == Product::TYPE_SERVICE) $text = img_object($langs->trans('Service'), 'service'); else $text = img_object($langs->trans('Product'), 'product'); @@ -2311,8 +2208,7 @@ elseif ($id || $ref) // Batch number managment print ' | '.$formproduct->selectLotStock('', 'batchl'.$line_id.'_0', '', 1, 0, $lines[$i]->fk_product).' | '; print ''; - } - elseif (!empty($conf->stock->enabled)) + } elseif (!empty($conf->stock->enabled)) { if ($lines[$i]->fk_product > 0) { @@ -2327,8 +2223,7 @@ elseif ($id || $ref) // Batch number managment print '- '.$langs->trans("NA").' | '; print ''; - } - elseif (count($lines[$i]->details_entrepot) > 1) + } elseif (count($lines[$i]->details_entrepot) > 1) { print ''; foreach ($lines[$i]->details_entrepot as $detail_entrepot) @@ -2342,15 +2237,11 @@ elseif ($id || $ref) print '- '.$langs->trans("NA").' | '; print ''; } - } - else - { + } else { print ''; print '||||||||||||||||||||||||||||||||
| '.$langs->trans("NotEnoughStock").' | ||||||||||||||||||||||||||||||||||||||||
'; } print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"), $detail); - } - else - { + } else { print $langs->trans("NA"); } print ''; @@ -2449,8 +2335,7 @@ elseif ($id || $ref) print '
'; print '
'; print ''; - } - elseif ($object->statut == Expedition::STATUS_DRAFT) + } elseif ($object->statut == Expedition::STATUS_DRAFT) { // edit-delete buttons print '
"; } $db->free($resql); -} -else dol_print_error($db); +} else dol_print_error($db); /* * Open orders @@ -259,8 +257,7 @@ if ($resql) print "
"; } -} -else dol_print_error($db); +} else dol_print_error($db); print ''; diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php index 999bde3fb32..74efaaeb27a 100644 --- a/htdocs/expedition/list.php +++ b/htdocs/expedition/list.php @@ -56,6 +56,7 @@ $search_ref_exp = GETPOST("search_ref_exp", 'alpha'); $search_ref_liv = GETPOST('search_ref_liv', 'alpha'); $search_ref_customer = GETPOST('search_ref_customer', 'alpha'); $search_company = GETPOST("search_company", 'alpha'); +$search_tracking = GETPOST("search_tracking", 'alpha'); $search_town = GETPOST('search_town', 'alpha'); $search_zip = GETPOST('search_zip', 'alpha'); $search_state = trim(GETPOST("search_state")); @@ -106,6 +107,7 @@ $fieldstosearchall = array( 'e.ref'=>"Ref", 's.nom'=>"ThirdParty", 'e.note_public'=>'NotePublic', + 'e.tracking_number'=>"TrackingNumber", ); if (empty($user->socid)) $fieldstosearchall["e.note_private"] = "NotePrivate"; @@ -120,6 +122,7 @@ $arrayfields = array( 'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0), 'typent.code'=>array('label'=>$langs->trans("ThirdPartyType"), 'checked'=>$checkedtypetiers), 'e.date_delivery'=>array('label'=>$langs->trans("DateDeliveryPlanned"), 'checked'=>1), + 'e.tracking_number'=>array('label'=>$langs->trans("TrackingNumber"), 'checked'=>1), 'e.weight'=>array('label'=>$langs->trans("Weight"), 'checked'=>0), 'e.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500), 'e.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500), @@ -172,6 +175,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x' $search_state = ""; $search_type = ''; $search_country = ''; + $search_tracking=''; $search_type_thirdparty = ''; $search_billed = ''; $search_datedelivery_start = ''; @@ -214,7 +218,7 @@ llxHeader('', $langs->trans('ListOfSendings'), $helpurl); $sql = 'SELECT'; if ($sall || $search_product_category > 0) $sql = 'SELECT DISTINCT'; -$sql .= " e.rowid, e.ref, e.ref_customer, e.date_expedition as date_expedition, e.weight, e.weight_units, e.date_delivery as date_livraison, l.date_delivery as date_reception, e.fk_statut, e.billed,"; +$sql .= " e.rowid, e.ref, e.ref_customer, e.date_expedition as date_expedition, e.weight, e.weight_units, e.date_delivery as date_livraison, l.date_delivery as date_reception, e.fk_statut, e.billed, e.tracking_number,"; $sql .= " s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client, "; $sql .= " typent.code as typent_code,"; $sql .= " state.code_departement as state_code, state.nom as state_name,"; @@ -273,6 +277,7 @@ if ($search_town) $sql .= natural_search('s.town', $search_town); if ($search_zip) $sql .= natural_search("s.zip", $search_zip); if ($search_state) $sql .= natural_search("state.nom", $search_state); if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')'; +if ($search_tracking) $sql.= natural_search("e.tracking_number", $search_tracking); if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')'; if ($search_sale > 0) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$search_sale; if ($search_ref_exp) $sql .= natural_search('e.ref', $search_ref_exp); @@ -330,6 +335,7 @@ if ($resql) if ($search_user > 0) $param .= '&search_user='.urlencode($search_user); if ($search_sale > 0) $param .= '&search_sale='.urlencode($search_sale); if ($search_company) $param .= "&search_company=".urlencode($search_company); + if ($search_tracking) $param.= "&search_tracking=".urlencode($search_tracking); if ($search_town) $param .= '&search_town='.urlencode($search_town); if ($search_zip) $param .= '&search_zip='.urlencode($search_zip); @@ -507,6 +513,13 @@ if ($resql) print ''; print ''; } + // Tracking number + if (! empty($arrayfields['e.tracking_number']['checked'])) + { + print '
';
print ''.$langs->trans("CreateShipment").'';
print '
';
@@ -944,9 +925,7 @@ if ($id > 0 || !empty($ref))
}
show_list_sending_receive('commande', $object->id);
- }
- else
- {
+ } else {
/* Order not found */
setEventMessages($langs->trans("NonExistentOrder"), null, 'errors');
}
diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php
index db28b094e65..fcccb545a33 100644
--- a/htdocs/expedition/stats/index.php
+++ b/htdocs/expedition/stats/index.php
@@ -74,9 +74,7 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
if (!$user->rights->societe->client->voir || $user->socid)
{
$filenamenb = $dir.'/shipmentsnbinyear-'.$user->id.'-'.$year.'.png';
-}
-else
-{
+} else {
$filenamenb = $dir.'/shipmentsnbinyear-'.$year.'.png';
}
@@ -290,8 +288,7 @@ print '';
// Show graphs
print '
";
@@ -2200,9 +2101,7 @@ else
if (!empty($line->value_unit_ht))
{
print price($line->value_unit_ht);
- }
- else
- {
+ } else {
$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $line->vatrate));
$pricenettoshow = price2num($line->value_unit / (1 + $tmpvat / 100), 'MU');
print $pricenettoshow;
@@ -2245,9 +2144,7 @@ else
}
print ' ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.'/'.$minifile).')
';
print '';
- }
- else
- {
+ } else {
$modulepart = 'expensereport';
$thumbshown = 0;
if (preg_match('/\.pdf$/i', $ecmfilesstatic->filename))
@@ -2625,8 +2522,7 @@ else
dol_fiche_end();
} // end edit or not edit
} // end of if result
- else
- {
+ else {
dol_print_error($db);
}
} //fin si id > 0
@@ -2748,9 +2644,7 @@ if ($action != 'create' && $action != 'edit')
if ($remaintopay == 0)
{
print ''.$langs->trans("TotalTTC").' : '.price($total_TTC).' ';
print ' ';
print '';
- }
- else
- {
+ } else {
$this->error = $db->lasterror();
return -1;
}
@@ -992,14 +963,12 @@ class ExpenseReport extends CommonObject
if ($result):
$this->db->free($result);
return 1;
- else:
+ else :
$this->error = $this->db->lasterror();
dol_syslog(get_class($this)."::recalculer: Error ".$this->error, LOG_ERR);
return -3;
endif;
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
dol_syslog(get_class($this)."::recalculer: Error ".$this->error, LOG_ERR);
return -3;
@@ -1031,9 +1000,7 @@ class ExpenseReport extends CommonObject
if (!empty($conf->global->EXPENSEREPORT_LINES_SORTED_BY_ROWID))
{
$sql .= ' ORDER BY de.rang ASC, de.rowid ASC';
- }
- else
- {
+ } else {
$sql .= ' ORDER BY de.rang ASC, de.date ASC';
}
@@ -1082,9 +1049,7 @@ class ExpenseReport extends CommonObject
}
$this->db->free($resql);
return 1;
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
dol_syslog(get_class($this)."::fetch_lines: Error ".$this->error, LOG_ERR);
return -3;
@@ -1113,17 +1078,13 @@ class ExpenseReport extends CommonObject
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->error = $this->db->error()." sql=".$sql;
dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
$this->db->rollback();
return -6;
}
- }
- else
- {
+ } else {
$this->error = $this->db->error()." sql=".$sql;
dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
$this->db->rollback();
@@ -1158,9 +1119,7 @@ class ExpenseReport extends CommonObject
if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
{
$num = $this->getNextNumRef();
- }
- else
- {
+ } else {
$num = $this->ref;
}
if (empty($num) || $num < 0) return -1;
@@ -1243,16 +1202,12 @@ class ExpenseReport extends CommonObject
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
$this->error = $this->db->error();
return -2;
}
- }
- else
- {
+ } else {
$this->db->rollback();
$this->error = $this->db->lasterror();
return -1;
@@ -1293,15 +1248,11 @@ class ExpenseReport extends CommonObject
if ($this->db->query($sql))
{
return 1;
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
return -1;
}
- }
- else
- {
+ } else {
dol_syslog(get_class($this)."::set_save_from_refuse expensereport already with save status", LOG_WARNING);
}
}
@@ -1345,23 +1296,17 @@ class ExpenseReport extends CommonObject
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
$this->error = $this->db->error();
return -2;
}
- }
- else
- {
+ } else {
$this->db->rollback();
$this->error = $this->db->lasterror();
return -1;
}
- }
- else
- {
+ } else {
dol_syslog(get_class($this)."::setApproved expensereport already with approve status", LOG_WARNING);
}
@@ -1412,23 +1357,17 @@ class ExpenseReport extends CommonObject
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
$this->error = $this->db->error();
return -2;
}
- }
- else
- {
+ } else {
$this->db->rollback();
$this->error = $this->db->lasterror();
return -1;
}
- }
- else
- {
+ } else {
dol_syslog(get_class($this)."::setDeny expensereport already with refuse status", LOG_WARNING);
}
}
@@ -1473,23 +1412,17 @@ class ExpenseReport extends CommonObject
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
$this->error = $this->db->error();
return -2;
}
- }
- else
- {
+ } else {
$this->db->rollback();
$this->error = $this->db->error();
return -1;
}
- }
- else
- {
+ } else {
dol_syslog(get_class($this)."::set_unpaid expensereport already with unpaid status", LOG_WARNING);
}
}
@@ -1537,23 +1470,17 @@ class ExpenseReport extends CommonObject
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
$this->error = $this->db->error();
return -2;
}
- }
- else
- {
+ } else {
$this->db->rollback();
$this->error = $this->db->error();
return -1;
}
- }
- else
- {
+ } else {
dol_syslog(get_class($this)."::set_cancel expensereport already with cancel status", LOG_WARNING);
}
}
@@ -1596,17 +1523,13 @@ class ExpenseReport extends CommonObject
if ($numref != "")
{
return $numref;
- }
- else
- {
+ } else {
$this->error = $obj->error;
$this->errors = $obj->errors;
//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
return -1;
}
- }
- else
- {
+ } else {
$this->error = "Error_EXPENSEREPORT_ADDON_NotDefined";
return -2;
}
@@ -1703,7 +1626,7 @@ class ExpenseReport extends CommonObject
$result = $this->db->query($sql);
if ($result):
return 1;
- else:
+ else :
$this->error = $this->db->error();
return -1;
endif;
@@ -1733,7 +1656,7 @@ class ExpenseReport extends CommonObject
$result = $this->db->query($sql);
if ($result):
return 1;
- else:
+ else :
$this->error = $this->db->error();
return -1;
endif;
@@ -1822,23 +1745,17 @@ class ExpenseReport extends CommonObject
{
$this->db->commit();
return $this->line->id;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
- }
- else
- {
+ } else {
$this->error = $this->line->error;
dol_syslog(get_class($this)."::addline error=".$this->error, LOG_ERR);
$this->db->rollback();
return -2;
}
- }
- else
- {
+ } else {
dol_syslog(get_class($this)."::addline status of expense report must be Draft to allow use of ->addline()", LOG_ERR);
$this->error = 'ErrorExpenseNotDraft';
return -3;
@@ -1887,9 +1804,7 @@ class ExpenseReport extends CommonObject
$new_current_total_ttc -= $amount_to_test - $rule->amount; // ex, entered 16€, limit 12€, subtracts 4€;
$rule_warning_message_tab[] = $langs->trans('ExpenseReportConstraintViolationError', $rule->id, price($amount_to_test, 0, $langs, 1, -1, -1, $conf->currency), price($rule->amount, 0, $langs, 1, -1, -1, $conf->currency), $langs->trans('by'.$rule->code_expense_rules_type, price($new_current_total_ttc, 0, $langs, 1, -1, -1, $conf->currency)));
- }
- else
- {
+ } else {
$this->error = 'ExpenseReportConstraintViolationWarning';
$this->errors[] = $this->error;
@@ -1912,8 +1827,7 @@ class ExpenseReport extends CommonObject
$this->line->total_tva = $tmp[1];
return false;
- }
- else return true;
+ } else return true;
}
/**
@@ -1984,9 +1898,7 @@ class ExpenseReport extends CommonObject
{
$num = $this->db->num_rows($resql);
if ($num > 0) return true;
- }
- else
- {
+ } else {
dol_print_error($this->db);
}
@@ -2105,9 +2017,7 @@ class ExpenseReport extends CommonObject
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->error = $this->line->error;
$this->errors = $this->line->errors;
$this->db->rollback();
@@ -2187,14 +2097,10 @@ class ExpenseReport extends CommonObject
if ($existe) return 1;
else return 0;
- }
- else
- {
+ } else {
return 0;
}
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
dol_syslog(get_class($this)."::periode_existe Error ".$this->error, LOG_ERR);
return -1;
@@ -2235,9 +2141,7 @@ class ExpenseReport extends CommonObject
$i++;
}
return $users_validator;
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
dol_syslog(get_class($this)."::fetch_users_approver_expensereport Error ".$this->error, LOG_ERR);
return -1;
@@ -2301,9 +2205,7 @@ class ExpenseReport extends CommonObject
$ret[$obj->code] = (($langs->trans($obj->code) != $obj->code) ? $langs->trans($obj->code) : $obj->label);
$i++;
}
- }
- else
- {
+ } else {
dol_print_error($this->db);
}
return $ret;
@@ -2318,7 +2220,7 @@ class ExpenseReport extends CommonObject
public function load_state_board()
{
// phpcs:enable
- global $conf;
+ global $conf, $user;
$this->nb = array();
@@ -2326,6 +2228,12 @@ class ExpenseReport extends CommonObject
$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as ex";
$sql .= " WHERE ex.fk_statut > 0";
$sql .= " AND ex.entity IN (".getEntity('expensereport').")";
+ if (empty($user->rights->expensereport->readall))
+ {
+ $userchildids = $user->getAllChildIds(1);
+ $sql .= " AND (ex.fk_user_author IN (".join(',', $userchildids).")";
+ $sql .= " OR ex.fk_user_validator IN (".join(',', $userchildids)."))";
+ }
$resql = $this->db->query($sql);
if ($resql) {
@@ -2334,9 +2242,7 @@ class ExpenseReport extends CommonObject
}
$this->db->free($resql);
return 1;
- }
- else
- {
+ } else {
dol_print_error($this->db);
$this->error = $this->db->error();
return -1;
@@ -2360,15 +2266,17 @@ class ExpenseReport extends CommonObject
$now = dol_now();
- $userchildids = $user->getAllChildIds(1);
-
$sql = "SELECT ex.rowid, ex.date_valid";
$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as ex";
if ($option == 'toapprove') $sql .= " WHERE ex.fk_statut = 2";
else $sql .= " WHERE ex.fk_statut = 5";
$sql .= " AND ex.entity IN (".getEntity('expensereport').")";
- $sql .= " AND (ex.fk_user_author IN (".join(',', $userchildids).")";
- $sql .= " OR ex.fk_user_validator IN (".join(',', $userchildids)."))";
+ if (empty($user->rights->expensereport->readall))
+ {
+ $userchildids = $user->getAllChildIds(1);
+ $sql .= " AND (ex.fk_user_author IN (".join(',', $userchildids).")";
+ $sql .= " OR ex.fk_user_validator IN (".join(',', $userchildids)."))";
+ }
$resql = $this->db->query($sql);
if ($resql)
@@ -2382,9 +2290,7 @@ class ExpenseReport extends CommonObject
$response->label = $langs->trans("ExpenseReportsToApprove");
$response->labelShort = $langs->trans("ToApprove");
$response->url = DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&statut=2';
- }
- else
- {
+ } else {
$response->warning_delay = $conf->expensereport->payment->warning_delay / 60 / 60 / 24;
$response->label = $langs->trans("ExpenseReportsToPay");
$response->labelShort = $langs->trans("StatusToPay");
@@ -2401,9 +2307,7 @@ class ExpenseReport extends CommonObject
if ($this->db->jdate($obj->date_valid) < ($now - $conf->expensereport->approve->warning_delay)) {
$response->nbtodolate++;
}
- }
- else
- {
+ } else {
if ($this->db->jdate($obj->date_valid) < ($now - $conf->expensereport->payment->warning_delay)) {
$response->nbtodolate++;
}
@@ -2411,9 +2315,7 @@ class ExpenseReport extends CommonObject
}
return $response;
- }
- else
- {
+ } else {
dol_print_error($this->db);
$this->error = $this->db->error();
return -1;
@@ -2438,9 +2340,7 @@ class ExpenseReport extends CommonObject
if ($option == 'toapprove')
{
return ($this->datevalid ? $this->datevalid : $this->date_valid) < ($now - $conf->expensereport->approve->warning_delay);
- }
- else
- return ($this->datevalid ? $this->datevalid : $this->date_valid) < ($now - $conf->expensereport->payment->warning_delay);
+ } else return ($this->datevalid ? $this->datevalid : $this->date_valid) < ($now - $conf->expensereport->payment->warning_delay);
}
/**
@@ -2463,9 +2363,7 @@ class ExpenseReport extends CommonObject
{
$alreadydispatched = $obj->nb;
}
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
return -1;
}
@@ -2498,9 +2396,7 @@ class ExpenseReport extends CommonObject
$obj = $this->db->fetch_object($resql);
$this->db->free($resql);
return $obj->amount;
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
return -1;
}
@@ -2694,9 +2590,7 @@ class ExpenseReportLine
$this->errors = $tmpparent->errors;
}
}
- }
- else
- {
+ } else {
$error++;
}
@@ -2704,9 +2598,7 @@ class ExpenseReportLine
{
$this->db->commit();
return $this->id;
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
dol_syslog("ExpenseReportLine::insert Error ".$this->error, LOG_ERR);
$this->db->rollback();
@@ -2747,9 +2639,7 @@ class ExpenseReportLine
$obj = $this->db->fetch_object($resql);
$amount = (double) $obj->total_amount;
}
- }
- else
- {
+ } else {
dol_print_error($this->db);
}
@@ -2812,16 +2702,12 @@ class ExpenseReportLine
$this->error = $tmpparent->error;
$this->errors = $tmpparent->errors;
}
- }
- else
- {
+ } else {
$error++;
$this->error = $tmpparent->error;
$this->errors = $tmpparent->errors;
}
- }
- else
- {
+ } else {
$error++;
dol_print_error($this->db);
}
@@ -2830,9 +2716,7 @@ class ExpenseReportLine
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
dol_syslog("ExpenseReportLine::update Error ".$this->error, LOG_ERR);
$this->db->rollback();
@@ -2867,9 +2751,7 @@ function select_expensereport_statut($selected = '', $htmlname = 'fk_statut', $u
if ($selected != '' && $selected == $key)
{
print '
| ';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
print $px1->show();
print " \n"; /*print $px2->show(); diff --git a/htdocs/expensereport/ajax/ajaxik.php b/htdocs/expensereport/ajax/ajaxik.php index b2c89f68e41..413bc061fbf 100644 --- a/htdocs/expensereport/ajax/ajaxik.php +++ b/htdocs/expensereport/ajax/ajaxik.php @@ -52,22 +52,18 @@ $fk_c_exp_tax_cat = GETPOST('fk_c_exp_tax_cat'); if (empty($fk_expense) || $fk_expense < 0) echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_expense, 'fk_expense'))); elseif (empty($fk_c_exp_tax_cat) || $fk_c_exp_tax_cat < 0) echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_c_exp_tax_cat, 'fk_c_exp_tax_cat'))); -else -{ +else { // @see ndfp.class.php:3576 (method: compute_total_km) $expense = new ExpenseReport($db); if ($expense->fetch($fk_expense) <= 0) echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorRecordNotFound'), 'fk_expense' => $fk_expense)); - else - { + else { $userauthor = new User($db); if ($userauthor->fetch($expense->fk_user_author) <= 0) echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorRecordNotFound'), 'fk_user_author' => $expense->fk_user_author)); - else - { + else { $range = ExpenseReportIk::getRangeByUser($userauthor, $fk_c_exp_tax_cat); if (empty($range)) echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorRecordNotFound'), 'range' => $range)); - else - { + else { $ikoffset = price($range->ikoffset, 0, $langs, 1, -1, -1, $conf->currency); echo json_encode(array('up' => $range->coef, 'ikoffset' => $range->ikoffset, 'title' => $langs->transnoentitiesnoconv('ExpenseRangeOffset', $offset), 'comment' => 'offset should be apply on addline or updateline')); } diff --git a/htdocs/expensereport/ajax/ajaxprojet.php b/htdocs/expensereport/ajax/ajaxprojet.php index 2fdb0cd4fdb..49a7bd4201e 100644 --- a/htdocs/expensereport/ajax/ajaxprojet.php +++ b/htdocs/expensereport/ajax/ajaxprojet.php @@ -76,13 +76,9 @@ if (GETPOST('fk_projet') != '') } echo json_encode($return_arr); - } - else - { + } else { echo json_encode(array('nom'=>'Error', 'label'=>'Error', 'key'=>'Error', 'value'=>'Error')); } -} -else -{ +} else { echo json_encode(array('nom'=>'ErrorBadParameter', 'label'=>'ErrorBadParameter', 'key'=>'ErrorBadParameter', 'value'=>'ErrorBadParameter')); } diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php index 2a0f804b196..f5348bb4261 100644 --- a/htdocs/expensereport/card.php +++ b/htdocs/expensereport/card.php @@ -177,9 +177,7 @@ if (empty($reshook)) if (1 == 0 && !GETPOST('clone_content', 'alpha') && !GETPOST('clone_receivers', 'alpha')) { setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors'); - } - else - { + } else { if ($object->id > 0) { // Because createFromClone modifies the object, we must clone it so that we can restore it later if it fails @@ -190,9 +188,7 @@ if (empty($reshook)) { header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result); exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); $object = $orig; $action = ''; @@ -210,9 +206,7 @@ if (empty($reshook)) { header("Location: index.php"); exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } @@ -264,9 +258,7 @@ if (empty($reshook)) $db->commit(); Header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id); exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); $db->rollback(); $action = 'create'; @@ -297,9 +289,7 @@ if (empty($reshook)) { header("Location: ".$_SERVER["PHP_SELF"]."?id=".$_POST['id']); exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } @@ -356,9 +346,7 @@ if (empty($reshook)) $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); } - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); $error++; } @@ -415,9 +403,7 @@ if (empty($reshook)) { $mesg = $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($emailFrom, 2), $mailfile->getValidAddress($emailTo, 2)); setEventMessages($mesg, null, 'mesgs'); - } - else - { + } else { $langs->load("other"); if ($mailfile->error) { @@ -425,21 +411,15 @@ if (empty($reshook)) $mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo); $mesg .= ' '.$mailfile->error; setEventMessages($mesg, null, 'errors'); - } - else - { + } else { setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings'); } } - } - else - { + } else { setEventMessages($mailfile->error, $mailfile->errors, 'errors'); $action = ''; } - } - else - { + } else { setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings'); $action = ''; } @@ -450,9 +430,7 @@ if (empty($reshook)) $db->commit(); header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id); exit; - } - else - { + } else { $db->rollback(); } } @@ -542,9 +520,7 @@ if (empty($reshook)) setEventMessages($mesg, null, 'mesgs'); header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id); exit; - } - else - { + } else { $langs->load("other"); if ($mailfile->error) { @@ -552,27 +528,19 @@ if (empty($reshook)) $mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo); $mesg .= ' '.$mailfile->error; setEventMessages($mesg, null, 'errors'); - } - else - { + } else { setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings'); } } - } - else - { + } else { setEventMessages($mailfile->error, $mailfile->errors, 'errors'); $action = ''; } - } - else - { + } else { setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings'); $action = ''; } - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } @@ -665,9 +633,7 @@ if (empty($reshook)) setEventMessages($mesg, null, 'mesgs'); header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id); exit; - } - else - { + } else { $langs->load("other"); if ($mailfile->error) { @@ -675,27 +641,19 @@ if (empty($reshook)) $mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo); $mesg .= ' '.$mailfile->error; setEventMessages($mesg, null, 'errors'); - } - else - { + } else { setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings'); } } - } - else - { + } else { setEventMessages($mailfile->error, $mailfile->errors, 'errors'); $action = ''; } - } - else - { + } else { setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings'); $action = ''; } - } - else - { + } else { setEventMessages($langs->trans("FailedtoSetToApprove"), null, 'warnings'); $action = ''; } @@ -786,9 +744,7 @@ if (empty($reshook)) setEventMessages($mesg, null, 'mesgs'); header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id); exit; - } - else - { + } else { $langs->load("other"); if ($mailfile->error) { @@ -796,27 +752,19 @@ if (empty($reshook)) $mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo); $mesg .= ' '.$mailfile->error; setEventMessages($mesg, null, 'errors'); - } - else - { + } else { setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings'); } } - } - else - { + } else { setEventMessages($mailfile->error, $mailfile->errors, 'errors'); $action = ''; } - } - else - { + } else { setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings'); $action = ''; } - } - else - { + } else { setEventMessages($langs->trans("FailedtoSetToDeny"), null, 'warnings'); $action = ''; } @@ -828,9 +776,7 @@ if (empty($reshook)) if (!GETPOST('detail_cancel', 'alpha')) { setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Comment")), null, 'errors'); - } - else - { + } else { $object = new ExpenseReport($db); $object->fetch($id); @@ -916,9 +862,7 @@ if (empty($reshook)) setEventMessages($mesg, null, 'mesgs'); header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id); exit; - } - else - { + } else { $langs->load("other"); if ($mailfile->error) { @@ -926,33 +870,23 @@ if (empty($reshook)) $mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo); $mesg .= ' '.$mailfile->error; setEventMessages($mesg, null, 'errors'); - } - else - { + } else { setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings'); } } - } - else - { + } else { setEventMessages($mailfile->error, $mailfile->errors, 'errors'); $action = ''; } - } - else - { + } else { setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings'); $action = ''; } - } - else - { + } else { setEventMessages($langs->trans("FailedToSetToCancel"), null, 'warnings'); $action = ''; } - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } @@ -990,14 +924,10 @@ if (empty($reshook)) { header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id); exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } - } - else - { + } else { setEventMessages("NOT_AUTHOR", '', 'errors'); } } @@ -1131,9 +1061,7 @@ if (empty($reshook)) setEventMessages($mesg, null, 'mesgs'); header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id); exit; - } - else - { + } else { $langs->load("other"); if ($mailfile->error) { @@ -1141,27 +1069,19 @@ if (empty($reshook)) $mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo); $mesg .= ' '.$mailfile->error; setEventMessages($mesg, null, 'errors'); - } - else - { + } else { setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings'); } } - } - else - { + } else { setEventMessages($mailfile->error, $mailfile->errors, 'errors'); $action = ''; } - } - else - { + } else { setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings'); $action = ''; } - } - else - { + } else { setEventMessages($langs->trans("FailedToSetPaid"), null, 'warnings'); $action = ''; } @@ -1312,9 +1232,7 @@ if (empty($reshook)) $object->update_totaux_del($object_ligne->total_ht, $object_ligne->total_tva); header("Location: ".$_SERVER["PHP_SELF"]."?id=".$_GET['id']); exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } @@ -1407,9 +1325,7 @@ if (empty($reshook)) //header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id); //exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } @@ -1497,8 +1413,7 @@ if ($action == 'create') $object = new ExpenseReport($db); $include_users = $object->fetch_users_approver_expensereport(); if (empty($include_users)) print img_warning().' '.$langs->trans("NobodyHasPermissionToValidateExpenseReport"); - else - { + else { $defaultselectuser = (empty($user->fk_user_expense_validator) ? $user->fk_user : $user->fk_user_expense_validator); // Will work only if supervisor has permission to approve so is inside include_users if (!empty($conf->global->EXPENSEREPORT_DEFAULT_VALIDATOR)) $defaultselectuser = $conf->global->EXPENSEREPORT_DEFAULT_VALIDATOR; // Can force default approver if (GETPOST('fk_user_validator', 'int') > 0) $defaultselectuser = GETPOST('fk_user_validator', 'int'); @@ -1558,9 +1473,7 @@ if ($action == 'create') print ''; print ''; -} -else -{ +} else { if ($id > 0 || $ref) { $result = $object->fetch($id, $ref); @@ -1601,9 +1514,7 @@ else if ($object->fk_statut == 99) { print ''; - } - else - { + } else { print ''; } @@ -1660,9 +1571,7 @@ else print $form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate")); print ' | ';
print '|||
| '.$langs->trans("VALIDOR").' | '; print ''; @@ -1697,9 +1606,7 @@ else print ''; print ''; - } - else - { + } else { dol_fiche_head($head, 'card', $langs->trans("ExpenseReport"), -1, 'trip'); // Clone confirmation @@ -1871,8 +1778,7 @@ else } } print ' | ||
| '.$langs->trans("CANCEL_USER").' | '; @@ -1893,9 +1799,7 @@ else print ''.$langs->trans("DATE_CANCEL").' | '; print ''.dol_print_date($object->date_cancel, 'dayhour').' | |
| '.$langs->trans("ApprovedBy").' | '; print ''; @@ -2080,8 +1984,7 @@ else { $cssforamountpaymentcomplete = 'amountpaymentneutral'; $resteapayeraffiche = 0; - } - elseif ($object->paid == 0) + } elseif ($object->paid == 0) { $cssforamountpaymentcomplete = 'amountpaymentneutral'; } @@ -2092,9 +1995,7 @@ else print ' | '.price($resteapayeraffiche).' |
'.$langs->trans('DoPayment').'
';
- }
- else
- {
+ } else {
print '';
}
}
@@ -2794,8 +2688,7 @@ if ($action != 'create' && $action != 'edit')
{
// Delete
print '';
- }
- elseif ($user->rights->expensereport->supprimer && $object->fk_statut != ExpenseReport::STATUS_CLOSED)
+ } elseif ($user->rights->expensereport->supprimer && $object->fk_statut != ExpenseReport::STATUS_CLOSED)
{
// Delete
print '';
diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index 18fef29e04c..c246da650af 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -145,8 +145,7 @@ class ExpenseReports extends DolibarrApi
}
$i++;
}
- }
- else {
+ } else {
throw new RestException(503, 'Error when retrieve Expense Report list : '.$db->lasterror());
}
if (!count($obj_ret)) {
@@ -411,9 +410,7 @@ class ExpenseReports extends DolibarrApi
if ($this->expensereport->update(DolibarrApiAccess::$user) > 0)
{
return $this->get($id);
- }
- else
- {
+ } else {
throw new RestException(500, $this->expensereport->error);
}
}
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 70d8a3d9b59..e2ea2b377a4 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -308,8 +308,7 @@ class ExpenseReport extends CommonObject
$newndfline->rule_warning_message = $line->rule_warning_message;
$newndfline->fk_c_exp_tax_cat = $line->fk_c_exp_tax_cat;
$newndfline->fk_ecm_files = $line->fk_ecm_files;
- }
- else {
+ } else {
$newndfline = $line;
}
//$newndfline=new ExpenseReportLine($this->db);
@@ -351,28 +350,20 @@ class ExpenseReport extends CommonObject
{
$this->db->commit();
return $this->id;
- }
- else
- {
+ } else {
$this->db->rollback();
return -4;
}
- }
- else
- {
+ } else {
$this->db->rollback();
return -3;
}
- }
- else
- {
+ } else {
dol_syslog(get_class($this)."::create error ".$this->error, LOG_ERR);
$this->db->rollback();
return -2;
}
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror()." sql=".$sql;
$this->db->rollback();
return -1;
@@ -440,9 +431,7 @@ class ExpenseReport extends CommonObject
{
$this->db->commit();
return $this->id;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
@@ -504,16 +493,12 @@ class ExpenseReport extends CommonObject
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
$this->error = $this->db->error();
return -2;
}
- }
- else
- {
+ } else {
$this->db->rollback();
$this->error = $this->db->error();
return -1;
@@ -605,14 +590,10 @@ class ExpenseReport extends CommonObject
$result = $this->fetch_lines();
return $result;
- }
- else
- {
+ } else {
return 0;
}
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
return -1;
}
@@ -658,22 +639,16 @@ class ExpenseReport extends CommonObject
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
$this->error = $this->db->error();
return -2;
}
- }
- else
- {
+ } else {
$this->db->commit();
return 0;
}
- }
- else
- {
+ } else {
$this->db->rollback();
dol_print_error($this->db);
return -1;
@@ -780,9 +755,7 @@ class ExpenseReport extends CommonObject
}
}
$this->db->free($resql);
- }
- else
- {
+ } else {
dol_print_error($this->db);
}
}
@@ -946,9 +919,7 @@ class ExpenseReport extends CommonObject
print ''; -} -else dol_print_error($db); +} else dol_print_error($db); print '
';
print '';
print '
'; } - } - else - { + } else { $title = $langs->trans("ListTripsAndExpenses"); $newcardbutton = ''; @@ -805,9 +796,7 @@ if ($resql) $i++; } - } - else - { + } else { $colspan = 1; foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; } print '
';
// Show graphs
print '
';
@@ -546,8 +530,7 @@ if ($step == 2 && $datatoexport)
print ''.$langs->trans("SelectExportFields").' ';
if (empty($conf->global->EXPORTS_SHARE_MODELS)) {
$htmlother->select_export_model($exportmodelid, 'exportmodelid', $datatoexport, 1, $user->id);
- }
- else {
+ } else {
$htmlother->select_export_model($exportmodelid, 'exportmodelid', $datatoexport, 1);
}
print ' ';
@@ -614,9 +597,7 @@ if ($step == 2 && $datatoexport)
if (!empty($objexport->array_export_special[0][$code]))
{
$htmltext .= ''.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." : ".$objexport->array_export_special[0][$code]."
"; - } - else - { + } else { $htmltext .= ''.$langs->trans("Table")." -> ".$langs->trans("Field").": ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."
"; } if (!empty($objexport->array_export_examplevalues[0][$code])) @@ -642,9 +623,7 @@ if ($step == 2 && $datatoexport) print $form->textwithpicto($text, $htmltext); //print ' ('.$code.')'; print ''; - } - else - { + } else { // Fields not selected print '';
//print $text.'-'.$htmltext."
"; @@ -672,14 +651,10 @@ if ($step == 2 && $datatoexport) if ($usefilters && isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0])) { print ''.$langs->trans("NextStep").''; - } - else - { + } else { print ''.$langs->trans("NextStep").''; } - } - else - { + } else { print ''.$langs->trans("NextStep").''; } @@ -810,9 +785,7 @@ if ($step == 3 && $datatoexport) if (!empty($objexport->array_export_special[0][$code])) { $htmltext .= ''.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." : ".$objexport->array_export_special[0][$code]."
"; - } - else - { + } else { $htmltext .= ''.$langs->trans("Table")." -> ".$langs->trans("Field").": ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."
"; } if (!empty($objexport->array_export_examplevalues[0][$code])) @@ -841,9 +814,7 @@ if ($step == 3 && $datatoexport) { $tmp = $objexport->build_filterField($Typefieldsarray[$code], $code, $ValueFilter); print $form->textwithpicto($tmp, $szInfoFiltre); - } - else - { + } else { print $objexport->build_filterField($Typefieldsarray[$code], $code, $ValueFilter); } } @@ -1005,9 +976,7 @@ if ($step == 4 && $datatoexport) if (!empty($objexport->array_export_special[0][$code])) { $htmltext .= ''.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." : ".$objexport->array_export_special[0][$code]."
"; - } - else - { + } else { $htmltext .= ''.$langs->trans("Table")." -> ".$langs->trans("Field").": ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."
"; } if (!empty($objexport->array_export_examplevalues[0][$code])) @@ -1111,8 +1080,7 @@ if ($step == 4 && $datatoexport) print ''; $i++; } - } - else { + } else { dol_print_error($this->db); } @@ -1306,6 +1274,5 @@ function getablenamefromfield($code, $sqlmaxforexport) if (preg_match($regexstring, $newsql, $reg)) { return $reg[1]; // The tablename - } - else return ''; + } else return ''; } diff --git a/htdocs/externalsite/admin/externalsite.php b/htdocs/externalsite/admin/externalsite.php index b1e3dc7fac8..e2af9e5267d 100644 --- a/htdocs/externalsite/admin/externalsite.php +++ b/htdocs/externalsite/admin/externalsite.php @@ -59,9 +59,7 @@ if ($action == 'update') { $db->commit(); setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); - } - else - { + } else { $db->rollback(); setEventMessages($db->lasterror(), null, 'errors'); } diff --git a/htdocs/externalsite/frames.php b/htdocs/externalsite/frames.php index 3a1b1c04b82..4827d832af4 100644 --- a/htdocs/externalsite/frames.php +++ b/htdocs/externalsite/frames.php @@ -63,19 +63,15 @@ if (!empty($keyforcontent)) { $langs->load("errors"); print $langs->trans("ErrorBadSyntaxForParamKeyForContent", 'EXTERNAL_SITE_CONTENT_', 'EXTERNAL_SITE_URL_'); - } - elseif (empty($conf->global->$keyforcontent)) + } elseif (empty($conf->global->$keyforcontent)) { $langs->load("errors"); print $langs->trans("ErrorVariableKeyForContentMustBeSet", 'EXTERNAL_SITE_CONTENT_'.$keyforcontent, 'EXTERNAL_SITE_URL_'.$keyforcontent); - } - else - { + } else { if (preg_match('/EXTERNAL_SITE_CONTENT_/', $keyforcontent)) { print $conf->global->$keyforcontent; - } - elseif (preg_match('/EXTERNAL_SITE_URL_/', $keyforcontent)) + } elseif (preg_match('/EXTERNAL_SITE_URL_/', $keyforcontent)) { /*print " @@ -114,9 +110,7 @@ if (!empty($keyforcontent)) print ' ';
@@ -619,15 +617,12 @@ if ($action == 'create') {
print '';
if ($user->rights->ficheinter->creer && ($action == 'nb_gen_max' || $object->frequency > 0)) {
print $form->editfieldkey($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $user->rights->facture->creer);
- } else
- print $langs->trans("MaxPeriodNumber");
+ } else print $langs->trans("MaxPeriodNumber");
print ' ';
if ($action == 'nb_gen_max' || $object->frequency > 0) {
print $form->editfieldval($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max ? $object->nb_gen_max : '', $object, $user->rights->facture->creer);
- }
- else
- print '';
+ } else print '';
print ' ';
print '
';
}
print '| ';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
print $px1->show();
print " \n"; print $px2->show(); diff --git a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php index d0096390489..f4f460719a0 100644 --- a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php +++ b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php @@ -42,9 +42,7 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) print ' | ||
| '; print ''.$langs->trans("NoFilesUploadedYet").''; diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php index 978a3059ace..e04b8f20dfb 100644 --- a/htdocs/exports/class/export.class.php +++ b/htdocs/exports/class/export.class.php @@ -141,9 +141,7 @@ class Export if (!empty($perm[2])) { $bool = $user->rights->{$perm[0]}->{$perm[1]}->{$perm[2]}; - } - else - { + } else { $bool = $user->rights->{$perm[0]}->{$perm[1]}; } if ($perm[0] == 'user' && $user->admin) $bool = true; @@ -295,8 +293,7 @@ class Export case 'Text': if (!(strpos($ValueField, '%') === false)) $szFilterQuery .= " ".$NameField." LIKE '".$ValueField."'"; - else - $szFilterQuery .= " ".$NameField." = '".$ValueField."'"; + else $szFilterQuery .= " ".$NameField." = '".$ValueField."'"; break; case 'Date': if (strpos($ValueField, "+") > 0) @@ -305,13 +302,10 @@ class Export $ValueArray = explode("+", $ValueField); $szFilterQuery = "(".$this->conditionDate($NameField, trim($ValueArray[0]), ">="); $szFilterQuery .= " AND ".$this->conditionDate($NameField, trim($ValueArray[1]), "<=").")"; - } - else - { + } else { if (is_numeric(substr($ValueField, 0, 1))) $szFilterQuery = $this->conditionDate($NameField, trim($ValueField), "="); - else - $szFilterQuery = $this->conditionDate($NameField, trim(substr($ValueField, 1)), substr($ValueField, 0, 1)); + else $szFilterQuery = $this->conditionDate($NameField, trim(substr($ValueField, 1)), substr($ValueField, 0, 1)); } break; case 'Duree': @@ -324,13 +318,10 @@ class Export $ValueArray = explode("+", $ValueField); $szFilterQuery = "(".$NameField.">=".$ValueArray[0]; $szFilterQuery .= " AND ".$NameField."<=".$ValueArray[1].")"; - } - else - { + } else { if (is_numeric(substr($ValueField, 0, 1))) $szFilterQuery = " ".$NameField."=".$ValueField; - else - $szFilterQuery = " ".$NameField.substr($ValueField, 0, 1).substr($ValueField, 1); + else $szFilterQuery = " ".$NameField.substr($ValueField, 0, 1).substr($ValueField, 1); } break; case 'Boolean': @@ -343,8 +334,7 @@ class Export else { if (!(strpos($ValueField, '%') === false)) $szFilterQuery = " ".$NameField." LIKE '".$ValueField."'"; - else - $szFilterQuery = " ".$NameField." = '".$ValueField."'"; + else $szFilterQuery = " ".$NameField." = '".$ValueField."'"; } break; default: @@ -367,7 +357,7 @@ class Export // TODO date_format is forbidden, not performant and not portable. Use instead BETWEEN if (strlen($Value) == 4) $Condition = " date_format(".$Field.",'%Y') ".$Sens." '".$Value."'"; elseif (strlen($Value) == 6) $Condition = " date_format(".$Field.",'%Y%m') ".$Sens." '".$Value."'"; - else $Condition = " date_format(".$Field.",'%Y%m%d') ".$Sens." ".$Value; + else $Condition = " date_format(".$Field.",'%Y%m%d') ".$Sens." ".$Value; return $Condition; } @@ -428,8 +418,7 @@ class Export if (!empty($InfoFieldList[3])) $keyList = $InfoFieldList[3]; - else - $keyList = 'rowid'; + else $keyList = 'rowid'; $sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3]) ? '' : ', '.$InfoFieldList[3].' as code'); if ($InfoFieldList[1] == 'c_stcomm') $sql = 'SELECT id as id, '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3]) ? '' : ', '.$InfoFieldList[3].' as code'); if ($InfoFieldList[1] == 'c_country') $sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label, code as code'; @@ -473,9 +462,7 @@ class Export if (!empty($ValueField) && $ValueField == $obj->rowid) { $szFilterField .= ''; - } - else - { + } else { $szFilterField .= ''; } $i++; @@ -484,8 +471,7 @@ class Export $szFilterField .= ""; $this->db->free($resql); - } - else dol_print_error($this->db); + } else dol_print_error($this->db); break; } @@ -564,8 +550,7 @@ class Export $objmodel = new $classname($this->db); if (!empty($sqlquery)) $sql = $sqlquery; - else - { + else { // Define value for indice from $datatoexport $foundindice = 0; foreach ($this->array_export_code as $key => $dataset) @@ -595,8 +580,7 @@ class Export //$this->array_export_label[$indice] if ($conf->global->EXPORT_PREFIX_SPEC) $filename = $conf->global->EXPORT_PREFIX_SPEC."_".$datatoexport; - else - $filename = "export_".$datatoexport; + else $filename = "export_".$datatoexport; $filename .= '.'.$objmodel->getDriverExtension(); $dirname = $conf->export->dir_temp.'/'.$user->id; @@ -664,9 +648,7 @@ class Export $remaintopay = $tmpobjforcomputecall->getRemainToPay(); } $obj->$alias = $remaintopay; - } - else - { + } else { // TODO FIXME Export of compute field does not work. $obj containt $obj->alias_field and formulat will contains $obj->field $computestring = $this->array_export_special[$indice][$key]; $tmp = dol_eval($computestring, 1, 0); @@ -688,16 +670,12 @@ class Export $objmodel->close_file(); return 1; - } - else - { + } else { $this->error = $objmodel->error; dol_syslog("Export::build_file Error: ".$this->error, LOG_ERR); return -1; } - } - else - { + } else { $this->error = $this->db->error()." - sql=".$sql; return -1; } @@ -739,9 +717,7 @@ class Export { $this->db->commit(); return 1; - } - else - { + } else { $this->error = $this->db->lasterror(); $this->errno = $this->db->lasterrno(); $this->db->rollback(); @@ -776,15 +752,11 @@ class Export $this->hexafiltervalue = $obj->filter; return 1; - } - else - { + } else { $this->error = "ModelNotFound"; return -2; } - } - else - { + } else { dol_print_error($this->db); return -3; } @@ -822,9 +794,7 @@ class Export } $this->db->rollback(); return -1 * $error; - } - else - { + } else { $this->db->commit(); return 1; } diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index 6543747d1f7..98353d42bf1 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -173,9 +173,7 @@ if ($action == 'selectfield') // Selection of field at step 2 //print_r($array_selected); $_SESSION["export_selected_fields"] = $array_selected; } - } - else - { + } else { $warnings = array(); $array_selected[$field] = count($array_selected) + 1; // We tag the key $field as "selected" @@ -190,8 +188,7 @@ if ($action == 'selectfield') // Selection of field at step 2 $tmp = $fieldsdependenciesarray[$fieldsentitiesarray[$field]]; // $fieldsdependenciesarray=array('element'=>'fd.rowid') or array('element'=>array('fd.rowid','ab.rowid')) if (is_array($tmp)) $listofdependencies = $tmp; else $listofdependencies = array($tmp); - } - elseif (!empty($field) && !empty($fieldsdependenciesarray[$field])) + } elseif (!empty($field) && !empty($fieldsdependenciesarray[$field])) { // We found a dependency on a dedicated field $tmp = $fieldsdependenciesarray[$field]; // $fieldsdependenciesarray=array('fd.fieldx'=>'fd.rowid') or array('fd.fieldx'=>array('fd.rowid','ab.rowid')) @@ -222,9 +219,7 @@ if ($action == 'unselectfield') { $array_selected = array(); $_SESSION["export_selected_fields"] = $array_selected; - } - else - { + } else { unset($array_selected[$_GET["field"]]); // Renumber fields of array_selected (from 1 to nb_elements) asort($array_selected); @@ -287,9 +282,7 @@ if ($action == 'builddoc') { setEventMessages($objexport->error, $objexport->errors, 'errors'); $sqlusedforexport = $objexport->sqlusedforexport; - } - else - { + } else { setEventMessages($langs->trans("FileSuccessfullyBuilt"), null, 'mesgs'); $sqlusedforexport = $objexport->sqlusedforexport; } @@ -350,18 +343,13 @@ if ($action == 'add_export_model') if ($result >= 0) { setEventMessages($langs->trans("ExportModelSaved", $objexport->model_name), null, 'mesgs'); - } - else - { + } else { $langs->load("errors"); if ($objexport->errno == 'DB_ERROR_RECORD_ALREADY_EXISTS') setEventMessages($langs->trans("ErrorExportDuplicateProfil"), null, 'errors'); - else - setEventMessages($objexport->error, $objexport->errors, 'errors'); + else setEventMessages($objexport->error, $objexport->errors, 'errors'); } - } - else - { + } else { setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("ExportModelName")), null, 'errors'); } } @@ -472,16 +460,12 @@ if ($step == 1 || !$datatoexport) if ($objexport->array_export_perms[$key]) { print ''.img_picto($langs->trans("NewExport"), 'filenew').''; - } - else - { + } else { print $langs->trans("NotEnoughPermissions"); } print ' | ||
| '.$langs->trans("NoExportableData").' | ||
"; - } - else - { + } else { $htmltext .= ''.$langs->trans("Table")." -> ".$langs->trans("Field").": ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."
"; } if (!empty($objexport->array_export_examplevalues[0][$code])) @@ -642,9 +623,7 @@ if ($step == 2 && $datatoexport) print $form->textwithpicto($text, $htmltext); //print ' ('.$code.')'; print ''; - } - else - { + } else { // Fields not selected print '
"; @@ -672,14 +651,10 @@ if ($step == 2 && $datatoexport) if ($usefilters && isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0])) { print ''.$langs->trans("NextStep").''; - } - else - { + } else { print ''.$langs->trans("NextStep").''; } - } - else - { + } else { print ''.$langs->trans("NextStep").''; } @@ -810,9 +785,7 @@ if ($step == 3 && $datatoexport) if (!empty($objexport->array_export_special[0][$code])) { $htmltext .= ''.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." : ".$objexport->array_export_special[0][$code]."
"; - } - else - { + } else { $htmltext .= ''.$langs->trans("Table")." -> ".$langs->trans("Field").": ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."
"; } if (!empty($objexport->array_export_examplevalues[0][$code])) @@ -841,9 +814,7 @@ if ($step == 3 && $datatoexport) { $tmp = $objexport->build_filterField($Typefieldsarray[$code], $code, $ValueFilter); print $form->textwithpicto($tmp, $szInfoFiltre); - } - else - { + } else { print $objexport->build_filterField($Typefieldsarray[$code], $code, $ValueFilter); } } @@ -1005,9 +976,7 @@ if ($step == 4 && $datatoexport) if (!empty($objexport->array_export_special[0][$code])) { $htmltext .= ''.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." : ".$objexport->array_export_special[0][$code]."
"; - } - else - { + } else { $htmltext .= ''.$langs->trans("Table")." -> ".$langs->trans("Field").": ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."
"; } if (!empty($objexport->array_export_examplevalues[0][$code])) @@ -1111,8 +1080,7 @@ if ($step == 4 && $datatoexport) print ''; $i++; } - } - else { + } else { dol_print_error($this->db); } @@ -1306,6 +1274,5 @@ function getablenamefromfield($code, $sqlmaxforexport) if (preg_match($regexstring, $newsql, $reg)) { return $reg[1]; // The tablename - } - else return ''; + } else return ''; } diff --git a/htdocs/externalsite/admin/externalsite.php b/htdocs/externalsite/admin/externalsite.php index b1e3dc7fac8..e2af9e5267d 100644 --- a/htdocs/externalsite/admin/externalsite.php +++ b/htdocs/externalsite/admin/externalsite.php @@ -59,9 +59,7 @@ if ($action == 'update') { $db->commit(); setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); - } - else - { + } else { $db->rollback(); setEventMessages($db->lasterror(), null, 'errors'); } diff --git a/htdocs/externalsite/frames.php b/htdocs/externalsite/frames.php index 3a1b1c04b82..4827d832af4 100644 --- a/htdocs/externalsite/frames.php +++ b/htdocs/externalsite/frames.php @@ -63,19 +63,15 @@ if (!empty($keyforcontent)) { $langs->load("errors"); print $langs->trans("ErrorBadSyntaxForParamKeyForContent", 'EXTERNAL_SITE_CONTENT_', 'EXTERNAL_SITE_URL_'); - } - elseif (empty($conf->global->$keyforcontent)) + } elseif (empty($conf->global->$keyforcontent)) { $langs->load("errors"); print $langs->trans("ErrorVariableKeyForContentMustBeSet", 'EXTERNAL_SITE_CONTENT_'.$keyforcontent, 'EXTERNAL_SITE_URL_'.$keyforcontent); - } - else - { + } else { if (preg_match('/EXTERNAL_SITE_CONTENT_/', $keyforcontent)) { print $conf->global->$keyforcontent; - } - elseif (preg_match('/EXTERNAL_SITE_URL_/', $keyforcontent)) + } elseif (preg_match('/EXTERNAL_SITE_URL_/', $keyforcontent)) { /*print " @@ -114,9 +110,7 @@ if (!empty($keyforcontent)) print '
';
llxFooter();
-}
-else
-{
+} else {
if (preg_match('/^\//', $conf->global->EXTERNALSITE_URL) || preg_match('/^http/i', $conf->global->EXTERNALSITE_URL))
{
print "
@@ -150,9 +144,7 @@ else
";
- }
- else
- {
+ } else {
llxHeader();
print '
';
print $conf->global->EXTERNALSITE_URL;
diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index b5b259f2430..55ad529df3b 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -424,8 +424,7 @@ if ($action == 'create') {
print '';
print '
';
print "\n";
- }
- else {
+ } else {
dol_print_error('', "Error, no fichinter ".$object->id);
}
} elseif ($action == 'selsocforcreatefrommodel') {
@@ -596,8 +595,7 @@ if ($action == 'create') {
} else {
if ($object->frequency > 0)
print $langs->trans('FrequencyPer_'.$object->unit_frequency, $object->frequency);
- else
- print $langs->trans("NotARecurringInterventionalTemplate");
+ else print $langs->trans("NotARecurringInterventionalTemplate");
}
print ''.$object->error.'
';
}
- }
-
- elseif ($action == 'confirm_modify' && $confirm == 'yes' && $user->rights->ficheinter->creer)
+ } elseif ($action == 'confirm_modify' && $confirm == 'yes' && $user->rights->ficheinter->creer)
{
$result = $object->setDraft($user);
if ($result >= 0)
@@ -205,14 +197,10 @@ if (empty($reshook))
header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
exit;
- }
- else
- {
+ } else {
$mesg = ''.$object->error.'
';
}
- }
-
- elseif ($action == 'add' && $user->rights->ficheinter->creer)
+ } elseif ($action == 'add' && $user->rights->ficheinter->creer)
{
$object->socid = $socid;
$object->duration = GETPOST('duration', 'int');
@@ -383,21 +371,15 @@ if (empty($reshook))
}
}
}
- }
- else
- {
+ } else {
$mesg = $srcobject->error;
$error++;
}
- }
- else
- {
+ } else {
$mesg = $object->error;
$error++;
}
- }
- else
- {
+ } else {
// Fill array 'array_options' with data from add form
$ret = $extrafields->setOptionalsFromPost(null, $object);
if ($ret < 0) {
@@ -416,24 +398,18 @@ if (empty($reshook))
if ($result > 0)
{
$id = $result; // Force raffraichissement sur fiche venant d'etre cree
- }
- else
- {
+ } else {
$langs->load("errors");
setEventMessages($object->error, $object->errors, 'errors');
$action = 'create';
}
}
}
- }
- else
- {
+ } else {
$mesg = ''.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdParty")).'
';
$action = 'create';
}
- }
-
- elseif ($action == 'update' && $user->rights->ficheinter->creer)
+ } elseif ($action == 'update' && $user->rights->ficheinter->creer)
{
$object->socid = $socid;
$object->fk_project = GETPOST('projectid', 'int');
@@ -460,9 +436,7 @@ if (empty($reshook))
{
$result = $object->set_contrat($user, GETPOST('contratid', 'int'));
if ($result < 0) dol_print_error($db, $object->error);
- }
-
- elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->ficheinter->supprimer)
+ } elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->ficheinter->supprimer)
{
$result = $object->delete($user);
if ($result < 0) {
@@ -471,9 +445,7 @@ if (empty($reshook))
header('Location: '.DOL_URL_ROOT.'/fichinter/list.php?leftmenu=ficheinter&restore_lastsearch_values=1');
exit;
- }
-
- elseif ($action == 'setdescription' && $user->rights->ficheinter->creer)
+ } elseif ($action == 'setdescription' && $user->rights->ficheinter->creer)
{
$result = $object->set_description($user, GETPOST('description'));
if ($result < 0) dol_print_error($db, $object->error);
@@ -537,9 +509,7 @@ if (empty($reshook))
if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) fichinter_create($db, $object, $object->modelpdf, $outputlangs);
header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
exit;
- }
- else
- {
+ } else {
$mesg = $object->error;
$db->rollback();
}
@@ -554,9 +524,7 @@ if (empty($reshook))
{
header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
exit;
- }
- else
- {
+ } else {
setEventMessages($object->error, $object->errors, 'errors');
}
}
@@ -569,9 +537,7 @@ if (empty($reshook))
{
header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
exit;
- }
- else
- {
+ } else {
$mesg = ''.$object->error.'
';
}
}
@@ -584,9 +550,7 @@ if (empty($reshook))
{
header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
exit;
- }
- else
- {
+ } else {
setEventMessages($object->error, $object->errors, 'errors');
}
}
@@ -698,9 +662,7 @@ if (empty($reshook))
header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'#'.$lineid);
exit;
- }
-
- elseif ($action == 'down' && $user->rights->ficheinter->creer)
+ } elseif ($action == 'down' && $user->rights->ficheinter->creer)
{
$object->line_down($lineid);
@@ -769,16 +731,12 @@ if (empty($reshook))
{
header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit;
- }
- else
- {
+ } else {
if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
{
$langs->load("errors");
$mesg = ''.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'
';
- }
- else
- {
+ } else {
$mesg = ''.$object->error.'
';
}
}
@@ -799,8 +757,7 @@ if (empty($reshook))
{
header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit;
- }
- else {
+ } else {
dol_print_error($db);
}
}
@@ -845,9 +802,7 @@ if ($action == 'create')
if ($element == 'project')
{
$projectid = GETPOST('originid', 'int');
- }
- else
- {
+ } else {
// For compatibility
if ($element == 'order' || $element == 'commande') {
$element = $subelement = 'commande';
@@ -881,8 +836,7 @@ if ($action == 'create')
// Object source contacts list
$srccontactslist = $objectsrc->liste_contact(-1, 'external', 1);
}
- }
- else {
+ } else {
$projectid = GETPOST('projectid', 'int');
}
@@ -1061,9 +1015,7 @@ if ($action == 'create')
print '';
}
- }
- else
- {
+ } else {
print '';
}
-}
-elseif ($id > 0 || !empty($ref))
+} elseif ($id > 0 || !empty($ref))
{
/*
* Affichage en mode visu
@@ -1134,9 +1085,7 @@ elseif ($id > 0 || !empty($ref))
$error++;
setEventMessages($object->error, $object->errors, 'errors');
}
- }
- else
- {
+ } else {
$numref = $object->ref;
}
$text = $langs->trans('ConfirmValidateIntervention', $numref);
@@ -1290,18 +1239,14 @@ elseif ($id > 0 || !empty($ref))
{
$formcontract = new Formcontract($db);
$formcontract->formSelectContract($_SERVER["PHP_SELF"].'?id='.$object->id, $object->socid, $object->fk_contrat, 'contratid', 0, 1);
- }
- else
- {
+ } else {
if ($object->fk_contrat)
{
$contratstatic = new Contrat($db);
$contratstatic->fetch($object->fk_contrat);
//print ''.$projet->title.'';
print $contratstatic->getNomUrl(0, '', 1);
- }
- else
- {
+ } else {
print " ";
}
}
@@ -1363,9 +1308,7 @@ elseif ($id > 0 || !empty($ref))
{
print '';
print '';
- }
- else
- {
+ } else {
print '';
}
@@ -1446,9 +1389,7 @@ elseif ($id > 0 || !empty($ref))
}
}
print '';
- }
- else
- {
+ } else {
print '"; -} -else -{ +} else { dol_print_error($db); } @@ -298,8 +296,7 @@ if ($resql) } } print "
"; -} -else dol_print_error($db); +} else dol_print_error($db); /* @@ -369,8 +366,7 @@ if (!empty($conf->ficheinter->enabled)) } print "
"; - } - else dol_print_error($db); + } else dol_print_error($db); } print ''; diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index 64a3c3812bb..993dd0f3fa4 100644 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -75,8 +75,6 @@ $pagenext = $page + 1; if (!$sortorder) $sortorder = "DESC"; if (!$sortfield) { - //if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) $sortfield="fd.date"; - //else $sortfield = "f.ref"; } @@ -203,7 +201,7 @@ foreach ($arrayfields as $tmpkey => $tmpval) $sql = "SELECT"; $sql .= " f.ref, f.rowid, f.fk_statut as status, f.description, f.datec as date_creation, f.tms as date_update, f.note_private,"; -if (empty($conf->global->FICHINTER_DISABLE_DETAILS) && $atleastonefieldinlines) $sql .= "fd.rowid as lineid, fd.description as descriptiondetail, fd.date as dp, fd.duree,"; +if (empty($conf->global->FICHINTER_DISABLE_DETAILS) && $atleastonefieldinlines) $sql .= " fd.rowid as lineid, fd.description as descriptiondetail, fd.date as dp, fd.duree,"; $sql .= " s.nom as name, s.rowid as socid, s.client, s.fournisseur, s.email, s.status as thirdpartystatus"; if (!empty($conf->projet->enabled)) { $sql .= ", pr.rowid as projet_id, pr.ref as projet_ref, pr.title as projet_title"; @@ -245,7 +243,7 @@ if ($search_contrat_ref) { $sql .= natural_search('c.ref', $search_contrat_ref); } if ($search_desc) { - if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) $sql .= natural_search(array('f.description', 'fd.description'), $search_desc); + if (empty($conf->global->FICHINTER_DISABLE_DETAILS) && $atleastonefieldinlines) $sql .= natural_search(array('f.description', 'fd.description'), $search_desc); else $sql .= natural_search(array('f.description'), $search_desc); } if ($search_status != '' && $search_status >= 0) { @@ -652,9 +650,7 @@ if ($resql) $delallowed = $user->rights->ficheinter->creer; print $formfile->showdocuments('massfilesarea_interventions', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty); -} -else -{ +} else { dol_print_error($db); } diff --git a/htdocs/fichinter/stats/index.php b/htdocs/fichinter/stats/index.php index 0ca948312c6..cb076e01ef1 100644 --- a/htdocs/fichinter/stats/index.php +++ b/htdocs/fichinter/stats/index.php @@ -81,9 +81,7 @@ if (!$user->rights->societe->client->voir || $user->socid) { $filenamenb = $dir.'/interventionsnbinyear-'.$user->id.'-'.$year.'.png'; $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsnbinyear-'.$user->id.'-'.$year.'.png'; -} -else -{ +} else { $filenamenb = $dir.'/interventionsnbinyear-'.$year.'.png'; $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsnbinyear-'.$year.'.png'; } @@ -121,9 +119,7 @@ if (!$user->rights->societe->client->voir || $user->socid) { $filenameamount = $dir.'/interventionsamountinyear-'.$user->id.'-'.$year.'.png'; $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsamountinyear-'.$user->id.'-'.$year.'.png'; -} -else -{ +} else { $filenameamount = $dir.'/interventionsamountinyear-'.$year.'.png'; $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsamountinyear-'.$year.'.png'; } @@ -160,9 +156,7 @@ if (!$user->rights->societe->client->voir || $user->socid) { $filename_avg = $dir.'/interventionsaverage-'.$user->id.'-'.$year.'.png'; $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsaverage-'.$user->id.'-'.$year.'.png'; -} -else -{ +} else { $filename_avg = $dir.'/interventionsaverage-'.$year.'.png'; $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsaverage-'.$year.'.png'; } @@ -313,8 +307,7 @@ print '
';
// Show graphs
print '
";
- }
- else
- {
+ } else {
dol_print_error($db);
}
}
@@ -606,9 +596,7 @@ if ($object->id > 0)
if (empty($conf->global->SUPPLIER_ORDER_TO_INVOICE_STATUS))
{
$sql2 .= " AND c.fk_statut IN (".CommandeFournisseur::STATUS_RECEIVED_COMPLETELY.")"; // Must match filter in htdocs/fourn/orderstoinvoice.php
- }
- else
- {
+ } else {
// CommandeFournisseur::STATUS_ORDERSENT.", ".CommandeFournisseur::STATUS_RECEIVED_PARTIALLY.", ".CommandeFournisseur::STATUS_RECEIVED_COMPLETELY
$sql2 .= " AND c.fk_statut IN (".$db->escape($conf->global->SUPPLIER_ORDER_TO_INVOICE_STATUS).")";
}
@@ -677,9 +665,7 @@ if ($object->id > 0)
if ($obj->dc)
{
print dol_print_date($db->jdate($obj->dc), 'day');
- }
- else
- {
+ } else {
print "-";
}
print '';
@@ -690,9 +676,7 @@ if ($object->id > 0)
$db->free($resql);
if ($num > 0) print "";
- }
- else
- {
+ } else {
dol_print_error($db);
}
}
@@ -761,9 +745,7 @@ if ($object->id > 0)
}
$db->free($resql);
if ($num > 0) print '';
- }
- else
- {
+ } else {
dol_print_error($db);
}
}
@@ -817,13 +799,10 @@ if ($object->id > 0)
{
// Company is open
print '';
- }
- else
- {
+ } else {
print '';
}
- }
- else print '';
+ } else print '';
}
if ($user->rights->fournisseur->facture->creer)
@@ -842,9 +821,7 @@ if ($object->id > 0)
if ($user->rights->agenda->myactions->create)
{
print ''.$langs->trans("AddAction").'';
- }
- else
- {
+ } else {
print ''.$langs->trans("AddAction").'';
}
}
@@ -870,9 +847,7 @@ if ($object->id > 0)
// List of done actions
show_actions_done($conf, $langs, $db, $object);
}
-}
-else
-{
+} else {
dol_print_error($db);
}
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index 1f20965fab3..5ec2b6f49a6 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -177,8 +177,7 @@ class SupplierInvoices extends DolibarrApi
}
$i++;
}
- }
- else {
+ } else {
throw new RestException(503, 'Error when retrieve supplier invoice list : '.$db->lasterror());
}
if (!count($obj_ret)) {
@@ -669,9 +668,7 @@ class SupplierInvoices extends DolibarrApi
$updateRes = $this->invoice->deleteline($lineid);
if ($updateRes > 0) {
return $this->get($id);
- }
- else
- {
+ } else {
throw new RestException(405, $this->invoice->error);
}
}
diff --git a/htdocs/fourn/class/api_supplier_orders.class.php b/htdocs/fourn/class/api_supplier_orders.class.php
index 9e22d952920..bee6346386b 100644
--- a/htdocs/fourn/class/api_supplier_orders.class.php
+++ b/htdocs/fourn/class/api_supplier_orders.class.php
@@ -175,8 +175,7 @@ class SupplierOrders extends DolibarrApi
}
$i++;
}
- }
- else {
+ } else {
throw new RestException(503, 'Error when retrieve supplier order list : '.$db->lasterror());
}
if (!count($obj_ret)) {
diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php
index 30995b3b0df..e9ba334313c 100644
--- a/htdocs/fourn/class/fournisseur.class.php
+++ b/htdocs/fourn/class/fournisseur.class.php
@@ -95,9 +95,7 @@ class Fournisseur extends Societe
{
$obj = $this->db->fetch_object($resql);
return $obj->nb;
- }
- else
- {
+ } else {
return -1;
}
}
@@ -136,9 +134,7 @@ class Fournisseur extends Societe
}
$this->db->free($resql);
return 1;
- }
- else
- {
+ } else {
dol_print_error($this->db);
$this->error = $this->db->error();
return -1;
@@ -166,9 +162,7 @@ class Fournisseur extends Societe
{
dol_syslog("Fournisseur::CreateCategory : Success");
return 0;
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
dol_syslog("Fournisseur::CreateCategory : Failed (".$this->error.")");
return -1;
@@ -204,9 +198,7 @@ class Fournisseur extends Societe
{
$arr[$obj->rowid] = $obj->name;
}
- }
- else
- {
+ } else {
dol_print_error($this->db);
$this->error = $this->db->lasterror();
}
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 19060b9a393..c544658a921 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -422,14 +422,10 @@ class CommandeFournisseur extends CommonOrder
if ($result < 0)
{
return -1;
- }
- else
- {
+ } else {
return 1;
}
- }
- else
- {
+ } else {
$this->error = $this->db->error()." sql=".$sql;
return -1;
}
@@ -547,9 +543,7 @@ class CommandeFournisseur extends CommonOrder
$this->db->free($result);
return $num;
- }
- else
- {
+ } else {
$this->error = $this->db->error()." sql=".$sql;
return -1;
}
@@ -585,9 +579,7 @@ class CommandeFournisseur extends CommonOrder
if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
{
$num = $this->getNextNumRef($soc);
- }
- else
- {
+ } else {
$num = $this->ref;
}
$this->newref = dol_sanitizeFileName($num);
@@ -666,15 +658,11 @@ class CommandeFournisseur extends CommonOrder
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
- }
- else
- {
+ } else {
$this->error = 'NotAuthorized';
dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
return -1;
@@ -881,15 +869,11 @@ class CommandeFournisseur extends CommonOrder
if ($numref != "")
{
return $numref;
- }
- else
- {
+ } else {
$this->error = $obj->error;
return -1;
}
- }
- else
- {
+ } else {
$this->error = "Error_COMMANDE_SUPPLIER_ADDON_NotDefined";
return -2;
}
@@ -923,15 +907,11 @@ class CommandeFournisseur extends CommonOrder
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
- }
- else
- {
+ } else {
dol_print_error($this->db);
$this->db->rollback();
@@ -970,9 +950,7 @@ class CommandeFournisseur extends CommonOrder
if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
{
$num = $this->getNextNumRef($soc);
- }
- else
- {
+ } else {
$num = $this->ref;
}
$this->newref = dol_sanitizeFileName($num);
@@ -995,8 +973,7 @@ class CommandeFournisseur extends CommonOrder
$comment = ' (first level)';
}
}
- }
- else // request a second level approval
+ } else // request a second level approval
{
$sql .= " date_approve2='".$this->db->idate($now)."',";
$sql .= " fk_user_approve2 = ".$user->id;
@@ -1063,8 +1040,7 @@ class CommandeFournisseur extends CommonOrder
{
$this->date_approve = $now;
$this->user_approve_id = $user->id;
- }
- else // request a second level approval
+ } else // request a second level approval
{
$this->date_approve2 = $now;
$this->user_approve_id2 = $user->id;
@@ -1072,22 +1048,16 @@ class CommandeFournisseur extends CommonOrder
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
- }
- else
- {
+ } else {
$this->db->rollback();
$this->error = $this->db->lasterror();
return -1;
}
- }
- else
- {
+ } else {
dol_syslog(get_class($this)."::approve Not Authorized", LOG_ERR);
}
return -1;
@@ -1126,22 +1096,16 @@ class CommandeFournisseur extends CommonOrder
{
$error++;
$this->db->rollback();
- }
- else
- $this->db->commit();
+ } else $this->db->commit();
// End call triggers
}
- }
- else
- {
+ } else {
$this->db->rollback();
$this->error = $this->db->lasterror();
dol_syslog(get_class($this)."::refuse Error -1");
$result = -1;
}
- }
- else
- {
+ } else {
dol_syslog(get_class($this)."::refuse Not Authorized");
}
return $result;
@@ -1187,23 +1151,17 @@ class CommandeFournisseur extends CommonOrder
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
- }
- else
- {
+ } else {
$this->db->rollback();
$this->error = $this->db->lasterror();
dol_syslog(get_class($this)."::cancel ".$this->error);
return -1;
}
- }
- else
- {
+ } else {
dol_syslog(get_class($this)."::cancel Not Authorized");
return -1;
}
@@ -1247,9 +1205,7 @@ class CommandeFournisseur extends CommonOrder
$result = $this->call_trigger('ORDER_SUPPLIER_SUBMIT', $user);
if ($result < 0) $error++;
// End call triggers
- }
- else
- {
+ } else {
$error++;
$this->error = $this->db->lasterror();
$this->errors[] = $this->db->lasterror();
@@ -1258,14 +1214,10 @@ class CommandeFournisseur extends CommonOrder
if (!$error)
{
$this->db->commit();
- }
- else
- {
+ } else {
$this->db->rollback();
}
- }
- else
- {
+ } else {
$error++;
$this->error = $langs->trans('NotAuthorized');
$this->errors[] = $langs->trans('NotAuthorized');
@@ -1428,8 +1380,7 @@ class CommandeFournisseur extends CommonOrder
$error++;
}
}
- }
- else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+ } else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
{
$origin_id = $tmp_origin_id;
$ret = $this->add_object_linked($origin, $origin_id);
@@ -1463,17 +1414,13 @@ class CommandeFournisseur extends CommonOrder
$this->db->commit();
return $this->id;
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
$this->db->rollback();
return -2;
}
}
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
$this->db->rollback();
return -1;
@@ -1557,9 +1504,7 @@ class CommandeFournisseur extends CommonOrder
{
$this->db->commit();
return $this->id;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
@@ -1626,9 +1571,7 @@ class CommandeFournisseur extends CommonOrder
if ($price_base_type == 'HT')
{
$pu = $pu_ht;
- }
- else
- {
+ } else {
$pu = $pu_ttc;
}
$desc = trim($desc);
@@ -1698,9 +1641,7 @@ class CommandeFournisseur extends CommonOrder
dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_ERR);
return -1;
}
- }
- else
- {
+ } else {
$this->error = $prod->error;
$this->db->rollback();
return -1;
@@ -1715,9 +1656,7 @@ class CommandeFournisseur extends CommonOrder
if ($qty < $prod->packaging)
{
$qty = $prod->packaging;
- }
- else
- {
+ } else {
if (($qty % $prod->packaging) > 0)
{
$coeff = intval($qty / $prod->packaging) + 1;
@@ -1726,9 +1665,7 @@ class CommandeFournisseur extends CommonOrder
}
}
}
- }
- else
- {
+ } else {
$product_type = $type;
}
@@ -1841,15 +1778,11 @@ class CommandeFournisseur extends CommonOrder
{
$this->db->commit();
return $this->line->id;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
- }
- else
- {
+ } else {
$this->error = $this->line->error;
$this->errors = $this->line->errors;
dol_syslog(get_class($this)."::addline error=".$this->error, LOG_ERR);
@@ -1922,13 +1855,10 @@ class CommandeFournisseur extends CommonOrder
if ($result < 0)
{
$error++;
- return -1;
}
// End call triggers
}
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
$error++;
}
@@ -1956,15 +1886,11 @@ class CommandeFournisseur extends CommonOrder
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
- }
- else
- {
+ } else {
$this->error = 'BadStatusForObject';
return -2;
}
@@ -1992,16 +1918,12 @@ class CommandeFournisseur extends CommonOrder
{
$this->update_price();
return 1;
- }
- else
- {
+ } else {
$this->error = $line->error;
$this->errors = $line->errors;
return -1;
}
- }
- else
- {
+ } else {
return -2;
}
}
@@ -2030,6 +1952,7 @@ class CommandeFournisseur extends CommonOrder
{
$this->errors[] = 'ErrorWhenRunningTrigger';
dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
+ $this->db->rollback();
return -1;
}
// End call triggers
@@ -2065,9 +1988,7 @@ class CommandeFournisseur extends CommonOrder
$this->errors[] = $this->db->lasterror();
$error++;
}
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
$this->errors[] = $this->db->lasterror();
$error++;
@@ -2129,9 +2050,7 @@ class CommandeFournisseur extends CommonOrder
dol_syslog(get_class($this)."::delete $this->id by $user->id", LOG_DEBUG);
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
$this->db->rollback();
return -$error;
@@ -2166,9 +2085,7 @@ class CommandeFournisseur extends CommonOrder
$i++;
}
return 0;
- }
- else
- {
+ } else {
return -1;
}
}
@@ -2218,8 +2135,7 @@ class CommandeFournisseur extends CommonOrder
$i++;
}
- }
- else dol_print_error($this->db, 'Failed to execute request to get dispatched lines');
+ } else dol_print_error($this->db, 'Failed to execute request to get dispatched lines');
return $ret;
}
@@ -2315,25 +2231,19 @@ class CommandeFournisseur extends CommonOrder
if (!$error)
{
$this->db->commit();
- }
- else
- {
+ } else {
$this->statut = $old_statut;
$this->db->rollback();
$this->error = $this->db->lasterror();
$result = -1;
}
- }
- else
- {
+ } else {
$this->db->rollback();
$this->error = $this->db->lasterror();
$result = -1;
}
}
- }
- else
- {
+ } else {
$this->error = $langs->trans('NotAuthorized');
$this->errors[] = $langs->trans('NotAuthorized');
dol_syslog(get_class($this)."::Livraison Not Authorized");
@@ -2390,9 +2300,7 @@ class CommandeFournisseur extends CommonOrder
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
foreach ($this->errors as $errmsg)
{
dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2401,9 +2309,7 @@ class CommandeFournisseur extends CommonOrder
$this->db->rollback();
return -1 * $error;
}
- }
- else
- {
+ } else {
return -2;
}
}
@@ -2457,9 +2363,7 @@ class CommandeFournisseur extends CommonOrder
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
foreach ($this->errors as $errmsg)
{
dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2468,9 +2372,7 @@ class CommandeFournisseur extends CommonOrder
$this->db->rollback();
return -1 * $error;
}
- }
- else
- {
+ } else {
return -2;
}
}
@@ -2557,9 +2459,7 @@ class CommandeFournisseur extends CommonOrder
$result = $this->call_trigger("ORDER_SUPPLIER_STATUS_".$triggerName[$status], $user);
if ($result < 0) { $error++; }
// End call triggers
- }
- else
- {
+ } else {
$error++;
$this->error = $this->db->lasterror();
dol_syslog(get_class($this)."::setStatus ".$this->error);
@@ -2570,9 +2470,7 @@ class CommandeFournisseur extends CommonOrder
$this->statut = $status;
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
@@ -2695,9 +2593,7 @@ class CommandeFournisseur extends CommonOrder
if ($qty < $this->line->packaging)
{
$qty = $this->line->packaging;
- }
- else
- {
+ } else {
if (($qty % $this->line->packaging) > 0)
{
$coeff = intval($qty / $this->line->packaging) + 1;
@@ -2762,16 +2658,12 @@ class CommandeFournisseur extends CommonOrder
$this->update_price('', 'auto');
$this->db->commit();
return $result;
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
$this->db->rollback();
return -1;
}
- }
- else
- {
+ } else {
$this->error = "Order status makes operation forbidden";
dol_syslog(get_class($this)."::updateline ".$this->error, LOG_ERR);
return -2;
@@ -2849,9 +2741,7 @@ class CommandeFournisseur extends CommonOrder
$line->total_ttc = 59.8;
$line->total_tva = 9.8;
$line->remise_percent = 50;
- }
- else
- {
+ } else {
$line->total_ht = 100;
$line->total_ttc = 119.6;
$line->total_tva = 19.6;
@@ -2902,9 +2792,7 @@ class CommandeFournisseur extends CommonOrder
$this->date_validation = $this->db->idate($obj->date_validation);
}
$this->db->free($result);
- }
- else
- {
+ } else {
dol_print_error($this->db);
}
}
@@ -2943,9 +2831,7 @@ class CommandeFournisseur extends CommonOrder
}
$this->db->free($resql);
return 1;
- }
- else
- {
+ } else {
dol_print_error($this->db);
$this->error = $this->db->error();
return -1;
@@ -2978,8 +2864,7 @@ class CommandeFournisseur extends CommonOrder
$sql .= $clause." c.entity = ".$conf->entity;
if ($mode === 'awaiting') {
$sql .= " AND c.fk_statut = ".self::STATUS_ORDERSENT;
- }
- else {
+ } else {
$sql .= " AND c.fk_statut IN (".self::STATUS_VALIDATED.", ".self::STATUS_ACCEPTED.")";
}
if ($user->socid) $sql .= " AND c.fk_soc = ".$user->socid;
@@ -3016,9 +2901,7 @@ class CommandeFournisseur extends CommonOrder
}
return $response;
- }
- else
- {
+ } else {
$this->error = $this->db->error();
return -1;
}
@@ -3054,8 +2937,7 @@ class CommandeFournisseur extends CommonOrder
}
return $string;
}
- }
- else dol_print_error($db);
+ } else dol_print_error($db);
}
return '';
@@ -3218,9 +3100,7 @@ class CommandeFournisseur extends CommonOrder
{
$this->error = $supplierorderdispatch->error; $this->errors = $supplierorderdispatch->errors;
return $ret;
- }
- else
- {
+ } else {
if (is_array($supplierorderdispatch->lines) && count($supplierorderdispatch->lines) > 0)
{
$date_liv = dol_now();
@@ -3253,9 +3133,7 @@ class CommandeFournisseur extends CommonOrder
return -1;
}
return 5;
- }
- else
- {
+ } else {
//Diff => received partially
//$ret=$this->setStatus($user,4);
$ret = $this->Livraison($user, $date_liv, 'par', $comment); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
@@ -3293,9 +3171,7 @@ class CommandeFournisseur extends CommonOrder
return -1;
}
return 5;
- }
- else
- {
+ } else {
//Diff => received partially
$ret = $this->Livraison($user, $date_liv, 'par', $comment); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
if ($ret < 0) {
@@ -3303,9 +3179,7 @@ class CommandeFournisseur extends CommonOrder
}
return 4;
}
- }
- else
- {
+ } else {
//all the products are not received
$ret = $this->Livraison($user, $date_liv, 'par', $comment); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
if ($ret < 0) {
@@ -3313,9 +3187,7 @@ class CommandeFournisseur extends CommonOrder
}
return 4;
}
- }
- else
- {
+ } else {
//Diff => received partially
$ret = $this->Livraison($user, $date_liv, 'par', $comment); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
if ($ret < 0) {
@@ -3370,9 +3242,7 @@ class CommandeFournisseur extends CommonOrder
$this->db->free();
return $num;
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
return -1;
}
@@ -3533,16 +3403,12 @@ class CommandeFournisseurLigne extends CommonOrderLine
$this->db->free($result);
return 1;
- }
- else
- {
+ } else {
$this->error = 'Supplier order line with id='.$rowid.' not found';
dol_syslog(get_class($this)."::fetch Error ".$this->error, LOG_ERR);
return 0;
}
- }
- else
- {
+ } else {
dol_print_error($this->db);
return -1;
}
@@ -3603,8 +3469,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
$sql .= " VALUES (".$this->fk_commande.", '".$this->db->escape($this->label)."','".$this->db->escape($this->desc)."',";
$sql .= " ".($this->date_start ? "'".$this->db->idate($this->date_start)."'" : "null").",";
$sql .= " ".($this->date_end ? "'".$this->db->idate($this->date_end)."'" : "null").",";
- if ($this->fk_product) { $sql .= $this->fk_product.","; }
- else { $sql .= "null,"; }
+ if ($this->fk_product) { $sql .= $this->fk_product.","; } else { $sql .= "null,"; }
$sql .= "'".$this->db->escape($this->product_type)."',";
$sql .= "'".$this->db->escape($this->special_code)."',";
$sql .= "'".$this->db->escape($this->rang)."',";
@@ -3666,9 +3531,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
}
$this->db->rollback();
return -1 * $error;
- }
- else
- {
+ } else {
$this->errors[] = $this->db->error();
$this->db->rollback();
return -2;
@@ -3753,15 +3616,11 @@ class CommandeFournisseurLigne extends CommonOrderLine
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
$this->db->rollback();
return -1;
@@ -3817,9 +3676,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
}
$this->db->rollback();
return -1 * $error;
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
return -1;
}
diff --git a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
index 19ea5880346..518c6885411 100644
--- a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
@@ -227,9 +227,7 @@ class CommandeFournisseurDispatch extends CommonObject
}
$this->db->rollback();
return -1 * $error;
- }
- else
- {
+ } else {
$this->db->commit();
return $this->id;
}
@@ -297,9 +295,7 @@ class CommandeFournisseurDispatch extends CommonObject
$this->db->free($resql);
return 1;
- }
- else
- {
+ } else {
$this->error = "Error ".$this->db->lasterror();
return -1;
}
@@ -392,9 +388,7 @@ class CommandeFournisseurDispatch extends CommonObject
}
$this->db->rollback();
return -1 * $error;
- }
- else
- {
+ } else {
$this->db->commit();
return 1;
}
@@ -459,9 +453,7 @@ class CommandeFournisseurDispatch extends CommonObject
}
$this->db->rollback();
return -1 * $error;
- }
- else
- {
+ } else {
$this->db->commit();
return 1;
}
@@ -514,9 +506,7 @@ class CommandeFournisseurDispatch extends CommonObject
{
$this->db->commit();
return $object->id;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
@@ -552,28 +542,23 @@ class CommandeFournisseurDispatch extends CommonObject
if ($mode == 0)
{
return $langs->trans($this->statuts[$status]);
- }
- elseif ($mode == 1)
+ } elseif ($mode == 1)
{
return $langs->trans($this->statutshort[$status]);
- }
- elseif ($mode == 2)
+ } elseif ($mode == 2)
{
return $langs->trans($this->statuts[$status]);
- }
- elseif ($mode == 3)
+ } elseif ($mode == 3)
{
if ($status == 0) return img_picto($langs->trans($this->statuts[$status]), 'statut0');
elseif ($status == 1) return img_picto($langs->trans($this->statuts[$status]), 'statut4');
elseif ($status == 2) return img_picto($langs->trans($this->statuts[$status]), 'statut8');
- }
- elseif ($mode == 4)
+ } elseif ($mode == 4)
{
if ($status == 0) return img_picto($langs->trans($this->statuts[$status]), 'statut0').' '.$langs->trans($this->statuts[$status]);
elseif ($status == 1) return img_picto($langs->trans($this->statuts[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]);
elseif ($status == 2) return img_picto($langs->trans($this->statuts[$status]), 'statut8').' '.$langs->trans($this->statuts[$status]);
- }
- elseif ($mode == 5)
+ } elseif ($mode == 5)
{
if ($status == 0) return ''.$langs->trans($this->statutshort[$status]).' '.img_picto($langs->trans($this->statuts[$status]), 'statut0');
elseif ($status == 1) return ''.$langs->trans($this->statutshort[$status]).' '.img_picto($langs->trans($this->statuts[$status]), 'statut4');
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 52d1b9bf326..9949c4d3253 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -455,8 +455,7 @@ class FactureFournisseur extends CommonInvoice
$error++;
}
}
- }
- else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+ } else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
{
$origin_id = $tmp_origin_id;
$ret = $this->add_object_linked($origin, $origin_id);
@@ -502,16 +501,13 @@ class FactureFournisseur extends CommonInvoice
$this->lines[$i]->fk_unit,
$this->lines[$i]->pu_ht_devise
);
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
$this->db->rollback();
return -5;
}
}
- }
- else // If this->lines is an array of invoice line arrays
+ } else // If this->lines is an array of invoice line arrays
{
dol_syslog("There is ".count($this->lines)." lines that are array lines");
foreach ($this->lines as $i => $val)
@@ -543,9 +539,7 @@ class FactureFournisseur extends CommonInvoice
(!empty($line->info_bits) ? $line->info_bits : ''),
$line->product_type
);
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
$this->db->rollback();
return -5;
@@ -579,30 +573,22 @@ class FactureFournisseur extends CommonInvoice
{
$this->db->commit();
return $this->id;
- }
- else
- {
+ } else {
$this->db->rollback();
return -4;
}
- }
- else
- {
+ } else {
$this->error = $langs->trans('FailedToUpdatePrice');
$this->db->rollback();
return -3;
}
- }
- else
- {
+ } else {
if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
{
$this->error = $langs->trans('ErrorRefAlreadyExists');
$this->db->rollback();
return -1;
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
$this->db->rollback();
return -2;
@@ -757,9 +743,7 @@ class FactureFournisseur extends CommonInvoice
$this->error = $this->db->lasterror();
return -3;
}
- }
- else
- {
+ } else {
$this->error = 'Bill with id '.$id.' not found';
dol_syslog(get_class($this).'::fetch '.$this->error);
return 0;
@@ -767,9 +751,7 @@ class FactureFournisseur extends CommonInvoice
$this->db->free($resql);
return 1;
- }
- else
- {
+ } else {
$this->error = "Error ".$this->db->lasterror();
return -1;
}
@@ -869,9 +851,7 @@ class FactureFournisseur extends CommonInvoice
}
$this->db->free($resql_rows);
return 1;
- }
- else
- {
+ } else {
$this->error = $this->db->error();
return -3;
}
@@ -1007,9 +987,7 @@ class FactureFournisseur extends CommonInvoice
}
$this->db->rollback();
return -1 * $error;
- }
- else
- {
+ } else {
$this->db->commit();
return 1;
}
@@ -1096,23 +1074,17 @@ class FactureFournisseur extends CommonInvoice
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->error = $facligne->error;
$this->db->rollback();
return -1;
}
- }
- else
- {
+ } else {
$this->error = $facligne->error;
$this->db->rollback();
return -2;
}
- }
- else
- {
+ } else {
$this->db->rollback();
return -3;
}
@@ -1195,8 +1167,7 @@ class FactureFournisseur extends CommonInvoice
if (!$resql2) {
$error++;
}
- }
- else {
+ } else {
$error++;
}
}
@@ -1262,9 +1233,7 @@ class FactureFournisseur extends CommonInvoice
dol_syslog(get_class($this)."::delete $this->id by $user->id", LOG_DEBUG);
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
$this->db->rollback();
return -$error;
@@ -1301,9 +1270,7 @@ class FactureFournisseur extends CommonInvoice
$result = $this->call_trigger('BILL_SUPPLIER_PAYED', $user);
if ($result < 0) $error++;
// End call triggers
- }
- else
- {
+ } else {
$error++;
$this->error = $this->db->error();
dol_print_error($this->db);
@@ -1313,9 +1280,7 @@ class FactureFournisseur extends CommonInvoice
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
@@ -1351,9 +1316,7 @@ class FactureFournisseur extends CommonInvoice
$result = $this->call_trigger('BILL_SUPPLIER_UNPAYED', $user);
if ($result < 0) $error++;
// End call triggers
- }
- else
- {
+ } else {
$error++;
$this->error = $this->db->lasterror();
dol_syslog("FactureFournisseur::set_unpaid ".$this->error);
@@ -1363,9 +1326,7 @@ class FactureFournisseur extends CommonInvoice
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
@@ -1420,13 +1381,10 @@ class FactureFournisseur extends CommonInvoice
if ($force_number)
{
$num = $force_number;
- }
- elseif (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
+ } elseif (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
{
$num = $this->getNextNumRef($this->thirdparty);
- }
- else
- {
+ } else {
$num = $this->ref;
}
$this->newref = dol_sanitizeFileName($num);
@@ -1525,15 +1483,11 @@ class FactureFournisseur extends CommonInvoice
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
- }
- else
- {
+ } else {
$this->error = $this->db->error();
$this->db->rollback();
return -1;
@@ -1607,15 +1561,11 @@ class FactureFournisseur extends CommonInvoice
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
- }
- else
- {
+ } else {
$this->error = $this->db->error();
$this->db->rollback();
return -1;
@@ -1739,17 +1689,13 @@ class FactureFournisseur extends CommonInvoice
dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_ERR);
return -1;
}
- }
- else
- {
+ } else {
$this->error = $prod->error;
$this->db->rollback();
return -1;
}
}
- }
- else
- {
+ } else {
$product_type = $type;
}
@@ -1861,24 +1807,18 @@ class FactureFournisseur extends CommonInvoice
{
$this->db->commit();
return $this->line->id;
- }
- else
- {
+ } else {
$this->error = $this->db->error();
$this->db->rollback();
return -1;
}
- }
- else
- {
+ } else {
$this->error = $this->line->error;
$this->errors = $this->line->errors;
$this->db->rollback();
return -2;
}
- }
- else
- {
+ } else {
return 0;
}
}
@@ -1976,9 +1916,7 @@ class FactureFournisseur extends CommonInvoice
$product = new Product($this->db);
$result = $product->fetch($idproduct);
$product_type = $product->type;
- }
- else
- {
+ } else {
$product_type = $type;
}
@@ -2092,9 +2030,7 @@ class FactureFournisseur extends CommonInvoice
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
$this->error = $this->db->lasterror();
return -4;
@@ -2146,9 +2082,7 @@ class FactureFournisseur extends CommonInvoice
//$this->date_validation = $obj->datev; // This field is not available. Should be store into log table and using this function should be replaced with showing content of log (like for supplier orders)
}
$this->db->free($result);
- }
- else
- {
+ } else {
dol_print_error($this->db);
}
}
@@ -2196,9 +2130,7 @@ class FactureFournisseur extends CommonInvoice
}
//print_r($return);
return $return;
- }
- else
- {
+ } else {
$this->error = $this->db->error();
return -1;
}
@@ -2249,9 +2181,7 @@ class FactureFournisseur extends CommonInvoice
}
return $return;
- }
- else
- {
+ } else {
$this->error = $this->db->error();
return -1;
}
@@ -2308,9 +2238,7 @@ class FactureFournisseur extends CommonInvoice
}
$this->db->free($resql);
return $response;
- }
- else
- {
+ } else {
dol_print_error($this->db);
$this->error = $this->db->error();
return -1;
@@ -2356,6 +2284,9 @@ class FactureFournisseur extends CommonInvoice
if ($this->type == self::TYPE_DEPOSIT) $picto .= 'd'; // Deposit invoice
$label = ''.$langs->trans("SupplierInvoice").'';
+ if ($this->type == self::TYPE_REPLACEMENT) $label = ''.$langs->transnoentitiesnoconv("InvoiceReplace").'';
+ elseif ($this->type == self::TYPE_CREDIT_NOTE) $label = ''.$langs->transnoentitiesnoconv("CreditNote").'';
+ elseif ($this->type == self::TYPE_DEPOSIT) $label = ''.$langs->transnoentitiesnoconv("Deposit").'';
if (!empty($this->ref))
$label .= '
'.$langs->trans('Ref').': '.$this->ref; if (!empty($this->ref_supplier)) @@ -2370,9 +2301,6 @@ class FactureFournisseur extends CommonInvoice $label .= '
'.$langs->trans('VAT').': '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency); if (!empty($this->total_ttc)) $label .= '
'.$langs->trans('AmountTTC').': '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency); - if ($this->type == self::TYPE_REPLACEMENT) $label = $langs->transnoentitiesnoconv("ShowInvoiceReplace").': '.$this->ref; - elseif ($this->type == self::TYPE_CREDIT_NOTE) $label = $langs->transnoentitiesnoconv("ShowInvoiceAvoir").': '.$this->ref; - elseif ($this->type == self::TYPE_DEPOSIT) $label = $langs->transnoentitiesnoconv("ShowInvoiceDeposit").': '.$this->ref; if ($moretitle) $label .= ' - '.$moretitle; if (isset($this->statut) && isset($this->alreadypaid)) { $label .= '
'.$langs->trans("Status").": ".$this->getLibStatut(5, $this->alreadypaid); @@ -2464,9 +2392,7 @@ class FactureFournisseur extends CommonInvoice if ($numref != "") { return $numref; - } - else - { + } else { $this->error = $obj->error; //dol_print_error($db,get_class($this)."::getNextNumRef ".$obj->error); return false; @@ -2549,9 +2475,7 @@ class FactureFournisseur extends CommonInvoice $line->total_ttc = 59.8; $line->total_tva = 9.8; $line->remise_percent = 50; - } - else - { + } else { $line->total_ht = 100; $line->total_ttc = 119.6; $line->total_tva = 19.6; @@ -2616,9 +2540,7 @@ class FactureFournisseur extends CommonInvoice } $this->db->free($resql); return 1; - } - else - { + } else { dol_print_error($this->db); $this->error = $this->db->error(); return -1; @@ -2693,9 +2615,7 @@ class FactureFournisseur extends CommonInvoice { $this->db->commit(); return $object->id; - } - else - { + } else { $this->db->rollback(); return -1; } @@ -2724,9 +2644,7 @@ class FactureFournisseur extends CommonInvoice if (!empty($conf->global->INVOICE_SUPPLIER_ADDON_PDF)) { $modele = $conf->global->INVOICE_SUPPLIER_ADDON_PDF; - } - else - { + } else { $modele = ''; // No default value. For supplier invoice, we allow to disable all PDF generation } } @@ -2734,9 +2652,7 @@ class FactureFournisseur extends CommonInvoice if (empty($modele)) { return 0; - } - else - { + } else { $modelpath = "core/modules/supplier_invoice/doc/"; return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams); @@ -3176,9 +3092,7 @@ class SupplierInvoiceLine extends CommonObjectLine { $this->db->commit(); return 1; - } - else - { + } else { $this->db->rollback(); return -1; } @@ -3434,9 +3348,7 @@ class SupplierInvoiceLine extends CommonObjectLine $this->db->commit(); return $this->id; - } - else - { + } else { $this->error = $this->db->error(); $this->db->rollback(); return -2; @@ -3470,9 +3382,7 @@ class SupplierInvoiceLine extends CommonObjectLine { $this->db->commit(); return 1; - } - else - { + } else { $this->error = $this->db->error(); $this->db->rollback(); return -2; diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php index c00ee77df53..a2ed4b6c0aa 100644 --- a/htdocs/fourn/class/fournisseur.product.class.php +++ b/htdocs/fourn/class/fournisseur.product.class.php @@ -149,9 +149,7 @@ class ProductFournisseur extends Product { $this->db->commit(); return 1; - } - else - { + } else { $this->db->rollback(); return -1; } @@ -287,8 +285,7 @@ class ProductFournisseur extends Product $localtax1 = $localtaxes_array['1']; $localtaxtype2 = $localtaxes_array['2']; $localtax2 = $localtaxes_array['3']; - } - else // old method. deprecated because ot can't retreive type + } else // old method. deprecated because ot can't retreive type { $localtaxtype1 = '0'; $localtax1 = get_localtax($newvat, 1); @@ -384,22 +381,16 @@ class ProductFournisseur extends Product { $this->db->commit(); return $this->product_fourn_price_id; - } - else - { + } else { $this->db->rollback(); return -1; } - } - else - { + } else { $this->error = $this->db->error()." sql=".$sql; $this->db->rollback(); return -2; } - } - else - { + } else { dol_syslog(get_class($this).'::update_buyprice without knowing id of line, so we delete from company, quantity and supplier_ref and insert again', LOG_DEBUG); // Delete price for this quantity @@ -447,8 +438,7 @@ class ProductFournisseur extends Product $resql = $this->db->query($sql); if ($resql) { $this->product_fourn_price_id = $this->db->last_insert_id(MAIN_DB_PREFIX."product_fournisseur_price"); - } - else { + } else { $error++; } @@ -566,23 +556,17 @@ class ProductFournisseur extends Product if ($this->fourn_qty != 0) { $this->fourn_unitprice = price2num($this->fourn_price / $this->fourn_qty, 'MU'); - } - else - { + } else { $this->fourn_unitprice = ""; } } } return 1; - } - else - { + } else { return 0; } - } - else - { + } else { $this->error = $this->db->error(); return -1; } @@ -685,9 +669,7 @@ class ProductFournisseur extends Product if ($prodfourn->fourn_qty != 0) { $prodfourn->fourn_unitprice = price2num($prodfourn->fourn_price / $prodfourn->fourn_qty, 'MU'); - } - else - { + } else { $prodfourn->fourn_unitprice = ""; } } @@ -697,9 +679,7 @@ class ProductFournisseur extends Product $this->db->free($resql); return $retarray; - } - else - { + } else { $this->error = $this->db->error(); return -1; } @@ -775,9 +755,7 @@ class ProductFournisseur extends Product { $this->db->free($resql); return 0; - } - else - { + } else { $min = -1; foreach ($record_array as $record) { @@ -798,9 +776,7 @@ class ProductFournisseur extends Product if ($record["quantity"] != 0) { $fourn_unitprice = price2num($fourn_price / $record["quantity"], 'MU'); - } - else - { + } else { $fourn_unitprice = $fourn_price; } } @@ -835,9 +811,7 @@ class ProductFournisseur extends Product $this->db->free($resql); return 1; - } - else - { + } else { $this->error = $this->db->error(); return -1; } @@ -868,9 +842,7 @@ class ProductFournisseur extends Product { $this->db->commit(); return 1; - } - else - { + } else { $this->error = $this->db->error()." sql=".$sql; $this->db->rollback(); return -1; @@ -997,9 +969,7 @@ class ProductFournisseur extends Product $this->db->free($resql); return $retarray; - } - else - { + } else { $this->error = $this->db->error(); return -1; } @@ -1087,8 +1057,7 @@ class ProductFournisseur extends Product } $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"'; $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"'; - } - else $linkclose = ($morecss ? ' class="'.$morecss.'"' : ''); + } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : ''); $linkstart = ''; diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php index a95aefede0f..a2df6ba9b74 100644 --- a/htdocs/fourn/class/paiementfourn.class.php +++ b/htdocs/fourn/class/paiementfourn.class.php @@ -131,15 +131,11 @@ class PaiementFourn extends Paiement $this->type_label = $obj->paiement_type; $this->statut = $obj->statut; $error = 1; - } - else - { + } else { $error = -2; // TODO Use 0 instead } $this->db->free($resql); - } - else - { + } else { dol_print_error($this->db); $error = -1; } @@ -171,9 +167,7 @@ class PaiementFourn extends Paiement { $amounts = &$this->amounts; $amounts_to_update = &$this->multicurrency_amounts; - } - else - { + } else { $amounts = &$this->multicurrency_amounts; $amounts_to_update = &$this->amounts; } @@ -202,9 +196,7 @@ class PaiementFourn extends Paiement { $total = $totalamount; $mtotal = $totalamount_converted; // Maybe use price2num with MT for the converted value - } - else - { + } else { $total = $totalamount_converted; // Maybe use price2num with MT for the converted value $mtotal = $totalamount; } @@ -247,8 +239,7 @@ class PaiementFourn extends Paiement if ($remaintopay == 0) { $result = $invoice->set_paid($user, '', ''); - } - else dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing."); + } else dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing."); } // Regenerate documents of invoices @@ -268,15 +259,11 @@ class PaiementFourn extends Paiement $error++; } } - } - else - { + } else { $this->error = $this->db->lasterror(); $error++; } - } - else - { + } else { dol_syslog(get_class($this).'::Create Amount line '.$key.' not a number. We discard it.'); } } @@ -288,15 +275,11 @@ class PaiementFourn extends Paiement if ($result < 0) $error++; // End call triggers } - } - else - { + } else { $this->error = $this->db->lasterror(); $error++; } - } - else - { + } else { $this->error = "ErrorTotalIsNull"; dol_syslog('PaiementFourn::Create Error '.$this->error, LOG_ERR); $error++; @@ -310,9 +293,7 @@ class PaiementFourn extends Paiement $this->db->commit(); dol_syslog('PaiementFourn::Create Ok Total = '.$this->total); return $this->id; - } - else - { + } else { $this->db->rollback(); return -1; } @@ -346,9 +327,7 @@ class PaiementFourn extends Paiement $this->db->rollback(); return -1; } - } - else - { + } else { $this->db->rollback(); return -2; } @@ -414,9 +393,7 @@ class PaiementFourn extends Paiement $this->db->commit(); return 1; - } - else - { + } else { $this->error = $this->db->error; $this->db->rollback(); return -5; @@ -460,9 +437,7 @@ class PaiementFourn extends Paiement $this->date_modification = $this->db->jdate($obj->tms); } $this->db->free($resql); - } - else - { + } else { dol_print_error($this->db); } } @@ -496,9 +471,7 @@ class PaiementFourn extends Paiement } return $billsarray; - } - else - { + } else { $this->error = $this->db->error(); dol_syslog(get_class($this).'::getBillsArray Error '.$this->error); return -1; @@ -705,9 +678,7 @@ class PaiementFourn extends Paiement } return $numref; - } - else - { + } else { $langs->load("errors"); print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Supplier")); return ""; @@ -737,9 +708,7 @@ class PaiementFourn extends Paiement if (!empty($conf->global->SUPPLIER_PAYMENT_ADDON_PDF)) { $modele = $conf->global->SUPPLIER_PAYMENT_ADDON_PDF; - } - else - { + } else { $modele = ''; // No default value. For supplier invoice, we allow to disable all PDF generation } } @@ -747,9 +716,7 @@ class PaiementFourn extends Paiement if (empty($modele)) { return 0; - } - else - { + } else { $modelpath = "core/modules/supplier_payment/doc/"; return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams); diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 0cd823304ee..0a288644d7e 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -99,8 +99,7 @@ if ($id > 0 || !empty($ref)) if ($ret < 0) dol_print_error($db, $object->error); $ret = $object->fetch_thirdparty(); if ($ret < 0) dol_print_error($db, $object->error); -} -elseif (!empty($socid) && $socid > 0) +} elseif (!empty($socid) && $socid > 0) { $fourn = new Fournisseur($db); $ret = $fourn->fetch($socid); @@ -110,10 +109,25 @@ elseif (!empty($socid) && $socid > 0) if ($ret < 0) dol_print_error($db, $object->error); } -$permissionnote = $user->rights->fournisseur->commande->creer; // Used by the include of actions_setnotes.inc.php -$permissiondellink = $user->rights->fournisseur->commande->creer; // Used by the include of actions_dellink.inc.php -$permissiontoedit = $user->rights->fournisseur->commande->creer; // Used by the include of actions_lineupdown.inc.php -$permissiontoadd = $user->rights->fournisseur->commande->creer; // Used by the include of actions_addupdatedelete.inc.php +// Common permissions +$usercanread = $user->rights->fournisseur->commande->lire; +$usercancreate = $user->rights->fournisseur->commande->creer; +$usercandelete = $user->rights->fournisseur->commande->supprimer; + +// Advanced permissions +$usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($usercancreate)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->supplier_order_advance->validate))); + +// Additional area permissions +$usercanapprove = $user->rights->fournisseur->commande->approuver; +$usercanapprovesecond = $user->rights->fournisseur->commande->approve2; +$usercanorder = $user->rights->fournisseur->commande->commander; +$usercanreceived = $user->rights->fournisseur->commande->receptionner; + +// Permissions for includes +$permissionnote = $usercancreate; // Used by the include of actions_setnotes.inc.php +$permissiondellink = $usercancreate; // Used by the include of actions_dellink.inc.php +$permissiontoedit = $usercancreate; // Used by the include of actions_lineupdown.inc.php +$permissiontoadd = $usercancreate; // Used by the include of actions_addupdatedelete.inc.php /* @@ -142,66 +156,66 @@ if (empty($reshook)) include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be include, not include_once - if ($action == 'setref_supplier' && $user->rights->fournisseur->commande->creer) + if ($action == 'setref_supplier' && $usercancreate) { $result = $object->setValueFrom('ref_supplier', GETPOST('ref_supplier', 'alpha'), '', null, 'text', '', $user, 'ORDER_SUPPLIER_MODIFY'); if ($result < 0) setEventMessages($object->error, $object->errors, 'errors'); } // Set incoterm - if ($action == 'set_incoterms' && $user->rights->fournisseur->commande->creer) + if ($action == 'set_incoterms' && $usercancreate) { $result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha')); if ($result < 0) setEventMessages($object->error, $object->errors, 'errors'); } // payment conditions - if ($action == 'setconditions' && $user->rights->fournisseur->commande->creer) + if ($action == 'setconditions' && $usercancreate) { $result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int')); if ($result < 0) setEventMessages($object->error, $object->errors, 'errors'); } // payment mode - if ($action == 'setmode' && $user->rights->fournisseur->commande->creer) + if ($action == 'setmode' && $usercancreate) { $result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int')); if ($result < 0) setEventMessages($object->error, $object->errors, 'errors'); } // Multicurrency Code - elseif ($action == 'setmulticurrencycode' && $user->rights->fournisseur->commande->creer) { + elseif ($action == 'setmulticurrencycode' && $usercancreate) { $result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha')); } // Multicurrency rate - elseif ($action == 'setmulticurrencyrate' && $user->rights->fournisseur->commande->creer) { + elseif ($action == 'setmulticurrencyrate' && $usercancreate) { $result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx'))); } // bank account - if ($action == 'setbankaccount' && $user->rights->fournisseur->commande->creer) + if ($action == 'setbankaccount' && $usercancreate) { $result = $object->setBankAccount(GETPOST('fk_account', 'int')); if ($result < 0) setEventMessages($object->error, $object->errors, 'errors'); } // date of delivery - if ($action == 'setdate_livraison' && $user->rights->fournisseur->commande->creer) + if ($action == 'setdate_livraison' && $usercancreate) { $result = $object->set_date_livraison($user, $datelivraison); if ($result < 0) setEventMessages($object->error, $object->errors, 'errors'); } // Set project - if ($action == 'classin' && $user->rights->fournisseur->commande->creer) + if ($action == 'classin' && $usercancreate) { $result = $object->setProject($projectid); if ($result < 0) setEventMessages($object->error, $object->errors, 'errors'); } // Edit Thirdparty - if (!empty($conf->global->MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER) && $action == 'set_thirdparty' && $user->rights->fournisseur->commande->creer && $object->statut == CommandeFournisseur::STATUS_DRAFT) + if (!empty($conf->global->MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER) && $action == 'set_thirdparty' && $usercancreate && $object->statut == CommandeFournisseur::STATUS_DRAFT) { $new_socid = GETPOST('new_socid', 'int'); if (!empty($new_socid) && $new_socid != $object->thirdparty->id) { @@ -238,8 +252,7 @@ if (empty($reshook)) $l->total_ttc = 0; $l->ref_supplier = ''; $l->update(); - } - else { + } else { // No need for loop to keep best supplier price $obj = $db->fetch_object($resql); $l->subprice = $obj->unitprice; @@ -250,8 +263,7 @@ if (empty($reshook)) $l->ref_supplier = $obj->ref_fourn; $l->update(); } - } - else { + } else { dol_print_error($db); } $db->free($resql); @@ -263,7 +275,7 @@ if (empty($reshook)) exit; } - if ($action == 'setremisepercent' && $user->rights->fournisseur->commande->creer) + if ($action == 'setremisepercent' && $usercancreate) { $result = $object->set_remise($user, $_POST['remise_percent']); if ($result < 0) setEventMessages($object->error, $object->errors, 'errors'); @@ -284,8 +296,7 @@ if (empty($reshook)) //$newstatus=3; // Submited // TODO If there is at least one reception, we can set to Received->Received partially $newstatus = 4; // Received partially - } - elseif ($object->statut == 6) $newstatus = 2; // Canceled->Approved + } elseif ($object->statut == 6) $newstatus = 2; // Canceled->Approved elseif ($object->statut == 7) $newstatus = 3; // Canceled->Process running elseif ($object->statut == 9) $newstatus = 1; // Refused->Validated else $newstatus = 2; @@ -316,9 +327,7 @@ if (empty($reshook)) header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id); exit; - } - else - { + } else { $db->rollback(); setEventMessages($object->error, $object->errors, 'errors'); @@ -329,7 +338,7 @@ if (empty($reshook)) /* * Classify supplier order as billed */ - if ($action == 'classifybilled' && $user->rights->fournisseur->commande->creer) + if ($action == 'classifybilled' && $usercancreate) { $ret = $object->classifyBilled($user); if ($ret < 0) { @@ -338,7 +347,7 @@ if (empty($reshook)) } // Add a product line - if ($action == 'addline' && $user->rights->fournisseur->commande->creer) + if ($action == 'addline' && $usercancreate) { $db->begin(); @@ -356,9 +365,7 @@ if (empty($reshook)) $idprod = 0; $price_ht = GETPOST('price_ht'); $tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0); - } - else - { + } else { $idprod = GETPOST('idprod', 'int'); $price_ht = GETPOST('price_ht'); $tva_tx = ''; @@ -441,14 +448,11 @@ if (empty($reshook)) { $productsupplier->ref_supplier = ''; } - } - else - { + } else { $fksoctosearch = $object->thirdparty->id; $productsupplier->get_buyprice(0, -1, $idprod, 'none', $fksoctosearch); // We force qty to -1 to be sure to find if a supplier price exist } - } - elseif (GETPOST('idprodfournprice', 'alpha') > 0) + } elseif (GETPOST('idprodfournprice', 'alpha') > 0) { $qtytosearch = $qty; // Just to see if a price exists for the quantity. Not used to found vat. //$qtytosearch=-1; // We force qty to -1 to be sure to find if a supplier price exist @@ -534,8 +538,7 @@ if (empty($reshook)) $langs->load("errors"); setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'errors'); } - } - elseif (empty($error)) // $price_ht is already set + } elseif (empty($error)) // $price_ht is already set { $tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0); $tva_tx = str_replace('*', '', $tva_tx); @@ -555,9 +558,7 @@ if (empty($reshook)) if ($price_ht !== '') { $pu_ht = price2num($price_ht, 'MU'); // $pu_ht must be rounded according to settings - } - else - { + } else { $pu_ttc = price2num(GETPOST('price_ttc'), 'MU'); $pu_ht = price2num($pu_ttc / (1 + ($tva_tx / 100)), 'MU'); // $pu_ht must be rounded according to settings } @@ -623,9 +624,7 @@ if (empty($reshook)) unset($_POST['date_endday']); unset($_POST['date_endmonth']); unset($_POST['date_endyear']); - } - else - { + } else { $db->rollback(); setEventMessages($object->error, $object->errors, 'errors'); } @@ -636,7 +635,7 @@ if (empty($reshook)) /* * Updating a line in the order */ - if ($action == 'updateline' && $user->rights->fournisseur->commande->creer && !GETPOST('cancel', 'alpha')) + if ($action == 'updateline' && $usercancreate && !GETPOST('cancel', 'alpha')) { $vat_rate = (GETPOST('tva_tx') ?GETPOST('tva_tx') : 0); @@ -674,9 +673,7 @@ if (empty($reshook)) { $price_base_type = 'HT'; $ht = price2num(GETPOST('price_ht')); - } - else - { + } else { $vatratecleaned = $vat_rate; if (preg_match('/^(.*)\s*\((.*)\)$/', $vat_rate, $reg)) // If vat is "xx (yy)" { @@ -768,16 +765,14 @@ if (empty($reshook)) $result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); if ($result < 0) dol_print_error($db, $result); } - } - else - { + } else { dol_print_error($db, $object->error); exit; } } // Remove a product line - if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->fournisseur->commande->creer) + if ($action == 'confirm_deleteline' && $confirm == 'yes' && $usercancreate) { $result = $object->deleteline($lineid); if ($result > 0) @@ -800,9 +795,7 @@ if (empty($reshook)) header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id); exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); /* Fix bug 1485 : Reset action to avoid asking again confirmation on failure */ $action = ''; @@ -810,10 +803,7 @@ if (empty($reshook)) } // Validate - if ($action == 'confirm_valid' && $confirm == 'yes' && - ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->commande->creer)) - || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->supplier_order_advance->validate))) - ) + if ($action == 'confirm_valid' && $confirm == 'yes' && $usercanvalidate) { $object->date_commande = dol_now(); $result = $object->valid($user); @@ -836,20 +826,18 @@ if (empty($reshook)) $result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); if ($result < 0) dol_print_error($db, $result); } - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } // If we have permission, and if we don't need to provide the idwarehouse, we go directly on approved step - if (empty($conf->global->SUPPLIER_ORDER_NO_DIRECT_APPROVE) && $user->rights->fournisseur->commande->approuver && !(!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $object->hasProductsOrServices(1))) + if (empty($conf->global->SUPPLIER_ORDER_NO_DIRECT_APPROVE) && $usercanapprove && !(!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $object->hasProductsOrServices(1))) { $action = 'confirm_approve'; // can make standard or first level approval also if permission is set } } - if (($action == 'confirm_approve' || $action == 'confirm_approve2') && $confirm == 'yes' && $user->rights->fournisseur->commande->approuver) + if (($action == 'confirm_approve' || $action == 'confirm_approve2') && $confirm == 'yes' && $usercanapprove) { $idwarehouse = GETPOST('idwarehouse', 'int'); @@ -857,9 +845,7 @@ if (empty($reshook)) if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) { $qualified_for_stock_change = $object->hasProductsOrServices(2); - } - else - { + } else { $qualified_for_stock_change = $object->hasProductsOrServices(1); } @@ -892,24 +878,20 @@ if (empty($reshook)) } header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id); exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } } - if ($action == 'confirm_refuse' && $confirm == 'yes' && $user->rights->fournisseur->commande->approuver) + if ($action == 'confirm_refuse' && $confirm == 'yes' && $usercanapprove) { $result = $object->refuse($user); if ($result > 0) { header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id); exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } @@ -924,7 +906,7 @@ if (empty($reshook)) } } - if ($action == 'confirm_commande' && $confirm == 'yes' && $user->rights->fournisseur->commande->commander) + if ($action == 'confirm_commande' && $confirm == 'yes' && $usercanorder) { $result = $object->commande($user, GETPOST("datecommande"), GETPOST("methode", 'int'), GETPOST('comment', 'alphanohtml')); if ($result > 0) @@ -944,37 +926,31 @@ if (empty($reshook)) $action = ''; header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id); exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } - if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->fournisseur->commande->supprimer) + if ($action == 'confirm_delete' && $confirm == 'yes' && $usercandelete) { $result = $object->delete($user); if ($result > 0) { header("Location: ".DOL_URL_ROOT.'/fourn/commande/list.php?restore_lastsearch_values=1'); exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } // Action clone object - if ($action == 'confirm_clone' && $confirm == 'yes' && $user->rights->fournisseur->commande->creer) + if ($action == 'confirm_clone' && $confirm == 'yes' && $usercancreate) { if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers')) { setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors'); - } - else - { + } else { if ($object->id > 0) { $orig = clone $object; @@ -984,9 +960,7 @@ if (empty($reshook)) { header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result); exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); $object = $orig; $action = ''; @@ -996,7 +970,7 @@ if (empty($reshook)) } // Set status of reception (complete, partial, ...) - if ($action == 'livraison' && $user->rights->fournisseur->commande->receptionner) + if ($action == 'livraison' && $usercanreceived) { if (GETPOST("type") != '') { @@ -1008,32 +982,25 @@ if (empty($reshook)) $langs->load("deliveries"); setEventMessages($langs->trans("DeliveryStateSaved"), null); $action = ''; - } - elseif ($result == -3) + } elseif ($result == -3) { setEventMessages($object->error, $object->errors, 'errors'); - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } - } - else - { + } else { setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Delivery")), null, 'errors'); } } - if ($action == 'confirm_cancel' && $confirm == 'yes' && $user->rights->fournisseur->commande->commander) + if ($action == 'confirm_cancel' && $confirm == 'yes' && $usercanorder) { $result = $object->cancel($user); if ($result > 0) { header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id); exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } @@ -1049,7 +1016,7 @@ if (empty($reshook)) // Actions to build doc $upload_dir = $conf->fournisseur->commande->dir_output; - $permissiontoadd = $user->rights->fournisseur->commande->creer; + $permissiontoadd = $usercancreate; include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php'; @@ -1082,7 +1049,7 @@ if (empty($reshook)) /* * Create an order */ - if ($action == 'add' && $user->rights->fournisseur->commande->creer) + if ($action == 'add' && $usercancreate) { $error = 0; $selectedLines = GETPOST('toselect', 'array'); @@ -1128,14 +1095,11 @@ if (empty($reshook)) { $classname = 'Propal'; $element = 'comm/propal'; $subelement = 'propal'; - } - elseif ($origin == 'order' || $origin == 'commande') + } elseif ($origin == 'order' || $origin == 'commande') { $classname = 'Commande'; $element = $subelement = 'commande'; - } - else - { + } else { $classname = 'SupplierProposal'; $element = 'supplier_proposal'; $subelement = 'supplier_proposal'; @@ -1207,9 +1171,7 @@ if (empty($reshook)) $ref_supplier = $productsupplier->ref_supplier; $product_fourn_price_id = $productsupplier->product_fourn_price_id; } - } - else - { + } else { $ref_supplier = $lines[$i]->ref_fourn; $product_fourn_price_id = 0; } @@ -1276,9 +1238,7 @@ if (empty($reshook)) setEventMessages($object->error, $object->errors, 'errors'); $error++; } - } - else - { + } else { $id = $object->create($user); if ($id < 0) { @@ -1294,9 +1254,7 @@ if (empty($reshook)) $db->rollback(); $action = 'create'; $_GET['socid'] = $_POST['socid']; - } - else - { + } else { $db->commit(); header("Location: ".$_SERVER['PHP_SELF']."?id=".$id); exit; @@ -1383,19 +1341,16 @@ if (empty($reshook)) if (empty($result_order["result"]["result_code"])) //No result, check error str { setEventMessages($langs->trans("SOAPError")." '".$soapclient_order->error_str."'", null, 'errors'); - } - elseif ($result_order["result"]["result_code"] != "OK") //Something went wrong + } elseif ($result_order["result"]["result_code"] != "OK") //Something went wrong { setEventMessages($langs->trans("SOAPError")." '".$result_order["result"]["result_code"]."' - '".$result_order["result"]["result_label"]."'", null, 'errors'); - } - else - { + } else { setEventMessages($langs->trans("RemoteOrderRef")." ".$result_order["ref"], null, 'mesgs'); } } } - if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->fournisseur->commande->creer) + if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $usercancreate) { if ($action == 'addcontact') { @@ -1409,16 +1364,12 @@ if (empty($reshook)) { header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); exit; - } - else - { + } else { if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') { $langs->load("errors"); setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors'); - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } @@ -1439,8 +1390,7 @@ if (empty($reshook)) { header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); exit; - } - else { + } else { dol_print_error($db); } } @@ -1492,14 +1442,11 @@ if ($action == 'create') { $classname = 'Propal'; $element = 'comm/propal'; $subelement = 'propal'; - } - elseif ($origin == 'order' || $origin == 'commande') + } elseif ($origin == 'order' || $origin == 'commande') { $classname = 'Commande'; $element = $subelement = 'commande'; - } - else - { + } else { $classname = 'SupplierProposal'; $element = 'supplier_proposal'; $subelement = 'supplier_proposal'; @@ -1544,9 +1491,7 @@ if ($action == 'create') // Object source contacts list $srccontactslist = $objectsrc->liste_contact(-1, 'external', 1); - } - else - { + } else { $cond_reglement_id = $societe->cond_reglement_supplier_id; $mode_reglement_id = $societe->mode_reglement_supplier_id; @@ -1584,9 +1529,7 @@ if ($action == 'create') { print $societe->getNomUrl(1); print ''; - } - else - { + } else { print $form->select_company((empty($socid) ? '' : $socid), 'socid', 's.fournisseur=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300'); // reload page to retrieve customer informations if (!empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE)) @@ -1770,8 +1713,7 @@ if ($action == 'create') print ''; } print "\n"; -} -elseif (!empty($object->id)) +} elseif (!empty($object->id)) { $result = $object->fetch($id, $ref); @@ -1819,16 +1761,13 @@ elseif (!empty($object->id)) if (preg_match('/^[\(]?PROV/i', $object->ref) || empty($object->ref)) // empty should not happened, but when it occurs, the test save life { $newref = $object->getNextNumRef($object->thirdparty); - } - else $newref = $object->ref; + } else $newref = $object->ref; if ($newref < 0) { setEventMessages($object->error, $object->errors, 'errors'); $action = ''; - } - else - { + } else { $text = $langs->trans('ConfirmValidateOrder', $newref); if (!empty($conf->notification->enabled)) { @@ -1849,9 +1788,7 @@ elseif (!empty($object->id)) if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) { $qualified_for_stock_change = $object->hasProductsOrServices(2); - } - else - { + } else { $qualified_for_stock_change = $object->hasProductsOrServices(1); } @@ -1922,11 +1859,11 @@ elseif (!empty($object->id)) $morehtmlref = '
"; -} -else dol_print_error($db); +} else dol_print_error($db); /* diff --git a/htdocs/fourn/commande/info.php b/htdocs/fourn/commande/info.php index f41e9e3fece..195e87e5b5d 100644 --- a/htdocs/fourn/commande/info.php +++ b/htdocs/fourn/commande/info.php @@ -55,9 +55,7 @@ if (GETPOST('actioncode', 'array')) { $actioncode = GETPOST('actioncode', 'array', 3); if (!count($actioncode)) $actioncode = '0'; -} -else -{ +} else { $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECTS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECTS)); } $search_agenda_label = GETPOST('search_agenda_label'); @@ -196,9 +194,7 @@ if (!empty($conf->agenda->enabled)) if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) { print ''.$langs->trans("AddAction").''; - } - else - { + } else { print ''.$langs->trans("AddAction").''; } } diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php index acd79212052..8ffc6be6c05 100644 --- a/htdocs/fourn/commande/list.php +++ b/htdocs/fourn/commande/list.php @@ -335,16 +335,12 @@ if (empty($reshook)) { $result = $object->insert_discount($discountid); //$result=$discount->link_to_invoice($lineid,$id); - } - else - { + } else { setEventMessages($discount->error, $discount->errors, 'errors'); $error++; break; } - } - else - { + } else { // Positive line $product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0); // Date start @@ -391,9 +387,7 @@ if (empty($reshook)) if ($result > 0) { $lineid = $result; - } - else - { + } else { $lineid = 0; $error++; break; @@ -447,9 +441,7 @@ if (empty($reshook)) { $db->commit(); setEventMessages($langs->trans('BillCreated', $nb_bills_created), null, 'mesgs'); - } - else - { + } else { $db->rollback(); $action = 'create'; $_GET["origin"] = $_POST["origin"]; @@ -596,9 +588,7 @@ if ($resql) $soc = new Societe($db); $soc->fetch($socid); $title = $langs->trans('ListOfSupplierOrders').' - '.$soc->name; - } - else - { + } else { $title = $langs->trans('ListOfSupplierOrders'); } @@ -1261,9 +1251,7 @@ if ($resql) $delallowed = $user->rights->fournisseur->commande->creer; print $formfile->showdocuments('massfilesarea_supplier_order', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty); -} -else -{ +} else { dol_print_error($db); } diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php index 87effcd5863..53efd68faa6 100644 --- a/htdocs/fourn/commande/note.php +++ b/htdocs/fourn/commande/note.php @@ -145,9 +145,7 @@ if ($id > 0 || !empty($ref)) print '
';
dol_fiche_end();
- }
- else
- {
+ } else {
/* Order not found */
$langs->load("errors");
print $langs->trans("ErrorRecordNotFound");
diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php
index 909dec03796..d7f8ef489ab 100644
--- a/htdocs/fourn/commande/orderstoinvoice.php
+++ b/htdocs/fourn/commande/orderstoinvoice.php
@@ -83,9 +83,7 @@ if ($action == 'create')
if (!GETPOST('createbill'))
{
$action = '';
- }
- else
- {
+ } else {
if (!is_array($selected))
{
//$error++;
@@ -448,9 +446,7 @@ if (($action != 'create' && $action != 'add') && !$error) {
if (empty($conf->global->SUPPLIER_ORDER_TO_INVOICE_STATUS))
{
$sql .= " AND c.fk_statut IN (".CommandeFournisseur::STATUS_RECEIVED_COMPLETELY.")"; // Must match filter in htdocs/fourn/card.php
- }
- else
- {
+ } else {
// CommandeFournisseur::STATUS_ORDERSENT.", ".CommandeFournisseur::STATUS_RECEIVED_PARTIALLY.", ".CommandeFournisseur::STATUS_RECEIVED_COMPLETELY
$sql .= " AND c.fk_statut IN (".$db->escape($conf->global->SUPPLIER_ORDER_TO_INVOICE_STATUS).")";
}
diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php
index 40773f0eca6..edcccbc6a88 100644
--- a/htdocs/fourn/contact.php
+++ b/htdocs/fourn/contact.php
@@ -124,9 +124,7 @@ if ($result)
}
print "";
$db->free($result);
-}
-else
-{
+} else {
dol_print_error($db);
}
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 6e8f259bc01..1e0e64fb695 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -99,12 +99,20 @@ if (!empty($user->socid)) $socid = $user->socid;
$isdraft = (($object->statut == FactureFournisseur::STATUS_DRAFT) ? 1 : 0);
$result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture', 'fk_soc', 'rowid', $isdraft);
-$usercancreate = $user->rights->fournisseur->facture->creer;
+// Common permissions
+$usercanread = $user->rights->fournisseur->facture->lire;
+$usercancreate = $user->rights->fournisseur->facture->creer;
+$usercandelete = $user->rights->fournisseur->facture->supprimer;
-$permissionnote = $user->rights->fournisseur->facture->creer; // Used by the include of actions_setnotes.inc.php
-$permissiondellink = $user->rights->fournisseur->facture->creer; // Used by the include of actions_dellink.inc.php
-$permissiontoedit = $user->rights->fournisseur->facture->creer; // Used by the include of actions_lineupdown.inc.php
-$permissiontoadd = $user->rights->fournisseur->facture->creer; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+// Advanced permissions
+$usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($usercancreate)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->supplier_invoice_advance->validate)));
+$usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->fournisseur->supplier_invoice_advance->send);
+
+// Permissions for includes
+$permissionnote = $usercancreate; // Used by the include of actions_setnotes.inc.php
+$permissiondellink = $usercancreate; // Used by the include of actions_dellink.inc.php
+$permissiontoedit = $usercancreate; // Used by the include of actions_lineupdown.inc.php
+$permissiontoadd = $usercancreate; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
/*
@@ -154,20 +162,12 @@ if (empty($reshook))
{
header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
exit;
- }
- else
- {
+ } else {
$langs->load("errors");
setEventMessages($objectutil->error, $objectutil->errors, 'errors');
$action = '';
}
- }
-
- elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
- ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->facture->creer))
- || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->supplier_invoice_advance->validate)))
- )
- {
+ } elseif ($action == 'confirm_valid' && $confirm == 'yes' && $usercanvalidate) {
$idwarehouse = GETPOST('idwarehouse');
$object->fetch($id);
@@ -177,9 +177,7 @@ if (empty($reshook))
if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
{
$qualified_for_stock_change = $object->hasProductsOrServices(2);
- }
- else
- {
+ } else {
$qualified_for_stock_change = $object->hasProductsOrServices(1);
}
@@ -221,33 +219,28 @@ if (empty($reshook))
}
}
}
- }
-
- elseif ($action == 'confirm_delete' && $confirm == 'yes')
+ } elseif ($action == 'confirm_delete' && $confirm == 'yes')
{
$object->fetch($id);
$object->fetch_thirdparty();
$isErasable = $object->is_erasable();
- if (($user->rights->fournisseur->facture->supprimer && $isErasable > 0)
- || ($user->rights->fournisseur->facture->creer && $isErasable == 1))
+ if (($usercandelete && $isErasable > 0) || ($usercancreate && $isErasable == 1))
{
$result = $object->delete($user);
if ($result > 0)
{
header('Location: list.php?restore_lastsearch_values=1');
exit;
- }
- else
- {
+ } else {
setEventMessages($object->error, $object->errors, 'errors');
}
}
}
// Remove a product line
- elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->fournisseur->facture->creer)
+ elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $usercancreate)
{
$result = $object->deleteline($lineid);
if ($result > 0)
@@ -270,9 +263,7 @@ if (empty($reshook))
header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
exit;
- }
- else
- {
+ } else {
setEventMessages($object->error, $object->errors, 'errors');
/* Fix bug 1485 : Reset action to avoid asking again confirmation on failure */
$action = '';
@@ -280,15 +271,12 @@ if (empty($reshook))
}
// Delete link of credit note to invoice
- elseif ($action == 'unlinkdiscount' && $user->rights->fournisseur->facture->creer)
+ elseif ($action == 'unlinkdiscount' && $usercancreate)
{
$discount = new DiscountAbsolute($db);
$result = $discount->fetch(GETPOST("discountid"));
$discount->unlink_invoice();
- }
-
- elseif ($action == 'confirm_paid' && $confirm == 'yes' && $user->rights->fournisseur->facture->creer)
- {
+ } elseif ($action == 'confirm_paid' && $confirm == 'yes' && $usercancreate) {
$object->fetch($id);
$result = $object->set_paid($user);
if ($result < 0)
@@ -298,15 +286,13 @@ if (empty($reshook))
}
// Set supplier ref
- if ($action == 'setref_supplier' && $user->rights->fournisseur->facture->creer)
+ if ($action == 'setref_supplier' && $usercancreate)
{
$object->ref_supplier = GETPOST('ref_supplier', 'alpha');
if ($object->update($user) < 0) {
setEventMessages($object->error, $object->errors, 'errors');
- }
- else
- {
+ } else {
// Define output language
$outputlangs = $langs;
$newlang = '';
@@ -328,7 +314,7 @@ if (empty($reshook))
}
// payments conditions
- if ($action == 'setconditions' && $user->rights->fournisseur->facture->creer)
+ if ($action == 'setconditions' && $usercancreate)
{
$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
}
@@ -340,36 +326,34 @@ if (empty($reshook))
}
// payment mode
- elseif ($action == 'setmode' && $user->rights->fournisseur->facture->creer)
+ elseif ($action == 'setmode' && $usercancreate)
{
$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
}
// Multicurrency Code
- elseif ($action == 'setmulticurrencycode' && $user->rights->fournisseur->facture->creer) {
+ elseif ($action == 'setmulticurrencycode' && $usercancreate) {
$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
}
// Multicurrency rate
- elseif ($action == 'setmulticurrencyrate' && $user->rights->fournisseur->facture->creer) {
+ elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx', 'alpha')));
}
// bank account
- elseif ($action == 'setbankaccount' && $user->rights->fournisseur->facture->creer) {
+ elseif ($action == 'setbankaccount' && $usercancreate) {
$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
}
// Set label
- elseif ($action == 'setlabel' && $user->rights->fournisseur->facture->creer)
+ elseif ($action == 'setlabel' && $usercancreate)
{
$object->fetch($id);
$object->label = GETPOST('label');
$result = $object->update($user);
if ($result < 0) dol_print_error($db);
- }
- elseif ($action == 'setdatef' && $user->rights->fournisseur->facture->creer)
- {
+ } elseif ($action == 'setdatef' && $usercancreate) {
$newdate = dol_mktime(0, 0, 0, $_POST['datefmonth'], $_POST['datefday'], $_POST['datefyear']);
if ($newdate > (dol_now() + (empty($conf->global->INVOICE_MAX_OFFSET_IN_FUTURE) ? 0 : $conf->global->INVOICE_MAX_OFFSET_IN_FUTURE)))
{
@@ -392,9 +376,7 @@ if (empty($reshook))
$result = $object->update($user);
if ($result < 0) dol_print_error($db, $object->error);
- }
- elseif ($action == 'setdate_lim_reglement' && $user->rights->fournisseur->facture->creer)
- {
+ } elseif ($action == 'setdate_lim_reglement' && $usercancreate) {
$object->fetch($id);
$object->date_echeance = dol_mktime(12, 0, 0, $_POST['date_lim_reglementmonth'], $_POST['date_lim_reglementday'], $_POST['date_lim_reglementyear']);
if (!empty($object->date_echeance) && $object->date_echeance < $object->date)
@@ -404,8 +386,7 @@ if (empty($reshook))
}
$result = $object->update($user);
if ($result < 0) dol_print_error($db, $object->error);
- }
- elseif ($action == "setabsolutediscount" && $usercancreate)
+ } elseif ($action == "setabsolutediscount" && $usercancreate)
{
// POST[remise_id] or POST[remise_id_for_payment]
@@ -594,18 +575,14 @@ if (empty($reshook))
if ($result >= 0)
{
$db->commit();
- }
- else
- {
+ } else {
setEventMessages($object->error, $object->errors, 'errors');
$db->rollback();
}
} else {
$db->commit();
}
- }
- else
- {
+ } else {
setEventMessages($discount->error, $discount->errors, 'errors');
$db->rollback();
}
@@ -614,7 +591,7 @@ if (empty($reshook))
// Delete payment
- elseif ($action == 'confirm_delete_paiement' && $confirm == 'yes' && $user->rights->fournisseur->facture->creer)
+ elseif ($action == 'confirm_delete_paiement' && $confirm == 'yes' && $usercancreate)
{
$object->fetch($id);
if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0)
@@ -644,7 +621,7 @@ if (empty($reshook))
$ret = $extrafields->setOptionalsFromPost(null, $object);
if ($ret < 0) $error++;
- $datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+ $datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
$datedue = dol_mktime(12, 0, 0, $_POST['echmonth'], $_POST['echday'], $_POST['echyear']);
// Replacement invoice
@@ -972,9 +949,7 @@ if (empty($reshook))
{
$pu = 0;
$pu_currency = $lines[$i]->multicurrency_subprice;
- }
- else
- {
+ } else {
$pu = $lines[$i]->subprice;
$pu_currency = 0;
}
@@ -1014,18 +989,13 @@ if (empty($reshook))
// Now reload line
$object->fetch_lines();
- }
- else
- {
+ } else {
$error++;
}
- }
- else
- {
+ } else {
$error++;
}
- }
- elseif (!$error)
+ } elseif (!$error)
{
$id = $object->create($user);
if ($id < 0)
@@ -1044,9 +1014,7 @@ if (empty($reshook))
setEventMessages($object->error, $object->errors, 'errors');
$action = 'create';
$_GET['socid'] = $_POST['socid'];
- }
- else
- {
+ } else {
$db->commit();
if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
@@ -1065,7 +1033,7 @@ if (empty($reshook))
}
// Edit line
- elseif ($action == 'updateline' && $user->rights->fournisseur->facture->creer)
+ elseif ($action == 'updateline' && $usercancreate)
{
$db->begin();
@@ -1078,9 +1046,7 @@ if (empty($reshook))
{
$up = price2num(GETPOST('price_ht'));
$price_base_type = 'HT';
- }
- else
- {
+ } else {
$up = price2num(GETPOST('price_ttc'));
$price_base_type = 'TTC';
}
@@ -1102,9 +1068,7 @@ if (empty($reshook))
if (trim($_POST['product_desc']) != trim($label)) $label = $_POST['product_desc'];
$type = $prod->type;
- }
- else
- {
+ } else {
$label = $_POST['product_desc'];
$type = $_POST["type"] ? $_POST["type"] : 0;
}
@@ -1154,16 +1118,11 @@ if (empty($reshook))
unset($_POST['date_endyear']);
$db->commit();
- }
- else
- {
+ } else {
$db->rollback();
setEventMessages($object->error, $object->errors, 'errors');
}
- }
-
- elseif ($action == 'addline' && $user->rights->fournisseur->facture->creer)
- {
+ } elseif ($action == 'addline' && $usercancreate) {
$db->begin();
$ret = $object->fetch($id);
@@ -1189,9 +1148,7 @@ if (empty($reshook))
$idprod = 0;
$price_ht = GETPOST('price_ht');
$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
- }
- else
- {
+ } else {
$idprod = GETPOST('idprod', 'int');
$price_ht = GETPOST('price_ht');
$tva_tx = '';
@@ -1274,14 +1231,11 @@ if (empty($reshook))
{
$productsupplier->ref_supplier = '';
}
- }
- else
- {
+ } else {
$fksoctosearch = $object->thirdparty->id;
$productsupplier->get_buyprice(0, -1, $idprod, 'none', $fksoctosearch); // We force qty to -1 to be sure to find if a supplier price exist
}
- }
- elseif (GETPOST('idprodfournprice', 'alpha') > 0)
+ } elseif (GETPOST('idprodfournprice', 'alpha') > 0)
{
$qtytosearch = $qty; // Just to see if a price exists for the quantity. Not used to found vat.
//$qtytosearch=-1; // We force qty to -1 to be sure to find if a supplier price exist
@@ -1365,8 +1319,7 @@ if (empty($reshook))
$langs->load("errors");
setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'errors');
}
- }
- elseif (empty($error)) // $price_ht is already set
+ } elseif (empty($error)) // $price_ht is already set
{
$tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0);
$tva_tx = str_replace('*', '', $tva_tx);
@@ -1386,9 +1339,7 @@ if (empty($reshook))
if ($price_ht !== '')
{
$pu_ht = price2num($price_ht, 'MU'); // $pu_ht must be rounded according to settings
- }
- else
- {
+ } else {
$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
$pu_ht = price2num($pu_ttc / (1 + ($tva_tx / 100)), 'MU'); // $pu_ht must be rounded according to settings
}
@@ -1453,25 +1404,20 @@ if (empty($reshook))
unset($_POST['date_endday']);
unset($_POST['date_endmonth']);
unset($_POST['date_endyear']);
- }
- else
- {
+ } else {
$db->rollback();
setEventMessages($object->error, $object->errors, 'errors');
}
$action = '';
- }
-
- elseif ($action == 'classin' && $user->rights->fournisseur->facture->creer)
- {
+ } elseif ($action == 'classin' && $usercancreate) {
$object->fetch($id);
$result = $object->setProject($projectid);
}
// Set invoice to draft status
- elseif ($action == 'confirm_edit' && $confirm == 'yes' && $user->rights->fournisseur->facture->creer)
+ elseif ($action == 'confirm_edit' && $confirm == 'yes' && $usercancreate)
{
$object->fetch($id);
@@ -1494,9 +1440,7 @@ if (empty($reshook))
if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
{
$qualified_for_stock_change = $object->hasProductsOrServices(2);
- }
- else
- {
+ } else {
$qualified_for_stock_change = $object->hasProductsOrServices(1);
}
@@ -1538,7 +1482,7 @@ if (empty($reshook))
}
// Set invoice to validated/unpaid status
- elseif ($action == 'reopen' && $user->rights->fournisseur->facture->creer)
+ elseif ($action == 'reopen' && $usercancreate)
{
$result = $object->fetch($id);
if ($object->statut == FactureFournisseur::STATUS_CLOSED
@@ -1549,9 +1493,7 @@ if (empty($reshook))
{
header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
exit;
- }
- else
- {
+ } else {
setEventMessages($object->error, $object->errors, 'errors');
}
}
@@ -1569,7 +1511,7 @@ if (empty($reshook))
// Actions to build doc
$upload_dir = $conf->fournisseur->facture->dir_output;
- $permissiontoadd = $user->rights->fournisseur->facture->creer;
+ $permissiontoadd = $usercancreate;
include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
// Make calculation according to calculationrule
@@ -1611,7 +1553,7 @@ if (empty($reshook))
$action = 'edit_extras';
}
- if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->fournisseur->facture->creer)
+ if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $usercancreate)
{
if ($action == 'addcontact')
{
@@ -1627,16 +1569,12 @@ if (empty($reshook))
{
header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit;
- }
- else
- {
+ } else {
if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
{
$langs->load("errors");
setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
- }
- else
- {
+ } else {
setEventMessages($object->error, $object->errors, 'errors');
}
}
@@ -1648,9 +1586,7 @@ if (empty($reshook))
if ($object->fetch($id))
{
$result = $object->swapContactStatus(GETPOST('ligne'));
- }
- else
- {
+ } else {
dol_print_error($db);
}
}
@@ -1665,8 +1601,7 @@ if (empty($reshook))
{
header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit;
- }
- else {
+ } else {
dol_print_error($db);
}
}
@@ -1758,7 +1693,7 @@ if ($action == 'create')
if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx)) $currency_tx = $objectsrc->multicurrency_tx;
}
- $datetmp = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+ $datetmp = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
$dateinvoice = ($datetmp == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $datetmp);
$datetmp = dol_mktime(12, 0, 0, $_POST['echmonth'], $_POST['echday'], $_POST['echyear']);
$datedue = ($datetmp == '' ?-1 : $datetmp);
@@ -1766,13 +1701,11 @@ if ($action == 'create')
// Replicate extrafields
$objectsrc->fetch_optionals();
$object->array_options = $objectsrc->array_options;
- }
- else
- {
+ } else {
$cond_reglement_id = $societe->cond_reglement_supplier_id;
$mode_reglement_id = $societe->mode_reglement_supplier_id;
$fk_account = $societe->fk_account;
- $datetmp = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+ $datetmp = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
$dateinvoice = ($datetmp == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $datetmp);
$datetmp = dol_mktime(12, 0, 0, $_POST['echmonth'], $_POST['echday'], $_POST['echyear']);
$datedue = ($datetmp == '' ?-1 : $datetmp);
@@ -1780,6 +1713,16 @@ if ($action == 'create')
if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) $currency_code = $soc->multicurrency_code;
}
+ // when payment condition is empty (means not override by payment condition form a other object, like third-party), try to use default value
+ if (empty($cond_reglement_id)) {
+ $cond_reglement_id = GETPOST("cond_reglement_id");
+ }
+
+ // when payment mode is empty (means not override by payment condition form a other object, like third-party), try to use default value
+ if (empty($mode_reglement_id)) {
+ $mode_reglement_id = GETPOST("mode_reglement_id");
+ }
+
print '| ';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
print $px1->show();
/*print " \n"; print $px2->show(); diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index b70419de5f4..d1a33d24344 100644 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -87,9 +87,7 @@ if (!$result && !empty($_SERVER["GATEWAY_INTERFACE"])) // If install not done // Note: If calling page was an index.php not into htdocs (ie comm/index.php, ...), then this redirect will fails, // but we don't want to change this because when URL is correct, we must be sure the redirect to install/index.php will be correct. $path = ''; - } - else - { + } else { // If what we look is not index.php, we can try to guess location of root. May not work all the time. // There is no real solution, because the only way to know the apache url relative path is to have it into conf file. // If it fails to find correct $path, then only solution is to ask user to enter the correct URL to index.php or install/index.php @@ -114,9 +112,7 @@ if (!$result && !empty($_SERVER["GATEWAY_INTERFACE"])) // If install not done if (!empty($dolibarr_strict_mode)) { error_reporting(E_ALL | E_STRICT); -} -else -{ +} else { error_reporting(E_ALL & ~(E_STRICT | E_NOTICE | E_DEPRECATED)); } @@ -156,8 +152,7 @@ if (!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck)) { $csrfattack = false; if (empty($_SERVER['HTTP_REFERER'])) $csrfattack = true; // An evil browser was used - else - { + else { $tmpa = parse_url($_SERVER['HTTP_HOST']); $tmpb = parse_url($_SERVER['HTTP_REFERER']); if ((empty($tmpa['host']) ? $tmpa['path'] : $tmpa['host']) != (empty($tmpb['host']) ? $tmpb['path'] : $tmpb['host'])) $csrfattack = true; diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php index 6470b7db313..c10b9dbf162 100644 --- a/htdocs/fourn/card.php +++ b/htdocs/fourn/card.php @@ -235,9 +235,7 @@ if ($object->id > 0) if ($action == 'editconditions') { $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_supplier_id, 'cond_reglement_supplier_id', -1, 1); - } - else - { + } else { $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_supplier_id, 'none'); } print " | ";
@@ -254,9 +252,7 @@ if ($object->id > 0)
if ($action == 'editmode')
{
$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->mode_reglement_supplier_id, 'mode_reglement_supplier_id', 'DBIT', 1, 1);
- }
- else
- {
+ } else {
$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->mode_reglement_supplier_id, 'none');
}
print "";
@@ -334,9 +330,7 @@ if ($object->id > 0)
{
$adh->ref = $adh->getFullName($langs);
print $adh->getNomUrl(1);
- }
- else
- {
+ } else {
print $langs->trans("ThirdpartyNotLinkedToMember");
}
print '';
@@ -566,9 +560,7 @@ if ($object->id > 0)
if ($obj->dc)
{
print dol_print_date($db->jdate($obj->dc), 'day');
- }
- else
- {
+ } else {
print "-";
}
print '';
@@ -579,9 +571,7 @@ if ($object->id > 0)
$db->free($resql);
if ($num > 0) print "
'.$langs->trans('Ref').': '.$this->ref; if (!empty($this->ref_supplier)) @@ -2370,9 +2301,6 @@ class FactureFournisseur extends CommonInvoice $label .= '
'.$langs->trans('VAT').': '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency); if (!empty($this->total_ttc)) $label .= '
'.$langs->trans('AmountTTC').': '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency); - if ($this->type == self::TYPE_REPLACEMENT) $label = $langs->transnoentitiesnoconv("ShowInvoiceReplace").': '.$this->ref; - elseif ($this->type == self::TYPE_CREDIT_NOTE) $label = $langs->transnoentitiesnoconv("ShowInvoiceAvoir").': '.$this->ref; - elseif ($this->type == self::TYPE_DEPOSIT) $label = $langs->transnoentitiesnoconv("ShowInvoiceDeposit").': '.$this->ref; if ($moretitle) $label .= ' - '.$moretitle; if (isset($this->statut) && isset($this->alreadypaid)) { $label .= '
'.$langs->trans("Status").": ".$this->getLibStatut(5, $this->alreadypaid); @@ -2464,9 +2392,7 @@ class FactureFournisseur extends CommonInvoice if ($numref != "") { return $numref; - } - else - { + } else { $this->error = $obj->error; //dol_print_error($db,get_class($this)."::getNextNumRef ".$obj->error); return false; @@ -2549,9 +2475,7 @@ class FactureFournisseur extends CommonInvoice $line->total_ttc = 59.8; $line->total_tva = 9.8; $line->remise_percent = 50; - } - else - { + } else { $line->total_ht = 100; $line->total_ttc = 119.6; $line->total_tva = 19.6; @@ -2616,9 +2540,7 @@ class FactureFournisseur extends CommonInvoice } $this->db->free($resql); return 1; - } - else - { + } else { dol_print_error($this->db); $this->error = $this->db->error(); return -1; @@ -2693,9 +2615,7 @@ class FactureFournisseur extends CommonInvoice { $this->db->commit(); return $object->id; - } - else - { + } else { $this->db->rollback(); return -1; } @@ -2724,9 +2644,7 @@ class FactureFournisseur extends CommonInvoice if (!empty($conf->global->INVOICE_SUPPLIER_ADDON_PDF)) { $modele = $conf->global->INVOICE_SUPPLIER_ADDON_PDF; - } - else - { + } else { $modele = ''; // No default value. For supplier invoice, we allow to disable all PDF generation } } @@ -2734,9 +2652,7 @@ class FactureFournisseur extends CommonInvoice if (empty($modele)) { return 0; - } - else - { + } else { $modelpath = "core/modules/supplier_invoice/doc/"; return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams); @@ -3176,9 +3092,7 @@ class SupplierInvoiceLine extends CommonObjectLine { $this->db->commit(); return 1; - } - else - { + } else { $this->db->rollback(); return -1; } @@ -3434,9 +3348,7 @@ class SupplierInvoiceLine extends CommonObjectLine $this->db->commit(); return $this->id; - } - else - { + } else { $this->error = $this->db->error(); $this->db->rollback(); return -2; @@ -3470,9 +3382,7 @@ class SupplierInvoiceLine extends CommonObjectLine { $this->db->commit(); return 1; - } - else - { + } else { $this->error = $this->db->error(); $this->db->rollback(); return -2; diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php index c00ee77df53..a2ed4b6c0aa 100644 --- a/htdocs/fourn/class/fournisseur.product.class.php +++ b/htdocs/fourn/class/fournisseur.product.class.php @@ -149,9 +149,7 @@ class ProductFournisseur extends Product { $this->db->commit(); return 1; - } - else - { + } else { $this->db->rollback(); return -1; } @@ -287,8 +285,7 @@ class ProductFournisseur extends Product $localtax1 = $localtaxes_array['1']; $localtaxtype2 = $localtaxes_array['2']; $localtax2 = $localtaxes_array['3']; - } - else // old method. deprecated because ot can't retreive type + } else // old method. deprecated because ot can't retreive type { $localtaxtype1 = '0'; $localtax1 = get_localtax($newvat, 1); @@ -384,22 +381,16 @@ class ProductFournisseur extends Product { $this->db->commit(); return $this->product_fourn_price_id; - } - else - { + } else { $this->db->rollback(); return -1; } - } - else - { + } else { $this->error = $this->db->error()." sql=".$sql; $this->db->rollback(); return -2; } - } - else - { + } else { dol_syslog(get_class($this).'::update_buyprice without knowing id of line, so we delete from company, quantity and supplier_ref and insert again', LOG_DEBUG); // Delete price for this quantity @@ -447,8 +438,7 @@ class ProductFournisseur extends Product $resql = $this->db->query($sql); if ($resql) { $this->product_fourn_price_id = $this->db->last_insert_id(MAIN_DB_PREFIX."product_fournisseur_price"); - } - else { + } else { $error++; } @@ -566,23 +556,17 @@ class ProductFournisseur extends Product if ($this->fourn_qty != 0) { $this->fourn_unitprice = price2num($this->fourn_price / $this->fourn_qty, 'MU'); - } - else - { + } else { $this->fourn_unitprice = ""; } } } return 1; - } - else - { + } else { return 0; } - } - else - { + } else { $this->error = $this->db->error(); return -1; } @@ -685,9 +669,7 @@ class ProductFournisseur extends Product if ($prodfourn->fourn_qty != 0) { $prodfourn->fourn_unitprice = price2num($prodfourn->fourn_price / $prodfourn->fourn_qty, 'MU'); - } - else - { + } else { $prodfourn->fourn_unitprice = ""; } } @@ -697,9 +679,7 @@ class ProductFournisseur extends Product $this->db->free($resql); return $retarray; - } - else - { + } else { $this->error = $this->db->error(); return -1; } @@ -775,9 +755,7 @@ class ProductFournisseur extends Product { $this->db->free($resql); return 0; - } - else - { + } else { $min = -1; foreach ($record_array as $record) { @@ -798,9 +776,7 @@ class ProductFournisseur extends Product if ($record["quantity"] != 0) { $fourn_unitprice = price2num($fourn_price / $record["quantity"], 'MU'); - } - else - { + } else { $fourn_unitprice = $fourn_price; } } @@ -835,9 +811,7 @@ class ProductFournisseur extends Product $this->db->free($resql); return 1; - } - else - { + } else { $this->error = $this->db->error(); return -1; } @@ -868,9 +842,7 @@ class ProductFournisseur extends Product { $this->db->commit(); return 1; - } - else - { + } else { $this->error = $this->db->error()." sql=".$sql; $this->db->rollback(); return -1; @@ -997,9 +969,7 @@ class ProductFournisseur extends Product $this->db->free($resql); return $retarray; - } - else - { + } else { $this->error = $this->db->error(); return -1; } @@ -1087,8 +1057,7 @@ class ProductFournisseur extends Product } $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"'; $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"'; - } - else $linkclose = ($morecss ? ' class="'.$morecss.'"' : ''); + } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : ''); $linkstart = ''; diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php index a95aefede0f..a2df6ba9b74 100644 --- a/htdocs/fourn/class/paiementfourn.class.php +++ b/htdocs/fourn/class/paiementfourn.class.php @@ -131,15 +131,11 @@ class PaiementFourn extends Paiement $this->type_label = $obj->paiement_type; $this->statut = $obj->statut; $error = 1; - } - else - { + } else { $error = -2; // TODO Use 0 instead } $this->db->free($resql); - } - else - { + } else { dol_print_error($this->db); $error = -1; } @@ -171,9 +167,7 @@ class PaiementFourn extends Paiement { $amounts = &$this->amounts; $amounts_to_update = &$this->multicurrency_amounts; - } - else - { + } else { $amounts = &$this->multicurrency_amounts; $amounts_to_update = &$this->amounts; } @@ -202,9 +196,7 @@ class PaiementFourn extends Paiement { $total = $totalamount; $mtotal = $totalamount_converted; // Maybe use price2num with MT for the converted value - } - else - { + } else { $total = $totalamount_converted; // Maybe use price2num with MT for the converted value $mtotal = $totalamount; } @@ -247,8 +239,7 @@ class PaiementFourn extends Paiement if ($remaintopay == 0) { $result = $invoice->set_paid($user, '', ''); - } - else dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing."); + } else dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing."); } // Regenerate documents of invoices @@ -268,15 +259,11 @@ class PaiementFourn extends Paiement $error++; } } - } - else - { + } else { $this->error = $this->db->lasterror(); $error++; } - } - else - { + } else { dol_syslog(get_class($this).'::Create Amount line '.$key.' not a number. We discard it.'); } } @@ -288,15 +275,11 @@ class PaiementFourn extends Paiement if ($result < 0) $error++; // End call triggers } - } - else - { + } else { $this->error = $this->db->lasterror(); $error++; } - } - else - { + } else { $this->error = "ErrorTotalIsNull"; dol_syslog('PaiementFourn::Create Error '.$this->error, LOG_ERR); $error++; @@ -310,9 +293,7 @@ class PaiementFourn extends Paiement $this->db->commit(); dol_syslog('PaiementFourn::Create Ok Total = '.$this->total); return $this->id; - } - else - { + } else { $this->db->rollback(); return -1; } @@ -346,9 +327,7 @@ class PaiementFourn extends Paiement $this->db->rollback(); return -1; } - } - else - { + } else { $this->db->rollback(); return -2; } @@ -414,9 +393,7 @@ class PaiementFourn extends Paiement $this->db->commit(); return 1; - } - else - { + } else { $this->error = $this->db->error; $this->db->rollback(); return -5; @@ -460,9 +437,7 @@ class PaiementFourn extends Paiement $this->date_modification = $this->db->jdate($obj->tms); } $this->db->free($resql); - } - else - { + } else { dol_print_error($this->db); } } @@ -496,9 +471,7 @@ class PaiementFourn extends Paiement } return $billsarray; - } - else - { + } else { $this->error = $this->db->error(); dol_syslog(get_class($this).'::getBillsArray Error '.$this->error); return -1; @@ -705,9 +678,7 @@ class PaiementFourn extends Paiement } return $numref; - } - else - { + } else { $langs->load("errors"); print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Supplier")); return ""; @@ -737,9 +708,7 @@ class PaiementFourn extends Paiement if (!empty($conf->global->SUPPLIER_PAYMENT_ADDON_PDF)) { $modele = $conf->global->SUPPLIER_PAYMENT_ADDON_PDF; - } - else - { + } else { $modele = ''; // No default value. For supplier invoice, we allow to disable all PDF generation } } @@ -747,9 +716,7 @@ class PaiementFourn extends Paiement if (empty($modele)) { return 0; - } - else - { + } else { $modelpath = "core/modules/supplier_payment/doc/"; return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams); diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 0cd823304ee..0a288644d7e 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -99,8 +99,7 @@ if ($id > 0 || !empty($ref)) if ($ret < 0) dol_print_error($db, $object->error); $ret = $object->fetch_thirdparty(); if ($ret < 0) dol_print_error($db, $object->error); -} -elseif (!empty($socid) && $socid > 0) +} elseif (!empty($socid) && $socid > 0) { $fourn = new Fournisseur($db); $ret = $fourn->fetch($socid); @@ -110,10 +109,25 @@ elseif (!empty($socid) && $socid > 0) if ($ret < 0) dol_print_error($db, $object->error); } -$permissionnote = $user->rights->fournisseur->commande->creer; // Used by the include of actions_setnotes.inc.php -$permissiondellink = $user->rights->fournisseur->commande->creer; // Used by the include of actions_dellink.inc.php -$permissiontoedit = $user->rights->fournisseur->commande->creer; // Used by the include of actions_lineupdown.inc.php -$permissiontoadd = $user->rights->fournisseur->commande->creer; // Used by the include of actions_addupdatedelete.inc.php +// Common permissions +$usercanread = $user->rights->fournisseur->commande->lire; +$usercancreate = $user->rights->fournisseur->commande->creer; +$usercandelete = $user->rights->fournisseur->commande->supprimer; + +// Advanced permissions +$usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($usercancreate)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->supplier_order_advance->validate))); + +// Additional area permissions +$usercanapprove = $user->rights->fournisseur->commande->approuver; +$usercanapprovesecond = $user->rights->fournisseur->commande->approve2; +$usercanorder = $user->rights->fournisseur->commande->commander; +$usercanreceived = $user->rights->fournisseur->commande->receptionner; + +// Permissions for includes +$permissionnote = $usercancreate; // Used by the include of actions_setnotes.inc.php +$permissiondellink = $usercancreate; // Used by the include of actions_dellink.inc.php +$permissiontoedit = $usercancreate; // Used by the include of actions_lineupdown.inc.php +$permissiontoadd = $usercancreate; // Used by the include of actions_addupdatedelete.inc.php /* @@ -142,66 +156,66 @@ if (empty($reshook)) include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be include, not include_once - if ($action == 'setref_supplier' && $user->rights->fournisseur->commande->creer) + if ($action == 'setref_supplier' && $usercancreate) { $result = $object->setValueFrom('ref_supplier', GETPOST('ref_supplier', 'alpha'), '', null, 'text', '', $user, 'ORDER_SUPPLIER_MODIFY'); if ($result < 0) setEventMessages($object->error, $object->errors, 'errors'); } // Set incoterm - if ($action == 'set_incoterms' && $user->rights->fournisseur->commande->creer) + if ($action == 'set_incoterms' && $usercancreate) { $result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha')); if ($result < 0) setEventMessages($object->error, $object->errors, 'errors'); } // payment conditions - if ($action == 'setconditions' && $user->rights->fournisseur->commande->creer) + if ($action == 'setconditions' && $usercancreate) { $result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int')); if ($result < 0) setEventMessages($object->error, $object->errors, 'errors'); } // payment mode - if ($action == 'setmode' && $user->rights->fournisseur->commande->creer) + if ($action == 'setmode' && $usercancreate) { $result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int')); if ($result < 0) setEventMessages($object->error, $object->errors, 'errors'); } // Multicurrency Code - elseif ($action == 'setmulticurrencycode' && $user->rights->fournisseur->commande->creer) { + elseif ($action == 'setmulticurrencycode' && $usercancreate) { $result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha')); } // Multicurrency rate - elseif ($action == 'setmulticurrencyrate' && $user->rights->fournisseur->commande->creer) { + elseif ($action == 'setmulticurrencyrate' && $usercancreate) { $result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx'))); } // bank account - if ($action == 'setbankaccount' && $user->rights->fournisseur->commande->creer) + if ($action == 'setbankaccount' && $usercancreate) { $result = $object->setBankAccount(GETPOST('fk_account', 'int')); if ($result < 0) setEventMessages($object->error, $object->errors, 'errors'); } // date of delivery - if ($action == 'setdate_livraison' && $user->rights->fournisseur->commande->creer) + if ($action == 'setdate_livraison' && $usercancreate) { $result = $object->set_date_livraison($user, $datelivraison); if ($result < 0) setEventMessages($object->error, $object->errors, 'errors'); } // Set project - if ($action == 'classin' && $user->rights->fournisseur->commande->creer) + if ($action == 'classin' && $usercancreate) { $result = $object->setProject($projectid); if ($result < 0) setEventMessages($object->error, $object->errors, 'errors'); } // Edit Thirdparty - if (!empty($conf->global->MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER) && $action == 'set_thirdparty' && $user->rights->fournisseur->commande->creer && $object->statut == CommandeFournisseur::STATUS_DRAFT) + if (!empty($conf->global->MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER) && $action == 'set_thirdparty' && $usercancreate && $object->statut == CommandeFournisseur::STATUS_DRAFT) { $new_socid = GETPOST('new_socid', 'int'); if (!empty($new_socid) && $new_socid != $object->thirdparty->id) { @@ -238,8 +252,7 @@ if (empty($reshook)) $l->total_ttc = 0; $l->ref_supplier = ''; $l->update(); - } - else { + } else { // No need for loop to keep best supplier price $obj = $db->fetch_object($resql); $l->subprice = $obj->unitprice; @@ -250,8 +263,7 @@ if (empty($reshook)) $l->ref_supplier = $obj->ref_fourn; $l->update(); } - } - else { + } else { dol_print_error($db); } $db->free($resql); @@ -263,7 +275,7 @@ if (empty($reshook)) exit; } - if ($action == 'setremisepercent' && $user->rights->fournisseur->commande->creer) + if ($action == 'setremisepercent' && $usercancreate) { $result = $object->set_remise($user, $_POST['remise_percent']); if ($result < 0) setEventMessages($object->error, $object->errors, 'errors'); @@ -284,8 +296,7 @@ if (empty($reshook)) //$newstatus=3; // Submited // TODO If there is at least one reception, we can set to Received->Received partially $newstatus = 4; // Received partially - } - elseif ($object->statut == 6) $newstatus = 2; // Canceled->Approved + } elseif ($object->statut == 6) $newstatus = 2; // Canceled->Approved elseif ($object->statut == 7) $newstatus = 3; // Canceled->Process running elseif ($object->statut == 9) $newstatus = 1; // Refused->Validated else $newstatus = 2; @@ -316,9 +327,7 @@ if (empty($reshook)) header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id); exit; - } - else - { + } else { $db->rollback(); setEventMessages($object->error, $object->errors, 'errors'); @@ -329,7 +338,7 @@ if (empty($reshook)) /* * Classify supplier order as billed */ - if ($action == 'classifybilled' && $user->rights->fournisseur->commande->creer) + if ($action == 'classifybilled' && $usercancreate) { $ret = $object->classifyBilled($user); if ($ret < 0) { @@ -338,7 +347,7 @@ if (empty($reshook)) } // Add a product line - if ($action == 'addline' && $user->rights->fournisseur->commande->creer) + if ($action == 'addline' && $usercancreate) { $db->begin(); @@ -356,9 +365,7 @@ if (empty($reshook)) $idprod = 0; $price_ht = GETPOST('price_ht'); $tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0); - } - else - { + } else { $idprod = GETPOST('idprod', 'int'); $price_ht = GETPOST('price_ht'); $tva_tx = ''; @@ -441,14 +448,11 @@ if (empty($reshook)) { $productsupplier->ref_supplier = ''; } - } - else - { + } else { $fksoctosearch = $object->thirdparty->id; $productsupplier->get_buyprice(0, -1, $idprod, 'none', $fksoctosearch); // We force qty to -1 to be sure to find if a supplier price exist } - } - elseif (GETPOST('idprodfournprice', 'alpha') > 0) + } elseif (GETPOST('idprodfournprice', 'alpha') > 0) { $qtytosearch = $qty; // Just to see if a price exists for the quantity. Not used to found vat. //$qtytosearch=-1; // We force qty to -1 to be sure to find if a supplier price exist @@ -534,8 +538,7 @@ if (empty($reshook)) $langs->load("errors"); setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'errors'); } - } - elseif (empty($error)) // $price_ht is already set + } elseif (empty($error)) // $price_ht is already set { $tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0); $tva_tx = str_replace('*', '', $tva_tx); @@ -555,9 +558,7 @@ if (empty($reshook)) if ($price_ht !== '') { $pu_ht = price2num($price_ht, 'MU'); // $pu_ht must be rounded according to settings - } - else - { + } else { $pu_ttc = price2num(GETPOST('price_ttc'), 'MU'); $pu_ht = price2num($pu_ttc / (1 + ($tva_tx / 100)), 'MU'); // $pu_ht must be rounded according to settings } @@ -623,9 +624,7 @@ if (empty($reshook)) unset($_POST['date_endday']); unset($_POST['date_endmonth']); unset($_POST['date_endyear']); - } - else - { + } else { $db->rollback(); setEventMessages($object->error, $object->errors, 'errors'); } @@ -636,7 +635,7 @@ if (empty($reshook)) /* * Updating a line in the order */ - if ($action == 'updateline' && $user->rights->fournisseur->commande->creer && !GETPOST('cancel', 'alpha')) + if ($action == 'updateline' && $usercancreate && !GETPOST('cancel', 'alpha')) { $vat_rate = (GETPOST('tva_tx') ?GETPOST('tva_tx') : 0); @@ -674,9 +673,7 @@ if (empty($reshook)) { $price_base_type = 'HT'; $ht = price2num(GETPOST('price_ht')); - } - else - { + } else { $vatratecleaned = $vat_rate; if (preg_match('/^(.*)\s*\((.*)\)$/', $vat_rate, $reg)) // If vat is "xx (yy)" { @@ -768,16 +765,14 @@ if (empty($reshook)) $result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); if ($result < 0) dol_print_error($db, $result); } - } - else - { + } else { dol_print_error($db, $object->error); exit; } } // Remove a product line - if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->fournisseur->commande->creer) + if ($action == 'confirm_deleteline' && $confirm == 'yes' && $usercancreate) { $result = $object->deleteline($lineid); if ($result > 0) @@ -800,9 +795,7 @@ if (empty($reshook)) header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id); exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); /* Fix bug 1485 : Reset action to avoid asking again confirmation on failure */ $action = ''; @@ -810,10 +803,7 @@ if (empty($reshook)) } // Validate - if ($action == 'confirm_valid' && $confirm == 'yes' && - ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->commande->creer)) - || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->supplier_order_advance->validate))) - ) + if ($action == 'confirm_valid' && $confirm == 'yes' && $usercanvalidate) { $object->date_commande = dol_now(); $result = $object->valid($user); @@ -836,20 +826,18 @@ if (empty($reshook)) $result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); if ($result < 0) dol_print_error($db, $result); } - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } // If we have permission, and if we don't need to provide the idwarehouse, we go directly on approved step - if (empty($conf->global->SUPPLIER_ORDER_NO_DIRECT_APPROVE) && $user->rights->fournisseur->commande->approuver && !(!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $object->hasProductsOrServices(1))) + if (empty($conf->global->SUPPLIER_ORDER_NO_DIRECT_APPROVE) && $usercanapprove && !(!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $object->hasProductsOrServices(1))) { $action = 'confirm_approve'; // can make standard or first level approval also if permission is set } } - if (($action == 'confirm_approve' || $action == 'confirm_approve2') && $confirm == 'yes' && $user->rights->fournisseur->commande->approuver) + if (($action == 'confirm_approve' || $action == 'confirm_approve2') && $confirm == 'yes' && $usercanapprove) { $idwarehouse = GETPOST('idwarehouse', 'int'); @@ -857,9 +845,7 @@ if (empty($reshook)) if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) { $qualified_for_stock_change = $object->hasProductsOrServices(2); - } - else - { + } else { $qualified_for_stock_change = $object->hasProductsOrServices(1); } @@ -892,24 +878,20 @@ if (empty($reshook)) } header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id); exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } } - if ($action == 'confirm_refuse' && $confirm == 'yes' && $user->rights->fournisseur->commande->approuver) + if ($action == 'confirm_refuse' && $confirm == 'yes' && $usercanapprove) { $result = $object->refuse($user); if ($result > 0) { header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id); exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } @@ -924,7 +906,7 @@ if (empty($reshook)) } } - if ($action == 'confirm_commande' && $confirm == 'yes' && $user->rights->fournisseur->commande->commander) + if ($action == 'confirm_commande' && $confirm == 'yes' && $usercanorder) { $result = $object->commande($user, GETPOST("datecommande"), GETPOST("methode", 'int'), GETPOST('comment', 'alphanohtml')); if ($result > 0) @@ -944,37 +926,31 @@ if (empty($reshook)) $action = ''; header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id); exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } - if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->fournisseur->commande->supprimer) + if ($action == 'confirm_delete' && $confirm == 'yes' && $usercandelete) { $result = $object->delete($user); if ($result > 0) { header("Location: ".DOL_URL_ROOT.'/fourn/commande/list.php?restore_lastsearch_values=1'); exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } // Action clone object - if ($action == 'confirm_clone' && $confirm == 'yes' && $user->rights->fournisseur->commande->creer) + if ($action == 'confirm_clone' && $confirm == 'yes' && $usercancreate) { if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers')) { setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors'); - } - else - { + } else { if ($object->id > 0) { $orig = clone $object; @@ -984,9 +960,7 @@ if (empty($reshook)) { header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result); exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); $object = $orig; $action = ''; @@ -996,7 +970,7 @@ if (empty($reshook)) } // Set status of reception (complete, partial, ...) - if ($action == 'livraison' && $user->rights->fournisseur->commande->receptionner) + if ($action == 'livraison' && $usercanreceived) { if (GETPOST("type") != '') { @@ -1008,32 +982,25 @@ if (empty($reshook)) $langs->load("deliveries"); setEventMessages($langs->trans("DeliveryStateSaved"), null); $action = ''; - } - elseif ($result == -3) + } elseif ($result == -3) { setEventMessages($object->error, $object->errors, 'errors'); - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } - } - else - { + } else { setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Delivery")), null, 'errors'); } } - if ($action == 'confirm_cancel' && $confirm == 'yes' && $user->rights->fournisseur->commande->commander) + if ($action == 'confirm_cancel' && $confirm == 'yes' && $usercanorder) { $result = $object->cancel($user); if ($result > 0) { header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id); exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } @@ -1049,7 +1016,7 @@ if (empty($reshook)) // Actions to build doc $upload_dir = $conf->fournisseur->commande->dir_output; - $permissiontoadd = $user->rights->fournisseur->commande->creer; + $permissiontoadd = $usercancreate; include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php'; @@ -1082,7 +1049,7 @@ if (empty($reshook)) /* * Create an order */ - if ($action == 'add' && $user->rights->fournisseur->commande->creer) + if ($action == 'add' && $usercancreate) { $error = 0; $selectedLines = GETPOST('toselect', 'array'); @@ -1128,14 +1095,11 @@ if (empty($reshook)) { $classname = 'Propal'; $element = 'comm/propal'; $subelement = 'propal'; - } - elseif ($origin == 'order' || $origin == 'commande') + } elseif ($origin == 'order' || $origin == 'commande') { $classname = 'Commande'; $element = $subelement = 'commande'; - } - else - { + } else { $classname = 'SupplierProposal'; $element = 'supplier_proposal'; $subelement = 'supplier_proposal'; @@ -1207,9 +1171,7 @@ if (empty($reshook)) $ref_supplier = $productsupplier->ref_supplier; $product_fourn_price_id = $productsupplier->product_fourn_price_id; } - } - else - { + } else { $ref_supplier = $lines[$i]->ref_fourn; $product_fourn_price_id = 0; } @@ -1276,9 +1238,7 @@ if (empty($reshook)) setEventMessages($object->error, $object->errors, 'errors'); $error++; } - } - else - { + } else { $id = $object->create($user); if ($id < 0) { @@ -1294,9 +1254,7 @@ if (empty($reshook)) $db->rollback(); $action = 'create'; $_GET['socid'] = $_POST['socid']; - } - else - { + } else { $db->commit(); header("Location: ".$_SERVER['PHP_SELF']."?id=".$id); exit; @@ -1383,19 +1341,16 @@ if (empty($reshook)) if (empty($result_order["result"]["result_code"])) //No result, check error str { setEventMessages($langs->trans("SOAPError")." '".$soapclient_order->error_str."'", null, 'errors'); - } - elseif ($result_order["result"]["result_code"] != "OK") //Something went wrong + } elseif ($result_order["result"]["result_code"] != "OK") //Something went wrong { setEventMessages($langs->trans("SOAPError")." '".$result_order["result"]["result_code"]."' - '".$result_order["result"]["result_label"]."'", null, 'errors'); - } - else - { + } else { setEventMessages($langs->trans("RemoteOrderRef")." ".$result_order["ref"], null, 'mesgs'); } } } - if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->fournisseur->commande->creer) + if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $usercancreate) { if ($action == 'addcontact') { @@ -1409,16 +1364,12 @@ if (empty($reshook)) { header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); exit; - } - else - { + } else { if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') { $langs->load("errors"); setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors'); - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } @@ -1439,8 +1390,7 @@ if (empty($reshook)) { header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); exit; - } - else { + } else { dol_print_error($db); } } @@ -1492,14 +1442,11 @@ if ($action == 'create') { $classname = 'Propal'; $element = 'comm/propal'; $subelement = 'propal'; - } - elseif ($origin == 'order' || $origin == 'commande') + } elseif ($origin == 'order' || $origin == 'commande') { $classname = 'Commande'; $element = $subelement = 'commande'; - } - else - { + } else { $classname = 'SupplierProposal'; $element = 'supplier_proposal'; $subelement = 'supplier_proposal'; @@ -1544,9 +1491,7 @@ if ($action == 'create') // Object source contacts list $srccontactslist = $objectsrc->liste_contact(-1, 'external', 1); - } - else - { + } else { $cond_reglement_id = $societe->cond_reglement_supplier_id; $mode_reglement_id = $societe->mode_reglement_supplier_id; @@ -1584,9 +1529,7 @@ if ($action == 'create') { print $societe->getNomUrl(1); print ''; - } - else - { + } else { print $form->select_company((empty($socid) ? '' : $socid), 'socid', 's.fournisseur=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300'); // reload page to retrieve customer informations if (!empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE)) @@ -1770,8 +1713,7 @@ if ($action == 'create') print ''; } print "\n"; -} -elseif (!empty($object->id)) +} elseif (!empty($object->id)) { $result = $object->fetch($id, $ref); @@ -1819,16 +1761,13 @@ elseif (!empty($object->id)) if (preg_match('/^[\(]?PROV/i', $object->ref) || empty($object->ref)) // empty should not happened, but when it occurs, the test save life { $newref = $object->getNextNumRef($object->thirdparty); - } - else $newref = $object->ref; + } else $newref = $object->ref; if ($newref < 0) { setEventMessages($object->error, $object->errors, 'errors'); $action = ''; - } - else - { + } else { $text = $langs->trans('ConfirmValidateOrder', $newref); if (!empty($conf->notification->enabled)) { @@ -1849,9 +1788,7 @@ elseif (!empty($object->id)) if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) { $qualified_for_stock_change = $object->hasProductsOrServices(2); - } - else - { + } else { $qualified_for_stock_change = $object->hasProductsOrServices(1); } @@ -1922,11 +1859,11 @@ elseif (!empty($object->id)) $morehtmlref = '
';
// Ref supplier
- $morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->fournisseur->commande->creer, 'string', '', 0, 1);
- $morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->fournisseur->commande->creer, 'string', '', null, null, '', 1);
+ $morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', 0, 1);
+ $morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', null, null, '', 1);
// Thirdparty
$morehtmlref .= '
'.$langs->trans('ThirdParty'); - if (!empty($conf->global->MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER) && !empty($user->rights->fournisseur->commande->creer) && $action == 'edit_thirdparty') { + if (!empty($conf->global->MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER) && !empty($usercancreate) && $action == 'edit_thirdparty') { $morehtmlref .= ' : '; $morehtmlref .= ''; - } - else { + } else { $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1); } - } - else { + } else { if (!empty($object->fk_project)) { $proj = new Project($db); $proj->fetch($object->fk_project); $morehtmlref .= ''; $morehtmlref .= $proj->ref; $morehtmlref .= ''; - } - else { + } else { $morehtmlref .= ''; } } @@ -2044,9 +1978,7 @@ elseif (!empty($object->id)) if ($action == 'editconditions') { $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'cond_reglement_id'); - } - else - { + } else { $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none'); } print ""; @@ -2064,9 +1996,7 @@ elseif (!empty($object->id)) if ($action == 'editmode') { $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'DBIT', 1, 1); - } - else - { + } else { $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none'); } print ''; @@ -2128,7 +2058,7 @@ elseif (!empty($object->id)) print '
';
print '';
@@ -2159,9 +2089,7 @@ elseif (!empty($object->id))
print $form->selectDate($object->date_livraison ? $object->date_livraison : -1, 'liv_', $usehourmin, $usehourmin, '', "setdate_livraison");
print '';
print '';
- }
- else
- {
+ } else {
$usehourmin = 'day';
if (!empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) $usehourmin = 'dayhour';
print $object->date_livraison ? dol_print_date($object->date_livraison, $usehourmin) : ' ';
@@ -2184,7 +2112,7 @@ elseif (!empty($object->id))
print '
';
print ' ';
@@ -2192,9 +2120,7 @@ elseif (!empty($object->id))
if ($action != 'editincoterm')
{
print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
- }
- else
- {
+ } else {
print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
}
print '';
@@ -2324,7 +2250,7 @@ elseif (!empty($object->id))
$num = count($object->lines);
// Form to add new line
- if ($object->statut == CommandeFournisseur::STATUS_DRAFT && $user->rights->fournisseur->commande->creer)
+ if ($object->statut == CommandeFournisseur::STATUS_DRAFT && $usercancreate)
{
if ($action != 'editline')
{
@@ -2359,11 +2285,10 @@ elseif (!empty($object->id))
// Validate
if ($object->statut == 0 && $num > 0)
{
- if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->commande->creer))
- || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->supplier_order_advance->validate)))
+ if ($usercanvalidate)
{
$tmpbuttonlabel = $langs->trans('Validate');
- if ($user->rights->fournisseur->commande->approuver && empty($conf->global->SUPPLIER_ORDER_NO_DIRECT_APPROVE)) $tmpbuttonlabel = $langs->trans("ValidateAndApprove");
+ if ($usercanapprove && empty($conf->global->SUPPLIER_ORDER_NO_DIRECT_APPROVE)) $tmpbuttonlabel = $langs->trans("ValidateAndApprove");
print '';
print $tmpbuttonlabel;
@@ -2379,7 +2304,7 @@ elseif (!empty($object->id))
// Modify
if ($object->statut == CommandeFournisseur::STATUS_VALIDATED)
{
- if ($user->rights->fournisseur->commande->commander)
+ if ($usercanorder)
{
print ''.$langs->trans("Modify").'';
}
@@ -2388,19 +2313,15 @@ elseif (!empty($object->id))
// Approve
if ($object->statut == CommandeFournisseur::STATUS_VALIDATED)
{
- if ($user->rights->fournisseur->commande->approuver)
+ if ($usercanapprove)
{
if (!empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) && $conf->global->MAIN_FEATURES_LEVEL > 0 && $object->total_ht >= $conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED && !empty($object->user_approve_id))
{
print ''.$langs->trans("ApproveOrder").'';
- }
- else
- {
+ } else {
print ''.$langs->trans("ApproveOrder").'';
}
- }
- else
- {
+ } else {
print ''.$langs->trans("ApproveOrder").'';
}
}
@@ -2410,19 +2331,15 @@ elseif (!empty($object->id))
{
if ($object->statut == CommandeFournisseur::STATUS_VALIDATED)
{
- if ($user->rights->fournisseur->commande->approve2)
+ if ($usercanapprovesecond)
{
if (!empty($object->user_approve_id2))
{
print ''.$langs->trans("Approve2Order").'';
- }
- else
- {
+ } else {
print ''.$langs->trans("Approve2Order").'';
}
- }
- else
- {
+ } else {
print ''.$langs->trans("Approve2Order").'';
}
}
@@ -2431,12 +2348,10 @@ elseif (!empty($object->id))
// Refuse
if ($object->statut == CommandeFournisseur::STATUS_VALIDATED)
{
- if ($user->rights->fournisseur->commande->approuver || $user->rights->fournisseur->commande->approve2)
+ if ($usercanapprove || $usercanapprovesecond)
{
print ''.$langs->trans("RefuseOrder").'';
- }
- else
- {
+ } else {
print ''.$langs->trans("RefuseOrder").'';
}
}
@@ -2445,7 +2360,7 @@ elseif (!empty($object->id))
if (empty($user->socid)) {
if (in_array($object->statut, array(CommandeFournisseur::STATUS_ACCEPTED, 3, 4, 5)) || !empty($conf->global->SUPPLIER_ORDER_SENDBYEMAIL_FOR_ALL_STATUS))
{
- if ($user->rights->fournisseur->commande->commander)
+ if ($usercanorder)
{
print ''.$langs->trans('SendMail').'';
}
@@ -2456,7 +2371,7 @@ elseif (!empty($object->id))
if (in_array($object->statut, array(CommandeFournisseur::STATUS_ACCEPTED)))
{
$buttonshown = 0;
- if (!$buttonshown && $user->rights->fournisseur->commande->approuver)
+ if (!$buttonshown && $usercanapprove)
{
if (empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER_ONLY)
|| (!empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER_ONLY) && $user->id == $object->user_approve_id))
@@ -2465,7 +2380,7 @@ elseif (!empty($object->id))
$buttonshown++;
}
}
- if (!$buttonshown && $user->rights->fournisseur->commande->approve2 && !empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED))
+ if (!$buttonshown && $usercanapprovesecond && !empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED))
{
if (empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER2_ONLY)
|| (!empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER2_ONLY) && $user->id == $object->user_approve_id2))
@@ -2476,7 +2391,7 @@ elseif (!empty($object->id))
}
if (in_array($object->statut, array(3, 4, 5, 6, 7, 9)))
{
- if ($user->rights->fournisseur->commande->commander)
+ if ($usercanorder)
{
print ''.$langs->trans("ReOpen").'';
}
@@ -2490,7 +2405,7 @@ elseif (!empty($object->id))
if ($conf->reception->enabled) $labelofbutton = $langs->trans("CreateReception");
if (in_array($object->statut, array(3, 4, 5))) {
- if ($conf->fournisseur->enabled && $user->rights->fournisseur->commande->receptionner) {
+ if ($conf->fournisseur->enabled && $usercanreceived) {
print '';
} else {
print '';
@@ -2500,12 +2415,10 @@ elseif (!empty($object->id))
if ($object->statut == CommandeFournisseur::STATUS_ACCEPTED)
{
- if ($user->rights->fournisseur->commande->commander)
+ if ($usercanorder)
{
print '';
- }
- else
- {
+ } else {
print '';
}
}
@@ -2513,7 +2426,7 @@ elseif (!empty($object->id))
// Classify received (this does not record reception)
if ($object->statut == CommandeFournisseur::STATUS_ORDERSENT || $object->statut == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY)
{
- if ($user->rights->fournisseur->commande->receptionner)
+ if ($usercanreceived)
{
print '';
}
@@ -2532,23 +2445,19 @@ elseif (!empty($object->id))
//}
// Classify billed manually (need one invoice if module invoice is on, no condition on invoice if not)
- if ($user->rights->fournisseur->commande->creer && $object->statut >= 2 && $object->statut != 7 && $object->billed != 1) // statut 2 means approved
+ if ($usercancreate && $object->statut >= 2 && $object->statut != 7 && $object->billed != 1) // statut 2 means approved
{
if (empty($conf->facture->enabled))
{
print ''.$langs->trans("ClassifyBilled").'';
- }
- else
- {
+ } else {
if (!empty($object->linkedObjectsIds['invoice_supplier']))
{
if ($user->rights->fournisseur->facture->creer)
{
print ''.$langs->trans("ClassifyBilled").'';
}
- }
- else
- {
+ } else {
print ''.$langs->trans("ClassifyBilled").'';
}
}
@@ -2561,7 +2470,7 @@ elseif (!empty($object->id))
}
// Clone
- if ($user->rights->fournisseur->commande->creer)
+ if ($usercancreate)
{
print ''.$langs->trans("ToClone").'';
}
@@ -2569,14 +2478,14 @@ elseif (!empty($object->id))
// Cancel
if ($object->statut == 2)
{
- if ($user->rights->fournisseur->commande->commander)
+ if ($usercanorder)
{
print ''.$langs->trans("CancelOrder").'';
}
}
// Delete
- if (!empty($user->rights->fournisseur->commande->supprimer) || ($object->statut == CommandeFournisseur::STATUS_DRAFT && !empty($user->rights->fournisseur->commande->creer)))
+ if (!empty($usercandelete) || ($object->statut == CommandeFournisseur::STATUS_DRAFT && !empty($usercancreate)))
{
print ''.$langs->trans("Delete").'';
}
@@ -2586,7 +2495,7 @@ elseif (!empty($object->id))
- if ($user->rights->fournisseur->commande->commander && $object->statut == CommandeFournisseur::STATUS_ACCEPTED && $action == 'makeorder')
+ if ($usercanorder && $object->statut == CommandeFournisseur::STATUS_ACCEPTED && $action == 'makeorder')
{
// Set status to ordered (action=commande)
print ''."\n";
@@ -2625,15 +2534,15 @@ elseif (!empty($object->id))
print '
"; -} -else -{ +} else { dol_print_error($db); } @@ -226,9 +224,7 @@ if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_T $sql .= " WHERE ((ug.fk_user = u.rowid"; $sql .= " AND ug.entity IN (".getEntity('usergroup')."))"; $sql .= " OR u.entity = 0)"; // Show always superadmin -} -else -{ +} else { $sql .= " WHERE (u.entity IN (".getEntity('user')."))"; } $sql .= " AND u.fk_soc IS NULL"; // An external user can not approved @@ -269,9 +265,7 @@ if ($resql) } print "
"; $db->free($resql); -} -else -{ +} else { dol_print_error($db); } @@ -344,8 +338,7 @@ if ($resql) } } print "
'.$langs->trans('ThirdParty'); - if (!empty($conf->global->MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER) && !empty($user->rights->fournisseur->commande->creer) && $action == 'edit_thirdparty') { + if (!empty($conf->global->MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER) && !empty($usercancreate) && $action == 'edit_thirdparty') { $morehtmlref .= ' : '; $morehtmlref .= ''; - } - else { + } else { $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1); } - } - else { + } else { if (!empty($object->fk_project)) { $proj = new Project($db); $proj->fetch($object->fk_project); $morehtmlref .= ''; $morehtmlref .= $proj->ref; $morehtmlref .= ''; - } - else { + } else { $morehtmlref .= ''; } } @@ -2044,9 +1978,7 @@ elseif (!empty($object->id)) if ($action == 'editconditions') { $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'cond_reglement_id'); - } - else - { + } else { $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none'); } print ""; @@ -2064,9 +1996,7 @@ elseif (!empty($object->id)) if ($action == 'editmode') { $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'DBIT', 1, 1); - } - else - { + } else { $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none'); } print ''; @@ -2128,7 +2058,7 @@ elseif (!empty($object->id)) print '
| '; print $langs->trans('BankAccount'); print ' | '; - if ($action != 'editbankaccount' && $user->rights->fournisseur->commande->creer) + if ($action != 'editbankaccount' && $usercancreate) print ' | id.'">'.img_edit($langs->trans('SetBankAccount'), 1).' | '; print '
| '; print $langs->trans('IncotermLabel'); print ' | '; - if ($user->rights->fournisseur->commande->creer) print ''.img_edit().''; + if ($usercancreate) print ''.img_edit().''; else print ' '; print ' |
';
// Generated documents
- $comfournref = dol_sanitizeFileName($object->ref);
- $file = $conf->fournisseur->dir_output.'/commande/'.$comfournref.'/'.$comfournref.'.pdf';
- $relativepath = $comfournref.'/'.$comfournref.'.pdf';
- $filedir = $conf->fournisseur->dir_output.'/commande/'.$comfournref;
+ $objref = dol_sanitizeFileName($object->ref);
+ $file = $conf->fournisseur->dir_output.'/commande/'.$objref.'/'.$objref.'.pdf';
+ $relativepath = $objref.'/'.$objref.'.pdf';
+ $filedir = $conf->fournisseur->dir_output.'/commande/'.$objref;
$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
- $genallowed = $user->rights->fournisseur->commande->lire;
- $delallowed = $user->rights->fournisseur->commande->creer;
+ $genallowed = $usercanread;
+ $delallowed = $usercancreate;
- print $formfile->showdocuments('commande_fournisseur', $comfournref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 0, 0, '', '', '', $object->thirdparty->default_lang);
+ print $formfile->showdocuments('commande_fournisseur', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 0, 0, '', '', '', $object->thirdparty->default_lang);
$somethingshown = $formfile->numoffiles;
// Show links to link elements
@@ -2644,7 +2553,7 @@ elseif (!empty($object->id))
if ($action == 'classifyreception')
{
- if ($user->rights->fournisseur->commande->receptionner && ($object->statut == CommandeFournisseur::STATUS_ORDERSENT || $object->statut == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY))
+ if ($usercanreceived && ($object->statut == CommandeFournisseur::STATUS_ORDERSENT || $object->statut == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY))
{
// Set status to received (action=livraison)
print ''."\n";
@@ -2733,9 +2642,7 @@ elseif (!empty($object->id))
{
print "
".$langs->trans("ErrorOccurredReviseAndRetry")."
"; print ''; - } - else - { + } else { $textinput_size = "50"; // Webservice url print ''.$langs->trans("WebServiceURL").' '.dol_print_url($ws_url).'
".$langs->trans("ErrorOccurredReviseAndRetry")."
"; - } - else - { + } else { print ''; print ' '; } diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php index 7ff0dd1c85a..b3d2e3aa664 100644 --- a/htdocs/fourn/commande/contact.php +++ b/htdocs/fourn/commande/contact.php @@ -65,16 +65,12 @@ if ($action == 'addcontact' && $user->rights->fournisseur->commande->creer) { header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); exit; - } - else - { + } else { if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') { $langs->load("errors"); setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors'); - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } @@ -86,9 +82,7 @@ elseif ($action == 'swapstatut' && $user->rights->fournisseur->commande->creer) if ($object->fetch($id)) { $result = $object->swapContactStatus(GETPOST('ligne')); - } - else - { + } else { dol_print_error($db); } } @@ -103,8 +97,7 @@ elseif ($action == 'deletecontact' && $user->rights->fournisseur->commande->cree { header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); exit; - } - else { + } else { dol_print_error($db); } } @@ -193,9 +186,7 @@ if ($id > 0 || !empty($ref)) // Contacts lines include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php'; - } - else - { + } else { // Contact not found print "ErrorRecordNotFound"; } diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php index d132a87233f..d7ad3785338 100644 --- a/htdocs/fourn/commande/dispatch.php +++ b/htdocs/fourn/commande/dispatch.php @@ -8,7 +8,7 @@ * Copyright (C) 2016 Florian Henry
* Copyright (C) 2017 Ferran Marcet
* Copyright (C) 2018 Frédéric France
- * Copyright (C) 2019 Christophe Battarel
+ * Copyright (C) 2019-2020 Christophe Battarel
*
* 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
@@ -38,6 +38,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.dispatch.class.php';
require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+require_once DOL_DOCUMENT_ROOT . '/product/stock/class/mouvementstock.class.php';
+
if (!empty($conf->projet->enabled))
require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
@@ -53,6 +55,8 @@ $ref = GETPOST('ref');
$lineid = GETPOST('lineid', 'int');
$action = GETPOST('action', 'aZ09');
$fk_default_warehouse = GETPOST('fk_default_warehouse', 'int');
+$cancel = GETPOST('cancel', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
if ($user->socid)
$socid = $user->socid;
@@ -128,9 +132,7 @@ if ($action == 'checkdispatchline' && !((empty($conf->global->MAIN_USE_ADVANCED_
if (!$error)
{
$db->commit();
- }
- else
- {
+ } else {
$db->rollback();
}
}
@@ -171,9 +173,7 @@ if ($action == 'uncheckdispatchline' && !((empty($conf->global->MAIN_USE_ADVANCE
if (!$error)
{
$db->commit();
- }
- else
- {
+ } else {
$db->rollback();
}
}
@@ -214,9 +214,7 @@ if ($action == 'denydispatchline' && !((empty($conf->global->MAIN_USE_ADVANCED_P
if (!$error)
{
$db->commit();
- }
- else
- {
+ } else {
$db->rollback();
}
}
@@ -366,6 +364,121 @@ if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner)
}
}
+// Remove a dispatched line
+if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->fournisseur->commande->receptionner)
+{
+ $db->begin();
+
+ $supplierorderdispatch = new CommandeFournisseurDispatch($db);
+ $result = $supplierorderdispatch->fetch($lineid);
+ if ($result > 0)
+ {
+ $qty = $supplierorderdispatch->qty;
+ $entrepot = $supplierorderdispatch->fk_entrepot;
+ $product = $supplierorderdispatch->fk_product;
+ $price = GETPOST('price');
+ $comment = $supplierorderdispatch->comment;
+ $eatby = $supplierorderdispatch->fk_product;
+ $sellby = $supplierorderdispatch->sellby;
+ $batch = $supplierorderdispatch->batch;
+
+ $result = $supplierorderdispatch->delete($user);
+ }
+ if ($result < 0)
+ {
+ $errors = $object->errors;
+ $error++;
+ }
+ else {
+ // If module stock is enabled and the stock increase is done on purchase order dispatching
+ if ($entrepot > 0 && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
+ {
+ $mouv = new MouvementStock($db);
+ if ($product > 0)
+ {
+ $mouv->origin = &$object;
+ $result=$mouv->livraison($user, $product, $entrepot, $qty, $price, $comment, '', $eatby, $sellby, $batch);
+ if ($result < 0)
+ {
+ $errors=$mouv->errors;
+ $error++;
+ }
+ }
+ }
+ }
+ if ($error > 0)
+ {
+ $db->rollback();
+ setEventMessages($error, $errors, 'errors');
+ }
+ else {
+ $db->commit();
+ }
+}
+
+// Update a dispatched line
+if ($action == 'updateline' && $user->rights->fournisseur->commande->receptionner)
+{
+ $db->begin();
+ $error = 0;
+
+ $supplierorderdispatch = new CommandeFournisseurDispatch($db);
+ $result = $supplierorderdispatch->fetch($lineid);
+ if ($result > 0)
+ {
+ $qty = $supplierorderdispatch->qty;
+ $entrepot = $supplierorderdispatch->fk_entrepot;
+ $product = $supplierorderdispatch->fk_product;
+ $price = GETPOST('price');
+ $comment = $supplierorderdispatch->comment;
+ $eatby = $supplierorderdispatch->fk_product;
+ $sellby = $supplierorderdispatch->sellby;
+ $batch = $supplierorderdispatch->batch;
+
+ $supplierorderdispatch->qty = GETPOST('qty', 'int');
+ $supplierorderdispatch->fk_entrepot = GETPOST('fk_entrepot');
+ $result = $supplierorderdispatch->update($user);
+ }
+ if ($result < 0)
+ {
+ $error++;
+ $errors=$supplierorderdispatch->errors;
+ }
+ else {
+ // If module stock is enabled and the stock increase is done on purchase order dispatching
+ if ($entrepot > 0 && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
+ {
+ $mouv = new MouvementStock($db);
+ if ($product > 0)
+ {
+ $mouv->origin = &$object;
+ $result=$mouv->livraison($user, $product, $entrepot, $qty, $price, $comment, '', $eatby, $sellby, $batch);
+ if ($result < 0)
+ {
+ $errors=$mouv->errors;
+ $error++;
+ }
+ else {
+ $mouv->origin = &$object;
+ $result=$mouv->reception($user, $product, $supplierorderdispatch->fk_entrepot, $supplierorderdispatch->qty, $price, $comment, $eatby, $sellby, $batch);
+ if ($result < 0)
+ {
+ $errors=$mouv->errors;
+ $error++;
+ }
+ }
+ }
+ }
+ }
+ if ($error > 0)
+ {
+ $db->rollback();
+ setEventMessages($error, $errors, 'errors');
+ }
+ else {
+ $db->commit();
+ }
+}
/*
* View
@@ -379,7 +492,7 @@ $warehouse_static = new Entrepot($db);
$supplierorderdispatch = new CommandeFournisseurDispatch($db);
$help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
-llxHeader('', $langs->trans("Order"), $help_url, '', 0, 0, array('/fourn/js/lib_dispatch.js.php'));
+llxHeader('', $langs->trans("OrderDispatch"), $help_url, '', 0, 0, array('/fourn/js/lib_dispatch.js.php'));
if ($id > 0 || !empty($ref)) {
$soc = new Societe($db);
@@ -393,6 +506,23 @@ if ($id > 0 || !empty($ref)) {
$title = $langs->trans("SupplierOrder");
dol_fiche_head($head, 'dispatch', $title, -1, 'order');
+ $formconfirm='';
+
+ // Confirmation to delete line
+ if ($action == 'ask_deleteline')
+ {
+ $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
+ }
+
+ // Call Hook formConfirm
+ $parameters = array('lineid' => $lineid);
+ // Note that $action and $object may be modified by hook
+ $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action);
+ if (empty($reshook)) $formconfirm.=$hookmanager->resPrint;
+ elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint;
+
+ // Print form confirm
+ print $formconfirm;
// Supplier order card
@@ -493,6 +623,9 @@ if ($id > 0 || !empty($ref)) {
require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
$formproduct = new FormProduct($db);
$formproduct->loadWarehouses();
+ $entrepot = new Entrepot($db);
+ $listwarehouses=$entrepot->list_array(1);
+
if (empty($conf->reception->enabled))print '
".$langs->trans("ErrorOccurredReviseAndRetry")."
"; print ''; - } - else - { + } else { $textinput_size = "50"; // Webservice url print '
".$langs->trans("ErrorOccurredReviseAndRetry")."
"; - } - else - { + } else { print ''; print ' '; } diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php index 7ff0dd1c85a..b3d2e3aa664 100644 --- a/htdocs/fourn/commande/contact.php +++ b/htdocs/fourn/commande/contact.php @@ -65,16 +65,12 @@ if ($action == 'addcontact' && $user->rights->fournisseur->commande->creer) { header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); exit; - } - else - { + } else { if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') { $langs->load("errors"); setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors'); - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } @@ -86,9 +82,7 @@ elseif ($action == 'swapstatut' && $user->rights->fournisseur->commande->creer) if ($object->fetch($id)) { $result = $object->swapContactStatus(GETPOST('ligne')); - } - else - { + } else { dol_print_error($db); } } @@ -103,8 +97,7 @@ elseif ($action == 'deletecontact' && $user->rights->fournisseur->commande->cree { header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); exit; - } - else { + } else { dol_print_error($db); } } @@ -193,9 +186,7 @@ if ($id > 0 || !empty($ref)) // Contacts lines include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php'; - } - else - { + } else { // Contact not found print "ErrorRecordNotFound"; } diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php index d132a87233f..d7ad3785338 100644 --- a/htdocs/fourn/commande/dispatch.php +++ b/htdocs/fourn/commande/dispatch.php @@ -8,7 +8,7 @@ * Copyright (C) 2016 Florian Henry
"; -} -else -{ +} else { dol_print_error($db); } @@ -226,9 +224,7 @@ if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_T $sql .= " WHERE ((ug.fk_user = u.rowid"; $sql .= " AND ug.entity IN (".getEntity('usergroup')."))"; $sql .= " OR u.entity = 0)"; // Show always superadmin -} -else -{ +} else { $sql .= " WHERE (u.entity IN (".getEntity('user')."))"; } $sql .= " AND u.fk_soc IS NULL"; // An external user can not approved @@ -269,9 +265,7 @@ if ($resql) } print "
"; $db->free($resql); -} -else -{ +} else { dol_print_error($db); } @@ -344,8 +338,7 @@ if ($resql) } } print "
"; -} -else dol_print_error($db); +} else dol_print_error($db); /* diff --git a/htdocs/fourn/commande/info.php b/htdocs/fourn/commande/info.php index f41e9e3fece..195e87e5b5d 100644 --- a/htdocs/fourn/commande/info.php +++ b/htdocs/fourn/commande/info.php @@ -55,9 +55,7 @@ if (GETPOST('actioncode', 'array')) { $actioncode = GETPOST('actioncode', 'array', 3); if (!count($actioncode)) $actioncode = '0'; -} -else -{ +} else { $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECTS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECTS)); } $search_agenda_label = GETPOST('search_agenda_label'); @@ -196,9 +194,7 @@ if (!empty($conf->agenda->enabled)) if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) { print ''.$langs->trans("AddAction").''; - } - else - { + } else { print ''.$langs->trans("AddAction").''; } } diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php index acd79212052..8ffc6be6c05 100644 --- a/htdocs/fourn/commande/list.php +++ b/htdocs/fourn/commande/list.php @@ -335,16 +335,12 @@ if (empty($reshook)) { $result = $object->insert_discount($discountid); //$result=$discount->link_to_invoice($lineid,$id); - } - else - { + } else { setEventMessages($discount->error, $discount->errors, 'errors'); $error++; break; } - } - else - { + } else { // Positive line $product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0); // Date start @@ -391,9 +387,7 @@ if (empty($reshook)) if ($result > 0) { $lineid = $result; - } - else - { + } else { $lineid = 0; $error++; break; @@ -447,9 +441,7 @@ if (empty($reshook)) { $db->commit(); setEventMessages($langs->trans('BillCreated', $nb_bills_created), null, 'mesgs'); - } - else - { + } else { $db->rollback(); $action = 'create'; $_GET["origin"] = $_POST["origin"]; @@ -596,9 +588,7 @@ if ($resql) $soc = new Societe($db); $soc->fetch($socid); $title = $langs->trans('ListOfSupplierOrders').' - '.$soc->name; - } - else - { + } else { $title = $langs->trans('ListOfSupplierOrders'); } @@ -1261,9 +1251,7 @@ if ($resql) $delallowed = $user->rights->fournisseur->commande->creer; print $formfile->showdocuments('massfilesarea_supplier_order', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty); -} -else -{ +} else { dol_print_error($db); } diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php index 87effcd5863..53efd68faa6 100644 --- a/htdocs/fourn/commande/note.php +++ b/htdocs/fourn/commande/note.php @@ -145,9 +145,7 @@ if ($id > 0 || !empty($ref)) print '
';
$tmp = ' ';
$text = $tmp.$langs->trans("InvoiceAvoir").' ';
@@ -2221,9 +2160,7 @@ if ($action == 'create')
print '';
}
-}
-else
-{
+} else {
if ($id > 0 || !empty($ref))
{
/* *************************************************************************** */
@@ -2316,9 +2253,7 @@ else
{
$savdate = $object->date;
$numref = $object->getNextNumRef($societe);
- }
- else
- {
+ } else {
$numref = $object->ref;
}
@@ -2336,9 +2271,7 @@ else
if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
{
$qualified_for_stock_change = $object->hasProductsOrServices(2);
- }
- else
- {
+ } else {
$qualified_for_stock_change = $object->hasProductsOrServices(1);
}
@@ -2373,9 +2306,7 @@ else
if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
{
$qualified_for_stock_change = $object->hasProductsOrServices(2);
- }
- else
- {
+ } else {
$qualified_for_stock_change = $object->hasProductsOrServices(1);
}
if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change)
@@ -2439,8 +2370,8 @@ else
$morehtmlref = '';
+
+ $result .= '';
+ $result .= '';
+ $result .= '
';
+ $result .= ' ';
+
+ $result .= ''.$companystatic->getNomUrl(1, 'supplier').' ';
+ $result .= ''.dol_print_date($db->jdate($obj->datec), 'day').' ';
+ $result .= ''.$objectstatic->getLibStatut(5).' ';
+
+ $result .= ' ';
+
+ $i++;
+ }
+
+ $result .= '';
+ $result .= '
';
+ return $result;
+}
+
+/**
+ * Return a HTML table that contains a list with open (unpaid) supplier invoices
+ *
+ * @param int $maxCount (Optional) The maximum count of elements inside the table
+ * @param int $socid (Optional) Show only results from the supplier with this id
+ * @return string A HTML table that conatins a list with open (unpaid) supplier invoices
+ */
+function getOpenTable($maxCount = 500, $socid = 0)
+{
+ global $conf, $db, $langs, $user;
+
+ $sql = "SELECT s.nom as socname, s.rowid as socid, s.canvas, s.client";
+ $sql .= ", f.rowid as id, f.entity, f.total_ttc, f.total_ht, f.ref, f.fk_statut";
+ $sql .= ", f.datef as df, f.date_lim_reglement as datelimite";
+ $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+ $sql .= ", ".MAIN_DB_PREFIX."facture_fourn as f";
+ if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ $sql .= " WHERE f.fk_soc = s.rowid";
+ $sql .= " AND f.entity IN (".getEntity('facture_fourn').")";
+ $sql .= " AND f.fk_statut = ".FactureFournisseur::STATUS_VALIDATED;
+ if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+ if ($socid) $sql .= " AND s.rowid = ".$socid;
+ $sql .= " ORDER BY f.rowid DESC";
+ $sql .= $db->plimit($maxCount, 0);
+
+ $resql = $db->query($sql);
+ if (!$resql)
+ {
+ dol_print_error($db);
+ return '';
+ }
+
+ $num = $db->num_rows($resql);
+
+ $result = '';
// Ref supplier
- $morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->fournisseur->facture->creer, 'string', '', 0, 1);
- $morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->fournisseur->facture->creer, 'string', '', null, null, '', 1);
+ $morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', 0, 1);
+ $morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', null, null, '', 1);
// Thirdparty
$morehtmlref .= '
'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1); if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' ('.$langs->trans("OtherBills").')'; @@ -2449,7 +2380,7 @@ else { $langs->load("projects"); $morehtmlref .= '
'.$langs->trans('Project').' '; - if ($user->rights->fournisseur->facture->creer) + if ($usercancreate) { if ($action != 'classify') { $morehtmlref .= ''.img_edit($langs->transnoentitiesnoconv('SetProject')).' : '; @@ -2549,11 +2480,11 @@ else // Label print '';
- print ''.$form->editfieldkey("Label", 'label', $object->label, $object, ($user->rights->fournisseur->facture->creer)).' ';
- print ''.$form->editfieldval("Label", 'label', $object->label, $object, ($user->rights->fournisseur->facture->creer)).' ';
+ print ''.$form->editfieldkey("Label", 'label', $object->label, $object, ($usercancreate)).' ';
+ print ''.$form->editfieldval("Label", 'label', $object->label, $object, ($usercancreate)).' ';
print ' ';
- $form_permission = ($object->statut < FactureFournisseur::STATUS_CLOSED) && $user->rights->fournisseur->facture->creer && ($object->getSommePaiement() <= 0);
+ $form_permission = ($object->statut < FactureFournisseur::STATUS_CLOSED) && $usercancreate && ($object->getSommePaiement() <= 0);
// Date
print ''.$form->editfieldkey("DateInvoice", 'datef', $object->datep, $object, $form_permission, 'datepicker').' ';
@@ -2574,7 +2505,7 @@ else
print '
';
@@ -2582,9 +2513,7 @@ else
if ($action == 'editconditions')
{
$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'cond_reglement_id');
- }
- else
- {
+ } else {
$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none');
}
print " ";
@@ -2596,7 +2525,7 @@ else
print '
';
@@ -2604,9 +2533,7 @@ else
if ($action == 'editmode')
{
$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'DBIT', 1, 1);
- }
- else
- {
+ } else {
$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none');
}
print '
';
print '';
@@ -2684,7 +2611,7 @@ else
print '
';
print ' ';
@@ -2692,9 +2619,7 @@ else
if ($action != 'editincoterm')
{
print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
- }
- else
- {
+ } else {
print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
}
print '';
@@ -2737,7 +2662,7 @@ else
if (GETPOST('calculationrule')) $calculationrule = GETPOST('calculationrule', 'alpha');
else $calculationrule = (empty($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND) ? 'totalofround' : 'roundoftotal');
if ($calculationrule == 'totalofround') $calculationrulenum = 1;
- else $calculationrulenum = 2;
+ else $calculationrulenum = 2;
// Show link for "recalculate"
if ($object->getVentilExportCompta() == 0) {
$s = $langs->trans("ReCalculate").' ';
@@ -2866,9 +2791,7 @@ else
$totalpaye += $objp->amount;
$i++;
}
- }
- else
- {
+ } else {
print ''.$langs->trans("None").' ';
if ($object->type != FactureFournisseur::TYPE_DEPOSIT)
print $langs->trans('AlreadyPaidNoCreditNotesNoDeposits');
- else
- print $langs->trans('AlreadyPaid');
+ else print $langs->trans('AlreadyPaid');
print ' : 0) ? ' class="amountalreadypaid"' : '').'>'.price($totalpaye).' ';
if ($resteapayeraffiche >= 0)
print $langs->trans('RemainderToPay');
- else
- print $langs->trans('ExcessPaid');
+ else print $langs->trans('ExcessPaid');
print ' : ';
print ''.price($resteapayeraffiche).' ';
print ' ';
if ($resteapayeraffiche <= 0)
print $langs->trans('RemainderToPayBack');
- else
- print $langs->trans('ExcessPaid');
+ else print $langs->trans('ExcessPaid');
print ' : ';
print ''.price($sign * $resteapayeraffiche).' ';
print ' ';
+ $result .= ''.$objectstatic->getNomUrl(1).' ';
+ $result .= ''.$companystatic->getNomUrl(1, 'supplier', 24).' ';
+ $result .= ''.price($obj->total_ttc).' ';
+ $result .= ' ';
+
+ $i++;
+ $total += $obj->total_ttc;
+ }
+
+ if ($num > $nbofloop)
+ {
+ $result .= '';
+ $result .= ''.$langs->trans("XMoreLines", ($num - $nbofloop)).' ';
+ $result .= ' ';
+ }
+ elseif ($total > 0)
+ {
+ $result .= '';
+ $result .= ''.$langs->trans("Total").' ';
+ $result .= ''.price($total).' ';
+ $result .= ' ';
+ }
+
+ $result .= '';
+ $result .= '
';
+ return $result;
+}
+
+/**
+ * Return a HTML table that contains a list with latest edited supplier invoices
+ *
+ * @param int $maxCount (Optional) The maximum count of elements inside the table
+ * @param int $socid (Optional) Show only results from the supplier with this id
+ * @return string A HTML table that contains a list with latest edited supplier invoices
+ */
+function getLatestEditTable($maxCount = 5, $socid = 0)
+{
+ global $conf, $db, $langs, $user;
+
+ $sql = "SELECT f.rowid, f.entity, f.ref, f.fk_statut as status, f.paye, s.nom as socname, s.rowid as socid, s.canvas, s.client,";
+ $sql .= " f.datec";
+ $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
+ $sql .= ", ".MAIN_DB_PREFIX."societe as s";
+ if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ $sql .= " WHERE f.fk_soc = s.rowid";
+ $sql .= " AND f.entity IN (".getEntity('facture_fourn').")";
+ if ($socid) $sql .= " AND f.fk_soc = ".$socid;
+ if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+ $sql .= " ORDER BY f.tms DESC";
+ $sql .= $db->plimit($maxCount, 0);
+
+ $resql = $db->query($sql);
+ if (!$resql)
+ {
+ dol_print_error($db);
+ return '';
+ }
+
+ $num = $db->num_rows($resql);
+
+ $result = ''.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1); if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' ('.$langs->trans("OtherBills").')'; @@ -2449,7 +2380,7 @@ else { $langs->load("projects"); $morehtmlref .= '
'.$langs->trans('Project').' '; - if ($user->rights->fournisseur->facture->creer) + if ($usercancreate) { if ($action != 'classify') { $morehtmlref .= ''.img_edit($langs->transnoentitiesnoconv('SetProject')).' : '; @@ -2549,11 +2480,11 @@ else // Label print '
| '; print $langs->trans('PaymentConditions'); print ' | '; - if ($action != 'editconditions' && $user->rights->fournisseur->facture->creer) { + if ($action != 'editconditions' && $usercancreate) { print ' | id.'">'.img_edit($langs->trans('SetConditions'), 1).' | '; } print '
| '; print $langs->trans('PaymentMode'); print ' | '; - if ($action != 'editmode' && $user->rights->fournisseur->facture->creer) { + if ($action != 'editmode' && $usercancreate) { print 'id.'">'.img_edit($langs->trans('SetMode'), 1).' | '; } print '
| '; print $langs->trans('BankAccount'); print ' | '; - if ($action != 'editbankaccount' && $user->rights->fournisseur->facture->creer) + if ($action != 'editbankaccount' && $usercancreate) print ' | id.'">'.img_edit($langs->trans('SetBankAccount'), 1).' | '; print '
| '; print $langs->trans('IncotermLabel'); print ' | '; - if ($user->rights->fournisseur->facture->creer) print ''.img_edit().''; + if ($usercancreate) print ''.img_edit().''; else print ' '; print ' |
'.$langs->trans('Modify').'
';
}
}
@@ -3133,13 +3048,11 @@ else
|| ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE && empty($discount->id)))
&& ($object->statut == FactureFournisseur::STATUS_CLOSED || $object->statut == FactureFournisseur::STATUS_ABANDONED)) // A paid invoice (partially or completely)
{
- if (!$facidnext && $object->close_code != 'replaced' && $user->rights->fournisseur->facture->creer) // Not replaced by another invoice
+ if (!$facidnext && $object->close_code != 'replaced' && $usercancreate) // Not replaced by another invoice
{
print '';
- }
- else
- {
- if ($user->rights->fournisseur->facture->creer) {
+ } else {
+ if ($usercancreate) {
print ''.$langs->trans('ReOpen').'
';
} elseif (empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) {
print ''.$langs->trans('ReOpen').'
';
@@ -3151,11 +3064,10 @@ else
if (empty($user->socid)) {
if (($object->statut == FactureFournisseur::STATUS_VALIDATED || $object->statut == FactureFournisseur::STATUS_CLOSED))
{
- if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->fournisseur->supplier_invoice_advance->send)
+ if ($usercansend)
{
print '';
- }
- else print ''.$langs->trans('SendMail').'
';
+ } else print ''.$langs->trans('SendMail').'
';
}
}
@@ -3182,26 +3094,24 @@ else
if ($resteapayer == 0)
{
print ''.$langs->trans('DoPaymentBack').'
';
- }
- else
- {
+ } else {
print '';
}
}
// For standard invoice with excess paid
- if ($object->type == FactureFournisseur::TYPE_STANDARD && empty($object->paye) && ($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits) < 0 && $user->rights->fournisseur->facture->creer && empty($discount->id))
+ if ($object->type == FactureFournisseur::TYPE_STANDARD && empty($object->paye) && ($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits) < 0 && $usercancreate && empty($discount->id))
{
print '';
}
// For credit note
- if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE && $object->statut == 1 && $object->paye == 0 && $user->rights->fournisseur->facture->creer
+ if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE && $object->statut == 1 && $object->paye == 0 && $usercancreate
&& (!empty($conf->global->SUPPLIER_INVOICE_ALLOW_REUSE_OF_CREDIT_WHEN_PARTIALLY_REFUNDED) || $object->getSommePaiement() == 0)
) {
print '';
}
// For deposit invoice
- if ($object->type == FactureFournisseur::TYPE_DEPOSIT && $object->paye == 1 && $resteapayer == 0 && $user->rights->fournisseur->facture->creer && empty($discount->id))
+ if ($object->type == FactureFournisseur::TYPE_DEPOSIT && $object->paye == 1 && $resteapayer == 0 && $usercancreate && empty($discount->id))
{
print '';
}
@@ -3212,14 +3122,11 @@ else
{
if (count($object->lines))
{
- if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->facture->creer))
- || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->supplier_invoice_advance->validate)))
+ if ($usercanvalidate)
{
print '';
- }
- else
- {
+ } else {
print '';
}
@@ -3233,13 +3140,13 @@ else
}*/
// Clone
- if ($action != 'edit' && $user->rights->fournisseur->facture->creer)
+ if ($action != 'edit' && $usercancreate)
{
print '';
}
// Create a credit note
- if (($object->type == FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_DEPOSIT) && $object->statut > 0 && $user->rights->fournisseur->facture->creer)
+ if (($object->type == FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_DEPOSIT) && $object->statut > 0 && $usercancreate)
{
if (!$objectidnext)
{
@@ -3249,27 +3156,21 @@ else
// Delete
$isErasable = $object->is_erasable();
- if ($action != 'confirm_edit' && ($user->rights->fournisseur->facture->supprimer || ($user->rights->fournisseur->facture->creer && $isErasable == 1))) // isErasable = 1 means draft with temporary ref (draft can always be deleted with no need of permissions)
+ if ($action != 'confirm_edit' && ($user->rights->fournisseur->facture->supprimer || ($usercancreate && $isErasable == 1))) // isErasable = 1 means draft with temporary ref (draft can always be deleted with no need of permissions)
{
//var_dump($isErasable);
if ($isErasable == -4) {
print '';
- }
- elseif ($isErasable == -3) { // Should never happen with supplier invoice
+ } elseif ($isErasable == -3) { // Should never happen with supplier invoice
print '';
- }
- elseif ($isErasable == -2) { // Should never happen with supplier invoice
+ } elseif ($isErasable == -2) { // Should never happen with supplier invoice
print '';
- }
- elseif ($isErasable == -1) {
+ } elseif ($isErasable == -1) {
print '';
- }
- elseif ($isErasable <= 0) // Any other cases
+ } elseif ($isErasable <= 0) // Any other cases
{
print '';
- }
- else
- {
+ } else {
print '';
}
}
@@ -3286,8 +3187,8 @@ else
$subdir = get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').$ref;
$filedir = $conf->fournisseur->facture->dir_output.'/'.$subdir;
$urlsource = $_SERVER['PHP_SELF'].'?id='.$object->id;
- $genallowed = $user->rights->fournisseur->facture->lire;
- $delallowed = $user->rights->fournisseur->facture->creer;
+ $genallowed = $usercanread;
+ $delallowed = $usercancreate;
$modelpdf = (!empty($object->modelpdf) ? $object->modelpdf : (empty($conf->global->INVOICE_SUPPLIER_ADDON_PDF) ? '' : $conf->global->INVOICE_SUPPLIER_ADDON_PDF));
print $formfile->showdocuments('facture_fournisseur', $subdir, $filedir, $urlsource, $genallowed, $delallowed, $modelpdf, 1, 0, 0, 40, 0, '', '', '', $societe->default_lang);
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index ebe3573bd99..5cd1043de8f 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -65,16 +65,12 @@ if ($action == 'addcontact' && $user->rights->fournisseur->facture->creer)
{
header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit;
- }
- else
- {
+ } else {
if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
{
$langs->load("errors");
setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
- }
- else
- {
+ } else {
setEventMessages($object->error, $object->errors, 'errors');
}
}
@@ -86,9 +82,7 @@ elseif ($action == 'swapstatut' && $user->rights->fournisseur->facture->creer)
if ($object->fetch($id))
{
$result = $object->swapContactStatus(GETPOST('ligne'));
- }
- else
- {
+ } else {
dol_print_error($db);
}
}
@@ -103,8 +97,7 @@ elseif ($action == 'deletecontact' && $user->rights->fournisseur->facture->creer
{
header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit;
- }
- else {
+ } else {
dol_print_error($db);
}
}
@@ -267,9 +260,7 @@ if ($id > 0 || !empty($ref))
// Contacts lines
include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php';
- }
- else
- {
+ } else {
print "ErrorRecordNotFound";
}
}
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 022028bb483..3b06f1276d6 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -253,9 +253,7 @@ if ($object->id > 0)
$permtoedit = $user->rights->fournisseur->facture->creer;
$param = '&facid='.$object->id;
include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
print $langs->trans('ErrorUnknown');
}
diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php
index 5368b491728..b37de34301d 100644
--- a/htdocs/fourn/facture/impayees.php
+++ b/htdocs/fourn/facture/impayees.php
@@ -290,9 +290,7 @@ if ($user->rights->fournisseur->facture->lire)
print '';
$db->free($resql);
- }
- else
- {
+ } else {
dol_print_error($db);
}
}
diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php
new file mode 100644
index 00000000000..df32ee1b19a
--- /dev/null
+++ b/htdocs/fourn/facture/index.php
@@ -0,0 +1,535 @@
+
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see ';
+
+print '
';
+
+// End of page
+llxFooter();
+$db->close();
+
+/**
+ * Return a HTML string that contains a additional search form
+ *
+ * @return string A HTML string that contains a additional search form
+ */
+function getAreaSearchFrom()
+{
+ global $langs;
+
+ $result = '";
+
+ return $result;
+}
+
+/**
+ * Return a HTML table that contains a pie chart of supplier invoices
+ *
+ * @param int $socid (Optional) Show only results from the supplier with this id
+ * @return string A HTML table that contains a pie chart of supplier invoices
+ */
+function getPieChart($socid = 0)
+{
+ global $conf, $db, $langs, $user;
+
+ $sql = "SELECT count(f.rowid), f.fk_statut";
+ $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+ $sql .= ", ".MAIN_DB_PREFIX."facture_fourn as f";
+ if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ $sql .= " WHERE f.fk_soc = s.rowid";
+ $sql .= " AND f.entity IN (".getEntity('facture_fourn').")";
+ if ($user->socid) $sql .= ' AND f.fk_soc = '.$user->socid;
+ if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+ $sql .= " GROUP BY f.fk_statut";
+
+ $resql = $db->query($sql);
+ if (!$resql)
+ {
+ dol_print_error($db);
+ return '';
+ }
+
+ $num = $db->num_rows($resql);
+ $i = 0;
+
+ $total = 0;
+ $vals = [];
+
+ while ($i < $num)
+ {
+ $row = $db->fetch_row($resql);
+ if ($row)
+ {
+ $vals[$row[1]] = $row[0];
+ $total += $row[0];
+ }
+
+ $i++;
+ }
+
+ $db->free($resql);
+
+ $result = '';
+
+// This is useless due to the global search combo
+if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))
+{
+ print getAreaSearchFrom();
+ print '
'; +} + +print getPieChart($socid); +print '
'; +print getDraftTable($maxDraftCount, $socid); + +print '
';
+
+print ''; +} + +print getPieChart($socid); +print '
'; +print getDraftTable($maxDraftCount, $socid); + +print '
';
+print '
';
+
+print '';
+
+print getLatestEditTable($maxLatestEditCount, $socid);
+print '
'; +print getOpenTable($maxOpenCount, $socid); + +print '
';
+print ''; +print getOpenTable($maxOpenCount, $socid); + +print '
';
+ $result .= '';
+
+ $result .= '
';
+ $result .= '
';
+
+ return $result;
+}
+
+/**
+ * Return a HTML table that contains a list with supplier invoice drafts
+ *
+ * @param int $maxCount (Optional) The maximum count of elements inside the table
+ * @param int $socid (Optional) Show only results from the supplier with this id
+ * @return string A HTML table that contains a list with supplier invoice drafts
+ */
+function getDraftTable($maxCount = 500, $socid = 0)
+{
+ global $db, $langs, $user;
+
+ $sql = "SELECT f.rowid, f.ref, s.nom as socname, s.rowid as socid, s.canvas, s.client, f.total_ttc";
+ $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
+ $sql .= ", ".MAIN_DB_PREFIX."societe as s";
+ if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ $sql .= " WHERE f.fk_soc = s.rowid";
+ $sql .= " AND f.entity IN (".getEntity('facture_fourn').")";
+ $sql .= " AND f.fk_statut = ".FactureFournisseur::STATUS_DRAFT;
+ if ($socid) $sql .= " AND f.fk_soc = ".$socid;
+ if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+ $sql .= $db->plimit($maxCount, 0);
+
+ $resql = $db->query($sql);
+ if (!$resql)
+ {
+ dol_print_error($db);
+ return '';
+ }
+
+ $num = $db->num_rows($resql);
+
+ $result = '| '.$langs->trans("Statistics").' - '.$langs->trans("SupplierInvoice").' | '; + $result .= '|
| '.$objectstatic->getLibStatut(0).' | '; + $result .= ''.(isset($vals[$status]) ? $vals[$status] : 0).' | '; + $result .= '
| '.$dolgraph->show($total ? 0 : 1).' | '; + $result .= '|
| '.$langs->trans("Total").' | '; + $result .= ''.$total.' | '; + $result .= '
';
+ $result .= '';
+
+ $result .= '
';
+ $result .= '
';
+ return $result;
+ }
+
+ $objectstatic = new FactureFournisseur($db);
+ $companystatic = new Societe($db);
+ $nbofloop = min($num, $maxCount);
+ $total = 0;
+ $i = 0;
+
+ while ($i < $nbofloop)
+ {
+ $obj = $db->fetch_object($resql);
+
+ $objectstatic->id = $obj->rowid;
+ $objectstatic->ref = $obj->ref;
+
+ $companystatic->id = $obj->socid;
+ $companystatic->name = $obj->socname;
+ $companystatic->client = $obj->client;
+ $companystatic->canvas = $obj->canvas;
+
+ $result .= '| '; + $result .= $langs->trans("SuppliersDraftInvoices"); + $result .= ' '; + $result .= ''.$num.''; + $result .= ''; + $result .= ' | '; + $result .= '
';
+ $result .= '';
+ $result .= '
';
+ $result .= '
';
+ return $result;
+ }
+
+ $objectstatic = new FactureFournisseur($db);
+ $companystatic = new Societe($db);
+ $formfile = new FormFile($db);
+ $i = 0;
+
+ while ($i < $num)
+ {
+ $obj = $db->fetch_object($resql);
+
+ $objectstatic->id = $obj->rowid;
+ $objectstatic->ref = $obj->ref;
+ $objectstatic->paye = $obj->paye;
+ $objectstatic->statut = $obj->status;
+
+ $companystatic->id = $obj->socid;
+ $companystatic->name = $obj->socname;
+ $companystatic->client = $obj->client;
+ $companystatic->canvas = $obj->canvas;
+
+ $filename = dol_sanitizeFileName($obj->ref);
+ $filedir = $conf->propal->multidir_output[$obj->entity].'/'.$filename;
+
+ $result .= '| '.$langs->trans("BoxTitleLastSupplierBills", $maxCount).' | '; + $result .= '
| '.$objectstatic->getNomUrl(1).' | '; + $result .= ''; + $result .= ' | '.$formfile->getDocumentsLink($objectstatic->element, $filename, $filedir).' | '; + + $result .= '
';
+ $result .= '';
+ $result .= '
';
+ $result .= '
';
+ return $result;
+ }
+
+ $objectstatic = new FactureFournisseur($db);
+ $companystatic = new Societe($db);
+ $formfile = new FormFile($db);
+ $nbofloop = min($num, $maxCount);
+ $now = dol_now();
+ $total = 0;
+ $i = 0;
+
+ while ($i < $nbofloop)
+ {
+ $obj = $db->fetch_object($resql);
+
+ $objectstatic->id = $obj->id;
+ $objectstatic->ref = $obj->ref;
+
+ $companystatic->id = $obj->socid;
+ $companystatic->name = $obj->socname;
+ $companystatic->client = $obj->client;
+ $companystatic->canvas = $obj->canvas;
+
+ $filename = dol_sanitizeFileName($obj->ref);
+ $filedir = $conf->propal->multidir_output[$obj->entity].'/'.$filename;
+
+ $result .= '| '; + $result .= $langs->trans("BillsCustomersUnpaid"); + $result .= ' '; + $result .= ''.$num.''; + $result .= ''; + $result .= ' | '; + $result .= '
| '.$objectstatic->getNomUrl(1).' | '; + $result .= ''; + + if ($db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) + { + $result .= img_warning($langs->trans("Late")); + } + + $result .= ' | '; + + $result .= ''.$formfile->getDocumentsLink($objectstatic->element, $filename, $filedir).' | '; + + $result .= '
\n"; $db->free($resql); -} -else -{ +} else { dol_print_error($db); } @@ -210,9 +208,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU print "
\n"; } $db->free($resql); - } - else - { + } else { dol_print_error($db); } } @@ -264,9 +260,7 @@ if ($resql) print "\n"; $db->free($resql); -} -else -{ +} else { dol_print_error($db); } diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php index 09ed7acc1e4..a93d093022c 100644 --- a/htdocs/fourn/paiement/card.php +++ b/htdocs/fourn/paiement/card.php @@ -59,9 +59,7 @@ if ($action == 'setnote' && $user->rights->fournisseur->facture->creer) { $db->commit(); $action = ''; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); $db->rollback(); } @@ -78,9 +76,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->fournisse $db->commit(); header('Location: '.DOL_URL_ROOT.'/fourn/facture/paiement.php'); exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); $db->rollback(); } @@ -99,9 +95,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $db->commit(); header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); $db->rollback(); } @@ -114,9 +108,7 @@ if ($action == 'setnum_paiement' && !empty($_POST['num_paiement'])) if ($res === 0) { setEventMessages($langs->trans('PaymentNumberUpdateSucceeded'), null, 'mesgs'); - } - else - { + } else { setEventMessages($langs->trans('PaymentNumberUpdateFailed'), null, 'errors'); } } @@ -129,9 +121,7 @@ if ($action == 'setdatep' && !empty($_POST['datepday'])) if ($res === 0) { setEventMessages($langs->trans('PaymentDateUpdateSucceeded'), null, 'mesgs'); - } - else - { + } else { setEventMessages($langs->trans('PaymentDateUpdateFailed'), null, 'errors'); } } @@ -326,9 +316,7 @@ if ($result > 0) print "\n"; $db->free($resql); - } - else - { + } else { dol_print_error($db); } @@ -358,9 +346,7 @@ if ($result > 0) if ($allow_delete) { print ''.$langs->trans('Delete').''; - } - else - { + } else { print ''.$langs->trans('Delete').''; } } @@ -397,9 +383,7 @@ if ($result > 0) */ print ''; -} -else -{ +} else { $langs->load("errors"); print $langs->trans("ErrorRecordNotFound"); } diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php index 5e83ae93923..91cd3636bbe 100644 --- a/htdocs/fourn/product/list.php +++ b/htdocs/fourn/product/list.php @@ -331,9 +331,7 @@ if ($resql) print ""; print ''; -} -else -{ +} else { dol_print_error($db); } diff --git a/htdocs/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php index 8cda5a20d98..540ed1cbc18 100644 --- a/htdocs/fourn/recap-fourn.php +++ b/htdocs/fourn/recap-fourn.php @@ -173,23 +173,17 @@ if ($socid > 0) } $db->free($resqlp); - } - else - { + } else { dol_print_error($db); } } - } - else - { + } else { dol_print_error($db); } print ""; } -} -else -{ +} else { dol_print_error($db); } diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php index 39f5cc61bd2..49af7141d84 100644 --- a/htdocs/ftp/admin/ftpclient.php +++ b/htdocs/ftp/admin/ftpclient.php @@ -50,9 +50,7 @@ if ($result) $obj = $db->fetch_object($result); preg_match('/([0-9]+)$/i', $obj->name, $reg); if ($reg[1]) $lastftpentry = $reg[1]; -} -else -{ +} else { dol_print_error($db); } @@ -96,9 +94,7 @@ if ($action == 'add' || GETPOST('modify', 'alpha')) $db->commit(); header("Location: ".$_SERVER["PHP_SELF"]); exit; - } - else - { + } else { $db->rollback(); dol_print_error($db); } @@ -123,9 +119,7 @@ if (GETPOST('delete', 'alpha')) $db->commit(); header("Location: ".$_SERVER["PHP_SELF"]); exit; - } - else - { + } else { $db->rollback(); dol_print_error($db); } @@ -148,9 +142,7 @@ print '
'; if (!function_exists('ftp_connect')) { print $langs->trans("FTPFeatureNotSupportedByYourPHP"); -} -else -{ +} else { // Formulaire ajout print '"; - } - else - { + } else { $foundsetup = false; $MAXFTP = 20; $i = 1; @@ -655,9 +622,7 @@ else if (!$foundsetup) { print $langs->trans("SetupOfFTPClientModuleNotComplete"); - } - else - { + } else { print $langs->trans("ChooseAFTPEntryIntoMenu"); } } @@ -670,13 +635,10 @@ if ($conn_id) { if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) { - } - elseif (!empty($conf->global->FTP_CONNECT_WITH_SSL)) + } elseif (!empty($conf->global->FTP_CONNECT_WITH_SSL)) { ftp_close($conn_id); - } - else - { + } else { ftp_close($conn_id); } } @@ -718,14 +680,11 @@ function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $sect { dol_syslog('Try to connect with ssh2_ftp'); $tmp_conn_id = ssh2_connect($ftp_server, $ftp_port); - } - elseif (!empty($conf->global->FTP_CONNECT_WITH_SSL)) + } elseif (!empty($conf->global->FTP_CONNECT_WITH_SSL)) { dol_syslog('Try to connect with ftp_ssl_connect'); $conn_id = ftp_ssl_connect($ftp_server, $ftp_port, $connecttimeout); - } - else - { + } else { dol_syslog('Try to connect with ftp_connect'); $conn_id = ftp_connect($ftp_server, $ftp_port, $connecttimeout); } @@ -750,16 +709,12 @@ function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $sect $ok = 0; $error++; } - } - else - { + } else { $mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials"); $ok = 0; $error++; } - } - else - { + } else { if (ftp_login($conn_id, $ftp_user, $ftp_password)) { // Turn on passive mode transfers (must be after a successful login @@ -768,18 +723,14 @@ function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $sect // Change the dir $newsectioniso = utf8_decode($section); ftp_chdir($conn_id, $newsectioniso); - } - else - { + } else { $mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials"); $ok = 0; $error++; } } } - } - else - { + } else { dol_syslog('FailedToConnectToFTPServer '.$ftp_server.' '.$ftp_port, LOG_ERR); $mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServer", $ftp_server, $ftp_port); $ok = 0; @@ -804,9 +755,7 @@ function ftp_isdir($connect_id, $dir) { ftp_cdup($connect_id); return 1; - } - else - { + } else { return 0; } } diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php index c5554a40fb1..6e639370aa9 100644 --- a/htdocs/holiday/card.php +++ b/htdocs/holiday/card.php @@ -228,9 +228,7 @@ if (empty($reshook)) header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id); exit; - } - else - { + } else { $db->rollback(); } } @@ -252,9 +250,7 @@ if (empty($reshook)) { setEventMessages($object->error, $object->errors, 'warnings'); $action = 'editvalidator'; - } - else - { + } else { header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id); exit; } @@ -339,21 +335,15 @@ if (empty($reshook)) { setEventMessages($object->error, $object->errors, 'warnings'); $action = 'edit'; - } - else - { + } else { header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id); exit; } - } - else - { + } else { setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors'); $action = ''; } - } - else - { + } else { setEventMessages($langs->trans("ErrorBadStatus"), null, 'errors'); $action = ''; } @@ -375,9 +365,7 @@ if (empty($reshook)) if ($candelete) { $result = $object->delete($user); - } - else - { + } else { $error++; setEventMessages($langs->trans('ErrorCantDeleteCP'), null, 'errors'); $action = ''; @@ -389,9 +377,7 @@ if (empty($reshook)) $db->commit(); header('Location: list.php?restore_lastsearch_values=1'); exit; - } - else - { + } else { $db->rollback(); } } @@ -484,15 +470,11 @@ if (empty($reshook)) { setEventMessages($mail->error, $mail->errors, 'warnings'); $action = ''; - } - else - { + } else { header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id); exit; } - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); $action = ''; } @@ -580,9 +562,7 @@ if (empty($reshook)) if (!$emailTo) { dol_syslog("User that request leave has no email, so we redirect directly to finished page without sending email"); - } - else - { + } else { // From $expediteur = new User($db); $expediteur->fetch($object->fk_validator); @@ -625,9 +605,7 @@ if (empty($reshook)) header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id); exit; - } - else - { + } else { $db->rollback(); $action = ''; } @@ -668,9 +646,7 @@ if (empty($reshook)) if (!$emailTo) { dol_syslog("User that request leave has no email, so we redirect directly to finished page without sending email"); - } - else - { + } else { // From $expediteur = new User($db); $expediteur->fetch($object->fk_validator); @@ -706,9 +682,7 @@ if (empty($reshook)) $action = ''; } } - } - else - { + } else { $action = ''; } @@ -718,9 +692,7 @@ if (empty($reshook)) header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id); exit; - } - else - { + } else { $db->rollback(); $action = ''; } @@ -755,9 +727,7 @@ if (empty($reshook)) header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id); exit; - } - else - { + } else { $db->rollback(); } } @@ -805,9 +775,7 @@ if (empty($reshook)) if (!$error) { $db->commit(); - } - else - { + } else { $db->rollback(); } @@ -857,9 +825,7 @@ if (empty($reshook)) { setEventMessages($mail->error, $mail->errors, 'warnings'); $action = ''; - } - else - { + } else { header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id); exit; } @@ -903,9 +869,7 @@ if ((empty($id) && empty($ref)) || $action == 'add' || $action == 'request' || $ if (($fuserid == $user->id && empty($user->rights->holiday->write)) || ($fuserid != $user->id && empty($user->rights->holiday->write_all))) { $errors[] = $langs->trans('CantCreateCP'); - } - else - { + } else { // Formulaire de demande de congés payés print load_fiche_titre($langs->trans('MenuAddCP'), '', 'title_hrm.png'); @@ -999,8 +963,7 @@ if ((empty($id) && empty($ref)) || $action == 'add' || $action == 'request' || $ print $out; dol_fiche_end(); - } - elseif (!is_numeric($conf->global->HOLIDAY_HIDE_BALANCE)) + } elseif (!is_numeric($conf->global->HOLIDAY_HIDE_BALANCE)) { print $langs->trans($conf->global->HOLIDAY_HIDE_BALANCE).'
'; } @@ -1021,8 +984,7 @@ if ((empty($id) && empty($ref)) || $action == 'add' || $action == 'request' || $ { print $form->select_dolusers(($fuserid ? $fuserid : $user->id), 'fuserid', 0, '', 0, 'hierarchyme', '', '0,'.$conf->entity, 0, 0, $morefilter, 0, '', 'maxwidth300'); //print ''; - } - else print $form->select_dolusers(GETPOST('fuserid', 'int') ?GETPOST('fuserid', 'int') : $user->id, 'fuserid', 0, '', 0, '', '', '0,'.$conf->entity, 0, 0, $morefilter, 0, '', 'maxwidth300'); + } else print $form->select_dolusers(GETPOST('fuserid', 'int') ?GETPOST('fuserid', 'int') : $user->id, 'fuserid', 0, '', 0, '', '', '0,'.$conf->entity, 0, 0, $morefilter, 0, '', 'maxwidth300'); print ''; print ''; @@ -1089,8 +1051,7 @@ if ((empty($id) && empty($ref)) || $action == 'add' || $action == 'request' || $ $object = new Holiday($db); $include_users = $object->fetch_users_approver_holiday(); if (empty($include_users)) print img_warning().' '.$langs->trans("NobodyHasPermissionToValidateHolidays"); - else - { + else { $defaultselectuser = (empty($user->fk_user_holiday_validator) ? $user->fk_user : $user->fk_user_holiday_validator); // Will work only if supervisor has permission to approve so is inside include_users if (!empty($conf->global->HOLIDAY_DEFAULT_VALIDATOR)) $defaultselectuser = $conf->global->HOLIDAY_DEFAULT_VALIDATOR; // Can force default approver if (GETPOST('valideur', 'int') > 0) $defaultselectuser = GETPOST('valideur', 'int'); @@ -1126,18 +1087,14 @@ if ((empty($id) && empty($ref)) || $action == 'add' || $action == 'request' || $ print ''."\n"; } -} -else -{ +} else { if ($error) { print '
';
print $error;
print '
'; print '
';
- }
- else
- {
+ } else {
// Affichage de la fiche d'une demande de congés payés
if (($id > 0) || $ref)
{
@@ -1246,9 +1203,7 @@ else
print ''.$langs->trans($listhalfday[$starthalfday]).'';
print '';
print '';
- }
- else
- {
+ } else {
print ''; print '
\n"; print $langs->trans("GoIntoDictionaryHolidayTypes"); //print ''; -} -else -{ +} else { $canedit = 0; if (!empty($user->rights->holiday->define_holiday)) $canedit = 1; @@ -260,9 +258,7 @@ else { print '
'.$langs->trans("MonthOfLastMonthlyUpdate").': '.$yearLastUpdate.'-'.$monthLastUpdate.''."\n"; -} -else print $langs->trans('None'); +} else print $langs->trans('None'); print "
\n"; $moreforfilter = ''; diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php index ba98812f1b2..a260941ab0d 100644 --- a/htdocs/hrm/admin/admin_establishment.php +++ b/htdocs/hrm/admin/admin_establishment.php @@ -129,16 +129,12 @@ if ($result) $i++; } - } - else - { + } else { print '
| '; - dol_print_object_info($object); - print ' |
';
+ /*
+ // Ref customer
+ $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+ $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+ // Thirdparty
+ $morehtmlref.='
'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : ''); + // Project + if (! empty($conf->projet->enabled)) + { + $langs->load("projects"); + $morehtmlref.='
'.$langs->trans('Project') . ' '; + if ($permissiontoadd) + { + if ($action != 'classify') + //$morehtmlref.='' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : '; + $morehtmlref.=' : '; + if ($action == 'classify') { + //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1); + $morehtmlref.=''; + } else { + $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1); + } + } else { + if (! empty($object->fk_project)) { + $proj = new Project($db); + $proj->fetch($object->fk_project); + $morehtmlref .= ': '.$proj->getNomUrl(); + } else { + $morehtmlref .= ''; + } + } + }*/ + $morehtmlref .= '
';
+
+
+ dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+ print ''.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : ''); + // Project + if (! empty($conf->projet->enabled)) + { + $langs->load("projects"); + $morehtmlref.='
'.$langs->trans('Project') . ' '; + if ($permissiontoadd) + { + if ($action != 'classify') + //$morehtmlref.='' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : '; + $morehtmlref.=' : '; + if ($action == 'classify') { + //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1); + $morehtmlref.=''; + } else { + $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1); + } + } else { + if (! empty($object->fk_project)) { + $proj = new Project($db); + $proj->fetch($object->fk_project); + $morehtmlref .= ': '.$proj->getNomUrl(); + } else { + $morehtmlref .= ''; + } + } + }*/ + $morehtmlref .= '
';
+ print '';
+
+ $object->info($object->id);
+ dol_print_object_info($object, 1);
+
+ print '
';
+
+ dol_fiche_end();
}
+
// End of page
llxFooter();
$db->close();
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index ba33ecbbdb3..7cc72c1792e 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -77,7 +77,7 @@ $childids[] = $user->id;
llxHeader('', $langs->trans('HRMArea'));
-print load_fiche_titre($langs->trans("HRMArea"), '', 'hrm');
+print load_fiche_titre($langs->trans("HRMArea"), '', 'user');
if (!empty($setupcompanynotcomplete))
@@ -160,8 +160,7 @@ if (!empty($conf->holiday->enabled))
print '';
print ''; - } - elseif (!is_numeric($conf->global->HOLIDAY_HIDE_BALANCE)) + } elseif (!is_numeric($conf->global->HOLIDAY_HIDE_BALANCE)) { print $langs->trans($conf->global->HOLIDAY_HIDE_BALANCE).'
'; } @@ -241,16 +240,13 @@ if (!empty($conf->holiday->enabled) && $user->rights->holiday->read) $i++; } - } - else - { + } else { print '
'; - } - else dol_print_error($db); + } else dol_print_error($db); } @@ -314,15 +310,12 @@ if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->lire) $i++; } - } - else - { + } else { print '
'.dol_htmlentitiesbr($object->lines[$i]->description) : ''; } - } - else - { + } else { print "
'; if ($sumpaid < $loan->capital) { print $langs->trans("Insurance").': '; - } - else - { + } else { print '-'; } print '
'; if ($sumpaid < $loan->capital) { print $langs->trans("Interest").': '; - } - else - { + } else { print '-'; } print "
".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL; @@ -1606,9 +1566,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead $logouttext .= ''; $logouttext .= img_picto($langs->trans('Logout'), 'sign-out', '', false, 0, 0, '', 'atoplogin'); $logouttext .= ''; - } - else - { + } else { $logouthtmltext .= $langs->trans("NoLogoutProcessWithAuthMode", $_SESSION["dol_authmode"]); $logouttext .= img_picto($langs->trans('Logout'), 'sign-out', '', false, 0, 0, '', 'atoplogin opacitymedium'); } @@ -1625,11 +1583,10 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead { if ($result == 0) $toprightmenu .= $hookmanager->resPrint; // add - else + else { $toprightmenu = $hookmanager->resPrint; // replace - } - else - { + } + } else { $toprightmenu .= $result; // For backward compatibility } @@ -1699,10 +1656,11 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead $langs->load('admin'); $appli .= '
'.$langs->trans("Database").': '.$db->database_name; } - $text = ''.DOL_VERSION.''; - $toprightmenu .= @Form::textwithtooltip('', $appli, 2, 1, $text, 'login_block_elem', 2); } + $text = ''.DOL_VERSION.''; + $toprightmenu .= @Form::textwithtooltip('', $appli, 2, 1, $text, 'login_block_elem', 2); + // Logout link $toprightmenu .= @Form::textwithtooltip('', $logouthtmltext, 2, 1, $logouttext, 'login_block_elem logout-btn', 2); @@ -1722,6 +1680,11 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead $toprightmenu .= top_menu_search(); } + if (!empty($conf->global->MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN)) { + // Add search dropdown + $toprightmenu .= top_menu_quickadd(); + } + // Add bookmark dropdown $toprightmenu .= top_menu_bookmark(); @@ -1765,8 +1728,7 @@ function top_menu_user($hideloginname = 0, $urllogout = '') { $userImage = Form::showphoto('userphoto', $user, 0, 0, 0, 'photouserphoto userphoto', 'small', 0, 1); $userDropDownImage = Form::showphoto('userphoto', $user, 0, 0, 0, 'dropdown-user-image', 'small', 0, 1); - } - else { + } else { $nophoto = '/public/theme/common/user_anonymous.png'; if ($user->gender == 'man') $nophoto = '/public/theme/common/user_man.png'; if ($user->gender == 'woman') $nophoto = '/public/theme/common/user_woman.png'; @@ -1819,8 +1781,7 @@ function top_menu_user($hideloginname = 0, $urllogout = '') { if ($result == 0) { $dropdownBody .= $hookmanager->resPrint; // add - } - else { + } else { $dropdownBody = $hookmanager->resPrint; // replace } } @@ -1846,10 +1807,8 @@ function top_menu_user($hideloginname = 0, $urllogout = '') if (preg_match('/\d\.\d/', $appli)) { if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core - } - else $appli .= " ".DOL_VERSION; - } - else $appli .= " ".DOL_VERSION; + } else $appli .= " ".DOL_VERSION; + } else $appli .= " ".DOL_VERSION; if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { $btnUser = ' @@ -1934,6 +1893,224 @@ function top_menu_user($hideloginname = 0, $urllogout = '') return $btnUser; } +/** + * Build the tooltip on top menu quick add + * + * @return string HTML content + */ +function top_menu_quickadd() +{ + global $langs, $conf, $db, $hookmanager, $user; + global $menumanager; + $html = ''; + // Define $dropDownQuickAddHtml + $dropDownQuickAddHtml = '
';
+ $dropDownQuickAddHtml.= $langs->trans('QuickAdd');
+ $dropDownQuickAddHtml.= '
';
+
+ $dropDownQuickAddHtml.= '';
+ $dropDownQuickAddHtml.= '
';
+
+ $html.= '
+ ';
+ $html .= '
+
+
+ ';
+ return $html;
+}
/**
* Build the tooltip on top menu bookmark
@@ -2240,10 +2417,8 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
if (preg_match('/\d\.\d/', $appli))
{
if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
- }
- else $appli .= " ".DOL_VERSION;
- }
- else $appli .= " ".DOL_VERSION;
+ } else $appli .= " ".DOL_VERSION;
+ } else $appli .= " ".DOL_VERSION;
print '';
+ if (! empty($conf->societe->enabled) && $user->rights->societe->creer) {
+ $langs->load("companies");
+ $dropDownQuickAddHtml.= '
+
+
+ ';
+ }
+
+ if (! empty($conf->societe->enabled) && $user->rights->societe->contact->creer) {
+ $langs->load("companies");
+ $dropDownQuickAddHtml.= '
+
+
+ ';
+ }
+
+ if (! empty($conf->propal->enabled) && $user->rights->propale->creer) {
+ $langs->load("propal");
+ $dropDownQuickAddHtml.= '
+
+
+ ';
+ }
+
+ if (! empty($conf->commande->enabled) && $user->rights->commande->creer) {
+ $langs->load("orders");
+ $dropDownQuickAddHtml.= '
+
+
+ ';
+ }
+
+ if (! empty($conf->facture->enabled) && $user->rights->facture->creer) {
+ $langs->load("bills");
+ $dropDownQuickAddHtml.= '
+
+
+ ';
+ }
+
+ if (! empty($conf->contrat->enabled) && $user->rights->contrat->creer) {
+ $langs->load("contracts");
+ $dropDownQuickAddHtml.= '
+
+
+ ';
+ }
+
+ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->creer) {
+ $langs->load("supplier_proposal");
+ $dropDownQuickAddHtml.= '
+
+
+ ';
+ }
+
+ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->creer) {
+ $langs->load("orders");
+ $dropDownQuickAddHtml.= '
+
+
+ ';
+ }
+
+ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->creer) {
+ $langs->load("bills");
+ $dropDownQuickAddHtml.= '
+
+
+ ';
+ }
+
+ if (! empty($conf->product->enabled) && $user->rights->produit->creer) {
+ $langs->load("products");
+ $dropDownQuickAddHtml.= '
+
+
+ ';
+ }
+
+ if (! empty($conf->service->enabled) && $user->rights->service->creer) {
+ $langs->load("products");
+ $dropDownQuickAddHtml .= '
+
+
+ ';
+ }
+
+ // Execute hook printTopRightMenu (hooks should output string like '')
+ $parameters = array();
+ $result = $hookmanager->executeHooks('printQuickAddBlock', $parameters); // Note that $action and $object may have been modified by some hooks
+ if (is_numeric($result)) {
+ if ($result == 0) {
+ $dropDownQuickAddHtml.= $hookmanager->resPrint; // add
+ } else {
+ $dropDownQuickAddHtml = $hookmanager->resPrint; // replace
+ }
+ } else {
+ $dropDownQuickAddHtml .= $result; // For backward compatibility
+ }
+
+ $dropDownQuickAddHtml .= '
';
+ $dropDownQuickAddHtml .= '';
if ($doliurl) print '';
else print '';
@@ -2297,8 +2472,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
if (empty($reshook))
{
$bugbaseurl .= $hookmanager->resPrint;
- }
- else $bugbaseurl = $hookmanager->resPrint;
+ } else $bugbaseurl = $hookmanager->resPrint;
$bugbaseurl .= urlencode("\n");
$bugbaseurl .= urlencode("## Report\n");
@@ -2362,8 +2536,9 @@ function main_area($title = '')
print ''."\n";
print '';
print '
";
print '
';
-}
-else
-{
+} else {
dol_print_error($db);
}
$db->free($result);
diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php
index 337791238ce..83e743e0d68 100644
--- a/htdocs/margin/checkMargins.php
+++ b/htdocs/margin/checkMargins.php
@@ -222,7 +222,7 @@ if ($result) {
if ($conf->global->MARGIN_TYPE == "1")
$labelcostprice = 'BuyingPrice';
- else // value is 'costprice' or 'pmp'
+ else // value is 'costprice' or 'pmp'
$labelcostprice = 'CostPrice';
$moreforfilter = '';
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index 3cdd9c3c650..e1fd6876e0f 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -108,8 +108,7 @@ if ($socid > 0) {
if (!$sortorder) $sortorder = "DESC";
if (!$sortfield) $sortfield = "f.datef";
}
-}
-else {
+} else {
print '| ';
- if ($conf->global->MAIN_SHOW_LOGO && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && !empty($conf->global->MAIN_INFO_SOCIETE_LOGO))
+ if ($conf->global->MAIN_SHOW_LOGO && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && !empty($conf->global->MAIN_INFO_SOCIETE_LOGO)) {
print ' | |
| '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_NOM).' | |
| '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ADDRESS).' '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ZIP).' '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TOWN).' | '; if (!empty($conf->use_javascript_ajax)) { print ajax_constantonoff('DISPLAY_MARGIN_RATES'); -} -else -{ +} else { if (empty($conf->global->DISPLAY_MARGIN_RATES)) { print ''.img_picto($langs->trans("Disabled"), 'off').''; - } - else - { + } else { print ''.img_picto($langs->trans("Enabled"), 'on').''; } } @@ -189,15 +175,11 @@ print ' | '; if (!empty($conf->use_javascript_ajax)) { print ajax_constantonoff('DISPLAY_MARK_RATES'); -} -else -{ +} else { if (empty($conf->global->DISPLAY_MARK_RATES)) { print ''.img_picto($langs->trans("Disabled"), 'off').''; - } - else - { + } else { print ''.img_picto($langs->trans("Enabled"), 'on').''; } } @@ -212,15 +194,11 @@ print ' | '; if (!empty($conf->use_javascript_ajax)) { print ajax_constantonoff('ForceBuyingPriceIfNull'); -} -else -{ +} else { if (empty($conf->global->ForceBuyingPriceIfNull)) { print ''.img_picto($langs->trans("Disabled"), 'off').''; - } - else - { + } else { print ''.img_picto($langs->trans("Enabled"), 'on').''; } } diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php index cf1d70db91a..6ff9cdc7274 100644 --- a/htdocs/margin/agentMargins.php +++ b/htdocs/margin/agentMargins.php @@ -48,8 +48,7 @@ if (!$sortfield) { if ($agentid > 0) $sortfield = "s.nom"; - else - $sortfield = "u.lastname"; + else $sortfield = "u.lastname"; } $startdate = $enddate = ''; @@ -156,16 +155,14 @@ $sql .= " AND sc.fk_soc = f.fk_soc"; $sql .= " AND (d.product_type = 0 OR d.product_type = 1)"; if (!empty($conf->global->AGENT_CONTACT_TYPE)) $sql .= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = u.rowid) OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = u.rowid))"; -else - $sql .= " AND sc.fk_user = u.rowid"; +else $sql .= " AND sc.fk_user = u.rowid"; $sql .= " AND f.fk_statut NOT IN (".implode(', ', $invoice_status_except_list).")"; $sql .= ' AND s.entity IN ('.getEntity('societe').')'; $sql .= " AND d.fk_facture = f.rowid"; if ($agentid > 0) { if (!empty($conf->global->AGENT_CONTACT_TYPE)) $sql .= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = ".$agentid.") OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = ".$agentid."))"; - else - $sql .= " AND sc.fk_user = ".$agentid; + else $sql .= " AND sc.fk_user = ".$agentid; } if (!empty($startdate)) $sql .= " AND f.datef >= '".$db->idate($startdate)."'"; @@ -205,7 +202,7 @@ if ($result) if ($conf->global->MARGIN_TYPE == "1") $labelcostprice = 'BuyingPrice'; - else // value is 'costprice' or 'pmp' + else // value is 'costprice' or 'pmp' $labelcostprice = 'CostPrice'; $moreforfilter = ''; @@ -217,8 +214,7 @@ if ($result) print ' |
'; $db->free($result); -} -else -{ +} else { dol_print_error('', 'Parameter socid not defined'); } diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 4005e6a2ed5..e50539fd05b 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -60,14 +60,14 @@ if (defined('TEST_DB_FORCE_TYPE')) $conf->db->type = constant('TEST_DB_FORCE_TYP // Set properties specific to conf file $conf->file->main_limit_users = $dolibarr_main_limit_users; -$conf->file->mailing_limit_sendbyweb = $dolibarr_mailing_limit_sendbyweb; -$conf->file->mailing_limit_sendbycli = $dolibarr_mailing_limit_sendbycli; +$conf->file->mailing_limit_sendbyweb = $dolibarr_mailing_limit_sendbyweb; +$conf->file->mailing_limit_sendbycli = $dolibarr_mailing_limit_sendbycli; $conf->file->main_authentication = empty($dolibarr_main_authentication) ? '' : $dolibarr_main_authentication; // Identification mode $conf->file->main_force_https = empty($dolibarr_main_force_https) ? '' : $dolibarr_main_force_https; // Force https -$conf->file->strict_mode = empty($dolibarr_strict_mode) ? '' : $dolibarr_strict_mode; // Force php strict mode (for debug) +$conf->file->strict_mode = empty($dolibarr_strict_mode) ? '' : $dolibarr_strict_mode; // Force php strict mode (for debug) $conf->file->instance_unique_id = empty($dolibarr_main_instance_unique_id) ? (empty($dolibarr_main_cookie_cryptkey) ? '' : $dolibarr_main_cookie_cryptkey) : $dolibarr_main_instance_unique_id; // Unique id of instance $conf->file->dol_document_root = array('main' => (string) DOL_DOCUMENT_ROOT); // Define array of document root directories ('/home/htdocs') -$conf->file->dol_url_root = array('main' => (string) DOL_URL_ROOT); // Define array of url root path ('' or '/dolibarr') +$conf->file->dol_url_root = array('main' => (string) DOL_URL_ROOT); // Define array of url root path ('' or '/dolibarr') if (!empty($dolibarr_main_document_root_alt)) { // dolibarr_main_document_root_alt can contains several directories @@ -132,9 +132,7 @@ if (!defined('NOREQUIREDB')) $langs->setDefaultLang('auto'); $langs->load("website"); print $langs->trans("SorryWebsiteIsCurrentlyOffLine"); - } - else - { + } else { print "SorryWebsiteIsCurrentlyOffLine"; } print ''; @@ -162,20 +160,17 @@ if (!defined('NOREQUIREUSER')) { */ // By default conf->entity is 1, but we change this if we ask another value. -if (session_id() && !empty($_SESSION["dol_entity"])) // Entity inside an opened session -{ +if (session_id() && !empty($_SESSION["dol_entity"])) { + // Entity inside an opened session $conf->entity = $_SESSION["dol_entity"]; -} -elseif (!empty($_ENV["dol_entity"])) // Entity inside a CLI script -{ +} elseif (!empty($_ENV["dol_entity"])) { + // Entity inside a CLI script $conf->entity = $_ENV["dol_entity"]; -} -elseif (GETPOSTISSET("loginfunction") && GETPOST("entity", 'int')) // Just after a login page -{ +} elseif (GETPOSTISSET("loginfunction") && GETPOST("entity", 'int')) { + // Just after a login page $conf->entity = GETPOST("entity", 'int'); -} -elseif (defined('DOLENTITY') && is_numeric(DOLENTITY)) // For public page with MultiCompany module -{ +} elseif (defined('DOLENTITY') && is_numeric(DOLENTITY)) { + // For public page with MultiCompany module $conf->entity = DOLENTITY; } @@ -225,9 +220,7 @@ if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n"; $nexturl = DOL_URL_ROOT.'/user/logout.php'; print 'Please try later or click here to disconnect and change login user...'."\n"; - } - else - { + } else { print 'Sorry, your application is offline. Only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n"; $nexturl = DOL_URL_ROOT.'/'; print 'Please try later or click here to change login user...'."\n"; diff --git a/htdocs/modulebuilder/admin/setup.php b/htdocs/modulebuilder/admin/setup.php index db30c32607f..1b260396e6b 100644 --- a/htdocs/modulebuilder/admin/setup.php +++ b/htdocs/modulebuilder/admin/setup.php @@ -48,14 +48,13 @@ if ($action == "update") if ($res1 < 0 || $res2 < 0 || $res3 < 0 || $res4 < 0 || $res5 < 0 || $res6 < 0 || $res7 < 0 || $res8 < 0) { setEventMessages('ErrorFailedToSaveDate', null, 'errors'); $db->rollback(); - } - else - { + } else { setEventMessages('RecordModifiedSuccessfully', null, 'mesgs'); $db->commit(); } } +$reg = array(); if (preg_match('/set_(.*)/', $action, $reg)) { $code = $reg[1]; $values = GETPOST($code); diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php index d813c3b291b..be786a3b20a 100644 --- a/htdocs/modulebuilder/index.php +++ b/htdocs/modulebuilder/index.php @@ -128,9 +128,8 @@ if ($dirins && $action == 'initmodule' && $modulename) $error++; $langs->load("errors"); setEventMessages($langs->trans("ErrorFailToCopyDir", $srcdir, $destdir), null, 'errors'); - } - else // $result == 0 - { + } else { + // $result == 0 setEventMessages($langs->trans("AllFilesDidAlreadyExist", $srcdir, $destdir), null, 'warnings'); } } @@ -270,9 +269,7 @@ if ($dirins && $action == 'initapi' && !empty($module)) ); dolReplaceInFile($destfile, $arrayreplacement); - } - else - { + } else { $langs->load("errors"); setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors'); } @@ -307,15 +304,12 @@ if ($dirins && $action == 'initphpunit' && !empty($module)) ); dolReplaceInFile($destfile, $arrayreplacement); - } - else - { + } else { $langs->load("errors"); setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors'); } } -if ($dirins && $action == 'initsqlextrafields' && !empty($module)) -{ +if ($dirins && $action == 'initsqlextrafields' && !empty($module)) { $modulename = ucfirst($module); // Force first letter in uppercase $objectname = $tabobj; @@ -353,9 +347,7 @@ if ($dirins && $action == 'initsqlextrafields' && !empty($module)) dolReplaceInFile($destfile1, $arrayreplacement); dolReplaceInFile($destfile2, $arrayreplacement); - } - else - { + } else { $langs->load("errors"); setEventMessages($langs->trans('ErrorFailToCreateFile', ''), null, 'errors'); } @@ -388,9 +380,7 @@ if ($dirins && $action == 'inithook' && !empty($module)) ); dolReplaceInFile($destfile, $arrayreplacement); - } - else - { + } else { $langs->load("errors"); setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors'); } @@ -422,9 +412,7 @@ if ($dirins && $action == 'inittrigger' && !empty($module)) ); dolReplaceInFile($destfile, $arrayreplacement); - } - else - { + } else { $langs->load("errors"); setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors'); } @@ -438,8 +426,7 @@ if ($dirins && $action == 'initwidget' && !empty($module)) //var_dump($srcfile);var_dump($destfile); $result = dol_copy($srcfile, $destfile, 0, 0); - if ($result > 0) - { + if ($result > 0) { $modulename = ucfirst($module); // Force first letter in uppercase //var_dump($phpfileval['fullname']); @@ -456,9 +443,7 @@ if ($dirins && $action == 'initwidget' && !empty($module)) ); dolReplaceInFile($destfile, $arrayreplacement); - } - else - { + } else { $langs->load("errors"); setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors'); } @@ -495,13 +480,12 @@ if ($dirins && $action == 'initcss' && !empty($module)) $srcfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php'; $arrayreplacement = array('/\/\/\s*\''.preg_quote('/'.strtolower($module).'/css/'.strtolower($module).'.css.php', '/').'\'/' => '\'/'.strtolower($module).'/css/'.strtolower($module).'.css.php\''); dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1); - } - else - { + } else { $langs->load("errors"); setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors'); } } + if ($dirins && $action == 'initjs' && !empty($module)) { dol_mkdir($dirins.'/'.strtolower($module).'/js'); @@ -534,9 +518,7 @@ if ($dirins && $action == 'initjs' && !empty($module)) $srcfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php'; $arrayreplacement = array('/\/\/\s*\''.preg_quote('/'.strtolower($module).'/js/'.strtolower($module).'.js.php', '/').'\'/' => '\'/'.strtolower($module).'/js/'.strtolower($module).'.js.php\''); dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1); - } - else - { + } else { $langs->load("errors"); setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors'); } @@ -573,15 +555,12 @@ if ($dirins && $action == 'initcli' && !empty($module)) ); dolReplaceInFile($destfile, $arrayreplacement); - } - else - { + } else { $langs->load("errors"); setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors'); } } -if ($dirins && $action == 'initdoc' && !empty($module)) -{ +if ($dirins && $action == 'initdoc' && !empty($module)) { dol_mkdir($dirins.'/'.strtolower($module).'/doc'); $srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template'; $srcfile = $srcdir.'/doc/Documentation.asciidoc'; @@ -589,8 +568,7 @@ if ($dirins && $action == 'initdoc' && !empty($module)) //var_dump($srcfile);var_dump($destfile); $result = dol_copy($srcfile, $destfile, 0, 0); - if ($result > 0) - { + if ($result > 0) { $modulename = ucfirst($module); // Force first letter in uppercase $modulelowercase = strtolower($module); @@ -624,9 +602,7 @@ if ($dirins && $action == 'initdoc' && !empty($module)) dol_delete_file($outputfiledoc, 0, 0, 0, null, false, 0); dol_delete_file($outputfiledocpdf, 0, 0, 0, null, false, 0); - } - else - { + } else { $langs->load("errors"); setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors'); } @@ -650,14 +626,18 @@ if ($dirins && $action == 'confirm_removefile' && !empty($module)) $dirtodelete = $dirins.'/'.$dirnametodelete; $result = dol_delete_file($filetodelete); - if (dol_is_dir_empty($dirtodelete)) dol_delete_dir($dirtodelete); + if (! $result) { + setEventMessages($langs->trans("ErrorFailToDeleteFile", basename($filetodelete)), null, 'errors'); + } else { + if (dol_is_dir_empty($dirtodelete)) dol_delete_dir($dirtodelete); - // Update descriptor file to comment file - if (in_array($tab, array('css', 'js'))) - { - $srcfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php'; - $arrayreplacement = array('/^\s*\''.preg_quote('/'.$relativefilename, '/').'\',*/m'=>' // \'/'.$relativefilename.'\','); - dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1); + // Update descriptor file to comment file + if (in_array($tab, array('css', 'js'))) + { + $srcfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php'; + $arrayreplacement = array('/^\s*\''.preg_quote('/'.$relativefilename, '/').'\',*/m'=>' // \'/'.$relativefilename.'\','); + dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1); + } } } } @@ -670,9 +650,7 @@ if ($dirins && $action == 'initobject' && $module && GETPOST('createtablearray', if (empty($_results)) { setEventMessages($langs->trans("ErrorTableNotFound", $tablename), null, 'errors'); - } - else - { + } else { /** * 'type' if the field format ('integer', 'integer:Class:pathtoclass', 'varchar(x)', 'double(24,8)', 'text', 'html', 'datetime', 'timestamp', 'float') * 'label' the translation key. @@ -722,7 +700,9 @@ if ($dirins && $action == 'initobject' && $module && GETPOST('createtablearray', $fieldname = $obj->Field; // type $type = $obj->Type; - if ($type == 'int(11)') $type = 'integer'; + if ($type == 'int(11)') $type='integer'; + if ($type == 'float') $type='real'; + if (strstr($type, 'tinyint')) $type='integer'; if ($obj->Field == 'fk_soc') $type = 'integer:Societe:societe/class/societe.class.php'; if (preg_match('/^fk_proj/', $obj->Field)) $type = 'integer:Project:projet/class/project.class.php:1:fk_statut=1'; if (preg_match('/^fk_prod/', $obj->Field)) $type = 'integer:Product:product/class/product.class.php:1'; @@ -867,7 +847,8 @@ if ($dirins && $action == 'initobject' && $module && $objectname) dol_mkdir($destdir.'/core/modules/'.strtolower($module).'/doc'); $filetogenerate += array( - 'core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php'=>'core/modules/'.strtolower($module).'/doc/doc_generic_'.strtolower($objectname).'_odt.modules.php' + 'core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php'=>'core/modules/'.strtolower($module).'/doc/doc_generic_'.strtolower($objectname).'_odt.modules.php', + 'core/modules/mymodule/doc/pdf_standard_myobject.modules.php'=>'core/modules/'.strtolower($module).'/doc/pdf_standard_'.strtolower($objectname).'.modules.php' ); } @@ -881,9 +862,8 @@ if ($dirins && $action == 'initobject' && $module && $objectname) $error++; $langs->load("errors"); setEventMessages($langs->trans("ErrorFailToCopyFile", $srcdir.'/'.$srcfile, $destdir.'/'.$destfile), null, 'errors'); - } - else // $result == 0 - { + } else { + // $result == 0 setEventMessages($langs->trans("FileAlreadyExists", $destfile), null, 'warnings'); } } @@ -912,13 +892,18 @@ if ($dirins && $action == 'initobject' && $module && $objectname) '/\$includedocgeneration = 0;/' => '$includedocgeneration = 1;' ); dolReplaceInFile($destdir.'/class/'.strtolower($objectname).'.class.php', $arrayreplacement, '', 0, 0, 1); + dolReplaceInFile($destdir.'/'.strtolower($objectname).'_card.php', $arrayreplacement, '', 0, 0, 1); $arrayreplacement = array( '/\'models\' => 0,/' => '\'models\' => 1,' ); + dolReplaceInFile($destdir.'/core/modules/mod'.$module.'.class.php', $arrayreplacement, '', 0, 0, 1); } + // TODO Update entries '$myTmpObjects['MyObject']=array('includerefgeneration'=>0, 'includedocgeneration'=>0);' + + // Scan for object class files $listofobject = dol_dir_list($destdir.'/class', 'files', 0, '\.class\.php$'); @@ -1065,15 +1050,11 @@ if ($dirins && ($action == 'droptable' || $action == 'droptableextrafields') && { $nb = $obj->nb; } - } - else - { + } else { if ($db->lasterrno() == 'DB_ERROR_NOSUCHTABLE') { setEventMessages($langs->trans("TableDoesNotExists", $tabletodrop), null, 'warnings'); - } - else - { + } else { dol_print_error($db); } } @@ -1082,8 +1063,7 @@ if ($dirins && ($action == 'droptable' || $action == 'droptableextrafields') && $resql = $db->DDLDropTable($tabletodrop); //var_dump($resql); setEventMessages($langs->trans("TableDropped", $tabletodrop), null, 'mesgs'); - } - elseif ($nb > 0) + } elseif ($nb > 0) { setEventMessages($langs->trans("TableNotEmptyDropCanceled", $tabletodrop), null, 'warnings'); } @@ -1230,9 +1210,7 @@ if ($dirins && $action == 'confirm_deletemodule') if ($result > 0) { setEventMessages($langs->trans("DirWasRemoved", $modulelowercase), null); - } - else - { + } else { setEventMessages($langs->trans("PurgeNothingToDelete"), null, 'warnings'); } } @@ -1277,22 +1255,22 @@ if ($dirins && $action == 'confirm_deleteobject' && $objectname) 'core/modules/mymodule/mod_myobject_advanced.php'=>'core/modules/'.strtolower($module).'/mod_'.strtolower($objectname).'_advanced.php', 'core/modules/mymodule/mod_myobject_standard.php'=>'core/modules/'.strtolower($module).'/mod_'.strtolower($objectname).'_standard.php', 'core/modules/mymodule/modules_myobject.php'=>'core/modules/'.strtolower($module).'/modules_'.strtolower($objectname).'.php', - 'core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php'=>'core/modules/'.strtolower($module).'/doc/doc_generic_'.strtolower($objectname).'_odt.modules.php' + 'core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php'=>'core/modules/'.strtolower($module).'/doc/doc_generic_'.strtolower($objectname).'_odt.modules.php', + 'core/modules/mymodule/doc/pdf_standard_myobject.modules.php'=>'core/modules/'.strtolower($module).'/doc/pdf_standard_'.strtolower($objectname).'.modules.php' ); $resultko = 0; foreach ($filetodelete as $filetodelete) { $resulttmp = dol_delete_file($dir.'/'.$filetodelete, 0, 0, 1); + $resulttmp = dol_delete_file($dir.'/'.$filetodelete.'.back', 0, 0, 1); if (!$resulttmp) $resultko++; } if ($resultko == 0) { setEventMessages($langs->trans("FilesDeleted"), null); - } - else - { + } else { setEventMessages($langs->trans("ErrorSomeFilesCouldNotBeDeleted"), null, 'warnings'); } } @@ -1319,15 +1297,12 @@ if ($dirins && $action == 'generatepackage') { try { $moduleobj = new $class($db); - } - catch (Exception $e) + } catch (Exception $e) { $error++; dol_print_error($e->getMessage()); } - } - else - { + } else { $error++; $langs->load("errors"); dol_print_error($langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module)); @@ -1345,25 +1320,19 @@ if ($dirins && $action == 'generatepackage') { if (!dol_is_dir($dirofmodule)) dol_mkdir($dirofmodule); $result = dol_compress_dir($dir, $outputfilezip, 'zip', '', $modulelowercase); - } - else - { + } else { $result = -1; } if ($result > 0) { setEventMessages($langs->trans("ZipFileGeneratedInto", $outputfilezip), null); - } - else - { + } else { $error++; $langs->load("errors"); setEventMessages($langs->trans("ErrorFailToGenerateFile", $outputfilezip), null, 'errors'); } - } - else - { + } else { $error++; $langs->load("errors"); setEventMessages($langs->trans("ErrorCheckVersionIsDefined"), null, 'errors'); @@ -1381,9 +1350,7 @@ if ($dirins && $action == 'generatedoc') if ($result > 0) { setEventMessages($langs->trans("DocFileGeneratedInto", $dirofmodule), null); - } - else - { + } else { setEventMessages($util->error, $util->errors, 'errors'); } } @@ -1420,14 +1387,10 @@ if ($action == 'savefile' && empty($cancel)) @chmod($pathoffile, octdec($newmask)); setEventMessages($langs->trans("FileSaved"), null); - } - else - { + } else { setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors'); } - } - else - { + } else { setEventMessages($langs->trans("ContentCantBeEmpty"), null, 'errors'); //$action='editfile'; $error++; @@ -1446,8 +1409,7 @@ if ($action == 'set' && $user->admin) $value = GETPOST('value', 'alpha'); $resarray = activateModule($value); if (!empty($resarray['errors'])) setEventMessages('', $resarray['errors'], 'errors'); - else - { + else { //var_dump($resarray);exit; if ($resarray['nbperms'] > 0) { @@ -1462,8 +1424,7 @@ if ($action == 'set' && $user->admin) $msg = $langs->trans('ModuleEnabledAdminMustCheckRights'); setEventMessages($msg, null, 'warnings'); } - } - else dol_print_error($db); + } else dol_print_error($db); } } header("Location: ".$_SERVER["PHP_SELF"]."?".$param); @@ -1594,9 +1555,7 @@ if (!$dirins) { $message = info_admin($langs->trans("ConfFileMustContainCustom", DOL_DOCUMENT_ROOT.'/custom', DOL_DOCUMENT_ROOT)); $allowfromweb = -1; -} -else -{ +} else { if ($dirins_ok) { if (!is_writable(dol_osencode($dirins))) @@ -1605,9 +1564,7 @@ else $message = info_admin($langs->trans("ErrorFailedToWriteInDir", $dirins)); $allowfromweb = 0; } - } - else - { + } else { $message = info_admin($langs->trans("NotExistsDirect", $dirins).$langs->trans("InfDirAlt").$langs->trans("InfDirExample")); $allowfromweb = 0; } @@ -1625,31 +1582,41 @@ $infomodulesfound = '
'.$form->textwithpicto(
$error = 0;
$moduleobj = null;
+
+
if (!empty($module) && $module != 'initmodule' && $module != 'deletemodule')
{
$modulelowercase = strtolower($module);
+ $loadclasserrormessage = '';
// Load module
- $fullpathdirtodescriptor = $listofmodules[strtolower($module)]['moduledescriptorrelpath'];
- dol_include_once($fullpathdirtodescriptor);
- $class = 'mod'.$module;
+ try {
+ $fullpathdirtodescriptor = $listofmodules[strtolower($module)]['moduledescriptorrelpath'];
+
+ //throw(new Exception());
+ dol_include_once($fullpathdirtodescriptor);
+
+ $class = 'mod'.$module;
+ } catch (Throwable $e) { // This is called in PHP 7 only. Never called with PHP 5.6
+ $loadclasserrormessage = $e->getMessage()."
\n";; + $loadclasserrormessage .= 'File: '.$e->getFile()."
\n"; + $loadclasserrormessage .= 'Line: '.$e->getLine()."
\n"; + } if (class_exists($class)) { try { $moduleobj = new $class($db); - } - catch (Exception $e) + } catch (Exception $e) { $error++; print $e->getMessage(); } - } - else - { + } else { if (empty($forceddirread)) $error++; $langs->load("errors"); print img_warning('').' '.$langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module).'
'; + print $loadclasserrormessage; } } @@ -1681,7 +1648,7 @@ if (is_array($listofmodules) && count($listofmodules) > 0) { $urltomodulesetup = ''.$langs->trans('Home').'-'.$langs->trans("Setup").'-'.$langs->trans("Modules").''; if (!empty($conf->global->$const_name)) // If module is already activated { - $linktoenabledisable .= ''; + $linktoenabledisable .= ''; $linktoenabledisable .= img_picto($langs->trans("Activated"), 'switch_on', '', false, 0, 0, '', '', 1); $linktoenabledisable .= ''; @@ -1702,30 +1669,22 @@ if (is_array($listofmodules) && count($listofmodules) > 0) { { $linktoenabledisable .= ' '.img_picto(ucfirst($page), "setup").''; // print ''.ucfirst($page).' '; - } - else - { + } else { if (preg_match('/^([^@]+)@([^@]+)$/i', $urlpage, $regs)) { $urltouse = dol_buildpath('/'.$regs[2].'/admin/'.$regs[1], 1); $linktoenabledisable .= ' '.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').''; - } - else - { + } else { $urltouse = $urlpage; $linktoenabledisable .= ' '.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').''; } } } - } - elseif (preg_match('/^([^@]+)@([^@]+)$/i', $objMod->config_page_url, $regs)) - { + } elseif (preg_match('/^([^@]+)@([^@]+)$/i', $objMod->config_page_url, $regs)) { $linktoenabledisable .= ' '.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').''; } - } - else - { - $linktoenabledisable .= ''; + } else { + $linktoenabledisable .= ''; $linktoenabledisable .= img_picto($langs->trans("ModuleIsNotActive", $urltomodulesetup), 'switch_off', '', false, 0, 0, '', 'classfortooltip', 1); $linktoenabledisable .= "\n"; } @@ -1756,7 +1715,7 @@ $head[$h][1] = $langs->trans("DangerZone"); $head[$h][2] = 'deletemodule'; $h++; -dol_fiche_head($head, $module, $langs->trans("Modules"), -1, 'generic', 0, $infomodulesfound, '', 8); // Modules +dol_fiche_head($head, $module, '', -1, '', 0, $infomodulesfound, '', 8); // Modules if ($module == 'initmodule') { @@ -1774,9 +1733,7 @@ if ($module == 'initmodule') print '
'; print ''; -} -elseif ($module == 'deletemodule') -{ +} elseif ($module == 'deletemodule') { print ''."\n"; print ''; -} -elseif (!empty($module)) -{ +} elseif (!empty($module)) { // Tabs for module if (!$error) { @@ -1977,9 +1932,7 @@ elseif (!empty($module)) print ''; print ''; - } - else - { + } else { print $langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module).'
'; } @@ -2005,9 +1958,7 @@ elseif (!empty($module)) } dol_fiche_end(); - } - else - { + } else { // Edit text file $fullpathoffile = dol_buildpath($file, 0, 1); // Description - level 2 if ($fullpathoffile) @@ -2038,9 +1989,7 @@ elseif (!empty($module)) print ''; } - } - else - { + } else { dol_fiche_head($head2, $tab, '', -1, ''); // Level 2 } @@ -2077,9 +2026,7 @@ elseif (!empty($module)) print ''; } print ''; - } - else - { + } else { // Edit text language file //print $langs->trans("UseAsciiDocFormat").'
'; @@ -2207,9 +2154,7 @@ elseif (!empty($module)) print ''; $i++; } - } - else - { + } else { print ''.$langs->trans("None").'
';
print '';
- }
- else
- {
+ } else {
$fullpathoffile = dol_buildpath($file, 0);
$content = file_get_contents($fullpathoffile);
@@ -2306,7 +2249,7 @@ elseif (!empty($module))
print ''.$langs->trans("EnterNameOfObjectDesc").'\n";; + $loadclasserrormessage .= 'File: '.$e->getFile()."
\n"; + $loadclasserrormessage .= 'Line: '.$e->getLine()."
\n"; + } if (class_exists($class)) { try { $moduleobj = new $class($db); - } - catch (Exception $e) + } catch (Exception $e) { $error++; print $e->getMessage(); } - } - else - { + } else { if (empty($forceddirread)) $error++; $langs->load("errors"); print img_warning('').' '.$langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module).'
'; + print $loadclasserrormessage; } } @@ -1681,7 +1648,7 @@ if (is_array($listofmodules) && count($listofmodules) > 0) { $urltomodulesetup = ''.$langs->trans('Home').'-'.$langs->trans("Setup").'-'.$langs->trans("Modules").''; if (!empty($conf->global->$const_name)) // If module is already activated { - $linktoenabledisable .= ''; + $linktoenabledisable .= ''; $linktoenabledisable .= img_picto($langs->trans("Activated"), 'switch_on', '', false, 0, 0, '', '', 1); $linktoenabledisable .= ''; @@ -1702,30 +1669,22 @@ if (is_array($listofmodules) && count($listofmodules) > 0) { { $linktoenabledisable .= ' '.img_picto(ucfirst($page), "setup").''; // print ''.ucfirst($page).' '; - } - else - { + } else { if (preg_match('/^([^@]+)@([^@]+)$/i', $urlpage, $regs)) { $urltouse = dol_buildpath('/'.$regs[2].'/admin/'.$regs[1], 1); $linktoenabledisable .= ' '.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').''; - } - else - { + } else { $urltouse = $urlpage; $linktoenabledisable .= ' '.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').''; } } } - } - elseif (preg_match('/^([^@]+)@([^@]+)$/i', $objMod->config_page_url, $regs)) - { + } elseif (preg_match('/^([^@]+)@([^@]+)$/i', $objMod->config_page_url, $regs)) { $linktoenabledisable .= ' '.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').''; } - } - else - { - $linktoenabledisable .= ''; + } else { + $linktoenabledisable .= ''; $linktoenabledisable .= img_picto($langs->trans("ModuleIsNotActive", $urltomodulesetup), 'switch_off', '', false, 0, 0, '', 'classfortooltip', 1); $linktoenabledisable .= "\n"; } @@ -1756,7 +1715,7 @@ $head[$h][1] = $langs->trans("DangerZone"); $head[$h][2] = 'deletemodule'; $h++; -dol_fiche_head($head, $module, $langs->trans("Modules"), -1, 'generic', 0, $infomodulesfound, '', 8); // Modules +dol_fiche_head($head, $module, '', -1, '', 0, $infomodulesfound, '', 8); // Modules if ($module == 'initmodule') { @@ -1774,9 +1733,7 @@ if ($module == 'initmodule') print '
'; print ''; -} -elseif ($module == 'deletemodule') -{ +} elseif ($module == 'deletemodule') { print ''."\n"; print ''; -} -elseif (!empty($module)) -{ +} elseif (!empty($module)) { // Tabs for module if (!$error) { @@ -1977,9 +1932,7 @@ elseif (!empty($module)) print ''; print ''; - } - else - { + } else { print $langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module).'
'; } @@ -2005,9 +1958,7 @@ elseif (!empty($module)) } dol_fiche_end(); - } - else - { + } else { // Edit text file $fullpathoffile = dol_buildpath($file, 0, 1); // Description - level 2 if ($fullpathoffile) @@ -2038,9 +1989,7 @@ elseif (!empty($module)) print ''; } - } - else - { + } else { dol_fiche_head($head2, $tab, '', -1, ''); // Level 2 } @@ -2077,9 +2026,7 @@ elseif (!empty($module)) print ''; } print ''; - } - else - { + } else { // Edit text language file //print $langs->trans("UseAsciiDocFormat").'
'; @@ -2207,9 +2154,7 @@ elseif (!empty($module)) print ''; $i++; } - } - else - { + } else { print '
'; - print '
'; + print '
'; print ' '.$form->textwithpicto($langs->trans("IncludeRefGeneration"), $langs->trans("IncludeRefGenerationHelp")).'
'; print ' '.$form->textwithpicto($langs->trans("IncludeDocGeneration"), $langs->trans("IncludeDocGenerationHelp")).'
'; print ''; @@ -2323,9 +2266,7 @@ elseif (!empty($module)) print '
'; print ''; - } - elseif ($tabobj == 'deleteobject') - { + } elseif ($tabobj == 'deleteobject') { // Delete object tab print ''; - } - else - { // tabobj = module + } else { + // tabobj = module if ($action == 'deleteproperty') { $formconfirm = $form->formconfirm( @@ -2412,16 +2352,12 @@ elseif (!empty($module)) if (empty($conf->global->$const_name)) // If module is not activated { print '
'; @@ -2432,11 +2368,9 @@ elseif (!empty($module)) print ' '.img_picto($langs->trans("Edit"), 'edit').''; print ' '; print ''.img_picto($langs->trans("Delete"), 'delete').''; - } - else - { + } else { //print ''.$langs->trans("FileNotYetGenerated").' '; - print ''; + print ''; } print '
'; @@ -2470,9 +2404,8 @@ elseif (!empty($module)) print ''.img_picto($langs->trans("Delete"), 'delete').''; print ' '; print ''.$langs->trans("DropTableIfEmpty").''; - } - else { - print ''; + } else { + print ''; } //print ' '.$langs->trans("RunSql").''; print '
'; @@ -2541,17 +2474,14 @@ elseif (!empty($module)) if (empty($forceddirread)) { $result = dol_include_once($pathtoclass); - } - else - { + } else { $result = @include_once $dirread.'/'.$pathtoclass; } if (class_exists($tabobj)) { try { $tmpobjet = @new $tabobj($db); - } - catch (Exception $e) + } catch (Exception $e) { dol_syslog('Failed to load Constructor of class: '.$e->getMessage(), LOG_WARNING); } @@ -2572,8 +2502,8 @@ elseif (!empty($module)) print ''; print ''; - print ''; - //print ''; + print ''; + //print ''; print '
'; print load_fiche_titre($langs->trans("ObjectProperties"), '', ''); @@ -2747,9 +2677,7 @@ elseif (!empty($module)) print ''; } - } - else - { + } else { if ($tab == 'specifications') { if ($action != 'editfile' || empty($file)) @@ -2768,9 +2696,7 @@ elseif (!empty($module)) print ' '.img_picto($langs->trans("Edit"), 'edit').''; print '
'; } - } - else - { + } else { // Use MD or asciidoc //print $langs->trans("UseAsciiDocFormat").'
'; @@ -2805,25 +2731,18 @@ elseif (!empty($module)) print ''; print ''; - } - else - { + } else { print '
'.$langs->trans('CronArgs').': '.$cron['parameters']; $texttoshow .= '
'.$langs->trans('Comment').': '.$langs->trans($cron['comment']); - } - elseif ($cron['jobtype'] == 'command') + } elseif ($cron['jobtype'] == 'command') { $text = $langs->trans('CronCommand'); $texttoshow = $langs->trans('CronCommand').': '.dol_trunc($cron['command']); @@ -3560,9 +3446,7 @@ elseif (!empty($module)) print ''; } - } - else - { + } else { print '
'; @@ -3734,15 +3612,11 @@ elseif (!empty($module)) { try { $moduleobj = new $class($db); - } - catch (Exception $e) - { + } catch (Exception $e) { $error++; dol_print_error($e->getMessage()); } - } - else - { + } else { $error++; $langs->load("errors"); dol_print_error($langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module)); diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php index 05b2c56ffb8..4cafe1b9824 100644 --- a/htdocs/modulebuilder/template/admin/setup.php +++ b/htdocs/modulebuilder/template/admin/setup.php @@ -53,11 +53,15 @@ if (!$user->admin) accessforbidden(); $action = GETPOST('action', 'alpha'); $backtopage = GETPOST('backtopage', 'alpha'); +$value = GETPOST('value', 'alpha'); + $arrayofparameters = array( 'MYMODULE_MYPARAM1'=>array('css'=>'minwidth200', 'enabled'=>1), 'MYMODULE_MYPARAM2'=>array('css'=>'minwidth500', 'enabled'=>1) ); +$error = 0; +$setupnotempty = 0; /* @@ -69,12 +73,116 @@ if ((float) DOL_VERSION >= 6) include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php'; } +if ($action == 'updateMask') +{ + $maskconstorder = GETPOST('maskconstorder', 'alpha'); + $maskorder = GETPOST('maskorder', 'alpha'); + + if ($maskconstorder) $res = dolibarr_set_const($db, $maskconstorder, $maskorder, 'chaine', 0, '', $conf->entity); + + if (!$res > 0) $error++; + + if (!$error) + { + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); + } else { + setEventMessages($langs->trans("Error"), null, 'errors'); + } +} elseif ($action == 'specimen') +{ + $modele = GETPOST('module', 'alpha'); + $tmpobjectkey = GETPOST('object'); + + $tmpobject = new $tmpobjectkey($db); + $tmpobject->initAsSpecimen(); + + // Search template files + $file = ''; $classname = ''; $filefound = 0; + $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']); + foreach ($dirmodels as $reldir) + { + $file = dol_buildpath($reldir."core/modules/mymodule/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0); + if (file_exists($file)) + { + $filefound = 1; + $classname = "pdf_".$modele; + break; + } + } + + if ($filefound) + { + require_once $file; + + $module = new $classname($db); + + if ($module->write_file($tmpobject, $langs) > 0) + { + header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf"); + return; + } else { + setEventMessages($module->error, null, 'errors'); + dol_syslog($module->error, LOG_ERR); + } + } else { + setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors'); + dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR); + } +} + +// Activate a model +elseif ($action == 'set') +{ + $ret = addDocumentModel($value, $type, $label, $scandir); +} elseif ($action == 'del') +{ + $tmpobjectkey = GETPOST('object'); + + $ret = delDocumentModel($value, $type); + if ($ret > 0) + { + $constforval = strtoupper($tmpobjectkey).'_ADDON_PDF'; + if ($conf->global->$constforval == "$value") dolibarr_del_const($db, $constforval, $conf->entity); + } +} + +// Set default model +elseif ($action == 'setdoc') +{ + $tmpobjectkey = GETPOST('object'); + $constforval = strtoupper($tmpobjectkey).'_ADDON_PDF'; + if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) + { + // The constant that was read before the new set + // We therefore requires a variable to have a coherent view + $conf->global->$constforval = $value; + } + + // On active le modele + $ret = delDocumentModel($value, $type); + if ($ret > 0) + { + $ret = addDocumentModel($value, $type, $label, $scandir); + } +} elseif ($action == 'setmod') +{ + // TODO Check if numbering module chosen can be activated + // by calling method canBeActivated + $tmpobjectkey = GETPOST('object'); + $constforval = 'MYMODULE_'.strtoupper($tmpobjectkey)."_ADDON"; + dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity); +} + /* * View */ +$form = new Form($db); + +$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']); + $page_name = "MyModuleSetup"; llxHeader('', $langs->trans($page_name)); @@ -115,9 +223,7 @@ if ($action == 'edit') print ''; print '
'; -} -else -{ +} else { if (!empty($arrayofparameters)) { print '
'; - } - else - { + } else { print ''."\n"; ?> '; -} -elseif ($object->id > 0) +} elseif ($object->id > 0) { /* * Show or edit @@ -895,8 +874,7 @@ elseif ($object->id > 0) { $texthelp = $langs->trans("IfNeedToUseOtherObjectKeepEmpty"); print $form->textwithtooltip($text.' '.img_help(), $texthelp, 1, 0, '', '', 2); - } - else print $text; + } else print $text; print '
' : '').''.$langs->trans('Ref').': '.$this->ref; // The space must be after the : to not being explode when showing the title in img_picto - $label .= ($label ? '
' : '').''.$langs->trans('Label').': '.$this->title; // The space must be after the : to not being explode when showing the title in img_picto - if (isset($this->public)) { - $label .= '
'.$langs->trans("Visibility").": ".($this->public ? $langs->trans("SharedProject") : $langs->trans("PrivateProject")); - } - if (!empty($this->thirdparty_name)) - $label .= ($label ? '
' : '').''.$langs->trans('ThirdParty').': '.$this->thirdparty_name; // The space must be after the : to not being explode when showing the title in img_picto - if (!empty($this->dateo)) - $label .= ($label ? '
' : '').''.$langs->trans('DateStart').': '.dol_print_date($this->dateo, 'day'); // The space must be after the : to not being explode when showing the title in img_picto - if (!empty($this->datee)) - $label .= ($label ? '
' : '').''.$langs->trans('DateEnd').': '.dol_print_date($this->datee, 'day'); // The space must be after the : to not being explode when showing the title in img_picto - if ($moreinpopup) $label .= '
'.$moreinpopup; - if (isset($this->status)) { - $label .= '
'.$langs->trans("Status").": ".$this->getLibStatut(5); - } - - $url = ''; - if ($option != 'nolink') - { - if (preg_match('/\.php$/', $option)) { - $url = dol_buildpath($option, 1).'?id='.$this->id; - } - elseif ($option == 'task') - { - $url = DOL_URL_ROOT.'/projet/tasks.php?id='.$this->id; - } - elseif ($option == 'preview') - { - $url = DOL_URL_ROOT.'/projet/element.php?id='.$this->id; - } - else - { - $url = DOL_URL_ROOT.'/projet/card.php?id='.$this->id; - } - // Add param to save lastsearch_values or not - $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0); - if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1; - if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1'; - } - - $linkclose = ''; - if (empty($notooltip) && $user->rights->projet->lire) - { - if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) - { - $label = $langs->trans("ShowProject"); - $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"'; - } - $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"'; - $linkclose .= ' class="classfortooltip"'; - - /* - $hookmanager->initHooks(array('projectdao')); - $parameters=array('id'=>$this->id); - // Note that $action and $object may have been modified by some hooks - $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action); - if ($reshook > 0) - $linkclose = $hookmanager->resPrint; - */ + /** + * Delete tasks with no children first, then task with children recursively + * + * @param User $user User + * @return int <0 if KO, 1 if OK + */ + public function deleteTasks($user) + { + $countTasks = count($this->lines); + $deleted = false; + if ($countTasks) + { + foreach ($this->lines as $task) + { + if ($task->hasChildren() <= 0) { // If there is no children (or error to detect them) + $deleted = true; + $ret = $task->delete($user); + if ($ret <= 0) + { + $this->errors[] = $this->db->lasterror(); + return -1; + } + } + } + } + $this->getLinesArray($user); + if ($deleted && count($this->lines) < $countTasks) + { + if (count($this->lines)) $this->deleteTasks($this->lines); } - $picto = 'projectpub'; - if (!$this->public) $picto = 'project'; + return 1; + } - $linkstart = ''; - $linkend = ''; + /** + * Validate a project + * + * @param User $user User that validate + * @param int $notrigger 1=Disable triggers + * @return int <0 if KO, >0 if OK + */ + public function setValid($user, $notrigger = 0) + { + global $langs, $conf; - $result .= $linkstart; - if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1); - if ($withpicto != 2) $result .= $this->ref; - $result .= $linkend; - if ($withpicto != 2) $result .= (($addlabel && $this->title) ? $sep.dol_trunc($this->title, ($addlabel > 1 ? $addlabel : 0)) : ''); + $error = 0; - global $action; - $hookmanager->initHooks(array('projectdao')); - $parameters = array('id'=>$this->id, 'getnomurl'=>$result); - $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks - if ($reshook > 0) $result = $hookmanager->resPrint; - else $result .= $hookmanager->resPrint; - - return $result; - } - - /** - * Initialise an instance with random values. - * Used to build previews or test instances. - * id must be 0 if object instance is a specimen. - * - * @return void - */ - public function initAsSpecimen() - { - global $user, $langs, $conf; - - $now = dol_now(); - - // Initialise parameters - $this->id = 0; - $this->ref = 'SPECIMEN'; - $this->specimen = 1; - $this->socid = 1; - $this->date_c = $now; - $this->date_m = $now; - $this->date_start = $now; - $this->date_end = $now + (3600 * 24 * 365); - $this->note_public = 'SPECIMEN'; - $this->fk_ele = 20000; - $this->opp_amount = 20000; - $this->budget_amount = 10000; - - $this->usage_opportunity = 1; - $this->usage_task = 1; - $this->usage_bill_time = 1; - $this->usage_organize_event = 1; - - /* - $nbp = mt_rand(1, 9); - $xnbp = 0; - while ($xnbp < $nbp) - { - $line = new Task($this->db); - $line->fk_project = 0; - $line->label = $langs->trans("Label") . " " . $xnbp; - $line->description = $langs->trans("Description") . " " . $xnbp; - - $this->lines[]=$line; - $xnbp++; - } - */ - } - - /** - * Check if user has permission on current project - * - * @param User $user Object user to evaluate - * @param string $mode Type of permission we want to know: 'read', 'write' - * @return int >0 if user has permission, <0 if user has no permission - */ - public function restrictedProjectArea($user, $mode = 'read') - { - // To verify role of users - $userAccess = 0; - if (($mode == 'read' && !empty($user->rights->projet->all->lire)) || ($mode == 'write' && !empty($user->rights->projet->all->creer)) || ($mode == 'delete' && !empty($user->rights->projet->all->supprimer))) - { - $userAccess = 1; - } - elseif ($this->public && (($mode == 'read' && !empty($user->rights->projet->lire)) || ($mode == 'write' && !empty($user->rights->projet->creer)) || ($mode == 'delete' && !empty($user->rights->projet->supprimer)))) - { - $userAccess = 1; - } - else + if ($this->statut != 1) { - foreach (array('internal', 'external') as $source) - { - $userRole = $this->liste_contact(4, $source); - $num = count($userRole); + // Check parameters + if (preg_match('/^'.preg_quote($langs->trans("CopyOf").' ').'/', $this->title)) + { + $this->error = $langs->trans("ErrorFieldFormat", $langs->transnoentities("Label")).'. '.$langs->trans('RemoveString', $langs->transnoentitiesnoconv("CopyOf")); + return -1; + } - $nblinks = 0; - while ($nblinks < $num) - { - if ($source == 'internal' && preg_match('/^PROJECT/', $userRole[$nblinks]['code']) && $user->id == $userRole[$nblinks]['id']) - { - if ($mode == 'read' && $user->rights->projet->lire) $userAccess++; - if ($mode == 'write' && $user->rights->projet->creer) $userAccess++; - if ($mode == 'delete' && $user->rights->projet->supprimer) $userAccess++; - } - $nblinks++; - } - } - //if (empty($nblinks)) // If nobody has permission, we grant creator - //{ - // if ((!empty($this->user_author_id) && $this->user_author_id == $user->id)) - // { - // $userAccess = 1; - // } - //} - } + $this->db->begin(); - return ($userAccess ? $userAccess : -1); - } + $sql = "UPDATE ".MAIN_DB_PREFIX."projet"; + $sql .= " SET fk_statut = 1"; + $sql .= " WHERE rowid = ".$this->id; + $sql .= " AND entity = ".$conf->entity; - /** - * Return array of projects a user has permission on, is affected to, or all projects - * - * @param User $user User object - * @param int $mode 0=All project I have permission on (assigned to me or public), 1=Projects assigned to me only, 2=Will return list of all projects with no test on contacts - * @param int $list 0=Return array, 1=Return string list - * @param int $socid 0=No filter on third party, id of third party - * @param string $filter additionnal filter on project (statut, ref, ...) - * @return array or string Array of projects id, or string with projects id separated with "," if list is 1 - */ - public function getProjectsAuthorizedForUser($user, $mode = 0, $list = 0, $socid = 0, $filter = '') - { - $projects = array(); - $temp = array(); + dol_syslog(get_class($this)."::setValid", LOG_DEBUG); + $resql = $this->db->query($sql); + if ($resql) + { + // Call trigger + if (empty($notrigger)) + { + $result = $this->call_trigger('PROJECT_VALIDATE', $user); + if ($result < 0) { $error++; } + // End call triggers + } - $sql = "SELECT ".(($mode == 0 || $mode == 1) ? "DISTINCT " : "")."p.rowid, p.ref"; - $sql .= " FROM ".MAIN_DB_PREFIX."projet as p"; - if ($mode == 0) - { - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_contact as ec ON ec.element_id = p.rowid"; - } - elseif ($mode == 1) - { - $sql .= ", ".MAIN_DB_PREFIX."element_contact as ec"; - } - elseif ($mode == 2) - { - // No filter. Use this if user has permission to see all project - } - $sql .= " WHERE p.entity IN (".getEntity('project').")"; - // Internal users must see project he is contact to even if project linked to a third party he can't see. - //if ($socid || ! $user->rights->societe->client->voir) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")"; - if ($socid > 0) $sql .= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")"; + if (!$error) + { + $this->statut = 1; + $this->db->commit(); + return 1; + } else { + $this->db->rollback(); + $this->error = join(',', $this->errors); + dol_syslog(get_class($this)."::setValid ".$this->error, LOG_ERR); + return -1; + } + } else { + $this->db->rollback(); + $this->error = $this->db->lasterror(); + return -1; + } + } + } - // Get id of types of contacts for projects (This list never contains a lot of elements) - $listofprojectcontacttype = array(); - $sql2 = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc"; - $sql2 .= " WHERE ctc.element = '".$this->db->escape($this->element)."'"; - $sql2 .= " AND ctc.source = 'internal'"; - $resql = $this->db->query($sql2); - if ($resql) - { - while ($obj = $this->db->fetch_object($resql)) - { - $listofprojectcontacttype[$obj->rowid] = $obj->code; - } - } - else dol_print_error($this->db); - if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0] = '0'; // To avoid syntax error if not found + /** + * Close a project + * + * @param User $user User that close project + * @return int <0 if KO, 0 if already closed, >0 if OK + */ + public function setClose($user) + { + global $langs, $conf; - if ($mode == 0) - { - $sql .= " AND ( p.public = 1"; - $sql .= " OR ( ec.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).")"; - $sql .= " AND ec.fk_socpeople = ".$user->id.")"; - $sql .= " )"; - } - elseif ($mode == 1) - { - $sql .= " AND ec.element_id = p.rowid"; - $sql .= " AND ("; - $sql .= " ( ec.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).")"; - $sql .= " AND ec.fk_socpeople = ".$user->id.")"; - $sql .= " )"; - } - elseif ($mode == 2) - { - // No filter. Use this if user has permission to see all project - } + $now = dol_now(); - $sql .= $filter; - //print $sql; + $error = 0; - $resql = $this->db->query($sql); - if ($resql) - { - $num = $this->db->num_rows($resql); - $i = 0; - while ($i < $num) - { - $row = $this->db->fetch_row($resql); - $projects[$row[0]] = $row[1]; - $temp[] = $row[0]; - $i++; - } + if ($this->statut != self::STATUS_CLOSED) + { + $this->db->begin(); - $this->db->free($resql); + $sql = "UPDATE ".MAIN_DB_PREFIX."projet"; + $sql .= " SET fk_statut = ".self::STATUS_CLOSED.", fk_user_close = ".$user->id.", date_close = '".$this->db->idate($now)."'"; + $sql .= " WHERE rowid = ".$this->id; + $sql .= " AND fk_statut = ".self::STATUS_VALIDATED; - if ($list) - { - if (empty($temp)) return '0'; - $result = implode(',', $temp); - return $result; - } - } - else - { - dol_print_error($this->db); - } + if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) + { + // TODO What to do if fk_opp_status is not code 'WON' or 'LOST' + } - return $projects; - } + dol_syslog(get_class($this)."::setClose", LOG_DEBUG); + $resql = $this->db->query($sql); + if ($resql) + { + // Call trigger + $result = $this->call_trigger('PROJECT_CLOSE', $user); + if ($result < 0) { $error++; } + // End call triggers - /** - * Load an object from its id and create a new one in database + if (!$error) + { + $this->statut = 2; + $this->db->commit(); + return 1; + } else { + $this->db->rollback(); + $this->error = join(',', $this->errors); + dol_syslog(get_class($this)."::setClose ".$this->error, LOG_ERR); + return -1; + } + } else { + $this->db->rollback(); + $this->error = $this->db->lasterror(); + return -1; + } + } + + return 0; + } + + /** + * Return status label of object + * + * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto + * @return string Label + */ + public function getLibStatut($mode = 0) + { + return $this->LibStatut(isset($this->statut) ? $this->statut : $this->status, $mode); + } + + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps + /** + * Renvoi status label for a status + * + * @param int $status id status + * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto + * @return string Label + */ + public function LibStatut($status, $mode = 0) + { + // phpcs:enable + global $langs; + + $statustrans = array( + 0 => 'status0', + 1 => 'status4', + 2 => 'status6', + ); + + $statusClass = 'status0'; + if (!empty($statustrans[$status])) { + $statusClass = $statustrans[$status]; + } + + return dolGetStatus($langs->trans($this->statuts_long[$status]), $langs->trans($this->statuts_short[$status]), '', $statusClass, $mode); + } + + /** + * Return clickable name (with picto eventually) + * + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto + * @param string $option Variant where the link point to ('', 'nolink') + * @param int $addlabel 0=Default, 1=Add label into string, >1=Add first chars into string + * @param string $moreinpopup Text to add into popup + * @param string $sep Separator between ref and label if option addlabel is set + * @param int $notooltip 1=Disable tooltip + * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking + * @param string $morecss More css on a link + * @return string String with URL + */ + public function getNomUrl($withpicto = 0, $option = '', $addlabel = 0, $moreinpopup = '', $sep = ' - ', $notooltip = 0, $save_lastsearch_value = -1, $morecss = '') + { + global $conf, $langs, $user, $hookmanager; + + if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips + + $result = ''; + if (! empty($conf->global->PROJECT_OPEN_ALWAYS_ON_TAB)) { + $option = $conf->global->PROJECT_OPEN_ALWAYS_ON_TAB; + } + + $label = ''; + if ($option != 'nolink') $label = ''.$langs->trans("Project").''; + $label .= ($label ? '
' : '').''.$langs->trans('Ref').': '.$this->ref; // The space must be after the : to not being explode when showing the title in img_picto + $label .= ($label ? '
' : '').''.$langs->trans('Label').': '.$this->title; // The space must be after the : to not being explode when showing the title in img_picto + if (isset($this->public)) { + $label .= '
'.$langs->trans("Visibility").": ".($this->public ? $langs->trans("SharedProject") : $langs->trans("PrivateProject")); + } + if (!empty($this->thirdparty_name)) { + $label .= ($label ? '
' : '').''.$langs->trans('ThirdParty').': '.$this->thirdparty_name; // The space must be after the : to not being explode when showing the title in img_picto + } + if (!empty($this->dateo)) { + $label .= ($label ? '
' : '').''.$langs->trans('DateStart').': '.dol_print_date($this->dateo, 'day'); // The space must be after the : to not being explode when showing the title in img_picto + } + if (!empty($this->datee)) { + $label .= ($label ? '
' : '').''.$langs->trans('DateEnd').': '.dol_print_date($this->datee, 'day'); // The space must be after the : to not being explode when showing the title in img_picto + } + if ($moreinpopup) $label .= '
'.$moreinpopup; + if (isset($this->status)) { + $label .= '
'.$langs->trans("Status").": ".$this->getLibStatut(5); + } + + $url = ''; + if ($option != 'nolink') + { + if (preg_match('/\.php$/', $option)) { + $url = dol_buildpath($option, 1).'?id='.$this->id; + } elseif ($option == 'task') + { + $url = DOL_URL_ROOT.'/projet/tasks.php?id='.$this->id; + } elseif ($option == 'preview') + { + $url = DOL_URL_ROOT.'/projet/element.php?id='.$this->id; + } else { + $url = DOL_URL_ROOT.'/projet/card.php?id='.$this->id; + } + // Add param to save lastsearch_values or not + $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0); + if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1; + if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1'; + } + + $linkclose = ''; + if (empty($notooltip) && $user->rights->projet->lire) + { + if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) + { + $label = $langs->trans("ShowProject"); + $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"'; + } + $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"'; + $linkclose .= ' class="classfortooltip"'; + + /* + $hookmanager->initHooks(array('projectdao')); + $parameters=array('id'=>$this->id); + // Note that $action and $object may have been modified by some hooks + $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action); + if ($reshook > 0) + $linkclose = $hookmanager->resPrint; + */ + } + + $picto = 'projectpub'; + if (!$this->public) $picto = 'project'; + + $linkstart = ''; + $linkend = ''; + + $result .= $linkstart; + if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1); + if ($withpicto != 2) $result .= $this->ref; + $result .= $linkend; + if ($withpicto != 2) $result .= (($addlabel && $this->title) ? $sep.dol_trunc($this->title, ($addlabel > 1 ? $addlabel : 0)) : ''); + + global $action; + $hookmanager->initHooks(array('projectdao')); + $parameters = array('id'=>$this->id, 'getnomurl'=>$result); + $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks + if ($reshook > 0) $result = $hookmanager->resPrint; + else $result .= $hookmanager->resPrint; + + return $result; + } + + /** + * Initialise an instance with random values. + * Used to build previews or test instances. + * id must be 0 if object instance is a specimen. + * + * @return void + */ + public function initAsSpecimen() + { + global $user, $langs, $conf; + + $now = dol_now(); + + // Initialise parameters + $this->id = 0; + $this->ref = 'SPECIMEN'; + $this->specimen = 1; + $this->socid = 1; + $this->date_c = $now; + $this->date_m = $now; + $this->date_start = $now; + $this->date_end = $now + (3600 * 24 * 365); + $this->note_public = 'SPECIMEN'; + $this->fk_ele = 20000; + $this->opp_amount = 20000; + $this->budget_amount = 10000; + + $this->usage_opportunity = 1; + $this->usage_task = 1; + $this->usage_bill_time = 1; + $this->usage_organize_event = 1; + + /* + $nbp = mt_rand(1, 9); + $xnbp = 0; + while ($xnbp < $nbp) + { + $line = new Task($this->db); + $line->fk_project = 0; + $line->label = $langs->trans("Label") . " " . $xnbp; + $line->description = $langs->trans("Description") . " " . $xnbp; + + $this->lines[]=$line; + $xnbp++; + } + */ + } + + /** + * Check if user has permission on current project + * + * @param User $user Object user to evaluate + * @param string $mode Type of permission we want to know: 'read', 'write' + * @return int >0 if user has permission, <0 if user has no permission + */ + public function restrictedProjectArea($user, $mode = 'read') + { + // To verify role of users + $userAccess = 0; + if (($mode == 'read' && !empty($user->rights->projet->all->lire)) || ($mode == 'write' && !empty($user->rights->projet->all->creer)) || ($mode == 'delete' && !empty($user->rights->projet->all->supprimer))) + { + $userAccess = 1; + } elseif ($this->public && (($mode == 'read' && !empty($user->rights->projet->lire)) || ($mode == 'write' && !empty($user->rights->projet->creer)) || ($mode == 'delete' && !empty($user->rights->projet->supprimer)))) + { + $userAccess = 1; + } else { + foreach (array('internal', 'external') as $source) + { + $userRole = $this->liste_contact(4, $source); + $num = count($userRole); + + $nblinks = 0; + while ($nblinks < $num) + { + if ($source == 'internal' && preg_match('/^PROJECT/', $userRole[$nblinks]['code']) && $user->id == $userRole[$nblinks]['id']) + { + if ($mode == 'read' && $user->rights->projet->lire) $userAccess++; + if ($mode == 'write' && $user->rights->projet->creer) $userAccess++; + if ($mode == 'delete' && $user->rights->projet->supprimer) $userAccess++; + } + $nblinks++; + } + } + //if (empty($nblinks)) // If nobody has permission, we grant creator + //{ + // if ((!empty($this->user_author_id) && $this->user_author_id == $user->id)) + // { + // $userAccess = 1; + // } + //} + } + + return ($userAccess ? $userAccess : -1); + } + + /** + * Return array of projects a user has permission on, is affected to, or all projects + * + * @param User $user User object + * @param int $mode 0=All project I have permission on (assigned to me or public), 1=Projects assigned to me only, 2=Will return list of all projects with no test on contacts + * @param int $list 0=Return array, 1=Return string list + * @param int $socid 0=No filter on third party, id of third party + * @param string $filter additionnal filter on project (statut, ref, ...) + * @return array or string Array of projects id, or string with projects id separated with "," if list is 1 + */ + public function getProjectsAuthorizedForUser($user, $mode = 0, $list = 0, $socid = 0, $filter = '') + { + $projects = array(); + $temp = array(); + + $sql = "SELECT ".(($mode == 0 || $mode == 1) ? "DISTINCT " : "")."p.rowid, p.ref"; + $sql.= " FROM " . MAIN_DB_PREFIX . "projet as p"; + if ($mode == 0) + { + $sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "element_contact as ec ON ec.element_id = p.rowid"; + } elseif ($mode == 1) + { + $sql.= ", " . MAIN_DB_PREFIX . "element_contact as ec"; + } elseif ($mode == 2) + { + // No filter. Use this if user has permission to see all project + } + $sql.= " WHERE p.entity IN (".getEntity('project').")"; + // Internal users must see project he is contact to even if project linked to a third party he can't see. + //if ($socid || ! $user->rights->societe->client->voir) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")"; + if ($socid > 0) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = " . $socid . ")"; + + // Get id of types of contacts for projects (This list never contains a lot of elements) + $listofprojectcontacttype=array(); + $sql2 = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc"; + $sql2.= " WHERE ctc.element = '" . $this->db->escape($this->element) . "'"; + $sql2.= " AND ctc.source = 'internal'"; + $resql = $this->db->query($sql2); + if ($resql) + { + while ($obj = $this->db->fetch_object($resql)) + { + $listofprojectcontacttype[$obj->rowid]=$obj->code; + } + } else dol_print_error($this->db); + if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0]='0'; // To avoid syntax error if not found + + if ($mode == 0) + { + $sql.= " AND ( p.public = 1"; + $sql.= " OR ( ec.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).")"; + $sql.= " AND ec.fk_socpeople = ".$user->id.")"; + $sql.= " )"; + } elseif ($mode == 1) + { + $sql.= " AND ec.element_id = p.rowid"; + $sql.= " AND ("; + $sql.= " ( ec.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).")"; + $sql.= " AND ec.fk_socpeople = ".$user->id.")"; + $sql.= " )"; + } elseif ($mode == 2) + { + // No filter. Use this if user has permission to see all project + } + + $sql.= $filter; + //print $sql; + + $resql = $this->db->query($sql); + if ($resql) + { + $num = $this->db->num_rows($resql); + $i = 0; + while ($i < $num) + { + $row = $this->db->fetch_row($resql); + $projects[$row[0]] = $row[1]; + $temp[] = $row[0]; + $i++; + } + + $this->db->free($resql); + + if ($list) + { + if (empty($temp)) return '0'; + $result = implode(',', $temp); + return $result; + } + } else { + dol_print_error($this->db); + } + + return $projects; + } + + /** + * Load an object from its id and create a new one in database * * @param User $user User making the clone * @param int $fromid Id of object to clone @@ -1346,14 +1292,14 @@ class Project extends CommonObject * @param bool $clone_task Clone task of project * @param bool $clone_project_file Clone file of project * @param bool $clone_task_file Clone file of task (if task are copied) - * @param bool $clone_note Clone note of project - * @param bool $move_date Move task date on clone - * @param integer $notrigger No trigger flag - * @param int $newthirdpartyid New thirdparty id + * @param bool $clone_note Clone note of project + * @param bool $move_date Move task date on clone + * @param integer $notrigger No trigger flag + * @param int $newthirdpartyid New thirdparty id * @return int New id of clone */ - public function createFromClone(User $user, $fromid, $clone_contact = false, $clone_task = true, $clone_project_file = false, $clone_task_file = false, $clone_note = true, $move_date = true, $notrigger = 0, $newthirdpartyid = 0) - { + public function createFromClone(User $user, $fromid, $clone_contact = false, $clone_task = true, $clone_project_file = false, $clone_task_file = false, $clone_note = true, $move_date = true, $notrigger = 0, $newthirdpartyid = 0) + { global $langs, $conf; $error = 0; @@ -1379,40 +1325,40 @@ class Project extends CommonObject $clone_project->id = 0; if ($move_date) { - $clone_project->date_start = $now; - if (!(empty($clone_project->date_end))) - { - $clone_project->date_end = $clone_project->date_end + ($now - $orign_dt_start); - } + $clone_project->date_start = $now; + if (!(empty($clone_project->date_end))) + { + $clone_project->date_end = $clone_project->date_end + ($now - $orign_dt_start); + } } - $clone_project->datec = $now; + $clone_project->datec = $now; - if (!$clone_note) - { - $clone_project->note_private = ''; - $clone_project->note_public = ''; - } + if (!$clone_note) + { + $clone_project->note_private = ''; + $clone_project->note_public = ''; + } //Generate next ref $defaultref = ''; - $obj = empty($conf->global->PROJECT_ADDON) ? 'mod_project_simple' : $conf->global->PROJECT_ADDON; - // Search template files - $file = ''; $classname = ''; $filefound = 0; - $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']); - foreach ($dirmodels as $reldir) - { - $file = dol_buildpath($reldir."core/modules/project/".$obj.'.php', 0); - if (file_exists($file)) - { - $filefound = 1; - dol_include_once($reldir."core/modules/project/".$obj.'.php'); - $modProject = new $obj; - $defaultref = $modProject->getNextValue(is_object($clone_project->thirdparty) ? $clone_project->thirdparty : null, $clone_project); - break; - } - } - if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = ''; + $obj = empty($conf->global->PROJECT_ADDON) ? 'mod_project_simple' : $conf->global->PROJECT_ADDON; + // Search template files + $file = ''; $classname = ''; $filefound = 0; + $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']); + foreach ($dirmodels as $reldir) + { + $file = dol_buildpath($reldir."core/modules/project/".$obj.'.php', 0); + if (file_exists($file)) + { + $filefound = 1; + dol_include_once($reldir."core/modules/project/".$obj.'.php'); + $modProject = new $obj; + $defaultref = $modProject->getNextValue(is_object($clone_project->thirdparty) ? $clone_project->thirdparty : null, $clone_project); + break; + } + } + if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = ''; $clone_project->ref = $defaultref; $clone_project->title = $langs->trans("CopyOf").' '.$clone_project->title; @@ -1433,23 +1379,19 @@ class Project extends CommonObject $clone_project_id = $clone_project->id; //Note Update - if (!$clone_note) - { - $clone_project->note_private = ''; - $clone_project->note_public = ''; - } - else - { - $this->db->begin(); + if (!$clone_note) + { + $clone_project->note_private = ''; + $clone_project->note_public = ''; + } else { + $this->db->begin(); $res = $clone_project->update_note(dol_html_entity_decode($clone_project->note_public, ENT_QUOTES), '_public'); if ($res < 0) { $this->error .= $clone_project->error; $error++; $this->db->rollback(); - } - else - { + } else { $this->db->commit(); } @@ -1460,12 +1402,10 @@ class Project extends CommonObject $this->error .= $clone_project->error; $error++; $this->db->rollback(); - } - else - { + } else { $this->db->commit(); } - } + } //Duplicate contact if ($clone_contact) @@ -1485,9 +1425,7 @@ class Project extends CommonObject $langs->load("errors"); $this->error .= $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"); $error++; - } - else - { + } else { if ($clone_project->error != '') { $this->error .= $clone_project->error; @@ -1518,9 +1456,7 @@ class Project extends CommonObject $error++; } } - } - else - { + } else { $this->error .= $langs->trans('ErrorInternalErrorDetected').':dol_mkdir'; $error++; } @@ -1529,57 +1465,55 @@ class Project extends CommonObject //Duplicate task if ($clone_task) { - require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; + require_once DOL_DOCUMENT_ROOT . '/projet/class/task.class.php'; $taskstatic = new Task($this->db); // Security check - $socid = 0; + $socid=0; if ($user->socid > 0) $socid = $user->socid; - $tasksarray = $taskstatic->getTasksArray(0, 0, $fromid, $socid, 0); + $tasksarray=$taskstatic->getTasksArray(0, 0, $fromid, $socid, 0); - $tab_conv_child_parent = array(); + $tab_conv_child_parent=array(); // Loop on each task, to clone it - foreach ($tasksarray as $tasktoclone) - { + foreach ($tasksarray as $tasktoclone) + { $result_clone = $taskstatic->createFromClone($user, $tasktoclone->id, $clone_project_id, $tasktoclone->fk_parent, $move_date, true, false, $clone_task_file, true, false); if ($result_clone <= 0) - { - $this->error .= $result_clone->error; + { + $this->error .= $result_clone->error; $error++; - } - else - { - $new_task_id = $result_clone; - $taskstatic->fetch($tasktoclone->id); + } else { + $new_task_id = $result_clone; + $taskstatic->fetch($tasktoclone->id); - //manage new parent clone task id - // if the current task has child we store the original task id and the equivalent clone task id + //manage new parent clone task id + // if the current task has child we store the original task id and the equivalent clone task id if (($taskstatic->hasChildren()) && !array_key_exists($tasktoclone->id, $tab_conv_child_parent)) { $tab_conv_child_parent[$tasktoclone->id] = $new_task_id; } - } - } + } + } - //Parse all clone node to be sure to update new parent - $tasksarray = $taskstatic->getTasksArray(0, 0, $clone_project_id, $socid, 0); - foreach ($tasksarray as $task_cloned) - { - $taskstatic->fetch($task_cloned->id); - if ($taskstatic->fk_task_parent != 0) - { - $taskstatic->fk_task_parent = $tab_conv_child_parent[$taskstatic->fk_task_parent]; - } - $res = $taskstatic->update($user, $notrigger); - if ($result_clone <= 0) - { - $this->error .= $taskstatic->error; + //Parse all clone node to be sure to update new parent + $tasksarray = $taskstatic->getTasksArray(0, 0, $clone_project_id, $socid, 0); + foreach ($tasksarray as $task_cloned) + { + $taskstatic->fetch($task_cloned->id); + if ($taskstatic->fk_task_parent != 0) + { + $taskstatic->fk_task_parent = $tab_conv_child_parent[$taskstatic->fk_task_parent]; + } + $res = $taskstatic->update($user, $notrigger); + if ($result_clone <= 0) + { + $this->error .= $taskstatic->error; $error++; - } - } + } + } } } @@ -1589,104 +1523,100 @@ class Project extends CommonObject { $this->db->commit(); return $clone_project_id; - } - else - { + } else { $this->db->rollback(); dol_syslog(get_class($this)."::createFromClone nbError: ".$error." error : ".$this->error, LOG_ERR); return -1; } - } + } - /** + /** * Shift project task date from current date to delta * * @param integer $old_project_dt_start Old project start date * @return int 1 if OK or < 0 if KO */ - public function shiftTaskDate($old_project_dt_start) - { + public function shiftTaskDate($old_project_dt_start) + { global $user, $langs, $conf; - $error = 0; + $error=0; $taskstatic = new Task($this->db); // Security check - $socid = 0; + $socid=0; if ($user->socid > 0) $socid = $user->socid; - $tasksarray = $taskstatic->getTasksArray(0, 0, $this->id, $socid, 0); + $tasksarray=$taskstatic->getTasksArray(0, 0, $this->id, $socid, 0); - foreach ($tasksarray as $tasktoshiftdate) - { - $to_update = false; - // Fetch only if update of date will be made - if ((!empty($tasktoshiftdate->date_start)) || (!empty($tasktoshiftdate->date_end))) - { - //dol_syslog(get_class($this)."::shiftTaskDate to_update", LOG_DEBUG); - $to_update = true; - $task = new Task($this->db); - $result = $task->fetch($tasktoshiftdate->id); - if (!$result) - { - $error++; - $this->error .= $task->error; - } - } + foreach ($tasksarray as $tasktoshiftdate) + { + $to_update=false; + // Fetch only if update of date will be made + if ((!empty($tasktoshiftdate->date_start)) || (!empty($tasktoshiftdate->date_end))) + { + //dol_syslog(get_class($this)."::shiftTaskDate to_update", LOG_DEBUG); + $to_update=true; + $task = new Task($this->db); + $result = $task->fetch($tasktoshiftdate->id); + if (!$result) + { + $error++; + $this->error.=$task->error; + } + } //print "$this->date_start + $tasktoshiftdate->date_start - $old_project_dt_start";exit; - //Calcultate new task start date with difference between old proj start date and origin task start date - if (!empty($tasktoshiftdate->date_start)) - { + //Calcultate new task start date with difference between old proj start date and origin task start date + if (!empty($tasktoshiftdate->date_start)) + { $task->date_start = $this->date_start + ($tasktoshiftdate->date_start - $old_project_dt_start); - } + } - //Calcultate new task end date with difference between origin proj end date and origin task end date - if (!empty($tasktoshiftdate->date_end)) - { + //Calcultate new task end date with difference between origin proj end date and origin task end date + if (!empty($tasktoshiftdate->date_end)) + { $task->date_end = $this->date_start + ($tasktoshiftdate->date_end - $old_project_dt_start); - } + } if ($to_update) { - $result = $task->update($user); - if (!$result) - { - $error++; - $this->error .= $task->error; - } + $result = $task->update($user); + if (!$result) + { + $error++; + $this->error .= $task->error; + } } - } - if ($error != 0) - { - return -1; - } - return $result; + } + if ($error != 0) + { + return -1; + } + return $result; } - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps /** * Associate element to a project * * @param string $tableName Table of the element to update * @param int $elementSelectId Key-rowid of the line of the element to update * @return int 1 if OK or < 0 if KO - */ + */ public function update_element($tableName, $elementSelectId) { - // phpcs:enable + // phpcs:enable $sql = "UPDATE ".MAIN_DB_PREFIX.$tableName; if ($tableName == "actioncomm") { $sql .= " SET fk_project=".$this->id; $sql .= " WHERE id=".$elementSelectId; - } - else - { + } else { $sql .= " SET fk_projet=".$this->id; $sql .= " WHERE rowid=".$elementSelectId; } @@ -1701,27 +1631,26 @@ class Project extends CommonObject } } - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps /** * Associate element to a project * * @param string $tableName Table of the element to update * @param int $elementSelectId Key-rowid of the line of the element to update * @param string $projectfield The column name that stores the link with the project - * + * * @return int 1 if OK or < 0 if KO */ public function remove_element($tableName, $elementSelectId, $projectfield = 'fk_projet') { - // phpcs:enable + // phpcs:enable $sql = "UPDATE ".MAIN_DB_PREFIX.$tableName; if ($tableName == "actioncomm") { $sql .= " SET fk_project=NULL"; $sql .= " WHERE id=".$elementSelectId; - } else - { + } else { $sql .= " SET ".$projectfield."=NULL"; $sql .= " WHERE rowid=".$elementSelectId; } @@ -1748,16 +1677,16 @@ class Project extends CommonObject */ public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0) { - global $conf, $langs; + global $conf,$langs; $langs->load("projects"); - if (!dol_strlen($modele)) { + if (! dol_strlen($modele)) { $modele = 'baleine'; if ($this->modelpdf) { $modele = $this->modelpdf; - } elseif (!empty($conf->global->PROJECT_ADDON_PDF)) { + } elseif (! empty($conf->global->PROJECT_ADDON_PDF)) { $modele = $conf->global->PROJECT_ADDON_PDF; } } @@ -1777,60 +1706,57 @@ class Project extends CommonObject * @param int $userid Time spent by a particular user * @return int <0 if OK, >0 if KO */ - public function loadTimeSpent($datestart, $taskid = 0, $userid = 0) - { - $error = 0; + public function loadTimeSpent($datestart, $taskid = 0, $userid = 0) + { + $error=0; - $this->weekWorkLoad = array(); - $this->weekWorkLoadPerTask = array(); + $this->weekWorkLoad=array(); + $this->weekWorkLoadPerTask=array(); - if (empty($datestart)) dol_print_error('', 'Error datestart parameter is empty'); + if (empty($datestart)) dol_print_error('', 'Error datestart parameter is empty'); - $sql = "SELECT ptt.rowid as taskid, ptt.task_duration, ptt.task_date, ptt.task_datehour, ptt.fk_task"; - $sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time AS ptt, ".MAIN_DB_PREFIX."projet_task as pt"; - $sql .= " WHERE ptt.fk_task = pt.rowid"; - $sql .= " AND pt.fk_projet = ".$this->id; - $sql .= " AND (ptt.task_date >= '".$this->db->idate($datestart)."' "; - $sql .= " AND ptt.task_date <= '".$this->db->idate(dol_time_plus_duree($datestart, 1, 'w') - 1)."')"; - if ($taskid) $sql .= " AND ptt.fk_task=".$taskid; - if (is_numeric($userid)) $sql .= " AND ptt.fk_user=".$userid; + $sql = "SELECT ptt.rowid as taskid, ptt.task_duration, ptt.task_date, ptt.task_datehour, ptt.fk_task"; + $sql.= " FROM ".MAIN_DB_PREFIX."projet_task_time AS ptt, ".MAIN_DB_PREFIX."projet_task as pt"; + $sql.= " WHERE ptt.fk_task = pt.rowid"; + $sql.= " AND pt.fk_projet = ".$this->id; + $sql.= " AND (ptt.task_date >= '".$this->db->idate($datestart)."' "; + $sql.= " AND ptt.task_date <= '".$this->db->idate(dol_time_plus_duree($datestart, 1, 'w') - 1)."')"; + if ($taskid) $sql.= " AND ptt.fk_task=".$taskid; + if (is_numeric($userid)) $sql.= " AND ptt.fk_user=".$userid; - //print $sql; - $resql = $this->db->query($sql); - if ($resql) - { - $daylareadyfound = array(); + //print $sql; + $resql=$this->db->query($sql); + if ($resql) + { + $daylareadyfound=array(); - $num = $this->db->num_rows($resql); - $i = 0; - // Loop on each record found, so each couple (project id, task id) + $num = $this->db->num_rows($resql); + $i = 0; + // Loop on each record found, so each couple (project id, task id) while ($i < $num) - { - $obj = $this->db->fetch_object($resql); - $day = $this->db->jdate($obj->task_date); // task_date is date without hours + { + $obj=$this->db->fetch_object($resql); + $day=$this->db->jdate($obj->task_date); // task_date is date without hours if (empty($daylareadyfound[$day])) - { + { $this->weekWorkLoad[$day] = $obj->task_duration; $this->weekWorkLoadPerTask[$day][$obj->fk_task] = $obj->task_duration; - } - else - { + } else { $this->weekWorkLoad[$day] += $obj->task_duration; $this->weekWorkLoadPerTask[$day][$obj->fk_task] += $obj->task_duration; } - $daylareadyfound[$day] = 1; - $i++; + $daylareadyfound[$day]=1; + $i++; } - $this->db->free($resql); - return 1; - } - else - { - $this->error = "Error ".$this->db->lasterror(); - dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR); - return -1; - } - } + $this->db->free($resql); + return 1; + } else { + $this->error = "Error ".$this->db->lasterror(); + dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR); + return -1; + } + } + /** * Load time spent into this->weekWorkLoad and this->weekWorkLoadPerTask for all day of a week of project. * Note: array weekWorkLoad and weekWorkLoadPerTask are reset and filled at each call. @@ -1878,9 +1804,7 @@ class Project extends CommonObject { $this->monthWorkLoad[$week_number] = $obj->task_duration; $this->monthWorkLoadPerTask[$week_number][$obj->fk_task] = $obj->task_duration; - } - else - { + } else { $this->monthWorkLoad[$week_number] += $obj->task_duration; $this->monthWorkLoadPerTask[$week_number][$obj->fk_task] += $obj->task_duration; } @@ -1889,9 +1813,7 @@ class Project extends CommonObject } $this->db->free($resql); return 1; - } - else - { + } else { $this->error = "Error ".$this->db->lasterror(); dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR); return -1; @@ -1899,74 +1821,72 @@ class Project extends CommonObject } - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps - /** - * Load indicators for dashboard (this->nbtodo and this->nbtodolate) - * - * @param User $user Objet user - * @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK - */ - public function load_board($user) - { - // phpcs:enable - global $conf, $langs; + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps + /** + * Load indicators for dashboard (this->nbtodo and this->nbtodolate) + * + * @param User $user Objet user + * @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK + */ + public function load_board($user) + { + // phpcs:enable + global $conf, $langs; - // For external user, no check is done on company because readability is managed by public status of project and assignement. - //$socid=$user->socid; + // For external user, no check is done on company because readability is managed by public status of project and assignement. + //$socid=$user->socid; $projectsListId = null; - if (!$user->rights->projet->all->lire) $projectsListId = $this->getProjectsAuthorizedForUser($user, 0, 1); + if (!$user->rights->projet->all->lire) $projectsListId = $this->getProjectsAuthorizedForUser($user, 0, 1); - $sql = "SELECT p.rowid, p.fk_statut as status, p.fk_opp_status, p.datee as datee"; - $sql .= " FROM (".MAIN_DB_PREFIX."projet as p"; - $sql .= ")"; - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid"; - // For external user, no check is done on company permission because readability is managed by public status of project and assignement. - //if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid"; - $sql .= " WHERE p.fk_statut = 1"; - $sql .= " AND p.entity IN (".getEntity('project').')'; - if (!empty($projectsListId)) $sql .= " AND p.rowid IN (".$projectsListId.")"; - // No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser - //if ($socid || ! $user->rights->societe->client->voir) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")"; - // For external user, no check is done on company permission because readability is managed by public status of project and assignement. - //if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))"; + $sql = "SELECT p.rowid, p.fk_statut as status, p.fk_opp_status, p.datee as datee"; + $sql .= " FROM (".MAIN_DB_PREFIX."projet as p"; + $sql .= ")"; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid"; + // For external user, no check is done on company permission because readability is managed by public status of project and assignement. + //if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid"; + $sql .= " WHERE p.fk_statut = 1"; + $sql .= " AND p.entity IN (".getEntity('project').')'; + if (!empty($projectsListId)) $sql .= " AND p.rowid IN (".$projectsListId.")"; + // No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser + //if ($socid || ! $user->rights->societe->client->voir) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")"; + // For external user, no check is done on company permission because readability is managed by public status of project and assignement. + //if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))"; - //print $sql; - $resql = $this->db->query($sql); - if ($resql) - { - $project_static = new Project($this->db); + //print $sql; + $resql = $this->db->query($sql); + if ($resql) + { + $project_static = new Project($this->db); - $response = new WorkboardResponse(); - $response->warning_delay = $conf->projet->warning_delay / 60 / 60 / 24; - $response->label = $langs->trans("OpenedProjects"); - $response->labelShort = $langs->trans("Opened"); - if ($user->rights->projet->all->lire) $response->url = DOL_URL_ROOT.'/projet/list.php?search_status=1&mainmenu=project'; - else $response->url = DOL_URL_ROOT.'/projet/list.php?search_project_user=-1&search_status=1&mainmenu=project'; - $response->img = img_object('', "projectpub"); + $response = new WorkboardResponse(); + $response->warning_delay = $conf->projet->warning_delay / 60 / 60 / 24; + $response->label = $langs->trans("OpenedProjects"); + $response->labelShort = $langs->trans("Opened"); + if ($user->rights->projet->all->lire) $response->url = DOL_URL_ROOT.'/projet/list.php?search_status=1&mainmenu=project'; + else $response->url = DOL_URL_ROOT.'/projet/list.php?search_project_user=-1&search_status=1&mainmenu=project'; + $response->img = img_object('', "projectpub"); - // This assignment in condition is not a bug. It allows walking the results. - while ($obj = $this->db->fetch_object($resql)) - { - $response->nbtodo++; + // This assignment in condition is not a bug. It allows walking the results. + while ($obj = $this->db->fetch_object($resql)) + { + $response->nbtodo++; - $project_static->statut = $obj->status; - $project_static->opp_status = $obj->opp_status; - $project_static->datee = $this->db->jdate($obj->datee); + $project_static->statut = $obj->status; + $project_static->opp_status = $obj->opp_status; + $project_static->datee = $this->db->jdate($obj->datee); - if ($project_static->hasDelay()) { - $response->nbtodolate++; - } - } + if ($project_static->hasDelay()) { + $response->nbtodolate++; + } + } - return $response; - } - else - { - $this->error = $this->db->error(); - return -1; - } - } + return $response; + } else { + $this->error = $this->db->error(); + return -1; + } + } /** @@ -1987,7 +1907,7 @@ class Project extends CommonObject } - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps /** * Charge indicateurs this->nb pour le tableau de bord * @@ -1995,37 +1915,35 @@ class Project extends CommonObject */ public function load_state_board() { - // phpcs:enable - global $user; + // phpcs:enable + global $user; - $this->nb = array(); + $this->nb = array(); - $sql = "SELECT count(p.rowid) as nb"; - $sql .= " FROM ".MAIN_DB_PREFIX."projet as p"; - $sql .= " WHERE"; - $sql .= " p.entity IN (".getEntity('project').")"; + $sql = "SELECT count(p.rowid) as nb"; + $sql .= " FROM ".MAIN_DB_PREFIX."projet as p"; + $sql .= " WHERE"; + $sql .= " p.entity IN (".getEntity('project').")"; if (!$user->rights->projet->all->lire) { $projectsListId = $this->getProjectsAuthorizedForUser($user, 0, 1); $sql .= "AND p.rowid IN (".$projectsListId.")"; } - $resql = $this->db->query($sql); - if ($resql) - { - while ($obj = $this->db->fetch_object($resql)) - { - $this->nb["projects"] = $obj->nb; - } - $this->db->free($resql); - return 1; - } - else - { - dol_print_error($this->db); - $this->error = $this->db->error(); - return -1; - } + $resql = $this->db->query($sql); + if ($resql) + { + while ($obj = $this->db->fetch_object($resql)) + { + $this->nb["projects"] = $obj->nb; + } + $this->db->free($resql); + return 1; + } else { + dol_print_error($this->db); + $this->error = $this->db->error(); + return -1; + } } @@ -2036,14 +1954,14 @@ class Project extends CommonObject */ public function hasDelay() { - global $conf; + global $conf; - if (!($this->statut == self::STATUS_VALIDATED)) return false; - if (!$this->datee && !$this->date_end) return false; + if (!($this->statut == self::STATUS_VALIDATED)) return false; + if (!$this->datee && !$this->date_end) return false; - $now = dol_now(); + $now = dol_now(); - return ($this->datee ? $this->datee : $this->date_end) < ($now - $conf->projet->warning_delay); + return ($this->datee ? $this->datee : $this->date_end) < ($now - $conf->projet->warning_delay); } @@ -2055,43 +1973,41 @@ class Project extends CommonObject */ public function info($id) { - $sql = 'SELECT c.rowid, datec as datec, tms as datem,'; - $sql .= ' date_close as datecloture,'; - $sql .= ' fk_user_creat as fk_user_author, fk_user_close as fk_use_cloture'; - $sql .= ' FROM '.MAIN_DB_PREFIX.'projet as c'; - $sql .= ' WHERE c.rowid = '.$id; - $result = $this->db->query($sql); - if ($result) - { - if ($this->db->num_rows($result)) - { - $obj = $this->db->fetch_object($result); - $this->id = $obj->rowid; - if ($obj->fk_user_author) - { - $cuser = new User($this->db); - $cuser->fetch($obj->fk_user_author); - $this->user_creation = $cuser; - } + $sql = 'SELECT c.rowid, datec as datec, tms as datem,'; + $sql .= ' date_close as datecloture,'; + $sql .= ' fk_user_creat as fk_user_author, fk_user_close as fk_use_cloture'; + $sql .= ' FROM '.MAIN_DB_PREFIX.'projet as c'; + $sql .= ' WHERE c.rowid = '.$id; + $result = $this->db->query($sql); + if ($result) + { + if ($this->db->num_rows($result)) + { + $obj = $this->db->fetch_object($result); + $this->id = $obj->rowid; + if ($obj->fk_user_author) + { + $cuser = new User($this->db); + $cuser->fetch($obj->fk_user_author); + $this->user_creation = $cuser; + } - if ($obj->fk_user_cloture) - { - $cluser = new User($this->db); - $cluser->fetch($obj->fk_user_cloture); - $this->user_cloture = $cluser; - } + if ($obj->fk_user_cloture) + { + $cluser = new User($this->db); + $cluser->fetch($obj->fk_user_cloture); + $this->user_cloture = $cluser; + } - $this->date_creation = $this->db->jdate($obj->datec); - $this->date_modification = $this->db->jdate($obj->datem); - $this->date_cloture = $this->db->jdate($obj->datecloture); - } + $this->date_creation = $this->db->jdate($obj->datec); + $this->date_modification = $this->db->jdate($obj->datem); + $this->date_cloture = $this->db->jdate($obj->datecloture); + } - $this->db->free($result); - } - else - { - dol_print_error($this->db); - } + $this->db->free($result); + } else { + dol_print_error($this->db); + } } /** @@ -2102,7 +2018,7 @@ class Project extends CommonObject * Existing categories are left untouch. * * @param int[]|int $categories Category or categories IDs - * @return void + * @return void */ public function setCategories($categories) { @@ -2161,9 +2077,9 @@ class Project extends CommonObject */ public function getLinesArray($user) { - require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; - $taskstatic = new Task($this->db); + require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; + $taskstatic = new Task($this->db); - $this->lines = $taskstatic->getTasksArray(0, $user, $this->id, 0, 0); + $this->lines = $taskstatic->getTasksArray(0, $user, $this->id, 0, 0); } } diff --git a/htdocs/projet/class/projectstats.class.php b/htdocs/projet/class/projectstats.class.php index 22868e96899..cb6150b6dc7 100644 --- a/htdocs/projet/class/projectstats.class.php +++ b/htdocs/projet/class/projectstats.class.php @@ -92,9 +92,7 @@ class ProjectStats extends Stats $label.' ('.price(price2num($row[0], 'MT'), 1, $langs, 1, -1, -1, $conf->currency).')', $row[0] ); - } - else - $other += $row[1]; + } else $other += $row[1]; $i++; } if ($num > $limit) @@ -281,9 +279,7 @@ class ProjectStats extends Stats $foundintocache = 1; $this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate; - } - else - { + } else { dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it."); } } @@ -293,9 +289,7 @@ class ProjectStats extends Stats { dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate."."); $data = json_decode(file_get_contents($newpathofdestfile), true); - } - else - { + } else { $year = $startyear; while ($year <= $endyear) { @@ -329,8 +323,7 @@ class ProjectStats extends Stats fclose($fp); if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK; @chmod($newpathofdestfile, octdec($newmask)); - } - else dol_syslog("Failed to write cache file", LOG_ERR); + } else dol_syslog("Failed to write cache file", LOG_ERR); $this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $nowgmt; } diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index 41f6a76afb2..10f5a36d67f 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -225,9 +225,7 @@ class Task extends CommonObject } $this->db->rollback(); return -1 * $error; - } - else - { + } else { $this->db->commit(); return $this->id; } @@ -328,9 +326,7 @@ class Task extends CommonObject } else { return 0; } - } - else - { + } else { $this->error = "Error ".$this->db->lasterror(); return -1; } @@ -439,9 +435,7 @@ class Task extends CommonObject } $this->db->rollback(); return -1 * $error; - } - else - { + } else { $this->db->commit(); return 1; } @@ -543,9 +537,7 @@ class Task extends CommonObject } $this->db->rollback(); return -1 * $error; - } - else - { + } else { //Delete associated link file if ($conf->projet->dir_output) { @@ -589,9 +581,7 @@ class Task extends CommonObject dol_syslog(get_class($this)."::hasChildren", LOG_DEBUG); $resql = $this->db->query($sql); - if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); } - else - { + if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); } else { $obj = $this->db->fetch_object($resql); if ($obj) $ret = $obj->nb; $this->db->free($resql); @@ -600,9 +590,7 @@ class Task extends CommonObject if (!$error) { return $ret; - } - else - { + } else { return -1; } } @@ -623,9 +611,7 @@ class Task extends CommonObject dol_syslog(get_class($this)."::hasTimeSpent", LOG_DEBUG); $resql = $this->db->query($sql); - if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); } - else - { + if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); } else { $obj = $this->db->fetch_object($resql); if ($obj) $ret = $obj->nb; $this->db->free($resql); @@ -634,9 +620,7 @@ class Task extends CommonObject if (!$error) { return $ret; - } - else - { + } else { return -1; } } @@ -799,8 +783,7 @@ class Task extends CommonObject $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_extrafields as efpt ON (t.rowid = efpt.fk_object)"; $sql .= " WHERE p.entity IN (".getEntity('project').")"; $sql .= " AND t.fk_projet = p.rowid"; - } - elseif ($mode == 1) + } elseif ($mode == 1) { if ($filteronprojuser > 0) { @@ -816,9 +799,7 @@ class Task extends CommonObject } $sql .= ", ".MAIN_DB_PREFIX."element_contact as ec2"; $sql .= ", ".MAIN_DB_PREFIX."c_type_contact as ctc2"; - } - else - { + } else { $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid"; if ($includebilltime) { @@ -827,8 +808,7 @@ class Task extends CommonObject } $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_extrafields as efpt ON (t.rowid = efpt.fk_object)"; $sql .= " WHERE p.entity IN (".getEntity('project').")"; - } - else return 'BadValueForParameterMode'; + } else return 'BadValueForParameterMode'; if ($filteronprojuser > 0) { @@ -974,9 +954,7 @@ class Task extends CommonObject $i++; } $this->db->free($resql); - } - else - { + } else { dol_print_error($this->db); } @@ -1054,9 +1032,7 @@ class Task extends CommonObject $i++; } $this->db->free($resql); - } - else - { + } else { dol_print_error($this->db); } @@ -1080,7 +1056,7 @@ class Task extends CommonObject while ($i < $num) { if ($source == 'thirdparty') $contactAlreadySelected[$i] = $tab[$i]['socid']; - else $contactAlreadySelected[$i] = $tab[$i]['id']; + else $contactAlreadySelected[$i] = $tab[$i]['id']; $i++; } return $contactAlreadySelected; @@ -1147,9 +1123,7 @@ class Task extends CommonObject if ($result < 0) { $ret = -1; } // End call triggers } - } - else - { + } else { $this->error = $this->db->lasterror(); $ret = -1; } @@ -1184,9 +1158,7 @@ class Task extends CommonObject if ($ret > 0) { $this->db->commit(); - } - else - { + } else { $this->db->rollback(); } return $ret; @@ -1246,9 +1218,7 @@ class Task extends CommonObject $this->timespent_nblines = ($obj->nblines ? $obj->nblines : 0); $this->db->free($resql); - } - else - { + } else { dol_print_error($this->db); } return $result; @@ -1303,9 +1273,7 @@ class Task extends CommonObject $this->db->free($resql); return $result; - } - else - { + } else { dol_print_error($this->db); return $result; } @@ -1356,9 +1324,7 @@ class Task extends CommonObject $this->db->free($resql); return 1; - } - else - { + } else { $this->error = "Error ".$this->db->lasterror(); return -1; } @@ -1443,9 +1409,7 @@ class Task extends CommonObject } $this->db->free($resql); - } - else - { + } else { dol_print_error($this->db); $this->error = "Error ".$this->db->lasterror(); return -1; @@ -1505,14 +1469,10 @@ class Task extends CommonObject { $this->db->rollback(); $ret = -1; - } - else $ret = 1; + } else $ret = 1; // End call triggers - } - else $ret = 1; - } - else - { + } else $ret = 1; + } else { $this->error = $this->db->lasterror(); $this->db->rollback(); $ret = -1; @@ -1582,9 +1542,7 @@ class Task extends CommonObject if ($this->db->query($sql)) { $result = 0; - } - else - { + } else { $this->error = $this->db->lasterror(); $result = -2; } @@ -1600,9 +1558,7 @@ class Task extends CommonObject } $this->db->rollback(); return -1 * $error; - } - else - { + } else { $this->db->commit(); return 1; } @@ -1714,9 +1670,7 @@ class Task extends CommonObject { $clone_task->note_private = ''; $clone_task->note_public = ''; - } - else - { + } else { $this->db->begin(); $res = $clone_task->update_note(dol_html_entity_decode($clone_task->note_public, ENT_QUOTES), '_public'); if ($res < 0) @@ -1724,9 +1678,7 @@ class Task extends CommonObject $this->error .= $clone_task->error; $error++; $this->db->rollback(); - } - else - { + } else { $this->db->commit(); } @@ -1737,9 +1689,7 @@ class Task extends CommonObject $this->error .= $clone_task->error; $error++; $this->db->rollback(); - } - else - { + } else { $this->db->commit(); } } @@ -1758,9 +1708,7 @@ class Task extends CommonObject { $projectstatic->fetch($project_id); $clone_project_ref = $projectstatic->ref; - } - else - { + } else { $clone_project_ref = $ori_project_ref; } @@ -1807,9 +1755,7 @@ class Task extends CommonObject $langs->load("errors"); $this->error .= $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"); $error++; - } - else - { + } else { if ($clone_task->error != '') { $this->error .= $clone_task->error; @@ -1833,9 +1779,7 @@ class Task extends CommonObject { $this->db->commit(); return $clone_task_id; - } - else - { + } else { $this->db->rollback(); dol_syslog(get_class($this)."::createFromClone nbError: ".$error." error : ".$this->error, LOG_ERR); return -1; @@ -1882,12 +1826,10 @@ class Task extends CommonObject if ($mode == 0) { return $langs->trans($this->statuts[$status]); - } - elseif ($mode == 1) + } elseif ($mode == 1) { return $langs->trans($this->statuts_short[$status]); - } - elseif ($mode == 2) + } elseif ($mode == 2) { if ($status == 0) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts_short[$status]); elseif ($status == 1) return img_picto($langs->trans($this->statuts_short[$status]), 'statut1').' '.$langs->trans($this->statuts_short[$status]); @@ -1895,8 +1837,7 @@ class Task extends CommonObject elseif ($status == 3) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts_short[$status]); elseif ($status == 4) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts_short[$status]); elseif ($status == 5) return img_picto($langs->trans($this->statuts_short[$status]), 'statut5').' '.$langs->trans($this->statuts_short[$status]); - } - elseif ($mode == 3) + } elseif ($mode == 3) { if ($status == 0) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0'); elseif ($status == 1) return img_picto($langs->trans($this->statuts_short[$status]), 'statut1'); @@ -1904,8 +1845,7 @@ class Task extends CommonObject elseif ($status == 3) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6'); elseif ($status == 4) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6'); elseif ($status == 5) return img_picto($langs->trans($this->statuts_short[$status]), 'statut5'); - } - elseif ($mode == 4) + } elseif ($mode == 4) { if ($status == 0) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts[$status]); elseif ($status == 1) return img_picto($langs->trans($this->statuts_short[$status]), 'statut1').' '.$langs->trans($this->statuts[$status]); @@ -1913,8 +1853,7 @@ class Task extends CommonObject elseif ($status == 3) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]); elseif ($status == 4) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]); elseif ($status == 5) return img_picto($langs->trans($this->statuts_short[$status]), 'statut5').' '.$langs->trans($this->statuts[$status]); - } - elseif ($mode == 5) + } elseif ($mode == 5) { /*if ($status==0) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'statut0'); elseif ($status==1) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'statut1'); @@ -1925,8 +1864,7 @@ class Task extends CommonObject */ //else return $this->progress.' %'; return ' '; - } - elseif ($mode == 6) + } elseif ($mode == 6) { /*if ($status==0) return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'statut0'); elseif ($status==1) return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'statut1'); @@ -2038,9 +1976,7 @@ class Task extends CommonObject } return $response; - } - else - { + } else { $this->error = $this->db->error(); return -1; } @@ -2087,9 +2023,7 @@ class Task extends CommonObject } $this->db->free($resql); return 1; - } - else - { + } else { dol_print_error($this->db); $this->error = $this->db->error(); return -1; diff --git a/htdocs/projet/class/taskstats.class.php b/htdocs/projet/class/taskstats.class.php index 12d6395af66..722736fe9b8 100644 --- a/htdocs/projet/class/taskstats.class.php +++ b/htdocs/projet/class/taskstats.class.php @@ -82,9 +82,7 @@ class TaskStats extends Stats $row[1], $row[0] ); - } - else - $other += $row[1]; + } else $other += $row[1]; $i++; } if ($num > $limit) diff --git a/htdocs/projet/comment.php b/htdocs/projet/comment.php index d16dca5ceb1..04e306f9dfb 100644 --- a/htdocs/projet/comment.php +++ b/htdocs/projet/comment.php @@ -123,8 +123,7 @@ print '
| '.$langs->trans("Visibility").' | '; if ($object->public) print $langs->trans('SharedProject'); -else - print $langs->trans('PrivateProject'); +else print $langs->trans('PrivateProject'); print ' |
| '.$langs->trans("Element").' | '; +print '';
+$tooltiponprofit = $langs->trans("ProfitIsCalculatedWith")." \n"; +$tooltiponprofitplus = $tooltiponprofitminus = ''; +foreach ($listofreferent as $key => $value) +{ + $name = $langs->trans($value['name']); + $qualified = $value['test']; + $margin = $value['margin']; + if ($qualified && isset($margin)) // If this element must be included into profit calculation ($margin is 'minus' or 'add') + { + if ($margin == 'add') { + $tooltiponprofitplus.=' + '.$name." \n"; + } + if ($margin == 'minus') { + $tooltiponprofitminus.=' - '.$name." \n"; + } + } +} +$tooltiponprofit .= $tooltiponprofitplus; +$tooltiponprofit .= $tooltiponprofitminus; +print $form->textwithpicto($langs->trans("Element"), $tooltiponprofit); +print ' | ';
print ''.$langs->trans("Number").' | '; print ''.$langs->trans("AmountHT").' | '; print ''.$langs->trans("AmountTTC").' | '; @@ -640,7 +660,7 @@ foreach ($listofreferent as $key => $value) $qualified = $value['test']; $margin = $value['margin']; $project_field = $value['project_field']; - if ($qualified && isset($margin)) // If this element must be included into profit calculation ($margin is 'minus' or 'plus') + if ($qualified && isset($margin)) // If this element must be included into profit calculation ($margin is 'minus' or 'add') { $element = new $classname($db); @@ -685,19 +705,15 @@ foreach ($listofreferent as $key => $value) { $tmp = $element->getSumOfAmount($elementuser, $dates, $datee); $total_ht_by_line = price2num($tmp['amount'], 'MT'); - } - else - { + } else { $tmp = $element->getSumOfAmount('', $dates, $datee); $total_ht_by_line = price2num($tmp['amount'], 'MT'); } - } - elseif ($key == 'loan') { + } elseif ($key == 'loan') { if ((empty($dates) && empty($datee)) || (intval($dates) <= $element->datestart && intval($datee) >= $element->dateend)) { // Get total loan $total_ht_by_line = -$element->capital; - } - else { + } else { // Get loan schedule according to date filter $total_ht_by_line = 0; $loanScheduleStatic = new LoanSchedule($element->db); @@ -716,8 +732,7 @@ foreach ($listofreferent as $key => $value) } } } - } - else $total_ht_by_line = $element->total_ht; + } else $total_ht_by_line = $element->total_ht; // Define $total_ttc_by_line if ($tablename == 'don' || $tablename == 'chargesociales' || $tablename == 'payment_various' || $tablename == 'payment_salary') $total_ttc_by_line = $element->amount; @@ -727,11 +742,9 @@ foreach ($listofreferent as $key => $value) { $defaultvat = get_default_tva($mysoc, $mysoc); $total_ttc_by_line = price2num($total_ht_by_line * (1 + ($defaultvat / 100)), 'MT'); - } - elseif ($key == 'loan') { + } elseif ($key == 'loan') { $total_ttc_by_line = $total_ht_by_line; // For loan there is actually no taxe managed in Dolibarr - } - else $total_ttc_by_line = $element->total_ttc; + } else $total_ttc_by_line = $element->total_ttc; // Change sign of $total_ht_by_line and $total_ttc_by_line for some cases if ($tablename == 'payment_various') @@ -845,8 +858,7 @@ foreach ($listofreferent as $key => $value) if ($selectList < 0) { setEventMessages($formproject->error, $formproject->errors, 'errors'); - } - elseif ($selectList) + } elseif ($selectList) { // Define form with the combo list of elements to link $addform .= ''; + } else print ' | '; // Amount inc tax if (empty($value['disableamount'])) @@ -1192,15 +1184,11 @@ foreach ($listofreferent as $key => $value) // TODO Permission to read daily rate $defaultvat = get_default_tva($mysoc, $mysoc); $total_ttc_by_line = price2num($total_ht_by_line * (1 + ($defaultvat / 100)), 'MT'); - } - else - { + } else { $othermessage = $form->textwithpicto($langs->trans("NotAvailable"), $langs->trans("ModuleSalaryToDefineHourlyRateMustBeEnabled")); } - } - elseif ($key == 'loan') $total_ttc_by_line = $element->capital - $element->getSumPayment(); - else - { + } elseif ($key == 'loan') $total_ttc_by_line = $element->capital - $element->getSumPayment(); + else { $total_ttc_by_line = $element->total_ttc; } @@ -1223,33 +1211,27 @@ foreach ($listofreferent as $key => $value) } if ($warning) print ' '.img_warning($warning); print ''; - } - else print ' | '; + } else print ' | '; // Status print ' | '; if ($tablename == 'expensereport_det') { print $expensereport->getLibStatut(5); - } - elseif ($element instanceof CommonInvoice) + } elseif ($element instanceof CommonInvoice) { //This applies for Facture and FactureFournisseur print $element->getLibStatut(5, $element->getSommePaiement()); - } - elseif ($element instanceof Task) + } elseif ($element instanceof Task) { if ($element->progress != '') { print $element->progress.' %'; } - } - elseif ($tablename == 'stock_mouvement') + } elseif ($tablename == 'stock_mouvement') { print $element->getLibStatut(3); - } - else - { + } else { print $element->getLibStatut(5); } print ' | '; @@ -1323,9 +1305,7 @@ foreach ($listofreferent as $key => $value) print ''; print ''; print ' |
"; -} -else dol_print_error($db); +} else dol_print_error($db); $companystatic = new Societe($db); // We need a clean new object for next loop because current one has some properties set. @@ -327,9 +345,7 @@ if ($resql) $companystatic->status = $obj->status; print $companystatic->getNomUrl(1); - } - else - { + } else { print $langs->trans("OthersNotLinkedToThirdParty"); } print ''; @@ -353,9 +369,7 @@ if ($resql) } $db->free($resql); -} -else -{ +} else { dol_print_error($db); } print "
';
- $moreforfilter .= $langs->trans('ProjectCategories').': ';
- $moreforfilter .= $formother->select_categories('project', $search_categ, 'search_categ', 1, 1, 'maxwidth300');
- $moreforfilter .= '
';
+ $formcategory = new FormCategory($db);
+ $moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_PROJECT, $search_category_array);
}
// If the user can view user other than himself
@@ -752,9 +756,7 @@ while ($i < min($num, $limit))
if ($obj->socid)
{
print $socstatic->getNomUrl(1);
- }
- else
- {
+ } else {
print ' ';
}
print '';
@@ -773,8 +775,7 @@ while ($i < min($num, $limit))
if ($nbofsalesrepresentative > 3) // We print only number
{
print $nbofsalesrepresentative;
- }
- elseif ($nbofsalesrepresentative > 0)
+ } elseif ($nbofsalesrepresentative > 0)
{
$userstatic = new User($db);
$j = 0;
@@ -794,9 +795,7 @@ while ($i < min($num, $limit))
}
}
//else print $langs->trans("NoSalesRepresentativeAffected");
- }
- else
- {
+ } else {
print ' ';
}
print '';
diff --git a/htdocs/projet/stats/index.php b/htdocs/projet/stats/index.php
index 38d12081b4f..6d56b2088e9 100644
--- a/htdocs/projet/stats/index.php
+++ b/htdocs/projet/stats/index.php
@@ -350,8 +350,7 @@ print '';
print '';
$stringtoshow .= '
";
- }
- else
- {
+ } else {
print "ErrorRecordNotFound";
}
}
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index bd4335f747f..1493542c5ed 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -79,9 +79,7 @@ if (!empty($project_ref) && !empty($withproject))
{
$id = $tasksarray[0]->id;
$object->fetch($id);
- }
- else
- {
+ } else {
header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.($withproject ? '&withproject=1' : '').(empty($mode) ? '' : '&mode='.$mode));
exit;
}
@@ -103,9 +101,7 @@ if ($id > 0 || !empty($ref))
$object->project = clone $projectstatic;
$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($projectstatic->ref).'/'.dol_sanitizeFileName($object->ref);
- }
- else
- {
+ } else {
dol_print_error($db);
}
}
@@ -271,8 +267,7 @@ if ($object->id > 0)
{
$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
$object->next_prev_filter = " fk_projet in (".$projectsListId.")";
- }
- else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
+ } else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
$morehtmlref = '';
@@ -318,9 +313,7 @@ if ($object->id > 0)
$permtoedit = $user->rights->projet->creer;
$relativepathwithnofile = dol_sanitizeFileName($projectstatic->ref).'/'.dol_sanitizeFileName($object->ref).'/';
include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
header('Location: index.php');
exit;
}
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 0aefa412571..8930220f6ec 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -245,8 +245,7 @@ if ($resql)
{
$listofprojectcontacttype[$obj->rowid] = $obj->code;
}
-}
-else dol_print_error($db);
+} else dol_print_error($db);
if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0] = '0'; // To avoid sql syntax error if not found
// Get id of types of contacts for tasks (This list never contains a lot of elements)
$listoftaskcontacttype = array();
@@ -260,8 +259,7 @@ if ($resql)
{
$listoftaskcontacttype[$obj->rowid] = $obj->code;
}
-}
-else dol_print_error($db);
+} else dol_print_error($db);
if (count($listoftaskcontacttype) == 0) $listoftaskcontacttype[0] = '0'; // To avoid sql syntax error if not found
$distinct = 'DISTINCT'; // We add distinct until we are added a protection to be sure a contact of a project and task is assigned only once.
@@ -437,8 +435,7 @@ print '';
// Show description of content
$texthelp = '';
if ($search_task_user == $user->id) $texthelp .= $langs->trans("MyTasksDesc");
-else
-{
+else {
if ($user->rights->projet->all->lire && !$socid) $texthelp .= $langs->trans("TasksOnProjectsDesc");
else $texthelp .= $langs->trans("TasksOnProjectsPublicDesc");
}
@@ -753,9 +750,7 @@ while ($i < min($num, $limit))
$socstatic->id = $obj->socid;
$socstatic->name = $obj->name;
print $socstatic->getNomUrl(1);
- }
- else
- {
+ } else {
print ' ';
}
print '';
@@ -856,9 +851,7 @@ while ($i < min($num, $limit))
print convertSecondToTime($obj->tobill, 'allhourmin');
$totalarray['val']['t.tobill'] += $obj->tobill;
$totalarray['totaltobill'] += $obj->tobill;
- }
- else
- {
+ } else {
print ''.$langs->trans("NA").'';
}
print '';
@@ -875,9 +868,7 @@ while ($i < min($num, $limit))
print convertSecondToTime($obj->billed, 'allhourmin');
$totalarray['val']['t.billed'] += $obj->billed;
$totalarray['totalbilled'] += $obj->billed;
- }
- else
- {
+ } else {
print ''.$langs->trans("NA").'';
}
print '';
@@ -942,8 +933,7 @@ if (isset($totalarray['totaldurationeffectivefield']) || isset($totalarray['tota
{
if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").' ';
else print ''.$langs->trans("Totalforthispage").' ';
- }
- elseif ($totalarray['totalplannedworkloadfield'] == $i) print ''.convertSecondToTime($totalarray['totalplannedworkload'], $plannedworkloadoutputformat).' ';
+ } elseif ($totalarray['totalplannedworkloadfield'] == $i) print ''.convertSecondToTime($totalarray['totalplannedworkload'], $plannedworkloadoutputformat).' ';
elseif ($totalarray['totaldurationeffectivefield'] == $i) print ''.convertSecondToTime($totalarray['totaldurationeffective'], $timespentoutputformat).' ';
elseif ($totalarray['totalprogress_calculatedfield'] == $i) print ''.($totalarray['totalplannedworkload'] > 0 ? round(100 * $totalarray['totaldurationeffective'] / $totalarray['totalplannedworkload'], 2).' %' : '').' ';
elseif ($totalarray['totalprogress_declaredfield'] == $i) print ''.($totalarray['totalplannedworkload'] > 0 ? round(100 * $totalarray['totaldurationdeclared'] / $totalarray['totalplannedworkload'], 2).' %' : '').' ';
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index 4967257570e..7af9bbbacef 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -57,9 +57,7 @@ if ($id > 0 || !empty($ref))
if (!empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
$object->project = clone $projectstatic;
- }
- else
- {
+ } else {
dol_print_error($db);
}
}
@@ -75,9 +73,7 @@ if (!empty($project_ref) && !empty($withproject))
{
$id = $tasksarray[0]->id;
$object->fetch($id);
- }
- else
- {
+ } else {
header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.(empty($mode) ? '' : '&mode='.$mode));
}
}
@@ -243,8 +239,7 @@ if ($object->id > 0)
{
$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
$object->next_prev_filter = " fk_projet in (".$projectsListId.")";
- }
- else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
+ } else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
$morehtmlref = '';
diff --git a/htdocs/projet/tasks/stats/index.php b/htdocs/projet/tasks/stats/index.php
index bbb275ef5df..a0bf33b34ba 100644
--- a/htdocs/projet/tasks/stats/index.php
+++ b/htdocs/projet/tasks/stats/index.php
@@ -199,8 +199,7 @@ print '
';
print '| ';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
$stringtoshow .= $px1->show();
$stringtoshow .= " \n"; if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index ebc6a7dc556..f395a4ee27a 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -236,8 +236,7 @@ if ($action == 'createtask' && $user->rights->projet->creer) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors'); $action = 'create'; $error++; - } - elseif (empty($_POST['task_parent'])) + } elseif (empty($_POST['task_parent'])) { setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("ChildOfProjectTask")), null, 'errors'); $action = 'create'; @@ -273,17 +272,13 @@ if ($action == 'createtask' && $user->rights->projet->creer) if ($taskid > 0) { $result = $task->add_contact($_POST["userid"], 'TASKEXECUTIVE', 'internal'); - } - else - { + } else { if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') { $langs->load("projects"); setEventMessages($langs->trans('NewTaskRefSuggested'), '', 'warnings'); $duplicate_code_error = true; - } - else - { + } else { setEventMessages($task->error, $task->errors, 'errors'); } $action = 'create'; @@ -297,23 +292,19 @@ if ($action == 'createtask' && $user->rights->projet->creer) { header("Location: ".$backtopage); exit; - } - elseif (empty($projectid)) + } elseif (empty($projectid)) { header("Location: ".DOL_URL_ROOT.'/projet/tasks/list.php'.(empty($mode) ? '' : '?mode='.$mode)); exit; } $id = $projectid; } - } - else - { + } else { if (!empty($backtopage)) { header("Location: ".$backtopage); exit; - } - elseif (empty($id)) + } elseif (empty($id)) { // We go back on task list header("Location: ".DOL_URL_ROOT.'/projet/tasks/list.php'.(empty($mode) ? '' : '?mode='.$mode)); @@ -507,9 +498,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third $langs->load("errors"); print $langs->trans("WarningProjectClosed"); print ''; - } - else - { + } else { print ' |
| '.$langs->trans("NoTasks").' |
';
$stringtoshow .= '
";
- }
- else
- {
+ } else {
print "Aucun don publique";
}
-}
-else
-{
+} else {
dol_print_error($db);
}
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 7f788a84671..7eb45f008e6 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -107,13 +107,11 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
{
$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
$width = 150;
- }
- elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
+ } elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
{
$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/'.$mysoc->logo);
$width = 150;
- }
- elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg'))
+ } elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg'))
{
$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg';
$width = 150;
@@ -343,10 +341,8 @@ if ($action == 'add')
if (preg_match('/\d\.\d/', $appli))
{
if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
- }
- else $appli .= " ".DOL_VERSION;
- }
- else $appli .= " ".DOL_VERSION;
+ } else $appli .= " ".DOL_VERSION;
+ } else $appli .= " ".DOL_VERSION;
$to = $adh->makeSubstitution($conf->global->MAIN_INFO_SOCIETE_MAIL);
$from = $conf->global->ADHERENT_MAIL_FROM;
@@ -375,8 +371,7 @@ if ($action == 'add')
{
$urlback = $conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION;
// TODO Make replacement of __AMOUNT__, etc...
- }
- else $urlback = $_SERVER["PHP_SELF"]."?action=added";
+ } else $urlback = $_SERVER["PHP_SELF"]."?action=added";
if (!empty($conf->global->MEMBER_NEWFORM_PAYONLINE) && $conf->global->MEMBER_NEWFORM_PAYONLINE != '-1')
{
@@ -390,14 +385,11 @@ if ($action == 'add')
if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
{
$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
- }
- else
- {
+ } else {
$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
}
}
- }
- elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paybox')
+ } elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paybox')
{
$urlback = DOL_MAIN_URL_ROOT.'/public/paybox/newpayment.php?from=membernewform&source=membersubscription&ref='.urlencode($adh->ref);
if (price2num(GETPOST('amount', 'alpha'))) $urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
@@ -407,14 +399,11 @@ if ($action == 'add')
if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
{
$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
- }
- else
- {
+ } else {
$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
}
}
- }
- elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paypal')
+ } elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paypal')
{
$urlback = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?from=membernewform&source=membersubscription&ref='.urlencode($adh->ref);
if (price2num(GETPOST('amount', 'alpha'))) $urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
@@ -424,14 +413,11 @@ if ($action == 'add')
if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
{
$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
- }
- else
- {
+ } else {
$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
}
}
- }
- elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'stripe')
+ } elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'stripe')
{
$urlback = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?from=membernewform&source=membersubscription&ref='.$adh->ref;
if (price2num(GETPOST('amount', 'alpha'))) $urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
@@ -441,15 +427,11 @@ if ($action == 'add')
if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
{
$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
- }
- else
- {
+ } else {
$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
}
}
- }
- else
- {
+ } else {
dol_print_error('', "Autosubscribe form is setup to ask an online payment for a not managed online payment");
exit;
}
@@ -457,9 +439,7 @@ if ($action == 'add')
if (!empty($entity)) $urlback .= '&entity='.$entity;
dol_syslog("member ".$adh->ref." was created, we redirect to ".$urlback);
- }
- else
- {
+ } else {
$error++;
$errmsg .= join('
', $adh->errors); } @@ -471,9 +451,7 @@ if ($action == 'add') Header("Location: ".$urlback); exit; - } - else - { + } else { $db->rollback(); } } @@ -574,9 +552,7 @@ if (empty($conf->global->MEMBER_NEWFORM_FORCETYPE)) print ''.$langs->trans("Type").' * ';
print $form->selectarray("type", $adht->liste_array(), GETPOST('type') ?GETPOST('type') : $defaulttype, $isempty);
print ' '.$langs->trans('MemberNature').' * '."\n";
print $form->selectarray("morphy", $morphys, GETPOST('morphy'), 1);
print ' ';
print '
";
-}
-else
-{
+} else {
dol_print_error($db);
}
diff --git a/htdocs/public/notice.php b/htdocs/public/notice.php
index 626aba2cd32..a86b8c68e42 100644
--- a/htdocs/public/notice.php
+++ b/htdocs/public/notice.php
@@ -38,9 +38,7 @@ if (!GETPOST('transkey', 'alphanohtml') && !GETPOST('transphrase', 'alphanohtml'
{
print 'Sorry, it seems your internet connexion is off.
'; print 'You need to be connected to network to use this software.
'; -} -else -{ +} else { $langs->load("error"); $langs->load("other"); diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php index 2378728a8d3..2031c11a3ad 100644 --- a/htdocs/public/onlinesign/newonlinesign.php +++ b/htdocs/public/onlinesign/newonlinesign.php @@ -174,8 +174,7 @@ if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumb $urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall); $urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall); $width = 150; -} -elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo)) +} elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo)) { $urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo); $urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo); @@ -235,9 +234,7 @@ if ($source == 'proposal') { $mesg = $proposal->error; $error++; - } - else - { + } else { $result = $proposal->fetch_thirdparty($proposal->socid); } @@ -276,14 +273,10 @@ if ($action != 'dosign') { if ($found && !$error) // We are in a management option and no error { - } - else - { + } else { dol_print_error_email('ERRORNEWONLINESIGN'); } -} -else -{ +} else { // Print } diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php index d0ce716bb7d..4f437c07740 100644 --- a/htdocs/public/opensurvey/studs.php +++ b/htdocs/public/opensurvey/studs.php @@ -108,12 +108,10 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x")) // bout if (isset($_POST["choix$i"]) && $_POST["choix$i"] == '1') { $nouveauchoix .= "1"; - } - elseif (isset($_POST["choix$i"]) && $_POST["choix$i"] == '2') + } elseif (isset($_POST["choix$i"]) && $_POST["choix$i"] == '2') { $nouveauchoix .= "2"; - } - else { // sinon c'est 0 + } else { // sinon c'est 0 $nouveauchoix .= "0"; } } @@ -132,9 +130,7 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x")) // bout { setEventMessages($langs->trans("VoteNameAlreadyExists"), null, 'errors'); $error++; - } - else - { + } else { $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'opensurvey_user_studs (nom, id_sondage, reponses)'; $sql .= " VALUES ('".$db->escape($nom)."', '".$db->escape($numsondage)."','".$db->escape($nouveauchoix)."')"; $resql = $db->query($sql); @@ -169,12 +165,9 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x")) // bout $result = $cmailfile->sendfile(); } } - } - else dol_print_error($db); + } else dol_print_error($db); } - } - else - { + } else { setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Name")), null, 'errors'); } } @@ -210,12 +203,10 @@ if ($testmodifier) if (isset($_POST["choix".$i]) && $_POST["choix".$i] == '1') { $nouveauchoix .= "1"; - } - elseif (isset($_POST["choix".$i]) && $_POST["choix".$i] == '2') + } elseif (isset($_POST["choix".$i]) && $_POST["choix".$i] == '2') { $nouveauchoix .= "2"; - } - else { // sinon c'est 0 + } else { // sinon c'est 0 $nouveauchoix .= "0"; } } @@ -391,9 +382,7 @@ if ($object->format == "D") print ''."\n"; } -} -else -{ +} else { //display of survey topics print ''."\n";
print '
'.$langs->trans("OrderBilled").''; - } - elseif ($source == 'invoice' && $object->paye) + } elseif ($source == 'invoice' && $object->paye) { print '
'.$langs->trans("InvoicePaid").''; - } - elseif ($source == 'donation' && $object->paid) + } elseif ($source == 'donation' && $object->paid) { print '
'.$langs->trans("DonationPaid").''; - } - else - { + } else { // Membership can be paid and we still allow to make renewal if ($source == 'membersubscription' && $object->datefin > dol_now()) { @@ -1795,14 +1740,10 @@ if ($action != 'dopayment') '; } } - } - else - { + } else { dol_print_error_email('ERRORNEWPAYMENT'); } -} -else -{ +} else { // Print } @@ -1939,9 +1880,7 @@ if (preg_match('/^dopayment/', $action)) // If we choosed/click on the payment if (empty($paymentintent)) { print ''.$langs->trans("Error").' ';
- }
- else
- {
+ } else {
print '';
//$_SESSION["paymentintent_id"] = $paymentintent->id;
}
@@ -1955,9 +1894,7 @@ if (preg_match('/^dopayment/', $action)) // If we choosed/click on the payment
{
$langs->load("errors");
print info_admin($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Stripe")), 0, 0, 'error');
- }
- else
- {
+ } else {
print '';
print ''."\n";
print ''."\n";
@@ -2019,8 +1956,7 @@ if (preg_match('/^dopayment/', $action)) // If we choosed/click on the payment
$_SESSION['ipaddress'] = ($remoteip ? $remoteip : 'unknown'); // Payer ip
$_SESSION['payerID'] = is_object($stripecu) ? $stripecu->id : '';
$_SESSION['TRANSACTIONID'] = $sessionstripe->id;
- }
- catch (Exception $e)
+ } catch (Exception $e)
{
print $e->getMessage();
}
@@ -2068,8 +2004,7 @@ if (preg_match('/^dopayment/', $action)) // If we choosed/click on the payment
global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
+ } elseif (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
{
?>
// Code for payment with option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION set
@@ -2172,8 +2107,7 @@ if (preg_match('/^dopayment/', $action)) // If we choosed/click on the payment
});
// Old code for payment with option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION off and STRIPE_USE_NEW_CHECKOUT off
@@ -2240,8 +2174,7 @@ if (preg_match('/^dopayment/', $action)) // If we choosed/click on the payment
}
});
/* Use 3DS source */
diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index a3f6d733fcb..c42677d8b21 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -77,9 +77,7 @@ if (empty($paymentmethod))
{
dol_print_error(null, 'The back url does not contains a parameter fulltag that should help us to find the payment method used');
exit;
-}
-else
-{
+} else {
dol_syslog("paymentmethod=".$paymentmethod);
}
@@ -159,10 +157,8 @@ if (!empty($_SESSION['ipaddress'])) // To avoid to make action twice
if (preg_match('/\d\.\d/', $appli))
{
if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
- }
- else $appli .= " ".DOL_VERSION;
- }
- else $appli .= " ".DOL_VERSION;
+ } else $appli .= " ".DOL_VERSION;
+ } else $appli .= " ".DOL_VERSION;
$urlback = $_SERVER["REQUEST_URI"];
$topic = '['.$appli.'] '.$companylangs->transnoentitiesnoconv("NewOnlinePaymentFailed");
@@ -186,9 +182,7 @@ if (!empty($_SESSION['ipaddress'])) // To avoid to make action twice
if ($result)
{
dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
- }
- else
- {
+ } else {
dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
}
}
@@ -227,8 +221,7 @@ if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumb
$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
$width = 150;
-}
-elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
+} elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
{
$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index b1d6c149a51..4bb899b930e 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -163,8 +163,7 @@ if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumb
$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
$width = 150;
-}
-elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
+} elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
{
$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
@@ -221,9 +220,7 @@ if (!empty($conf->paypal->enabled))
{
// Nothing to do
dol_syslog("Call to GetExpressCheckoutDetails return ".$ack, LOG_DEBUG, 0, '_payment');
- }
- else
- {
+ } else {
dol_syslog("Call to GetExpressCheckoutDetails return error: ".json_encode($resArray), LOG_WARNING, '_payment');
}
@@ -250,9 +247,7 @@ if (!empty($conf->paypal->enabled))
$NOTE = urldecode($resArray2["NOTE"]);
$ispaymentok = true;
- }
- else
- {
+ } else {
dol_syslog("Call to DoExpressCheckoutPayment return error: ".json_encode($resArray2), LOG_WARNING, 0, '_payment');
//Display a user friendly Error on the page using any of the following error information returned by PayPal
@@ -261,14 +256,10 @@ if (!empty($conf->paypal->enabled))
$ErrorLongMsg = urldecode($resArray2["L_LONGMESSAGE0"]);
$ErrorSeverityCode = urldecode($resArray2["L_SEVERITYCODE0"]);
}
- }
- else
- {
+ } else {
dol_print_error('', 'Session expired');
}
- }
- else
- {
+ } else {
dol_print_error('', '$PAYPALTOKEN not defined');
}
}
@@ -419,9 +410,7 @@ if ($ispaymentok)
$errmsg = $object->error;
$postactionmessages[] = $errmsg;
$ispostactionok = -1;
- }
- else
- {
+ } else {
$postactionmessages[] = 'Subscription created';
$ispostactionok = 1;
}
@@ -442,9 +431,7 @@ if ($ispaymentok)
$postactionmessages[] = $object->error;
$postactionmessages = array_merge($postactionmessages, $object->errors);
$ispostactionok = -1;
- }
- else
- {
+ } else {
if ($option == 'bankviainvoice')
{
$postactionmessages[] = 'Invoice, payment and bank record created';
@@ -508,8 +495,7 @@ if ($ispaymentok)
$postactionmessages[] = $errmsg;
$ispostactionok = -1;
}
- }
- catch (Exception $e) {
+ } catch (Exception $e) {
$error++;
$errmsg = 'Failed to save customer stripe id in database ; '.$e->getMessage();
$postactionmessages[] = $errmsg;
@@ -522,9 +508,7 @@ if ($ispaymentok)
if (!$error)
{
$db->commit();
- }
- else
- {
+ } else {
$db->rollback();
}
@@ -589,9 +573,7 @@ if ($ispaymentok)
$errmsg = $object->error;
$postactionmessages[] = $errmsg;
$ispostactionok = -1;
- }
- else
- {
+ } else {
if ($file) $postactionmessages[] = 'Email sent to member (with invoice document attached)';
else $postactionmessages[] = 'Email sent to member (without any attached document)';
@@ -599,20 +581,15 @@ if ($ispaymentok)
}
}
}
- }
- else
- {
+ } else {
$postactionmessages[] = 'Failed to get a valid value for "amount paid" or "payment type" to record the payment of subscription for member '.$tmptag['MEM'].'. May be payment was already recorded.';
$ispostactionok = -1;
}
- }
- else
- {
+ } else {
$postactionmessages[] = 'Member '.$tmptag['MEM'].' for subscription payed was not found';
$ispostactionok = -1;
}
- }
- elseif (array_key_exists('INV', $tmptag) && $tmptag['INV'] > 0)
+ } elseif (array_key_exists('INV', $tmptag) && $tmptag['INV'] > 0)
{
// Record payment
include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -647,9 +624,7 @@ if ($ispaymentok)
if ($currencyCodeType == $conf->currency)
{
$paiement->amounts = array($invoice->id => $FinalPaymentAmt); // Array with all payments dispatching with invoice id
- }
- else
- {
+ } else {
$paiement->multicurrency_amounts = array($invoice->id => $FinalPaymentAmt); // Array with all payments dispatching
$postactionmessages[] = 'Payment was done in a different currency that currency expected of company';
@@ -671,9 +646,7 @@ if ($ispaymentok)
$postactionmessages[] = $paiement->error.' '.join("
\n", $paiement->errors); $ispostactionok = -1; $error++; - } - else - { + } else { $postactionmessages[] = 'Payment created'; $ispostactionok = 1; } @@ -696,15 +669,11 @@ if ($ispaymentok) $postactionmessages[] = $paiement->error.' '.join("
\n", $paiement->errors); $ispostactionok = -1; $error++; - } - else - { + } else { $postactionmessages[] = 'Bank transaction of payment created'; $ispostactionok = 1; } - } - else - { + } else { $postactionmessages[] = 'Setup of bank account to use in module '.$paymentmethod.' was not set. No way to record the payment.'; $ispostactionok = -1; $error++; @@ -714,26 +683,18 @@ if ($ispaymentok) if (!$error) { $db->commit(); - } - else - { + } else { $db->rollback(); } - } - else - { + } else { $postactionmessages[] = 'Failed to get a valid value for "amount paid" ('.$FinalPaymentAmt.') or "payment type" ('.$paymentType.') to record the payment of invoice '.$tmptag['INV'].'. May be payment was already recorded.'; $ispostactionok = -1; } - } - else - { + } else { $postactionmessages[] = 'Invoice payed '.$tmptag['INV'].' was not found'; $ispostactionok = -1; } - } - else - { + } else { // Nothing done } } @@ -788,10 +749,8 @@ if ($ispaymentok) if (preg_match('/\d\.\d/', $appli)) { if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core - } - else $appli .= " ".DOL_VERSION; - } - else $appli .= " ".DOL_VERSION; + } else $appli .= " ".DOL_VERSION; + } else $appli .= " ".DOL_VERSION; $urlback = $_SERVER["REQUEST_URI"]; $topic = '['.$appli.'] '.$companylangs->transnoentitiesnoconv("NewOnlinePaymentReceived"); @@ -802,17 +761,14 @@ if ($ispaymentok) $content .= ''.$companylangs->trans("PaymentSubscription")."
\n"; $content .= $companylangs->trans("MemberId").': '.$tmptag['MEM']."
\n"; $content .= $companylangs->trans("Link").': '.$url.''."
\n"; - } - elseif (array_key_exists('INV', $tmptag)) + } elseif (array_key_exists('INV', $tmptag)) { $url = $urlwithroot."/compta/facture/card.php?id=".$tmptag['INV']; $content .= ''.$companylangs->trans("Payment")."
\n"; $content .= $companylangs->trans("InvoiceId").': '.$tmptag['INV']."
\n"; //$content.=$companylangs->trans("ThirdPartyId").': '.$tmptag['CUS']."
\n"; $content .= $companylangs->trans("Link").': '.$url.''."
\n"; - } - else - { + } else { $content .= $companylangs->transnoentitiesnoconv("NewOnlinePaymentReceived")."
\n"; } $content .= $companylangs->transnoentities("PostActionAfterPayment").' : '; @@ -820,13 +776,10 @@ if ($ispaymentok) { //$topic.=' ('.$companylangs->transnoentitiesnoconv("Status").' '.$companylangs->transnoentitiesnoconv("OK").')'; $content .= ''.$companylangs->transnoentitiesnoconv("OK").''; - } - elseif ($ispostactionok == 0) + } elseif ($ispostactionok == 0) { $content .= $companylangs->transnoentitiesnoconv("None"); - } - else - { + } else { $topic .= ($ispostactionok ? '' : ' ('.$companylangs->trans("WarningPostActionErrorAfterPayment").')'); $content .= ''.$companylangs->transnoentitiesnoconv("Error").''; } @@ -864,16 +817,12 @@ if ($ispaymentok) { dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment'); //dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0); - } - else - { + } else { dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment'); //dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0); } } -} -else -{ +} else { // Get on url call $onlinetoken = empty($PAYPALTOKEN) ? $_SESSION['onlinetoken'] : $PAYPALTOKEN; $payerID = empty($PAYPALPAYERID) ? $_SESSION['payerID'] : $PAYPALPAYERID; @@ -924,10 +873,8 @@ else if (preg_match('/\d\.\d/', $appli)) { if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core - } - else $appli .= " ".DOL_VERSION; - } - else $appli .= " ".DOL_VERSION; + } else $appli .= " ".DOL_VERSION; + } else $appli .= " ".DOL_VERSION; $urlback = $_SERVER["REQUEST_URI"]; $topic = '['.$appli.'] '.$companylangs->transnoentitiesnoconv("ValidationOfPaymentFailed"); @@ -951,9 +898,7 @@ else if ($result) { dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment'); - } - else - { + } else { dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment'); } } diff --git a/htdocs/public/stripe/confirm_payment.php b/htdocs/public/stripe/confirm_payment.php index 9a45a2cbeec..683a537fe69 100644 --- a/htdocs/public/stripe/confirm_payment.php +++ b/htdocs/public/stripe/confirm_payment.php @@ -48,23 +48,18 @@ if (isset($_GET['connect'])) $endpoint_secret = $conf->global->STRIPE_TEST_WEBHOOK_CONNECT_KEY; $service = 'StripeTest'; $servicestatus = 0; - } - else - { + } else { $endpoint_secret = $conf->global->STRIPE_LIVE_WEBHOOK_CONNECT_KEY; $service = 'StripeLive'; $servicestatus = 1; } -} -else { +} else { if (isset($_GET['test'])) { $endpoint_secret = $conf->global->STRIPE_TEST_WEBHOOK_KEY; $service = 'StripeTest'; $servicestatus = 0; - } - else - { + } else { $endpoint_secret = $conf->global->STRIPE_LIVE_WEBHOOK_KEY; $service = 'StripeLive'; $servicestatus = 1; diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php index 4291cb6f834..d3a9521bf25 100644 --- a/htdocs/public/stripe/ipn.php +++ b/htdocs/public/stripe/ipn.php @@ -48,23 +48,18 @@ if (isset($_GET['connect'])) $endpoint_secret = $conf->global->STRIPE_TEST_WEBHOOK_CONNECT_KEY; $service = 'StripeTest'; $servicestatus = 0; - } - else - { + } else { $endpoint_secret = $conf->global->STRIPE_LIVE_WEBHOOK_CONNECT_KEY; $service = 'StripeLive'; $servicestatus = 1; } -} -else { +} else { if (isset($_GET['test'])) { $endpoint_secret = $conf->global->STRIPE_TEST_WEBHOOK_KEY; $service = 'StripeTest'; $servicestatus = 0; - } - else - { + } else { $endpoint_secret = $conf->global->STRIPE_LIVE_WEBHOOK_KEY; $service = 'StripeLive'; $servicestatus = 1; @@ -91,8 +86,7 @@ $error = 0; try { $event = \Stripe\Webhook::constructEvent($payload, $sig_header, $endpoint_secret); -} -catch (\UnexpectedValueException $e) { +} catch (\UnexpectedValueException $e) { // Invalid payload http_response_code(400); // PHP 5.4 or greater exit(); @@ -125,12 +119,10 @@ if (!empty($conf->multicompany->enabled) && !empty($conf->stripeconnect->enabled { $obj = $db->fetch_object($result); $key = $obj->entity; - } - else { + } else { $key = 1; } - } - else { + } else { $key = 1; } $ret = $mc->switchEntity($key); @@ -188,15 +180,12 @@ if ($event->type == 'payout.created') { http_response_code(200); // PHP 5.4 or greater return 1; - } - else - { + } else { $error++; http_response_code(500); // PHP 5.4 or greater return -1; } -} -elseif ($event->type == 'payout.paid') { +} elseif ($event->type == 'payout.paid') { global $conf; $error = 0; $result = dolibarr_set_const($db, $service."_NEXTPAYOUT", null, 'chaine', 0, '', $conf->entity); @@ -269,42 +258,32 @@ elseif ($event->type == 'payout.paid') { http_response_code(200); // PHP 5.4 or greater return 1; - } - else - { + } else { $error++; http_response_code(500); // PHP 5.4 or greater return -1; } -} -elseif ($event->type == 'customer.source.created') { +} elseif ($event->type == 'customer.source.created') { //TODO: save customer's source -} -elseif ($event->type == 'customer.source.updated') { +} elseif ($event->type == 'customer.source.updated') { //TODO: update customer's source -} -elseif ($event->type == 'customer.source.delete') { +} elseif ($event->type == 'customer.source.delete') { //TODO: delete customer's source -} -elseif ($event->type == 'customer.deleted') { +} elseif ($event->type == 'customer.deleted') { $db->begin(); $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_account WHERE key_account = '".$db->escape($event->data->object->id)."' and site='stripe'"; $db->query($sql); $db->commit(); -} -elseif ($event->type == 'payment_intent.succeeded') { // Called when making payment with PaymentIntent method ($conf->global->STRIPE_USE_NEW_CHECKOUT is on). +} elseif ($event->type == 'payment_intent.succeeded') { // Called when making payment with PaymentIntent method ($conf->global->STRIPE_USE_NEW_CHECKOUT is on). // TODO: create fees // TODO: Redirect to paymentok.php -} -elseif ($event->type == 'payment_intent.payment_failed') { +} elseif ($event->type == 'payment_intent.payment_failed') { // TODO: Redirect to paymentko.php -} -elseif ($event->type == 'checkout.session.completed') // Called when making payment with new Checkout method ($conf->global->STRIPE_USE_NEW_CHECKOUT is on). +} elseif ($event->type == 'checkout.session.completed') // Called when making payment with new Checkout method ($conf->global->STRIPE_USE_NEW_CHECKOUT is on). { // TODO: create fees // TODO: Redirect to paymentok.php -} -elseif ($event->type == 'payment_method.attached') { +} elseif ($event->type == 'payment_method.attached') { require_once DOL_DOCUMENT_ROOT.'/societe/class/companypaymentmode.class.php'; require_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php'; $societeaccount = new SocieteAccount($db); @@ -343,14 +322,11 @@ elseif ($event->type == 'payment_method.attached') { if (!$error) { $db->commit(); - } - else - { + } else { $db->rollback(); } } -} -elseif ($event->type == 'payment_method.updated') { +} elseif ($event->type == 'payment_method.updated') { require_once DOL_DOCUMENT_ROOT.'/societe/class/companypaymentmode.class.php'; $companypaymentmode = new CompanyPaymentMode($db); $companypaymentmode->fetch(0, '', 0, '', " AND stripe_card_ref = '".$db->escape($event->data->object->id)."'"); @@ -380,26 +356,20 @@ elseif ($event->type == 'payment_method.updated') { if (!$error) { $db->commit(); - } - else - { + } else { $db->rollback(); } -} -elseif ($event->type == 'payment_method.detached') { +} elseif ($event->type == 'payment_method.detached') { $db->begin(); $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_rib WHERE ref = '".$db->escape($event->data->object->id)."' and status = ".$servicestatus; $db->query($sql); $db->commit(); -} -elseif ($event->type == 'charge.succeeded') { +} elseif ($event->type == 'charge.succeeded') { // TODO: create fees // TODO: Redirect to paymentok.php -} -elseif ($event->type == 'charge.failed') { +} elseif ($event->type == 'charge.failed') { // TODO: Redirect to paymentko.php -} -elseif (($event->type == 'source.chargeable') && ($event->data->object->type == 'three_d_secure') && ($event->data->object->three_d_secure->authenticated == true)) { +} elseif (($event->type == 'source.chargeable') && ($event->data->object->type == 'three_d_secure') && ($event->data->object->three_d_secure->authenticated == true)) { // This event is deprecated. } diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php index c326b4a6bd2..ffa4b24fc59 100644 --- a/htdocs/public/test/test_arrays.php +++ b/htdocs/public/test/test_arrays.php @@ -45,9 +45,7 @@ if (empty($usedolheader)) trans("ErrorFieldRequired", $langs->transnoentities("TicketEmailNotificationFrom")).'
'; print $langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentities("Ticket")); print ' ';
@@ -1639,9 +1593,7 @@ elseif ($id || $ref)
if ($object->statut <= 1)
{
print $langs->trans("QtyToReceive").' - ';
- }
- else
- {
+ } else {
print $langs->trans("QtyReceived").' - ';
}
if (!empty($conf->stock->enabled))
@@ -1653,15 +1605,11 @@ elseif ($id || $ref)
print $langs->trans("Batch");
}
print '';
- }
- else
- {
+ } else {
if ($object->statut <= 1)
{
print ''.$langs->trans("QtyToReceive").' ';
- }
- else
- {
+ } else {
print ''.$langs->trans("QtyReceived").' ';
}
if (!empty($conf->stock->enabled))
@@ -1768,9 +1716,7 @@ elseif ($id || $ref)
$prod = new Product($db);
$prod->fetch($lines[$i]->fk_product);
$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $lines[$i]->product->label;
- }
- else
- $label = (!empty($lines[$i]->product->label) ? $lines[$i]->product->label : $lines[$i]->product->product_label);
+ } else $label = (!empty($lines[$i]->product->label) ? $lines[$i]->product->label : $lines[$i]->product->product_label);
print '';
@@ -1784,9 +1730,7 @@ elseif ($id || $ref)
print (!empty($lines[$i]->product->description) && $lines[$i]->description != $lines[$i]->product->description) ? '
'.dol_htmlentitiesbr($lines[$i]->description) : ''; } print " \n";
- }
- else
- {
+ } else {
print "";
if ($lines[$i]->product_type == Product::TYPE_SERVICE) $text = img_object($langs->trans('Service'), 'service');
else $text = img_object($langs->trans('Product'), 'product');
@@ -1805,9 +1749,7 @@ elseif ($id || $ref)
if ($action == 'editline' && $lines[$i]->id == $line_id)
{
print ' '.$lines[$i]->comment.' ';
- }
- else
- {
+ } else {
print ''.$lines[$i]->comment.' ';
}
@@ -1872,9 +1814,7 @@ elseif ($id || $ref)
print '';
}
print '';
- }
- else
- {
+ } else {
print '';
print '';
// Qty to receive or received
@@ -1887,9 +1827,7 @@ elseif ($id || $ref)
}
}
print '';
- }
- else
- {
+ } else {
// Qty to receive or received
print ''.$lines[$i]->qty.' ';
@@ -1925,9 +1863,7 @@ elseif ($id || $ref)
$detail .= '
'; print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"), $detail); - } - else - { + } else { print $langs->trans("NA"); } print ''; @@ -1955,8 +1891,7 @@ elseif ($id || $ref) print '';
print '
'; print '
'; - } - elseif ($object->statut == Reception::STATUS_DRAFT) + } elseif ($object->statut == Reception::STATUS_DRAFT) { // edit-delete buttons print ' ';
@@ -1987,9 +1922,7 @@ elseif ($id || $ref)
if ($action == 'editline' && $lines[$i]->id == $line_id)
{
print $line->showOptionals($extrafields, 'edit', array('colspan'=>$colspan), $indiceAsked);
- }
- else
- {
+ } else {
print $line->showOptionals($extrafields, 'view', array('colspan'=>$colspan), $indiceAsked);
}
}
@@ -2026,9 +1959,7 @@ elseif ($id || $ref)
|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->reception_advance->validate)))
{
print ''.$langs->trans("Validate").'';
- }
- else
- {
+ } else {
print ''.$langs->trans("Validate").'';
}
}
@@ -2044,9 +1975,7 @@ elseif ($id || $ref)
if (!empty($conf->facture->enabled) && !empty($conf->global->WORKFLOW_BILL_ON_RECEPTION)) // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
{
print ''.$langs->trans("ClassifyUnbilled").'';
- }
- else
- {
+ } else {
print ''.$langs->trans("ReOpen").'';
}
}
@@ -2058,8 +1987,7 @@ elseif ($id || $ref)
if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->reception->reception_advance->send)
{
print ''.$langs->trans('SendByMail').'';
- }
- else print ''.$langs->trans('SendByMail').'';
+ } else print ''.$langs->trans('SendByMail').'';
}
}
diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index a95d6217c1c..f4cbb08ee9e 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -178,15 +178,11 @@ class Reception extends CommonObject
if ($numref != "")
{
return $numref;
- }
- else
- {
+ } else {
dol_print_error($this->db, get_class($this)."::getNextNumRef ".$obj->error);
return "";
}
- }
- else
- {
+ } else {
print $langs->trans("Error")." ".$langs->trans("Error_RECEPTION_ADDON_NUMBER_NotDefined");
return "";
}
@@ -324,9 +320,7 @@ class Reception extends CommonObject
{
$this->db->commit();
return $this->id;
- }
- else
- {
+ } else {
foreach ($this->errors as $errmsg)
{
dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
@@ -335,17 +329,13 @@ class Reception extends CommonObject
$this->db->rollback();
return -1 * $error;
}
- }
- else
- {
+ } else {
$error++;
$this->error = $this->db->lasterror()." - sql=$sql";
$this->db->rollback();
return -2;
}
- }
- else
- {
+ } else {
$error++;
$this->error = $this->db->error()." - sql=$sql";
$this->db->rollback();
@@ -472,16 +462,12 @@ class Reception extends CommonObject
}
return 1;
- }
- else
- {
+ } else {
dol_syslog(get_class($this).'::Fetch no reception found', LOG_ERR);
$this->error = 'Delivery with id '.$id.' not found';
return 0;
}
- }
- else
- {
+ } else {
$this->error = $this->db->error();
return -1;
}
@@ -530,8 +516,7 @@ class Reception extends CommonObject
if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
{
$numref = $this->getNextNumRef($soc);
- }
- else {
+ } else {
$numref = $this->ref;
}
@@ -601,9 +586,7 @@ class Reception extends CommonObject
$this->errors = array_merge($this->errors, $mouvS->errors);
break;
}
- }
- else
- {
+ } else {
// line with batch detail
// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record.
@@ -617,9 +600,7 @@ class Reception extends CommonObject
}
}
}
- }
- else
- {
+ } else {
$this->db->rollback();
$this->error = $this->db->error();
return -2;
@@ -693,9 +674,7 @@ class Reception extends CommonObject
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
foreach ($this->errors as $errmsg)
{
dol_syslog(get_class($this)."::valid ".$errmsg, LOG_ERR);
@@ -866,9 +845,7 @@ class Reception extends CommonObject
}
$this->db->rollback();
return -1 * $error;
- }
- else
- {
+ } else {
$this->db->commit();
return 1;
}
@@ -921,9 +898,7 @@ class Reception extends CommonObject
$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $obj->qty, 0, $langs->trans("ReceptionDeletedInDolibarr", $this->ref), '', $obj->eatby, $obj->sellby, $obj->batch); // Price is set to 0, because we don't want to see WAP changed
}
- }
- else
- {
+ } else {
$error++; $this->errors[] = "Error ".$this->db->lasterror();
}
}
@@ -999,36 +974,26 @@ class Reception extends CommonObject
}
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror()." - sql=$sql";
$this->db->rollback();
return -3;
}
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror()." - sql=$sql";
$this->db->rollback();
return -2;
}
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror()." - sql=$sql";
$this->db->rollback();
return -1;
}
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
@@ -1086,8 +1051,7 @@ class Reception extends CommonObject
}
return 1;
- }
- else {
+ } else {
return -1;
}
}
@@ -1273,15 +1237,11 @@ class Reception extends CommonObject
{
$this->date_delivery = $date_livraison;
return 1;
- }
- else
- {
+ } else {
$this->error = $this->db->error();
return -1;
}
- }
- else
- {
+ } else {
return -2;
}
}
@@ -1364,9 +1324,7 @@ class Reception extends CommonObject
$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_shipment_mode (code, libelle, description, tracking)";
$sql .= " VALUES ('".$this->db->escape($this->update['code'])."','".$this->db->escape($this->update['libelle'])."','".$this->db->escape($this->update['description'])."','".$this->db->escape($this->update['tracking'])."')";
$resql = $this->db->query($sql);
- }
- else
- {
+ } else {
$sql = "UPDATE ".MAIN_DB_PREFIX."c_shipment_mode SET";
$sql .= " code='".$this->db->escape($this->update['code'])."'";
$sql .= ",libelle='".$this->db->escape($this->update['libelle'])."'";
@@ -1441,9 +1399,7 @@ class Reception extends CommonObject
{
$url = str_replace('{TRACKID}', $value, $tracking);
$this->tracking_url = sprintf(''.($value ? $value : 'url').'', $url, $url);
- }
- else
- {
+ } else {
$this->tracking_url = $value;
}
}
@@ -1544,9 +1500,7 @@ class Reception extends CommonObject
$this->errors = $mouvS->errors;
$error++; break;
}
- }
- else
- {
+ } else {
// line with batch detail
// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
@@ -1559,9 +1513,7 @@ class Reception extends CommonObject
}
}
}
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
$error++;
}
@@ -1575,9 +1527,7 @@ class Reception extends CommonObject
$error++;
}
}
- }
- else
- {
+ } else {
dol_print_error($this->db);
$error++;
}
@@ -1586,9 +1536,7 @@ class Reception extends CommonObject
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
@@ -1632,9 +1580,7 @@ class Reception extends CommonObject
if (empty($error)) {
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
@@ -1709,9 +1655,7 @@ class Reception extends CommonObject
$this->errors = $mouvS->errors;
$error++; break;
}
- }
- else
- {
+ } else {
// line with batch detail
// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
@@ -1723,9 +1667,7 @@ class Reception extends CommonObject
}
}
}
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
$error++;
}
@@ -1754,9 +1696,7 @@ class Reception extends CommonObject
{
$this->db->commit();
return 1;
- }
- else
- {
+ } else {
$this->db->rollback();
return -1;
}
@@ -1845,9 +1785,7 @@ class Reception extends CommonObject
$error++;
break;
}
- }
- else
- {
+ } else {
// line with batch detail
// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
@@ -1859,9 +1797,7 @@ class Reception extends CommonObject
}
}
}
- }
- else
- {
+ } else {
$this->error = $this->db->lasterror();
$error++;
}
@@ -1911,9 +1847,7 @@ class Reception extends CommonObject
$this->db->rollback();
return -1;
}
- }
- else
- {
+ } else {
$this->error = $this->db->error();
$this->db->rollback();
return -1;
diff --git a/htdocs/reception/contact.php b/htdocs/reception/contact.php
index b2d30bf7c7f..4e8605ac74a 100644
--- a/htdocs/reception/contact.php
+++ b/htdocs/reception/contact.php
@@ -90,9 +90,7 @@ if ($action == 'addcontact' && $user->rights->reception->creer)
{
header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit;
- }
- else
- {
+ } else {
if ($objectsrc->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
{
$langs->load("errors");
@@ -120,8 +118,7 @@ elseif ($action == 'deletecontact' && $user->rights->reception->creer)
{
header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit;
- }
- else {
+ } else {
dol_print_error($db);
}
}
diff --git a/htdocs/reception/index.php b/htdocs/reception/index.php
index b9786229468..e3951458e40 100644
--- a/htdocs/reception/index.php
+++ b/htdocs/reception/index.php
@@ -120,8 +120,7 @@ if ($resql)
print ' ';
$i++;
}
- }
- else {
+ } else {
print ''.$langs->trans("None").'
| ';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
$stringtoshow .= $px1->show();
$stringtoshow .= " \n"; } diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index da15a73f66f..7a109eb1f50 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -113,9 +113,7 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->projet->creer) setEventMessages($object->error, $object->errors, 'errors'); } } - } - else - { + } else { $action = 'edit'; } } @@ -131,9 +129,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->s { header('Location: '.DOL_URL_ROOT.'/projet/tasks.php?restore_lastsearch_values=1&id='.$projectstatic->id.($withproject ? '&withproject=1' : '')); exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); $action = ''; } @@ -149,9 +145,7 @@ if (!empty($project_ref) && !empty($withproject)) if (count($tasksarray) > 0) { $id = $tasksarray[0]->id; - } - else - { + } else { header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.(empty($mode) ? '' : '&mode='.$mode)); } } @@ -462,9 +456,7 @@ if ($id > 0 || !empty($ref)) print ''; print ''; - } - else - { + } else { /* * Fiche tache en mode visu */ @@ -482,8 +474,7 @@ if ($id > 0 || !empty($ref)) { $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1); $object->next_prev_filter = " fk_projet in (".$projectsListId.")"; - } - else $object->next_prev_filter = " fk_projet = ".$projectstatic->id; + } else $object->next_prev_filter = " fk_projet = ".$projectstatic->id; $morehtmlref = ''; @@ -567,8 +558,7 @@ if ($id > 0 || !empty($ref)) $tmparray = $object->getSummaryOfTimeSpent(); if ($tmparray['total_duration'] > 0 && !empty($object->planned_workload)) print round($tmparray['total_duration'] / $object->planned_workload * 100, 2).' %'; else print '0 %'; - } - else print ''.$langs->trans("WorkloadNotDefined").''; + } else print ''.$langs->trans("WorkloadNotDefined").''; print ' | '.$langs->trans("Total").' | '; else print ''.$langs->trans("Totalforthispage").' | '; - } - elseif ($totalarray['totaldurationfield'] == $i) print ''.convertSecondToTime($totalarray['totalduration'], 'allhourmin').' | '; + } elseif ($totalarray['totaldurationfield'] == $i) print ''.convertSecondToTime($totalarray['totalduration'], 'allhourmin').' | '; elseif ($totalarray['totalvaluefield'] == $i) print ''.price($totalarray['totalvalue']).' | '; //elseif ($totalarray['totalvaluebilledfield'] == $i) print ''.price($totalarray['totalvaluebilled']).' | '; else print ''; diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php index a7eef6c2ede..9530757b283 100644 --- a/htdocs/public/agenda/agendaexport.php +++ b/htdocs/public/agenda/agendaexport.php @@ -109,8 +109,7 @@ if ($reshook < 0) { print ' |
| ".dolGetFirstLastname($objp->firstname, $objp->lastname)." ".$objp->societe." | \n"; - } - else - { + } else { print "Anonyme Anonyme | \n"; } print "".dol_print_date($db->jdate($objp->datedon))." | \n"; @@ -98,14 +96,10 @@ if ($resql) $i++; } print "
', $adh->errors); } @@ -471,9 +451,7 @@ if ($action == 'add') Header("Location: ".$urlback); exit; - } - else - { + } else { $db->rollback(); } } @@ -574,9 +552,7 @@ if (empty($conf->global->MEMBER_NEWFORM_FORCETYPE)) print '
| '.$langs->trans("Type").' | '.$object->type." | '; print $form->showphoto('memberphoto', $objp, 64); print ' | '."\n"; - } - else - { + } else { print "\n"; } print ""; $i++; } print " |
'; print 'You need to be connected to network to use this software.
'; -} -else -{ +} else { $langs->load("error"); $langs->load("other"); diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php index 2378728a8d3..2031c11a3ad 100644 --- a/htdocs/public/onlinesign/newonlinesign.php +++ b/htdocs/public/onlinesign/newonlinesign.php @@ -174,8 +174,7 @@ if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumb $urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall); $urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall); $width = 150; -} -elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo)) +} elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo)) { $urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo); $urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo); @@ -235,9 +234,7 @@ if ($source == 'proposal') { $mesg = $proposal->error; $error++; - } - else - { + } else { $result = $proposal->fetch_thirdparty($proposal->socid); } @@ -276,14 +273,10 @@ if ($action != 'dosign') { if ($found && !$error) // We are in a management option and no error { - } - else - { + } else { dol_print_error_email('ERRORNEWONLINESIGN'); } -} -else -{ +} else { // Print } diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php index d0ce716bb7d..4f437c07740 100644 --- a/htdocs/public/opensurvey/studs.php +++ b/htdocs/public/opensurvey/studs.php @@ -108,12 +108,10 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x")) // bout if (isset($_POST["choix$i"]) && $_POST["choix$i"] == '1') { $nouveauchoix .= "1"; - } - elseif (isset($_POST["choix$i"]) && $_POST["choix$i"] == '2') + } elseif (isset($_POST["choix$i"]) && $_POST["choix$i"] == '2') { $nouveauchoix .= "2"; - } - else { // sinon c'est 0 + } else { // sinon c'est 0 $nouveauchoix .= "0"; } } @@ -132,9 +130,7 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x")) // bout { setEventMessages($langs->trans("VoteNameAlreadyExists"), null, 'errors'); $error++; - } - else - { + } else { $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'opensurvey_user_studs (nom, id_sondage, reponses)'; $sql .= " VALUES ('".$db->escape($nom)."', '".$db->escape($numsondage)."','".$db->escape($nouveauchoix)."')"; $resql = $db->query($sql); @@ -169,12 +165,9 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x")) // bout $result = $cmailfile->sendfile(); } } - } - else dol_print_error($db); + } else dol_print_error($db); } - } - else - { + } else { setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Name")), null, 'errors'); } } @@ -210,12 +203,10 @@ if ($testmodifier) if (isset($_POST["choix".$i]) && $_POST["choix".$i] == '1') { $nouveauchoix .= "1"; - } - elseif (isset($_POST["choix".$i]) && $_POST["choix".$i] == '2') + } elseif (isset($_POST["choix".$i]) && $_POST["choix".$i] == '2') { $nouveauchoix .= "2"; - } - else { // sinon c'est 0 + } else { // sinon c'est 0 $nouveauchoix .= "0"; } } @@ -391,9 +382,7 @@ if ($object->format == "D") print ''."\n"; } -} -else -{ +} else { //display of survey topics print '
'.$langs->trans("OrderBilled").''; - } - elseif ($source == 'invoice' && $object->paye) + } elseif ($source == 'invoice' && $object->paye) { print '
'.$langs->trans("InvoicePaid").''; - } - elseif ($source == 'donation' && $object->paid) + } elseif ($source == 'donation' && $object->paid) { print '
'.$langs->trans("DonationPaid").''; - } - else - { + } else { // Membership can be paid and we still allow to make renewal if ($source == 'membersubscription' && $object->datefin > dol_now()) { @@ -1795,14 +1740,10 @@ if ($action != 'dopayment') '; } } - } - else - { + } else { dol_print_error_email('ERRORNEWPAYMENT'); } -} -else -{ +} else { // Print } @@ -1939,9 +1880,7 @@ if (preg_match('/^dopayment/', $action)) // If we choosed/click on the payment if (empty($paymentintent)) { print '
\n", $paiement->errors); $ispostactionok = -1; $error++; - } - else - { + } else { $postactionmessages[] = 'Payment created'; $ispostactionok = 1; } @@ -696,15 +669,11 @@ if ($ispaymentok) $postactionmessages[] = $paiement->error.' '.join("
\n", $paiement->errors); $ispostactionok = -1; $error++; - } - else - { + } else { $postactionmessages[] = 'Bank transaction of payment created'; $ispostactionok = 1; } - } - else - { + } else { $postactionmessages[] = 'Setup of bank account to use in module '.$paymentmethod.' was not set. No way to record the payment.'; $ispostactionok = -1; $error++; @@ -714,26 +683,18 @@ if ($ispaymentok) if (!$error) { $db->commit(); - } - else - { + } else { $db->rollback(); } - } - else - { + } else { $postactionmessages[] = 'Failed to get a valid value for "amount paid" ('.$FinalPaymentAmt.') or "payment type" ('.$paymentType.') to record the payment of invoice '.$tmptag['INV'].'. May be payment was already recorded.'; $ispostactionok = -1; } - } - else - { + } else { $postactionmessages[] = 'Invoice payed '.$tmptag['INV'].' was not found'; $ispostactionok = -1; } - } - else - { + } else { // Nothing done } } @@ -788,10 +749,8 @@ if ($ispaymentok) if (preg_match('/\d\.\d/', $appli)) { if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core - } - else $appli .= " ".DOL_VERSION; - } - else $appli .= " ".DOL_VERSION; + } else $appli .= " ".DOL_VERSION; + } else $appli .= " ".DOL_VERSION; $urlback = $_SERVER["REQUEST_URI"]; $topic = '['.$appli.'] '.$companylangs->transnoentitiesnoconv("NewOnlinePaymentReceived"); @@ -802,17 +761,14 @@ if ($ispaymentok) $content .= ''.$companylangs->trans("PaymentSubscription")."
\n"; $content .= $companylangs->trans("MemberId").': '.$tmptag['MEM']."
\n"; $content .= $companylangs->trans("Link").': '.$url.''."
\n"; - } - elseif (array_key_exists('INV', $tmptag)) + } elseif (array_key_exists('INV', $tmptag)) { $url = $urlwithroot."/compta/facture/card.php?id=".$tmptag['INV']; $content .= ''.$companylangs->trans("Payment")."
\n"; $content .= $companylangs->trans("InvoiceId").': '.$tmptag['INV']."
\n"; //$content.=$companylangs->trans("ThirdPartyId").': '.$tmptag['CUS']."
\n"; $content .= $companylangs->trans("Link").': '.$url.''."
\n"; - } - else - { + } else { $content .= $companylangs->transnoentitiesnoconv("NewOnlinePaymentReceived")."
\n"; } $content .= $companylangs->transnoentities("PostActionAfterPayment").' : '; @@ -820,13 +776,10 @@ if ($ispaymentok) { //$topic.=' ('.$companylangs->transnoentitiesnoconv("Status").' '.$companylangs->transnoentitiesnoconv("OK").')'; $content .= ''.$companylangs->transnoentitiesnoconv("OK").''; - } - elseif ($ispostactionok == 0) + } elseif ($ispostactionok == 0) { $content .= $companylangs->transnoentitiesnoconv("None"); - } - else - { + } else { $topic .= ($ispostactionok ? '' : ' ('.$companylangs->trans("WarningPostActionErrorAfterPayment").')'); $content .= ''.$companylangs->transnoentitiesnoconv("Error").''; } @@ -864,16 +817,12 @@ if ($ispaymentok) { dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment'); //dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0); - } - else - { + } else { dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment'); //dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0); } } -} -else -{ +} else { // Get on url call $onlinetoken = empty($PAYPALTOKEN) ? $_SESSION['onlinetoken'] : $PAYPALTOKEN; $payerID = empty($PAYPALPAYERID) ? $_SESSION['payerID'] : $PAYPALPAYERID; @@ -924,10 +873,8 @@ else if (preg_match('/\d\.\d/', $appli)) { if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core - } - else $appli .= " ".DOL_VERSION; - } - else $appli .= " ".DOL_VERSION; + } else $appli .= " ".DOL_VERSION; + } else $appli .= " ".DOL_VERSION; $urlback = $_SERVER["REQUEST_URI"]; $topic = '['.$appli.'] '.$companylangs->transnoentitiesnoconv("ValidationOfPaymentFailed"); @@ -951,9 +898,7 @@ else if ($result) { dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment'); - } - else - { + } else { dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment'); } } diff --git a/htdocs/public/stripe/confirm_payment.php b/htdocs/public/stripe/confirm_payment.php index 9a45a2cbeec..683a537fe69 100644 --- a/htdocs/public/stripe/confirm_payment.php +++ b/htdocs/public/stripe/confirm_payment.php @@ -48,23 +48,18 @@ if (isset($_GET['connect'])) $endpoint_secret = $conf->global->STRIPE_TEST_WEBHOOK_CONNECT_KEY; $service = 'StripeTest'; $servicestatus = 0; - } - else - { + } else { $endpoint_secret = $conf->global->STRIPE_LIVE_WEBHOOK_CONNECT_KEY; $service = 'StripeLive'; $servicestatus = 1; } -} -else { +} else { if (isset($_GET['test'])) { $endpoint_secret = $conf->global->STRIPE_TEST_WEBHOOK_KEY; $service = 'StripeTest'; $servicestatus = 0; - } - else - { + } else { $endpoint_secret = $conf->global->STRIPE_LIVE_WEBHOOK_KEY; $service = 'StripeLive'; $servicestatus = 1; diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php index 4291cb6f834..d3a9521bf25 100644 --- a/htdocs/public/stripe/ipn.php +++ b/htdocs/public/stripe/ipn.php @@ -48,23 +48,18 @@ if (isset($_GET['connect'])) $endpoint_secret = $conf->global->STRIPE_TEST_WEBHOOK_CONNECT_KEY; $service = 'StripeTest'; $servicestatus = 0; - } - else - { + } else { $endpoint_secret = $conf->global->STRIPE_LIVE_WEBHOOK_CONNECT_KEY; $service = 'StripeLive'; $servicestatus = 1; } -} -else { +} else { if (isset($_GET['test'])) { $endpoint_secret = $conf->global->STRIPE_TEST_WEBHOOK_KEY; $service = 'StripeTest'; $servicestatus = 0; - } - else - { + } else { $endpoint_secret = $conf->global->STRIPE_LIVE_WEBHOOK_KEY; $service = 'StripeLive'; $servicestatus = 1; @@ -91,8 +86,7 @@ $error = 0; try { $event = \Stripe\Webhook::constructEvent($payload, $sig_header, $endpoint_secret); -} -catch (\UnexpectedValueException $e) { +} catch (\UnexpectedValueException $e) { // Invalid payload http_response_code(400); // PHP 5.4 or greater exit(); @@ -125,12 +119,10 @@ if (!empty($conf->multicompany->enabled) && !empty($conf->stripeconnect->enabled { $obj = $db->fetch_object($result); $key = $obj->entity; - } - else { + } else { $key = 1; } - } - else { + } else { $key = 1; } $ret = $mc->switchEntity($key); @@ -188,15 +180,12 @@ if ($event->type == 'payout.created') { http_response_code(200); // PHP 5.4 or greater return 1; - } - else - { + } else { $error++; http_response_code(500); // PHP 5.4 or greater return -1; } -} -elseif ($event->type == 'payout.paid') { +} elseif ($event->type == 'payout.paid') { global $conf; $error = 0; $result = dolibarr_set_const($db, $service."_NEXTPAYOUT", null, 'chaine', 0, '', $conf->entity); @@ -269,42 +258,32 @@ elseif ($event->type == 'payout.paid') { http_response_code(200); // PHP 5.4 or greater return 1; - } - else - { + } else { $error++; http_response_code(500); // PHP 5.4 or greater return -1; } -} -elseif ($event->type == 'customer.source.created') { +} elseif ($event->type == 'customer.source.created') { //TODO: save customer's source -} -elseif ($event->type == 'customer.source.updated') { +} elseif ($event->type == 'customer.source.updated') { //TODO: update customer's source -} -elseif ($event->type == 'customer.source.delete') { +} elseif ($event->type == 'customer.source.delete') { //TODO: delete customer's source -} -elseif ($event->type == 'customer.deleted') { +} elseif ($event->type == 'customer.deleted') { $db->begin(); $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_account WHERE key_account = '".$db->escape($event->data->object->id)."' and site='stripe'"; $db->query($sql); $db->commit(); -} -elseif ($event->type == 'payment_intent.succeeded') { // Called when making payment with PaymentIntent method ($conf->global->STRIPE_USE_NEW_CHECKOUT is on). +} elseif ($event->type == 'payment_intent.succeeded') { // Called when making payment with PaymentIntent method ($conf->global->STRIPE_USE_NEW_CHECKOUT is on). // TODO: create fees // TODO: Redirect to paymentok.php -} -elseif ($event->type == 'payment_intent.payment_failed') { +} elseif ($event->type == 'payment_intent.payment_failed') { // TODO: Redirect to paymentko.php -} -elseif ($event->type == 'checkout.session.completed') // Called when making payment with new Checkout method ($conf->global->STRIPE_USE_NEW_CHECKOUT is on). +} elseif ($event->type == 'checkout.session.completed') // Called when making payment with new Checkout method ($conf->global->STRIPE_USE_NEW_CHECKOUT is on). { // TODO: create fees // TODO: Redirect to paymentok.php -} -elseif ($event->type == 'payment_method.attached') { +} elseif ($event->type == 'payment_method.attached') { require_once DOL_DOCUMENT_ROOT.'/societe/class/companypaymentmode.class.php'; require_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php'; $societeaccount = new SocieteAccount($db); @@ -343,14 +322,11 @@ elseif ($event->type == 'payment_method.attached') { if (!$error) { $db->commit(); - } - else - { + } else { $db->rollback(); } } -} -elseif ($event->type == 'payment_method.updated') { +} elseif ($event->type == 'payment_method.updated') { require_once DOL_DOCUMENT_ROOT.'/societe/class/companypaymentmode.class.php'; $companypaymentmode = new CompanyPaymentMode($db); $companypaymentmode->fetch(0, '', 0, '', " AND stripe_card_ref = '".$db->escape($event->data->object->id)."'"); @@ -380,26 +356,20 @@ elseif ($event->type == 'payment_method.updated') { if (!$error) { $db->commit(); - } - else - { + } else { $db->rollback(); } -} -elseif ($event->type == 'payment_method.detached') { +} elseif ($event->type == 'payment_method.detached') { $db->begin(); $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_rib WHERE ref = '".$db->escape($event->data->object->id)."' and status = ".$servicestatus; $db->query($sql); $db->commit(); -} -elseif ($event->type == 'charge.succeeded') { +} elseif ($event->type == 'charge.succeeded') { // TODO: create fees // TODO: Redirect to paymentok.php -} -elseif ($event->type == 'charge.failed') { +} elseif ($event->type == 'charge.failed') { // TODO: Redirect to paymentko.php -} -elseif (($event->type == 'source.chargeable') && ($event->data->object->type == 'three_d_secure') && ($event->data->object->three_d_secure->authenticated == true)) { +} elseif (($event->type == 'source.chargeable') && ($event->data->object->type == 'three_d_secure') && ($event->data->object->three_d_secure->authenticated == true)) { // This event is deprecated. } diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php index c326b4a6bd2..ffa4b24fc59 100644 --- a/htdocs/public/test/test_arrays.php +++ b/htdocs/public/test/test_arrays.php @@ -45,9 +45,7 @@ if (empty($usedolheader)) trans("ErrorFieldRequired", $langs->transnoentities("TicketEmailNotificationFrom")).'
'; print $langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentities("Ticket")); print '
';
- }
- else {
+ } else {
print '";
if ($type == 1) $text = img_object($langs->trans('Service'), 'service');
else $text = img_object($langs->trans('Product'), 'product');
@@ -1088,9 +1064,7 @@ if ($action == 'create')
if ($line->product_type == 1 && empty($conf->global->STOCK_SUPPORTS_SERVICES))
{
$quantityToBeDelivered = 0;
- }
- else
- {
+ } else {
$quantityToBeDelivered = $dispatchLines[$indiceAsked]['qty'];
}
$warehouse_id = $dispatchLines[$indiceAsked]['ent'];
@@ -1111,8 +1085,7 @@ if ($action == 'create')
if (GETPOST('qtyl'.$indiceAsked, 'int')) $defaultqty = GETPOST('qtyl'.$indiceAsked, 'int');
print '';
print '';
- }
- else print $langs->trans("NA");
+ } else print $langs->trans("NA");
print ' ';
// Stock
@@ -1130,9 +1103,7 @@ if ($action == 'create')
print '';
print $formproduct->selectWarehouses($tmpentrepot_id, 'entl'.$indiceAsked, '', 0, 0, $line->fk_product, '', 1);
}
- }
- else
- {
+ } else {
print $langs->trans("Service");
}
print '';
@@ -1149,8 +1120,7 @@ if ($action == 'create')
print '';
print $form->selectDate($dispatchLines[$indiceAsked]['DLUO'], 'dluo'.$indiceAsked, '', '', 1, "");
print ' ';
- }
- else {
+ } else {
print '
'; - } - else - { + } else { dol_print_error($db); } } -} -elseif ($id || $ref) +} elseif ($id || $ref) /* *************************************************************************** */ /* */ /* Edit and view mode */ @@ -1246,9 +1213,7 @@ elseif ($id || $ref) if ($objectref == 'PROV') { $numref = $object->getNextNumRef($soc); - } - else - { + } else { $numref = $object->ref; } @@ -1412,9 +1377,7 @@ elseif ($id || $ref) print $form->selectDate($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0); print ''; print ''; - } - else - { + } else { print $object->date_delivery ? dol_print_date($object->date_delivery, 'dayhour') : ' '; } print ''; @@ -1436,9 +1399,7 @@ elseif ($id || $ref) print ' '; print ' '; print ''; - } - else - { + } else { print $object->trueWeight; print ($object->trueWeight && $object->weight_units != '') ? ' '.measuringUnitString(0, "weight", $object->weight_units) : ''; } @@ -1471,9 +1432,7 @@ elseif ($id || $ref) print ' '; print ' '; print ''; - } - else - { + } else { print $object->trueHeight; print ($object->trueHeight && $object->height_units != '') ? ' '.measuringUnitString(0, "size", $object->height_units) : ''; } @@ -1504,8 +1463,7 @@ elseif ($id || $ref) if ($volumeUnit < 50) { print showDimensionInBestUnit($calculatedVolume, $volumeUnit, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND) ? $conf->global->MAIN_VOLUME_DEFAULT_ROUND : -1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT) ? $conf->global->MAIN_VOLUME_DEFAULT_UNIT : 'no'); - } - else print $calculatedVolume.' '.measuringUnitString(0, "volume", $volumeUnit); + } else print $calculatedVolume.' '.measuringUnitString(0, "volume", $volumeUnit); } if ($totalVolume > 0) { @@ -1550,9 +1508,7 @@ elseif ($id || $ref) if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1); print ''; print ''; - } - else - { + } else { if ($object->shipping_method_id > 0) { // Get code using getLabelFromKey @@ -1584,9 +1540,7 @@ elseif ($id || $ref) if ($action != 'editincoterm') { print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1); - } - else - { + } else { print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id); } print '
'.$langs->trans('TicketPublicInfoCreateTicket').'
';
$formticket->showForm();
}
diff --git a/htdocs/public/ticket/view.php b/htdocs/public/ticket/view.php
index af656e69ab0..ee8865170af 100644
--- a/htdocs/public/ticket/view.php
+++ b/htdocs/public/ticket/view.php
@@ -171,7 +171,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
if (!$error && $action == "add_message" && $display_ticket && GETPOSTISSET('btn_add_message'))
{
// TODO Add message...
- $ret = $object->dao->newMessage($user, $action, 0);
+ $ret = $object->dao->newMessage($user, $action, 0, 1);
@@ -187,9 +187,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
if ($action == "add_message")
{
$action = 'presend';
- }
- else
- {
+ } else {
$action = '';
}
}
@@ -372,9 +370,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
// Message list
print load_fiche_titre($langs->trans('TicketMessagesList'), '', 'object_conversation');
$object->viewTicketMessages(false, true, $object->dao);
- }
- else
- {
+ } else {
print 'Not Allowed
'.$langs->trans('Back').'
';
}
} else {
diff --git a/htdocs/public/website/index.php b/htdocs/public/website/index.php
index 95f2efa492a..d09b8e10012 100644
--- a/htdocs/public/website/index.php
+++ b/htdocs/public/website/index.php
@@ -95,8 +95,7 @@ if (empty($pageid))
if ($result > 0)
{
$pageid = $objectpage->id;
- }
- elseif ($result == 0)
+ } elseif ($result == 0)
{
// Page not found from ref=pageurl, we try using alternative alias
$result = $objectpage->fetch(0, $object->id, null, $pageref);
@@ -105,9 +104,7 @@ if (empty($pageid))
$pageid = $objectpage->id;
}
}
- }
- else
- {
+ } else {
if ($object->fk_default_home > 0)
{
$result = $objectpage->fetch($object->fk_default_home);
@@ -164,9 +161,7 @@ if ($pageid == 'css') // No more used ?
//else
header('Cache-Control: no-cache');
$original_file = $dolibarr_main_data_root.'/website/'.$websitekey.'/styles.css.php';
-}
-else
-{
+} else {
$original_file = $dolibarr_main_data_root.'/website/'.$websitekey.'/page'.$pageid.'.tpl.php';
}
diff --git a/htdocs/public/website/styles.css.php b/htdocs/public/website/styles.css.php
index ce416bdd7b6..8854c13ea52 100644
--- a/htdocs/public/website/styles.css.php
+++ b/htdocs/public/website/styles.css.php
@@ -77,9 +77,7 @@ if (empty($pageid))
{
$object->fetch($websiteid);
$website = $object->ref;
- }
- else
- {
+ } else {
$object->fetch(0, $website);
}
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 3d8547f9322..7bc99977943 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -79,7 +79,7 @@ else {
$result = restrictedArea($user, 'reception');
if ($origin == 'supplierorder') {
if (empty($user->rights->fournisseur->commande->lire) && empty($user->rights->fournisseur->commande->read)) accessforbidden();
- }elseif (empty($user->rights->{$origin}->lire) && empty($user->rights->{$origin}->read)) accessforbidden();
+ } elseif (empty($user->rights->{$origin}->lire) && empty($user->rights->{$origin}->read)) accessforbidden();
}
$action = GETPOST('action', 'alpha');
@@ -233,8 +233,7 @@ if (empty($reshook))
if ($object->origin == "supplierorder")
$classname = 'CommandeFournisseur';
- else
- $classname = ucfirst($object->origin);
+ else $classname = ucfirst($object->origin);
$objectsrc = new $classname($db);
$objectsrc->fetch($object->origin_id);
@@ -353,9 +352,7 @@ if (empty($reshook))
$error++;
}
}
- }
- else
- {
+ } else {
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("QtyToReceive").'/'.$langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
$error++;
}
@@ -365,16 +362,12 @@ if (empty($reshook))
$db->commit();
header("Location: card.php?id=".$object->id);
exit;
- }
- else
- {
+ } else {
$db->rollback();
$_GET["commande_id"] = GETPOST('commande_id', 'int');
$action = 'create';
}
- }
-
- elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
+ } elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->creer))
|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->reception_advance->validate)))
)
@@ -387,9 +380,7 @@ if (empty($reshook))
{
$langs->load("errors");
setEventMessages($langs->trans($object->error), null, 'errors');
- }
- else
- {
+ } else {
// Define output language
if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
{
@@ -408,18 +399,14 @@ if (empty($reshook))
if ($result < 0) dol_print_error($db, $result);
}
}
- }
-
- elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->reception->supprimer)
+ } elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->reception->supprimer)
{
$result = $object->delete($user);
if ($result > 0)
{
header("Location: ".DOL_URL_ROOT.'/reception/index.php');
exit;
- }
- else
- {
+ } else {
setEventMessages($object->error, $object->errors, 'errors');
}
}
@@ -517,9 +504,7 @@ if (empty($reshook))
$ret = dol_delete_file($file, 0, 0, 0, $object);
if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
- }
-
- elseif ($action == 'classifybilled')
+ } elseif ($action == 'classifybilled')
{
$object->fetch($id);
$result = $object->set_billed();
@@ -527,9 +512,7 @@ if (empty($reshook))
header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
exit();
}
- }
-
- elseif ($action == 'classifyclosed')
+ } elseif ($action == 'classifyclosed')
{
$object->fetch($id);
$result = $object->setClosed();
@@ -566,9 +549,7 @@ if (empty($reshook))
if (!$error) {
header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
exit();
- }
- else
- {
+ } else {
setEventMessages($line->error, $line->errors, 'errors');
}
}
@@ -630,8 +611,7 @@ if (empty($reshook))
setEventMessages($line->error, $line->errors, 'errors');
$error++;
}
- }
- else // Product no predefined
+ } else // Product no predefined
{
$qty = "qtyl".$line_id;
$line->id = $line_id;
@@ -666,9 +646,7 @@ if (empty($reshook))
$ret = $object->fetch($object->id); // Reload to get new records
$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
}
- }
- else
- {
+ } else {
header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition
exit();
}
@@ -1048,9 +1026,7 @@ if ($action == 'create')
}
print '';
- }
- else
- {
+ } else {
print "'.$langs->trans('Back').'
'; - } - else - { + } else { dol_print_error($db); } } -} -elseif ($id || $ref) +} elseif ($id || $ref) /* *************************************************************************** */ /* */ /* Edit and view mode */ @@ -1246,9 +1213,7 @@ elseif ($id || $ref) if ($objectref == 'PROV') { $numref = $object->getNextNumRef($soc); - } - else - { + } else { $numref = $object->ref; } @@ -1412,9 +1377,7 @@ elseif ($id || $ref) print $form->selectDate($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0); print ''; print ''; - } - else - { + } else { print $object->date_delivery ? dol_print_date($object->date_delivery, 'dayhour') : ' '; } print ''; @@ -1436,9 +1399,7 @@ elseif ($id || $ref) print ' '; print ' '; print ''; - } - else - { + } else { print $object->trueWeight; print ($object->trueWeight && $object->weight_units != '') ? ' '.measuringUnitString(0, "weight", $object->weight_units) : ''; } @@ -1471,9 +1432,7 @@ elseif ($id || $ref) print ' '; print ' '; print ''; - } - else - { + } else { print $object->trueHeight; print ($object->trueHeight && $object->height_units != '') ? ' '.measuringUnitString(0, "size", $object->height_units) : ''; } @@ -1504,8 +1463,7 @@ elseif ($id || $ref) if ($volumeUnit < 50) { print showDimensionInBestUnit($calculatedVolume, $volumeUnit, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND) ? $conf->global->MAIN_VOLUME_DEFAULT_ROUND : -1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT) ? $conf->global->MAIN_VOLUME_DEFAULT_UNIT : 'no'); - } - else print $calculatedVolume.' '.measuringUnitString(0, "volume", $volumeUnit); + } else print $calculatedVolume.' '.measuringUnitString(0, "volume", $volumeUnit); } if ($totalVolume > 0) { @@ -1550,9 +1508,7 @@ elseif ($id || $ref) if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1); print ''; print ''; - } - else - { + } else { if ($object->shipping_method_id > 0) { // Get code using getLabelFromKey @@ -1584,9 +1540,7 @@ elseif ($id || $ref) if ($action != 'editincoterm') { print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1); - } - else - { + } else { print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id); } print '
'.dol_htmlentitiesbr($lines[$i]->description) : ''; } print "
'; print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"), $detail); - } - else - { + } else { print $langs->trans("NA"); } print ''; @@ -1955,8 +1891,7 @@ elseif ($id || $ref) print '
'; print '
'; - } - elseif ($object->statut == Reception::STATUS_DRAFT) + } elseif ($object->statut == Reception::STATUS_DRAFT) { // edit-delete buttons print '
"; } $db->free($resql); -} -else dol_print_error($db); +} else dol_print_error($db); diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php index c6cfcd5264c..93aba12eb00 100644 --- a/htdocs/reception/list.php +++ b/htdocs/reception/list.php @@ -192,8 +192,7 @@ if (empty($reshook)) $object->add_object_linked('reception', $value); // add supplier order linked object } } - } - else { + } else { $object->socid = $rcp->socid; $object->type = FactureFournisseur::TYPE_STANDARD; $object->cond_reglement_id = $rcp->thirdparty->cond_reglement_supplier_id; @@ -278,16 +277,12 @@ if (empty($reshook)) { $result = $object->insert_discount($discountid); //$result=$discount->link_to_invoice($lineid,$id); - } - else - { + } else { setEventMessages($discount->error, $discount->errors, 'errors'); $error++; break; } - } - else - { + } else { // Positive line $product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0); // Date start @@ -334,9 +329,7 @@ if (empty($reshook)) if ($result > 0) { $lineid = $result; - } - else - { + } else { $lineid = 0; $error++; break; @@ -390,9 +383,7 @@ if (empty($reshook)) { $db->commit(); setEventMessage($langs->trans('BillCreated', $nb_bills_created)); - } - else - { + } else { $db->rollback(); $action = 'create'; $_GET["origin"] = $_POST["origin"]; @@ -584,9 +575,7 @@ if ($resql) { print $form->selectyesno('validate_invoices', 0, 1, 1); print ' ('.$langs->trans("AutoValidationNotPossibleWhenStockIsDecreasedOnInvoiceValidation").')'; - } - else - { + } else { print $form->selectyesno('validate_invoices', 0, 1); } print ''; @@ -936,9 +925,7 @@ if ($resql) print "
';
// Show graphs
print '
| ';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
print $px1->show();
print " \n"; /*print $px2->show(); diff --git a/htdocs/resource/agenda.php b/htdocs/resource/agenda.php index 1035d17d5f9..72d055da41d 100644 --- a/htdocs/resource/agenda.php +++ b/htdocs/resource/agenda.php @@ -48,9 +48,7 @@ if (GETPOST('actioncode', 'array')) { $actioncode = GETPOST('actioncode', 'array', 3); if (!count($actioncode)) $actioncode = '0'; -} -else -{ +} else { $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT)); } $search_agenda_label = GETPOST('search_agenda_label'); diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php index b403c0516f9..8d965c69c2c 100644 --- a/htdocs/resource/card.php +++ b/htdocs/resource/card.php @@ -99,9 +99,7 @@ if (empty($reshook)) { setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Ref")), null, 'errors'); $action = 'create'; - } - else - { + } else { $object->ref = $ref; $object->description = $description; $object->fk_code_type_resource = $fk_code_type_resource; @@ -118,17 +116,13 @@ if (empty($reshook)) setEventMessages($langs->trans('ResourceCreatedWithSuccess'), null, 'mesgs'); Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); exit; - } - else - { + } else { // Creation KO setEventMessages($object->error, $object->errors, 'errors'); $action = 'create'; } } - } - else - { + } else { Header("Location: list.php"); exit; } @@ -165,15 +159,11 @@ if (empty($reshook)) { Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); $error++; } - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); $error++; } @@ -197,14 +187,10 @@ if (empty($reshook)) setEventMessages($langs->trans('RessourceSuccessfullyDeleted'), null, 'mesgs'); Header('Location: '.DOL_URL_ROOT.'/resource/list.php'); exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } @@ -227,9 +213,7 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0) { print load_fiche_titre($title, '', 'object_resource'); dol_fiche_head(''); - } - else - { + } else { $head = resource_prepare_head($object); dol_fiche_head($head, 'resource', $title, -1, 'resource'); } @@ -291,9 +275,7 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0) print ''; print ''; - } - else - { + } else { $formconfirm = ''; // Confirm deleting resource line @@ -393,8 +375,7 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0) } } print ''; -} -else { +} else { dol_print_error(); } diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php index 1b4223e1fff..294f36e5589 100644 --- a/htdocs/resource/class/dolresource.class.php +++ b/htdocs/resource/class/dolresource.class.php @@ -164,9 +164,7 @@ class Dolresource extends CommonObject } $this->db->rollback(); return -1 * $error; - } - else - { + } else { $this->db->commit(); return $this->id; } @@ -223,9 +221,7 @@ class Dolresource extends CommonObject $this->db->free($resql); return $this->id; - } - else - { + } else { $this->error = "Error ".$this->db->lasterror(); dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR); return -1; @@ -329,9 +325,7 @@ class Dolresource extends CommonObject } $this->db->rollback(); return -1 * $error; - } - else - { + } else { $this->db->commit(); return 1; } @@ -388,9 +382,7 @@ class Dolresource extends CommonObject $this->db->free($resql); return $this->id; - } - else - { + } else { $this->error = "Error ".$this->db->lasterror(); return -1; } @@ -427,9 +419,7 @@ class Dolresource extends CommonObject $this->error = $this->db->lasterror(); $error++; } - } - else - { + } else { $this->error = $this->db->lasterror(); $error++; } @@ -475,9 +465,7 @@ class Dolresource extends CommonObject { $this->db->commit(); return 1; - } - else - { + } else { $this->db->rollback(); return -1; } @@ -522,11 +510,9 @@ class Dolresource extends CommonObject foreach ($filter as $key => $value) { if (strpos($key, 'date')) { $sql .= ' AND '.$key.' = \''.$this->db->idate($value).'\''; - } - elseif (strpos($key, 'ef.') !== false) { + } elseif (strpos($key, 'ef.') !== false) { $sql .= $value; - } - else { + } else { $sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\''; } } @@ -567,9 +553,7 @@ class Dolresource extends CommonObject $this->db->free($resql); } return $num; - } - else - { + } else { $this->error = $this->db->lasterror(); return -1; } @@ -608,8 +592,7 @@ class Dolresource extends CommonObject foreach ($filter as $key => $value) { if (strpos($key, 'date')) { $sql .= ' AND '.$key.' = \''.$this->db->idate($value).'\''; - } - else { + } else { $sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\''; } } @@ -645,9 +628,7 @@ class Dolresource extends CommonObject $this->db->free($resql); } return $num; - } - else - { + } else { $this->error = $this->db->lasterror(); return -1; } @@ -690,8 +671,7 @@ class Dolresource extends CommonObject foreach ($filter as $key => $value) { if (strpos($key, 'date')) { $sql .= ' AND '.$key.' = \''.$this->db->idate($value).'\''; - } - else { + } else { $sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\''; } } @@ -724,9 +704,7 @@ class Dolresource extends CommonObject $this->db->free($resql); } return $num; - } - else - { + } else { $this->error = $this->db->lasterror(); return -1; } @@ -816,9 +794,7 @@ class Dolresource extends CommonObject } $this->db->rollback(); return -1 * $error; - } - else - { + } else { $this->db->commit(); return 1; } @@ -924,9 +900,7 @@ class Dolresource extends CommonObject $i++; } return $num; - } - else - { + } else { dol_print_error($this->db); return -1; } @@ -978,8 +952,7 @@ class Dolresource extends CommonObject } $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"'; $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"'; - } - else $linkclose = ($morecss ? ' class="'.$morecss.'"' : ''); + } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : ''); $linkstart = ''; diff --git a/htdocs/resource/class/html.formresource.class.php b/htdocs/resource/class/html.formresource.class.php index 4836ed1a0f1..451ca9922b1 100644 --- a/htdocs/resource/class/html.formresource.class.php +++ b/htdocs/resource/class/html.formresource.class.php @@ -126,9 +126,7 @@ class FormResource if ($selected > 0 && $selected == $resourcestat->lines[$i]->id) { $out .= ''; - } - else - { + } else { $out .= ''; } @@ -146,9 +144,7 @@ class FormResource $out .= ''; } - } - else - { + } else { dol_print_error($this->db); } diff --git a/htdocs/resource/contact.php b/htdocs/resource/contact.php index cbc94c2e843..ee20d918648 100644 --- a/htdocs/resource/contact.php +++ b/htdocs/resource/contact.php @@ -62,9 +62,7 @@ if ($action == 'addcontact' && $user->rights->resource->write) { header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); exit; - } - else - { + } else { if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') { $langs->load("errors"); $mesg = $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"); @@ -91,8 +89,7 @@ elseif ($action == 'deletecontact' && $user->rights->resource->write) { header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); exit; - } - else { + } else { dol_print_error($db); } } diff --git a/htdocs/resource/document.php b/htdocs/resource/document.php index d0d4e2300d8..077430cf4bb 100644 --- a/htdocs/resource/document.php +++ b/htdocs/resource/document.php @@ -136,9 +136,7 @@ if ($object->id > 0) $permission = $user->rights->resource->write; include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php'; -} -else -{ +} else { print $langs->trans("ErrorUnknown"); } diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php index 1ce3957071a..dd3a02e18e3 100644 --- a/htdocs/resource/element_resource.php +++ b/htdocs/resource/element_resource.php @@ -97,9 +97,7 @@ if (empty($reshook)) $error++; setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Resource")), null, 'errors'); $action = ''; - } - else - { + } else { $objstat = fetchObjectByElement($element_id, $element, $element_ref); $objstat->element = $element; // For externals module, we need to keep @xx @@ -169,8 +167,7 @@ if (empty($reshook)) setEventMessages($langs->trans('ResourceLinkedWithSuccess'), null, 'mesgs'); header("Location: ".$_SERVER['PHP_SELF'].'?element='.$element.'&element_id='.$objstat->id); exit; - } - elseif ($objstat) + } elseif ($objstat) { setEventMessages($objstat->error, $objstat->errors, 'errors'); } @@ -265,9 +262,7 @@ if (empty($reshook)) setEventMessages($langs->trans('RessourceLineSuccessfullyDeleted'), null, 'mesgs'); header("Location: ".$_SERVER['PHP_SELF']."?element=".$element."&element_id=".$element_id); exit; - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } @@ -297,9 +292,7 @@ if ($ret == -1) { } if (!$ret) { print ' '.$langs->trans('NoResourceInDatabase').' ';
-}
-else
-{
+} else {
// Confirmation suppression resource line
if ($action == 'delete_resource')
{
@@ -411,9 +404,7 @@ else
}
}
$_SESSION['assignedtouser'] = json_encode($listofuserid);
- }
- else
- {
+ } else {
if (!empty($_SESSION['assignedtouser']))
{
$listofuserid = json_decode($_SESSION['assignedtouser'], true);
@@ -600,9 +591,7 @@ else
if (file_exists(dol_buildpath($reldir.'/resource_'.$element_prop['element'].'_add.tpl.php')))
{
$tpl = dol_buildpath($reldir.'/resource_'.$element_prop['element'].'_add.tpl.php');
- }
- else
- {
+ } else {
$tpl = DOL_DOCUMENT_ROOT.$reldir.'/resource_add.tpl.php';
}
if (empty($conf->file->strict_mode)) {
@@ -620,9 +609,7 @@ else
if (file_exists(dol_buildpath($reldir.'/resource_'.$element_prop['element'].'_view.tpl.php')))
{
$tpl = dol_buildpath($reldir.'/resource_'.$element_prop['element'].'_view.tpl.php');
- }
- else
- {
+ } else {
$tpl = DOL_DOCUMENT_ROOT.$reldir.'/resource_view.tpl.php';
}
if (empty($conf->file->strict_mode)) {
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index 033d49ae8c8..4dca64b47a6 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -281,9 +281,7 @@ if ($ret)
print ' | ||||||||||||||||||||
| '.$langs->trans("NoRecordFound").' | ||||||||||||||||||||
| ';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
print $px1->show();
print " \n"; print $px2->show(); diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php index fb6663be951..21ee679292a 100644 --- a/htdocs/societe/admin/societe.php +++ b/htdocs/societe/admin/societe.php @@ -53,9 +53,7 @@ if ($action == 'setcodeclient') { header("Location: ".$_SERVER["PHP_SELF"]); exit; - } - else - { + } else { dol_print_error($db); } } @@ -66,9 +64,7 @@ if ($action == 'setcodecompta') { header("Location: ".$_SERVER["PHP_SELF"]); exit; - } - else - { + } else { dol_print_error($db); } } @@ -83,9 +79,7 @@ if ($action == 'updateoptions') if (!$error) { setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); - } - else - { + } else { setEventMessages($langs->trans("Error"), null, 'errors'); } } @@ -98,9 +92,7 @@ if ($action == 'updateoptions') if (!$error) { setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); - } - else - { + } else { setEventMessages($langs->trans("Error"), null, 'errors'); } } @@ -113,9 +105,7 @@ if ($action == 'updateoptions') if (!$error) { setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); - } - else - { + } else { setEventMessages($langs->trans("Error"), null, 'errors'); } } @@ -177,9 +167,7 @@ if ($action == 'setdoc') if ($result1 && $result2) { $db->commit(); - } - else - { + } else { $db->rollback(); } } @@ -192,9 +180,7 @@ if ($action == "setaddrefinlist") { if (!$error) { setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); - } - else - { + } else { setEventMessages($langs->trans("Error"), null, 'errors'); } } @@ -207,9 +193,7 @@ if ($action == "setaddadressinlist") { if (!$error) { setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); - } - else - { + } else { setEventMessages($langs->trans("Error"), null, 'errors'); } } @@ -222,9 +206,7 @@ if ($action == "setaskforshippingmet") { if (!$error) { setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); - } - else - { + } else { setEventMessages($langs->trans("Error"), null, 'errors'); } } @@ -237,9 +219,7 @@ if ($action == "setdisableprospectcustomer") { if (!$error) { setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); - } - else - { + } else { setEventMessages($langs->trans("Error"), null, 'errors'); } } @@ -254,9 +234,7 @@ if ($action == 'setprofid') { //header("Location: ".$_SERVER["PHP_SELF"]); //exit; - } - else - { + } else { dol_print_error($db); } } @@ -271,9 +249,7 @@ if ($action == 'setprofidmandatory') { //header("Location: ".$_SERVER["PHP_SELF"]); //exit; - } - else - { + } else { dol_print_error($db); } } @@ -288,9 +264,7 @@ if ($action == 'setprofidinvoicemandatory') { //header("Location: ".$_SERVER["PHP_SELF"]); //exit; - } - else - { + } else { dol_print_error($db); } } @@ -304,9 +278,7 @@ if ($action == 'sethideinactivethirdparty') { header("Location: ".$_SERVER["PHP_SELF"]); exit; - } - else - { + } else { dol_print_error($db); } } @@ -317,9 +289,7 @@ if ($action == 'setonsearchandlistgooncustomerorsuppliercard') { if (!$error) { setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); - } - else - { + } else { setEventMessages($langs->trans("Error"), null, 'errors'); } } @@ -378,8 +348,7 @@ foreach ($dirsociete as $dirroot) try { dol_include_once($dirroot.$file.'.php'); - } - catch (Exception $e) + } catch (Exception $e) { dol_syslog($e->getMessage(), LOG_ERR); } @@ -411,9 +380,7 @@ foreach ($arrayofmodules as $file => $modCodeTiers) print ' | '."\n"; print img_picto($langs->trans("Activated"), 'switch_on'); print " | \n"; - } - else - { + } else { $disabled = (!empty($conf->multicompany->enabled) && (is_object($mc) && !empty($mc->sharings['referent']) && $mc->sharings['referent'] != $conf->entity) ? true : false); print ''; if (!$disabled) print ''; @@ -466,8 +433,7 @@ foreach ($dirsociete as $dirroot) try { dol_include_once($dirroot.$file.'.php'); - } - catch (Exception $e) + } catch (Exception $e) { dol_syslog($e->getMessage(), LOG_ERR); } @@ -497,9 +463,7 @@ foreach ($arrayofmodules as $file => $modCodeCompta) print ' | '; print img_picto($langs->trans("Activated"), 'switch_on'); print ' | '; - } - else - { + } else { print ''; print img_picto($langs->trans("Disabled"), 'switch_off'); print ' | '; @@ -537,9 +501,7 @@ if ($resql) array_push($def, $array[0]); $i++; } -} -else -{ +} else { dol_print_error($db); } @@ -569,8 +531,7 @@ foreach ($dirsociete as $dirroot) try { dol_include_once($dirroot.'doc/'.$file); - } - catch (Exception $e) + } catch (Exception $e) { dol_syslog($e->getMessage(), LOG_ERR); } @@ -607,17 +568,13 @@ foreach ($dirsociete as $dirroot) // print img_picto($langs->trans("Enabled"),'on'); //} print ""; - } - else - { + } else { if (versioncompare($module->phpmin, versionphparray()) > 0) { print "\n"; print img_picto(dol_escape_htmltag($langs->trans("ErrorModuleRequirePHPVersion", join('.', $module->phpmin))), 'switch_off'); print " | "; - } - else - { + } else { print "\n"; print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').''; print " | "; @@ -643,9 +600,7 @@ foreach ($dirsociete as $dirroot) if ($module->type == 'pdf') { $linkspec = ''.img_object($langs->trans("Preview"), 'bill').''; - } - else - { + } else { $linkspec = img_object($langs->trans("PreviewNotAvailable"), 'generic'); } print $linkspec; @@ -714,9 +669,7 @@ foreach ($profid as $key => $val) print ''; print img_picto($langs->trans("Activated"), 'switch_on'); print ' | '; - } - else - { + } else { print ''; print img_picto($langs->trans("Disabled"), 'switch_off'); print ' | '; @@ -727,9 +680,7 @@ foreach ($profid as $key => $val) print ''; print img_picto($langs->trans("Activated"), 'switch_on'); print ' | '; - } - else - { + } else { print ''; print img_picto($langs->trans("Disabled"), 'switch_off'); print ' | '; @@ -740,9 +691,7 @@ foreach ($profid as $key => $val) print ''; print img_picto($langs->trans("Activated"), 'switch_on'); print ' | '; - } - else - { + } else { print ''; print img_picto($langs->trans("Disabled"), 'switch_off'); print ' | '; @@ -783,9 +732,7 @@ if (!$conf->use_javascript_ajax) print ''; print $langs->trans("NotAvailableWhenAjaxDisabled"); print " | "; -} -else -{ +} else { print ''; $arrval = array('0'=>$langs->trans("No"), '1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')', @@ -807,9 +754,7 @@ if (!$conf->use_javascript_ajax) print ' | '; print $langs->trans("NotAvailableWhenAjaxDisabled"); print " | "; -} -else -{ +} else { print ''; $arrval = array('0'=>$langs->trans("No"), '1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')', @@ -833,9 +778,7 @@ if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST)) { print ''; print img_picto($langs->trans("Activated"), 'switch_on'); -} -else -{ +} else { print ''; print img_picto($langs->trans("Disabled"), 'switch_off'); } @@ -850,9 +793,7 @@ if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) { print ''; print img_picto($langs->trans("Activated"), 'switch_on'); -} -else -{ +} else { print ''; print img_picto($langs->trans("Disabled"), 'switch_off'); } @@ -869,9 +810,7 @@ if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD)) { print ''; print img_picto($langs->trans("Activated"), 'switch_on'); -} -else -{ +} else { print ''; print img_picto($langs->trans("Disabled"), 'switch_off'); } @@ -887,9 +826,7 @@ if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS)) { print ''; print img_picto($langs->trans("Activated"), 'switch_on'); -} -else -{ +} else { print ''; print img_picto($langs->trans("Disabled"), 'switch_off'); } diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php index dba483c52eb..61d473f5c43 100644 --- a/htdocs/societe/agenda.php +++ b/htdocs/societe/agenda.php @@ -38,9 +38,7 @@ if (GETPOST('actioncode', 'array')) { $actioncode = GETPOST('actioncode', 'array', 3); if (!count($actioncode)) $actioncode = '0'; -} -else -{ +} else { $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT)); } $search_agenda_label = GETPOST('search_agenda_label'); diff --git a/htdocs/societe/ajax/company.php b/htdocs/societe/ajax/company.php index 4fe737ca31c..dc2d60df5e6 100644 --- a/htdocs/societe/ajax/company.php +++ b/htdocs/societe/ajax/company.php @@ -67,9 +67,7 @@ if (!empty($action) && $action == 'fetch' && !empty($id)) } echo json_encode($outjson); -} -else -{ +} else { require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; $langs->load("companies"); diff --git a/htdocs/societe/ajaxcompanies.php b/htdocs/societe/ajaxcompanies.php index dcf0b1a4483..b98a5f75d5b 100644 --- a/htdocs/societe/ajaxcompanies.php +++ b/htdocs/societe/ajaxcompanies.php @@ -71,9 +71,7 @@ if (GETPOST('newcompany') || GETPOST('socid', 'int') || GETPOST('id_fourn')) $sql .= "nom LIKE '".$db->escape($socid)."%'"; $sql .= " OR code_client LIKE '".$db->escape($socid)."%'"; $sql .= " OR code_fournisseur LIKE '".$db->escape($socid)."%'"; - } - else - { + } else { $sql .= "nom LIKE '%".$db->escape($socid)."%'"; $sql .= " OR code_client LIKE '%".$db->escape($socid)."%'"; $sql .= " OR code_fournisseur LIKE '%".$db->escape($socid)."%'"; @@ -100,13 +98,9 @@ if (GETPOST('newcompany') || GETPOST('socid', 'int') || GETPOST('id_fourn')) } echo json_encode($return_arr); - } - else - { + } else { echo json_encode(array('nom'=>'Error', 'label'=>'Error', 'key'=>'Error', 'value'=>'Error')); } -} -else -{ +} else { echo json_encode(array('nom'=>'ErrorBadParameter', 'label'=>'ErrorBadParameter', 'key'=>'ErrorBadParameter', 'value'=>'ErrorBadParameter')); } diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php index 70ac0577cb9..fa650a4e1fd 100644 --- a/htdocs/societe/canvas/actions_card_common.class.php +++ b/htdocs/societe/canvas/actions_card_common.class.php @@ -244,23 +244,19 @@ abstract class ActionsCardCommon $this->tpl['localtax'] .= ' | '.$langs->trans("LocalTax2IsUsedES").' | '; $this->tpl['localtax'] .= $form->selectyesno('localtax2assuj_value', $this->object->localtax1_assuj, 1); $this->tpl['localtax'] .= ' | ||
| '.$langs->trans("LocalTax1IsUsedES").' | '; $this->tpl['localtax'] .= $form->selectyesno('localtax1assuj_value', $this->object->localtax1_assuj, 1); $this->tpl['localtax'] .= ' | |||||||||||||||||||
| '.$langs->trans("LocalTax2IsUsedES").' | '; $this->tpl['localtax'] .= $form->selectyesno('localtax2assuj_value', $this->object->localtax1_assuj, 1); $this->tpl['localtax'] .= ' | |||||||||||||||||||
| '.yn($this->object->localtax1_assuj).' | '; $this->tpl['localtax'] .= ''.$langs->trans("LocalTax2IsUsedES").' | '; $this->tpl['localtax'] .= ''.yn($this->object->localtax2_assuj).' | ||||||||||||||||||
| '.$langs->trans("LocalTax1IsUsedES").' | '; $this->tpl['localtax'] .= ''.yn($this->object->localtax1_assuj).' | |||||||||||||||||||
| '.$langs->trans("LocalTax2IsUsedES").' | '; $this->tpl['localtax'] .= ''.yn($this->object->localtax2_assuj).' | '.$form->editfieldkey('Vendor', 'fournisseur', '', $object, 0, 'string', '', 1).' | '; $default = -1; if (!empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)) $default = 1; - print $form->selectyesno("fournisseur", (GETPOST('fournisseur', 'int') != '' ?GETPOST('fournisseur', 'int') : (GETPOST("type", 'alpha') == '' ? $default : $object->fournisseur)), 1, 0, (GETPOST("type", 'alpha') == '' ? 1 : 0)); + print $form->selectyesno("fournisseur", (GETPOST('fournisseur', 'int') != '' ? GETPOST('fournisseur', 'int') : (GETPOST("type", 'alpha') == '' ? $default : $object->fournisseur)), 1, 0, (GETPOST("type", 'alpha') == '' ? 1 : 0)); print ' | '; @@ -1341,9 +1301,7 @@ else if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2)) { print '|||||||||||||||||
| '.$form->editfieldkey('Region-State', 'state_id', '', $object, 0).' | '; - } - else - { + } else { print ' | |||||||||||||||||||
| '.$form->editfieldkey('State', 'state_id', '', $object, 0).' | '; } @@ -1431,9 +1389,7 @@ else print "\n"; $s .= ''.$langs->trans("VATIntraCheck").''; $s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1); - } - else - { + } else { $s .= 'country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').''; } } @@ -1452,14 +1408,12 @@ else print ' | '.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).' | '; print $form->selectyesno('localtax2assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2 : 0), 1); print ' | |||||||||||||||||
| '.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).' | '; print $form->selectyesno('localtax1assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1 : 0), 1); print ' | |||||||||||||||||||
| '.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).' | '; print $form->selectyesno('localtax2assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2 : 0), 1); @@ -1484,9 +1438,7 @@ else if ($object->country_id) { print $formcompany->select_juridicalstatus($object->forme_juridique_code, $object->country_code, '', 'forme_juridique_code'); - } - else - { + } else { print $countrynotdefined; } print ' | |||||||||||||||||||
| '.$form->editfieldkey('Region-State', 'state_id', '', $object, 0).' | '; - } - else - { + } else { print ' | |||||||||||||||||||
| '.$form->editfieldkey('State', 'state_id', '', $object, 0).' | '; } @@ -2049,8 +1988,7 @@ else print ''; } print ' | |||||||||||||||||||
| '.$form->editfieldkey($langs->transcountry("LocalTax1IsUsed", $mysoc->country_code), 'localtax1assuj_value', '', $object, 0).' | '; print $form->selectyesno('localtax1assuj_value', $object->localtax1_assuj, 1); @@ -2061,8 +1999,7 @@ else print ''; } print ' | |||||||||||||||||||
| '.$form->editfieldkey($langs->transcountry("LocalTax2IsUsed", $mysoc->country_code), 'localtax2assuj_value', '', $object, 0).' | '; print $form->selectyesno('localtax2assuj_value', $object->localtax2_assuj, 1); @@ -2098,9 +2035,7 @@ else print "\n"; $s .= ''.$langs->trans("VATIntraCheck").''; $s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1); - } - else - { + } else { $s .= 'country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').''; } } @@ -2242,9 +2177,7 @@ else print ''; } - } - else - { + } else { /* * View */ @@ -2405,9 +2338,7 @@ else print ' | '; $formcompany->select_localtax(1, $object->localtax1_value, "lt1"); print ' | '; - } - else - { + } else { print ''.$object->localtax1_value.' | '; } print '|||||||||||||||||
| '.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).' | '; print yn($object->localtax1_assuj); @@ -2448,8 +2378,7 @@ else } print ' | |||||||||||||||||||
| '.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).' | '; print yn($object->localtax2_assuj); @@ -2499,16 +2428,12 @@ else print "\n"; $s .= ''.$langs->trans("VATIntraCheck").''; $s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1); - } - else - { + } else { $s .= 'country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').''; } } print $s; - } - else - { + } else { print ' '; } print ' | '; @@ -2585,9 +2510,7 @@ else if ($action != 'editincoterm') { print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1); - } - else - { + } else { print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?socid='.$object->id); } print '|||||||||||||||||||
| '; print $langs->trans('SupplierCode').' | '; print $object->code_fournisseur; @@ -352,14 +355,14 @@ if ($sql_select) $num = $db->num_rows($resql); - $param = "&socid=".$socid."&type_element=".$type_element; - if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage; - if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit; + $param = "&socid=".urlencode($socid)."&type_element=".urlencode($type_element); + if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage); + if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit); if ($sprod_fulldescr) $param .= "&sprod_fulldescr=".urlencode($sprod_fulldescr); if ($sref) $param .= "&sref=".urlencode($sref); - if ($month) $param .= "&month=".$month; - if ($year) $param .= "&year=".$year; - if ($optioncss != '') $param .= '&optioncss='.$optioncss; + if ($month) $param .= "&month=".urlencode($month); + if ($year) $param .= "&year=".urlencode($year); + if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss); print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, '', 0, '', '', $limit); @@ -427,9 +430,7 @@ if ($sql_select) if ($type_element == 'contract') { print $documentstaticline->getLibStatut(2); - } - else - { + } else { print $documentstatic->getLibStatut(2); } print ' | '; @@ -471,9 +472,7 @@ if ($sql_select) } $label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label; - } - else - { + } else { $label = $objp->product_label; } @@ -507,29 +506,23 @@ if ($sql_select) $discount = new DiscountAbsolute($db); $discount->fetch($objp->fk_remise_except); echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0)); - } - elseif ($objp->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0) + } elseif ($objp->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0) { $discount = new DiscountAbsolute($db); $discount->fetch($objp->fk_remise_except); echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0)); - } - elseif ($objp->description == '(DEPOSIT)' && $objp->fk_remise_except > 0) + } elseif ($objp->description == '(DEPOSIT)' && $objp->fk_remise_except > 0) { $discount = new DiscountAbsolute($db); $discount->fetch($objp->fk_remise_except); echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0)); // Add date of deposit if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) echo ' ('.dol_print_date($discount->datec).')'; - } - else - { + } else { echo ($txt ? ' - ' : '').dol_htmlentitiesbr($objp->description); } } - } - else - { + } else { if ($objp->fk_product > 0) { echo $form->textwithtooltip($text, $description, 3, '', '', $i, 0, ''); @@ -607,8 +600,7 @@ if ($sql_select) print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num); } $db->free($resql); -} -elseif (empty($type_element) || $type_element == -1) +} elseif (empty($type_element) || $type_element == -1) { print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', ''); @@ -625,8 +617,7 @@ elseif (empty($type_element) || $type_element == -1) print '|||||||||||||||||||
| '.$langs->trans("SelectElementAndClick", $langs->transnoentitiesnoconv("Search")).' | ||||||||||||||||||||
| '; print ' | |||
| '; print $langs->trans("YouMustCreateContactFirst"); print ' | |||
....'.$src->card->last4.' - '.$src->card->exp_month.'/'.$src->card->exp_year.''; print '
....'.$src->card->last4.' - '.$src->card->exp_month.'/'.$src->card->exp_year.''; print '
LT12 1000 0111 0100 1000
FR14 2004 1010 0505 0001 3M02 606
LU28 0019 4006 4475 0000
DE89 3704 0044 0532 0130 00'; } elseif ($val == 'BIC') { $name = 'bic'; $size = 12; $content = $companybankaccount->bic; if ($companybankaccount->needIBAN()) $require = true; + $tooltip = $langs->trans("Example").': LIABLT2XXXX'; } - print '
'."\n";
print '';
print "\n
\n"; - } - else - { + } else { // View mode /* ************************************************************************** */ @@ -590,9 +586,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { print "\n"; } - } - else - { + } else { $colspan = 9; if ($user->rights->produit->supprimer || $user->rights->service->supprimer) $colspan += 1; print '
'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'
';
- }
- else
- {
+ } else {
$mesg = ''.$object->error.'
';
}
}
@@ -99,9 +95,7 @@ elseif ($action == 'swapstatut' && $user->rights->societe->creer)
if ($object->fetch($id))
{
$result = $object->swapContactStatus(GETPOST('ligne'));
- }
- else
- {
+ } else {
dol_print_error($db);
}
}
@@ -116,8 +110,7 @@ elseif ($action == 'deletecontact' && $user->rights->societe->creer)
{
header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit;
- }
- else {
+ } else {
dol_print_error($db);
}
}
@@ -327,17 +320,13 @@ if ($id > 0 || !empty($ref))
print " ".img_warning($langs->trans("SubscriptionLate"));
}
print '';
- }
- else
- {
+ } else {
print '| ';
$this->resprints .= $langs->trans('StripeCustomer');
@@ -208,25 +204,19 @@ class ActionsStripeconnect
{
$langs->load("withdrawals");
print ''.$langs->trans("StripeConnectPay").'';
- }
- else
- {
+ } else {
print ''.$langs->trans("StripeConnectPay").'';
}
- }
- elseif ($resteapayer == 0)
+ } elseif ($resteapayer == 0)
{
print ''.$langs->trans("StripeConnectPay").'';
}
- }
- else {
+ } else {
print ''.$langs->trans("StripeConnectPay").'';
}
- }
- elseif (is_object($object) && $object->element == 'invoice_supplier') {
+ } elseif (is_object($object) && $object->element == 'invoice_supplier') {
print ''.$langs->trans("StripeConnectPay").'';
- }
- elseif (is_object($object) && $object->element == 'member') {
+ } elseif (is_object($object) && $object->element == 'member') {
print ''.$langs->trans("StripeAutoSubscription").'';
}
return 0;
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index a72e5291f58..f3bb30d7efb 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -95,8 +95,7 @@ class Stripe extends CommonObject
$sql .= " AND service = '".$mode."'";
if ($fk_soc > 0) {
$sql .= " AND fk_soc = ".$fk_soc;
- }
- else {
+ } else {
$sql .= " AND fk_soc IS NULL";
}
$sql .= " AND fk_user IS NULL AND fk_adherent IS NULL";
@@ -113,8 +112,7 @@ class Stripe extends CommonObject
} else {
$tokenstring = '';
}
- }
- else {
+ } else {
dol_print_error($this->db);
}
@@ -189,14 +187,12 @@ class Stripe extends CommonObject
} else {
$customer = \Stripe\Customer::retrieve("$tiers", array("stripe_account" => $key));
}
- }
- catch (Exception $e)
+ } catch (Exception $e)
{
// For exemple, we may have error: 'No such customer: cus_XXXXX; a similar object exists in live mode, but a test mode key was used to make this request.'
$this->error = $e->getMessage();
}
- }
- elseif ($createifnotlinkedtostripe)
+ } elseif ($createifnotlinkedtostripe)
{
$ipaddress = getUserRemoteIP();
@@ -254,15 +250,12 @@ class Stripe extends CommonObject
{
$this->error = $this->db->lasterror();
}
- }
- catch (Exception $e)
+ } catch (Exception $e)
{
$this->error = $e->getMessage();
}
}
- }
- else
- {
+ } else {
dol_print_error($this->db);
}
@@ -290,8 +283,7 @@ class Stripe extends CommonObject
} else {
$stripepaymentmethod = \Stripe\PaymentMethod::retrieve(''.$paymentmethod->id.'', array("stripe_account" => $key));
}
- }
- catch (Exception $e)
+ } catch (Exception $e)
{
$this->error = $e->getMessage();
}
@@ -481,8 +473,7 @@ class Stripe extends CommonObject
$obj = $this->db->fetch_object($resql);
if ($obj) $paymentintentalreadyexists++;
}
- }
- else dol_print_error($this->db);
+ } else dol_print_error($this->db);
// If not, we create it.
if (!$paymentintentalreadyexists)
@@ -498,20 +489,16 @@ class Stripe extends CommonObject
dol_syslog(get_class($this)."::PaymentIntent failed to insert paymentintent with id=".$paymentintent->id." into database.");
}
}
- }
- else
- {
+ } else {
$_SESSION["stripe_payment_intent"] = $paymentintent;
}
- }
- catch (Stripe\Error\Card $e)
+ } catch (Stripe\Error\Card $e)
{
$error++;
$this->error = $e->getMessage();
$this->code = $e->getStripeCode();
$this->declinecode = $e->getDeclineCode();
- }
- catch (Exception $e)
+ } catch (Exception $e)
{
/*var_dump($dataforintent);
var_dump($description);
@@ -531,9 +518,7 @@ class Stripe extends CommonObject
if (!$error)
{
return $paymentintent;
- }
- else
- {
+ } else {
return null;
}
}
@@ -657,8 +642,7 @@ class Stripe extends CommonObject
{
$_SESSION["stripe_setup_intent"] = $setupintent;
}*/
- }
- catch (Exception $e)
+ } catch (Exception $e)
{
/*var_dump($dataforintent);
var_dump($description);
@@ -674,9 +658,7 @@ class Stripe extends CommonObject
{
dol_syslog("getSetupIntent ".(is_object($setupintent) ? $setupintent->id : ''), LOG_INFO, -1);
return $setupintent;
- }
- else
- {
+ } else {
dol_syslog("getSetupIntent return error=".$error, LOG_INFO, -1);
return null;
}
@@ -720,9 +702,7 @@ class Stripe extends CommonObject
if (!preg_match('/^pm_/', $cardref))
{
$card = $cu->sources->retrieve($cardref);
- }
- else
- {
+ } else {
$card = \Stripe\PaymentMethod::retrieve($cardref);
}
} else {
@@ -730,20 +710,17 @@ class Stripe extends CommonObject
{
//$card = $cu->sources->retrieve($cardref, array("stripe_account" => $stripeacc)); // this API fails when array stripe_account is provided
$card = $cu->sources->retrieve($cardref);
- }
- else {
+ } else {
//$card = \Stripe\PaymentMethod::retrieve($cardref, array("stripe_account" => $stripeacc)); // Don't know if this works
$card = \Stripe\PaymentMethod::retrieve($cardref);
}
}
- }
- catch (Exception $e)
+ } catch (Exception $e)
{
$this->error = $e->getMessage();
dol_syslog($this->error, LOG_WARNING);
}
- }
- elseif ($createifnotlinkedtostripe)
+ } elseif ($createifnotlinkedtostripe)
{
$exp_date_month = $obj->exp_date_month;
$exp_date_year = $obj->exp_date_year;
@@ -768,9 +745,7 @@ class Stripe extends CommonObject
{
$this->error = 'Creation of card on Stripe has failed';
}
- }
- else
- {
+ } else {
$connect = '';
if (!empty($stripeacc)) $connect = $stripeacc.'/';
$url = 'https://dashboard.stripe.com/'.$connect.'test/customers/'.$cu->id;
@@ -792,9 +767,7 @@ class Stripe extends CommonObject
{
$this->error = 'Creation of card on Stripe has failed';
}
- }
- else
- {
+ } else {
$connect = '';
if (!empty($stripeacc)) $connect = $stripeacc.'/';
$url = 'https://dashboard.stripe.com/'.$connect.'test/customers/'.$cu->id;
@@ -823,17 +796,14 @@ class Stripe extends CommonObject
$this->error = $this->db->lasterror();
}
}
- }
- catch (Exception $e)
+ } catch (Exception $e)
{
$this->error = $e->getMessage();
dol_syslog($this->error, LOG_WARNING);
}
}
}
- }
- else
- {
+ } else {
dol_print_error($this->db);
}
@@ -943,9 +913,7 @@ class Stripe extends CommonObject
if ($paymentintent->status == 'succeeded')
{
$charge->status = 'ok';
- }
- else
- {
+ } else {
$charge->status = 'failed';
$charge->failure_code = $stripe->code;
$charge->failure_message = $stripe->error;
@@ -954,8 +922,7 @@ class Stripe extends CommonObject
$stripefailuremessage = $stripe->error;
$stripefailuredeclinecode = $stripe->declinecode;
}
- }
- elseif (preg_match('/acct_/i', $source))
+ } elseif (preg_match('/acct_/i', $source))
{
$charge = \Stripe\Charge::create(array(
"amount" => "$stripeamount",
@@ -1038,17 +1005,13 @@ class Stripe extends CommonObject
{
$charge->status = 'ok';
$charge->id = $paymentintent->id;
- }
- else
- {
+ } else {
$charge->status = 'failed';
$charge->failure_code = $stripe->code;
$charge->failure_message = $stripe->error;
$charge->failure_declinecode = $stripe->declinecode;
}
- }
- else
- {
+ } else {
$charge = \Stripe\Charge::create($paymentarray, array("idempotency_key" => "$description", "stripe_account" => "$account"));
}
}
@@ -1060,9 +1023,7 @@ class Stripe extends CommonObject
if (preg_match('/pm_/i', $source))
{
$return->message = 'Payment retreived by card status = '.$charge->status;
- }
- else
- {
+ } else {
if ($charge->source->type == 'card') {
$return->message = $charge->source->card->brand." ....".$charge->source->card->last4;
} elseif ($charge->source->type == 'three_d_secure') {
diff --git a/htdocs/stripe/config.php b/htdocs/stripe/config.php
index 730203245f4..e6dc75c04ec 100644
--- a/htdocs/stripe/config.php
+++ b/htdocs/stripe/config.php
@@ -47,9 +47,7 @@ $stripearrayofkeys = array();
if (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))
{
$stripearrayofkeys = $stripearrayofkeysbyenv[0]; // Test
-}
-else
-{
+} else {
$stripearrayofkeys = $stripearrayofkeysbyenv[1]; // Live
}
diff --git a/htdocs/stripe/payout.php b/htdocs/stripe/payout.php
index 17f2423327f..6823c32c0b7 100644
--- a/htdocs/stripe/payout.php
+++ b/htdocs/stripe/payout.php
@@ -64,9 +64,7 @@ if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETP
$service = 'StripeTest';
$servicestatus = '0';
dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
-}
-else
-{
+} else {
$service = 'StripeLive';
$servicestatus = '1';
}
@@ -114,9 +112,7 @@ if (!$rowid) {
if ($stripeacc)
{
$payout = \Stripe\Payout::all(array("limit" => $limit), array("stripe_account" => $stripeacc));
- }
- else
- {
+ } else {
$payout = \Stripe\Payout::all(array("limit" => $limit));
}
diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
index 3829eba4d0d..6f74d1a48c0 100644
--- a/htdocs/stripe/transaction.php
+++ b/htdocs/stripe/transaction.php
@@ -65,9 +65,7 @@ if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETP
$service = 'StripeTest';
$servicestatus = '0';
dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
-}
-else
-{
+} else {
$service = 'StripeLive';
$servicestatus = '1';
}
@@ -113,9 +111,7 @@ if (!$rowid) {
if ($stripeacc)
{
$txn = \Stripe\BalanceTransaction::all(array("limit" => $limit), array("stripe_account" => $stripeacc));
- }
- else
- {
+ } else {
$txn = \Stripe\BalanceTransaction::all(array("limit" => $limit));
}
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 08479b95871..9e776f94371 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -96,9 +96,23 @@ if ($id > 0 || !empty($ref)) {
dol_print_error('', $object->error);
}
-$permissionnote = $user->rights->supplier_proposal->creer; // Used by the include of actions_setnotes.inc.php
-$permissiondellink = $user->rights->supplier_proposal->creer; // Used by the include of actions_dellink.inc.php
-$permissiontoedit = $user->rights->supplier_proposal->creer; // Used by the include of actions_lineupdown.inc.php
+// Common permissions
+$usercanread = $user->rights->supplier_proposal->lire;
+$usercancreate = $user->rights->supplier_proposal->creer;
+$usercandelete = $user->rights->supplier_proposal->supprimer;
+
+// Advanced permissions
+$usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($usercancreate)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->supplier_proposal->validate_advance)));
+$usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->supplier_proposal->send_advance);
+
+// Additional area permissions
+$usercanclose = $user->rights->supplier_proposal->cloturer;
+$usercancreateorder = $user->rights->fournisseur->commande->creer;
+
+// Permissions for includes
+$permissionnote = $usercancreate; // Used by the include of actions_setnotes.inc.php
+$permissiondellink = $usercancreate; // Used by the include of actions_dellink.inc.php
+$permissiontoedit = $usercancreate; // Used by the include of actions_lineupdown.inc.php
/*
@@ -133,17 +147,13 @@ if (empty($reshook))
if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers'))
{
setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
- }
- else
- {
+ } else {
if ($object->id > 0) {
$result = $object->createFromClone($user, $socid);
if ($result > 0) {
header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
exit();
- }
- else
- {
+ } else {
setEventMessages($object->error, $object->errors, 'errors');
$action = '';
}
@@ -152,7 +162,7 @@ if (empty($reshook))
}
// Delete askprice
- elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->supplier_proposal->supprimer)
+ elseif ($action == 'confirm_delete' && $confirm == 'yes' && $usercandelete)
{
$result = $object->delete($user);
if ($result > 0) {
@@ -165,7 +175,7 @@ if (empty($reshook))
}
// Remove line
- elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->supplier_proposal->creer)
+ elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $usercancreate)
{
$result = $object->deleteline($lineid);
// reorder lines
@@ -189,10 +199,7 @@ if (empty($reshook))
}
// Validation
- elseif ($action == 'confirm_validate' && $confirm == 'yes' &&
- ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->supplier_proposal->creer))
- || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->supplier_proposal->validate_advance)))
- )
+ elseif ($action == 'confirm_validate' && $confirm == 'yes' && $usercanvalidate)
{
$result = $object->valid($user);
if ($result >= 0)
@@ -221,17 +228,14 @@ if (empty($reshook))
if (count($object->errors) > 0) setEventMessages($object->error, $object->errors, 'errors');
else setEventMessages($langs->trans($object->error), null, 'errors');
}
- }
-
- elseif ($action == 'setdate_livraison' && $user->rights->supplier_proposal->creer)
- {
+ } elseif ($action == 'setdate_livraison' && $usercancreate) {
$result = $object->set_date_livraison($user, dol_mktime(12, 0, 0, $_POST['liv_month'], $_POST['liv_day'], $_POST['liv_year']));
if ($result < 0)
dol_print_error($db, $object->error);
}
// Create supplier proposal
- elseif ($action == 'add' && $user->rights->supplier_proposal->creer)
+ elseif ($action == 'add' && $usercancreate)
{
$object->socid = $socid;
$object->fetch_thirdparty();
@@ -411,8 +415,7 @@ if (empty($reshook))
$error++;
}
} // Standard creation
- else
- {
+ else {
$id = $object->create($user);
}
@@ -442,15 +445,11 @@ if (empty($reshook))
header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
exit();
- }
- else
- {
+ } else {
$db->rollback();
$action = 'create';
}
- }
- else
- {
+ } else {
setEventMessages($object->error, $object->errors, 'errors');
$db->rollback();
$action = 'create';
@@ -460,7 +459,7 @@ if (empty($reshook))
}
// Reopen proposal
- elseif ($action == 'confirm_reopen' && $user->rights->supplier_proposal->cloturer && !GETPOST('cancel', 'alpha')) {
+ elseif ($action == 'confirm_reopen' && $usercanclose && !GETPOST('cancel', 'alpha')) {
// prevent browser refresh from reopening proposal several times
if ($object->statut == SupplierProposal::STATUS_SIGNED || $object->statut == SupplierProposal::STATUS_NOTSIGNED || $object->statut == SupplierProposal::STATUS_CLOSE) {
$object->reopen($user, SupplierProposal::STATUS_VALIDATED);
@@ -468,7 +467,7 @@ if (empty($reshook))
}
// Close proposal
- elseif ($action == 'close' && $user->rights->supplier_proposal->cloturer && !GETPOST('cancel', 'alpha')) {
+ elseif ($action == 'close' && $usercanclose && !GETPOST('cancel', 'alpha')) {
// prevent browser refresh from reopening proposal several times
if ($object->statut == SupplierProposal::STATUS_SIGNED) {
$object->setStatut(SupplierProposal::STATUS_CLOSE);
@@ -476,7 +475,7 @@ if (empty($reshook))
}
// Set accepted/refused
- elseif ($action == 'setstatut' && $user->rights->supplier_proposal->cloturer && !GETPOST('cancel', 'alpha')) {
+ elseif ($action == 'setstatut' && $usercanclose && !GETPOST('cancel', 'alpha')) {
if (!GETPOST('statut')) {
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("CloseAs")), null, 'errors');
$action = 'statut';
@@ -499,12 +498,12 @@ if (empty($reshook))
// Actions to build doc
$upload_dir = $conf->supplier_proposal->dir_output;
- $permissiontoadd = $user->rights->supplier_proposal->creer;
+ $permissiontoadd = $usercancreate;
include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
// Go back to draft
- if ($action == 'modif' && $user->rights->supplier_proposal->creer)
+ if ($action == 'modif' && $usercancreate)
{
$object->setDraft($user);
@@ -520,9 +519,7 @@ if (empty($reshook))
$ret = $object->fetch($id); // Reload to get new records
$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
}
- }
-
- elseif ($action == "setabsolutediscount" && $user->rights->supplier_proposal->creer) {
+ } elseif ($action == "setabsolutediscount" && $usercancreate) {
if ($_POST["remise_id"]) {
if ($object->id > 0) {
$result = $object->insert_discount($_POST["remise_id"]);
@@ -534,7 +531,7 @@ if (empty($reshook))
}
// Add a product line
- if ($action == 'addline' && $user->rights->supplier_proposal->creer)
+ if ($action == 'addline' && $usercancreate)
{
$langs->load('errors');
$error = 0;
@@ -551,9 +548,7 @@ if (empty($reshook))
$idprod = 0;
$price_ht = GETPOST('price_ht');
$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
- }
- else
- {
+ } else {
$idprod = GETPOST('idprod', 'int');
$price_ht = '';
$tva_tx = '';
@@ -621,14 +616,11 @@ if (empty($reshook))
{
$productsupplier->ref_supplier = '';
}
- }
- else
- {
+ } else {
$fksoctosearch = $object->thirdparty->id;
$productsupplier->get_buyprice(0, -1, $idprod, 'none', $fksoctosearch); // We force qty to -1 to be sure to find if a supplier price exist
}
- }
- elseif (GETPOST('idprodfournprice', 'alpha') > 0)
+ } elseif (GETPOST('idprodfournprice', 'alpha') > 0)
{
//$qtytosearch=$qty; // Just to see if a price exists for the quantity. Not used to found vat.
$qtytosearch = -1; // We force qty to -1 to be sure to find if the supplier price that exists
@@ -715,8 +707,7 @@ if (empty($reshook))
$langs->load("errors");
setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'errors');
}
- }
- elseif ((GETPOST('price_ht') !== '' || GETPOST('price_ttc') !== '' || GETPOST('multicurrency_price_ht') != '') && empty($error)) // Free product. // $price_ht is already set
+ } elseif ((GETPOST('price_ht') !== '' || GETPOST('price_ttc') !== '' || GETPOST('multicurrency_price_ht') != '') && empty($error)) // Free product. // $price_ht is already set
{
$pu_ht = price2num($price_ht, 'MU');
$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
@@ -737,9 +728,7 @@ if (empty($reshook))
if ($price_ht !== '')
{
$pu_ht = price2num($price_ht, 'MU'); // $pu_ht must be rounded according to settings
- }
- else
- {
+ } else {
$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
$pu_ht = price2num($pu_ttc / (1 + ($tva_tx / 100)), 'MU'); // $pu_ht must be rounded according to settings
}
@@ -834,9 +823,7 @@ if (empty($reshook))
unset($_POST['date_endday']);
unset($_POST['date_endmonth']);
unset($_POST['date_endyear']);
- }
- else
- {
+ } else {
$db->rollback();
setEventMessages($object->error, $object->errors, 'errors');
@@ -845,7 +832,7 @@ if (empty($reshook))
}
// Mise a jour d'une ligne dans la demande de prix
- elseif ($action == 'updateline' && $user->rights->supplier_proposal->creer && GETPOST('save') == $langs->trans("Save")) {
+ elseif ($action == 'updateline' && $usercancreate && GETPOST('save') == $langs->trans("Save")) {
$vat_rate = (GETPOST('tva_tx') ?GETPOST('tva_tx') : 0);
// Define info_bits
@@ -1011,52 +998,44 @@ if (empty($reshook))
setEventMessages($object->error, $object->errors, 'errors');
}
}
- }
-
- elseif ($action == 'updateline' && $user->rights->supplier_proposal->creer && GETPOST('cancel', 'alpha') == $langs->trans('Cancel')) {
+ } elseif ($action == 'updateline' && $usercancreate && GETPOST('cancel', 'alpha') == $langs->trans('Cancel')) {
header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition
exit();
}
// Set project
- elseif ($action == 'classin' && $user->rights->supplier_proposal->creer) {
+ elseif ($action == 'classin' && $usercancreate) {
$object->setProject(GETPOST('projectid'), 'int');
}
// Delivery delay
- elseif ($action == 'setavailability' && $user->rights->supplier_proposal->creer) {
+ elseif ($action == 'setavailability' && $usercancreate) {
$result = $object->availability($_POST['availability_id']);
}
// Terms of payments
- elseif ($action == 'setconditions' && $user->rights->supplier_proposal->creer) {
+ elseif ($action == 'setconditions' && $usercancreate) {
$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
- }
-
- elseif ($action == 'setremisepercent' && $user->rights->supplier_proposal->creer) {
- $result = $object->set_remise_percent($user, $_POST['remise_percent']);
- }
-
- elseif ($action == 'setremiseabsolue' && $user->rights->supplier_proposal->creer) {
- $result = $object->set_remise_absolue($user, $_POST['remise_absolue']);
+ } elseif ($action == 'setremisepercent' && $usercancreate) {
+ $result = $object->set_remise_percent($user, GETPOST('remise_percent', 'alpha'));
+ } elseif ($action == 'setremiseabsolue' && $usercancreate) {
+ $result = $object->set_remise_absolue($user, GETPOST('remise_absolue', 'alpha'));
}
// Payment mode
- elseif ($action == 'setmode' && $user->rights->supplier_proposal->creer) {
+ elseif ($action == 'setmode' && $usercancreate) {
$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
}
// Multicurrency Code
- elseif ($action == 'setmulticurrencycode' && $user->rights->supplier_proposal->creer) {
+ elseif ($action == 'setmulticurrencycode' && $usercancreate) {
$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
}
// Multicurrency rate
- elseif ($action == 'setmulticurrencyrate' && $user->rights->supplier_proposal->creer) {
+ elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')));
- }
-
- elseif ($action == 'update_extras') {
+ } elseif ($action == 'update_extras') {
$object->oldcopy = dol_clone($object);
// Fill array 'array_options' with data from update form
@@ -1138,9 +1117,7 @@ if ($action == 'create')
if (!empty($objectsrc->multicurrency_code)) $currency_code = $objectsrc->multicurrency_code;
if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx)) $currency_tx = $objectsrc->multicurrency_tx;
}
- }
- else
- {
+ } else {
$cond_reglement_id = $soc->cond_reglement_supplier_id;
$mode_reglement_id = $soc->mode_reglement_supplier_id;
if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) $currency_code = $soc->multicurrency_code;
@@ -1480,8 +1457,8 @@ if ($action == 'create')
$morehtmlref = ' ';
// Ref supplier
- //$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->fournisseur->commande->creer, 'string', '', 0, 1);
- //$morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->fournisseur->commande->creer, 'string', '', null, null, '', 1);
+ //$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreateorder, 'string', '', 0, 1);
+ //$morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreateorder, 'string', '', null, null, '', 1);
// Thirdparty
$morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' ('.$langs->trans("OtherProposals").')';
@@ -1490,7 +1467,7 @@ if ($action == 'create')
{
$langs->load("projects");
$morehtmlref .= ' '.$langs->trans('Project').' '; - if ($user->rights->supplier_proposal->creer) + if ($usercancreate) { if ($action != 'classify') { $morehtmlref .= ''.img_edit($langs->transnoentitiesnoconv('SetProject')).' : '; @@ -1680,7 +1657,7 @@ if ($action == 'create') print '
| '; @@ -1809,7 +1786,7 @@ if ($action == 'create') $ret = $object->printObjectLines($action, $soc, $mysoc, $lineid, $dateSelector); // Form to add new line - if ($object->statut == SupplierProposal::STATUS_DRAFT && $user->rights->supplier_proposal->creer) + if ($object->statut == SupplierProposal::STATUS_DRAFT && $usercancreate) { if ($action != 'editline') { @@ -1870,22 +1847,20 @@ if ($action == 'create') if ($action != 'statut' && $action != 'editline') { // Validate - if ($object->statut == SupplierProposal::STATUS_DRAFT && $object->total_ttc >= 0 && count($object->lines) > 0 && - ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->supplier_proposal->creer)) - || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->supplier_proposal->validate_advance))) - ) { + if ($object->statut == SupplierProposal::STATUS_DRAFT && $object->total_ttc >= 0 && count($object->lines) > 0 && $usercanvalidate) + { if (count($object->lines) > 0) print ''; // else print ''.$langs->trans('Validate').''; } // Edit - if ($object->statut == SupplierProposal::STATUS_VALIDATED && $user->rights->supplier_proposal->creer) { + if ($object->statut == SupplierProposal::STATUS_VALIDATED && $usercancreate) { print ''; } // ReOpen - if (($object->statut == SupplierProposal::STATUS_SIGNED || $object->statut == SupplierProposal::STATUS_NOTSIGNED || $object->statut == SupplierProposal::STATUS_CLOSE) && $user->rights->supplier_proposal->cloturer) { + if (($object->statut == SupplierProposal::STATUS_SIGNED || $object->statut == SupplierProposal::STATUS_NOTSIGNED || $object->statut == SupplierProposal::STATUS_CLOSE) && $usercanclose) { print ''; } @@ -1893,39 +1868,38 @@ if ($action == 'create') // Send if (empty($user->socid)) { if ($object->statut == SupplierProposal::STATUS_VALIDATED || $object->statut == SupplierProposal::STATUS_SIGNED) { - if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->supplier_proposal->send_advance) { + if ($usercansend) { print ''; - } else - print ''; + } else print ''; } } // Create an order if (!empty($conf->fournisseur->enabled) && $object->statut == SupplierProposal::STATUS_SIGNED) { - if ($user->rights->fournisseur->commande->creer) { + if ($usercancreateorder) { print ''; } } // Set accepted/refused - if ($object->statut == SupplierProposal::STATUS_VALIDATED && $user->rights->supplier_proposal->cloturer) { + if ($object->statut == SupplierProposal::STATUS_VALIDATED && $usercanclose) { print ''; } // Close - if ($object->statut == SupplierProposal::STATUS_SIGNED && $user->rights->supplier_proposal->cloturer) { + if ($object->statut == SupplierProposal::STATUS_SIGNED && $usercanclose) { print ''; } // Clone - if ($user->rights->supplier_proposal->creer) { + if ($usercancreate) { print ''; } // Delete - if (($object->statut == SupplierProposal::STATUS_DRAFT && $user->rights->supplier_proposal->creer) || $user->rights->supplier_proposal->supprimer) { + if (($object->statut == SupplierProposal::STATUS_DRAFT && $usercancreate) || $usercandelete) { print ''; } @@ -1945,8 +1919,8 @@ if ($action == 'create') $filename = dol_sanitizeFileName($object->ref); $filedir = $conf->supplier_proposal->dir_output."/".dol_sanitizeFileName($object->ref); $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id; - $genallowed = $user->rights->supplier_proposal->lire; - $delallowed = $user->rights->supplier_proposal->creer; + $genallowed = $usercanread; + $delallowed = $usercancreate; print $formfile->showdocuments('supplier_proposal', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang); diff --git a/htdocs/supplier_proposal/class/api_supplier_proposals.class.php b/htdocs/supplier_proposal/class/api_supplier_proposals.class.php index 3fbe3afa021..3eea10bdf13 100644 --- a/htdocs/supplier_proposal/class/api_supplier_proposals.class.php +++ b/htdocs/supplier_proposal/class/api_supplier_proposals.class.php @@ -160,8 +160,7 @@ class Supplierproposals extends DolibarrApi } $i++; } - } - else { + } else { throw new RestException(503, 'Error when retrieving supplier proposal list : '.$db->lasterror()); } if (!count($obj_ret)) { diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php index 97c0ee27e4e..907a741c288 100644 --- a/htdocs/supplier_proposal/class/supplier_proposal.class.php +++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php @@ -273,9 +273,7 @@ class SupplierProposal extends CommonObject if ($conf->global->PRODUIT_MULTIPRICES && $this->thirdparty->price_level) { $price = $prod->multiprices[$this->thirdparty->price_level]; - } - else - { + } else { $price = $prod->price; } @@ -346,22 +344,16 @@ class SupplierProposal extends CommonObject { $this->db->commit(); return 1; - } - else - { + } else { $this->db->rollback(); return -1; } - } - else - { + } else { $this->error = $supplier_proposalligne->error; $this->db->rollback(); return -2; } - } - else - { + } else { $this->db->rollback(); return -2; } @@ -430,9 +422,7 @@ class SupplierProposal extends CommonObject if ($price_base_type == 'HT') { $pu = $pu_ht; - } - else - { + } else { $pu = $pu_ttc; } @@ -492,17 +482,13 @@ class SupplierProposal extends CommonObject dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_ERR); return -1; } - } - else - { + } else { $this->error = $prod->error; $this->db->rollback(); return -1; } } - } - else - { + } else { $product_type = $type; } @@ -622,23 +608,17 @@ class SupplierProposal extends CommonObject { $this->db->commit(); return $this->line->id; - } - else - { + } else { $this->error = $this->db->error(); $this->db->rollback(); return -1; } - } - else - { + } else { $this->error = $this->line->error; $this->db->rollback(); return -2; } - } - else - { + } else { $this->error = 'BadStatusOfObjectToAddLine'; return -5; } @@ -808,16 +788,12 @@ class SupplierProposal extends CommonObject $this->db->commit(); return $result; - } - else - { + } else { $this->error = $this->db->error(); $this->db->rollback(); return -1; } - } - else - { + } else { dol_syslog(get_class($this)."::updateline Erreur -2 SupplierProposal en mode incompatible pour cette action"); return -2; } @@ -844,14 +820,10 @@ class SupplierProposal extends CommonObject $this->update_price(1); return 1; - } - else - { + } else { return -1; } - } - else - { + } else { return -2; } } @@ -1079,16 +1051,12 @@ class SupplierProposal extends CommonObject if ($result < 0) { $error++; } // End call triggers } - } - else - { + } else { $this->error = $this->db->lasterror(); $error++; } } - } - else - { + } else { $this->error = $this->db->lasterror(); $error++; } @@ -1098,15 +1066,11 @@ class SupplierProposal extends CommonObject $this->db->commit(); dol_syslog(get_class($this)."::create done id=".$this->id); return $this->id; - } - else - { + } else { $this->db->rollback(); return -2; } - } - else - { + } else { $this->error = $this->db->lasterror(); $this->db->rollback(); return -1; @@ -1167,9 +1131,7 @@ class SupplierProposal extends CommonObject } // TODO Change product price if multi-prices - } - else - { + } else { $objsoc->fetch($this->socid); } @@ -1217,9 +1179,7 @@ class SupplierProposal extends CommonObject { $this->db->commit(); return $this->id; - } - else - { + } else { $this->db->rollback(); return -1; } @@ -1410,9 +1370,7 @@ class SupplierProposal extends CommonObject $i++; } $this->db->free($result); - } - else - { + } else { $this->error = $this->db->error(); return -1; } @@ -1426,9 +1384,7 @@ class SupplierProposal extends CommonObject $this->error = "Record Not Found"; return 0; - } - else - { + } else { $this->error = $this->db->error(); return -1; } @@ -1463,9 +1419,7 @@ class SupplierProposal extends CommonObject if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life { $num = $this->getNextNumRef($soc); - } - else - { + } else { $num = $this->ref; } $this->newref = dol_sanitizeFileName($num); @@ -1538,15 +1492,11 @@ class SupplierProposal extends CommonObject $this->db->commit(); return 1; - } - else - { + } else { $this->db->rollback(); return -1; } - } - else - { + } else { dol_syslog("You don't have permission to validate supplier proposal", LOG_WARNING); return -2; } @@ -1573,9 +1523,7 @@ class SupplierProposal extends CommonObject { $this->date_livraison = $date_livraison; return 1; - } - else - { + } else { $this->error = $this->db->error(); dol_syslog(get_class($this)."::set_date_livraison Erreur SQL"); return -1; @@ -1608,9 +1556,7 @@ class SupplierProposal extends CommonObject $this->remise_percent = $remise; $this->update_price(1); return 1; - } - else - { + } else { $this->error = $this->db->error(); return -1; } @@ -1644,9 +1590,7 @@ class SupplierProposal extends CommonObject $this->remise_absolue = $remise; $this->update_price(1); return 1; - } - else - { + } else { $this->error = $this->db->error(); return -1; } @@ -1708,9 +1652,7 @@ class SupplierProposal extends CommonObject } $this->db->rollback(); return -1 * $error; - } - else - { + } else { $this->db->commit(); return 1; } @@ -1782,15 +1724,11 @@ class SupplierProposal extends CommonObject { $this->db->commit(); return 1; - } - else - { + } else { $this->db->rollback(); return -1; } - } - else - { + } else { $this->error = $this->db->lasterror(); $this->errors[] = $this->db->lasterror(); $this->db->rollback(); @@ -1892,8 +1830,7 @@ class SupplierProposal extends CommonObject $values[] = $product->multicurrency_subprice; $values[] = $product->multicurrency_total_ht; $values[] = $multicurrency->rate->rate; - } - else { + } else { for ($i = 0; $i < 5; $i++) $values[] = 'NULL'; } } @@ -1957,9 +1894,7 @@ class SupplierProposal extends CommonObject $this->db->rollback(); return -1; } - } - else - { + } else { return -1; } } @@ -2019,13 +1954,10 @@ class SupplierProposal extends CommonObject if ($shortlist == 1) { $ga[$obj->supplier_proposalid] = $obj->ref; - } - elseif ($shortlist == 2) + } elseif ($shortlist == 2) { $ga[$obj->supplier_proposalid] = $obj->ref.' ('.$obj->name.')'; - } - else - { + } else { $ga[$i]['id'] = $obj->supplier_proposalid; $ga[$i]['ref'] = $obj->ref; $ga[$i]['name'] = $obj->name; @@ -2035,9 +1967,7 @@ class SupplierProposal extends CommonObject } } return $ga; - } - else - { + } else { dol_print_error($this->db); return -1; } @@ -2133,30 +2063,22 @@ class SupplierProposal extends CommonObject dol_syslog(get_class($this)."::delete ".$this->id." by ".$user->id, LOG_DEBUG); $this->db->commit(); return 1; - } - else - { + } else { $this->error = $this->db->lasterror(); $this->db->rollback(); return 0; } - } - else - { + } else { $this->error = $this->db->lasterror(); $this->db->rollback(); return -3; } - } - else - { + } else { $this->error = $this->db->lasterror(); $this->db->rollback(); return -2; } - } - else - { + } else { $this->db->rollback(); return -1; } @@ -2209,9 +2131,7 @@ class SupplierProposal extends CommonObject } } $this->db->free($result); - } - else - { + } else { dol_print_error($this->db); } } @@ -2340,9 +2260,7 @@ class SupplierProposal extends CommonObject // if ($mode == 'signed' && ! count($this->FactureListeArray($obj->rowid))) $this->nbtodolate++; } return $response; - } - else - { + } else { $this->error = $this->db->lasterror(); return -1; } @@ -2409,9 +2327,7 @@ class SupplierProposal extends CommonObject $line->total_ttc = 59.8; $line->total_tva = 9.8; $line->remise_percent = 50; - } - else - { + } else { $line->total_ht = 100; $line->total_ttc = 119.6; $line->total_tva = 19.6; @@ -2469,9 +2385,7 @@ class SupplierProposal extends CommonObject } $this->db->free($resql); return 1; - } - else - { + } else { dol_print_error($this->db); $this->error = $this->db->lasterror(); return -1; @@ -2520,15 +2434,11 @@ class SupplierProposal extends CommonObject if ($numref != "") { return $numref; - } - else - { + } else { $this->error = $obj->error; return ""; } - } - else - { + } else { $langs->load("errors"); print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("SupplierProposal")); return ""; @@ -2698,9 +2608,7 @@ class SupplierProposal extends CommonObject $this->db->free($resql); return 1; - } - else - { + } else { $this->error = $this->db->error(); return -1; } @@ -2994,9 +2902,7 @@ class SupplierProposalLine extends CommonObjectLine $this->fk_unit = $objp->fk_unit; $this->db->free($result); - } - else - { + } else { dol_print_error($this->db); } } @@ -3041,9 +2947,7 @@ class SupplierProposalLine extends CommonObjectLine if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0) { return $result; - } - else - { + } else { $this->pa_ht = $result; } } @@ -3129,9 +3033,7 @@ class SupplierProposalLine extends CommonObjectLine $this->db->commit(); return 1; - } - else - { + } else { $this->error = $this->db->error()." sql=".$sql; $this->db->rollback(); return -1; @@ -3177,9 +3079,7 @@ class SupplierProposalLine extends CommonObjectLine $this->db->commit(); return 1; - } - else - { + } else { $this->error = $this->db->error()." sql=".$sql; $this->db->rollback(); return -1; @@ -3224,9 +3124,7 @@ class SupplierProposalLine extends CommonObjectLine if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0) { return $result; - } - else - { + } else { $this->pa_ht = $result; } } @@ -3300,9 +3198,7 @@ class SupplierProposalLine extends CommonObjectLine $this->db->commit(); return 1; - } - else - { + } else { $this->error = $this->db->error(); $this->db->rollback(); return -2; @@ -3335,9 +3231,7 @@ class SupplierProposalLine extends CommonObjectLine { $this->db->commit(); return 1; - } - else - { + } else { $this->error = $this->db->error(); $this->db->rollback(); return -2; diff --git a/htdocs/supplier_proposal/contact.php b/htdocs/supplier_proposal/contact.php index 43c9b91f563..4bd027299fa 100644 --- a/htdocs/supplier_proposal/contact.php +++ b/htdocs/supplier_proposal/contact.php @@ -65,16 +65,12 @@ if ($action == 'addcontact' && $permissiontoedit) { header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); exit; - } - else - { + } else { if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') { $langs->load("errors"); setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors'); - } - else - { + } else { setEventMessages($object->error, $object->errors, 'errors'); } } @@ -86,9 +82,7 @@ elseif ($action == 'swapstatut' && $permissiontoedit) if ($object->fetch($id)) { $result = $object->swapContactStatus(GETPOST('ligne')); - } - else - { + } else { dol_print_error($db); } } @@ -103,8 +97,7 @@ elseif ($action == 'deletecontact' && $permissiontoedit) { header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); exit; - } - else { + } else { dol_print_error($db); } } @@ -194,9 +187,7 @@ if ($id > 0 || !empty($ref)) // Contacts lines include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php'; - } - else - { + } else { // Contact not found print "ErrorRecordNotFound"; } diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php index 3f471e28b3f..5b58c7de461 100644 --- a/htdocs/supplier_proposal/document.php +++ b/htdocs/supplier_proposal/document.php @@ -166,9 +166,7 @@ if ($object->id > 0) $permtoedit = $user->rights->supplier_proposal->creer; $param = '&id='.$object->id; include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php'; -} -else -{ +} else { print $langs->trans("ErrorUnknown"); } diff --git a/htdocs/supplier_proposal/index.php b/htdocs/supplier_proposal/index.php index e8432ad8fe4..6ba425f323a 100644 --- a/htdocs/supplier_proposal/index.php +++ b/htdocs/supplier_proposal/index.php @@ -162,9 +162,7 @@ if ($resql) print ' | ||||
| '.$langs->trans("Total").' | '.$total.' | ||||
"; -} -else -{ +} else { dol_print_error($db); } @@ -294,8 +292,7 @@ if ($resql) } } print "
"; -} -else dol_print_error($db); +} else dol_print_error($db); /* @@ -376,16 +373,13 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa if ($num > $nbofloop) { print '
"; } - } - else - { + } else { dol_print_error($db); } } diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php index ded5d9ca2bf..d0ea3a2b625 100644 --- a/htdocs/supplier_proposal/list.php +++ b/htdocs/supplier_proposal/list.php @@ -358,9 +358,7 @@ if ($resql) $soc = new Societe($db); $soc->fetch($socid); $title = $langs->trans('ListOfSupplierProposals').' - '.$soc->name; - } - else - { + } else { $title = $langs->trans('ListOfSupplierProposals'); } @@ -950,9 +948,7 @@ if ($resql) $delallowed = $user->rights->supplier_proposal->creer; print $formfile->showdocuments('massfilesarea_supplier_proposal', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty); -} -else -{ +} else { dol_print_error($db); } diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php index 7e5b6aaf531..43077495238 100644 --- a/htdocs/support/inc.php +++ b/htdocs/support/inc.php @@ -110,14 +110,10 @@ if (!defined('DONOTLOADCONF') && file_exists($conffile) && filesize($conffile) > $includeconferror = 'ErrorBadValueForDolibarrMainDBType'; } } - } - else - { + } else { $includeconferror = 'ErrorBadValueForDolibarrMainDocumentRoot'; } - } - else - { + } else { $includeconferror = 'ErrorBadFormatForConfFile'; } } diff --git a/htdocs/takepos/admin/bar.php b/htdocs/takepos/admin/bar.php index 2508ab56040..0f47990cb4a 100644 --- a/htdocs/takepos/admin/bar.php +++ b/htdocs/takepos/admin/bar.php @@ -52,9 +52,7 @@ if (GETPOST('action', 'alpha') == 'set') { $db->commit(); setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); - } - else - { + } else { $db->rollback(); setEventMessages($langs->trans("Error"), null, 'errors'); } @@ -129,11 +127,17 @@ if ($conf->global->TAKEPOS_SUPPLEMENTS) } print '
'; + print '
| '.$langs->trans("URL").' | '.$langs->trans("QR").' | '; + print "
| '; + print "".$urlwithroot."/takepos/public/menu.php"; + print ' | ';
+ print " |
'; diff --git a/htdocs/takepos/admin/orderprinters.php b/htdocs/takepos/admin/orderprinters.php index 566f18ac1a4..79a16d77861 100644 --- a/htdocs/takepos/admin/orderprinters.php +++ b/htdocs/takepos/admin/orderprinters.php @@ -72,17 +72,39 @@ if ($action == "SavePrinter2") { $categstatic = new Categorie($db); $form = new Form($db); -if ($type == Categorie::TYPE_PRODUCT) { $title = $langs->trans("ProductsCategoriesArea"); $typetext = 'product'; } -elseif ($type == Categorie::TYPE_SUPPLIER) { $title = $langs->trans("SuppliersCategoriesArea"); $typetext = 'supplier'; } -elseif ($type == Categorie::TYPE_CUSTOMER) { $title = $langs->trans("CustomersCategoriesArea"); $typetext = 'customer'; } -elseif ($type == Categorie::TYPE_MEMBER) { $title = $langs->trans("MembersCategoriesArea"); $typetext = 'member'; } -elseif ($type == Categorie::TYPE_CONTACT) { $title = $langs->trans("ContactsCategoriesArea"); $typetext = 'contact'; } -elseif ($type == Categorie::TYPE_ACCOUNT) { $title = $langs->trans("AccountsCategoriesArea"); $typetext = 'bank_account'; } -elseif ($type == Categorie::TYPE_PROJECT) { $title = $langs->trans("ProjectsCategoriesArea"); $typetext = 'project'; } -elseif ($type == Categorie::TYPE_USER) { $title = $langs->trans("UsersCategoriesArea"); $typetext = 'user'; } -else { $title = $langs->trans("CategoriesArea"); $typetext = 'unknown'; } +if ($type == Categorie::TYPE_PRODUCT) { + $title = $langs->trans("ProductsCategoriesArea"); + $typetext = 'product'; +} elseif ($type == Categorie::TYPE_SUPPLIER) { + $title = $langs->trans("SuppliersCategoriesArea"); + $typetext = 'supplier'; +} elseif ($type == Categorie::TYPE_CUSTOMER) { + $title = $langs->trans("CustomersCategoriesArea"); + $typetext = 'customer'; +} elseif ($type == Categorie::TYPE_MEMBER) { + $title = $langs->trans("MembersCategoriesArea"); + $typetext = 'member'; +} elseif ($type == Categorie::TYPE_CONTACT) { + $title = $langs->trans("ContactsCategoriesArea"); + $typetext = 'contact'; +} elseif ($type == Categorie::TYPE_ACCOUNT) { + $title = $langs->trans("AccountsCategoriesArea"); + $typetext = 'bank_account'; +} elseif ($type == Categorie::TYPE_PROJECT) { + $title = $langs->trans("ProjectsCategoriesArea"); + $typetext = 'project'; +} elseif ($type == Categorie::TYPE_USER) { + $title = $langs->trans("UsersCategoriesArea"); + $typetext = 'user'; +} else { + $title = $langs->trans("CategoriesArea"); + $typetext = 'unknown'; +} -$arrayofjs = array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.js', '/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js'); +$arrayofjs = array( + '/includes/jquery/plugins/jquerytreeview/jquery.treeview.js', + '/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js', +); $arrayofcss = array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css'); llxHeader('', $title, '', '', 0, 0, $arrayofjs, $arrayofcss); @@ -146,9 +168,7 @@ if ($nbofentries > 0) if ($row["fk_menu"] == 0) print ''.$row["label"].'
'; } print ''; -} -else -{ +} else { print '
| '.img_picto_common('', 'treemenu/branchbottom.gif').' | '; print '';
@@ -176,9 +196,7 @@ if ($nbofentries > 0)
if ($row["fk_menu"] == 0) print ''.$row["label"].' '; } print ' | |||||||||||||||
'; +foreach ($substitutionarray as $key => $val) $htmltext .= $key . ' '; +$htmltext .= ''; + +print ' '; +print load_fiche_titre($langs->trans('FreeLegalTextOnInvoices'), '', ''); + +print ' ';
+print ' ';
+
if ($atleastonefound == 0 && !empty($conf->banque->enabled))
{
print info_admin($langs->trans("AtLeastOneDefaultBankAccountMandatory"), 0, 0, 'error');
diff --git a/htdocs/takepos/ajax/ajax.php b/htdocs/takepos/ajax/ajax.php
index d1f59325c1f..7c4471b0ec8 100644
--- a/htdocs/takepos/ajax/ajax.php
+++ b/htdocs/takepos/ajax/ajax.php
@@ -64,13 +64,10 @@ if ($action == 'getProducts') {
}
}
echo json_encode($prods);
- }
- else
- {
+ } else {
echo 'Failed to load category with id='.$category;
}
-}
-elseif ($action == 'search' && $term != '') {
+} elseif ($action == 'search' && $term != '') {
// Define $filteroncategids, the filter on category ID if there is a Root category defined.
$filteroncategids = '';
if ($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0) { // A root category is defined, we must filter on products inside this category tree
@@ -109,8 +106,7 @@ elseif ($action == 'search' && $term != '') {
);
}
echo json_encode($rows);
- }
- else {
+ } else {
echo 'Failed to search product : '.$db->lasterror();
}
} elseif ($action == "opendrawer" && $term != '') {
diff --git a/htdocs/takepos/css/phone.css b/htdocs/takepos/css/phone.css
index 0f3606071f0..bdfdf45e116 100644
--- a/htdocs/takepos/css/phone.css
+++ b/htdocs/takepos/css/phone.css
@@ -4,6 +4,7 @@ html,body {
margin:0;
height:100%;
width:100%;
+ background-color: #FFF !important;
}
.container{
@@ -17,14 +18,14 @@ html,body {
.phonerow1{
margin: 0 auto;
width: 100%;
- height: 40%;
+ height: auto;
min-height: 40%;
}
.phonerow2{
margin: 0 auto;
width: 100%;
- height: 40%;
+ height: auto;
}
.phonebuttonsrow{
@@ -90,7 +91,71 @@ button.publicphonebutton {
text-align: center;
overflow: visible; /* removes extra width in IE */
width:33%;
- height:90%;
+ height:50px;
+ font-weight: bold;
+ color: #fff;
+}
+
+.phoneblue{
+ color: #fff;
+ background-color: #428bca;
+ border-color: #357ebd;
+}
+
+.phonegreen{
+ color: #fff;
+ background-color: #5cb85c;
+ border-color: #4cae4c;
+ font-size:20px;
+ text-align:center;
+ width:20px;
+}
+
+.phonetable{
+ width:130px;
+}
+
+.phoneqty{
+ font-size:24px;
+ font-weight: bold;
+
+
+}
+
+.phonered{
+ color: #fff;
+ background-color: #dc3545;
+ border-color: #dc3545;
+ font-size:20px;
+ text-align:center;
+ width:20px;
+}
+
+.phoneorange{
+ color: #fff;
+ background-color: #f0ad4e;
+ border-color: #eea236;
+}
+
+.total{
+ width:100% !important;
+ font-size:24px;
+}
+
+.width24{
+ font-size:24px;
+}
+
+.leftcat{
+ margin-top:15px;
+ float:left;
+ width: 50%;
+ text-align:center;
+ height:150px;;
+ overflow:hidden;
+ margin-bottom:5px;
+ font-size:18px;
+ color:#5B5858;
font-weight: bold;
}
@@ -107,3 +172,28 @@ button.publicphonebutton2 {
font-weight: bold;
padding: 8px 16px;
}
+
+.div-table-responsive-no-min{
+ margin-top:20px;
+}
+
+.comment {
+ float: left;
+ width: 100%;
+ height: auto;
+}
+
+.comment-text-area {
+ float: left;
+ width: 80%;
+ height: auto;
+}
+
+.textinput {
+ float: left;
+ width: 100%;
+ min-height: 75px;
+ outline: none;
+ resize: none;
+ border: 1px solid grey;
+}
diff --git a/htdocs/takepos/genimg/index.php b/htdocs/takepos/genimg/index.php
index e668b01aacb..9ec730bfad8 100644
--- a/htdocs/takepos/genimg/index.php
+++ b/htdocs/takepos/genimg/index.php
@@ -55,18 +55,15 @@ if ($query == "cat")
if ($obj['photo_vignette'])
{
$filename = $obj['photo_vignette'];
- }
- else
- {
+ } else {
$filename = $obj['photo'];
}
- $file = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=category&entity='.$object->entity.'&file='.urlencode($pdir.$filename);
+ $file = DOL_URL_ROOT.'/viewimage.php?cache=1&publictakepos=1&modulepart=category&entity='.$object->entity.'&file='.urlencode($pdir.$filename);
header('Location: '.$file);
exit;
}
header('Location: ../../public/theme/common/nophoto.png');
-}
-elseif ($query == "pro")
+} elseif ($query == "pro")
{
require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php";
@@ -76,11 +73,16 @@ elseif ($query == "pro")
preg_match('@src="([^"]+)"@', $image, $match);
$file = array_pop($match);
- if ($file == "") header('Location: ../../public/theme/common/nophoto.png');
- else header('Location: '.$file.'&cache=1&publictakepos=1&modulepart=product');
-}
-else
-{
+ if ($file == "") {
+ header('Location: ../../public/theme/common/nophoto.png');
+ } else {
+ if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+ header('Location: '.$file.'&cache=1');
+ } else {
+ header('Location: '.$file.'&cache=1&publictakepos=1&modulepart=product');
+ }
+ }
+} else {
// TODO We don't need this. Size of image must be defined on HTML page, image must NOT be resize when downloaded.
// The file
diff --git a/htdocs/takepos/genimg/qr.php b/htdocs/takepos/genimg/qr.php
index 3aca3b22ebf..452eb7023e2 100644
--- a/htdocs/takepos/genimg/qr.php
+++ b/htdocs/takepos/genimg/qr.php
@@ -27,10 +27,15 @@ if (!defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1');
require '../../main.inc.php'; // Load $user and permissions
require '../../core/modules/barcode/doc/tcpdfbarcode.modules.php';
-$key = GETPOST('key');
-
$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
-$module = new modTcpdfbarcode();
-$result = $module->buildBarCode($urlwithroot."/takepos/public/auto_order.php?key=".dol_encode($key), 'QRCODE', 'Y');
+if (GETPOSTISSET("key")) {
+ $key = GETPOST('key');
+ $module = new modTcpdfbarcode();
+ $result = $module->buildBarCode($urlwithroot."/takepos/public/auto_order.php?key=".$key, 'QRCODE', 'Y');
+}
+else {
+ $module = new modTcpdfbarcode();
+ $result = $module->buildBarCode($urlwithroot."/takepos/public/menu.php", 'QRCODE', 'Y');
+}
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index dbc68afeaf4..4091e5fff90 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -134,9 +134,7 @@ foreach ($categories as $key => $categorycursor)
if ($categorycursor['level'] == $levelofmaincategories)
{
$maincategories[$key] = $categorycursor;
- }
- else
- {
+ } else {
$subcategories[$key] = $categorycursor;
}
}
@@ -857,9 +855,7 @@ $r = 0;
if (empty($conf->global->TAKEPOS_BAR_RESTAURANT))
{
$menus[$r++] = array('title'=>'
'.$langs->trans("New").' ', 'action'=>'New();');
-}
-else
-{
+} else {
// BAR RESTAURANT specific menu
$menus[$r++] = array('title'=>''.$langs->trans("Place").' ', 'action'=>'Floors();');
}
@@ -953,8 +949,7 @@ if (!empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
{
echo '';
echo '';
- }
- elseif ($i > 12) echo '';
+ } elseif ($i > 12) echo '';
else echo '';
}
@@ -983,13 +978,10 @@ if (!empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
if ($count == ($MAXCATEG - 2)) {
//echo ' ';
echo '';
- }
- elseif ($count == ($MAXCATEG - 1)) {
+ } elseif ($count == ($MAXCATEG - 1)) {
//echo ' ';
echo '';
- }
- else
- {
+ } else {
echo '';
print '';
- }
- elseif ($count == ($MAXPRODUCT - 1)) {
+ } elseif ($count == ($MAXPRODUCT - 1)) {
//echo '';
print '';
- }
- else
- {
+ } else {
print '';
print ''.$langs->trans("SubscriptionNotReceived"); if ($adh->statut > 0) $s .= " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated } - } - else - { + } else { $s .= ' '.$langs->trans("ThirdpartyNotLinkedToMember"); } $s .= ''; @@ -863,6 +844,9 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT) print $langs->trans('Place')." ".$label." - "; print $langs->trans('Floor')." ".$floor." - "; } + elseif (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) print $mysoc->name; + elseif ($mobilepage == "cats") print $langs->trans('Category'); + elseif ($mobilepage == "products") print $langs->trans('Label'); } // In phone version only show when is invoice page if ($mobilepage == "invoice" || $mobilepage == "") { @@ -877,6 +861,7 @@ if ($_SESSION["basiclayout"] != 1) print ' | '.$langs->trans('Qty').' | '; print ''.$langs->trans('TotalTTCShort').' | '; } +elseif ($mobilepage == "invoice") print ''.$langs->trans('Qty').' | '; print "|||||||||||||
| ';
+ if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) $htmlforlines .= ' '; + else $htmlforlines .= ' | '; $htmlforlines .= $row['label']; - $htmlforlines .= ' | '; - $htmlforlines .= '|||||||||||||||
'.price($row->price_ttc, 1, $langs, 1, -1, -1, $conf->currency).'
';
- $htmlforlines .= ''; + $htmlforlines .= $row->label.''.price($row->price_ttc, 1, $langs, 1, -1, -1, $conf->currency); + $htmlforlines .= ''."\n"; + } + else { + $htmlforlines .= '
'.price($row->price_ttc, 1, $langs, 1, -1, -1, $conf->currency).'
';
+ $htmlforlines .= ''."\n";
+ }
}
$htmlforlines .= '';
print $htmlforlines;
@@ -967,9 +962,7 @@ if ($placeid > 0)
if ($firstline != $line->desc)
{
$htmlsupplements[$line->fk_parent_line] .= $form->textwithpicto(dolGetFirstLineOfText($line->desc), $line->desc);
- }
- else
- {
+ } else {
$htmlsupplements[$line->fk_parent_line] .= $line->desc;
}
}
@@ -991,8 +984,7 @@ if ($placeid > 0)
}
$htmlforlines .= '" id="'.$line->id.'">';
$htmlforlines .= '(".$line->array_options['options_order_notes'].")"; - if ($_SESSION["basiclayout"] != 1) + if ($_SESSION["basiclayout"] == 1) $htmlforlines .= '
"; + print ''; + print "
".$prod->label."
"; print '
".$prod->description; print "
".price($prod->price_ttc, 1, $langs, 1, -1, -1, $conf->currency).""; print '
'; - print ''; +} elseif ($action == "publicpreorder") { + print ''; + print "
"; + print '
+
+
';
+ print ''; +} elseif ($action == "publicpayment") { + $langs->loadLangs(array("orders")); + print '
'.$langs->trans('StatusOrderDelivered').'
'; + print ''; + print ''; } -elseif ($action == "editline") { +elseif ($action == "checkplease") { + if (GETPOSTISSET("payment")) { + print '
'.$langs->trans('StatusOrderDelivered').'
'; + require_once DOL_DOCUMENT_ROOT.'/core/class/dolreceiptprinter.class.php'; + require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; + $printer = new dolReceiptPrinter($db); + $printer->initPrinter($conf->global->{'TAKEPOS_PRINTER_TO_USE'.$_SESSION["takeposterminal"]}); + $printer->printer->feed(); + $printer->printer->feed(); + $printer->printer->text($langs->trans('IM')); + $printer->printer->feed(); + $printer->printer->text($langs->trans('Place').": ".$place); + $printer->printer->feed(); + $printer->printer->text($langs->trans('Payment').": ".$langs->trans(GETPOST('payment', 'alpha'))); + $printer->printer->feed(); + $printer->printer->feed(); + $printer->printer->feed(); + $printer->printer->feed(); + $printer->printer->feed(); + $printer->close(); + } else { + print ''; + print ''; + print ''; + } +} elseif ($action == "editline") { $placeid = GETPOST('placeid', 'int'); $selectedline = GETPOST('selectedline', 'int'); $invoice = new Facture($db); @@ -99,13 +125,21 @@ elseif ($action == "editline") { print "
".$prod->description; print "
".price($prod->price_ttc, 1, $langs, 1, -1, -1, $conf->currency).""; print '
'; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; } } -} -else { +} else { + // Title + $title = 'TakePOS - Dolibarr '.DOL_VERSION; + if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $title = 'TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE; + $head = ' + + +'; + $arrayofcss = array('/takepos/css/phone.css'); + top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); ?> - + global->TAKEPOS_NUM_TERMINALS != "1" && $_SESSION["takeposterminal"] == "") print '
'.$langs->trans('TerminalSelect').'
';
?>
@@ -301,18 +362,18 @@ function CheckPlease(){
print '';
}
else {
- print '';
- print '';
- print '';
+ print '';
+ print '';
+ print '';
}
?>
-
-
-
-
+
+
.container {
+ padding-right: 15px;
+ padding-left: 15px;
+}
+/* -- -- */
+h3 {
+ display:inline-block;
+ font-size: 32px;
+ line-height: 36px;
+ position: relative;
+ margin-top:28px;
+ margin-bottom:15px;
+}
+h3:before{
+ left: -40px;
+ height: 0;
+ height:1px;
+}
+h3:before, h3:after {
+ content: "";
+ position: absolute;
+ bottom: 10px;
+ height: 1px;
+ width: 40px;
+ margin: 0 -15px;
+ background-color: #533834;
+}
+h3:after{
+ right: -40px;
+}
+h5 {
+ font-size: 16px;
+ line-height: 22px;
+ margin: 0 0 15px;
+ font-weight: 400;
+}
+.item {
+ position: relative;
+ overflow: hidden;
+ margin-bottom:20px;
+}
+.item h4, .price {
+ z-index: 0;
+ position: relative;
+ background-color: #fff;
+ right: 0;
+ position: absolute;
+}
+.item .price {
+ padding-left: 8px;
+}
+.item h4, .item p {
+ display: block;
+ clear: both;
+ color: #533834;
+}
+.item p {
+ clear: both;
+ color: #938372;
+ margin-left:10px;
+}
+.dots {
+ background-image: linear-gradient(to right,rgba(56,47,47,.5) 33%,rgba(0,0,0,0) 0%);
+ background-position: bottom;
+ background-size: 3px 1px;
+ background-repeat: repeat-x;
+ height: 1px;
+ width: 100%;
+ position: absolute;
+ top: 22px;
+}
+/* Dots in IE */
+@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
+ .dots {
+ background: transparent url('/img/dot.gif') repeat-x bottom left;
+ }
+}
+.badge {
+ display: inline-block;
+ padding: 0 10px;
+ background: #d2c82a;
+ font-size: 12px;
+ font-weight: 300;
+ line-height: 26px;
+ color: #fff;
+ text-align: center;
+ vertical-align: middle;
+ text-transform: uppercase;
+ border: 1px solid rgba(0,0,0,.05);
+ letter-spacing: 1px;
+ border-radius: 3px;
+ margin: -5px 5px 0 0;
+}
+.note {
+ padding: 0 6px;
+ min-width: 23px;
+ background: rgba(0,0,0,0);
+ border: 1px solid #382f2f;
+ color: #382f2f;
+ box-sizing: border-box;
+ border-radius: 500px;
+ line-height: 21px;
+}
+.veggie {
+ color:#82b440;
+ border-color:#82b440;
+}
+.spicy {
+ color:#ec4e00;
+ border-color:#ec4e00;
+}
+.price {
+ position: absolute;
+ font-size:22px;
+ font-weight:400;
+ right: 0;
+}
+.item h4 {
+ display: inline-block;
+ padding-right: 8px;
+ max-width: 80%;
+ text-transform: capitalize;
+ margin-bottom:4px;
+ position: relative;
+}
\ No newline at end of file
diff --git a/htdocs/takepos/public/js/script.js b/htdocs/takepos/public/js/script.js
new file mode 100644
index 00000000000..c3c8817354f
--- /dev/null
+++ b/htdocs/takepos/public/js/script.js
@@ -0,0 +1 @@
+$(document).foundation();
\ No newline at end of file
diff --git a/htdocs/takepos/public/menu.php b/htdocs/takepos/public/menu.php
new file mode 100644
index 00000000000..c051ae4d673
--- /dev/null
+++ b/htdocs/takepos/public/menu.php
@@ -0,0 +1,117 @@
+
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/htdocs/takepos/receipt.php b/htdocs/takepos/receipt.php
index 90b3a5c1fee..1da92de8827 100644
--- a/htdocs/takepos/receipt.php
+++ b/htdocs/takepos/receipt.php
@@ -89,12 +89,14 @@ if (!empty($hookmanager->resPrint)) {
global->TAKEPOS_HEADER)) +$constFreeText = 'TAKEPOS_HEADER' . $_SESSION['takeposterminal']; +if (!empty($conf->global->TAKEPOS_HEADER) || !empty($conf->global->{$constFreeText})) { + $newfreetext = ''; $substitutionarray = getCommonSubstitutionArray($langs); - if (!empty($conf->global->TAKEPOS_HEADER)) - $newfreetext = make_substitutions($conf->global->TAKEPOS_HEADER, $substitutionarray); - echo $newfreetext; + if (!empty($conf->global->TAKEPOS_HEADER)) $newfreetext .= make_substitutions($conf->global->TAKEPOS_HEADER, $substitutionarray); + if (!empty($conf->global->{$constFreeText})) $newfreetext .= make_substitutions($conf->global->{$constFreeText}, $substitutionarray); + print $newfreetext; } ?>
@@ -183,11 +185,14 @@ if ($conf->global->TAKEPOS_SHOW_CUSTOMER)global->TAKEPOS_FOOTER)) +$constFreeText = 'TAKEPOS_FOOTER' . $_SESSION['takeposterminal']; +if (!empty($conf->global->TAKEPOS_FOOTER) || !empty($conf->global->{$constFreeText})) { + $newfreetext = ''; $substitutionarray = getCommonSubstitutionArray($langs); - $newfreetext = make_substitutions($conf->global->TAKEPOS_FOOTER, $substitutionarray); - echo $newfreetext; + if (!empty($conf->global->{$constFreeText})) $newfreetext .= make_substitutions($conf->global->{$constFreeText}, $substitutionarray); + if (!empty($conf->global->TAKEPOS_FOOTER)) $newfreetext .= make_substitutions($conf->global->TAKEPOS_FOOTER, $substitutionarray); + print $newfreetext; } ?> diff --git a/htdocs/takepos/reduction.php b/htdocs/takepos/reduction.php index 7be5ee85938..e882957ad14 100644 --- a/htdocs/takepos/reduction.php +++ b/htdocs/takepos/reduction.php @@ -51,9 +51,7 @@ $invoice = new Facture($db); if ($invoiceid > 0) { $invoice->fetch($invoiceid); -} -else -{ +} else { $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'"; $resql = $db->query($sql); $obj = $db->fetch_object($resql); @@ -64,9 +62,7 @@ else if (!$invoiceid) { $invoiceid = 0; // Invoice does not exist yet - } - else - { + } else { $invoice->fetch($invoiceid); } } diff --git a/htdocs/theme/dolibarr.png b/htdocs/theme/dolibarr.png index 1ef6b77d4ca..3f7c35b6cf8 100644 Binary files a/htdocs/theme/dolibarr.png and b/htdocs/theme/dolibarr.png differ diff --git a/htdocs/theme/dolibarr_256x256_color.png b/htdocs/theme/dolibarr_256x256_color.png new file mode 100644 index 00000000000..417387d6a27 Binary files /dev/null and b/htdocs/theme/dolibarr_256x256_color.png differ diff --git a/htdocs/theme/dolibarr_512x512_white.png b/htdocs/theme/dolibarr_512x512_white.png new file mode 100644 index 00000000000..06e69ad8b7b Binary files /dev/null and b/htdocs/theme/dolibarr_512x512_white.png differ diff --git a/htdocs/theme/dolibarr_logo.jpg b/htdocs/theme/dolibarr_logo.jpg new file mode 100644 index 00000000000..a4a0611067d Binary files /dev/null and b/htdocs/theme/dolibarr_logo.jpg differ diff --git a/htdocs/theme/dolibarr_logo.png b/htdocs/theme/dolibarr_logo.png old mode 100644 new mode 100755 index c15f03c821b..9a0781ce2ea Binary files a/htdocs/theme/dolibarr_logo.png and b/htdocs/theme/dolibarr_logo.png differ diff --git a/htdocs/theme/dolibarr_logo.svg b/htdocs/theme/dolibarr_logo.svg index 44f6c07ece5..9c9259d0b33 100644 --- a/htdocs/theme/dolibarr_logo.svg +++ b/htdocs/theme/dolibarr_logo.svg @@ -23,94 +23,6 @@ id="title3072">Logo Dolibarr ERP-CRM