mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-12-08 02:28:23 +01:00
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
* Qual: Introduce getDataToShowPhoto to prepare generic code
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
* Fix missing trans
* Fix langs
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
* Remove useless files in web templates
* Clean code
* Fix duplicate translation key
* Fix duplicate translation key
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
* Fix duplicate key
* Fix $object
* Debug v19
* WIP SMSing
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
* WIP EMAILINGS_SUPPORT_ALSO_SMS
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
* WIP SMSing
* Debug the "validate" feature
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
* Clean code
* Move rights->x->y into hasRight('x', 'y')
* Move rights->x->y into hasRight('x', 'y')
* Move rights->x->y into hasRight('x', 'y')
* Move rights->x->y into hasRight('x', 'y')
* Move rights->x->y into hasRight('x', 'y')
* Move rights->x->y into hasRight('x', 'y')
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
* Enhance rector to fix empty($user->rights->modulex->perm1)
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
* Fix template to use v19 dev rules
* Fix use v19 dev rules
* Fix phpunit
* Debug v19
* Clean code
* Use rector to convert user->rights into user->hasRight
* Clean code
* Use rector to convert user->rights into user->hasRight
* Use rector to convert user->rights into user->hasRight
* Clean code
* Fix phpcs
* add editorconfig for sql files (#27999)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
* add model_pdf field in llx_ticket-ticket.sql (#27996)
* add model_pdf field in llx_ticket-ticket.sql
* Update 19.0.0-20.0.0.sql
* Update 19.0.0-20.0.0.sql
* Improve wording in README (#27994)
* fix phpstan (#27989)
* fix phpstan
* Update UserRightsToFunction.php
---------
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
* Qual: Fix spelling/working in datapolicy translations (#28006)
# Qual: Fix spelling/wording in datapolicy translations
Fixed some spelling and wording in datapolicy translations.
* qual: phpstan for htdocs/ticket/class/ticketstats.class.php (#27986)
htdocs/ticket/class/ticketstats.class.php 98 Parameter #1 $year (string) of method TicketStats::getNbByMonth() should be compatible with parameter $year (int) of method Stats::getNbByMonth()
* Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop
* Fix user with readonly perm on email template must be able to read.
* Fix doc
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
* Better message
* Add missing fields in merge of thirdparty
* Debug v19 selection of ticket printer per terminal
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
* Use constant
* NEW: Adding a recipient on emails sent, change status to sent partialy.
* fix travis (#28052)
* fix travis
* Update partnership.class.php
* fix php doc (#28047)
* fix undefined array key (#28048)
* Add region and departament for Cuba (#28046)
* Update llx_10_c_regions.sql
Add Cuba Regions (id_country=77)
* Update llx_20_c_departements.sql
Add Provinces Cuba (id country=77)
* Find the typo (#28050)
* Find the typo
* clean code
* add last_main_doc field to product (#28045)
* add las_main_doc field to product
* add field fetch
* NEW Add Categorie filter for ActionComm (#28041)
* New Add Categorie filter for ActionComm
New Add Categorie filter for ActionComm
* Fix space errors
Fix space errors
* Fix space errors 2
Fix space errors 2
* Update cunits.class.php (#28056)
FIX: error SQL when creating a Cunit
* Update codespell-lines-ignore.txt to avoid PR merge conflict
---------
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
Co-authored-by: Frédéric FRANCE <frederic34@users.noreply.github.com>
Co-authored-by: thibdrev <thibault.drevet@gmail.com>
Co-authored-by: sonikf <93765174+sonikf@users.noreply.github.com>
Co-authored-by: Ikarus <44511582+LeKarSol@users.noreply.github.com>
Co-authored-by: Anthony Damhet <73399671+EchoLoGeek@users.noreply.github.com>
Co-authored-by: Quentin-Seekness <72733832+Quentin-Seekness@users.noreply.github.com>
148 lines
4.0 KiB
PHP
148 lines
4.0 KiB
PHP
<?php
|
|
/* Copyright (C) 2012-2013 Charles-Fr BENKE <charles.fr@benke.fr>
|
|
*
|
|
* 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 3 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, see <https://www.gnu.org/licenses/>.
|
|
* or see https://www.gnu.org/
|
|
*/
|
|
|
|
/**
|
|
* \file htdocs/core/class/html.formexpensereport.class.php
|
|
* \ingroup core
|
|
* \brief File of class with all html predefined components
|
|
*/
|
|
|
|
/**
|
|
* Class to manage generation of HTML components for contract module
|
|
*/
|
|
class FormExpenseReport
|
|
{
|
|
/**
|
|
* @var DoliDB Database handler.
|
|
*/
|
|
public $db;
|
|
|
|
/**
|
|
* @var string Error code (or message)
|
|
*/
|
|
public $error = '';
|
|
|
|
|
|
/**
|
|
* Constructor
|
|
*
|
|
* @param DoliDB $db Database handler
|
|
*/
|
|
public function __construct($db)
|
|
{
|
|
$this->db = $db;
|
|
}
|
|
|
|
|
|
/**
|
|
* Return the combobox for the different statuses of an expense report
|
|
* The list values are the ids from the labelStatus.
|
|
*
|
|
* @param int $selected preselect status
|
|
* @param string $htmlname Name of HTML select
|
|
* @param int $useempty 1=Add empty line
|
|
* @param int $useshortlabel Use short labels
|
|
* @return string HTML select with status
|
|
*/
|
|
public function selectExpensereportStatus($selected = 0, $htmlname = 'fk_statut', $useempty = 1, $useshortlabel = 0)
|
|
{
|
|
global $langs;
|
|
|
|
$tmpep = new ExpenseReport($this->db);
|
|
|
|
$html = '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
|
|
if ($useempty) {
|
|
$html.='<option value="-1"> </option>';
|
|
}
|
|
$arrayoflabels = $tmpep->labelStatus;
|
|
if ($useshortlabel) {
|
|
$arrayoflabels = $tmpep->labelStatusShort;
|
|
}
|
|
foreach ($arrayoflabels as $key => $val) {
|
|
if (!empty($selected) && $selected == $key) {
|
|
$html .= '<option value="'.$key.'" selected>';
|
|
} else {
|
|
$html .= '<option value="'.$key.'">';
|
|
}
|
|
$html .= $langs->trans($val);
|
|
$html .= '</option>';
|
|
}
|
|
$html .= '</select>';
|
|
$html .= ajax_combobox($htmlname);
|
|
print $html;
|
|
return $html;
|
|
}
|
|
|
|
/**
|
|
* Return list of types of notes with select value = id
|
|
*
|
|
* @param int $selected Preselected type
|
|
* @param string $htmlname Name of field in form
|
|
* @param int $showempty Add an empty field
|
|
* @param int $active 1=Active only, 0=Unactive only, -1=All
|
|
* @return string Select html
|
|
*/
|
|
public function selectTypeExpenseReport($selected = 0, $htmlname = 'type', $showempty = 0, $active = 1)
|
|
{
|
|
// phpcs:enable
|
|
global $langs, $user;
|
|
$langs->load("trips");
|
|
|
|
$out = '';
|
|
|
|
$out .= '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
|
|
if ($showempty) {
|
|
$out .= '<option value="-1"';
|
|
if ($selected == -1) {
|
|
$out .= ' selected';
|
|
}
|
|
$out .= '> </option>';
|
|
}
|
|
|
|
$sql = "SELECT c.id, c.code, c.label as type FROM ".$this->db->prefix()."c_type_fees as c";
|
|
if ($active >= 0) {
|
|
$sql .= " WHERE c.active = ".((int) $active);
|
|
}
|
|
$sql .= " ORDER BY c.label ASC";
|
|
$resql = $this->db->query($sql);
|
|
if ($resql) {
|
|
$num = $this->db->num_rows($resql);
|
|
$i = 0;
|
|
|
|
while ($i < $num) {
|
|
$obj = $this->db->fetch_object($resql);
|
|
$out .= '<option value="'.$obj->id.'"';
|
|
if ($obj->code == $selected || $obj->id == $selected) {
|
|
$out .= ' selected';
|
|
}
|
|
$out .= '>';
|
|
if ($obj->code != $langs->trans($obj->code)) {
|
|
$out .= $langs->trans($obj->code);
|
|
} else {
|
|
$out .= $langs->trans($obj->type);
|
|
}
|
|
$i++;
|
|
}
|
|
}
|
|
$out .= '</select>';
|
|
$out .= ajax_combobox($htmlname);
|
|
|
|
return $out;
|
|
}
|
|
}
|