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

Merge branch 'bug-1925' of https://github.com/marcosgdf/dolibarr into

Browse Source 
marcosgdf-bug-1925

Conflicts:
	ChangeLog
This commit is contained in:
Laurent Destailleur 2015-07-19 15:31:02 +02:00
commit dafe0a37cf
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -14,6 +14,7 @@ FIX [ bug #1852 ] JS error when editing a customer order line
FIX [ bug #2900 ] Courtesy title is not stored in create thirdparty form
FIX [ bug #3055 ] Product image thumbnails were not deleted after deleting the image
FIX [ bug 1634 ] Error deleting a project when it had many linked objects
FIX [ bug 1925 ] "Link to order" option in supplier invoices is not working properly
***** ChangeLog for 3.7.1 compared to 3.7.* *****
FIX Bug in the new photo system

2
htdocs/fourn/facture/card.php
View File

@ -824,7 +824,7 @@ elseif ($action == 'reopen' && $user->rights->fournisseur->facture->creer)
if (GETPOST('linkedOrder')) {
$object->fetch($id);
$object->fetch_thirdparty();
$result = $object->add_object_linked('commande', GETPOST('linkedOrder'));
$result = $object->add_object_linked('order_supplier', GETPOST('linkedOrder'));
}
// Add file in email form