diff --git a/ChangeLog b/ChangeLog index 20c79c28ce7..7edc06afec0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1845,7 +1845,7 @@ backport commit 384e3812eb73a15adafb472cacfb93397a54459b to fix W3C/edit contrac - Fix: [ bug #810 ] Cannot update ODT template path - Fix: [ bug #816 ] Sales journal does not reflect localtaxes - Fix: [ bug #817 ] Purchases journal does not reflect localtaxes -- Fix: [ bug #824 ] MAIN_DB_PREFIX not use into dictionnary +- Fix: [ bug #824 ] MAIN_DB_PREFIX not use into dictionary - Fix: [ bug #828 ] Error when code_region is not a number in llx_c_regions (with postgres) - Fix: [ bug #855 ] Holiday approval email in French - Fix: [ bug #856 ] (Holidays module) Mail error if destination user doesn't have an email @@ -1864,7 +1864,7 @@ backport commit 384e3812eb73a15adafb472cacfb93397a54459b to fix W3C/edit contrac - Fix: [ bug #736 ] Missing column in llx_c_chargesociales - Fix: Localtax2 for Spain must be based into buyer - Fix: [ bug #762 ] Bad profit calculation in Reporting -- Fix: bug dictionnary with wrong prefix table +- Fix: bug dictionary with wrong prefix table ***** ChangeLog for 3.3 compared to 3.2.* ***** For users: @@ -1952,7 +1952,7 @@ New experimental module: For developers: - New: Add webservice for thirdparty creation and list. - New: A module can overwrite templates parts. -- New: Can add a link on title field of added dictionnary. +- New: Can add a link on title field of added dictionary. - New: Uniformize code. - New: Add option WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER and WORKFLOW_DISABLE_CLASSIFY_BILLED_FROM_ORDER. diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index ebe2b58745d..156d8c813e0 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -5,7 +5,7 @@ * Copyright (C) 2005-2015 Regis Houssin * Copyright (C) 2006 Andre Cianfarani * Copyright (C) 2010-2013 Juanjo Menent - * Copyright (C) 2011-2015 Philippe Grand + * Copyright (C) 2011-2016 Philippe Grand * Copyright (C) 2012-2013 Christophe Battarel * Copyright (C) 2012 Marcos García * Copyright (C) 2012 Cedric Salvador diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php index 94c7b7bf860..84c49f6392d 100644 --- a/htdocs/core/class/commonobjectline.class.php +++ b/htdocs/core/class/commonobjectline.class.php @@ -51,7 +51,7 @@ abstract class CommonObjectLine extends CommonObject /** - * Returns the text label from units dictionnary + * Returns the text label from units dictionary * * @param string $type Label type (long or short) * @return string|int <0 if ko, label if ok diff --git a/htdocs/core/modules/modIncoterm.class.php b/htdocs/core/modules/modIncoterm.class.php index cae4f9ec28f..f7dba3a5e9d 100644 --- a/htdocs/core/modules/modIncoterm.class.php +++ b/htdocs/core/modules/modIncoterm.class.php @@ -91,7 +91,7 @@ class modIncoterm extends DolibarrModules 'tablib'=>array("Incoterms"), // Label of tables 'tabsql'=>array('SELECT rowid, code, libelle, active FROM '.MAIN_DB_PREFIX.'c_incoterms'), // Request to select fields 'tabsqlsort'=>array("rowid ASC"), // Sort order - 'tabfield'=>array("code,libelle"), // List of fields (result of select to show dictionnary) + 'tabfield'=>array("code,libelle"), // List of fields (result of select to show dictionary) 'tabfieldvalue'=>array("code,libelle"), // List of fields (list of fields to edit a record) 'tabfieldinsert'=>array("code,libelle"), // List of fields (list of fields for insert) 'tabrowid'=>array("rowid"), // Name of columns with primary key (try to always name it 'rowid') diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 66fe6edb19a..ec7a67aff83 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -5,13 +5,13 @@ * Copyright (C) 2006 Andre Cianfarani * Copyright (C) 2007-2011 Jean Heimburger * Copyright (C) 2010-2013 Juanjo Menent - * Copyright (C) 2012 Cedric Salvador + * Copyright (C) 2012 Cedric Salvador * Copyright (C) 2013-2014 Cedric GROSS * Copyright (C) 2013-2015 Marcos García * Copyright (C) 2011-2014 Alexandre Spangaro * Copyright (C) 2014 Henry Florian - * Copyright (C) 2014 Philippe Grand - * Copyright (C) 2014 Ion agorria + * Copyright (C) 2014-2016 Philippe Grand + * Copyright (C) 2014 Ion agorria * Copyright (C) 2016 Ferran Marcet * * This program is free software; you can redistribute it and/or modify @@ -3927,7 +3927,7 @@ class Product extends CommonObject } /** - * Returns the text label from units dictionnary + * Returns the text label from units dictionary * * @param string $type Label type (long or short) * @return string|int <0 if ko, label if ok