[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: |
Fri, 04 Jul 2014 05:15:01 -0700 |
Branch: refs/heads/develop
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: e496823778d8acc64ec8e0d6433590d7df7f425e
https://github.com/Dolibarr/dolibarr/commit/e496823778d8acc64ec8e0d6433590d7df7f425e
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-04 (Fri, 04 Jul 2014)
Changed paths:
M .travis.yml
M ChangeLog
M htdocs/admin/system/dolibarr.php
M htdocs/contact/fiche.php
M htdocs/core/js/dst.js
M htdocs/core/lib/functions.lib.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/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/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
M htdocs/user/fiche.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
.travis.yml
ChangeLog
htdocs/fourn/commande/fiche.php
htdocs/install/mysql/migration/3.5.0-3.6.0.sql
htdocs/product/stock/replenish.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/389554bd9db8...e496823778d8