From 18848eaf744393f69b33d74e622983118e78079c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 May 2014 13:25:36 +0200
Subject: [PATCH] Clean forms
---
htdocs/compta/facture.php | 3 ++-
htdocs/contrat/fiche.php | 32 ++++++++----------------
htdocs/core/class/commonobject.class.php | 16 ++++++------
htdocs/core/tpl/objectline_edit.tpl.php | 11 ++++++--
htdocs/theme/eldy/style.css.php | 3 +++
5 files changed, 32 insertions(+), 33 deletions(-)
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 7187c5771d9..b48c95edfb6 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -3069,7 +3069,8 @@ if ($action == 'create')
print '</table>';
// Margin Infos
- if (! empty($conf->margin->enabled)) {
+ if (! empty($conf->margin->enabled))
+ {
print '<br>';
$object->displayMarginInfos($object->statut > 0);
}
diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php
index 22db24d2920..0bee62d4f12 100644
--- a/htdocs/contrat/fiche.php
+++ b/htdocs/contrat/fiche.php
@@ -1099,18 +1099,14 @@ else
*/
$productstatic=new Product($db);
+
+ $usemargins=0;
+ if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) $usemargins=1;
+
// Title line for service
- //print '<table class="notopnoleft allwidth">'; // Array with (n*2)+1 lines
$cursorline=1;
while ($cursorline <= $nbofservices)
{
- //print '<tr '.$bc[false].'>';
- //print '<td width="90" style="border-left: 1px solid #'.$colorb.'; border-top: 1px solid #'.$colorb.'; border-bottom: 1px solid #'.$colorb.';">';
- //print $langs->trans("ServiceNb",$cursorline).'</td>';
-
- // print '<td class="tab" style="border-right: 1px solid #'.$colorb.'; border-top: 1px solid #'.$colorb.'; border-bottom: 1px solid #'.$colorb.';" rowspan="2">';
-
-
print '<form name="update" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="updateligne">';
@@ -1119,7 +1115,7 @@ else
print '<input type="hidden" name="fournprice" value="'.($objp->fk_fournprice?$objp->fk_fournprice:'0').'">';
// Area with common detail of line
- print '<table class="notopnoleft allwidth" width="100%">';
+ print '<table class="notopnoleftnoright allwidth tableforservicepart1" width="100%">';
$sql = "SELECT cd.rowid, cd.statut, cd.label as label_det, cd.fk_product, cd.description, cd.price_ht, cd.qty,";
$sql.= " cd.tva_tx, cd.remise_percent, cd.info_bits, cd.subprice,";
@@ -1289,10 +1285,10 @@ else
print '<td align="right"><input size="5" type="text" name="elprice" value="'.price($objp->subprice).'"></td>';
print '<td align="center"><input size="2" type="text" name="elqty" value="'.$objp->qty.'"></td>';
print '<td align="right" class="nowrap"><input size="1" type="text" name="elremise_percent" value="'.$objp->remise_percent.'">%</td>';
- if ($conf->margin->enabled) {
+ if (! empty($usemargins))
+ {
print '<td align="right">';
- if ($objp->fk_product)
- print '<select id="fournprice" name="fournprice"></select>';
+ if ($objp->fk_product) print '<select id="fournprice" name="fournprice"></select>';
print '<input id="buying_price" type="text" size="5" name="buying_price" value="'.price($objp->pa_ht,0,'',0).'"></td>';
}
print '<td align="center" rowspan="2" valign="middle"><input type="submit" class="button" name="save" value="'.$langs->trans("Modify").'">';
@@ -1389,7 +1385,7 @@ else
// Area with status and activation info of line
if ($object->statut > 0)
{
- print '<table class="notopnoleft" width="100%">';
+ print '<table class="notopnoleftnoright tableforservicepart2" width="100%">';
print '<tr '.$bc[false].'>';
print '<td>'.$langs->trans("ServiceStatus").': '.$object->lines[$cursorline-1]->getLibStatut(4).'</td>';
@@ -1447,8 +1443,7 @@ else
print '<form name="active" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&ligne='.GETPOST('ligne').'&action=active" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
- print '<table class="noborder" width="100%">';
- //print '<tr class="liste_titre"><td colspan="5">'.$langs->trans("Status").'</td></tr>';
+ print '<table class="notopnoleftnoright" width="100%">';
// Definie date debut et fin par defaut
$dateactstart = $objp->date_debut;
@@ -1540,15 +1535,8 @@ else
print '</form>';
}
- /* print '</td>'; // End td if line is 1
-
- print '</tr>';
- print '<tr><td style="border-right: 1px solid #'.$colorb.'"> </td></tr>';*/
-
$cursorline++;
}
- //print '</table>';
-
// Form to add new line
if ($user->rights->contrat->creer && ($object->statut >= 0))
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index f2c9ae0fc8a..f6e5e2e815e 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3208,7 +3208,7 @@ abstract class CommonObject
}
/**
- * displayMarginInfos
+ * Show the array with all margin infos
*
* @param string $force_price Force price
* @return void
@@ -3225,7 +3225,7 @@ abstract class CommonObject
$marginInfo = $this->getMarginInfos($force_price);
- print '<table class="noborder" width="100%">';
+ print '<table class="nobordernopadding" width="100%">';
print '<tr class="liste_titre">';
print '<td width="30%">'.$langs->trans('Margins').'</td>';
print '<td width="20%" align="right">'.$langs->trans('SellingPrice').'</td>';
@@ -3246,9 +3246,9 @@ abstract class CommonObject
print '<td align="right">'.price($marginInfo['pa_products'], null, null, null, null, $rounding).'</td>';
print '<td align="right">'.price($marginInfo['margin_on_products'], null, null, null, null, $rounding).'</td>';
if (! empty($conf->global->DISPLAY_MARGIN_RATES))
- print '<td align="right">'.(($marginInfo['margin_rate_products'] == '')?'n/a':price($marginInfo['margin_rate_products'], null, null, null, null, $rounding).'%').'</td>';
+ print '<td align="right">'.(($marginInfo['margin_rate_products'] == '')?'':price($marginInfo['margin_rate_products'], null, null, null, null, $rounding).'%').'</td>';
if (! empty($conf->global->DISPLAY_MARK_RATES))
- print '<td align="right">'.(($marginInfo['mark_rate_products'] == '')?'n/a':price($marginInfo['mark_rate_products'], null, null, null, null, $rounding).'%').'</td>';
+ print '<td align="right">'.(($marginInfo['mark_rate_products'] == '')?'':price($marginInfo['mark_rate_products'], null, null, null, null, $rounding).'%').'</td>';
print '</tr>';
print '<tr class="pair">';
print '<td>'.$langs->trans('MarginOnServices').'</td>';
@@ -3256,9 +3256,9 @@ abstract class CommonObject
print '<td align="right">'.price($marginInfo['pa_services'], null, null, null, null, $rounding).'</td>';
print '<td align="right">'.price($marginInfo['margin_on_services'], null, null, null, null, $rounding).'</td>';
if (! empty($conf->global->DISPLAY_MARGIN_RATES))
- print '<td align="right">'.(($marginInfo['margin_rate_services'] == '')?'n/a':price($marginInfo['margin_rate_services'], null, null, null, null, $rounding).'%').'</td>';
+ print '<td align="right">'.(($marginInfo['margin_rate_services'] == '')?'':price($marginInfo['margin_rate_services'], null, null, null, null, $rounding).'%').'</td>';
if (! empty($conf->global->DISPLAY_MARK_RATES))
- print '<td align="right">'.(($marginInfo['mark_rate_services'] == '')?'n/a':price($marginInfo['mark_rate_services'], null, null, null, null, $rounding).'%').'</td>';
+ print '<td align="right">'.(($marginInfo['mark_rate_services'] == '')?'':price($marginInfo['mark_rate_services'], null, null, null, null, $rounding).'%').'</td>';
print '</tr>';
//}
print '<tr class="impair">';
@@ -3267,9 +3267,9 @@ abstract class CommonObject
print '<td align="right">'.price($marginInfo['pa_total'], null, null, null, null, $rounding).'</td>';
print '<td align="right">'.price($marginInfo['total_margin'], null, null, null, null, $rounding).'</td>';
if (! empty($conf->global->DISPLAY_MARGIN_RATES))
- print '<td align="right">'.(($marginInfo['total_margin_rate'] == '')?'n/a':price($marginInfo['total_margin_rate'], null, null, null, null, $rounding).'%').'</td>';
+ print '<td align="right">'.(($marginInfo['total_margin_rate'] == '')?'':price($marginInfo['total_margin_rate'], null, null, null, null, $rounding).'%').'</td>';
if (! empty($conf->global->DISPLAY_MARK_RATES))
- print '<td align="right">'.(($marginInfo['total_mark_rate'] == '')?'n/a':price($marginInfo['total_mark_rate'], null, null, null, null, $rounding).'%').'</td>';
+ print '<td align="right">'.(($marginInfo['total_mark_rate'] == '')?'':price($marginInfo['total_mark_rate'], null, null, null, null, $rounding).'%').'</td>';
print '</tr>';
print '</table>';
}
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index 09517a5281c..54348b2d646 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -121,9 +121,16 @@ $coldisplay=-1; // We remove first td
<?php } ?>
</td>
- <?php if (! empty($conf->margin->enabled)) { ?>
+ <?php
+ if (! empty($usemargins))
+ {
+ ?>
<td align="right"><?php $coldisplay++; ?>
- <select id="fournprice" name="fournprice" class="hideobject"></select>
+ <!-- For predef product -->
+ <?php if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) { ?>
+ <select id="fournprice_predef" name="fournprice_predef" class="flat" style="display: none;"></select>
+ <?php } ?>
+ <!-- For free product -->
<input type="text" size="5" id="buying_price" name="buying_price" class="hideobject" value="<?php echo price($line->pa_ht,0,'',0); ?>">
</td>
<?php if ($user->rights->margins->creer) {
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index ee5688073ed..63eea66a591 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1839,6 +1839,9 @@ tr.liste_total td, form.liste_total div {
color: #202020;
}
+.tableforservicepart1 .impair, .tableforservicepart1 .pair, .tableforservicepart2 .impair, .tableforservicepart2 .pair {
+ background: none;
+}
/* Disable shadows */
.noshadow {
--
GitLab