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

Merge remote-tracking branch 'upstream/develop' into camelCaps

Browse Source
This commit is contained in:
Frédéric FRANCE 2018-09-01 13:52:51 +02:00
commit 57fb3dc2f4
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
414 changed files with 279 additions and 860 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.tx/config
View File

@ -38,6 +38,12 @@ source_file = htdocs/langs/en_US/bills.lang
source_lang = en_US source_lang = en_US
type = MOZILLAPROPERTIES type = MOZILLAPROPERTIES
[dolibarr.blockedlog]
file_filter = htdocs/langs/<lang>/blockedlog.lang
source_file = htdocs/langs/en_US/blockedlog.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[dolibarr.bookmarks] [dolibarr.bookmarks]
file_filter = htdocs/langs/<lang>/bookmarks.lang file_filter = htdocs/langs/<lang>/bookmarks.lang
source_file = htdocs/langs/en_US/bookmarks.lang source_file = htdocs/langs/en_US/bookmarks.lang

4
ChangeLog
View File

@ -13,6 +13,10 @@ NEW: Dolibarr can provide information in page title when multicompany is enabled
Android application like DoliDroid able to provide native features for multicompany module Android application like DoliDroid able to provide native features for multicompany module
For developers:
Code changes to be more compatible with PSR2
***** ChangeLog for 8.0.0 compared to 7.0.0 ***** ***** ChangeLog for 8.0.0 compared to 7.0.0 *****

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

@ -374,6 +374,9 @@
</rule> </rule>
<rule ref="PEAR.NamingConventions.ValidVariableName" /> <rule ref="PEAR.NamingConventions.ValidVariableName" />
<rule ref="PSR2.Classes.ClassDeclaration" />
<rule ref="PSR2.Methods.FunctionClosingBrace" />
<!-- This is not in PSR2 --> <!-- This is not in PSR2 -->
<rule ref="PEAR.NamingConventions.ValidVariableName.PrivateNoUnderscore"> <rule ref="PEAR.NamingConventions.ValidVariableName.PrivateNoUnderscore">
<severity>0</severity> <severity>0</severity>

2
dev/translation/autotranslator.class.php
View File

@ -65,7 +65,6 @@ class autoTranslator
//ini_set('default_charset','UTF-8'); //ini_set('default_charset','UTF-8');
ini_set('default_charset',$this->_outputpagecode); ini_set('default_charset',$this->_outputpagecode);
$this->parse_refLangTranslationFiles(); $this->parse_refLangTranslationFiles();
} }
/** /**
@ -347,5 +346,4 @@ class autoTranslator
return $rep; return $rep;
} }
} }

10
htdocs/accountancy/class/accountancycategory.class.php
View File

@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
/** /**
* Class to manage categories of an accounting account * Class to manage categories of an accounting account
*/ */
class AccountancyCategory // extends CommonObject class AccountancyCategory // extends CommonObject
{ {
/** /**
* @var DoliDB Database handler. * @var DoliDB Database handler.
@ -58,7 +58,12 @@ class AccountancyCategory // extends CommonObject
public $id; public $id;
public $code; public $code;
public $label;
/**
* @var string proper name for given parameter
*/
public $label;
public $range_account; public $range_account;
public $sens; public $sens;
public $category_type; public $category_type;
@ -824,5 +829,4 @@ class AccountancyCategory // extends CommonObject
return -1; return -1;
} }
} }
} }

13
htdocs/accountancy/class/accountingjournal.class.php
View File

@ -30,20 +30,25 @@ class AccountingJournal extends CommonObject
* @var string ID to identify managed object * @var string ID to identify managed object
*/ */
public $element='accounting_journal'; public $element='accounting_journal';
/** /**
* @var string Name of table without prefix where object is stored * @var string Name of table without prefix where object is stored
*/ */
public $table_element='accounting_journal'; public $table_element='accounting_journal';
public $fk_element = ''; public $fk_element = '';
public $ismultientitymanaged = 0; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe public $ismultientitymanaged = 0; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
public $picto = 'generic'; public $picto = 'generic';
var $rowid; public $rowid;
public $code; public $code;
public $label;
/**
* @var string proper name for given parameter
*/
public $label;
public $nature; // 1:various operations, 2:sale, 3:purchase, 4:bank, 5:expense-report, 8:inventory, 9: has-new public $nature; // 1:various operations, 2:sale, 3:purchase, 4:bank, 5:expense-report, 8:inventory, 9: has-new
public $active; public $active;

1
htdocs/adherents/canvas/actions_adherentcard_common.class.php
View File

@ -279,5 +279,4 @@ abstract class ActionsAdherentCardCommon
} }
} }
} }
} }

1
htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
View File

@ -118,7 +118,6 @@ class ActionsAdherentCardDefault extends ActionsAdherentCardCommon
{ {
$this->LoadListDatas($limit, $offset, $sortfield, $sortorder); $this->LoadListDatas($limit, $offset, $sortfield, $sortorder);
} }
} }

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

