Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Debug module blocked log

Browse Source
This commit is contained in:
Laurent Destailleur 2017-10-31 23:57:37 +01:00
parent 9458c80c48
commit 4220d02dd4
5 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/blockedlog/class/blockedlog.class.php
View File

@ -180,11 +180,11 @@ class BlockedLog
public function setObjectData(&$object)
{
// Set date
if($object->element == 'payment' || $object->element == 'payment_supplier')
if ($object->element == 'payment' || $object->element == 'payment_supplier')
{
$this->date_object = $object->datepaye;
}
if ($object->element=='payment_salary')
elseif ($object->element=='payment_salary')
{
$this->date_object = $object->datev;
}

4
htdocs/comm/action/index.php
View File

@ -1364,7 +1364,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
print '>';
print '<table class="centpercent cal_event'.(empty($event->transparency)?'':' cal_event_busy').'" style="'.$h;
print 'background: #'.$color.';';
print 'background: -webkit-gradient(linear, left top, left bottom, from(#'.dol_color_minus($color, 0).'), to(#'.dol_color_minus($color, 1).'));';
print 'background: -webkit-gradient(linear, left top, left bottom, from(#'.dol_color_minus($color, -4).'), to(#'.dol_color_minus($color, -3).'));';
//if (! empty($event->transparency)) print 'background: #'.$color.'; background: -webkit-gradient(linear, left top, left bottom, from(#'.$color.'), to(#'.dol_color_minus($color,1).'));';
//else print 'background-color: transparent !important; background: none; border: 1px solid #bbb;';
//print ' -moz-border-radius:4px;"';
@ -1572,7 +1572,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
* Change color with a delta
*
* @param string $color Color
* @param int $minus Delta (1 = 16 unit)
* @param int $minus Delta (1 = 16 unit). Positive value = darker color, Negative value = brighter color.
* @param int $minusunit Minus unit
* @return string New color
*/

2
htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
View File

@ -83,7 +83,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
$b=new BlockedLog($this->db);
$b->action = $action;
$b->amounts= $amounts;
$b->setObjectData($object); // Set field ref_object, fk_object, element, object_data
$b->setObjectData($object); // Set field date_object, ref_object, fk_object, element, object_data
$res = $b->create($user);

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

@ -3323,6 +3323,8 @@ img.datecallink { padding-left: 2px !important; padding-right: 2px !important; }
.ui-datepicker-trigger {
vertical-align: middle;
cursor: pointer;
padding-left: 2px;
padding-right: 2px;
}
.bodyline {
@ -3475,6 +3477,10 @@ a.websitebuttonsitepreviewdisabled img {
/* Module agenda */
/* ============================================================================== */
.dayevent .tagtr:first-of-type {
height: 24px;
}
.agendacell { height: 60px; }
table.cal_month { border-spacing: 0px; }
table.cal_month td:first-child { border-left: 0px; }

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

@ -3418,6 +3418,8 @@ img.datecallink { padding-left: 2px !important; padding-right: 2px !important; }
.ui-datepicker-trigger {
vertical-align: middle;
cursor: pointer;
padding-left: 2px;
padding-right: 2px;
}
.bodyline {
@ -3571,6 +3573,9 @@ a.websitebuttonsitepreviewdisabled img {
/* Module agenda */
/* ============================================================================== */
.dayevent .tagtr:first-of-type {
height: 24px;
}
.agendacell { height: 60px; }
table.cal_month { border-spacing: 0px; }
table.cal_month td:first-child { border-left: 0px; }