[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 047aa8: Fix: avoid error when multipl
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 047aa8: Fix: avoid error when multiple files uploaded |
|
Date: |
Mon, 20 May 2013 12:22:21 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 047aa8ea29f7ef92dc4701fd5f3b3b0c4b048fce
https://github.com/Dolibarr/dolibarr/commit/047aa8ea29f7ef92dc4701fd5f3b3b0c4b048fce
Author: Regis Houssin <address@hidden>
Date: 2013-05-14 (Tue, 14 May 2013)
Changed paths:
M htdocs/core/tpl/ajax/fileupload_main.tpl.php
Log Message:
-----------
Fix: avoid error when multiple files uploaded
Commit: 658f0af428aeffcf9d46fc8ba37c798d92c3542e
https://github.com/Dolibarr/dolibarr/commit/658f0af428aeffcf9d46fc8ba37c798d92c3542e
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-16 (Thu, 16 May 2013)
Changed paths:
M htdocs/core/class/translate.class.php
Log Message:
-----------
Fix: Removed warning
Commit: bab4e1e5090a49b46bd426cbd72172905b54e831
https://github.com/Dolibarr/dolibarr/commit/bab4e1e5090a49b46bd426cbd72172905b54e831
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-16 (Thu, 16 May 2013)
Changed paths:
M htdocs/admin/system/phpinfo.php
Log Message:
-----------
Fix: PHP version was lost
Fix: split of long text to avoid horizontal scrolls
Commit: 20b3a9873e01b9a99cd88a2c775287b75e2dff83
https://github.com/Dolibarr/dolibarr/commit/20b3a9873e01b9a99cd88a2c775287b75e2dff83
Author: fhenry <address@hidden>
Date: 2013-05-16 (Thu, 16 May 2013)
Changed paths:
R pom.xml
Log Message:
-----------
remove pom.xml
Commit: b3adbf53e5bd2f3fcabfcb4024c22ea015d04173
https://github.com/Dolibarr/dolibarr/commit/b3adbf53e5bd2f3fcabfcb4024c22ea015d04173
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-16 (Thu, 16 May 2013)
Changed paths:
M htdocs/install/mysql/data/llx_20_c_departements.sql
M htdocs/install/mysql/data/llx_c_tva.sql
Log Message:
-----------
Fix data for greece
Commit: b8cd276128d4d059b32dbff6efc08e999787de4b
https://github.com/Dolibarr/dolibarr/commit/b8cd276128d4d059b32dbff6efc08e999787de4b
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-16 (Thu, 16 May 2013)
Changed paths:
M htdocs/admin/system/phpinfo.php
M htdocs/core/class/translate.class.php
Log Message:
-----------
Merge branch '3.4' of address@hidden:Dolibarr/dolibarr.git into 3.4
Commit: fdd8d2cc5e8d3d523a5b5c0c2a68fc18037a2676
https://github.com/Dolibarr/dolibarr/commit/fdd8d2cc5e8d3d523a5b5c0c2a68fc18037a2676
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-16 (Thu, 16 May 2013)
Changed paths:
M htdocs/core/tpl/login.tpl.php
Log Message:
-----------
Fix: to large a href
Commit: 87329068e229dded294b7bacc1e2fe8a803318da
https://github.com/Dolibarr/dolibarr/commit/87329068e229dded294b7bacc1e2fe8a803318da
Author: Juanjo Menent <address@hidden>
Date: 2013-05-17 (Fri, 17 May 2013)
Changed paths:
R pom.xml
Log Message:
-----------
Merge pull request #953 from FHenry/3.4
remove pom.xml
Commit: f7f59f962b3cc8f5372ef8c3158f65eefc7ef4b0
https://github.com/Dolibarr/dolibarr/commit/f7f59f962b3cc8f5372ef8c3158f65eefc7ef4b0
Author: Grand Philippe <address@hidden>
Date: 2013-05-17 (Fri, 17 May 2013)
Changed paths:
M htdocs/langs/en_US/bills.lang
M htdocs/langs/fr_FR/bills.lang
M scripts/invoices/email_unpaid_invoices_to_representatives.php
Log Message:
-----------
missing translation for script
Commit: 86d2f3447477400684ecf803eb32b8ad35fe9ca1
https://github.com/Dolibarr/dolibarr/commit/86d2f3447477400684ecf803eb32b8ad35fe9ca1
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-17 (Fri, 17 May 2013)
Changed paths:
M htdocs/langs/en_US/bills.lang
M htdocs/langs/fr_FR/bills.lang
M scripts/invoices/email_unpaid_invoices_to_representatives.php
Log Message:
-----------
Merge pull request #954 from grandoc/3.4
missing translation for script
Commit: bd92adf092163afae50f5aa9a018be19078f653a
https://github.com/Dolibarr/dolibarr/commit/bd92adf092163afae50f5aa9a018be19078f653a
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-17 (Fri, 17 May 2013)
Changed paths:
M htdocs/langs/fr_FR/bills.lang
Log Message:
-----------
Better trans
Commit: 5acdbfa8f00a7e0a316a7628c9a32762413d43ae
https://github.com/Dolibarr/dolibarr/commit/5acdbfa8f00a7e0a316a7628c9a32762413d43ae
Author: fhenry <address@hidden>
Date: 2013-05-17 (Fri, 17 May 2013)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/fiche.php
Log Message:
-----------
Fix error management and SQL resquest in action comm
Commit: e3615d43bd762a206ee2a5968edf886ceb4de0fa
https://github.com/Dolibarr/dolibarr/commit/e3615d43bd762a206ee2a5968edf886ceb4de0fa
Author: Christophe Battarel <address@hidden>
Date: 2013-05-17 (Fri, 17 May 2013)
Changed paths:
M htdocs/core/class/commonobject.class.php
M htdocs/core/tpl/objectline_view.tpl.php
Log Message:
-----------
fix bug : external users should not see costprice and margin infos
Commit: 7efe39495a0d5ec0416f515c1460d00117811940
https://github.com/Dolibarr/dolibarr/commit/7efe39495a0d5ec0416f515c1460d00117811940
Author: Christophe Battarel <address@hidden>
Date: 2013-05-17 (Fri, 17 May 2013)
Changed paths:
M htdocs/langs/fr_FR/margins.lang
Log Message:
-----------
french translation for CostPrice
Commit: 1c1736fa2000056d2d40e94f4fbad1f77a692741
https://github.com/Dolibarr/dolibarr/commit/1c1736fa2000056d2d40e94f4fbad1f77a692741
Author: fhenry <address@hidden>
Date: 2013-05-17 (Fri, 17 May 2013)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Fix bad Warning: Bad formed request converted PGSQL
Commit: 1eddd869500a1a2b05bc807185b8dec0fe06405f
https://github.com/Dolibarr/dolibarr/commit/1eddd869500a1a2b05bc807185b8dec0fe06405f
Author: fhenry <address@hidden>
Date: 2013-05-17 (Fri, 17 May 2013)
Changed paths:
M htdocs/fichinter/class/fichinter.class.php
Log Message:
-----------
Fix Bad Formed Request PGSQL
Commit: e19e9e1c639ee632e07633295e2263d06f7c4c56
https://github.com/Dolibarr/dolibarr/commit/e19e9e1c639ee632e07633295e2263d06f7c4c56
Author: fhenry <address@hidden>
Date: 2013-05-17 (Fri, 17 May 2013)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Add dol_syslog
Commit: 7a6a74f43eb2efdadd7a6c0217ad568b7ea85be0
https://github.com/Dolibarr/dolibarr/commit/7a6a74f43eb2efdadd7a6c0217ad568b7ea85be0
Author: fhenry <address@hidden>
Date: 2013-05-17 (Fri, 17 May 2013)
Changed paths:
M htdocs/langs/en_US/bills.lang
M htdocs/langs/fr_FR/bills.lang
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: 2879a09a03f204bf86429b9b1cf05593c124d6e1
https://github.com/Dolibarr/dolibarr/commit/2879a09a03f204bf86429b9b1cf05593c124d6e1
Author: simnandez <address@hidden>
Date: 2013-05-18 (Sat, 18 May 2013)
Changed paths:
M htdocs/comm/propal.php
M htdocs/core/tpl/freeproductline_create.tpl.php
Log Message:
-----------
Fix: Remove windows CR/LF
Commit: e2f2ad30ae7877b4c58ad3996a53e06b96f33541
https://github.com/Dolibarr/dolibarr/commit/e2f2ad30ae7877b4c58ad3996a53e06b96f33541
Author: simnandez <address@hidden>
Date: 2013-05-18 (Sat, 18 May 2013)
Changed paths:
M htdocs/core/tpl/predefinedproductline_create.tpl.php
Log Message:
-----------
Fix: Remove windows CR/LF
Commit: fefb21a56e9c99090a6c6ff98263222a4f33edf3
https://github.com/Dolibarr/dolibarr/commit/fefb21a56e9c99090a6c6ff98263222a4f33edf3
Author: fhenry <address@hidden>
Date: 2013-05-18 (Sat, 18 May 2013)
Changed paths:
M ChangeLog
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/propal.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/fiche.php
M htdocs/compta/facture.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/tpl/admin_extrafields_add.tpl.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fichinter/fiche.php
Log Message:
-----------
Fix bug on Extrafield checkbox
Fix bug on ActionComm Update
[ task #900 ] Review code of ficheinter.class.php
Commit: 181ce5222353cabf9bca897a150c0292196a3b72
https://github.com/Dolibarr/dolibarr/commit/181ce5222353cabf9bca897a150c0292196a3b72
Author: fhenry <address@hidden>
Date: 2013-05-18 (Sat, 18 May 2013)
Changed paths:
M htdocs/core/class/commonobject.class.php
M htdocs/fichinter/class/fichinter.class.php
Log Message:
-----------
Add ficheinter in GetElementURL for action
Commit: a8e1d111c35e9553f7300a71568ea3c63b51b746
https://github.com/Dolibarr/dolibarr/commit/a8e1d111c35e9553f7300a71568ea3c63b51b746
Author: fhenry <address@hidden>
Date: 2013-05-19 (Sun, 19 May 2013)
Changed paths:
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fichinter/fiche.php
Log Message:
-----------
Add trigger into ficheinter lines and $user pass trought parameters
every where
Commit: 94e2ea05d2c88f1ac3e41e097530356f50854057
https://github.com/Dolibarr/dolibarr/commit/94e2ea05d2c88f1ac3e41e097530356f50854057
Author: fhenry <address@hidden>
Date: 2013-05-19 (Sun, 19 May 2013)
Changed paths:
M htdocs/fichinter/class/fichinter.class.php
Log Message:
-----------
Fix trigger ficheinterline
Commit: 6190dddac95fb75b5835a34ada60ea13390469ab
https://github.com/Dolibarr/dolibarr/commit/6190dddac95fb75b5835a34ada60ea13390469ab
Author: fhenry <address@hidden>
Date: 2013-05-19 (Sun, 19 May 2013)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
GetElmentURL fichinter instead of ficheinter (to be ok with element of
fichinter class
Commit: c07d5045d14b3abc39cfba7de14fac2e4ce961f6
https://github.com/Dolibarr/dolibarr/commit/c07d5045d14b3abc39cfba7de14fac2e4ce961f6
Author: fhenry <address@hidden>
Date: 2013-05-19 (Sun, 19 May 2013)
Changed paths:
M htdocs/fichinter/fiche.php
Log Message:
-----------
Error management
Commit: 08b234ed012db11d4d1b2f871440576fb18fe2e3
https://github.com/Dolibarr/dolibarr/commit/08b234ed012db11d4d1b2f871440576fb18fe2e3
Author: Marcos García <address@hidden>
Date: 2013-05-19 (Sun, 19 May 2013)
Changed paths:
M htdocs/langs/ar_SA/products.lang
M htdocs/langs/bg_BG/products.lang
M htdocs/langs/ca_ES/products.lang
M htdocs/langs/da_DK/products.lang
M htdocs/langs/de_AT/products.lang
M htdocs/langs/de_DE/products.lang
M htdocs/langs/el_GR/products.lang
M htdocs/langs/en_US/products.lang
M htdocs/langs/es_ES/products.lang
M htdocs/langs/et_EE/products.lang
M htdocs/langs/fa_IR/products.lang
M htdocs/langs/fi_FI/products.lang
M htdocs/langs/fr_FR/products.lang
M htdocs/langs/he_IL/products.lang
M htdocs/langs/hu_HU/products.lang
M htdocs/langs/is_IS/products.lang
M htdocs/langs/it_IT/products.lang
M htdocs/langs/ja_JP/products.lang
M htdocs/langs/nb_NO/products.lang
M htdocs/langs/nl_BE/products.lang
M htdocs/langs/nl_NL/products.lang
M htdocs/langs/pl_PL/products.lang
M htdocs/langs/pt_BR/products.lang
M htdocs/langs/pt_PT/products.lang
M htdocs/langs/ro_RO/products.lang
M htdocs/langs/ru_RU/products.lang
M htdocs/langs/sl_SI/products.lang
M htdocs/langs/sv_SE/products.lang
M htdocs/langs/tr_TR/products.lang
M htdocs/langs/zh_CN/products.lang
M htdocs/langs/zh_TW/products.lang
Log Message:
-----------
Corrected translation key BuyingPrice from lang files
Commit: 5f4433dbffba52f87d0716e1c6692cab1064390e
https://github.com/Dolibarr/dolibarr/commit/5f4433dbffba52f87d0716e1c6692cab1064390e
Author: Marcos García <address@hidden>
Date: 2013-05-19 (Sun, 19 May 2013)
Changed paths:
M htdocs/margin/admin/margin.php
Log Message:
-----------
Missing succes message in margin module config page
Commit: bd712262b673c5221adb9b5d15f4d08ab9a61819
https://github.com/Dolibarr/dolibarr/commit/bd712262b673c5221adb9b5d15f4d08ab9a61819
Author: Juanjo Menent <address@hidden>
Date: 2013-05-19 (Sun, 19 May 2013)
Changed paths:
M htdocs/margin/admin/margin.php
Log Message:
-----------
Merge pull request #961 from marcosgdf/minor
Missing success message in margin module config page
Commit: afddded13c1c80157a53cab4fa4f3277ae78dc9d
https://github.com/Dolibarr/dolibarr/commit/afddded13c1c80157a53cab4fa4f3277ae78dc9d
Author: Juanjo Menent <address@hidden>
Date: 2013-05-19 (Sun, 19 May 2013)
Changed paths:
M htdocs/langs/ar_SA/products.lang
M htdocs/langs/bg_BG/products.lang
M htdocs/langs/ca_ES/products.lang
M htdocs/langs/da_DK/products.lang
M htdocs/langs/de_AT/products.lang
M htdocs/langs/de_DE/products.lang
M htdocs/langs/el_GR/products.lang
M htdocs/langs/en_US/products.lang
M htdocs/langs/es_ES/products.lang
M htdocs/langs/et_EE/products.lang
M htdocs/langs/fa_IR/products.lang
M htdocs/langs/fi_FI/products.lang
M htdocs/langs/fr_FR/products.lang
M htdocs/langs/he_IL/products.lang
M htdocs/langs/hu_HU/products.lang
M htdocs/langs/is_IS/products.lang
M htdocs/langs/it_IT/products.lang
M htdocs/langs/ja_JP/products.lang
M htdocs/langs/nb_NO/products.lang
M htdocs/langs/nl_BE/products.lang
M htdocs/langs/nl_NL/products.lang
M htdocs/langs/pl_PL/products.lang
M htdocs/langs/pt_BR/products.lang
M htdocs/langs/pt_PT/products.lang
M htdocs/langs/ro_RO/products.lang
M htdocs/langs/ru_RU/products.lang
M htdocs/langs/sl_SI/products.lang
M htdocs/langs/sv_SE/products.lang
M htdocs/langs/tr_TR/products.lang
M htdocs/langs/zh_CN/products.lang
M htdocs/langs/zh_TW/products.lang
Log Message:
-----------
Merge pull request #962 from marcosgdf/translations
Corrected translation key BuyingPrice from lang files
Commit: 347fc6d714cdf12b0abdd5b95f09c9fb8a86ee2f
https://github.com/Dolibarr/dolibarr/commit/347fc6d714cdf12b0abdd5b95f09c9fb8a86ee2f
Author: Christophe Battarel <address@hidden>
Date: 2013-05-19 (Sun, 19 May 2013)
Changed paths:
M htdocs/core/modules/modMargin.class.php
Log Message:
-----------
fix unauthorized access to margins for external user
Commit: fea0e6de54077d46c6ec6e31f788c6dc6551772a
https://github.com/Dolibarr/dolibarr/commit/fea0e6de54077d46c6ec6e31f788c6dc6551772a
Author: Christophe Battarel <address@hidden>
Date: 2013-05-19 (Sun, 19 May 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
Fix - external users should not see costprice and margin infos
Commit: a6233a738c2f67e557b54b144066a7cb15c728e8
https://github.com/Dolibarr/dolibarr/commit/a6233a738c2f67e557b54b144066a7cb15c728e8
Author: fhenry <address@hidden>
Date: 2013-05-19 (Sun, 19 May 2013)
Changed paths:
M htdocs/fichinter/class/fichinter.class.php
Log Message:
-----------
Fix trigger in deleteline fiche inter
Commit: 2ac738d8c4246555ffd5ec0d34a0012fe7918043
https://github.com/Dolibarr/dolibarr/commit/2ac738d8c4246555ffd5ec0d34a0012fe7918043
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-19 (Sun, 19 May 2013)
Changed paths:
M ChangeLog
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/fiche.php
M htdocs/comm/propal.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/fiche.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/tpl/admin_extrafields_add.tpl.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fichinter/fiche.php
Log Message:
-----------
Merge pull request #955 from FHenry/3.4
Fix error management and SQL resquest in action comm
Commit: 3d409390a57b546ed7a9734dd37d3009651ffd27
https://github.com/Dolibarr/dolibarr/commit/3d409390a57b546ed7a9734dd37d3009651ffd27
Author: fhenry <address@hidden>
Date: 2013-05-19 (Sun, 19 May 2013)
Changed paths:
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fichinter/fiche.php
Log Message:
-----------
Revert Class rewrite and ficheinter line trigger
Commit: f8ca8426856c341dbcde7add82580bf74864a46d
https://github.com/Dolibarr/dolibarr/commit/f8ca8426856c341dbcde7add82580bf74864a46d
Author: Christophe Battarel <address@hidden>
Date: 2013-05-20 (Mon, 20 May 2013)
Changed paths:
M htdocs/core/modules/modMargin.class.php
Log Message:
-----------
fix typo error
Commit: 5f714f1403467bc0c2f8fded950e52d9f580f272
https://github.com/Dolibarr/dolibarr/commit/5f714f1403467bc0c2f8fded950e52d9f580f272
Author: Grand Philippe <address@hidden>
Date: 2013-05-20 (Mon, 20 May 2013)
Changed paths:
M htdocs/admin/supplier_order.php
Log Message:
-----------
fix: wrong trad
Commit: 23211705406711c6910bc66c3c31b86c0dfb7e43
https://github.com/Dolibarr/dolibarr/commit/23211705406711c6910bc66c3c31b86c0dfb7e43
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-20 (Mon, 20 May 2013)
Changed paths:
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fichinter/fiche.php
Log Message:
-----------
Merge pull request #964 from FHenry/3.4
Revert Class rewrite and ficheinter line trigger
Commit: 416cdd2f9c460654611c9681512823f2fa08c589
https://github.com/Dolibarr/dolibarr/commit/416cdd2f9c460654611c9681512823f2fa08c589
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-20 (Mon, 20 May 2013)
Changed paths:
M ChangeLog
M htdocs/core/class/commonobject.class.php
M htdocs/core/modules/modMargin.class.php
M htdocs/core/tpl/objectline_view.tpl.php
M htdocs/langs/fr_FR/margins.lang
Log Message:
-----------
Merge pull request #956 from cbattarel/3.3
fix bug : external users should not see costprice and margin infos
Commit: e00df581539d5d5f626ca86ba306d1d4eb8ca46d
https://github.com/Dolibarr/dolibarr/commit/e00df581539d5d5f626ca86ba306d1d4eb8ca46d
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-20 (Mon, 20 May 2013)
Changed paths:
M htdocs/admin/supplier_order.php
Log Message:
-----------
Merge pull request #965 from grandoc/3.4
fix: wrong trad
Commit: 71e14df62fd29bec1053f26c2557492cda6511b7
https://github.com/Dolibarr/dolibarr/commit/71e14df62fd29bec1053f26c2557492cda6511b7
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-20 (Mon, 20 May 2013)
Changed paths:
M ChangeLog
M htdocs/comm/propal.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/modules/modMargin.class.php
M htdocs/core/tpl/freeproductline_create.tpl.php
M htdocs/core/tpl/objectline_view.tpl.php
M htdocs/core/tpl/predefinedproductline_create.tpl.php
M htdocs/langs/fr_FR/margins.lang
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/freeproductline_create.tpl.php
htdocs/core/tpl/predefinedproductline_create.tpl.php
Commit: 250b6d65020fdff5f9cafce516d3c609fa8b7e54
https://github.com/Dolibarr/dolibarr/commit/250b6d65020fdff5f9cafce516d3c609fa8b7e54
Author: fhenry <address@hidden>
Date: 2013-05-20 (Mon, 20 May 2013)
Changed paths:
M htdocs/comm/propal.php
Log Message:
-----------
Fix bug on service date strat date end in propal line not recorded
Commit: 53c053604fcd4f2e3d443e08cdb998bd52dd6541
https://github.com/Dolibarr/dolibarr/commit/53c053604fcd4f2e3d443e08cdb998bd52dd6541
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-20 (Mon, 20 May 2013)
Changed paths:
M htdocs/comm/propal.php
Log Message:
-----------
Merge pull request #966 from FHenry/3.4
Fix bug on service date strat date end in propal line not recorded
Commit: 3f1dabb4e2afb6e93f6a760822db7a0b52bb8448
https://github.com/Dolibarr/dolibarr/commit/3f1dabb4e2afb6e93f6a760822db7a0b52bb8448
Author: simnandez <address@hidden>
Date: 2013-05-20 (Mon, 20 May 2013)
Changed paths:
M htdocs/langs/es_ES/admin.lang
Log Message:
-----------
Trad: Fix Catalan words into Spanish
Commit: 6db07ac2d8f059205c4e550feb4f71c0903d1282
https://github.com/Dolibarr/dolibarr/commit/6db07ac2d8f059205c4e550feb4f71c0903d1282
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-20 (Mon, 20 May 2013)
Changed paths:
M htdocs/comm/propal/class/propalestats.class.php
M htdocs/comm/propal/stats/index.php
M htdocs/commande/class/commandestats.class.php
M htdocs/commande/stats/index.php
M htdocs/compta/facture/class/facturestats.class.php
M htdocs/compta/facture/stats/index.php
Log Message:
-----------
Fix: Several bugs into filter on statistics pages.
Commit: 4539f6ce588b69658e86ebdf863e043753ec8818
https://github.com/Dolibarr/dolibarr/commit/4539f6ce588b69658e86ebdf863e043753ec8818
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-20 (Mon, 20 May 2013)
Changed paths:
M htdocs/comm/propal.php
M htdocs/langs/es_ES/admin.lang
Log Message:
-----------
Merge branch '3.4' of address@hidden:Dolibarr/dolibarr.git into 3.4
Commit: 7ef45b92267af30d2a2ab896548f1f8727d86f7c
https://github.com/Dolibarr/dolibarr/commit/7ef45b92267af30d2a2ab896548f1f8727d86f7c
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-20 (Mon, 20 May 2013)
Changed paths:
M scripts/contracts/email_expire_services_to_customers.php
M scripts/contracts/email_expire_services_to_representatives.php
M scripts/invoices/email_unpaid_invoices_to_customers.php
M scripts/invoices/email_unpaid_invoices_to_representatives.php
Log Message:
-----------
Can force out email
Commit: 91d1f9d48bf55658bfdbcafbd75f5ebc89e1d8a8
https://github.com/Dolibarr/dolibarr/commit/91d1f9d48bf55658bfdbcafbd75f5ebc89e1d8a8
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-20 (Mon, 20 May 2013)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/fiche.php
M htdocs/comm/propal.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/fiche.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/tpl/admin_extrafields_add.tpl.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fichinter/fiche.php
M htdocs/fourn/class/paiementfourn.class.php
M htdocs/langs/es_ES/admin.lang
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop
Commit: 12681994eaac997b0b3efb070704f7e937d56228
https://github.com/Dolibarr/dolibarr/commit/12681994eaac997b0b3efb070704f7e937d56228
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-20 (Mon, 20 May 2013)
Changed paths:
M ChangeLog
M htdocs/admin/supplier_order.php
M htdocs/comm/propal.php
M htdocs/comm/propal/class/propalestats.class.php
M htdocs/comm/propal/stats/index.php
M htdocs/commande/class/commandestats.class.php
M htdocs/commande/stats/index.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facturestats.class.php
M htdocs/compta/facture/stats/index.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/modules/modMargin.class.php
M htdocs/core/tpl/freeproductline_create.tpl.php
M htdocs/core/tpl/login.tpl.php
M htdocs/core/tpl/objectline_view.tpl.php
M htdocs/core/tpl/predefinedproductline_create.tpl.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fichinter/fiche.php
M htdocs/install/mysql/data/llx_20_c_departements.sql
M htdocs/install/mysql/data/llx_c_tva.sql
M htdocs/langs/en_US/bills.lang
M htdocs/langs/fr_FR/bills.lang
M htdocs/langs/fr_FR/margins.lang
M scripts/invoices/email_unpaid_invoices_to_representatives.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/fichinter/class/fichinter.class.php
htdocs/fichinter/fiche.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/1470b75e5c25...12681994eaac