Fix: Navigation on shipment cards
This commit is contained in:
parent
c86d726a4f
commit
a0e701da3d
@ -29,7 +29,6 @@
|
|||||||
|
|
||||||
require("../main.inc.php");
|
require("../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/modules/expedition/pdf/ModelePdfExpedition.class.php");
|
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php");
|
||||||
@ -53,6 +52,7 @@ $origin_id = GETPOST("id")?GETPOST("id"):'';
|
|||||||
if (empty($origin_id)) $origin_id = GETPOST("origin_id"); // Id of order or propal
|
if (empty($origin_id)) $origin_id = GETPOST("origin_id"); // Id of order or propal
|
||||||
if (empty($origin_id)) $origin_id = GETPOST("object_id"); // Id of order or propal
|
if (empty($origin_id)) $origin_id = GETPOST("object_id"); // Id of order or propal
|
||||||
$id = $origin_id;
|
$id = $origin_id;
|
||||||
|
$ref=GETPOST('ref');
|
||||||
|
|
||||||
// Security check
|
// Security check
|
||||||
if ($user->societe_id) $socid=$user->societe_id;
|
if ($user->societe_id) $socid=$user->societe_id;
|
||||||
@ -252,7 +252,7 @@ if ($action == 'settrackingnumber' || $action == 'settrackingurl'
|
|||||||
*/
|
*/
|
||||||
if ($action == 'builddoc') // En get ou en post
|
if ($action == 'builddoc') // En get ou en post
|
||||||
{
|
{
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/modules/expedition/pdf/ModelePdfExpedition.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/modules/expedition/doc/ModelePdfExpedition.class.php");
|
||||||
|
|
||||||
// Sauvegarde le dernier modele choisi pour generer un document
|
// Sauvegarde le dernier modele choisi pour generer un document
|
||||||
$shipment = new Expedition($db);
|
$shipment = new Expedition($db);
|
||||||
@ -768,15 +768,6 @@ if ($action == 'create')
|
|||||||
}
|
}
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
/*else
|
|
||||||
{
|
|
||||||
// Quantity
|
|
||||||
print '<td align="center" '.$colspan.'>';
|
|
||||||
print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
|
|
||||||
print '<input name="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$quantityToBeDelivered.'">';
|
|
||||||
print '</td>';
|
|
||||||
if ($line->product_type == 1) print '<td> </td>';
|
|
||||||
}*/
|
|
||||||
|
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user