[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] d79340: FIX: stock replenish: fetchin
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] d79340: FIX: stock replenish: fetching and freeing non exi... |
|
Date: |
Tue, 22 Oct 2019 19:04:38 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: d79340a6325aada703073a2a295e8be27234e1bd
https://github.com/Dolibarr/dolibarr/commit/d79340a6325aada703073a2a295e8be27234e1bd
Author: Marc de Lima Lucio <address@hidden>
Date: 2019-10-17 (Thu, 17 Oct 2019)
Changed paths:
M htdocs/product/stock/replenish.php
Log Message:
-----------
FIX: stock replenish: fetching and freeing non existing SQL result set
Commit: 9cd2406d50f0077c6e8d008a3b1fb2eef457498f
https://github.com/Dolibarr/dolibarr/commit/9cd2406d50f0077c6e8d008a3b1fb2eef457498f
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-17 (Thu, 17 Oct 2019)
Changed paths:
M htdocs/product/stock/replenish.php
Log Message:
-----------
Merge pull request #12156 from ATM-Marc/FIX_8.0_replenish_resql
FIX: stock replenish: fetching and freeing non existing SQL result set
Commit: 373d6d60e7bbf9c0a75df69d5a6c304526788280
https://github.com/Dolibarr/dolibarr/commit/373d6d60e7bbf9c0a75df69d5a6c304526788280
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-17 (Thu, 17 Oct 2019)
Changed paths:
M htdocs/filefunc.inc.php
Log Message:
-----------
Add a message
Commit: d442134a51d7cbca93605d968ce2aaa18b7fb23c
https://github.com/Dolibarr/dolibarr/commit/d442134a51d7cbca93605d968ce2aaa18b7fb23c
Author: Frédéric FRANCE <address@hidden>
Date: 2019-10-17 (Thu, 17 Oct 2019)
Changed paths:
M htdocs/bookmarks/bookmarks.lib.php
Log Message:
-----------
fix cant add bookmark with csrf active
Commit: aeafdae34c87a5c3324abdc87a054907badeefcb
https://github.com/Dolibarr/dolibarr/commit/aeafdae34c87a5c3324abdc87a054907badeefcb
Author: Frédéric FRANCE <address@hidden>
Date: 2019-10-17 (Thu, 17 Oct 2019)
Changed paths:
M htdocs/langs/en_US/main.lang
Log Message:
-----------
Update main.lang
Commit: f9c0e63f169ecc68f048251c4116d0594ac9db39
https://github.com/Dolibarr/dolibarr/commit/f9c0e63f169ecc68f048251c4116d0594ac9db39
Author: Frédéric FRANCE <address@hidden>
Date: 2019-10-17 (Thu, 17 Oct 2019)
Changed paths:
M htdocs/langs/fr_FR/main.lang
Log Message:
-----------
Update main.lang
Commit: ce1b4432124993cf35d31417ea17dd7d29bfb593
https://github.com/Dolibarr/dolibarr/commit/ce1b4432124993cf35d31417ea17dd7d29bfb593
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-18 (Fri, 18 Oct 2019)
Changed paths:
M htdocs/product/stock/replenish.php
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into 9.0
Commit: b5390bfb3cae471f2b55274b5a71a7efb2c9e43e
https://github.com/Dolibarr/dolibarr/commit/b5390bfb3cae471f2b55274b5a71a7efb2c9e43e
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-20 (Sun, 20 Oct 2019)
Changed paths:
M htdocs/langs/en_US/main.lang
M htdocs/langs/fr_FR/main.lang
Log Message:
-----------
Merge pull request #12167 from frederic34/patch-14
Update main.lang
Commit: 40135e043ea114dee684f97765645e629bc34138
https://github.com/Dolibarr/dolibarr/commit/40135e043ea114dee684f97765645e629bc34138
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-20 (Sun, 20 Oct 2019)
Changed paths:
M htdocs/bookmarks/bookmarks.lib.php
Log Message:
-----------
Merge pull request #12166 from frederic34/patch-13
fix cant add bookmark with csrf active
Commit: 2fb521667c3b2b3418f641595047c466ec093fed
https://github.com/Dolibarr/dolibarr/commit/2fb521667c3b2b3418f641595047c466ec093fed
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-22 (Tue, 22 Oct 2019)
Changed paths:
M ChangeLog
Log Message:
-----------
Doc
Commit: 84c8b6b5d1f6a9871ec79c610728807c9d1197f7
https://github.com/Dolibarr/dolibarr/commit/84c8b6b5d1f6a9871ec79c610728807c9d1197f7
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-22 (Tue, 22 Oct 2019)
Changed paths:
M htdocs/contact/card.php
M htdocs/contact/class/contact.class.php
M htdocs/public/emailing/mailing-unsubscribe.php
Log Message:
-----------
FIX #12198
Commit: 6079a4d1591d7aa1b8fa3742930fe88d1da01e7d
https://github.com/Dolibarr/dolibarr/commit/6079a4d1591d7aa1b8fa3742930fe88d1da01e7d
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-22 (Tue, 22 Oct 2019)
Changed paths:
M htdocs/bookmarks/bookmarks.lib.php
M htdocs/langs/en_US/main.lang
M htdocs/langs/fr_FR/main.lang
M htdocs/product/stock/replenish.php
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/langs/en_US/main.lang
Commit: 44ced0cbeb95f2a934c85569906931e261ec5bee
https://github.com/Dolibarr/dolibarr/commit/44ced0cbeb95f2a934c85569906931e261ec5bee
Author: gauthier <address@hidden>
Date: 2019-10-22 (Tue, 22 Oct 2019)
Changed paths:
M htdocs/product/list.php
Log Message:
-----------
FIX : if we search something with global search, and after with form fields,
we want to stay on Products AND Services list
Commit: c4be61c55cf506feb39021abb09561fdf1ced3d5
https://github.com/Dolibarr/dolibarr/commit/c4be61c55cf506feb39021abb09561fdf1ced3d5
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-22 (Tue, 22 Oct 2019)
Changed paths:
M htdocs/core/class/commondocgenerator.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/cunits.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/product.lib.php
M htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
M htdocs/core/modules/reception/doc/pdf_squille.modules.php
M htdocs/expedition/card.php
M htdocs/product/canvas/product/actions_card_product.class.php
M htdocs/product/card.php
M htdocs/product/class/html.formproduct.class.php
M htdocs/product/class/product.class.php
M htdocs/reception/card.php
M htdocs/variants/combinations.php
M htdocs/variants/generator.php
Log Message:
-----------
FIX Better compatible fix for the trouble of weight / size units
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/product/card.php
Commit: 2f0b791cfe44d9d3d997d16ccb9f561cb8b60a2d
https://github.com/Dolibarr/dolibarr/commit/2f0b791cfe44d9d3d997d16ccb9f561cb8b60a2d
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-22 (Tue, 22 Oct 2019)
Changed paths:
M htdocs/product/list.php
Log Message:
-----------
Merge pull request #12202 from
atm-gauthier/10.0_fix_search_on_product_and_service
FIX : if we search something with global search, and after with form …
Commit: f23804a091e31dab22041629ae15ebf78c55a52a
https://github.com/Dolibarr/dolibarr/commit/f23804a091e31dab22041629ae15ebf78c55a52a
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-23 (Wed, 23 Oct 2019)
Changed paths:
M htdocs/core/modules/modProduct.class.php
M htdocs/langs/en_US/products.lang
Log Message:
-----------
FIX #12152
Commit: 2e573fd7947c0d99950bb0e5e0f393bf234808d0
https://github.com/Dolibarr/dolibarr/commit/2e573fd7947c0d99950bb0e5e0f393bf234808d0
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-23 (Wed, 23 Oct 2019)
Changed paths:
M htdocs/expedition/card.php
M htdocs/expedition/class/expedition.class.php
M htdocs/product/canvas/product/actions_card_product.class.php
M htdocs/product/class/product.class.php
M htdocs/reception/card.php
Log Message:
-----------
Fix save of units
Conflicts:
htdocs/expedition/card.php
htdocs/product/card.php
htdocs/product/class/product.class.php
Commit: 161f2a018f68da7fdc2e074c3fb524be335e1c0d
https://github.com/Dolibarr/dolibarr/commit/161f2a018f68da7fdc2e074c3fb524be335e1c0d
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-23 (Wed, 23 Oct 2019)
Changed paths:
M htdocs/comm/propal/card.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/expedition/shipment.php
Log Message:
-----------
Fix responsive and bad closing td
Commit: 034b3bc814c4681e1bb4b1961610fc91634f2a75
https://github.com/Dolibarr/dolibarr/commit/034b3bc814c4681e1bb4b1961610fc91634f2a75
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-23 (Wed, 23 Oct 2019)
Changed paths:
M htdocs/expedition/card.php
Log Message:
-----------
Css
Commit: da00591bbaae03bdd1c793ba693460af36e78118
https://github.com/Dolibarr/dolibarr/commit/da00591bbaae03bdd1c793ba693460af36e78118
Author: Laurent Destailleur <address@hidden>
Date: 2019-10-23 (Wed, 23 Oct 2019)
Changed paths:
M ChangeLog
M htdocs/bookmarks/bookmarks.lib.php
M htdocs/comm/propal/card.php
M htdocs/core/lib/product.lib.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/expedition/card.php
M htdocs/expedition/shipment.php
M htdocs/langs/en_US/main.lang
M htdocs/langs/fr_FR/main.lang
M htdocs/product/list.php
M htdocs/product/stock/replenish.php
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/product.lib.php
htdocs/expedition/card.php
htdocs/product/list.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/f0355b305786...da00591bbaae