[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 27100d: FIX : Avoid empty value to fk
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 27100d: FIX : Avoid empty value to fk_multicurrency attrib... |
Date: |
Wed, 07 Mar 2018 04:06:41 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 27100df927c4c98a25daaf2de8a2200a8a79164c
https://github.com/Dolibarr/dolibarr/commit/27100df927c4c98a25daaf2de8a2200a8a79164c
Author: ATM-Nicolas <address@hidden>
Date: 2018-02-27 (Tue, 27 Feb 2018)
Changed paths:
M htdocs/commande/class/commande.class.php
Log Message:
-----------
FIX : Avoid empty value to fk_multicurrency attribute
Commit: 60f8ca12832db6a08de51a1f7ba5e8eb2b4bfcff
https://github.com/Dolibarr/dolibarr/commit/60f8ca12832db6a08de51a1f7ba5e8eb2b4bfcff
Author: ATM-Nicolas <address@hidden>
Date: 2018-03-05 (Mon, 05 Mar 2018)
Changed paths:
M htdocs/accountancy/bookkeeping/balance.php
M htdocs/compta/facture/class/facture.class.php
M scripts/product/migrate_picture_path.php
Log Message:
-----------
Merge branch '6.0' of github.com:Dolibarr/dolibarr into
fix_order_line_fk_multicurrency
Commit: f9f37c52de48afe3a11e3b4635045122abe9099f
https://github.com/Dolibarr/dolibarr/commit/f9f37c52de48afe3a11e3b4635045122abe9099f
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-05 (Mon, 05 Mar 2018)
Changed paths:
M htdocs/commande/class/commande.class.php
Log Message:
-----------
Merge pull request #8275 from ATM-Nicolas/fix_order_line_fk_multicurrency
Fix order line fk multicurrency
Commit: 35703cff99ee56d82ee4d89e3fc86d8fcd470c7d
https://github.com/Dolibarr/dolibarr/commit/35703cff99ee56d82ee4d89e3fc86d8fcd470c7d
Author: Regis Houssin <address@hidden>
Date: 2018-03-06 (Tue, 06 Mar 2018)
Changed paths:
M htdocs/accountancy/class/bookkeeping.class.php
Log Message:
-----------
Fix: wrong entity id, already value 1 !
Commit: 1807bb36e254047b53e1fda168bf1686b1eec02e
https://github.com/Dolibarr/dolibarr/commit/1807bb36e254047b53e1fda168bf1686b1eec02e
Author: Regis Houssin <address@hidden>
Date: 2018-03-06 (Tue, 06 Mar 2018)
Changed paths:
M htdocs/accountancy/class/bookkeeping.class.php
Log Message:
-----------
Fix: missing global $conf
Commit: d406b289111f57478e19db6dbcc2ea1392e117da
https://github.com/Dolibarr/dolibarr/commit/d406b289111f57478e19db6dbcc2ea1392e117da
Author: Regis Houssin <address@hidden>
Date: 2018-03-06 (Tue, 06 Mar 2018)
Changed paths:
M htdocs/user/class/user.class.php
M htdocs/user/home.php
M htdocs/user/index.php
Log Message:
-----------
Fix: problem to see users with transverse mode
Commit: 175971bfc1bd3a7347cf3337aef88acb5c3d7c1f
https://github.com/Dolibarr/dolibarr/commit/175971bfc1bd3a7347cf3337aef88acb5c3d7c1f
Author: Regis Houssin <address@hidden>
Date: 2018-03-06 (Tue, 06 Mar 2018)
Changed paths:
M htdocs/user/class/user.class.php
M htdocs/user/home.php
Log Message:
-----------
Fix: syntax error
Commit: bf4402eb89efdd55dc0d00440350ec06f4debb29
https://github.com/Dolibarr/dolibarr/commit/bf4402eb89efdd55dc0d00440350ec06f4debb29
Author: Regis Houssin <address@hidden>
Date: 2018-03-06 (Tue, 06 Mar 2018)
Changed paths:
M htdocs/user/class/user.class.php
M htdocs/user/home.php
M htdocs/user/index.php
Log Message:
-----------
Fix: missing superadmin
Commit: 03873038d5706f8ecd84c986c14bfe9b12e23957
https://github.com/Dolibarr/dolibarr/commit/03873038d5706f8ecd84c986c14bfe9b12e23957
Author: florian HENRY <address@hidden>
Date: 2018-03-07 (Wed, 07 Mar 2018)
Changed paths:
M htdocs/core/class/comment.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/projet/tasks/comment.php
Log Message:
-----------
fix comment task
Commit: bb73a715a853b26eaba2b4162a8794ebcf5658f3
https://github.com/Dolibarr/dolibarr/commit/bb73a715a853b26eaba2b4162a8794ebcf5658f3
Author: florian HENRY <address@hidden>
Date: 2018-03-07 (Wed, 07 Mar 2018)
Changed paths:
M htdocs/accountancy/admin/journals_list.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/journal/expensereportsjournal.php
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/resultat/index.php
M htdocs/compta/stats/index.php
M htdocs/core/lib/functions.lib.php
M htdocs/langs/en_US/compta.lang
M htdocs/langs/en_US/main.lang
M htdocs/projet/class/task.class.php
M htdocs/projet/tasks/contact.php
M htdocs/projet/tasks/document.php
M htdocs/projet/tasks/note.php
M htdocs/projet/tasks/task.php
M htdocs/projet/tasks/time.php
Log Message:
-----------
Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into
7.0_fix_comment_task
Commit: 6cb77577a634f2958e52ac3f2161c1789ed09636
https://github.com/Dolibarr/dolibarr/commit/6cb77577a634f2958e52ac3f2161c1789ed09636
Author: florian HENRY <address@hidden>
Date: 2018-03-07 (Wed, 07 Mar 2018)
Changed paths:
M htdocs/core/tpl/bloc_comment.tpl.php
Log Message:
-----------
can use image
Commit: cb27eb98e10a17406955a86f99e3c960b46b0671
https://github.com/Dolibarr/dolibarr/commit/cb27eb98e10a17406955a86f99e3c960b46b0671
Author: alexis Algoud <address@hidden>
Date: 2018-03-07 (Wed, 07 Mar 2018)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
FIX natural search double quote
Commit: dd208348c48921fd2c8550819f61c284161de5b2
https://github.com/Dolibarr/dolibarr/commit/dd208348c48921fd2c8550819f61c284161de5b2
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-03-07 (Wed, 07 Mar 2018)
Changed paths:
M htdocs/core/modules/modCommande.class.php
M htdocs/core/modules/modFournisseur.class.php
Log Message:
-----------
FIX: add planned delivery to order exports
Commit: 2053cc930718d8221e44d98e85381443a112e806
https://github.com/Dolibarr/dolibarr/commit/2053cc930718d8221e44d98e85381443a112e806
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-07 (Wed, 07 Mar 2018)
Changed paths:
M htdocs/accountancy/class/bookkeeping.class.php
Log Message:
-----------
Merge pull request #8284 from hregis/7.0_bug5
Fix: wrong entity id, always value 1 !
Commit: ee1a2c49fde2003654674c73198fd7e1b677d7cb
https://github.com/Dolibarr/dolibarr/commit/ee1a2c49fde2003654674c73198fd7e1b677d7cb
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-07 (Wed, 07 Mar 2018)
Changed paths:
M htdocs/user/class/user.class.php
M htdocs/user/home.php
M htdocs/user/index.php
Log Message:
-----------
Merge pull request #8287 from hregis/7.0_bug3
Fix: problem to see users with transverse mode
Commit: f7f9f0e605d19732bf88da06d637fe3b33e724de
https://github.com/Dolibarr/dolibarr/commit/f7f9f0e605d19732bf88da06d637fe3b33e724de
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-07 (Wed, 07 Mar 2018)
Changed paths:
M htdocs/projet/tasks/comment.php
Log Message:
-----------
Update comment.php
Commit: e518303e1bd3d05547614927b13b33777a53dc14
https://github.com/Dolibarr/dolibarr/commit/e518303e1bd3d05547614927b13b33777a53dc14
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-07 (Wed, 07 Mar 2018)
Changed paths:
M htdocs/core/class/comment.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/tpl/bloc_comment.tpl.php
M htdocs/projet/tasks/comment.php
Log Message:
-----------
Merge pull request #8288 from atm-florian/7.0_fix_comment_task
FIX comment on tasks
Commit: 3284ebdcf12f77f77bf1712e454efbce402c960b
https://github.com/Dolibarr/dolibarr/commit/3284ebdcf12f77f77bf1712e454efbce402c960b
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-07 (Wed, 07 Mar 2018)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Merge pull request #8290 from atm-alexis/6.0_fix_natural_search_double_space
FIX natural search double quote
Commit: 94de6efa4b07f86de8ac7866951f66b03a46ac56
https://github.com/Dolibarr/dolibarr/commit/94de6efa4b07f86de8ac7866951f66b03a46ac56
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-07 (Wed, 07 Mar 2018)
Changed paths:
M htdocs/core/modules/modCommande.class.php
M htdocs/core/modules/modFournisseur.class.php
Log Message:
-----------
Merge pull request #8291 from ATM-Marc/FIX_order_export_date_livraison
FIX: add planned delivery to order exports
Commit: 4caefbe926cd6d84144c0f52a5f42c41f7a0df02
https://github.com/Dolibarr/dolibarr/commit/4caefbe926cd6d84144c0f52a5f42c41f7a0df02
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-07 (Wed, 07 Mar 2018)
Changed paths:
M htdocs/core/modules/modCommande.class.php
M htdocs/core/modules/modFournisseur.class.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Commit: 8b9041b93ee2bb62dacf2eaebcdd9518b5a9917c
https://github.com/Dolibarr/dolibarr/commit/8b9041b93ee2bb62dacf2eaebcdd9518b5a9917c
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-07 (Wed, 07 Mar 2018)
Changed paths:
M htdocs/core/modules/modCommande.class.php
M htdocs/core/modules/modFournisseur.class.php
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into 6.0
Commit: 004839b368248800da2070250a63dc4fc942dd3b
https://github.com/Dolibarr/dolibarr/commit/004839b368248800da2070250a63dc4fc942dd3b
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-07 (Wed, 07 Mar 2018)
Changed paths:
M htdocs/commande/class/commande.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/modules/modCommande.class.php
M htdocs/core/modules/modFournisseur.class.php
M scripts/product/migrate_picture_path.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Commit: f8d8c5c6580d0df50a998b0f570fbd0755637754
https://github.com/Dolibarr/dolibarr/commit/f8d8c5c6580d0df50a998b0f570fbd0755637754
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-07 (Wed, 07 Mar 2018)
Changed paths:
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/core/class/comment.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/tpl/bloc_comment.tpl.php
M htdocs/projet/tasks/comment.php
M htdocs/user/class/user.class.php
M htdocs/user/home.php
M htdocs/user/index.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Commit: 7e6ba51780393072cdb67c5983e12abb80ba9227
https://github.com/Dolibarr/dolibarr/commit/7e6ba51780393072cdb67c5983e12abb80ba9227
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-07 (Wed, 07 Mar 2018)
Changed paths:
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/core/class/comment.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/modules/modCommande.class.php
M htdocs/core/modules/modFournisseur.class.php
M htdocs/core/tpl/bloc_comment.tpl.php
M htdocs/projet/tasks/comment.php
M htdocs/user/class/user.class.php
M htdocs/user/home.php
M htdocs/user/index.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/projet/tasks/comment.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/c1c6720edcf3...7e6ba5178039