lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9866 from frederic34/emptylines

Browse Source 
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
This commit is contained in:
Laurent Destailleur 2018-10-26 15:31:24 +02:00 committed by GitHub
commit 0e464ea4f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
360 changed files with 1 additions and 720 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dev/initdata/generate-invoice.php
View File

@ -185,7 +185,4 @@ while ($i < GEN_NUMBER_FACTURE && $result >= 0)
{
dol_print_error($db,$object->error);
}
}

2
dev/initdata/generate-proposal.php
View File

@ -218,6 +218,4 @@ while ($i < GEN_NUMBER_PROPAL && $result >= 0)
{
dol_print_error($db,$object->error);
}
}

1
dev/setup/codesniffer/ruleset.xml
View File

@ -173,6 +173,7 @@
<rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines">
<severity>0</severity>
</rule>
<rule ref="Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose" />
<rule ref="Squiz.Functions.MultiLineFunctionDeclaration" />

1
htdocs/accountancy/admin/accountmodel.php
View File

@ -247,7 +247,6 @@ if (GETPOST('actionadd','alpha') || GETPOST('actionmodify','alpha'))
{
$obj = $db->fetch_object($result);
$newid=($obj->newid + 1);
} else {
dol_print_error($db);
}

1
htdocs/accountancy/admin/categories_list.php
View File

@ -202,7 +202,6 @@ if (GETPOST('actionadd','alpha') || GETPOST('actionmodify','alpha'))
{
$obj = $db->fetch_object($result);
$newid=($obj->newid + 1);
} else {
dol_print_error($db);
}

1
htdocs/accountancy/admin/journals_list.php
View File

@ -202,7 +202,6 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
{
$obj = $db->fetch_object($result);
$newid=($obj->newid + 1);
} else {
dol_print_error($db);
}

1
htdocs/accountancy/admin/productaccount.php
View File

@ -173,7 +173,6 @@ if ($action == 'update') {
$cpt++;
}
}
if ($ko) setEventMessages($langs->trans("XLineFailedToBeBinded", $ko), null, 'errors');

1
htdocs/accountancy/bookkeeping/balance.php
View File

@ -315,7 +315,6 @@ if ($action != 'export_csv')
print "</table>";
print '</form>';
}
// End of page

1
htdocs/accountancy/bookkeeping/list.php
View File

@ -760,7 +760,6 @@ if ($num > 0)
else print '<td></td>';
}
print '</tr>';
}
}

1
htdocs/accountancy/class/bookkeeping.class.php
View File

@ -1841,7 +1841,6 @@ class BookKeeping extends CommonObject
}
return $obj->label;
} else {
$this->error = "Error " . $this->db->lasterror();
dol_syslog(__METHOD__ . " " . $this->error, LOG_ERR);

1
htdocs/accountancy/customer/lines.php
View File

@ -135,7 +135,6 @@ if (is_array($changeaccount) && count($changeaccount) > 0) {
$account_parent = ''; // Protection to avoid to mass apply it a second time
}
}

1
htdocs/accountancy/journal/sellsjournal.php
View File

@ -500,7 +500,6 @@ if ($action == 'writebookkeeping') {
break; // Break in the foreach
}
}
}
$tabpay = $tabfac;

3
htdocs/adherents/card.php
View File

@ -789,7 +789,6 @@ if (empty($reshook))
$mode='emailfrommember';
$trackid='mem'.$object->id;
include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
}
@ -1320,7 +1319,6 @@ else
print '</div>';
print '</form>';
}
if ($id > 0 && $action != 'edit')
@ -1858,7 +1856,6 @@ else
print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=add_spip">'.$langs->trans("AddIntoSpip")."</a></div>\n";
}
}
}
}
print '</div>';

1
htdocs/adherents/cartes/carte.php
View File

@ -208,7 +208,6 @@ if ((! empty($foruserid) || ! empty($foruserlogin) || ! empty($mode)) && ! $mesg
$mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("DescADHERENT_CARD_TYPE"));
}
if (! $mesg) $result=members_card_pdf_create($db, $arrayofmembers, $model, $outputlangs);
}
elseif ($mode == 'label')
{

2
htdocs/adherents/class/adherent.class.php
View File

@ -2509,7 +2509,6 @@ class Adherent extends CommonObject
}
$this->db->free($result);
}
else
{
@ -2738,7 +2737,6 @@ class Adherent extends CommonObject
$nbok++;
// TODO Add event email sent for member
}
}
else

1
htdocs/adherents/class/subscription.class.php
View File

@ -416,7 +416,6 @@ class Subscription extends CommonObject
}
$this->db->free($result);
}
else
{

1
htdocs/adherents/note.php
View File

@ -116,7 +116,6 @@ if ($id)
dol_fiche_end();
}
// End of page

1
htdocs/adherents/type.php
View File

@ -694,7 +694,6 @@ if ($rowid > 0)
{
dol_print_error($db);
}
}
/* ************************************************************************** */

1
htdocs/admin/barcode.php
View File

@ -75,7 +75,6 @@ else if ($action == 'update')
else if ($action == 'updateengine')
{
// TODO Update engines.
}
if ($action && $action != 'setcoder' && $action != 'setModuleOptions')

1
htdocs/admin/chequereceipts.php
View File

@ -217,7 +217,6 @@ foreach ($dirmodels as $reldir)
print '</td>';
print "</tr>\n";
}
}
}

