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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2020-10-10 15:45:22 +02:00
commit b36b9170b2
10 changed files with 331 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/docker/docker-compose.yml
View File

@ -12,8 +12,11 @@ services:
environment: environment:
MYSQL_ROOT_PASSWORD: root MYSQL_ROOT_PASSWORD: root
MYSQL_DATABASE: dolibarr MYSQL_DATABASE: dolibarr
ports:
- "3306:3306"
networks: networks:
- internal-pod - internal-pod
- external-pod
phpmyadmin: phpmyadmin:
image: phpmyadmin/phpmyadmin image: phpmyadmin/phpmyadmin

4
htdocs/accountancy/admin/account.php
View File

@ -485,11 +485,11 @@ if ($resql)
// Action // Action
print '<td class="center">'; print '<td class="center">';
if ($user->rights->accounting->chartofaccount) { if ($user->rights->accounting->chartofaccount) {
print '<a class="editfielda" href="./card.php?action=update&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?chartofaccounts='.$object->id).'">'; print '<a class="editfielda" href="./card.php?action=update&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?'.$param).'">';
print img_edit(); print img_edit();
print '</a>'; print '</a>';
print '&nbsp;'; print '&nbsp;';
print '<a class="marginleftonly" href="./card.php?action=delete&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?chartofaccounts='.$object->id).'">'; print '<a class="marginleftonly" href="./card.php?action=delete&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?'.$param).'">';
print img_delete(); print img_delete();
print '</a>'; print '</a>';
} }

11
htdocs/core/class/html.formother.class.php
View File