@ -692,7 +692,6 @@ class Adherent extends CommonObject
$this->db->rollback(); $this->db->rollback();
return -1; return -1;
} }
} }
/** /**
@ -2116,7 +2115,6 @@ class Adherent extends CommonObject
$this->error=$this->db->error(); $this->error=$this->db->error();
return -1; return -1;
} }
} }
/** /**
@ -2683,5 +2681,4 @@ class Adherent extends CommonObject
return 0; return 0;
} }
} }

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

@ -558,5 +558,4 @@ class AdherentType extends CommonObject
return ''; return '';
} }
} }

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

@ -181,5 +181,4 @@ class AdherentStats extends Stats
return $this->_getAllByYear($sql); return $this->_getAllByYear($sql);
} }
} }

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

@ -409,5 +409,4 @@ class Members extends DolibarrApi
return $result; return $result;
} }
} }

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

@ -320,5 +320,4 @@ class MembersTypes extends DolibarrApi
return $object; return $object;
} }
} }

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

@ -181,7 +181,6 @@ function create_script_table($list)
print '</tr>'; print '</tr>';
} }
print '</table>'; print '</table>';
} }
/** /**

1
htdocs/api/class/api_access.class.php
View File

@ -195,6 +195,5 @@ class DolibarrApiAccess implements iAuthenticate
return $requires return $requires
? static::$role == 'admin' || in_array(static::$role, (array) $requires) ? static::$role == 'admin' || in_array(static::$role, (array) $requires)
: true; : true;
} }
} }

1
htdocs/api/class/api_setup.class.php
View File

@ -918,5 +918,4 @@ class Setup extends DolibarrApi
return array('resultcode'=>$resultcode, 'resultcomment'=>$resultcomment, 'expectedchecksum'=> $outexpectedchecksum, 'currentchecksum'=> $outcurrentchecksum, 'out'=>$out); return array('resultcode'=>$resultcode, 'resultcomment'=>$resultcomment, 'expectedchecksum'=> $outexpectedchecksum, 'currentchecksum'=> $outcurrentchecksum, 'out'=>$out);
} }
} }

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

@ -35,22 +35,22 @@ class Asset extends CommonObject
* @var string ID to identify managed object * @var string ID to identify managed object
*/ */
public $element = 'asset'; public $element = 'asset';
/** /**
* @var string Name of table without prefix where object is stored * @var string Name of table without prefix where object is stored
*/ */
public $table_element = 'asset'; public $table_element = 'asset';
/** /**
* @var int Does module support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe * @var int Does module support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
*/ */
public $ismultientitymanaged = 0; public $ismultientitymanaged = 0;
/** /**
* @var int Does asset support extrafields ? 0=No, 1=Yes * @var int Does asset support extrafields ? 0=No, 1=Yes
*/ */
public $isextrafieldmanaged = 1; public $isextrafieldmanaged = 1;
/** /**
* @var string String with name of icon for asset. Must be the part after the 'object_' into object_asset.png * @var string String with name of icon for asset. Must be the part after the 'object_' into object_asset.png
*/ */
@ -98,7 +98,12 @@ class Asset extends CommonObject
public $rowid; public $rowid;
public $ref; public $ref;
public $entity; public $entity;
public $label;
/**
* @var string proper name for given parameter
*/
public $label;
public $amount; public $amount;
public $fk_soc; public $fk_soc;
public $description; public $description;

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

@ -438,5 +438,4 @@ class AssetType extends CommonObject
{ {
return ''; return '';
} }
} }

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

