[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] cd7f94: [ bug #849 ] BUG PGSQL
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] cd7f94: [ bug #849 ] BUG PGSQL |
|
Date: |
Mon, 29 Apr 2013 10:04:30 -0700 |
Branch: refs/heads/3.3_backported
Home: https://github.com/Dolibarr/dolibarr
Commit: cd7f94d515ffa724cc6acb1bbab3360e6320a6f0
https://github.com/Dolibarr/dolibarr/commit/cd7f94d515ffa724cc6acb1bbab3360e6320a6f0
Author: fhenry <address@hidden>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M htdocs/compta/facture/impayees.php
Log Message:
-----------
[ bug #849 ] BUG PGSQL
Commit: 4badcf5a75265616b75c6c04d2f246aad2d3fcff
https://github.com/Dolibarr/dolibarr/commit/4badcf5a75265616b75c6c04d2f246aad2d3fcff
Author: fhenry <address@hidden>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M htdocs/includes/nusoap/lib/nusoap.php
Log Message:
-----------
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
Commit: 521929b740c0353cf9f2aee49bdb80151484b703
https://github.com/Dolibarr/dolibarr/commit/521929b740c0353cf9f2aee49bdb80151484b703
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-25 (Thu, 25 Apr 2013)
Changed paths:
M htdocs/compta/facture/impayees.php
Log Message:
-----------
Merge pull request #878 from FHenry/3.3
[ bug #849 ] BUG PGSQL
Commit: bc7015a431465522d83ef3b65240915f845bb49b
https://github.com/Dolibarr/dolibarr/commit/bc7015a431465522d83ef3b65240915f845bb49b
Author: fhenry <address@hidden>
Date: 2013-04-25 (Thu, 25 Apr 2013)
Changed paths:
M htdocs/compta/index.php
Log Message:
-----------
fix [ bug #850 ] Dolibarr PGSQL
Commit: 733ff62ec826fb944a80fca384e530d6290a92f5
https://github.com/Dolibarr/dolibarr/commit/733ff62ec826fb944a80fca384e530d6290a92f5
Author: fhenry <address@hidden>
Date: 2013-04-25 (Thu, 25 Apr 2013)
Log Message:
-----------
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
Commit: 2f72bbca5ab19a6e39700207f18f50a7b2efda60
https://github.com/Dolibarr/dolibarr/commit/2f72bbca5ab19a6e39700207f18f50a7b2efda60
Author: Regis Houssin <address@hidden>
Date: 2013-04-25 (Thu, 25 Apr 2013)
Changed paths:
M htdocs/master.inc.php
Log Message:
-----------
Fix: broken features with multicompany
Commit: d162a61d41118af12f30df6d80402a52a3d1d65a
https://github.com/Dolibarr/dolibarr/commit/d162a61d41118af12f30df6d80402a52a3d1d65a
Author: Regis Houssin <address@hidden>
Date: 2013-04-25 (Thu, 25 Apr 2013)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
Fix: use $conf->entity if defined
Commit: ed5a00a79de12322b436e20ec47a42f4da528073
https://github.com/Dolibarr/dolibarr/commit/ed5a00a79de12322b436e20ec47a42f4da528073
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-25 (Thu, 25 Apr 2013)
Changed paths:
M htdocs/compta/index.php
Log Message:
-----------
Merge pull request #880 from FHenry/3.3
fix [ bug #850 ] Dolibarr PGSQL
Commit: 016b4a2baaa24381e437ad9637a3d6619818eae7
https://github.com/Dolibarr/dolibarr/commit/016b4a2baaa24381e437ad9637a3d6619818eae7
Author: Regis Houssin <address@hidden>
Date: 2013-04-26 (Fri, 26 Apr 2013)
Changed paths:
M htdocs/contact/class/contact.class.php
M htdocs/contact/exportimport.php
M htdocs/contact/fiche.php
M htdocs/contact/ldap.php
M htdocs/contact/perso.php
M htdocs/contact/vcard.php
Log Message:
-----------
Fix: security problem with multicompany
Commit: 9e1487fc6126237b300a6990f5c20c3522c7e270
https://github.com/Dolibarr/dolibarr/commit/9e1487fc6126237b300a6990f5c20c3522c7e270
Author: fhenry <address@hidden>
Date: 2013-04-26 (Fri, 26 Apr 2013)
Changed paths:
M htdocs/fourn/facture/impayees.php
Log Message:
-----------
Fix bug Pgsql
Commit: 4ff5922a55dc987f9ab8a5ea7c16be664ec165bf
https://github.com/Dolibarr/dolibarr/commit/4ff5922a55dc987f9ab8a5ea7c16be664ec165bf
Author: fhenry <address@hidden>
Date: 2013-04-26 (Fri, 26 Apr 2013)
Changed paths:
M htdocs/fourn/facture/impayees.php
Log Message:
-----------
Fix pgSQL bug
Commit: b67faf1eb14560da9f66736048d70affcc2f7eae
https://github.com/Dolibarr/dolibarr/commit/b67faf1eb14560da9f66736048d70affcc2f7eae
Author: fhenry <address@hidden>
Date: 2013-04-26 (Fri, 26 Apr 2013)
Changed paths:
M htdocs/compta/facture/impayees.php
Log Message:
-----------
Fix PgSQL
Commit: 36e6269b24b846efdf50c1736260709c16a31187
https://github.com/Dolibarr/dolibarr/commit/36e6269b24b846efdf50c1736260709c16a31187
Author: Regis Houssin <address@hidden>
Date: 2013-04-26 (Fri, 26 Apr 2013)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/document.php
M htdocs/comm/action/fiche.php
M htdocs/comm/action/info.php
M htdocs/core/lib/security.lib.php
Log Message:
-----------
Fix: big security problem with multicompany
Commit: c969d17e48af89e58850e1abc954153525bec5b9
https://github.com/Dolibarr/dolibarr/commit/c969d17e48af89e58850e1abc954153525bec5b9
Author: Regis Houssin <address@hidden>
Date: 2013-04-26 (Fri, 26 Apr 2013)
Changed paths:
M htdocs/core/lib/security.lib.php
Log Message:
-----------
Fix: avoid error
Commit: c0a3271d7618463a69af7f1adccbefabf7f35039
https://github.com/Dolibarr/dolibarr/commit/c0a3271d7618463a69af7f1adccbefabf7f35039
Author: Regis Houssin <address@hidden>
Date: 2013-04-26 (Fri, 26 Apr 2013)
Changed paths:
M htdocs/core/lib/security.lib.php
Log Message:
-----------
Fix: bypass the second test if the first is ok
Commit: 652e0c1b5f5c921909b396605f7c45cce9d1b586
https://github.com/Dolibarr/dolibarr/commit/652e0c1b5f5c921909b396605f7c45cce9d1b586
Author: Marcos García <address@hidden>
Date: 2013-04-26 (Fri, 26 Apr 2013)
Changed paths:
M htdocs/holiday/class/holiday.class.php
Log Message:
-----------
Corrected translation key
Commit: 44a1120c0646e18d953cd1429725014895a60245
https://github.com/Dolibarr/dolibarr/commit/44a1120c0646e18d953cd1429725014895a60245
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-26 (Fri, 26 Apr 2013)
Changed paths:
M htdocs/compta/facture/impayees.php
M htdocs/fourn/facture/impayees.php
Log Message:
-----------
Merge pull request #888 from FHenry/3.3
Fix bug Pgsql
Commit: b1cf0b9a76e513e4d8c75d13affd92f48e25d3e7
https://github.com/Dolibarr/dolibarr/commit/b1cf0b9a76e513e4d8c75d13affd92f48e25d3e7
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-26 (Fri, 26 Apr 2013)
Changed paths:
M htdocs/holiday/class/holiday.class.php
Log Message:
-----------
Merge pull request #889 from marcosgdf/translations
Corrected translation key
Commit: 3203283fe98eaf5d95a5c281fc8a26edb771cc3d
https://github.com/Dolibarr/dolibarr/commit/3203283fe98eaf5d95a5c281fc8a26edb771cc3d
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-27 (Sat, 27 Apr 2013)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Fix: remove warning
Commit: 24309a7f172d12029fd438c4b85fc34fbe618a94
https://github.com/Dolibarr/dolibarr/commit/24309a7f172d12029fd438c4b85fc34fbe618a94
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-27 (Sat, 27 Apr 2013)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/document.php
M htdocs/comm/action/fiche.php
M htdocs/comm/action/info.php
M htdocs/compta/facture/impayees.php
M htdocs/compta/index.php
M htdocs/contact/class/contact.class.php
M htdocs/contact/exportimport.php
M htdocs/contact/fiche.php
M htdocs/contact/ldap.php
M htdocs/contact/perso.php
M htdocs/contact/vcard.php
M htdocs/core/lib/security.lib.php
M htdocs/core/modules/syslog/mod_syslog_file.php
M htdocs/fourn/facture/impayees.php
M htdocs/holiday/class/holiday.class.php
M htdocs/includes/nusoap/lib/nusoap.php
M htdocs/main.inc.php
M htdocs/master.inc.php
Log Message:
-----------
Merge branch '3.3' of address@hidden:Dolibarr/dolibarr.git into 3.3
Commit: 1065645fb67bc90899c6b470d133ece67fe45e00
https://github.com/Dolibarr/dolibarr/commit/1065645fb67bc90899c6b470d133ece67fe45e00
Author: Marcos García <address@hidden>
Date: 2013-04-27 (Sat, 27 Apr 2013)
Changed paths:
M ChangeLog
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
Fix: [ bug #857 ] Invoice created from shipment does not have the order
discount
Commit: ecaea4c575af1c85957fadf369d0b06c6124a809
https://github.com/Dolibarr/dolibarr/commit/ecaea4c575af1c85957fadf369d0b06c6124a809
Author: Marcos García <address@hidden>
Date: 2013-04-27 (Sat, 27 Apr 2013)
Changed paths:
M htdocs/expedition/tpl/linkedobjectblock.tpl.php
Log Message:
-----------
Corrected incorrect lang trans key
Commit: 7a115a92166968e5b7f03940e2f437304743fba3
https://github.com/Dolibarr/dolibarr/commit/7a115a92166968e5b7f03940e2f437304743fba3
Author: Marcos García <address@hidden>
Date: 2013-04-27 (Sat, 27 Apr 2013)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Expedition class name was not being translated when creating invoice from it
Commit: 8e7b72d09ee07edd3f793fd45db12d3d6a91c11a
https://github.com/Dolibarr/dolibarr/commit/8e7b72d09ee07edd3f793fd45db12d3d6a91c11a
Author: Marcos García <address@hidden>
Date: 2013-04-27 (Sat, 27 Apr 2013)
Changed paths:
M htdocs/langs/en_US/holiday.lang
M htdocs/langs/es_ES/holiday.lang
Log Message:
-----------
Fixed incorrect translations in holidays module
Commit: bd2b363e4023a61cf2bbc2dce12dd955757a0322
https://github.com/Dolibarr/dolibarr/commit/bd2b363e4023a61cf2bbc2dce12dd955757a0322
Author: Marcos García <address@hidden>
Date: 2013-04-27 (Sat, 27 Apr 2013)
Changed paths:
M htdocs/holiday/class/holiday.class.php
M htdocs/holiday/fiche.php
M htdocs/langs/bg_BG/holiday.lang
M htdocs/langs/en_US/holiday.lang
M htdocs/langs/es_ES/holiday.lang
M htdocs/langs/fr_FR/holiday.lang
Log Message:
-----------
Modified traslation keys to reflect expected translation
Commit: 0672d10a3f9f04dbec5dc9e6d25680850e65ef3b
https://github.com/Dolibarr/dolibarr/commit/0672d10a3f9f04dbec5dc9e6d25680850e65ef3b
Author: Marcos García <address@hidden>
Date: 2013-04-27 (Sat, 27 Apr 2013)
Changed paths:
M htdocs/holiday/class/holiday.class.php
Log Message:
-----------
Fixed typos
Commit: ab668f0f073950780d2b622de1f55ac11f2f1ade
https://github.com/Dolibarr/dolibarr/commit/ab668f0f073950780d2b622de1f55ac11f2f1ade
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-27 (Sat, 27 Apr 2013)
Changed paths:
M htdocs/compta/facture.php
M htdocs/expedition/tpl/linkedobjectblock.tpl.php
Log Message:
-----------
Merge pull request #892 from marcosgdf/expedition-translations
Corrected incorrect lang trans key
Commit: f8e0f40ffa7ee0ec53ccfe931b65bba749f2c428
https://github.com/Dolibarr/dolibarr/commit/f8e0f40ffa7ee0ec53ccfe931b65bba749f2c428
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-27 (Sat, 27 Apr 2013)
Changed paths:
M ChangeLog
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
Merge pull request #891 from marcosgdf/bug-857
Fix: [ bug #857 ] Invoice created from shipment does not have the order ...
Commit: de1f53db45cb27f054681eaafbd6b0d35e0630b1
https://github.com/Dolibarr/dolibarr/commit/de1f53db45cb27f054681eaafbd6b0d35e0630b1
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-27 (Sat, 27 Apr 2013)
Changed paths:
M htdocs/holiday/class/holiday.class.php
M htdocs/holiday/fiche.php
M htdocs/langs/bg_BG/holiday.lang
M htdocs/langs/en_US/holiday.lang
M htdocs/langs/es_ES/holiday.lang
M htdocs/langs/fr_FR/holiday.lang
Log Message:
-----------
Merge pull request #894 from marcosgdf/holidays-translations
Holidays translations
Commit: 54fc731df78f4249dfae21af3aeb214086665468
https://github.com/Dolibarr/dolibarr/commit/54fc731df78f4249dfae21af3aeb214086665468
Author: Marcos García <address@hidden>
Date: 2013-04-27 (Sat, 27 Apr 2013)
Changed paths:
M ChangeLog
M htdocs/holiday/fiche.php
Log Message:
-----------
Fix: [bug #856] Mail error if destination user doesn't have an email
Commit: 89eec9bfbdf89d48e01e06523787712969427220
https://github.com/Dolibarr/dolibarr/commit/89eec9bfbdf89d48e01e06523787712969427220
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-27 (Sat, 27 Apr 2013)
Changed paths:
M ChangeLog
M htdocs/holiday/fiche.php
Log Message:
-----------
Merge pull request #896 from marcosgdf/bug-856
Fix: [bug #856] Mail error if destination user doesn't have an email
Commit: 00adb1b9ab4938f778c3050d39ad814fc6deec47
https://github.com/Dolibarr/dolibarr/commit/00adb1b9ab4938f778c3050d39ad814fc6deec47
Author: simnandez <address@hidden>
Date: 2013-04-29 (Mon, 29 Apr 2013)
Changed paths:
M ChangeLog
M htdocs/holiday/fiche.php
A 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
Log Message:
-----------
Fix: [ bug #855 ] Holiday approval email in French
Commit: fd85755461e71d8a8b38f166f2b89d711b905df3
https://github.com/Dolibarr/dolibarr/commit/fd85755461e71d8a8b38f166f2b89d711b905df3
Author: simnandez <address@hidden>
Date: 2013-04-29 (Mon, 29 Apr 2013)
Changed paths:
M htdocs/holiday/fiche.php
Log Message:
-----------
Fix: [ bug #855 ] Holiday approval email in French
Commit: c215b4769e28c102afcf5bcf382d839dda89730a
https://github.com/Dolibarr/dolibarr/commit/c215b4769e28c102afcf5bcf382d839dda89730a
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-29 (Mon, 29 Apr 2013)
Changed paths:
M ChangeLog
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/document.php
M htdocs/comm/action/fiche.php
M htdocs/comm/action/info.php
M htdocs/compta/facture.php
M htdocs/compta/facture/impayees.php
M htdocs/compta/index.php
M htdocs/contact/class/contact.class.php
M htdocs/contact/exportimport.php
M htdocs/contact/fiche.php
M htdocs/contact/ldap.php
M htdocs/contact/perso.php
M htdocs/contact/vcard.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/security.lib.php
M htdocs/expedition/class/expedition.class.php
M htdocs/expedition/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/facture/impayees.php
M htdocs/holiday/class/holiday.class.php
M htdocs/holiday/fiche.php
M htdocs/langs/bg_BG/holiday.lang
A 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/main.inc.php
M htdocs/master.inc.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into 3.3_backported
Compare:
https://github.com/Dolibarr/dolibarr/compare/70de5f1f7b72...c215b4769e28