[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 2cf9a7: Add date of file so we know i
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 2cf9a7: Add date of file so we know if file was correctly ... |
|
Date: |
Mon, 28 Jul 2014 16:18:23 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 2cf9a7511b5dff15775a90d4c03262c3bf456743
https://github.com/Dolibarr/dolibarr/commit/2cf9a7511b5dff15775a90d4c03262c3bf456743
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
M build/makepack-dolibarr.pl
Log Message:
-----------
Add date of file so we know if file was correctly build before
publishing it.
Commit: 25f12590617896e2ed637b20ff44b701da7f20ad
https://github.com/Dolibarr/dolibarr/commit/25f12590617896e2ed637b20ff44b701da7f20ad
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
M htdocs/core/class/cookie.class.php
Log Message:
-----------
Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5
Commit: 25a591bd03263ea5a84eb750d8e3b73687aba02b
https://github.com/Dolibarr/dolibarr/commit/25a591bd03263ea5a84eb750d8e3b73687aba02b
Author: nicoplh <address@hidden>
Date: 2014-07-17 (Thu, 17 Jul 2014)
Changed paths:
M htdocs/compta/facture/impayees.php
Log Message:
-----------
Update impayees.php
Add column ref.Client with search module.
Commit: 4f0d01d5c5e6a64811794c868d1cd5aeb28848e6
https://github.com/Dolibarr/dolibarr/commit/4f0d01d5c5e6a64811794c868d1cd5aeb28848e6
Author: Drosis Nikos <address@hidden>
Date: 2014-07-18 (Fri, 18 Jul 2014)
Changed paths:
M htdocs/margin/productMargins.php
Log Message:
-----------
Fix Link product, In list view and label product
This Fix added and develop.
Commit: 2cfc5f10a8afa733cf324b57634f6fde56dd46e9
https://github.com/Dolibarr/dolibarr/commit/2cfc5f10a8afa733cf324b57634f6fde56dd46e9
Author: nicoplh <address@hidden>
Date: 2014-07-18 (Fri, 18 Jul 2014)
Changed paths:
M htdocs/compta/facture/impayees.php
Log Message:
-----------
Update impayees.php
remove useless type alpha.
Commit: 7794101e10b8ecc3355eb9917391509f9f1a57ae
https://github.com/Dolibarr/dolibarr/commit/7794101e10b8ecc3355eb9917391509f9f1a57ae
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-07-19 (Sat, 19 Jul 2014)
Changed paths:
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Corrected VAT expenses behaviour name
Commit: 6637ea51e39d66917e959f647eb5525e57e25b53
https://github.com/Dolibarr/dolibarr/commit/6637ea51e39d66917e959f647eb5525e57e25b53
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-19 (Sat, 19 Jul 2014)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
Fix: [ bug #1534 ] Unknown error when deleting a product photo under
special circumstances
Commit: a74b65df0e0643859627760d785a66a7a3e0ef79
https://github.com/Dolibarr/dolibarr/commit/a74b65df0e0643859627760d785a66a7a3e0ef79
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-20 (Sun, 20 Jul 2014)
Changed paths:
M htdocs/theme/amarok/style.css.php
M htdocs/theme/auguria/style.css.php
M htdocs/theme/bureau2crea/style.css.php
M htdocs/theme/cameleo/style.css.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Fix: Add max height to solve pb with very large logo.
Commit: 6499c4ff70cd2df8dfda876fb443b47ee5fb1cbd
https://github.com/Dolibarr/dolibarr/commit/6499c4ff70cd2df8dfda876fb443b47ee5fb1cbd
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-20 (Sun, 20 Jul 2014)
Changed paths:
M htdocs/compta/facture/impayees.php
Log Message:
-----------
Merge pull request #1750 from nicoplh/patch-1
Update impayees.php
Commit: c289e8a23d3c70c96fe292c04dd450661d50030e
https://github.com/Dolibarr/dolibarr/commit/c289e8a23d3c70c96fe292c04dd450661d50030e
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-20 (Sun, 20 Jul 2014)
Changed paths:
M htdocs/margin/productMargins.php
Log Message:
-----------
Merge pull request #1754 from ndrosis/patch-3
Fix Link product, In list view and label product
Commit: 3451276b8bfc358c22ea6d89abd94346cda2aee7
https://github.com/Dolibarr/dolibarr/commit/3451276b8bfc358c22ea6d89abd94346cda2aee7
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-20 (Sun, 20 Jul 2014)
Changed paths:
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Merge pull request #1755 from marcosgdf/translation-taxes
Corrected VAT expenses behaviour name
Commit: 8cd2e00e5f95348f378491759c2b0e501a55ed69
https://github.com/Dolibarr/dolibarr/commit/8cd2e00e5f95348f378491759c2b0e501a55ed69
Author: Juanjo Menent <address@hidden>
Date: 2014-07-21 (Mon, 21 Jul 2014)
Changed paths:
M ChangeLog
M htdocs/fourn/commande/liste.php
Log Message:
-----------
Fix: [ bug #1521 ] The second order's page from a provider shows all
orders
Commit: f31f0cc0a9bbbb2c1ebba704d7f561b635db2cc2
https://github.com/Dolibarr/dolibarr/commit/f31f0cc0a9bbbb2c1ebba704d7f561b635db2cc2
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-07-23 (Wed, 23 Jul 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
Updated changelog for 3.6
Commit: 280ecf1243454d324e16c459cfc3fa3ef8f1dbbe
https://github.com/Dolibarr/dolibarr/commit/280ecf1243454d324e16c459cfc3fa3ef8f1dbbe
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-07-23 (Wed, 23 Jul 2014)
Changed paths:
M .travis.yml
M ChangeLog
M README-FR.md
M README.md
M build/rpm/dolibarr_fedora.spec
M build/rpm/dolibarr_generic.spec
M build/rpm/dolibarr_mandriva.spec
M build/rpm/dolibarr_opensuse.spec
M dev/codesniffer/ruleset.dtd
M dev/codesniffer/ruleset.xml
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/liste.php
M htdocs/admin/system/dolibarr.php
M htdocs/commande/orderstoinvoice.php
M htdocs/contact/fiche.php
M htdocs/contrat/class/contrat.class.php
M htdocs/contrat/fiche.php
M htdocs/core/class/cookie.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/class/html.formprojet.class.php
M htdocs/core/js/dst.js
M htdocs/core/lib/functions.lib.php
M htdocs/core/modules/modSociete.class.php
M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/fichinter/fiche.php
M htdocs/fourn/commande/fiche.php
M htdocs/fourn/commande/liste.php
M htdocs/fourn/facture/fiche.php
M htdocs/includes/adodbtime/adodb-time.inc.php
M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
M htdocs/install/mysql/tables/llx_expeditiondet_batch.key.sql
M htdocs/install/mysql/tables/llx_product_batch.key.sql
M htdocs/langs/ar_SA/admin.lang
M htdocs/langs/ar_SA/agenda.lang
M htdocs/langs/ar_SA/commercial.lang
M htdocs/langs/ar_SA/companies.lang
M htdocs/langs/ar_SA/compta.lang
M htdocs/langs/ar_SA/languages.lang
M htdocs/langs/ar_SA/main.lang
M htdocs/langs/ar_SA/projects.lang
M htdocs/langs/ar_SA/stocks.lang
M htdocs/langs/ar_SA/users.lang
M htdocs/langs/bg_BG/admin.lang
M htdocs/langs/bg_BG/agenda.lang
M htdocs/langs/bg_BG/boxes.lang
M htdocs/langs/bg_BG/commercial.lang
M htdocs/langs/bg_BG/companies.lang
M htdocs/langs/bg_BG/compta.lang
M htdocs/langs/bg_BG/languages.lang
M htdocs/langs/bg_BG/main.lang
M htdocs/langs/bg_BG/projects.lang
M htdocs/langs/bg_BG/salaries.lang
M htdocs/langs/bg_BG/stocks.lang
M htdocs/langs/bg_BG/users.lang
M htdocs/langs/bs_BA/admin.lang
M htdocs/langs/bs_BA/agenda.lang
M htdocs/langs/bs_BA/commercial.lang
M htdocs/langs/bs_BA/companies.lang
M htdocs/langs/bs_BA/compta.lang
M htdocs/langs/bs_BA/languages.lang
M htdocs/langs/bs_BA/main.lang
M htdocs/langs/bs_BA/projects.lang
M htdocs/langs/bs_BA/stocks.lang
M htdocs/langs/bs_BA/users.lang
M htdocs/langs/ca_ES/admin.lang
M htdocs/langs/ca_ES/agenda.lang
M htdocs/langs/ca_ES/commercial.lang
M htdocs/langs/ca_ES/companies.lang
M htdocs/langs/ca_ES/compta.lang
M htdocs/langs/ca_ES/languages.lang
M htdocs/langs/ca_ES/main.lang
M htdocs/langs/ca_ES/projects.lang
M htdocs/langs/ca_ES/stocks.lang
M htdocs/langs/ca_ES/users.lang
M htdocs/langs/cs_CZ/admin.lang
M htdocs/langs/cs_CZ/agenda.lang
M htdocs/langs/cs_CZ/commercial.lang
M htdocs/langs/cs_CZ/companies.lang
M htdocs/langs/cs_CZ/compta.lang
M htdocs/langs/cs_CZ/languages.lang
M htdocs/langs/cs_CZ/main.lang
M htdocs/langs/cs_CZ/projects.lang
M htdocs/langs/cs_CZ/stocks.lang
M htdocs/langs/cs_CZ/users.lang
M htdocs/langs/da_DK/admin.lang
M htdocs/langs/da_DK/agenda.lang
M htdocs/langs/da_DK/commercial.lang
M htdocs/langs/da_DK/companies.lang
M htdocs/langs/da_DK/compta.lang
M htdocs/langs/da_DK/languages.lang
M htdocs/langs/da_DK/main.lang
M htdocs/langs/da_DK/projects.lang
M htdocs/langs/da_DK/stocks.lang
M htdocs/langs/da_DK/users.lang
M htdocs/langs/de_DE/admin.lang
M htdocs/langs/de_DE/agenda.lang
M htdocs/langs/de_DE/commercial.lang
M htdocs/langs/de_DE/companies.lang
M htdocs/langs/de_DE/compta.lang
M htdocs/langs/de_DE/holiday.lang
M htdocs/langs/de_DE/languages.lang
M htdocs/langs/de_DE/main.lang
M htdocs/langs/de_DE/other.lang
M htdocs/langs/de_DE/projects.lang
M htdocs/langs/de_DE/stocks.lang
M htdocs/langs/de_DE/users.lang
M htdocs/langs/el_GR/admin.lang
M htdocs/langs/el_GR/agenda.lang
M htdocs/langs/el_GR/commercial.lang
M htdocs/langs/el_GR/companies.lang
M htdocs/langs/el_GR/compta.lang
M htdocs/langs/el_GR/languages.lang
M htdocs/langs/el_GR/main.lang
M htdocs/langs/el_GR/projects.lang
M htdocs/langs/el_GR/stocks.lang
M htdocs/langs/el_GR/users.lang
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/productbatch.lang
M htdocs/langs/en_US/users.lang
M htdocs/langs/es_ES/admin.lang
M htdocs/langs/es_ES/agenda.lang
M htdocs/langs/es_ES/commercial.lang
M htdocs/langs/es_ES/companies.lang
M htdocs/langs/es_ES/compta.lang
M htdocs/langs/es_ES/languages.lang
M htdocs/langs/es_ES/main.lang
M htdocs/langs/es_ES/projects.lang
M htdocs/langs/es_ES/shop.lang
M htdocs/langs/es_ES/stocks.lang
M htdocs/langs/es_ES/users.lang
M htdocs/langs/et_EE/admin.lang
M htdocs/langs/et_EE/agenda.lang
M htdocs/langs/et_EE/commercial.lang
M htdocs/langs/et_EE/companies.lang
M htdocs/langs/et_EE/compta.lang
M htdocs/langs/et_EE/languages.lang
M htdocs/langs/et_EE/main.lang
M htdocs/langs/et_EE/products.lang
M htdocs/langs/et_EE/projects.lang
M htdocs/langs/et_EE/stocks.lang
M htdocs/langs/et_EE/users.lang
M htdocs/langs/eu_ES/admin.lang
M htdocs/langs/eu_ES/agenda.lang
M htdocs/langs/eu_ES/commercial.lang
M htdocs/langs/eu_ES/companies.lang
M htdocs/langs/eu_ES/compta.lang
M htdocs/langs/eu_ES/languages.lang
M htdocs/langs/eu_ES/main.lang
M htdocs/langs/eu_ES/projects.lang
M htdocs/langs/eu_ES/stocks.lang
M htdocs/langs/eu_ES/users.lang
M htdocs/langs/fa_IR/admin.lang
M htdocs/langs/fa_IR/agenda.lang
M htdocs/langs/fa_IR/banks.lang
M htdocs/langs/fa_IR/commercial.lang
M htdocs/langs/fa_IR/companies.lang
M htdocs/langs/fa_IR/compta.lang
M htdocs/langs/fa_IR/languages.lang
M htdocs/langs/fa_IR/main.lang
M htdocs/langs/fa_IR/products.lang
M htdocs/langs/fa_IR/projects.lang
M htdocs/langs/fa_IR/stocks.lang
M htdocs/langs/fa_IR/users.lang
M htdocs/langs/fi_FI/admin.lang
M htdocs/langs/fi_FI/agenda.lang
M htdocs/langs/fi_FI/commercial.lang
M htdocs/langs/fi_FI/companies.lang
M htdocs/langs/fi_FI/compta.lang
M htdocs/langs/fi_FI/languages.lang
M htdocs/langs/fi_FI/main.lang
M htdocs/langs/fi_FI/projects.lang
M htdocs/langs/fi_FI/stocks.lang
M htdocs/langs/fi_FI/users.lang
M htdocs/langs/fr_FR/admin.lang
M htdocs/langs/fr_FR/agenda.lang
M htdocs/langs/fr_FR/commercial.lang
M htdocs/langs/fr_FR/companies.lang
M htdocs/langs/fr_FR/compta.lang
M htdocs/langs/fr_FR/languages.lang
M htdocs/langs/fr_FR/main.lang
M htdocs/langs/fr_FR/other.lang
M htdocs/langs/fr_FR/productbatch.lang
M htdocs/langs/fr_FR/products.lang
M htdocs/langs/fr_FR/projects.lang
M htdocs/langs/fr_FR/shop.lang
M htdocs/langs/fr_FR/stocks.lang
M htdocs/langs/fr_FR/users.lang
M htdocs/langs/he_IL/admin.lang
M htdocs/langs/he_IL/agenda.lang
M htdocs/langs/he_IL/commercial.lang
M htdocs/langs/he_IL/companies.lang
M htdocs/langs/he_IL/compta.lang
M htdocs/langs/he_IL/languages.lang
M htdocs/langs/he_IL/main.lang
M htdocs/langs/he_IL/projects.lang
M htdocs/langs/he_IL/stocks.lang
M htdocs/langs/he_IL/users.lang
M htdocs/langs/hr_HR/admin.lang
M htdocs/langs/hr_HR/agenda.lang
M htdocs/langs/hr_HR/commercial.lang
M htdocs/langs/hr_HR/companies.lang
M htdocs/langs/hr_HR/compta.lang
M htdocs/langs/hr_HR/languages.lang
M htdocs/langs/hr_HR/main.lang
M htdocs/langs/hr_HR/projects.lang
M htdocs/langs/hr_HR/stocks.lang
M htdocs/langs/hr_HR/users.lang
M htdocs/langs/hu_HU/admin.lang
M htdocs/langs/hu_HU/agenda.lang
M htdocs/langs/hu_HU/commercial.lang
M htdocs/langs/hu_HU/companies.lang
M htdocs/langs/hu_HU/compta.lang
M htdocs/langs/hu_HU/languages.lang
M htdocs/langs/hu_HU/main.lang
M htdocs/langs/hu_HU/projects.lang
M htdocs/langs/hu_HU/stocks.lang
M htdocs/langs/hu_HU/users.lang
M htdocs/langs/id_ID/admin.lang
M htdocs/langs/id_ID/agenda.lang
M htdocs/langs/id_ID/bills.lang
M htdocs/langs/id_ID/commercial.lang
M htdocs/langs/id_ID/companies.lang
M htdocs/langs/id_ID/compta.lang
M htdocs/langs/id_ID/languages.lang
M htdocs/langs/id_ID/main.lang
M htdocs/langs/id_ID/projects.lang
M htdocs/langs/id_ID/stocks.lang
M htdocs/langs/id_ID/users.lang
M htdocs/langs/is_IS/admin.lang
M htdocs/langs/is_IS/agenda.lang
M htdocs/langs/is_IS/commercial.lang
M htdocs/langs/is_IS/companies.lang
M htdocs/langs/is_IS/compta.lang
M htdocs/langs/is_IS/languages.lang
M htdocs/langs/is_IS/main.lang
M htdocs/langs/is_IS/projects.lang
M htdocs/langs/is_IS/stocks.lang
M htdocs/langs/is_IS/users.lang
M htdocs/langs/it_IT/admin.lang
M htdocs/langs/it_IT/agenda.lang
M htdocs/langs/it_IT/commercial.lang
M htdocs/langs/it_IT/companies.lang
M htdocs/langs/it_IT/compta.lang
M htdocs/langs/it_IT/languages.lang
M htdocs/langs/it_IT/main.lang
M htdocs/langs/it_IT/projects.lang
M htdocs/langs/it_IT/stocks.lang
M htdocs/langs/it_IT/users.lang
M htdocs/langs/ja_JP/admin.lang
M htdocs/langs/ja_JP/agenda.lang
M htdocs/langs/ja_JP/commercial.lang
M htdocs/langs/ja_JP/companies.lang
M htdocs/langs/ja_JP/compta.lang
M htdocs/langs/ja_JP/languages.lang
M htdocs/langs/ja_JP/main.lang
M htdocs/langs/ja_JP/projects.lang
M htdocs/langs/ja_JP/stocks.lang
M htdocs/langs/ja_JP/users.lang
M htdocs/langs/ko_KR/admin.lang
M htdocs/langs/ko_KR/agenda.lang
M htdocs/langs/ko_KR/commercial.lang
M htdocs/langs/ko_KR/companies.lang
M htdocs/langs/ko_KR/compta.lang
M htdocs/langs/ko_KR/languages.lang
M htdocs/langs/ko_KR/main.lang
M htdocs/langs/ko_KR/projects.lang
M htdocs/langs/ko_KR/stocks.lang
M htdocs/langs/ko_KR/users.lang
M htdocs/langs/lt_LT/admin.lang
M htdocs/langs/lt_LT/agenda.lang
M htdocs/langs/lt_LT/commercial.lang
M htdocs/langs/lt_LT/companies.lang
Log Message:
-----------
Merge remote-tracking branch 'upstream/3.6' into changelog
Commit: 2e18fa88d147815936340763b8dd4835a8ecc97b
https://github.com/Dolibarr/dolibarr/commit/2e18fa88d147815936340763b8dd4835a8ecc97b
Author: Maxime Kohlhaas <address@hidden>
Date: 2014-07-25 (Fri, 25 Jul 2014)
Changed paths:
M htdocs/core/menus/standard/eldy.lib.php
Log Message:
-----------
Mauvais libellé utilisé pour statut commande
Commit: 386022947a5489b52aacda1f4282371f74fe8cdb
https://github.com/Dolibarr/dolibarr/commit/386022947a5489b52aacda1f4282371f74fe8cdb
Author: Maxime Kohlhaas <address@hidden>
Date: 2014-07-25 (Fri, 25 Jul 2014)
Changed paths:
M htdocs/categories/class/categorie.class.php
Log Message:
-----------
Categorie class was fetching an object even if no param passed
Commit: 36b634784b24be32ba3a94202279dc6d62f99a76
https://github.com/Dolibarr/dolibarr/commit/36b634784b24be32ba3a94202279dc6d62f99a76
Author: Maxime Kohlhaas <address@hidden>
Date: 2014-07-25 (Fri, 25 Jul 2014)
Changed paths:
M htdocs/expedition/liste.php
Log Message:
-----------
Fix : real delivery date on livraison was not displayed
Commit: aa33cc5f42aea195df9717a4097c523bafc568a0
https://github.com/Dolibarr/dolibarr/commit/aa33cc5f42aea195df9717a4097c523bafc568a0
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-25 (Fri, 25 Jul 2014)
Changed paths:
M htdocs/categories/class/categorie.class.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/expedition/liste.php
Log Message:
-----------
Merge pull request #1772 from atm-maxime/3.6
Mauvais libellé utilisé pour statut commande
Commit: 7498f38438fe8e666e53cc0257f458f9f0ea34b4
https://github.com/Dolibarr/dolibarr/commit/7498f38438fe8e666e53cc0257f458f9f0ea34b4
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-25 (Fri, 25 Jul 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
Merge pull request #1766 from marcosgdf/changelog
changelog
Commit: 45435b597e2c689a68d079a7276e5ebc45b276aa
https://github.com/Dolibarr/dolibarr/commit/45435b597e2c689a68d079a7276e5ebc45b276aa
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-26 (Sat, 26 Jul 2014)
Changed paths:
M htdocs/adherents/liste.php
Log Message:
-----------
Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne
s'appliquent pas
Commit: 10e677d2d9aa4173e98a6be6cdda205c1713b5e7
https://github.com/Dolibarr/dolibarr/commit/10e677d2d9aa4173e98a6be6cdda205c1713b5e7
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-26 (Sat, 26 Jul 2014)
Changed paths:
M build/perl/virtualmin/dolibarr.pl
Log Message:
-----------
Prepare script for 3.6 version
Commit: 3a0ccdabc9324d85bf2c84bac1252c7bd91275ab
https://github.com/Dolibarr/dolibarr/commit/3a0ccdabc9324d85bf2c84bac1252c7bd91275ab
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-26 (Sat, 26 Jul 2014)
Changed paths:
M ChangeLog
M htdocs/categories/class/categorie.class.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/expedition/liste.php
M htdocs/fourn/commande/liste.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: a8547e9c4de4032c6ec4f3a8a7063222ca668317
https://github.com/Dolibarr/dolibarr/commit/a8547e9c4de4032c6ec4f3a8a7063222ca668317
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-26 (Sat, 26 Jul 2014)
Changed paths:
M ChangeLog
M build/debian/changelog
M build/doxygen/dolibarr-doxygen.doxyfile
M build/exe/doliwamp/doliwamp.iss
M build/makepack-howto.txt
M build/rpm/dolibarr_fedora.spec
M build/rpm/dolibarr_generic.spec
M build/rpm/dolibarr_mandriva.spec
M build/rpm/dolibarr_opensuse.spec
M htdocs/filefunc.inc.php
Log Message:
-----------
Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne
s'appliquent pas
Commit: f794b820c3f64ae0dcfdae461defaffaa4a1eead
https://github.com/Dolibarr/dolibarr/commit/f794b820c3f64ae0dcfdae461defaffaa4a1eead
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-26 (Sat, 26 Jul 2014)
Changed paths:
M htdocs/compta/facture/impayees.php
M htdocs/langs/en_US/admin.lang
M htdocs/margin/productMargins.php
Log Message:
-----------
Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5
Commit: adb70ecf24b0c6e4c66c223a75319cf61df70665
https://github.com/Dolibarr/dolibarr/commit/adb70ecf24b0c6e4c66c223a75319cf61df70665
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-26 (Sat, 26 Jul 2014)
Changed paths:
M htdocs/core/modules/product/mod_codeproduct_leopard.php
M htdocs/core/modules/societe/mod_codeclient_leopard.php
Log Message:
-----------
Fix: [ bug #1528 ] Leopard Services numeration module description is not
translated.
Commit: db091896a5b72ab83019eab00ed05ed4f83a2941
https://github.com/Dolibarr/dolibarr/commit/db091896a5b72ab83019eab00ed05ed4f83a2941
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-26 (Sat, 26 Jul 2014)
Changed paths:
M ChangeLog
M build/debian/changelog
M build/doxygen/dolibarr-doxygen-build.pl
M build/doxygen/dolibarr-doxygen.doxyfile
M build/doxygen/doxygen_header.html
M build/exe/doliwamp/doliwamp.iss
M build/makepack-dolibarr.pl
M build/makepack-howto.txt
M build/rpm/dolibarr_fedora.spec
M build/rpm/dolibarr_generic.spec
M build/rpm/dolibarr_mandriva.spec
M build/rpm/dolibarr_opensuse.spec
M htdocs/adherents/liste.php
M htdocs/compta/facture/impayees.php
M htdocs/core/modules/product/mod_codeproduct_leopard.php
M htdocs/core/modules/societe/mod_codeclient_leopard.php
M htdocs/filefunc.inc.php
M htdocs/langs/en_US/admin.lang
M htdocs/margin/productMargins.php
M htdocs/product/class/product.class.php
M htdocs/theme/amarok/style.css.php
M htdocs/theme/auguria/style.css.php
M htdocs/theme/bureau2crea/style.css.php
M htdocs/theme/cameleo/style.css.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Prepare 3.6.
Use google adsense tag of foundation for doxygen doc pages.
Version is no more encoded int odoxygen.
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
ChangeLog
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/compta/facture/impayees.php
htdocs/filefunc.inc.php
Commit: 41ab5a0ce2e4473f1a68641e7d36837a4469cd0e
https://github.com/Dolibarr/dolibarr/commit/41ab5a0ce2e4473f1a68641e7d36837a4469cd0e
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-26 (Sat, 26 Jul 2014)
Changed paths:
M htdocs/opensurvey/class/opensurveysondage.class.php
M htdocs/opensurvey/wizard/choix_date.php
M htdocs/opensurvey/wizard/create_survey.php
Log Message:
-----------
Fix: date was not saved if not in future.
Commit: 0ca72dcfea0b5ddccf5a5ba34073235402ff62d8
https://github.com/Dolibarr/dolibarr/commit/0ca72dcfea0b5ddccf5a5ba34073235402ff62d8
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-27 (Sun, 27 Jul 2014)
Changed paths:
M htdocs/core/lib/admin.lib.php
Log Message:
-----------
Fix: Restore compatibility with old modules.
Commit: 1a96bc0f30d7a8f7d214a052067b3da1bddb254b
https://github.com/Dolibarr/dolibarr/commit/1a96bc0f30d7a8f7d214a052067b3da1bddb254b
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-28 (Mon, 28 Jul 2014)
Changed paths:
M htdocs/core/lib/cron.lib.php
M htdocs/cron/list.php
M htdocs/public/cron/cron_run_jobs.php
Log Message:
-----------
Fix: Bad url for cron
Fix: must use html syntax, not xml
Commit: 6d7b50d5d4bfb33d7097c1c3917b9cadc76c39c8
https://github.com/Dolibarr/dolibarr/commit/6d7b50d5d4bfb33d7097c1c3917b9cadc76c39c8
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-28 (Mon, 28 Jul 2014)
Changed paths:
M htdocs/core/menus/standard/eldy.lib.php
Log Message:
-----------
Fix: [ bug #1541 ] Surveys menu is not shown up if Export/Import module
is not enabled.
Commit: 21c7972f7eb0cf565129f1ed9e803e5171283711
https://github.com/Dolibarr/dolibarr/commit/21c7972f7eb0cf565129f1ed9e803e5171283711
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-28 (Mon, 28 Jul 2014)
Changed paths:
M htdocs/core/menus/init_menu_auguria.sql
Log Message:
-----------
Fix: [ bug #1541 ] Surveys menu is not shown up if Export/Import module
is not enabled.
Commit: 096a61d5c0bb06c5ca471e3d7518eecae833311e
https://github.com/Dolibarr/dolibarr/commit/096a61d5c0bb06c5ca471e3d7518eecae833311e
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-28 (Mon, 28 Jul 2014)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
Fix: [ bug #1542 ] extrafields.class.php, showOutputField wrong
translate.
Commit: c9d27383a4c735c42f9c0fb1077fafbba1911b4e
https://github.com/Dolibarr/dolibarr/commit/c9d27383a4c735c42f9c0fb1077fafbba1911b4e
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-29 (Tue, 29 Jul 2014)
Changed paths:
M htdocs/core/boxes/box_graph_invoices_permonth.php
M htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
M htdocs/core/boxes/box_graph_orders_permonth.php
M htdocs/core/boxes/box_graph_orders_supplier_permonth.php
M htdocs/core/boxes/box_graph_product_distribution.php
M htdocs/core/boxes/box_graph_propales_permonth.php
M htdocs/core/class/html.formother.class.php
M htdocs/index.php
M htdocs/langs/en_US/errors.lang
M htdocs/langs/en_US/main.lang
Log Message:
-----------
Fix: When option to use optimize display for text borwser and blin
person is on, box addon was broken.
Commit: c895c892a512b460f112a1cfada058a4e42fd82f
https://github.com/Dolibarr/dolibarr/commit/c895c892a512b460f112a1cfada058a4e42fd82f
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-29 (Tue, 29 Jul 2014)
Changed paths:
M ChangeLog
M build/debian/changelog
M build/doxygen/dolibarr-doxygen-build.pl
M build/doxygen/dolibarr-doxygen.doxyfile
M build/doxygen/doxygen_header.html
M build/exe/doliwamp/doliwamp.iss
M build/makepack-dolibarr.pl
M build/makepack-howto.txt
M build/perl/virtualmin/dolibarr.pl
M build/rpm/dolibarr_fedora.spec
M build/rpm/dolibarr_generic.spec
M build/rpm/dolibarr_mandriva.spec
M build/rpm/dolibarr_opensuse.spec
M htdocs/adherents/liste.php
M htdocs/categories/class/categorie.class.php
M htdocs/compta/facture/impayees.php
M htdocs/core/boxes/box_graph_invoices_permonth.php
M htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
M htdocs/core/boxes/box_graph_orders_permonth.php
M htdocs/core/boxes/box_graph_orders_supplier_permonth.php
M htdocs/core/boxes/box_graph_product_distribution.php
M htdocs/core/boxes/box_graph_propales_permonth.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/product/mod_codeproduct_leopard.php
M htdocs/core/modules/societe/mod_codeclient_leopard.php
M htdocs/expedition/liste.php
M htdocs/index.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/errors.lang
M htdocs/langs/en_US/main.lang
M htdocs/opensurvey/class/opensurveysondage.class.php
M htdocs/opensurvey/wizard/choix_date.php
M htdocs/opensurvey/wizard/create_survey.php
M htdocs/product/class/product.class.php
M htdocs/theme/amarok/style.css.php
M htdocs/theme/auguria/style.css.php
M htdocs/theme/bureau2crea/style.css.php
M htdocs/theme/cameleo/style.css.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/2783ec7dc869...c895c892a512