';
// Project
if (! empty($conf->projet->enabled))
@@ -581,8 +581,8 @@ if (! empty($id) && $action != 'edit')
}
}
$morehtmlref.='
';
-
-
+
+
dol_banner_tab($object, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref);
@@ -620,7 +620,7 @@ if (! empty($id) && $action != 'edit')
// Zip / Town
print '';
print '| ';
print '';
@@ -712,7 +707,7 @@ if ($object->id > 0)
{
print '';
}
-
+
if ($conf->supplier_proposal->enabled && $user->rights->supplier_proposal->creer && $object->status==1)
{
$langs->load("supplier_proposal");
@@ -750,9 +745,9 @@ if ($object->id > 0)
}
}
}
-
+
print '';
-
+
if (! empty($conf->global->MAIN_REPEATCONTACTONEACHTAB))
{
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index a6f0cc248f1..f77eb949c9a 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -279,7 +279,7 @@ if (empty($reshook))
if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
{
$db->begin();
-
+
$langs->load('errors');
$error = 0;
@@ -469,7 +469,7 @@ if (empty($reshook))
if (! $error && $result > 0)
{
$db->commit();
-
+
$ret=$object->fetch($object->id); // Reload to get new records
// Define output language
@@ -526,7 +526,7 @@ if (empty($reshook))
$db->rollback();
setEventMessages($object->error, $object->errors, 'errors');
}
-
+
$action = '';
}
@@ -1617,7 +1617,7 @@ elseif (! empty($object->id))
$res=$object->fetch_optionals($object->id,$extralabels);
-
+
$head = ordersupplier_prepare_head($object);
$title=$langs->trans("SupplierOrder");
@@ -1754,11 +1754,11 @@ elseif (! empty($object->id))
// Print form confirm
print $formconfirm;
-
+
// Supplier order card
$linkback = ''.$langs->trans("BackToList").'';
-
+
$morehtmlref=' ';
// Ref supplier
$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->fournisseur->commande->creer, 'string', '', 0, 1);
@@ -1798,15 +1798,15 @@ elseif (! empty($object->id))
}
}
$morehtmlref.=' ';
-
-
- dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-
+
+
+ dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
print '';
print ' ';
print ' ';
-
+
print ' ';
// Date
@@ -1995,16 +1995,15 @@ elseif (! empty($object->id))
}
// Other attributes
- $cols = 2;
include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
print ' ';
-
+
print ' ';
print ' ';
print ' ';
print ' ';
-
+
print ' ';
if (!empty($conf->multicurrency->enabled))
@@ -2013,18 +2012,18 @@ elseif (! empty($object->id))
print '| ' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . ' | ';
print '' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' | ';
print ' ';
-
+
// Multicurrency Amount VAT
print '| ' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . ' | ';
print '' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' | ';
print ' ';
-
+
// Multicurrency Amount TTC
print '| ' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . ' | ';
print '' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' | ';
print ' ';
}
-
+
// Total
print '| '.$langs->trans("AmountHT").' | ';
print ''.price($object->total_ht,'',$langs,1,-1,-1,$conf->currency).' | ';
@@ -2053,19 +2052,19 @@ elseif (! empty($object->id))
print ' ';
print ' ';
-
+
// Margin Infos
/*if (! empty($conf->margin->enabled)) {
$formmargin->displayMarginInfos($object);
}*/
-
-
+
+
print ' ';
print ' ';
print '
';
-
+
if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
{
$blocname = 'contacts';
diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php
index 32f1a5538b5..9fb9a63828d 100644
--- a/htdocs/fourn/commande/orderstoinvoice.php
+++ b/htdocs/fourn/commande/orderstoinvoice.php
@@ -76,9 +76,9 @@ $extrafields = new ExtraFields($db);
// fetch optionals attributes and labels
$extralabels=$extrafields->fetch_name_optionals_label('facture_fourn');
-if ($action == 'create')
+if ($action == 'create')
{
- if (! is_array($selected))
+ if (! is_array($selected))
{
$error++;
setEventMessages($langs->trans('Error_OrderNotChecked'), null, 'errors');
@@ -246,10 +246,10 @@ if (($action == 'create' || $action == 'add') && ! $error) {
// End of object creation, we show it
if ($id > 0 && ! $error) {
-
+
foreach($orders_id as $fk_supplier_order) {
$supplier_order = new CommandeFournisseur($db);
- if ($supplier_order->fetch($fk_supplier_order)>0 && $supplier_order->statut == 5)
+ if ($supplier_order->fetch($fk_supplier_order)>0 && $supplier_order->statut == 5)
{
if ($supplier_order->classifyBilled($user) < 0)
{
@@ -258,20 +258,20 @@ if (($action == 'create' || $action == 'add') && ! $error) {
$_GET["origin"] = $_POST["origin"];
$_GET["originid"] = $_POST["originid"];
$mesgs[] = '' . $object->error . ' ';
-
+
$error++;
break;
}
-
+
}
}
-
+
if(!$error) {
$db->commit();
header('Location: ' . DOL_URL_ROOT . '/fourn/facture/card.php?facid=' . $id);
exit();
}
-
+
} else {
$db->rollback();
$action = 'create';
@@ -366,7 +366,8 @@ if ($action == 'create' && !$error) {
$parameters = array (
'objectsrc' => $objectsrc,
'idsrc' => $listoforders,
- 'colspan' => ' colspan="3"'
+ 'colspan' => ' colspan="2"',
+ 'cols'=>2
);
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
@@ -494,7 +495,7 @@ if (($action != 'create' && $action != 'add') && !$error) {
$companystatic->nom = $soc->nom;
print '' . $companystatic->getNomUrl(1, 'customer') . '';
}
-
+
print '';
@@ -1910,7 +1905,7 @@ else
}
}
}
-
+
/*
* Fiche en mode edition
*/
@@ -2030,7 +2025,7 @@ else
print " |
\n";
// API key
- if(! empty($conf->api->enabled) && $user->admin)
+ if(! empty($conf->api->enabled) && $user->admin)
{
print '