This commit is contained in:
Laurent Destailleur 2019-01-17 19:27:26 +01:00
parent f2b075d79d
commit 5130019003
9 changed files with 30 additions and 30 deletions

View File

@ -696,7 +696,7 @@ if (empty($reshook))
}
}
}
// add lines from objectlinked
elseif($action == 'import_lines_from_object'
&& $user->rights->propal->creer
@ -706,7 +706,7 @@ if (empty($reshook))
$fromElement = GETPOST('fromelement');
$fromElementid = GETPOST('fromelementid');
$importLines = GETPOST('line_checkbox');
if(!empty($importLines) && is_array($importLines) && !empty($fromElement) && ctype_alpha($fromElement) && !empty($fromElementid))
{
if($fromElement == 'commande')
@ -758,9 +758,9 @@ if (empty($reshook))
$fk_prev_id = '';
$fk_unit = $originLine->fk_unit;
$pu_ht_devise = $originLine->multicurrency_subprice;
$res = $object->addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $price_base_type, $pu_ttc, $info_bits, $type, $rang, $special_code, $fk_parent_line, $fk_fournprice, $pa_ht, $label,$date_start, $date_end,$array_options, $fk_unit, $origin, $origin_id, $pu_ht_devise, $fk_remise_except);
if($res > 0){
$importCount++;
}else{
@ -771,7 +771,7 @@ if (empty($reshook))
$error++;
}
}
if($error)
{
setEventMessages($langs->trans('ErrorsOnXLines',$error), null, 'errors');
@ -2014,7 +2014,7 @@ if ($action == 'create')
print '<div class="fichehalfleft">';
print '<div class="underbanner clearboth"></div>';
print '<table class="border" width="100%">';
print '<table class="border tableforfield" width="100%">';
// Link for thirdparty discounts
if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
@ -2320,7 +2320,7 @@ if ($action == 'create')
print '<div class="ficheaddleft">';
print '<div class="underbanner clearboth"></div>';
print '<table class="border centpercent">';
print '<table class="border tableforfield centpercent">';
if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))
{
@ -2570,7 +2570,7 @@ if ($action == 'create')
// Show links to link elements
$linktoelem = $form->showLinkToObjectBlock($object, null, array('propal'));
$compatibleImportElementsList = false;
if($user->rights->propal->creer && $object->statut == Propal::STATUS_DRAFT)
{

View File

@ -1329,7 +1329,7 @@ if (empty($reshook))
$fromElement = GETPOST('fromelement');
$fromElementid = GETPOST('fromelementid');
$importLines = GETPOST('line_checkbox');
if(!empty($importLines) && is_array($importLines) && !empty($fromElement) && ctype_alpha($fromElement) && !empty($fromElementid))
{
if($fromElement == 'commande')
@ -1381,9 +1381,9 @@ if (empty($reshook))
$fk_prev_id = '';
$fk_unit = $originLine->fk_unit;
$pu_ht_devise = $originLine->multicurrency_subprice;
$res = $object->addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $info_bits, $fk_remise_except, $price_base_type, $pu_ttc, $date_start, $date_end, $type, $rang, $special_code, $fk_parent_line, $fk_fournprice, $pa_ht, $label,$array_options, $fk_unit, $origin, $origin_id, $pu_ht_devise);
if($res > 0){
$importCount++;
}else{
@ -1394,14 +1394,14 @@ if (empty($reshook))
$error++;
}
}
if($error)
{
setEventMessages($langs->trans('ErrorsOnXLines',$error), null, 'errors');
}
}
}
// Actions when printing a doc from card
include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
@ -2117,7 +2117,7 @@ if ($action == 'create' && $user->rights->commande->creer)
print '<div class="fichehalfleft">';
print '<div class="underbanner clearboth"></div>';
print '<table class="border" width="100%">';
print '<table class="border tableforfield" width="100%">';
if ($soc->outstanding_limit)
{
@ -2396,7 +2396,7 @@ if ($action == 'create' && $user->rights->commande->creer)
print '<div class="ficheaddleft">';
print '<div class="underbanner clearboth"></div>';
print '<table class="border centpercent">';
print '<table class="border tableforfield centpercent">';
if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))
{
@ -2669,7 +2669,7 @@ if ($action == 'create' && $user->rights->commande->creer)
// Show links to link elements
$linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
$compatibleImportElementsList = false;
if($user->rights->commande->creer
&& $object->statut == Commande::STATUS_DRAFT)

View File

@ -829,7 +829,7 @@ if (empty($reshook))
if ($socid > 0) $object->socid = GETPOST('socid', 'int');
$db->begin();
$error = 0;
$originentity = GETPOST('originentity');
// Fill array 'array_options' with data from add form
@ -3748,7 +3748,7 @@ else if ($id > 0 || ! empty($ref))
print '<div class="fichehalfleft">';
print '<div class="underbanner clearboth"></div>';
print '<table class="border" width="100%">';
print '<table class="border tableforfield" width="100%">';
// Type
print '<tr><td class="titlefield">' . $langs->trans('Type') . '</td><td>';

View File

@ -1459,7 +1459,7 @@ else
print '<div class="underbanner clearboth"></div>';
print '<table class="border" width="100%">';
print '<table class="border tableforfield" width="100%">';
// Ligne info remises tiers
print '<tr><td class="titlefield">'.$langs->trans('Discount').'</td><td colspan="3">';

View File

@ -1237,7 +1237,7 @@ else if ($id > 0 || ! empty($ref))
print '<div class="fichehalfleft">';
print '<div class="underbanner clearboth"></div>';
print '<table class="border" width="100%">';
print '<table class="border tableforfield" width="100%">';
if (! empty($conf->global->FICHINTER_USE_PLANNED_AND_DONE_DATES))
{
@ -1323,7 +1323,7 @@ else if ($id > 0 || ! empty($ref))
print '<div class="ficheaddleft">';
print '<div class="underbanner clearboth"></div>';
print '<table class="border centpercent">';
print '<table class="border tableforfield centpercent">';
if (empty($conf->global->FICHINTER_DISABLE_DETAILS))
{

View File

@ -1872,7 +1872,7 @@ elseif (! empty($object->id))
print '<div class="fichehalfleft">';
print '<div class="underbanner clearboth"></div>';
print '<table class="border" width="100%">';
print '<table class="border tableforfield" width="100%">';
// Date
if ($object->methode_commande_id > 0)
@ -2092,7 +2092,7 @@ elseif (! empty($object->id))
print '<div class="ficheaddleft">';
print '<div class="underbanner clearboth"></div>';
print '<table class="border centpercent">';
print '<table class="border tableforfield centpercent">';
if (!empty($conf->multicurrency->enabled))
{
@ -2364,7 +2364,7 @@ elseif (! empty($object->id))
}
// Ship
if (! empty($conf->stock->enabled) && (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)))
{
if (in_array($object->statut, array(3,4,5))) {

View File

@ -863,7 +863,7 @@ if (empty($reshook))
$object->origin = GETPOST('origin');
$object->origin_id = GETPOST('originid');
require_once DOL_DOCUMENT_ROOT.'/'.$element.'/class/'.$subelement.'.class.php';
$classname = ucfirst($subelement);
if ($classname == 'Fournisseur.commande') $classname='CommandeFournisseur';
@ -1653,7 +1653,7 @@ if ($action == 'create')
$projectid = $originid;
$element = 'projet';
}
// For compatibility
if ($element == 'order') {
$element = $subelement = 'commande';
@ -2413,7 +2413,7 @@ else
print '<div class="fichehalfleft">';
print '<div class="underbanner clearboth"></div>';
print '<table class="border" width="100%">';
print '<table class="border tableforfield" width="100%">';
// Type
print '<tr><td class="titlefield">'.$langs->trans('Type').'</td><td>';

View File

@ -920,7 +920,7 @@ elseif ($object->id > 0)
print '<div class="fichehalfleft">';
print '<div class="underbanner clearboth"></div>';
print '<table class="border" width="100%">';
print '<table class="border tableforfield" width="100%">';
// Visibility
print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';

View File

@ -1434,7 +1434,7 @@ if ($action == 'create')
print '<div class="fichehalfleft">';
print '<div class="underbanner clearboth"></div>';
print '<table class="border" width="100%">';
print '<table class="border tableforfield" width="100%">';
// Relative and absolute discounts
if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
@ -1606,7 +1606,7 @@ if ($action == 'create')
print '<div class="ficheaddleft">';
print '<div class="underbanner clearboth"></div>';
print '<table class="border centpercent">';
print '<table class="border tableforfield centpercent">';
if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))
{