@ -54,7 +54,6 @@ class BlockedLogAuthority
{ {
$this->db = $db; $this->db = $db;
} }
/** /**
@ -90,7 +89,6 @@ class BlockedLogAuthority
{ {
return md5($this->signature.$this->blockchain); return md5($this->signature.$this->blockchain);
} }
/** /**
@ -103,7 +101,6 @@ class BlockedLogAuthority
{ {
return ($hash === $this->getBlockchainHash() ); return ($hash === $this->getBlockchainHash() );
} }
/** /**
@ -116,7 +113,6 @@ class BlockedLogAuthority
{ {
$this->blockchain.=$block; $this->blockchain.=$block;
} }
/** /**
@ -197,7 +193,6 @@ class BlockedLogAuthority
$this->error=$this->db->error(); $this->error=$this->db->error();
return -1; return -1;
} }
} }
/** /**
@ -252,7 +247,6 @@ class BlockedLogAuthority
$this->db->rollback(); $this->db->rollback();
return -1; return -1;
} }
} }
/** /**
@ -291,7 +285,6 @@ class BlockedLogAuthority
$this->db->rollback(); $this->db->rollback();
return -1; return -1;
} }
} }
/** /**
@ -340,5 +333,4 @@ class BlockedLogAuthority
return 1; return 1;
} }
} }

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

@ -283,7 +283,6 @@ class BlockedLog
} }
return '<i class="opacitymedium">'.$langs->trans('ImpossibleToReloadObject', $this->element, $this->fk_object).'</i>'; return '<i class="opacitymedium">'.$langs->trans('ImpossibleToReloadObject', $this->element, $this->fk_object).'</i>';
} }
/** /**
@ -676,7 +675,6 @@ class BlockedLog
$this->error=$this->db->error(); $this->error=$this->db->error();
return -1; return -1;
} }
} }
@ -716,8 +714,6 @@ class BlockedLog
if($res===false) return false; if($res===false) return false;
return true; return true;
} }
/** /**
@ -1060,5 +1056,4 @@ class BlockedLog
return $result; return $result;
} }
} }

2
htdocs/bookmarks/class/bookmark.class.php
View File

@ -226,7 +226,6 @@ class Bookmark extends CommonObject
$this->error=$this->db->lasterror(); $this->error=$this->db->lasterror();
return -1; return -1;
} }
} }
/** /**
@ -256,5 +255,4 @@ class Bookmark extends CommonObject
{ {
return ''; return '';
} }
} }

1
htdocs/cashdesk/class/Auth.class.php
View File

@ -138,6 +138,5 @@ class Auth
return $ret; return $ret;
} }
} }

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

@ -167,7 +167,6 @@ class Facturation
$_SESSION['poscart']=$newcartarray; $_SESSION['poscart']=$newcartarray;
$this->raz(); $this->raz();
} }
/** /**
@ -269,7 +268,6 @@ class Facturation
$this->prixTotalHt('RESET'); $this->prixTotalHt('RESET');
$this->montantTva('RESET'); $this->montantTva('RESET');
$this->prixTotalTtc('RESET'); $this->prixTotalTtc('RESET');
} }
@ -324,7 +322,6 @@ class Facturation
{ {
$this->ref = $aRef; $this->ref = $aRef;
} }
} }
/** /**
@ -348,7 +345,6 @@ class Facturation
{ {
$this->qte = $aQte; $this->qte = $aQte;
} }
} }
/** /**
@ -372,7 +368,6 @@ class Facturation
{ {
$this->stock = $aStock; $this->stock = $aStock;
} }
} }
/** /**
@ -396,7 +391,6 @@ class Facturation
{ {
$this->remise_percent = $aRemisePercent; $this->remise_percent = $aRemisePercent;
} }
} }
/** /**
@ -421,7 +415,6 @@ class Facturation
$this->montant_remise = $aMontantRemise; $this->montant_remise = $aMontantRemise;
} }
} }
/** /**
@ -446,7 +439,6 @@ class Facturation
$this->prix = $aPrix; $this->prix = $aPrix;
} }
} }
/** /**
@ -470,7 +462,6 @@ class Facturation
$this->tva = $aTva; $this->tva = $aTva;
} }
} }
/** /**
@ -518,7 +509,6 @@ class Facturation
$this->mode_reglement = $aModeReglement; $this->mode_reglement = $aModeReglement;
} }
} }
/** /**
@ -543,7 +533,6 @@ class Facturation
$this->montant_encaisse = $aMontantEncaisse; $this->montant_encaisse = $aMontantEncaisse;
} }
} }
/** /**
@ -567,7 +556,6 @@ class Facturation
$this->montant_rendu = $aMontantRendu; $this->montant_rendu = $aMontantRendu;
} }
} }
/** /**
@ -637,7 +625,6 @@ class Facturation
$this->montant_tva = $aMontantTva; $this->montant_tva = $aMontantTva;
} }
} }
/** /**
@ -661,5 +648,4 @@ class Facturation
$this->prix_total_ttc = $aTotalTtc; $this->prix_total_ttc = $aTotalTtc;
} }
} }
} }

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

@ -6,7 +6,7 @@
* Copyright (C) 2006-2012 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2006-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com> * Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
* Copyright (C) 2013-2016 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2013-2016 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013-2016 Philippe Grand <philippe.grand@atoo-net.com> * Copyright (C) 2013-2018 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com> * Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr> * Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
* Copyright (C) 2016 Charlie Benke <charlie@patas-monkey.com> * Copyright (C) 2016 Charlie Benke <charlie@patas-monkey.com>
@ -51,7 +51,7 @@ class Categorie extends CommonObject
const TYPE_USER = 'user'; const TYPE_USER = 'user';
const TYPE_PROJECT = 'project'; const TYPE_PROJECT = 'project';
const TYPE_ACCOUNT = 'bank_account'; const TYPE_ACCOUNT = 'bank_account';
const TYPE_BANK_LINE = 'bank_line'; const TYPE_BANK_LINE = 'bank_line';
public $picto = 'category'; public $picto = 'category';
@ -152,14 +152,19 @@ class Categorie extends CommonObject
* @var string ID to identify managed object * @var string ID to identify managed object
*/ */
public $element='category'; public $element='category';
/** /**
* @var string Name of table without prefix where object is stored * @var string Name of table without prefix where object is stored
*/ */
public $table_element='categorie'; public $table_element='categorie';
public $fk_parent; public $fk_parent;
public $label;
/**
* @var string proper name for given parameter
*/
public $label;
public $description; public $description;
/** /**
* @var string Color * @var string Color

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

@ -437,7 +437,6 @@ class ActionComm extends CommonObject
$this->error=$this->db->lasterror(); $this->error=$this->db->lasterror();
return -1; return -1;
} }
} }
/** /**
@ -648,7 +647,6 @@ class ActionComm extends CommonObject
} }
return $num; return $num;
} }
/** /**
@ -1692,5 +1690,4 @@ class ActionComm extends CommonObject
return $error; return $error;
} }
} }

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

@ -228,5 +228,4 @@ class ActionCommReminder extends CommonObject
{ {
$this->initAsSpecimenCommon(); $this->initAsSpecimenCommon();
} }
} }

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

@ -293,7 +293,6 @@ class AgendaEvents extends DolibarrApi
'message' => 'Agenda Event deleted' 'message' => 'Agenda Event deleted'
) )
); );
} }
/** /**

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

@ -226,5 +226,4 @@ class CActionComm
$transcode=$langs->trans("Action".$this->code); $transcode=$langs->trans("Action".$this->code);
if ($transcode != "Action".$this->code) return $transcode; if ($transcode != "Action".$this->code) return $transcode;
} }
} }

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

@ -44,7 +44,6 @@ class ICal
*/ */
public function __construct() public function __construct()
{ {
} }
/** /**

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

@ -66,7 +66,6 @@ $modulesdir = dolGetModulesDirs('/mailings');
$object = new Mailing($db); $object = new Mailing($db);
/* /*
* Actions * Actions
*/ */
@ -330,16 +329,14 @@ if ($object->fetch($id) >= 0)
// Si le module mailing est qualifie // Si le module mailing est qualifie
if ($qualified) if ($qualified)
{ {
$var = ! $var;
if ($allowaddtarget) if ($allowaddtarget)
{ {
print '<form '.$bctag[$var].' name="'.$modulename.'" action="'.$_SERVER['PHP_SELF'].'?action=add&id='.$object->id.'&module='.$modulename.'" method="POST" enctype="multipart/form-data">'; print '<form class="oddeven tagtr" name="'.$modulename.'" action="'.$_SERVER['PHP_SELF'].'?action=add&id='.$object->id.'&module='.$modulename.'" method="POST" enctype="multipart/form-data">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
} }
else else
{ {
print '<div '.$bctag[$var].'>'; print '<div class="oddeven tagtr">';
} }
print '<div class="tagtd">'; print '<div class="tagtd">';

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

@ -974,5 +974,4 @@ class AdvanceTargetingMailing extends CommonObject
return $return_sql_criteria; return $return_sql_criteria;
} }
} }

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