8
htdocs/admin/delais.php
View File

@ -155,7 +155,6 @@ if ($action == 'update')
for($i=0; $i<4; $i++) {
if(isset($_POST['MAIN_METEO'.$plus.'_LEVEL'.$i])) dolibarr_set_const($db, 'MAIN_METEO'.$plus.'_LEVEL'.$i, GETPOST('MAIN_METEO'.$plus.'_LEVEL'.$i, 'int'),'chaine',0,'',$conf->entity);
}
}
@ -254,7 +253,6 @@ else
print '</td></tr>';
print '</table>';
}
print '<br>';
@ -272,7 +270,6 @@ if($action == 'edit') {
print '<input type="hidden" id="MAIN_USE_METEO_WITH_PERCENTAGE" name="MAIN_USE_METEO_WITH_PERCENTAGE" value="'.$conf->global->MAIN_USE_METEO_WITH_PERCENTAGE.'" />';
print '<br><br>';
} else {
if(empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) print $langs->trans('MeteoStdModEnabled');
else print $langs->trans('MeteoPercentageModEnabled');
@ -362,7 +359,6 @@ if ($action == 'edit') {
</script>
<?php
} else {
if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
@ -385,7 +381,6 @@ if ($action == 'edit') {
print '&gt; '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'&nbsp;%</td>';
print '</div>';
print '</div>';
} else {
print '<div>';
@ -406,7 +401,6 @@ if ($action == 'edit') {
print '&gt; '.$level3;
print '</div>';
print '</div>';
}
}
@ -416,13 +410,11 @@ if($action == 'edit') {
print '<br><div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
print '<br></form>';
} else {
// Boutons d'action
print '<br><div class="tabsAction">';
print '<a class="butAction" href="delais.php?action=edit">'.$langs->trans("Modify").'</a></div>';
}
// End of page

1
htdocs/admin/dict.php
View File

@ -705,7 +705,6 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
{
$obj = $db->fetch_object($result);
$newid=($obj->newid + 1);
} else {
dol_print_error($db);
}

1
htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
View File

@ -177,7 +177,6 @@ class PrestaShopWebservice
{
$this->printDebug('HTTP REQUEST HEADER', curl_getinfo($session, CURLINFO_HEADER_OUT));
$this->printDebug('HTTP RESPONSE HEADER', $header);
}
$status_code = curl_getinfo($session, CURLINFO_HTTP_CODE);
if ($status_code === 0)

3
htdocs/admin/facture.php
View File

@ -261,8 +261,6 @@ if ($action == 'setDefaultPDFModulesByType')
setEventMessages($langs->trans("Error"), null, 'errors');
}
}
}
@ -436,7 +434,6 @@ foreach ($dirmodels as $reldir)
print '</td>';
print "</tr>\n";
}
}
}

1
htdocs/admin/ldap.php
View File

@ -336,7 +336,6 @@ if (function_exists("ldap_connect"))
print $langs->trans("Error").' '.$ldap->error;
print '<br>';
}
}
}

1
htdocs/admin/ldap_members.php
View File

@ -439,7 +439,6 @@ if (function_exists("ldap_connect"))
print $langs->trans("ErrorLDAPMakeManualTest",$conf->ldap->dir_temp).'<br>';
}
}
}
// End of page

1
htdocs/admin/ldap_users.php
View File

@ -443,7 +443,6 @@ if (function_exists("ldap_connect"))
}
$liste[$key] = $label;
}
}
else
{

1
htdocs/admin/limits.php
View File

@ -253,7 +253,6 @@ else
print " x ".$langs->trans("Quantity").": ".$qty;
print " - ".$langs->trans("VAT").": ".$vat.'%';
print " &nbsp; -> &nbsp; ".$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
}
// Important: can debug rounding, to simulate the rounded total

6
htdocs/admin/modules.php
View File

@ -433,9 +433,7 @@ if ($action == 'reset_confirm' && $user->admin)
$form = new Form($db);
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?value='.$value.'&mode='.$mode.$param, $langs->trans('ConfirmUnactivation'), $langs->trans(GETPOST('confirm_message_code')), 'reset', '', 'no', 1);
}
}
print $formconfirm;
@ -711,16 +709,13 @@ if ($mode == 'common')
print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=reset_confirm&amp;confirm_message_code='.$objMod->warnings_unactivation[$mysoc->country_code].'&amp;value=' . $modName . '&amp;mode=' . $mode . $param . '">';
print img_picto($langs->trans("Activated"),'switch_on');
print '</a>';
}
else {
print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=reset&amp;value=' . $modName . '&amp;mode=' . $mode .'&amp;confirm=yes' . $param . '">';
print img_picto($langs->trans("Activated"),'switch_on');
print '</a>';
}
}
print '</td>'."\n";
@ -775,7 +770,6 @@ if ($mode == 'common')
{
print '<td class="tdsetuppicto right valignmiddle" width="60px">'.img_picto($langs->trans("NothingToSetup"),"setup",'class="opacitytransp" style="padding-right: 6px"').'</td>';
}
}
else // Module not yet activated
{

1
htdocs/admin/oauth.php
View File

@ -139,7 +139,6 @@ foreach ($list as $key)
print '<td><label for="'.$key[2].'">'.$langs->trans($key[2]).'</label></td>';
print '<td><input type="password" size="100" id="'.$key[2].'" name="'.$key[2].'" value="'.$conf->global->{$key[2]}.'">';
print '</td></tr>';
}
print '</table>'."\n";

