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

Merge pull request #15124 from frederic34/retrieve

Browse Source 
retrieve the spelling
This commit is contained in:
Laurent Destailleur 2020-10-25 14:48:51 +01:00 committed by GitHub
commit 4d9c8e2225
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
65 changed files with 130 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/CONTRIBUTING.md vendored
View File

@ -141,7 +141,7 @@ Translations done on transifex are available in the next major release.
Note: Sometimes, the source text (english) is modified. In such a case, the translation is reset. Transifex assume that if the original source
has changed, the translation is surely no more correct so must be done again. But old translation is not lost and you can use the tab "History"
to retreive all old translation of a source text, and restore the translation in one click with no need to retranslate it if there is no need to.
to retrieve all old translation of a source text, and restore the translation in one click with no need to retranslate it if there is no need to.
### Resources

4
ChangeLog
View File

@ -3387,7 +3387,7 @@ Following changes may create regression for some external modules, but were nece
entities and to review completely the rights of the groups and the users.
* Use getEntity('xxx') instead getEntity('xxx', 1) and use getEntity('xxx', 0) instead getEntity('xxx')
* Some other change were done in the way we read permission of a user when module multicompany is enabled. You can
retreive the old behavior by adding constant MULTICOMPANY_BACKWARD_COMPATIBILITY to 1.
retrieve the old behavior by adding constant MULTICOMPANY_BACKWARD_COMPATIBILITY to 1.
* The hook formObjectOptions was not implemented correctly in previous version. Sometimes, you had to return output
content by doing a print into function, sometimes by returning content into "resprint". This has been fixed to follow
hook specifications so you must return output into "resprint".
@ -6133,7 +6133,7 @@ For users:
- Fix: [Bug #958] LocalTax2 for Spain fails on Suppliers
- Fix: [ bug #972 ] Auto completion contact field do not take account the min caract number before search
- Fix: [ bug #971 ] html.form.class.php select_contact with autocomplete do not exclude id from exclude array
- Fix: Expedition creation, can retreive product from other expedition
- Fix: Expedition creation, can retrieve product from other expedition
For translators:
- Update language files.

2
htdocs/accountancy/journal/bankjournal.php
View File

@ -339,7 +339,7 @@ if ($result) {
$tabpay[$obj->rowid]["soclib"] = $chargestatic->getNomUrl(1, 30);
$tabpay[$obj->rowid]["paymentscid"] = $chargestatic->id;
// Retreive the accounting code of the social contribution of the payment from link of payment.
// Retrieve the accounting code of the social contribution of the payment from link of payment.
// Note: We have the social contribution id, it can be faster to get accounting code from social contribution id.
$sqlmid = 'SELECT cchgsoc.accountancy_code';
$sqlmid .= " FROM ".MAIN_DB_PREFIX."c_chargesociales cchgsoc";

2
htdocs/adherents/class/adherent.class.php
View File

@ -1320,7 +1320,7 @@ class Adherent extends CommonObject
$this->model_pdf = $obj->model_pdf;
// Retreive all extrafield
// Retrieve all extrafield
// fetch optionals attributes and labels
if ($fetch_optionals) {
$this->fetch_optionals();

4
htdocs/admin/company.php
View File

@ -142,7 +142,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
if ($isimage > 0)
{
// Create thumbs
//$object->addThumbs($newfile); // We can't use addThumbs here yet because we need name of generated thumbs to add them into constants. TODO Check if need such constants. We should be able to retreive value with get...
//$object->addThumbs($newfile); // We can't use addThumbs here yet because we need name of generated thumbs to add them into constants. TODO Check if need such constants. We should be able to retrieve value with get...
// Create small thumb, Used on logon for example
$imgThumbSmall = vignette($dirforimage.$original_file, $maxwidthsmall, $maxheightsmall, '_small', $quality);
@ -270,7 +270,7 @@ if ($action == 'addthumb' || $action == 'addthumbsquarred') // Regenerate thumb
$reg = array();
// Create thumbs
//$object->addThumbs($newfile); // We can't use addThumbs here yet because we need name of generated thumbs to add them into constants. TODO Check if need such constants. We should be able to retreive value with get...
//$object->addThumbs($newfile); // We can't use addThumbs here yet because we need name of generated thumbs to add them into constants. TODO Check if need such constants. We should be able to retrieve value with get...
// Create small thumb. Used on logon for example
$imgThumbSmall = vignette($conf->mycompany->dir_output.'/logos/'.$_GET["file"], $maxwidthsmall, $maxheightsmall, '_small', $quality);

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

@ -347,7 +347,7 @@ class Categorie extends CommonObject
$this->user_creation = $res['fk_user_creat'];
$this->user_modification = $res['fk_user_modif'];
// Retreive all extrafield
// Retrieve all extrafield
// fetch optionals attributes and labels
$this->fetch_optionals();

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

@ -626,7 +626,7 @@ class ActionComm extends CommonObject
// Load source object
$objFrom = clone $this;
// Retreive all extrafield
// Retrieve all extrafield
// fetch optionals attributes and labels
$this->fetch_optionals();

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

@ -451,7 +451,7 @@ class AdvanceTargetingMailing extends CommonObject
/**
* Save query in database to retreive it
* Save query in database to retrieve it
*
* @param User $user User that deletes
* @param array $arrayquery All element to Query

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

@ -1562,7 +1562,7 @@ class Propal extends CommonObject
$this->brouillon = 1;
}
// Retreive all extrafield
// Retrieve all extrafield
// fetch optionals attributes and labels
$this->fetch_optionals();

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

@ -1889,7 +1889,7 @@ class Commande extends CommonOrder
if ($this->statut == self::STATUS_DRAFT) $this->brouillon = 1;
// Retreive all extrafield
// Retrieve all extrafield
// fetch optionals attributes and labels
$this->fetch_optionals();

2
htdocs/compta/bank/class/account.class.php
View File

@ -984,7 +984,7 @@ class Account extends CommonObject
$this->date_creation = $this->db->jdate($obj->date_creation);
$this->date_update = $this->db->jdate($obj->date_update);
// Retreive all extrafield
// Retrieve all extrafield
// fetch optionals attributes and labels
$this->fetch_optionals();

4
htdocs/compta/facture/class/facture-rec.class.php
View File

@ -585,7 +585,7 @@ class FactureRec extends CommonInvoice
if ($this->statut == self::STATUS_DRAFT) $this->brouillon = 1;
// Retreive all extrafield
// Retrieve all extrafield
// fetch optionals attributes and labels
$this->fetch_optionals();
@ -635,7 +635,7 @@ class FactureRec extends CommonInvoice
// phpcs:enable
$this->lines = array();
// Retreive all extrafield for line
// Retrieve all extrafield for line
// fetch optionals attributes and labels
if (!is_object($extrafields))
{

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

@ -1026,7 +1026,7 @@ class Facture extends CommonInvoice
// Charge facture source
$facture = new Facture($this->db);
// Retreive all extrafield
// Retrieve all extrafield
// fetch optionals attributes and labels
$this->fetch_optionals();
@ -1625,7 +1625,7 @@ class Facture extends CommonInvoice
if ($this->statut == self::STATUS_DRAFT) $this->brouillon = 1;
// Retreive all extrafield
// Retrieve all extrafield
// fetch optionals attributes and labels
$this->fetch_optionals();

4
htdocs/compta/resultat/index.php
View File

@ -449,7 +449,7 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
} else {
dol_print_error($db);
}
// TVA retreived
// TVA retrieved
$sql = "SELECT sum(t.amount) as amount, date_format(t.datev,'%Y-%m') as dm";
$sql .= " FROM ".MAIN_DB_PREFIX."tva as t";
$sql .= " WHERE amount < 0";
@ -915,7 +915,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
print '</td>';
print '<td class="liste_titre" align="center" class="borderrightlight">';
$htmlhelp = '';
// if ($modecompta == 'RECETTES-DEPENSES') $htmlhelp=$langs->trans("SalesPlusVATToRetreive");
// if ($modecompta == 'RECETTES-DEPENSES') $htmlhelp=$langs->trans("SalesPlusVATToRetrieve");
print $form->textwithpicto($langs->trans("Income"), $htmlhelp);
print '</td>';
}

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

@ -987,7 +987,7 @@ class Contact extends CommonObject
return -1;
}
// Retreive all extrafield
// Retrieve all extrafield
// fetch optionals attributes and labels
$this->fetch_optionals();

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

@ -891,7 +891,7 @@ class Contrat extends CommonObject
$line->date_fin_prevue = $this->db->jdate($objp->date_fin_validite);
$line->date_fin_reel = $this->db->jdate($objp->date_cloture);
// Retreive all extrafields for contract
// Retrieve all extrafields for contract
// fetch optionals attributes and labels
$line->fetch_optionals();

2
htdocs/core/class/commonobject.class.php
View File

@ -7788,7 +7788,7 @@ abstract class CommonObject
{
$this->setVarsFromFetchObj($obj);
// Retreive all extrafield
// Retrieve all extrafield
// fetch optionals attributes and labels
$this->fetch_optionals();

2
htdocs/core/filemanagerdol/browser/default/browser.php
View File

@ -3,7 +3,7 @@
* Copyright (C) 2003-2010 Frederico Caldeira Knabben
*
* Source modified from part of fckeditor (http://www.fckeditor.net)
* retreived as GPL v2 or later
* retrieved as GPL v2 or later
*
* 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

2
htdocs/core/filemanagerdol/browser/default/frmactualfolder.php
View File

@ -3,7 +3,7 @@
* Copyright (C) 2003-2010 Frederico Caldeira Knabben
*
* Source modified from part of fckeditor (http://www.fckeditor.net)
* retreived as GPL v2 or later
* retrieved as GPL v2 or later
*
* 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

2
htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php
View File

@ -3,7 +3,7 @@
* Copyright (C) 2003-2010 Frederico Caldeira Knabben
*
* Source modified from part of fckeditor (http://www.fckeditor.net)
* retreived as GPL v2 or later
* retrieved as GPL v2 or later
*
* 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

2
htdocs/core/filemanagerdol/browser/default/frmfolders.php
View File

@ -3,7 +3,7 @@
* Copyright (C) 2003-2010 Frederico Caldeira Knabben
*
* Source modified from part of fckeditor (http://www.fckeditor.net)
* retreived as GPL v2 or later
* retrieved as GPL v2 or later
*
* 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

2
htdocs/core/filemanagerdol/browser/default/frmresourceslist.php
View File

@ -3,7 +3,7 @@
* Copyright (C) 2003-2010 Frederico Caldeira Knabben
*
* Source modified from part of fckeditor (http://www.fckeditor.net)
* retreived as GPL v2 or later
* retrieved as GPL v2 or later
*
* 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

2
htdocs/core/filemanagerdol/browser/default/frmupload.php
View File

@ -3,7 +3,7 @@
* Copyright (C) 2003-2010 Frederico Caldeira Knabben
*
* Source modified from part of fckeditor (http://www.fckeditor.net)
* retreived as GPL v2 or later
* retrieved as GPL v2 or later
*
* 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

2
htdocs/core/js/lib_notification.js.php
View File

@ -80,7 +80,7 @@ if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/' || $_SERVER['HTTP
//console.log(result);
var arrayofpastreminders = Object.values(result.pastreminders);
if (arrayofpastreminders && arrayofpastreminders.length > 0) {
console.log("Retreived "+arrayofpastreminders.length+" reminders to do.");
console.log("Retrieved "+arrayofpastreminders.length+" reminders to do.");
var audio = null;
<?php
if (!empty($conf->global->AGENDA_REMINDER_BROWSER_SOUND)) {

4
htdocs/core/lib/functions.lib.php
View File

@ -361,7 +361,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
{
$out = $_SESSION['lastsearch_limit_'.$relativepathstring];
}
} // Else, retreive default values if we are not doing a sort
} // Else, retrieve default values if we are not doing a sort
elseif (!isset($_GET['sortfield'])) // If we did a click on a field to sort, we do no apply default values. Same if option MAIN_ENABLE_DEFAULT_VALUES is not set
{
if (!empty($_GET['action']) && $_GET['action'] == 'create' && !isset($_GET[$paramname]) && !isset($_POST[$paramname]))
@ -735,7 +735,7 @@ if (!function_exists('dol_getprefix'))
*/
function dol_include_once($relpath, $classname = '')
{
global $conf, $langs, $user, $mysoc; // Do not remove this. They must be defined for files we include. Other globals var must be retreived with $GLOBALS['var']
global $conf, $langs, $user, $mysoc; // Do not remove this. They must be defined for files we include. Other globals var must be retrieved with $GLOBALS['var']
$fullpath = dol_buildpath($relpath);

2
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
View File

@ -378,7 +378,7 @@ class pdf_crabe extends ModelePDFFactures
$this->atleastonediscount++;
}
}
if (empty($this->atleastonediscount)) // retreive space not used by discount
if (empty($this->atleastonediscount)) // retrieve space not used by discount
{
$delta = ($this->posxprogress - $this->posxdiscount);
$this->posxpicture += $delta;

2
htdocs/don/class/don.class.php
View File

@ -689,7 +689,7 @@ class Don extends CommonObject
$this->model_pdf = $obj->model_pdf;
$this->modelpdf = $obj->model_pdf; // deprecated
// Retreive all extrafield
// Retrieve all extrafield
// fetch optionals attributes and labels
$this->fetch_optionals();
}

2
htdocs/expedition/class/expedition.class.php
View File

@ -624,7 +624,7 @@ class Expedition extends CommonObject
*/
$result = $this->fetch_thirdparty();
// Retreive extrafields
// Retrieve extrafields
$this->fetch_optionals();
// Fix Get multicurrency param for transmited

4
htdocs/fourn/class/fournisseur.commande.class.php
View File

@ -407,7 +407,7 @@ class CommandeFournisseur extends CommonOrder
$this->db->free($resql);
// Retreive all extrafield
// Retrieve all extrafield
// fetch optionals attributes and labels
$this->fetch_optionals();
@ -530,7 +530,7 @@ class CommandeFournisseur extends CommonOrder
$line->rang = $objp->rang;
// Retreive all extrafield
// Retrieve all extrafield
// fetch optionals attributes and labels
$line->fetch_optionals();

2
htdocs/fourn/class/fournisseur.facture.class.php
View File

@ -732,7 +732,7 @@ class FactureFournisseur extends CommonInvoice
$this->socid = $obj->socid;
$this->socnom = $obj->socnom;
// Retreive all extrafield
// Retrieve all extrafield
// fetch optionals attributes and labels
$this->fetch_optionals();

2
htdocs/fourn/class/fournisseur.product.class.php
View File

@ -285,7 +285,7 @@ class ProductFournisseur extends Product
$localtax1 = $localtaxes_array['1'];
$localtaxtype2 = $localtaxes_array['2'];
$localtax2 = $localtaxes_array['3'];
} else // old method. deprecated because ot can't retreive type
} else // old method. deprecated because ot can't retrieve type
{
$localtaxtype1 = '0';
$localtax1 = get_localtax($newvat, 1);

2
htdocs/livraison/class/livraison.class.php
View File

@ -332,7 +332,7 @@ class Livraison extends CommonObject
if ($this->statut == 0) $this->brouillon = 1;
// Retreive all extrafields
// Retrieve all extrafields
// fetch optionals attributes and labels
$this->fetch_optionals();

4
htdocs/main.inc.php
View File

@ -656,7 +656,7 @@ if (!defined('NOLOGIN'))
exit;
}
$resultFetchUser = $user->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1)); // login was retreived previously when checking password.
$resultFetchUser = $user->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1)); // login was retrieved previously when checking password.
if ($resultFetchUser <= 0)
{
dol_syslog('User not found, connexion refused');
@ -1122,7 +1122,7 @@ if (!function_exists("llxHeader"))
if (empty($conf->dol_hide_leftmenu))
{
left_menu('', $help_url, '', '', 1, $title, 1); // $menumanager is retreived with a global $menumanager inside this function
left_menu('', $help_url, '', '', 1, $title, 1); // $menumanager is retrieved with a global $menumanager inside this function
}
// main area

4
htdocs/product/class/product.class.php
View File

@ -1903,7 +1903,7 @@ class Product extends CommonObject
$localtax1 = $localtaxes_array['1'];
$localtaxtype2 = $localtaxes_array['2'];
$localtax2 = $localtaxes_array['3'];
} else // old method. deprecated because ot can't retreive type
} else // old method. deprecated because ot can't retrieve type
{
$localtaxtype1 = '0';
$localtax1 = get_localtax($newvat, 1);
@ -2145,7 +2145,7 @@ class Product extends CommonObject
$this->db->free($resql);
// Retreive all extrafield
// Retrieve all extrafield
// fetch optionals attributes and labels
$this->fetch_optionals();

2
htdocs/product/price.php
View File

@ -162,7 +162,7 @@ if (empty($reshook))
if ($error)
{
//$localtaxarray=array('0'=>$localtax1_type,'1'=>$localtax1,'2'=>$localtax2_type,'3'=>$localtax2);
$localtaxarray = array(); // We do not store localtaxes into product, we will use instead the "vat code" to retreive them.
$localtaxarray = array(); // We do not store localtaxes into product, we will use instead the "vat code" to retrieve them.
$object->updatePrice(0, $object->price_base_type, $user, $tva_tx, '', 0, $npr, 0, 0, $localtaxarray, $vatratecode);
}

2
htdocs/product/stock/class/entrepot.class.php
View File

@ -488,7 +488,7 @@ class Entrepot extends CommonObject
$this->model_pdf = $obj->model_pdf;
$this->import_key = $obj->import_key;
// Retreive all extrafield
// Retrieve all extrafield
// fetch optionals attributes and labels
$this->fetch_optionals();

2
htdocs/product/stock/class/mouvementstock.class.php
View File

@ -662,7 +662,7 @@ class MouvementStock extends CommonObject
$this->fk_project = $obj->fk_project;
}
// Retreive all extrafield
// Retrieve all extrafield
// fetch optionals attributes and labels
$this->fetch_optionals();