@ -93,7 +93,6 @@ class Mailing extends CommonObject
$this->statut_dest[1] = 'MailingStatusSent'; $this->statut_dest[1] = 'MailingStatusSent';
$this->statut_dest[2] = 'MailingStatusRead'; $this->statut_dest[2] = 'MailingStatusRead';
$this->statut_dest[3] = 'MailingStatusReadAndUnsubscribe'; // Read but ask to not be contacted anymore $this->statut_dest[3] = 'MailingStatusReadAndUnsubscribe'; // Read but ask to not be contacted anymore
} }
/** /**
@ -647,5 +646,4 @@ class Mailing extends CommonObject
if ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut3'); if ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut3');
} }
} }
} }

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

@ -491,7 +491,6 @@ class Proposals extends DolibarrApi
'message' => 'Commercial Proposal deleted' 'message' => 'Commercial Proposal deleted'
) )
); );
} }
/** /**

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

@ -49,22 +49,22 @@ class Propal extends CommonObject
* @var string ID to identify managed object * @var string ID to identify managed object
*/ */
public $element='propal'; public $element='propal';
/** /**
* @var string Name of table without prefix where object is stored * @var string Name of table without prefix where object is stored
*/ */
public $table_element='propal'; public $table_element='propal';
public $table_element_line='propaldet'; public $table_element_line='propaldet';
public $fk_element='fk_propal'; public $fk_element='fk_propal';
public $picto='propal'; public $picto='propal';
/** /**
* 0=No test on entity, 1=Test with field entity, 2=Test with link by societe * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
* @var int * @var int
*/ */
public $ismultientitymanaged = 1; public $ismultientitymanaged = 1;
/** /**
* 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user
* @var integer * @var integer
@ -1578,10 +1578,10 @@ class Propal extends CommonObject
$sql = 'SELECT d.rowid, d.fk_propal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.vat_src_code, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.localtax1_type, d.localtax2_type, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,'; $sql = 'SELECT d.rowid, d.fk_propal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.vat_src_code, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.localtax1_type, d.localtax2_type, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,';
$sql.= ' d.info_bits, d.total_ht, d.total_tva, d.total_localtax1, d.total_localtax2, d.total_ttc, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht, d.special_code, d.rang, d.product_type,'; $sql.= ' d.info_bits, d.total_ht, d.total_tva, d.total_localtax1, d.total_localtax2, d.total_ttc, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht, d.special_code, d.rang, d.product_type,';
$sql.= ' d.fk_unit,'; $sql.= ' d.fk_unit,';
$sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label,'; $sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label, p.tobach as product_batch,';
$sql.= ' p.weight, p.weight_units, p.volume, p.volume_units,'; $sql.= ' p.weight, p.weight_units, p.volume, p.volume_units,';
$sql.= ' d.date_start, d.date_end'; $sql.= ' d.date_start, d.date_end,';
$sql.= ' ,d.fk_multicurrency, d.multicurrency_code, d.multicurrency_subprice, d.multicurrency_total_ht, d.multicurrency_total_tva, d.multicurrency_total_ttc'; $sql.= ' d.fk_multicurrency, d.multicurrency_code, d.multicurrency_subprice, d.multicurrency_total_ht, d.multicurrency_total_tva, d.multicurrency_total_ttc';
$sql.= ' FROM '.MAIN_DB_PREFIX.'propaldet as d'; $sql.= ' FROM '.MAIN_DB_PREFIX.'propaldet as d';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON (d.fk_product = p.rowid)'; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON (d.fk_product = p.rowid)';
$sql.= ' WHERE d.fk_propal = '.$this->id; $sql.= ' WHERE d.fk_propal = '.$this->id;
@ -1643,7 +1643,8 @@ class Propal extends CommonObject
$line->libelle = $objp->product_label; // TODO deprecated $line->libelle = $objp->product_label; // TODO deprecated
$line->product_label = $objp->product_label; $line->product_label = $objp->product_label;
$line->product_desc = $objp->product_desc; // Description produit $line->product_desc = $objp->product_desc; // Description produit
$line->fk_product_type = $objp->fk_product_type; $line->product_tobatch = $objp->product_tobatch;
$line->fk_product_type = $objp->fk_product_type; // TODO deprecated
$line->fk_unit = $objp->fk_unit; $line->fk_unit = $objp->fk_unit;
$line->weight = $objp->weight; $line->weight = $objp->weight;
$line->weight_units = $objp->weight_units; $line->weight_units = $objp->weight_units;
@ -3219,7 +3220,7 @@ class Propal extends CommonObject
{ {
$response->nbtodo++; $response->nbtodo++;
$response->total+=$obj->total_ht; $response->total+=$obj->total_ht;
if ($mode == 'opened') if ($mode == 'opened')
{ {
$datelimit = $this->db->jdate($obj->datefin); $datelimit = $this->db->jdate($obj->datefin);
@ -3530,8 +3531,8 @@ class Propal extends CommonObject
*/ */
function getLinesArray() function getLinesArray()
{ {
// TODO Duplicate with fetch_lines ? Wich one to keep ? return $this->fetch_lines();
/*
$this->lines = array(); $this->lines = array();
$sql = 'SELECT pt.rowid, pt.label as custom_label, pt.description, pt.fk_product, pt.fk_remise_except,'; $sql = 'SELECT pt.rowid, pt.label as custom_label, pt.description, pt.fk_product, pt.fk_remise_except,';
@ -3620,7 +3621,7 @@ class Propal extends CommonObject
{ {
$this->error=$this->db->error(); $this->error=$this->db->error();
return -1; return -1;
} }*/
} }
/** /**
@ -3684,7 +3685,7 @@ class PropaleLigne extends CommonObjectLine
* @var string ID to identify managed object * @var string ID to identify managed object
*/ */
public $element='propaldet'; public $element='propaldet';
/** /**
* @var string Name of table without prefix where object is stored * @var string Name of table without prefix where object is stored
*/ */
@ -4255,5 +4256,4 @@ class PropaleLigne extends CommonObjectLine
return -2; return -2;
} }
} }
} }

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

@ -473,7 +473,6 @@ class Orders extends DolibarrApi
'message' => 'Order deleted' 'message' => 'Order deleted'
) )
); );
} }
/** /**

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

@ -3428,7 +3428,6 @@ class Commande extends CommonOrder
if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderProcessed').$billedtext.' </span>'.img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6'); if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderProcessed').$billedtext.' </span>'.img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6');
if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderDelivered').' </span>'.img_picto($langs->trans('StatusOrderDelivered'),'statut6'); if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderDelivered').' </span>'.img_picto($langs->trans('StatusOrderDelivered'),'statut6');
} }
} }

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

@ -222,6 +222,5 @@ class CommandeStats extends Stats
return $this->_getAllByProduct($sql); return $this->_getAllByProduct($sql);
} }
} }

5
htdocs/compta/bank/class/account.class.php
View File

@ -1175,7 +1175,6 @@ class Account extends CommonObject
} }
return $solde; return $solde;
} }
/** /**
@ -1520,7 +1519,6 @@ class Account extends CommonObject
*/ */
function info($id) function info($id)
{ {
} }
/** /**
@ -1565,7 +1563,6 @@ class Account extends CommonObject
//Get the order the properties are shown //Get the order the properties are shown
return $fieldarray; return $fieldarray;
} }
/** /**
@ -1639,7 +1636,6 @@ class Account extends CommonObject
$this->owner_address = 'Owner address'; $this->owner_address = 'Owner address';
$this->country_id = 1; $this->country_id = 1;
} }
} }
@ -2331,5 +2327,4 @@ class AccountLine extends CommonObject
} }
return 0; return 0;
} }
} }

7
htdocs/compta/bank/class/bankcateg.class.php
View File

@ -33,7 +33,11 @@ class BankCateg // extends CommonObject
public $picto='generic'; public $picto='generic';
public $id; public $id;
public $label;
/**
* @var string proper name for given parameter
*/
public $label;
/** /**
@ -339,5 +343,4 @@ class BankCateg // extends CommonObject
$this->id = 0; $this->id = 0;
$this->label = ''; $this->label = '';
} }
} }

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

@ -601,5 +601,4 @@ class PaymentVarious extends CommonObject
dol_print_error($this->db); dol_print_error($this->db);
} }
} }
} }

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

@ -154,7 +154,6 @@ class Deplacement extends CommonObject
$this->db->rollback(); $this->db->rollback();
return -1; return -1;
} }
} }
/** /**
@ -454,5 +453,4 @@ class Deplacement extends CommonObject
dol_print_error($this->db); dol_print_error($this->db);
} }
} }
} }

1
htdocs/compta/facture/class/api_invoices.class.php
View File

@ -1259,5 +1259,4 @@ class Invoices extends DolibarrApi
} }
return $invoice; return $invoice;
} }
} }

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

@ -1860,7 +1860,5 @@ class FactureLigneRec extends CommonInvoiceLine
$this->db->rollback(); $this->db->rollback();
return -2; return -2;
} }
} }
} }

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

@ -1552,7 +1552,6 @@ class Facture extends CommonInvoice
} }
} }
} }
} }
/** /**

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

@ -224,7 +224,5 @@ class FactureStats extends Stats
return $this->_getAllByProduct($sql); return $this->_getAllByProduct($sql);
} }
} }

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

@ -482,5 +482,4 @@ class PaymentTerm // extends CommonObject
$this->nbjour=''; $this->nbjour='';
$this->decalage=''; $this->decalage='';
} }
} }

7
htdocs/compta/localtax/class/localtax.class.php
View File

@ -644,14 +644,13 @@ class Localtax extends CommonObject
* *
* @param int $status Statut * @param int $status Statut
* @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
* @return string Libelle du statut * @return string Libelle du statut
*/ */
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps // phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function LibStatut($status,$mode=0) function LibStatut($status, $mode=0)
{ {
global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage
return ''; return '';
} }
} }