@ -952,12 +952,21 @@ class FormOther
* @param int $invert Invert * @param int $invert Invert
* @param string $option Option * @param string $option Option
* @param string $morecss More css * @param string $morecss More css
* @param bool $addjscombo Add js combo
* @return string * @return string
*/ */
public function selectyear($selected = '', $htmlname = 'yearid', $useempty = 0, $min_year = 10, $max_year = 5, $offset = 0, $invert = 0, $option = '', $morecss = 'valignmiddle maxwidth75imp') public function selectyear($selected = '', $htmlname = 'yearid', $useempty = 0, $min_year = 10, $max_year = 5, $offset = 0, $invert = 0, $option = '', $morecss = 'valignmiddle maxwidth75imp', $addjscombo = false)
{ {
$out = ''; $out = '';
// Add code for jquery to use multiselect
if ($addjscombo)
{
// Enhance with select2
include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
$out .= ajax_combobox($htmlname);
}
$currentyear = date("Y") + $offset; $currentyear = date("Y") + $offset;
$max_year = $currentyear + $max_year; $max_year = $currentyear + $max_year;
$min_year = $currentyear - $min_year; $min_year = $currentyear - $min_year;

20
htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
View File

@ -134,7 +134,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
$this->name = "canelle"; $this->name = "canelle";
$this->description = $langs->trans('SuppliersInvoiceModel'); $this->description = $langs->trans('SuppliersInvoiceModel');
// Dimension page // Page dimensions
$this->type = 'pdf'; $this->type = 'pdf';
$formatarray = pdf_getFormat(); $formatarray = pdf_getFormat();
$this->page_largeur = $formatarray['width']; $this->page_largeur = $formatarray['width'];
@ -145,12 +145,12 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10; $this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10; $this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
$this->option_logo = 1; // Affiche logo $this->option_logo = 1; // Display logo
$this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION $this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
$this->option_modereg = 1; // Affiche mode reglement $this->option_modereg = 1; // Display payment mode
$this->option_condreg = 1; // Affiche conditions reglement $this->option_condreg = 1; // Display payment terms
$this->option_codeproduitservice = 1; // Affiche code produit-service $this->option_codeproduitservice = 1; // Display product-service code
$this->option_multilang = 1; // Dispo en plusieurs langues $this->option_multilang = 1; // Available in several languages
// Define column position // Define column position
$this->posxdesc = $this->marge_gauche + 1; $this->posxdesc = $this->marge_gauche + 1;
@ -489,7 +489,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
$pdf->SetXY($this->postotalht, $curY); $pdf->SetXY($this->postotalht, $curY);
$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $total_excl_tax, 0, 'R', 0); $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva // Collection of totals by VAT value in $this->tva["taux"]=total_tva
if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva; if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva;
else $tvaligne = $object->lines[$i]->total_tva; else $tvaligne = $object->lines[$i]->total_tva;
@ -668,7 +668,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
$this->atleastoneratenotnull = 0; $this->atleastoneratenotnull = 0;
foreach ($this->tva as $tvakey => $tvaval) foreach ($this->tva as $tvakey => $tvaval)
{ {
if ($tvakey > 0) // On affiche pas taux 0 if ($tvakey > 0) // We do not display rate 0
{ {
$this->atleastoneratenotnull++; $this->atleastoneratenotnull++;
@ -1209,7 +1209,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
} }
//Recipient name //Recipient name
// On peut utiliser le nom de la societe du contact // We can use the name of the contact's company
if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) { if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
$thirdparty = $object->contact; $thirdparty = $object->contact;
} else { } else {

14
htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
View File

@ -142,13 +142,13 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10; $this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10; $this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
$this->option_logo = 1; // Affiche logo $this->option_logo = 1; // Display logo
$this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION $this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
$this->option_modereg = 1; // Affiche mode reglement $this->option_modereg = 1; // Display payment mode
$this->option_condreg = 1; // Affiche conditions reglement $this->option_condreg = 1; // Display payment terms
$this->option_codeproduitservice = 1; // Affiche code produit-service $this->option_codeproduitservice = 1; // Display product-service code
$this->option_multilang = 1; // Dispo en plusieurs langues $this->option_multilang = 1; // Available in several languages
$this->option_escompte = 0; // Affiche si il y a eu escompte $this->option_escompte = 0; // Displays if there has been a discount
$this->option_credit_note = 0; // Support credit notes $this->option_credit_note = 0; // Support credit notes
$this->option_freetext = 1; // Support add of a personalised text $this->option_freetext = 1; // Support add of a personalised text
$this->option_draft_watermark = 1; // Support add of a watermark on drafts $this->option_draft_watermark = 1; // Support add of a watermark on drafts

10
htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
View File

@ -139,8 +139,8 @@ class pdf_standard extends ModelePDFSuppliersPayments
$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10; $this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10; $this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
$this->option_logo = 1; // Affiche logo $this->option_logo = 1; // Display logo
$this->option_multilang = 1; // Dispo en plusieurs langues $this->option_multilang = 1; // Available in several languages
// Define column position // Define column position
$this->posxdate = $this->marge_gauche + 1; $this->posxdate = $this->marge_gauche + 1;
@ -168,7 +168,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
$this->atleastoneratenotnull = 0; $this->atleastoneratenotnull = 0;
$this->atleastonediscount = 0; $this->atleastonediscount = 0;
// Recupere emetteur // Get source company
$this->emetteur = $mysoc; $this->emetteur = $mysoc;
if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
} }
@ -462,13 +462,13 @@ class pdf_standard extends ModelePDFSuppliersPayments
$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1; $bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
} }
// Affiche zone cheèque // Display check zone
$posy = $this->_tableau_cheque($pdf, $object, $bottomlasttab, $outputlangs); $posy = $this->_tableau_cheque($pdf, $object, $bottomlasttab, $outputlangs);
// Affiche zone totaux // Affiche zone totaux
//$posy=$this->_tableau_tot($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs); //$posy=$this->_tableau_tot($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
// Pied de page // Footer page
$this->_pagefoot($pdf, $object, $outputlangs); $this->_pagefoot($pdf, $object, $outputlangs);
if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages(); if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();

426
htdocs/holiday/view_log.php
View File

