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

Merge branch 'marcosgdf-bug-1731' into 3.6

Browse Source
This commit is contained in:
Laurent Destailleur 2014-12-25 23:21:55 +01:00
commit 6c67df0698
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -17,6 +17,7 @@ English Dolibarr ChangeLog
- Fix: [ bug #1624 ] Use lowest buying price for margin when selling with POS - Fix: [ bug #1624 ] Use lowest buying price for margin when selling with POS
- Fix: [ bug #1749 ] Undefined $mailchimp - Fix: [ bug #1749 ] Undefined $mailchimp
- Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks - Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks
- Fix: [ bug #1731 ] Can't use quick navigation on project tasks secondary tabs
***** ChangeLog for 3.6.1 compared to 3.6.* ***** ***** ChangeLog for 3.6.1 compared to 3.6.* *****
For users: For users:

10
htdocs/projet/tasks/contact.php
View File

@ -57,7 +57,7 @@ $projectstatic = new Project($db);
// Add new contact // Add new contact
if ($action == 'addcontact' && $user->rights->projet->creer) if ($action == 'addcontact' && $user->rights->projet->creer)
{ {
$result = $object->fetch($id); $result = $object->fetch($id, $ref);
if ($result > 0 && $id > 0) if ($result > 0 && $id > 0)
{ {
@ -87,7 +87,7 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
// bascule du statut d'un contact // bascule du statut d'un contact
if ($action == 'swapstatut' && $user->rights->projet->creer) if ($action == 'swapstatut' && $user->rights->projet->creer)
{ {
if ($object->fetch($id)) if ($object->fetch($id, $ref))
{ {
$result=$object->swapContactStatus(GETPOST('ligne')); $result=$object->swapContactStatus(GETPOST('ligne'));
} }
@ -100,7 +100,7 @@ if ($action == 'swapstatut' && $user->rights->projet->creer)
// Efface un contact // Efface un contact
if ($action == 'deleteline' && $user->rights->projet->creer) if ($action == 'deleteline' && $user->rights->projet->creer)
{ {
$object->fetch($id); $object->fetch($id, $ref);
$result = $object->delete_contact($_GET["lineid"]); $result = $object->delete_contact($_GET["lineid"]);
if ($result >= 0) if ($result >= 0)
@ -152,7 +152,7 @@ $userstatic = new User($db);
if ($id > 0 || ! empty($ref)) if ($id > 0 || ! empty($ref))
{ {
if ($object->fetch($id) > 0) if ($object->fetch($id, $ref) > 0)
{ {
$result=$projectstatic->fetch($object->fk_project); $result=$projectstatic->fetch($object->fk_project);
if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid); if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid);
@ -245,7 +245,7 @@ if ($id > 0 || ! empty($ref))
$object->next_prev_filter=" fk_projet in (".$projectsListId.")"; $object->next_prev_filter=" fk_projet in (".$projectsListId.")";
} }
else $object->next_prev_filter=" fk_projet = ".$projectstatic->id; else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
print $form->showrefnav($object,'id',$linkback,1,'rowid','ref','',$param); print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','',$param);
print '</td></tr>'; print '</td></tr>';
// Label // Label

2
htdocs/projet/tasks/document.php
View File

@ -209,7 +209,7 @@ if ($object->id > 0)
$object->next_prev_filter=" fk_projet in (".$projectsListId.")"; $object->next_prev_filter=" fk_projet in (".$projectsListId.")";
} }
else $object->next_prev_filter=" fk_projet = ".$projectstatic->id; else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
print $form->showrefnav($object,'id',$linkback,1,'rowid','ref','',$param); print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','',$param);
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';

2
htdocs/projet/tasks/note.php
View File

@ -181,7 +181,7 @@ if ($object->id > 0)
$object->next_prev_filter=" fk_projet in (".$projectsListId.")"; $object->next_prev_filter=" fk_projet in (".$projectsListId.")";
} }
else $object->next_prev_filter=" fk_projet = ".$projectstatic->id; else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
print $form->showrefnav($object,'id',$linkback,1,'rowid','ref','',$param); print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','',$param);
print '</td></tr>'; print '</td></tr>';
// Label // Label

8
htdocs/projet/tasks/time.php
View File

@ -72,7 +72,7 @@ if ($action == 'addtimespent' && $user->rights->projet->creer)
if (! $error) if (! $error)
{ {
$object->fetch($id); $object->fetch($id, $ref);
$object->timespent_note = $_POST["timespent_note"]; $object->timespent_note = $_POST["timespent_note"];
$object->timespent_duration = $_POST["timespent_durationhour"]*60*60; // We store duration in seconds $object->timespent_duration = $_POST["timespent_durationhour"]*60*60; // We store duration in seconds
@ -109,7 +109,7 @@ if ($action == 'updateline' && ! $_POST["cancel"] && $user->rights->projet->cree
if (! $error) if (! $error)
{ {
$object->fetch($id); $object->fetch($id, $ref);
$object->timespent_id = $_POST["lineid"]; $object->timespent_id = $_POST["lineid"];
$object->timespent_note = $_POST["timespent_note_line"]; $object->timespent_note = $_POST["timespent_note_line"];
@ -183,7 +183,7 @@ if ($id > 0 || ! empty($ref))
/* /*
* Fiche projet en mode visu * Fiche projet en mode visu
*/ */
if ($object->fetch($id) >= 0) if ($object->fetch($id, $ref) >= 0)
{ {
$result=$projectstatic->fetch($object->fk_project); $result=$projectstatic->fetch($object->fk_project);
if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid); if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid);
@ -277,7 +277,7 @@ if ($id > 0 || ! empty($ref))
$object->next_prev_filter=" fk_projet in (".$projectsListId.")"; $object->next_prev_filter=" fk_projet in (".$projectsListId.")";
} }
else $object->next_prev_filter=" fk_projet = ".$projectstatic->id; else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
print $form->showrefnav($object,'id',$linkback,1,'rowid','ref','',$param); print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','',$param);
print '</td></tr>'; print '</td></tr>';
// Label // Label