1
htdocs/compta/paiement/cheque/class/remisecheque.class.php
View File

@ -1106,5 +1106,4 @@ class RemiseCheque extends CommonObject
} }
return $langs->trans('Unknown'); return $langs->trans('Unknown');
} }
} }

3
htdocs/compta/paiement/class/cpaiement.class.php
View File

@ -369,8 +369,5 @@ class Cpaiement
$this->active = ''; $this->active = '';
$this->accountancy_code = ''; $this->accountancy_code = '';
$this->module = ''; $this->module = '';
} }
} }

4
htdocs/compta/prelevement/class/bonprelevement.class.php
View File

@ -165,7 +165,6 @@ class BonPrelevement extends CommonObject
} }
return $result; return $result;
} }
/** /**
@ -1467,7 +1466,6 @@ class BonPrelevement extends CommonObject
if (! empty($conf->global->MAIN_UMASK)) if (! empty($conf->global->MAIN_UMASK))
@chmod($this->file, octdec($conf->global->MAIN_UMASK)); @chmod($this->file, octdec($conf->global->MAIN_UMASK));
return $result; return $result;
} }
@ -1700,7 +1698,6 @@ class BonPrelevement extends CommonObject
fputs($this->file, substr(" ",0,5)); fputs($this->file, substr(" ",0,5));
fputs($this->file, "\n"); fputs($this->file, "\n");
} }
/** /**
@ -1956,5 +1953,4 @@ class BonPrelevement extends CommonObject
if ($statut==2) return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut],'statut6'); if ($statut==2) return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut],'statut6');
} }
} }
} }

4
htdocs/compta/prelevement/class/rejetprelevement.class.php
View File

@ -69,7 +69,6 @@ class RejetPrelevement
$this->facturer[0]=$langs->trans("NoInvoiceRefused"); $this->facturer[0]=$langs->trans("NoInvoiceRefused");
$this->facturer[1]=$langs->trans("InvoiceRefused"); $this->facturer[1]=$langs->trans("InvoiceRefused");
} }
/** /**
@ -198,7 +197,6 @@ class RejetPrelevement
dol_syslog("RejetPrelevement::Create Rollback"); dol_syslog("RejetPrelevement::Create Rollback");
$this->db->rollback(); $this->db->rollback();
} }
} }
/** /**
@ -328,7 +326,6 @@ class RejetPrelevement
} }
return $arr; return $arr;
} }
/** /**
@ -372,5 +369,4 @@ class RejetPrelevement
return -2; return -2;
} }
} }
} }

8
htdocs/compta/salaries/class/paymentsalary.class.php
View File

@ -51,7 +51,12 @@ class PaymentSalary extends CommonObject
public $fk_project; public $fk_project;
public $type_payment; public $type_payment;
public $num_payment; public $num_payment;
public $label;
/**
* @var string proper name for given parameter
*/
public $label;
public $datesp; public $datesp;
public $dateep; public $dateep;
public $fk_bank; public $fk_bank;
@ -629,5 +634,4 @@ class PaymentSalary extends CommonObject
}*/ }*/
return ''; return '';
} }
} }

3
htdocs/compta/sociales/class/cchargesociales.class.php
View File

@ -524,8 +524,5 @@ class Cchargesociales
$this->fk_pays = ''; $this->fk_pays = '';
$this->module = ''; $this->module = '';
$this->accountancy_code = ''; $this->accountancy_code = '';
} }
} }

1
htdocs/compta/sociales/class/chargesociales.class.php
View File

@ -289,7 +289,6 @@ class ChargeSociales extends CommonObject
$this->db->rollback(); $this->db->rollback();
return -1; return -1;
} }
} }

26
htdocs/compta/sociales/class/paymentsocialcontribution.class.php
View File

