diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 68851629917..0498c8d06bc 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -302,7 +302,7 @@ if (empty($reshook)) {
$object->size_units = GETPOST('size_units', 'int');
$object->weight_units = GETPOST('weight_units', 'int');
- // On va boucler sur chaque ligne du document d'origine pour completer objet reception
+ // On va boucler sur chaque ligne du document d'origine pour completer object reception
// avec info diverses + qte a livrer
if ($object->origin == "supplierorder") {
@@ -316,7 +316,7 @@ if (empty($reshook)) {
$object->socid = $objectsrc->socid;
$object->ref_supplier = GETPOST('ref_supplier', 'alpha');
$object->model_pdf = GETPOST('model');
- $object->date_delivery = $date_delivery; // Date delivery planed
+ $object->date_delivery = $date_delivery; // Date delivery planned
$object->fk_delivery_address = $objectsrc->fk_delivery_address;
$object->shipping_method_id = GETPOST('shipping_method_id', 'int');
$object->tracking_number = GETPOST('tracking_number', 'alpha');
@@ -1008,7 +1008,7 @@ if ($action == 'create') {
$dispatchLines[$numAsked] = array('paramSuffix'=>$paramSuffix, 'prod' => GETPOST($prod, 'int'), 'qty' => price2num(GETPOST($qty), 'MS'), 'ent' => GETPOST($ent, 'int'), 'pu' => price2num(GETPOST($pu), 'MU'), 'comment' => GETPOST('comment'), 'fk_commandefourndet' => GETPOST($fk_commandefourndet, 'int'), 'DLC'=> $dDLC, 'DLUO'=> $dDLUO, 'lot'=> GETPOST($lot, 'alpha'));
}
- // If create form is coming from same page, it means that post was sent but an error occured
+ // If create form is coming from same page, it means that post was sent but an error occurred
if (preg_match('/^productl([0-9]+)$/i', $key, $reg)) {
$numAsked++;
$paramSuffix = $reg[1];
@@ -1101,7 +1101,7 @@ if ($action == 'create') {
$arrayofpurchaselinealreadyoutput= array();
- // $_POST contains fk_commandefourndet_X_Y where Y is num of product line and X is number of splitted line
+ // $_POST contains fk_commandefourndet_X_Y where Y is num of product line and X is number of split lines
$indiceAsked = 1;
while ($indiceAsked <= $numAsked) { // Loop on $dispatchLines. Warning: $dispatchLines must be sorted by fk_commandefourndet (it is a regroupment key on output)
$product = new Product($db);
@@ -1366,7 +1366,7 @@ if ($action == 'create') {
$formconfirm = '';
- // Confirm deleteion
+ // Confirm deletion
if ($action == 'delete') {
$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('DeleteReception'), $langs->trans("ConfirmDeleteReception", $object->ref), 'confirm_delete', '', 0, 1);
}
@@ -1397,7 +1397,7 @@ if ($action == 'create') {
$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('ValidateReception'), $text, 'confirm_valid', '', 0, 1, 250);
}
- // Confirm cancelation
+ // Confirm cancellation
if ($action == 'annuler') {
$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('CancelReception'), $langs->trans("ConfirmCancelReception", $object->ref), 'confirm_cancel', '', 0, 1);
}
@@ -1970,7 +1970,7 @@ if ($action == 'create') {
print '
';
- // Batch number managment
+ // Batch number management
if ($conf->productbatch->enabled && !empty($lines[$i]->product->status_batch)) {
print '
';
if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
@@ -1991,7 +1991,7 @@ if ($action == 'create') {
print '
';
// Warehouse source
print '
';
- // Batch number managment
+ // Batch number management
print '
';
print '';
}
@@ -2015,7 +2015,7 @@ if ($action == 'create') {
}
}
- // Batch number managment
+ // Batch number management
if (isModEnabled('productbatch')) {
if (isset($lines[$i]->batch)) {
print '';
diff --git a/htdocs/reception/class/api_receptions.class.php b/htdocs/reception/class/api_receptions.class.php
index 976f3f396ec..6255b18d722 100644
--- a/htdocs/reception/class/api_receptions.class.php
+++ b/htdocs/reception/class/api_receptions.class.php
@@ -55,7 +55,7 @@ class Receptions extends DolibarrApi
/**
* Get properties of a reception object
*
- * Return an array with reception informations
+ * Return an array with reception information
*
* @param int $id ID of reception
* @return Object Object with cleaned properties
@@ -93,7 +93,7 @@ class Receptions extends DolibarrApi
* @param int $page Page number
* @param string $thirdparty_ids Thirdparty ids to filter receptions 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 reception objects
*
* @throws RestException
@@ -187,7 +187,7 @@ class Receptions 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->reception->context['caller'] = $request_data['caller'];
continue;
}
@@ -442,7 +442,7 @@ class Receptions 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->reception->context['caller'] = $request_data['caller'];
continue;
}
diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index dab334d6042..5feba5547db 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -30,7 +30,7 @@
/**
* \file htdocs/reception/class/reception.class.php
* \ingroup reception
- * \brief Fichier de la classe de gestion des receptions
+ * \brief File for class to manage receptions
*/
require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
@@ -97,7 +97,7 @@ class Reception extends CommonObject
public $size_units;
public $user_author_id;
- public $date_delivery; // Date delivery planed
+ public $date_delivery; // Date delivery planned
/**
* @var integer|string Effective delivery date
@@ -207,7 +207,7 @@ class Reception extends CommonObject
/**
* Create reception en base
*
- * @param User $user Objet du user qui cree
+ * @param User $user Object du user qui cree
* @param int $notrigger 1=Does not execute triggers, 0= execute triggers
* @return int Return integer <0 si erreur, id reception creee si ok
*/
@@ -414,7 +414,7 @@ class Reception extends CommonObject
$this->date_creation = $this->db->jdate($obj->date_creation);
$this->date = $this->db->jdate($obj->date_reception); // TODO deprecated
$this->date_reception = $this->db->jdate($obj->date_reception); // Date real
- $this->date_delivery = $this->db->jdate($obj->date_delivery); // Date planed
+ $this->date_delivery = $this->db->jdate($obj->date_delivery); // Date planned
$this->model_pdf = $obj->model_pdf;
$this->shipping_method_id = $obj->fk_shipping_method;
$this->tracking_number = $obj->tracking_number;
@@ -546,7 +546,7 @@ class Reception extends CommonObject
$error++;
}
- // If stock increment is done on reception (recommanded choice)
+ // If stock increment is done on reception (recommended choice)
if (!$error && isModEnabled('stock') && getDolGlobalInt('STOCK_CALCULATE_ON_RECEPTION')) {
require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
@@ -1416,7 +1416,7 @@ class Reception extends CommonObject
$order = new CommandeFournisseur($this->db);
$order->initAsSpecimen();
- // Initialise parametres
+ // Initialise parameters
$this->id = 0;
$this->ref = 'SPECIMEN';
$this->specimen = 1;
@@ -1457,7 +1457,7 @@ class Reception extends CommonObject
/**
* Set the planned delivery date
*
- * @param User $user Objet utilisateur qui modifie
+ * @param User $user Object utilisateur qui modifie
* @param integer $delivery_date Delivery date
* @return int Return integer <0 if KO, >0 if OK
*/
@@ -1718,7 +1718,7 @@ class Reception extends CommonObject
}
/**
- * Classify the reception as invoiced (used for exemple by trigger when WORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE is on)
+ * Classify the reception as invoiced (used for example by trigger when WORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE is on)
*
* @return int Return integer <0 if ko, >0 if ok
*/
diff --git a/htdocs/reception/class/receptionstats.class.php b/htdocs/reception/class/receptionstats.class.php
index b56211933dd..bc1cc4fb1ab 100644
--- a/htdocs/reception/class/receptionstats.class.php
+++ b/htdocs/reception/class/receptionstats.class.php
@@ -21,7 +21,7 @@
/**
* \file htdocs/reception/class/receptionstats.class.php
* \ingroup reception
- * \brief File of class fo tmanage reception statistics
+ * \brief File of class to manage reception statistics
*/
include_once DOL_DOCUMENT_ROOT.'/core/class/stats.class.php';
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index 06a0d69ff82..ef28514f1fd 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -243,7 +243,7 @@ if (empty($reshook)) {
$objecttmp = new FactureFournisseur($db);
if (!empty($createbills_onebythird) && !empty($TFactThird[$rcp->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[$rcp->socid];
// Add all links of this new reception to the existing invoice
@@ -251,7 +251,7 @@ if (empty($reshook)) {
$rcp->fetchObjectLinked();
if (count($rcp->linkedObjectsIds['order_supplier']) > 0) {
foreach ($rcp->linkedObjectsIds['order_supplier'] as $key => $value) {
- if (empty($objecttmp->linkedObjectsIds['order_supplier']) || !in_array($value, $objecttmp->linkedObjectsIds['order_supplier'])) { //Dont try to link if already linked
+ if (empty($objecttmp->linkedObjectsIds['order_supplier']) || !in_array($value, $objecttmp->linkedObjectsIds['order_supplier'])) { //Don't try to link if already linked
$objecttmp->add_object_linked('order_supplier', $value); // add supplier order linked object
}
}
@@ -1311,7 +1311,7 @@ while ($i < $imaxinloop) {
}
}
- // Date delivery planed
+ // Date delivery planned
if (!empty($arrayfields['e.date_delivery']['checked'])) {
print '
';
print dol_print_date($db->jdate($obj->delivery_date), "day");
diff --git a/htdocs/recruitment/class/api_recruitments.class.php b/htdocs/recruitment/class/api_recruitments.class.php
index b68fe8602db..88c7c54488e 100644
--- a/htdocs/recruitment/class/api_recruitments.class.php
+++ b/htdocs/recruitment/class/api_recruitments.class.php
@@ -64,7 +64,7 @@ class Recruitments extends DolibarrApi
/**
* Get properties of a jobposition object
*
- * Return an array with jobposition informations
+ * Return an array with jobposition information
*
* @param int $id ID of jobposition
* @return Object Object with cleaned properties
@@ -95,7 +95,7 @@ class Recruitments extends DolibarrApi
/**
* Get properties of a candidature object
*
- * Return an array with candidature informations
+ * Return an array with candidature information
*
* @param int $id ID of candidature
* @return Object Object with cleaned properties
@@ -134,7 +134,7 @@ class Recruitments 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
@@ -328,7 +328,7 @@ class Recruitments 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->jobposition->context['caller'] = $request_data['caller'];
continue;
}
@@ -366,7 +366,7 @@ class Recruitments 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->jobposition->context['caller'] = $request_data['caller'];
continue;
}
@@ -414,7 +414,7 @@ class Recruitments 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->jobposition->context['caller'] = $request_data['caller'];
continue;
}
@@ -463,7 +463,7 @@ class Recruitments 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->candidature->context['caller'] = $request_data['caller'];
continue;
}
diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index 5505f6682d1..5de6f1487ae 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -89,7 +89,7 @@ class RecruitmentCandidature 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' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
@@ -492,7 +492,7 @@ class RecruitmentCandidature extends CommonObject
// Protection
if ($this->status == self::STATUS_VALIDATED) {
- dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
+ dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
return 0;
}
@@ -705,7 +705,7 @@ class RecruitmentCandidature 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', ...)
@@ -995,7 +995,7 @@ class RecruitmentCandidature extends CommonObject
* 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
diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index dba9c86ef5f..a5f0d3bd8df 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -95,7 +95,7 @@ class RecruitmentJobPosition 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' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
@@ -507,7 +507,7 @@ class RecruitmentJobPosition extends CommonObject
// Protection
if ($this->status == self::STATUS_VALIDATED) {
- dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
+ dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
return 0;
}
@@ -783,7 +783,7 @@ class RecruitmentJobPosition 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', ...)
@@ -1052,7 +1052,7 @@ class RecruitmentJobPosition extends CommonObject
* 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
diff --git a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
index 133720a1b8c..3a1e94ca061 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
@@ -318,7 +318,7 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
$contactobject = $object->contact;
} else {
$socobject = $object->thirdparty;
- // if we have a CUSTOMER contact and we dont use it as thirdparty recipient we store the contact object for later use
+ // if we have a CUSTOMER contact and we don't use it as thirdparty recipient we store the contact object for later use
$contactobject = $object->contact;
}
} else {
diff --git a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
index 6a7030d5882..dd94bd1a5b3 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
@@ -157,7 +157,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
}
// Define position of columns
- $this->posxdesc = $this->marge_gauche + 1; // used for notes ans other stuff
+ $this->posxdesc = $this->marge_gauche + 1; // used for notes and other stuff
$this->tabTitleHeight = 5; // default height
@@ -620,7 +620,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
$curY = $tab_top_newpage;
}
- $pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+ $pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par default
@@ -1090,18 +1090,18 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
);
/*
- * For exemple
+ * For example
$this->cols['theColKey'] = array(
'rank' => $rank, // int : use for ordering columns
'width' => 20, // the column width in mm
'title' => array(
'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
'label' => ' ', // the final label : used fore final generated text
- 'align' => 'L', // text alignement : R,C,L
+ 'align' => 'L', // text alignment : R,C,L
'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
),
'content' => array(
- 'align' => 'L', // text alignement : R,C,L
+ 'align' => 'L', // text alignment : R,C,L
'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
),
);
@@ -1114,7 +1114,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
'width' => false, // only for desc
'status' => true,
'title' => array(
- 'textkey' => 'Designation', // use lang key is usefull in somme case with module
+ 'textkey' => 'Designation', // use lang key is useful in somme case with module
'align' => 'L',
// 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
// 'label' => ' ', // the final label
diff --git a/htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php b/htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php
index bb6e9fbc2fe..a269bc61683 100644
--- a/htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php
+++ b/htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php
@@ -113,7 +113,7 @@ function recruitmentjobpositionPrepareHead($object)
/**
* Return string with full Url
*
- * @param int $mode 0=True url, 1=Url formated with colors
+ * @param int $mode 0=True url, 1=Url formatted with colors
* @param string $ref Ref of object
* @param int $localorexternal 0=Url for browser, 1=Url for external access
* @return string Url string
diff --git a/htdocs/recruitment/recruitmentcandidature_card.php b/htdocs/recruitment/recruitmentcandidature_card.php
index f3f5164c0c7..a6ee9fd58ef 100644
--- a/htdocs/recruitment/recruitmentcandidature_card.php
+++ b/htdocs/recruitment/recruitmentcandidature_card.php
@@ -56,7 +56,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
-// Initialize array of search criterias
+// Initialize array of search criteria
$search_all = GETPOST("search_all", 'alpha');
$search = array();
foreach ($object->fields as $key => $val) {
diff --git a/htdocs/recruitment/recruitmentcandidature_list.php b/htdocs/recruitment/recruitmentcandidature_list.php
index 68598edbb26..a5279acd2ee 100644
--- a/htdocs/recruitment/recruitmentcandidature_list.php
+++ b/htdocs/recruitment/recruitmentcandidature_list.php
@@ -82,7 +82,7 @@ if (!$sortorder) {
$sortorder = "DESC";
}
-// Initialize array of search criterias
+// Initialize array of search criteria
$search_all = GETPOST('search_all', 'alphanohtml');
$search = array();
foreach ($object->fields as $key => $val) {
@@ -609,7 +609,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
-print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '
'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '
'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '
'."\n";
diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
index 2783a366405..5287ac99f52 100644
--- a/htdocs/resource/class/dolresource.class.php
+++ b/htdocs/resource/class/dolresource.class.php
@@ -669,13 +669,13 @@ class Dolresource extends CommonObject
* @param string $element Element
* @param int $element_id Id
* @param string $resource_type Type
- * @return array Aray of resources
+ * @return array Array of resources
*/
public function getElementResources($element, $element_id, $resource_type = '')
{
$resources = array();
- // Links beetween objects are stored in this table
+ // Links between objects are stored in this table
$sql = 'SELECT rowid, resource_id, resource_type, busy, mandatory';
$sql .= ' FROM '.MAIN_DB_PREFIX.'element_resources';
$sql .= " WHERE element_id=".((int) $element_id)." AND element_type='".$this->db->escape($element)."'";
@@ -799,7 +799,7 @@ class Dolresource extends CommonObject
*
* @param int $withpicto Add picto into link
* @param string $option Where point the link ('compta', '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 string $morecss Add more css on link
* @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
@@ -904,7 +904,7 @@ class Dolresource extends CommonObject
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
- * Charge indicateurs this->nb de tableau de bord
+ * Load indicators this->nb for state board
*
* @return int Return integer <0 if KO, >0 if OK
*/
diff --git a/htdocs/resource/class/html.formresource.class.php b/htdocs/resource/class/html.formresource.class.php
index 6186a90cd60..03941f84573 100644
--- a/htdocs/resource/class/html.formresource.class.php
+++ b/htdocs/resource/class/html.formresource.class.php
@@ -67,7 +67,7 @@ class FormResource
*
* @param int $selected Preselected resource id
* @param string $htmlname Name of field in form
- * @param string $filter Optionnal filters criteras (example: 's.rowid <> x')
+ * @param string $filter Optional filters criteras (example: 's.rowid <> x')
* @param int $showempty Add an empty field
* @param int $showtype Show third party type in combolist (customer, prospect or supplier)
* @param int $forcecombo Force to use combo box
@@ -76,7 +76,7 @@ class FormResource
* @param int $outputmode 0=HTML select string, 1=Array, 2=without form tag
* @param int $limit Limit number of answers
* @param string $morecss More css
- * @param bool $multiple add [] in the name of element and add 'multiple' attribut
+ * @param bool $multiple add [] in the name of element and add 'multiple' attribute
* @return string|array HTML string with
*/
public function select_resource_list($selected = '', $htmlname = 'fk_resource', $filter = '', $showempty = 0, $showtype = 0, $forcecombo = 0, $event = array(), $filterkey = '', $outputmode = 0, $limit = 20, $morecss = '', $multiple = false)
diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php
index 75cf03d1bb8..77e81696d8f 100644
--- a/htdocs/resource/element_resource.php
+++ b/htdocs/resource/element_resource.php
@@ -192,7 +192,7 @@ if (empty($reshook)) {
}
}
- // Update ressource
+ // Update resource
if ($action == 'update_linked_resource' && $user->hasRight('resource', 'write') && !GETPOST('cancel', 'alpha')) {
$res = $object->fetch_element_resource($lineid);
if ($res) {
diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index 19092a8383d..89442fa0b4c 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -1001,7 +1001,7 @@ if ($id > 0) {
$i = 0;
$total = 0;
- print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+ print '
'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '
';
print '
';
print '
'.$langs->trans("RefPayment").'
';
diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php
index 787d794a240..27db76ba07e 100644
--- a/htdocs/salaries/class/paymentsalary.class.php
+++ b/htdocs/salaries/class/paymentsalary.class.php
@@ -162,7 +162,7 @@ class PaymentSalary extends CommonObject
* Use this->amounts to have list of lines for the payment
*
* @param User $user User making payment
- * @param int $closepaidcontrib 1=Also close payed contributions to paid, 0=Do nothing more
+ * @param int $closepaidcontrib 1=Also close paid contributions to paid, 0=Do nothing more
* @return int Return integer <0 if KO, id of payment if OK
*/
public function create($user, $closepaidcontrib = 0)
@@ -181,7 +181,7 @@ class PaymentSalary extends CommonObject
$this->datep = $this->datepaye;
}
- // Validate parametres
+ // Validate parameters
if (empty($this->datep)) {
$this->error = 'ErrorBadValueForParameterCreatePaymentSalary';
return -1;
@@ -252,7 +252,7 @@ class PaymentSalary extends CommonObject
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_salary");
}
- // If we want to closed payed invoices
+ // If we want to closed paid invoices
if ($closepaidcontrib) {
$tmpsalary = new Salary($this->db);
$tmpsalary->fetch($salary_id);
diff --git a/htdocs/salaries/class/salariesstats.class.php b/htdocs/salaries/class/salariesstats.class.php
index a1e701ed87e..fc687add5ea 100644
--- a/htdocs/salaries/class/salariesstats.class.php
+++ b/htdocs/salaries/class/salariesstats.class.php
@@ -20,13 +20,13 @@
/**
* \file htdocs/salaries/class/salariesstats.class.php
* \ingroup salaries
- * \brief File of class for statistics on salaries
+ * \brief File of class to manage salary statistics
*/
include_once DOL_DOCUMENT_ROOT.'/core/class/stats.class.php';
include_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php';
/**
- * Classe permettant la gestion des stats des salaires
+ * Class to manage salary statistics
*/
class SalariesStats extends Stats
{
diff --git a/htdocs/salaries/class/salary.class.php b/htdocs/salaries/class/salary.class.php
index e04f4430225..c561ec496af 100644
--- a/htdocs/salaries/class/salary.class.php
+++ b/htdocs/salaries/class/salary.class.php
@@ -676,7 +676,7 @@ class Salary extends CommonObject
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
- * Tag social contribution as payed completely
+ * Tag social contribution as paid completely
*
* @deprecated
* @see setPaid()
@@ -691,7 +691,7 @@ class Salary extends CommonObject
}
/**
- * Tag social contribution as payed completely
+ * Tag social contribution as paid completely
*
* @param User $user Object user making change
* @return int Return integer <0 if KO, >0 if OK
@@ -714,7 +714,7 @@ class Salary extends CommonObject
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
- * Remove tag payed on social contribution
+ * Remove tag paid on social contribution
*
* @param User $user Object user making change
* @return int Return integer <0 if KO, >0 if OK
@@ -741,7 +741,7 @@ class Salary extends CommonObject
* Return label of current status
*
* @param int $mode 0=label long, 1=labels short, 2=Picto + Label short, 3=Picto, 4=Picto + Label long, 5=Label short + Picto
- * @param double $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
+ * @param double $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommend to put here amount paid if you have it, 1 otherwise)
* @return string Label
*/
public function getLibStatut($mode = 0, $alreadypaid = -1)
@@ -755,7 +755,7 @@ class Salary extends CommonObject
*
* @param int $status Id status
* @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=Long label + picto
- * @param double $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
+ * @param double $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommend to put here amount paid if you have it, 1 otherwise)
* @return string Label
*/
public function LibStatut($status, $mode = 0, $alreadypaid = -1)
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 64b82b4e8f2..89dc0b6927c 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -100,7 +100,7 @@ $filtre = GETPOST("filtre", 'restricthtml');
$childids = $user->getAllChildIds(1);
-// Initialize array of search criterias
+// Initialize array of search criteria
$search_all = GETPOST("search_all", 'alpha');
$search = array();
foreach ($object->fields as $key => $val) {
@@ -476,7 +476,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
-print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '
'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '
'."\n";
// Fields title search
diff --git a/htdocs/salaries/payment_salary/card.php b/htdocs/salaries/payment_salary/card.php
index bdf21475a77..d5aff1dd250 100644
--- a/htdocs/salaries/payment_salary/card.php
+++ b/htdocs/salaries/payment_salary/card.php
@@ -194,7 +194,7 @@ print dol_get_fiche_end();
/*
- * List of salaries payed
+ * List of salaries paid
*/
$disable_delete = 0;
@@ -213,7 +213,7 @@ if ($resql) {
$total = 0;
print ' ';
- print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+ print '
'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+ print '
'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '
';
print '
';
print '
'.$langs->trans("RefPayment").'
';
@@ -481,7 +481,7 @@ if ($object->paye == 0 && $hadRequest == 0) {
print '';
if (getDolGlobalString('STRIPE_SEPA_DIRECT_DEBIT_SHOW_OLD_BUTTON')) { // This is hidden, prefer to use mode enabled with STRIPE_SEPA_DIRECT_DEBIT
- // TODO Replace this with a checkbox for each payment mode: "Send request to XXX immediatly..."
+ // TODO Replace this with a checkbox for each payment mode: "Send request to XXX immediately..."
print " ";
//add stripe sepa button
$buttonlabel = $langs->trans("MakeWithdrawRequestStripe");
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index 3095e18f2b1..66f7c413f19 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -223,7 +223,7 @@ if ($action == "setvatinlist") {
}
}
-//Activate Set adress in list
+//Activate Set address in list
if ($action == "setaddadressinlist") {
$val = GETPOST('value', 'int');
$res = dolibarr_set_const($db, "COMPANY_SHOW_ADDRESS_SELECTLIST", $val, 'yesno', 0, '', $conf->entity);
diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php
index ac7d894b36b..1a405cf7799 100644
--- a/htdocs/societe/canvas/actions_card_common.class.php
+++ b/htdocs/societe/canvas/actions_card_common.class.php
@@ -19,11 +19,11 @@
/**
* \file htdocs/societe/canvas/actions_card_common.class.php
* \ingroup thirdparty
- * \brief Fichier de la classe Thirdparty card controller (common)
+ * \brief File for the abstract class to manage third parties
*/
/**
- * Classe permettant la gestion des tiers par defaut
+ * Abstract class to manage third parties
*/
abstract class ActionsCardCommon
{
@@ -253,13 +253,13 @@ abstract class ActionsCardCommon
}
// VAT
- $this->tpl['yn_assujtva'] = $form->selectyesno('assujtva_value', $this->tpl['tva_assuj'], 1); // Assujeti par defaut en creation
+ $this->tpl['yn_assujtva'] = $form->selectyesno('assujtva_value', $this->tpl['tva_assuj'], 1); // Assujeti par default en creation
// Select users
$this->tpl['select_users'] = $form->select_dolusers($this->object->commercial_id, 'commercial_id', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
// Local Tax
- // TODO mettre dans une classe propre au pays
+ // TODO Implement country specific action in country specific class
if ($mysoc->country_code == 'ES') {
$this->tpl['localtax'] = '';
@@ -357,7 +357,7 @@ abstract class ActionsCardCommon
}
// Local Tax
- // TODO mettre dans une classe propre au pays
+ // TODO Implement country specific action in country specific class
if ($mysoc->country_code == 'ES') {
$this->tpl['localtax'] = '';
@@ -396,7 +396,7 @@ abstract class ActionsCardCommon
$this->object->code_client = GETPOST("code_client");
$this->object->fournisseur = GETPOST("fournisseur");
$this->object->code_fournisseur = GETPOST("code_fournisseur");
- $this->object->address = GETPOST("adresse");
+ $this->object->address = GETPOST("address");
$this->object->zip = GETPOST("zipcode");
$this->object->town = GETPOST("town");
$this->object->country_id = GETPOST("country_id") ? GETPOST("country_id") : $mysoc->country_id;
diff --git a/htdocs/societe/canvas/company/actions_card_company.class.php b/htdocs/societe/canvas/company/actions_card_company.class.php
index cd95285d75b..f5d533ceeab 100644
--- a/htdocs/societe/canvas/company/actions_card_company.class.php
+++ b/htdocs/societe/canvas/company/actions_card_company.class.php
@@ -34,7 +34,7 @@ class ActionsCardCompany extends ActionsCardCommon
/**
* 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
diff --git a/htdocs/societe/canvas/company/tpl/card_create.tpl.php b/htdocs/societe/canvas/company/tpl/card_create.tpl.php
index 97a2e490ac4..b18f0b31ec2 100644
--- a/htdocs/societe/canvas/company/tpl/card_create.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_create.tpl.php
@@ -114,7 +114,7 @@ if (isModEnabled('barcode')) { ?>
trans('Address'); ?>
-
+
diff --git a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
index c928d1e2514..651a9cc180d 100644
--- a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
@@ -129,7 +129,7 @@ if (isModEnabled('barcode')) { ?>
trans('Address'); ?>
-
+
diff --git a/htdocs/societe/canvas/individual/actions_card_individual.class.php b/htdocs/societe/canvas/individual/actions_card_individual.class.php
index 376dbefa1bf..4778cf7f4f0 100644
--- a/htdocs/societe/canvas/individual/actions_card_individual.class.php
+++ b/htdocs/societe/canvas/individual/actions_card_individual.class.php
@@ -18,7 +18,7 @@
/**
* \file htdocs/societe/canvas/individual/actions_card_individual.class.php
* \ingroup thirdparty
- * \brief Fichier de la classe Thirdparty card controller (individual canvas)
+ * \brief File for class for Thirdparty card controller with individual canvas
*/
include_once DOL_DOCUMENT_ROOT.'/societe/canvas/actions_card_common.class.php';
@@ -33,7 +33,7 @@ class ActionsCardIndividual extends ActionsCardCommon
/**
* 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
diff --git a/htdocs/societe/canvas/individual/tpl/card_create.tpl.php b/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
index 8ed547f7ecd..e46721b167c 100644
--- a/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
@@ -122,7 +122,7 @@ if (isModEnabled('barcode')) { ?>
trans('Address'); ?>
-
+
diff --git a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
index e86d2376896..9c53ad5b3d8 100644
--- a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
@@ -126,7 +126,7 @@ if ($this->control->tpl['fournisseur']) {
trans('Address'); ?>
-
+
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index b2e1d90266d..ad81a592328 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1106,7 +1106,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
$("#typent_id").change();
$("#effectif_id").val(id_ef15);
$("#effectif_id").change();
- /* Force to recompute the width of a select2 field when it was hidden and then shown programatically */
+ /* Force to recompute the width of a select2 field when it was hidden and then shown programmatically */
if ($("#civility_id").data("select2")) {
$("#civility_id").select2({width: "resolve"});
}
@@ -1557,7 +1557,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
// Vat is used
print '
';
- print ''; // Assujeti par defaut en creation
+ print ''; // Assujeti par default en creation
print '
';
if ($conf->browser->layout == 'phone') {
print '
';
diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php
index dd38649b545..ba9d77715eb 100644
--- a/htdocs/societe/checkvat/checkVatPopup.php
+++ b/htdocs/societe/checkvat/checkVatPopup.php
@@ -112,7 +112,7 @@ if (!$vatNumber) {
$messagetoshow = $result['faultstring'];
} elseif (preg_match('/INVALID_INPUT/i', $result['faultstring'])
|| ($result['requestDate'] && !$result['valid'])) {
- // Syntaxe ko
+ // Syntax ko
if ($result['requestDate']) {
print $langs->trans("Date").': '.$result['requestDate'].' ';
}
@@ -120,7 +120,7 @@ if (!$vatNumber) {
print $langs->trans("ValueIsValid").': '.$langs->trans("No").' (Might be a non europeen VAT) ';
//$messagetoshow=$soapclient->response;
} else {
- // Syntaxe ok
+ // Syntax ok
if ($result['requestDate']) {
print $langs->trans("Date").': '.$result['requestDate'].' ';
}
diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index 3d37b274d99..a501ccb8c62 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -60,7 +60,7 @@ class Contacts extends DolibarrApi
/**
* Get properties of a contact object
*
- * Return an array with contact informations
+ * Return an array with contact information
*
* @param int $id ID of contact
* @param int $includecount Count and return also number of elements the contact is used as a link for
@@ -166,7 +166,7 @@ class Contacts extends DolibarrApi
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
* @param int $includecount Count and return also number of elements the contact is used as a link for
* @param int $includeroles Includes roles of the contact
- * @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 contact objects
*
* @throws RestException
@@ -284,7 +284,7 @@ class Contacts 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->contact->context['caller'] = $request_data['caller'];
continue;
}
@@ -333,7 +333,7 @@ class Contacts 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->contact->context['caller'] = $request_data['caller'];
continue;
}
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 9604137ed10..c9adc61efb5 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -66,7 +66,7 @@ class Thirdparties extends DolibarrApi
/**
* Get properties of a thirdparty object
*
- * Return an array with thirdparty informations
+ * Return an array with thirdparty information
*
* @param int $id Id of third party to load
* @return Object Object with cleaned properties
@@ -81,7 +81,7 @@ class Thirdparties extends DolibarrApi
/**
* Get properties of a thirdparty object by email.
*
- * Return an array with thirdparty informations
+ * Return an array with thirdparty information
*
* @param string $email Email of third party to load
* @return array|mixed Cleaned Societe object
@@ -98,7 +98,7 @@ class Thirdparties extends DolibarrApi
/**
* Get properties of a thirdparty object by barcode.
*
- * Return an array with thirdparty informations
+ * Return an array with thirdparty information
*
* @param string $barcode Barcode of third party to load
* @return array|mixed Cleaned Societe object
@@ -127,7 +127,7 @@ class Thirdparties extends DolibarrApi
* Set to 4 to show only suppliers
* @param int $category Use this param to filter list by category
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "((t.nom:like:'TheCompany%') or (t.name_alias:like:'TheCompany%')) 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 thirdparty objects
*/
public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $mode = 0, $category = 0, $sqlfilters = '', $properties = '')
@@ -252,7 +252,7 @@ class Thirdparties 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->company->context['caller'] = $request_data['caller'];
continue;
}
@@ -297,7 +297,7 @@ class Thirdparties 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->company->context['caller'] = $request_data['caller'];
continue;
}
@@ -967,7 +967,7 @@ class Thirdparties extends DolibarrApi
/**
* Return list of invoices qualified to be corrected by a credit note.
* Invoices matching the following rules are returned
- * (validated + payment on process) or classified (paid completely or paid partialy) + not already replaced + not already a credit note
+ * (validated + payment on process) or classified (paid completely or paid partially) + not already replaced + not already a credit note
*
* @param int $id Id of thirdparty
*
@@ -1105,7 +1105,7 @@ class Thirdparties 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->company->context['caller'] = $request_data['caller'];
continue;
}
@@ -1161,7 +1161,7 @@ class Thirdparties 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
$account->context['caller'] = $request_data['caller'];
continue;
}
@@ -1411,7 +1411,7 @@ class Thirdparties 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
$account->context['caller'] = $request_data['caller'];
continue;
}
@@ -1474,7 +1474,7 @@ class Thirdparties 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
$account->context['caller'] = $request_data['caller'];
continue;
}
@@ -1513,7 +1513,7 @@ class Thirdparties 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
$account->context['caller'] = $request_data['caller'];
continue;
}
@@ -1575,7 +1575,7 @@ class Thirdparties 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
$account->context['caller'] = $request_data['caller'];
continue;
}
@@ -1738,9 +1738,9 @@ class Thirdparties extends DolibarrApi
/**
* Fetch properties of a thirdparty object.
*
- * Return an array with thirdparty informations
+ * Return an array with thirdparty information
*
- * @param int $rowid Id of third party to load (Use 0 to get a specimen record, use null to use other search criterias)
+ * @param int $rowid Id of third party to load (Use 0 to get a specimen record, use null to use other search criteria)
* @param string $ref Reference of third party, name (Warning, this can return several records)
* @param string $ref_ext External reference of third party (Warning, this information is a free field not provided by Dolibarr)
* @param string $barcode Barcode of third party to load
@@ -1781,8 +1781,8 @@ class Thirdparties extends DolibarrApi
}
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)%')";
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index 37e63bba1d6..5619d263aa1 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -66,7 +66,7 @@ class CompanyBankAccount extends Account
* 'alwayseditable' says if field can be modified also when status is not draft ('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 or 2 if field can be used for measure. Field type must be summable like integer or double(24,8). Use 1 in most cases, or 2 if you don't want to see the column total into list (for example for percentage)
* 'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
@@ -262,7 +262,7 @@ class CompanyBankAccount extends Account
$error = 0;
- // Check paramaters
+ // Check parameters
if (empty($this->socid)) {
$this->error = 'BadValueForParameter';
$this->errors[] = $this->error;
diff --git a/htdocs/societe/class/companypaymentmode.class.php b/htdocs/societe/class/companypaymentmode.class.php
index c8e4d1b95d6..415cd0db2da 100644
--- a/htdocs/societe/class/companypaymentmode.class.php
+++ b/htdocs/societe/class/companypaymentmode.class.php
@@ -70,7 +70,7 @@ class CompanyPaymentMode extends CommonObject
* 'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only. Using a negative value means field is not shown by default on list but can be selected for viewing)
* 'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
* '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_...).
* 'position' is the sort order of field.
* '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).
@@ -359,7 +359,7 @@ class CompanyPaymentMode 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', ...)
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index f4309ce0e31..23ffffb7e95 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -171,7 +171,7 @@ class Societe 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' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
@@ -880,7 +880,7 @@ class Societe extends CommonObject
/**
* Create third party in database.
- * $this->code_client = -1 and $this->code_fournisseur = -1 means automatic assignement.
+ * $this->code_client = -1 and $this->code_fournisseur = -1 means automatic assignment.
*
* @param User $user Object of user that ask creation
* @param int $notrigger 1=Does not execute triggers, 0= execute triggers
@@ -1070,7 +1070,7 @@ class Societe extends CommonObject
* Create a contact/address from thirdparty
*
* @param User $user Object user
- * @param int $no_email 1=Do not send mailing, 0=Ok to recieve mailling
+ * @param int $no_email 1=Do not send mailing, 0=Ok to receive mailing
* @param array $tags Array of tag to affect to contact
* @param int $notrigger 1=Does not execute triggers, 0= execute triggers
* @return int Return integer <0 if KO, >0 if OK
@@ -2208,7 +2208,7 @@ class Societe extends CommonObject
return -1;
}
} else {
- dol_syslog("Can't remove thirdparty with id ".$id.". There is ".$objectisused." childs", LOG_WARNING);
+ dol_syslog("Can't remove thirdparty with id ".$id.". There are ".$objectisused." children", LOG_WARNING);
}
return 0;
}
@@ -2386,7 +2386,7 @@ class Societe extends CommonObject
* @param float $remise Amount of discount
* @param User $user User adding discount
* @param string $desc Reason of discount
- * @param string $vatrate VAT rate (may contain the vat code too). Exemple: '1.23', '1.23 (ABC)', ...
+ * @param string $vatrate VAT rate (may contain the vat code too). Example: '1.23', '1.23 (ABC)', ...
* @param int $discount_type 0 => customer discount, 1 => supplier discount
* @param string $price_base_type Price base type 'HT' or 'TTC'
* @return int Return integer <0 if KO, id of discount record if OK
@@ -3090,7 +3090,7 @@ class Societe extends CommonObject
$contact_phone = $this->contact_property_array('mobile');
- if (!empty($this->phone)) { // If a phone of thirdparty is defined, we add it ot mobile of contacts
+ if (!empty($this->phone)) { // If a phone of thirdparty is defined, we add it to mobile of contacts
if (empty($this->name)) {
$this->name = $this->nom;
}
@@ -3726,7 +3726,7 @@ class Societe extends CommonObject
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
- * Returns if a profid sould be verified to be unique
+ * Returns if a profid should be verified to be unique
*
* @param int $idprof 1,2,3,4,5,6 (Example: 1=siren, 2=siret, 3=naf, 4=rcs/rm, 5=eori, 6=idprof6)
* @return boolean true if the ID must be unique
@@ -3827,8 +3827,8 @@ class Societe extends CommonObject
/**
* Check the validity of a professional identifier according to the country of the company (siren, siret, ...)
*
- * @param int $idprof 1,2,3,4 (Exemple: 1=siren,2=siret,3=naf,4=rcs/rm)
- * @param Societe $soc Objet societe
+ * @param int $idprof 1,2,3,4 (Example: 1=siren,2=siret,3=naf,4=rcs/rm)
+ * @param Societe $soc Object societe
* @return int Return integer <=0 if KO, >0 if OK
* TODO better to have this in a lib than into a business class
*/
@@ -3889,7 +3889,7 @@ class Societe extends CommonObject
}
$n = 10 - substr($sum, strlen($sum) - 1, 1);
- //Chek special NIF
+ //Check special NIF
if (preg_match('/^[KLM]{1}/', $string)) {
if ($num[8] == chr(64 + $n) || $num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 1, 8) % 23, 1)) {
return 1;
@@ -4201,7 +4201,7 @@ class Societe extends CommonObject
/**
* Set "blacklist" mailing status
*
- * @param int $no_email 1=Do not send mailing, 0=Ok to recieve mailling
+ * @param int $no_email 1=Do not send mailing, 0=Ok to receive mailing
* @return int Return integer <0 if KO, >0 if OK
*/
public function setNoEmail($no_email)
@@ -4257,7 +4257,7 @@ class Societe 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
*/
@@ -4316,7 +4316,7 @@ class Societe extends CommonObject
$name = $socname;
$alias = $socalias ? $socalias : '';
- // Positionne parametres
+ // Positionne parameters
$this->nom = $name; // TODO deprecated
$this->name = $name;
$this->name_alias = $alias;
@@ -4490,7 +4490,7 @@ class Societe extends CommonObject
$this->idprof4 = getDolGlobalString('MAIN_INFO_RCS');
$this->idprof5 = getDolGlobalString('MAIN_INFO_PROFID5');
$this->idprof6 = getDolGlobalString('MAIN_INFO_PROFID6');
- $this->tva_intra = getDolGlobalString('MAIN_INFO_TVAINTRA'); // VAT number, not necessarly INTRA.
+ $this->tva_intra = getDolGlobalString('MAIN_INFO_TVAINTRA'); // VAT number, not necessarily INTRA.
$this->managers = getDolGlobalString('MAIN_INFO_SOCIETE_MANAGERS');
$this->capital = getDolGlobalString('MAIN_INFO_CAPITAL');
$this->forme_juridique_code = getDolGlobalString('MAIN_INFO_SOCIETE_FORME_JURIDIQUE');
@@ -4667,7 +4667,7 @@ class Societe 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');
}
@@ -4758,7 +4758,7 @@ class Societe extends CommonObject
* Return amount of proposal not yet paid and total an dlist of all proposals
*
* @param string $mode 'customer' or 'supplier'
- * @return array array('opened'=>Amount including tax that remains to pay, 'total_ht'=>Total amount without tax of all objects paid or not, 'total_ttc'=>Total amunt including tax of all object paid or not)
+ * @return array array('opened'=>Amount including tax that remains to pay, 'total_ht'=>Total amount without tax of all objects paid or not, 'total_ttc'=>Total amount including tax of all object paid or not)
*/
public function getOutstandingProposals($mode = 'customer')
{
@@ -4802,7 +4802,7 @@ class Societe extends CommonObject
* Return amount of order not yet paid and total and list of all orders
*
* @param string $mode 'customer' or 'supplier'
- * @return array array('opened'=>Amount including tax that remains to pay, 'total_ht'=>Total amount without tax of all objects paid or not, 'total_ttc'=>Total amunt including tax of all object paid or not)
+ * @return array array('opened'=>Amount including tax that remains to pay, 'total_ht'=>Total amount without tax of all objects paid or not, 'total_ttc'=>Total amount including tax of all object paid or not)
*/
public function getOutstandingOrders($mode = 'customer')
{
@@ -4846,7 +4846,7 @@ class Societe extends CommonObject
*
* @param string $mode 'customer' or 'supplier'
* @param int $late 0 => all invoice, 1=> only late
- * @return array array('opened'=>Amount including tax that remains to pay, 'total_ht'=>Total amount without tax of all objects paid or not, 'total_ttc'=>Total amunt including tax of all object paid or not)
+ * @return array array('opened'=>Amount including tax that remains to pay, 'total_ht'=>Total amount without tax of all objects paid or not, 'total_ttc'=>Total amount including tax of all object paid or not)
*/
public function getOutstandingBills($mode = 'customer', $late = 0)
{
@@ -4903,9 +4903,9 @@ class Societe extends CommonObject
if ($obj->paye == 0
&& $obj->status != $tmpobject::STATUS_DRAFT // Not a draft
- && $obj->status != $tmpobject::STATUS_ABANDONED // Not abandonned
+ && $obj->status != $tmpobject::STATUS_ABANDONED // Not abandoned
&& $obj->status != $tmpobject::STATUS_CLOSED) { // Not classified as paid
- //$sql .= " AND (status <> 3 OR close_code <> 'abandon')"; // Not abandonned for undefined reason
+ //$sql .= " AND (status <> 3 OR close_code <> 'abandon')"; // Not abandoned for undefined reason
$paiement = $tmpobject->getSommePaiement();
$creditnotes = $tmpobject->getSumCreditNotesUsed();
$deposits = $tmpobject->getSumDepositsUsed();
@@ -4975,7 +4975,7 @@ class Societe extends CommonObject
* Create a document onto disk according to template module.
*
* @param string $modele Generator to use. Caller must set it to obj->model_pdf or GETPOST('model','alpha') for example.
- * @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
diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index c4efe6be306..f7fcb979ede 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -62,7 +62,7 @@ class SocieteAccount extends CommonObject
* 'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only. Using a negative value means field is not shown by default on list but can be selected for viewing)
* 'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
* '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_...).
* 'position' is the sort order of field.
* '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).
@@ -310,7 +310,7 @@ class SocieteAccount extends CommonObject
$sql .= " AND (sa.site_account = '' OR sa.site_account IS NULL OR sa.site_account = '".$this->db->escape($site_account)."')";
$sql .= " ORDER BY sa.site_account DESC"; // To get the entry with a site_account defined in priority
- dol_syslog(get_class($this)."::getCustomerAccount Try to find the first system customer id for ".$site." of thirdparty id=".$id." (exemple: cus_.... for stripe)", LOG_DEBUG);
+ dol_syslog(get_class($this)."::getCustomerAccount Try to find the first system customer id for ".$site." of thirdparty id=".$id." (example: cus_.... for stripe)", LOG_DEBUG);
$result = $this->db->query($sql);
if ($result) {
if ($this->db->num_rows($result)) {
@@ -404,7 +404,7 @@ class SocieteAccount 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', ...)
@@ -531,7 +531,7 @@ class SocieteAccount extends CommonObject
}
/**
- * 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
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 0de0a878ab0..71da286c48a 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -223,7 +223,7 @@ if (($tmp = $langs->transnoentities("ProfId6".$mysoc->country_code)) && $tmp !=
if (isModEnabled('barcode')) {
$fieldstosearchall['s.barcode'] = 'Gencod';
}
-// Personalized search criterias. Example: $conf->global->THIRDPARTY_QUICKSEARCH_ON_FIELDS = 's.nom=ThirdPartyName;s.name_alias=AliasNameShort;s.code_client=CustomerCode'
+// Personalized search criteria. Example: $conf->global->THIRDPARTY_QUICKSEARCH_ON_FIELDS = 's.nom=ThirdPartyName;s.name_alias=AliasNameShort;s.code_client=CustomerCode'
if (getDolGlobalString('THIRDPARTY_QUICKSEARCH_ON_FIELDS')) {
$fieldstosearchall = dolExplodeIntoArray($conf->global->THIRDPARTY_QUICKSEARCH_ON_FIELDS);
}
@@ -487,7 +487,7 @@ if ($type == 'f' && (empty($search_type) || ($search_type == '4'))) {
$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-// 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_prospectlevel";
@@ -1197,7 +1197,7 @@ $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfi
//$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
$selectedfields .= ((count($arrayofmassactions) && $contextpage != 'poslist') ? $form->showCheckAddButtons('checkforselect', 1) : '');
-print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '
'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '
'."\n";
// Fields title search
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 52e339bb588..fa1495ab87c 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -1176,7 +1176,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
//($stripeacc ? ' (Stripe connection with StripeConnect account '.$stripeacc.')' : ' (Stripe connection with keys from Stripe module setup)')
print ''."\n";
- print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+ print '
'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '
'."\n";
print '
';
print '
'.$langs->trans('Label').'
';
diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
index 677fce1b7ca..7d109cfc3f4 100644
--- a/htdocs/societe/societecontact.php
+++ b/htdocs/societe/societecontact.php
@@ -204,7 +204,7 @@ if ($id > 0 || !empty($ref)) {
}
}
- // additionnal list with adherents of company
+ // additional list with adherents of company
if (isModEnabled('adherent') && $user->hasRight('adherent', 'lire')) {
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index 67192c08357..9b1bb4c14c2 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -86,7 +86,7 @@ $search_array_options = $extrafields->getOptionalsFromPost($objectwebsiteaccount
unset($objectwebsiteaccount->fields['fk_soc']); // Remove this field, we are already on the thirdparty
-// Initialize array of search criterias
+// Initialize array of search criteria
$search_all = GETPOST("search_all", 'alpha');
$search = array();
foreach ($objectwebsiteaccount->fields as $key => $val) {
@@ -422,7 +422,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
-print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '
'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '
'."\n";
diff --git a/htdocs/stripe/class/actions_stripe.class.php b/htdocs/stripe/class/actions_stripe.class.php
index fa4b87d88df..55b62f7fd09 100644
--- a/htdocs/stripe/class/actions_stripe.class.php
+++ b/htdocs/stripe/class/actions_stripe.class.php
@@ -165,7 +165,7 @@ class ActionsStripeconnect extends CommonHookActions
global $conf, $langs;
if (is_object($object) && $object->element == 'facture') {
- // On verifie si la facture a des paiements
+ // Verify if the invoice has payments
$sql = 'SELECT pf.amount';
$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf';
$sql .= ' WHERE pf.fk_facture = '.((int) $object->id);
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index 7757f24be8b..c100bdba1ca 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -198,7 +198,7 @@ class Stripe extends CommonObject
$customer = \Stripe\Customer::retrieve(array('id'=>"$tiers", 'expand[]'=>'sources'), array("stripe_account" => $key));
}
} catch (Exception $e) {
- // For exemple, we may have error: 'No such customer: cus_XXXXX; a similar object exists in live mode, but a test mode key was used to make this request.'
+ // For example, we may have error: 'No such customer: cus_XXXXX; a similar object exists in live mode, but a test mode key was used to make this request.'
$this->error = $e->getMessage();
}
} elseif ($createifnotlinkedtostripe) {
@@ -340,7 +340,7 @@ class Stripe extends CommonObject
* @param int $status Status (0=test, 1=live)
* @param int $usethirdpartyemailforreceiptemail 1=use thirdparty email for receipt
* @param int $mode automatic=automatic confirmation/payment when conditions are ok, manual=need to call confirm() on intent
- * @param boolean $confirmnow false=default, true=try to confirm immediatly after create (if conditions are ok)
+ * @param boolean $confirmnow false=default, true=try to confirm immediately after create (if conditions are ok)
* @param string $payment_method 'pm_....' (if known)
* @param string $off_session If we use an already known payment method to pay when customer is not available during the checkout flow.
* @param string $noidempotency_key Do not use the idempotency_key when creating the PaymentIntent
@@ -468,7 +468,7 @@ class Stripe extends CommonObject
global $dolibarr_main_url_root;
$dataforintent = array(
- "confirm" => $confirmnow, // try to confirm immediatly after create (if conditions are ok)
+ "confirm" => $confirmnow, // try to confirm immediately after create (if conditions are ok)
"confirmation_method" => $mode,
"amount" => $stripeamount,
"currency" => $currency_code,
@@ -635,7 +635,7 @@ class Stripe extends CommonObject
* Get the Stripe payment intent. Create it with confirmnow=false
* 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),
+ * 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 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.
@@ -646,7 +646,7 @@ class Stripe extends CommonObject
* @param string $key ''=Use common API. If not '', it is the Stripe connect account 'acc_....' to use Stripe connect
* @param int $status Status (0=test, 1=live)
* @param int $usethirdpartyemailforreceiptemail 1=use thirdparty email for receipt
- * @param boolean $confirmnow false=default, true=try to confirm immediatly after create (if conditions are ok)
+ * @param boolean $confirmnow false=default, true=try to confirm immediately after create (if conditions are ok)
* @return \Stripe\SetupIntent|null Stripe SetupIntent or null if not found and failed to create
*/
public function getSetupIntent($description, $object, $customer, $key, $status, $usethirdpartyemailforreceiptemail = 0, $confirmnow = false)
@@ -695,7 +695,7 @@ class Stripe extends CommonObject
global $dolibarr_main_url_root;
$dataforintent = array(
- "confirm" => $confirmnow, // Do not confirm immediatly during creation of intent
+ "confirm" => $confirmnow, // Do not confirm immediately during creation of intent
"payment_method_types" => $paymentmethodtypes, // When payment_method_types is set, return_url is not required but payment mode can't be managed from dashboard
/*
'return_url' => $dolibarr_main_url_root.'/public/payment/paymentok.php',
@@ -1075,7 +1075,7 @@ class Stripe extends CommonObject
$cs = $s->setupIntents->create($dataforintent);
//$cs = $s->setupIntents->update($cs->id, ['payment_method' => $sepa->id]);
$cs = $s->setupIntents->confirm($cs->id, ['mandate_data' => ['customer_acceptance' => ['type' => 'offline']]]);
- // note: $cs->mandate contians ID of mandate on Stripe side
+ // note: $cs->mandate contains ID of mandate on Stripe side
if (!$cs) {
$this->error = 'Link SEPA <-> Customer failed';
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 2a9841bad76..12551a2e7a3 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -277,7 +277,7 @@ if (empty($reshook)) {
if (!$error) {
$db->begin();
- // Si on a selectionne une demande a copier, on realise la copie
+ // When a copy request was made, make the copy
if (GETPOST('createmode') == 'copy' && GETPOST('copie_supplier_proposal')) {
if ($object->fetch(GETPOST('copie_supplier_proposal')) > 0) {
$object->ref = GETPOST('ref');
@@ -702,7 +702,7 @@ if (empty($reshook)) {
$desc = $productsupplier->desc_supplier;
}
- //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 (trim($product_desc) == trim($desc) && getDolGlobalString('PRODUIT_AUTOFILL_DESC')) {
$product_desc='';
}
@@ -978,7 +978,7 @@ if (empty($reshook)) {
// Add buying price
$fournprice = (GETPOST('fournprice') ? GETPOST('fournprice') : '');
- $buyingprice = (GETPOST('buying_price') != '' ? GETPOST('buying_price') : ''); // If buying_price is '0', we muste keep this value
+ $buyingprice = (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);
@@ -1276,7 +1276,7 @@ if ($action == 'create') {
print '
';
$filter = '((s.fournisseur:=:1) AND (s.status:=:1))';
print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company((empty($socid) ? '' : $socid), '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_SUPPLIER_CHANGE')) {
print '