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

Fix travis

Browse Source
This commit is contained in:
John Botella 2019-06-24 14:36:06 +02:00
parent 9c414a7a57
commit ec7446762c
7 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4213,7 +4213,6 @@ elseif ($id > 0 || ! empty($ref))
} }
print '</td></tr>'; print '</td></tr>';
} }
} }

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

@ -4387,8 +4387,8 @@ class Facture extends CommonInvoice
/** /**
* @return number or -1 if not available * @return number or -1 if not available
*/ */
function getRetainedWarrantyAmount() { public function getRetainedWarrantyAmount()
{
if(empty($this->retained_warranty) ){ if(empty($this->retained_warranty) ){
return -1; return -1;
} }
@ -4425,7 +4425,6 @@ class Facture extends CommonInvoice
else{ else{
return -1; return -1;
} }
} }
else else
{ {
@ -4442,7 +4441,7 @@ class Facture extends CommonInvoice
* @param float $value value of retained warranty * @param float $value value of retained warranty
* @return int >0 if OK, <0 if KO * @return int >0 if OK, <0 if KO
*/ */
function setRetainedWarranty($value) public function setRetainedWarranty($value)
{ {
dol_syslog(get_class($this).'::setRetainedWarranty('.$value.')'); dol_syslog(get_class($this).'::setRetainedWarranty('.$value.')');
if ($this->statut >= 0) if ($this->statut >= 0)
@ -4476,17 +4475,18 @@ class Facture extends CommonInvoice
/** /**
* Change the retained_warranty_date_limit * Change the retained_warranty_date_limit
* *
* @param timestamp $value value of retained warranty * @param int $timestamp date limit of retained warranty in timestamp format
* @param string $dateYmd date limit of retained warranty in Y m d format
* @return int >0 if OK, <0 if KO * @return int >0 if OK, <0 if KO
*/ */
function setRetainedWarrantyDateLimit($timestamp,$dateYmd=false) public function setRetainedWarrantyDateLimit($timestamp, $dateYmd = false)
{ {
if(!$timestamp && $dateYmd){ if(!$timestamp && $dateYmd){
$timestamp = $this->db->jdate($dateYmd); $timestamp = $this->db->jdate($dateYmd);
} }
dol_syslog(get_class($this).'::setRetainedWarrantyDateLimit('.$value.')'); dol_syslog(get_class($this).'::setRetainedWarrantyDateLimit('.$timestamp.')');
if ($this->statut >= 0) if ($this->statut >= 0)
{ {
$fieldname = 'retained_warranty_date_limit'; $fieldname = 'retained_warranty_date_limit';

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

@ -2059,7 +2059,7 @@ abstract class CommonObject
* @param int $id Id of new payment terms * @param int $id Id of new payment terms
* @return int >0 if OK, <0 if KO * @return int >0 if OK, <0 if KO
*/ */
function setRetainedWarrantyPaymentTerms($id) public function setRetainedWarrantyPaymentTerms($id)
{ {
dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms('.$id.')'); dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms('.$id.')');
if ($this->statut >= 0 || $this->element == 'societe') if ($this->statut >= 0 || $this->element == 'societe')

1
htdocs/core/lib/pdf.lib.php
View File

@ -2216,7 +2216,6 @@ function pdf_getSizeForImage($realpath)
* @param int $hidedetails Hide details (0=no, 1=yes, 2=just special lines) * @param int $hidedetails Hide details (0=no, 1=yes, 2=just special lines)
* @return string Return total of line excl tax * @return string Return total of line excl tax
*/ */
function pdfGetLineTotalDiscountAmount($object, $i, $outputlangs, $hidedetails = 0) function pdfGetLineTotalDiscountAmount($object, $i, $outputlangs, $hidedetails = 0)
{ {
global $conf, $hookmanager; global $conf, $hookmanager;

2
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
View File

@ -1349,6 +1349,8 @@ class pdf_crabe extends ModelePDFFactures
// Retained warranty // Retained warranty
if( !empty($object->situation_final) && ( $object->type == Facture::TYPE_SITUATION && (!empty($object->retained_warranty) ) ) ) if( !empty($object->situation_final) && ( $object->type == Facture::TYPE_SITUATION && (!empty($object->retained_warranty) ) ) )
{ {
$displayWarranty = false;
// Check if this situation invoice is 100% for real // Check if this situation invoice is 100% for real
if(!empty($object->lines)){ if(!empty($object->lines)){
$displayWarranty = true; $displayWarranty = true;

2
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
View File

@ -1306,7 +1306,6 @@ class pdf_sponge extends ModelePDFFactures
$posy += $tab2_hl; $posy += $tab2_hl;
$pdf->setY($posy); $pdf->setY($posy);
} }
// Display curent total // Display curent total
@ -1637,6 +1636,7 @@ class pdf_sponge extends ModelePDFFactures
if( !empty($object->situation_final) && ( $object->type == Facture::TYPE_SITUATION && (!empty($object->retained_warranty) ) ) ) if( !empty($object->situation_final) && ( $object->type == Facture::TYPE_SITUATION && (!empty($object->retained_warranty) ) ) )
{ {
$displayWarranty = false; $displayWarranty = false;
// Check if this situation invoice is 100% for real // Check if this situation invoice is 100% for real
if(!empty($object->situation_final)){ if(!empty($object->situation_final)){
$displayWarranty = true; $displayWarranty = true;