3
htdocs/admin/oauthlogintokens.php
View File

@ -327,7 +327,6 @@ if ($mode == 'setup' && $user->admin)
print '</form>';
}
}
if ($mode == 'test' && $user->admin)
@ -352,11 +351,9 @@ if ($mode == 'test' && $user->admin)
else {
print $langs->trans('PleaseConfigureDriverfromList');
}
}
print '</table>';
}
if ($mode == 'userconf' && $user->admin)

2
htdocs/admin/payment.php
View File

@ -83,7 +83,6 @@ if ($action == 'setparams')
{
setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
}
}
@ -217,7 +216,6 @@ foreach ($dirmodels as $reldir)
print '</td>';
print "</tr>\n";
}
}
}

1
htdocs/admin/pdf.php
View File

@ -517,7 +517,6 @@ else // Show
$text.= yn($conf->global->MAIN_PDF_MAIN_HIDE_THIRD_TAX,1);
$text.= '</td></tr>';
}
}
// Sales TAX / VAT information

1
htdocs/admin/receiptprinter.php
View File

@ -438,7 +438,6 @@ if ($mode == 'template' && $user->admin)
print '</table>';
dol_fiche_end();
}
// to remove after test

1
htdocs/admin/supplier_payment.php
View File

@ -301,7 +301,6 @@ foreach ($dirmodels as $reldir)
print '</td>';
print "</tr>\n";
}
}
}

2
htdocs/admin/syslog.php
View File

@ -132,9 +132,7 @@ if ($action == 'set')
{
$db->rollback();
setEventMessages($error, $errors, 'errors');
}
}
// Set level

1
htdocs/admin/tools/eaccelerator.php
View File

@ -168,7 +168,6 @@ function create_script_table($list)
default:
$sortby = "file";
($order == "asc" ? uasort($list, 'compare') : uasort($list, 'revcompare'));
}
foreach($list as $script) {

1
htdocs/admin/tools/listsessions.php
View File

@ -170,7 +170,6 @@ if ($savehandler == 'files')
print '<tr '.$bc[false].'><td colspan="6">'.$langs->trans("NoSessionFound",$savepath,$openbasedir).'</td></tr>';
}
print "</table>";
}
else
{

1
htdocs/admin/translation.php
View File

@ -384,7 +384,6 @@ if ($mode == 'overwrite')
print '</table>';
print '</div>';
}
if ($mode == 'searchkey')

1
htdocs/admin/website.php
View File

@ -167,7 +167,6 @@ if (GETPOST('actionadd','alpha') || GETPOST('actionmodify','alpha'))
{
$obj = $db->fetch_object($result);
$newid=($obj->newid + 1);
} else {
dol_print_error($db);
}

1
htdocs/asset/class/asset.class.php
View File

@ -463,7 +463,6 @@ class Asset extends CommonObject
}
$this->db->free($result);
}
else
{

3
htdocs/asset/type.php
View File

@ -356,7 +356,6 @@ if ($action == 'create')
print '<td>';
print $formaccounting->select_account($object->accountancy_code_depreciation_expense, 'accountancy_code_depreciation_expense', 1, '', 1, 1);
print '</td></tr>';
}
else // For external software
{
@ -732,7 +731,6 @@ if ($rowid > 0)
{
dol_print_error($db);
}
}
/* ************************************************************************** */
@ -782,7 +780,6 @@ if ($rowid > 0)
print '<td>';
print $formaccounting->select_account($object->accountancy_code_depreciation_expense, 'accountancy_code_depreciation_expense', 1, '', 1, 1);
print '</td></tr>';
}
else // For external software
{

2
htdocs/blockedlog/admin/blockedlog_list.php
View File

@ -444,7 +444,6 @@ if (! empty($conf->global->BLOCKEDLOG_SCAN_ALL_FOR_LOWERIDINERROR))
// TODO Make a full scan of table in reverse order of id of $block, so we can use the parameter $previoushash into checkSignature to save requests
// to find the $loweridinerror.
}
else
{
@ -538,7 +537,6 @@ if (is_array($blocks))
print '<td></td>';
print '</tr>';
}
}
}

2
htdocs/blockedlog/ajax/authority.php
View File

