diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 8e664a89c3c..64769fa704f 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -18,21 +18,32 @@
* along with this program. If not, see trans('Qty'); ?>
trans('ReductionShort'); ?>
@@ -62,22 +72,8 @@ if (empty($senderissupplier)) $senderissupplier=0;
?>
rights->margins->creer)
- {
- if(! empty($conf->global->DISPLAY_MARGIN_RATES))
- {
- echo ''.$langs->trans('MarginRate').' ';
- }
- if(! empty($conf->global->DISPLAY_MARK_RATES))
- {
- echo ''.$langs->trans('MarkRate').' ';
- }
- }
- else
- {
- if (! empty($conf->global->DISPLAY_MARGIN_RATES)) $colspan++;
- if (! empty($conf->global->DISPLAY_MARK_RATES)) $colspan++;
- }
+ if ($user->rights->margins->creer && ! empty($conf->global->DISPLAY_MARGIN_RATES)) echo ''.$langs->trans('MarginRate').' ';
+ if ($user->rights->margins->creer && ! empty($conf->global->DISPLAY_MARK_RATES)) echo ''.$langs->trans('MarkRate').' ';
}
?>
@@ -98,20 +94,30 @@ else {
// Free line
echo '';
// Show radio free line
- if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) echo ' ';
// Predefined product/service
@@ -200,8 +206,8 @@ else {
% % % '.$langs->trans("ErrorQtyTooLowForThisSupplier").'
';
}
}
- else
- {
- $npr = preg_match('/\*/', $_POST['tauxtva']) ? 1 : 0 ;
- $tauxtva = str_replace('*','',$_POST["tauxtva"]);
- $tauxtva = price2num($tauxtva);
- $localtax1tx= get_localtax($tauxtva, 1, $mysoc,$object->thirdparty);
- $localtax2tx= get_localtax($tauxtva, 2, $mysoc,$object->thirdparty);
+ else if( GETPOST('price_ht')!=='' || GETPOST('price_ttc')!=='' )
+ {
+ $pu_ht = price2num($price_ht, 'MU');
+ $pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
+ $tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0);
+ $tva_tx = str_replace('*', '', $tva_tx);
+ $label = (GETPOST('product_label') ? GETPOST('product_label') : '');
+ $desc = $product_desc;
+ $type = GETPOST('type');
- if (! $product_desc)
- {
- $error++;
- $mesg=''.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Description")).'
';
+ $tva_tx = price2num($tva_tx); // When vat is text input field
+
+ // Local Taxes
+ $localtax1_tx= get_localtax($tva_tx, 1,$mysoc,$object->thirdparty);
+ $localtax2_tx= get_localtax($tva_tx, 2,$mysoc,$object->thirdparty);
+
+ if (!empty($_POST['price_ht']))
+ {
+ $ht = price2num($_POST['price_ht']);
+ $price_base_type = 'HT';
+
+ //print $product_desc, $pu, $txtva, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0
+ $result=$object->addline($product_desc, $ht, $tva_tx, $localtax1tx, $localtax2tx, $qty, 0, $remise_percent, $datestart, $dateend, 0, $npr, $price_base_type, $type);
}
else
- {
- $type = $_POST["type"];
-
- if (! empty($_POST['amount']))
- {
- $ht = price2num($_POST['amount']);
- $price_base_type = 'HT';
-
- //print $product_desc, $pu, $txtva, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0
- $result=$object->addline($product_desc, $ht, $tauxtva, $localtax1tx, $localtax2tx, $qty, 0, $remise_percent, $datestart, $dateend, 0, $npr, $price_base_type, $type);
- }
- else
- {
- $ttc = price2num($_POST['amountttc']);
- $ht = $ttc / (1 + ($tauxtva / 100));
- $price_base_type = 'HT';
- //print $product_desc, $pu, $txtva, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0
- $result=$object->addline($product_desc, $ht, $tauxtva,$localtax1tx, $localtax2tx, $qty, 0, $remise_percent, $datestart, $dateend, 0, $npr, $price_base_type, $type);
- }
+ {
+ $ttc = price2num($_POST['price_ttc']);
+ $ht = $ttc / (1 + ($tva_tx / 100));
+ $price_base_type = 'HT';
+ //print $product_desc, $pu, $txtva, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0
+ $result=$object->addline($product_desc, $ht, $tva_tx,$localtax1tx, $localtax2tx, $qty, 0, $remise_percent, $datestart, $dateend, 0, $npr, $price_base_type, $type);
}
}
@@ -657,22 +673,35 @@ elseif ($action == 'addline' && $user->rights->fournisseur->facture->creer)
}
}
- unset($_POST['qty']);
- unset($_POST['type']);
- unset($_POST['remise_percent']);
- unset($_POST['dp_desc']);
- unset($_POST['pu']);
- unset($_POST['tva_tx']);
- unset($_POST['label']);
- unset($localtax1_tx);
- unset($localtax2_tx);
+ unset($_POST ['prod_entry_mode']);
- unset($_POST['idprodfournprice']);
- unset($_POST['qty_predef']);
- unset($_POST['remise_percent_predef']);
- unset($_POST['fournprice_predef']);
- unset($_POST['buying_price_predef']);
- unset($_POST['np_desc']);
+ unset($_POST['qty']);
+ unset($_POST['type']);
+ unset($_POST['remise_percent']);
+ unset($_POST['pu']);
+ unset($_POST['price_ht']);
+ unset($_POST['price_ttc']);
+ unset($_POST['tva_tx']);
+ unset($_POST['label']);
+ unset($localtax1_tx);
+ unset($localtax2_tx);
+ unset($_POST['np_marginRate']);
+ unset($_POST['np_markRate']);
+ unset($_POST['dp_desc']);
+ unset($_POST['idprodfournprice']);
+
+ unset($_POST['date_starthour']);
+ unset($_POST['date_startmin']);
+ unset($_POST['date_startsec']);
+ unset($_POST['date_startday']);
+ unset($_POST['date_startmonth']);
+ unset($_POST['date_startyear']);
+ unset($_POST['date_endhour']);
+ unset($_POST['date_endmin']);
+ unset($_POST['date_endsec']);
+ unset($_POST['date_endday']);
+ unset($_POST['date_endmonth']);
+ unset($_POST['date_endyear']);
}
else if (empty($mesg))
{
@@ -2021,13 +2050,10 @@ else
}
- /*
- * Form to add new line
- */
-
+ // Form to add new line
if ($object->statut == 0 && $action != 'edit_line')
{
- print '';
+ /*print ' ';
print '';
print ' ';
@@ -2040,9 +2066,26 @@ else
print ' ';
print ' ';
print ' ';
- print ' ';
+ print '';*/
+
+ global $forceall, $senderissupplier, $dateSelector, $inputalsopricewithtax;
+ $forceall=1; $senderissupplier=1; $dateSelector=0; $inputalsopricewithtax=1;
+ if ($object->statut == 0 && $user->rights->propal->creer)
+ {
+ if ($action != 'editline')
+ {
+ $var = true;
+
+ // Add free products/services
+ $object->formAddObjectLine(1, $mysoc, $soc);
+
+ $parameters = array();
+ $reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+ }
+ }
// Add free products/services form
+ /*
$var=true;
print '';
print '';
@@ -2141,7 +2184,7 @@ else
print ' ';
print ' ';
- }
+ }*/
}
print '';