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

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2017-01-16 01:12:11 +01:00
commit 9d72f1df62
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -12,7 +12,7 @@ php:
- '5.5'
- '5.6'
- '7.0'
- '7.1'
#- '7.1'
- nightly
addons:

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

@ -483,7 +483,7 @@ class pdf_einstein extends ModelePDFCommandes
$this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
if (! isset($this->tva[$vatrate])) $this->tva[$vatrate]='';
if (! isset($this->tva[$vatrate])) $this->tva[$vatrate]=0;
$this->tva[$vatrate] += $tvaligne;
// Add line

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

@ -585,7 +585,7 @@ class pdf_crabe extends ModelePDFFactures
$this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
if (! isset($this->tva[$vatrate])) $this->tva[$vatrate]='';
if (! isset($this->tva[$vatrate])) $this->tva[$vatrate]=0;
$this->tva[$vatrate] += $tvaligne;
if ($posYAfterImage > $posYAfterDescription) $nexY=$posYAfterImage;

2
htdocs/core/modules/project/doc/pdf_baleine.modules.php
View File

@ -223,7 +223,7 @@ class pdf_baleine extends ModelePDFProjects
$progress=$object->lines[$i]->progress.'%';
$datestart=dol_print_date($object->lines[$i]->date_start,'day');
$dateend=dol_print_date($object->lines[$i]->date_end,'day');
$planned_workload=convertSecondToTime($object->lines[$i]->planned_workload,'allhourmin');
$planned_workload=convertSecondToTime((int) $object->lines[$i]->planned_workload,'allhourmin');
$pdf->SetFont('','', $default_font_size - 1); // Dans boucle pour gerer multi-page

2
htdocs/core/modules/propale/doc/pdf_azur.modules.php
View File

@ -582,7 +582,7 @@ class pdf_azur extends ModelePDFPropales
$this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
if (! isset($this->tva[$vatrate])) $this->tva[$vatrate]='';
if (! isset($this->tva[$vatrate])) $this->tva[$vatrate]=0;
$this->tva[$vatrate] += $tvaligne;
if ($posYAfterImage > $posYAfterDescription) $nexY=$posYAfterImage;

4
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
View File

@ -170,7 +170,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
{
$object->fetch_thirdparty();
$deja_regle = "";
$deja_regle = 0;
$amount_credit_notes_included = 0;
$amount_deposits_included = 0;
//$amount_credit_notes_included = $object->getSumCreditNotesUsed();
@ -466,7 +466,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
if (! isset($this->tva[$vatrate])) $this->tva[$vatrate]='';
if (! isset($this->tva[$vatrate])) $this->tva[$vatrate]=0;
$this->tva[$vatrate] += $tvaligne;

2
htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
View File

@ -489,7 +489,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
$this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
if (! isset($this->tva[$vatrate])) $this->tva[$vatrate]='';
if (! isset($this->tva[$vatrate])) $this->tva[$vatrate]=0;
$this->tva[$vatrate] += $tvaligne;
if ($posYAfterImage > $posYAfterDescription) $nexY=$posYAfterImage;