@ -43,22 +43,22 @@ class PaymentSocialContribution extends CommonObject
public $picto = 'payment'; public $picto = 'payment';
var $fk_charge; public $fk_charge;
var $datec=''; public $datec='';
var $tms=''; public $tms='';
var $datep=''; public $datep='';
/** /**
* @deprecated * @deprecated
* @see amount * @see amount
*/ */
var $total; public $total;
var $amount; // Total amount of payment public $amount; // Total amount of payment
var $amounts=array(); // Array of amounts public $amounts=array(); // Array of amounts
var $fk_typepaiement; public $fk_typepaiement;
var $num_paiement; public $num_paiement;
var $fk_bank; public $fk_bank;
var $fk_user_creat; public $fk_user_creat;
var $fk_user_modif; public $fk_user_modif;
/** /**
* Constructor * Constructor
@ -501,8 +501,6 @@ class PaymentSocialContribution extends CommonObject
$this->fk_bank=''; $this->fk_bank='';
$this->fk_user_creat=''; $this->fk_user_creat='';
$this->fk_user_modif=''; $this->fk_user_modif='';
} }

1
htdocs/contact/canvas/actions_contactcard_common.class.php
View File

@ -318,5 +318,4 @@ abstract class ActionsContactCardCommon
$this->object->country = $langs->trans("Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->label; $this->object->country = $langs->trans("Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->label;
} }
} }
} }

1
htdocs/contact/canvas/default/actions_contactcard_default.class.php
View File

@ -117,7 +117,6 @@ class ActionsContactCardDefault extends ActionsContactCardCommon
{ {
$this->LoadListDatas($limit, $offset, $sortfield, $sortorder); $this->LoadListDatas($limit, $offset, $sortfield, $sortorder);
} }
} }

13
htdocs/contrat/class/api_contracts.class.php
View File

@ -55,13 +55,13 @@ class Contracts extends DolibarrApi
} }
/** /**
* Get properties of a contrat object * Get properties of a contract object
* *
* Return an array with contrat informations * Return an array with contract informations
* *
* @param int $id ID of contract * @param int $id ID of contract
* @return array|mixed data without useless information * @return array|mixed data without useless information
* *
* @throws RestException * @throws RestException
*/ */
function get($id) function get($id)
@ -457,7 +457,7 @@ class Contracts extends DolibarrApi
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
} }
// TODO Check the lineid $lineid is a line of ojbect // TODO Check the lineid $lineid is a line of object
$updateRes = $this->contract->deleteline($lineid, DolibarrApiAccess::$user); $updateRes = $this->contract->deleteline($lineid, DolibarrApiAccess::$user);
if ($updateRes > 0) { if ($updateRes > 0) {
@ -472,7 +472,7 @@ class Contracts extends DolibarrApi
/** /**
* Update contract general fields (won't touch lines of contract) * Update contract general fields (won't touch lines of contract)
* *
* @param int $id Id of contrat to update * @param int $id Id of contract to update
* @param array $request_data Datas * @param array $request_data Datas
* *
* @return int * @return int
@ -537,11 +537,10 @@ class Contracts extends DolibarrApi
'message' => 'Contract deleted' 'message' => 'Contract deleted'
) )
); );
} }
/** /**
* Validate an contract * Validate a contract
* *
* @param int $id Contract ID * @param int $id Contract ID
* @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @param int $notrigger 1=Does not execute triggers, 0= execute triggers

44
htdocs/contrat/class/contrat.class.php
View File

@ -45,22 +45,22 @@ class Contrat extends CommonObject
* @var string ID to identify managed object * @var string ID to identify managed object
*/ */
public $element='contrat'; public $element='contrat';
/** /**
* @var string Name of table without prefix where object is stored * @var string Name of table without prefix where object is stored
*/ */
public $table_element='contrat'; public $table_element='contrat';
public $table_element_line='contratdet'; public $table_element_line='contratdet';
public $fk_element='fk_contrat'; public $fk_element='fk_contrat';
public $picto='contract'; public $picto='contract';
/** /**
* 0=No test on entity, 1=Test with field entity, 2=Test with link by societe * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
* @var int * @var int
*/ */
public $ismultientitymanaged = 1; public $ismultientitymanaged = 1;
/** /**
* 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user
* @var integer * @var integer
@ -241,8 +241,8 @@ class Contrat extends CommonObject
* *
* @param User $user Objet User who activate contract * @param User $user Objet User who activate contract
* @param int $line_id Id of line to activate * @param int $line_id Id of line to activate
* @param int $date Date d'ouverture * @param int $date Opening date
* @param int|string $date_end Date fin prevue * @param int|string $date_end Expected end date
* @param string $comment A comment typed by user * @param string $comment A comment typed by user
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*/ */
@ -264,7 +264,7 @@ class Contrat extends CommonObject
* *
* @param User $user Objet User who close contract * @param User $user Objet User who close contract
* @param int $line_id Id of line to close * @param int $line_id Id of line to close
* @param int $date_end Date end * @param int $date_end End date
* @param string $comment A comment typed by user * @param string $comment A comment typed by user
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*/ */
@ -522,13 +522,12 @@ class Contrat extends CommonObject
$this->db->rollback(); $this->db->rollback();
return -1; return -1;
} }
} }
/** /**
* Unvalidate a contract * Unvalidate a contract
* *
* @param User $user Objet User * @param User $user Object User
* @param int $notrigger 1=Does not execute triggers, 0=execute triggers * @param int $notrigger 1=Does not execute triggers, 0=execute triggers
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*/ */
@ -570,7 +569,7 @@ class Contrat extends CommonObject
// End call triggers // End call triggers
} }
// Set new ref and define current statut // Set new ref and define current status
if (! $error) if (! $error)
{ {
$this->statut=0; $this->statut=0;
@ -668,7 +667,7 @@ class Contrat extends CommonObject
$this->db->free($resql); $this->db->free($resql);
// Retreive all extrafield // Retreive all extrafields
// fetch optionals attributes and labels // fetch optionals attributes and labels
$this->fetch_optionals(); $this->fetch_optionals();
@ -701,7 +700,6 @@ class Contrat extends CommonObject
$this->error=$this->db->error(); $this->error=$this->db->error();
return -1; return -1;
} }
} }
/** /**
@ -732,7 +730,7 @@ class Contrat extends CommonObject
$this->lines=array(); $this->lines=array();
$pos = 0; $pos = 0;
// Selectionne les lignes contrats liees a un produit // Selects contract lines related to a product
$sql = "SELECT p.label as product_label, p.description as product_desc, p.ref as product_ref,"; $sql = "SELECT p.label as product_label, p.description as product_desc, p.ref as product_ref,";
$sql.= " d.rowid, d.fk_contrat, d.statut, d.description, d.price_ht, d.vat_src_code, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.localtax1_type, d.localtax2_type, d.qty, d.remise_percent, d.subprice, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht,"; $sql.= " d.rowid, d.fk_contrat, d.statut, d.description, d.price_ht, d.vat_src_code, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.localtax1_type, d.localtax2_type, d.qty, d.remise_percent, d.subprice, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht,";
$sql.= " d.total_ht,"; $sql.= " d.total_ht,";
@ -766,7 +764,7 @@ class Contrat extends CommonObject
$line->id = $objp->rowid; $line->id = $objp->rowid;
$line->ref = $objp->rowid; $line->ref = $objp->rowid;
$line->fk_contrat = $objp->fk_contrat; $line->fk_contrat = $objp->fk_contrat;
$line->desc = $objp->description; // Description ligne $line->desc = $objp->description; // Description line
$line->qty = $objp->qty; $line->qty = $objp->qty;
$line->vat_src_code = $objp->vat_src_code ; $line->vat_src_code = $objp->vat_src_code ;
$line->tva_tx = $objp->tva_tx; $line->tva_tx = $objp->tva_tx;
@ -797,9 +795,9 @@ class Contrat extends CommonObject
$line->fk_unit = $objp->fk_unit; $line->fk_unit = $objp->fk_unit;
$line->ref = $objp->product_ref; // deprecated $line->ref = $objp->product_ref; // deprecated
$line->product_ref = $objp->product_ref; // Ref product $line->product_ref = $objp->product_ref; // Product Ref
$line->product_desc = $objp->product_desc; // Description product $line->product_desc = $objp->product_desc; // Product Description
$line->product_label = $objp->product_label; // Label product $line->product_label = $objp->product_label; // Product Label
$line->description = $objp->description; $line->description = $objp->description;
@ -817,7 +815,7 @@ class Contrat extends CommonObject
$line->date_fin_prevue = $this->db->jdate($objp->date_fin_validite); $line->date_fin_prevue = $this->db->jdate($objp->date_fin_validite);
$line->date_fin_reel = $this->db->jdate($objp->date_cloture); $line->date_fin_reel = $this->db->jdate($objp->date_cloture);
// Retreive all extrafield for contract // Retreive all extrafields for contract
// fetch optionals attributes and labels // fetch optionals attributes and labels
$line->fetch_optionals(); $line->fetch_optionals();
@ -923,7 +921,7 @@ class Contrat extends CommonObject
$modCodeContract = new $module(); $modCodeContract = new $module();
if (!empty($modCodeContract->code_auto)) { if (!empty($modCodeContract->code_auto)) {
// Mise a jour ref // Update ref
$sql = 'UPDATE '.MAIN_DB_PREFIX."contrat SET ref='(PROV".$this->id.")' WHERE rowid=".$this->id; $sql = 'UPDATE '.MAIN_DB_PREFIX."contrat SET ref='(PROV".$this->id.")' WHERE rowid=".$this->id;
if ($this->db->query($sql)) if ($this->db->query($sql))
{ {
@ -947,14 +945,14 @@ class Contrat extends CommonObject
} }
} }
// Insert contacts commerciaux ('SALESREPSIGN','contrat') // Insert business contacts ('SALESREPSIGN','contrat')
if (! $error) if (! $error)
{ {
$result=$this->add_contact($this->commercial_signature_id,'SALESREPSIGN','internal'); $result=$this->add_contact($this->commercial_signature_id,'SALESREPSIGN','internal');
if ($result < 0) $error++; if ($result < 0) $error++;
} }
// Insert contacts commerciaux ('SALESREPFOLL','contrat') // Insert business contacts ('SALESREPFOLL','contrat')
if (! $error) if (! $error)
{ {
$result=$this->add_contact($this->commercial_suivi_id,'SALESREPFOLL','internal'); $result=$this->add_contact($this->commercial_suivi_id,'SALESREPFOLL','internal');
@ -2473,7 +2471,7 @@ class ContratLigne extends CommonObjectLine
* @var string ID to identify managed object * @var string ID to identify managed object
*/ */
public $element='contratdet'; public $element='contratdet';
/** /**
* @var string Name of table without prefix where object is stored * @var string Name of table without prefix where object is stored
*/ */
@ -2483,7 +2481,7 @@ class ContratLigne extends CommonObjectLine
* @var int ID * @var int ID
*/ */
public $id; public $id;
var $ref; var $ref;
var $tms; var $tms;

