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

Fix travis

Browse Source
This commit is contained in:
Laurent Destailleur 2017-11-22 21:36:01 +01:00
parent b0cecab22b
commit 5a2fe13958
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -962,7 +962,6 @@ class Facture extends CommonInvoice
* @param User $user Object user * @param User $user Object user
* @return int <0 if KO, 0 if nothing done, 1 if OK * @return int <0 if KO, 0 if nothing done, 1 if OK
*/ */
function createFromOrder($object, User $user) function createFromOrder($object, User $user)
{ {
global $hookmanager; global $hookmanager;
@ -1001,9 +1000,9 @@ class Facture extends CommonInvoice
$line->special_code = $object->lines[$i]->special_code; $line->special_code = $object->lines[$i]->special_code;
$line->fk_parent_line = $object->lines[$i]->fk_parent_line; $line->fk_parent_line = $object->lines[$i]->fk_parent_line;
$line->fk_unit = $object->lines[$i]->fk_unit; $line->fk_unit = $object->lines[$i]->fk_unit;
$line->date_start = $object->lines[$i]->date_start; $line->date_start = $object->lines[$i]->date_start;
+ $line->date_end = $object->lines[$i]->date_end; + $line->date_end = $object->lines[$i]->date_end;
$line->fk_fournprice = $object->lines[$i]->fk_fournprice; $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); $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]; $line->pa_ht = $marginInfos[0];

2
htdocs/core/class/html.form.class.php
View File

@ -1651,7 +1651,7 @@ class Form
* @param int $showproperties Show properties of each attendees * @param int $showproperties Show properties of each attendees
* @param array $listofuserid Array with properties of each user * @param array $listofuserid Array with properties of each user
* @param array $listofcontactid Array with properties of each contact * @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 * @return string HTML select string
* @see select_dolgroups * @see select_dolgroups
*/ */