From 5a2fe13958e86134ddefeaf1c442843bc0d475da Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 22 Nov 2017 21:36:01 +0100 Subject: [PATCH] Fix travis --- htdocs/compta/facture/class/facture.class.php | 7 +++---- htdocs/core/class/html.form.class.php | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 0f96e1e3ce2..c32a8c2a54b 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -962,7 +962,6 @@ class Facture extends CommonInvoice * @param User $user Object user * @return int <0 if KO, 0 if nothing done, 1 if OK */ - function createFromOrder($object, User $user) { global $hookmanager; @@ -1001,9 +1000,9 @@ class Facture extends CommonInvoice $line->special_code = $object->lines[$i]->special_code; $line->fk_parent_line = $object->lines[$i]->fk_parent_line; $line->fk_unit = $object->lines[$i]->fk_unit; - $line->date_start = $object->lines[$i]->date_start; -+ $line->date_end = $object->lines[$i]->date_end; - + $line->date_start = $object->lines[$i]->date_start; ++ $line->date_end = $object->lines[$i]->date_end; + $line->fk_fournprice = $object->lines[$i]->fk_fournprice; $marginInfos = getMarginInfos($object->lines[$i]->subprice, $object->lines[$i]->remise_percent, $object->lines[$i]->tva_tx, $object->lines[$i]->localtax1_tx, $object->lines[$i]->localtax2_tx, $object->lines[$i]->fk_fournprice, $object->lines[$i]->pa_ht); $line->pa_ht = $marginInfos[0]; diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 88b40bb4734..157840e0e14 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -1651,7 +1651,7 @@ class Form * @param int $showproperties Show properties of each attendees * @param array $listofuserid Array with properties of each user * @param array $listofcontactid Array with properties of each contact - * @param array $listofother Array with properties of each other contact + * @param array $listofotherid Array with properties of each other contact * @return string HTML select string * @see select_dolgroups */