[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 365639: Prepare 6.0.5
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 365639: Prepare 6.0.5 |
|
Date: |
Fri, 08 Dec 2017 04:15:04 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 365639a6c00422d79db569e75e46014a42e0b5f1
https://github.com/Dolibarr/dolibarr/commit/365639a6c00422d79db569e75e46014a42e0b5f1
Author: Laurent Destailleur <address@hidden>
Date: 2017-12-05 (Tue, 05 Dec 2017)
Changed paths:
M htdocs/filefunc.inc.php
Log Message:
-----------
Prepare 6.0.5
Commit: 340287f073686ace946816efe8f89e9cf50654fc
https://github.com/Dolibarr/dolibarr/commit/340287f073686ace946816efe8f89e9cf50654fc
Author: Laurent Destailleur <address@hidden>
Date: 2017-12-05 (Tue, 05 Dec 2017)
Changed paths:
M htdocs/holiday/class/holiday.class.php
Log Message:
-----------
FIX #7903
Conflicts:
htdocs/holiday/class/holiday.class.php
Commit: bfc476a118a40f4d05af7e6b5c5c1aa297c664ec
https://github.com/Dolibarr/dolibarr/commit/bfc476a118a40f4d05af7e6b5c5c1aa297c664ec
Author: Ferran Marcet <address@hidden>
Date: 2017-12-07 (Thu, 07 Dec 2017)
Changed paths:
M htdocs/core/class/html.formfile.class.php
M htdocs/product/class/product.class.php
M htdocs/product/document.php
Log Message:
-----------
FIX #7379: Compatibility with PRODUCT_USE_OLD_PATH_FOR_PHOTO varieable
Commit: 95fa183fac33b7ea8432ae213534b70502e50702
https://github.com/Dolibarr/dolibarr/commit/95fa183fac33b7ea8432ae213534b70502e50702
Author: Regis Houssin <address@hidden>
Date: 2017-12-08 (Fri, 08 Dec 2017)
Changed paths:
M htdocs/compta/paiement/cheque/card.php
Log Message:
-----------
Fix: Avoid warning "A non-numeric value encountered"
Commit: 8e1a9064cb053eebf4db0bacbc47d742c986f62f
https://github.com/Dolibarr/dolibarr/commit/8e1a9064cb053eebf4db0bacbc47d742c986f62f
Author: Regis Houssin <address@hidden>
Date: 2017-12-08 (Fri, 08 Dec 2017)
Changed paths:
M htdocs/compta/paiement/cheque/card.php
Log Message:
-----------
Fix: avoid warning again
Commit: c4b2c3e6976f98f5f3700ebe3b886f26979e8a04
https://github.com/Dolibarr/dolibarr/commit/c4b2c3e6976f98f5f3700ebe3b886f26979e8a04
Author: Regis Houssin <address@hidden>
Date: 2017-12-08 (Fri, 08 Dec 2017)
Changed paths:
M htdocs/compta/paiement/cheque/card.php
Log Message:
-----------
FIXME $accounts[$bid] is a label !
Commit: 04327189f756d476157af50e684679c48507c04e
https://github.com/Dolibarr/dolibarr/commit/04327189f756d476157af50e684679c48507c04e
Author: Regis Houssin <address@hidden>
Date: 2017-12-08 (Fri, 08 Dec 2017)
Changed paths:
M htdocs/compta/paiement/cheque/card.php
Log Message:
-----------
Fix: access error when user not right to view all customers
Commit: 5f71165020380edd1c93e85e82ee3fef3f2aad71
https://github.com/Dolibarr/dolibarr/commit/5f71165020380edd1c93e85e82ee3fef3f2aad71
Author: Laurent Destailleur <address@hidden>
Date: 2017-12-08 (Fri, 08 Dec 2017)
Changed paths:
M htdocs/compta/paiement/cheque/card.php
Log Message:
-----------
Merge pull request #7924 from hregis/6.0_bug2
Fix: Avoid warning "A non-numeric value encountered"
Commit: df5768c176042b6eba2338bf258d481dc0615396
https://github.com/Dolibarr/dolibarr/commit/df5768c176042b6eba2338bf258d481dc0615396
Author: Laurent Destailleur <address@hidden>
Date: 2017-12-08 (Fri, 08 Dec 2017)
Changed paths:
M htdocs/langs/en_US/other.lang
M htdocs/user/class/user.class.php
M htdocs/user/class/usergroup.class.php
Log Message:
-----------
Fix missing translation
Commit: acd4e0b0830ee8221963160497f5533f91109b1a
https://github.com/Dolibarr/dolibarr/commit/acd4e0b0830ee8221963160497f5533f91109b1a
Author: Laurent Destailleur <address@hidden>
Date: 2017-12-08 (Fri, 08 Dec 2017)
Changed paths:
M htdocs/comm/propal/card.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/card.php
M htdocs/compta/facture/class/facture-rec.class.php
M htdocs/core/class/commoninvoice.class.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/facture/card.php
M htdocs/langs/en_US/errors.lang
M htdocs/product/dynamic_price/class/price_parser.class.php
M htdocs/projet/card.php
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop
Commit: 08abb1490a3660fabd7dd632808a5ddd91b20359
https://github.com/Dolibarr/dolibarr/commit/08abb1490a3660fabd7dd632808a5ddd91b20359
Author: Laurent Destailleur <address@hidden>
Date: 2017-12-08 (Fri, 08 Dec 2017)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
Remove code using not defined var
Commit: 9b9b5adf660d47a07191d342e6066046acc3bfe9
https://github.com/Dolibarr/dolibarr/commit/9b9b5adf660d47a07191d342e6066046acc3bfe9
Author: Laurent Destailleur <address@hidden>
Date: 2017-12-08 (Fri, 08 Dec 2017)
Changed paths:
M htdocs/product/document.php
Log Message:
-----------
Fix must be compatible with old and new storage location
Commit: 8dc3d7323d2511c489ac3b7e80f18557db14b4eb
https://github.com/Dolibarr/dolibarr/commit/8dc3d7323d2511c489ac3b7e80f18557db14b4eb
Author: Laurent Destailleur <address@hidden>
Date: 2017-12-08 (Fri, 08 Dec 2017)
Changed paths:
M htdocs/core/class/html.formfile.class.php
M htdocs/product/class/product.class.php
M htdocs/product/document.php
Log Message:
-----------
Merge pull request #7923 from fmarcet/6.0
FIX #7379: Compatibility with PRODUCT_USE_OLD_PATH_FOR_PHOTO varieable
Commit: f85e79e250c19fc38a2b77413f738d6a50105c74
https://github.com/Dolibarr/dolibarr/commit/f85e79e250c19fc38a2b77413f738d6a50105c74
Author: Laurent Destailleur <address@hidden>
Date: 2017-12-08 (Fri, 08 Dec 2017)
Changed paths:
M htdocs/compta/paiement/cheque/card.php
M htdocs/core/class/html.formfile.class.php
M htdocs/product/class/product.class.php
M htdocs/product/document.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/filefunc.inc.php
htdocs/holiday/class/holiday.class.php
Commit: ac56e61cdfe2ea320210656f0a784cb8847944a5
https://github.com/Dolibarr/dolibarr/commit/ac56e61cdfe2ea320210656f0a784cb8847944a5
Author: Laurent Destailleur <address@hidden>
Date: 2017-12-08 (Fri, 08 Dec 2017)
Changed paths:
M htdocs/societe/agenda.php
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/c2ad58895f03...ac56e61cdfe2