1
htdocs/core/boxes/box_actions.php
View File

@ -260,6 +260,5 @@ class box_actions extends ModeleBoxes
return ''; return '';
} }
} }

1
htdocs/core/boxes/box_bookmarks.php
View File

@ -161,6 +161,5 @@ class box_bookmarks extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

2
htdocs/core/boxes/box_clients.php
View File

@ -163,7 +163,6 @@ class box_clients extends ModeleBoxes
'text' => $langs->trans("ReadPermissionNotAllowed") 'text' => $langs->trans("ReadPermissionNotAllowed")
); );
} }
} }
/** /**
@ -178,6 +177,5 @@ class box_clients extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

1
htdocs/core/boxes/box_commandes.php
View File

@ -202,6 +202,5 @@ class box_commandes extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

2
htdocs/core/boxes/box_comptes.php
View File

@ -174,7 +174,6 @@ class box_comptes extends ModeleBoxes
'text' => $langs->trans("ReadPermissionNotAllowed") 'text' => $langs->trans("ReadPermissionNotAllowed")
); );
} }
} }
/** /**
@ -189,6 +188,5 @@ class box_comptes extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

1
htdocs/core/boxes/box_contacts.php
View File

@ -189,6 +189,5 @@ class box_contacts extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

1
htdocs/core/boxes/box_contracts.php
View File

@ -185,6 +185,5 @@ class box_contracts extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

1
htdocs/core/boxes/box_external_rss.php
View File

@ -198,6 +198,5 @@ class box_external_rss extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

1
htdocs/core/boxes/box_factures.php
View File

@ -206,5 +206,4 @@ class box_factures extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

1
htdocs/core/boxes/box_factures_fourn.php
View File

@ -218,6 +218,5 @@ class box_factures_fourn extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

2
htdocs/core/boxes/box_factures_fourn_imp.php
View File

@ -191,7 +191,6 @@ class box_factures_fourn_imp extends ModeleBoxes
'text' => $langs->trans("ReadPermissionNotAllowed") 'text' => $langs->trans("ReadPermissionNotAllowed")
); );
} }
} }
/** /**
@ -206,6 +205,5 @@ class box_factures_fourn_imp extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

1
htdocs/core/boxes/box_factures_imp.php
View File

@ -209,5 +209,4 @@ class box_factures_imp extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

1
htdocs/core/boxes/box_ficheinter.php
View File

@ -170,6 +170,5 @@ class box_ficheinter extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

2
htdocs/core/boxes/box_fournisseurs.php
View File

@ -150,7 +150,6 @@ class box_fournisseurs extends ModeleBoxes
'text' => $langs->trans("ReadPermissionNotAllowed") 'text' => $langs->trans("ReadPermissionNotAllowed")
); );
} }
} }
/** /**
@ -165,6 +164,5 @@ class box_fournisseurs extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

1
htdocs/core/boxes/box_goodcustomers.php
View File

@ -159,7 +159,6 @@ class box_goodcustomers extends ModeleBoxes
'text' => $langs->trans("ReadPermissionNotAllowed") 'text' => $langs->trans("ReadPermissionNotAllowed")
); );
} }
} }
/** /**

1
htdocs/core/boxes/box_graph_invoices_permonth.php
View File

@ -280,6 +280,5 @@ class box_graph_invoices_permonth extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

1
htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
View File

@ -279,6 +279,5 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

1
htdocs/core/boxes/box_graph_orders_permonth.php
View File

@ -278,6 +278,5 @@ class box_graph_orders_permonth extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

1
htdocs/core/boxes/box_graph_orders_supplier_permonth.php
View File

@ -277,6 +277,5 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

2
htdocs/core/boxes/box_graph_product_distribution.php
View File

@ -401,7 +401,6 @@ class box_graph_product_distribution extends ModeleBoxes
'text' => $mesg 'text' => $mesg
); );
} }
} }
/** /**
@ -416,6 +415,5 @@ class box_graph_product_distribution extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

1
htdocs/core/boxes/box_graph_propales_permonth.php
View File

@ -281,6 +281,5 @@ class box_graph_propales_permonth extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

1
htdocs/core/boxes/box_lastlogin.php
View File

@ -98,7 +98,6 @@ class box_lastlogin extends ModeleBoxes
'td' => '', 'td' => '',
'text' => $tmp, 'text' => $tmp,
); );
} }

2
htdocs/core/boxes/box_members.php
View File

@ -168,7 +168,6 @@ class box_members extends ModeleBoxes
'text' => $langs->trans("ReadPermissionNotAllowed") 'text' => $langs->trans("ReadPermissionNotAllowed")
); );
} }
} }
/** /**
@ -183,6 +182,5 @@ class box_members extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

1
htdocs/core/boxes/box_produits.php
View File

@ -230,6 +230,5 @@ class box_produits extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

1
htdocs/core/boxes/box_produits_alerte_stock.php
View File

@ -242,6 +242,5 @@ class box_produits_alerte_stock extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

1
htdocs/core/boxes/box_project.php
View File

@ -184,7 +184,6 @@ class box_project extends ModeleBoxes
'td' => '', 'td' => '',
'text' => "&nbsp;", 'text' => "&nbsp;",
); );
} }
/** /**

1
htdocs/core/boxes/box_propales.php
View File

@ -192,6 +192,5 @@ class box_propales extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

1
htdocs/core/boxes/box_prospect.php
View File

@ -180,6 +180,5 @@ class box_prospect extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

2
htdocs/core/boxes/box_services_contracts.php
View File

@ -222,7 +222,6 @@ class box_services_contracts extends ModeleBoxes
'text' => $langs->trans("ReadPermissionNotAllowed") 'text' => $langs->trans("ReadPermissionNotAllowed")
); );
} }
} }
/** /**
@ -237,6 +236,5 @@ class box_services_contracts extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

3
htdocs/core/boxes/box_services_expired.php
View File

@ -184,6 +184,5 @@ class box_services_expired extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
}
}

1
htdocs/core/boxes/box_supplier_orders.php
View File

@ -188,6 +188,5 @@ class box_supplier_orders extends ModeleBoxes
{ {
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
} }
} }

1
htdocs/core/boxes/box_task.php
View File

@ -137,7 +137,6 @@ class box_task extends ModeleBoxes
$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totalplannedtot,'all',25200,5)); $this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totalplannedtot,'all',25200,5));
$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totaldurationtot,'all',25200,5)); $this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totaldurationtot,'all',25200,5));
$this->info_box_contents[$i][] = array('td' => '', 'text' => ""); $this->info_box_contents[$i][] = array('td' => '', 'text' => "");
} }
/** /**

4
htdocs/core/boxes/modules_boxes.php
View File

@ -31,7 +31,7 @@
* *
* Boxes parent class * Boxes parent class
*/ */
class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" boxes class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" boxes
{ {
/** /**
* @var DoliDB Database handler * @var DoliDB Database handler
@ -503,8 +503,6 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty"
} }
return $widget; return $widget;
} }
} }

1
htdocs/core/class/CMailFile.class.php
View File

@ -471,7 +471,6 @@ class CMailFile
// -------------------------------------- // --------------------------------------
$this->error = 'Bad value for sendmode'; $this->error = 'Bad value for sendmode';
} }
} }

1
htdocs/core/class/CSMSFile.class.php
View File

@ -246,5 +246,4 @@ class CSMSFile
@chmod($outputfile, octdec($conf->global->MAIN_UMASK)); @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
} }
} }
} }

1
htdocs/core/class/antivir.class.php
View File

@ -180,5 +180,4 @@ class AntiVir
return $ret; return $ret;
} }
} }

1
htdocs/core/class/canvas.class.php
View File

@ -210,5 +210,4 @@ class Canvas
return $ret; return $ret;
} }
} }
} }

1
htdocs/core/class/ccountry.class.php
View File

@ -333,5 +333,4 @@ class Ccountry // extends CommonObject
return 1; return 1;
} }
} }
} }

1
htdocs/core/class/commondocgenerator.class.php
View File

@ -778,7 +778,6 @@ abstract class CommonDocGenerator
} }
return $array_to_fill; return $array_to_fill;
} }

4
htdocs/core/class/commonobject.class.php
View File

@ -1069,7 +1069,6 @@ abstract class CommonObject
dol_print_error($this->db); dol_print_error($this->db);
return -1; return -1;
} }
} }
/** /**
@ -2041,7 +2040,6 @@ abstract class CommonObject
$this->db->commit(); $this->db->commit();
return 1; return 1;
} }
} }
@ -4650,7 +4648,6 @@ abstract class CommonObject
if (isset($conf->global->$keyforfieldname)) return $conf->global->$keyforfieldname; if (isset($conf->global->$keyforfieldname)) return $conf->global->$keyforfieldname;
// TODO Ad here a scan into table llx_overwrite_default with a filter on $this->element and $fieldname // TODO Ad here a scan into table llx_overwrite_default with a filter on $this->element and $fieldname
} }
@ -7274,5 +7271,4 @@ abstract class CommonObject
{ {
return count($this->comments); return count($this->comments);
} }
} }

1
htdocs/core/class/commonorder.class.php
View File

@ -144,6 +144,5 @@ abstract class CommonOrderLine extends CommonObjectLine
public $info_bits = 0; public $info_bits = 0;
public $special_code = 0; public $special_code = 0;
} }

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