[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 903854: fix margin calculation proble
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 903854: fix margin calculation problem |
|
Date: |
Sat, 11 May 2013 06:27:22 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 9038549d0d41e5abb2ec8f79961a209bffc73da0
https://github.com/Dolibarr/dolibarr/commit/9038549d0d41e5abb2ec8f79961a209bffc73da0
Author: fhenry <address@hidden>
Date: 2013-05-03 (Fri, 03 May 2013)
Changed paths:
M htdocs/install/mysql/tables/llx_facturedet.sql
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
M htdocs/margin/tabs/productMargins.php
M htdocs/margin/tabs/thirdpartyMargins.php
Log Message:
-----------
fix margin calculation problem
Commit: 880daa4375f9a6d863037c71840b906d063b6caa
https://github.com/Dolibarr/dolibarr/commit/880daa4375f9a6d863037c71840b906d063b6caa
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-03 (Fri, 03 May 2013)
Changed paths:
M htdocs/core/modules/syslog/mod_syslog_file.php
Log Message:
-----------
Fix: log file permission during install
Commit: c850d413f4bf87e63e9fb9a5b8dccbb026c0e7bb
https://github.com/Dolibarr/dolibarr/commit/c850d413f4bf87e63e9fb9a5b8dccbb026c0e7bb
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-03 (Fri, 03 May 2013)
Changed paths:
M htdocs/install/upgrade2.php
Log Message:
-----------
Fix: [ bug #871 ] Erreur MAJ 3.2 -> 3.3 avec pgsql
Commit: b7f3f07fc78b306b11e1aedca7e5b2180021be24
https://github.com/Dolibarr/dolibarr/commit/b7f3f07fc78b306b11e1aedca7e5b2180021be24
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-03 (Fri, 03 May 2013)
Changed paths:
M htdocs/core/lib/project.lib.php
Log Message:
-----------
Fix: [ bug #840 ] fichetwothirdright 65% to 55%
Commit: ff80e3b031c5afdf8213c19a55bd55e932256642
https://github.com/Dolibarr/dolibarr/commit/ff80e3b031c5afdf8213c19a55bd55e932256642
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-03 (Fri, 03 May 2013)
Changed paths:
M dev/initdata/mysqldump_dolibarr_3.3.0.sql
M dev/initdata/mysqldump_dolibarr_3.4.0.sql
Log Message:
-----------
Fix: latin to utf8
Commit: 8dcb396fb81c2a32e46ff2f1e75f11c657f7ee39
https://github.com/Dolibarr/dolibarr/commit/8dcb396fb81c2a32e46ff2f1e75f11c657f7ee39
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-03 (Fri, 03 May 2013)
Changed paths:
M htdocs/install/mysql/tables/llx_facturedet.sql
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
M htdocs/margin/tabs/productMargins.php
M htdocs/margin/tabs/thirdpartyMargins.php
Log Message:
-----------
Merge pull request #914 from FHenry/3.4
fix margin calculation problem
Commit: a35a44b23e73487d42c5eb4ab7994b7c6a49704a
https://github.com/Dolibarr/dolibarr/commit/a35a44b23e73487d42c5eb4ab7994b7c6a49704a
Author: fhenry <address@hidden>
Date: 2013-05-03 (Fri, 03 May 2013)
Changed paths:
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
M htdocs/margin/tabs/productMargins.php
M htdocs/margin/tabs/thirdpartyMargins.php
Log Message:
-----------
Fix margin calculation problem
Commit: 4a1eb1a58854c74e98bda8ad4c78081539f5d1cc
https://github.com/Dolibarr/dolibarr/commit/4a1eb1a58854c74e98bda8ad4c78081539f5d1cc
Author: fhenry <address@hidden>
Date: 2013-05-03 (Fri, 03 May 2013)
Changed paths:
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
M htdocs/margin/tabs/productMargins.php
M htdocs/margin/tabs/thirdpartyMargins.php
Log Message:
-----------
Fix margin calculation
Commit: 723bd6f7500a13d2acada3ac6c11dbd0d1a9d0e2
https://github.com/Dolibarr/dolibarr/commit/723bd6f7500a13d2acada3ac6c11dbd0d1a9d0e2
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-03 (Fri, 03 May 2013)
Changed paths:
M htdocs/comm/index.php
M htdocs/core/class/conf.class.php
M htdocs/core/lib/agenda.lib.php
M htdocs/filefunc.inc.php
M htdocs/user/perms.php
Log Message:
-----------
Fix: [ bug #872 ] Erreur sur page Accueil Commerciale avec pgsql
(3.4-beta).
Fix: Permission tab was not visible for external users.
Commit: c8ef07a889298273655fe2d4aa2e415715c95b47
https://github.com/Dolibarr/dolibarr/commit/c8ef07a889298273655fe2d4aa2e415715c95b47
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-03 (Fri, 03 May 2013)
Changed paths:
M ChangeLog
M htdocs/compta/clients.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/prelevement.php
M htdocs/compta/prelevement/bons.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/prelevement/factures.php
M htdocs/compta/prelevement/fiche-rejet.php
M htdocs/compta/prelevement/fiche-stat.php
M htdocs/compta/prelevement/lignes.php
M htdocs/compta/prelevement/rejets.php
M htdocs/contact/class/contact.class.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/db/mysqli.class.php
M htdocs/core/db/pgsql.class.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/security.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/import/import_csv.modules.php
M htdocs/core/modules/modSociete.class.php
M htdocs/core/modules/societe/mod_codeclient_monkey.php
M htdocs/core/tpl/admin_extrafields_add.tpl.php
M htdocs/holiday/fiche.php
M htdocs/imports/import.php
M htdocs/includes/nusoap/lib/Mail/PEAR.php
M htdocs/includes/nusoap/lib/Mail/mimeDecode.php
A htdocs/langs/ca_ES/holiday.lang
M htdocs/langs/en_US/holiday.lang
M htdocs/langs/es_ES/admin.lang
M htdocs/langs/es_ES/holiday.lang
M htdocs/langs/es_ES/withdrawals.lang
M htdocs/langs/fr_FR/holiday.lang
M htdocs/product/ajax/products.php
M htdocs/product/class/product.class.php
M htdocs/projet/class/project.class.php
M htdocs/projet/element.php
M htdocs/projet/fiche.php
M test/phpunit/FilesLibTest.php
Log Message:
-----------
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
Commit: 0b228b3a87cd1ef6342e7be6a58151c264451bc7
https://github.com/Dolibarr/dolibarr/commit/0b228b3a87cd1ef6342e7be6a58151c264451bc7
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-03 (Fri, 03 May 2013)
Changed paths:
M htdocs/comm/index.php
M htdocs/core/class/conf.class.php
M htdocs/core/lib/agenda.lib.php
M htdocs/filefunc.inc.php
M htdocs/user/perms.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
htdocs/user/perms.php
Commit: 1c9caeb0d31c9c2665808423bb5cd72ab2775ada
https://github.com/Dolibarr/dolibarr/commit/1c9caeb0d31c9c2665808423bb5cd72ab2775ada
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-03 (Fri, 03 May 2013)
Changed paths:
M htdocs/core/login/README.txt
Log Message:
-----------
Fix: CRLF
Commit: 95e44749066eb05980b786255e33e22d0678fd6f
https://github.com/Dolibarr/dolibarr/commit/95e44749066eb05980b786255e33e22d0678fd6f
Author: fhenry <address@hidden>
Date: 2013-05-03 (Fri, 03 May 2013)
Changed paths:
M htdocs/core/modules/DolibarrModules.class.php
Log Message:
-----------
Fix bug on PgSQL if user in on another entity than 1
Commit: bdb81803bdae918d985830c6c4a57722a406badc
https://github.com/Dolibarr/dolibarr/commit/bdb81803bdae918d985830c6c4a57722a406badc
Author: fhenry <address@hidden>
Date: 2013-05-04 (Sat, 04 May 2013)
Changed paths:
M htdocs/comm/index.php
M htdocs/core/class/conf.class.php
M htdocs/core/lib/agenda.lib.php
M htdocs/core/login/README.txt
M htdocs/filefunc.inc.php
M htdocs/user/perms.php
Log Message:
-----------
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
Commit: a5009fd555e13408152663aa60ac23f4f6b8693a
https://github.com/Dolibarr/dolibarr/commit/a5009fd555e13408152663aa60ac23f4f6b8693a
Author: Marcos García <address@hidden>
Date: 2013-05-04 (Sat, 04 May 2013)
Changed paths:
M htdocs/install/mysql/data/llx_c_forme_juridique.sql
M htdocs/langs/es_ES/admin.lang
Log Message:
-----------
Corrected es_ES translations
Commit: e2a73839bc00d4ed16757e08dc960f828a8d891b
https://github.com/Dolibarr/dolibarr/commit/e2a73839bc00d4ed16757e08dc960f828a8d891b
Author: Marcos García <address@hidden>
Date: 2013-05-04 (Sat, 04 May 2013)
Changed paths:
M htdocs/holiday/class/holiday.class.php
Log Message:
-----------
Replaced addslashes with $this->db->escape
Commit: 8bd7c6a763b57461dc8316b6cceb70fd2987226f
https://github.com/Dolibarr/dolibarr/commit/8bd7c6a763b57461dc8316b6cceb70fd2987226f
Author: fhenry <address@hidden>
Date: 2013-05-06 (Mon, 06 May 2013)
Changed paths:
M htdocs/langs/fr_FR/dict.lang
Log Message:
-----------
Fix Trad Fr
Commit: 441ad8c6d0709f7cb6aec907e91181f6d28df561
https://github.com/Dolibarr/dolibarr/commit/441ad8c6d0709f7cb6aec907e91181f6d28df561
Author: fhenry <address@hidden>
Date: 2013-05-06 (Mon, 06 May 2013)
Changed paths:
M htdocs/langs/fr_FR/dict.lang
Log Message:
-----------
Fix Trad Fr
Commit: ae4e861147c6c8b9c034474f6651ee5c6ce7a136
https://github.com/Dolibarr/dolibarr/commit/ae4e861147c6c8b9c034474f6651ee5c6ce7a136
Author: fhenry <address@hidden>
Date: 2013-05-06 (Mon, 06 May 2013)
Changed paths:
M htdocs/comm/index.php
M htdocs/core/class/conf.class.php
M htdocs/core/lib/agenda.lib.php
M htdocs/filefunc.inc.php
M htdocs/user/perms.php
Log Message:
-----------
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
Commit: 0bb9ee158afb2461ff70961f9c69c8e924c96339
https://github.com/Dolibarr/dolibarr/commit/0bb9ee158afb2461ff70961f9c69c8e924c96339
Author: fhenry <address@hidden>
Date: 2013-05-06 (Mon, 06 May 2013)
Changed paths:
M htdocs/fichinter/class/fichinter.class.php
Log Message:
-----------
Fix trigger call ficher inter create
Commit: 934657cc2f9cb81210d5c29f76449ea68919ee29
https://github.com/Dolibarr/dolibarr/commit/934657cc2f9cb81210d5c29f76449ea68919ee29
Author: Juanjo Menent <address@hidden>
Date: 2013-05-06 (Mon, 06 May 2013)
Changed paths:
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/langs/fr_FR/dict.lang
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
M htdocs/margin/tabs/productMargins.php
M htdocs/margin/tabs/thirdpartyMargins.php
Log Message:
-----------
Merge pull request #916 from FHenry/3.3
Fix margin calculation problem
Commit: 36528ca2648ba5fee456182dd723c55c89d800e0
https://github.com/Dolibarr/dolibarr/commit/36528ca2648ba5fee456182dd723c55c89d800e0
Author: Juanjo Menent <address@hidden>
Date: 2013-05-06 (Mon, 06 May 2013)
Changed paths:
M htdocs/langs/fr_FR/dict.lang
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
M htdocs/margin/tabs/productMargins.php
M htdocs/margin/tabs/thirdpartyMargins.php
Log Message:
-----------
Merge pull request #917 from FHenry/3.4
Fix margin calculation
Commit: ea2109b635a7f007546e4de8eb9ff421808c70f1
https://github.com/Dolibarr/dolibarr/commit/ea2109b635a7f007546e4de8eb9ff421808c70f1
Author: Juanjo Menent <address@hidden>
Date: 2013-05-06 (Mon, 06 May 2013)
Changed paths:
M htdocs/install/mysql/data/llx_c_forme_juridique.sql
M htdocs/langs/es_ES/admin.lang
Log Message:
-----------
Merge pull request #922 from marcosgdf/translations
Corrected es_ES translations
Commit: d0635901a6eee54dcf5167a348cdf5d53b97e24a
https://github.com/Dolibarr/dolibarr/commit/d0635901a6eee54dcf5167a348cdf5d53b97e24a
Author: Marcos García <address@hidden>
Date: 2013-05-06 (Mon, 06 May 2013)
Changed paths:
M htdocs/holiday/fiche.php
Log Message:
-----------
Fixed bug with holidays log
Commit: d7a7f316d3f27b3823a6ad953c88c71bdc9bad51
https://github.com/Dolibarr/dolibarr/commit/d7a7f316d3f27b3823a6ad953c88c71bdc9bad51
Author: Marcos García <address@hidden>
Date: 2013-05-06 (Mon, 06 May 2013)
Changed paths:
M htdocs/holiday/admin/holiday.php
M htdocs/langs/bg_BG/holiday.lang
M htdocs/langs/ca_ES/holiday.lang
M htdocs/langs/en_US/holiday.lang
M htdocs/langs/es_ES/holiday.lang
M htdocs/langs/fr_FR/holiday.lang
M htdocs/langs/tr_TR/holiday.lang
Log Message:
-----------
Replaced "Jours" with DurationDays translation key
Commit: 7e11f7466a76f059687473de94135134ef2f8df0
https://github.com/Dolibarr/dolibarr/commit/7e11f7466a76f059687473de94135134ef2f8df0
Author: Marcos García <address@hidden>
Date: 2013-05-06 (Mon, 06 May 2013)
Changed paths:
M htdocs/holiday/define_holiday.php
M htdocs/holiday/month_report.php
M htdocs/holiday/view_log.php
Log Message:
-----------
Missing translations
Commit: e1913f4a1338ce81d0ba6375a3958b75b7d6953a
https://github.com/Dolibarr/dolibarr/commit/e1913f4a1338ce81d0ba6375a3958b75b7d6953a
Author: Marcos García <address@hidden>
Date: 2013-05-06 (Mon, 06 May 2013)
Changed paths:
M htdocs/holiday/index.php
Log Message:
-----------
Stetic fix: Select was not valigned
Commit: 192ef564be396db363edc8ac7eb2b317ec31f305
https://github.com/Dolibarr/dolibarr/commit/192ef564be396db363edc8ac7eb2b317ec31f305
Author: Juanjo Menent <address@hidden>
Date: 2013-05-06 (Mon, 06 May 2013)
Changed paths:
M htdocs/holiday/class/holiday.class.php
Log Message:
-----------
Merge pull request #924 from marcosgdf/minor
Replaced addslashes with $this->db->escape
Commit: a53e4123ebb6cc2d39a7dfc2f1e3addf45054c22
https://github.com/Dolibarr/dolibarr/commit/a53e4123ebb6cc2d39a7dfc2f1e3addf45054c22
Author: Juanjo Menent <address@hidden>
Date: 2013-05-06 (Mon, 06 May 2013)
Changed paths:
M htdocs/holiday/fiche.php
Log Message:
-----------
Merge pull request #927 from marcosgdf/holidays-bug
Fixed bug with holidays log
Commit: 0e49ec93f99d7302806b5fd87dc2c2d820b560f4
https://github.com/Dolibarr/dolibarr/commit/0e49ec93f99d7302806b5fd87dc2c2d820b560f4
Author: Juanjo Menent <address@hidden>
Date: 2013-05-06 (Mon, 06 May 2013)
Changed paths:
M htdocs/holiday/admin/holiday.php
M htdocs/holiday/define_holiday.php
M htdocs/holiday/index.php
M htdocs/holiday/month_report.php
M htdocs/holiday/view_log.php
M htdocs/langs/bg_BG/holiday.lang
M htdocs/langs/ca_ES/holiday.lang
M htdocs/langs/en_US/holiday.lang
M htdocs/langs/es_ES/holiday.lang
M htdocs/langs/fr_FR/holiday.lang
M htdocs/langs/tr_TR/holiday.lang
Log Message:
-----------
Merge pull request #929 from marcosgdf/holidays-minor
Minor changes in holidays module
Commit: 3aa049b6611d6de065fdc3c340bc5e2b62dc158b
https://github.com/Dolibarr/dolibarr/commit/3aa049b6611d6de065fdc3c340bc5e2b62dc158b
Author: Regis Houssin <address@hidden>
Date: 2013-05-06 (Mon, 06 May 2013)
Changed paths:
M htdocs/contact/class/contact.class.php
Log Message:
-----------
Fix: regression
Commit: f9093e00bb5e113fbca505452181901eff7f48c1
https://github.com/Dolibarr/dolibarr/commit/f9093e00bb5e113fbca505452181901eff7f48c1
Author: Marcos García <address@hidden>
Date: 2013-05-06 (Mon, 06 May 2013)
Changed paths:
M htdocs/langs/es_ES/admin.lang
Log Message:
-----------
Missing es_ES translations
Commit: 20e0fe4b2493612e5ba97820352b92a40d822055
https://github.com/Dolibarr/dolibarr/commit/20e0fe4b2493612e5ba97820352b92a40d822055
Author: Marcos García <address@hidden>
Date: 2013-05-06 (Mon, 06 May 2013)
Changed paths:
M htdocs/contact/list.php
Log Message:
-----------
Corrected translation key
Commit: c81cf6364a34891719dd9f52dc1ff26d13d8aa77
https://github.com/Dolibarr/dolibarr/commit/c81cf6364a34891719dd9f52dc1ff26d13d8aa77
Author: Marcos García <address@hidden>
Date: 2013-05-06 (Mon, 06 May 2013)
Changed paths:
M htdocs/core/menus/standard/eldy.lib.php
Log Message:
-----------
Removed innecesary whitespace when no picto is displayed
Commit: 0a90af0b9905ae79830653b3c2d263205121d7c2
https://github.com/Dolibarr/dolibarr/commit/0a90af0b9905ae79830653b3c2d263205121d7c2
Author: Marcos García <address@hidden>
Date: 2013-05-06 (Mon, 06 May 2013)
Changed paths:
M htdocs/societe/admin/societe.php
Log Message:
-----------
Fixed untranslated string
Commit: b3f40b900b0e552ee899b2b6713766a456173fc5
https://github.com/Dolibarr/dolibarr/commit/b3f40b900b0e552ee899b2b6713766a456173fc5
Author: fhenry <address@hidden>
Date: 2013-05-07 (Tue, 07 May 2013)
Changed paths:
M htdocs/install/mysql/tables/llx_opensurvey_user_studs.key.sql
Log Message:
-----------
Make constraint SQL unique name (Mandatory for PgSQL)
Commit: 642712948058280781b0929077bde3d8db998586
https://github.com/Dolibarr/dolibarr/commit/642712948058280781b0929077bde3d8db998586
Author: fhenry <address@hidden>
Date: 2013-05-07 (Tue, 07 May 2013)
Changed paths:
M htdocs/user/fiche.php
Log Message:
-----------
Fix extrafields update/save on User/fiche.php
Commit: c28ef8a5578e56c309e5ce0ba31b0b86bde9a34a
https://github.com/Dolibarr/dolibarr/commit/c28ef8a5578e56c309e5ce0ba31b0b86bde9a34a
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-07 (Tue, 07 May 2013)
Changed paths:
M htdocs/install/upgrade2.php
Log Message:
-----------
Fix: Delete deprecated files during install as they create conflicts
when migrating from old versions.
Commit: 8a82c8c5d56b46a16160bb197288f723df4cc709
https://github.com/Dolibarr/dolibarr/commit/8a82c8c5d56b46a16160bb197288f723df4cc709
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-07 (Tue, 07 May 2013)
Changed paths:
M htdocs/contact/class/contact.class.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/tabs/productMargins.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
htdocs/contact/class/contact.class.php
htdocs/margin/agentMargins.php
htdocs/margin/tabs/productMargins.php
Commit: 094a7e5ea94888690d0adc205fa6a7f3becf9a63
https://github.com/Dolibarr/dolibarr/commit/094a7e5ea94888690d0adc205fa6a7f3becf9a63
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-07 (Tue, 07 May 2013)
Changed paths:
M scripts/invoices/email_unpaid_invoices_to_customers.php
M scripts/invoices/email_unpaid_invoices_to_representatives.php
Log Message:
-----------
Fix: Bad constant
Commit: f016517ed1b07cb84c64f84b8c3c38802a172639
https://github.com/Dolibarr/dolibarr/commit/f016517ed1b07cb84c64f84b8c3c38802a172639
Author: fhenry <address@hidden>
Date: 2013-05-07 (Tue, 07 May 2013)
Changed paths:
M htdocs/contact/class/contact.class.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/holiday/admin/holiday.php
M htdocs/holiday/class/holiday.class.php
M htdocs/holiday/define_holiday.php
M htdocs/holiday/fiche.php
M htdocs/holiday/index.php
M htdocs/holiday/month_report.php
M htdocs/holiday/view_log.php
M htdocs/install/mysql/data/llx_c_forme_juridique.sql
M htdocs/install/upgrade2.php
M htdocs/langs/bg_BG/holiday.lang
M htdocs/langs/ca_ES/holiday.lang
M htdocs/langs/en_US/holiday.lang
M htdocs/langs/es_ES/admin.lang
M htdocs/langs/es_ES/holiday.lang
M htdocs/langs/fr_FR/holiday.lang
M htdocs/langs/tr_TR/holiday.lang
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/tabs/productMargins.php
M scripts/invoices/email_unpaid_invoices_to_customers.php
M scripts/invoices/email_unpaid_invoices_to_representatives.php
Log Message:
-----------
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
Commit: 6ec81375c4142c0905edd55f2d012742f9dfe5bf
https://github.com/Dolibarr/dolibarr/commit/6ec81375c4142c0905edd55f2d012742f9dfe5bf
Author: Regis Houssin <address@hidden>
Date: 2013-05-07 (Tue, 07 May 2013)
Changed paths:
M htdocs/core/modules/modSociete.class.php
Log Message:
-----------
Fix: missing rename note to note_private and add note_public
Commit: c623e7913bc721ef1ca9c2981ac04b6c9ff313f4
https://github.com/Dolibarr/dolibarr/commit/c623e7913bc721ef1ca9c2981ac04b6c9ff313f4
Author: fhenry <address@hidden>
Date: 2013-05-07 (Tue, 07 May 2013)
Changed paths:
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
Log Message:
-----------
Update migration script with new idx index unique name opensurvey
Commit: 1fc693f6922adeef985b08a6ce0b05e90e0fcd40
https://github.com/Dolibarr/dolibarr/commit/1fc693f6922adeef985b08a6ce0b05e90e0fcd40
Author: fhenry <address@hidden>
Date: 2013-05-07 (Tue, 07 May 2013)
Changed paths:
M htdocs/core/modules/modSociete.class.php
Log Message:
-----------
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
Commit: de4b9b01bfe281349156b54469fff5862cd19356
https://github.com/Dolibarr/dolibarr/commit/de4b9b01bfe281349156b54469fff5862cd19356
Author: fhenry <address@hidden>
Date: 2013-05-07 (Tue, 07 May 2013)
Changed paths:
M htdocs/compta/prelevement/bons.php
M htdocs/compta/prelevement/create.php
M htdocs/compta/prelevement/demandes.php
M htdocs/compta/prelevement/factures.php
M htdocs/compta/prelevement/fiche-rejet.php
M htdocs/compta/prelevement/fiche-stat.php
M htdocs/compta/prelevement/fiche.php
M htdocs/compta/prelevement/index.php
M htdocs/compta/prelevement/ligne.php
M htdocs/compta/prelevement/lignes.php
M htdocs/compta/prelevement/liste.php
M htdocs/compta/prelevement/rejets.php
M htdocs/compta/prelevement/stats.php
Log Message:
-----------
Fix Bug [ bug #880 ] Prelevement section is broken
Commit: 16e06736e65ade5ed24daad9035e6e00dd3ef77f
https://github.com/Dolibarr/dolibarr/commit/16e06736e65ade5ed24daad9035e6e00dd3ef77f
Author: fhenry <address@hidden>
Date: 2013-05-07 (Tue, 07 May 2013)
Changed paths:
M htdocs/core/lib/files.lib.php
Log Message:
-----------
Fix bug [ bug #882 ] [3.4.0] Can't open WithdrawalReceipt / fichier de
prélèvement
Commit: 207f6cea2850a4fa35c5c0169b1fae543b7e83f2
https://github.com/Dolibarr/dolibarr/commit/207f6cea2850a4fa35c5c0169b1fae543b7e83f2
Author: fhenry <address@hidden>
Date: 2013-05-07 (Tue, 07 May 2013)
Changed paths:
M htdocs/core/lib/agenda.lib.php
Log Message:
-----------
Fix [ bug #883 ] Silent pgsql errors in comm/index.php
Commit: 37a9686921bfdb5ab619ccbb9cb35f9153ec96a2
https://github.com/Dolibarr/dolibarr/commit/37a9686921bfdb5ab619ccbb9cb35f9153ec96a2
Author: fhenry <address@hidden>
Date: 2013-05-07 (Tue, 07 May 2013)
Changed paths:
M htdocs/compta/bank/class/account.class.php
Log Message:
-----------
Fix bug [ bug #884 ] Warnings on /compta/bank/index.php
Commit: 68259c51ebf6b657a80ef05b19eb247055460848
https://github.com/Dolibarr/dolibarr/commit/68259c51ebf6b657a80ef05b19eb247055460848
Author: fhenry <address@hidden>
Date: 2013-05-07 (Tue, 07 May 2013)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
Fix [ bug #886 ] Silent pgsql errors in
/fourn/commande/fiche.php?action=create
Commit: 8c37063541e06646009a3f9186cc0f35517d3267
https://github.com/Dolibarr/dolibarr/commit/8c37063541e06646009a3f9186cc0f35517d3267
Author: fhenry <address@hidden>
Date: 2013-05-07 (Tue, 07 May 2013)
Changed paths:
M htdocs/projet/class/project.class.php
Log Message:
-----------
Fix bug [ bug #881 ] some errors
Commit: 68f3a634b6e96145a57af9b1dec21d07ed963b14
https://github.com/Dolibarr/dolibarr/commit/68f3a634b6e96145a57af9b1dec21d07ed963b14
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-08 (Wed, 08 May 2013)
Changed paths:
M htdocs/core/menus/standard/eldy.lib.php
Log Message:
-----------
Merge pull request #932 from marcosgdf/minor
Removed innecesary whitespace when no picto is displayed
Commit: 28c4f9af6137ac24f76af4364a179dad644bc405
https://github.com/Dolibarr/dolibarr/commit/28c4f9af6137ac24f76af4364a179dad644bc405
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-08 (Wed, 08 May 2013)
Changed paths:
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/prelevement/bons.php
M htdocs/compta/prelevement/create.php
M htdocs/compta/prelevement/demandes.php
M htdocs/compta/prelevement/factures.php
M htdocs/compta/prelevement/fiche-rejet.php
M htdocs/compta/prelevement/fiche-stat.php
M htdocs/compta/prelevement/fiche.php
M htdocs/compta/prelevement/index.php
M htdocs/compta/prelevement/ligne.php
M htdocs/compta/prelevement/lignes.php
M htdocs/compta/prelevement/liste.php
M htdocs/compta/prelevement/rejets.php
M htdocs/compta/prelevement/stats.php
M htdocs/core/lib/agenda.lib.php
M htdocs/core/lib/files.lib.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
M htdocs/install/mysql/tables/llx_opensurvey_user_studs.key.sql
M htdocs/projet/class/project.class.php
M htdocs/user/fiche.php
Log Message:
-----------
Merge pull request #933 from FHenry/3.4
Make constraint SQL unique name (Mandatory for PgSQL)
Commit: 9c0839074c6d47e3be5ffa150cb2d5355a475f31
https://github.com/Dolibarr/dolibarr/commit/9c0839074c6d47e3be5ffa150cb2d5355a475f31
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-08 (Wed, 08 May 2013)
Changed paths:
M htdocs/contact/list.php
M htdocs/langs/es_ES/admin.lang
M htdocs/societe/admin/societe.php
Log Message:
-----------
Merge pull request #931 from marcosgdf/translations
Improved translations
Commit: e18eb3a6b38ff546984b7b28b5d0a77c85e539d1
https://github.com/Dolibarr/dolibarr/commit/e18eb3a6b38ff546984b7b28b5d0a77c85e539d1
Author: Marcos García <address@hidden>
Date: 2013-05-08 (Wed, 08 May 2013)
Changed paths:
M htdocs/admin/dict.php
M htdocs/langs/en_US/main.lang
M htdocs/langs/es_ES/main.lang
M htdocs/langs/fr_FR/main.lang
Log Message:
-----------
Added missing translations
Commit: 661071286e5817e937e828e65250160ca885c248
https://github.com/Dolibarr/dolibarr/commit/661071286e5817e937e828e65250160ca885c248
Author: Marcos García <address@hidden>
Date: 2013-05-08 (Wed, 08 May 2013)
Changed paths:
M dev/skeletons/modMyModule.class.php
Log Message:
-----------
Typo in skeleton module class
Commit: 581707221489e94e9bdef740a0fdb7a09b104d62
https://github.com/Dolibarr/dolibarr/commit/581707221489e94e9bdef740a0fdb7a09b104d62
Author: Juanjo Menent <address@hidden>
Date: 2013-05-08 (Wed, 08 May 2013)
Changed paths:
M htdocs/admin/dict.php
M htdocs/langs/en_US/main.lang
M htdocs/langs/es_ES/main.lang
M htdocs/langs/fr_FR/main.lang
Log Message:
-----------
Merge pull request #938 from marcosgdf/translations
Added missing translations
Commit: 5e059fb15dcab7f2eb300d460a9ecd2556a9cde4
https://github.com/Dolibarr/dolibarr/commit/5e059fb15dcab7f2eb300d460a9ecd2556a9cde4
Author: simnandez <address@hidden>
Date: 2013-05-08 (Wed, 08 May 2013)
Changed paths:
M htdocs/langs/ca_ES/main.lang
Log Message:
-----------
Trad: Added missing translations
Commit: 30fb1e5e0558e9675b37e7c3f2077173510c4674
https://github.com/Dolibarr/dolibarr/commit/30fb1e5e0558e9675b37e7c3f2077173510c4674
Author: fhenry <address@hidden>
Date: 2013-05-09 (Thu, 09 May 2013)
Changed paths:
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
Log Message:
-----------
Fix bug [ bug #885 ] silent pgsql errors with click2dial
Commit: cc500cceba677a430240a69cb17bf670a1c1cee6
https://github.com/Dolibarr/dolibarr/commit/cc500cceba677a430240a69cb17bf670a1c1cee6
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-09 (Thu, 09 May 2013)
Changed paths:
M htdocs/adherents/admin/mailman.php
M htdocs/adherents/admin/spip.php
M htdocs/core/lib/admin.lib.php
M htdocs/langs/fr_FR/mailmanspip.lang
M htdocs/langs/fr_FR/members.lang
Log Message:
-----------
Fix: form into table is not W3C (broken with some uncommon browsers).
Commit: e5ef27b168c586f9787e0285a813e09395819ebc
https://github.com/Dolibarr/dolibarr/commit/e5ef27b168c586f9787e0285a813e09395819ebc
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-09 (Thu, 09 May 2013)
Changed paths:
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Fix: no underline onto link that are disabled.
Commit: ce6e1dc2a6c43be888fd7b2f57be1c6feaf832e7
https://github.com/Dolibarr/dolibarr/commit/ce6e1dc2a6c43be888fd7b2f57be1c6feaf832e7
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-09 (Thu, 09 May 2013)
Changed paths:
M htdocs/admin/dict.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/prelevement/bons.php
M htdocs/compta/prelevement/create.php
M htdocs/compta/prelevement/demandes.php
M htdocs/compta/prelevement/factures.php
M htdocs/compta/prelevement/fiche-rejet.php
M htdocs/compta/prelevement/fiche-stat.php
M htdocs/compta/prelevement/fiche.php
M htdocs/compta/prelevement/index.php
M htdocs/compta/prelevement/ligne.php
M htdocs/compta/prelevement/lignes.php
M htdocs/compta/prelevement/liste.php
M htdocs/compta/prelevement/rejets.php
M htdocs/compta/prelevement/stats.php
M htdocs/contact/list.php
M htdocs/core/lib/agenda.lib.php
M htdocs/core/lib/files.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/modSociete.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
M htdocs/install/mysql/tables/llx_opensurvey_user_studs.key.sql
M htdocs/langs/ca_ES/main.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/es_ES/admin.lang
M htdocs/langs/es_ES/main.lang
M htdocs/langs/fr_FR/main.lang
M htdocs/projet/class/project.class.php
M htdocs/societe/admin/societe.php
M htdocs/user/fiche.php
Log Message:
-----------
Merge branch '3.4' of address@hidden:Dolibarr/dolibarr.git into 3.4
Commit: a4e8e8eb4bcf30a1966b2a44e8e386781fa7be6e
https://github.com/Dolibarr/dolibarr/commit/a4e8e8eb4bcf30a1966b2a44e8e386781fa7be6e
Author: fhenry <address@hidden>
Date: 2013-05-10 (Fri, 10 May 2013)
Changed paths:
M htdocs/user/class/user.class.php
Log Message:
-----------
Add fecth extrafield into fetch user class
Commit: 9b30f116f11250762f22a6031d1e47cc3d2f29fb
https://github.com/Dolibarr/dolibarr/commit/9b30f116f11250762f22a6031d1e47cc3d2f29fb
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-10 (Fri, 10 May 2013)
Changed paths:
M htdocs/categories/fiche.php
M htdocs/core/class/html.formother.class.php
M htdocs/main.inc.php
Log Message:
-----------
Fix: Some lib missing when jmobile enabled.
Commit: 358f051b8e5d26940bc4ff88e38ca0cafd74e2d4
https://github.com/Dolibarr/dolibarr/commit/358f051b8e5d26940bc4ff88e38ca0cafd74e2d4
Author: fhenry <address@hidden>
Date: 2013-05-10 (Fri, 10 May 2013)
Changed paths:
M htdocs/adherents/admin/mailman.php
M htdocs/adherents/admin/spip.php
M htdocs/categories/fiche.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/lib/admin.lib.php
M htdocs/langs/fr_FR/mailmanspip.lang
M htdocs/langs/fr_FR/members.lang
M htdocs/main.inc.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
Commit: 9427e32e2ed54c1a2bc519a88c057207836df489
https://github.com/Dolibarr/dolibarr/commit/9427e32e2ed54c1a2bc519a88c057207836df489
Author: fhenry <address@hidden>
Date: 2013-05-10 (Fri, 10 May 2013)
Changed paths:
M htdocs/adherents/fiche.php
Log Message:
-----------
Fix security breach (SQL injection)
Commit: 0a26be3f04559f5f49a9b84d3cfefa9adf256478
https://github.com/Dolibarr/dolibarr/commit/0a26be3f04559f5f49a9b84d3cfefa9adf256478
Author: fhenry <address@hidden>
Date: 2013-05-10 (Fri, 10 May 2013)
Changed paths:
M htdocs/adherents/fiche.php
Log Message:
-----------
Fix security leak
Commit: aab3e0a8a5e2d886bbbfc08a1930d3d81a1fd733
https://github.com/Dolibarr/dolibarr/commit/aab3e0a8a5e2d886bbbfc08a1930d3d81a1fd733
Author: fhenry <address@hidden>
Date: 2013-05-10 (Fri, 10 May 2013)
Changed paths:
M htdocs/comm/propal.php
Log Message:
-----------
Fix Extrafield problem on propal pages
Commit: cdc1e55b26df20950338ad494c56232309b4dc6f
https://github.com/Dolibarr/dolibarr/commit/cdc1e55b26df20950338ad494c56232309b4dc6f
Author: fhenry <address@hidden>
Date: 2013-05-10 (Fri, 10 May 2013)
Changed paths:
M htdocs/comm/propal.php
M htdocs/commande/fiche.php
Log Message:
-----------
Fix bug on Extrafield order and propal
Commit: 9992fc803ddb26d2b3e669f5ab902222b5d110c9
https://github.com/Dolibarr/dolibarr/commit/9992fc803ddb26d2b3e669f5ab902222b5d110c9
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-10 (Fri, 10 May 2013)
Changed paths:
M dev/skeletons/modMyModule.class.php
Log Message:
-----------
Merge pull request #937 from marcosgdf/skeleton
Typo in skeleton module class
Commit: e67bb18062b6cdb82ea0ab91cf267350fb05461b
https://github.com/Dolibarr/dolibarr/commit/e67bb18062b6cdb82ea0ab91cf267350fb05461b
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-10 (Fri, 10 May 2013)
Changed paths:
M htdocs/adherents/fiche.php
M htdocs/comm/propal.php
M htdocs/commande/fiche.php
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
M htdocs/user/class/user.class.php
Log Message:
-----------
Merge pull request #939 from FHenry/3.4
Fix bug [ bug #885 ] silent pgsql errors with click2dial
Commit: cb3b0996ce2a7835e6ed78411601e9fd647e5cd3
https://github.com/Dolibarr/dolibarr/commit/cb3b0996ce2a7835e6ed78411601e9fd647e5cd3
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-10 (Fri, 10 May 2013)
Changed paths:
M htdocs/adherents/fiche.php
Log Message:
-----------
Merge pull request #941 from FHenry/3.3
Fix security breach (SQL injection)
Commit: b2a4f5d1bb01a462ceda1664ea7b7dd55ce64a32
https://github.com/Dolibarr/dolibarr/commit/b2a4f5d1bb01a462ceda1664ea7b7dd55ce64a32
Author: Marcos García <address@hidden>
Date: 2013-05-10 (Fri, 10 May 2013)
Changed paths:
M dev/skeletons/modMyModule.class.php
Log Message:
-----------
Typo in skeleton module class
Commit: fa4fc8495b6f4ae12ad6c6d939c35354498a45d7
https://github.com/Dolibarr/dolibarr/commit/fa4fc8495b6f4ae12ad6c6d939c35354498a45d7
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-10 (Fri, 10 May 2013)
Changed paths:
M htdocs/comm/propal.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/core/search_page.php
M htdocs/core/tpl/freeproductline_create.tpl.php
M htdocs/core/tpl/predefinedproductline_create.tpl.php
M htdocs/langs/en_US/errors.lang
M htdocs/langs/fr_FR/errors.lang
M htdocs/theme/cameleo/style.css.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Fix: Missing translation key
Fix: Minor css style missing
Fix: Create draft proposal return error if no contact defined.
Fix: W3C
Commit: 8717b1dd3cb6b9c08af0474b840e003410973e7b
https://github.com/Dolibarr/dolibarr/commit/8717b1dd3cb6b9c08af0474b840e003410973e7b
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-10 (Fri, 10 May 2013)
Changed paths:
M dev/skeletons/modMyModule.class.php
M htdocs/adherents/fiche.php
M htdocs/comm/propal.php
M htdocs/commande/fiche.php
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
M htdocs/user/class/user.class.php
Log Message:
-----------
Merge branch '3.4' of address@hidden:Dolibarr/dolibarr.git into 3.4
Commit: 526a80dd202bbca396687a502d52c27e06e97fff
https://github.com/Dolibarr/dolibarr/commit/526a80dd202bbca396687a502d52c27e06e97fff
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-11 (Sat, 11 May 2013)
Changed paths:
M htdocs/core/lib/barcode.lib.php
Log Message:
-----------
Sec: Param not escaped
Fix: Bad return error
Commit: e4dda125d8d804aa9cc882998e9464eee1c58d68
https://github.com/Dolibarr/dolibarr/commit/e4dda125d8d804aa9cc882998e9464eee1c58d68
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-11 (Sat, 11 May 2013)
Changed paths:
M dev/skeletons/modMyModule.class.php
M htdocs/adherents/fiche.php
Log Message:
-----------
Merge branch '3.3' of address@hidden:Dolibarr/dolibarr.git into 3.3
Commit: 8a90598b23e1b2689848187941f7a96b04907005
https://github.com/Dolibarr/dolibarr/commit/8a90598b23e1b2689848187941f7a96b04907005
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-11 (Sat, 11 May 2013)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Fix: Escape entities
Commit: 711e7bf9adb9722a7b379de48ed125897117ee12
https://github.com/Dolibarr/dolibarr/commit/711e7bf9adb9722a7b379de48ed125897117ee12
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-11 (Sat, 11 May 2013)
Changed paths:
M htdocs/core/lib/barcode.lib.php
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
htdocs/adherents/fiche.php
htdocs/core/lib/functions.lib.php
Commit: 6c4e47514de9b21598940e04c04c69bda3af2e9a
https://github.com/Dolibarr/dolibarr/commit/6c4e47514de9b21598940e04c04c69bda3af2e9a
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-11 (Sat, 11 May 2013)
Changed paths:
M dev/initdata/mysqldump_dolibarr_3.3.0.sql
M dev/initdata/mysqldump_dolibarr_3.4.0.sql
M htdocs/adherents/admin/mailman.php
M htdocs/adherents/admin/spip.php
M htdocs/adherents/fiche.php
M htdocs/categories/fiche.php
M htdocs/comm/index.php
M htdocs/comm/propal.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/fiche.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/prelevement/bons.php
M htdocs/compta/prelevement/create.php
M htdocs/compta/prelevement/demandes.php
M htdocs/compta/prelevement/factures.php
M htdocs/compta/prelevement/fiche-rejet.php
M htdocs/compta/prelevement/fiche-stat.php
M htdocs/compta/prelevement/fiche.php
M htdocs/compta/prelevement/index.php
M htdocs/compta/prelevement/ligne.php
M htdocs/compta/prelevement/lignes.php
M htdocs/compta/prelevement/liste.php
M htdocs/compta/prelevement/rejets.php
M htdocs/compta/prelevement/stats.php
M htdocs/contact/class/contact.class.php
M htdocs/contact/list.php
M htdocs/core/class/conf.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/lib/admin.lib.php
M htdocs/core/lib/agenda.lib.php
M htdocs/core/lib/barcode.lib.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/project.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/core/modules/syslog/mod_syslog_file.php
M htdocs/core/search_page.php
M htdocs/core/tpl/freeproductline_create.tpl.php
M htdocs/core/tpl/predefinedproductline_create.tpl.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/filefunc.inc.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/holiday/fiche.php
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
M htdocs/install/mysql/tables/llx_opensurvey_user_studs.key.sql
M htdocs/install/upgrade2.php
M htdocs/langs/en_US/errors.lang
M htdocs/langs/es_ES/admin.lang
M htdocs/langs/fr_FR/dict.lang
M htdocs/langs/fr_FR/errors.lang
M htdocs/langs/fr_FR/mailmanspip.lang
M htdocs/langs/fr_FR/members.lang
M htdocs/main.inc.php
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/tabs/productMargins.php
M htdocs/projet/class/project.class.php
M htdocs/societe/admin/societe.php
M htdocs/theme/cameleo/style.css.php
M htdocs/theme/eldy/style.css.php
M htdocs/user/class/user.class.php
M htdocs/user/fiche.php
M htdocs/user/perms.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
htdocs/holiday/fiche.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/d2257b9fb006...6c4e47514de9