[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 0f5745: Fix: avoid error if type is n
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 0f5745: Fix: avoid error if type is not numeric |
|
Date: |
Thu, 08 Mar 2018 07:37:33 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 0f574579eb71e95969d6dd2b645162016f0c8f1b
https://github.com/Dolibarr/dolibarr/commit/0f574579eb71e95969d6dd2b645162016f0c8f1b
Author: Regis Houssin <address@hidden>
Date: 2018-03-07 (Wed, 07 Mar 2018)
Changed paths:
M htdocs/categories/class/categorie.class.php
Log Message:
-----------
Fix: avoid error if type is not numeric
Commit: 64e59c3f973e4f9e4d7e8a29ef9ea1b6480c2580
https://github.com/Dolibarr/dolibarr/commit/64e59c3f973e4f9e4d7e8a29ef9ea1b6480c2580
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-07 (Wed, 07 Mar 2018)
Changed paths:
M htdocs/categories/class/categorie.class.php
Log Message:
-----------
Merge pull request #8292 from hregis/7.0_bug6
Fix: avoid error if type is not numeric
Commit: a0774d523d234e83ef7fb26b3100ae94275c852d
https://github.com/Dolibarr/dolibarr/commit/a0774d523d234e83ef7fb26b3100ae94275c852d
Author: Regis Houssin <address@hidden>
Date: 2018-03-07 (Wed, 07 Mar 2018)
Changed paths:
M htdocs/core/lib/functions2.lib.php
M htdocs/core/modules/facture/mod_facture_mars.php
M htdocs/core/modules/facture/mod_facture_terre.php
Log Message:
-----------
Fix: avoid conflict between invoice and invoicenumber sharings
Commit: b2f6105ae251221a1c291ace826e8f5bca521a1c
https://github.com/Dolibarr/dolibarr/commit/b2f6105ae251221a1c291ace826e8f5bca521a1c
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-07 (Wed, 07 Mar 2018)
Changed paths:
M htdocs/core/actions_sendmails.inc.php
M htdocs/societe/card.php
Log Message:
-----------
FIX #8277
Commit: eeb5b4b2064d07b91c17b1f91a479e9071bc6b0e
https://github.com/Dolibarr/dolibarr/commit/eeb5b4b2064d07b91c17b1f91a479e9071bc6b0e
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-07 (Wed, 07 Mar 2018)
Changed paths:
M htdocs/categories/class/categorie.class.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Commit: f4f009d877dfcda54b5ba6ce9870f72698acf4f0
https://github.com/Dolibarr/dolibarr/commit/f4f009d877dfcda54b5ba6ce9870f72698acf4f0
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-07 (Wed, 07 Mar 2018)
Changed paths:
M htdocs/fourn/facture/card.php
Log Message:
-----------
FIX #8269
Commit: acc29ea1639ac0daa4f31f98822422e8b97abc8b
https://github.com/Dolibarr/dolibarr/commit/acc29ea1639ac0daa4f31f98822422e8b97abc8b
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-07 (Wed, 07 Mar 2018)
Changed paths:
M htdocs/fourn/card.php
Log Message:
-----------
FIX #8219
Commit: 884b74a6bb322a44e129ea54cf77e4399ad54536
https://github.com/Dolibarr/dolibarr/commit/884b74a6bb322a44e129ea54cf77e4399ad54536
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-03-07 (Wed, 07 Mar 2018)
Changed paths:
M htdocs/core/class/html.formfile.class.php
Log Message:
-----------
FIX: warning when adding ECM files using old photo path
Commit: c02e8e9831d6920132356b3c06bce20439f05019
https://github.com/Dolibarr/dolibarr/commit/c02e8e9831d6920132356b3c06bce20439f05019
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-07 (Wed, 07 Mar 2018)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Css
Commit: 69ef6a9316363895c8708b4fe2d0529daa823cbe
https://github.com/Dolibarr/dolibarr/commit/69ef6a9316363895c8708b4fe2d0529daa823cbe
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-07 (Wed, 07 Mar 2018)
Changed paths:
M htdocs/compta/paiement/card.php
Log Message:
-----------
Fix data on thirdparty tooltip
Commit: 78259db0ee701f9f97a732297a111f84c38bf566
https://github.com/Dolibarr/dolibarr/commit/78259db0ee701f9f97a732297a111f84c38bf566
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-07 (Wed, 07 Mar 2018)
Changed paths:
M htdocs/blockedlog/admin/blockedlog_list.php
M htdocs/blockedlog/ajax/block-info.php
M htdocs/blockedlog/class/blockedlog.class.php
Log Message:
-----------
Intorduce dolDecodeBlockedData
Commit: 317a5f5b2f3aa109fbfb22d9e0b7cd737868c111
https://github.com/Dolibarr/dolibarr/commit/317a5f5b2f3aa109fbfb22d9e0b7cd737868c111
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-07 (Wed, 07 Mar 2018)
Changed paths:
M htdocs/commande/list.php
M htdocs/core/actions_massactions.inc.php
Log Message:
-----------
Fix by adding a redirect to avoid the order2billing being done twice.
Commit: cab61724f28e044922309ee1cfc14f407b4a9452
https://github.com/Dolibarr/dolibarr/commit/cab61724f28e044922309ee1cfc14f407b4a9452
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-07 (Wed, 07 Mar 2018)
Changed paths:
M htdocs/blockedlog/class/blockedlog.class.php
Log Message:
-----------
Fix phpcs
Commit: d8dcebfa9aec5eb867bf9ff3d679019c50c3ceef
https://github.com/Dolibarr/dolibarr/commit/d8dcebfa9aec5eb867bf9ff3d679019c50c3ceef
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-07 (Wed, 07 Mar 2018)
Changed paths:
M htdocs/projet/tasks/time.php
Log Message:
-----------
FIX Do not lose filter when editing comment of a time spent in task view
Commit: 7a7c4b8f14e8ca1c3ef5a1e1820171562c3f5d2c
https://github.com/Dolibarr/dolibarr/commit/7a7c4b8f14e8ca1c3ef5a1e1820171562c3f5d2c
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-08 (Thu, 08 Mar 2018)
Changed paths:
M htdocs/public/paybox/paymentok.php
M htdocs/public/payment/paymentok.php
M htdocs/public/paypal/paymentok.php
M htdocs/public/stripe/paymentok.php
Log Message:
-----------
Fix invalid url
Commit: 343ca1bc777cfe80b7ae3d45aad48b2b8f78229b
https://github.com/Dolibarr/dolibarr/commit/343ca1bc777cfe80b7ae3d45aad48b2b8f78229b
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-08 (Thu, 08 Mar 2018)
Changed paths:
M htdocs/core/lib/functions2.lib.php
M htdocs/core/modules/facture/mod_facture_mars.php
M htdocs/core/modules/facture/mod_facture_terre.php
Log Message:
-----------
Merge pull request #8294 from hregis/7.0_bug5
Fix: avoid conflict between invoice and invoicenumber sharings
Commit: 6d0c4deb6e25c1cd2c81458e026d0733bb27800e
https://github.com/Dolibarr/dolibarr/commit/6d0c4deb6e25c1cd2c81458e026d0733bb27800e
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-08 (Thu, 08 Mar 2018)
Changed paths:
M htdocs/core/class/html.formfile.class.php
Log Message:
-----------
Merge pull request #8295 from ATM-Marc/FIX_product_photo_ecm
FIX: warning when adding ECM files using old photo path
Commit: 3762ed12c731ab1f20f2495b6c7b6d2c7c752b7c
https://github.com/Dolibarr/dolibarr/commit/3762ed12c731ab1f20f2495b6c7b6d2c7c752b7c
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-08 (Thu, 08 Mar 2018)
Changed paths:
M htdocs/core/lib/files.lib.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/core/class/html.formfile.class.php
Commit: af9fff4f83a0b5f51b26cfe7a6e902b443c8a19a
https://github.com/Dolibarr/dolibarr/commit/af9fff4f83a0b5f51b26cfe7a6e902b443c8a19a
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-08 (Thu, 08 Mar 2018)
Changed paths:
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/modules/facture/mod_facture_mars.php
M htdocs/core/modules/facture/mod_facture_terre.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Commit: 5b8006a6bb5fdee906edd5e61ccd559f722d904c
https://github.com/Dolibarr/dolibarr/commit/5b8006a6bb5fdee906edd5e61ccd559f722d904c
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-08 (Thu, 08 Mar 2018)
Changed paths:
M htdocs/categories/class/categorie.class.php
M htdocs/core/actions_sendmails.inc.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/modules/facture/mod_facture_mars.php
M htdocs/core/modules/facture/mod_facture_terre.php
M htdocs/fourn/card.php
M htdocs/fourn/facture/card.php
M htdocs/projet/tasks/time.php
M htdocs/public/paybox/paymentok.php
M htdocs/public/paypal/paymentok.php
M htdocs/public/stripe/paymentok.php
M htdocs/societe/card.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/public/payment/paymentok.php
htdocs/public/paypal/paymentok.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/8d56c9d3745f...5b8006a6bb5f