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

Qual: Spelling fixes that newly appeared. (#27495)

Browse Source 
* Qual: Spelling fixes that newly appeared.

# Qual: Fix spelling erros that appeared since the bulk updates.

These issues mostly appeared since the bulk updates (a few ones were postponed
to make sure no real spelling errors were missed.)

* Update modulebuilder.lib.php

* Update pdf_standard.modules.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
This commit is contained in:
MDW 2024-01-14 12:26:37 +01:00 committed by GitHub
parent 90b2a65589
commit a04f2bf4e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
68 changed files with 251 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
COPYRIGHT
View File

@ -79,7 +79,7 @@ Font libraries:
Fontawesome 5.13 Font Awesome Free Licence Yes
For more licenses compatibility informations: https://www.gnu.org/licenses/licenses.en.html
For more licenses compatibility information: https://www.gnu.org/licenses/licenses.en.html
Authors

2
dev/tools/apstats.php
View File

@ -88,7 +88,7 @@ $resexec = shell_exec($commandcheck);
$resexec = (int) (empty($resexec) ? 0 : trim($resexec));
*/
// Retreive the .git informations
// Retrieve the .git information
$urlgit = 'https://github.com/Dolibarr/dolibarr/blob/develop/';

6
htdocs/api/class/api_documents.class.php
View File

@ -62,7 +62,7 @@ class Documents extends DolibarrApi
*
* @url GET /download
*
* @throws RestException 400 Bad value for paramter modulepart or original_file
* @throws RestException 400 Bad value for parameter modulepart or original_file
* @throws RestException 401 Access denied
* @throws RestException 404 File not found
*/
@ -131,7 +131,7 @@ class Documents extends DolibarrApi
*
* @url PUT /builddoc
*
* @throws RestException 400 Bad value for paramter modulepart or original_file
* @throws RestException 400 Bad value for parameter modulepart or original_file
* @throws RestException 401 Access denied
* @throws RestException 403 Generation not available for this modulepart
* @throws RestException 404 Invoice, Order, Proposal, Contract or Shipment not found
@ -299,7 +299,7 @@ class Documents extends DolibarrApi
*
* @url GET /
*
* @throws RestException 400 Bad value for paramter modulepart, id or ref
* @throws RestException 400 Bad value for parameter modulepart, id or ref
* @throws RestException 401 Access denied
* @throws RestException 403 Generation not available for this modulepart
* @throws RestException 404 Thirdparty, User, Member, Order, Invoice or Proposal not found

2
htdocs/barcode/printsheet.php
View File

@ -224,7 +224,7 @@ if (empty($reshook)) {
// For labels
if ($mode == 'label') {
$txtforsticker = "%PHOTO%"; // Photo will be barcode image, %BARCODE% posible when using TCPDF generator
$txtforsticker = "%PHOTO%"; // Photo will be barcode image, %BARCODE% possible when using TCPDF generator
$textleft = make_substitutions(getDolGlobalString('BARCODE_LABEL_LEFT_TEXT', $txtforsticker), $substitutionarray);
$textheader = make_substitutions(getDolGlobalString('BARCODE_LABEL_HEADER_TEXT'), $substitutionarray);
$textfooter = make_substitutions(getDolGlobalString('BARCODE_LABEL_FOOTER_TEXT'), $substitutionarray);

10
htdocs/categories/class/api_categories.class.php
View File

@ -78,7 +78,7 @@ class Categories extends DolibarrApi
/**
* Get properties of a category object
*
* Return an array with category informations
* Return an array with category information
*
* @param int $id ID of category
* @param bool $include_childs Include child categories list (true or false)
@ -126,7 +126,7 @@ class Categories extends DolibarrApi
* @param int $page Page number
* @param string $type Type of category ('member', 'customer', 'supplier', 'product', 'contact')
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
* @param string $properties Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
* @param string $properties Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
* @return array Array of category objects
*
* @throws RestException
@ -203,7 +203,7 @@ class Categories extends DolibarrApi
foreach ($request_data as $field => $value) {
if ($field === 'caller') {
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
$this->category->context['caller'] = $request_data['caller'];
continue;
}
@ -243,7 +243,7 @@ class Categories extends DolibarrApi
continue;
}
if ($field === 'caller') {
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
$this->category->context['caller'] = $request_data['caller'];
continue;
}
@ -674,7 +674,7 @@ class Categories extends DolibarrApi
// phpcs:enable
$object = parent::_cleanObjectDatas($object);
// Remove fields not relevent to categories
// Remove fields not relevant to categories
unset($object->MAP_CAT_FK);
unset($object->MAP_CAT_TABLE);
unset($object->MAP_OBJ_CLASS);

30
htdocs/categories/class/categorie.class.php
View File

@ -260,7 +260,7 @@ class Categorie extends CommonObject
public $motherof = array();
/**
* @var array Childs
* @var array children
*/
public $childs = array();
@ -1055,7 +1055,7 @@ class Categorie extends CommonObject
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Return direct childs id of a category into an array
* Return direct children ids of a category into an array
*
* @return array|int Return integer <0 KO, array ok
*/
@ -1119,8 +1119,8 @@ class Categorie extends CommonObject
* id_mere = id de la categorie mere
* id_children = tableau des id enfant
* label = nom de la categorie
* fulllabel = nom avec chemin complet de la categorie
* fullpath = chemin complet compose des id
* fulllabel = Name with full path for the category
* fullpath = Full path built with the id's
*
* @param string $type Type of categories ('customer', 'supplier', 'contact', 'product', 'member', ...)
* @param int|string|array $markafterid Keep only or removed all categories including the leaf $markafterid in category tree (exclude) or Keep only of category is inside the leaf starting with this id.
@ -1228,7 +1228,7 @@ class Categorie extends CommonObject
}
/**
* For category id_categ and its childs available in this->cats, define property fullpath and fulllabel.
* For category id_categ and its children available in this->cats, define property fullpath and fulllabel.
* It is called by get_full_arbo()
* This function is a memory scan only from $this->cats and $this->motherof, no database access must be done here.
*
@ -1393,8 +1393,8 @@ class Categorie extends CommonObject
// phpcs:enable
$ways = array();
$allways = $this->get_all_ways(); // Load array of categories
foreach ($allways as $way) {
$all_ways = $this->get_all_ways(); // Load array of categories
foreach ($all_ways as $way) {
$w = array();
$i = 0;
$forced_color = '';
@ -1481,8 +1481,8 @@ class Categorie extends CommonObject
$parents = $this->get_meres();
if (is_array($parents)) {
foreach ($parents as $parent) {
$allways = $parent->get_all_ways();
foreach ($allways as $way) {
$all_ways = $parent->get_all_ways();
foreach ($all_ways as $way) {
$w = $way;
$w[] = $this;
$ways[] = $w;
@ -1722,9 +1722,9 @@ class Categorie extends CommonObject
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Deplace fichier uploade sous le nom $file dans le repertoire sdir
* Add the image uploaded as $file to the directory $sdir/<category>-<id>/photos/
*
* @param string $sdir Final destination directory
* @param string $sdir Root destination directory
* @param array $file Uploaded file name
* @return void
*/
@ -1801,7 +1801,7 @@ class Categorie extends CommonObject
$photo_vignette = preg_replace('/'.$regs[0].'/i', '', $photo).'_small'.$regs[0];
}
// Objet
// Object
$obj = array();
$obj['photo'] = $photo;
if ($photo_vignette && is_file($dirthumb.$photo_vignette)) {
@ -1998,7 +1998,7 @@ class Categorie extends CommonObject
{
dol_syslog(get_class($this)."::initAsSpecimen");
// Initialise parametres
// Initialise parameters
$this->id = 0;
$this->fk_parent = 0;
$this->label = 'SPECIMEN';
@ -2026,7 +2026,7 @@ class Categorie extends CommonObject
}
/**
* Return the addtional SQL JOIN query for filtering a list by a category
* Return the additional SQL JOIN query for filtering a list by a category
*
* @param string $type The category type (e.g Categorie::TYPE_WAREHOUSE)
* @param string $rowIdName The name of the row id inside the whole sql query (e.g. "e.rowid")
@ -2043,7 +2043,7 @@ class Categorie extends CommonObject
}
/**
* Return the addtional SQL SELECT query for filtering a list by a category
* Return the additional SQL SELECT query for filtering a list by a category
*
* @param string $type The category type (e.g Categorie::TYPE_WAREHOUSE)
* @param string $rowIdName The name of the row id inside the whole sql query (e.g. "e.rowid")

10
htdocs/comm/action/card.php
View File

@ -93,7 +93,7 @@ $reg = array();
if (GETPOST('datep')) {
if (GETPOST('datep') == 'now') {
$datep = dol_now();
} elseif (preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])$/', GETPOST("datep"), $reg)) { // Try to not use this. Use insteead '&datep=now'
} elseif (preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])$/', GETPOST("datep"), $reg)) { // Try to not use this. Use instead '&datep=now'
$datep = dol_mktime(0, 0, 0, $reg[2], $reg[3], $reg[1], 'tzuserrel');
}
}
@ -343,7 +343,7 @@ if (empty($reshook) && $action == 'add') {
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Title")), null, 'errors');
}
// Initialisation objet cactioncomm
// Initialisation object cactioncomm
if (GETPOSTISSET('actioncode') && !GETPOST('actioncode', 'aZ09')) { // actioncode is '0'
$error++;
$donotclearsession = 1;
@ -354,7 +354,7 @@ if (empty($reshook) && $action == 'add') {
}
if (!$error) {
// Initialisation objet actioncomm
// Initialisation object actioncomm
$object->priority = GETPOSTISSET("priority") ? GETPOST("priority", "int") : 0;
$object->fulldayevent = ($fulldayevent ? 1 : 0);
$object->location = GETPOST("location", 'alphanohtml');
@ -2344,7 +2344,7 @@ if ($id > 0) {
// Full day event
print '<tr><td class="titlefield">'.$langs->trans("EventOnFullDay").'</td><td>'.yn($object->fulldayevent ? 1 : 0, 3).'</td></tr>';
// Event into a serie
// Event into a series
if ($object->recurid) {
print '<tr><td class="titlefield">'.$langs->trans("EventIntoASerie").'</td><td>'.dol_escape_htmltag($object->recurid).'</td></tr>';
}
@ -2397,7 +2397,7 @@ if ($id > 0) {
if ($object->userownerid > 0) {
$listofuserid[$object->userownerid] = array(
'id'=>$object->userownerid,
'transparency'=>$object->transparency, // Force transparency on onwer from preoperty of event
'transparency'=>$object->transparency, // Force transparency on owner from property of event
'answer_status'=>$object->userassigned[$object->userownerid]['answer_status'],
'mandatory'=>$object->userassigned[$object->userownerid]['mandatory']
);

22
htdocs/comm/action/class/actioncomm.class.php
View File

@ -194,7 +194,7 @@ class ActionComm extends CommonObject
public $datep2;
/**
* @var int -1=Unkown duration
* @var int -1=Unknown duration
* @deprecated
*/
public $durationp = -1;
@ -382,7 +382,7 @@ class ActionComm extends CommonObject
/**
* Properties to manage the recurring events
*/
public $recurid; /* A string YYYYMMDDHHMMSS shared by allevent of same serie */
public $recurid; /* A string YYYYMMDDHHMMSS shared by allevent of same series */
public $recurrule; /* Rule of recurring */
public $recurdateend; /* Repeat until this date */
@ -1406,7 +1406,7 @@ class ActionComm extends CommonObject
/**
* Load indicators for dashboard (this->nbtodo and this->nbtodolate)
*
* @param User $user Objet user
* @param User $user Object user
* @param int $load_state_board Load indicator array this->nb
* @return WorkboardResponse|int Return integer <0 if KO, WorkboardResponse if OK
*/
@ -1491,7 +1491,7 @@ class ActionComm extends CommonObject
/**
* Charge les informations d'ordre info dans l'objet facture
* Charge les information d'ordre info dans l'objet facture
*
* @param int $id Id de la facture a charger
* @return void
@ -1645,7 +1645,7 @@ class ActionComm extends CommonObject
if (!empty($this->email_tocc)) {
$datas['mailcc'] = '<br><b>'.$langs->trans('MailCC').':</b> '.str_replace(array('<', '>'), array('&amp;lt', '&amp;gt'), $this->email_tocc);
}
/* Disabled because bcc must remain by defintion not visible
/* Disabled because bcc must remain by definition not visible
if (!empty($this->email_tobcc)) {
$datas['mailccc'] = '<br><b>'.$langs->trans('MailCCC').':</b> '.$this->email_tobcc;
} */
@ -1674,7 +1674,7 @@ class ActionComm extends CommonObject
* Use $this->id, $this->type_code, $this->label and $this->type_label
*
* @param int $withpicto 0 = No picto, 1 = Include picto into link, 2 = Only picto
* @param int $maxlength Max number of charaters into label. If negative, use the ref as label.
* @param int $maxlength Max number of characters into label. If negative, use the ref as label.
* @param string $classname Force style class on a link
* @param string $option '' = Link to action, 'birthday'= Link to contact, 'holiday' = Link to leave
* @param int $overwritepicto 1 = Overwrite picto with this one
@ -1749,7 +1749,7 @@ class ActionComm extends CommonObject
if (!empty($this->email_tocc)) {
$tooltip .= '<br><b>'.$langs->trans('MailCC').':</b> '.str_replace(array('<', '>'), array('&amp;lt', '&amp;gt'), $this->email_tocc);
}
/* Disabled because bcc must remain by defintion not visible
/* Disabled because bcc must remain by definition not visible
if (!empty($this->email_tobcc)) {
$tooltip .= '<br><b>'.$langs->trans('MailCCC').':</b> '.$this->email_tobcc;
} */
@ -2045,7 +2045,7 @@ class ActionComm extends CommonObject
$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters); // Note that $action and $object may have been modified by hook
$sql .= $hookmanager->resPrint;
// We must filter on assignement table
// We must filter on assignment table
if ($filters['logint']) {
$sql .= ", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
}
@ -2076,7 +2076,7 @@ class ActionComm extends CommonObject
if ($key == 'notactiontype') {
$sql .= " AND c.type <> '".$this->db->escape($value)."'";
}
// We must filter on assignement table
// We must filter on assignment table
if ($key == 'logint') {
$sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
}
@ -2351,7 +2351,7 @@ class ActionComm extends CommonObject
$now = dol_now();
// Initialise parametres
// Initialise parameters
$this->id = 0;
$this->specimen = 1;
@ -2667,7 +2667,7 @@ class ActionComm extends CommonObject
}
/**
* Udpate the percent value of a event with the given id
* Update the percent value of a event with the given id
*
* @param int $id The id of the event
* @param int $percent The new percent value for the event

8
htdocs/comm/action/class/api_agendaevents.class.php
View File

@ -54,7 +54,7 @@ class AgendaEvents extends DolibarrApi
/**
* Get properties of a Agenda Events object
*
* Return an array with Agenda Events informations
* Return an array with Agenda Events information
*
* @param int $id ID of Agenda Events
* @return Object Object with cleaned properties
@ -100,7 +100,7 @@ class AgendaEvents extends DolibarrApi
* @param int $page Page number
* @param string $user_ids User ids filter field (owners of event). Example: '1' or '1,2,3' {@pattern /^[0-9,]*$/i}
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.label:like:'%dol%') and (t.datec:<:'20160101')"
* @param string $properties Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
* @param string $properties Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
* @return array Array of Agenda Events objects
*/
public function index($sortfield = "t.id", $sortorder = 'ASC', $limit = 100, $page = 0, $user_ids = '', $sqlfilters = '', $properties = '')
@ -203,7 +203,7 @@ class AgendaEvents extends DolibarrApi
foreach ($request_data as $field => $value) {
if ($field === 'caller') {
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
$this->actioncomm->context['caller'] = $request_data['caller'];
continue;
}
@ -261,7 +261,7 @@ class AgendaEvents extends DolibarrApi
continue;
}
if ($field === 'caller') {
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
$this->actioncomm->context['caller'] = $request_data['caller'];
continue;
}