2
htdocs/product/stock/class/productlot.class.php
View File

@ -300,7 +300,7 @@ class Productlot extends CommonObject
$this->fk_user_modif = $obj->fk_user_modif;
$this->import_key = $obj->import_key;
// Retreive all extrafield
// Retrieve all extrafield
// fetch optionals attributes and labels
$this->fetch_optionals();
}

2
htdocs/product/stock/class/productstockentrepot.class.php
View File

@ -202,7 +202,7 @@ class ProductStockEntrepot extends CommonObject
$this->import_key = $obj->import_key;
}
// Retreive all extrafield
// Retrieve all extrafield
// fetch optionals attributes and labels
$this->fetch_optionals();

2
htdocs/projet/class/project.class.php
View File

@ -586,7 +586,7 @@ class Project extends CommonObject
$this->db->free($resql);
// Retreive all extrafield
// Retrieve all extrafield
// fetch optionals attributes and labels
$this->fetch_optionals();

4
htdocs/projet/class/task.class.php
View File

@ -317,7 +317,7 @@ class Task extends CommonObject
$this->task_parent_position = $obj->task_parent_position;
}
// Retreive all extrafield
// Retrieve all extrafield
$this->fetch_optionals();
}
@ -1702,7 +1702,7 @@ class Task extends CommonObject
{
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
//retreive project origin ref to know folder to copy
//retrieve project origin ref to know folder to copy
$projectstatic = new Project($this->db);
$projectstatic->fetch($ori_project_id);
$ori_project_ref = $projectstatic->ref;

2
htdocs/projet/tasks/comment.php
View File

@ -65,7 +65,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
// include comment actions
include DOL_DOCUMENT_ROOT.'/core/actions_comments.inc.php';
// Retreive First Task ID of Project if withprojet is on to allow project prev next to work
// Retrieve First Task ID of Project if withprojet is on to allow project prev next to work
if (!empty($project_ref) && !empty($withproject))
{
if ($projectstatic->fetch('', $project_ref) > 0)

2
htdocs/projet/tasks/contact.php
View File

@ -121,7 +121,7 @@ if ($action == 'deleteline' && $user->rights->projet->creer)
}
}
// Retreive First Task ID of Project if withprojet is on to allow project prev next to work
// Retrieve First Task ID of Project if withprojet is on to allow project prev next to work
if (!empty($project_ref) && !empty($withproject))
{
if ($projectstatic->fetch(0, $project_ref) > 0)

2
htdocs/projet/tasks/document.php
View File

@ -69,7 +69,7 @@ $projectstatic = new Project($db);
* Actions
*/
// Retreive First Task ID of Project if withprojet is on to allow project prev next to work
// Retrieve First Task ID of Project if withprojet is on to allow project prev next to work
if (!empty($project_ref) && !empty($withproject))
{
if ($projectstatic->fetch(0, $project_ref) > 0)

2
htdocs/projet/tasks/note.php
View File

@ -63,7 +63,7 @@ if ($id > 0 || !empty($ref))
}
// Retreive First Task ID of Project if withprojet is on to allow project prev next to work
// Retrieve First Task ID of Project if withprojet is on to allow project prev next to work
if (!empty($project_ref) && !empty($withproject))
{
if ($projectstatic->fetch(0, $project_ref) > 0)

2
htdocs/projet/tasks/task.php
View File

@ -136,7 +136,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->s
}
}
// Retreive First Task ID of Project if withprojet is on to allow project prev next to work
// Retrieve First Task ID of Project if withprojet is on to allow project prev next to work
if (!empty($project_ref) && !empty($withproject))
{
if ($projectstatic->fetch('', $project_ref) > 0)

2
htdocs/projet/tasks/time.php
View File

@ -293,7 +293,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->l
}
}
// Retreive First Task ID of Project if withprojet is on to allow project prev next to work
// Retrieve First Task ID of Project if withprojet is on to allow project prev next to work
if (!empty($project_ref) && !empty($withproject))
{
if ($projectstatic->fetch(0, $project_ref) > 0)

2
htdocs/public/members/public_card.php
View File

@ -32,7 +32,7 @@ if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
// For MultiCompany module.
// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
// TODO This should be useless. Because entity must be retreive from object ref and not from url.
// TODO This should be useless. Because entity must be retrieve from object ref and not from url.
$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
if (is_numeric($entity)) define("DOLENTITY", $entity);

2
htdocs/public/members/public_list.php
View File

@ -31,7 +31,7 @@ if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
// For MultiCompany module.
// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
// TODO This should be useless. Because entity must be retreive from object ref and not from url.
// TODO This should be useless. Because entity must be retrieve from object ref and not from url.
$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
if (is_numeric($entity)) define("DOLENTITY", $entity);

2
htdocs/public/onlinesign/newonlinesign.php
View File

@ -30,7 +30,7 @@ if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
// For MultiCompany module.
// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
// TODO This should be useless. Because entity must be retreive from object ref and not from url.
// TODO This should be useless. Because entity must be retrieve from object ref and not from url.
$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
if (is_numeric($entity)) define("DOLENTITY", $entity);

4
htdocs/public/payment/newpayment.php
View File

@ -649,7 +649,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled))
} catch (Exception $e)
{
$error++;
$errormessage = "CantRetreivePaymentIntent ".$e->getMessage();
$errormessage = "CantRetrievePaymentIntent ".$e->getMessage();
dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
setEventMessages($e->getMessage(), null, 'errors');
$action = '';
@ -658,7 +658,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled))
if ($paymentintent->status != 'succeeded')
{
$error++;
$errormessage = "StatusOfRetreivedIntent is not succeeded: ".$paymentintent->status;
$errormessage = "StatusOfRetrievedIntent is not succeeded: ".$paymentintent->status;
dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
setEventMessages($paymentintent->status, null, 'errors');
$action = '';

2
htdocs/public/payment/paymentko.php
View File

@ -32,7 +32,7 @@ if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
// For MultiCompany module.
// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
// TODO This should be useless. Because entity must be retreive from object ref and not from url.
// TODO This should be useless. Because entity must be retrieve from object ref and not from url.
$entity = (!empty($_GET['e']) ? (int) $_GET['e'] : (!empty($_POST['e']) ? (int) $_POST['e'] : 1));
if (is_numeric($entity)) define("DOLENTITY", $entity);

2
htdocs/public/payment/paymentok.php
View File

@ -32,7 +32,7 @@ if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
// For MultiCompany module.
// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
// TODO This should be useless. Because entity must be retreive from object ref and not from url.
// TODO This should be useless. Because entity must be retrieve from object ref and not from url.
$entity = (!empty($_GET['e']) ? (int) $_GET['e'] : (!empty($_POST['e']) ? (int) $_POST['e'] : 1));
if (is_numeric($entity)) define("DOLENTITY", $entity);

2
htdocs/public/ticket/index.php
View File

@ -30,7 +30,7 @@ if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
// For MultiCompany module.
// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
// TODO This should be useless. Because entity must be retreive from object ref and not from url.
// TODO This should be useless. Because entity must be retrieve from object ref and not from url.
$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
if (is_numeric($entity)) define("DOLENTITY", $entity);

2
htdocs/resource/class/dolresource.class.php
View File

@ -210,7 +210,7 @@ class Dolresource extends CommonObject
$this->note_private = $obj->note_private;
$this->type_label = $obj->type_label;
// Retreive all extrafield
// Retrieve all extrafield
// fetch optionals attributes and labels
$this->fetch_optionals();
}