@ -53,7 +53,6 @@ if($auth->fetch(0, $signature)<=0) {
if(!empty($hash)) {
echo $auth->checkBlockchain($hash) ? 'hashisok' : 'hashisjunk';
}
elseif(!empty($newblock)){
if($auth->checkBlock($newblock)) {
@ -65,7 +64,6 @@ elseif(!empty($newblock)){
else{
echo 'blockalreadyadded';
}
}
else{

1
htdocs/blockedlog/ajax/check_signature.php
View File

@ -49,7 +49,6 @@ $auth->signature = $block_static->getSignature();
foreach($blocks as &$b) {
$auth->blockchain.=$b->signature;
}
$hash = $auth->getBlockchainHash();

4
htdocs/blockedlog/class/authority.class.php
View File

@ -73,7 +73,6 @@ class BlockedLogAuthority
foreach($blocks as &$b) {
$this->blockchain.=$b->signature;
}
return $this->blockchain;
@ -319,15 +318,12 @@ class BlockedLogAuthority
if($res === 'blockalreadyadded' || $res === 'blockadded') {
$block->setCertified();
}
else {
$this->error = $langs->trans('ImpossibleToContactAuthority ',$url);
return -1;
}
}
return 1;

3
htdocs/blockedlog/class/blockedlog.class.php
View File

@ -947,17 +947,14 @@ class BlockedLog
$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
WHERE entity=".$conf->entity;
}
else if ($element=='not_certified') {
$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
WHERE entity=".$conf->entity." AND certified = 0";
}
else if ($element=='just_certified') {
$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
WHERE entity=".$conf->entity." AND certified = 1";
}
else{
$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog

1
htdocs/bookmarks/card.php
View File

@ -333,7 +333,6 @@ if ($id > 0 && ! preg_match('/^add/i',$action))
}
print '</div>';
}
// End of page

32
htdocs/cashdesk/class/Facturation.class.php
View File

@ -290,19 +290,16 @@ class Facturation
if ( !$aId )
{
return $this->id;
}
else if ( $aId == 'RESET' )
{
$this->id = null;
}
else
{
$this->id = $aId;
}
}
@ -410,15 +407,12 @@ class Facturation
if (is_null($aMontantRemise)) {
return $this->montant_remise;
} else if ( $aMontantRemise == 'RESET' ) {
$this->montant_remise = null;
} else {
$this->montant_remise = $aMontantRemise;
}
}
@ -434,15 +428,12 @@ class Facturation
if (is_null($aPrix)) {
return $this->prix;
} else if ( $aPrix == 'RESET' ) {
$this->prix = null;
} else {
$this->prix = $aPrix;
}
}
@ -457,15 +448,12 @@ class Facturation
if (is_null($aTva)) {
return $this->tva;
} else if ( $aTva == 'RESET' ) {
$this->tva = null;
} else {
$this->tva = $aTva;
}
}
@ -480,15 +468,12 @@ class Facturation
if (is_null($aNumFacture)) {
return $this->num_facture;
} else if ( $aNumFacture == 'RESET' ) {
$this->num_facture = null;
} else {
$this->num_facture = $aNumFacture;
}
}
@ -504,15 +489,12 @@ class Facturation
if (is_null($aModeReglement)) {
return $this->mode_reglement;
} else if ( $aModeReglement == 'RESET' ) {
$this->mode_reglement = null;
} else {
$this->mode_reglement = $aModeReglement;
}
}
@ -528,15 +510,12 @@ class Facturation
if (is_null($aMontantEncaisse)) {
return $this->montant_encaisse;
} else if ( $aMontantEncaisse == 'RESET' ) {
$this->montant_encaisse = null;
} else {
$this->montant_encaisse = $aMontantEncaisse;
}
}
@ -555,11 +534,9 @@ class Facturation
} else if ( $aMontantRendu == 'RESET' ) {
$this->montant_rendu = null;
} else {
$this->montant_rendu = $aMontantRendu;
}
}
@ -574,15 +551,12 @@ class Facturation
if (is_null($aPaiementLe)) {
return $this->paiement_le;
} else if ( $aPaiementLe == 'RESET' ) {
$this->paiement_le = null;
} else {
$this->paiement_le = $aPaiementLe;
}
}
@ -597,15 +571,12 @@ class Facturation
if (is_null($aTotalHt)) {
return $this->prix_total_ht;
} else if ( $aTotalHt == 'RESET' ) {
$this->prix_total_ht = null;
} else {
$this->prix_total_ht = $aTotalHt;
}
}
@ -620,15 +591,12 @@ class Facturation
if (is_null($aMontantTva)) {
return $this->montant_tva;
} else if ( $aMontantTva == 'RESET' ) {
$this->montant_tva = null;
} else {
$this->montant_tva = $aMontantTva;
}
}

1
htdocs/cashdesk/facturation.php
View File

@ -137,7 +137,6 @@ if ( $nbr_enreg > 1 )
{
$top_liste_produits = '----- '.$nbr_enreg.' '.$langs->transnoentitiesnoconv("CashDeskProducts").' '.$langs->trans("CashDeskOn").' '.$nbr_enreg.' -----';
}
}
else if ( $nbr_enreg == 1 )
{

1
htdocs/cashdesk/facturation_dhtml.php
View File

@ -108,5 +108,4 @@ if (dol_strlen($search) >= 0) // If search criteria is on char length at least
print '</ul>';
}
}
}

2
htdocs/cashdesk/facturation_verif.php
View File

@ -216,7 +216,6 @@ switch($action)
$obj_facturation->remisePercent($_POST['txtRemise']);
$obj_facturation->ajoutArticle(); // This add an entry into $_SESSION['poscart']
// We update prixTotalTtc
}
$redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation';
@ -227,7 +226,6 @@ switch($action)
$redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation';
break;
}
// We saved object obj_facturation

1
htdocs/cashdesk/tpl/facturation1.tpl.php
View File

@ -89,7 +89,6 @@ $langs->loadLangs(array("main","bills","cashdesk"));
print '<option '.$selected.' value="'.$tab_designations[$i]['rowid'].'">'.dol_trunc($tab_designations[$i]['ref'],16).' - '.dol_trunc($label,35,'middle');
if (! empty($conf->stock->enabled) && !empty($conf_fkentrepot) && $tab_designations[$i]['fk_product_type']==0) print ' ('.$langs->trans("CashDeskStock").': '.(empty($tab_designations[$i]['reel'])?0:$tab_designations[$i]['reel']).')';
print '</option>'."\n";
}
?>
</select>

