Fix: [ bug #1431 ] Reception and Send supplier order box has a weird top
margin.
This commit is contained in:
parent
a2065d0b6a
commit
28fd8c6862
@ -3,6 +3,7 @@ English Dolibarr ChangeLog
|
|||||||
--------------------------------------------------------------
|
--------------------------------------------------------------
|
||||||
|
|
||||||
***** ChangeLog for 3.5.4 compared to 3.5.3 *****
|
***** ChangeLog for 3.5.4 compared to 3.5.3 *****
|
||||||
|
Fix: [ bug #1431 ] Reception and Send supplier order box has a weird top margin.
|
||||||
Fix: [ bug #1428 ] "Nothing" is shown in the middle of the screen in a supplier order.
|
Fix: [ bug #1428 ] "Nothing" is shown in the middle of the screen in a supplier order.
|
||||||
Fix: The object deliverycompany was not used anymore and output of
|
Fix: The object deliverycompany was not used anymore and output of
|
||||||
details for delivery reports was lost during 3.5. Rewrite code to
|
details for delivery reports was lost during 3.5. Rewrite code to
|
||||||
|
|||||||
@ -198,7 +198,7 @@ else if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
|
|||||||
}
|
}
|
||||||
if (GETPOST('addline_predefined')
|
if (GETPOST('addline_predefined')
|
||||||
|| (! GETPOST('dp_desc') && ! GETPOST('addline_predefined') && GETPOST('idprod', 'int')>0) // we push enter onto qty field
|
|| (! GETPOST('dp_desc') && ! GETPOST('addline_predefined') && GETPOST('idprod', 'int')>0) // we push enter onto qty field
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
$predef=(($conf->global->MAIN_FEATURES_LEVEL < 2) ? '_predef' : '');
|
$predef=(($conf->global->MAIN_FEATURES_LEVEL < 2) ? '_predef' : '');
|
||||||
$idprod=GETPOST('idprod', 'int');
|
$idprod=GETPOST('idprod', 'int');
|
||||||
@ -221,7 +221,7 @@ else if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
|
|||||||
}
|
}
|
||||||
if (! GETPOST('addline_predefined') && ( GETPOST('pu')==='')) // Unit price can be 0 but not ''
|
if (! GETPOST('addline_predefined') && ( GETPOST('pu')==='')) // Unit price can be 0 but not ''
|
||||||
{
|
{
|
||||||
|
|
||||||
setEventMessage($langs->trans($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('UnitPrice'))), 'errors');
|
setEventMessage($langs->trans($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('UnitPrice'))), 'errors');
|
||||||
$error++;
|
$error++;
|
||||||
}
|
}
|
||||||
@ -760,10 +760,10 @@ else if ($action == 'add' && $user->rights->fournisseur->commande->creer)
|
|||||||
$object->mode_reglement_id = GETPOST('mode_reglement_id');
|
$object->mode_reglement_id = GETPOST('mode_reglement_id');
|
||||||
$object->note_private = GETPOST('note_private');
|
$object->note_private = GETPOST('note_private');
|
||||||
$object->note_public = GETPOST('note_public');
|
$object->note_public = GETPOST('note_public');
|
||||||
|
|
||||||
// Fill array 'array_options' with data from add form
|
// Fill array 'array_options' with data from add form
|
||||||
$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
|
$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
|
||||||
|
|
||||||
$id = $object->create($user);
|
$id = $object->create($user);
|
||||||
if ($id < 0)
|
if ($id < 0)
|
||||||
{
|
{
|
||||||
@ -1118,12 +1118,12 @@ if ($action=="create")
|
|||||||
// Other options
|
// Other options
|
||||||
$parameters=array();
|
$parameters=array();
|
||||||
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
|
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
|
||||||
|
|
||||||
if (empty($reshook) && ! empty($extrafields->attribute_label))
|
if (empty($reshook) && ! empty($extrafields->attribute_label))
|
||||||
{
|
{
|
||||||
print $object->showOptionals($extrafields,'edit');
|
print $object->showOptionals($extrafields,'edit');
|
||||||
}
|
}
|
||||||
|
|
||||||
// Bouton "Create Draft"
|
// Bouton "Create Draft"
|
||||||
print "</table>\n";
|
print "</table>\n";
|
||||||
|
|
||||||
@ -1140,9 +1140,9 @@ elseif (! empty($object->id))
|
|||||||
|
|
||||||
$title=$langs->trans("SupplierOrder");
|
$title=$langs->trans("SupplierOrder");
|
||||||
dol_fiche_head($head, 'card', $title, 0, 'order');
|
dol_fiche_head($head, 'card', $title, 0, 'order');
|
||||||
|
|
||||||
$res=$object->fetch_optionals($object->id,$extralabels);
|
$res=$object->fetch_optionals($object->id,$extralabels);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Confirmation de la suppression de la commande
|
* Confirmation de la suppression de la commande
|
||||||
*/
|
*/
|
||||||
@ -1470,7 +1470,7 @@ elseif (! empty($object->id))
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Ligne de 3 colonnes
|
// Ligne de 3 colonnes
|
||||||
print '<tr><td>'.$langs->trans("AmountHT").'</td>';
|
print '<tr><td>'.$langs->trans("AmountHT").'</td>';
|
||||||
print '<td align="right"><b>'.price($object->total_ht).'</b></td>';
|
print '<td align="right"><b>'.price($object->total_ht).'</b></td>';
|
||||||
@ -1731,30 +1731,30 @@ elseif (! empty($object->id))
|
|||||||
// TODO Use the predefinedproductline_create.tpl.php file
|
// TODO Use the predefinedproductline_create.tpl.php file
|
||||||
|
|
||||||
// Add free products/services form
|
// Add free products/services form
|
||||||
|
|
||||||
//Fix Bug [ bug #1254 ] Error when using "Enter" on qty input box of a product
|
//Fix Bug [ bug #1254 ] Error when using "Enter" on qty input box of a product
|
||||||
//this Fix Will be obsolete in 3.6 because 3.6 get one form to do every things
|
//this Fix Will be obsolete in 3.6 because 3.6 get one form to do every things
|
||||||
if (! empty($conf->use_javascript_ajax)) {
|
if (! empty($conf->use_javascript_ajax)) {
|
||||||
print '<script type="text/javascript">
|
print '<script type="text/javascript">
|
||||||
jQuery(document).ready(function() {
|
jQuery(document).ready(function() {
|
||||||
|
|
||||||
$("#qty").bind("keypress", {}, keypressInBox);
|
$("#qty").bind("keypress", {}, keypressInBox);
|
||||||
$("#remise_percent").bind("keypress", {}, keypressInBox);
|
$("#remise_percent").bind("keypress", {}, keypressInBox);
|
||||||
$("#pu").bind("keypress", {}, keypressInBox);
|
$("#pu").bind("keypress", {}, keypressInBox);
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
function keypressInBox(e) {
|
function keypressInBox(e) {
|
||||||
var code = (e.keyCode ? e.keyCode : e.which);
|
var code = (e.keyCode ? e.keyCode : e.which);
|
||||||
if (code == 13) { //Enter keycode
|
if (code == 13) { //Enter keycode
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
|
||||||
$(\'#addFreeProductButton\').click();
|
$(\'#addFreeProductButton\').click();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>';
|
</script>';
|
||||||
}
|
}
|
||||||
|
|
||||||
$var=true;
|
$var=true;
|
||||||
print '<tr '.$bc[$var].'>';
|
print '<tr '.$bc[$var].'>';
|
||||||
print '<td>';
|
print '<td>';
|
||||||
@ -1788,26 +1788,26 @@ elseif (! empty($object->id))
|
|||||||
// Ajout de produits/services predefinis
|
// Ajout de produits/services predefinis
|
||||||
if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
|
if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
|
||||||
{
|
{
|
||||||
|
|
||||||
if (! empty($conf->use_javascript_ajax)) {
|
if (! empty($conf->use_javascript_ajax)) {
|
||||||
print '<script type="text/javascript">
|
print '<script type="text/javascript">
|
||||||
jQuery(document).ready(function() {
|
jQuery(document).ready(function() {
|
||||||
jQuery(\'#idprodfournprice\').change(function() {
|
jQuery(\'#idprodfournprice\').change(function() {
|
||||||
if (jQuery(\'#idprodfournprice\').val() > 0) jQuery(\'#np_desc\').focus();
|
if (jQuery(\'#idprodfournprice\').val() > 0) jQuery(\'#np_desc\').focus();
|
||||||
});
|
});
|
||||||
|
|
||||||
//Fix Bug [ bug #1254 ] Error when using "Enter" on qty input box of a product
|
//Fix Bug [ bug #1254 ] Error when using "Enter" on qty input box of a product
|
||||||
//this Fix Will be obsolete in 3.6 because 3.6 get one form to do every things
|
//this Fix Will be obsolete in 3.6 because 3.6 get one form to do every things
|
||||||
$("#qty_predef").bind("keypress", {}, keypressInBox);
|
$("#qty_predef").bind("keypress", {}, keypressInBox);
|
||||||
$("#remise_percent_predef").bind("keypress", {}, keypressInBox);
|
$("#remise_percent_predef").bind("keypress", {}, keypressInBox);
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
function keypressInBox(e) {
|
function keypressInBox(e) {
|
||||||
var code = (e.keyCode ? e.keyCode : e.which);
|
var code = (e.keyCode ? e.keyCode : e.which);
|
||||||
if (code == 13) { //Enter keycode
|
if (code == 13) { //Enter keycode
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
|
||||||
$(\'#addPredefinedProductButton\').click();
|
$(\'#addPredefinedProductButton\').click();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -1971,8 +1971,6 @@ elseif (! empty($object->id))
|
|||||||
|
|
||||||
|
|
||||||
print '<div class="fichecenter"><div class="fichehalfleft">';
|
print '<div class="fichecenter"><div class="fichehalfleft">';
|
||||||
//print '<table width="100%"><tr><td width="50%" valign="top">';
|
|
||||||
//print '<a name="builddoc"></a>'; // ancre
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Documents generes
|
* Documents generes
|
||||||
@ -2001,10 +1999,6 @@ elseif (! empty($object->id))
|
|||||||
$formactions=new FormActions($db);
|
$formactions=new FormActions($db);
|
||||||
$somethingshown=$formactions->showactions($object,'order_supplier',$socid);
|
$somethingshown=$formactions->showactions($object,'order_supplier',$socid);
|
||||||
|
|
||||||
print '</div></div></div>';
|
|
||||||
|
|
||||||
//print '</td><td valign="top" width="50%">';
|
|
||||||
print '</div><div class="fichehalfright"><div class="ficheaddleft">';
|
|
||||||
|
|
||||||
if ($user->rights->fournisseur->commande->commander && $object->statut == 2)
|
if ($user->rights->fournisseur->commande->commander && $object->statut == 2)
|
||||||
{
|
{
|
||||||
@ -2073,7 +2067,6 @@ elseif (! empty($object->id))
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
print '</div></div></div>';
|
print '</div></div></div>';
|
||||||
//print '</td></tr></table>';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user