2
htdocs/salaries/class/paymentsalary.class.php
View File

@ -254,7 +254,7 @@ class PaymentSalary extends CommonObject
$this->fk_type = $obj->fk_type;
$this->rappro = $obj->rappro;
// Retreive all extrafield
// Retrieve all extrafield
// fetch optionals attributes and labels
$this->fetch_optionals();
}

8
htdocs/stripe/class/stripe.class.php
View File

@ -299,7 +299,7 @@ class Stripe extends CommonObject
* Warning. If a payment was tried and failed, a payment intent was created.
* But if we change something on object to pay (amount or other), reusing same payment intent is not allowed by Stripe.
* Recommended solution is to recreate a new payment intent each time we need one (old one will be automatically closed after a delay),
* that's why i comment the part of code to retreive a payment intent with object id (never mind if we cumulate payment intent with old ones that will not be used)
* that's why i comment the part of code to retrieve a payment intent with object id (never mind if we cumulate payment intent with old ones that will not be used)
* Note: This is used when option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION is on when making a payment from the public/payment/newpayment.php page
* but not when using the STRIPE_USE_NEW_CHECKOUT.
*
@ -354,7 +354,7 @@ class Stripe extends CommonObject
// But if we change something on object to pay (amount or other that does not change the idempotency key), reusing same payment intent is not allowed by Stripe.
// Recommended solution is to recreate a new payment intent each time we need one (old one will be automatically closed by Stripe after a delay), Stripe will
// automatically return the existing payment intent if idempotency is provided when we try to create the new one.
// That's why we can comment the part of code to retreive a payment intent with object id (never mind if we cumulate payment intent with old ones that will not be used)
// That's why we can comment the part of code to retrieve a payment intent with object id (never mind if we cumulate payment intent with old ones that will not be used)
$sql = "SELECT pi.ext_payment_id, pi.entity, pi.fk_facture, pi.sourcetype, pi.ext_payment_site";
$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pi";
@ -536,7 +536,7 @@ class Stripe extends CommonObject
* Warning. If a payment was tried and failed, a payment intent was created.
* But if we change something on object to pay (amount or other), reusing same payment intent is not allowed.
* Recommanded solution is to recreate a new payment intent each time we need one (old one will be automatically closed after a delay),
* that's why i comment the part of code to retreive a payment intent with object id (never mind if we cumulate payment intent with old ones that will not be used)
* that's why i comment the part of code to retrieve a payment intent with object id (never mind if we cumulate payment intent with old ones that will not be used)
* Note: This is used when option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION is on when making a payment from the public/payment/newpayment.php page
* but not when using the STRIPE_USE_NEW_CHECKOUT.
*
@ -1034,7 +1034,7 @@ class Stripe extends CommonObject
if (preg_match('/pm_/i', $source))
{
$return->message = 'Payment retreived by card status = '.$charge->status;
$return->message = 'Payment retrieved by card status = '.$charge->status;
} else {
if ($charge->source->type == 'card') {
$return->message = $charge->source->card->brand." ....".$charge->source->card->last4;

4
htdocs/supplier_proposal/class/supplier_proposal.class.php
View File

@ -1289,7 +1289,7 @@ class SupplierProposal extends CommonObject
$this->brouillon = 1;
}
// Retreive all extrafield
// Retrieve all extrafield
// fetch optionals attributes and labels
$this->fetch_optionals();
@ -1379,7 +1379,7 @@ class SupplierProposal extends CommonObject
return -1;
}
// Retreive all extrafield
// Retrieve all extrafield
// fetch optionals attributes and labels
$this->fetch_optionals();

