[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 57b546: Fix: Hide title of event when
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 57b546: Fix: Hide title of event when agenda module disabl... |
|
Date: |
Tue, 15 Jul 2014 00:28:57 -0700 |
Branch: refs/heads/3.6_backported
Home: https://github.com/Dolibarr/dolibarr
Commit: 57b546650a81f004c1f48da93cdce8b332b27147
https://github.com/Dolibarr/dolibarr/commit/57b546650a81f004c1f48da93cdce8b332b27147
Author: Laurent Destailleur <address@hidden>
Date: 2014-06-30 (Mon, 30 Jun 2014)
Changed paths:
M ChangeLog
M htdocs/contact/fiche.php
Log Message:
-----------
Fix: Hide title of event when agenda module disabled.
Commit: b70a090de2fcb031c17f5e155e2ff9c1d217156c
https://github.com/Dolibarr/dolibarr/commit/b70a090de2fcb031c17f5e155e2ff9c1d217156c
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-07-02 (Wed, 02 Jul 2014)
Changed paths:
M htdocs/langs/en_US/users.lang
Log Message:
-----------
Corrected English typo
Commit: c2f0d84e454a0deca35c8653081d2ddd77885e7d
https://github.com/Dolibarr/dolibarr/commit/c2f0d84e454a0deca35c8653081d2ddd77885e7d
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-02 (Wed, 02 Jul 2014)
Changed paths:
M htdocs/langs/en_US/stocks.lang
M htdocs/product/stock/replenish.php
Log Message:
-----------
Fix: [ bug #1512 ] Manque des produits dans la page réapprovisionement
Commit: 2537a9d35fd2f4414c01a592487d571583e21ca5
https://github.com/Dolibarr/dolibarr/commit/2537a9d35fd2f4414c01a592487d571583e21ca5
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-02 (Wed, 02 Jul 2014)
Changed paths:
M htdocs/user/fiche.php
Log Message:
-----------
Fix: Error if module multicompany was removed without being disabled.
Commit: ea310efba50308f657dfe80d2148c2bdba10dd08
https://github.com/Dolibarr/dolibarr/commit/ea310efba50308f657dfe80d2148c2bdba10dd08
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-02 (Wed, 02 Jul 2014)
Changed paths:
M ChangeLog
M htdocs/user/fiche.php
Log Message:
-----------
Fix: [ bug #1471 ] Several PHP warnings when intercepting USER_CREATE
trigger
Commit: de527365a8bc4dc6cd4966d2981eadb7d8ef8ebc
https://github.com/Dolibarr/dolibarr/commit/de527365a8bc4dc6cd4966d2981eadb7d8ef8ebc
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-02 (Wed, 02 Jul 2014)
Changed paths:
M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
M htdocs/install/mysql/tables/llx_expedition.sql
Log Message:
-----------
Fix: [ bug #1517 ] Packages sizes
Commit: c1d33af50d3f968976778c03374e245389c4c8d0
https://github.com/Dolibarr/dolibarr/commit/c1d33af50d3f968976778c03374e245389c4c8d0
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-02 (Wed, 02 Jul 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
- Fix: [ bug #1517 ] Packages sizes.
Commit: 505a78a7ea0086865469ed6b8ea22ba93c13be58
https://github.com/Dolibarr/dolibarr/commit/505a78a7ea0086865469ed6b8ea22ba93c13be58
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-02 (Wed, 02 Jul 2014)
Changed paths:
M htdocs/langs/en_US/users.lang
Log Message:
-----------
Merge pull request #1698 from marcosgdf/translation
Corrected English typo
Commit: 959c41e8db19c8577233042c9b2617630fc68f2d
https://github.com/Dolibarr/dolibarr/commit/959c41e8db19c8577233042c9b2617630fc68f2d
Author: Maxime Kohlhaas <address@hidden>
Date: 2014-07-03 (Thu, 03 Jul 2014)
Changed paths:
M htdocs/product/class/product.class.php
M htdocs/product/stock/product.php
Log Message:
-----------
Fix : virtual stock was not correctly calculated because reception was not
included.
Commit: b115e9b943c24a2408aedb8db3c835eddb19dfd4
https://github.com/Dolibarr/dolibarr/commit/b115e9b943c24a2408aedb8db3c835eddb19dfd4
Author: Maxime Kohlhaas <address@hidden>
Date: 2014-07-03 (Thu, 03 Jul 2014)
Changed paths:
M htdocs/product/stock/replenish.php
Log Message:
-----------
Fix : replenish function was not working with virtual stock
Commit: 830cc30f802c0569ac16a8e2bdf574724f5a6f36
https://github.com/Dolibarr/dolibarr/commit/830cc30f802c0569ac16a8e2bdf574724f5a6f36
Author: Maxime Kohlhaas <address@hidden>
Date: 2014-07-03 (Thu, 03 Jul 2014)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
Fix : sendings and reception stock calculation must be on the same status
than order and oreder supplier calculation
Commit: a22963e4329cf73be2a22874fbfd9c4ca02a1ec6
https://github.com/Dolibarr/dolibarr/commit/a22963e4329cf73be2a22874fbfd9c4ca02a1ec6
Author: Maxime Kohlhaas <address@hidden>
Date: 2014-07-03 (Thu, 03 Jul 2014)
Changed paths:
M htdocs/product/stock/replenish.php
Log Message:
-----------
Fix : filter by status + was not working if desiredstock not defined
Commit: a26db9ab524010e9ddf6b2da1aa9f10353584bf4
https://github.com/Dolibarr/dolibarr/commit/a26db9ab524010e9ddf6b2da1aa9f10353584bf4
Author: Maxime Kohlhaas <address@hidden>
Date: 2014-07-03 (Thu, 03 Jul 2014)
Changed paths:
M htdocs/product/stock/replenish.php
Log Message:
-----------
Fix : qty ordered was not including qty already received
Commit: 51e4fa0d3613629347a7df1a51c06441584412c2
https://github.com/Dolibarr/dolibarr/commit/51e4fa0d3613629347a7df1a51c06441584412c2
Author: Maxime Kohlhaas <address@hidden>
Date: 2014-07-03 (Thu, 03 Jul 2014)
Changed paths:
M htdocs/product/stock/replenish.php
Log Message:
-----------
Fix : picto for already ordered product was missing
Commit: f2248d5bc887b66b9254f315992d5c8eadc19952
https://github.com/Dolibarr/dolibarr/commit/f2248d5bc887b66b9254f315992d5c8eadc19952
Author: Maxime Kohlhaas <address@hidden>
Date: 2014-07-03 (Thu, 03 Jul 2014)
Changed paths:
M htdocs/product/stock/replenish.php
Log Message:
-----------
Fix : ordered should display qty in supplier order not yet send
Commit: 8eb8f33f28850a8f8be69c0d61540c33caf475ce
https://github.com/Dolibarr/dolibarr/commit/8eb8f33f28850a8f8be69c0d61540c33caf475ce
Author: Maxime Kohlhaas <address@hidden>
Date: 2014-07-03 (Thu, 03 Jul 2014)
Changed paths:
M htdocs/product/stats/commande.php
M htdocs/product/stats/commande_fournisseur.php
M htdocs/product/stats/facture.php
M htdocs/product/stats/facture_fournisseur.php
M htdocs/product/stats/propal.php
Log Message:
-----------
Ajout qté dans écran consommation produit
Commit: db0fa0afd0ab803122f13b8172a72b552d18feea
https://github.com/Dolibarr/dolibarr/commit/db0fa0afd0ab803122f13b8172a72b552d18feea
Author: Maxime Kohlhaas <address@hidden>
Date: 2014-07-03 (Thu, 03 Jul 2014)
Changed paths:
M htdocs/product/stock/replenish.php
Log Message:
-----------
Revert "Fix : ordered should display qty in supplier order not yet send"
This reverts commit f2248d5bc887b66b9254f315992d5c8eadc19952.
Commit: 47cff4d407ed00389fe719af78d181b13289a4fd
https://github.com/Dolibarr/dolibarr/commit/47cff4d407ed00389fe719af78d181b13289a4fd
Author: Juanjo Menent <address@hidden>
Date: 2014-07-04 (Fri, 04 Jul 2014)
Changed paths:
M htdocs/fourn/commande/fiche.php
Log Message:
-----------
Fix: Unable to add lines in supplier orders
Commit: 11abba30b38041d96a2fa71b293d9db9983be067
https://github.com/Dolibarr/dolibarr/commit/11abba30b38041d96a2fa71b293d9db9983be067
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-04 (Fri, 04 Jul 2014)
Changed paths:
M htdocs/admin/system/dolibarr.php
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Fix: Add information to help debug pb with TZ.
Commit: f22a04810eef50dd3255986700a8b5bef95218bb
https://github.com/Dolibarr/dolibarr/commit/f22a04810eef50dd3255986700a8b5bef95218bb
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-04 (Fri, 04 Jul 2014)
Changed paths:
M htdocs/langs/en_US/users.lang
Log Message:
-----------
Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5
Commit: 7ee1388582bf74beca7faf1073753066625944ce
https://github.com/Dolibarr/dolibarr/commit/7ee1388582bf74beca7faf1073753066625944ce
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-04 (Fri, 04 Jul 2014)
Changed paths:
M ChangeLog
M htdocs/admin/system/dolibarr.php
M htdocs/contact/fiche.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/users.lang
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Commit: c662f34f16a2bfdcd82107ab6f3a870970148a60
https://github.com/Dolibarr/dolibarr/commit/c662f34f16a2bfdcd82107ab6f3a870970148a60
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-04 (Fri, 04 Jul 2014)
Changed paths:
M htdocs/product/class/product.class.php
M htdocs/product/stats/commande.php
M htdocs/product/stats/commande_fournisseur.php
M htdocs/product/stats/facture.php
M htdocs/product/stats/facture_fournisseur.php
M htdocs/product/stats/propal.php
M htdocs/product/stock/product.php
M htdocs/product/stock/replenish.php
Log Message:
-----------
Merge pull request #1702 from atm-maxime/3.6
Fix : virtual stock was not correctly calculated because reception was n...
Commit: bf96a78f630afe772a821ee063a37d9ace66c269
https://github.com/Dolibarr/dolibarr/commit/bf96a78f630afe772a821ee063a37d9ace66c269
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-04 (Fri, 04 Jul 2014)
Changed paths:
M htdocs/core/js/dst.js
M htdocs/core/lib/functions.lib.php
M htdocs/includes/adodbtime/adodb-time.inc.php
M htdocs/main.inc.php
Log Message:
-----------
Try a fix when timezone string is not standard
Commit: 105e7189ecd2e5abbbb3454d5fbca97b19dd8880
https://github.com/Dolibarr/dolibarr/commit/105e7189ecd2e5abbbb3454d5fbca97b19dd8880
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-04 (Fri, 04 Jul 2014)
Changed paths:
M .travis.yml
Log Message:
-----------
Add -p on phpcs to avoid timeout
Commit: 7d519fdfe63a6f918c92909fa117850b3fbe3d60
https://github.com/Dolibarr/dolibarr/commit/7d519fdfe63a6f918c92909fa117850b3fbe3d60
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-04 (Fri, 04 Jul 2014)
Changed paths:
M htdocs/product/class/product.class.php
M htdocs/product/stats/commande.php
M htdocs/product/stats/commande_fournisseur.php
M htdocs/product/stats/facture.php
M htdocs/product/stats/facture_fournisseur.php
M htdocs/product/stats/propal.php
M htdocs/product/stock/product.php
M htdocs/product/stock/replenish.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: cdfe8818da728aa7a81fed118e54a79cd42af26a
https://github.com/Dolibarr/dolibarr/commit/cdfe8818da728aa7a81fed118e54a79cd42af26a
Author: Florian HENRY <address@hidden>
Date: 2014-07-04 (Fri, 04 Jul 2014)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
avoid message
Delimiter must not be alphanumeric or backslash in
/home/bobby/Eclipse/workspace/dolibarr/htdocs/main.inc.php on line 450
on preg_replace
Commit: fa84409fea52a495c76696a2167b5dcd4cbc2e14
https://github.com/Dolibarr/dolibarr/commit/fa84409fea52a495c76696a2167b5dcd4cbc2e14
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-04 (Fri, 04 Jul 2014)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
Merge pull request #1707 from FHenry/3.6
avoid warning message on preg_replace
Commit: b8c293fb1687b36e4309d4e118291476ad241747
https://github.com/Dolibarr/dolibarr/commit/b8c293fb1687b36e4309d4e118291476ad241747
Author: Florian HENRY <address@hidden>
Date: 2014-07-04 (Fri, 04 Jul 2014)
Changed paths:
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/core/tpl/objectline_edit.tpl.php
Log Message:
-----------
$dateSelector is a paramters of formAddObjectLine, if use global it is
reset to 0 because not declare in outer context but already exists in
the same context.
Commit: faa5eba2033ae5b445309eb0d75ee0545a24a0e5
https://github.com/Dolibarr/dolibarr/commit/faa5eba2033ae5b445309eb0d75ee0545a24a0e5
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-04 (Fri, 04 Jul 2014)
Changed paths:
M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
Log Message:
-----------
Fix: Substitution for external module at wrong place.
Commit: 13c208dd8f41632bb60b01e1e3a5e8c2444b3489
https://github.com/Dolibarr/dolibarr/commit/13c208dd8f41632bb60b01e1e3a5e8c2444b3489
Author: Florian HENRY <address@hidden>
Date: 2014-07-05 (Sat, 05 Jul 2014)
Changed paths:
M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: 02574a7af2c18b9f0e9e2169ad79ed7e6fce2311
https://github.com/Dolibarr/dolibarr/commit/02574a7af2c18b9f0e9e2169ad79ed7e6fce2311
Author: Florian HENRY <address@hidden>
Date: 2014-07-05 (Sat, 05 Jul 2014)
Changed paths:
M htdocs/contrat/class/contrat.class.php
M htdocs/contrat/fiche.php
M htdocs/core/class/extrafields.class.php
M htdocs/main.inc.php
M htdocs/product/class/product.class.php
Log Message:
-----------
Fix Ajax combobox in Extrafeilds
Add Extrafield on contract
Commit: fe50d8b1ab8b34b672623c369dd0db87a9704480
https://github.com/Dolibarr/dolibarr/commit/fe50d8b1ab8b34b672623c369dd0db87a9704480
Author: Florian HENRY <address@hidden>
Date: 2014-07-05 (Sat, 05 Jul 2014)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
restore min jquery
Commit: fe547de0e3572c24a9e5c20a290daf8be0ba34ae
https://github.com/Dolibarr/dolibarr/commit/fe547de0e3572c24a9e5c20a290daf8be0ba34ae
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-05 (Sat, 05 Jul 2014)
Changed paths:
M scripts/members/sync_members_ldap2dolibarr.php
M scripts/user/sync_groups_ldap2dolibarr.php
M scripts/user/sync_users_ldap2dolibarr.php
Log Message:
-----------
Fix: Removed duplicate lines
Commit: dec4ff2e199621c5ac6eb8b5ddff971a6f02168d
https://github.com/Dolibarr/dolibarr/commit/dec4ff2e199621c5ac6eb8b5ddff971a6f02168d
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-05 (Sat, 05 Jul 2014)
Changed paths:
M scripts/members/sync_members_dolibarr2ldap.php
M scripts/members/sync_members_ldap2dolibarr.php
M scripts/user/sync_groups_ldap2dolibarr.php
M scripts/user/sync_users_ldap2dolibarr.php
Log Message:
-----------
Fix: Duplicate confirmation
Commit: 292141263499ab029b16de565c678ff360390aed
https://github.com/Dolibarr/dolibarr/commit/292141263499ab029b16de565c678ff360390aed
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-05 (Sat, 05 Jul 2014)
Changed paths:
M scripts/members/sync_members_dolibarr2ldap.php
M scripts/members/sync_members_ldap2dolibarr.php
M scripts/user/sync_groups_ldap2dolibarr.php
M scripts/user/sync_users_ldap2dolibarr.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Commit: 851fdf3bb78fdcb32b4e2a1e75eef2de50fa8637
https://github.com/Dolibarr/dolibarr/commit/851fdf3bb78fdcb32b4e2a1e75eef2de50fa8637
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-05 (Sat, 05 Jul 2014)
Changed paths:
M htdocs/contrat/class/contrat.class.php
M htdocs/contrat/fiche.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge pull request #1711 from FHenry/3.6_contractextrafields
3.6 contractextrafields
Commit: cb9e0983dd1ebf11625472c846fdadc995301bcc
https://github.com/Dolibarr/dolibarr/commit/cb9e0983dd1ebf11625472c846fdadc995301bcc
Author: Florian HENRY <address@hidden>
Date: 2014-07-06 (Sun, 06 Jul 2014)
Changed paths:
M htdocs/product/fiche.php
Log Message:
-----------
Remove fetch_optionnal becauwe done in fetch from product class
Commit: 4d9f78dc07d8df31d3ab58897cc1b7fdb8f4c9b8
https://github.com/Dolibarr/dolibarr/commit/4d9f78dc07d8df31d3ab58897cc1b7fdb8f4c9b8
Author: BENKE Charles <address@hidden>
Date: 2014-07-06 (Sun, 06 Jul 2014)
Changed paths:
M htdocs/projet/class/task.class.php
Log Message:
-----------
getlibstatut added
Add function getlibstatut and libstatut on task (fk_statut allready present on
project_task table)
Commit: 56c067f15c5e70eabbf34a63007b4036e0a461bd
https://github.com/Dolibarr/dolibarr/commit/56c067f15c5e70eabbf34a63007b4036e0a461bd
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-06 (Sun, 06 Jul 2014)
Changed paths:
M htdocs/fichinter/fiche.php
Log Message:
-----------
Fix: form is not allowed inside a table
Conflicts:
htdocs/fichinter/fiche.php
Commit: 96ec3ad7f4b0e5ddbc457a3720df97773ef75b6f
https://github.com/Dolibarr/dolibarr/commit/96ec3ad7f4b0e5ddbc457a3720df97773ef75b6f
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-07 (Mon, 07 Jul 2014)
Changed paths:
M htdocs/core/class/doleditor.class.php
Log Message:
-----------
Fix: Allow percent to solve presentation pb by some pages.
Commit: 7c163223911b907a2c8a1690cff90e9595aba401
https://github.com/Dolibarr/dolibarr/commit/7c163223911b907a2c8a1690cff90e9595aba401
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-07 (Mon, 07 Jul 2014)
Changed paths:
M htdocs/product/fiche.php
Log Message:
-----------
Merge pull request #1713 from FHenry/3.6
Remove fetch_optionnal becauwe done in fetch from product class
Commit: 41dc0681c62dcfcbfb2c4c66efdbe5764ff381be
https://github.com/Dolibarr/dolibarr/commit/41dc0681c62dcfcbfb2c4c66efdbe5764ff381be
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-08 (Tue, 08 Jul 2014)
Changed paths:
M htdocs/projet/class/task.class.php
Log Message:
-----------
Merge pull request #1715 from defrance69/patch-5
getlibstatut added
Commit: e8b7d36004ca4b4a1a921710a7aa45b51062e6f9
https://github.com/Dolibarr/dolibarr/commit/e8b7d36004ca4b4a1a921710a7aa45b51062e6f9
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-08 (Tue, 08 Jul 2014)
Changed paths:
M .travis.yml
Log Message:
-----------
Fix: Solve timeout pb.
Commit: 5b1cdd05cbc2676bdfd108ca812542de33fd378c
https://github.com/Dolibarr/dolibarr/commit/5b1cdd05cbc2676bdfd108ca812542de33fd378c
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-08 (Tue, 08 Jul 2014)
Changed paths:
M htdocs/product/fiche.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: 6c8c23203632ddde0620c73b99f433dd069e9532
https://github.com/Dolibarr/dolibarr/commit/6c8c23203632ddde0620c73b99f433dd069e9532
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-08 (Tue, 08 Jul 2014)
Changed paths:
M .travis.yml
Log Message:
-----------
Fix: Solve timeout pb.
Commit: 36e6f9a9fcb3ebb498c7d01a7b269bf92751db19
https://github.com/Dolibarr/dolibarr/commit/36e6f9a9fcb3ebb498c7d01a7b269bf92751db19
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-08 (Tue, 08 Jul 2014)
Changed paths:
M htdocs/projet/class/task.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
.travis.yml
Commit: 0eabf26d270a87e5c0634fe7467bed662cea90c1
https://github.com/Dolibarr/dolibarr/commit/0eabf26d270a87e5c0634fe7467bed662cea90c1
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-08 (Tue, 08 Jul 2014)
Changed paths:
M htdocs/projet/class/task.class.php
Log Message:
-----------
Fix: Checkstyle
Commit: 6d83882a5d355b0c3b6a09a4e8047ff039e5505f
https://github.com/Dolibarr/dolibarr/commit/6d83882a5d355b0c3b6a09a4e8047ff039e5505f
Author: Alexis Algoud <address@hidden>
Date: 2014-07-08 (Tue, 08 Jul 2014)
Changed paths:
M htdocs/commande/orderstoinvoice.php
Log Message:
-----------
FIX : Bad rank when a bill was made by multiple orders
Commit: 869bde5fb0e9daa44e9688761aff2199810183b9
https://github.com/Dolibarr/dolibarr/commit/869bde5fb0e9daa44e9688761aff2199810183b9
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-08 (Tue, 08 Jul 2014)
Changed paths:
M .travis.yml
Log Message:
-----------
Fix: Ignore vagrant dir into CI
Conflicts:
.travis.yml
Commit: 0598bb611429f53d8cf2d05ab312f2b61f05f73b
https://github.com/Dolibarr/dolibarr/commit/0598bb611429f53d8cf2d05ab312f2b61f05f73b
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-08 (Tue, 08 Jul 2014)
Changed paths:
M .travis.yml
Log Message:
-----------
Fix: travis file for 3.5
Commit: 0e78e631c1fc111b6fa8e915478c4c385c5a60c6
https://github.com/Dolibarr/dolibarr/commit/0e78e631c1fc111b6fa8e915478c4c385c5a60c6
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-08 (Tue, 08 Jul 2014)
Changed paths:
M .travis.yml
M htdocs/projet/class/task.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
.travis.yml
Commit: f1d1736532874bddfad982d970dcfc36be1c3a1e
https://github.com/Dolibarr/dolibarr/commit/f1d1736532874bddfad982d970dcfc36be1c3a1e
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-08 (Tue, 08 Jul 2014)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
Fix: checkstyle
Commit: a137b31a47526d56c286bf721efd7a2e58ce46fe
https://github.com/Dolibarr/dolibarr/commit/a137b31a47526d56c286bf721efd7a2e58ce46fe
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-08 (Tue, 08 Jul 2014)
Changed paths:
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 test/phpunit/SqlTest.php
Log Message:
-----------
Fix: ON DELETE CASCADE is forbidden.
Conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
test/phpunit/SqlTest.php
Commit: f0056b3b95e493ffd53801ebac798ee2fa70bc58
https://github.com/Dolibarr/dolibarr/commit/f0056b3b95e493ffd53801ebac798ee2fa70bc58
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-08 (Tue, 08 Jul 2014)
Changed paths:
M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
M htdocs/install/mysql/tables/llx_expeditiondet_batch.key.sql
Log Message:
-----------
Fix: Migration does not match tables
Commit: 32c15132df1c0cc19eda293cea8f5f84d68201cb
https://github.com/Dolibarr/dolibarr/commit/32c15132df1c0cc19eda293cea8f5f84d68201cb
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-08 (Tue, 08 Jul 2014)
Changed paths:
M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
Log Message:
-----------
Fix: sql syntax error
Commit: 3f23b116c6a5f58d4fad3b9b1f0acb8408066382
https://github.com/Dolibarr/dolibarr/commit/3f23b116c6a5f58d4fad3b9b1f0acb8408066382
Author: Florian HENRY <address@hidden>
Date: 2014-07-11 (Fri, 11 Jul 2014)
Changed paths:
M htdocs/core/class/html.formprojet.class.php
M htdocs/projet/element.php
Log Message:
-----------
[ bug #1522 ] Liste des propositions commerciales non filtée depuis un
projet
Commit: 7d77772820307ada5407807da695f63514b00b71
https://github.com/Dolibarr/dolibarr/commit/7d77772820307ada5407807da695f63514b00b71
Author: Florian HENRY <address@hidden>
Date: 2014-07-11 (Fri, 11 Jul 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
changelog
Commit: 13cc8620b2075e0845defe91a6eaf25f361b09d3
https://github.com/Dolibarr/dolibarr/commit/13cc8620b2075e0845defe91a6eaf25f361b09d3
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-11 (Fri, 11 Jul 2014)
Changed paths:
M ChangeLog
M htdocs/core/class/html.formprojet.class.php
M htdocs/projet/element.php
Log Message:
-----------
Merge pull request #1732 from FHenry/3.5
[ bug #1522 ] Liste des propositions commerciales non filtée depuis un projet
Commit: 0cba9b8fae2a9e58f35661f393b5f09df6f971c1
https://github.com/Dolibarr/dolibarr/commit/0cba9b8fae2a9e58f35661f393b5f09df6f971c1
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-11 (Fri, 11 Jul 2014)
Changed paths:
M htdocs/commande/orderstoinvoice.php
Log Message:
-----------
Merge pull request #1726 from atm-alexis/3.5
FIX : Bad rank when a bill was made by multiple orders
Commit: ff5ea31452e1796ba2022cf73915e42f417d2139
https://github.com/Dolibarr/dolibarr/commit/ff5ea31452e1796ba2022cf73915e42f417d2139
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-11 (Fri, 11 Jul 2014)
Changed paths:
M build/rpm/dolibarr_fedora.spec
M build/rpm/dolibarr_generic.spec
M build/rpm/dolibarr_mandriva.spec
M build/rpm/dolibarr_opensuse.spec
Log Message:
-----------
Fix: Date error
Commit: b9df48d48c72558aff58d826158e42fc6cb774c3
https://github.com/Dolibarr/dolibarr/commit/b9df48d48c72558aff58d826158e42fc6cb774c3
Author: Florian HENRY <address@hidden>
Date: 2014-07-11 (Fri, 11 Jul 2014)
Changed paths:
M htdocs/core/class/cookie.class.php
Log Message:
-----------
Fix
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/50854-multi-societe-options-cookies
Commit: c1bfe0f6c5f3bf2a9f24ce245ddc5f27d121e768
https://github.com/Dolibarr/dolibarr/commit/c1bfe0f6c5f3bf2a9f24ce245ddc5f27d121e768
Author: juanjo <address@hidden>
Date: 2014-07-11 (Fri, 11 Jul 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
Update ChangeLog: Remove add_photo_web()
Commit: d289306fa4cea7a0fd8d09b33e9b422671c00dc6
https://github.com/Dolibarr/dolibarr/commit/d289306fa4cea7a0fd8d09b33e9b422671c00dc6
Author: Cedric <address@hidden>
Date: 2014-07-12 (Sat, 12 Jul 2014)
Changed paths:
M htdocs/product/stock/fiche.php
Log Message:
-----------
Security fix
Commit: 4bc8e026b69b58becd91bc924d1cf4a0755824c6
https://github.com/Dolibarr/dolibarr/commit/4bc8e026b69b58becd91bc924d1cf4a0755824c6
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-07-13 (Sun, 13 Jul 2014)
Changed paths:
M ChangeLog
M htdocs/core/class/html.formfile.class.php
Log Message:
-----------
[ bug #1526 ] Thumbs of files uploaded with dots in their names do not load
correctly
Commit: b0ae2fe2aaf069a4a9893d09ae3d588742862318
https://github.com/Dolibarr/dolibarr/commit/b0ae2fe2aaf069a4a9893d09ae3d588742862318
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
M htdocs/projet/element.php
Log Message:
-----------
Fixed a bug introduced in commit 0916d2cf3b
Commit: 3930c8829ef5a8cb6e305ca2d828e4f4a019525c
https://github.com/Dolibarr/dolibarr/commit/3930c8829ef5a8cb6e305ca2d828e4f4a019525c
Author: Juanjo Menent <address@hidden>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
M htdocs/core/modules/modSociete.class.php
Log Message:
-----------
Fix: Import ProfId1 to siren and ProfId2 to siret
Commit: 3816e0fe1485bdbe73cdf29b340a5c40ebf0e749
https://github.com/Dolibarr/dolibarr/commit/3816e0fe1485bdbe73cdf29b340a5c40ebf0e749
Author: Juanjo Menent <address@hidden>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
Fix: Import ProfId1 to siren and ProfId2 to siret
Commit: f8b5bac05c4e632e7e37be2e75c551cd93155c8b
https://github.com/Dolibarr/dolibarr/commit/f8b5bac05c4e632e7e37be2e75c551cd93155c8b
Author: Juanjo Menent <address@hidden>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
M htdocs/core/modules/modSociete.class.php
Log Message:
-----------
Fix: Import ProfId1 to siren and ProfId2 to siret
Commit: 3a8835892e9bf212d7bacbe939f47e26842b0019
https://github.com/Dolibarr/dolibarr/commit/3a8835892e9bf212d7bacbe939f47e26842b0019
Author: Juanjo Menent <address@hidden>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
Fix: Import ProfId1 to siren and ProfId2 to siret
Conflicts:
ChangeLog
Commit: 2ac088d60e734cfc705e723d1979128da0cb6074
https://github.com/Dolibarr/dolibarr/commit/2ac088d60e734cfc705e723d1979128da0cb6074
Author: Juanjo Menent <address@hidden>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
M htdocs/product/stock/fiche.php
Log Message:
-----------
Merge pull request #1739 from KreizIT/XssFix
Security fix
Commit: 0bfc90ee9a14cc703fcb7e22e986a8872eca5ea0
https://github.com/Dolibarr/dolibarr/commit/0bfc90ee9a14cc703fcb7e22e986a8872eca5ea0
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
M htdocs/projet/element.php
Log Message:
-----------
Merge pull request #1744 from marcosgdf/bug-linkedprojects
Fixed a bug introduced in commit 0916d2cf3b
Commit: d02df05ab869dbd5b6d22ad31ccd89303f24bf3b
https://github.com/Dolibarr/dolibarr/commit/d02df05ab869dbd5b6d22ad31ccd89303f24bf3b
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
M ChangeLog
M htdocs/core/class/html.formfile.class.php
Log Message:
-----------
Merge branch 'marcosgdf-bug-1526' into 3.5
Commit: f55814e3b27e0f34f15a1189f98456338bea8e96
https://github.com/Dolibarr/dolibarr/commit/f55814e3b27e0f34f15a1189f98456338bea8e96
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
M ChangeLog
M htdocs/core/modules/modSociete.class.php
M htdocs/projet/element.php
Log Message:
-----------
Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5
Conflicts:
ChangeLog
Commit: 32a6d59b64160158457a79a2546aa5946439ccdd
https://github.com/Dolibarr/dolibarr/commit/32a6d59b64160158457a79a2546aa5946439ccdd
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 pull request #1734 from FHenry/3.5
Fix
Commit: 9acf60d7c55fdcec677ebc068e526b898143a925
https://github.com/Dolibarr/dolibarr/commit/9acf60d7c55fdcec677ebc068e526b898143a925
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
M ChangeLog
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/commande/orderstoinvoice.php
M htdocs/core/class/cookie.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/class/html.formprojet.class.php
M htdocs/projet/element.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
.travis.yml
ChangeLog
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/core/class/html.formfile.class.php
Commit: 98242cd2bc1a35410740548d658b9515a064ab87
https://github.com/Dolibarr/dolibarr/commit/98242cd2bc1a35410740548d658b9515a064ab87
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-15 (Tue, 15 Jul 2014)
Changed paths:
M .travis.yml
M ChangeLog
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/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.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/includes/adodbtime/adodb-time.inc.php
M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
M htdocs/install/mysql/tables/llx_expedition.sql
M htdocs/install/mysql/tables/llx_expeditiondet_batch.key.sql
M htdocs/install/mysql/tables/llx_product_batch.key.sql
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/stocks.lang
M htdocs/langs/en_US/users.lang
M htdocs/main.inc.php
M htdocs/product/class/product.class.php
M htdocs/product/fiche.php
M htdocs/product/stats/commande.php
M htdocs/product/stats/commande_fournisseur.php
M htdocs/product/stats/facture.php
M htdocs/product/stats/facture_fournisseur.php
M htdocs/product/stats/propal.php
M htdocs/product/stock/fiche.php
M htdocs/product/stock/product.php
M htdocs/product/stock/replenish.php
M htdocs/projet/class/task.class.php
M htdocs/projet/element.php
M htdocs/user/fiche.php
M scripts/members/sync_members_dolibarr2ldap.php
M scripts/members/sync_members_ldap2dolibarr.php
M scripts/user/sync_groups_ldap2dolibarr.php
M scripts/user/sync_users_ldap2dolibarr.php
M test/phpunit/SqlTest.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.6_backported
Compare:
https://github.com/Dolibarr/dolibarr/compare/48e748c86ad7...98242cd2bc1a