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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2014-09-27 14:51:41 +02:00
commit e1ba6ccfc6
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/projet/activity/list.php
View File

@ -131,10 +131,6 @@ $tasksrole=$taskstatic->getUserRolesForProjectsOrTasks(0,$user,($project->id?$pr
//var_dump($taskrole); //var_dump($taskrole);
llxHeader("",$title,"");
llxHeader("",$title,""); llxHeader("",$title,"");
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num); print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num);

2
htdocs/webservices/server_invoice.php
View File

@ -528,7 +528,7 @@ function createInvoice($authentication,$invoice)
{ {
// $key can be 'line' or '0','1',... // $key can be 'line' or '0','1',...
$newline=new FactureLigne($db); $newline=new FactureLigne($db);
$newline->type=$line['type']; $newline->product_type=$line['type'];
$newline->desc=$line['desc']; $newline->desc=$line['desc'];
$newline->fk_product=$line['fk_product']; $newline->fk_product=$line['fk_product'];
$newline->tva_tx=$line['vat_rate']; $newline->tva_tx=$line['vat_rate'];