vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Qual: Spelling htdocs/[q-z]* (#27447)

Browse source 
# Qual: Fix spelling htdocs/[q-z]*

Probably fixes a bug:

- htdocs/webservices/server_thirdparty.php
  No other occurence of adress found.
  -'adress'=>->adress,- +'address'=>->address,+
This commit is contained in:
MDW 2024-01-12 17:18:52 +01:00 committed by GitHub
parent 5d6d6a92cf
commit 342ab85195
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
118 changed files with 366 additions and 366 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
htdocs/reception/card.php
View file

@ -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 '<td><input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty.'"></td>';
// Warehouse source
print '<td>'.$formproduct->selectWarehouses($lines[$i]->fk_entrepot, 'entl'.$line_id, '', 1, 0, $lines[$i]->fk_product, '', 1).'</td>';
// Batch number managment
// Batch number management
if ($conf->productbatch->enabled && !empty($lines[$i]->product->status_batch)) {
print '<td class="nowraponall left"><input name="batch'.$line_id.'" id="batch'.$line_id.'" type="text" value="'.$lines[$i]->batch.'"><br>';
if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
@ -1991,7 +1991,7 @@ if ($action == 'create') {
print '<td><input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty.'"></td>';
// Warehouse source
print '<td></td>';
// Batch number managment
// Batch number management
print '<td></td>';
print '</tr>';
}
@ -2015,7 +2015,7 @@ if ($action == 'create') {
}
}
// Batch number managment
// Batch number management
if (isModEnabled('productbatch')) {
if (isset($lines[$i]->batch)) {
print '<!-- Detail of lot -->';

8
htdocs/reception/class/api_receptions.class.php
View file

@ -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;
}

16
htdocs/reception/class/reception.class.php
View file

@ -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
*/

2
htdocs/reception/class/receptionstats.class.php
View file

@ -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';

6
htdocs/reception/list.php
View file

@ -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 '<td class="center">';
print dol_print_date($db->jdate($obj->delivery_date), "day");

14
htdocs/recruitment/class/api_recruitments.class.php
View file

@ -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;
}

8
htdocs/recruitment/class/recruitmentcandidature.class.php
View file

@ -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

8
htdocs/recruitment/class/recruitmentjobposition.class.php
View file

@ -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

2
htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
View file

@ -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 {

12
htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
View file

@ -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

2
htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php
View file

@ -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

2
htdocs/recruitment/recruitmentcandidature_card.php
View file

@ -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) {

4
htdocs/recruitment/recruitmentcandidature_list.php
View file

@ -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 '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";

2
htdocs/recruitment/recruitmentjobposition_applications.php
View file

@ -55,7 +55,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) {

2
htdocs/recruitment/recruitmentjobposition_card.php
View file

@ -55,7 +55,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) {

4
htdocs/recruitment/recruitmentjobposition_list.php
View file

@ -78,7 +78,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) {
@ -449,7 +449,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 '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";

8
htdocs/resource/class/dolresource.class.php
View file

@ -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
*/

4
htdocs/resource/class/html.formresource.class.php
View file

@ -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)

2
htdocs/resource/element_resource.php
View file

@ -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) {

2
htdocs/salaries/card.php
View file

@ -1001,7 +1001,7 @@ if ($id > 0) {
$i = 0;
$total = 0;
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="noborder paymenttable">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("RefPayment").'</td>';

6
htdocs/salaries/class/paymentsalary.class.php
View file

@ -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);

4
htdocs/salaries/class/salariesstats.class.php
View file

@ -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
{

10
htdocs/salaries/class/salary.class.php
View file

@ -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)

4
htdocs/salaries/list.php
View file

@ -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 '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
// Fields title search

6
htdocs/salaries/payment_salary/card.php
View file

@ -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 '<br>';
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans('Salary').'</td>';
@ -239,7 +239,7 @@ if ($resql) {
print '<td class="right">'.price($objp->sc_amount).'</td>';
// Status
print '<td class="center">'.$salary->getLibStatut(4, $objp->amount).'</td>';
// Amount payed
// Amount paid
print '<td class="right">'.price($objp->amount).'</td>';
print "</tr>\n";
if ($objp->paye == 1) {

2
htdocs/salaries/payments.php
View file

@ -115,7 +115,7 @@ if (!GETPOST('search_type_id', 'int')) {
$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) {

4
htdocs/salaries/virement_request.php
View file

@ -369,7 +369,7 @@ if ($resql) {
$i = 0;
$total = 0;
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="noborder paymenttable">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("RefPayment").'</td>';
@ -481,7 +481,7 @@ if ($object->paye == 0 && $hadRequest == 0) {
print '</form>';
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 "<br>";
//add stripe sepa button
$buttonlabel = $langs->trans("MakeWithdrawRequestStripe");

2
htdocs/societe/admin/societe.php
View file

@ -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);

12
htdocs/societe/canvas/actions_card_common.class.php
View file

@ -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;

2
htdocs/societe/canvas/company/actions_card_company.class.php
View file

@ -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

2
htdocs/societe/canvas/company/tpl/card_create.tpl.php
View file

@ -114,7 +114,7 @@ if (isModEnabled('barcode')) { ?>
<tr>
<td class="tdtop"><?php echo $langs->trans('Address'); ?></td>
<td colspan="3"><textarea name="adress" cols="40" rows="3"><?php echo $this->control->tpl['address']; ?></textarea></td>
<td colspan="3"><textarea name="address" cols="40" rows="3"><?php echo $this->control->tpl['address']; ?></textarea></td>
</tr>
<tr>

2
htdocs/societe/canvas/company/tpl/card_edit.tpl.php
View file

@ -129,7 +129,7 @@ if (isModEnabled('barcode')) { ?>
<tr>
<td class="tdtop"><?php echo $langs->trans('Address'); ?></td>
<td colspan="3"><textarea name="adress" cols="40" rows="3"><?php echo $this->control->tpl['address']; ?></textarea></td>
<td colspan="3"><textarea name="address" cols="40" rows="3"><?php echo $this->control->tpl['address']; ?></textarea></td>
</tr>
<tr>

4
htdocs/societe/canvas/individual/actions_card_individual.class.php
View file

@ -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

2
htdocs/societe/canvas/individual/tpl/card_create.tpl.php
View file

@ -122,7 +122,7 @@ if (isModEnabled('barcode')) { ?>
<tr>
<td class="tdtop"><?php echo $langs->trans('Address'); ?></td>
<td colspan="3"><textarea name="adresse" cols="40" rows="3"><?php echo $this->control->tpl['address']; ?></textarea></td>
<td colspan="3"><textarea name="address" cols="40" rows="3"><?php echo $this->control->tpl['address']; ?></textarea></td>
</tr>
<tr>

2
htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
View file

@ -126,7 +126,7 @@ if ($this->control->tpl['fournisseur']) {
<tr>
<td class="tdtop"><?php echo $langs->trans('Address'); ?></td>
<td colspan="3"><textarea name="adresse" cols="40" rows="3"><?php echo $this->control->tpl['address']; ?></textarea></td>
<td colspan="3"><textarea name="address" cols="40" rows="3"><?php echo $this->control->tpl['address']; ?></textarea></td>
</tr>
<tr>

4
htdocs/societe/card.php
View file

@ -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 '<tr><td>'.$form->editfieldkey('VATIsUsed', 'assujtva_value', '', $object, 0).'</td>';
print '<td>';
print '<input id="assujtva_value" name="assujtva_value" type="checkbox" ' . (GETPOSTISSET('assujtva_value') ? 'checked="checked"' : 'checked="checked"') . ' value="1">'; // Assujeti par defaut en creation
print '<input id="assujtva_value" name="assujtva_value" type="checkbox" ' . (GETPOSTISSET('assujtva_value') ? 'checked="checked"' : 'checked="checked"') . ' value="1">'; // Assujeti par default en creation
print '</td>';
if ($conf->browser->layout == 'phone') {
print '</tr><tr>';

4
htdocs/societe/checkvat/checkVatPopup.php
View file

@ -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'].'<br>';
}
@ -120,7 +120,7 @@ if (!$vatNumber) {
print $langs->trans("ValueIsValid").': <span class="error">'.$langs->trans("No").'</span> (Might be a non europeen VAT)<br>';
//$messagetoshow=$soapclient->response;
} else {
// Syntaxe ok
// Syntax ok
if ($result['requestDate']) {
print $langs->trans("Date").': '.$result['requestDate'].'<br>';
}

8
htdocs/societe/class/api_contacts.class.php
View file

@ -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;
}

34
htdocs/societe/class/api_thirdparties.class.php
View file

@ -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)%')";

4
htdocs/societe/class/companybankaccount.class.php
View file

@ -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;

4
htdocs/societe/class/companypaymentmode.class.php
View file

@ -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', ...)

42
htdocs/societe/class/societe.class.php
View file

@ -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

8
htdocs/societe/class/societeaccount.class.php
View file

@ -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

6
htdocs/societe/list.php
View file

@ -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 '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
// Fields title search

2
htdocs/societe/paymentmodes.php
View file

@ -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 '<!-- List of card payments -->'."\n";
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="liste centpercent">'."\n";
print '<tr class="liste_titre">';
print '<td>'.$langs->trans('Label').'</td>';

2
htdocs/societe/societecontact.php
View file

@ -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';

4
htdocs/societe/website.php
View file

@ -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 '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";

2
htdocs/stripe/class/actions_stripe.class.php
View file

@ -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);

14
htdocs/stripe/class/stripe.class.php
View file

@ -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';

14
htdocs/supplier_proposal/card.php
View file

@ -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 '<td colspan="2">';
$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 '<script>
$(document).ready(function() {
@ -1557,7 +1557,7 @@ if ($action == 'create') {
// Confirm validate askprice
$error = 0;
// on verifie si l'objet est en numerotation provisoire
// Verify if the object has a temporary number
$ref = substr($object->ref, 1, 4);
if ($ref == 'PROV') {
$numref = $object->getNextNumRef($soc);
@ -1647,8 +1647,8 @@ if ($action == 'create') {
// Relative and absolute discounts
if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {
$filterabsolutediscount = "fk_invoice_supplier_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
$filterabsolutediscount = "fk_invoice_supplier_source IS NULL"; // If we want deposit to be subtracted to payments only and not to total of final invoice
$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL"; // If we want deposit to be subtracted to payments only and not to total of final invoice
} else {
$filterabsolutediscount = "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')";
$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS PAID)%')";

4
htdocs/supplier_proposal/class/api_supplier_proposals.class.php
View file

@ -54,7 +54,7 @@ class SupplierProposals extends DolibarrApi
/**
* Get properties of a supplier proposal (price request) object
*
* Return an array with supplier proposal informations
* Return an array with supplier proposal information
*
* @param int $id ID of supplier proposal
* @return Object Object with cleaned properties
@ -91,7 +91,7 @@ class SupplierProposals extends DolibarrApi
* @param int $page Page number
* @param string $thirdparty_ids Thirdparty ids to filter supplier proposals (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.datec:<:'20160101')"
* @param string $properties Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
* @param string $properties Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
* @return array Array of order objects
*/
public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '', $properties = '')

32
htdocs/supplier_proposal/class/supplier_proposal.class.php
View file

@ -248,7 +248,7 @@ class SupplierProposal extends CommonObject
* @param int $remise_percent Discount effected on Product
* @return int Return integer <0 if KO, >0 if OK
*
* TODO Remplacer les appels a cette fonction par generation objet Ligne
* TODO Remplacer les appels a cette fonction par generation object Ligne
*/
public function add_product($idproduct, $qty, $remise_percent = 0)
{
@ -362,7 +362,7 @@ class SupplierProposal extends CommonObject
/**
* Add a proposal line into database (linked to product/service or not)
* Les parametres sont deja cense etre juste et avec valeurs finales a l'appel
* Les parameters sont deja cense etre juste et avec valeurs finales a l'appel
* de cette methode. Aussi, pour le taux tva, il doit deja avoir ete defini
* par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,'',produit)
* et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue)
@ -586,7 +586,7 @@ class SupplierProposal extends CommonObject
$this->line->date_start = $date_start;
$this->line->date_end = $date_end;
// infos marge
// infos merge
if (!empty($fk_product) && $fk_product > 0 && empty($fk_fournprice) && empty($pa_ht)) {
// When fk_fournprice is 0, we take the lowest buying price
include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
@ -628,7 +628,7 @@ class SupplierProposal extends CommonObject
}
}
// Mise a jour informations denormalisees au niveau de la propale meme
// Mise a jour information denormalisees au niveau de la propale meme
$result = $this->update_price(1, 'auto', 0, $this->thirdparty); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
if ($result > 0) {
$this->db->commit();
@ -662,7 +662,7 @@ class SupplierProposal extends CommonObject
* @param double $txlocaltax2 Local tax 2 rate
* @param string $desc Description
* @param double $price_base_type HT or TTC
* @param int $info_bits Miscellaneous informations
* @param int $info_bits Miscellaneous information
* @param int $special_code Special code (also used by externals modules!)
* @param int $fk_parent_line Id of parent line (0 in most cases, used by modules adding sublevels into lines).
* @param int $skip_update_total Keep fields total_xxx to 0 (used for special lines by some modules)
@ -789,7 +789,7 @@ class SupplierProposal extends CommonObject
$this->line->ref_fourn = $ref_supplier;
$this->line->fk_unit = $fk_unit;
// infos marge
// infos merge
if (!empty($fk_product) && $fk_product > 0 && empty($fk_fournprice) && empty($pa_ht)) {
// by external module, take lowest buying price
include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
@ -1787,10 +1787,10 @@ class SupplierProposal extends CommonObject
}
/**
* Upate ProductFournisseur
* Update ProductFournisseur
*
* @param int $idProductFournPrice id of llx_product_fournisseur_price
* @param Product $product contain informations to update
* @param Product $product contain information to update
* @param User $user Object user
* @return int Return integer <0 if KO, >0 if OK
*/
@ -1911,7 +1911,7 @@ class SupplierProposal extends CommonObject
if (!$error) {
$this->status = self::STATUS_DRAFT;
$this->statut = self::STATUS_DRAFT; // dperecated
$this->statut = self::STATUS_DRAFT; // deprecated
$this->db->commit();
return 1;
} else {
@ -1931,7 +1931,7 @@ class SupplierProposal extends CommonObject
* @param int $shortlist 0=Return array[id]=ref, 1=Return array[](id=>id,ref=>ref,name=>name)
* @param int $draft 0=not draft, 1=draft
* @param int $notcurrentuser 0=all user, 1=not current user
* @param int $socid Id third pary
* @param int $socid Id third party
* @param int $limit For pagination
* @param int $offset For pagination
* @param string $sortfield Sort criteria
@ -2313,7 +2313,7 @@ class SupplierProposal extends CommonObject
}
}
// Initialise parametres
// Initialise parameters
$this->id = 0;
$this->ref = 'SPECIMEN';
$this->specimen = 1;
@ -2500,7 +2500,7 @@ class SupplierProposal 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 int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
* @param int $addlinktonotes Add link to show notes
@ -2877,14 +2877,14 @@ class SupplierProposalLine extends CommonObjectLine
public $marge_tx;
public $marque_tx;
public $special_code; // Tag for special lines (exlusive tags)
public $special_code; // Tag for special lines (exclusive tags)
// 1: frais de port
// 2: ecotaxe
// 3: option line (when qty = 0)
public $info_bits = 0; // Liste d'options cumulables:
// Bit 0: 0 si TVA normal - 1 si TVA NPR
// Bit 1: 0 ligne normale - 1 si ligne de remise fixe
// Bit 0: 0 si TVA normal - 1 if TVA NPR
// Bit 1: 0 ligne normal - 1 if fixed reduction
public $total_ht; // Total HT de la ligne toute quantite et incluant la remise ligne
public $total_tva; // Total TVA de la ligne toute quantite et incluant la remise ligne
@ -2955,7 +2955,7 @@ class SupplierProposalLine extends CommonObjectLine
public $multicurrency_total_ttc;
/**
* Class line Contructor
* Class line Constructor
*
* @param DoliDB $db Database handler
*/

2
htdocs/supplier_proposal/list.php
View file

@ -1028,7 +1028,7 @@ if ($resql) {
print '<div class="box-flex-container kanban">';
}
// Output Kanban
// TODO Use a cahe on user
// TODO Use a cache on user
$userstatic->fetch($obj->fk_user_author);
$objectstatic->delivery_date = $obj->dp;
print $objectstatic->getKanbanView('', array('thirdparty'=>$companystatic, 'userauthor'=>$userstatic, 'selected' => in_array($obj->id, $arrayofselected)));

4
htdocs/support/inc.php
View file

@ -130,7 +130,7 @@ if (!isset($dolibarr_main_db_prefix) || !$dolibarr_main_db_prefix) {
}
define('MAIN_DB_PREFIX', (isset($dolibarr_main_db_prefix) ? $dolibarr_main_db_prefix : ''));
define('DOL_CLASS_PATH', 'class/'); // Filsystem path to class dir
define('DOL_CLASS_PATH', 'class/'); // Filesystem path to class dir
define('DOL_DATA_ROOT', (isset($dolibarr_main_data_root) ? $dolibarr_main_data_root : ''));
define('DOL_MAIN_URL_ROOT', (isset($dolibarr_main_url_root) ? $dolibarr_main_url_root : '')); // URL relative root
$uri = preg_replace('/^http(s?):\/\//i', '', constant('DOL_MAIN_URL_ROOT')); // $uri contains url without http*
@ -166,7 +166,7 @@ if (empty($conf->db->user)) {
}
// Defini objet langs
// Defini object langs
$langs = new Translate('..', $conf);
if (GETPOST('lang', 'aZ09')) {
$langs->setDefaultLang(GETPOST('lang', 'aZ09'));

2
htdocs/takepos/admin/setup.php
View file

@ -144,7 +144,7 @@ $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
print load_fiche_titre($langs->trans('CashDeskRefNumberingModules'), '', '');
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Name")."</td>\n";

2
htdocs/takepos/genimg/index.php
View file

@ -16,7 +16,7 @@
*/
// This page return an image of public photos of a category or product.
// Test to check image can be publically viewed is done inside the viewimage.php wrapper.
// Test to check image can be publicly viewed is done inside the viewimage.php wrapper.
//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language
//if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1'); // Not disabled cause need to load personalized language

4
htdocs/takepos/index.php
View file

@ -400,7 +400,7 @@ function LoadProducts(position, issubcat) {
}
$("#prowatermark"+ishow).hide();
ishow++; //Next product to show after print data product
idata++; //Next data everytime
idata++; //Next data every time
}
});
@ -475,7 +475,7 @@ function MoreProducts(moreorless) {
}
$("#prowatermark"+ishow).hide();
ishow++; //Next product to show after print data product
idata++; //Next data everytime
idata++; //Next data every time
}
});

8
htdocs/takepos/invoice.php
View file

@ -82,7 +82,7 @@ if ((getDolGlobalString('TAKEPOS_PHONE_BASIC_LAYOUT') == 1 && $conf->browser->la
/**
* Abort invoice creationg with a given error message
* Abort invoice creation with a given error message
*
* @param string $message Message explaining the error to the user
* @return void
@ -434,7 +434,7 @@ if (empty($reshook)) {
$line->fk_parent_line = $fk_parent_line;
$line->subprice = -$line->subprice; // invert price for object
$line->pa_ht = $line->pa_ht; // we choosed to have buy/cost price always positive, so no revert of sign here
$line->pa_ht = $line->pa_ht; // we chose to have the buy/cost price always positive, so no inversion of the sign here
$line->total_ht = -$line->total_ht;
$line->total_tva = -$line->total_tva;
$line->total_ttc = -$line->total_ttc;
@ -446,7 +446,7 @@ if (empty($reshook)) {
$line->multicurrency_total_tva = -$line->multicurrency_total_tva;
$line->multicurrency_total_ttc = -$line->multicurrency_total_ttc;
$result = $line->insert(0, 1); // When creating credit note with same lines than source, we must ignore error if discount alreayd linked
$result = $line->insert(0, 1); // When creating credit note with same lines than source, we must ignore error if discount already linked
$creditnote->lines[] = $line; // insert new line in current object
@ -766,7 +766,7 @@ if (empty($reshook)) {
// Action to delete or discard an invoice
if ($action == "delete" && ($user->hasRight('takepos', 'run') || defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE'))) {
// $placeid is the invoice id (it differs from place) and is defined if the place is set and the ref of invoice is '(PROV-POS'.$_SESSION["takeposterminal"].'-'.$place.')', so the fetch at begining of page works.
// $placeid is the invoice id (it differs from place) and is defined if the place is set and the ref of invoice is '(PROV-POS'.$_SESSION["takeposterminal"].'-'.$place.')', so the fetch at beginning of page works.
if ($placeid > 0) {
$result = $invoice->fetch($placeid);

2
htdocs/takepos/pay.php
View file

@ -447,7 +447,7 @@ if (!getDolGlobalInt("TAKEPOS_NUMPAD")) {
console.log("error when capturing paymentIntent", result.error);
} else {
document.getElementById("card-present-alert").innerHTML = '<div class="warning clearboth"><?php echo $langs->trans('PaymentValidated'); ?></div>';
console.log("Capture paymentIntent successfull "+paymentIntentId);
console.log("Capture paymentIntent successful "+paymentIntentId);
parent.$("#poslines").load("invoice.php?place=<?php echo $place; ?>&action=valid&token=<?php echo newToken(); ?>&pay=CB&amount="+amountpayed+"&excess="+excess+"&invoiceid="+invoiceid+"&accountid="+accountid, function() {
if (amountpayed > <?php echo $remaintopay; ?> || amountpayed == <?php echo $remaintopay; ?> || amountpayed==0 ) {
console.log("Close popup");

4
htdocs/theme/eldy/badges.inc.php
View file

@ -3,7 +3,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
die('Must be call by steelsheet');
}
?>
/* Badge style is based on boostrap framework */
/* Badge style is based on bootstrap framework */
.badge {
display: inline-block;
@ -24,7 +24,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
.badge-status {
font-size: 0.95em;
padding: .19em .35em; /* more than 0.19 generate a change into heigth of lines */
padding: .19em .35em; /* more than 0.19 generate a change into height of lines */
}
.tabBar .arearef .statusref .badge-status, .tabBar .arearefnobottom .statusref .badge-status {
font-size: 1.1em;

2
htdocs/theme/eldy/btn.inc.php
View file

@ -255,7 +255,7 @@ a.btnTitle.btnTitleSelected {
text-decoration: none;
box-shadow: none;
}
/* The buttonplus isgrowing on hover (dont know why). This is to avoid to have the cellegrowing too */
/* The buttonplus isgrowing on hover (don't know why). This is to avoid to have the cellegrowing too */
.btnTitlePlus:hover {
max-width: 24px;
max-height: 40px;

2
htdocs/theme/eldy/dropdown.inc.php
View file

@ -2,7 +2,7 @@
if (!defined('ISLOADEDBYSTEELSHEET')) {
die('Must be call by steelsheet');
} ?>
/* <style type="text/css" > dont remove this line it's an ide hack */
/* <style type="text/css" > don't remove this line it's an ide hack */
/*
* Dropdown of user popup
*/

2
htdocs/theme/eldy/flags-sprite.inc.php
View file

@ -2,7 +2,7 @@
if (!defined('ISLOADEDBYSTEELSHEET')) {
die('Must be call by steelsheet');
} ?>
/* <style type="text/css" > dont remove this line it's an ide hack */
/* <style type="text/css" > don't remove this line it's an ide hack */
.flag-sprite {
background:url(<?php echo dol_buildpath($path.'/theme/common/flags/flag-sprite.png', 1) ?>) no-repeat top left; display:inline-block;

18
htdocs/theme/eldy/global.inc.php
View file

@ -1587,7 +1587,7 @@ div.fiche {
.thumbstat150 {
min-width: 168px;
max-width: 169px;
/* width: 168px; If I use with, there is trouble on size of flex boxes solved with min+max that is a little bit higer than min */
/* width: 168px; If I use with, there is trouble on size of flex boxes solved with min+max that is a little bit higher than min */
}
.thumbstat, .thumbstat150 {
<?php if ($conf->browser->name == 'ie') { ?>
@ -1934,7 +1934,7 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
width: <?php print dol_size(300, 'width'); ?>px;
}
/* intput, input[type=text], */
/* input, input[type=text], */
select {
width: 98%;
min-width: 40px;
@ -2308,7 +2308,7 @@ div.secondcolumn div.box {
}*/
/* Force values on one colum for small screen */
/* Force values on one column for small screen */
@media only screen and (max-width: 1000px)
{
div.fiche {
@ -2351,7 +2351,7 @@ div.secondcolumn div.box {
}
}
/* Force values on one colum for small screen */
/* Force values on one column for small screen */
@media only screen and (max-width: 1499px)
{
div.fichehalfleft-lg {
@ -4314,7 +4314,7 @@ div.liste_titre .tagtd {
vertical-align: middle;
}
div.liste_titre {
min-height: 26px !important; /* We cant use height because it's a div and it should be higher if content is more. but min-height does not work either for div */
min-height: 26px !important; /* We can't use height because it's a div and it should be higher if content is more. but min-height does not work either for div */
padding-top: 2px;
padding-bottom: 2px;
@ -4645,7 +4645,7 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
margin-bottom: 8px;
min-width: <?php echo isset($_SESSION['dol_screenwidth']) ? min(160, round((int) $_SESSION['dol_screenwidth'] / 2 - 20)) : 160; ?>px; /* on screen < 320, we guaranty to have 2 columns */
max-width: <?php echo isset($_SESSION['dol_screenwidth']) ? min(161, round((int) $_SESSION['dol_screenwidth'] / 2 - 20)) : 161; ?>px; /* on screen < 320, we guaranty to have 2 columns */
/* width: ...px; If I use with, there is trouble on size of flex boxes solved with min + (max that is a little bit higer than min) */
/* width: ...px; If I use with, there is trouble on size of flex boxes solved with min + (max that is a little bit higher than min) */
}
.dashboardlineindicator {
float: left;
@ -7023,7 +7023,7 @@ a.ui-link {
text-overflow: clip; /* "hidden" : do not exists as a text-overflow value (https://developer.mozilla.org/fr/docs/Web/CSS/text-overflow) */
}
/* Warning: setting this may make screen not beeing refreshed after a combo selection */
/* Warning: setting this may make screen not being refreshed after a combo selection */
/*.ui-body-c {
background: #fff;
}*/
@ -7604,7 +7604,7 @@ span.clipboardCPValueToPrint, div.clipboardCPValueToPrint {
}
span.clipboardCPValue.hidewithsize {
width: 0 !important;
display: inline-block; /* this will be modifiy on the fly by the copy-paste js code in lib_foot.js.php to have copy feature working */
display: inline-block; /* this will be modify on the fly by the copy-paste js code in lib_foot.js.php to have copy feature working */
color: transparent;
white-space: nowrap;
overflow-x: hidden;
@ -7621,7 +7621,7 @@ div.clipboardCPValue.hidewithsize {
display: none;
}
/* To make a div popup, we must use a position aboluste inside a position relative */
/* To make a div popup, we must use a position absolute inside a position relative */
.clipboardCPText {
position: relative;
}

2
htdocs/theme/eldy/progress.inc.php
View file

@ -4,7 +4,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
} ?>
/* <style type="text/css" > */
/*
progress style is based on boostrap and admin lte framework
progress style is based on bootstrap and admin lte framework
*/

8
htdocs/theme/eldy/theme_vars.inc.php
View file

@ -95,15 +95,15 @@ $badgeDanger = '#af4705'; // See $textDanger
$badgeDark = '#343a40';
$badgeLight = '#f8f9fa';
// badge color ajustement for color blind
// badge color adjustment for color blind
$colorblind_deuteranopes_badgeSuccess = '#37de5d'; //! text color black
$colorblind_deuteranopes_badgeSuccess_textColor7 = '#000';
$colorblind_deuteranopes_badgeWarning = '#e4e411';
$colorblind_deuteranopes_badgeDanger = $badgeDanger; // currently not tested with a color blind people so use default color
/* default color for status : After a quick check, somme status can have oposite function according to objects
/* default color for status : After a quick check, somme status can have opposite function according to objects
* So this badges status uses default value according to theme eldy status img
* TODO: use color definition vars above for define badges color status X -> exemple $badgeStatusValidate, $badgeStatusClosed, $badgeStatusActive ....
* TODO: use color definition vars above for define badges color status X -> example $badgeStatusValidate, $badgeStatusClosed, $badgeStatusActive ....
*/
$badgeStatus0 = '#cbd3d3'; // draft
$badgeStatus1 = '#bc9526'; // validated
@ -120,7 +120,7 @@ $badgeStatus9 = '#e7f0f0';
$badgeStatus10 = '#993013';
$badgeStatus11 = '#15a540';
// status color ajustement for color blind
// status color adjustment for color blind
$colorblind_deuteranopes_badgeStatus4 = $colorblind_deuteranopes_badgeStatus7 = $colorblind_deuteranopes_badgeSuccess; //! text color black
$colorblind_deuteranopes_badgeStatus_textColor4 = $colorblind_deuteranopes_badgeStatus_textColor7 = '#000';
$colorblind_deuteranopes_badgeStatus1 = $colorblind_deuteranopes_badgeWarning;

4
htdocs/theme/md/badges.inc.php
View file

@ -5,7 +5,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
?>
/* <style type="text/css" > */
/*
Badge style is based on boostrap framework
Badge style is based on bootstrap framework
*/
.badge {
@ -27,7 +27,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
.badge-status {
font-size: 1em;
padding: .19em .35em; /* more than 0.19 generate a change into heigth of lines */
padding: .19em .35em; /* more than 0.19 generate a change into height of lines */
}
.tabBar .arearef .statusref .badge-status, .tabBar .arearefnobottom .statusref .badge-status {
font-size: 1.1em;

2
htdocs/theme/md/btn.inc.php
View file

@ -379,7 +379,7 @@ div.pagination .btnTitle:hover .btnTitle-label{
border-color: #ddd;
}
/* The buttonplus isgrowing on hover (dont know why). This is to avoid to have the cellegrowing too */
/* The buttonplus isgrowing on hover (don't know why). This is to avoid to have the cellegrowing too */
.btnTitlePlus:hover {
max-width: 24px;
max-height: 40px;

2
htdocs/theme/md/dropdown.inc.php
View file

@ -2,7 +2,7 @@
if (!defined('ISLOADEDBYSTEELSHEET')) {
die('Must be call by steelsheet');
} ?>
/* <style type="text/css" > dont remove this line it's an ide hack */
/* <style type="text/css" > don't remove this line it's an ide hack */
/*
* Dropdown of user popup
*/

2
htdocs/theme/md/flags-sprite.inc.php
View file

@ -2,7 +2,7 @@
if (!defined('ISLOADEDBYSTEELSHEET')) {
die('Must be call by steelsheet');
} ?>
/* <style type="text/css" > dont remove this line it's an ide hack */
/* <style type="text/css" > don't remove this line it's an ide hack */
.flag-sprite {
background:url(<?php echo dol_buildpath($path.'/theme/common/flags/flag-sprite.png', 1) ?>) no-repeat top left; display:inline-block;

2
htdocs/theme/md/info-box.inc.php
View file

@ -517,7 +517,7 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
}
/* USING IMAGES FOR WEATHER INTEAD OF FONT AWESOME */
/* USING IMAGES FOR WEATHER INSTEAD OF FONT AWESOME */
/* For other themes just uncomment this part */
/*.info-box-weather-level0,
.info-box-weather-level1,

14
htdocs/theme/md/style.css.php
View file

@ -2165,7 +2165,7 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
width: <?php print dol_size(300, 'width'); ?>px;
}
/* intput, input[type=text], */
/* input, input[type=text], */
select {
width: 98%;
min-width: 40px;
@ -2501,7 +2501,7 @@ div.fichehalfright {
} ?>
}
/* Force values on one colum for small screen */
/* Force values on one column for small screen */
@media only screen and (max-width: 1499px)
{
div.fichehalfleft-lg {
@ -2525,7 +2525,7 @@ div.secondcolumn div.box {
padding-left: 10px;
}*/
/* Force values on one colum for small screen */
/* Force values on one column for small screen */
@media only screen and (max-width: 900px)
{
div.fiche {
@ -4450,7 +4450,7 @@ div.liste_titre .tagtd {
vertical-align: middle;
}
div.liste_titre {
min-height: 26px !important; /* We cant use height because it's a div and it should be higher if content is more. but min-height doe not work either for div */
min-height: 26px !important; /* We can't use height because it's a div and it should be higher if content is more. but min-height doe not work either for div */
padding-top: 2px;
padding-bottom: 2px;
@ -6971,7 +6971,7 @@ a.ui-link {
text-overflow: clip; /* "hidden" : do not exists as a text-overflow value (https://developer.mozilla.org/fr/docs/Web/CSS/text-overflow) */
}
/* Warning: setting this may make screen not beeing refreshed after a combo selection */
/* Warning: setting this may make screen not being refreshed after a combo selection */
/*.ui-body-c {
background: #fff;
}*/
@ -7553,7 +7553,7 @@ span.clipboardCPValueToPrint, div.clipboardCPValueToPrint {
}
span.clipboardCPValue.hidewithsize {
width: 0 !important;
display: inline-block; /* this will be modifiy on the fly by the copy-paste js code in lib_foot.js.php to have copy feature working */
display: inline-block; /* this will be modify on the fly by the copy-paste js code in lib_foot.js.php to have copy feature working */
color: transparent;
white-space: nowrap;
overflow-x: hidden;
@ -7570,7 +7570,7 @@ div.clipboardCPValue.hidewithsize {
display: none;
}
/* To make a div popup, we must use a position aboluste inside a position relative */
/* To make a div popup, we must use a position absolute inside a position relative */
.clipboardCPText {
position: relative;

8
htdocs/theme/md/theme_vars.inc.php
View file

@ -90,15 +90,15 @@ $badgeDanger = '#8c4446'; // See $textDanger
$badgeDark = '#343a40';
$badgeLight = '#f8f9fa';
// badge color ajustement for color blind
// badge color adjustment for color blind
$colorblind_deuteranopes_badgeSuccess = '#37de5d'; //! text color black
$colorblind_deuteranopes_badgeSuccess_textColor7 = '#000';
$colorblind_deuteranopes_badgeWarning = '#e4e411';
$colorblind_deuteranopes_badgeDanger = $badgeDanger; // currently not tested with a color blind people so use default color
/* default color for status : After a quick check, somme status can have oposite function according to objects
/* default color for status : After a quick check, somme status can have opposite function according to objects
* So this badges status uses default value according to theme eldy status img
* TODO: use color definition vars above for define badges color status X -> exemple $badgeStatusValidate, $badgeStatusClosed, $badgeStatusActive ....
* TODO: use color definition vars above for define badges color status X -> example $badgeStatusValidate, $badgeStatusClosed, $badgeStatusActive ....
*/
$badgeStatus0 = '#cbd3d3'; // draft
$badgeStatus1 = '#bc9526'; // validated
@ -115,7 +115,7 @@ $badgeStatus9 = '#e7f0f0';
$badgeStatus10 = '#993013';
$badgeStatus11 = '#15a540';
// status color ajustement for color blind
// status color adjustment for color blind
$colorblind_deuteranopes_badgeStatus4 = $colorblind_deuteranopes_badgeStatus7 = $colorblind_deuteranopes_badgeSuccess; //! text color black
$colorblind_deuteranopes_badgeStatus_textColor4 = $colorblind_deuteranopes_badgeStatus_textColor7 = '#000';
$colorblind_deuteranopes_badgeStatus1 = $colorblind_deuteranopes_badgeWarning;

4
htdocs/ticket/card.php
View file

@ -92,7 +92,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) {
@ -1240,7 +1240,7 @@ if ($action == 'create' || $action == 'presend') {
$actionobject->viewTicketOriginalMessage($user, $action, $object);
// Classification of ticket
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="noborder tableforfield centpercent margintable">';
print '<tr class="liste_titre">';
print '<td>';

4
htdocs/ticket/class/actions_ticket.class.php
View file

@ -179,7 +179,7 @@ class ActionsTicket extends CommonHookActions
/**
* Show ticket original message
*
* @param User $user User wich display
* @param User $user User which display
* @param string $action Action mode
* @param Ticket $object Object ticket
* @return void
@ -198,7 +198,7 @@ class ActionsTicket extends CommonHookActions
}
// Initial message
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="noborder centpercent margintable margintable">';
print '<tr class="liste_titre trforfield"><td class="nowrap titlefield">';
print $langs->trans("InitialMessage");

16
htdocs/ticket/class/api_tickets.class.php
View file

@ -63,7 +63,7 @@ class Tickets extends DolibarrApi
/**
* Get properties of a Ticket object.
*
* Return an array with ticket informations
* Return an array with ticket information
*
* @param int $id ID of ticket
* @return Object Object with cleaned properties
@ -80,7 +80,7 @@ class Tickets extends DolibarrApi
/**
* Get properties of a Ticket object from track id
*
* Return an array with ticket informations
* Return an array with ticket information
*
* @param string $track_id Tracking ID of ticket
* @return array|mixed Data without useless information
@ -99,7 +99,7 @@ class Tickets extends DolibarrApi
/**
* Get properties of a Ticket object from ref
*
* Return an array with ticket informations
* Return an array with ticket information
*
* @param string $ref Reference for ticket
* @return array|mixed Data without useless information
@ -117,7 +117,7 @@ class Tickets extends DolibarrApi
/**
* Get properties of a Ticket object
* Return an array with ticket informations
* Return an array with ticket information
*
* @param int $id ID of ticket
* @param string $track_id Tracking ID of ticket
@ -194,7 +194,7 @@ class Tickets 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') and (t.fk_statut:=:1)"
* @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 ticket objects
*
@ -292,7 +292,7 @@ class Tickets 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->ticket->context['caller'] = $request_data['caller'];
continue;
}
@ -331,7 +331,7 @@ class Tickets 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->ticket->context['caller'] = $request_data['caller'];
continue;
}
@ -375,7 +375,7 @@ class Tickets 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->ticket->context['caller'] = $request_data['caller'];
continue;
}

4
htdocs/ticket/class/cticketcategory.class.php
View file

@ -80,7 +80,7 @@ class CTicketCategory 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'
@ -484,7 +484,7 @@ class CTicketCategory 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', ...)

20
htdocs/ticket/class/ticket.class.php
View file

@ -74,7 +74,7 @@ class Ticket extends CommonObject
/**
* @var string Hash to identify ticket publically
* @var string Hash to identify ticket publicly
*/
public $track_id;
@ -302,7 +302,7 @@ class Ticket 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'
@ -1525,7 +1525,7 @@ class Ticket 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', ...)
@ -1863,7 +1863,7 @@ class Ticket extends CommonObject
* Close a ticket
*
* @param User $user User that close
* @param int $mode 0=Close solved, 1=Close abandonned
* @param int $mode 0=Close solved, 1=Close abandoned
* @return int Return integer <0 if KO, 0=nothing done, >0 if OK
*/
public function close(User $user, $mode = 0)
@ -2129,7 +2129,7 @@ class Ticket extends CommonObject
}
/**
* Retrieve informations about internal contacts
* Retrieve information about internal contacts
*
* @param int $status Status of user or company
* @return array Array with datas : firstname, lastname, socid (-1 for internal users), email, code, libelle, status
@ -2150,7 +2150,7 @@ class Ticket extends CommonObject
}
/**
* Retrieve informations about external contacts
* Retrieve information about external contacts
*
* @param int $status Status of user or company
* @return array Array with datas : firstname, lastname, socid (-1 for internal users), email, code, libelle, status
@ -2760,7 +2760,7 @@ class Ticket extends CommonObject
}
}
// dont try to send email if no recipient
// don't try to send email if no recipient
if (!empty($sendto)) {
$this->sendTicketMessageByEmail($subject, $message, '', $sendto, $listofpaths, $listofmimes, $listofnames);
}
@ -2855,7 +2855,7 @@ class Ticket extends CommonObject
}
}
// Dont try to send email when no recipient
// Don't try to send email when no recipient
if (!empty($sendto)) {
$result = $this->sendTicketMessageByEmail($subject, $message, '', $sendto, $listofpaths, $listofmimes, $listofnames);
if ($result) {
@ -2870,7 +2870,7 @@ class Ticket extends CommonObject
}
// Set status back to "In progress" if not set yet, but only if internal user and not a private message
// Or set status to "In porgress" if the client has answered and if the ticket has started
// Or set status to "In progress" if the client has answered and if the ticket has started
// So we are sure to leave the STATUS_DRAFT, STATUS_NEED_INFO.
if (($object->status < self::STATUS_IN_PROGRESS && !$user->socid && !$private) ||
($object->status > self::STATUS_IN_PROGRESS && $public_area)
@ -2895,7 +2895,7 @@ class Ticket extends CommonObject
* @param string $subject Email subject
* @param string $message Email message
* @param int $send_internal_cc Receive a copy on internal email ($conf->global->TICKET_NOTIFICATION_EMAIL_FROM)
* @param array $array_receiver Array of receiver. exemple array('name' => 'John Doe', 'email' => 'john@doe.com', etc...)
* @param array $array_receiver Array of receiver. example array('name' => 'John Doe', 'email' => 'john@doe.com', etc...)
* @param array $filename_list List of files to attach (full path of filename on file system)
* @param array $mimetype_list List of MIME type of attached files
* @param array $mimefilename_list List of attached file name in message

4
htdocs/ticket/class/ticketstats.class.php
View file

@ -18,14 +18,14 @@
/**
* \file /ticket/class/ticketstats.class.php
* \ingroup ticket
* \brief Fichier de la classe de gestion des stats des tickets
* \brief File for class to manage the ticket stats
*/
require_once DOL_DOCUMENT_ROOT.'/core/class/stats.class.php';
require_once 'ticket.class.php';
/**
* Classe permettant la gestion des stats des deplacements et notes de frais
* Class to manage the ticket stats
*/
class TicketStats extends Stats
{

4
htdocs/ticket/index.php
View file

@ -66,7 +66,7 @@ $object = new Ticket($db);
// Security check
//$result = restrictedArea($user, 'ticket|knowledgemanagement', 0, '', '', '', '');
if (!$user->hasRight('ticket', 'read') && !$user->hasRight('knowledgemanagement', 'knowledgerecord', 'read')) {
accessforbidden('Not enought permissions');
accessforbidden('Not enough permissions');
}
@ -123,7 +123,7 @@ if (empty($endyear)) {
$startyear = $endyear - 1;
// Change default WIDHT and HEIGHT (we need a smaller than default for both desktop and smartphone)
// Change default WIDTH and HEIGHT (we need a smaller than default for both desktop and smartphone)
$WIDTH = (($shownb && $showtot) || !empty($conf->dol_optimize_smallscreen)) ? '100%' : '80%';
if (empty($conf->dol_optimize_smallscreen)) {
$HEIGHT = '200';

4
htdocs/ticket/list.php
View file

@ -110,7 +110,7 @@ if (GETPOST('search_fk_status', 'alpha') == 'non_closed') {
$_GET['search_fk_statut'][] = 'openall'; // For backward compatibility
}
// Initialize array of search criterias
// Initialize array of search criteria
$search_all = (GETPOSTISSET("search_all") ? GETPOST("search_all", 'alpha') : GETPOST('sall'));
$search = array();
foreach ($object->fields as $key => $val) {
@ -829,7 +829,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 '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<div class="div-table-responsive-inside">';
print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";

8
htdocs/user/bank.php
View file

@ -617,7 +617,7 @@ if ($action != 'edit' && $action != 'create') { // If not bank account yet, $ac
if ($resql) {
$num = $db->num_rows($resql);
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';
@ -678,7 +678,7 @@ if ($action != 'edit' && $action != 'create') { // If not bank account yet, $ac
if ($resql) {
$num = $db->num_rows($resql);
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';
@ -736,7 +736,7 @@ if ($action != 'edit' && $action != 'create') { // If not bank account yet, $ac
if ($resql) {
$num = $db->num_rows($resql);
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';
@ -793,7 +793,7 @@ if ($action != 'edit' && $action != 'create') { // If not bank account yet, $ac
print load_fiche_titre($langs->trans("BankAccounts"), $morehtmlright, 'bank_account');
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="liste centpercent">';
print '<tr class="liste_titre">';

10
htdocs/user/card.php
View file

@ -680,7 +680,7 @@ if (empty($reshook)) {
// Echec
setEventMessages($langs->trans("ErrorFailedToSetNewPassword"), null, 'errors');
} else {
// Succes
// Success
if ($action == 'confirm_passwordsend' && $confirm == 'yes') {
if ($object->send_password($user, $newpassword) > 0) {
setEventMessages($langs->trans("PasswordChangedAndSentTo", $object->email), null, 'mesgs');
@ -1411,7 +1411,7 @@ if ($action == 'create' || $action == 'adduserldap') {
}
}
// Connexion ldap
// Connection ldap
// pour recuperer passDoNotExpire et userChangePassNextLogon
if (isModEnabled('ldap') && !empty($object->ldap_sid)) {
$ldap = new Ldap();
@ -1463,14 +1463,14 @@ if ($action == 'create' || $action == 'adduserldap') {
$head = user_prepare_head($object);
/*
* Confirmation reinitialisation mot de passe
* Confirmation reinitialisation password
*/
if ($action == 'password') {
print $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id", $langs->trans("ReinitPassword"), $langs->trans("ConfirmReinitPassword", $object->login), "confirm_password", '', 0, 1);
}
/*
* Confirmation envoi mot de passe
* Confirmation envoi password
*/
if ($action == 'passwordsend') {
print $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id", $langs->trans("SendNewPassword"), $langs->trans("ConfirmSendNewPassword", $object->login), "confirm_passwordsend", '', 0, 1);
@ -2087,7 +2087,7 @@ if ($action == 'create' || $action == 'adduserldap') {
print load_fiche_titre($langs->trans("ListOfGroupsForUser"), '', '');
// On selectionne les groupes auquel fait parti le user
// We select the groups that the users belongs to
$exclude = array();
$usergroup = new UserGroup($db);

10
htdocs/user/class/api_users.class.php
View file

@ -66,7 +66,7 @@ class Users extends DolibarrApi
* @param string $user_ids User ids filter field. Example: '1' or '1,2,3' {@pattern /^[0-9,]*$/i}
* @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.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 User objects
*/
public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $user_ids = '0', $category = 0, $sqlfilters = '', $properties = '')
@ -325,7 +325,7 @@ class Users extends DolibarrApi
throw new RestException(401, 'The property '.$field." can't be set/modified using the APIs");
}
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->useraccount->context['caller'] = $request_data['caller'];
continue;
}
@ -391,7 +391,7 @@ class Users extends DolibarrApi
}
}
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->useraccount->context['caller'] = $request_data['caller'];
continue;
}
@ -526,7 +526,7 @@ class Users extends DolibarrApi
* @param int $page Page number
* @param string $group_ids Groups ids filter field. 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 User objects
*
* @throws RestException 404 User not found
@ -595,7 +595,7 @@ class Users extends DolibarrApi
/**
* Get properties of an group object
*
* Return an array with group informations
* Return an array with group information
*
* @url GET /groups/{group}
*

4
htdocs/user/class/user.class.php
View file

@ -3334,7 +3334,7 @@ class User extends CommonObject
// When password is modified
if (!empty($this->pass)) {
if (getDolGlobalString('LDAP_FIELD_PASSWORD')) {
$info[getDolGlobalString('LDAP_FIELD_PASSWORD')] = $this->pass; // this->pass = mot de passe non crypte
$info[getDolGlobalString('LDAP_FIELD_PASSWORD')] = $this->pass; // this->pass = unencrypted password
}
if (getDolGlobalString('LDAP_FIELD_PASSWORD_CRYPTED')) {
$info[getDolGlobalString('LDAP_FIELD_PASSWORD_CRYPTED')] = dol_hash($this->pass, 'openldap'); // Create OpenLDAP password (see LDAP_PASSWORD_HASH_TYPE)
@ -3352,7 +3352,7 @@ class User extends CommonObject
} elseif (!empty($this->pass_indatabase)) {
// Use $this->pass_indatabase value if exists
if (getDolGlobalString('LDAP_FIELD_PASSWORD')) {
$info[getDolGlobalString('LDAP_FIELD_PASSWORD')] = $this->pass_indatabase; // $this->pass_indatabase = mot de passe non crypte
$info[getDolGlobalString('LDAP_FIELD_PASSWORD')] = $this->pass_indatabase; // $this->pass_indatabase = unencrypted password
}
if (getDolGlobalString('LDAP_FIELD_PASSWORD_CRYPTED')) {
$info[getDolGlobalString('LDAP_FIELD_PASSWORD_CRYPTED')] = dol_hash($this->pass_indatabase, 'openldap'); // Create OpenLDAP password (see LDAP_PASSWORD_HASH_TYPE)

18
htdocs/user/class/usergroup.class.php
View file

@ -144,7 +144,7 @@ class UserGroup extends CommonObject
/**
* Constructor de la classe
* Class constructor
*
* @param DoliDb $db Database handler
*/
@ -156,7 +156,7 @@ class UserGroup extends CommonObject
/**
* Charge un objet group avec toutes ses caracteristiques (except ->members array)
* Charge un object group avec toutes ses caracteristiques (except ->members array)
*
* @param int $id Id of group to load
* @param string $groupname Name of group to load
@ -458,7 +458,7 @@ class UserGroup extends CommonObject
if (!empty($rid)) {
$module = $perms = $subperms = '';
// Si on a demande supression d'un droit en particulier, on recupere
// Si on a demande suppression d'un droit en particulier, on recupere
// les caracteristiques module, perms et subperms de ce droit.
$sql = "SELECT module, perms, subperms";
$sql .= " FROM ".$this->db->prefix()."rights_def";
@ -489,7 +489,7 @@ class UserGroup extends CommonObject
}
// Pour compatibilite, si lowid = 0, on est en mode suppression de tout
// TODO A virer quand sera gere par l'appelant
// TODO To remove when this will be implemented by the caller
//if (substr($rid,-1,1) == 0) $wherefordel="module='$module'";
} else {
// Add permission of the list $wherefordel
@ -565,10 +565,10 @@ class UserGroup extends CommonObject
/**
* Charge dans l'objet group, la liste des permissions auquels le groupe a droit
* Load the list of permissions for the user into the group object
*
* @param string $moduletag Name of module we want permissions ('' means all)
* @return int Return integer <0 if KO, >=0 if OK
* @return int Return integer <0 if KO, >=0 if OK
*/
public function getrights($moduletag = '')
{
@ -790,7 +790,7 @@ class UserGroup extends CommonObject
}
/**
* Return a link to the user card (with optionaly the picto)
* Return a link to the user card (with optionally the picto)
* Use this->id,this->lastname, this->firstname
*
* @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto, -1=Include photo into link, -2=Only picto photo, -3=Only photo very small)
@ -912,7 +912,7 @@ class UserGroup extends CommonObject
/**
* Initialize the info array (array of LDAP values) that will be used to call LDAP functions
*
* @return array Tableau info des attributs
* @return array Tableau info des attributes
*/
public function _load_ldap_info()
{
@ -960,7 +960,7 @@ class UserGroup extends CommonObject
{
global $conf, $user, $langs;
// Initialise parametres
// Initialise parameters
$this->id = 0;
$this->ref = 'SPECIMEN';
$this->specimen = 1;

4
htdocs/user/document.php
View file

@ -62,7 +62,7 @@ if ($id) {
$caneditfield = ((($user->id == $id) && $user->hasRight("user", "self", "write"))
|| (($user->id != $id) && $user->hasRight("user", "user", "write")));
$caneditpassword = ((($user->id == $id) && $user->hasRight("user", "self", "password"))
|| (($user->id != $id) && $user->hasRight("user", "user", "passsword")));
|| (($user->id != $id) && $user->hasRight("user", "user", "password")));
}
$permissiontoadd = $caneditfield; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles
@ -199,7 +199,7 @@ if ($object->id) {
}
print '</tr>';
// Nunber of files
// Number of files
print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td>'.count($filearray).'</td></tr>';
// Total size

6
htdocs/user/group/card.php
View file

@ -401,7 +401,7 @@ if ($action == 'create') {
print load_fiche_titre($langs->trans("ListOfUsersInGroup"), '', 'user');
// On selectionne les users qui ne sont pas deja dans le groupe
// Select the users that do not belong to the group yet
$exclude = array();
if (!empty($object->members)) {
@ -420,7 +420,7 @@ if ($action == 'create') {
print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST">'."\n";
print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="action" value="adduser">';
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="noborder centpercent">'."\n";
print '<tr class="liste_titre"><td class="titlefield liste_titre">'.$langs->trans("NonAffectedUsers").'</td>'."\n";
print '<td class="liste_titre">';
@ -439,7 +439,7 @@ if ($action == 'create') {
* Group members
*/
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';
print '<td class="liste_titre">'.$langs->trans("Login").'</td>';

4
htdocs/user/group/ldap.php
View file

@ -20,7 +20,7 @@
/**
* \file htdocs/user/group/ldap.php
* \ingroup ldap
* \brief Page fiche LDAP groupe
* \brief Page Record LDAP Group
*/
// Load Dolibarr environment
@ -162,7 +162,7 @@ if (getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
// Affichage attributs LDAP
// Affichage attributes LDAP
print load_fiche_titre($langs->trans("LDAPInformationsForThisGroup"));
print '<table class="noborder centpercent">';

2
htdocs/user/group/list.php
View file

@ -102,7 +102,7 @@ if (!$user->hasRight("user", "user", "read") && !$user->admin) {
accessforbidden();
}
// Defini si peux lire/modifier utilisateurs et permisssions
// Defini si peux lire/modifier utilisateurs et permissions
$caneditperms = ($user->admin || $user->hasRight("user", "user", "write"));
$permissiontodelete = ($user->admin || $user->hasRight("user", "user", "write"));
// Advanced permissions

2
htdocs/user/hierarchy.php
View file

@ -197,7 +197,7 @@ if (!is_array($user_arbo) && $user_arbo < 0) {
print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
print '<input type="hidden" name="mode" value="'.$mode.'">';
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="liste nohover centpercent">';
print '<tr class="liste_titre_filter">';

2
htdocs/user/info.php
View file

@ -19,7 +19,7 @@
/**
* \file htdocs/user/info.php
* \ingroup core
* \brief Page des informations d'un utilisateur
* \brief Page des information d'un utilisateur
*/
// Load Dolibarr environment

2
htdocs/user/ldap.php
View file

@ -169,7 +169,7 @@ if (getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
// Affichage attributs LDAP
// Affichage attributes LDAP
print load_fiche_titre($langs->trans("LDAPInformationsForThisUser"));
print '<table class="noborder centpercent">';

4
htdocs/user/list.php
View file

@ -83,7 +83,7 @@ if (!$sortorder) {
$sortorder = "ASC";
}
// Initialize array of search criterias
// Initialize array of search criteria
$search_all = trim(GETPOST('search_all', 'alphanohtml'));
$search = array();
foreach ($object->fields as $key => $val) {
@ -735,7 +735,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 '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
// Fields title search

4
htdocs/user/param_ihm.php
View file

@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
// Load translation files required by page
$langs->loadLangs(array('companies', 'products', 'admin', 'users', 'languages', 'projects', 'members'));
// Defini si peux lire/modifier permisssions
// Defini si peux lire/modifier permissions
$canreaduser = ($user->admin || $user->hasRight("user", "user", "read"));
$id = GETPOST('id', 'int');
@ -438,7 +438,7 @@ if ($action == 'edit') {
print dol_get_fiche_end();
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="noborder centpercent">';
print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("DefaultValue").'</td><td>&nbsp;</td><td>'.$langs->trans("PersonalValue").'</td></tr>';

4
htdocs/variants/class/ProductAttribute.class.php
View file

@ -82,7 +82,7 @@ class ProductAttribute 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'
@ -1100,7 +1100,7 @@ class ProductAttribute 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', ...)

2
htdocs/variants/class/ProductAttributeValue.class.php
View file

@ -61,7 +61,7 @@ class ProductAttributeValue extends CommonObjectLine
* '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'

2
htdocs/variants/class/ProductCombination.class.php
View file

@ -165,7 +165,7 @@ class ProductCombination
}
if (!is_array($this->combination_price_levels)
|| empty($fk_price_level) // if fetch an unique level dont erase all already fetched
|| empty($fk_price_level) // if fetch an unique level don't erase all already fetched
) {
$this->combination_price_levels = array();
}

2
htdocs/variants/combinations.php
View file

@ -497,7 +497,7 @@ if (!empty($id) || !empty($ref)) {
$listofvariantselected = '';
// Create or edit a varian
// Create or edit a variant
if ($action == 'add' || ($action == 'edit')) {
if ($action == 'add') {
$title = $langs->trans('NewProductCombination');

4
htdocs/variants/list.php
View file

@ -75,7 +75,7 @@ if (!$sortorder) {
$sortorder = "ASC";
}
// Initialize array of search criterias
// Initialize array of search criteria
$search_all = GETPOST('search_all', 'alphanohtml');
$search = array();
foreach ($object->fields as $key => $val) {
@ -509,7 +509,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 '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table id="tableattributes" class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";

Some files were not shown because too many files have changed in this diff Show more