@ -25,9 +25,16 @@
*/ */
require '../main.inc.php'; require '../main.inc.php';
// Security check (access forbidden for external user too)
if (empty($user->rights->holiday->define_holiday) || $user->socid > 0) {
accessforbidden();
}
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php'; require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
$action = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ... $action = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists) $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
@ -39,15 +46,15 @@ $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ')
$backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print') $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
$search_id = GETPOST('search_id', 'alpha'); $search_id = GETPOST('search_id', 'alphanohtml');
$search_prev_solde = GETPOST('search_prev_solde', 'alpha'); $search_month = GETPOST('search_month', 'int');
$search_new_solde = GETPOST('search_new_solde', 'alpha'); $search_year = GETPOST('search_year', 'int');
$year = GETPOST('year'); $search_employee = GETPOST('search_employee', 'int');
if (empty($year)) $search_validator = GETPOST('search_validator', 'int');
{ $search_description = GETPOST('search_description', 'alphanohtml');
$tmpdate = dol_getdate(dol_now()); $search_type = GETPOST('search_type', 'int');
$year = $tmpdate['year']; $search_prev_solde = GETPOST('search_prev_solde', 'alphanohtml');
} $search_new_solde = GETPOST('search_new_solde', 'alphanohtml');
// Load variable for pagination // Load variable for pagination
$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit; $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
@ -61,10 +68,6 @@ $pagenext = $page + 1;
if (! $sortfield) $sortfield="cpl.rowid"; if (! $sortfield) $sortfield="cpl.rowid";
if (! $sortorder) $sortorder="DESC"; if (! $sortorder) $sortorder="DESC";
// Protection if external user
if ($user->socid > 0) accessforbidden();
// Si l'utilisateur n'a pas le droit de lire cette page // Si l'utilisateur n'a pas le droit de lire cette page
if (!$user->rights->holiday->read_all) accessforbidden(); if (!$user->rights->holiday->read_all) accessforbidden();
@ -92,81 +95,126 @@ $parameters = array();
$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
if (empty($reshook)) if (empty($reshook)) {
{ // Selection of new fields
// Selection of new fields include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
// Purge search criteria // Purge search criteria
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
{ $search_id = '';
$search_id = ''; $search_month = '';
$toselect = ''; $search_year = '';
$search_array_options = array(); $search_employee = '';
} $search_validator = '';
$search_description = '';
$search_type = '';
$search_prev_solde = '';
$search_new_solde = '';
$toselect = '';
$search_array_options = array();
}
if (GETPOST('button_removefilter_x', 'alpha') if (GETPOST('button_removefilter_x', 'alpha')
|| GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter.x', 'alpha')
|| GETPOST('button_removefilter', 'alpha') || GETPOST('button_removefilter', 'alpha')
|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search_x', 'alpha')
|| GETPOST('button_search.x', 'alpha') || GETPOST('button_search.x', 'alpha')
|| GETPOST('button_search', 'alpha')) || GETPOST('button_search', 'alpha'))
{ {
$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation $massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
} }
// Mass actions // Mass actions
/*$objectclass='MyObject'; /*$objectclass='MyObject';
$objectlabel='MyObject'; $objectlabel='MyObject';
$permissiontoread = $user->rights->mymodule->read; $permissiontoread = $user->rights->mymodule->read;
$permissiontodelete = $user->rights->mymodule->delete; $permissiontodelete = $user->rights->mymodule->delete;
$uploaddir = $conf->mymodule->dir_output; $uploaddir = $conf->mymodule->dir_output;
include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
*/ */
} }
// Definition of fields for lists // Definition of fields for lists
$arrayfields = array( $arrayfields = array(
'cpl.rowid'=>array('label'=>$langs->trans("ID"), 'checked'=>1), 'cpl.rowid'=>array('label'=>$langs->trans("ID"), 'checked'=>1),
'cpl.date_action'=>array('label'=>$langs->trans("Date"), 'checked'=>1), 'cpl.date_action'=>array('label'=>$langs->trans("Date"), 'checked'=>1),
'cpl.fk_user_action'=>array('label'=>$langs->trans("ActionByCP"), 'checked'=>1), 'cpl.fk_user_action'=>array('label'=>$langs->trans("ActionByCP"), 'checked'=>1),
'cpl.fk_user_update'=>array('label'=>$langs->trans("UserUpdateCP"), 'checked'=>1), 'cpl.fk_user_update'=>array('label'=>$langs->trans("UserUpdateCP"), 'checked'=>1),
'cpl.type_action'=>array('label'=>$langs->trans("Description"), 'checked'=>1), 'cpl.type_action'=>array('label'=>$langs->trans("Description"), 'checked'=>1),
'cpl.fk_type'=>array('label'=>$langs->trans("Type"), 'checked'=>1), 'cpl.fk_type'=>array('label'=>$langs->trans("Type"), 'checked'=>1),
'cpl.prev_solde'=>array('label'=>$langs->trans("PrevSoldeCP"), 'checked'=>1), 'cpl.prev_solde'=>array('label'=>$langs->trans("PrevSoldeCP"), 'checked'=>1),
'variation'=>array('label'=>$langs->trans("Variation"), 'checked'=>1), 'variation'=>array('label'=>$langs->trans("Variation"), 'checked'=>1),
'cpl.new_solde'=>array('label'=>$langs->trans("NewSoldeCP"), 'checked'=>1), 'cpl.new_solde'=>array('label'=>$langs->trans("NewSoldeCP"), 'checked'=>1),
); );
/* /*
* View * View
*/ */
$form = new Form($db); $form = new Form($db);
$formother = new FormOther($db);
$holidaylogstatic = new stdClass();
$alltypeleaves = $object->getTypes(1, -1); // To have labels $alltypeleaves = $object->getTypes(1, -1); // To have labels
llxHeader('', $langs->trans('CPTitreMenu').' ('.$langs->trans("Year").' '.$year.')'); llxHeader('', $langs->trans('CPTitreMenu'));
$sqlwhere = " AND date_action BETWEEN ". $sqlwhere = '';
$sqlwhere.= "'".$db->idate(dol_get_first_day($year, 1, 1))."'";
$sqlwhere.= " AND ";
$sqlwhere.= "'".$db->idate(dol_get_last_day($year, 12, 1))."'";
if ($search_id != '') $sqlwhere.= natural_search('rowid', $search_id, 1); if (!empty($search_year) && $search_year > 0) {
if ($search_prev_solde != '') $sqlwhere.= natural_search('prev_solde', $search_prev_solde, 1); if (!empty($search_month) && $search_month > 0) {
if ($search_new_solde != '') $sqlwhere.= natural_search('new_solde', $search_new_solde, 1); $from_date = dol_get_first_day($search_year, $search_month, 1);
$to_date = dol_get_last_day($search_year, $search_month, 1);
} else {
$from_date = dol_get_first_day($search_year, 1, 1);
$to_date = dol_get_last_day($search_year, 12, 1);
}
$sqlwhere .= "AND date_action BETWEEN '".$db->idate($from_date)."' AND '".$db->idate($to_date)."'";
}
if (!empty($search_id) && $search_id > 0) $sqlwhere.= natural_search('rowid', $search_id, 1);
if (!empty($search_validator) && $search_validator > 0) $sqlwhere.= natural_search('fk_user_action', $search_validator, 1);
if (!empty($search_employee) && $search_employee > 0) $sqlwhere.= natural_search('fk_user_update', $search_employee, 1);
if (!empty($search_description)) $sqlwhere.= natural_search('type_action', $search_description);
if (!empty($search_type) && $search_type > 0) $sqlwhere.= natural_search('fk_type', $search_type, 1);
if (!empty($search_prev_solde)) $sqlwhere.= natural_search('prev_solde', $search_prev_solde, 1);
if (!empty($search_new_solde)) $sqlwhere.= natural_search('new_solde', $search_new_solde, 1);
$sqlorder = $db->order($sortfield, $sortorder); $sqlorder = $db->order($sortfield, $sortorder);
// Recent changes are more important than old changes // Recent changes are more important than old changes
$log_holiday = $object->fetchLog($sqlorder, $sqlwhere); // Load $object->logs $log_holiday = $object->fetchLog($sqlorder, $sqlwhere); // Load $object->logs
// Count total nb of records
$nbtotalofrecords = '';
if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
//TODO: $result = $db->query($sql);
//TODO: $nbtotalofrecords = $db->num_rows($result);
$nbtotalofrecords = is_array($object->logs) ? count($object->logs) : 0;
if (($page * $limit) > $nbtotalofrecords) { // if total resultset is smaller then paging size (filtering), goto and load page 0
$page = 0;
$offset = 0;
}
}
// TODO: $num = $db->num_rows($resql);
$num = is_array($object->logs) ? count($object->logs) : 0;
$param = ''; $param = '';
if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage); if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit); if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
if ($search_id) $param = '&search_id='.urlencode($search_id); if (!empty($search_id)) $param .= '&search_statut='.urlencode($search_statut);
if (!empty($search_month) && $search_month > 0) $param .= '&search_month='.urlencode($search_month);
if (!empty($search_year) && $search_year > 0) $param .= '&search_year='.urlencode($search_year);
if (!empty($search_validator) && $search_validator > 0) $param .= '&search_validator='.urlencode($search_validator);
if (!empty($search_employee) && $search_employee > 0) $param .= '&search_employee='.urlencode($search_employee);
if (!empty($search_description)) $param .= '&search_description='.urlencode($search_description);
if (!empty($search_type) && $search_type > 0) $param .= '&search_type='.urlencode($search_type);
if (!empty($search_prev_solde)) $param .= '&search_prev_solde='.urlencode($search_prev_solde);
if (!empty($search_new_solde)) $param .= '&search_new_solde='.urlencode($search_new_solde);
print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'; print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">'; if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@ -178,44 +226,23 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="page" value="'.$page.'">';
print '<input type="hidden" name="contextpage" value="'.$contextpage.'">'; print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
$pagination = '<div class="pagination">'; $newcardbutton = dolGetButtonTitle($langs->trans('MenuAddCP'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/holiday/card.php?action=request', '', $user->rights->holiday->write);
$pagination.= '<ul>'; print_barre_liste($langs->trans('LogCP'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_hrm', 0, $newcardbutton, '', $limit, 0, 0, 1);
$pagination.= '<li class="pagination">';
$pagination.= '<a href="'.$_SERVER["PHP_SELF"].'?year='.($year - 1).$param.'">'; print '<div class="info">'.$langs->trans('LastUpdateCP').': ';
$pagination.= '<i class="fa fa-chevron-left" title="Previous"></i>';
$pagination.= '</a>';
$pagination.= '<li class="pagination">';
$pagination.= '<span class="active">'.$langs->trans("Year").' '.$year.'</span>';
$pagination.= '</li>';
$pagination.= '<li class="pagination">';
$pagination.= '<a href="'.$_SERVER["PHP_SELF"].'?year='.($year + 1).$param.'">';
$pagination.= '<i class="fa fa-chevron-right" title="Next"></i>';
$pagination.= '</a>';
$pagination.= '</li>';
$pagination.= '</li>';
$pagination.= '</ul>';
$pagination.= '</div>';
print load_fiche_titre($langs->trans('LogCP'), $pagination, 'title_hrm.png');
print '<div class="info">'.$langs->trans('LastUpdateCP').': '."\n";
$lastUpdate = $object->getConfCP('lastUpdate'); $lastUpdate = $object->getConfCP('lastUpdate');
if ($lastUpdate) if ($lastUpdate) {
{ $monthLastUpdate = $lastUpdate[4].$lastUpdate[5];
$monthLastUpdate = $lastUpdate[4].$lastUpdate[5]; $yearLastUpdate = $lastUpdate[0].$lastUpdate[1].$lastUpdate[2].$lastUpdate[3];
$yearLastUpdate = $lastUpdate[0].$lastUpdate[1].$lastUpdate[2].$lastUpdate[3]; print '<strong>'.dol_print_date($db->jdate($object->getConfCP('lastUpdate')), 'dayhour', 'tzuser').'</strong>';
print '<strong>'.dol_print_date($db->jdate($object->getConfCP('lastUpdate')), 'dayhour', 'tzuser').'</strong>'; print '<br>';
print '<br>'.$langs->trans("MonthOfLastMonthlyUpdate").': <strong>'.$yearLastUpdate.'-'.$monthLastUpdate.'</strong>'."\n"; print $langs->trans("MonthOfLastMonthlyUpdate").': <strong>'.$yearLastUpdate.'-'.$monthLastUpdate.'</strong>';
} else {
print $langs->trans('None');
} }
else { print '</div>';
print $langs->trans('None'); print '<br>';
}
print "</div><br>\n";
$moreforfilter = ''; $moreforfilter = '';
@ -225,20 +252,84 @@ $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfiel
$selectedfields.=(count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); $selectedfields.=(count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
print '<div class="div-table-responsive">'; print '<div class="div-table-responsive">';
print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'" id="tablelines3">'."\n"; print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'" id="tablelines3">';
print '<tbody>'; print '<tr class="liste_titre_filter">';
// Filter Id
if (!empty($arrayfields['cpl.rowid']['checked'])) {
print '<td class="liste_titre"><input type="text" class="maxwidth50" name="search_id" value="'.$search_id.'"></td>';
}
// Filter: Date
if (!empty($arrayfields['cpl.date_action']['checked'])) {
print '<td class="liste_titre right">';
print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month" value="'.dol_escape_htmltag($search_month).'">';
print $formother->selectyear($search_year, 'search_year', 1, 10, 5, 0, 0, '', 'maxwidth200', true);
print '</td>';
}
// Filter: Validator
if (!empty($arrayfields['cpl.fk_user_action']['checked'])) {
$validator = new UserGroup($db);
$excludefilter = $user->admin ? '' : 'u.rowid <> '.$user->id;
$valideurobjects = $validator->listUsersForGroup($excludefilter);
$valideurarray = array();
foreach ($valideurobjects as $val) {
$valideurarray[$val->id] = $val->id;
}
print '<td class="liste_titre">';
print $form->select_dolusers($search_validator, "search_validator", 1, "", 0, $valideurarray, '', 0, 0, 0, $morefilter, 0, '', 'maxwidth200');
print '</td>';
}
// Filter: User
if (!empty($arrayfields['cpl.fk_user_update']['checked'])) {
print '<td class="liste_titre">';
print $form->select_dolusers($search_employee, "search_employee", 1, "", $disabled, $include, '', 0, 0, 0, $morefilter, 0, '', 'maxwidth200');
print '</td>';
}
// Filter: Description
if (!empty($arrayfields['cpl.type_action']['checked'])) {
print '<td class="liste_titre">';
print '<input type="text" class="maxwidth50" name="search_description" value="'.$search_description.'">';
print '</td>';
}
// Filter: Type
if (!empty($arrayfields['cpl.fk_type']['checked'])) {
foreach ($alltypeleaves as $key => $val) {
$labeltoshow = ($langs->trans($val['code']) != $val['code'] ? $langs->trans($val['code']) : $val['label']);
$arraytypeleaves[$val['rowid']] = $labeltoshow;
}
print '<td class="liste_titre">';
print $form->selectarray('search_type', $arraytypeleaves, $search_type, 1, 0, 0, '', 0, 0, 0, '', '', 1);
print '</td>';
}
// Filter: Previous balance
if (!empty($arrayfields['cpl.prev_solde']['checked'])) {
print '<td class="liste_titre">';
print '<input type="text" class="maxwidth50" name="search_prev_solde" value="'.$search_prev_solde.'">';
print '</td>';
}
// Filter: Variation (only placeholder)
if (!empty($arrayfields['variation']['checked'])) {
print '<td class="liste_titre"></td>';
}
// Filter: New Balance
if (!empty($arrayfields['cpl.new_solde']['checked'])) {
print '<td class="liste_titre">';
print '<input type="text" class="maxwidth50" name="search_new_solde" value="'.$search_new_solde.'">';
print '</td>';
}
print '<tr class="liste_titre">';
if (!empty($arrayfields['cpl.rowid']['checked'])) print '<td class="liste_titre"><input type="text" class="maxwidth50" name="search_id" value="'.$search_id.'"></td>';
if (!empty($arrayfields['cpl.date_action']['checked'])) print '<td class="liste_titre"></td>';
if (!empty($arrayfields['cpl.fk_user_action']['checked'])) print '<td class="liste_titre"></td>';
if (!empty($arrayfields['cpl.fk_user_update']['checked'])) print '<td class="liste_titre"></td>';
if (!empty($arrayfields['cpl.type_action']['checked'])) print '<td class="liste_titre"></td>';
if (!empty($arrayfields['cpl.fk_type']['checked'])) print '<td class="liste_titre"></td>';
if (!empty($arrayfields['cpl.prev_solde']['checked'])) print '<td class="liste_titre"><input type="text" class="maxwidth50" name="search_prev_solde" value="'.$search_prev_solde.'"></td>';
if (!empty($arrayfields['variation']['checked'])) print '<td class="liste_titre"></td>';
if (!empty($arrayfields['cpl.new_solde']['checked'])) print '<td class="liste_titre"><input type="text" class="maxwidth50" name="search_new_solde" value="'.$search_new_solde.'"></td>';
// Action column // Action column
print '<td class="liste_titre maxwidthsearch">'; print '<td class="liste_titre maxwidthsearch">';
$searchpicto = $form->showFilterButtons(); $searchpicto = $form->showFilterButtons();
@ -256,51 +347,102 @@ if (!empty($arrayfields['cpl.fk_type']['checked'])) print_liste_field_titre($arr
if (!empty($arrayfields['cpl.prev_solde']['checked'])) print_liste_field_titre($arrayfields['cpl.prev_solde']['label'], $_SERVER["PHP_SELF"], 'prev_solde', '', '', '', $sortfield, $sortorder, 'right '); if (!empty($arrayfields['cpl.prev_solde']['checked'])) print_liste_field_titre($arrayfields['cpl.prev_solde']['label'], $_SERVER["PHP_SELF"], 'prev_solde', '', '', '', $sortfield, $sortorder, 'right ');
if (!empty($arrayfields['variation']['checked'])) print_liste_field_titre($arrayfields['variation']['label'], $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'right '); if (!empty($arrayfields['variation']['checked'])) print_liste_field_titre($arrayfields['variation']['label'], $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'right ');
if (!empty($arrayfields['cpl.new_solde']['checked'])) print_liste_field_titre($arrayfields['cpl.new_solde']['label'], $_SERVER["PHP_SELF"], 'new_solde', '', '', '', $sortfield, $sortorder, 'right '); if (!empty($arrayfields['cpl.new_solde']['checked'])) print_liste_field_titre($arrayfields['cpl.new_solde']['label'], $_SERVER["PHP_SELF"], 'new_solde', '', '', '', $sortfield, $sortorder, 'right ');
print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n"; print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
print '</tr>'; print '</tr>';
// TODO: $i = 0;
$i = 1;
foreach ($object->logs as $logs_CP) while ($i < min($num, $limit))
{ {
$user_action = new User($db); //TODO: $obj = $db->fetch_object($resql);
$user_action->fetch($logs_CP['fk_user_action']); $obj = next($object->logs);
$user_update = new User($db); $holidaylogstatic->id = $obj['rowid'];
$user_update->fetch($logs_CP['fk_user_update']); $holidaylogstatic->date = $obj['date_action'];
$holidaylogstatic->validator = $obj['fk_user_action'];
$holidaylogstatic->employee = $obj['fk_user_update'];
$holidaylogstatic->description = $obj['type_action'];
$holidaylogstatic->type = $obj['fk_type'];
$holidaylogstatic->balance_previous = $obj['prev_solde'];
$holidaylogstatic->balance_new = $obj['new_solde'];
$delta = price2num($logs_CP['new_solde'] - $logs_CP['prev_solde'], 5); print '<tr class="oddeven">';
$detasign = ($delta > 0 ? '+' : '');
print '<tr class="oddeven">'; // Id
if (!empty($arrayfields['cpl.rowid']['checked'])) print '<td>'.$logs_CP['rowid'].'</td>'; if (!empty($arrayfields['cpl.rowid']['checked'])) {
if (!empty($arrayfields['cpl.date_action']['checked'])) print '<td style="text-align: center;">'.$logs_CP['date_action'].'</td>'; print '<td>'.$holidaylogstatic->id.'</td>';
if (!empty($arrayfields['cpl.fk_user_action']['checked'])) print '<td>'.$user_action->getNomUrl(-1).'</td>'; }
if (!empty($arrayfields['cpl.fk_user_update']['checked'])) print '<td>'.$user_update->getNomUrl(-1).'</td>';
if (!empty($arrayfields['cpl.type_action']['checked'])) print '<td>'.$logs_CP['type_action'].'</td>';
if (!empty($arrayfields['cpl.fk_type']['checked']))
{
print '<td>';
$label = (($alltypeleaves[$logs_CP['fk_type']]['code'] && $langs->trans($alltypeleaves[$logs_CP['fk_type']]['code']) != $alltypeleaves[$logs_CP['fk_type']]['code']) ? $langs->trans($alltypeleaves[$logs_CP['fk_type']]['code']) : $alltypeleaves[$logs_CP['fk_type']]['label']);
print $label ? $label : $logs_CP['fk_type'];
print '</td>';
}
if (!empty($arrayfields['cpl.prev_solde']['checked'])) print '<td style="text-align: right;">'.price2num($logs_CP['prev_solde'], 5).' '.$langs->trans('days').'</td>'; // Date
if (!empty($arrayfields['variation']['checked'])) print '<td style="text-align: right;">'.$detasign.$delta.'</td>'; if (!empty($arrayfields['cpl.date_action']['checked'])) {
if (!empty($arrayfields['cpl.new_solde']['checked'])) print '<td style="text-align: right;">'.price2num($logs_CP['new_solde'], 5).' '.$langs->trans('days').'</td>'; print '<td style="text-align: center">'.$holidaylogstatic->date.'</td>';
print '<td></td>'; }
print '</tr>'."\n";
// Validator
if (!empty($arrayfields['cpl.fk_user_action']['checked'])) {
$user_action = new User($db);
$user_action->fetch($holidaylogstatic->validator);
print '<td>'.$user_action->getNomUrl(-1).'</td>';
}
// Emloyee
if (!empty($arrayfields['cpl.fk_user_update']['checked'])) {
$user_update = new User($db);
$user_update->fetch($holidaylogstatic->employee);
print '<td>'.$user_update->getNomUrl(-1).'</td>';
}
// Description
if (!empty($arrayfields['cpl.type_action']['checked'])) {
print '<td>'.$holidaylogstatic->description.'</td>';
}
// Type
if (!empty($arrayfields['cpl.fk_type']['checked'])) {
if ($alltypeleaves[$holidaylogstatic->type]['code'] && $langs->trans($alltypeleaves[$holidaylogstatic->type]['code']) != $alltypeleaves[$holidaylogstatic->type]['code']) {
$label = $langs->trans($alltypeleaves[$holidaylogstatic->type]['code']);
} else {
$label = $alltypeleaves[$holidaylogstatic->type]['label'];
}
print '<td>';
print $label ? $label : $holidaylogstatic->type;
print '</td>';
}
// Previous balance
if (!empty($arrayfields['cpl.prev_solde']['checked'])) {
print '<td style="text-align: right;">'.price2num($holidaylogstatic->balance_previous, 5).' '.$langs->trans('days').'</td>';
}
// Variation
if (!empty($arrayfields['variation']['checked'])) {
$delta = price2num($holidaylogstatic->balance_new - $holidaylogstatic->balance_previous, 5);
$detasign = ($delta > 0 ? '+' : '');
print '<td style="text-align: right;">'.$detasign.$delta.'</td>';
}
// New Balance
if (!empty($arrayfields['cpl.new_solde']['checked'])) {
print '<td style="text-align: right;">'.price2num($holidaylogstatic->balance_new, 5).' '.$langs->trans('days').'</td>';
}
// Buttons
print '<td></td>';
print '</tr>';
$i++;
} }
if ($log_holiday == '2') if ($log_holiday == '2') {
{ print '<tr class="opacitymedium">';
print '<tr class="opacitymedium">'; print '<td colspan="10" class="opacitymedium">'.$langs->trans('NoRecordFound').'</td>';
print '<td colspan="10" class="opacitymedium">'.$langs->trans('NoRecordFound').'</td>'; print '</tr>';
print '</tr>';
} }
print '</tbody>'."\n"; print '</table>';
print '</table>'."\n";
print '</div>'; print '</div>';
print '</form>'; print '</form>';

3
htdocs/install/mysql/migration/12.0.0-13.0.0.sql
View File

@ -358,6 +358,9 @@ ALTER TABLE llx_website_page ADD COLUMN fk_object varchar(255);
DELETE FROM llx_const WHERE name in ('MAIN_INCLUDE_ZERO_VAT_IN_REPORTS'); DELETE FROM llx_const WHERE name in ('MAIN_INCLUDE_ZERO_VAT_IN_REPORTS');
UPDATE llx_projet_task_time SET tms = null WHERE tms = 0;
ALTER TABLE llx_projet_task_time MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
ALTER TABLE llx_projet_task_time MODIFY COLUMN datec datetime; ALTER TABLE llx_projet_task_time MODIFY COLUMN datec datetime;
DELETE FROM llx_user_rights WHERE fk_id IN (SELECT id FROM llx_rights_def where module = 'holiday' and perms = 'lire_tous'); DELETE FROM llx_user_rights WHERE fk_id IN (SELECT id FROM llx_rights_def where module = 'holiday' and perms = 'lire_tous');

10
htdocs/modulebuilder/template/myobject_agenda.php
View File

@ -223,13 +223,15 @@ if ($object->id > 0)
$objthirdparty = $object; $objthirdparty = $object;
$objcon = new stdClass(); $objcon = new stdClass();
$out = '&origin='.$object->element.'&originid='.$object->id; $out = '&origin='.urlencode($object->element.'@'.$object->module).'&originid='.urlencode($object->id);
$urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id;
$out .= '&backtopage='.urlencode($urlbacktopage);
$permok = $user->rights->agenda->myactions->create; $permok = $user->rights->agenda->myactions->create;
if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok)
{ {
//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'; //$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
if (get_class($objthirdparty) == 'Societe') $out .= '&amp;socid='.$objthirdparty->id; if (get_class($objthirdparty) == 'Societe') $out .= '&socid='.urlencode($objthirdparty->id);
$out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;backtopage=1&amp;percentage=-1'; $out .= (!empty($objcon->id) ? '&contactid='.urlencode($objcon->id) : '').'&percentage=-1';
//$out.=$langs->trans("AddAnAction").' '; //$out.=$langs->trans("AddAnAction").' ';
//$out.=img_picto($langs->trans("AddAnAction"),'filenew'); //$out.=img_picto($langs->trans("AddAnAction"),'filenew');
//$out.="</a>"; //$out.="</a>";
@ -264,7 +266,7 @@ if ($object->id > 0)
$filters['search_agenda_label'] = $search_agenda_label; $filters['search_agenda_label'] = $search_agenda_label;
// TODO Replace this with same code than into list.php // TODO Replace this with same code than into list.php
show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder, 'mymmodule'); show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder, $object->module);
} }
} }

2
htdocs/modulebuilder/template/myobject_card.php
View File

@ -569,7 +569,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
// List of actions on element // List of actions on element
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
$formactions = new FormActions($db); $formactions = new FormActions($db);
$somethingshown = $formactions->showactions($object, $object->element.'@mymodule', (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlright); $somethingshown = $formactions->showactions($object, $object->element.'@'.$object->module, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlright);
print '</div></div></div>'; print '</div></div></div>';
} }