8
htdocs/comm/action/class/cactioncomm.class.php
View File

@ -162,9 +162,9 @@ class CActionComm
global $langs, $conf, $user;
$langs->load("commercial");
$repid = array();
$repcode = array();
$repall = array();
$rep_id = array();
$rep_code = array();
$rep_all = array();
$sql = "SELECT id, code, libelle as label, module, type, color, picto";
$sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm";
@ -301,7 +301,7 @@ class CActionComm
$module = $obj->module;
}
$label = '&nbsp;&nbsp; '.$label;
if (!isset($repcode['AC_ALL_'.strtoupper($module)])) { // If first time for this module
if (!isset($rep_code['AC_ALL_'.strtoupper($module)])) { // If first time for this module
$idforallfornewmodule--;
}
$TModule['id'][$idforallfornewmodule] = $langs->trans("ActionAC_ALL_".strtoupper($module));

2
htdocs/comm/action/class/ical.class.php
View File

@ -339,7 +339,7 @@ class ICal
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Return Unix time from ical date time fomrat (YYYYMMDD[T]HHMMSS[Z] or YYYYMMDD[T]HHMMSS)
* Return Unix time from ical date time format (YYYYMMDD[T]HHMMSS[Z] or YYYYMMDD[T]HHMMSS)
*
* @param string $ical_date String date
* @return int

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

@ -318,7 +318,7 @@ if (empty($mode) || $mode == 'show_month') {
$max_day_in_prev_month = date("t", dol_mktime(12, 0, 0, $prev_month, 1, $prev_year, 'gmt')); // Nb of days in previous month
$max_day_in_month = date("t", dol_mktime(12, 0, 0, $month, 1, $year, 'gmt')); // Nb of days in next month
// tmpday is a negative or null cursor to know how many days before the 1st to show on month view (if tmpday=0, 1st is monday)
$tmpday = -date("w", dol_mktime(12, 0, 0, $month, 1, $year, 'gmt')) + 2; // date('w') is 0 fo sunday
$tmpday = -date("w", dol_mktime(12, 0, 0, $month, 1, $year, 'gmt')) + 2; // date('w') is 0 for sunday
$tmpday += ((isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1) - 1);
if ($tmpday >= 1) {
$tmpday -= 7; // If tmpday is 0 we start with sunday, if -6, we start with monday of previous week.
@ -721,7 +721,7 @@ $sql .= ' FROM '.MAIN_DB_PREFIX.'c_actioncomm as ca, '.MAIN_DB_PREFIX."actioncom
if ($resourceid > 0) {
$sql .= ", ".MAIN_DB_PREFIX."element_resources as r";
}
// We must filter on assignement table
// We must filter on assignment table
if ($filtert > 0 || $usergroup > 0) {
$sql .= ", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
}
@ -782,7 +782,7 @@ if ($search_sale && $search_sale != '-1') {
if ($socid) {
$sql .= " AND a.fk_soc = ".((int) $socid);
}
// We must filter on assignement table
// We must filter on assignment table
if ($filtert > 0 || $usergroup > 0) {
$sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
}
@ -832,7 +832,7 @@ if ($status == 'done' || $status == '100') {
if ($status == 'todo') {
$sql .= " AND (a.percent >= 0 AND a.percent < 100)";
}
// We must filter on assignement table
// We must filter on assignment table
if ($filtert > 0 || $usergroup > 0) {
$sql .= " AND (";
if ($filtert > 0) {
@ -1029,7 +1029,7 @@ if ($showbirthday) {
$datebirth = dol_stringtotime($obj->birthday, 1);
//print 'ee'.$obj->birthday.'-'.$datebirth;
$datearray = dol_getdate($datebirth, true);
$event->datep = dol_mktime(0, 0, 0, $datearray['mon'], $datearray['mday'], $year, true); // For full day events, date are also GMT but they wont but converted during output
$event->datep = dol_mktime(0, 0, 0, $datearray['mon'], $datearray['mday'], $year, true); // For full day events, date are also GMT but they won't but converted during output
$event->datef = $event->datep;
$event->type_code = 'BIRTHDAY';
@ -1213,7 +1213,7 @@ if (count($listofextcals)) {
// datecurstart and datecurend are now GMT date
//var_dump($datecurstart); var_dump($datecurend); exit;
} else {
// Not a recongized record
// Not a recognized record
dol_syslog("Found a not recognized repeatable record with unknown date start", LOG_ERR);
continue;
}
@ -1243,7 +1243,7 @@ if (count($listofextcals)) {
}
$moreicalevents[] = $newevent;
}
// Jump on next occurence
// Jump on next occurrence
$numofevent++;
$savdatecurstart = $datecurstart;
if ($icalevent['RRULE']['FREQ'] == 'DAILY') {
@ -1285,7 +1285,7 @@ if (count($listofextcals)) {
$event = new ActionComm($db);
$addevent = false;
if (isset($icalevent['DTSTART;VALUE=DATE'])) { // fullday event
// For full day events, date are also GMT but they wont but converted using tz during output
// For full day events, date are also GMT but they won't but converted using tz during output
$datestart = dol_stringtotime($icalevent['DTSTART;VALUE=DATE'], 1);
if (empty($icalevent['DTEND;VALUE=DATE'])) {
$dateend = $datestart + 86400 - 1;
@ -1349,7 +1349,7 @@ if (count($listofextcals)) {
$event->icalname = $namecal;
$event->icalcolor = $colorcal;
$usertime = 0; // We dont modify date because we want to have date into memory datep and datef stored as GMT date. Compensation will be done during output.
$usertime = 0; // We don't modify date because we want to have date into memory datep and datef stored as GMT date. Compensation will be done during output.
$event->datep = $datestart + $usertime;
$event->datef = $dateend + $usertime;
@ -1695,7 +1695,7 @@ if (empty($mode) || $mode == 'show_month') { // View by month
/* WIP View per hour */
$useviewhour = 0;
if ($useviewhour) {
print '<div class="div-table-responsive-no-min borderbottom">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '<div class="div-table-responsive-no-min borderbottom">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
$maxheightwin = (isset($_SESSION["dol_screenheight"]) && $_SESSION["dol_screenheight"] > 500) ? ($_SESSION["dol_screenheight"] - 200) : 660; // Also into index.php file
@ -1734,7 +1734,7 @@ if (empty($mode) || $mode == 'show_month') { // View by month
print '</div>';
} else {
print '<div class="div-table-responsive-no-min borderbottom">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '<div class="div-table-responsive-no-min borderbottom">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
show_day_events($db, $day, $month, $year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, 0, $bookcalcalendars);
@ -1809,7 +1809,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
print '</a>';
print '</div><div class="nowrap floatright inline-block marginrightonly">';
if ($user->hasRight('agenda', 'myactions', 'create') || $user->hasRight('agenda', 'allactions', 'create')) {
print '<a class="cursoradd" href="'.$urltocreate.'">'; // Explicit link, usefull for nojs interfaces
print '<a class="cursoradd" href="'.$urltocreate.'">'; // Explicit link, useful for nojs interfaces
print img_picto($langs->trans("NewAction"), 'edit_add.png');
print '</a>';
}
@ -2354,7 +2354,7 @@ function sort_events_by_date($a, $b)
function sort_events_by_percentage($a, $b)
{
// Sort events with no percentage before each other
// (usefull to sort holidays, sick days or similar on the top)
// (useful to sort holidays, sick days or similar on the top)
if ($a->percentage < 0) {
return -1;

2
htdocs/comm/action/info.php
View File

@ -19,7 +19,7 @@
/**
* \file htdocs/comm/action/info.php
* \ingroup agenda
* \brief Page des informations d'une action
* \brief Page des information d'une action
*/
// Load Dolibarr environment

6
htdocs/comm/action/list.php
View File

@ -445,7 +445,7 @@ $sql .= " ,".MAIN_DB_PREFIX."c_actioncomm as c";
if ($resourceid > 0) {
$sql .= ", ".MAIN_DB_PREFIX."element_resources as r";
}
// We must filter on assignement table
// We must filter on assignment table
if ($filtert > 0 || $usergroup > 0) {
$sql .= ", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
}
@ -506,7 +506,7 @@ if ($search_sale && $search_sale != '-1') {
if ($socid) {
$sql .= " AND a.fk_soc = ".((int) $socid);
}
// We must filter on assignement table
// We must filter on assignment table
if ($filtert > 0 || $usergroup > 0) {
$sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
}
@ -540,7 +540,7 @@ if ($search_title) {
if ($search_note) {
$sql .= natural_search('a.note', $search_note);
}
// We must filter on assignement table
// We must filter on assignment table
if ($filtert > 0 || $usergroup > 0) {
$sql .= " AND (";
if ($filtert > 0) {

6
htdocs/comm/action/pertype.php
View File

@ -526,7 +526,7 @@ $sql .= ' FROM '.MAIN_DB_PREFIX.'c_actioncomm as ca, '.MAIN_DB_PREFIX."actioncom
if ($resourceid > 0) {
$sql .= ", ".MAIN_DB_PREFIX."element_resources as r";
}
// We must filter on assignement table
// We must filter on assignment table
if ($filtert > 0 || $usergroup > 0) {
$sql .= ", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
}
@ -587,7 +587,7 @@ if ($search_sale && $search_sale != '-1') {
if ($socid) {
$sql .= " AND a.fk_soc = ".((int) $socid);
}
// We must filter on assignement table
// We must filter on assignment table
if ($filtert > 0 || $usergroup > 0) {
$sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
}
@ -635,7 +635,7 @@ if ($status == 'done' || $status == '100') {
if ($status == 'todo') {
$sql .= " AND (a.percent >= 0 AND a.percent < 100)";
}
// We must filter on assignement table
// We must filter on assignment table
if ($filtert > 0 || $usergroup > 0) {
$sql .= " AND (";
if ($filtert > 0) {

2
htdocs/comm/action/peruser.php
View File

@ -539,7 +539,7 @@ $sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm as ca, ".MAIN_DB_PREFIX."actioncom
if ($resourceid > 0) {
$sql .= ", ".MAIN_DB_PREFIX."element_resources as r";
}
// We must filter on assignement table
// We must filter on assignment table
if ($filtert > 0 || $usergroup > 0) {
$sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm_resources as ar";
$sql .= " ON ar.fk_actioncomm = a.id AND ar.element_type='user'";

2
htdocs/comm/card.php
View File

@ -513,7 +513,7 @@ if ($object->id > 0) {
if ($object->client) {
if (isModEnabled('commande') && getDolGlobalString('ORDER_MANAGE_MIN_AMOUNT')) {
print '<!-- Minimim amount for orders -->'."\n";
print '<!-- Minimum amount for orders -->'."\n";
print '<tr class="nowrap">';
print '<td>';
print $form->editfieldkey("OrderMinAmount", 'order_min_amount', $object->order_min_amount, $object, $user->hasRight('societe', 'creer'));

2
htdocs/comm/contact.php
View File

@ -105,7 +105,7 @@ if (!empty($search_firstname)) {
if (!empty($search_company)) {
$sql .= " AND s.nom LIKE '%".$db->escape($search_company)."%'";
}
if (!empty($contactname)) { // acces a partir du module de recherche
if (!empty($contactname)) { // access a partir du module de recherche
$sql .= " AND (p.name LIKE '%".$db->escape($contactname)."%' OR lower(p.firstname) LIKE '%".$db->escape($contactname)."%') ";
$sortfield = "p.name";
$sortorder = "ASC";

2
htdocs/comm/index.php
View File

@ -56,7 +56,7 @@ $langs->loadLangs(array("boxes", "commercial", "contracts", "orders", "propal",
$action = GETPOST('action', 'aZ09');
$bid = GETPOST('bid', 'int');
// Securite acces client
// Securite access client
$socid = GETPOST('socid', 'int');
if (isset($user->socid) && $user->socid > 0) {
$action = '';

4
htdocs/comm/mailing/advtargetemailing.php
View File

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2016 Laurent Destailleur <eldy@uers.sourceforge.net>
* Copyright (C) 2016 Laurent Destailleur <eldy@users.sourceforge.net>
*
* 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
@ -256,7 +256,7 @@ if ($action == 'add') {
}
if ($action == 'clear') {
// Chargement de la classe
// Load a new class instance
$classname = "MailingTargets";
$obj = new $classname($db);
$obj->clear_target($id);

12
htdocs/comm/mailing/card.php
View File

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005-2019 Laurent Destailleur <eldy@uers.sourceforge.net>
* Copyright (C) 2005-2019 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2016 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2021 Waël Almoman <info@almoman.com>
*
@ -482,7 +482,7 @@ if (empty($reshook)) {
if (!$error) {
// Is the message in html
$msgishtml = -1; // Unknow = autodetect by default
$msgishtml = -1; // Unknown = autodetect by default
if (preg_match('/[\s\t]*<html>/i', $object->body)) {
$msgishtml = 1;
}
@ -852,7 +852,7 @@ if ($action == 'create') {
* View mode mailing
*/
if ($action == 'sendall') {
// Define message to recommand from command line
// Define message to recommend from command line
$sendingmode = getDolGlobalString('EMAILING_MAIL_SENDMODE');
if (empty($sendingmode)) {
$sendingmode = getDolGlobalString('MAIN_MAIL_SENDMODE');
@ -863,8 +863,8 @@ if ($action == 'create') {
// MAILING_NO_USING_PHPMAIL may be defined or not.
// MAILING_LIMIT_SENDBYWEB is always defined to something != 0 (-1=forbidden).
// MAILING_LIMIT_SENDBYCLI may be defined ot not (-1=forbidden, 0 or undefined=no limit).
// MAILING_LIMIT_SENDBYDAY may be defined ot not (0 or undefined=no limit).
// MAILING_LIMIT_SENDBYCLI may be defined or not (-1=forbidden, 0 or undefined=no limit).
// MAILING_LIMIT_SENDBYDAY may be defined or not (0 or undefined=no limit).
if (getDolGlobalString('MAILING_NO_USING_PHPMAIL') && $sendingmode == 'mail') {
// EMailing feature may be a spam problem, so when you host several users/instance, having this option may force each user to use their own SMTP agent.
// You ensure that every user is using its own SMTP server when using the mass emailing module.
@ -893,7 +893,7 @@ if ($action == 'create') {
// The feature is forbidden from GUI, we show just message to use from command line.
setEventMessages($langs->trans("MailingNeedCommand"), null, 'warnings');
setEventMessages('<textarea cols="60" rows="'.ROWS_1.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.'</textarea>', null, 'warnings');
if ($conf->file->mailing_limit_sendbyweb != '-1') { // MAILING_LIMIT_SENDBYWEB was set to -1 in database, but it is allowed ot increase it.
if ($conf->file->mailing_limit_sendbyweb != '-1') { // MAILING_LIMIT_SENDBYWEB was set to -1 in database, but it is allowed to increase it.
setEventMessages($langs->trans("MailingNeedCommand2"), null, 'warnings'); // You can send online with constant...
}
$_GET["action"] = '';

2
htdocs/comm/mailing/cibles.php
View File

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005-2023 Laurent Destailleur <eldy@uers.sourceforge.net>
* Copyright (C) 2005-2023 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2010 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro>
*

8
htdocs/comm/mailing/class/advtargetemailing.class.php
View File

@ -1,5 +1,5 @@
<?php
/* Advance Targeting Emailling for mass emailing module
/* Advance Targeting Emailing for mass emailing module
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
*
* This program is free software: you can redistribute it and/or modify
@ -918,12 +918,12 @@ class AdvanceTargetingMailing extends CommonObject
/**
* Parse criteria to return a SQL qury formated
* Parse criteria to return a SQL query formatted
*
* @param string $column_to_test column to test
* @param string $criteria Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value,
* @param string $criteria Use %% as magic characters. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value,
* and use ! for except this value.
* For exemple jean;joe;jim%%;!jimo;!jima%> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
* For example jean;joe;jim%%;!jimo;!jima%> will target all jean, joe, start with jim but not jimo and not everythnig that start by jima
* @return string Sql to use for the where condition
*/
public function transformToSQL($column_to_test, $criteria)

4
htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
View File

@ -19,7 +19,7 @@
/**
* \file comm/mailing/class/html.formadvtargetemailing.class.php
* \ingroup mailing
* \brief Fichier de la classe des fonctions predefinies de composant html advtargetemailing
* \brief File for the class with functions for the building of HTML components for advtargetemailing
*/
/**
@ -339,7 +339,7 @@ class FormAdvTargetEmailing extends Form
* Return a combo list to select emailing target selector
*
* @param string $htmlname control name
* @param integer $selected defaut selected
* @param integer $selected default selected
* @param integer $showempty empty lines
* @param string $type_element Type element. Example: 'mailing'
* @param string $morecss More CSS

4
htdocs/comm/mailing/class/mailing.class.php
View File

@ -558,7 +558,7 @@ class Mailing extends CommonObject
/**
* Validate emailing
*
* @param User $user Objet user qui valide
* @param User $user Object user qui valide
* @return int Return integer <0 if KO, >0 if OK
*/
public function valid($user)
@ -660,7 +660,7 @@ class Mailing extends CommonObject
/**
* Change status of each recipient
*
* @param User $user Objet user qui valide
* @param User $user Object user qui valide
* @return int Return integer <0 if KO, >0 if OK
*/
public function reset_targets_status($user)

12
htdocs/comm/propal/card.php
View File

@ -1224,7 +1224,7 @@ if (empty($reshook)) {
$desc = $prod->description;
}
//If text set in desc is the same as product description (as now it's preloaded) whe add it only one time
//If text set in desc is the same as product description (as now it's preloaded) we add it only one time
if ($product_desc==$desc && getDolGlobalString('PRODUIT_AUTOFILL_DESC')) {
$product_desc='';
}
@ -1310,7 +1310,7 @@ if (empty($reshook)) {
// Margin
$fournprice = price2num(GETPOST('fournprice'.$predef) ? GETPOST('fournprice'.$predef) : '');
$buyingprice = price2num(GETPOST('buying_price'.$predef) != '' ? GETPOST('buying_price'.$predef) : ''); // If buying_price is '0', we muste keep this value
$buyingprice = price2num(GETPOST('buying_price'.$predef) != '' ? GETPOST('buying_price'.$predef) : ''); // If buying_price is '0', we must keep this value
$date_start = dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
$date_end = dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
@ -1439,7 +1439,7 @@ if (empty($reshook)) {
// Add buying price
$fournprice = price2num(GETPOST('fournprice') ? GETPOST('fournprice') : '');
$buyingprice = price2num(GETPOST('buying_price') != '' ? GETPOST('buying_price') : ''); // If buying_price is '0', we muste keep this value
$buyingprice = price2num(GETPOST('buying_price') != '' ? GETPOST('buying_price') : ''); // If buying_price is '0', we must keep this value
$pu_ht_devise = price2num(GETPOST('multicurrency_subprice'), '', 2);
$pu_ttc_devise = price2num(GETPOST('multicurrency_subprice_ttc'), '', 2);
@ -1908,7 +1908,7 @@ if ($action == 'create') {
print '<td class="valuefieldcreate">';
$filter = '((s.client:IN:1,2,3) AND (s.status:=:1))';
print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company('', 'socid', $filter, 'SelectThirdParty', 1, 0, null, 0, 'minwidth300 maxwidth500 widthcentpercentminusxx');
// reload page to retrieve customer informations
// reload page to retrieve customer information
if (!getDolGlobalString('RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED')) {
print '<script>
$(document).ready(function() {
@ -2519,8 +2519,8 @@ if ($action == 'create') {
// Link for thirdparty discounts
if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be subtracted to payments only and not to total of final invoice
$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be subtracted to payments only and not to total of final invoice
} else {
$filterabsolutediscount = "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')";
$filtercreditnote = "fk_facture_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS RECEIVED)%')";

14
htdocs/comm/propal/class/api_proposals.class.php
View File

@ -57,7 +57,7 @@ class Proposals extends DolibarrApi
/**
* Get properties of a commercial proposal object
*
* Return an array with commercial proposal informations
* Return an array with commercial proposal information
*
* @param int $id ID of commercial proposal
* @param int $contact_list 0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
@ -73,7 +73,7 @@ class Proposals extends DolibarrApi
/**
* Get properties of an proposal object by ref
*
* Return an array with proposal informations
* Return an array with proposal information
*
* @param string $ref Ref of object
* @param int $contact_list 0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
@ -91,7 +91,7 @@ class Proposals extends DolibarrApi
/**
* Get properties of an proposal object by ref_ext
*
* Return an array with proposal informations
* Return an array with proposal information
*
* @param string $ref_ext External reference of object
* @param int $contact_list 0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
@ -109,7 +109,7 @@ class Proposals extends DolibarrApi
/**
* Get properties of an proposal object
*
* Return an array with proposal informations
* Return an array with proposal information
*
* @param int $id ID of order
* @param string $ref Ref of object
@ -156,7 +156,7 @@ class Proposals extends DolibarrApi
* @param int $page Page number
* @param string $thirdparty_ids Thirdparty ids to filter commercial proposals (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.datec:<:'20160101')"
* @param string $properties Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
* @param string $properties Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
* @return array Array of order objects
*/
public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '', $properties = '')
@ -255,7 +255,7 @@ class Proposals extends DolibarrApi
foreach ($request_data as $field => $value) {
if ($field === 'caller') {
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
$this->propal->context['caller'] = $request_data['caller'];
continue;
}
@ -693,7 +693,7 @@ class Proposals extends DolibarrApi
continue;
}
if ($field === 'caller') {
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
$this->propal->context['caller'] = $request_data['caller'];
continue;
}

40
htdocs/comm/propal/class/propal.class.php
View File

@ -236,24 +236,24 @@ class Propal extends CommonObject
public $address;
/**
* @var int availabilty ID
* @var int availability ID
*/
public $availability_id;
/**
* @var int availabilty ID
* @var int availability ID
* @deprecated
* @see $availability_id
*/
public $fk_availability;
/**
* @var string availabilty code
* @var string availability code
*/
public $availability_code;
/**
* @var string availabilty label
* @var string availability label
*/
public $availability;
@ -304,7 +304,7 @@ class Propal extends CommonObject
* 'noteditable' says if field is not editable (1 or 0)
* 'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
* 'index' if we want an index in database.
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
* 'searchall' is 1 if we want to search in this field when making a search from the quick search button.
* 'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
* 'css' is the CSS style to use on field. For example: 'maxwidth200'
@ -430,7 +430,7 @@ class Propal extends CommonObject
* @param int $remise_percent Discount effected on Product
* @return int Return integer <0 if KO, >0 if OK
*
* TODO Replace calls to this function by generation objet Ligne
* TODO Replace calls to this function by generation object Ligne
*/
public function add_product($idproduct, $qty, $remise_percent = 0)
{
@ -786,7 +786,7 @@ class Propal extends CommonObject
}
}
// Mise a jour informations denormalisees au niveau de la propale meme
// Mise a jour information denormalisees au niveau de la propale meme
if (empty($noupdateafterinsertline)) {
$result = $this->update_price(1, 'auto', 0, $mysoc); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
}
@ -824,7 +824,7 @@ class Propal extends CommonObject
* @param float $txlocaltax2 Local tax 2 rate
* @param string $desc Description
* @param string $price_base_type HT or TTC
* @param int $info_bits Miscellaneous informations
* @param int $info_bits Miscellaneous information
* @param int $special_code Special code (also used by externals modules!)
* @param int $fk_parent_line Id of parent line (0 in most cases, used by modules adding sublevels into lines).
* @param int $skip_update_total Keep fields total_xxx to 0 (used for special lines by some modules)
@ -1614,7 +1614,7 @@ class Propal extends CommonObject
}
$sql .= " AND p.ref='".$this->db->escape($ref)."'";
} else {
// Dont't use entity if you use rowid
// Don't use entity if you use rowid
$sql .= " WHERE p.rowid = ".((int) $rowid);
}
@ -1987,7 +1987,7 @@ class Propal extends CommonObject
// Protection
if ($this->statut == self::STATUS_VALIDATED) {
dol_syslog(get_class($this)."::valid action abandonned: already validated", LOG_WARNING);
dol_syslog(get_class($this)."::valid action abandoned: already validated", LOG_WARNING);
return 0;
}
@ -2981,7 +2981,7 @@ class Propal extends CommonObject
* @param int $shortlist 0=Return array[id]=ref, 1=Return array[](id=>id,ref=>ref,name=>name)
* @param int $draft 0=not draft, 1=draft
* @param int $notcurrentuser 0=all user, 1=not current user
* @param int $socid Id third pary
* @param int $socid Id third party
* @param int $limit For pagination
* @param int $offset For pagination
* @param string $sortfield Sort criteria
@ -3082,14 +3082,14 @@ class Propal extends CommonObject
$this->fetchObjectLinked($id, $this->element);
foreach ($this->linkedObjectsIds as $objecttype => $objectid) {
// Nouveau système du comon object renvoi des rowid et non un id linéaire de 1 à n
// Nouveau système du common object renvoi des rowid et non un id linéaire de 1 à n
// On parcourt donc une liste d'objets en tant qu'objet unique
foreach ($objectid as $key => $object) {
// Cas des factures liees directement
if ($objecttype == 'facture') {
$linkedInvoices[] = $object;
} else {
// Cas des factures liees par un autre objet (ex: commande)
// Cas des factures liees par un autre object (ex: commande)
$this->fetchObjectLinked($object, $objecttype);
foreach ($this->linkedObjectsIds as $subobjecttype => $subobjectid) {
foreach ($subobjectid as $subkey => $subobject) {
@ -3623,7 +3623,7 @@ class Propal extends CommonObject
}
}
// Initialise parametres
// Initialise parameters
$this->id = 0;
$this->ref = 'SPECIMEN';
$this->ref_client = 'NEMICEPS';
@ -3687,7 +3687,7 @@ class Propal extends CommonObject
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Charge indicateurs this->nb de tableau de bord
* Load the indicators this->nb for the state board
*
* @return int Return integer <0 if ko, >0 if ok
*/
@ -3854,7 +3854,7 @@ class Propal extends CommonObject
*
* @param int $withpicto Add picto into link
* @param string $option Where point the link ('expedition', 'document', ...)
* @param string $get_params Parametres added to url
* @param string $get_params Parameters added to url
* @param int $notooltip 1=Disable tooltip
* @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
* @param int $addlinktonotes -1=Disable, 0=Just add label show notes, 1=Add private note (only internal user), 2=Add public note (internal or external user), 3=Add private (internal user) and public note (internal and external user)
@ -4156,14 +4156,14 @@ class PropaleLigne extends CommonObjectLine
public $marge_tx;
public $marque_tx;
public $special_code; // Tag for special lines (exlusive tags)
public $special_code; // Tag for special lines (exclusive tags)
// 1: frais de port
// 2: ecotaxe
// 3: option line (when qty = 0)
public $info_bits = 0; // Some other info:
// Bit 0: 0 si TVA normal - 1 si TVA NPR
// Bit 1: 0 ligne normale - 1 si ligne de remise fixe
// Bit 0: 0 si TVA normal - 1 if TVA NPR
// Bit 1: 0 ligne normal - 1 if line with fixed discount
public $total_ht; // Total HT de la ligne toute quantite et incluant la remise ligne
public $total_tva; // Total TVA de la ligne toute quantite et incluant la remise ligne
@ -4246,7 +4246,7 @@ class PropaleLigne extends CommonObjectLine
/**
* Class line Contructor
* Class line Constructor
*
* @param DoliDB $db Database handler
*/

2
htdocs/comm/propal/contact.php
View File

@ -22,7 +22,7 @@
/**
* \file htdocs/comm/propal/contact.php
* \ingroup propal
* \brief Tab to manage contacts/adresses of proposal
* \brief Tab to manage contacts/addresses of proposal
*/
// Load Dolibarr environment

4
htdocs/comm/remx.php
View File

@ -151,7 +151,7 @@ if ($action == 'confirm_split' && GETPOST("confirm", "alpha") == 'yes' && $permi
$newid2 = $newdiscount2->create($user);
if ($res > 0 && $newid1 > 0 && $newid2 > 0) {
$db->commit();
header("Location: ".$_SERVER["PHP_SELF"].'?id='.$id.($backtopage ? '&backtopage='.urlencode($backtopage) : '')); // To avoid pb whith back
header("Location: ".$_SERVER["PHP_SELF"].'?id='.$id.($backtopage ? '&backtopage='.urlencode($backtopage) : '')); // To avoid pb with back
exit;
} else {
$db->rollback();
@ -210,7 +210,7 @@ if (GETPOST('action', 'aZ09') == 'confirm_remove' && GETPOST("confirm") == 'yes'
$result = $discount->delete($user);
if ($result > 0) {
$db->commit();
header("Location: ".$_SERVER["PHP_SELF"].'?id='.$id); // To avoid pb whith back
header("Location: ".$_SERVER["PHP_SELF"].'?id='.$id); // To avoid pb with back
exit;
} else {
setEventMessages($discount->error, $discount->errors, 'errors');

14
htdocs/commande/card.php
View File

@ -916,7 +916,7 @@ if (empty($reshook)) {
$desc = $prod->description;
}
//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time
//If text set in desc is the same as product descpription (as now it's preloaded) we add it only one time
if ($product_desc==$desc && getDolGlobalString('PRODUIT_AUTOFILL_DESC')) {
$product_desc='';
}
@ -1002,7 +1002,7 @@ if (empty($reshook)) {
// Margin
$fournprice = price2num(GETPOST('fournprice'.$predef) ? GETPOST('fournprice'.$predef) : '');
$buyingprice = price2num(GETPOST('buying_price'.$predef) != '' ? GETPOST('buying_price'.$predef) : ''); // If buying_price is '0', we muste keep this value
$buyingprice = price2num(GETPOST('buying_price'.$predef) != '' ? GETPOST('buying_price'.$predef) : ''); // If buying_price is '0', we must keep this value
// Prepare a price equivalent for minimum price check
$pu_equivalent = $pu_ht;
@ -1162,7 +1162,7 @@ if (empty($reshook)) {
// Add buying price
$fournprice = price2num(GETPOST('fournprice') ? GETPOST('fournprice') : '');
$buyingprice = price2num(GETPOST('buying_price') != '' ? GETPOST('buying_price') : ''); // If buying_price is '0', we muste keep this value
$buyingprice = price2num(GETPOST('buying_price') != '' ? GETPOST('buying_price') : ''); // If buying_price is '0', we must keep this value
// Extrafields Lines
$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
@ -1855,7 +1855,7 @@ if ($action == 'create' && $usercancreate) {
print '<td class="valuefieldcreate">';
$filter = '((s.client:IN:1,2,3) AND (s.status:=:1))';
print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company('', 'socid', $filter, 'SelectThirdParty', 1, 0, null, 0, 'minwidth175 maxwidth500 widthcentpercentminusxx');
// reload page to retrieve customer informations
// reload page to retrieve customer information
if (!getDolGlobalString('RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED')) {
print '<script>
$(document).ready(function() {
@ -2495,8 +2495,8 @@ if ($action == 'create' && $usercancreate) {
// Relative and absolute discounts
if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be subtracted to payments only and not to total of final invoice
$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be subtracted to payments only and not to total of final invoice
} else {
$filterabsolutediscount = "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')";
$filtercreditnote = "fk_facture_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS RECEIVED)%')";
@ -2542,7 +2542,7 @@ if ($action == 'create' && $usercancreate) {
print '</td>';
print '</tr>';
// Delivery date planed
// Delivery date planned
print '<tr><td>';
$editenable = $usercancreate;
print $form->editfieldkey("DateDeliveryPlanned", 'date_livraison', '', $object, $editenable);

18
htdocs/commande/class/api_orders.class.php
View File

@ -54,7 +54,7 @@ class Orders extends DolibarrApi
/**
* Get properties of an order object by id
*
* Return an array with order informations
* Return an array with order information
*
* @param int $id ID of order
* @param int $contact_list 0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
@ -70,7 +70,7 @@ class Orders extends DolibarrApi
/**
* Get properties of an order object by ref
*
* Return an array with order informations
* Return an array with order information
*
* @param string $ref Ref of object
* @param int $contact_list 0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
@ -88,7 +88,7 @@ class Orders extends DolibarrApi
/**
* Get properties of an order object by ref_ext
*
* Return an array with order informations
* Return an array with order information
*
* @param string $ref_ext External reference of object
* @param int $contact_list 0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
@ -106,7 +106,7 @@ class Orders extends DolibarrApi
/**
* Get properties of an order object
*
* Return an array with order informations
* Return an array with order information
*
* @param int $id ID of order
* @param string $ref Ref of object
@ -157,7 +157,7 @@ class Orders extends DolibarrApi
* @param string $thirdparty_ids Thirdparty ids to filter orders of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
* @param string $sqlfilterlines Other criteria to filter answers separated by a comma. Syntax example "(tl.fk_product:=:'17') and (tl.price:<:'250')"
* @param string $properties Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
* @param string $properties Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
* @return array Array of order objects
*
* @throws RestException 404 Not found
@ -257,7 +257,7 @@ class Orders extends DolibarrApi
/**
* Create a sale order
*
* Exemple: { "socid": 2, "date": 1595196000, "type": 0, "lines": [{ "fk_product": 2, "qty": 1 }] }
* Example: { "socid": 2, "date": 1595196000, "type": 0, "lines": [{ "fk_product": 2, "qty": 1 }] }
*
* @param array $request_data Request data
* @return int ID of order
@ -272,7 +272,7 @@ class Orders extends DolibarrApi
foreach ($request_data as $field => $value) {
if ($field === 'caller') {
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
$this->commande->context['caller'] = $request_data['caller'];
continue;
}
@ -496,7 +496,7 @@ class Orders extends DolibarrApi
/**
* Get contacts of given order
*
* Return an array with contact informations
* Return an array with contact information
*
* @param int $id ID of order
* @param string $type Type of the contact (BILLING, SHIPPING, CUSTOMER)
@ -648,7 +648,7 @@ class Orders extends DolibarrApi
continue;
}
if ($field === 'caller') {
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
$this->commande->context['caller'] = $request_data['caller'];
continue;
}

42
htdocs/commande/class/commande.class.php
View File

@ -298,7 +298,7 @@ class Commande extends CommonOrder
* 'noteditable' says if field is not editable (1 or 0)
* 'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
* 'index' if we want an index in database.
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
* 'searchall' is 1 if we want to search in this field when making a search from the quick search button.
* 'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
* 'css' is the CSS style to use on field. For example: 'maxwidth200'
@ -475,7 +475,7 @@ class Commande extends CommonOrder
// Protection
if ($this->statut == self::STATUS_VALIDATED) {
dol_syslog(get_class($this)."::valid action abandonned: already validated", LOG_WARNING);
dol_syslog(get_class($this)."::valid action abandoned: already validated", LOG_WARNING);
return 0;
}
@ -766,7 +766,7 @@ class Commande extends CommonOrder
/**
* Close order
*
* @param User $user Objet user that close
* @param User $user Object user that close
* @param int $notrigger 1=Does not execute triggers, 0=Execute triggers
* @return int Return integer <0 if KO, >0 if OK
*/
@ -899,7 +899,7 @@ class Commande extends CommonOrder
* Create order
* Note that this->ref can be set or empty. If empty, we will use "(PROV)"
*
* @param User $user Objet user that make creation
* @param User $user Object user that make creation
* @param int $notrigger Disable all triggers
* @return int Return integer <0 if KO, >0 if OK
*/
@ -1453,7 +1453,7 @@ class Commande extends CommonOrder
}
if (!$error) {
// Validate immediatly the order
// Validate immediately the order
if (getDolGlobalString('ORDER_VALID_AFTER_CLOSE_PROPAL')) {
$this->fetch($ret);
$this->valid($user);
@ -1503,7 +1503,7 @@ class Commande extends CommonOrder
*
* @see add_product()
*
* Les parametres sont deja cense etre juste et avec valeurs finales a l'appel
* Les parameters sont deja cense etre juste et avec valeurs finales a l'appel
* de cette methode. Aussi, pour le taux tva, il doit deja avoir ete defini
* par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,produit)
* et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue)
@ -1722,7 +1722,7 @@ class Commande extends CommonOrder
}
}
// Mise a jour informations denormalisees au niveau de la commande meme
// Mise a jour information denormalisees au niveau de la commande meme
if (empty($noupdateafterinsertline)) {
$result = $this->update_price(1, 'auto', 0, $mysoc); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
}
@ -1759,7 +1759,7 @@ class Commande extends CommonOrder
* @param int|string $date_end End date of the line
* @return void
*
* TODO Remplacer les appels a cette fonction par generation objet Ligne
* TODO Remplacer les appels a cette fonction par generation object Ligne
*/
public function add_product($idproduct, $qty, $remise_percent = 0.0, $date_start = '', $date_end = '')
{
@ -1885,7 +1885,7 @@ class Commande extends CommonOrder
if ($id) {
$sql .= " WHERE c.rowid=".((int) $id);
} else {
$sql .= " WHERE c.entity IN (".getEntity('commande').")"; // Dont't use entity if you use rowid
$sql .= " WHERE c.entity IN (".getEntity('commande').")"; // Don't use entity if you use rowid
}
if ($ref) {
@ -2001,10 +2001,10 @@ class Commande extends CommonOrder
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Adding line of fixed discount in the order in DB
* Add line of fixed discount in the order in DB
*
* @param int $idremise Id de la remise fixe
* @return int >0 si ok, <0 si ko
* @param int $idremise Id for the fixed discount
* @return int >0 if OK, <0 if KO
*/
public function insert_discount($idremise)
{
@ -2661,7 +2661,7 @@ class Commande extends CommonOrder
/**
* Set the planned delivery date
*
* @param User $user Objet utilisateur qui modifie
* @param User $user Object utilisateur qui modifie
* @param int $delivery_date Delivery date
* @param int $notrigger 1=Does not execute triggers, 0= execute triggers
* @return int Return integer <0 si ko, >0 si ok
@ -2720,8 +2720,8 @@ class Commande extends CommonOrder
*
* @param int $shortlist 0=Return array[id]=ref, 1=Return array[](id=>id,ref=>ref,name=>name)
* @param int $draft 0=not draft, 1=draft
* @param User $excluser Objet user to exclude
* @param int $socid Id third pary
* @param User $excluser Object user to exclude
* @param int $socid Id third party
* @param int $limit For pagination
* @param int $offset For pagination
* @param string $sortfield Sort criteria
@ -3091,7 +3091,7 @@ class Commande extends CommonOrder
* @param float $txlocaltax1 Local tax 1 rate
* @param float $txlocaltax2 Local tax 2 rate
* @param string $price_base_type HT or TTC
* @param int $info_bits Miscellaneous informations on line
* @param int $info_bits Miscellaneous information on line
* @param int|string $date_start Start date of the line
* @param int|string $date_end End date of the line
* @param int $type Type of line (0=product, 1=service)
@ -3929,7 +3929,7 @@ class Commande extends CommonOrder
/**
* Charge les informations d'ordre info dans l'objet commande
* Charge les information d'ordre info dans l'objet commande
*
* @param int $id Id of order
* @return void
@ -4002,7 +4002,7 @@ class Commande extends CommonOrder
}
}
// Initialise parametres
// Initialise parameters
$this->id = 0;
$this->ref = 'SPECIMEN';
$this->specimen = 1;
@ -4064,9 +4064,9 @@ class Commande extends CommonOrder
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Charge indicateurs this->nb de tableau de bord
* Load the indicators this->nb for the state board
*
* @return int Return integer <0 si ko, >0 si ok
* @return int Return integer <0 if KO, >0 if OK
*/
public function load_state_board()
{
@ -4114,7 +4114,7 @@ class Commande extends CommonOrder
* Create a document onto disk according to template module.
*
* @param string $modele Force template to use ('' to not force)
* @param Translate $outputlangs objet lang a utiliser pour traduction
* @param Translate $outputlangs object lang a utiliser pour traduction
* @param int $hidedetails Hide details of lines
* @param int $hidedesc Hide description
* @param int $hideref Hide ref

2
htdocs/commande/index.php
View File

@ -157,7 +157,7 @@ print '</div><div class="fichetwothirdright">';
$max = 5;
/*
* Lattest modified orders
* Latest modified orders
*/
$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, c.facture, c.date_cloture as datec, c.tms as datem,";

6
htdocs/commande/list.php
View File

@ -359,7 +359,7 @@ if (empty($reshook)) {
$objecttmp = new Facture($db);
if (!empty($createbills_onebythird) && !empty($TFactThird[$cmd->socid])) {
// If option "one bill per third" is set, and an invoice for this thirdparty was already created, we re-use it.
// If option "one bill per third" is set, and an invoice for this thirdparty was already created, we reuse it.
$objecttmp = $TFactThird[$cmd->socid];
} else {
// If we want one invoice per order or if there is no first invoice yet for this thirdparty.
@ -1522,7 +1522,7 @@ if (GETPOST('autoselectall', 'int')) {
$selectedfields .= '</script>';
}
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
// Fields title search
@ -2660,7 +2660,7 @@ while ($i < $imaxinloop) {
} else { // BUGGED CODE.
// DOES NOT TAKE INTO ACCOUNT MANUFACTURING. THIS CODE SHOULD BE USELESS. PREVIOUS CODE SEEMS COMPLETE.
// COUNT STOCK WHEN WE SHOULD ALREADY HAVE VALUE
// Detailed virtual stock, looks bugged, uncomplete and need heavy load.
// Detailed virtual stock, looks bugged, incomplete and need heavy load.
// stock order and stock order_supplier
$stock_order = 0;
$stock_order_supplier = 0;

2
htdocs/commande/list_det.php
View File

@ -2119,7 +2119,7 @@ if ($resql) {
} else { // BUGGED CODE.
// DOES NOT TAKE INTO ACCOUNT MANUFACTURING. THIS CODE SHOULD BE USELESS. PREVIOUS CODE SEEMS COMPLETE.
// COUNT STOCK WHEN WE SHOULD ALREADY HAVE VALUE
// Detailed virtual stock, looks bugged, uncomplete and need heavy load.
// Detailed virtual stock, looks bugged, incomplete and need heavy load.
// stock order and stock order_supplier
$stock_order = 0;
$stock_order_supplier = 0;

2
htdocs/compta/facture/class/facture.class.php
View File

@ -3007,7 +3007,7 @@ class Facture extends CommonInvoice
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Tags the invoice as incompletely paied and call the trigger BILL_UNPAYED
* Tags the invoice as incompletely paid and call the trigger BILL_UNPAYED
* This method is used when a direct debit (fr:prelevement) is refused
* or when a canceled invoice is reopened.
*

2
htdocs/contact/agenda.php
View File

@ -187,7 +187,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
*/
$head = array();
if ($id > 0) {
// Si edition contact deja existant
// Si edition contact deja existent
$object = new Contact($db);
$res = $object->fetch($id, $user);
if ($res < 0) {

4
htdocs/contact/canvas/actions_contactcard_common.class.php
View File

@ -18,12 +18,12 @@
/**
* \file htdocs/contact/canvas/actions_contactcard_common.class.php
* \ingroup thirdparty
* \brief Fichier de la classe Thirdparty contact card controller (common)
* \brief File for the class Thirdparty contact card controller (common)
*/
/**
* \class ActionsContactCardCommon
* \brief Classe permettant la gestion des contacts par defaut
* \brief Common Abstract Class for contact managmeent
*/
abstract class ActionsContactCardCommon
{

6
htdocs/contact/canvas/default/actions_contactcard_default.class.php
View File

@ -19,20 +19,20 @@
/**
* \file htdocs/contact/canvas/default/actions_contactcard_default.class.php
* \ingroup thirdparty
* \brief Fichier de la classe Thirdparty contact card controller (default canvas)
* \brief File for the class Thirdparty contact card controller (default canvas)
*/
include_once DOL_DOCUMENT_ROOT.'/contact/canvas/actions_contactcard_common.class.php';
/**
* \class ActionsContactCardDefault
* \brief Classe permettant la gestion des contacts par defaut
* \brief Default Class to manage contacts
*/
class ActionsContactCardDefault extends ActionsContactCardCommon
{
/**
* Constructor
*
* @param DoliDB $db Handler acces base de donnees
* @param DoliDB $db Handler access base de donnees
* @param string $dirmodule Name of directory of module
* @param string $targetmodule Name of directory of module where canvas is stored
* @param string $canvas Name of canvas

6
htdocs/contact/card.php
View File

@ -175,7 +175,7 @@ if (empty($reshook)) {
}
// Confirmation desactivation
// Confirmation deactivation
if ($action == 'disable' && !empty($permissiontoadd)) {
$object->fetch($id);
if ($object->setstatus(0) < 0) {
@ -608,7 +608,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
*/
$head = array();
if ($id > 0) {
// Si edition contact deja existant
// Si edition contact deja existent
$object = new Contact($db);
$res = $object->fetch($id, $user);
if ($res < 0) {
@ -896,7 +896,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print '<hr style="margin-bottom: 20px">';
// Add personnal information
// Add personal information
print load_fiche_titre('<div class="comboperso">'.$langs->trans("PersonalInformations").'</div>', '', '');
print '<table class="border centpercent">';

12
htdocs/contact/class/contact.class.php
View File

@ -81,7 +81,7 @@ class Contact extends CommonObject
* 'noteditable' says if field is not editable (1 or 0)
* 'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
* 'index' if we want an index in database.
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
* 'searchall' is 1 if we want to search in this field when making a search from the quick search button.
* 'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
* 'css' is the CSS style to use on field. For example: 'maxwidth200'
@ -557,10 +557,10 @@ class Contact extends CommonObject
}
/**
* Update informations into database
* Update information into database
*
* @param int $id Id of contact/address to update
* @param User $user Objet user making change
* @param User $user Object user making change
* @param int $notrigger 0=no, 1=yes
* @param string $action Current action for hookmanager
* @param int $nosyncuser No sync linked user (external users and contacts are linked)
@ -889,7 +889,7 @@ class Contact extends CommonObject
$this->db->begin();
// Mis a jour contact
// Update the contact
$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET";
$sql .= " birthday = ".($this->birthday ? "'".$this->db->idate($this->birthday)."'" : "null");
$sql .= ", photo = ".($this->photo ? "'".$this->db->escape($this->photo)."'" : "null");
@ -1961,7 +1961,7 @@ class Contact extends CommonObject
global $langs;
$lib = $langs->trans("ProspectLevel".$fk_prospectlevel);
// If lib not found in language file, we get label from cache/databse
// If lib not found in language file, we get label from cache/database
if ($lib == $langs->trans("ProspectLevel".$fk_prospectlevel)) {
$lib = $langs->getLabelFromKey($this->db, $fk_prospectlevel, 'c_prospectlevel', 'code', 'label');
}
@ -2120,7 +2120,7 @@ class Contact extends CommonObject
/**
* get "blacklist" mailing status
* set no_email attribut to 1 or 0
* set no_email attribute to 1 or 0
*
* @return int Return integer <0 if KO, >0 if OK
*/

2
htdocs/contact/ldap.php
View File

@ -149,7 +149,7 @@ if (getDolGlobalString('LDAP_CONTACT_ACTIVE') && getDolGlobalInt('LDAP_CONTACT_A
// Affichage attributs LDAP
// Affichage attributes LDAP
print load_fiche_titre($langs->trans("LDAPInformationsForThisContact"));
print '<table width="100%" class="noborder">';

2
htdocs/contact/list.php
View File

@ -441,7 +441,7 @@ if (getDolGlobalString('THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES'))
$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
// Select every potentiels, and note each potentiels which fit in search parameters
// Select every potentials, and note each potentials which fit in search parameters
$tab_level = array();
$sql = "SELECT code, label, sortorder";
$sql .= " FROM ".MAIN_DB_PREFIX."c_prospectcontactlevel";

2
htdocs/contact/perso.php
View File

@ -21,7 +21,7 @@
/**
* \file htdocs/contact/perso.php
* \ingroup societe
* \brief Onglet informations personnelles d'un contact
* \brief Onglet information personnelles d'un contact
*/
// Load Dolibarr environment

2
htdocs/contact/vcard.php
View File

@ -117,7 +117,7 @@ if ($company->id) {
}
}
// Personal informations
// Personal information
$v->setPhoneNumber($contact->phone_perso, "TYPE=HOME;VOICE");
if ($contact->birthday) {
$v->setBirthday($contact->birthday);

10
htdocs/contrat/card.php
View File

@ -560,7 +560,7 @@ if (empty($reshook)) {
$desc = $prod->description;
//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time
//If text set in desc is the same as product descpription (as now it's preloaded) we add it only one time
if ($product_desc == $desc && getDolGlobalString('PRODUIT_AUTOFILL_DESC')) {
$product_desc = '';
}
@ -1690,7 +1690,7 @@ if ($action == 'create') {
$colspan++;
}
// Dates of service planed and real
// Dates of service planned and real
if ($objp->subprice >= 0) {
print '<tr class="oddeven" '.$moreparam.'>';
print '<td colspan="'.$colspan.'">';
@ -1820,7 +1820,7 @@ if ($action == 'create') {
$colspan++;
}
// Line dates planed
// Line dates planned
print '<tr class="oddeven">';
print '<td colspan="'.$colspan.'">';
print $langs->trans("DateStartPlanned").' ';
@ -1971,7 +1971,7 @@ if ($action == 'create') {
print '<table class="noborder tableforservicepart2'.($cursorline < $nbofservices ? ' boxtablenobottom' : '').' centpercent">';
// Definie date debut et fin par defaut
// Definie date debut et fin par default
$dateactstart = $objp->date_start;
if (GETPOST('remonth')) {
$dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
@ -2028,7 +2028,7 @@ if ($action == 'create') {
print '<table class="noborder tableforservicepart2'.($cursorline < $nbofservices ? ' boxtablenobottom' : '').' centpercent">';
// Definie date debut et fin par defaut
// Definie date debut et fin par default
$dateactstart = $objp->date_start_real;
if (GETPOST('remonth')) {
$dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));

8
htdocs/contrat/class/api_contracts.class.php
View File

@ -57,7 +57,7 @@ class Contracts extends DolibarrApi
/**
* Get properties of a contract object
*
* Return an array with contract informations
* Return an array with contract information
*
* @param int $id ID of contract
* @return Object Object with cleaned properties
@ -95,7 +95,7 @@ class Contracts extends DolibarrApi
* @param int $page Page number
* @param string $thirdparty_ids Thirdparty ids to filter contracts of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
* @param string $properties Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
* @param string $properties Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
* @return array Array of contract objects
*
* @throws RestException 404 Not found
@ -191,7 +191,7 @@ class Contracts extends DolibarrApi
foreach ($request_data as $field => $value) {
if ($field === 'caller') {
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
$this->contract->context['caller'] = $request_data['caller'];
continue;
}
@ -504,7 +504,7 @@ class Contracts extends DolibarrApi
continue;
}
if ($field === 'caller') {
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
$this->contract->context['caller'] = $request_data['caller'];
continue;
}

22
htdocs/contrat/class/contrat.class.php
View File

@ -122,7 +122,7 @@ class Contrat extends CommonObject
public $fk_soc;
public $societe; // Objet societe
public $societe; // Object societe
/**
* Status of the contract
@ -226,7 +226,7 @@ class Contrat extends CommonObject
* 'noteditable' says if field is not editable (1 or 0)
* 'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
* 'index' if we want an index in database.
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
* 'searchall' is 1 if we want to search in this field when making a search from the quick search button.
* 'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
* 'css' is the CSS style to use on field. For example: 'maxwidth200'
@ -338,7 +338,7 @@ class Contrat extends CommonObject
/**
* Activate a contract line
*
* @param User $user Objet User who activate contract
* @param User $user Object User who activate contract
* @param int $line_id Id of line to activate
* @param int $date_start Opening date
* @param int|string $date_end Expected end date
@ -361,7 +361,7 @@ class Contrat extends CommonObject
/**
* Close a contract line
*
* @param User $user Objet User who close contract
* @param User $user Object User who close contract
* @param int $line_id Id of line to close
* @param int $date_end End date
* @param string $comment A comment typed by user
@ -490,7 +490,7 @@ class Contrat extends CommonObject
/**
* Validate a contract
*
* @param User $user Objet User
* @param User $user Object User
* @param string $force_number Reference to force on contract (not implemented yet)
* @param int $notrigger 1=Does not execute triggers, 0= execute triggers
* @return int Return integer <0 if KO, >0 if OK
@ -2163,7 +2163,7 @@ class Contrat extends CommonObject
}
/**
* Charge les informations d'ordre info dans l'objet contrat
* Charge les information d'ordre info dans l'objet contrat
*
* @param int $id id du contrat a charger
* @return void
@ -2280,7 +2280,7 @@ class Contrat extends CommonObject
/**
* Load indicators for dashboard (this->nbtodo and this->nbtodolate)
*
* @param User $user Objet user
* @param User $user Object user
* @param string $mode "inactive" pour services a activer, "expired" pour services expires
* @return WorkboardResponse|int Return integer <0 if KO, WorkboardResponse if OK
*/
@ -2376,7 +2376,7 @@ class Contrat extends CommonObject
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Charge indicateurs this->nb de tableau de bord
* Load the indicators this->nb for state board
*
* @return int Return integer <0 si ko, >0 si ok
*/
@ -2467,7 +2467,7 @@ class Contrat extends CommonObject
}
}
// Initialise parametres
// Initialise parameters
$this->id = 0;
$this->specimen = 1;
@ -3744,7 +3744,7 @@ class ContratLigne extends CommonObjectLine
/**
* Activate a contract line
*
* @param User $user Objet User who activate contract
* @param User $user Object User who activate contract
* @param int $date Date real activation
* @param int|string $date_end Date planned end. Use '-1' to keep it unchanged.
* @param string $comment A comment typed by user
@ -3802,7 +3802,7 @@ class ContratLigne extends CommonObjectLine
/**
* Close a contract line
*
* @param User $user Objet User who close contract
* @param User $user Object User who close contract
* @param int $date_end_real Date end
* @param string $comment A comment typed by user
* @param int $notrigger 1=Does not execute triggers, 0=Execute triggers

2
htdocs/contrat/tpl/linkedobjectblock.tpl.php
View File

@ -50,7 +50,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
<td class="center"><?php echo dol_print_date($objectlink->date_contrat, 'day'); ?></td>
<td class="nowraponall right"><?php
// Price of contract is not shown by default because a contract is a list of service with
// start and end date that change with time andd that may be different that the period of reference for price.
// start and end date that change with time and that may be different that the period of reference for price.
// So price of a contract does often means nothing. Prices is on the different invoices done on same contract.
if ($user->hasRight('contrat', 'lire') && !getDolGlobalString('CONTRACT_SHOW_TOTAL_OF_PRODUCT_AS_PRICE')) {
$totalcontrat = 0;

2
htdocs/core/lib/modulebuilder.lib.php
View File

@ -1317,7 +1317,7 @@ function writeApiUrlsInDoc($file_api, $file_doc)
// build format asciidoc for urls in table
if (!$error) {
$asciiDocTable = "[options=\"header\"]\n|===\n|Objet | URLs\n";
$asciiDocTable = "[options=\"header\"]\n|===\n|Object | URLs\n"; // phpcs:ignore
foreach ($groupedUrls as $objectName => $urls) {
$urlsList = implode(" +\n*", $urls);
$asciiDocTable .= "|$objectName | \n*$urlsList +\n";

2
htdocs/core/modules/hrm/doc/pdf_standard.modules.php
View File

@ -610,7 +610,7 @@ class pdf_standard extends ModelePDFEvaluation
/*$pdf->SetTextColor(0, 0, 0);
$pdf->SetFont('', 'B', $default_font_size - 2);
$pdf->SetXY($posx, $posy - 5);
$pdf->MultiCell(190, 5, $outputlangs->transnoentities("Informations"), '', 'L');*/
$pdf->MultiCell(190, 5, $outputlangs->transnoentities("Information"), '', 'L');*/
$pdf->SetXY($posx, $posy);
$pdf->SetFillColor(224, 224, 224);
$pdf->MultiCell(190, $hautcadre, "", 0, 'R', 1);

2
htdocs/cron/class/cronjob.class.php
View File

@ -1024,7 +1024,7 @@ class Cronjob extends CommonObject
}
/**
* Return a link to the object card (with optionaly the picto)
* Return a link to the object card (with optionally the picto)
*
* @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
* @param string $option On what the link point to ('nolink', ...)

4
htdocs/cron/list.php
View File

@ -164,7 +164,7 @@ if (empty($reshook)) {
setEventMessages($object->error, $object->errors, 'errors');
}
// Programm next run
// Plan next run
$res = $object->reprogram_jobs($user->login, $now);
if ($res > 0) {
if ($resrunjob >= 0) { // We show the result of reprogram only if no error message already reported
@ -490,7 +490,7 @@ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
}
print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "t.rowid", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("CronLabel", $_SERVER["PHP_SELF"], "t.label", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("Prority", $_SERVER["PHP_SELF"], "t.priority", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("Priority", $_SERVER["PHP_SELF"], "t.priority", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("CronModule", $_SERVER["PHP_SELF"], "t.module_name", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("CronType", '', '', "", $param, '', $sortfield, $sortorder, 'tdoverflowmax100 ');
print_liste_field_titre("CronFrequency", '', "", "", $param, '', $sortfield, $sortorder);

3
htdocs/emailcollector/class/emailcollector.class.php
View File

@ -1686,7 +1686,8 @@ class EmailCollector extends CommonObject
$trackidfoundintorecipientid = 0;
$reg = array();
// See also later list of all supported tags...
if (preg_match('/\+(thi|ctc|use|mem|sub|proj|tas|con|tic|pro|ord|inv|spro|sor|sin|leav|stockinv|job|surv|salary)([0-9]+)@/', $emailto, $reg)) {
// Note: "th[i]" to avoid matching a codespell suggestion to convert to this.
if (preg_match('/\+(th[i]|ctc|use|mem|sub|proj|tas|con|tic|pro|ord|inv|spro|sor|sin|leav|stockinv|job|surv|salary)([0-9]+)@/', $emailto, $reg)) {
$trackidfoundintorecipienttype = $reg[1];
$trackidfoundintorecipientid = $reg[2];
} elseif (preg_match('/\+emailing-(\w+)@/', $emailto, $reg)) { // Can be 'emailing-test' or 'emailing-IdMailing-IdRecipient'

2
htdocs/loan/payment/payment.php
View File

@ -125,7 +125,7 @@ if ($action == 'add_payment') {
$remaindertopay = price2num(GETPOST('remaindertopay'));
$amount = $pay_amount_capital + $pay_amount_insurance + $pay_amount_interest;
// This term is allready paid
// This term is already paid
if (!empty($line) && !empty($line->fk_bank)) {
setEventMessages($langs->trans('TermPaidAllreadyPaid'), null, 'errors');
$error++;

28
htdocs/margin/lib/margins.lib.php
View File

@ -106,55 +106,55 @@ function marges_prepare_head()
/**
* Return an array with margins information of a line
*
* @param float $pvht Selling price without tax
* @param float $pv_ht Selling price without tax
* @param float $remise_percent Discount percent on line
* @param float $tva_tx Vat rate (not used)
* @param float $localtax1_tx Vat rate special 1 (not used)
* @param float $localtax2_tx Vat rate special 2 (not used)
* @param int $fk_pa Id of buying price (prefer set this to 0 and provide $paht instead. With id, buying price may have change)
* @param float $paht Buying price without tax
* @param int $fk_pa Id of buying price (prefer set this to 0 and provide $pa_ht instead. With id, buying price may have change)
* @param float $pa_ht Buying price without tax
* @return array Array of margin info (buying price, marge rate, marque rate)
*/
function getMarginInfos($pvht, $remise_percent, $tva_tx, $localtax1_tx, $localtax2_tx, $fk_pa, $paht)
function getMarginInfos($pv_ht, $remise_percent, $tva_tx, $localtax1_tx, $localtax2_tx, $fk_pa, $pa_ht)
{
global $db, $conf;
$marge_tx_ret = '';
$marque_tx_ret = '';
if ($fk_pa > 0 && empty($paht)) {
if ($fk_pa > 0 && empty($pa_ht)) {
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
$product = new ProductFournisseur($db);
if ($product->fetch_product_fournisseur_price($fk_pa)) {
$paht_ret = $product->fourn_unitprice * (1 - $product->fourn_remise_percent / 100);
$pa_ht_ret = $product->fourn_unitprice * (1 - $product->fourn_remise_percent / 100);
} else {
$paht_ret = $paht;
$pa_ht_ret = $pa_ht;
}
} else {
$paht_ret = $paht;
$pa_ht_ret = $pa_ht;
}
// Calculate selling unit price including line discount
// We don't use calculate_price, because this function is dedicated to calculation of total with accuracy of total. We need an accuracy of a unit price.
// Also we must not apply rounding on non decimal rule defined by option MAIN_ROUNDING_RULE_TOT
$pu_ht_remise = $pvht * (1 - ($remise_percent / 100));
$pu_ht_remise = $pv_ht * (1 - ($remise_percent / 100));
$pu_ht_remise = price2num($pu_ht_remise, 'MU');
// calcul marge
if ($pu_ht_remise < 0) {
$marge = -1 * (abs($pu_ht_remise) - $paht_ret);
$marge = -1 * (abs($pu_ht_remise) - $pa_ht_ret);
} else {
$marge = $pu_ht_remise - $paht_ret;
$marge = $pu_ht_remise - $pa_ht_ret;
}
// calcul taux marge
if ($paht_ret != 0) {
$marge_tx_ret = (100 * $marge) / $paht_ret;
if ($pa_ht_ret != 0) {
$marge_tx_ret = (100 * $marge) / $pa_ht_ret;
}
// calcul taux marque
if ($pu_ht_remise != 0) {
$marque_tx_ret = (100 * $marge) / $pu_ht_remise;
}
return array($paht_ret, $marge_tx_ret, $marque_tx_ret);
return array($pa_ht_ret, $marge_tx_ret, $marque_tx_ret);
}

2
htdocs/modulebuilder/index.php
View File

@ -1618,7 +1618,7 @@ if ($dirins && $action == 'initdic' && $module && empty($cancel)) {
}
if (!GETPOST('label')) {
$error++;
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Lable")), null, 'errors');
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
}
if (!$error) {
$newdicname = $dicname;

2
htdocs/modulebuilder/template/class/api_mymodule.class.php
View File

@ -98,7 +98,7 @@ class MyModuleApi extends DolibarrApi
* @param int $limit Limit for list
* @param int $page Page number
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
* @param string $properties Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
* @param string $properties Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
* @return array Array of order objects
*
* @throws RestException

2
htdocs/mrp/class/api_mos.class.php
View File

@ -90,7 +90,7 @@ class Mos extends DolibarrApi
* @param int $limit Limit for list
* @param int $page Page number
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
* @param string $properties Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
* @param string $properties Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
* @return array Array of order objects
*
* @throws RestException

8
htdocs/mrp/class/mo.class.php
View File

@ -316,7 +316,7 @@ class Mo extends CommonObject
$this->db->begin();
if ($this->fk_bom > 0) {
// If there is a nown BOM, we force the type of MO to the type of BOM
// If there is a known BOM, we force the type of MO to the type of BOM
include_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
$tmpbom = new BOM($this->db);
$tmpbom->fetch($this->fk_bom);
@ -550,7 +550,7 @@ class Mo extends CommonObject
* Get list of lines linked to current line for a defined role.
*
* @param string $role Get lines linked to current line with the selected role ('consumed', 'produced', ...)
* @param int $lineid Id of production line to filter childs
* @param int $lineid Id of production line to filter children
* @return array Array of lines
*/
public function fetchLinesLinked($role, $lineid = 0)
@ -1807,7 +1807,7 @@ class Mo extends CommonObject
/**
* Function used to return childs of Mo
* Function used to return children of Mo
*
* @return Mo[]|int array if OK, -1 if KO
*/
@ -1893,7 +1893,7 @@ class Mo extends CommonObject
/**
* Function used to return childs of Mo
* Function used to return children of Mo
*
* @return Mo|int MO object if OK, -1 if KO, 0 if not exist
*/

2
htdocs/mrp/mo_card.php
View File

@ -143,7 +143,7 @@ if (empty($reshook)) {
}
$triggermodname = 'MO_MODIFY'; // Name of trigger action code to execute when we modify record
// Create MO with Childs
// Create MO with Children
if ($action == 'add' && empty($id) && !empty($TBomLineId)) {
$noback = 1;
include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';

2
htdocs/multicurrency/class/api_multicurrencies.class.php
View File

@ -48,7 +48,7 @@ class MultiCurrencies extends DolibarrApi
* @param int $limit Limit for list
* @param int $page Page number
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.product_id:=:1) and (t.date_creation:<:'20160101')"
* @param string $properties Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
* @param string $properties Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
* @return array Array of warehouse objects
*
* @throws RestException

4
htdocs/opensurvey/wizard/choix_date.php
View File

@ -536,11 +536,11 @@ if (issetAndNoEmpty('totalchoixjour', $_SESSION) || $erreur) {
for ($i = 0; $i < $_SESSION["nbrecaseshoraires"]; $i++) {
$j = $i + 1;
print '<td classe="somme"><div class="center">'.$langs->trans("Time").' '.$j.'</div></td>'."\n";
print '<td class="somme"><div class="center">'.$langs->trans("Time").' '.$j.'</div></td>'."\n";
}
if ($_SESSION["nbrecaseshoraires"] < 10) {
print '<td classe="somme"><input type="image" name="ajoutcases" src="../img/add-16.png"></td>'."\n";
print '<td class="somme"><input type="image" name="ajoutcases" src="../img/add-16.png"></td>'."\n";
}
print '</tr>'."\n";

2
htdocs/opensurvey/wizard/create_survey.php
View File

@ -198,7 +198,7 @@ if (GETPOST('choix_sondage')) {
print '<input type="hidden" name="choix_sondage" value="'.GETPOST('choix_sondage').'">';
print '<br><input type="submit" class="button" name="submit" value="'.$langs->trans("CreatePoll").' ('.(GETPOST('choix_sondage') == 'date' ? $langs->trans("TypeDate") : $langs->trans("TypeClassic")).')">';
} else {
// Show image to selecte between date survey or other survey
// Show image to select between date survey or other survey
print '<br><table>'."\n";
print '<tr><td>'.$langs->trans("CreateSurveyDate").'</td><td></td> '."\n";
print '<td><input type="image" name="creation_sondage_date" value="'.$langs->trans('CreateSurveyDate').'" src="../img/calendar-32.png"></td></tr>'."\n";

2
htdocs/partnership/class/api_partnerships.class.php
View File

@ -95,7 +95,7 @@ class Partnerships extends DolibarrApi
* @param int $limit Limit for list
* @param int $page Page number
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
* @param string $properties Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
* @param string $properties Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
* @return array Array of order objects
*
* @throws RestException

2
htdocs/viewimage.php
View File

@ -261,7 +261,7 @@ if (!empty($hashp)) {
if (getDolGlobalString('TAKEPOS_AUTO_ORDER') && in_array($modulepart, array('product', 'category'))) {
$accessallowed = 1; // When TakePOS Public Auto Order is enabled, we accept to see all images of product and categories with no login
// TODO Replace this with a call of getPublicImageOfObject like used by website so
// only share images are visibles
// only shared images are visible
}
} else {
// Basic protection (against external users only)

8
test/phpunit/FilesLibTest.php
View File

@ -141,13 +141,13 @@ class FilesLibTest extends PHPUnit\Framework\TestCase
$langs=$this->savlangs;
$db=$this->savdb;
$result=dol_basename('adir/afile');
$result=dol_basename('adir/a_file');
print __METHOD__." result=".$result."\n";
$this->assertEquals('afile', $result);
$this->assertEquals('a_file', $result);
$result=dol_basename('adir/afile/');
$result=dol_basename('adir/a_file/');
print __METHOD__." result=".$result."\n";
$this->assertEquals('afile', $result);
$this->assertEquals('a_file', $result);
$result=dol_basename('adir/νεο'); // With cyrillic data. Here basename fails to return correct value
print __METHOD__." result=".$result."\n";