2
htdocs/user/class/user.class.php
View File

@ -401,7 +401,7 @@ class User extends CommonObject
// in such case, this admin user must be admin for ALL entities.
if (empty($conf->multicompany->enabled) && $this->admin && $this->entity == 1) $this->entity = 0;
// Retreive all extrafield
// Retrieve all extrafield
// fetch optionals attributes and labels
$this->fetch_optionals();

8
htdocs/webservices/server_actioncomm.php
View File

@ -114,7 +114,7 @@ $actioncomm_fields = array(
$elementtype = 'actioncomm';
//Retreive all extrafield for actioncomm
//Retrieve all extrafield for actioncomm
// fetch optionals attributes and labels
$extrafields = new ExtraFields($db);
$extrafields->fetch_name_optionals_label($elementtype, true);
@ -308,7 +308,7 @@ function getActionComm($authentication, $id)
$elementtype = 'actioncomm';
// Retreive all extrafield for actioncomm
// Retrieve all extrafield for actioncomm
// fetch optionals attributes and labels
$extrafields = new ExtraFields($db);
$extrafields->fetch_name_optionals_label($elementtype, true);
@ -450,7 +450,7 @@ function createActionComm($authentication, $actioncomm)
$elementtype = 'actioncomm';
//Retreive all extrafield for actioncomm
//Retrieve all extrafield for actioncomm
// fetch optionals attributes and labels
$extrafields = new ExtraFields($db);
$extrafields->fetch_name_optionals_label($elementtype, true);
@ -547,7 +547,7 @@ function updateActionComm($authentication, $actioncomm)
$elementtype = 'actioncomm';
//Retreive all extrafield for actioncomm
//Retrieve all extrafield for actioncomm
// fetch optionals attributes and labels
$extrafields = new ExtraFields($db);
$extrafields->fetch_name_optionals_label($elementtype, true);

8
htdocs/webservices/server_contact.php
View File

@ -119,7 +119,7 @@ $contact_fields = array(
$elementtype = 'socpeople';
//Retreive all extrafield for contact
//Retrieve all extrafield for contact
// fetch optionals attributes and labels
$extrafields = new ExtraFields($db);
$extrafields->fetch_name_optionals_label($elementtype, true);
@ -312,7 +312,7 @@ function getContact($authentication, $id, $ref_ext)
$elementtype = 'socpeople';
//Retreive all extrafield for thirdsparty
//Retrieve all extrafield for thirdsparty
// fetch optionals attributes and labels
$extrafields = new ExtraFields($db);
$extrafields->fetch_name_optionals_label($elementtype, true);
@ -420,7 +420,7 @@ function createContact($authentication, $contact)
$elementtype = 'socpeople';
//Retreive all extrafield for thirdsparty
//Retrieve all extrafield for thirdsparty
// fetch optionals attributes and labels
$extrafields = new ExtraFields($db);
$extrafields->fetch_name_optionals_label($elementtype, true);
@ -667,7 +667,7 @@ function updateContact($authentication, $contact)
$elementtype = 'socpeople';
//Retreive all extrafield for contact
//Retrieve all extrafield for contact
// fetch optionals attributes and labels
$extrafields = new ExtraFields($db);
$extrafields->fetch_name_optionals_label($elementtype, true);

6
htdocs/webservices/server_order.php
View File

@ -112,7 +112,7 @@ $line_fields = array(
$elementtype = 'commandedet';
//Retreive all extrafield for thirdsparty
//Retrieve all extrafield for thirdsparty
// fetch optionals attributes and labels
$extrafields = new ExtraFields($db);
$extrafields->fetch_name_optionals_label($elementtype, true);
@ -216,7 +216,7 @@ $order_fields = array(
$elementtype = 'commande';
//Retreive all extrafield for thirdsparty
//Retrieve all extrafield for thirdsparty
// fetch optionals attributes and labels
$extrafields = new ExtraFields($db);
$extrafields->fetch_name_optionals_label($elementtype, true);
@ -944,7 +944,7 @@ function updateOrder($authentication, $order)
$elementtype = 'commande';
//Retreive all extrafield for object
//Retrieve all extrafield for object
// fetch optionals attributes and labels
$extrafields = new ExtraFields($db);
$extrafields->fetch_name_optionals_label($elementtype, true);

6
htdocs/webservices/server_productorservice.php
View File

@ -134,7 +134,7 @@ $productorservice_fields = array(
$elementtype = 'product';
//Retreive all extrafield for product
//Retrieve all extrafield for product
// fetch optionals attributes and labels
$extrafields = new ExtraFields($db);
$extrafields->fetch_name_optionals_label($elementtype, true);
@ -429,7 +429,7 @@ function getProductOrService($authentication, $id = '', $ref = '', $ref_ext = ''
$elementtype = 'product';
//Retreive all extrafield for thirdsparty
//Retrieve all extrafield for thirdsparty
// fetch optionals attributes and labels
$extrafields = new ExtraFields($db);
$extrafields->fetch_name_optionals_label($elementtype, true);
@ -1098,7 +1098,7 @@ function getProductsForCategory($authentication, $id, $lang = '')
$elementtype = 'product';
//Retreive all extrafield for thirdsparty
//Retrieve all extrafield for thirdsparty
// fetch optionals attributes and labels
$extrafields = new ExtraFields($db);
$extrafields->fetch_name_optionals_label($elementtype, true);

2
htdocs/webservices/server_project.php
View File

@ -161,7 +161,7 @@ $project_fields = array(
$elementtype = 'project';
//Retreive all extrafield for thirdsparty
//Retrieve all extrafield for thirdsparty
// fetch optionals attributes and labels
$extrafields = new ExtraFields($db);
$extrafields->fetch_name_optionals_label($elementtype, true);

4
htdocs/webservices/server_user.php
View File

@ -185,7 +185,7 @@ $thirdpartywithuser_fields = array(
$elementtype = 'socpeople';
//Retreive all extrafield for contact
//Retrieve all extrafield for contact
// fetch optionals attributes and labels
$extrafields = new ExtraFields($db);
$extrafields->fetch_name_optionals_label($elementtype, true);
@ -595,7 +595,7 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser)
$elementtype = 'socpeople';
//Retreive all extrafield for thirdsparty
//Retrieve all extrafield for thirdsparty
// fetch optionals attributes and labels
$extrafields = new ExtraFields($db);
$extrafields->fetch_name_optionals_label($elementtype, true);