2
htdocs/cashdesk/tpl/liste_articles.tpl.php
View File

@ -60,11 +60,9 @@ else
if ( $tab[$i]['remise_percent'] > 0 ) {
$remise_percent = ' -'.$tab[$i]['remise_percent'].'%';
} else {
$remise_percent = '';
}
$remise = $tab[$i]['remise'];

5
htdocs/cashdesk/tpl/validation1.tpl.php
View File

@ -41,13 +41,11 @@ $langs->loadLangs(array("main","bills","banks"));
if ( $obj_facturation->montantTva() ) {
echo ('<tr><td class="resume_label">'.$langs->trans("VAT").'</td><td>'.price(price2num($obj_facturation->montantTva(),'MT'),0,$langs,0,0,-1,$conf->currency).'</td></tr>');
}
else
{
echo ('<tr><td class="resume_label">'.$langs->trans("VAT").'</td><td>'.$langs->trans("NoVAT").'</td></tr>');
}
?>
<tr><td class="resume_label"><?php echo $langs->trans("TotalTTC"); ?> </td><td><?php echo price(price2num($obj_facturation->prixTotalTtc(),'MT'),0,$langs,0,0,-1,$conf->currency); ?></td></tr>
@ -91,18 +89,15 @@ $langs->loadLangs(array("main","bills","banks"));
if ( $obj_facturation->getsetPaymentMode() == 'DIF' ) {
echo ('<tr><td class="resume_label">'.$langs->trans("DateDue").'</td><td>'.$obj_facturation->paiementLe().'</td></tr>');
} else {
echo ('<tr><td class="resume_label">'.$langs->trans("Received").'</td><td>'.price(price2num($obj_facturation->montantEncaisse(),'MT'),0,$langs,0,0,-1,$conf->currency).'</td></tr>');
}
// Affichage du montant rendu (reglement en especes)
if ( $obj_facturation->montantRendu() ) {
echo ('<tr><td class="resume_label">'.$langs->trans("Change").'</td><td>'.price(price2num($obj_facturation->montantRendu(),'MT'),0,$langs,0,0,-1,$conf->currency).'</td></tr>');
}
?>

1
htdocs/cashdesk/validation_verif.php
View File

@ -328,7 +328,6 @@ switch ($action)
$result=$invoice->set_paid($user);
//print 'set paid';exit;
}
}
}
else

2
htdocs/categories/class/categorie.class.php
View File

@ -665,7 +665,6 @@ class Categorie extends CommonObject
$this->db->rollback();
return -2;
}
}
else
{
@ -1810,7 +1809,6 @@ class Categorie extends CommonObject
{
$this->label = $obj->label;
$this->description = $obj->description;
}
$this->multilangs["$obj->lang"]["label"] = $obj->label;
$this->multilangs["$obj->lang"]["description"] = $obj->description;

1
htdocs/categories/traduction.php
View File

@ -269,7 +269,6 @@ if ($action == 'edit')
print '</div>';
print '</form>';
}
else if ($action != 'add')
{

1
htdocs/categories/viewcat.php
View File

@ -168,7 +168,6 @@ if ($type == Categorie::TYPE_PRODUCT && $elemid && $action == 'addintocategory'
setEventMessages($object->error,$object->errors,'errors');
}
}
}

2
htdocs/comm/action/card.php
View File

@ -597,7 +597,6 @@ if (GETPOST('actionmove','alpha') == 'mupdate')
{
$action='';
}
}
// Actions to delete doc
@ -873,7 +872,6 @@ if ($action == 'create')
} else {
print $form->select_company('', 'socid', '', 'SelectThirdParty', 1, 0, $events, 0, 'minwidth300');
}
}
print '</td></tr>';

2
htdocs/comm/action/class/actioncomm.class.php
View File

@ -401,7 +401,6 @@ class ActionComm extends CommonObject
$error++;
$this->errors[]=$this->db->lasterror();
}
}
}
}
@ -937,7 +936,6 @@ class ActionComm extends CommonObject
$error++;
$this->errors[]=$this->db->lasterror();
}
}
}
}

1
htdocs/comm/action/class/api_agendaevents.class.php
View File

@ -309,7 +309,6 @@ class AgendaEvents extends DolibarrApi
if (!isset($data[$field]))
throw new RestException(400, "$field field missing");
$event[$field] = $data[$field];
}
return $event;
}

1
htdocs/comm/action/index.php
View File

@ -666,7 +666,6 @@ if ($resql)
//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<br>';
}
$i++;
}
}
else

2
htdocs/comm/action/list.php
View File

@ -643,7 +643,6 @@ if ($resql)
print "&nbsp;";
}
print '</td>';
}
// Extra fields
@ -668,7 +667,6 @@ if ($resql)
print '</form>';
$db->free($resql);
}
else
{

1
htdocs/comm/action/pertype.php
View File

@ -543,7 +543,6 @@ if ($resql)
//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<br>';
}
$i++;
}
}
else

2
htdocs/comm/action/peruser.php
View File

