mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
Qual: Spelling fixes, cleanup exceptions
# Qual: Spelling fixes, cleanup exceptions Fix some spelling and cleanup ignored lines
This commit is contained in:
MDW
parent
c631d66751
commit
581b079e14
|
|
@ -1,13 +1,10 @@
|
|||
$objMod->dictionaries = $objMod->{"dictionnaries"}; // For backward compatibility
|
||||
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.'&token='.newToken().'">';
|
||||
$object->date_ech = $object->periode;
|
||||
$reponsesadd = str_split($obj->reponses);
|
||||
$sql .= " SET reponses = '".$db->escape($reponsesadd)."'";
|
||||
$sql .= " SET reponses = '0".$db->escape($obj->reponses)."'";
|
||||
$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.od(s|t)$', '', 'name', SORT_ASC, 0);
|
||||
//$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&token='.newToken().'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$id).'">';
|
||||
$dateemail = dol_stringtotime((string) $overview[0]->udate, 'gmt');
|
||||
$pice = '<i class="fas fa-briefcase inline-block"></i>';
|
||||
|
|
@ -33,7 +30,6 @@
|
|||
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);
|
||||
$datesubscription = dol_mktime(12, 0, 0, GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"));
|
||||
$ensemblereponses = $obj->reponses;
|
||||
|
|
@ -55,7 +51,6 @@
|
|||
preg_match('/:([!<>=\s]+|in|notin|like|notlike):/', $tmpcrit, $reg);
|
||||
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->period), 'day').'</td>';
|
||||
"sme",
|
||||
$action = 'transfert';
|
||||
$cle_rib = strtolower(checkES($rib, $CCC));
|
||||
|
|
@ -71,7 +66,6 @@
|
|||
$reday = GETPOSTINT('reday');
|
||||
$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 .= ", '".$this->db->idate($this->period)."'";
|
||||
$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 .= ", periode = '".$this->db->idate($this->period ? $this->period : $this->periode)."'";
|
||||
$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)";
|
||||
|
|
@ -82,14 +76,11 @@
|
|||
$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");
|
||||
if (!empty($arrayfields['cs.periode']['checked'])) {
|
||||
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 (empty($reyear) || empty($remonth) || empty($reday)) {
|
||||
* @param float|string $selectedrate Force preselected vat rate. Can be '8.5' or '8.5 (NOO)' for example. Use '' for no forcing.
|
||||
$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"));
|
||||
$datepaye = dol_mktime(GETPOSTINT("rehour"), GETPOSTINT("remin"), GETPOSTINT("resec"), GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"));
|
||||
|
|
@ -100,7 +91,6 @@
|
|||
$inj += preg_match('/on(dblclick|drop|durationchange|emptied|end|ended|error|focus|focusin|focusout|formdata|gotpointercapture|hashchange|input|invalid)[a-z]*\s*=/i', $val);
|
||||
$opensurveysondage->mail_admin = $_SESSION['adresse'];
|
||||
$pdf->SetXY($savx, $savy);
|
||||
$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))."')";
|
||||
|
|
@ -125,7 +115,6 @@
|
|||
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>';
|
||||
print '<td class="right">'.$langs->trans("NbOfMembers").' <span class="opacitymedium">('.$langs->trans("AllTime").')</span></td>';
|
||||
print ajax_combobox("mouvement");
|
||||
print_liste_field_titre("Employee", $_SERVER["PHP_SELF"], "u.lastname,cs.periode", "", $param, 'class="left"', $sortfield, $sortorder);
|
||||
print_liste_field_titre($arrayfields['cs.amount']['label'], $_SERVER["PHP_SELF"], "cs.amount,cs.periode", '', $param, 'class="right"', $sortfield, $sortorder);
|
||||
|
|
@ -142,7 +131,7 @@
|
|||
- creat,unitl,alltime,datas,referers
|
||||
- informations,medias,uptodate,reenable,crypted,developpers
|
||||
- ned
|
||||
* 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');
|
||||
|
|
@ -150,6 +139,7 @@ $sql .= " GROUP BY cs.rowid, cs.fk_type, cs.fk_user, cs.amount, cs.date_ech, cs.
|
|||
$sql .= " cs.amount, cs.date_ech, cs.libelle as label, cs.paye, cs.periode as period, cs.fk_account,";
|
||||
$sql .= " cs.rowid, cs.libelle as label_sc, cs.fk_type as type, cs.periode as period, cs.date_ech, cs.amount as total, cs.paye,";
|
||||
$sql = "SELECT id_users, nom as name, id_sondage, reponses";
|
||||
$sql = "SELECT id_users, nom as name, id_sondage, reponses, tms, date_creation";
|
||||
$sql = 'SELECT nom as name, reponses';
|
||||
$title = $langs->trans("Referers", $object->name);
|
||||
$usercancreate = $user->hasRight('stock', 'mouvement', 'creer');
|
||||
|
|
@ -170,8 +160,6 @@ if (!$user->hasRight('stock', 'mouvement', 'lire')) {
|
|||
if (!empty($arrayfields['cs.periode']['checked'])) {
|
||||
if ($action == "transfert") {
|
||||
print $langs->trans("Developpers").':';
|
||||
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,
|
||||
$sql = "SELECT id_users, nom as name, id_sondage, reponses, tms, date_creation";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
/* Copyright (C) 2006-2008 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2012 Cedric Salvador <csalvador@gpcsolutions.fr>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -332,7 +332,7 @@ abstract class CommonObjectLine extends CommonObject
|
|||
}
|
||||
|
||||
/**
|
||||
* Return clicable link of object line (with eventually picto)
|
||||
* Return clickable link of object line (optionally with picto)
|
||||
* May (should) also return information about the associated "parent" object.
|
||||
* To overload
|
||||
*
|
||||
|
|
|
|||
|
|
@ -1940,7 +1940,7 @@ function dol_escape_js($stringtoescape, $mode = 0, $noescapebackslashn = 0)
|
|||
}
|
||||
|
||||
/**
|
||||
* Returns text escaped by RFC 3986 for inclusion into a clicable link.
|
||||
* Returns text escaped by RFC 3986 for inclusion into a clickable link.
|
||||
* This method can be used on the ...in links like href="javascript:..." because when clicking on such links, the browserfirst decode the strind
|
||||
* and then interpret content that can be javascript.
|
||||
* Usage of this escapement should be limited to links href="javascript:...". For common URL, use urlencode instead.
|
||||
|
|
|
|||
|
|
@ -347,7 +347,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
|
|||
* @param string $sendto Addresses to send the mail, format "first@address.net, second@address.net," etc.
|
||||
* @param string $base_subject email subject. Non-translated string.
|
||||
* @param string $body email body (first line). Non-translated string.
|
||||
* @param Ticket $object the ticket thet the email refers to
|
||||
* @param Ticket $object the ticket that the email refers to
|
||||
* @param Translate $langs the translation object
|
||||
* @return void
|
||||
*/
|
||||
|
|
@ -420,7 +420,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
|
|||
* @param string $base_subject email subject. Non-translated string.
|
||||
* @param string $body email body (first line). Non-translated string.
|
||||
* @param string $see_ticket string indicating the ticket public address
|
||||
* @param Ticket $object the ticket thet the email refers to
|
||||
* @param Ticket $object the ticket that the email refers to
|
||||
* @param Translate $langs the translation object
|
||||
* @return void
|
||||
*/
|
||||
|
|
@ -516,7 +516,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
|
|||
* @param string $base_subject email subject. Non-translated string.
|
||||
* @param string $body email body (first line). Non-translated string.
|
||||
* @param string $see_ticket string indicating the ticket public address
|
||||
* @param Ticket $object the ticket thet the email refers to
|
||||
* @param Ticket $object the ticket that the email refers to
|
||||
* @param Translate $langs the translation object
|
||||
* @return void
|
||||
*/
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user