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

Merge pull request #5221 from atm-florian/dev_fixwarning

Browse Source 
FIX : php strict warning
This commit is contained in:
Laurent Destailleur 2016-05-18 13:58:08 +02:00
commit 7e66a4cd1d
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/modules/commande/doc/pdf_proforma.modules.php
View File

@ -66,7 +66,7 @@ class pdf_proforma extends pdf_einstein
* @param Translate $outputlangs Object lang for output * @param Translate $outputlangs Object lang for output
* @return void * @return void
*/ */
function _pagehead(&$pdf, $object, $showaddress, $outputlangs) function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $titlekey="InvoiceProForma")
{ {
global $conf,$langs,$hookmanager; global $conf,$langs,$hookmanager;

8
htdocs/core/modules/modExpedition.class.php
View File

@ -224,7 +224,13 @@ class modExpedition extends DolibarrModules
include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
$shipment=new Commande($this->db); $shipment=new Commande($this->db);
$idcontacts=join(',',array_keys($shipment->liste_type_contact('external','',0,0,''))); $contact_arrays=$shipment->liste_type_contact('external','',0,0,'');
if (is_array($contact_arrays) && count($contact_arrays)>0){
$idcontacts=join(',',array_keys($shipment->liste_type_contact('external','',0,0,'')));
} else {
$idcontacts=0;
}
$r++; $r++;
$this->export_code[$r]=$this->rights_class.'_'.$r; $this->export_code[$r]=$this->rights_class.'_'.$r;

6
htdocs/societe/class/companybankaccount.class.php
View File

@ -64,7 +64,7 @@ class CompanyBankAccount extends Account
* @param User $user User * @param User $user User
* @return int <0 if KO, >= 0 if OK * @return int <0 if KO, >= 0 if OK
*/ */
function create($user='') function create(User $user = null)
{ {
$now=dol_now(); $now=dol_now();
@ -102,7 +102,7 @@ class CompanyBankAccount extends Account
* @param User $user Object user * @param User $user Object user
* @return int <=0 if KO, >0 if OK * @return int <=0 if KO, >0 if OK
*/ */
function update($user='') function update(User $user = null)
{ {
global $conf; global $conf;
@ -205,7 +205,7 @@ class CompanyBankAccount extends Account
* @param User $user User deleting * @param User $user User deleting
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*/ */
function delete($user='') function delete(User $user = null)
{ {
global $conf; global $conf;