@ -571,7 +571,6 @@ if ($resql)
//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<br>';
}
$i++;
}
$db->free($resql);
}
@ -798,7 +797,6 @@ while($currentdaytoshow<$lastdaytoshow) {
echo "<br>";
$currentdaytoshow = dol_time_plus_duree($currentdaytoshow, 7, 'd');
}
echo '</div>';

3
htdocs/comm/address.php
View File

@ -151,7 +151,6 @@ if ($action == 'add' || $action == 'update')
$action= "edit";
}
}
}
else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->societe->supprimer)
@ -291,7 +290,6 @@ if ($action == 'create')
print '</div>'."\n";
print '</form>'."\n";
}
}
elseif ($action == 'edit')
@ -486,7 +484,6 @@ else
}
print '</div>';
}
}

2
htdocs/comm/card.php
View File

@ -1301,7 +1301,6 @@ if ($object->id > 0)
if ($object->client != 0 && $object->client != 2) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a></div>';
else print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
}
}
}
@ -1344,7 +1343,6 @@ if ($object->id > 0)
// List of done actions
show_actions_done($conf,$langs,$db,$object);
}
}
else
{

2
htdocs/comm/index.php
View File

@ -521,7 +521,6 @@ if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
print '<td align="right" nowrap>'.dol_print_date($db->jdate($objp->tms),'day')."</td>";
print '</tr>';
$i++;
}
$db->free($resql);
@ -580,7 +579,6 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->societe->lire)
$i++;
}
}
else
{

1
htdocs/comm/mailing/advtargetemailing.php
View File

@ -467,7 +467,6 @@ if ($object->fetch($id) >= 0) {
if ($object->statut == 0 && $user->rights->mailing->creer) {
include DOL_DOCUMENT_ROOT . '/core/tpl/advtarget.tpl.php';
}
}

1
htdocs/comm/mailing/card.php
View File

@ -1165,7 +1165,6 @@ else
print '</div>';
dol_fiche_end();
}
else
{

1
htdocs/comm/mailing/cibles.php
View File

@ -643,7 +643,6 @@ if ($object->fetch($id) >= 0)
}
print "\n<!-- Fin liste destinataires selectionnes -->\n";
}
// End of page

9
htdocs/comm/mailing/class/advtargetemailing.class.php
View File

@ -240,7 +240,6 @@ class AdvanceTargetingMailing extends CommonObject
$this->datec = $this->db->jdate($obj->datec);
$this->fk_user_mod = $obj->fk_user_mod;
$this->tms = $this->db->jdate($obj->tms);
}
$this->db->free($resql);
@ -304,7 +303,6 @@ class AdvanceTargetingMailing extends CommonObject
$this->datec = $this->db->jdate($obj->datec);
$this->fk_user_mod = $obj->fk_user_mod;
$this->tms = $this->db->jdate($obj->tms);
}
$this->db->free($resql);
@ -372,7 +370,6 @@ class AdvanceTargetingMailing extends CommonObject
$this->datec = $this->db->jdate($obj->datec);
$this->fk_user_mod = $obj->fk_user_mod;
$this->tms = $this->db->jdate($obj->tms);
}
$this->db->free($resql);
@ -664,14 +661,10 @@ class AdvanceTargetingMailing extends CommonObject
$sqlwhere[]= " (te.".$key." LIKE '".$arrayquery['options_'.$key]."')";
}
}
}
}
if (count($sqlwhere)>0) $sql.= " WHERE ".implode(" AND ",$sqlwhere);
}
@ -803,7 +796,6 @@ class AdvanceTargetingMailing extends CommonObject
$sqlwhere[]= " (te.".$key." LIKE '".$arrayquery['options_'.$key.'_cnct']."')";
}
}
}
if (! empty($withThirdpartyFilter)) {
@ -969,7 +961,6 @@ class AdvanceTargetingMailing extends CommonObject
if (count($return_sql_not_like)>0) {
$return_sql_criteria .= ' AND (' . implode (' AND ', $return_sql_not_like).')';
}
}else {
$return_sql_criteria .= $column_to_test . ' LIKE \''.$this->db->escape($criteria).'\'';
}

3
htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
View File

@ -178,7 +178,6 @@ class FormAdvTargetEmailing extends Form
$label = $obj_usr->firstname . " " . $obj_usr->name . " (" . $obj_usr->login . ')';
$options_array [$obj_usr->rowid] = $label;
}
$this->db->free ( $resql_usr );
} else {
@ -323,7 +322,6 @@ class FormAdvTargetEmailing extends Form
$i++;
}
}
}
else
{
@ -411,7 +409,6 @@ class FormAdvTargetEmailing extends Form
$i++;
}
}
}
else
{

2
htdocs/comm/mailing/class/mailing.class.php
View File

@ -362,7 +362,6 @@ class Mailing extends CommonObject
'source_id'=>$obj->source_id,
'source_type'=>$obj->source_type);
}
}
}
else
@ -373,7 +372,6 @@ class Mailing extends CommonObject
$mailing_target->add_to_target($object->id, $target_array);
}
}
unset($object->context['createfromclone']);

1
htdocs/comm/mailing/index.php
View File

@ -182,7 +182,6 @@ if ($result)
print '</tr>';
$i++;
}
}
else
{

1
htdocs/comm/multiprix.php
View File

@ -174,7 +174,6 @@ if ($_socid > 0)
{
dol_print_error($db);
}
}
// End of page

