diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index dc2d2f872c5..b64eae56f2c 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -1425,11 +1425,13 @@ if ($id > 0 || ! empty($ref)) } // TODO test using div instead of tables - //print '
'; + //print '
'; print ''; // Show object lines if (! empty($object->lines)) $object->printObjectLines(0,$mysoc,$soc); + + //print '
'; /* * Form to add new line @@ -1463,8 +1465,8 @@ if ($id > 0 || ! empty($ref)) } // TODO test using div instead of tables - //print ''; print '
'; + //print '
'; print '
'; print "\n"; diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 37edc5f78d9..c6289411731 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -1466,16 +1466,17 @@ class CommonObject // TODO test using div instead of tables /* + print '
'; print '
'; print '
'; - print '
'.$langs->trans('Description').'
'; + print '
'.$langs->trans('Description').'
'; print '
'.$langs->trans('VAT').'
'; print '
'.$langs->trans('PriceUHT').'
'; print '
'.$langs->trans('Qty').'
'; print '
'.$langs->trans('ReductionShort').'
'; print '
'.$langs->trans('TotalHTShort').'
'; - print '
 
'; - print '
 
'; + print '
 
'; + print '
 
'; print '
 
'; print '
'; */ @@ -1495,7 +1496,9 @@ class CommonObject $num = count($this->lines); $var = true; $i = 0; - + + //print '
'; + foreach ($this->lines as $line) { $var=!$var; @@ -1511,6 +1514,8 @@ class CommonObject $i++; } + + //print '
'; } /** @@ -1561,6 +1566,7 @@ class CommonObject // Use global variables + $seller and $buyer include(DOL_DOCUMENT_ROOT.'/core/tpl/predefinedproductline_view.tpl.php'); + //include(DOL_DOCUMENT_ROOT.'/core/tpl/predefinedproductlinediv_view.tpl.php'); } else { diff --git a/htdocs/core/tpl/predefinedproductlinediv_view.tpl.php b/htdocs/core/tpl/predefinedproductlinediv_view.tpl.php new file mode 100644 index 00000000000..8a96f84e7ae --- /dev/null +++ b/htdocs/core/tpl/predefinedproductlinediv_view.tpl.php @@ -0,0 +1,106 @@ + + * Copyright (C) 2010-2011 Laurent Destailleur + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * $Id$ + */ +?> + + + +
> +
+ + textwithtooltip($text,$description,3,'','',$i,0,($line->fk_parent_line?img_picto('', 'rightarrow'):'')); + + // Show range + print_date_range($line->date_start, $line->date_end); + + // Add description in form + if ($conf->global->PRODUIT_DESC_IN_FORM) + { + print ($line->description && $line->description!=$line->product_label)?'
'.dol_htmlentitiesbr($line->description):''; + } + ?> +
+ +
tva_tx,'%',$line->info_bits); ?>
+ +
subprice); ?>
+ +
+ info_bits & 2) != 2) && $line->special_code != 3) echo $line->qty; + else echo ' '; ?> +
+ +
+ remise_percent) && $line->special_code != 3) { + echo dol_print_reduction($line->remise_percent,$langs); + } else { + echo ' '; + } ?> +
+ +
+ special_code == 3) { + echo $langs->trans('Option'); + } else { + echo price($line->total_ht); + } ?> +
+ + statut == 0 && $user->rights->$element->creer) { ?> +
+ info_bits & 2) == 2) { ?> + + id.'#'.$line->id; ?>"> + + + +
+ +
+ id; ?>"> + + +
+ + 1) { ?> +
+ 0) { ?> + id; ?>"> + + + + + id; ?>"> + + + +
+ +
 
+ + +
 
+
 
+
 
+ + +
+ diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index bdd3e7d62e0..6ea249010ba 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -1868,12 +1868,12 @@ A.none, A.none:active, A.none:visited, A.none:hover { /* Test using div instead of tables */ /* ============================================================================== */ -div.table { - display:table; +div.tablelines { + display: table; /* Joindre les bords des cellules */ - border-collapse:collapse; + border-collapse: collapse; /* Forcer le tableau à prendre la largeur écran */ - width:100%; + width: 100%; } div.thead { height: 24px; @@ -1884,30 +1884,44 @@ div.thead { font-family: ; /* border-bottom: 1px solid #FDFFFF; */ white-space: nowrap; - display:table-row-group; + display: table-row-group; } div.tfoot { - display:table-row-group; + display: table-row-group; } div.tbody { - display:table-row-group; + display: table-row-group; } div.tr { - display:table-row; + display: table-row; } div.td { - display:table-cell; + display: table-cell; text-align: right; - padding:5px; - width:auto; + padding: 5px; + width: 10%; } -div.td.desc { +div.td.firstcol { text-align: left; - width: 70%; + width: 65%; } -div.td.ten { - width: 10px; +div.td.endcol { + width: 5px; } div.end { - width:auto; + width: auto; +} + +div.dragClass { + color: #002255; +} +div.showDragHandle { + cursor: move; +} +div.tdlineupdown { + background-image: url(theme.'/img/grip.png' ?>); + background-repeat: no-repeat; + background-position: center center; + cursor: move; + white-space: nowrap; }