[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] b276a8: Fix sql entity for sub query
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] b276a8: Fix sql entity for sub query |
Date: |
Sun, 25 Feb 2018 06:01:50 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: b276a8186e8bf0b9b2b556ea2268664c31d1df5a
https://github.com/Dolibarr/dolibarr/commit/b276a8186e8bf0b9b2b556ea2268664c31d1df5a
Author: John <address@hidden>
Date: 2018-02-21 (Wed, 21 Feb 2018)
Changed paths:
M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
Log Message:
-----------
Fix sql entity for sub query
Commit: 1d6baf5f2bd69806314a82b9bdb449cad92fba36
https://github.com/Dolibarr/dolibarr/commit/1d6baf5f2bd69806314a82b9bdb449cad92fba36
Author: Juanjo Menent <address@hidden>
Date: 2018-02-22 (Thu, 22 Feb 2018)
Changed paths:
M htdocs/core/class/html.formactions.class.php
Log Message:
-----------
Fix: Not showing link to ad event if module is disabled
Commit: 36cc1c6ca95feb4111cff39d09e45012d1807c64
https://github.com/Dolibarr/dolibarr/commit/36cc1c6ca95feb4111cff39d09e45012d1807c64
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-02-23 (Fri, 23 Feb 2018)
Changed paths:
M htdocs/user/card.php
Log Message:
-----------
FIX: solve column mismatch in user card's usergroup list + code cleanup
Commit: 4c06384197dc8d47b836c2b8daaa6abead75948b
https://github.com/Dolibarr/dolibarr/commit/4c06384197dc8d47b836c2b8daaa6abead75948b
Author: Regis Houssin <address@hidden>
Date: 2018-02-24 (Sat, 24 Feb 2018)
Changed paths:
M htdocs/adherents/class/adherent_type.class.php
M htdocs/adherents/class/api_memberstypes.class.php
M htdocs/adherents/index.php
M htdocs/adherents/type.php
M htdocs/core/boxes/box_members.php
M htdocs/core/modules/mailings/fraise.modules.php
M htdocs/core/modules/modAdherent.class.php
M htdocs/societe/societecontact.php
Log Message:
-----------
Fix: differentiate sharing of "member" and "member_type"
Commit: 5ecbe2ae8103583868b94e3f2301640c4394d6d1
https://github.com/Dolibarr/dolibarr/commit/5ecbe2ae8103583868b94e3f2301640c4394d6d1
Author: Regis Houssin <address@hidden>
Date: 2018-02-24 (Sat, 24 Feb 2018)
Changed paths:
M htdocs/societe/card.php
Log Message:
-----------
Fix: Use of undefined constant _ROWS_2
Commit: 3859b5a92662c6fe3de5f31e06d36c050dcd9d15
https://github.com/Dolibarr/dolibarr/commit/3859b5a92662c6fe3de5f31e06d36c050dcd9d15
Author: Regis Houssin <address@hidden>
Date: 2018-02-24 (Sat, 24 Feb 2018)
Changed paths:
M htdocs/core/actions_massactions.inc.php
Log Message:
-----------
Fix: Parameter must be an array or an object that implements Countable
Commit: b2162492147f26443e051f84d477ae4d6526e6f6
https://github.com/Dolibarr/dolibarr/commit/b2162492147f26443e051f84d477ae4d6526e6f6
Author: Regis Houssin <address@hidden>
Date: 2018-02-24 (Sat, 24 Feb 2018)
Changed paths:
M htdocs/adherents/list.php
M htdocs/comm/propal/list.php
M htdocs/commande/list.php
M htdocs/compta/facture/list.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/facture/list.php
M htdocs/product/list.php
M htdocs/supplier_proposal/list.php
M htdocs/user/index.php
Log Message:
-----------
Fix: missing hook parameters
Commit: 703d976b3bd2929c6de2cf26a5a936be7417c7a2
https://github.com/Dolibarr/dolibarr/commit/703d976b3bd2929c6de2cf26a5a936be7417c7a2
Author: Regis Houssin <address@hidden>
Date: 2018-02-24 (Sat, 24 Feb 2018)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
Log Message:
-----------
Fix: missing object entity in fetch
Commit: b20ae45265b522589c709ff7ea62b6f14239f7d6
https://github.com/Dolibarr/dolibarr/commit/b20ae45265b522589c709ff7ea62b6f14239f7d6
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-25 (Sun, 25 Feb 2018)
Changed paths:
M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
Log Message:
-----------
Merge pull request #8210 from atm-john/fix_sql_entity
Fix sql entity for sub query
Commit: c698558d9e1406d4c87d0bdc13a4de925b627ac9
https://github.com/Dolibarr/dolibarr/commit/c698558d9e1406d4c87d0bdc13a4de925b627ac9
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-25 (Sun, 25 Feb 2018)
Changed paths:
M htdocs/core/class/html.formactions.class.php
Log Message:
-----------
Merge pull request #8212 from simnandez/6.0
Fix: Not showing link to ad event if module is disabled
Commit: 7b448a2d18b0e2b78b614642cc979aa59842ad28
https://github.com/Dolibarr/dolibarr/commit/7b448a2d18b0e2b78b614642cc979aa59842ad28
Author: Rui Strecht <address@hidden>
Date: 2018-02-25 (Sun, 25 Feb 2018)
Changed paths:
M htdocs/projet/class/project.class.php
Log Message:
-----------
Fixed issue with elementarray null if num_rows = 0
Commit: 286d62edb841c0e4a2a2d5e57c2c6bb59143f37e
https://github.com/Dolibarr/dolibarr/commit/286d62edb841c0e4a2a2d5e57c2c6bb59143f37e
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-25 (Sun, 25 Feb 2018)
Changed paths:
M htdocs/user/card.php
Log Message:
-----------
Merge pull request #8221 from ATM-Marc/FIX_usercard_columns
FIX: solve column mismatch in user card with multicompany transverse mode +
code cleanup
Commit: 8dceb8930f46b435951b8c649506363e844c1137
https://github.com/Dolibarr/dolibarr/commit/8dceb8930f46b435951b8c649506363e844c1137
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-25 (Sun, 25 Feb 2018)
Changed paths:
M htdocs/core/class/html.formactions.class.php
M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
M htdocs/user/card.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/core/class/html.formactions.class.php
htdocs/user/card.php
Commit: 4581d6049cb17b641bbd29eedd98ee76e6e40d8e
https://github.com/Dolibarr/dolibarr/commit/4581d6049cb17b641bbd29eedd98ee76e6e40d8e
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-25 (Sun, 25 Feb 2018)
Changed paths:
M htdocs/societe/societecontact.php
Log Message:
-----------
Update societecontact.php
Commit: 6c16f2af1eccf88f83542f7dd0a9cdbd4d7f0592
https://github.com/Dolibarr/dolibarr/commit/6c16f2af1eccf88f83542f7dd0a9cdbd4d7f0592
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-25 (Sun, 25 Feb 2018)
Changed paths:
M htdocs/adherents/class/adherent_type.class.php
M htdocs/adherents/class/api_memberstypes.class.php
M htdocs/adherents/index.php
M htdocs/adherents/type.php
M htdocs/core/boxes/box_members.php
M htdocs/core/modules/mailings/fraise.modules.php
M htdocs/core/modules/modAdherent.class.php
M htdocs/societe/societecontact.php
Log Message:
-----------
Merge pull request #8226 from hregis/7.0_multicompany
Fix: differentiate sharing of "member" and "member_type"
Commit: 7dfedbf35cb3ddf4a3b04d47f8802dd98f261c42
https://github.com/Dolibarr/dolibarr/commit/7dfedbf35cb3ddf4a3b04d47f8802dd98f261c42
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-25 (Sun, 25 Feb 2018)
Changed paths:
M htdocs/societe/card.php
Log Message:
-----------
Merge pull request #8228 from hregis/7.0_bug
FIX Use of undefined constant _ROWS_2
Commit: 898f2cf0ca1915524ee67e2499179d857168aa6b
https://github.com/Dolibarr/dolibarr/commit/898f2cf0ca1915524ee67e2499179d857168aa6b
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-25 (Sun, 25 Feb 2018)
Changed paths:
M htdocs/core/actions_massactions.inc.php
Log Message:
-----------
Merge pull request #8229 from hregis/7.0_bug3
FIX Parameter must be an array or an object that implements Countable
Commit: 0262b64eb10d35152ebdfad72d1b3ebdae8b7c76
https://github.com/Dolibarr/dolibarr/commit/0262b64eb10d35152ebdfad72d1b3ebdae8b7c76
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-25 (Sun, 25 Feb 2018)
Changed paths:
M htdocs/adherents/list.php
M htdocs/comm/propal/list.php
M htdocs/commande/list.php
M htdocs/compta/facture/list.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/facture/list.php
M htdocs/product/list.php
M htdocs/supplier_proposal/list.php
M htdocs/user/index.php
Log Message:
-----------
Merge pull request #8230 from hregis/7.0_bug4
Fix: missing hook parameters
Commit: 0a571a0677a90560d2e175e03660a861beb0fb5d
https://github.com/Dolibarr/dolibarr/commit/0a571a0677a90560d2e175e03660a861beb0fb5d
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-25 (Sun, 25 Feb 2018)
Changed paths:
M htdocs/modulebuilder/template/myobject_list.php
Log Message:
-----------
Complete fix #8230
Commit: 68e0283fe40c0560dcc6c471cf88dcd5ae75ade0
https://github.com/Dolibarr/dolibarr/commit/68e0283fe40c0560dcc6c471cf88dcd5ae75ade0
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-25 (Sun, 25 Feb 2018)
Changed paths:
M htdocs/adherents/class/adherent_type.class.php
M htdocs/adherents/class/api_memberstypes.class.php
M htdocs/adherents/index.php
M htdocs/adherents/list.php
M htdocs/adherents/type.php
M htdocs/comm/propal/list.php
M htdocs/commande/list.php
M htdocs/compta/facture/list.php
M htdocs/core/actions_massactions.inc.php
M htdocs/core/boxes/box_members.php
M htdocs/core/modules/mailings/fraise.modules.php
M htdocs/core/modules/modAdherent.class.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/facture/list.php
M htdocs/product/list.php
M htdocs/societe/card.php
M htdocs/societe/societecontact.php
M htdocs/supplier_proposal/list.php
M htdocs/user/index.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Commit: 502f219f7f7e2d7b9636124bbd9d086767fb3e3f
https://github.com/Dolibarr/dolibarr/commit/502f219f7f7e2d7b9636124bbd9d086767fb3e3f
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-25 (Sun, 25 Feb 2018)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
Log Message:
-----------
Merge pull request #8231 from hregis/7.0_entity
FIX missing object entity in fetch
Commit: 251136bebf0cf02b216daa69463384b0c05b7b0e
https://github.com/Dolibarr/dolibarr/commit/251136bebf0cf02b216daa69463384b0c05b7b0e
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-25 (Sun, 25 Feb 2018)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Fix PHPUnit
Commit: 7ff94c88bd09265c55e3d859586e4aef080e2a0c
https://github.com/Dolibarr/dolibarr/commit/7ff94c88bd09265c55e3d859586e4aef080e2a0c
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-25 (Sun, 25 Feb 2018)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Commit: 003827eb06032f0f43207bf3ea3a3f8ce3a8b16c
https://github.com/Dolibarr/dolibarr/commit/003827eb06032f0f43207bf3ea3a3f8ce3a8b16c
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-25 (Sun, 25 Feb 2018)
Changed paths:
M htdocs/adherents/class/adherent_type.class.php
M htdocs/adherents/class/api_memberstypes.class.php
M htdocs/adherents/index.php
M htdocs/adherents/list.php
M htdocs/adherents/type.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/comm/propal/list.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/list.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/list.php
M htdocs/core/actions_massactions.inc.php
M htdocs/core/boxes/box_members.php
M htdocs/core/class/html.formactions.class.php
M htdocs/core/modules/mailings/fraise.modules.php
M htdocs/core/modules/modAdherent.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/facture/list.php
M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
M htdocs/modulebuilder/template/myobject_list.php
M htdocs/product/list.php
M htdocs/societe/card.php
M htdocs/societe/societecontact.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
M htdocs/supplier_proposal/list.php
M htdocs/user/card.php
M htdocs/user/index.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/b52a2b12a515...003827eb0603