3
htdocs/comm/propal/card.php
View File

@ -1364,7 +1364,6 @@ if (empty($reshook))
$upload_dir = $conf->propal->multidir_output[$object->entity];
$permissioncreate=$usercancreate;
include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
}
@ -1777,7 +1776,6 @@ if ($action == 'create')
print '</table>';
}
} elseif ($object->id > 0) {
/*
* Show object in view mode
@ -1825,7 +1823,6 @@ if ($action == 'create')
}
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('SetAcceptedRefused'), $text, 'setstatut', $formquestion, '', 1, 250);
}
// Confirm delete

1
htdocs/comm/propal/class/api_proposals.class.php
View File

@ -700,7 +700,6 @@ class Proposals extends DolibarrApi
if (!isset($data[$field]))
throw new RestException(400, "$field field missing");
$propal[$field] = $data[$field];
}
return $propal;
}

3
htdocs/comm/propal/class/propal.class.php
View File

@ -3127,11 +3127,8 @@ class Propal extends CommonObject
$cluser->fetch($obj->fk_user_cloture);
$this->user_cloture = $cluser;
}
}
$this->db->free($result);
}
else
{

1
htdocs/comm/propal/list.php
View File

@ -227,7 +227,6 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x',
$toselect='';
$search_array_options=array();
$search_categ_cus=0;
}
if ($object_statut != '') $viewstatut=$object_statut;

1
htdocs/commande/card.php
View File

@ -423,7 +423,6 @@ if (empty($reshook))
// modified by hook
if ($reshook < 0)
$error++;
} else {
setEventMessages($object->error, $object->errors, 'errors');
$error++;

2
htdocs/commande/class/api_orders.class.php
View File

@ -297,7 +297,6 @@ class Orders extends DolibarrApi
if ($updateRes > 0) {
return $updateRes;
} else {
throw new RestException(400, $this->commande->error);
}
@ -793,7 +792,6 @@ class Orders extends DolibarrApi
if (!isset($data[$field]))
throw new RestException(400, $field ." field missing");
$commande[$field] = $data[$field];
}
return $commande;
}

1
htdocs/commande/class/commande.class.php
View File

@ -3616,7 +3616,6 @@ class Commande extends CommonOrder
}
$this->db->free($result);
}
else
{

1
htdocs/commande/list.php
View File

@ -214,7 +214,6 @@ if (empty($reshook))
$uploaddir = $conf->commande->dir_output;
$trigger_name='ORDER_SENTBYMAIL';
include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
}

5
htdocs/commande/orderstoinvoice.php
View File

@ -118,7 +118,6 @@ if (($action == 'create' || $action == 'add') && !$error)
$originid=$orders_id[0];
$_GET['originid']=$orders_id[0];
}
if (isset($_POST['orders_to_invoice']))
{
@ -128,7 +127,6 @@ if (($action == 'create' || $action == 'add') && !$error)
$originid=$orders_id[0];
$_POST['originid']=$orders_id[0];
}
$projectid = GETPOST('projectid','int')?GETPOST('projectid','int'):0;
@ -531,8 +529,6 @@ if ($action == 'create' && !$error)
print '</td></tr>';
print "</table>\n";
}
// Mode liste
@ -737,7 +733,6 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error)
{
dol_print_error($db);
}
}
// End of page

1
htdocs/compta/bank/annuel.php
View File

@ -339,7 +339,6 @@ else
$i++;
}
$db->free($resql);
}
else
{

3
htdocs/compta/bank/card.php
View File

@ -576,7 +576,6 @@ else
if ($action == 'delete')
{
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans("DeleteAccount"),$langs->trans("ConfirmDeleteAccount"),"confirm_delete");
}
// Print form confirm
@ -766,7 +765,6 @@ else
}
print '</div>';
}
/* ************************************************************************** */
@ -1033,7 +1031,6 @@ else
print '</form>';
}
}
// End of page

1
htdocs/compta/bank/class/paymentvarious.class.php
View File

@ -452,7 +452,6 @@ class PaymentVarious extends CommonObject
$result=$this->call_trigger('PAYMENT_VARIOUS_CREATE',$user);
if ($result < 0) $error++;
// End call triggers
}
else $error++;

2
htdocs/compta/bank/ligne.php
View File

@ -451,7 +451,6 @@ if ($result)
$receipt=new RemiseCheque($db);
$receipt->fetch($objp->receiptid);
print ' &nbsp; &nbsp; '.$langs->trans("CheckReceipt").': '.$receipt->getNomUrl(2);
}
print '</td>';
}
@ -682,7 +681,6 @@ if ($result)
print '</form>';
}
}
$db->free($result);

2
htdocs/compta/compta-files.php
View File

