Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

FIX #6461

Browse Source
This commit is contained in:
Laurent Destailleur
2017-03-03 14:00:38 +01:00
parent 807eb56807
commit 08eaff729f
4 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/contrat/card.php
View File

@@ -62,13 +62,12 @@ $origin=GETPOST('origin','alpha');
$originid=GETPOST('originid','int');
$datecontrat='';
$usehm=(! empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE:0);
// Security check
if ($user->societe_id) $socid=$user->societe_id;
$result=restrictedArea($user,'contrat',$id);
$usehm=(! empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE:0);
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
$hookmanager->initHooks(array('contractcard','globalcard'));
@@ -1700,7 +1699,7 @@ else
if ($object->statut > 0)
{
print '<tr '.$bcnd[$var].'>';
print '<td colspan="'.($conf->margin->enabled?7:6).'"><hr class="opacitymedium"></td>';
print '<td class="tdhrthin" colspan="'.($conf->margin->enabled?7:6).'"><hr class="opacitymedium tdhrthin"></td>';
print "</tr>\n";
}
@@ -1862,7 +1861,7 @@ else
print $form->select_date($dateactend,"end",$usehm,$usehm,'',"active",1,0,1);
print '</td>';
print '<td align="center nohover" rowspan="2" valign="middle" class="nohover">';
print '<td class="center nohover" rowspan="2" valign="middle" class="nohover">';
print '<input type="submit" class="button" name="activate" value="'.$langs->trans("Activate").'"><br>';
print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
print '</td>';
@@ -1917,7 +1916,7 @@ else
}
print '</td>';
print '<td align="right" rowspan="2" class="nohover">';
print '<td rowspan="2" class="center nohover">';
print '<input type="submit" class="button" name="close" value="'.$langs->trans("Unactivate").'"><br>';
print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
print '</td></tr>';

11
htdocs/contrat/class/contrat.class.php
View File

@@ -608,6 +608,7 @@ class Contrat extends CommonObject
$extralabelsline=$extrafieldsline->fetch_name_optionals_label($line->table_element,true);
$this->lines=array();
$pos = 0;
// Selectionne les lignes contrats liees a un produit
$sql = "SELECT p.label as product_label, p.description as product_desc, p.ref as product_ref,";
@@ -693,8 +694,8 @@ class Contrat extends CommonObject
// fetch optionals attributes and labels
$line->fetch_optionals($line->id,$extralabelsline);
$this->lines[$i] = $line;
$this->lines_id_index_mapper[$line->id] = $i;
$this->lines[$pos] = $line;
$this->lines_id_index_mapper[$line->id] = $pos;
//dol_syslog("1 ".$line->desc);
//dol_syslog("2 ".$line->product_desc);
@@ -709,6 +710,7 @@ class Contrat extends CommonObject
$total_ht+=$objp->total_ht;
$i++;
$pos++;
}
$this->db->free($result);
}
@@ -798,14 +800,15 @@ class Contrat extends CommonObject
$line->fetch_optionals($line->id,$extralabelsline);
$this->lines[] = $line;
$this->lines_id_index_mapper[$line->id] = key($this->lines);
$this->lines[$pos] = $line;
$this->lines_id_index_mapper[$line->id] = $pos;
$total_ttc+=$objp->total_ttc;
$total_vat+=$objp->total_tva;
$total_ht+=$objp->total_ht;
$i++;
$pos++;
}
$this->db->free($result);

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

@@ -1047,7 +1047,6 @@ div.photoref {
vertical-align:middle;
text-align:center;
}
img.photorefnoborder {
padding: 2px;
height: 48px;
@@ -1060,7 +1059,10 @@ img.photorefnoborder {
.underbanner {
border-bottom: <?php echo $borderwith ?>px solid rgb(<?php echo $colortopbordertitle1 ?>);
}
.tdhrthin {
margin: 0;
padding-bottom: 0 !important;
}
/* ============================================================================== */
/* Menu top et 1ere ligne tableau */

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

@@ -1069,7 +1069,6 @@ div.photoref {
vertical-align:middle;
text-align:center;
}
img.photorefnoborder {
padding: 2px;
height: 48px;
@@ -1077,12 +1076,15 @@ img.photorefnoborder {
object-fit: contain;
border: 1px solid #CCC;
}
.underrefbanner {
}
.underbanner {
border-bottom: <?php echo $borderwith; ?>px solid rgb(<?php echo $colortopbordertitle1 ?>);
}
.tdhrthin {
margin: 0;
padding-bottom: 0 !important;
}
/* ============================================================================== */