diff --git a/htdocs/projet/activity/list.php b/htdocs/projet/activity/list.php index 89e23bf6a07c6f6b053bde6db80c2864328c6b24..430970c981dc7ef28f1f9875cbbd5f9b22c2f52d 100644 --- a/htdocs/projet/activity/list.php +++ b/htdocs/projet/activity/list.php @@ -131,10 +131,6 @@ $tasksrole=$taskstatic->getUserRolesForProjectsOrTasks(0,$user,($project->id?$pr //var_dump($taskrole); - -llxHeader("",$title,""); - - llxHeader("",$title,""); print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num); diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php index c59544aa3f8badb3a36003bf37cafd4e492e984a..5794a90a297337fb3b9bee7b77cf000524b74b95 100644 --- a/htdocs/webservices/server_invoice.php +++ b/htdocs/webservices/server_invoice.php @@ -528,7 +528,7 @@ function createInvoice($authentication,$invoice) { // $key can be 'line' or '0','1',... $newline=new FactureLigne($db); - $newline->type=$line['type']; + $newline->product_type=$line['type']; $newline->desc=$line['desc']; $newline->fk_product=$line['fk_product']; $newline->tva_tx=$line['vat_rate'];