Merge branch 'develop' into patch-324

.github/CONTRIBUTING.md

@@ -4,7 +4,7 @@ How to contribute to Dolibarr
 Bug reports and feature requests
 --------------------------------
 
-<a name="not-a-support-forum"></a>*Note*: Issues are not a support forum. If you need help using the software, please use [the forums](http://www.dolibarr.org/forum).
+<a name="not-a-support-forum"></a>*Note*: Issues are not a support forum. If you need help using the software, please use [the forums](https://www.dolibarr.org/forum).
 
 Issues are managed on [GitHub](https://github.com/Dolibarr/dolibarr/issues).
 
@@ -104,31 +104,32 @@ Long description (Can span accross multiple lines).
 Pull Request (PR) process is the process to submit a change (enhancement, bug fix, ...) into the code of the project. There is some rules to know and 
 a process to follow to optimize the chance to have PRs merged efficiently...
 
-When submitting a pull request, use same rule as [Commits](#commits) for the message.
-If your pull request only contains 1 commit, GitHub will be smart enough to fill it for you.
-Otherwise, please be a bit verbose about what you're providing.
+* A PR must be atomic. It means it must contains the lower possible changes for 1 need (1 bug fix or 1 new feature) without breaking usability of code. If a PR can be split into several PRs, it often means your PR is not atomic.
+
+* Your Pull Request (PR) must pass the Continuous Integration checks and code quality checks.
+
+* When submitting a pull request, use same rule as [Commits](#commits) for the message. If your pull request only contains 1 commit, GitHub will be smart enough to fill it for you. Otherwise, please be a bit verbose about what you're providing.
 
-Your Pull Request (PR) must pass the Continuous Integration checks and code quality checks.
 Also, some code changes need a prior approbation:
 
-* if you want to include a new external library (into htdocs/includes directory), please ask before to the project manager (@eldy) to see if such a library can be accepted.
+* if you want to include a new external library (into htdocs/includes directory), please ask before to the core project manager (mention @dolibarr-yoda in your issue) to see if such a library can be accepted.
 
-* if you add a new table, you must first create a page on https://wiki.dolibarr.org/index.php/Category:Table_SQL (copy an existing page changing its name to see it into this index page). Then ask the project manager (@eldy) if the new data model you plan to add is compatible with curent and future works in progress and can be accepted as you suggest.
+* if you add a new table, you must first create a page on https://wiki.dolibarr.org/index.php/Category:Table_SQL (copy an existing page changing its name to see it into this index page). Then ask the project manager (@dolibarr-yoda) if the new data model you plan to add is compatible with curent and future works in progress and can be accepted as you suggest.
 
 Once a PR has been submitted, you may need to wait for its integration. It is common that the project leader let the PR open for a long delay to allow every developer discuss about the PR (A label is added in such a case).
 
-If the label of PR start with "WIP" (Work In Progress), it will not be analyzed (until you change the label of PR).
+If the label of PR start with "Draft" or "WIP" (Work In Progress), it will not be analyzed for merging until you change the label of PR (but it can be analyzed for discussion).
 
 If your PR has errors reported by the Continuous Integration Platform, it means your PR is not valid and nothing will be done with it. It will be kept open to allow developers to fix this, or it may be closed several month later. Don't expect anything on your PR if you have such errors, you MUST first fix the Continuous Integration error to have it taken into consideration. 
 
 If the PR is valid, and is kept open for a long time, a tag will also be added on the PR to describe the status of your PR and why the PR is kept open. By putting your mouse on the tag, you will get a full explanation of the tag/status that explain why your PR has not been integrated yet.
 In most cases, it gives you information of things you have to do to have the PR taken into consideration (for example a change is requested, a conflict is expected to be solved, some questions were asked). If you have a yellow, red flag of purple flag, don't expect to have your PR validated. You must first provide the answer the tag ask you. The majority of open PR are waiting an action of the author of the PR.
 
-Statistics on Dolibarr project shows that around 95% of submitted PR are reviewed and tagged. Average answer delay is also one of the best among Open source project (just few days before having the Answer Tag set). This is one of the most important ratio of answered PR in Open Source world for a major project. Don't expect the core team to reach the 100%. A so high ratio is very rare on a so popular project and with the increasing popularity of Dolibarr, this ratio will probably decrease in future to a more common level.
+Statistics on Dolibarr project shows that 95% of submitted PR are reviewed and tagged. Average answer delay is also one of the best among Open source projects (just few days before having the Answer Tag set). This is one of the most important ratio of answered PR in Open Source world for a major project. Don't expect the core team to reach the 100%. A so high ratio is very rare on a so popular project and with the increasing popularity of Dolibarr, this ratio will probably decrease in future to a more common level.
 
 
 ### Resources
-[Developer documentation](http://wiki.dolibarr.org/index.php/Developer_documentation)
+[Developer documentation](https://wiki.dolibarr.org/index.php/Developer_documentation)
 
 Translations
 ------------
@@ -144,11 +145,11 @@ to retreive all old translation of a source text, and restore the translation in
 
 
 ### Resources
-[Translator documentation](http://wiki.dolibarr.org/index.php/Translator_documentation)
+[Translator documentation](https://wiki.dolibarr.org/index.php/Translator_documentation)
 
 Documentation
 -------------
-The project's documentation is maintained on the [Wiki](http://wiki.dolibarr.org/index.php).
+The project's documentation is maintained on the [Wiki](https://wiki.dolibarr.org/index.php).
 
 *Note*: to help prevent spam, you need to create an account before being able to edit. Everybody is welcome to contribute to its content.
 

COPYRIGHT

@@ -41,7 +41,7 @@ Ace                    1.4.8         BSD                         Yes
 ChartJS				   2.9.3         MIT License                 Yes             JS library for graph
 jQuery                 3.4.1         MIT License                 Yes             JS library
 jQuery UI              1.12.1        GPL and MIT License         Yes             JS library plugin UI
-jQuery select2         4.0.13        GPL and Apache License      Yes             JS library plugin for sexier multiselect
+jQuery select2         4.0.13         GPL and Apache License      Yes             JS library plugin for sexier multiselect. Warning: 4.0.6+ create troubles without patching css
 jQuery blockUI         2.70.0        GPL and MIT License         Yes             JS library plugin blockUI (to use ajax popups)
 jQuery Colorpicker     1.1           MIT License                 Yes             JS library for color picker for a defined list of colors
 jQuery JCrop           0.9.8         GPL and MIT License         Yes             JS library plugin Crop (to crop images)
@@ -60,7 +60,7 @@ Image libraries:
 Octicons               8.1           MIT                         Yes
 
 Font libraries:
-Fontawesome            5.7.2         Font Awesome Free licence   Yes
+Fontawesome            5.13          Font Awesome Free licence   Yes
 
 
 For licenses compatibility informations:

ChangeLog

@@ -6,13 +6,14 @@ English Dolibarr ChangeLog
 ***** ChangeLog for 12.0.0 compared to 11.0.0 *****
 For Users:
 NEW: Module MO (Manufacturing Order) is available as stable module.
+NEW: Add option MAIN_VIEW_LINE_NUMBER_IN_LIST for some lists.
 
 For Developers or integrators:
 * A new way to navigate between pages in list is available. To use it, you must
   - replace $page = GETPOST('page', 'int') with $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int'); 
   - remove input field in form '<input type="hidden" name="page" value="'.$page.'">';'
   - add parameter $pagenavastextinput to value 1 when calling print_barre_liste   
-
+* UserGroup class has been refactored with new architecture. Triggers of class UserGroup are now USERGROUP_CREATE, USERGROUP_MODIFY, USERGROUP_DELETE
 
 WARNING:
 
@@ -27,6 +28,7 @@ Following changes may create regressions for some external modules, but were nec
 * Library jflot (replace with chartjs) and geoip (replaced with geoip2) were removed.  
 * Hidden constant COMMANDE_VALID_AFTER_CLOSE_PROPAL were renamed into ORDER_VALID_AFTER_CLOSE_PROPAL.
 
+
 ***** ChangeLog for 11.0.3 compared to 11.0.2 *****
 FIX: unit price for selected supplier products not set. NaN was used.
 FIX: use bad var to check if total is positive for each VAT rate when validating an invoice

README.md

@@ -5,7 +5,7 @@
 
 Dolibarr ERP & CRM is a modern software package to manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda…).
 
-It's an Open Source Software (written in PHP language) designed for small, medium or large companies, foundations and freelances.
+It's an Open Source Software (written in PHP language) designed for small, medium or large companies, foundations and freelancers.
 
 You can freely use, study, modify or distribute it according to its Free Software licence.
 
@@ -27,7 +27,7 @@ Other licenses apply for some included dependencies. See [COPYRIGHT](https://git
 
 If you have low technical skills and you're looking to install Dolibarr ERP/CRM in just a few clicks, you can use one of the packaged versions:
 
-- DoliWamp for Windows
+- [DoliWamp for Windows](https://wiki.dolibarr.org/index.php/Dolibarr_for_Windows_(DoliWamp)
 - DoliDeb for Debian or Ubuntu
 - DoliRpm for Redhat, Fedora, OpenSuse, Mandriva or Mageia
 
@@ -67,6 +67,7 @@ You can use a Web server and a supported database (MariaDB, MySQL or PostgreSQL)
 
 If you don't have time to install it yourself, you can try some commercial 'ready to use' Cloud offers (See https://saas.dolibarr.org). However, this third solution is not free.
 
+
 ## UPGRADING
 
 - At first make a backup of your Dolibarr files & than see https://wiki.dolibarr.org/index.php/Installation_-_Upgrade#Upgrade_Dolibarr
@@ -85,28 +86,27 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 
 ### Main application/modules (all optional)
 
-- Customers, Prospects (Leads) and/or Suppliers directory
+- Customers, Prospects (Leads) and/or Suppliers directory + Contacts
+- Members management 
 - Products and/or Services catalog
 - Commercial proposals management
-- Customer and Supplier Orders management
+- Customer & Supplier Orders management
+- Shipping management
+- Warehouse/Stock management
 - Invoices and payment management
 - Standing orders management (European SEPA)
 - Bank accounts management
 - Accounting management
 - Shared calendar/agenda (with ical and vcal export for third party tools integration)
 - Opportunities and/or project management
-- Projects management
+- Projects & Tasks management
 - Contracts management
-- Warehouse/Stock management
-- Shipping management
 - Interventions management
 - Employee's leave requests management
 - Expense reports
 - Timesheets
 - Electronic Document Management (EDM)
 - Foundations members management
-- Mass emailing
-- Surveys
 - Point of Sale (POS)
 - …
 
@@ -115,11 +115,13 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - Bookmarks management
 - Donations management
 - Reporting
+- Surveys
 - Data export/import
 - Barcodes support
 - Margin calculations
 - LDAP connectivity
 - ClickToDial integration
+- Mass emailing
 - RSS integration
 - Skype integration
 - Payment platforms integration (PayPal, Stripe, Paybox...)

build/exe/doliwamp/Languages/MyCatalan.isl

@@ -1,45 +1,47 @@
 
 [CustomMessages]
 
-NameAndVersion=%1 versió %2
+NameAndVersion=%1 versió %2
 AdditionalIcons=Icones addicionals:
 CreateDesktopIcon=Crea una icona a l'&Escriptori
 CreateQuickLaunchIcon=Crea una icona a la &Barra de tasques
 ProgramOnTheWeb=%1 a Internet
-UninstallProgram=Desinstal·la %1
+UninstallProgram=Desinstal·la %1
 LaunchProgram=Obre %1
-AssocFileExtension=&Associa %1 amb l'extensió de fitxer %2
-AssocingFileExtension=Associant %1 amb l'extensió de fitxer %2...
+AssocFileExtension=&Associa %1 amb l'extensió de fitxer %2
+AssocingFileExtension=Associant %1 amb l'extensió de fitxer %2...
 
-YouWillInstallDoliWamp=Va a instal·lar o actualitzar (Apache + Mysql + PHP + Dolibarr) al seu ordinador.
-ThisAssistantInstallOrUpgrade=Aquest assistent instal·la o actualitza Dolibarr ERP-CRM i tots els seus requisits (Apache, Mysql i PHP) optimitzats per a l'ús de Dolibarr.
-IfYouHaveTechnicalKnowledge=Si teniu coneixements tècnics i necessita usar la seva Apache, Mysql i PHP amb altres aplicacions a part de Dolibarr, no utilitzeu aquest assistent, hauria lació manual d'Dolibarr sobre un Apache, Mysql i PHP existent.
-ButIfYouLook=Però si busca una instal·lació automàtica, es troba en el bon camí...
-DoYouWantToStart=Vol iniciar el procés d'instal·lació/actualització?
+YouWillInstallDoliWamp=Instal·laràs DoliWamp (Dolibarr i altres programaris com Apache, Mysql i PHP) al teu ordinador.
+ThisAssistantInstallOrUpgrade=ALERTA: Utilitzar un ERP CRM instal·lat en un ordinador en local pot ser perillós: si l'ordinador s'espatlla, pots perdre totes les teves dades. Fes-ho si estàs preparat per autogestionar-te còpies de seguretat. Si no, pots utilitzar una instal·lació Saas (pots veure https://saas.dolibarr.org).
+IfYouHaveTechnicalKnowledge=Si tens coneixements tècnics i vols autogestionar el teu Apache, Mysql i PHP, no utilitzis aquest assistent i fes una instal·lació manual de Dolibarr sobre un servidor existent d'Apache, Mysql i PHP.
+ButIfYouLook=Però si busques una instal·lació automàtica en el teu propi ordinador, et trobes en el bon camí...
+DoYouWantToStart=Vols iniciar el procés d'instal·lació?
 
-TechnicalParameters=Paràmetres tècnics
-IfFirstInstall=Si es tracta de la primera instal lació, haurà d'especificar alguns paràmetres tècnics. Si no els entén, no sabeu o va a procedir a una actualització, deixi els camps amb els valors proposats per defecte.
+TechnicalParameters=Paràmetres tècnics
+IfFirstInstall=Si es tracta de la primera instal·lació, hauràs d'especificar alguns paràmetres tècnics. Si no els entens, no n'estàs segur, o estàs fent una actualització, pots deixar els valors per defecte.
 
-; WARNING !!! STRINGS HERE MUST BE LOWER THAN 70 CHARACTERS
-SMTPServer=Servidor SMTP (El seu o el del seu ISP, únicament primera instal.lació) :
-ApachePort=Puerto Apache (únicament primera instal.lació, normalment és el 80) :
-MySqlPort=Puerto Mysql (únicament primera instal.lació, normalment és el 3306) :
-MySqlPassword=Contrasenya del servidor i la base de dades MySQL de root (únicament primera instal.lació):
+; WARNING !!! STRINGS HERE MUST BE LOWER THAN 60 CHARACTERS
+SMTPServer=Servidor SMTP (propi o ISP, només primera instal·lació) :
+ApachePort=Port Apache (només primera instal·lació, normalment el 80) :
+MySqlPort=Port MySql (només primera instal·lació, normalment el 3306) :
+MySqlPassword=Contrasenya del servidor i base de dades MySql de root (només primera instal·lació):
 
-FailedToDeleteLock=FailedToDeleteLock=Error en l'eliminació del fitxer %1/www/dolibarr/install.lock. Pot ignorar l'avís però és possible que hagi de eliminar-lo manualment més tard. En aquest cas, serà informat. Feu clic a OK per continuar...
+FailedToDeleteLock=FailedToDeleteLock=Error en l'eliminació del fitxer %1/www/dolibarr/install.lock. Pots ignorar l'avís però és possible que hagis d'eliminar-lo manualment més tard. En aquest cas, serà informat. Fes clic a OK per continuar...
 
-PortAlreadyInUse=Sembla que el port %1 ja està sent utilitzat. Es recomana cancel·lar, tornar enrere i especificar un altre valor per al port% 2. Cancel·lar i escollir un altre valor?
+PortAlreadyInUse=Sembla que el port %1 ja està sent utilitzat. Es recomana cancel·lar, tornar enrere i especificar un altre valor per al port% 2. Vols cancel·lar i escollir un altre valor?
 
-FirefoxDetected=S'ha detectat Firefox al seu ordinador. Voleu activar per defecte com a navegador per Dolibarr?
-ChromeDetected=S'ha detectat Chrome al seu ordinador. Voleu activar per defecte com a navegador per Dolibarr?
-ChooseDefaultBrowser=Esculli el seu navegador per defecte. Si no està segur, simplement feu clic a Obrir:
+FirefoxDetected=S'ha detectat Firefox al teu ordinador. El vols utilitzar com a navegador per defecte per Dolibarr?
+ChromeDetected=S'ha detectat Chrome al teu ordinador. El vols utilitzar com a navegador per defecte per Dolibarr?
+ChooseDefaultBrowser=Escull el teu navegador per defecte (iexplore.exe, firefox.exe, chrome.exe, MicrosoftEdge.exe...).. Si no estàs segur, simplement fes clic a Obre:
 
-LaunchNow=Llançar ara Dolibarr
+LaunchNow=Obre ara el Dolibarr
 
-ProgramHasBeenRemoved=Els arxius del programa Dolibarr han estat eliminats. No obstant això tots els seus arxius de dades es troben encara al directori %1. Haurà eliminar aquest directori manualment per a una desinstal completa.
+ProgramHasBeenRemoved=Els arxius del programa Dolibarr han estat eliminats. No obstant això tots els seus arxius de dades es troben encara al directori %1. Hauràs d'eliminar aquest directori manualment per a una desinstal·lació completa.
 
-DoliWampWillStartApacheMysql=L'instal·lador DoliWamp intentarà iniciar o reiniciar Apache i MySQL, això pot durar des de diversos segons a un minut després de la confirmació. Iniciar la instal·lació o actualització dels servidors web i bases de dades requerides per Dolibarr?
+DoliWampWillStartApacheMysql=L'instal·lador DoliWamp intentarà iniciar o reiniciar Apache i MySQL, això pot durar des de diversos segons a un minut després de la confirmació. Vols iniciar la instal·lació o actualització dels servidors web i de base de dades requerides per Dolibarr?
 
-OldVersionFoundAndMoveInNew=S'ha trobat una versió antiga de base de dades i ha estat moguda per a ser utilitzada per la nova versió de Dolibarr
-OldVersionFoundButFailedToMoveInNew=S'ha trobat una versió antiga de base de dades, però no es pot moure per a ser utilitzada per la nova versió de Dolibarr
+OldVersionFoundAndMoveInNew=S'ha trobat una versió antiga de base de dades i ha estat moguda per a ser utilitzada per la nova versió de Dolibarr
+OldVersionFoundButFailedToMoveInNew=S'ha trobat una versió antiga de base de dades, però no es pot moure per a ser utilitzada per la nova versió de Dolibarr
 
+DLLMissing=La teva instal·lació windows no té el component "Microsoft Visual C++ Redistributable for Visual Studio 2012". Instal·la primer la versió de 32-bit (vcredist_x86.exe) (pots trobar-la a https://www.microsoft.com/en-us/download/) i reiniciar després la instal·lació/actualització de DoliWamp.
+ContinueAnyway=Continua igualment (el procés d'instal·lació podria fallar sense aquest prerequisit)

build/exe/doliwamp/Languages/MyGerman.isl

@@ -2,7 +2,7 @@
 [CustomMessages]
 
 NameAndVersion=%1 Version %2
-AdditionalIcons=Zusätzliche Symbole:
+AdditionalIcons=Zusätzliche Symbole:
 CreateDesktopIcon=&Desktop-Symbol erstellen
 CreateQuickLaunchIcon=Symbol in der Schnellstartleiste erstellen
 ProgramOnTheWeb=%1 im Internet
@@ -10,3 +10,38 @@ UninstallProgram=%1 entfernen
 LaunchProgram=%1 starten
 AssocFileExtension=&Registriere %1 mit der %2-Dateierweiterung
 AssocingFileExtension=%1 wird mit der %2-Dateierweiterung registriert...
+
+
+YouWillInstallDoliWamp=Sie installieren DoliWamp (also Dolibarr + alle erforderliche Software von Drittanbietern wie Apache, MySQL und PHP) auf Ihrem Computer.
+ThisAssistantInstallOrUpgrade=WARNUNG: Die Verwendung eines auf einem lokalen Computer installierten ERP-CRM kann gefährlich sein: Wenn Ihr Computer ausfällt, können Sie alle Ihre Daten verlieren. Tun Sie dies, wenn Sie bereit sind, das Backup selbst ernsthaft zu verwalten. Wenn nicht, verwenden Sie stattdessen eine Installation in Saas (siehe https://saas.dolibarr.org).
+IfYouHaveTechnicalKnowledge=Wenn Sie über technische Kenntnisse verfügen und Apache, MySQL und PHP selbst verwalten möchten, sollten Sie diesen Assistenten nicht verwenden und eine manuelle Installation von Dolibarr auf Ihrem vorhandenen Server mit Apache, MySQL und PHP durchführen.
+ButIfYouLook=Aber wenn Sie auf Ihrem lokalen Computer nach einer automatischen Einrichtung suchen, sind Sie auf dem besten Weg ...
+DoYouWantToStart=Möchten Sie den Installationsprozess starten?
+
+TechnicalParameters=technische Parameter
+IfFirstInstall=Geben Sie bei der Erstinstallation einige technische Parameter an. Wenn Sie nicht verstehen, sich nicht sicher sind oder ein Upgrade durchführen, belassen Sie einfach die Standardwerte.
+
+; WARNING !!! STRINGS HERE MUST BE LOWER THAN 60 CHARACTERS 
+SMTPServer=SMTP Server (your own or ISP SMTP server, first install only) :
+ApachePort=Apache Port (first install only, Standard ist 80) :
+MySqlPort=MySQL Port (first install only, Standard ist 3306) :
+MySqlPassword=MySQL Server und Datenbank Passwort für root (first install only):
+
+FailedToDeleteLock=Fehler beim Löschen der Datei %1/www/dolibarr/install.lock. Sie können die Warnung ignorieren, müssen sie jedoch möglicherweise später manuell entfernen, wenn Sie dazu aufgefordert werden. Klicken Sie auf OK, um fortzufahren ...
+
+PortAlreadyInUse=Port %1 scheint bereits verwendet zu werden. Sie sollten zurückgehen und einen anderen Wert für %2 Port wählen.  Auswahl abbrechen und einen anderen Wert wählen ? 
+
+FirefoxDetected=Firefox wurde auf Ihrem Computer erkannt. Möchten Sie ihn als Standardbrowser für Dolibarr verwenden?
+ChromeDetected=Chrome wurde auf Ihrem Computer erkannt. Möchten Sie ihn als Standardbrowser für Dolibarr verwenden?
+ChooseDefaultBrowser=Bitte wählen Sie Ihren Standardbrowser (iexplore.exe, firefox.exe, chrome.exe, MicrosoftEdge.exe...). Wenn Sie sich nicht sicher sind, klicken Sie einfach auf Öffnen:
+
+LaunchNow=Starten Sie jetzt Dolibarr
+
+ProgramHasBeenRemoved=Die Dolibarr-Programmdateien wurden entfernt. Alle Ihre Daten befinden sich jedoch noch im Verzeichnis %1. Für eine vollständige Deinstallation, müssen Sie dieses Verzeichnis manuell entfernen.
+DoliWampWillStartApacheMysql=Die DoliWamp-Installation wird nun starten oder Apache und MySQL neu starten. Dies kann nach dieser Bestätigung einige Sekunden bis eine Minute dauern. Wollen Sie mit der Installation oder Aktualisierung des von Dolibarr benötigten Web- und Datenbankservers starten ?
+
+OldVersionFoundAndMoveInNew=Eine alte Datenbankversion wurde gefunden und verschoben, um von der neuen Dolibarr-Version verwendet zu werden.
+OldVersionFoundButFailedToMoveInNew=Eine alte Datenbankversion wurde gefunden, konnte jedoch nicht verschoben werden, um mit der neuen Dolibarr-Version verwendet zu werden.
+
+DLLMissing=Your Windows installation is missing The "Micrsoft Visual C++ Redistributable for Visual Studio 2012" component. Please install the 32-bit version (vcredist_x86.exe) first (you can find it at https://www.microsoft.com/en-us/download/) and restart DoliWamp installation/upgrade after.
+ContinueAnyway=Fahren Sie trotzdem fort (der Installationsvorgang kann ohne diese Voraussetzung fehlschlagen).

build/exe/doliwamp/Languages/MySpanish.isl

@@ -1,45 +1,47 @@
 
 [CustomMessages]
 
-NameAndVersion=%1 versión %2
+NameAndVersion=%1 versión %2
 AdditionalIcons=Iconos adicionales:
 CreateDesktopIcon=Crear un icono en el &escritorio
-CreateQuickLaunchIcon=Crear un icono de Inicio Rápido
+CreateQuickLaunchIcon=Crear un icono de Inicio Rápido
 ProgramOnTheWeb=%1 en la Web
 UninstallProgram=Desinstalar %1
 LaunchProgram=Ejecutar %1
-AssocFileExtension=&Asociar %1 con la extensión de archivo %2
-AssocingFileExtension=Asociando %1 con la extensión de archivo %2...
+AssocFileExtension=&Asociar %1 con la extensión de archivo %2
+AssocingFileExtension=Asociando %1 con la extensión de archivo %2...
 
-YouWillInstallDoliWamp=Va a instalar o actualizar (Apache+Mysql+PHP+Dolibarr) en su ordenador.
-ThisAssistantInstallOrUpgrade=Este asistente instala o actualiza Dolibarr ERP-CRM y todos sus requisitos (Apache, Mysql y PHP) optimizados para el uso de  Dolibarr.
-IfYouHaveTechnicalKnowledge=Si tiene conocimientos técnicos y necesita usar su Apache, Mysql y PHP con otras aplicaciones aparte de Dolibarr, no debería usar este asistente, debería realizar una instalación manual de Dolibarr sobre un Apache, Mysql y PHP existente.
-ButIfYouLook=Pero si busca una instalación automática, se encuentra en el buen camino...
-DoYouWantToStart=¿Quiere iniciar el proceso de instalación/actualización?
+YouWillInstallDoliWamp=Va a instalar DoliWamp (Dolibarr y otro software como Apache, Mysql y PHP) en su ordenador.
+ThisAssistantInstallOrUpgrade=ALERTA: Utilizar un ERP CRM instalado en un ordenador en local puede ser peligroso: si el ordenador se estropea, puede perder todos sus datos. Hágalo si está preparado para autogestionar sus copias de seguridad. Si no, puede utilizar una instalacion Saas (puede ver https://saas.dolibarr.org).
+IfYouHaveTechnicalKnowledge=Si tiene conocimientos técnicos y necesita usar su Apache, Mysql y PHP con otras aplicaciones aparte de Dolibarr, no debería usar este asistente, debería realizar una instalación manual de Dolibarr sobre un Apache, Mysql y PHP existente.
+ButIfYouLook=Pero si busca una instalación automática en tu propio ordenador, se encuentra en el buen camino...
+DoYouWantToStart=¿Quiere iniciar el proceso de instalación?
 
-TechnicalParameters=Parámetros técnicos
-IfFirstInstall=Si se trata de la primera instalación, deberá especificar algunos parámetros técnicos. Si no los entiende, no está seguro o va a proceder a una actualización, deje los campos con los valores propuestos por defecto.
+TechnicalParameters=Parámetros técnicos
+IfFirstInstall=Si se trata de la primera instalación, deberá especificar algunos parámetros técnicos. Si no los entiende, no está seguro o va a proceder a una actualización, deje los campos con los valores propuestos por defecto.
 
-; WARNING !!! STRINGS HERE MUST BE LOWER THAN 70 CHARACTERS
-SMTPServer=Servidor SMTP (El suyo o el de su ISP, únicamente primera instalación) :
-ApachePort=Puerto Apache (únicamente primera instalación, normalmente es el 80) :
-MySqlPort=Puerto Mysql (únicamente primera instalación, normalmente es el 3306) :
-MySqlPassword=Contraseña del servidor y la base de datos MySQL de root (únicamente primera instalación):
+; WARNING !!! STRINGS HERE MUST BE LOWER THAN 60 CHARACTERS
+SMTPServer=Servidor SMTP (propio o su ISP, sólo primera instalación) :
+ApachePort=Puerto Apache (sólo primera instalación, normalmente el 80) :
+MySqlPort=Puerto Mysql (sólo primera instalación, normalmente el 3306) :
+MySqlPassword=Contraseña del servidor y la base de datos MySQL de root (sólo primera instalación):
 
-FailedToDeleteLock=Error en la eliminación del archivo %1/www/dolibarr/install.lock. Puede ignorar el aviso pero es posible que deba eliminarlo manualmente más tarde. En este caso, será informado. Haga clic en OK para continuar...
+FailedToDeleteLock=Error en la eliminación del archivo %1/www/dolibarr/install.lock. Puede ignorar el aviso pero es posible que deba eliminarlo manualmente más tarde. En este caso, será informado. Haga clic en OK para continuar...
 
-PortAlreadyInUse=Parece que el puerto %1 ya esta siendo usado. Se recomienda cancelar, volver atras y especificar otro valor para el puerto %2. ¿Cancelar y escojer otro valor?
+PortAlreadyInUse=Parece que el puerto %1 ya esta siendo usado. Se recomienda cancelar, volver atras y especificar otro valor para el puerto %2. ¿Cancelar y escojer otro valor?
 
 FirefoxDetected=Se ha detectado Firefox en su ordenador. Desea activarlo por defecto como navegador para Dolibarr ?
 ChromeDetected=Se ha detectado Chrome en su ordenador. Desea activarlo por defecto como navegador para Dolibarr ?
-ChooseDefaultBrowser=Escoja su navegador por defecto. Si no está seguro, simplementa haga clic en Abrir :
+ChooseDefaultBrowser=Escoja su navegador por defecto (iexplore.exe, firefox.exe, chrome.exe, MicrosoftEdge.exe...). Si no está seguro, simplementa haga clic en Abrir :
 
 LaunchNow=Lanzar ahora Dolibarr
 
-ProgramHasBeenRemoved=Los archivos del programa Dolibarr han sido eliminados. Sin embargo todos sus archivos de datos se encuentran todavía en el directorio %1. Deberá eliminar este directorio manualmente para una desinstalación completa.
+ProgramHasBeenRemoved=Los archivos del programa Dolibarr han sido eliminados. Sin embargo todos sus archivos de datos se encuentran todavía en el directorio %1. Deberá eliminar este directorio manualmente para una desinstalación completa.
 
-DoliWampWillStartApacheMysql=El instalador DoliWamp intentará iniciar o reiniciar Apache y MySQL, esto puede durar desde varios segundos a un minuto después de la confirmación. ¿Iniciar la instalación o actualización de los servidores Web y bases de datos requeridas por Dolibarr?
+DoliWampWillStartApacheMysql=El instalador DoliWamp intentará iniciar o reiniciar Apache y MySQL, esto puede durar desde varios segundos a un minuto después de la confirmación. ¿Iniciar la instalación o actualización de los servidores Web y bases de datos requeridas por Dolibarr?
 
-OldVersionFoundAndMoveInNew=Se ha encontrado una versión antigua de base de datos y ha sido movida para ser utilizada por la nueva versión de Dolibarr
-OldVersionFoundButFailedToMoveInNew=Se ha encontrado una versión antigua de base de datos, pero no se pudo mover para ser utilizada por la nueva versión de Dolibarr
- 	  	 
+OldVersionFoundAndMoveInNew=Se ha encontrado una versión antigua de base de datos y ha sido movida para ser utilizada por la nueva versión de Dolibarr
+OldVersionFoundButFailedToMoveInNew=Se ha encontrado una versión antigua de base de datos, pero no se pudo mover para ser utilizada por la nueva versión de Dolibarr
+ 	  	 
+DLLMissing=Su instalación Windows no tiene el componente "Microsoft Visual C++ Redistributable for Visual Studio 2012". Instale primero la versión de 32-bit (vcredist_x86.exe) (puedes encontrarlo en https://www.microsoft.com/en-us/download/) y reiniciar después la instalación/actualización de DoliWamp.
+ContinueAnyway=Continua igualmente (el proceso de instalación podría fallar sin este prerequisito)

dev/dolibarr_changes.txt

@@ -104,6 +104,27 @@ with
 				//return false;	
 			}
 			
+* Replace in tcpdf.php
+
+		if (($imgsrc[0] === '/') AND !empty($_SERVER['DOCUMENT_ROOT']) AND ($_SERVER['DOCUMENT_ROOT'] != '/')) {
+
+with
+
+		// @CHANGE LDR Add support for src="file://..." links
+		if (strpos($imgsrc, 'file://') === 0) {
+			$imgsrc = str_replace('file://', '/', $imgsrc);
+			$imgsrc = urldecode($imgsrc);
+			$testscrtype = @parse_url($imgsrc);
+			if (empty($testscrtype['query'])) {
+				// convert URL to server path
+				$imgsrc = str_replace(K_PATH_URL, K_PATH_MAIN, $imgsrc);
+			} elseif (preg_match('|^https?://|', $imgsrc) !== 1) {
+				// convert URL to server path
+				$imgsrc = str_replace(K_PATH_MAIN, K_PATH_URL, $imgsrc);
+			}
+		}
+		elseif (($imgsrc[0] === '/') AND !empty($_SERVER['DOCUMENT_ROOT']) AND ($_SERVER['DOCUMENT_ROOT'] != '/')) {
+					
 
 
 * In tecnickcom/tcpdf/include/tcpdf_static, in function fopenLocal, replace
@@ -277,3 +298,15 @@ JEDITABLE.JS
 * <button type="submit" />  =>  <button class="button" type="submit" />
 * <button type="cancel" />  =>  <button class="button" type="cancel" />
 
+
+
+SELECT2
+-------
+
+Edit CSS to restore line removed between 4.0.5 and 4.0.6. It generates this bug: https://github.com/select2/select2/issues/5832
+
+.select2-hidden-accessible {
+  margin: -1px !important;                /* line to restore */
+}
+
+

dev/setup/codesniffer/ruleset.xml

@@ -222,6 +222,9 @@
     <rule ref="Squiz.ControlStructures.ForEachLoopDeclaration.SpaceBeforeClose" />
 
     <rule ref="Squiz.Functions.MultiLineFunctionDeclaration" />
+	<rule ref="Squiz.Functions.MultiLineFunctionDeclaration.SpaceAfterFunction">
+        <severity>0</severity>
+	</rule>
     <rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing">
         <properties>
             <property name="equalsSpacing" value="1"/>

htdocs/accountancy/admin/account.php

@@ -332,7 +332,7 @@ if ($resql)
     else dol_print_error($db);
     print "</select>";
     print ajax_combobox("chartofaccounts");
-    print '<input type="'.(empty($conf->use_javascript_ajax)?'submit':'button').'" class="button" name="change_chart" id="change_chart" value="'.dol_escape_htmltag($langs->trans("ChangeAndLoad")).'">';
+    print '<input type="'.(empty($conf->use_javascript_ajax) ? 'submit' : 'button').'" class="button" name="change_chart" id="change_chart" value="'.dol_escape_htmltag($langs->trans("ChangeAndLoad")).'">';
 
     print '<br>';
 	print '<br>';
@@ -357,7 +357,7 @@ if ($resql)
 		print '</td>';
 	}
 	if (!empty($arrayfields['aa.pcg_type']['checked']))		    print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_pcgtype" value="'.$search_pcgtype.'"></td>';
-	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { if (! empty($arrayfields['aa.reconcilable']['checked']))   print '<td class="liste_titre">&nbsp;</td>'; }
+	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { if (!empty($arrayfields['aa.reconcilable']['checked']))   print '<td class="liste_titre">&nbsp;</td>'; }
 	if (!empty($arrayfields['aa.active']['checked']))			print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);
@@ -371,7 +371,7 @@ if ($resql)
 	if (!empty($arrayfields['aa.labelshort']['checked']))		print_liste_field_titre($arrayfields['aa.labelshort']['label'], $_SERVER["PHP_SELF"], "aa.labelshort", "", $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['aa.account_parent']['checked']))	print_liste_field_titre($arrayfields['aa.account_parent']['label'], $_SERVER["PHP_SELF"], "aa.account_parent", "", $param, '', $sortfield, $sortorder, 'left ');
 	if (!empty($arrayfields['aa.pcg_type']['checked']))			print_liste_field_titre($arrayfields['aa.pcg_type']['label'], $_SERVER["PHP_SELF"], 'aa.pcg_type', '', $param, '', $sortfield, $sortorder, '', $arrayfields['aa.pcg_type']['help']);
-	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { if (! empty($arrayfields['aa.reconcilable']['checked']))	print_liste_field_titre($arrayfields['aa.reconcilable']['label'], $_SERVER["PHP_SELF"], 'aa.reconcilable', '', $param, '', $sortfield, $sortorder); }
+	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { if (!empty($arrayfields['aa.reconcilable']['checked']))	print_liste_field_titre($arrayfields['aa.reconcilable']['label'], $_SERVER["PHP_SELF"], 'aa.reconcilable', '', $param, '', $sortfield, $sortorder); }
 	if (!empty($arrayfields['aa.active']['checked']))			print_liste_field_titre($arrayfields['aa.active']['label'], $_SERVER["PHP_SELF"], 'aa.active', '', $param, '', $sortfield, $sortorder);
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 	print "</tr>\n";
@@ -453,11 +453,11 @@ if ($resql)
 			if (!empty($arrayfields['aa.reconcilable']['checked'])) {
 				print '<td class="center">';
 				if (empty($obj->reconcilable)) {
-					print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?id=' . $obj->rowid . '&action=enable&mode=1">';
+					print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$obj->rowid.'&action=enable&mode=1">';
 					print img_picto($langs->trans("Disabled"), 'switch_off');
 					print '</a>';
 				} else {
-					print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?id=' . $obj->rowid . '&action=disable&mode=1">';
+					print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$obj->rowid.'&action=disable&mode=1">';
 					print img_picto($langs->trans("Activated"), 'switch_on');
 					print '</a>';
 				}

htdocs/accountancy/admin/card.php

@@ -237,8 +237,8 @@ if ($action == 'create') {
 	print '<td><input name="label" size="70" value="'.$object->label.'"></td></tr>';
 
 	// Label short
-	print '<tr><td>' . $langs->trans("LabelToShow") . '</td>';
-	print '<td><input name="labelshort" size="70" value="' . $object->labelshort . '"></td></tr>';
+	print '<tr><td>'.$langs->trans("LabelToShow").'</td>';
+	print '<td><input name="labelshort" size="70" value="'.$object->labelshort.'"></td></tr>';
 
 	// Account parent
 	print '<tr><td>'.$langs->trans("Accountparent").'</td>';
@@ -300,8 +300,8 @@ elseif ($id > 0 || $ref) {
 			print '<td><input name="label" size="70" value="'.$object->label.'"</td></tr>';
 
 			// Label short
-			print '<tr><td>' . $langs->trans("LabelToShow") . '</td>';
-			print '<td><input name="labelshort" size="70" value="' . $object->labelshort . '"</td></tr>';
+			print '<tr><td>'.$langs->trans("LabelToShow").'</td>';
+			print '<td><input name="labelshort" size="70" value="'.$object->labelshort.'"</td></tr>';
 
 			// Account parent
 			print '<tr><td>'.$langs->trans("Accountparent").'</td>';
@@ -351,8 +351,8 @@ elseif ($id > 0 || $ref) {
 			print '<td colspan="2">'.$object->label.'</td></tr>';
 
 			// Label to show
-			print '<tr><td class="titlefield">' . $langs->trans("LabelToShow") . '</td>';
-			print '<td colspan="2">' . $object->labelshort . '</td></tr>';
+			print '<tr><td class="titlefield">'.$langs->trans("LabelToShow").'</td>';
+			print '<td colspan="2">'.$object->labelshort.'</td></tr>';
 
 			// Account parent
 			$accp = new AccountingAccount($db);

htdocs/accountancy/admin/closure.php

@@ -23,12 +23,12 @@
  */
 
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("compta","admin","accountancy"));
+$langs->loadLangs(array("compta", "admin", "accountancy"));
 
 // Security check
 if (empty($user->rights->accounting->chartofaccount)) {
@@ -38,7 +38,7 @@ if (empty($user->rights->accounting->chartofaccount)) {
 $action = GETPOST('action', 'aZ09');
 
 
-$list_account_main = array (
+$list_account_main = array(
     'ACCOUNTING_RESULT_PROFIT',
     'ACCOUNTING_RESULT_LOSS'
 );
@@ -52,23 +52,23 @@ if ($action == 'update') {
 
     $defaultjournal = GETPOST('ACCOUNTING_CLOSURE_DEFAULT_JOURNAL', 'alpha');
 
-    if (! empty($defaultjournal)) {
-        if (! dolibarr_set_const($db, 'ACCOUNTING_CLOSURE_DEFAULT_JOURNAL', $defaultjournal, 'chaine', 0, '', $conf->entity)) {
-            $error ++;
+    if (!empty($defaultjournal)) {
+        if (!dolibarr_set_const($db, 'ACCOUNTING_CLOSURE_DEFAULT_JOURNAL', $defaultjournal, 'chaine', 0, '', $conf->entity)) {
+            $error++;
         }
     } else {
-        $error ++;
+        $error++;
     }
 
 	foreach ($list_account_main as $constname) {
 		$constvalue = GETPOST($constname, 'alpha');
 
-		if (! dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
-			$error ++;
+		if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+			$error++;
 		}
 	}
 
-	if (! $error) {
+	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
@@ -91,8 +91,8 @@ print load_fiche_titre($langs->trans('MenuClosureAccounts'), $linkback, 'title_a
 print '<span class="opacitymedium">'.$langs->trans("DefaultClosureDesc").'</span><br>';
 print '<br>';
 
-print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
-print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="update">';
 
 // Define main accounts for closure
@@ -102,14 +102,14 @@ foreach ($list_account_main as $key) {
     print '<tr class="oddeven value">';
     // Param
     $label = $langs->trans($key);
-    $keydesc=$key.'_Desc';
+    $keydesc = $key.'_Desc';
 
     $htmltext = $langs->trans($keydesc);
     print '<td class="fieldrequired" width="50%">';
     print $form->textwithpicto($label, $htmltext);
     print '</td>';
     // Value
-    print '<td>';  // Do not force class=right, or it align also the content of the select box
+    print '<td>'; // Do not force class=right, or it align also the content of the select box
     print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
     print '</td>';
     print '</tr>';
@@ -117,15 +117,15 @@ foreach ($list_account_main as $key) {
 
 // Journal
 print '<tr class="oddeven">';
-print '<td width="50%">' . $langs->trans("ACCOUNTING_CLOSURE_DEFAULT_JOURNAL") . '</td>';
+print '<td width="50%">'.$langs->trans("ACCOUNTING_CLOSURE_DEFAULT_JOURNAL").'</td>';
 print '<td>';
-$defaultjournal=$conf->global->ACCOUNTING_CLOSURE_DEFAULT_JOURNAL;
+$defaultjournal = $conf->global->ACCOUNTING_CLOSURE_DEFAULT_JOURNAL;
 print $formaccounting->select_journal($defaultjournal, "ACCOUNTING_CLOSURE_DEFAULT_JOURNAL", 9, 1, 0, 0);
 print '</td></tr>';
 
 print "</table>\n";
 
-print '<div class="center"><input type="submit" class="button" value="' . $langs->trans('Modify') . '" name="button"></div>';
+print '<div class="center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
 
 print '</form>';
 

htdocs/accountancy/admin/fiscalyear_card.php

@@ -274,23 +274,23 @@ if ($action == 'create')
 
 			// Label
 			print '<tr><td class="tdtop">';
-			print $form->editfieldkey("Label", 'label', $object->label, $object, $conf->global->MAIN_EDIT_ALSO_INLINE, 'alpha:32');
+			print $form->editfieldkey("Label", 'label', $object->label, $object, 1, 'alpha:32');
 			print '</td><td colspan="2">';
-			print $form->editfieldval("Label", 'label', $object->label, $object, $conf->global->MAIN_EDIT_ALSO_INLINE, 'alpha:32');
+			print $form->editfieldval("Label", 'label', $object->label, $object, 1, 'alpha:32');
 			print "</td></tr>";
 
 			// Date start
 			print '<tr><td>';
-			print $form->editfieldkey("DateStart", 'date_start', $object->date_start, $object, $conf->global->MAIN_EDIT_ALSO_INLINE, 'datepicker');
+			print $form->editfieldkey("DateStart", 'date_start', $object->date_start, $object, 1, 'datepicker');
 			print '</td><td colspan="2">';
-			print $form->editfieldval("DateStart", 'date_start', $object->date_start, $object, $conf->global->MAIN_EDIT_ALSO_INLINE, 'datepicker');
+			print $form->editfieldval("DateStart", 'date_start', $object->date_start, $object, 1, 'datepicker');
 			print '</td></tr>';
 
 			// Date end
 			print '<tr><td>';
-			print $form->editfieldkey("DateEnd", 'date_end', $object->date_end, $object, $conf->global->MAIN_EDIT_ALSO_INLINE, 'datepicker');
+			print $form->editfieldkey("DateEnd", 'date_end', $object->date_end, $object, 1, 'datepicker');
 			print '</td><td colspan="2">';
-			print $form->editfieldval("DateEnd", 'date_end', $object->date_end, $object, $conf->global->MAIN_EDIT_ALSO_INLINE, 'datepicker');
+			print $form->editfieldval("DateEnd", 'date_end', $object->date_end, $object, 1, 'datepicker');
 			print '</td></tr>';
 
 			// Statut

htdocs/accountancy/admin/fiscalyear_info.php

@@ -22,23 +22,23 @@
  */
 
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/fiscalyear.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/fiscalyear.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/fiscalyear.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/fiscalyear.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("admin","compta"));
+$langs->loadLangs(array("admin", "compta"));
 
 // Security check
 if ($user->socid > 0)
 	accessforbidden();
-if (! $user->rights->accounting->fiscalyear->write)
+if (!$user->rights->accounting->fiscalyear->write)
 	accessforbidden();
 
 $id = GETPOST('id', 'int');
 
 // View
-$title = $langs->trans("Fiscalyear") . " - " . $langs->trans("Info");
+$title = $langs->trans("Fiscalyear")." - ".$langs->trans("Info");
 $helpurl = "";
 llxHeader("", $title, $helpurl);
 

htdocs/accountancy/bookkeeping/list.php

@@ -1006,7 +1006,7 @@ while ($i < min($num, $limit))
 	// Amount debit
 	if (!empty($arrayfields['t.debit']['checked']))
 	{
-		print '<td class="nowrap right">'.($line->debit ? price($line->debit) : '').'</td>';
+		print '<td class="nowrap right">'.($line->debit != 0 ? price($line->debit) : '').'</td>';
 		if (!$i) $totalarray['nbfield']++;
 		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totaldebit';
 		$totalarray['val']['totaldebit'] += $line->debit;
@@ -1015,7 +1015,7 @@ while ($i < min($num, $limit))
 	// Amount credit
 	if (!empty($arrayfields['t.credit']['checked']))
 	{
-		print '<td class="nowrap right">'.($line->credit ? price($line->credit) : '').'</td>';
+		print '<td class="nowrap right">'.($line->credit != 0 ? price($line->credit) : '').'</td>';
 		if (!$i) $totalarray['nbfield']++;
 		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalcredit';
 		$totalarray['val']['totalcredit'] += $line->credit;

htdocs/accountancy/bookkeeping/listbyaccount.php

@@ -71,9 +71,9 @@ if ($sortorder == "") $sortorder = "ASC";
 if ($sortfield == "") $sortfield = "t.doc_date,t.rowid";
 
 if (empty($search_date_start) && empty($search_date_end) && GETPOSTISSET('search_date_startday') && GETPOSTISSET('search_date_startmonth') && GETPOSTISSET('search_date_starthour')) {
-	$sql = 	"SELECT date_start, date_end from ".MAIN_DB_PREFIX."accounting_fiscalyear ";
-	$sql.= " where date_start < '".$db->idate(dol_now())."' and date_end > '".$db->idate(dol_now())."'";
-	$sql.= $db->plimit(1);
+	$sql = "SELECT date_start, date_end from ".MAIN_DB_PREFIX."accounting_fiscalyear ";
+	$sql .= " where date_start < '".$db->idate(dol_now())."' and date_end > '".$db->idate(dol_now())."'";
+	$sql .= $db->plimit(1);
 	$res = $db->query($sql);
 
 	if ($res->num_rows > 0) {
@@ -220,15 +220,15 @@ if ($result < 0) {
 	setEventMessages($object->error, $object->errors, 'errors');
 }
 
-$num=count($object->lines);
+$num = count($object->lines);
 
 
 if ($action == 'delmouv') {
-	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?mvt_num=' . GETPOST('mvt_num'), $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvtPartial'), 'delmouvconfirm', '', 0, 1);
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?mvt_num='.GETPOST('mvt_num'), $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvtPartial'), 'delmouvconfirm', '', 0, 1);
 	print $formconfirm;
 }
 if ($action == 'delbookkeepingyear') {
-	$form_question = array ();
+	$form_question = array();
 	$delyear = GETPOST('delyear');
 
 	if (empty($delyear)) {
@@ -249,7 +249,7 @@ if ($action == 'delbookkeepingyear') {
 }
 
 
-print '<form method="POST" id="searchFormList" action="' . $_SERVER["PHP_SELF"] . '">';
+print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="list">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -259,11 +259,11 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
 
 
-$newcardbutton.= dolGetButtonTitle($langs->trans('ViewFlatList'), '', 'fa fa-list paddingleft', DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param);
-$newcardbutton.= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', './card.php?action=create');
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewFlatList'), '', 'fa fa-list paddingleft', DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param);
+$newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', './card.php?action=create');
 
-if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 
 print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $result, $nbtotalofrecords, 'title_accountancy', 0, $viewflat.$newcardbutton, '', $limit);
 
@@ -335,7 +335,7 @@ while ($i < min($num, $limit))
 	//if (empty($accountg)) $accountg = '-';
 
 	// Is it a break ?
-	if ($accountg != $displayed_account_number || ! isset($displayed_account_number)) {
+	if ($accountg != $displayed_account_number || !isset($displayed_account_number)) {
 		// Affiche un Sous-Total par compte comptable
 		if (isset($displayed_account_number)) {
 			print '<tr class="liste_total"><td class="right" colspan="5">'.$langs->trans("SubTotal").':</td><td class="nowrap right">'.price($sous_total_debit).'</td><td class="nowrap right">'.price($sous_total_credit).'</td>';
@@ -348,7 +348,7 @@ while ($i < min($num, $limit))
 		$colspan = 9;
 		print "<tr>";
 		print '<td colspan="'.$colspan.'" style="font-weight:bold; border-bottom: 1pt solid black;">';
-		if ($line->numero_compte != "" && $line->numero_compte != '-1') print length_accountg($line->numero_compte) . ' : ' . $object->get_compte_desc($line->numero_compte);
+		if ($line->numero_compte != "" && $line->numero_compte != '-1') print length_accountg($line->numero_compte).' : '.$object->get_compte_desc($line->numero_compte);
 		else print '<span class="error">'.$langs->trans("Unknown").'</span>';
 		print '</td>';
 		print '</tr>';
@@ -373,20 +373,20 @@ while ($i < min($num, $limit))
 
 	// Affiche un lien vers la facture client/fournisseur
 	$doc_ref = preg_replace('/\(.*\)/', '', $line->doc_ref);
-	print strlen(length_accounta($line->subledger_account)) == 0 ? '<td>' . $line->label_operation . '</td>' : '<td>' . $line->label_operation . '<br><span style="font-size:0.8em">(' . length_accounta($line->subledger_account) . ')</span></td>';
+	print strlen(length_accounta($line->subledger_account)) == 0 ? '<td>'.$line->label_operation.'</td>' : '<td>'.$line->label_operation.'<br><span style="font-size:0.8em">('.length_accounta($line->subledger_account).')</span></td>';
 
 
-	print '<td class="nowrap right">' . ($line->debit ? price($line->debit) :''). '</td>';
-	print '<td class="nowrap right">' . ($line->credit ? price($line->credit) : '') . '</td>';
+	print '<td class="nowrap right">'.($line->debit ? price($line->debit) : '').'</td>';
+	print '<td class="nowrap right">'.($line->credit ? price($line->credit) : '').'</td>';
 
 	$accountingjournal = new AccountingJournal($db);
 	$result = $accountingjournal->fetch('', $line->code_journal);
-	$journaltoshow = (($result > 0)?$accountingjournal->getNomUrl(0, 0, 0, '', 0) : $line->code_journal);
-	print '<td class="center">' . $journaltoshow . '</td>';
+	$journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $line->code_journal);
+	print '<td class="center">'.$journaltoshow.'</td>';
 
 	print '<td class="center">';
-	print '<a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num=' . $line->piece_num . '">' . img_edit() . '</a>&nbsp;';
-	print '<a href="' . $_SERVER['PHP_SELF'] . '?action=delmouv&mvt_num=' . $line->piece_num . $param . '&page=' . $page . '">' . img_delete() . '</a>';
+	print '<a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$line->piece_num.'">'.img_edit().'</a>&nbsp;';
+	print '<a href="'.$_SERVER['PHP_SELF'].'?action=delmouv&mvt_num='.$line->piece_num.$param.'&page='.$page.'">'.img_delete().'</a>';
 	print '</td>';
 	print "</tr>\n";
 

htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php

@@ -27,22 +27,22 @@
  * \brief       Tab to manage customer lettering
  */
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/lettering.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
-require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/lettering.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("compta","accountancy"));
+$langs->loadLangs(array("compta", "accountancy"));
 
 $action     = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
 $confirm    = GETPOST('confirm', 'alpha');
 $toselect   = GETPOST('toselect', 'array');
-$socid      = GETPOST('socid', 'int')?GETPOST('socid', 'int'):GETPOST('id', 'int');
+$socid      = GETPOST('socid', 'int') ?GETPOST('socid', 'int') : GETPOST('id', 'int');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
@@ -139,15 +139,15 @@ dol_fiche_head($head, 'lettering_customer', $langs->trans("ThirdParty"), 0, 'com
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-dol_banner_tab($object, 'socid', $linkback, ($user->socid?0:1), 'rowid', 'nom', '', '', 0, '', '', 'arearefnobottom');
+dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom', '', '', 0, '', '', 'arearefnobottom');
 
 dol_fiche_end();
 
 $sql = "SELECT bk.rowid, bk.doc_date, bk.doc_type, bk.doc_ref, ";
 $sql .= " bk.subledger_account, bk.numero_compte , bk.label_compte, bk.debit, ";
 $sql .= " bk.credit, bk.montant , bk.sens , bk.code_journal , bk.piece_num, bk.lettering_code ";
-$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as bk";
-$sql .= " WHERE (bk.subledger_account =  '" . $object->code_compta . "' AND bk.numero_compte = '" . $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER . "' )";
+$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as bk";
+$sql .= " WHERE (bk.subledger_account =  '".$object->code_compta."' AND bk.numero_compte = '".$conf->global->ACCOUNTING_ACCOUNT_CUSTOMER."' )";
 
 /*
 if (dol_strlen($search_date_start) || dol_strlen($search_date_end)) {
@@ -155,7 +155,7 @@ if (dol_strlen($search_date_start) || dol_strlen($search_date_end)) {
 }
 */
 
-$sql.= ' AND bk.entity IN ('.getEntity('accountingbookkeeping').')';
+$sql .= ' AND bk.entity IN ('.getEntity('accountingbookkeeping').')';
 $sql .= $db->order($sortfield, $sortorder);
 
 $debit = 0;
@@ -186,8 +186,8 @@ if (!$resql) {
 	exit();
 }
 
-$param='';
-$param.="&socid=".urlencode($socid);
+$param = '';
+$param .= "&socid=".urlencode($socid);
 
 $num = $db->num_rows($resql);
 
@@ -195,10 +195,10 @@ dol_syslog("/accountancy/bookkeeping/thirdparty_lettering_customer.php", LOG_DEB
 if ($resql) {
 	$i = 0;
 
-    $param="&socid=".$socid;
-	print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '?socid=' . $object->id . '" method="POST">';
-    print '<input type="hidden" name="token" value="' . newToken() . '">';
-	print '<input type="hidden" name="socid" value="' . $object->id . '">';
+    $param = "&socid=".$socid;
+	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'" method="POST">';
+    print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="socid" value="'.$object->id.'">';
 
     $letteringbutton = '<a class="divButAction"><span class="valignmiddle"><input class="butAction" type="submit" value="lettering" name="lettering" id="lettering"></span></a>';
 
@@ -250,33 +250,33 @@ if ($resql) {
 	$solde = 0;
 	$tmp = '';
 
-    while ( $obj = $db->fetch_object($resql) ) {
+    while ($obj = $db->fetch_object($resql)) {
 		if ($tmp != $obj->lettering_code || empty($tmp))						$tmp = $obj->lettering_code;
 		/*if ($tmp != $obj->lettering_code || empty($obj->lettering_code))*/	$solde += ($obj->credit - $obj->debit);
 
 		print '<tr class="oddeven">';
 
 		//print '<td>' . $obj->doc_type . '</td>' . "\n";
-		print '<td class="center">' . dol_print_date($db->jdate($obj->doc_date), 'day') . '</td>';
-		print '<td>' . $obj->doc_ref . '</td>';
-		print '<td>' . $obj->label_compte . '</td>';
-		print '<td class="nowrap right">' . price($obj->debit) . '</td>';
-		print '<td class="nowrap right">' . price($obj->credit) . '</td>';
-		print '<td class="nowrap right">' . price(round($solde, 2)) . '</td>';
+		print '<td class="center">'.dol_print_date($db->jdate($obj->doc_date), 'day').'</td>';
+		print '<td>'.$obj->doc_ref.'</td>';
+		print '<td>'.$obj->label_compte.'</td>';
+		print '<td class="nowrap right">'.price($obj->debit).'</td>';
+		print '<td class="nowrap right">'.price($obj->credit).'</td>';
+		print '<td class="nowrap right">'.price(round($solde, 2)).'</td>';
 
 		// Journal
         $accountingjournal = new AccountingJournal($db);
         $result = $accountingjournal->fetch('', $obj->code_journal);
-        $journaltoshow = (($result > 0)?$accountingjournal->getNomUrl(0, 0, 0, '', 0) : $obj->code_journal);
-        print '<td class="center">' . $journaltoshow . '</td>';
+        $journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $obj->code_journal);
+        print '<td class="center">'.$journaltoshow.'</td>';
 
         if (empty($obj->lettering_code)) {
-            print '<td class="nowrap center"><input type="checkbox" class="flat checkforselect" name="toselect[]" id="toselect[]" value="' . $obj->rowid . '" /></td>';
-            print '<td><a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num=' . $obj->piece_num . '">';
+            print '<td class="nowrap center"><input type="checkbox" class="flat checkforselect" name="toselect[]" id="toselect[]" value="'.$obj->rowid.'" /></td>';
+            print '<td><a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$obj->piece_num.'">';
             print img_edit();
-            print '</a></td>' . "\n";
+            print '</a></td>'."\n";
         } else {
-            print '<td class="center">' . $obj->lettering_code . '</td>';
+            print '<td class="center">'.$obj->lettering_code.'</td>';
             print '<td></td>';
         }
 
@@ -284,16 +284,16 @@ if ($resql) {
 	}
 
 	print '<tr class="oddeven">';
-	print '<td class="right" colspan="3">'.$langs->trans("Total").':</td>' . "\n";
-	print '<td class="nowrap right"><strong>' . price($debit) . '</strong></td>';
-	print '<td class="nowrap right"><strong>' . price($credit) . '</strong></td>';
+	print '<td class="right" colspan="3">'.$langs->trans("Total").':</td>'."\n";
+	print '<td class="nowrap right"><strong>'.price($debit).'</strong></td>';
+	print '<td class="nowrap right"><strong>'.price($credit).'</strong></td>';
 	print '<td colspan="4"></td>';
 	print "</tr>\n";
 
 	print '<tr class="oddeven">';
-	print '<td class="right" colspan="3">'.$langs->trans("Balancing").':</td>' . "\n";
+	print '<td class="right" colspan="3">'.$langs->trans("Balancing").':</td>'."\n";
 	print '<td colspan="2">&nbsp;</td>';
-	print '<td class="nowrap right"><strong>' . price($credit - $debit) . '</strong></td>';
+	print '<td class="nowrap right"><strong>'.price($credit - $debit).'</strong></td>';
 	print '<td colspan="6"></td>';
 	print "</tr>\n";
 

htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php

@@ -26,22 +26,22 @@
  * \brief 		Tab to setup lettering
  */
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/lettering.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
-require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/lettering.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("compta","accountancy"));
+$langs->loadLangs(array("compta", "accountancy"));
 
 $action     = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
 $confirm    = GETPOST('confirm', 'alpha');
 $toselect   = GETPOST('toselect', 'array');
-$socid      = GETPOST('socid', 'int')?GETPOST('socid', 'int'):GETPOST('id', 'int');
+$socid      = GETPOST('socid', 'int') ?GETPOST('socid', 'int') : GETPOST('id', 'int');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
@@ -67,7 +67,7 @@ $search_doc_ref = GETPOST("search_doc_ref",'alpha');
 
 $lettering = GETPOST('lettering', 'alpha');
 if (!empty($lettering)) {
-	$action=$lettering;
+	$action = $lettering;
 }
 
 /*
@@ -138,20 +138,20 @@ dol_fiche_head($head, 'lettering_supplier', $langs->trans("ThirdParty"), 0, 'com
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-dol_banner_tab($object, 'socid', $linkback, ($user->socid?0:1), 'rowid', 'nom', '', '', 0, '', '', 'arearefnobottom');
+dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom', '', '', 0, '', '', 'arearefnobottom');
 
 dol_fiche_end();
 
 $sql = "SELECT bk.rowid, bk.doc_date, bk.doc_type, bk.doc_ref, ";
 $sql .= " bk.subledger_account, bk.numero_compte , bk.label_compte, bk.debit, ";
 $sql .= " bk.credit, bk.montant , bk.sens , bk.code_journal , bk.piece_num, bk.lettering_code, bk.date_validated ";
-$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as bk";
-$sql .= " WHERE (bk.subledger_account =  '" . $object->code_compta_fournisseur . "' AND bk.numero_compte = '" . $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER . "' )";
+$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as bk";
+$sql .= " WHERE (bk.subledger_account =  '".$object->code_compta_fournisseur."' AND bk.numero_compte = '".$conf->global->ACCOUNTING_ACCOUNT_SUPPLIER."' )";
 if (dol_strlen($search_date_start) || dol_strlen($search_date_end)) {
 	$sql .= " AND (bk.doc_date BETWEEN '".$db->idate($search_date_start)."' AND  '".$db->idate($search_date_end)."' )";
 }
-$sql.= ' AND bk.entity IN ('.getEntity('accountingbookkeeping').')';
-$sql.= $db->order($sortfield, $sortorder);
+$sql .= ' AND bk.entity IN ('.getEntity('accountingbookkeeping').')';
+$sql .= $db->order($sortfield, $sortorder);
 
 $debit = 0;
 $credit = 0;
@@ -173,17 +173,17 @@ while ($obj = $db->fetch_object($resql)) {
 	$solde += ($obj->credit - $obj->debit);
 }
 
-$sql.= $db->plimit($limit+1, $offset);
+$sql .= $db->plimit($limit + 1, $offset);
 
 dol_syslog("/accountancy/bookkeeping/thirdparty_lettering_supplier.php", LOG_DEBUG);
 $resql = $db->query($sql);
-if (! $resql) {
+if (!$resql) {
 		dol_print_error($db);
 		exit;
 }
 
-$param='';
-$param.="&socid=".urlencode($socid);
+$param = '';
+$param .= "&socid=".urlencode($socid);
 
 $num = $db->num_rows($resql);
 
@@ -193,10 +193,10 @@ if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 
-    $param="&socid=".$socid;
-	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'?socid=' . $object->id . '" method="POST">';
-    print '<input type="hidden" name="token" value="' . newToken() . '">';
-	print '<input type="hidden" name="socid" value="' . $object->id . '">';
+    $param = "&socid=".$socid;
+	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'" method="POST">';
+    print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="socid" value="'.$object->id.'">';
 
     $letteringbutton = '<a class="divButAction"><span class="valignmiddle"><input class="butAction" type="submit" value="lettering" name="lettering" id="lettering"></span></a>';
 
@@ -254,26 +254,26 @@ if ($resql) {
 		print '<tr class="oddeven">';
 
 		//print '<td>' . $obj->doc_type . '</td>' . "\n";
-		print '<td class="center">' . dol_print_date($db->jdate($obj->doc_date), 'day') . '</td>';
-		print '<td>' . $obj->doc_ref . '</td>';
-		print '<td>' . $obj->label_compte . '</td>';
-		print '<td class="nowrap right">' . price($obj->debit) . '</td>';
-		print '<td class="nowrap right">' . price($obj->credit) . '</td>';
-		print '<td class="nowrap right">' . price(round($solde, 2)) . '</td>';
+		print '<td class="center">'.dol_print_date($db->jdate($obj->doc_date), 'day').'</td>';
+		print '<td>'.$obj->doc_ref.'</td>';
+		print '<td>'.$obj->label_compte.'</td>';
+		print '<td class="nowrap right">'.price($obj->debit).'</td>';
+		print '<td class="nowrap right">'.price($obj->credit).'</td>';
+		print '<td class="nowrap right">'.price(round($solde, 2)).'</td>';
 
         // Journal
         $accountingjournal = new AccountingJournal($db);
         $result = $accountingjournal->fetch('', $obj->code_journal);
-        $journaltoshow = (($result > 0)?$accountingjournal->getNomUrl(0, 0, 0, '', 0) : $obj->code_journal);
-        print '<td class="center">' . $journaltoshow . '</td>';
+        $journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $obj->code_journal);
+        print '<td class="center">'.$journaltoshow.'</td>';
 
-		if (empty($obj->lettering_code)  && empty($obj->date_validated) ) {
-			print '<td class="nowrap center"><input type="checkbox" class="flat checkforselect" name="toselect[]" id="toselect[]" value="' . $obj->rowid . '" /></td>';
-		    print '<td><a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num=' . $obj->piece_num . '">';
+		if (empty($obj->lettering_code) && empty($obj->date_validated)) {
+			print '<td class="nowrap center"><input type="checkbox" class="flat checkforselect" name="toselect[]" id="toselect[]" value="'.$obj->rowid.'" /></td>';
+		    print '<td><a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$obj->piece_num.'">';
 		    print img_edit();
-            print '</a></td>' . "\n";
+            print '</a></td>'."\n";
 		} else {
-            print '<td class="center">' . $obj->lettering_code . '</td>';
+            print '<td class="center">'.$obj->lettering_code.'</td>';
             print '<td></td>';
         }
 
@@ -281,16 +281,16 @@ if ($resql) {
 	}
 
 	print '<tr class="oddeven">';
-	print '<td class="right" colspan="3">'.$langs->trans("Total").':</td>' . "\n";
-	print '<td class="nowrap right"><strong>' . price($debit) . '</strong></td>';
-	print '<td class="nowrap right"><strong>' . price($credit) . '</strong></td>';
+	print '<td class="right" colspan="3">'.$langs->trans("Total").':</td>'."\n";
+	print '<td class="nowrap right"><strong>'.price($debit).'</strong></td>';
+	print '<td class="nowrap right"><strong>'.price($credit).'</strong></td>';
 	print '<td colspan="6"></td>';
 	print "</tr>\n";
 
 	print '<tr class="oddeven">';
-	print '<td class="right" colspan="3">'.$langs->trans("Balancing").':</td>' . "\n";
+	print '<td class="right" colspan="3">'.$langs->trans("Balancing").':</td>'."\n";
 	print '<td colspan="2">&nbsp;</td>';
-	print '<td class="nowrap right"><strong>' . price($credit - $debit) . '</strong></td>';
+	print '<td class="nowrap right"><strong>'.price($credit - $debit).'</strong></td>';
 	print '<td colspan="4"></td>';
 	print "</tr>\n";
 

htdocs/accountancy/class/accountancycategory.class.php

@@ -24,7 +24,7 @@
  */
 
 // Class
-require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 
 /**
  * Class to manage categories of an accounting account
@@ -49,12 +49,12 @@ class AccountancyCategory // extends CommonObject
 	/**
 	 * @var string ID to identify managed object
 	 */
-	public $element='c_accounting_category';
+	public $element = 'c_accounting_category';
 
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element='c_accounting_category';
+	public $table_element = 'c_accounting_category';
 
 	/**
 	 * @var int ID
@@ -150,15 +150,15 @@ class AccountancyCategory // extends CommonObject
 	public function create($user, $notrigger = 0)
 	{
 		global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->label)) $this->label=trim($this->label);
-		if (isset($this->range_account)) $this->range_account=trim($this->range_account);
+		if (isset($this->code)) $this->code = trim($this->code);
+		if (isset($this->label)) $this->label = trim($this->label);
+		if (isset($this->range_account)) $this->range_account = trim($this->range_account);
 		if (isset($this->sens)) $this->sens = (int) $this->sens;
 		if (isset($this->category_type)) $this->category_type = (int) $this->category_type;
-		if (isset($this->formula)) $this->formula=trim($this->formula);
+		if (isset($this->formula)) $this->formula = trim($this->formula);
 		if (isset($this->position)) $this->position = (int) $this->position;
 		if (isset($this->fk_country)) $this->fk_country = (int) $this->fk_country;
 		if (isset($this->active)) $this->active = (int) $this->active;
@@ -168,47 +168,47 @@ class AccountancyCategory // extends CommonObject
 
 		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_accounting_category(";
-		if ($this->rowid > 0) $sql.= "rowid, ";
-		$sql.= "code, ";
-		$sql.= "label, ";
-		$sql.= "range_account, ";
-		$sql.= "sens, ";
-		$sql.= "category_type, ";
-		$sql.= "formula, ";
-		$sql.= "position, ";
-		$sql.= "fk_country, ";
-		$sql.= "active, ";
-		$sql.= "entity";
-		$sql.= ") VALUES (";
-		if ($this->rowid > 0) $sql.= " ".$this->rowid.",";
-		$sql.= " ".(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").",";
-		$sql.= " ".(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").",";
-		$sql.= " ".(! isset($this->range_account)?'NULL':"'".$this->db->escape($this->range_account)."'").",";
-		$sql.= " ".(! isset($this->sens)?'NULL':"'".$this->db->escape($this->sens)."'").",";
-		$sql.= " ".(! isset($this->category_type)?'NULL':"'".$this->db->escape($this->category_type)."'").",";
-		$sql.= " ".(! isset($this->formula)?'NULL':"'".$this->db->escape($this->formula)."'").",";
-		$sql.= " ".(! isset($this->position)?'NULL':$this->db->escape($this->position)).",";
-		$sql.= " ".(! isset($this->fk_country)?'NULL':$this->db->escape($this->fk_country)).",";
-		$sql.= " ".(! isset($this->active)?'NULL':$this->db->escape($this->active));
-		$sql.= ", ".$conf->entity;
-		$sql.= ")";
+		if ($this->rowid > 0) $sql .= "rowid, ";
+		$sql .= "code, ";
+		$sql .= "label, ";
+		$sql .= "range_account, ";
+		$sql .= "sens, ";
+		$sql .= "category_type, ";
+		$sql .= "formula, ";
+		$sql .= "position, ";
+		$sql .= "fk_country, ";
+		$sql .= "active, ";
+		$sql .= "entity";
+		$sql .= ") VALUES (";
+		if ($this->rowid > 0) $sql .= " ".$this->rowid.",";
+		$sql .= " ".(!isset($this->code) ? 'NULL' : "'".$this->db->escape($this->code)."'").",";
+		$sql .= " ".(!isset($this->label) ? 'NULL' : "'".$this->db->escape($this->label)."'").",";
+		$sql .= " ".(!isset($this->range_account) ? 'NULL' : "'".$this->db->escape($this->range_account)."'").",";
+		$sql .= " ".(!isset($this->sens) ? 'NULL' : "'".$this->db->escape($this->sens)."'").",";
+		$sql .= " ".(!isset($this->category_type) ? 'NULL' : "'".$this->db->escape($this->category_type)."'").",";
+		$sql .= " ".(!isset($this->formula) ? 'NULL' : "'".$this->db->escape($this->formula)."'").",";
+		$sql .= " ".(!isset($this->position) ? 'NULL' : $this->db->escape($this->position)).",";
+		$sql .= " ".(!isset($this->fk_country) ? 'NULL' : $this->db->escape($this->fk_country)).",";
+		$sql .= " ".(!isset($this->active) ? 'NULL' : $this->db->escape($this->active));
+		$sql .= ", ".$conf->entity;
+		$sql .= ")";
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
 		// Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -229,27 +229,27 @@ class AccountancyCategory // extends CommonObject
 	public function fetch($id, $code = '', $label = '')
 	{
 		$sql = "SELECT";
-		$sql.= " t.rowid,";
-		$sql.= " t.code,";
-		$sql.= " t.label,";
-		$sql.= " t.range_account,";
-		$sql.= " t.sens,";
-		$sql.= " t.category_type,";
-		$sql.= " t.formula,";
-		$sql.= " t.position,";
-		$sql.= " t.fk_country,";
-		$sql.= " t.active";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_accounting_category as t";
-		if ($id)   $sql.= " WHERE t.rowid = ".$id;
+		$sql .= " t.rowid,";
+		$sql .= " t.code,";
+		$sql .= " t.label,";
+		$sql .= " t.range_account,";
+		$sql .= " t.sens,";
+		$sql .= " t.category_type,";
+		$sql .= " t.formula,";
+		$sql .= " t.position,";
+		$sql .= " t.fk_country,";
+		$sql .= " t.active";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as t";
+		if ($id)   $sql .= " WHERE t.rowid = ".$id;
 		else
 		{
-			$sql.= " WHERE t.entity IN (".getEntity('c_accounting_category').")"; // Dont't use entity if you use rowid
-			if ($code) $sql.= " AND t.code = '".$this->db->escape($code)."'";
-			elseif ($label) $sql.= " AND t.label = '".$this->db->escape($label)."'";
+			$sql .= " WHERE t.entity IN (".getEntity('c_accounting_category').")"; // Dont't use entity if you use rowid
+			if ($code) $sql .= " AND t.code = '".$this->db->escape($code)."'";
+			elseif ($label) $sql .= " AND t.label = '".$this->db->escape($label)."'";
 		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			if ($this->db->num_rows($resql))
@@ -273,7 +273,7 @@ class AccountancyCategory // extends CommonObject
 		}
 		else
 		{
-			$this->error="Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 	}
@@ -289,15 +289,15 @@ class AccountancyCategory // extends CommonObject
 	public function update($user = null, $notrigger = 0)
 	{
 		global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->label)) $this->label=trim($this->label);
-		if (isset($this->range_account)) $this->range_account=trim($this->range_account);
+		if (isset($this->code)) $this->code = trim($this->code);
+		if (isset($this->label)) $this->label = trim($this->label);
+		if (isset($this->range_account)) $this->range_account = trim($this->range_account);
 		if (isset($this->sens)) $this->sens = (int) $this->sens;
 		if (isset($this->category_type)) $this->category_type = (int) $this->category_type;
-		if (isset($this->formula)) $this->formula=trim($this->formula);
+		if (isset($this->formula)) $this->formula = trim($this->formula);
 		if (isset($this->position)) $this->position = (int) $this->position;
 		if (isset($this->fk_country)) $this->fk_country = (int) $this->fk_country;
 		if (isset($this->active)) $this->active = (int) $this->active;
@@ -308,33 +308,33 @@ class AccountancyCategory // extends CommonObject
 
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."c_accounting_category SET";
-		$sql.= " code=".(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").",";
-		$sql.= " label=".(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
-		$sql.= " range_account=".(isset($this->range_account)?"'".$this->db->escape($this->range_account)."'":"null").",";
-		$sql.= " sens=".(isset($this->sens)?$this->sens:"null").",";
-		$sql.= " category_type=".(isset($this->category_type)?$this->category_type:"null").",";
-		$sql.= " formula=".(isset($this->formula)?"'".$this->db->escape($this->formula)."'":"null").",";
-		$sql.= " position=".(isset($this->position)?$this->position:"null").",";
-		$sql.= " fk_country=".(isset($this->fk_country)?$this->fk_country:"null").",";
-		$sql.= " active=".(isset($this->active)?$this->active:"null")."";
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " code=".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "null").",";
+		$sql .= " label=".(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
+		$sql .= " range_account=".(isset($this->range_account) ? "'".$this->db->escape($this->range_account)."'" : "null").",";
+		$sql .= " sens=".(isset($this->sens) ? $this->sens : "null").",";
+		$sql .= " category_type=".(isset($this->category_type) ? $this->category_type : "null").",";
+		$sql .= " formula=".(isset($this->formula) ? "'".$this->db->escape($this->formula)."'" : "null").",";
+		$sql .= " position=".(isset($this->position) ? $this->position : "null").",";
+		$sql .= " fk_country=".(isset($this->fk_country) ? $this->fk_country : "null").",";
+		$sql .= " active=".(isset($this->active) ? $this->active : "null")."";
+		$sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
 		// Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -354,27 +354,27 @@ class AccountancyCategory // extends CommonObject
 	public function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."c_accounting_category";
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
 		// Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -394,28 +394,28 @@ class AccountancyCategory // extends CommonObject
     {
 		global $conf;
 		$sql = "SELECT t.rowid, t.account_number, t.label";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as t";
-		$sql .= " WHERE t.fk_accounting_category = " . $id;
-		$sql .= " AND t.entity = " . $conf->entity;
+		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as t";
+		$sql .= " WHERE t.fk_accounting_category = ".$id;
+		$sql .= " AND t.entity = ".$conf->entity;
 
 		$this->lines_display = array();
 
-		dol_syslog(__METHOD__ . " sql=" . $sql, LOG_DEBUG);
+		dol_syslog(__METHOD__." sql=".$sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			if ($num) {
-				while ( $obj = $this->db->fetch_object($resql) ) {
+				while ($obj = $this->db->fetch_object($resql)) {
 					$this->lines_display[] = $obj;
 				}
 			}
 			return $num;
 		} else {
-			$this->error = "Error " . $this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			$this->errors[] = $this->error;
-			dol_syslog(__METHOD__ . " " . implode(',' . $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__." ".implode(','.$this->errors), LOG_ERR);
 
-			return - 1;
+			return -1;
 		}
     }
 
@@ -431,40 +431,40 @@ class AccountancyCategory // extends CommonObject
 		global $conf;
 
 		$sql = "SELECT t.numero_compte, t.label_operation, t.doc_ref";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as t";
+		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as t";
 		$sql .= " WHERE t.numero_compte NOT IN (";
 		$sql .= " SELECT t.account_number";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as t";
-		$sql .= " WHERE t.fk_accounting_category = " . $id . " AND t.entity = " . $conf->entity.")";
+		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as t";
+		$sql .= " WHERE t.fk_accounting_category = ".$id." AND t.entity = ".$conf->entity.")";
 		$sql .= " AND t.numero_compte IN (";
 		$sql .= " SELECT DISTINCT aa.account_number";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
-		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
-		$sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
+		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as aa";
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
+		$sql .= " AND asy.rowid = ".$conf->global->CHARTOFACCOUNTS;
 		$sql .= " AND aa.active = 1";
-		$sql .= " AND aa.entity = " . $conf->entity . ")";
+		$sql .= " AND aa.entity = ".$conf->entity.")";
 		$sql .= " GROUP BY t.numero_compte, t.label_operation, t.doc_ref";
 		$sql .= " ORDER BY t.numero_compte";
 
-		$this->lines_CptBk = array ();
+		$this->lines_CptBk = array();
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			if ($num) {
-				while ( $obj = $this->db->fetch_object($resql) ) {
+				while ($obj = $this->db->fetch_object($resql)) {
 					$this->lines_cptbk[] = $obj;
 				}
 			}
 
 			return $num;
 		} else {
-			$this->error = "Error " . $this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			$this->errors[] = $this->error;
-			dol_syslog(__METHOD__ . " " . implode(',' . $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__." ".implode(','.$this->errors), LOG_ERR);
 
-			return - 1;
+			return -1;
 		}
     }
 
@@ -480,34 +480,34 @@ class AccountancyCategory // extends CommonObject
         global $conf;
 
 	    $sql = "SELECT aa.account_number as numero_compte, aa.label as label_compte";
-	    $sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
-	    $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
+	    $sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as aa";
+	    $sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
 	    $sql .= " WHERE (aa.fk_accounting_category != ".$id." OR aa.fk_accounting_category IS NULL)";
-	    $sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
+	    $sql .= " AND asy.rowid = ".$conf->global->CHARTOFACCOUNTS;
 	    $sql .= " AND aa.active = 1";
-	    $sql .= " AND aa.entity = " . $conf->entity;
+	    $sql .= " AND aa.entity = ".$conf->entity;
 	    $sql .= " GROUP BY aa.account_number, aa.label";
 	    $sql .= " ORDER BY aa.account_number, aa.label";
 
-	    $this->lines_CptBk = array ();
+	    $this->lines_CptBk = array();
 
 	    dol_syslog(__METHOD__, LOG_DEBUG);
 	    $resql = $this->db->query($sql);
 	    if ($resql) {
 	        $num = $this->db->num_rows($resql);
 	        if ($num) {
-	            while ( $obj = $this->db->fetch_object($resql) ) {
+	            while ($obj = $this->db->fetch_object($resql)) {
 	                $this->lines_cptbk[] = $obj;
 	            }
 	        }
 
 	        return $num;
 	    } else {
-	        $this->error = "Error " . $this->db->lasterror();
+	        $this->error = "Error ".$this->db->lasterror();
 	        $this->errors[] = $this->error;
-	        dol_syslog(__METHOD__ . " " . implode(',' . $this->errors), LOG_ERR);
+	        dol_syslog(__METHOD__." ".implode(','.$this->errors), LOG_ERR);
 
-	        return - 1;
+	        return -1;
 	    }
     }
 
@@ -527,42 +527,42 @@ class AccountancyCategory // extends CommonObject
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 
 		$sql = "SELECT aa.rowid, aa.account_number";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
-		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
-		$sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
+		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as aa";
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
+		$sql .= " AND asy.rowid = ".$conf->global->CHARTOFACCOUNTS;
 		$sql .= " AND aa.active = 1";
-		$sql .= " AND aa.entity = " . $conf->entity;
-        $sql .= " ORDER BY LENGTH(aa.account_number) DESC;";    // LENGTH is ok with mysql and postgresql
+		$sql .= " AND aa.entity = ".$conf->entity;
+        $sql .= " ORDER BY LENGTH(aa.account_number) DESC;"; // LENGTH is ok with mysql and postgresql
 
 		$this->db->begin();
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (! $resql) {
-			$error ++;
-			$this->errors[] = "Error " . $this->db->lasterror();
+		if (!$resql) {
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
 
-		$accountincptsadded=array();
+		$accountincptsadded = array();
 		while ($obj = $this->db->fetch_object($resql))
 		{
-		    $account_number_formated=length_accountg($obj->account_number);
-		    if (! empty($accountincptsadded[$account_number_formated])) continue;
+		    $account_number_formated = length_accountg($obj->account_number);
+		    if (!empty($accountincptsadded[$account_number_formated])) continue;
 
 		    if (array_key_exists($account_number_formated, $cpts))
 			{
-			    $accountincptsadded[$account_number_formated]=1;
+			    $accountincptsadded[$account_number_formated] = 1;
 			    // We found an account number that is in list $cpts of account to add
-				$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_account";
-				$sql .= " SET fk_accounting_category=" . $id_cat;
+				$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_account";
+				$sql .= " SET fk_accounting_category=".$id_cat;
 				$sql .= " WHERE rowid=".$obj->rowid;
 				dol_syslog(__METHOD__, LOG_DEBUG);
 				$resqlupdate = $this->db->query($sql);
-				if (! $resqlupdate) {
-					$error ++;
-					$this->errors[] = "Error " . $this->db->lasterror();
+				if (!$resqlupdate) {
+					$error++;
+					$this->errors[] = "Error ".$this->db->lasterror();
 				}
 			}
 		}
@@ -570,12 +570,12 @@ class AccountancyCategory // extends CommonObject
 		// Commit or rollback
 		if ($error) {
 			foreach ($this->errors as $errmsg) {
-				dol_syslog(__METHOD__ . " " . $errmsg, LOG_ERR);
-				$this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+				dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 
-			return - 1 * $error;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 
@@ -594,27 +594,27 @@ class AccountancyCategory // extends CommonObject
     {
 		$error = 0;
 
-		$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_account as aa";
+		$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_account as aa";
 		$sql .= " SET fk_accounting_category= 0";
-		$sql .= " WHERE aa.rowid= " . $cpt_id;
+		$sql .= " WHERE aa.rowid= ".$cpt_id;
 		$this->db->begin();
 
-		dol_syslog(__METHOD__ . " sql=" . $sql, LOG_DEBUG);
+		dol_syslog(__METHOD__." sql=".$sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (! $resql) {
-			$error ++;
-			$this->errors[] = "Error " . $this->db->lasterror();
+		if (!$resql) {
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		// Commit or rollback
         if ($error) {
 			foreach ($this->errors as $errmsg) {
-				dol_syslog(__METHOD__ . " " . $errmsg, LOG_ERR);
-				$this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+				dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 
-			return - 1 * $error;
+			return -1 * $error;
         } else {
 			$this->db->commit();
 
@@ -637,14 +637,14 @@ class AccountancyCategory // extends CommonObject
 		}
 
 		$sql = "SELECT t.rowid, t.account_number, t.label as account_label, cat.code, cat.position, cat.label as name_cat, cat.sens ";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as t, " . MAIN_DB_PREFIX . "c_accounting_category as cat";
+		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as t, ".MAIN_DB_PREFIX."c_accounting_category as cat";
 		$sql .= " WHERE t.fk_accounting_category IN ( SELECT c.rowid ";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "c_accounting_category as c";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c";
 		$sql .= " WHERE c.active = 1";
-		$sql .= " AND c.entity = " . $conf->entity;
+		$sql .= " AND c.entity = ".$conf->entity;
 		$sql .= " AND (c.fk_country = ".$mysoc->country_id." OR c.fk_country = 0)";
 		$sql .= " AND cat.rowid = t.fk_accounting_category";
-		$sql .= " AND t.entity = " . $conf->entity;
+		$sql .= " AND t.entity = ".$conf->entity;
 		$sql .= " ORDER BY cat.position ASC";
 
 		$resql = $this->db->query($sql);
@@ -652,11 +652,11 @@ class AccountancyCategory // extends CommonObject
 			$i = 0;
 			$obj = '';
 			$num = $this->db->num_rows($resql);
-			$data = array ();
+			$data = array();
 			if ($num) {
-				while ( $obj = $this->db->fetch_object($resql) ) {
+				while ($obj = $this->db->fetch_object($resql)) {
 					$name_cat = $obj->name_cat;
-					$data[$name_cat][$i] = array (
+					$data[$name_cat][$i] = array(
 							'id' => $obj->rowid,
 							'code' => $obj->code,
 							'position' => $obj->position,
@@ -664,13 +664,13 @@ class AccountancyCategory // extends CommonObject
 							'account_label' => $obj->account_label,
 							'sens' => $obj->sens
 					);
-					$i ++;
+					$i++;
 				}
 			}
 			return $data;
 		} else {
-			$this->error = "Error " . $this->db->lasterror();
-			dol_syslog(__METHOD__ . " " . $this->error, LOG_ERR);
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(__METHOD__." ".$this->error, LOG_ERR);
 
 			return -1;
 		}
@@ -696,34 +696,34 @@ class AccountancyCategory // extends CommonObject
 		$this->sdcpermonth = array();
 
 		$sql = "SELECT SUM(t.debit) as debit, SUM(t.credit) as credit";
-		if (is_array($cpt)) $sql.=", t.numero_compte as accountancy_account";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as t";
+		if (is_array($cpt)) $sql .= ", t.numero_compte as accountancy_account";
+		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as t";
 		//if (in_array($this->db->type, array('mysql', 'mysqli'))) $sql.=' USE INDEX idx_accounting_bookkeeping_doc_date';
 		$sql .= " WHERE t.entity = ".$conf->entity;
 		if (is_array($cpt))
 		{
-			$listofaccount='';
-			foreach($cpt as $cptcursor)
+			$listofaccount = '';
+			foreach ($cpt as $cptcursor)
 			{
-				if ($listofaccount) $listofaccount.=",";
-				$listofaccount.="'".$cptcursor."'";
+				if ($listofaccount) $listofaccount .= ",";
+				$listofaccount .= "'".$cptcursor."'";
 			}
-			$sql .= " AND t.numero_compte IN (" .$listofaccount. ")";
+			$sql .= " AND t.numero_compte IN (".$listofaccount.")";
 		}
 		else
 		{
-			$sql .= " AND t.numero_compte = '" . $this->db->escape($cpt) . "'";
+			$sql .= " AND t.numero_compte = '".$this->db->escape($cpt)."'";
 		}
-		if (! empty($date_start) && ! empty($date_end) && (empty($month) || empty($year)))	// If month/year provided, it is stronger than filter date_start/date_end
+		if (!empty($date_start) && !empty($date_end) && (empty($month) || empty($year)))	// If month/year provided, it is stronger than filter date_start/date_end
 			$sql .= " AND (t.doc_date BETWEEN '".$this->db->idate($date_start)."' AND '".$this->db->idate($date_end)."')";
-		if (! empty($month) && ! empty($year)) {
+		if (!empty($month) && !empty($year)) {
 			$sql .= " AND (t.doc_date BETWEEN '".$this->db->idate(dol_get_first_day($year, $month))."' AND '".$this->db->idate(dol_get_last_day($year, $month))."')";
 		}
 		if ($thirdparty_code != 'nofilter')
 		{
 			$sql .= " AND t.thirdparty_code = '".$this->db->escape($thirdparty_code)."'";
 		}
-		if (is_array($cpt)) $sql.=" GROUP BY t.numero_compte";
+		if (is_array($cpt)) $sql .= " GROUP BY t.numero_compte";
 		//print $sql;
 
 		$resql = $this->db->query($sql);
@@ -745,9 +745,9 @@ class AccountancyCategory // extends CommonObject
 			}
 			return $num;
 		} else {
-			$this->error = "Error " . $this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			$this->errors[] = $this->error;
-			dol_syslog(__METHOD__ . " " . $this->error, LOG_ERR);
+			dol_syslog(__METHOD__." ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -768,10 +768,10 @@ class AccountancyCategory // extends CommonObject
 		}
 
 		$sql = "SELECT c.rowid, c.code, c.label, c.formula, c.position, c.category_type, c.sens";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "c_accounting_category as c";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c";
 		$sql .= " WHERE c.active = 1";
-		$sql .= " AND c.entity = " . $conf->entity;
-		if ($categorytype >= 0) $sql.=" AND c.category_type = 1";
+		$sql .= " AND c.entity = ".$conf->entity;
+		if ($categorytype >= 0) $sql .= " AND c.category_type = 1";
 		$sql .= " AND (c.fk_country = ".$mysoc->country_id." OR c.fk_country = 0)";
 		$sql .= " ORDER BY c.position ASC";
 
@@ -780,12 +780,12 @@ class AccountancyCategory // extends CommonObject
 			$i = 0;
 			$obj = '';
 			$num = $this->db->num_rows($resql);
-			$data = array ();
+			$data = array();
 			if ($num) {
-				while ( $i < $num ) {
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 
-					$data[] = array (
+					$data[] = array(
 							'rowid' => $obj->rowid,
 							'code' => $obj->code,
 							'label' => $obj->label,
@@ -799,11 +799,11 @@ class AccountancyCategory // extends CommonObject
 			}
 			return $data;
 		} else {
-			$this->error = "Error " . $this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			$this->errors[] = $this->error;
-			dol_syslog(__METHOD__ . " " . implode(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__." ".implode(',', $this->errors), LOG_ERR);
 
-			return - 1;
+			return -1;
 		}
 	}
 
@@ -826,20 +826,20 @@ class AccountancyCategory // extends CommonObject
 			exit();
 		}
 
-		if (! empty($cat_id))
+		if (!empty($cat_id))
 		{
 			$sql = "SELECT t.rowid, t.account_number, t.label as account_label";
-			$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as t";
+			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as t";
 			$sql .= " WHERE t.fk_accounting_category = ".$cat_id;
-			$sql .= " AND t.entity = " . $conf->entity;
+			$sql .= " AND t.entity = ".$conf->entity;
 			$sql .= " ORDER BY t.account_number";
 		}
 		else
 		{
 			$sql = "SELECT t.rowid, t.account_number, t.label as account_label";
-			$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as t";
+			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as t";
 			$sql .= " WHERE ".$predefinedgroupwhere;
-			$sql .= " AND t.entity = " . $conf->entity;
+			$sql .= " AND t.entity = ".$conf->entity;
 			$sql .= " ORDER BY t.account_number";
 		}
 		//echo $sql;
@@ -853,7 +853,7 @@ class AccountancyCategory // extends CommonObject
 			if ($num) {
 				while ($obj = $this->db->fetch_object($resql))
 				{
-					$data[] = array (
+					$data[] = array(
 							'id' => $obj->rowid,
 							'account_number' => $obj->account_number,
 							'account_label' => $obj->account_label,
@@ -863,8 +863,8 @@ class AccountancyCategory // extends CommonObject
 			}
 			return $data;
 		} else {
-			$this->error = "Error " . $this->db->lasterror();
-			dol_syslog(__METHOD__ . " " . $this->error, LOG_ERR);
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(__METHOD__." ".$this->error, LOG_ERR);
 
 			return -1;
 		}

htdocs/accountancy/class/accountancyexport.class.php

@@ -1079,28 +1079,28 @@ class AccountancyExport
 
 		foreach ($objectLines as $line) {
 			// TYPE C
-			if($last_codeinvoice != $line->doc_ref){
+			if ($last_codeinvoice != $line->doc_ref) {
 				//recherche societe en fonction de son code client
-				$sql = "SELECT code_client, fk_forme_juridique, nom, address, zip, town, fk_pays, phone, siret FROM ".MAIN_DB_PREFIX."societe WHERE code_client = '".$line->thirdparty_code ."'";
+				$sql = "SELECT code_client, fk_forme_juridique, nom, address, zip, town, fk_pays, phone, siret FROM ".MAIN_DB_PREFIX."societe WHERE code_client = '".$line->thirdparty_code."'";
 				$resql = $this->db->query($sql);
 
-				if($resql && $this->db->num_rows($resql)>0)
+				if ($resql && $this->db->num_rows($resql) > 0)
 				{
 					$soc = $this->db->fetch_object($resql);
 
-	                $address=array('','','');
-                    if (strpos($soc->address, "\n")!==false) {
+	                $address = array('', '', '');
+                    if (strpos($soc->address, "\n") !== false) {
 	                    $address = explode("\n", $soc->address);
-	                    if (is_array($address) && count($address)>0) {
-	                    	foreach($address as $key=>$data) {
-			                    $address[$key]=str_replace(array("\t", "\n", "\r"), "", $data);
-			                    $address[$key]=dol_trunc($address[$key], 40, 'right', 'UTF-8', 1);
+	                    if (is_array($address) && count($address) > 0) {
+	                    	foreach ($address as $key=>$data) {
+			                    $address[$key] = str_replace(array("\t", "\n", "\r"), "", $data);
+			                    $address[$key] = dol_trunc($address[$key], 40, 'right', 'UTF-8', 1);
 		                    }
 	                    }
                     } else {
-	                    $address[0] =  substr(str_replace(array("\t", "\r"), " ", $soc->address), 0, 40);
-	                    $address[1] =  substr(str_replace(array("\t", "\r"), " ", $soc->address), 41, 40);
-	                    $address[2] =  substr(str_replace(array("\t", "\r"), " ", $soc->address), 82, 40);
+	                    $address[0] = substr(str_replace(array("\t", "\r"), " ", $soc->address), 0, 40);
+	                    $address[1] = substr(str_replace(array("\t", "\r"), " ", $soc->address), 41, 40);
+	                    $address[2] = substr(str_replace(array("\t", "\r"), " ", $soc->address), 82, 40);
                     }
 
 					$type_enregistrement = 'C';
@@ -1254,7 +1254,7 @@ class AccountancyExport
 			$racine_subledger_account = ''; // for records of type E leave this field blank
 			//			}
 
-			print $racine_subledger_account . $separator; // deprecated CPTG & CPTA use instead
+			print $racine_subledger_account.$separator; // deprecated CPTG & CPTA use instead
 			// MONT
 			print price(abs($line->montant), 0, '', 1, 2).$separator;
 			// CODC

htdocs/accountancy/class/accountancysystem.class.php

@@ -98,15 +98,15 @@ class AccountancySystem
 	    if ($rowid > 0 || $ref)
 	    {
 	        $sql  = "SELECT a.rowid, a.pcg_version, a.label, a.active";
-	        $sql .= " FROM " . MAIN_DB_PREFIX . "accounting_system as a";
+	        $sql .= " FROM ".MAIN_DB_PREFIX."accounting_system as a";
 	        $sql .= " WHERE";
 	        if ($rowid) {
-	            $sql .= " a.rowid = '" . $rowid . "'";
+	            $sql .= " a.rowid = '".$rowid."'";
 	        } elseif ($ref) {
-	            $sql .= " a.pcg_version = '" . $this->db->escape($ref) . "'";
+	            $sql .= " a.pcg_version = '".$this->db->escape($ref)."'";
 	        }
 
-	        dol_syslog(get_class($this) . "::fetch sql=" . $sql, LOG_DEBUG);
+	        dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
 	        $result = $this->db->query($sql);
 	        if ($result) {
 	            $obj = $this->db->fetch_object($result);
@@ -124,11 +124,11 @@ class AccountancySystem
 	                return 0;
 	            }
 	        } else {
-	            $this->error = "Error " . $this->db->lasterror();
-	            $this->errors[] = "Error " . $this->db->lasterror();
+	            $this->error = "Error ".$this->db->lasterror();
+	            $this->errors[] = "Error ".$this->db->lasterror();
 	        }
 	    }
-	    return - 1;
+	    return -1;
 	}
 
 
@@ -142,14 +142,14 @@ class AccountancySystem
     {
 		$now = dol_now();
 
-		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "accounting_system";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."accounting_system";
 		$sql .= " (date_creation, fk_user_author, numero, label)";
-		$sql .= " VALUES ('" . $this->db->idate($now) . "'," . $user->id . ",'" . $this->db->escape($this->numero) . "','" . $this->db->escape($this->label) . "')";
+		$sql .= " VALUES ('".$this->db->idate($now)."',".$user->id.",'".$this->db->escape($this->numero)."','".$this->db->escape($this->label)."')";
 
-		dol_syslog(get_class($this) . "::create sql=" . $sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
-			$id = $this->db->last_insert_id(MAIN_DB_PREFIX . "accounting_system");
+			$id = $this->db->last_insert_id(MAIN_DB_PREFIX."accounting_system");
 
 			if ($id > 0) {
 				$this->rowid = $id;

htdocs/accountancy/class/accountingaccount.class.php

@@ -34,12 +34,12 @@ class AccountingAccount extends CommonObject
 	/**
 	 * @var string Name of element
 	 */
-	public $element='accounting_account';
+	public $element = 'accounting_account';
 
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element='accounting_account';
+	public $table_element = 'accounting_account';
 
 	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
@@ -150,7 +150,7 @@ class AccountingAccount extends CommonObject
 		global $conf;
 
 		$this->db = $db;
-		$this->next_prev_filter='fk_pcg_version IN (SELECT pcg_version FROM ' . MAIN_DB_PREFIX . 'accounting_system WHERE rowid=' . $conf->global->CHARTOFACCOUNTS . ')';		// Used to add a filter in Form::showrefnav method
+		$this->next_prev_filter = 'fk_pcg_version IN (SELECT pcg_version FROM '.MAIN_DB_PREFIX.'accounting_system WHERE rowid='.$conf->global->CHARTOFACCOUNTS.')'; // Used to add a filter in Form::showrefnav method
     }
 
 	/**
@@ -169,23 +169,23 @@ class AccountingAccount extends CommonObject
 		if ($rowid || $account_number) {
 			$sql  = "SELECT a.rowid as rowid, a.datec, a.tms, a.fk_pcg_version, a.pcg_type, a.account_number, a.account_parent, a.label, a.labelshort, a.fk_accounting_category, a.fk_user_author, a.fk_user_modif, a.active, a.reconcilable";
 			$sql .= ", ca.label as category_label";
-			$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as a";
+			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as a";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_accounting_category as ca ON a.fk_accounting_category = ca.rowid";
 			$sql .= " WHERE";
 			if ($rowid) {
-				$sql .= " a.rowid = " . (int) $rowid;
+				$sql .= " a.rowid = ".(int) $rowid;
 			} elseif ($account_number) {
-				$sql .= " a.account_number = '" . $this->db->escape($account_number) . "'";
+				$sql .= " a.account_number = '".$this->db->escape($account_number)."'";
 				$sql .= " AND a.entity = ".$conf->entity;
 			}
-			if (! empty($limittocurrentchart)) {
-				$sql .= ' AND a.fk_pcg_version IN (SELECT pcg_version FROM ' . MAIN_DB_PREFIX . 'accounting_system WHERE rowid=' . $this->db->escape($conf->global->CHARTOFACCOUNTS) . ')';
+			if (!empty($limittocurrentchart)) {
+				$sql .= ' AND a.fk_pcg_version IN (SELECT pcg_version FROM '.MAIN_DB_PREFIX.'accounting_system WHERE rowid='.$this->db->escape($conf->global->CHARTOFACCOUNTS).')';
 			}
-			if (! empty($limittoachartaccount)) {
+			if (!empty($limittoachartaccount)) {
 			    $sql .= " AND a.fk_pcg_version = '".$this->db->escape($limittoachartaccount)."'";
 			}
 
-			dol_syslog(get_class($this) . "::fetch sql=" . $sql, LOG_DEBUG);
+			dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
 			$result = $this->db->query($sql);
 			if ($result) {
 				$obj = $this->db->fetch_object($result);
@@ -215,8 +215,8 @@ class AccountingAccount extends CommonObject
 					return 0;
 				}
 			} else {
-				$this->error = "Error " . $this->db->lasterror();
-				$this->errors[] = "Error " . $this->db->lasterror();
+				$this->error = "Error ".$this->db->lasterror();
+				$this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 		return -1;
@@ -255,7 +255,7 @@ class AccountingAccount extends CommonObject
 		// Put here code to add control on parameters values
 
 		// Insert request
-		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "accounting_account(";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."accounting_account(";
 		$sql .= "datec";
 		$sql .= ", entity";
 		$sql .= ", fk_pcg_version";
@@ -269,31 +269,31 @@ class AccountingAccount extends CommonObject
 		$sql .= ", active";
 		$sql .= ", reconcilable";
 		$sql .= ") VALUES (";
-		$sql .= " '" . $this->db->idate($now) . "'";
-		$sql .= ", " . $conf->entity;
-		$sql .= ", " . (empty($this->fk_pcg_version) ? 'NULL' : "'" . $this->db->escape($this->fk_pcg_version) . "'");
-		$sql .= ", " . (empty($this->pcg_type) ? 'NULL' : "'" . $this->db->escape($this->pcg_type) . "'");
-		$sql .= ", " . (empty($this->account_number) ? 'NULL' : "'" . $this->db->escape($this->account_number) . "'");
-		$sql .= ", " . (empty($this->account_parent) ? 0 : (int) $this->account_parent);
-		$sql .= ", " . (empty($this->label) ? "''" : "'" . $this->db->escape($this->label) . "'");
-		$sql .= ", " . (empty($this->labelshort) ? "''" : "'" . $this->db->escape($this->labelshort) . "'");
-		$sql .= ", " . (empty($this->account_category) ? 0 : (int) $this->account_category);
-		$sql .= ", " . $user->id;
-		$sql .= ", " . (int) $this->active;
-		$sql .= ", " . (int) $this->reconcilable;
+		$sql .= " '".$this->db->idate($now)."'";
+		$sql .= ", ".$conf->entity;
+		$sql .= ", ".(empty($this->fk_pcg_version) ? 'NULL' : "'".$this->db->escape($this->fk_pcg_version)."'");
+		$sql .= ", ".(empty($this->pcg_type) ? 'NULL' : "'".$this->db->escape($this->pcg_type)."'");
+		$sql .= ", ".(empty($this->account_number) ? 'NULL' : "'".$this->db->escape($this->account_number)."'");
+		$sql .= ", ".(empty($this->account_parent) ? 0 : (int) $this->account_parent);
+		$sql .= ", ".(empty($this->label) ? "''" : "'".$this->db->escape($this->label)."'");
+		$sql .= ", ".(empty($this->labelshort) ? "''" : "'".$this->db->escape($this->labelshort)."'");
+		$sql .= ", ".(empty($this->account_category) ? 0 : (int) $this->account_category);
+		$sql .= ", ".$user->id;
+		$sql .= ", ".(int) $this->active;
+		$sql .= ", ".(int) $this->reconcilable;
 		$sql .= ")";
 
 		$this->db->begin();
 
-		dol_syslog(get_class($this) . "::create sql=" . $sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (! $resql) {
+		if (!$resql) {
 			$error++;
-			$this->errors[] = "Error " . $this->db->lasterror();
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
-		if (! $error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . "accounting_account");
+		if (!$error) {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."accounting_account");
 
 			// Uncomment this and change MYOBJECT to your own tag if you
 			// want this action to call a trigger.
@@ -309,8 +309,8 @@ class AccountingAccount extends CommonObject
 		// Commit or rollback
 		if ($error) {
 			foreach ($this->errors as $errmsg) {
-				dol_syslog(get_class($this) . "::create " . $errmsg, LOG_ERR);
-				$this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
@@ -336,20 +336,20 @@ class AccountingAccount extends CommonObject
 
 		$this->db->begin();
 
-		$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_account ";
-		$sql .= " SET fk_pcg_version = " . ($this->fk_pcg_version ? "'" . $this->db->escape($this->fk_pcg_version) . "'" : "null");
-		$sql .= " , pcg_type = " . ($this->pcg_type ? "'" . $this->db->escape($this->pcg_type) . "'" : "null");
-		$sql .= " , account_number = '" . $this->db->escape($this->account_number) . "'";
-		$sql .= " , account_parent = " . (int) $this->account_parent;
-		$sql .= " , label = " . ($this->label ? "'" . $this->db->escape($this->label) . "'" : "''");
-		$sql .= " , labelshort = " . ($this->labelshort ? "'" . $this->db->escape($this->labelshort) . "'" : "''");
-		$sql .= " , fk_accounting_category = " . (empty($this->account_category) ? 0 : (int) $this->account_category);
-		$sql .= " , fk_user_modif = " . $user->id;
-		$sql .= " , active = " . (int) $this->active;
-		$sql .= " , reconcilable = " . (int) $this->reconcilable;
-		$sql .= " WHERE rowid = " . $this->id;
+		$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_account ";
+		$sql .= " SET fk_pcg_version = ".($this->fk_pcg_version ? "'".$this->db->escape($this->fk_pcg_version)."'" : "null");
+		$sql .= " , pcg_type = ".($this->pcg_type ? "'".$this->db->escape($this->pcg_type)."'" : "null");
+		$sql .= " , account_number = '".$this->db->escape($this->account_number)."'";
+		$sql .= " , account_parent = ".(int) $this->account_parent;
+		$sql .= " , label = ".($this->label ? "'".$this->db->escape($this->label)."'" : "''");
+		$sql .= " , labelshort = ".($this->labelshort ? "'".$this->db->escape($this->labelshort)."'" : "''");
+		$sql .= " , fk_accounting_category = ".(empty($this->account_category) ? 0 : (int) $this->account_category);
+		$sql .= " , fk_user_modif = ".$user->id;
+		$sql .= " , active = ".(int) $this->active;
+		$sql .= " , reconcilable = ".(int) $this->reconcilable;
+		$sql .= " WHERE rowid = ".$this->id;
 
-		dol_syslog(get_class($this) . "::update sql=" . $sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
 			$this->db->commit();
@@ -357,7 +357,7 @@ class AccountingAccount extends CommonObject
 		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
-			return - 1;
+			return -1;
 		}
 	}
 
@@ -370,13 +370,13 @@ class AccountingAccount extends CommonObject
     {
 		global $langs;
 
-		$sql = "(SELECT fk_code_ventilation FROM " . MAIN_DB_PREFIX . "facturedet";
-		$sql.= " WHERE fk_code_ventilation=" . $this->id . ")";
-		$sql.= "UNION";
-		$sql.= " (SELECT fk_code_ventilation FROM " . MAIN_DB_PREFIX . "facture_fourn_det";
-		$sql.= " WHERE fk_code_ventilation=" . $this->id . ")";
+		$sql = "(SELECT fk_code_ventilation FROM ".MAIN_DB_PREFIX."facturedet";
+		$sql .= " WHERE fk_code_ventilation=".$this->id.")";
+		$sql .= "UNION";
+		$sql .= " (SELECT fk_code_ventilation FROM ".MAIN_DB_PREFIX."facture_fourn_det";
+		$sql .= " WHERE fk_code_ventilation=".$this->id.")";
 
-		dol_syslog(get_class($this) . "::checkUsage sql=" . $sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::checkUsage sql=".$sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 
 		if ($resql) {
@@ -389,7 +389,7 @@ class AccountingAccount extends CommonObject
 			}
 		} else {
 			$this->error = $this->db->lasterror();
-			return - 1;
+			return -1;
 		}
 	}
 
@@ -409,32 +409,32 @@ class AccountingAccount extends CommonObject
 		if ($result > 0) {
 			$this->db->begin();
 
-			if (! $error) {
-				$sql = "DELETE FROM " . MAIN_DB_PREFIX . "accounting_account";
-				$sql .= " WHERE rowid=" . $this->id;
+			if (!$error) {
+				$sql = "DELETE FROM ".MAIN_DB_PREFIX."accounting_account";
+				$sql .= " WHERE rowid=".$this->id;
 
-				dol_syslog(get_class($this) . "::delete sql=" . $sql);
+				dol_syslog(get_class($this)."::delete sql=".$sql);
 				$resql = $this->db->query($sql);
-				if (! $resql) {
-					$error ++;
-					$this->errors[] = "Error " . $this->db->lasterror();
+				if (!$resql) {
+					$error++;
+					$this->errors[] = "Error ".$this->db->lasterror();
 				}
 			}
 
 			// Commit or rollback
 			if ($error) {
 				foreach ($this->errors as $errmsg) {
-					dol_syslog(get_class($this) . "::delete " . $errmsg, LOG_ERR);
-					$this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+					dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 				}
 				$this->db->rollback();
-				return - 1 * $error;
+				return -1 * $error;
 			} else {
 				$this->db->commit();
 				return 1;
 			}
 		} else {
-			return - 1;
+			return -1;
 		}
     }
 
@@ -455,19 +455,19 @@ class AccountingAccount extends CommonObject
 		global $langs, $conf, $user;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 
-		if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
 		$result = '';
 
-		$url = DOL_URL_ROOT . '/accountancy/admin/card.php?id=' . $this->id;
+		$url = DOL_URL_ROOT.'/accountancy/admin/card.php?id='.$this->id;
 
 		// Add param to save lastsearch_values or not
-		$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-		if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-		if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+		$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+		if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+		if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
 
 		$picto = 'billr';
-		$label='';
+		$label = '';
 
 		if (empty($this->labelshort) || $withcompletelabel == 1)
 		{
@@ -476,28 +476,28 @@ class AccountingAccount extends CommonObject
 			$labeltoshow = $this->labelshort;
 		}
 
-		$label = '<u>' . $langs->trans("ShowAccountingAccount") . '</u>';
-		if (! empty($this->account_number))
-			$label .= '<br><b>'.$langs->trans('AccountAccounting') . ':</b> ' . length_accountg($this->account_number);
-		if (! empty($labeltoshow))
-			$label .= '<br><b>'.$langs->trans('Label') . ':</b> ' . $labeltoshow;
-		if ($moretitle) $label.=' - '.$moretitle;
+		$label = '<u>'.$langs->trans("ShowAccountingAccount").'</u>';
+		if (!empty($this->account_number))
+			$label .= '<br><b>'.$langs->trans('AccountAccounting').':</b> '.length_accountg($this->account_number);
+		if (!empty($labeltoshow))
+			$label .= '<br><b>'.$langs->trans('Label').':</b> '.$labeltoshow;
+		if ($moretitle) $label .= ' - '.$moretitle;
 
-		$linkclose='';
+		$linkclose = '';
 		if (empty($notooltip))
 		{
-			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 			{
-				$label=$langs->trans("ShowAccoutingAccount");
-				$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+				$label = $langs->trans("ShowAccoutingAccount");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-			$linkclose.=' class="classfortooltip"';
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip"';
 		}
 
-		$linkstart='<a href="'.$url.'"';
-		$linkstart.=$linkclose.'>';
-		$linkend='</a>';
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
 
 		if ($nourl)
 		{
@@ -507,11 +507,11 @@ class AccountingAccount extends CommonObject
 		}
 
 		$label_link = length_accountg($this->account_number);
-		if ($withlabel) $label_link .= ' - ' . ($nourl ? '<span class="opacitymedium">' : '').$labeltoshow.($nourl ? '</span>' : '');
+		if ($withlabel) $label_link .= ' - '.($nourl ? '<span class="opacitymedium">' : '').$labeltoshow.($nourl ? '</span>' : '');
 
-		if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
+		if ($withpicto) $result .= ($linkstart.img_object(($notooltip ? '' : $label), $picto, ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1).$linkend);
 		if ($withpicto && $withpicto != 2) $result .= ' ';
-		if ($withpicto != 2) $result.=$linkstart . $label_link . $linkend;
+		if ($withpicto != 2) $result .= $linkstart.$label_link.$linkend;
 		return $result;
     }
 
@@ -524,10 +524,10 @@ class AccountingAccount extends CommonObject
     public function info($id)
     {
 		$sql = 'SELECT a.rowid, a.datec, a.fk_user_author, a.fk_user_modif, a.tms';
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . 'accounting_account as a';
-		$sql .= ' WHERE a.rowid = ' . $id;
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'accounting_account as a';
+		$sql .= ' WHERE a.rowid = '.$id;
 
-		dol_syslog(get_class($this) . '::info sql=' . $sql);
+		dol_syslog(get_class($this).'::info sql='.$sql);
 		$result = $this->db->query($sql);
 
 		if ($result) {
@@ -578,11 +578,11 @@ class AccountingAccount extends CommonObject
 		if ($result > 0) {
 			$this->db->begin();
 
-			$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_account ";
-			$sql .= "SET " . $fieldtouse . " = '0'";
-			$sql .= " WHERE rowid = " . $this->db->escape($id);
+			$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_account ";
+			$sql .= "SET ".$fieldtouse." = '0'";
+			$sql .= " WHERE rowid = ".$this->db->escape($id);
 
-			dol_syslog(get_class($this) . "::account_desactivate " . $fieldtouse . " sql=" . $sql, LOG_DEBUG);
+			dol_syslog(get_class($this)."::account_desactivate ".$fieldtouse." sql=".$sql, LOG_DEBUG);
 			$result = $this->db->query($sql);
 
 			if ($result) {
@@ -591,10 +591,10 @@ class AccountingAccount extends CommonObject
 			} else {
 				$this->error = $this->db->lasterror();
 				$this->db->rollback();
-				return - 1;
+				return -1;
 			}
 		} else {
-			return - 1;
+			return -1;
 		}
 	}
 
@@ -620,11 +620,11 @@ class AccountingAccount extends CommonObject
             $fieldtouse = 'reconcilable';
         }
 
-		$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_account ";
-		$sql .= "SET " . $fieldtouse . " = '1'";
-		$sql .= " WHERE rowid = " . $this->db->escape($id);
+		$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_account ";
+		$sql .= "SET ".$fieldtouse." = '1'";
+		$sql .= " WHERE rowid = ".$this->db->escape($id);
 
-		dol_syslog(get_class($this) . "::account_activate " . $fieldtouse . " sql=" . $sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::account_activate ".$fieldtouse." sql=".$sql, LOG_DEBUG);
 		$result = $this->db->query($sql);
         if ($result) {
 			$this->db->commit();
@@ -632,7 +632,7 @@ class AccountingAccount extends CommonObject
         } else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
-			return - 1;
+			return -1;
         }
     }