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

Merge remote-tracking branch 'origin/3.6' into develop

Browse Source 
Conflicts:
	htdocs/projet/activity/list.php
This commit is contained in:
Laurent Destailleur 2014-09-26 13:34:31 +02:00
commit a3436135c9
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,6 +127,9 @@ if ($id)
$tasksarray=$taskstatic->getTasksArray(0,0,($project->id?$project->id:$projectsListId),$socid,0); // We want to see all task of project i am allowed to see, not only mine. Later only mine will be editable later.
$projectsrole=$taskstatic->getUserRolesForProjectsOrTasks($user,0,($project->id?$project->id:$projectsListId),0);
$tasksrole=$taskstatic->getUserRolesForProjectsOrTasks(0,$user,($project->id?$project->id:$projectsListId),0);
//var_dump($tasksarray);
//var_dump($projectsrole);
//var_dump($taskrole);
llxHeader("",$title,"");

2
htdocs/webservices/server_invoice.php
View File

@ -532,7 +532,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'];