lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix design of option PROJECT_ADD_SUBTOTAL_LINES

Browse Source
This commit is contained in:
Laurent Destailleur 2016-08-03 01:42:05 +02:00
parent 6ae8d26a89
commit abbe204c97
5 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/fourn/class/fournisseur.commande.class.php
View File

@ -1078,6 +1078,7 @@ class CommandeFournisseur extends CommonOrder
$sql.= ", note_public"; $sql.= ", note_public";
$sql.= ", entity"; $sql.= ", entity";
$sql.= ", fk_soc"; $sql.= ", fk_soc";
$sql.= ", fk_projet";
$sql.= ", date_creation"; $sql.= ", date_creation";
$sql.= ", date_livraison"; $sql.= ", date_livraison";
$sql.= ", fk_user_author"; $sql.= ", fk_user_author";
@ -1099,6 +1100,7 @@ class CommandeFournisseur extends CommonOrder
$sql.= ", '".$this->db->escape($this->note_public)."'"; $sql.= ", '".$this->db->escape($this->note_public)."'";
$sql.= ", ".$conf->entity; $sql.= ", ".$conf->entity;
$sql.= ", ".$this->socid; $sql.= ", ".$this->socid;
$sql.= ", ".($this->fk_project > 0 ? $this->fk_project : "null");
$sql.= ", '".$this->db->idate($now)."'"; $sql.= ", '".$this->db->idate($now)."'";
$sql.= ", ".($this->date_livraison?"'".$this->db->idate($this->date_livraison)."'":"null"); $sql.= ", ".($this->date_livraison?"'".$this->db->idate($this->date_livraison)."'":"null");
$sql.= ", ".$user->id; $sql.= ", ".$user->id;

3
htdocs/fourn/commande/card.php
View File

@ -971,7 +971,8 @@ if (empty($reshook))
$object->location_incoterms = GETPOST('location_incoterms', 'alpha'); $object->location_incoterms = GETPOST('location_incoterms', 'alpha');
$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha'); $object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
$object->multicurrency_tx = GETPOST('originmulticurrency_tx', 'int'); $object->multicurrency_tx = GETPOST('originmulticurrency_tx', 'int');
$object->fk_project = GETPOST('projectid');
// Fill array 'array_options' with data from add form // Fill array 'array_options' with data from add form
if (! $error) if (! $error)
{ {

2
htdocs/projet/element.php
View File

@ -876,7 +876,7 @@ foreach ($listofreferent as $key => $value)
if (canApplySubtotalOn($tablename)) if (canApplySubtotalOn($tablename))
{ {
$breakline='<tr class="liste_total">'; $breakline='<tr class="liste_total liste_sub_total">';
$breakline.='<td colspan="2">'; $breakline.='<td colspan="2">';
$breakline.='</td>'; $breakline.='</td>';
$breakline.='<td>'; $breakline.='<td>';

3
htdocs/theme/eldy/style.css.php
View File

@ -2760,6 +2760,9 @@ input.liste_titre {
form.liste_total div { form.liste_total div {
border-top: 1px solid #DDDDDD; border-top: 1px solid #DDDDDD;
} }
tr.liste_sub_total, tr.liste_sub_total td {
border-bottom: 2px solid #aaa;
}
.tableforservicepart1 .impair, .tableforservicepart1 .pair, .tableforservicepart2 .impair, .tableforservicepart2 .pair { .tableforservicepart1 .impair, .tableforservicepart1 .pair, .tableforservicepart2 .impair, .tableforservicepart2 .pair {
background: #FFF; background: #FFF;

4
htdocs/theme/md/style.css.php
View File

@ -2634,7 +2634,9 @@ input.liste_titre {
padding: 4px; padding: 4px;
height: 20px; height: 20px;
} }
tr.liste_sub_total, tr.liste_sub_total td {
border-bottom: 2px solid #aaa;
}
.tableforservicepart1 .impair, .tableforservicepart1 .pair, .tableforservicepart2 .impair, .tableforservicepart2 .pair { .tableforservicepart1 .impair, .tableforservicepart1 .pair, .tableforservicepart2 .impair, .tableforservicepart2 .pair {
background: #FFF; background: #FFF;