@ -184,7 +184,6 @@ if(($action=="searchfiles"||$action=="dl" ) && $date_start && $date_stop){
}
}
$db->free($resd);
}
/*
* cleanup of old ZIP
@ -293,7 +292,6 @@ if ($result)
print '<td></td>';
print "</tr>\n";
}
}
print "</table>";
print '<form name="dl" action="?action=dl" method="POST" >'."\n\t\t\t";

1
htdocs/compta/deplacement/card.php
View File

@ -421,7 +421,6 @@ else if ($id)
if ($action == 'delete')
{
print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("DeleteTrip"),$langs->trans("ConfirmDeleteTrip"),"confirm_delete");
}
$soc = new Societe($db);

1
htdocs/compta/deplacement/document.php
View File

@ -122,7 +122,6 @@ 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
{

1
htdocs/compta/deplacement/index.php
View File

@ -191,7 +191,6 @@ if ($result)
$i++;
}
}
else
{

13
htdocs/compta/facture/card.php
View File

@ -744,7 +744,6 @@ if (empty($reshook))
{
$error++;
}
}
if ($object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT)
{
@ -765,7 +764,6 @@ if (empty($reshook))
break;
}
}
}
if (empty($error))
@ -1000,15 +998,11 @@ if (empty($reshook))
$line->multicurrency_total_ht = $line->multicurrency_total_ht - $prevLine->multicurrency_total_ht;
$line->multicurrency_total_tva = $line->multicurrency_total_tva - $prevLine->multicurrency_total_tva;
$line->multicurrency_total_ttc = $line->multicurrency_total_ttc - $prevLine->multicurrency_total_ttc;
}
}
// prorata
$line->situation_percent = $maxPrevSituationPercent - $line->situation_percent;
}
}
@ -1040,7 +1034,6 @@ if (empty($reshook))
$object->update_price(1);
}
}
if(GETPOST('invoiceAvoirWithPaymentRestAmount', 'int')==1 && $id>0)
@ -1342,7 +1335,6 @@ if (empty($reshook))
$subprice_diff = $object->lines[0]->subprice - $diff / (1 + $object->lines[0]->tva_tx / 100);
$object->updateline($object->lines[0]->id, $object->lines[0]->desc, $subprice_diff, $object->lines[0]->qty, $object->lines[0]->remise_percent, $object->lines[0]->date_start, $object->lines[0]->date_end, $object->lines[0]->tva_tx, 0, 0, 'HT', $object->lines[0]->info_bits, $object->lines[0]->product_type, 0, 0, 0, $object->lines[0]->pa_ht, $object->lines[0]->label, 0, array(), 100);
}
}
else
{
@ -1489,7 +1481,6 @@ if (empty($reshook))
setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
$error++;
}
} else {
setEventMessages($object->error, $object->errors, 'errors');
$error++;
@ -2363,7 +2354,6 @@ if (empty($reshook))
$line->situation_percent = $line->situation_percent - $maxPrevSituationPercent;
if($line->update()<0) $errors++;
}
}
}
@ -2693,7 +2683,6 @@ if ($action == 'create')
print ajax_combobox('fac_replacement');
print ajax_combobox('fac_avoir');
print ajax_combobox('situations');
}
if ($origin == 'contrat')
@ -3660,7 +3649,6 @@ else if ($id > 0 || ! empty($ref))
{
$payment_id = GETPOST('paiement_id');
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&paiement_id='.$payment_id, $langs->trans('DeletePayment'), $langs->trans('ConfirmDeletePayment'), 'confirm_delete_paiement', '', 'no', 1);
}
// Confirmation de la suppression d'une ligne produit
@ -4236,7 +4224,6 @@ else if ($id > 0 || ! empty($ref))
print '<td align="right">' . price($next_invoice->total_ttc) . '</td>';
print '<td align="right">' . $next_invoice->getLibStatut(3, $totalpaye) . '</td>';
print '</tr>';
}
$total_global_ht += $total_next_ht;

2
htdocs/compta/facture/class/facture.class.php
View File

@ -2465,7 +2465,6 @@ class Facture extends CommonInvoice
else $this->situation_final = 1;
$this->setFinal($user);
}
}
}
@ -4713,7 +4712,6 @@ class FactureLigne extends CommonInvoiceLine
$this->db->commit();
return $this->id;
}
else
{

2
htdocs/compta/facture/class/paymentterm.class.php
View File

@ -211,8 +211,6 @@ class PaymentTerm // extends CommonObject
$this->type_cdr = $obj->type_cdr;
$this->nbjour = $obj->nbjour;
$this->decalage = $obj->decalage;
}
$this->db->free($resql);

1
htdocs/compta/facture/contact.php
View File

@ -206,7 +206,6 @@ if ($id > 0 || ! empty($ref))
$res=@include dol_buildpath($reldir.'/contacts.tpl.php');
if ($res) break;
}
}
else
{

4
htdocs/compta/facture/fiche-rec.php
View File

@ -263,7 +263,6 @@ if (empty($reshook))
if ($action == 'setconditions' && $user->rights->facture->creer)
{
$result=$object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
}
// Set mode
elseif ($action == 'setmode' && $user->rights->facture->creer)
@ -629,12 +628,10 @@ if (empty($reshook))
$tmptxt .= $langs->transnoentitiesnoconv("CountryOrigin") . ': ' . getCountry($prod->country_code, 0, $db, $langs, 0);
$tmptxt .= ')';
$desc = dol_concatdesc($desc, $tmptxt);
}
$type = $prod->type;
$fk_unit = $prod->fk_unit;
}
else
{
@ -1730,7 +1727,6 @@ else
print '</div></div>';
}
}

1
htdocs/compta/facture/invoicetemplate_list.php
View File

@ -190,7 +190,6 @@ if (empty($reshook))
$permtodelete = $user->rights->mymodule->delete;
$uploaddir = $conf->mymodule->dir_output;
include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';*/
}

Some files were not shown because too many files have changed in this diff Show More