mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
Qual: Fix spelling/update .pre-commit configuration (versions) (#30546)
* Qual: Update pre-commit configuration * Qual: Update spelling * Ignore use of deprecated constant
This commit is contained in:
MDW
GitHub
parent
782f968eb7
commit
d6948077b2
|
|
@ -3,7 +3,7 @@ exclude: (?x)^( htdocs/includes/ckeditor/.*|(\.[^/]*/.*))$
|
|||
repos:
|
||||
# Several miscellaneous checks and fix (on yaml files, end of files fix)
|
||||
- repo: https://github.com/pre-commit/pre-commit-hooks
|
||||
rev: v4.5.0
|
||||
rev: v4.6.0
|
||||
hooks:
|
||||
# This hook tests the name of the branch and return an error if the name is
|
||||
# 'develop' or an official version 'x.y'
|
||||
|
|
@ -177,7 +177,7 @@ repos:
|
|||
|
||||
# Check format of yaml files
|
||||
- repo: https://github.com/adrienverge/yamllint.git
|
||||
rev: v1.33.0
|
||||
rev: v1.35.1
|
||||
hooks:
|
||||
- id: yamllint
|
||||
args:
|
||||
|
|
@ -187,7 +187,7 @@ repos:
|
|||
|
||||
# Execute codespell to fix typo errors (setup of codespell into dev/tools/codespell/)
|
||||
- repo: https://github.com/codespell-project/codespell
|
||||
rev: v2.2.6
|
||||
rev: v2.3.0
|
||||
hooks:
|
||||
- id: codespell
|
||||
# Due to a current limitation of configuration files,
|
||||
|
|
@ -230,14 +230,14 @@ repos:
|
|||
|
||||
# Check some shell scripts
|
||||
- repo: https://github.com/shellcheck-py/shellcheck-py
|
||||
rev: v0.9.0.6
|
||||
rev: v0.10.0.1
|
||||
hooks:
|
||||
- id: shellcheck
|
||||
args: [-W, "100"]
|
||||
|
||||
# Check sql file syntax
|
||||
- repo: https://github.com/sqlfluff/sqlfluff
|
||||
rev: 3.0.4
|
||||
rev: 3.1.0
|
||||
hooks:
|
||||
- id: sqlfluff-lint
|
||||
stages: [pre-commit, manual] # manual needed for ci
|
||||
|
|
|
|||
14
ChangeLog
14
ChangeLog
|
|
@ -1643,7 +1643,7 @@ NEW: Add link to create an element from the category page
|
|||
NEW: add margin infos to takepos invoice lines
|
||||
NEW: Add max size send for "backup and link to mail" option
|
||||
NEW: Add method httponly_accessforbidden()
|
||||
NEW: Add more advices into the Setup security page
|
||||
NEW: Add more advice into the Setup security page
|
||||
NEW: Add new global variable for keeping the previous signature information on proposal (case of reopening a proposal)
|
||||
NEW: Add objectLink on shipment
|
||||
NEW: Add option --force on CLI cron_run_jobs.php
|
||||
|
|
@ -3061,8 +3061,8 @@ NEW: add option in Workflow module to set a shipment as closed
|
|||
|
||||
|
||||
for Admins
|
||||
NEW: Add a security center page with all information and advices related to the security of your instance
|
||||
NEW: Add a performance center page with all information and advices related to the performance of your instance
|
||||
NEW: Add a security center page with all information and advice related to the security of your instance
|
||||
NEW: Add a performance center page with all information and advice related to the performance of your instance
|
||||
|
||||
Modules
|
||||
NEW: Module Recruitment is now stable
|
||||
|
|
@ -7080,7 +7080,7 @@ NEW: Add index and constraints keys on supplier proposal detail table
|
|||
NEW: Add phpunit to check the engine is defined into sql create files.
|
||||
NEW: Add project and Hook to Loan
|
||||
NEW: Add REST API to push a file.
|
||||
NEW: Allow extrafields list select to be dependands on other standard list and not only other extrafields list
|
||||
NEW: Allow extrafields list select to be dependent on other standard list and not only other extrafields list
|
||||
NEW: Architecture to manage search criteria persistence (using save_lastsearch_values=1 on exit links and restore_lastsearch_values=1 in entry links)
|
||||
NEW: data files are now also parsed by phpunit for sql syntax
|
||||
NEW: Hook to allow inserting custom product head #6001
|
||||
|
|
@ -8104,7 +8104,7 @@ NEW: The clicktodial module is now able to provide link "tel:" on phone numbers.
|
|||
NEW: The conditional IF into ODT templates works also on not defined var so we can show data only if defined. Close #3819
|
||||
NEW: The free text in PDF footers can now be a HTML content. So the WYSIWYG editor is on by default to edit it into module setup.
|
||||
NEW: The thirdparties tabs, the contacts tabs and the members tabs are now presented using a new "top banner", saving space and using a same way to show address, status and navigation arrows.
|
||||
NEW: Thumbs for statistics on main page are fully clicable (not only link inside the thumb)
|
||||
NEW: Thumbs for statistics on main page are fully clickable (not only link inside the thumb)
|
||||
NEW: Translate extrafield's labels.
|
||||
NEW: Use new select2 component for juridical status, country and state selection.
|
||||
NEW: When creating order, proposal or invoice from thirdparty card, the project is asked during creation. A link to create project if it does not exists is also available.
|
||||
|
|
@ -8703,7 +8703,7 @@ NEW: [ task #851 ] Add a new field: Commercial name
|
|||
NEW: [ task #977 ] New option to manage product unit Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements
|
||||
NEW: The line where mouse is over can be highlight with option THEME_ELDY_USE_HOVER (on by default)
|
||||
NEW: The notification module accept keyword __SUPERVISOR__ to send notification to supervisor of user.
|
||||
NEW: Thumbs for statistics on main page are fully clicable (not only link inside the thumb)
|
||||
NEW: Thumbs for statistics on main page are fully clickable (not only link inside the thumb)
|
||||
NEW: Title of page project contains project ref and label
|
||||
NEW: update skeleton and class builder
|
||||
NEW: Use new select2 component for juridical status, country and state selection.
|
||||
|
|
@ -9854,7 +9854,7 @@ For users:
|
|||
prices, radio).
|
||||
- New: [ task #798 ] Add range limit date on product/services as it is done on order
|
||||
and invoice.
|
||||
- New: [ task #814 ] Add extrafield feature for projects ands tasks.
|
||||
- New: [ task #814 ] Add extrafield feature for projects and tasks.
|
||||
- New: [ task #770 ] Add ODT document generation for Projects module.
|
||||
- New: [ task #741 ] Add intervention box.
|
||||
- New: [ task #826 ] Optional increase stock when deleting an invoice already validated.
|
||||
|
|
|
|||
|
|
@ -1,12 +1,6 @@
|
|||
|| !empty($dates) && empty($datee) && $loanSchedule->datep >= $dates && $loanSchedule->datep <= dol_now()
|
||||
|| empty($dates) && !empty($datee) && $loanSchedule->datep <= $datee
|
||||
$objMod->dictionaries = $objMod->{"dictionnaries"}; // For backward compatibility
|
||||
if (($loanSchedule->datep >= $dates && $loanSchedule->datep <= $datee) // dates filter is defined
|
||||
$datee = $langs->trans("Unknown");
|
||||
$datee = dol_print_date($objectligne->date_end, 'day', false, $outputlangs, true);
|
||||
$txt .= $outputlangs->transnoentities("DateStartPlannedShort")." : <strong>".$datei."</strong> - ".$outputlangs->transnoentities("DateEndPlanned")." : <strong>".$datee.'</strong>';
|
||||
if (empty($objMod->dictionaries) && !empty($objMod->{"dictionnaries"})) {
|
||||
print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&id_entrepot='.$entrepotstatic->id.'&action=transfert&pdluoid='.$pdluo->id.'">';
|
||||
print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&id_entrepot='.$entrepotstatic->id.'&action=transfert&pdluoid='.$pdluo->id.'&token='.newToken().'">';
|
||||
$object->date_ech = $object->periode;
|
||||
$object->periode = $object->date_ech;
|
||||
$reponsesadd = str_split($obj->reponses);
|
||||
|
|
@ -16,182 +10,97 @@
|
|||
// $object->periode = dol_get_last_day(year of $object->date_ech - 1m, month or $object->date_ech -1m)
|
||||
//$pice = '<i class="fas fa-briefcase inline-block"></i>';
|
||||
//$typea = ($objp->typea == 'birth') ? $picb : $pice;
|
||||
print '<td class="center"><a href="'.DOL_URL_ROOT.'/product/stock/product.php?dwid='.$object->id.'&id='.$objp->rowid.'&action=transfert&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$id).'">';
|
||||
$date = $overview[0]->udate;
|
||||
print '<td class="center"><a href="'.DOL_URL_ROOT.'/product/stock/product.php?dwid='.$object->id.'&id='.$objp->rowid.'&action=transfert&token='.newToken().'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$id).'">';
|
||||
$dateemail = dol_stringtotime((string) $overview[0]->udate, 'gmt');
|
||||
$dateb = $this->db->jdate($data[$j]->datea);
|
||||
$link->datea = $this->db->jdate($obj->datea);
|
||||
$object->periode = $newdateperiod;
|
||||
$out .= dol_print_date($file->datea, 'dayhour');
|
||||
$pice = '<i class="fas fa-briefcase inline-block"></i>';
|
||||
$taskstatic->date_end = $this->db->jdate($objp->datee);
|
||||
$tmp = $element->getSumOfAmount($idofelementuser ? $elementuser : '', $dates, $datee);
|
||||
$tmpprojtime = $element->getSumOfAmount($idofelementuser ? $elementuser : '', $dates, $datee); // $element is a task. $elementuser may be empty
|
||||
$typea = ($data[$j]->typea == 'birth') ? $picb : $pice;
|
||||
//var_dump("$key, $tablename, $datefieldname, $dates, $datee");
|
||||
GETPOSTINT("mouvement"),
|
||||
dol_syslog("msgid=".$overview[0]->message_id." date=".dol_print_date($overview[0]->udate, 'dayrfc', 'gmt')." from=".$overview[0]->from." to=".$overview[0]->to." subject=".$overview[0]->subject);
|
||||
if ((empty($dates) && empty($datee)) || (intval($dates) <= $element->datestart && intval($datee) >= $element->dateend)) {
|
||||
jQuery("#mouvement option").removeAttr("selected").change();
|
||||
jQuery("#mouvement option[value=0]").attr("selected","selected").trigger("change");
|
||||
jQuery("#mouvement option[value=1]").attr("selected","selected").trigger("change");
|
||||
jQuery("#mouvement").trigger("change");
|
||||
print '<td colspan="'.(6 + count($TWeek)).'">';
|
||||
$TFirstDay = getFirstDayOfEachWeek($TWeek, date('Y', $firstdaytoshow));
|
||||
$TFirstDay[reset($TWeek)] = 1;
|
||||
$action = 'transfert';
|
||||
$addform .= '<input type="hidden" name="dateerfc" value="'.dol_print_date($datee, 'dayhourrfc').'">';
|
||||
$date_liv = dol_mktime(GETPOST('rehour'), GETPOST('remin'), GETPOST('resec'), GETPOST("remonth"), GETPOST("reday"), GETPOST("reyear"));
|
||||
$newfiletmp = preg_replace('/\.od(s|t)/i', '', $newfile);
|
||||
$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
|
||||
$object->period = dol_time_plus_duree($object->periode, 1, 'm');
|
||||
$object->periode = dol_time_plus_duree($object->periode, 1, 'm');
|
||||
$project_static->date_end = $this->db->jdate($obj->datee);
|
||||
$projectstatic->date_end = $db->jdate($objp->datee);
|
||||
$ret = projectLinesPerMonth($inc, $firstdaytoshow, $fuser, $lines[$i]->id, ($parent == 0 ? $lineswithoutlevel0 : $lines), $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $isavailable, $oldprojectforbreak, $TWeek);
|
||||
$taskstatic->datee = $lines[$i]->date_end; // deprecated
|
||||
$this->category->childs[] = $this->_cleanObjectDatas($cat);
|
||||
$this->date_approbation = $this->db->jdate($obj->datea);
|
||||
$this->date_approval = $this->db->jdate($obj->datea);
|
||||
$this->date_approve = $this->db->jdate($obj->datea);
|
||||
$this->datea = $this->db->jdate($obj->datea);
|
||||
$this->datee = $this->db->jdate($obj->datee);
|
||||
$this->periode = $this->db->jdate($obj->period);
|
||||
$tmp = array('id_users' => $obj->id_users, 'nom' => $obj->name, 'reponses' => $obj->reponses);
|
||||
$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.od(s|t)$', '', 'name', SORT_ASC, 0, 1); // Disable hook for the moment
|
||||
//si les reponses ne concerne pas la colonne effacée, on concatenate
|
||||
GETPOST("mouvement", 'alpha'),
|
||||
GETPOSTINT("mouvement"),
|
||||
foreach ($TWeek as $weekIndex => $weekNb) {
|
||||
if (count($arrayfields) > 0 && !empty($arrayfields['t.datee']['checked'])) {
|
||||
if (jQuery("#mouvement").val() == \'0\') jQuery("#unitprice").removeAttr("disabled");
|
||||
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=transfert">'.$langs->trans("TransferStock").'</a>';
|
||||
print '<td class="center">'.dol_print_date($link->datea, "dayhour", "tzuser").'</td>';
|
||||
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=transfert&token='.newToken().'">'.$langs->trans("TransferStock").'</a>';
|
||||
$action = 'transfert';
|
||||
$date_com = dol_mktime(GETPOSTINT('rehour'), GETPOSTINT('remin'), GETPOSTINT('resec'), GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
|
||||
$date_next_execution = (GETPOST('remonth') ? dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear')) : -1);
|
||||
$date_next_execution = dol_mktime($rehour, $remin, 0, $remonth, $reday, $reyear);
|
||||
$datee = dol_get_last_day(GETPOSTINT('yeartoexport'), GETPOSTINT('monthtoexport') ? GETPOSTINT('monthtoexport') : 12);
|
||||
$datesubscription = dol_mktime(12, 0, 0, GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"));
|
||||
$ensemblereponses = $obj->reponses;
|
||||
$field = preg_replace('/(:[!<>=\s]+:|:in:|:notin:|:like:|:notlike:).*$/', '', $tmpcrit); // the name of the field
|
||||
$newcrit = preg_replace('/(:[!<>=\s]+:|:in:|:notin:|:like:|:notlike:)/', '', $tmpcrit);
|
||||
$object->datee = $datee;
|
||||
$object->periode = $dateperiod;
|
||||
$return .= '<br><span class="opacitymedium">'.$langs->trans("Payement").'</span> : <span class="info-box-label">'.$this->type_payment.'</span>';
|
||||
$sortfield = "datea";
|
||||
$sql = "SELECT p.rowid as id, p.entity, p.title, p.ref, p.public, p.dateo as do, p.datee as de, p.fk_statut as status, p.fk_opp_status, p.opp_amount, p.opp_percent, p.tms as date_update, p.budget_amount";
|
||||
$sql .= " '".$db->escape($conf->currency)."' as currency, 0 as fk_soc, t.date_ech as date, t.periode as date_due, 'SocialContributions' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
|
||||
$sql .= " , datee = ".(!empty($obj->datee) ? "'".$this->db->escape($obj->datee)."'" : "null");
|
||||
$sql .= " AND (".$datefieldname." <= '".$this->db->idate($datee)."' OR ".$datefieldname." IS NULL)";
|
||||
$sql .= " AND (p.datee IS NULL OR p.datee >= ".$db->idate(dol_get_first_day($project_year_filter, 1, false)).")";
|
||||
$sql .= " AND date_creation BETWEEN '".$db->idate($dates)."' AND '".$db->idate($datee)."'";
|
||||
$sql .= " AND er.datee >= '".$this->db->idate($date)."'";
|
||||
$sql .= " ORDER BY pt.datee ASC, pt.dateo ASC";
|
||||
$sql .= " t.datec, t.dateo, t.datee, t.tms,";
|
||||
$sql .= " t.dateo, t.datee, t.planned_workload, t.rang,";
|
||||
$sql .= ", datee = ".($this->date_end != '' ? "'".$this->db->idate($this->date_end)."'" : 'null');
|
||||
$sql .= "SELECT u.rowid, u.firstname, u.lastname, u.dateemployment as datea, date_format(u.dateemployment, '%d') as daya, 'employment' as typea, u.email, u.statut as status";
|
||||
$sql = "SELECT pt.rowid, pt.ref, pt.fk_projet, pt.fk_task_parent, pt.datec, pt.dateo, pt.datee, pt.datev, pt.label, pt.description, pt.duration_effective, pt.planned_workload, pt.progress";
|
||||
$sql = "SELECT u.rowid, u.firstname, u.lastname, u.birth as datea, date_format(u.birth, '%d') as daya, 'birth' as typea, u.email, u.statut as status";
|
||||
$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'opensurvey_user_studs (nom, id_sondage, reponses, date_creation)';
|
||||
$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'opensurvey_user_studs (nom, id_sondage, reponses, ip, date_creation)';
|
||||
$sql = 'SELECT s.reponses';
|
||||
$sql2 .= " SET reponses = '".$db->escape($newcar)."'";
|
||||
$taskstatic->datee = $db->jdate($obj->date_end);
|
||||
$this->category->childs = array();
|
||||
$this->datea = dol_now();
|
||||
$tmpcrit = preg_replace('/^.*(:[!<>=\s]+:|:in:|:notin:|:like:|:notlike:)/', '\1', $tmpcrit); // the condition after the name of the field
|
||||
'datee' => $date_end,
|
||||
// mise a jour des reponses utilisateurs dans la base
|
||||
if (!empty($arrayfields['t.datee']['checked'])) {
|
||||
if ($user->hasRight('stock', 'mouvement', 'lire')) {
|
||||
if (empty($reyear) || empty($remonth) || empty($reday)) {
|
||||
jQuery("#mouvement").change(function() {
|
||||
preg_match('/:([!<>=\s]+|in|notin|like|notlike):/', $tmpcrit, $reg);
|
||||
print $form->selectDate($object->periode, 'period', 0, 0, 0, 'charge', 1);
|
||||
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=transfert">'.$langs->trans("TransferStock").'</a>';
|
||||
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=transfert&token='.newToken().'">'.$langs->trans("TransferStock").'</a>';
|
||||
print '<span class="opacitymedium">'.$langs->trans("ClinkOnALinkOfColumn", $langs->transnoentitiesnoconv("Referers")).'</span>';
|
||||
print '<td class="center nowraponall">'.dol_print_date($db->jdate($obj->periode), 'day').'</td>';
|
||||
print '<tr><td>'.$langs->trans("AddIn").'</td><td>';
|
||||
print dol_print_date($object->periode, "day");
|
||||
$TWeek[$week_number] = $week_number;
|
||||
"sme",
|
||||
$action = 'transfert';
|
||||
$cle_rib = strtolower(checkES($rib, $CCC));
|
||||
$date_com = dol_mktime(GETPOST('rehour'), GETPOST('remin'), GETPOST('resec'), GETPOST("remonth"), GETPOST("reday"), GETPOST("reyear"));
|
||||
$date_next_execution = isset($date_next_execution) ? $date_next_execution : (GETPOST('remonth') ? dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear')) : -1);
|
||||
$date_next_execution = isset($date_next_execution) ? $date_next_execution : (GETPOSTINT('remonth') ? dol_mktime(12, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear')) : -1);
|
||||
$datefrom = dol_mktime(0, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
|
||||
$datesubscription = dol_mktime(0, 0, 0, GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"));
|
||||
$datetouse = ($this->date_end > 0) ? $this->date_end : ((isset($this->datee) && $this->datee > 0) ? $this->datee : 0);
|
||||
$elementarray = $object->get_element_list($key, $tablename, $datefieldname, $dates, $datee, !empty($project_field) ? $project_field : 'fk_projet');
|
||||
$ensemblereponses = $obj->reponses;
|
||||
$head[$h][1] = $langs->trans("Referers");
|
||||
$head[$tab][1] = $langs->trans("Referers");
|
||||
$out .= "<b>".$langs->trans("Referer").":</b> ".(isset($_SERVER["HTTP_REFERER"]) ? dol_htmlentities($_SERVER["HTTP_REFERER"], ENT_COMPAT) : '')."<br>\n";
|
||||
$reday = GETPOSTINT('reday');
|
||||
$sql = "SELECT p.rowid as id, p.entity, p.title, p.ref, p.public, p.dateo as do, p.datee as de, p.fk_statut as status, p.fk_opp_status, p.opp_amount, p.opp_percent, p.tms as date_modification, p.budget_amount";
|
||||
$sql = 'SELECT p.rowid as id, p.entity, p.title, p.ref, p.public, p.dateo as do, p.datee as de, p.fk_statut as status, p.fk_opp_status, p.opp_amount, p.opp_percent, p.tms as date_modification, p.budget_amount';
|
||||
$sql .= " (cs.periode IS NOT NULL AND cs.periode between '".$db->idate(dol_get_first_day($year))."' AND '".$db->idate(dol_get_last_day($year))."')";
|
||||
$sql .= " OR (cs.periode IS NULL AND cs.date_ech between '".$db->idate(dol_get_first_day($year))."' AND '".$db->idate(dol_get_last_day($year))."')";
|
||||
$sql .= " VALUES (".$conf->entity.", '".$this->db->idate($this->datea)."'";
|
||||
$sql .= " datee=".($this->date_end != '' ? "'".$this->db->idate($this->date_end)."'" : 'null').",";
|
||||
$sql .= " f.date_approval as datea,";
|
||||
$sql .= " f.date_approve as datea,";
|
||||
$sql .= " f.datec, f.dateo, f.datee, f.datet, f.fk_user_author,";
|
||||
$sql .= " t.datee as date_end,";
|
||||
$sql .= " t.dateo as date_start, t.datee as date_end";
|
||||
$sql .= " t.dateo as date_start, t.datee as date_end, t.planned_workload, t.rang,";
|
||||
$sql .= " tms, dateo as date_start, datee as date_end, date_close, fk_soc, fk_user_creat, fk_user_modif, fk_user_close, fk_statut as status, fk_opp_status, opp_percent,";
|
||||
$sql .= ", '".$this->db->idate($this->periode)."'";
|
||||
$sql .= ", cs.libelle as label, cs.fk_type, cs.amount, cs.fk_projet as fk_project, cs.paye, cs.periode as period, cs.import_key";
|
||||
$sql .= ", datea = '".$this->db->idate(dol_now())."'";
|
||||
$sql .= ", datee";
|
||||
$sql .= ", periode='".$this->db->idate($this->periode)."'";
|
||||
$sql = "INSERT INTO ".$this->db->prefix()."links (entity, datea, url, label, objecttype, objectid)";
|
||||
$sql = "INSERT INTO ".MAIN_DB_PREFIX."chargesociales (fk_type, fk_account, fk_mode_reglement, libelle, date_ech, periode, amount, fk_projet, entity, fk_user_author, fk_user, date_creation)";
|
||||
$sql = "SELECT SUM(duree) as total_duration, min(date) as dateo, max(date) as datee ";
|
||||
$sql = "SELECT id_users, nom as name, id_sondage, reponses";
|
||||
$sql = "SELECT id_users, nom as name, reponses";
|
||||
$sql = "SELECT p.rowid, p.fk_statut as status, p.fk_opp_status, p.datee as datee";
|
||||
$sql = "SELECT rowid, entity, datea, url, label, objecttype, objectid FROM ".$this->db->prefix()."links";
|
||||
$sql = 'SELECT c.rowid, date_creation as datec, tms as datem, date_valid as date_validation, date_approve as datea, date_approve2 as datea2,';
|
||||
$test = "<IMG SRC=\"jav
ascript:alert('XSS');\">"; // Same
|
||||
$test = '/javas:cript/google.com';
|
||||
$this->periode = $this->date_creation + 3600 * 24 * 30;
|
||||
$title = $langs->trans('Product')." ".$shortlabel." - ".$langs->trans('Referers');
|
||||
$title = $langs->trans('Service')." ".$shortlabel." - ".$langs->trans('Referers');
|
||||
$title = $langs->transnoentities("Balance")." - ".$langs->transnoentities("AllTime");
|
||||
'datee' => $datee
|
||||
'datee' =>array('type'=>'date', 'label'=>'DateEnd', 'enabled'=>1, 'visible'=>1, 'position'=>35),
|
||||
'datee' =>array('type'=>'date', 'label'=>'Datee', 'enabled'=>1, 'visible'=>-1, 'position'=>90),
|
||||
,'datee'=>array('type'=>'date')
|
||||
// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
|
||||
echo dol_print_date($rule->datee, 'day');
|
||||
foreach ($TWeek as $weekNb) {
|
||||
if (!empty($arrayfields['cs.periode']['checked'])) {
|
||||
if (!empty($arrayfields['p.datee']['checked'])) {
|
||||
if ($datee > 0) {
|
||||
if ($newamount == 0 || empty($this->date_ech) || (empty($this->period) && empty($this->periode))) {
|
||||
if ($user->hasRight('stock', 'mouvement', 'creer')) {
|
||||
if (GETPOSTISSET("reday") && GETPOSTISSET("remonth") && GETPOSTISSET("reyear")) {
|
||||
if (count($arrayfields) > 0 && !empty($arrayfields['t.datee']['checked'])) {
|
||||
if (empty($datee)) {
|
||||
if (empty($reyear) || empty($remonth) || empty($reday)) {
|
||||
if (empty($this->datea)) {
|
||||
if (in_array('01', $TWeek) && in_array('52', $TWeek) && $weekNb == '01') {
|
||||
print $form->selectDate(strtotime(date('Y-m-d', $object->datee)), 'end', '', '', 0, '', 1, 0);
|
||||
print $form->selectDate(strtotime(date('Y-m-d', $object->datee)), 'end', 0, 0, 0, '', 1, 0);
|
||||
print $object->datee ? dol_print_date($object->datee, 'daytext') : ' ';
|
||||
print '<input type="hidden" name="action" value="addin">';
|
||||
print '<tr><td>'.$langs->trans("AddIn").'</td><td>';
|
||||
print '<tr><td>'.$langs->trans("Datee").'</td>';
|
||||
print_liste_field_titre($arrayfields['t.datee']['label'], $_SERVER["PHP_SELF"], "t.datee", '', $param, '', $sortfield, $sortorder, 'center ');
|
||||
* @param string $datee End date (ex 23:59:59)
|
||||
* @param float|string $selectedrate Force preselected vat rate. Can be '8.5' or '8.5 (NOO)' for example. Use '' for no forcing.
|
||||
$TWeek = array();
|
||||
$date = $obj->periode;
|
||||
$datee = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
|
||||
$datee = dol_stringtotime($dateerfc);
|
||||
$datepaid = dol_mktime(12, 0, 0, GETPOST("remonth"), GETPOST("reday"), GETPOST("reyear"));
|
||||
$datepaid = dol_mktime(12, 0, 0, GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"));
|
||||
$datepaye = dol_mktime(12, 0, 0, GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"));
|
||||
|
|
@ -201,55 +110,31 @@
|
|||
$head[$h][1] = $langs->trans('Referers');
|
||||
$inj += preg_match('/on(dblclick|drop|durationchange|emptied|end|ended|error|focus|focusin|focusout|formdata|gotpointercapture|hashchange|input|invalid)[a-z]*\s*=/i', $tmpval);
|
||||
$inj += preg_match('/on(dblclick|drop|durationchange|emptied|end|ended|error|focus|focusin|focusout|formdata|gotpointercapture|hashchange|input|invalid)[a-z]*\s*=/i', $val);
|
||||
$morewherefilterarray[] = " t.datee <= '".$db->idate($search_date_end_end)."'";
|
||||
$morewherefilterarray[] = " t.datee >= '".$db->idate($search_date_end_start)."'";
|
||||
$opensurveysondage->mail_admin = $_SESSION['adresse'];
|
||||
$pdf->SetXY($savx, $savy);
|
||||
$projectstatic->datee = $db->jdate($obj->projectdatee);
|
||||
$reday = GETPOST('reday');
|
||||
$savy = $pdf->getY();
|
||||
$somethingshown = $formactions->showactions($object, 'mouvement', 0, 1, '', $MAXEVENT, '', $morehtmlcenter); // Show all action for product
|
||||
$sql .= " (cs.periode IS NOT NULL AND cs.periode between '".$db->idate(dol_get_first_day($year))."' AND '".$db->idate(dol_get_last_day($year))."')";
|
||||
$sql .= " AND cs.periode <= '".$db->idate($search_date_limit_end)."'";
|
||||
$sql .= " AND cs.periode >= '".$db->idate($search_date_limit_start)."'";
|
||||
$sql .= " AND p.datee <= '".$db->idate($search_date_end_end)."'";
|
||||
$sql .= " AND p.datee >= '".$db->idate($search_date_end_start)."'";
|
||||
$sql .= " AND t.datee <= '".$db->idate($search_datelimit_end)."'";
|
||||
$sql .= " AND t.datee >= '".$db->idate($search_datelimit_start)."'";
|
||||
$sql .= " GROUP BY p.ref, p.title, p.rowid, p.fk_statut, p.fk_opp_status, p.public, p.dateo, p.datee, t.label, t.rowid, t.planned_workload, t.duration_effective, t.progress, t.dateo, t.datee";
|
||||
$sql .= " GROUP BY p.rowid, p.ref, p.title, p.fk_statut, p.datee, p.fk_opp_status, p.public, p.fk_user_creat,";
|
||||
$sql .= " OR (cs.periode IS NULL AND cs.date_ech between '".$db->idate(dol_get_first_day($year))."' AND '".$db->idate(dol_get_last_day($year))."')";
|
||||
$sql .= " ORDER BY t.dateo DESC, t.rowid DESC, t.datee DESC";
|
||||
$sql .= " SET reponses = '".$db->escape($nouveauchoix)."'";
|
||||
$sql .= " cs.rowid, cs.libelle, cs.fk_type as type, cs.periode as period, cs.date_ech, cs.amount as total,";
|
||||
$sql .= " t.datec, t.dateo, t.datee, t.tms,";
|
||||
$sql .= " t.label, t.rowid as taskid, t.planned_workload, t.duration_effective, t.progress, t.dateo as date_start, t.datee as date_end, SUM(tasktime.element_duration) as timespent";
|
||||
$sql = "SELECT p.ref, p.title, p.rowid as projectid, p.fk_statut as status, p.fk_opp_status as opp_status, p.public, p.dateo as projdate_start, p.datee as projdate_end,";
|
||||
$sql.= " ".MAIN_DB_PREFIX."notify_def as nd,";
|
||||
$sql.= " AND nd.fk_action = ad.rowid";
|
||||
$sql.= " WHERE u.rowid = nd.fk_user";
|
||||
$sql.= " nd.rowid, ad.code, ad.label";
|
||||
$sql2 .= " p.dateo, p.datee,";
|
||||
$sql2 .= " s.logo, s.email, s.entity, p.fk_user_creat, p.public, p.fk_statut, p.fk_opp_status, p.opp_percent, p.opp_amount, p.dateo, p.datee";
|
||||
$title = $langs->trans('Batch')." ".$shortlabel." - ".$langs->trans('Referers');
|
||||
$totalforvisibletasks = projectLinesPerMonth($j, $firstdaytoshow, $usertoprocess, 0, $tasksarray, $level, $projectsrole, $tasksrole, $mine, $restrictviewformytask, $isavailable, 0, $TWeek);
|
||||
$value = preg_replace('/([a-z\.]+)\s*([!<>=]+|in|notin|like|notlike)\s*/', '\1:\2:', $value); // Clean string 'x < 10' into 'x:<:10' so we can then explode on space to get all AND tests to do
|
||||
'cs.periode' => array('label' => "PeriodEndDate", 'checked' => 1, 'position' => 50),
|
||||
't.datee'=>array('label'=>"Deadline", 'checked'=>1, 'position'=>101),
|
||||
't.datee'=>array('label'=>"Deadline", 'checked'=>1, 'position'=>5),
|
||||
// Ligne de la periode d'analyse du rapport
|
||||
// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
|
||||
//$datee=$now
|
||||
//$dates=dol_time_plus_duree($datee, -1, 'y');
|
||||
<strong>TaskItem(<em>pID, pName, pStart, pEnd, pColor, pLink, pMile, pRes, pComp, pGroup, pParent, pOpen, pDepend, pCaption, pNotes, pGantt</em>)</strong></p>
|
||||
foreach ($TWeek as $weekNb) {
|
||||
foreach ($TWeek as $week_number) {
|
||||
if (!empty($arrayfields['t.datee']['checked'])) {
|
||||
if ($action == "transfert") {
|
||||
if ($object->id > 0 && $action == 'addin') {
|
||||
if (GETPOST('reday')) {
|
||||
if (GETPOSTINT("reyear") && GETPOSTINT("remonth") && GETPOSTINT("reday")) {
|
||||
print $form->selectDate($datee, 'datee', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
|
||||
print '<option value="1"'.(GETPOST('mouvement') ? ' selected="selected"' : '').'>'.$langs->trans("Delete").'</option>';
|
||||
print '<select name="mouvement" id="mouvement" class="minwidth100 valignmiddle">';
|
||||
print '<td class="left" width="25%">'.$langs->trans("Referers").'</td>';
|
||||
|
|
@ -266,43 +151,21 @@
|
|||
print_liste_field_titre($arrayfields['cs.libelle']['label'], $_SERVER["PHP_SELF"], "cs.libelle,cs.periode", '', $param, '', $sortfield, $sortorder);
|
||||
print_liste_field_titre($arrayfields['cs.paye']['label'], $_SERVER["PHP_SELF"], "cs.paye,cs.periode", '', $param, 'class="right"', $sortfield, $sortorder);
|
||||
print_liste_field_titre($arrayfields['cs.periode']['label'], $_SERVER["PHP_SELF"], "cs.periode", '', $param, '', $sortfield, $sortorder, 'center ');
|
||||
print_liste_field_titre($arrayfields['p.datee']['label'], $_SERVER["PHP_SELF"], "p.datee", "", $param, '', $sortfield, $sortorder, 'center ');
|
||||
print_liste_field_titre($arrayfields['t.datee']['label'], $_SERVER["PHP_SELF"], "t.datee", "", $param, '', $sortfield, $sortorder, 'center ');
|
||||
public $childs = array();
|
||||
public $datea;
|
||||
public $datee;
|
||||
public $periode;
|
||||
public function getSumOfAmount($fuser = '', $dates = '', $datee = '')
|
||||
return $TWeek;
|
||||
unset($_SESSION["adresse"]);
|
||||
- creat,unitl,alltime,datas,referers
|
||||
- informations,medias,uptodate,reenable,crypted,developpers
|
||||
- ned
|
||||
* @param array $TWeek array of week numbers
|
||||
* @param string[] $TWeek array of week numbers
|
||||
* @param string[] $TWeek array of week numbers (week 1 must be '01')
|
||||
* @param array $TWeek Array of week numbers
|
||||
$TFirstDays = getFirstDayOfEachWeek($TWeek, $year);
|
||||
$TFirstDays[reset($TWeek)] = '01'; //first day of month
|
||||
$TLastDays = getLastDayOfEachWeek($TWeek, $year);
|
||||
$TLastDays[end($TWeek)] = date("t", strtotime($year.'-'.$month.'-'.$day)); //last day of month
|
||||
$TWeek = getWeekNumbersOfMonth($month, $year);
|
||||
$datee = dol_mktime(23, 59, 59, GETPOST('dateemonth'), GETPOST('dateeday'), GETPOST('dateeyear'));
|
||||
$moresql = dolSqlDateFilter('t.datee', $search_dtendday, $search_dtendmonth, $search_dtendyear, 1);
|
||||
$parameters = array('id' => $id, 'taskid' => $taskid, 'projectid' => $projectid, 'TWeek' => $TWeek, 'TFirstDays' => $TFirstDays, 'TLastDays' => $TLastDays);
|
||||
* Copyright (C) 2019 Cedric Ancelin <icedo.anc@gmail.com>
|
||||
* Copyright (C) 2019 Cedric Ancelin <icedo.anc@gmail.com>
|
||||
$permissiontoadd = $user->hasRight('stock', 'mouvement', 'creer');
|
||||
$permissiontodelete = $user->hasRight('stock', 'mouvement', 'creer'); // There is no deletion permission for stock movement as we should never delete
|
||||
$permissiontoread = $user->hasRight('stock', 'mouvement', 'lire');
|
||||
$sql .= " GROUP BY cs.rowid, cs.fk_type, cs.fk_user, cs.amount, cs.date_ech, cs.libelle, cs.paye, cs.periode, cs.fk_account, c.libelle, c.accountancy_code, ba.label, ba.ref, ba.number, ba.account_number, ba.iban_prefix, ba.bic, ba.currency_code, ba.clos, pay.code";
|
||||
$sql .= " cs.amount, cs.date_ech, cs.libelle as label, cs.paye, cs.periode, cs.fk_account,";
|
||||
$sql .= " cs.rowid, cs.libelle as label_sc, cs.fk_type as type, cs.periode, cs.date_ech, cs.amount as total, cs.paye,";
|
||||
$sql .= " p.datec as date_creation, p.dateo as date_start, p.datee as date_end, p.opp_amount, p.opp_percent, (p.opp_amount*p.opp_percent/100) as opp_weighted_amount, p.tms as date_modification, p.budget_amount,";
|
||||
$sql .= " t.datec as date_creation, t.dateo as date_start, t.datee as date_end, t.tms as date_modification,";
|
||||
$sql .= dolSqlDateFilter('p.datee', $search_eday, $search_emonth, $search_eyear);
|
||||
$sql = "SELECT ".$distinct." p.rowid as projectid, p.ref as projectref, p.title as projecttitle, p.fk_statut as projectstatus, p.datee as projectdatee, p.fk_opp_status, p.public, p.fk_user_creat as projectusercreate, p.usage_bill_time,";
|
||||
$sql = "SELECT id_users, nom as name, id_sondage, reponses";
|
||||
$sql = "SELECT p.rowid, p.ref, p.title, p.dateo as date_start, p.datee as date_end, p.fk_statut as status, p.tms as datem";
|
||||
$sql = "SELECT s.rowid, s.nom as name, s.client, s.town, s.datec, s.datea";
|
||||
$sql = 'SELECT nom as name, reponses';
|
||||
$title = $langs->trans("Referers", $object->name);
|
||||
$usercancreate = $user->hasRight('stock', 'mouvement', 'creer');
|
||||
|
|
@ -311,33 +174,19 @@ $usercandelete = $user->hasRight('stock', 'mouvement', 'creer');
|
|||
$usercandelete = (($user->hasRight('stock', 'mouvement', 'supprimer')));
|
||||
$usercanread = $user->hasRight('stock', 'mouvement', 'lire');
|
||||
$usercanread = (($user->hasRight('stock', 'mouvement', 'lire')));
|
||||
* The hook contaxt commcard has been renamed thirdpartycomm
|
||||
* The hook contaxt thirdpartycard has been renamed thirdpartycontact
|
||||
* The private array ->status_short, ->statuts and ->status_long are now array ->labelStatusShort and ->labelStatus everywhere.
|
||||
- Fix: [ bug #485 ] Configurated amount for public auto-subscription form is not taken into account
|
||||
- New: Add proposals into referer page of thirdparty.
|
||||
AmountIn
|
||||
NEW: ModuleBuilder: Checkin comments begin and end before each actions
|
||||
Vous pouvez voir la progression du ticket en cliquant sur le lien
|
||||
for /F "tokens=2 delims=," %%i in ('tasklist /FI "IMAGENAME eq php.exe" /FO CSV /NH') do (
|
||||
foreach ($TWeek as $week_number) {
|
||||
function checkES($IentOfi, $InumCta)
|
||||
function getFirstDayOfEachWeek($TWeek, $year)
|
||||
function getLastDayOfEachWeek($TWeek, $year)
|
||||
function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, &$isavailable, $oldprojectforbreak = 0, $TWeek = array())
|
||||
if (!$user->hasRight('stock', 'mouvement', 'lire')) {
|
||||
if (!empty($arrayfields['cs.periode']['checked'])) {
|
||||
if (!empty($arrayfields['p.datee']['checked'])) {
|
||||
if (!empty($arrayfields['t.datee']['checked'])) {
|
||||
if ($action == "transfert") {
|
||||
if (empty($datee) && !empty($dateerfc)) { // deprecated
|
||||
print $langs->trans("Developpers").':';
|
||||
print '<input type="hidden" id="numberOfFirstLine" name="numberOfFirstLine" value="'.(reset($TWeek)).'"/>'."\n";
|
||||
print '<td class="right">'.$langs->trans("NbOfMembers").' <span class="opacitymedium">('.$langs->trans("AllTime").')</span></td>';
|
||||
print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "cs.periode", "", $param, '', $sortfield, $sortorder, 'center ');
|
||||
select#date_startday, select#date_startmonth, select#date_endday, select#date_endmonth, select#reday, select#remonth
|
||||
select#date_startday, select#date_startmonth, select#date_endday, select#date_endmonth, select#reday, select#remonth,
|
||||
print '<td class="center"><a href="'.DOL_URL_ROOT.'/product/stock/product.php?dwid='.$object->id.'&id='.$objp->rowid.'&action=transfert&token='.newToken().'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$id).'">';
|
||||
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=transfert&token='.newToken().'">'.$langs->trans("TransferStock").'</a>';
|
||||
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=transfert&token='.newToken().'">'.$langs->trans("TransferStock").'</a>';
|
||||
print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&id_entrepot='.$entrepotstatic->id.'&action=transfert&pdluoid='.$pdluo->id.'&token='.newToken().'">';
|
||||
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=transfert&token='.newToken().'">'.$langs->trans("TransferStock").'</a>';
|
||||
|
|
|
|||
|
|
@ -157,7 +157,7 @@ foreach my $file (keys %filelist) {
|
|||
print OUT "\\c ". $1;
|
||||
next;
|
||||
}
|
||||
if ($create_sql ne "") { # we are inside create table statement so lets process datatypes
|
||||
if ($create_sql ne "") { # we are inside create table statement so let's process datatypes
|
||||
|
||||
if (/\);/i) { # end of create table sequence
|
||||
$create_sql =~ s/,$//g; # strip last , inside create table
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
/*
|
||||
* Copyright (C) 2005-2011 James Grant <james@lightbox.org> Lightbox Technologies Inc.
|
||||
* Copyright (C) 2020 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
*
|
||||
* 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
|
||||
|
|
@ -419,7 +420,7 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
|
|||
|
||||
// in after, we need to watch out for escape format strings, ie (E'escaped \r in a string'), and ('bla',E'escaped \r in a string'), but could also be (number, E'string'); so we can't search for the previous '
|
||||
// ugh i guess its possible these strings could exist IN the data as well, but the only way to solve that is to process these lines one character
|
||||
// at a time, and that's just stupid, so lets just hope this doesn't appear anywhere in the actual data
|
||||
// at a time, and that's just stupid, so let's just hope this doesn't appear anywhere in the actual data
|
||||
$after = str_replace(" (E'", " ('", $after);
|
||||
$after = str_replace(", E'", ", '", $after);
|
||||
|
||||
|
|
@ -439,7 +440,7 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
|
|||
|
||||
// in after, we need to watch out for escape format strings, ie (E'escaped \r in a string'), and ('bla',E'escaped \r in a string')
|
||||
// ugh i guess its possible these strings could exist IN the data as well, but the only way to solve that is to process these lines one character
|
||||
// at a time, and that's just stupid, so lets just hope this doesn't appear anywhere in the actual data
|
||||
// at a time, and that's just stupid, so let's just hope this doesn't appear anywhere in the actual data
|
||||
$after = str_replace(" (E'", " ('", $after);
|
||||
$after = str_replace(", E'", ", '", $after);
|
||||
|
||||
|
|
@ -457,7 +458,7 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
|
|||
|
||||
// in after, we need to watch out for escape format strings, ie (E'escaped \r in a string'), and ('bla',E'escaped \r in a string')
|
||||
// ugh i guess its possible these strings could exist IN the data as well, but the only way to solve that is to process these lines one character
|
||||
// at a time, and that's just stupid, so lets just hope this doesn't appear anywhere in the actual data
|
||||
// at a time, and that's just stupid, so let's just hope this doesn't appear anywhere in the actual data
|
||||
|
||||
// after the first line, we only need to check for it in the middle, not at the beginning of an insert (because the beginning will be on the first line)
|
||||
// $after=str_replace(" (E'","' ('",$after);
|
||||
|
|
@ -497,7 +498,7 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
|
|||
$reg2 = array();
|
||||
if (preg_match('/ALTER TABLE ([^\s]+)/', $pkey, $reg2)) {
|
||||
if (empty($arrayofprimaryalreadyintabledef[$reg2[1]])) {
|
||||
// looks like we have a single line PRIMARY KEY definition, lets go ahead and add it
|
||||
// looks like we have a single line PRIMARY KEY definition, let's go ahead and add it
|
||||
$output .= str_replace("\n", "", $pkey);
|
||||
// the postgres and mysql syntax for this is (at least, in the example im looking at)
|
||||
// identical, so we can just add it as is.
|
||||
|
|
|
|||
|
|
@ -1032,7 +1032,7 @@ $sous_total_credit = 0;
|
|||
$totalarray['val'] = array();
|
||||
$totalarray['val']['totaldebit'] = 0;
|
||||
$totalarray['val']['totalcredit'] = 0;
|
||||
$totalarray['val']['totalbalance']=0;
|
||||
$totalarray['val']['totalbalance'] = 0;
|
||||
|
||||
while ($i < min($num, $limit)) {
|
||||
$line = $object->lines[$i];
|
||||
|
|
@ -1283,7 +1283,7 @@ while ($i < min($num, $limit)) {
|
|||
|
||||
// Label operation
|
||||
if (!empty($arrayfields['t.label_operation']['checked'])) {
|
||||
// Affiche un lien vers la facture client/fournisseur
|
||||
// Show a link to the customer/supplier invoice
|
||||
$doc_ref = preg_replace('/\(.*\)/', '', $line->doc_ref);
|
||||
if (strlen(length_accounta($line->subledger_account)) == 0) {
|
||||
print '<td class="small tdoverflowmax350 classfortooltip" title="'.dol_escape_htmltag($line->label_operation).'">'.dol_escape_htmltag($line->label_operation).'</td>';
|
||||
|
|
|
|||
|
|
@ -466,7 +466,7 @@ class AccountingAccount extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable name (with picto eventually)
|
||||
* Return clickable name (with picto eventually)
|
||||
*
|
||||
* @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
|
||||
* @param int $withlabel 0=No label, 1=Include label of account
|
||||
|
|
|
|||
|
|
@ -2291,7 +2291,7 @@ class Adherent extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable name (with picto eventually)
|
||||
* Return clickable name (with picto eventually)
|
||||
*
|
||||
* @param int $withpictoimg 0=No picto, 1=Include picto into link, 2=Only picto, -1=Include photo into link, -2=Only picto photo, -3=Only photo very small, -4=???)
|
||||
* @param int $maxlen length max label
|
||||
|
|
@ -3251,7 +3251,7 @@ class Adherent extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
* Copyright (C) 2018-2019 Thibault Foucart <support@ptibogxiv.net>
|
||||
* Copyright (C) 2021 Waël Almoman <info@almoman.com>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
*
|
||||
* 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
|
||||
|
|
@ -699,9 +700,9 @@ class AdherentType extends CommonObject
|
|||
if (isset($this->duration)) {
|
||||
$datas['duration'] = '<br>'.$langs->trans("Duration").': '.$this->duration_value;
|
||||
if ($this->duration_value > 1) {
|
||||
$dur = array("i"=>$langs->trans("Minutes"), "h"=>$langs->trans("Hours"), "d"=>$langs->trans("Days"), "w"=>$langs->trans("Weeks"), "m"=>$langs->trans("Months"), "y"=>$langs->trans("Years"));
|
||||
$dur = array("i" => $langs->trans("Minutes"), "h" => $langs->trans("Hours"), "d" => $langs->trans("Days"), "w" => $langs->trans("Weeks"), "m" => $langs->trans("Months"), "y" => $langs->trans("Years"));
|
||||
} elseif ($this->duration_value > 0) {
|
||||
$dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
|
||||
$dur = array("i" => $langs->trans("Minute"), "h" => $langs->trans("Hour"), "d" => $langs->trans("Day"), "w" => $langs->trans("Week"), "m" => $langs->trans("Month"), "y" => $langs->trans("Year"));
|
||||
}
|
||||
$datas['duration'] .= " " . (!empty($this->duration_unit) && isset($dur[$this->duration_unit]) ? $langs->trans($dur[$this->duration_unit]) : '');
|
||||
}
|
||||
|
|
@ -710,7 +711,7 @@ class AdherentType extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable name (with picto eventually)
|
||||
* Return clickable name (with picto eventually)
|
||||
*
|
||||
* @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
|
||||
* @param int $maxlen length max label
|
||||
|
|
@ -970,7 +971,7 @@ class AdherentType extends CommonObject
|
|||
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -420,7 +420,7 @@ class Subscription extends CommonObject
|
|||
|
||||
|
||||
/**
|
||||
* Return clicable name (with picto eventually)
|
||||
* Return clickable name (with picto eventually)
|
||||
*
|
||||
* @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
|
||||
* @param int $notooltip 1=Disable tooltip
|
||||
|
|
@ -536,7 +536,7 @@ class Subscription extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -1622,7 +1622,7 @@ class BOM extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
/* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
|
||||
* Copyright (C) 2016 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
*
|
||||
* 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
|
||||
|
|
@ -350,7 +351,7 @@ class AgendaEvents extends DolibarrApi
|
|||
// phpcs:enable
|
||||
$object = parent::_cleanObjectDatas($object);
|
||||
|
||||
unset($object->note); // alreaydy into note_private
|
||||
unset($object->note); // already in note_private or note_public
|
||||
unset($object->usermod);
|
||||
unset($object->libelle);
|
||||
unset($object->context);
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
|
||||
* Copyright (C) 2020 Open-Dsi <support@open-dsi.fr>
|
||||
* Copyright (C) 2022 Anthony Berton <anthony.berton@bb2a.fr>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
*
|
||||
* 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
|
||||
|
|
@ -618,7 +619,7 @@ if ($object->id > 0) {
|
|||
}
|
||||
|
||||
// Other attributes
|
||||
$parameters = array('socid'=>$object->id);
|
||||
$parameters = array('socid' => $object->id);
|
||||
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
|
||||
|
||||
// Sales representative
|
||||
|
|
@ -697,7 +698,7 @@ if ($object->id > 0) {
|
|||
// Nbre max d'elements des petites listes
|
||||
$MAXLIST = getDolGlobalString('MAIN_SIZE_SHORTLIST_LIMIT');
|
||||
|
||||
// Lien recap
|
||||
// Link summary/status board
|
||||
$boxstat .= '<div class="box divboxtable box-halfright">';
|
||||
$boxstat .= '<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="border boxtable boxtablenobottom boxtablenotop boxtablenomarginbottom centpercent">';
|
||||
$boxstat .= '<tr class="impair nohover"><td colspan="2" class="tdboxstats nohover">';
|
||||
|
|
@ -926,7 +927,7 @@ if ($object->id > 0) {
|
|||
* Latest orders
|
||||
*/
|
||||
if (isModEnabled('order') && $user->hasRight('commande', 'lire')) {
|
||||
$param ="";
|
||||
$param = "";
|
||||
|
||||
$sql = "SELECT s.nom, s.rowid";
|
||||
$sql .= ", c.rowid as cid, c.entity, c.fk_projet, c.total_ht";
|
||||
|
|
@ -1237,7 +1238,7 @@ if ($object->id > 0) {
|
|||
print $late;
|
||||
print "</td>\n";
|
||||
print '<td class="nowrap">';
|
||||
print dol_trunc(strtolower(get_class($object)) == strtolower(Client::class) ? $objp->refcus : $objp->refsup, 12);
|
||||
print dol_trunc(strtolower(get_class($object)) == strtolower(Client::class) ? $objp->refcus : $objp->refsup, 12);
|
||||
print "</td>\n";
|
||||
//print '<td class="right" width="80px"><span title="'.$langs->trans("DateCreation").'">'.dol_print_date($db->jdate($objp->dc), 'day')."</span></td>\n";
|
||||
print '<td class="right" width="80px"><span title="'.$langs->trans("DateContract").'">'.dol_print_date($db->jdate($objp->dcon), 'day')."</span></td>\n";
|
||||
|
|
|
|||
|
|
@ -3723,7 +3723,7 @@ class Propal extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param int $withpicto Add picto into link
|
||||
* @param string $option Where point the link ('expedition', 'document', ...)
|
||||
|
|
@ -3938,7 +3938,7 @@ class Propal extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -390,17 +390,17 @@ class Commande extends CommonOrder
|
|||
/*
|
||||
* Signed by sender
|
||||
*/
|
||||
CONST STATUS_SIGNED_SENDER = 1;
|
||||
const STATUS_SIGNED_SENDER = 1;
|
||||
|
||||
/*
|
||||
* Signed by receiver
|
||||
*/
|
||||
CONST STATUS_SIGNED_RECEIVER = 2;
|
||||
const STATUS_SIGNED_RECEIVER = 2;
|
||||
|
||||
/*
|
||||
* Signed by all
|
||||
*/
|
||||
CONST STATUS_SIGNED_ALL = 9; // To handle future kind of signature (ex: tripartite contract)
|
||||
const STATUS_SIGNED_ALL = 9; // To handle future kind of signature (ex: tripartite contract)
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -3815,7 +3815,7 @@ class Commande extends CommonOrder
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param int $withpicto Add picto into link
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
|
|
|
|||
|
|
@ -557,12 +557,12 @@ class Account extends CommonObject
|
|||
$num = $this->db->num_rows($result);
|
||||
while ($i < $num) {
|
||||
$obj = $this->db->fetch_object($result);
|
||||
// Anciens liens (pour compatibilite)
|
||||
// Old links (for compatibility)
|
||||
$lines[$i][0] = $obj->url;
|
||||
$lines[$i][1] = $obj->url_id;
|
||||
$lines[$i][2] = $obj->label;
|
||||
$lines[$i][3] = $obj->type;
|
||||
// Nouveaux liens
|
||||
// New links
|
||||
$lines[$i]['url'] = $obj->url;
|
||||
$lines[$i]['url_id'] = $obj->url_id;
|
||||
$lines[$i]['label'] = $obj->label;
|
||||
|
|
@ -1515,7 +1515,7 @@ class Account extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable name (with picto eventually)
|
||||
* Return clickable name (with picto eventually)
|
||||
*
|
||||
* @param int $withpicto Include picto into link
|
||||
* @param string $mode ''=Link to card, 'transactions'=Link to transactions card
|
||||
|
|
@ -1950,7 +1950,7 @@ class Account extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -680,7 +680,7 @@ class PaymentVarious extends CommonObject
|
|||
|
||||
|
||||
/**
|
||||
* Send name clicable (with possibly the picto)
|
||||
* Send name clickable (with possibly the picto)
|
||||
*
|
||||
* @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
|
||||
* @param string $option link option
|
||||
|
|
@ -819,7 +819,7 @@ class PaymentVarious extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -370,7 +370,7 @@ class CashControl extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param int $withpicto Add picto into link
|
||||
* @param string $option On what the link point to ('nolink', ...)
|
||||
|
|
@ -448,7 +448,7 @@ class CashControl extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
* Copyright (C) 2009-2012 Regis Houssin <regis.houssin@inodbox.com>
|
||||
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
|
||||
* Copyright (C) 2019-2024 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
*
|
||||
* 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
|
||||
|
|
@ -362,14 +363,14 @@ class Deplacement extends CommonObject
|
|||
$this->labelStatusShort[self::STATUS_REFUNDED] = $langs->transnoentitiesnoconv('Refunded');
|
||||
}
|
||||
|
||||
$status_logo = array(0 => 'status0', 1=>'status4', 2 => 'status1', 4 => 'status6', 5 => 'status4', 6 => 'status6', 99 => 'status5');
|
||||
$status_logo = array(0 => 'status0', 1 => 'status4', 2 => 'status1', 4 => 'status6', 5 => 'status4', 6 => 'status6', 99 => 'status5');
|
||||
$statusType = $status_logo[$status];
|
||||
|
||||
return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
|
||||
}
|
||||
|
||||
/**
|
||||
* Return clicable name (with picto eventually)
|
||||
* Return clickable name (with picto eventually)
|
||||
*
|
||||
* @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
|
||||
* @return string Chaine avec URL
|
||||
|
|
|
|||
|
|
@ -1432,7 +1432,7 @@ class FactureRec extends CommonInvoice
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable name (with picto eventually)
|
||||
* Return clickable name (with picto eventually)
|
||||
*
|
||||
* @param int $withpicto Add picto into link
|
||||
* @param string $option Where point the link
|
||||
|
|
|
|||
|
|
@ -1968,7 +1968,7 @@ class Facture extends CommonInvoice
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param int $withpicto Add picto into link
|
||||
* @param string $option Where point the link
|
||||
|
|
@ -2861,7 +2861,7 @@ class Facture extends CommonInvoice
|
|||
// Delete invoice line
|
||||
$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facturedet WHERE fk_facture = '.((int) $rowid);
|
||||
|
||||
if ($this->db->query($sqlef) && $this->db->query($sql) && $this->delete_linked_contact() >= 0 ) {
|
||||
if ($this->db->query($sqlef) && $this->db->query($sql) && $this->delete_linked_contact() >= 0) {
|
||||
$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture WHERE rowid = '.((int) $rowid);
|
||||
|
||||
$resql = $this->db->query($sql);
|
||||
|
|
@ -5985,7 +5985,7 @@ class Facture extends CommonInvoice
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -545,7 +545,7 @@ class Localtax extends CommonObject
|
|||
$ok = 0;
|
||||
}
|
||||
|
||||
// Mise a jour liens
|
||||
// Update the links
|
||||
$result = $acc->add_url_line($bank_line_id, $this->id, DOL_URL_ROOT.'/compta/localtax/card.php?id=', "(VATPayment)", "payment_vat");
|
||||
if ($result < 0) {
|
||||
$this->error = $acc->error;
|
||||
|
|
@ -598,7 +598,7 @@ class Localtax extends CommonObject
|
|||
* Returns clickable name
|
||||
*
|
||||
* @param int $withpicto 0=Link, 1=Picto into link, 2=Picto
|
||||
* @param string $option Sur quoi pointe le lien
|
||||
* @param string $option What the link points to
|
||||
* @return string Chaine avec URL
|
||||
*/
|
||||
public function getNomUrl($withpicto = 0, $option = '')
|
||||
|
|
@ -653,7 +653,7 @@ class Localtax extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -505,7 +505,7 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
|
|||
print '</tr>';
|
||||
}
|
||||
|
||||
if (count($x_coll) == 0) { // Show a total ine if nothing shown
|
||||
if (count($x_coll) == 0) { // Show a total line if nothing shown
|
||||
print '<tr class="liste_total">';
|
||||
print '<td> </td>';
|
||||
print '<td class="right">'.$langs->trans("Total").':</td>';
|
||||
|
|
|
|||
|
|
@ -896,10 +896,10 @@ class RemiseCheque extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable name (with picto eventually)
|
||||
* Return clickable name (with picto eventually)
|
||||
*
|
||||
* @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
|
||||
* @param string $option Sur quoi pointe le lien
|
||||
* @param string $option Indicate where the link points to
|
||||
* @param int $notooltip 1=Disable tooltip
|
||||
* @param string $morecss Add more css on link
|
||||
* @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
|
||||
|
|
@ -996,7 +996,7 @@ class RemiseCheque extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -891,7 +891,7 @@ class Paiement extends CommonObject
|
|||
|
||||
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
|
||||
/**
|
||||
* Mise a jour du lien entre le paiement et la ligne generee dans llx_bank
|
||||
* Update the link between the Payment and the line generated in llx_bank
|
||||
*
|
||||
* @param int $id_bank Id compte bancaire
|
||||
* @return int Return integer <0 if KO, >0 if OK
|
||||
|
|
@ -1282,10 +1282,10 @@ class Paiement extends CommonObject
|
|||
|
||||
|
||||
/**
|
||||
* Return clicable name (with picto eventually)
|
||||
* Return clickable name (with picto eventually)
|
||||
*
|
||||
* @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
|
||||
* @param string $option Sur quoi pointe le lien
|
||||
* @param string $option What the link points to
|
||||
* @param string $mode 'withlistofinvoices'=Include list of invoices into tooltip
|
||||
* @param int $notooltip 1=Disable tooltip
|
||||
* @param string $morecss Add more CSS
|
||||
|
|
|
|||
|
|
@ -2213,7 +2213,7 @@ class BonPrelevement extends CommonObject
|
|||
$XML_DEBITOR .= ' </DrctDbtTx>' . $CrLf;
|
||||
$XML_DEBITOR .= ' <DbtrAgt>' . $CrLf;
|
||||
$XML_DEBITOR .= ' <FinInstnId>' . $CrLf;
|
||||
if (getDolGlobalInt('WITHDRAWAL_WITHOUT_BIC')==0) {
|
||||
if (getDolGlobalInt('WITHDRAWAL_WITHOUT_BIC') == 0) {
|
||||
$XML_DEBITOR .= ' <BIC>' . $row_bic . '</BIC>' . $CrLf;
|
||||
}
|
||||
$XML_DEBITOR .= ' </FinInstnId>' . $CrLf;
|
||||
|
|
@ -2771,7 +2771,7 @@ class BonPrelevement extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -755,7 +755,7 @@ class ChargeSociales extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -674,7 +674,7 @@ class PaymentSocialContribution extends CommonObject
|
|||
|
||||
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
|
||||
/**
|
||||
* Mise a jour du lien entre le paiement de charge et la ligne dans llx_bank generee
|
||||
* Update the link between the Payment and the line generated in llx_bank
|
||||
*
|
||||
* @param int $id_bank Id if bank
|
||||
* @return int >0 if OK, <=0 if KO
|
||||
|
|
@ -759,7 +759,7 @@ class PaymentSocialContribution extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable name (with picto eventually)
|
||||
* Return clickable name (with picto eventually)
|
||||
*
|
||||
* @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
|
||||
* @param int $maxlen Longueur max libelle
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
* Copyright (C) 2017 Olivier Geffroy <jeff@jeffinfo.com>
|
||||
* Copyright (C) 2018-2020 Frédéric France <frederic.france@netlogic.fr>
|
||||
* Copyright (C) 2024 Benjamin B. <b.crozon@trebisol.com>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
*
|
||||
* 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
|
||||
|
|
@ -677,8 +678,8 @@ print '</div>';
|
|||
|
||||
print '<br><table width="100%" class="noborder">';
|
||||
|
||||
// Factures non reglees
|
||||
// Y a bug ici. Il faut prendre le reste a payer et non le total des factures non reglees !
|
||||
// Unpaid invoices
|
||||
// There is a bug here. We need to use the remaining to pay and not the total of unpaid invoices!
|
||||
|
||||
$sql = "SELECT f.ref, f.rowid, s.nom, s.rowid as socid, f.total_ttc, sum(pf.amount) as am";
|
||||
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f left join ".MAIN_DB_PREFIX."paiement_facture as pf on f.rowid=pf.fk_facture";
|
||||
|
|
|
|||
|
|
@ -723,7 +723,7 @@ class Tva extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Send name clicable (with possibly the picto)
|
||||
* Send name clickable (with possibly the picto)
|
||||
*
|
||||
* @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
|
||||
* @param string $option link option
|
||||
|
|
@ -915,7 +915,7 @@ class Tva extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -2060,7 +2060,7 @@ class Contrat extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable name (with picto eventually)
|
||||
* Return clickable name (with picto eventually)
|
||||
*
|
||||
* @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
|
||||
* @param int $maxlength Max length of ref
|
||||
|
|
@ -2889,7 +2889,7 @@ class Contrat extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
@ -3233,7 +3233,7 @@ class ContratLigne extends CommonObjectLine
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable name (with picto eventually) for ContratLigne
|
||||
* Return clickable name (with picto eventually) for ContratLigne
|
||||
*
|
||||
* @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
|
||||
* @param int $maxlength Max length
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
<?php
|
||||
/* Copyright (C) 2015-2023 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
*
|
||||
* 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
|
||||
|
|
@ -77,7 +78,7 @@ if (!empty($user->socid)) {
|
|||
|
||||
// We check permission.
|
||||
// Check is done on $user->rights->element->create or $user->rights->element->subelement->create (because $action = 'set')
|
||||
if (preg_match('/statu[st]$/', $field) || ($field == 'evenunsubscribe' && $object->table_element == 'mailing')) {
|
||||
if (preg_match('/stat[u][st]$/', $field) || ($field == 'evenunsubscribe' && $object->table_element == 'mailing')) {
|
||||
restrictedArea($user, $object->module, $object, $object->table_element, $usesublevelpermission);
|
||||
} elseif ($element == 'product' && in_array($field, array('tosell', 'tobuy', 'tobatch'))) { // Special case for products
|
||||
restrictedArea($user, 'produit|service', $object, 'product&product', '', '', 'rowid');
|
||||
|
|
|
|||
|
|
@ -177,7 +177,7 @@ abstract class CommonInvoice extends CommonObject
|
|||
|
||||
/**
|
||||
* Proforma invoice.
|
||||
* @deprectad Remove this. A "proforma invoice" is an order with a look of invoice, not an invoice !
|
||||
* @deprecated Remove this. A "proforma invoice" is an order with a look of invoice, not an invoice !
|
||||
*/
|
||||
const TYPE_PROFORMA = 4;
|
||||
|
||||
|
|
@ -676,7 +676,7 @@ abstract class CommonInvoice extends CommonObject
|
|||
} elseif ($this->type == CommonInvoice::TYPE_DEPOSIT) {
|
||||
$labellong = "InvoiceDeposit";
|
||||
$labelshort = "Deposit";
|
||||
} elseif ($this->type == CommonInvoice::TYPE_PROFORMA) {
|
||||
} elseif ($this->type == CommonInvoice::TYPE_PROFORMA) { // @phan-suppress-current-line PhanDeprecatedClassConstant
|
||||
$labellong = "InvoiceProForma"; // Not used.
|
||||
$labelshort = "ProForma";
|
||||
} elseif ($this->type == CommonInvoice::TYPE_SITUATION) {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
/* Copyright (C) 2012 Regis Houssin <regis.houssin@inodbox.com>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
*
|
||||
* 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
|
||||
|
|
@ -35,7 +36,7 @@ abstract class CommonOrder extends CommonObject
|
|||
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
@ -72,7 +73,7 @@ abstract class CommonOrder extends CommonObject
|
|||
return $return;
|
||||
}
|
||||
|
||||
/** return nb of fines of order where products or services that can be buyed
|
||||
/** return nb of fines of order where products or services that can be bought
|
||||
*
|
||||
* @param boolean $ignoreFree Ignore free lines
|
||||
* @return int number of products or services on buy in a command
|
||||
|
|
@ -84,10 +85,12 @@ abstract class CommonOrder extends CommonObject
|
|||
$return = 0;
|
||||
foreach ($this->lines as $line) {
|
||||
if (empty($line->fk_product) && !$ignoreFree) {
|
||||
$return ++;
|
||||
$return++;
|
||||
} elseif ((int) $line->fk_product > 0) {
|
||||
if ($product->fetch($line->fk_product) > 0) {
|
||||
if ($product->status_buy) $return ++;
|
||||
if ($product->status_buy) {
|
||||
$return++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -143,13 +146,13 @@ abstract class CommonOrderLine extends CommonObjectLine
|
|||
* Boolean that indicates whether the product is available for sale '1' or not '0'
|
||||
* @var int
|
||||
*/
|
||||
public $product_tosell=0;
|
||||
public $product_tosell = 0;
|
||||
|
||||
/**
|
||||
* Boolean that indicates whether the product is available for purchase '1' or not '0'
|
||||
* @var int
|
||||
*/
|
||||
public $product_tobuy=0;
|
||||
public $product_tobuy = 0;
|
||||
|
||||
/**
|
||||
* Product description
|
||||
|
|
|
|||
|
|
@ -1914,7 +1914,7 @@ class ExtraFields
|
|||
$resql = $this->db->query($sql);
|
||||
if ($resql) {
|
||||
if ($filter_categorie === false) {
|
||||
$value = ''; // value was used, so now we reste it to use it to build final output
|
||||
$value = ''; // value was used, so now we reset it to use it to build final output
|
||||
|
||||
$obj = $this->db->fetch_object($resql);
|
||||
|
||||
|
|
@ -2024,7 +2024,7 @@ class ExtraFields
|
|||
$resql = $this->db->query($sql);
|
||||
if ($resql) {
|
||||
if ($filter_categorie === false) {
|
||||
$value = ''; // value was used, so now we reste it to use it to build final output
|
||||
$value = ''; // value was used, so now we reset it to use it to build final output
|
||||
$toprint = array();
|
||||
while ($obj = $this->db->fetch_object($resql)) {
|
||||
// Several field into label (eq table:code|label:rowid)
|
||||
|
|
|
|||
|
|
@ -301,7 +301,7 @@ class Fiscalyear extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param int $withpicto Add picto into link
|
||||
* @param int $notooltip 1=Disable tooltip
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
* Copyright (C) 2017 Rui Strecht <rui.strecht@aliartalentos.com>
|
||||
* Copyright (C) 2020 Open-Dsi <support@open-dsi.fr>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
*
|
||||
* 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
|
||||
|
|
@ -388,7 +389,7 @@ class FormCompany extends Form
|
|||
public function select_state_ajax($parent_field_id = 'country_id', $selected = 0, $country_codeid = 0, $htmlname = 'state_id', $morecss = 'maxwidth200onsmartphone minwidth300')
|
||||
{
|
||||
$html = '<script>';
|
||||
$html.='$("select[name=\"'.$parent_field_id.'\"]").change(function(){
|
||||
$html .= '$("select[name=\"'.$parent_field_id.'\"]").change(function(){
|
||||
$.ajax( "'.dol_buildpath('/core/ajax/ziptown.php', 2).'", { data:{ selected: $("select[name=\"'.$htmlname.'\"]").val(), country_codeid: $(this).val(), htmlname:"'.$htmlname.'", morecss:"'.$morecss.'" } } )
|
||||
.done(function(msg) {
|
||||
$("span#target_'.$htmlname.'").html(msg);
|
||||
|
|
@ -399,10 +400,11 @@ class FormCompany extends Form
|
|||
|
||||
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
|
||||
/**
|
||||
* Retourne la liste deroulante des regions actives don't le pays est actif
|
||||
* La cle de la liste est le code (il peut y avoir plusieurs entree pour
|
||||
* Provides the dropdown of the active regions including the actif country.
|
||||
* The key of the list is the code (there may be more than one entry for a
|
||||
* code but in that case the fields country and language are different).
|
||||
* un code donnee mais dans ce cas, le champ pays et lang differe).
|
||||
* Ainsi les liens avec les regions se font sur une region independemment de son name.
|
||||
* This way the links with the regions are made independent of its name.
|
||||
*
|
||||
* @param string $selected Preselected value
|
||||
* @param string $htmlname Name of HTML select field
|
||||
|
|
|
|||
|
|
@ -1360,7 +1360,7 @@ class Utils
|
|||
if ($filesize > $sizelimit) {
|
||||
$message .= '<br>'.$langs->trans("BackupIsTooLargeSend");
|
||||
$documenturl = $dolibarr_main_url_root.'/document.php?modulepart=systemtools&atachement=1&file=backup/'.urlencode($filename[0]);
|
||||
$message .= '<br><a href='.$documenturl.'>Lien de téléchargement</a>';
|
||||
$message .= '<br><a href='.$documenturl.'>Download link</a>';
|
||||
$filepath = '';
|
||||
$mimetype = '';
|
||||
$filename = '';
|
||||
|
|
@ -1390,7 +1390,7 @@ class Utils
|
|||
|
||||
dol_syslog(__METHOD__, LOG_DEBUG);
|
||||
|
||||
$this->error = "Error sending backp file ".((string) $error);
|
||||
$this->error = "Error sending backup file ".((string) $error);
|
||||
$this->output = $output;
|
||||
|
||||
if ($result) {
|
||||
|
|
|
|||
|
|
@ -464,7 +464,7 @@ interface Database
|
|||
/**
|
||||
* Convert (by PHP) a PHP server TZ string date into a Timestamps date (GMT if gm=true)
|
||||
* 19700101020000 -> 3600 with TZ+1 and gmt=0
|
||||
* 19700101020000 -> 7200 whaterver is TZ if gmt=1
|
||||
* 19700101020000 -> 7200 whatever is TZ if gmt=1
|
||||
*
|
||||
* @param string $string Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
|
||||
* @param bool $gm 1=Input information are GMT values, otherwise local to server TZ
|
||||
|
|
|
|||
|
|
@ -357,7 +357,7 @@ abstract class DoliDB implements Database
|
|||
/**
|
||||
* Convert (by PHP) a PHP server TZ string date into a Timestamps date (GMT if gm=true)
|
||||
* 19700101020000 -> 3600 with server TZ = +1 and $gm='tzserver'
|
||||
* 19700101020000 -> 7200 whaterver is server TZ if $gm='gmt'
|
||||
* 19700101020000 -> 7200 whatever is server TZ if $gm='gmt'
|
||||
*
|
||||
* @param string $string Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
|
||||
* @param mixed $gm 'gmt'=Input information are GMT values, 'tzserver'=Local to server TZ
|
||||
|
|
|
|||
|
|
@ -193,7 +193,7 @@ class DoliDBPgsql extends DoliDB
|
|||
|
||||
$line = preg_replace('/\s/', ' ', $line); // Replace tabulation with space
|
||||
|
||||
// we are inside create table statement so lets process datatypes
|
||||
// we are inside create table statement so let's process datatypes
|
||||
if (preg_match('/(ISAM|innodb)/i', $line)) { // end of create table sequence
|
||||
$line = preg_replace('/\)[\s\t]*type[\s\t]*=[\s\t]*(MyISAM|innodb).*;/i', ');', $line);
|
||||
$line = preg_replace('/\)[\s\t]*engine[\s\t]*=[\s\t]*(MyISAM|innodb).*;/i', ');', $line);
|
||||
|
|
|
|||
|
|
@ -166,7 +166,7 @@ class DoliDBSqlite3 extends DoliDB
|
|||
if ($type == 'dml') {
|
||||
$line = preg_replace('/\s/', ' ', $line); // Replace tabulation with space
|
||||
|
||||
// we are inside create table statement so lets process datatypes
|
||||
// we are inside create table statement so let's process datatypes
|
||||
if (preg_match('/(ISAM|innodb)/i', $line)) { // end of create table sequence
|
||||
$line = preg_replace('/\)[\s\t]*type[\s\t]*=[\s\t]*(MyISAM|innodb);/i', ');', $line);
|
||||
$line = preg_replace('/\)[\s\t]*engine[\s\t]*=[\s\t]*(MyISAM|innodb);/i', ');', $line);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
<?php
|
||||
/* Copyright (C) 2005-2023 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
*
|
||||
* This file is a modified version of datepicker.php from phpBSM to fix some
|
||||
* bugs, to add new features and to dramatically increase speed.
|
||||
|
|
@ -103,10 +104,10 @@ top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);
|
|||
|
||||
print '<body class="getmenudiv">'."\n";
|
||||
|
||||
// Javascript to make menu active like Jmobile did.
|
||||
// JavaScript to make menu active like Jmobile did.
|
||||
print '
|
||||
<style>
|
||||
/*Lets hide the non active LIs by default*/
|
||||
/* Hide the non active LIs by default*/
|
||||
body {
|
||||
font-size: 16px;
|
||||
}
|
||||
|
|
@ -155,7 +156,7 @@ if ($langs->trans("DIRECTION") == 'rtl') {
|
|||
} else {
|
||||
print 'background-position-x: 10px;';
|
||||
}
|
||||
print '
|
||||
print '
|
||||
background-position-y: 18px;
|
||||
padding: 1em 15px 1em 40px;
|
||||
display: block;
|
||||
|
|
@ -191,9 +192,9 @@ if ($langs->trans("DIRECTION") == 'rtl') {
|
|||
} else {
|
||||
print 'background-position-x: 10px;';
|
||||
}
|
||||
print 'background-position-y: 1px;';
|
||||
print 'padding-left: 20px;';
|
||||
print '
|
||||
print 'background-position-y: 1px;';
|
||||
print 'padding-left: 20px;';
|
||||
print '
|
||||
}
|
||||
li.lilevel1 a, li.lilevel1 {
|
||||
color: #000;
|
||||
|
|
|
|||
|
|
@ -8364,7 +8364,7 @@ function dol_htmlwithnojs($stringtoencode, $nouseofiframesandbox = 0, $check = '
|
|||
// List of dom events is on https://www.w3schools.com/jsref/dom_obj_event.asp and https://developer.mozilla.org/en-US/docs/Web/Events
|
||||
$out = preg_replace('/on(mouse|drag|key|load|touch|pointer|select|transition)[a-z]*\s*=/i', '', $out); // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
|
||||
$out = preg_replace('/on(abort|after|animation|auxclick|before|blur|cancel|canplay|canplaythrough|change|click|close|contextmenu|cuechange|copy|cut)[a-z]*\s*=/i', '', $out);
|
||||
$out = preg_replace('/on(dblclick|drop|durationchange|emptied|end|ended|error|focus|focusin|focusout|formdata|gotpointercapture|hashchange|input|invalid)[a-z]*\s*=/i', '', $out);
|
||||
$out = preg_replace('/on(dblclick|drop|durationchange|emptied|end|ended|error|focus(in|out)?|formdata|gotpointercapture|hashchange|input|invalid)[a-z]*\s*=/i', '', $out);
|
||||
$out = preg_replace('/on(lostpointercapture|offline|online|pagehide|pageshow)[a-z]*\s*=/i', '', $out);
|
||||
$out = preg_replace('/on(paste|pause|play|playing|progress|ratechange|reset|resize|scroll|search|seeked|seeking|show|stalled|start|submit|suspend)[a-z]*\s*=/i', '', $out);
|
||||
$out = preg_replace('/on(timeupdate|toggle|unload|volumechange|waiting|wheel)[a-z]*\s*=/i', '', $out);
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
* @param float $qty Quantity
|
||||
* @param float $pu Unit price (HT or TTC depending on price_base_type. TODO Add also mode 'INCT' when pu is price HT+VAT+LT1+LT2)
|
||||
* @param float $remise_percent_ligne Discount for line
|
||||
* @param float $txtva 0=do not apply VAT tax, VAT rate=apply (this is VAT rate only without text code, we don't need text code because we alreaydy have all tax info into $localtaxes_array)
|
||||
* @param float $txtva 0=do not apply VAT tax, VAT rate=apply (this is VAT rate only without text code, we don't need text code because we already have all tax info into $localtaxes_array)
|
||||
* @param float $uselocaltax1_rate 0=do not use localtax1, >0=apply and get value from localtaxes_array (or database if empty), -1=autodetect according to seller if we must apply, get value from localtaxes_array (or database if empty). Try to always use -1.
|
||||
* @param float $uselocaltax2_rate 0=do not use localtax2, >0=apply and get value from localtaxes_array (or database if empty), -1=autodetect according to seller if we must apply, get value from localtaxes_array (or database if empty). Try to always use -1.
|
||||
* @param float $remise_percent_global 0
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ class MenuManager
|
|||
$_SESSION["mainmenu"] = $mainmenu;
|
||||
$_SESSION["leftmenuopened"] = "";
|
||||
} else {
|
||||
// On va le chercher en session si non defini par le lien
|
||||
// Look for the menu in the session if not set by the link
|
||||
$mainmenu = isset($_SESSION["mainmenu"]) ? $_SESSION["mainmenu"] : '';
|
||||
}
|
||||
if (!empty($forcemainmenu)) {
|
||||
|
|
@ -119,7 +119,7 @@ class MenuManager
|
|||
$_SESSION["leftmenuopened"] = $leftmenu;
|
||||
}
|
||||
} else {
|
||||
// On va le chercher en session si non defini par le lien
|
||||
// Look for the menu in the session if not set by the link
|
||||
$leftmenu = isset($_SESSION["leftmenu"]) ? $_SESSION["leftmenu"] : '';
|
||||
}
|
||||
if (!empty($forceleftmenu)) {
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ class MenuManager
|
|||
$_SESSION["mainmenu"] = $mainmenu;
|
||||
$_SESSION["leftmenuopened"] = "";
|
||||
} else {
|
||||
// On va le chercher en session si non defini par le lien
|
||||
// Look for the menu in the session if not set by the link
|
||||
$mainmenu = isset($_SESSION["mainmenu"]) ? $_SESSION["mainmenu"] : '';
|
||||
}
|
||||
if (!empty($forcemainmenu)) {
|
||||
|
|
@ -118,7 +118,7 @@ class MenuManager
|
|||
$_SESSION["leftmenuopened"] = $leftmenu;
|
||||
}
|
||||
} else {
|
||||
// On va le chercher en session si non defini par le lien
|
||||
// Look for the menu in the session if not set by the link
|
||||
$leftmenu = isset($_SESSION["leftmenu"]) ? $_SESSION["leftmenu"] : '';
|
||||
}
|
||||
if (!empty($forceleftmenu)) {
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2005-2009 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@inodbox.com>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
*
|
||||
* 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
|
||||
|
|
@ -317,10 +318,10 @@ class mailing_contacts1 extends MailingTargets
|
|||
|
||||
|
||||
/**
|
||||
* Renvoie url lien vers fiche de la source du destinataire du mailing
|
||||
* Provide the URL to the car of the source information of the recipient for the mailing
|
||||
*
|
||||
* @param int $id ID
|
||||
* @return string Url lien
|
||||
* @return string URL link
|
||||
*/
|
||||
public function url($id)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
/* Copyright (C) 2005 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@inodbox.com>
|
||||
* Copyright (C) 2018-2023 Frédéric France <frederic.france@netlogic.fr>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
*
|
||||
* 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
|
||||
|
|
@ -212,10 +213,10 @@ class mailing_fraise extends MailingTargets
|
|||
|
||||
|
||||
/**
|
||||
* Renvoie url lien vers fiche de la source du destinataire du mailing
|
||||
* Provide the URL to the car of the source information of the recipient for the mailing
|
||||
*
|
||||
* @param int $id ID
|
||||
* @return string Url lien
|
||||
* @param int $id ID
|
||||
* @return string URL link
|
||||
*/
|
||||
public function url($id)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
/* Copyright (C) 2005-2011 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@inodbox.com>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
*
|
||||
* 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
|
||||
|
|
@ -137,10 +138,10 @@ class mailing_pomme extends MailingTargets
|
|||
|
||||
|
||||
/**
|
||||
* Renvoie url lien vers fiche de la source du destinataire du mailing
|
||||
* Provide the URL to the car of the source information of the recipient for the mailing
|
||||
*
|
||||
* @param int $id ID
|
||||
* @return string Url lien
|
||||
* @return string URL link
|
||||
*/
|
||||
public function url($id)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
<?php
|
||||
/* Copyright (C) 2005-2012 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
*
|
||||
* 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
|
||||
|
|
@ -87,10 +88,10 @@ class mailing_xinputfile extends MailingTargets
|
|||
|
||||
|
||||
/**
|
||||
* Renvoie url lien vers fiche de la source du destinataire du mailing
|
||||
* Provide the URL to the car of the source information of the recipient for the mailing
|
||||
*
|
||||
* @param int $id ID
|
||||
* @return string Url lien
|
||||
* @return string URL link
|
||||
*/
|
||||
public function url($id)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
<?php
|
||||
/* Copyright (C) 2005-2012 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
*
|
||||
* 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
|
||||
|
|
@ -87,10 +88,10 @@ class mailing_xinputuser extends MailingTargets
|
|||
|
||||
|
||||
/**
|
||||
* Renvoie url lien vers fiche de la source du destinataire du mailing
|
||||
* Provide the URL to the car of the source information of the recipient for the mailing
|
||||
*
|
||||
* @param int $id ID
|
||||
* @return string Url lien
|
||||
* @return string URL link
|
||||
*/
|
||||
public function url($id)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ use DebugBar\DataCollector\Renderable;
|
|||
/**
|
||||
* Class PhpCollector
|
||||
*
|
||||
* This class collects all PHP errors, notice, advices, trigger_error,...
|
||||
* This class collects all PHP errors, notices, advice, trigger_error,...
|
||||
* Supports 15 different types included.
|
||||
*/
|
||||
class PhpCollector extends DataCollector implements Renderable
|
||||
|
|
|
|||
|
|
@ -629,7 +629,7 @@ class TraceableDB extends DoliDB
|
|||
/**
|
||||
* Convert (by PHP) a PHP server TZ string date into a Timestamps date (GMT if gm=true)
|
||||
* 19700101020000 -> 3600 with TZ+1 and gmt=0
|
||||
* 19700101020000 -> 7200 whaterver is TZ if gmt=1
|
||||
* 19700101020000 -> 7200 whatever is TZ if gmt=1
|
||||
*
|
||||
* @param string $string Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
|
||||
* @param bool $gm 1=Input information are GMT values, otherwise local to server TZ
|
||||
|
|
|
|||
|
|
@ -765,7 +765,7 @@ class Delivery extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable name (with picto eventually)
|
||||
* Return clickable name (with picto eventually)
|
||||
*
|
||||
* @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
|
||||
* @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
|
||||
|
|
|
|||
|
|
@ -920,7 +920,7 @@ class Don extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable name (with picto eventually)
|
||||
* Return clickable name (with picto eventually)
|
||||
*
|
||||
* @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
|
||||
* @param int $notooltip 1=Disable tooltip
|
||||
|
|
@ -1162,7 +1162,7 @@ class Don extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
/* Copyright (C) 2015 Alexandre Spangaro <aspangaro@open-dsi.fr>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
*
|
||||
* 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
|
||||
|
|
@ -663,7 +664,7 @@ class PaymentDonation extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable name (with picto eventually)
|
||||
* Return clickable name (with picto eventually)
|
||||
*
|
||||
* @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
|
||||
* @param int $maxlen Max length
|
||||
|
|
@ -696,7 +697,7 @@ class PaymentDonation extends CommonObject
|
|||
|
||||
global $action;
|
||||
$hookmanager->initHooks(array($this->element . 'dao'));
|
||||
$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
|
||||
$parameters = array('id' => $this->id, 'getnomurl' => &$result);
|
||||
$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
||||
if ($reshook > 0) {
|
||||
$result = $hookmanager->resPrint;
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
/* Copyright (C) 2007-2012 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2008-2012 Regis Houssin <regis.houssin@inodbox.com>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
*
|
||||
* 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
|
||||
|
|
@ -469,7 +470,7 @@ class EcmDirectory extends CommonObject
|
|||
* Return directory name you can click (and picto)
|
||||
*
|
||||
* @param int $withpicto 0=Pas de picto, 1=Include picto into link, 2=Only picto
|
||||
* @param string $option Sur quoi pointe le lien
|
||||
* @param string $option What is the link pointing to
|
||||
* @param int $max Max length
|
||||
* @param string $more Add more param on a link
|
||||
* @param int $notooltip 1=Disable tooltip
|
||||
|
|
@ -511,7 +512,7 @@ class EcmDirectory extends CommonObject
|
|||
|
||||
global $action;
|
||||
$hookmanager->initHooks(array($this->element . 'dao'));
|
||||
$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
|
||||
$parameters = array('id' => $this->id, 'getnomurl' => &$result);
|
||||
$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
|
||||
if ($reshook > 0) {
|
||||
$result = $hookmanager->resPrint;
|
||||
|
|
|
|||
|
|
@ -1877,7 +1877,7 @@ class Expedition extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param int $withpicto Add picto into link
|
||||
* @param string $option Where the link point to
|
||||
|
|
@ -2001,7 +2001,7 @@ class Expedition extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -1785,7 +1785,7 @@ class ExpenseReport extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable name (with picto eventually)
|
||||
* Return clickable name (with picto eventually)
|
||||
*
|
||||
* @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
|
||||
* @param string $option Where point the link ('', 'document', ..)
|
||||
|
|
|
|||
|
|
@ -657,7 +657,7 @@ class PaymentExpenseReport extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable name (with picto eventually)
|
||||
* Return clickable name (with picto eventually)
|
||||
*
|
||||
* @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
|
||||
* @param int $maxlen Longueur max libelle
|
||||
|
|
@ -742,7 +742,7 @@ class PaymentExpenseReport extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -903,7 +903,7 @@ class Fichinter extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable name (with picto eventually)
|
||||
* Return clickable name (with picto eventually)
|
||||
*
|
||||
* @param int $withpicto 0=_No picto, 1=Includes the picto in the linkn, 2=Picto only
|
||||
* @param string $option Options
|
||||
|
|
@ -1603,7 +1603,7 @@ class Fichinter extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ class FichinterRec extends Fichinter
|
|||
$sql .= ", ".(!empty($fichintsrc->note_private) ? ("'".$this->db->escape($fichintsrc->note_private)."'") : "null");
|
||||
$sql .= ", ".(!empty($fichintsrc->note_public) ? ("'".$this->db->escape($fichintsrc->note_public)."'") : "null");
|
||||
$sql .= ", ".((int) $user->id);
|
||||
// si c'est la même société on conserve les liens vers le projet et le contrat
|
||||
// If the company is the same, keep the links to the project and the contract
|
||||
if ($this->socid == $fichintsrc->socid) {
|
||||
$sql .= ", ".(!empty($fichintsrc->fk_project) ? ((int) $fichintsrc->fk_project) : "null");
|
||||
$sql .= ", ".(!empty($fichintsrc->fk_contrat) ? ((int) $fichintsrc->fk_contrat) : "null");
|
||||
|
|
@ -627,7 +627,7 @@ class FichinterRec extends Fichinter
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable name (with picto eventually)
|
||||
* Return clickable name (with picto eventually)
|
||||
*
|
||||
* @param int $withpicto Add picto into link
|
||||
* @param string $option Where point the link
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
|
||||
* Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
|
||||
* Copyright (C) 2021 Frédéric France <frederic.france@netlogic.fr>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
*
|
||||
* 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
|
||||
|
|
@ -90,7 +91,7 @@ if ($object->id > 0) {
|
|||
* Action
|
||||
*/
|
||||
|
||||
$parameters = array('id'=>$id);
|
||||
$parameters = array('id' => $id);
|
||||
$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');
|
||||
|
|
@ -291,7 +292,7 @@ if ($object->id > 0) {
|
|||
$vattoshow = ($object->tva_intra ? showValueWithClipboardCPButton(dol_escape_htmltag($object->tva_intra)) : '');
|
||||
print $form->editfieldkey("VATIntra", 'tva_intra', $object->tva_intra, $object, $user->hasRight('societe', 'creer'));
|
||||
print '</td><td>';
|
||||
print $form->editfieldval("VATIntra", 'tva_intra', $vattoshow, $object, $user->hasRight('societe', 'creer'), 'string', $object->tva_intra, null, null, '', 1, '', 'id', 'auto', array('valuealreadyhtmlescaped'=>1));
|
||||
print $form->editfieldval("VATIntra", 'tva_intra', $vattoshow, $object, $user->hasRight('societe', 'creer'), 'string', $object->tva_intra, null, null, '', 1, '', 'id', 'auto', array('valuealreadyhtmlescaped' => 1));
|
||||
print '</td></tr>';
|
||||
|
||||
// Default terms of the settlement
|
||||
|
|
@ -408,7 +409,7 @@ if ($object->id > 0) {
|
|||
}
|
||||
|
||||
// Other attributes
|
||||
$parameters = array('socid'=>$object->id, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
|
||||
$parameters = array('socid' => $object->id, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
|
||||
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
|
||||
|
||||
// Module Adherent
|
||||
|
|
@ -442,7 +443,7 @@ if ($object->id > 0) {
|
|||
print '<div class="underbanner underbanner-before-box clearboth"></div>';
|
||||
print '<br>';
|
||||
|
||||
// Lien recap
|
||||
// Summary link
|
||||
$boxstat .= '<div class="box divboxtable box-halfright">';
|
||||
$boxstat .= '<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="border boxtable boxtablenobottom boxtablenotop" width="100%">';
|
||||
$boxstat .= '<tr class="impair nohover"><td colspan="2" class="tdboxstats nohover">';
|
||||
|
|
|
|||
|
|
@ -998,7 +998,7 @@ class CommandeFournisseur extends CommonOrder
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable name (with picto eventually)
|
||||
* Return clickable name (with picto eventually)
|
||||
*
|
||||
* @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
|
||||
* @param string $option On what the link points
|
||||
|
|
@ -3687,7 +3687,7 @@ class CommandeFournisseur extends CommonOrder
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -1436,7 +1436,7 @@ class FactureFournisseurRec extends CommonInvoice
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable name (with picto eventually)
|
||||
* Return clickable name (with picto eventually)
|
||||
*
|
||||
* @param int $withpicto Add picto into link
|
||||
* @param string $option Where point the link
|
||||
|
|
|
|||
|
|
@ -2832,7 +2832,7 @@ class FactureFournisseur extends CommonInvoice
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable name (with picto eventually)
|
||||
* Return clickable name (with picto eventually)
|
||||
*
|
||||
* @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
|
||||
* @param string $option Where point the link
|
||||
|
|
@ -3340,7 +3340,7 @@ class FactureFournisseur extends CommonInvoice
|
|||
return $isUsed;
|
||||
}
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param ?array{selected?:int<0,1>} $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -647,10 +647,10 @@ class PaiementFourn extends Paiement
|
|||
|
||||
|
||||
/**
|
||||
* Return clicable name (with picto eventually)
|
||||
* Return clickable name (with picto eventually)
|
||||
*
|
||||
* @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
|
||||
* @param string $option Sur quoi pointe le lien
|
||||
* @param string $option What is the link pointing to
|
||||
* @param string $mode 'withlistofinvoices'=Include list of invoices into tooltip
|
||||
* @param int $notooltip 1=Disable tooltip
|
||||
* @param string $morecss Add more CSS
|
||||
|
|
|
|||
|
|
@ -1383,7 +1383,7 @@ class Holiday extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable name (with picto eventually)
|
||||
* Return clickable name (with picto eventually)
|
||||
*
|
||||
* @param int $withpicto 0=_No picto, 1=Includes the picto in the linkn, 2=Picto only
|
||||
* @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
|
||||
|
|
@ -2478,7 +2478,7 @@ class Holiday extends CommonObject
|
|||
}
|
||||
}
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Label of holiday type (if known)
|
||||
|
|
|
|||
|
|
@ -1011,7 +1011,7 @@ class Evaluation extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -1021,7 +1021,7 @@ class Job extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -1076,7 +1076,7 @@ class Position extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -1080,7 +1080,7 @@ class Skill extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -745,7 +745,7 @@ if ($ret) {
|
|||
|
||||
|
||||
/**
|
||||
* Reporte liens vers une facture de paiements sur table de jointure (lien n-n paiements factures)
|
||||
* Records payment links for an invoice in a join table (link n<-->n for payments<-->invoices)
|
||||
*
|
||||
* @param DoliDB $db Database handler
|
||||
* @param Translate $langs Object langs
|
||||
|
|
@ -822,8 +822,8 @@ function migrate_paiements($db, $langs, $conf)
|
|||
}
|
||||
|
||||
/**
|
||||
* Corrige paiement orphelins (liens paumes suite a bugs)
|
||||
* Pour verifier s'il reste des orphelins:
|
||||
* Repair orphan payments (lost relations due to bugs)
|
||||
* Query to check if there are still orphans:
|
||||
* select * from llx_paiement as p left join llx_paiement_facture as pf on pf.fk_paiement=p.rowid WHERE pf.rowid IS NULL AND (p.fk_facture = 0 OR p.fk_facture IS NULL)
|
||||
*
|
||||
* @param DoliDB $db Database handler
|
||||
|
|
@ -887,7 +887,7 @@ function migrate_paiements_orphelins_1($db, $langs, $conf)
|
|||
print '* '.$row[$i]['datec'].' paymentid='.$row[$i]['paymentid'].' pamount='.$row[$i]['pamount'].' fk_bank='.$row[$i]['fk_bank'].' bamount='.$row[$i]['bamount'].' socid='.$row[$i]['socid'].'<br>';
|
||||
}
|
||||
|
||||
// On cherche facture sans lien paiement et du meme montant et pour meme societe.
|
||||
// Look for invoices without payment relations with the same amount and same comppany
|
||||
$sql = " SELECT distinct f.rowid from ".MAIN_DB_PREFIX."facture as f";
|
||||
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture";
|
||||
$sql .= " WHERE f.fk_statut in (2,3) AND fk_soc = ".((int) $row[$i]['socid'])." AND total_ttc = ".((float) $row[$i]['pamount']);
|
||||
|
|
@ -932,8 +932,8 @@ function migrate_paiements_orphelins_1($db, $langs, $conf)
|
|||
}
|
||||
|
||||
/**
|
||||
* Corrige paiement orphelins (liens paumes suite a bugs)
|
||||
* Pour verifier s'il reste des orphelins:
|
||||
* Repair orphan payments (lost relations due to bugs)
|
||||
* Query to check if there are still orphans:
|
||||
* select * from llx_paiement as p left join llx_paiement_facture as pf on pf.fk_paiement=p.rowid WHERE pf.rowid IS NULL AND (p.fk_facture = 0 OR p.fk_facture IS NULL)
|
||||
*
|
||||
* @param DoliDB $db Database handler
|
||||
|
|
@ -998,7 +998,7 @@ function migrate_paiements_orphelins_2($db, $langs, $conf)
|
|||
print '* '.$row[$i]['datec'].' paymentid='.$row[$i]['paymentid'].' pamount='.$row[$i]['pamount'].' fk_bank='.$row[$i]['fk_bank'].' '.$row[$i]['bamount'].' socid='.$row[$i]['socid'].'<br>';
|
||||
}
|
||||
|
||||
// On cherche facture sans lien paiement et du meme montant et pour meme societe.
|
||||
// Look for invoices without payment relations with the same amount and same comppany
|
||||
$sql = " SELECT distinct f.rowid from ".MAIN_DB_PREFIX."facture as f";
|
||||
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture";
|
||||
$sql .= " WHERE f.fk_statut in (2,3) AND fk_soc = ".((int) $row[$i]['socid'])." AND total_ttc = ".((float) $row[$i]['pamount']);
|
||||
|
|
@ -2474,7 +2474,7 @@ function migrate_commande_deliveryaddress($db, $langs, $conf)
|
|||
|
||||
/**
|
||||
* Migration du champ fk_remise_except dans llx_facturedet doit correspondre a
|
||||
* lien dans llx_societe_remise_except vers llx_facturedet
|
||||
* Link in `llx_societe_remise_except` to `llx_facturedet`
|
||||
*
|
||||
* @param DoliDB $db Database handler
|
||||
* @param Translate $langs Object langs
|
||||
|
|
|
|||
|
|
@ -1127,7 +1127,7 @@ class KnowledgeRecord extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
/* Copyright (C) 2014-2018 Alexandre Spangaro <aspangaro@open-dsi.fr>
|
||||
* Copyright (C) 2015-2024 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
*
|
||||
* 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
|
||||
|
|
@ -517,7 +518,7 @@ class Loan extends CommonObject
|
|||
|
||||
|
||||
/**
|
||||
* Return clicable name (with eventually the picto)
|
||||
* Return clickable name (with eventually the picto)
|
||||
*
|
||||
* @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
|
||||
* @param int $maxlen Label max length
|
||||
|
|
@ -693,7 +694,7 @@ class Loan extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -643,7 +643,7 @@ class PaymentLoan extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable name (with eventually a picto)
|
||||
* Return clickable name (with eventually a picto)
|
||||
*
|
||||
* @param int $withpicto 0=No picto, 1=Include picto into link, 2=No picto
|
||||
* @param int $maxlen Max length label
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
<?php
|
||||
/* Copyright (C) 2005-2012 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
*
|
||||
* This file is an example to follow to add your own email selector inside
|
||||
* the Dolibarr email tool.
|
||||
|
|
@ -61,7 +62,7 @@ class mailing_mailing_mymodule_selector1 extends MailingTargets
|
|||
global $langs;
|
||||
$langs->load("members");
|
||||
|
||||
$arraystatus = array(1=>'Option 1', 2=>'Option 2');
|
||||
$arraystatus = array(1 => 'Option 1', 2 => 'Option 2');
|
||||
|
||||
$s = '';
|
||||
$s .= $langs->trans("Status").': ';
|
||||
|
|
@ -81,7 +82,7 @@ class mailing_mailing_mymodule_selector1 extends MailingTargets
|
|||
* Returns url link to file of the source of the recipient of the mailing
|
||||
*
|
||||
* @param int $id ID
|
||||
* @return string Url lien
|
||||
* @return string Url link
|
||||
*/
|
||||
public function url($id)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1937,7 +1937,7 @@ class Mo extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -6707,7 +6707,7 @@ class Product extends CommonObject
|
|||
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ $h++;
|
|||
print dol_get_fiche_head($head, 'popularity', '', -1);
|
||||
|
||||
|
||||
// Array of liens to show
|
||||
// Array of lines to show
|
||||
$infoprod = array();
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1025,7 +1025,7 @@ class Entrepot extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -2491,7 +2491,7 @@ class Project extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -923,7 +923,7 @@ class Task extends CommonObjectLine
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable name (with picto eventually)
|
||||
* Return clickable name (with picto eventually)
|
||||
*
|
||||
* @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
|
||||
* @param string $option 'withproject' or ''
|
||||
|
|
@ -2644,7 +2644,7 @@ class Task extends CommonObjectLine
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -1254,7 +1254,7 @@ class Reception extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param int $withpicto Add picto into link
|
||||
* @param int $option Where point the link
|
||||
|
|
@ -1372,7 +1372,7 @@ class Reception extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -1039,7 +1039,7 @@ class RecruitmentCandidature extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -1111,7 +1111,7 @@ class RecruitmentJobPosition extends CommonObject
|
|||
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -209,7 +209,7 @@ class PaymentSalary extends CommonObject
|
|||
|
||||
dol_syslog(get_class($this)."::create", LOG_DEBUG);
|
||||
|
||||
//deprecatd
|
||||
//deprecated
|
||||
if (!empty($this->datepaye) && empty($this->datep)) {
|
||||
dol_syslog(__METHOD__.": using datepaye is deprecated, please use datep instead", LOG_WARNING);
|
||||
$this->datep = $this->datepaye;
|
||||
|
|
@ -711,7 +711,7 @@ class PaymentSalary extends CommonObject
|
|||
|
||||
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
|
||||
/**
|
||||
* Mise a jour du lien entre le paiement de salaire et la ligne dans llx_bank generee
|
||||
* Update the relation between the salary paiment and the line generated in llx_bank
|
||||
*
|
||||
* @param int $id_bank Id if bank
|
||||
* @return int >0 if OK, <=0 if KO
|
||||
|
|
@ -850,7 +850,7 @@ class PaymentSalary extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable name (with picto eventually)
|
||||
* Return clickable name (with picto eventually)
|
||||
*
|
||||
* @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
|
||||
* @param int $maxlen Longueur max libelle
|
||||
|
|
@ -987,7 +987,7 @@ class PaymentSalary extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -509,7 +509,7 @@ class Salary extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Send name clicable (with possibly the picto)
|
||||
* Send name clickable (with possibly the picto)
|
||||
*
|
||||
* @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
|
||||
* @param string $option link option
|
||||
|
|
@ -797,7 +797,7 @@ class Salary extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -5195,7 +5195,7 @@ class Societe extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
<?php
|
||||
/* Copyright (C) 2021 Thibault FOUCART <support@ptibogxiv.net>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
*
|
||||
* 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
|
||||
|
|
@ -75,7 +76,7 @@ if ($action == 'getConnexionToken') {
|
|||
// Force to use the correct API key
|
||||
global $stripearrayofkeysbyenv;
|
||||
\Stripe\Stripe::setApiKey($stripearrayofkeysbyenv[$servicestatus]['secret_key']);
|
||||
// The ConnectionToken's secret lets you connect to any Stripe Terminal reader
|
||||
// The ConnectionToken's secret let's you connect to any Stripe Terminal reader
|
||||
// and take payments with your Stripe account.
|
||||
$array = array();
|
||||
if (isset($location) && !empty($location)) {
|
||||
|
|
@ -102,9 +103,9 @@ if ($action == 'getConnexionToken') {
|
|||
$object->fetch($json_obj->invoiceid);
|
||||
$object->fetch_thirdparty();
|
||||
|
||||
$fulltag='INV='.$object->id.'.CUS='.$object->thirdparty->id;
|
||||
$tag=null;
|
||||
$fulltag=dol_string_unaccent($fulltag);
|
||||
$fulltag = 'INV='.$object->id.'.CUS='.$object->thirdparty->id;
|
||||
$tag = null;
|
||||
$fulltag = dol_string_unaccent($fulltag);
|
||||
|
||||
$stripe = new Stripe($db);
|
||||
$customer = $stripe->customerStripe($object->thirdparty, $stripeacc, $servicestatus, 1);
|
||||
|
|
|
|||
|
|
@ -2487,7 +2487,7 @@ class SupplierProposal extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param int $withpicto Add picto into link
|
||||
* @param string $option Where point the link ('compta', 'expedition', 'document', ...)
|
||||
|
|
@ -2741,7 +2741,7 @@ class SupplierProposal extends CommonObject
|
|||
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -309,7 +309,7 @@ div.tabBar input, div.tabBar input.flat, div.tabBar textarea, div.tabBar textare
|
|||
background-color: #f8f8fa;
|
||||
border-bottom-left-radius: 0;
|
||||
border-bottom-right-radius: 0;
|
||||
<?php
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
}
|
||||
|
|
@ -5134,7 +5134,7 @@ div.error {
|
|||
|
||||
|
||||
/*
|
||||
* Liens Payes/Non payes
|
||||
* Paid/Unpaid Links
|
||||
*/
|
||||
|
||||
a.normal:link { font-weight: normal }
|
||||
|
|
|
|||
|
|
@ -3153,78 +3153,78 @@ li.tmenu:hover .tmenuimage:not(.menuhider), li.tmenu:hover .tmenuimage:not(.menu
|
|||
<?php include dol_buildpath($path.'/theme/'.$theme.'/main_menu_fa_icons.inc.php', 0); ?>
|
||||
|
||||
<?php
|
||||
// Add here more div for other menu entries. moduletomainmenu=array('module name'=>'name of class for div')
|
||||
// Add here more div for other menu entries. moduletomainmenu=array('module name'=>'name of class for div')
|
||||
|
||||
$moduletomainmenu = array(
|
||||
'user' => '', 'syslog' => '', 'societe' => 'companies', 'projet' => 'project', 'propale' => 'commercial', 'commande' => 'commercial',
|
||||
'produit' => 'products', 'service' => 'products', 'stock' => 'products',
|
||||
'don' => 'accountancy', 'tax' => 'accountancy', 'banque' => 'accountancy', 'facture' => 'accountancy', 'compta' => 'accountancy', 'accounting' => 'accountancy', 'adherent' => 'members', 'import' => 'tools', 'export' => 'tools', 'mailing' => 'tools',
|
||||
'contrat' => 'commercial', 'ficheinter' => 'commercial', 'ticket' => 'ticket', 'deplacement' => 'commercial',
|
||||
'fournisseur' => 'companies',
|
||||
'barcode' => '', 'fckeditor' => '', 'categorie' => '',
|
||||
);
|
||||
$mainmenuused = 'home';
|
||||
foreach ($conf->modules as $val) {
|
||||
$mainmenuused .= ','.(isset($moduletomainmenu[$val]) ? $moduletomainmenu[$val] : $val);
|
||||
}
|
||||
$mainmenuusedarray = array_unique(explode(',', $mainmenuused));
|
||||
|
||||
$generic = 1;
|
||||
// Put here list of menu entries when the div.mainmenu.menuentry was previously defined
|
||||
$divalreadydefined = array('home', 'companies', 'products', 'mrp', 'commercial', 'externalsite', 'accountancy', 'project', 'tools', 'members', 'agenda', 'ftp', 'holiday', 'hrm', 'bookmark', 'cashdesk', 'takepos', 'ecm', 'geoipmaxmind', 'gravatar', 'clicktodial', 'paypal', 'stripe', 'webservices', 'website');
|
||||
// Put here list of menu entries we are sure we don't want
|
||||
$divnotrequired = array('multicurrency', 'salaries', 'ticket', 'margin', 'opensurvey', 'paybox', 'expensereport', 'incoterm', 'prelevement', 'propal', 'workflow', 'notification', 'supplier_proposal', 'cron', 'product', 'productbatch', 'expedition');
|
||||
foreach ($mainmenuusedarray as $val) {
|
||||
if (empty($val) || in_array($val, $divalreadydefined)) {
|
||||
continue;
|
||||
}
|
||||
if (in_array($val, $divnotrequired)) {
|
||||
continue;
|
||||
}
|
||||
//print "XXX".$val;
|
||||
|
||||
$found = 0;
|
||||
$url = '';
|
||||
$constformoduleicon = 'MAIN_MODULE_'.strtoupper($val).'_ICON';
|
||||
$iconformodule = getDolGlobalString($constformoduleicon);
|
||||
if ($iconformodule) {
|
||||
if (preg_match('/^fa\-/', $iconformodule)) {
|
||||
// This is a fa icon
|
||||
} else {
|
||||
$url = dol_buildpath('/'.$val.'/img/'.$iconformodule.'.png', 1);
|
||||
$moduletomainmenu = array(
|
||||
'user' => '', 'syslog' => '', 'societe' => 'companies', 'projet' => 'project', 'propale' => 'commercial', 'commande' => 'commercial',
|
||||
'produit' => 'products', 'service' => 'products', 'stock' => 'products',
|
||||
'don' => 'accountancy', 'tax' => 'accountancy', 'banque' => 'accountancy', 'facture' => 'accountancy', 'compta' => 'accountancy', 'accounting' => 'accountancy', 'adherent' => 'members', 'import' => 'tools', 'export' => 'tools', 'mailing' => 'tools',
|
||||
'contrat' => 'commercial', 'ficheinter' => 'commercial', 'ticket' => 'ticket', 'deplacement' => 'commercial',
|
||||
'fournisseur' => 'companies',
|
||||
'barcode' => '', 'fckeditor' => '', 'categorie' => '',
|
||||
);
|
||||
$mainmenuused = 'home';
|
||||
foreach ($conf->modules as $val) {
|
||||
$mainmenuused .= ','.(isset($moduletomainmenu[$val]) ? $moduletomainmenu[$val] : $val);
|
||||
}
|
||||
$found = 1;
|
||||
} else {
|
||||
// Search img file in module dir
|
||||
foreach ($conf->file->dol_document_root as $dirroot) {
|
||||
if (file_exists($dirroot."/".$val."/img/".$val.".png")) {
|
||||
$url = dol_buildpath('/'.$val.'/img/'.$val.'.png', 1);
|
||||
$mainmenuusedarray = array_unique(explode(',', $mainmenuused));
|
||||
|
||||
$generic = 1;
|
||||
// Put here list of menu entries when the div.mainmenu.menuentry was previously defined
|
||||
$divalreadydefined = array('home', 'companies', 'products', 'mrp', 'commercial', 'externalsite', 'accountancy', 'project', 'tools', 'members', 'agenda', 'ftp', 'holiday', 'hrm', 'bookmark', 'cashdesk', 'takepos', 'ecm', 'geoipmaxmind', 'gravatar', 'clicktodial', 'paypal', 'stripe', 'webservices', 'website');
|
||||
// Put here list of menu entries we are sure we don't want
|
||||
$divnotrequired = array('multicurrency', 'salaries', 'ticket', 'margin', 'opensurvey', 'paybox', 'expensereport', 'incoterm', 'prelevement', 'propal', 'workflow', 'notification', 'supplier_proposal', 'cron', 'product', 'productbatch', 'expedition');
|
||||
foreach ($mainmenuusedarray as $val) {
|
||||
if (empty($val) || in_array($val, $divalreadydefined)) {
|
||||
continue;
|
||||
}
|
||||
if (in_array($val, $divnotrequired)) {
|
||||
continue;
|
||||
}
|
||||
//print "XXX".$val;
|
||||
|
||||
$found = 0;
|
||||
$url = '';
|
||||
$constformoduleicon = 'MAIN_MODULE_'.strtoupper($val).'_ICON';
|
||||
$iconformodule = getDolGlobalString($constformoduleicon);
|
||||
if ($iconformodule) {
|
||||
if (preg_match('/^fa\-/', $iconformodule)) {
|
||||
// This is a fa icon
|
||||
} else {
|
||||
$url = dol_buildpath('/'.$val.'/img/'.$iconformodule.'.png', 1);
|
||||
}
|
||||
$found = 1;
|
||||
break;
|
||||
} else {
|
||||
// Search img file in module dir
|
||||
foreach ($conf->file->dol_document_root as $dirroot) {
|
||||
if (file_exists($dirroot."/".$val."/img/".$val.".png")) {
|
||||
$url = dol_buildpath('/'.$val.'/img/'.$val.'.png', 1);
|
||||
$found = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Output entry for menu icon in CSS
|
||||
if (!$found) {
|
||||
print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n";
|
||||
print 'div.mainmenu.'.$val.' span::before {'."\n";
|
||||
print 'content: "\f249";'."\n";
|
||||
print '}'."\n";
|
||||
$generic++;
|
||||
} else {
|
||||
if ($url) {
|
||||
print "div.mainmenu.".$val." {\n";
|
||||
print " background-image: url(".$url.");\n";
|
||||
print " background-position-y: 3px;\n";
|
||||
print " filter: saturate(0);\n";
|
||||
print "}\n";
|
||||
} else {
|
||||
print '/* icon for module '.$val.' is a fa icon */'."\n";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Output entry for menu icon in CSS
|
||||
if (!$found) {
|
||||
print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n";
|
||||
print 'div.mainmenu.'.$val.' span::before {'."\n";
|
||||
print 'content: "\f249";'."\n";
|
||||
print '}'."\n";
|
||||
$generic++;
|
||||
} else {
|
||||
if ($url) {
|
||||
print "div.mainmenu.".$val." {\n";
|
||||
print " background-image: url(".$url.");\n";
|
||||
print " background-position-y: 3px;\n";
|
||||
print " filter: saturate(0);\n";
|
||||
print "}\n";
|
||||
} else {
|
||||
print '/* icon for module '.$val.' is a fa icon */'."\n";
|
||||
}
|
||||
}
|
||||
}
|
||||
// End of part to add more div class css
|
||||
// End of part to add more div class css
|
||||
} // End test if $dol_hide_topmenu?>
|
||||
|
||||
|
||||
|
|
@ -5137,7 +5137,7 @@ div.error {
|
|||
|
||||
|
||||
/*
|
||||
* Liens Payes/Non payes
|
||||
* Paid/Unpaid Links
|
||||
*/
|
||||
|
||||
a.normal:link { font-weight: normal }
|
||||
|
|
|
|||
|
|
@ -307,7 +307,7 @@ class Ticket extends CommonObject
|
|||
'origin_email' => array('type' => 'mail', 'label' => 'OriginEmail', 'visible' => -2, 'enabled' => 1, 'position' => 16, 'notnull' => 1, 'index' => 1, 'searchall' => 1, 'comment' => "Reference of object", 'csslist' => 'tdoverflowmax150'),
|
||||
'origin_replyto' => array('type' => 'mail', 'label' => 'EmailReplyto', 'visible' => -2, 'enabled' => 1, 'position' => 17, 'notnull' => 1, 'index' => 1, 'searchall' => 1, 'comment' => "Email to reply to", 'csslist' => 'tdoverflowmax150'),
|
||||
'origin_references' => array('type' => 'text', 'label' => 'EmailReferences', 'visible' => -2, 'enabled' => 1, 'position' => 18, 'notnull' => 1, 'index' => 1, 'searchall' => 1, 'comment' => "References from origin email", 'csslist' => 'tdoverflowmax150'),
|
||||
'subject' => array('type' => 'varchar(255)', 'label' => 'Subject', 'visible' => 1, 'enabled' => 1, 'position' => 19, 'notnull' => -1, 'searchall' => 1, 'help' => "", 'css' => 'maxwidth200 tdoverflowmax200', 'csslist'=>'tdoverflowmax250', 'autofocusoncreate' => 1),
|
||||
'subject' => array('type' => 'varchar(255)', 'label' => 'Subject', 'visible' => 1, 'enabled' => 1, 'position' => 19, 'notnull' => -1, 'searchall' => 1, 'help' => "", 'css' => 'maxwidth200 tdoverflowmax200', 'csslist' => 'tdoverflowmax250', 'autofocusoncreate' => 1),
|
||||
'type_code' => array('type' => 'varchar(32)', 'label' => 'Type', 'visible' => 1, 'enabled' => 1, 'position' => 20, 'notnull' => -1, 'help' => "", 'csslist' => 'tdoverflowmax100'),
|
||||
'category_code' => array('type' => 'varchar(32)', 'label' => 'TicketCategory', 'visible' => -1, 'enabled' => 1, 'position' => 21, 'notnull' => -1, 'help' => "", 'css' => 'maxwidth100 tdoverflowmax200'),
|
||||
'severity_code' => array('type' => 'varchar(32)', 'label' => 'Severity', 'visible' => 1, 'enabled' => 1, 'position' => 22, 'notnull' => -1, 'help' => "", 'css' => 'maxwidth100'),
|
||||
|
|
@ -3243,7 +3243,7 @@ class Ticket extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -3227,7 +3227,7 @@ class User extends CommonObject
|
|||
|
||||
|
||||
/**
|
||||
* Return clicable link of object (optionally with picto)
|
||||
* Return clickable link of object (optionally with picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -1013,7 +1013,7 @@ class UserGroup extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -1164,7 +1164,7 @@ class FormWebPortal extends Form
|
|||
$resql = $this->db->query($sql);
|
||||
if ($resql) {
|
||||
if ($filter_categorie === false) {
|
||||
$value = ''; // value was used, so now we reste it to use it to build final output
|
||||
$value = ''; // value was used, so now we reset it to use it to build final output
|
||||
$numrows = $this->db->num_rows($resql);
|
||||
if ($numrows) {
|
||||
$obj = $this->db->fetch_object($resql);
|
||||
|
|
@ -1267,7 +1267,7 @@ class FormWebPortal extends Form
|
|||
$resql = $this->db->query($sql);
|
||||
if ($resql) {
|
||||
if ($filter_categorie === false) {
|
||||
$value = ''; // value was used, so now we reste it to use it to build final output
|
||||
$value = ''; // value was used, so now we reset it to use it to build final output
|
||||
$toprint = array();
|
||||
while ($obj = $this->db->fetch_object($resql)) {
|
||||
// Several field into label (eq table:code|libelle:rowid)
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@ class WebPortalInvoice extends Facture
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param int $withpicto Add picto into link
|
||||
* @param string $option Where point the link
|
||||
|
|
@ -262,7 +262,7 @@ class WebPortalInvoice extends Facture
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object (with eventually picto)
|
||||
* Return clickable link of object (with eventually picto)
|
||||
*
|
||||
* @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
|
||||
* @param array $arraydata Array of data
|
||||
|
|
|
|||
|
|
@ -236,7 +236,7 @@ class WebPortalMember extends Adherent
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable name (with picto eventually)
|
||||
* Return clickable name (with picto eventually)
|
||||
*
|
||||
* @param int $withpictoimg 0=No picto, 1=Include picto into link, 2=Only picto, -1=Include photo into link, -2=Only picto photo, -3=Only photo very small)
|
||||
* @param int $maxlen Length max label
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user