';
@@ -536,7 +536,7 @@ print ' ';
If not used by a module, I still need to understand in which case user may need this now we can set rule on product page.
if ($conf->global->PRODUIT_SOUSPRODUITS)
{
-
+
print '
';
foreach ($notavailable_choices as $choice) {
print $choice;
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 0fe1040b389..0a512b6bfc0 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -132,7 +132,7 @@ MaxNbOfLinesForBoxes=Max number of lines for widgets
PositionByDefault=Default order
Position=Position
MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries. Some modules add menu entries (in menu All mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
+MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries. Some modules add menu entries (in menu All mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
MenuForUsers=Menu for users
LangFile=.lang file
System=System
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 3ffbcf87080..a7918fc702c 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -331,7 +331,7 @@ ListOfNextSituationInvoices=List of next situation invoices
FrequencyPer_d=Every %s days
FrequencyPer_m=Every %s months
FrequencyPer_y=Every %s years
-toolTipFrequency=Examples: Set 7, Day: give a new invoice every 7 days Set 3, Month: give a new invoice every 3 month
+toolTipFrequency=Examples: Set 7, Day: give a new invoice every 7 days Set 3, Month: give a new invoice every 3 month
NextDateToExecution=Date for next invoice generation
DateLastGeneration=Date of latest generation
MaxPeriodNumber=Max nb of invoice generation
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 0cea69200dc..ca58f641e89 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -844,7 +844,7 @@ Select2NotFound=No result found
Select2Enter=Enter
Select2MoreCharacter=or more character
Select2MoreCharacters=or more characters
-Select2MoreCharactersMore=Search syntax: | OR (a|b) * Any character (a*b) ^ Start with (^ab) $ End with (ab$)
+Select2MoreCharactersMore=Search syntax: | OR (a|b) * Any character (a*b) ^ Start with (^ab) $ End with (ab$)
Select2LoadingMoreResults=Loading more results...
Select2SearchInProgress=Search in progress...
SearchIntoThirdparties=Thirdparties
diff --git a/htdocs/langs/en_US/multicurrency.lang b/htdocs/langs/en_US/multicurrency.lang
index a1e5025fa9d..fcf84791a1f 100644
--- a/htdocs/langs/en_US/multicurrency.lang
+++ b/htdocs/langs/en_US/multicurrency.lang
@@ -7,7 +7,7 @@ multicurrency_syncronize_error=Synchronisation error: %s
MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use date of document to find currency rate, instead of using latest known rate
multicurrency_useOriginTx=When an object is created from another, keep the original rate of source object (otherwise use the latest known rate)
CurrencyLayerAccount=CurrencyLayer API
-CurrencyLayerAccount_help_to_synchronize=You sould create an account on their website to use this functionnality Get your API key If you use a free account you can't change the currency source (USD by default) But if your main currency isn't USD you can use the alternate currency source to force you main currency
You are limited at 1000 synchronizations per month
+CurrencyLayerAccount_help_to_synchronize=You sould create an account on their website to use this functionnality Get your API key If you use a free account you can't change the currency source (USD by default) But if your main currency isn't USD you can use the alternate currency source to force you main currency
You are limited at 1000 synchronizations per month
multicurrency_appId=API key
multicurrency_appCurrencySource=Currency source
multicurrency_alternateCurrencySource=Alternate currency source
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index b9ce8965d71..f1cca6a1696 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -3,7 +3,7 @@ SecurityCode=Security code
NumberingShort=N°
Tools=Tools
TMenuTools=Tools
-ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.
All the tools can be reached in the left menu.
+ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.
All the tools can be reached in the left menu.
Birthday=Birthday
BirthdayDate=Birthday date
DateToBirth=Date of birth
@@ -162,9 +162,9 @@ SizeUnitinch=inch
SizeUnitfoot=foot
SizeUnitpoint=point
BugTracker=Bug tracker
-SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address. Change will become effective once you click on the confirmation link in the email. Check your inbox.
+SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address. Change will become effective once you click on the confirmation link in the email. Check your inbox.
BackToLoginPage=Back to login page
-AuthenticationDoesNotAllowSendNewPassword=Authentication mode is %s. In this mode, Dolibarr can't know nor change your password. Contact your system administrator if you want to change your password.
+AuthenticationDoesNotAllowSendNewPassword=Authentication mode is %s. In this mode, Dolibarr can't know nor change your password. Contact your system administrator if you want to change your password.
EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
ProfIdShortDesc=Prof Id %s is an information depending on third party country. For example, for country %s, it's code %s.
DolibarrDemo=Dolibarr ERP/CRM demo
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 9525b43432d..cda14147ece 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -49,7 +49,7 @@ EnhancedValue=Value
PMPValue=Weighted average price
PMPValueShort=WAP
EnhancedValueOfWarehouses=Warehouses value
-UserWarehouseAutoCreate=Create a warehouse automatically when creating a user
+UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Quantity dispatched
@@ -175,7 +175,7 @@ SelectFournisseur=Supplier filter
inventoryOnDate=Inventory
INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
-INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock mouvment have date of inventory
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement have date of inventory
inventoryChangePMPPermission=Allow to change PMP value for a product
ColumnNewPMP=New unit PMP
OnlyProdsInStock=Do not add product without stock
diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php
index 2ce78a2f8c7..49f26e47cb0 100644
--- a/htdocs/opensurvey/results.php
+++ b/htdocs/opensurvey/results.php
@@ -600,7 +600,7 @@ if (GETPOST('ajoutsujet'))
}
if ($user->rights->opensurvey->write) {
- print ' '.$langs->trans("PollAdminDesc", img_picto('','delete'), $langs->trans("Add")).' ';
+ print ' '.$langs->trans("PollAdminDesc", img_picto('','delete'), $langs->trans("Add")).' ';
}
$nbcolonnes=substr_count($object->sujet,',')+1;
diff --git a/htdocs/opensurvey/wizard/create_survey.php b/htdocs/opensurvey/wizard/create_survey.php
index 787bb7969fa..0dfc2505ce3 100644
--- a/htdocs/opensurvey/wizard/create_survey.php
+++ b/htdocs/opensurvey/wizard/create_survey.php
@@ -178,11 +178,11 @@ print ' '. $langs->trans(
if ($_SESSION['allow_comments']) $allow_comments = 'checked';
if (isset($_POST['allow_comments'])) $allow_comments=GETPOST('allow_comments')?'checked':'';
-print ' '.$langs->trans('CanComment').' '."\n";
+print ' '.$langs->trans('CanComment').' '."\n";
if ($_SESSION['allow_spy']) $allow_spy = 'checked';
if (isset($_POST['allow_spy'])) $allow_spy=GETPOST('allow_spy')?'checked':'';
-print ' '.$langs->trans('CanSeeOthersVote').' '."\n";
+print ' '.$langs->trans('CanSeeOthersVote').' '."\n";
if (GETPOST('choix_sondage'))
{
diff --git a/htdocs/product/inventory/tpl/inventory.tpl.php b/htdocs/product/inventory/tpl/inventory.tpl.php
index 05de0f4c002..c09328c3363 100644
--- a/htdocs/product/inventory/tpl/inventory.tpl.php
+++ b/htdocs/product/inventory/tpl/inventory.tpl.php
@@ -1,12 +1,12 @@
@@ -76,37 +76,37 @@
Date de création : getDate('datec') ?>
- Dernière mise à jour : getDate('tms') ?>
-
+ Dernière mise à jour : getDate('tms') ?>
+
+
-
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 3e3eb4c28a7..2ddc9f29464 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -38,13 +38,13 @@ class MouvementStock extends CommonObject
* @var string Name of table without prefix where object is stored
*/
public $table_element = 'stock_mouvement';
-
+
public $product_id;
public $warehouse_id;
public $qty;
public $type;
-
+
public $tms = '';
public $datem = '';
public $price;
@@ -54,8 +54,8 @@ class MouvementStock extends CommonObject
public $origintype;
public $inventorycode;
public $batch;
-
-
+
+
/**
* Constructor
@@ -67,7 +67,7 @@ class MouvementStock extends CommonObject
$this->db = $db;
}
-
+
/**
* Add a movement of stock (in one direction only)
*
@@ -173,7 +173,7 @@ class MouvementStock extends CommonObject
{
$tmparray=dol_getdate($eatby, true);
$eatbywithouthour=dol_mktime(0, 0, 0, $tmparray['mon'], $tmparray['mday'], $tmparray['year']);
- if ($this->db->jdate($obj->eatby) != $eatby && $this->db->jdate($obj->eatby) != $eatbywithouthour) // We test date without hours and with hours for backward compatibility
+ if ($this->db->jdate($obj->eatby) != $eatby && $this->db->jdate($obj->eatby) != $eatbywithouthour) // We test date without hours and with hours for backward compatibility
{
// If found and eatby/sellby defined into table and provided and differs, return error
$this->errors[]=$langs->trans("ThisSerialAlreadyExistWithDifferentDate", $batch, dol_print_date($this->db->jdate($obj->eatby), 'dayhour'), dol_print_date($eatby, 'dayhour'));
@@ -201,7 +201,7 @@ class MouvementStock extends CommonObject
$this->errors = $productlot->errors;
$this->db->rollback();
return -5;
- }
+ }
}
}
if ($obj->sellby)
@@ -241,7 +241,7 @@ class MouvementStock extends CommonObject
}
}
}
-
+
$i++;
}
}
@@ -270,7 +270,7 @@ class MouvementStock extends CommonObject
return -1;
}
}
-
+
// Define if we must make the stock change (If product type is a service or if stock is used also for services)
$movestock=0;
if ($product->type != Product::TYPE_SERVICE || ! empty($conf->global->STOCK_SUPPORTS_SERVICES)) $movestock=1;
@@ -297,7 +297,7 @@ class MouvementStock extends CommonObject
$this->errors[] = $langs->trans('qtyToTranferLotIsNotEnough');
$this->db->rollback();
return -8;
- }
+ }
}
else
{
@@ -310,8 +310,8 @@ class MouvementStock extends CommonObject
return -8;
}
}
- }
-
+ }
+
if ($movestock && $entrepot_id > 0) // Change stock for current product, change for subproduct is done after
{
if(!empty($this->origin)) { // This is set by caller for tracking reason
@@ -467,7 +467,7 @@ class MouvementStock extends CommonObject
$sql = "UPDATE ".MAIN_DB_PREFIX."product as p SET pmp = ".$newpmp.", ";
$sql.= " stock=(SELECT SUM(ps.reel) FROM ".MAIN_DB_PREFIX."product_stock as ps WHERE ps.fk_product = p.rowid)";
$sql.= " WHERE rowid = ".$fk_product;
-
+
dol_syslog(get_class($this)."::_create update AWP", LOG_DEBUG);
$resql=$this->db->query($sql);
if (! $resql)
@@ -476,7 +476,7 @@ class MouvementStock extends CommonObject
$error = -4;
}
}
-
+
// If stock is now 0, we can remove entry into llx_product_stock, but only if there is no child lines into llx_product_batch (detail of batch, because we can imagine
// having a lot1/qty=X and lot2/qty=-X, so 0 but we must not loose repartition of different lot.
$sql="DELETE FROM ".MAIN_DB_PREFIX."product_stock WHERE reel = 0 AND rowid NOT IN (SELECT fk_product_stock FROM ".MAIN_DB_PREFIX."product_batch as pb)";
@@ -511,7 +511,7 @@ class MouvementStock extends CommonObject
}
}
-
+
/**
* Load object in memory from the database
@@ -523,7 +523,7 @@ class MouvementStock extends CommonObject
public function fetch($id)
{
dol_syslog(__METHOD__, LOG_DEBUG);
-
+
$sql = 'SELECT';
$sql .= ' t.rowid,';
$sql .= " t.tms,";
@@ -548,20 +548,20 @@ class MouvementStock extends CommonObject
//} else {
$sql .= ' AND t.rowid = ' . $id;
//}
-
+
$resql = $this->db->query($sql);
if ($resql) {
$numrows = $this->db->num_rows($resql);
if ($numrows) {
$obj = $this->db->fetch_object($resql);
-
+
$this->id = $obj->rowid;
-
+
$this->product_id = $obj->fk_product;
$this->warehouse_id = $obj->fk_entrepot;
$this->qty = $obj->value;
$this->type = $obj->type_mouvement;
-
+
$this->tms = $this->db->jdate($obj->tms);
$this->datem = $this->db->jdate($obj->datem);
$this->price = $obj->price;
@@ -574,18 +574,18 @@ class MouvementStock extends CommonObject
$this->eatby = $this->db->jdate($obj->eatby);
$this->sellby = $this->db->jdate($obj->sellby);
}
-
+
// Retrieve all extrafields for invoice
// fetch optionals attributes and labels
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
$extrafields=new ExtraFields($this->db);
$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
$this->fetch_optionals($this->id,$extralabels);
-
+
// $this->fetch_lines();
-
+
$this->db->free($resql);
-
+
if ($numrows) {
return 1;
} else {
@@ -594,13 +594,13 @@ class MouvementStock extends CommonObject
} else {
$this->errors[] = 'Error ' . $this->db->lasterror();
dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-
+
return - 1;
}
}
-
-
-
+
+
+
/**
* Create movement in database for all subproducts
@@ -675,7 +675,7 @@ class MouvementStock extends CommonObject
function livraison($user, $fk_product, $entrepot_id, $qty, $price=0, $label='', $datem='', $eatby='', $sellby='', $batch='', $id_product_batch=0)
{
global $conf;
-
+
$skip_batch = empty($conf->productbatch->enabled);
return $this->_create($user, $fk_product, $entrepot_id, (0 - $qty), 2, $price, $label, '', $datem, $eatby, $sellby, $batch, $skip_batch, $id_product_batch);
@@ -756,7 +756,7 @@ class MouvementStock extends CommonObject
/**
* Create or update batch record (update table llx_product_batch). No check is done here, done by parent.
*
- * @param array|int $dluo Could be either
+ * @param array|int $dluo Could be either
* - int if row id of product_batch table
* - or complete array('fk_product_stock'=>, 'batchnumber'=>)
* @param int $qty Quantity of product with batch number. May be a negative amount.
@@ -765,13 +765,13 @@ class MouvementStock extends CommonObject
private function createBatch($dluo, $qty)
{
global $user;
-
+
$pdluo=new Productbatch($this->db);
$result=0;
// Try to find an existing record with same batch number or id
- if (is_numeric($dluo))
+ if (is_numeric($dluo))
{
$result=$pdluo->fetch($dluo);
if (empty($pdluo->id))
@@ -782,21 +782,21 @@ class MouvementStock extends CommonObject
$result = -2;
}
}
- else if (is_array($dluo))
+ else if (is_array($dluo))
{
- if (isset($dluo['fk_product_stock']))
+ if (isset($dluo['fk_product_stock']))
{
$vfk_product_stock=$dluo['fk_product_stock'];
$vbatchnumber = $dluo['batchnumber'];
-
+
$result = $pdluo->find($vfk_product_stock,'','',$vbatchnumber); // Search on batch number only (eatby and sellby are deprecated here)
}
- else
+ else
{
dol_syslog(get_class($this)."::createBatch array param dluo must contain at least key fk_product_stock".$error, LOG_ERR);
$result = -1;
}
- }
+ }
else
{
dol_syslog(get_class($this)."::createBatch error invalid param dluo".$error, LOG_ERR);
@@ -810,7 +810,7 @@ class MouvementStock extends CommonObject
{
//print "Avant ".$pdluo->qty." Apres ".($pdluo->qty + $qty)." ";
$pdluo->qty += $qty;
- if ($pdluo->qty == 0)
+ if ($pdluo->qty == 0)
{
$result=$pdluo->delete($user,1);
} else {
@@ -824,7 +824,7 @@ class MouvementStock extends CommonObject
$pdluo->eatby = $veatby;
$pdluo->sellby = $vsellby;
$pdluo->batch = $vbatchnumber;
-
+
$result=$pdluo->create($user,1);
if ($result < 0)
{
@@ -833,21 +833,21 @@ class MouvementStock extends CommonObject
}
}
}
-
+
return $result;
}
/**
* Return Url link of origin object
- *
+ *
* @param int $fk_origin Id origin
* @param int $origintype Type origin
* @return string
*/
- function get_origin($fk_origin, $origintype)
+ function get_origin($fk_origin, $origintype)
{
$origin='';
-
+
switch ($origintype) {
case 'commande':
require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
@@ -888,20 +888,20 @@ class MouvementStock extends CommonObject
}
if (empty($origin) || ! is_object($origin)) return '';
-
+
if ($origin->fetch($fk_origin) > 0) {
return $origin->getNomUrl(1);
}
return '';
}
-
+
/**
* Set attribute origin to object
- *
+ *
* @param string $origin_element type of element
* @param int $origin_id id of element
- *
+ *
* @return void
*/
function setOrigin($origin_element, $origin_id)
@@ -940,7 +940,7 @@ class MouvementStock extends CommonObject
// There is no specific properties. All data into insert are provided as method parameter.
}
-
+
/**
* Return a link (with optionaly the picto)
* Use this->id,this->lastname, this->firstname
@@ -962,7 +962,7 @@ class MouvementStock extends CommonObject
$label = '' . $langs->trans("Movement") . ' '.$this->id.'';
$label.= '
