[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] a5814c: Fix: nocheck for "fournisseur
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] a5814c: Fix: nocheck for "fournisseur", already check with... |
|
Date: |
Wed, 14 Feb 2018 13:09:30 -0800 |
Branch: refs/heads/7.0
Home: https://github.com/Dolibarr/dolibarr
Commit: a5814ce77907f7a2c7b874b493324596a64796b0
https://github.com/Dolibarr/dolibarr/commit/a5814ce77907f7a2c7b874b493324596a64796b0
Author: Regis Houssin <address@hidden>
Date: 2018-02-09 (Fri, 09 Feb 2018)
Changed paths:
M htdocs/core/lib/security.lib.php
Log Message:
-----------
Fix: nocheck for "fournisseur", already check with "societe"
Commit: 67ce71bc487feba279c83c57cfb287a6bea08f52
https://github.com/Dolibarr/dolibarr/commit/67ce71bc487feba279c83c57cfb287a6bea08f52
Author: Juanjo Menent <address@hidden>
Date: 2018-02-09 (Fri, 09 Feb 2018)
Changed paths:
M htdocs/contrat/tpl/linkedobjectblock.tpl.php
Log Message:
-----------
Fix: Contracts not show price
Commit: d731857fd0dfaa0ac22ee8db3d8aa1ce29f5d4f5
https://github.com/Dolibarr/dolibarr/commit/d731857fd0dfaa0ac22ee8db3d8aa1ce29f5d4f5
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-12 (Mon, 12 Feb 2018)
Changed paths:
M htdocs/contrat/tpl/linkedobjectblock.tpl.php
Log Message:
-----------
Update linkedobjectblock.tpl.php
Commit: 4d6f87e54449238488512e30243372508bc3c3d4
https://github.com/Dolibarr/dolibarr/commit/4d6f87e54449238488512e30243372508bc3c3d4
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-12 (Mon, 12 Feb 2018)
Changed paths:
M htdocs/contrat/tpl/linkedobjectblock.tpl.php
Log Message:
-----------
Merge pull request #8168 from simnandez/6.0
Fix: Contracts not show price
Commit: abb7e651d13f937de3f001bbb535cc52ec8814f5
https://github.com/Dolibarr/dolibarr/commit/abb7e651d13f937de3f001bbb535cc52ec8814f5
Author: Regis Houssin <address@hidden>
Date: 2018-02-12 (Mon, 12 Feb 2018)
Changed paths:
M htdocs/contrat/class/contrat.class.php
M htdocs/contrat/tpl/linkedobjectblock.tpl.php
M htdocs/core/lib/security.lib.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
Log Message:
-----------
Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0_bug
Commit: 448fcae02fc36f196883460814f0df8416d2b0c8
https://github.com/Dolibarr/dolibarr/commit/448fcae02fc36f196883460814f0df8416d2b0c8
Author: Regis Houssin <address@hidden>
Date: 2018-02-12 (Mon, 12 Feb 2018)
Changed paths:
M htdocs/core/lib/security.lib.php
Log Message:
-----------
Fix: move "fournisseur" in $checksoc
Commit: 24cc687724758e474d2e772a41532e252ec884e3
https://github.com/Dolibarr/dolibarr/commit/24cc687724758e474d2e772a41532e252ec884e3
Author: Regis Houssin <address@hidden>
Date: 2018-02-12 (Mon, 12 Feb 2018)
Changed paths:
M htdocs/core/lib/security.lib.php
M htdocs/product/fournisseurs.php
Log Message:
-----------
Fix: you can't check "fournisseur" with checkUserAccessToObject without
object ID
Commit: ef051716410fcb7eef18447f6facc1086924beec
https://github.com/Dolibarr/dolibarr/commit/ef051716410fcb7eef18447f6facc1086924beec
Author: Maxime Kohlhaas <address@hidden>
Date: 2018-02-12 (Mon, 12 Feb 2018)
Changed paths:
M htdocs/contrat/services.php
Log Message:
-----------
Fix : contract service list context was mixing up with service list from
product/service module
Commit: 1052213c978274c3bacb2188aba0c6b4b91f96c3
https://github.com/Dolibarr/dolibarr/commit/1052213c978274c3bacb2188aba0c6b4b91f96c3
Author: De Coninck Laurent <address@hidden>
Date: 2018-02-12 (Mon, 12 Feb 2018)
Changed paths:
M htdocs/adherents/type.php
Log Message:
-----------
Fix 8183 - adherent welcome e-mail
Fix the adherent welcome e-mail.
[see: #8183]
Commit: 144c13998a87fba22acf7bbf20f8b89adc2ad2e0
https://github.com/Dolibarr/dolibarr/commit/144c13998a87fba22acf7bbf20f8b89adc2ad2e0
Author: atm-quentin <address@hidden>
Date: 2018-02-13 (Tue, 13 Feb 2018)
Changed paths:
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
Log Message:
-----------
NEW_einstein_pdf_modules
Commit: c690dfb25803a2a37b80cecab0b8dbcf19f9eddd
https://github.com/Dolibarr/dolibarr/commit/c690dfb25803a2a37b80cecab0b8dbcf19f9eddd
Author: atm-ph <address@hidden>
Date: 2018-02-14 (Wed, 14 Feb 2018)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Fix apply global progress don't update multicurrency values
Commit: fa2fddcdc13e77e7f098db4e79cd5574d6e06c74
https://github.com/Dolibarr/dolibarr/commit/fa2fddcdc13e77e7f098db4e79cd5574d6e06c74
Author: Regis Houssin <address@hidden>
Date: 2018-02-14 (Wed, 14 Feb 2018)
Changed paths:
M ChangeLog
M htdocs/install/upgrade2.php
M htdocs/langs/en_US/install.lang
Log Message:
-----------
Fix: Update entity field in llx_user_rights and llx_usergroup_rights
Commit: 23ee6748f7244b199cdaeaff5ffe32602d6f1f05
https://github.com/Dolibarr/dolibarr/commit/23ee6748f7244b199cdaeaff5ffe32602d6f1f05
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-14 (Wed, 14 Feb 2018)
Changed paths:
M htdocs/product/fournisseurs.php
Log Message:
-----------
Update fournisseurs.php
Commit: 27c55635f353cdb8200d7d9a9498a10ecdb93123
https://github.com/Dolibarr/dolibarr/commit/27c55635f353cdb8200d7d9a9498a10ecdb93123
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-14 (Wed, 14 Feb 2018)
Changed paths:
M htdocs/product/fournisseurs.php
Log Message:
-----------
Merge pull request #8164 from hregis/6.0_bug
Fix: nocheck for "fournisseur", already check with "societe"
Commit: 94a76a1393d1bbfab818fb50b5f8c86433a20014
https://github.com/Dolibarr/dolibarr/commit/94a76a1393d1bbfab818fb50b5f8c86433a20014
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-14 (Wed, 14 Feb 2018)
Changed paths:
M htdocs/contrat/services.php
Log Message:
-----------
Merge pull request #8180 from atm-maxime/fix_service_list
Fix : contract service list context was mixing up with service list from
product/service module
Commit: 0d00c51c2aaf0a614eed10ebc912bd903d7aa02a
https://github.com/Dolibarr/dolibarr/commit/0d00c51c2aaf0a614eed10ebc912bd903d7aa02a
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-14 (Wed, 14 Feb 2018)
Changed paths:
M htdocs/adherents/type.php
Log Message:
-----------
Update type.php
Commit: d0fdf700d77a474ac03fae4cf0868ead674265a5
https://github.com/Dolibarr/dolibarr/commit/d0fdf700d77a474ac03fae4cf0868ead674265a5
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-14 (Wed, 14 Feb 2018)
Changed paths:
M htdocs/adherents/type.php
Log Message:
-----------
Update type.php
Commit: c28d87252bba3d02da5a2d35a38d2fc5009d2087
https://github.com/Dolibarr/dolibarr/commit/c28d87252bba3d02da5a2d35a38d2fc5009d2087
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-14 (Wed, 14 Feb 2018)
Changed paths:
M htdocs/adherents/type.php
Log Message:
-----------
Merge pull request #8184 from laudeco/hotfix/8183_welcome_email_adherent
Fix 8183 - adherent welcome e-mail edition always put 1 instead of keeping the
e-mail
Commit: 483bfb096b515a58e8824bc439ef26b5d6b2e084
https://github.com/Dolibarr/dolibarr/commit/483bfb096b515a58e8824bc439ef26b5d6b2e084
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-14 (Wed, 14 Feb 2018)
Changed paths:
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
Log Message:
-----------
Merge pull request #8188 from atm-quentin/6.0_develop
NEW Add sale representative einstein_pdf_modules
Commit: cf5c972c65ef34fba2e0d99674d4cded0b346c74
https://github.com/Dolibarr/dolibarr/commit/cf5c972c65ef34fba2e0d99674d4cded0b346c74
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-14 (Wed, 14 Feb 2018)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Merge pull request #8193 from atm-ph/fix_6.0_multicurrency_situation_invoice
Fix apply global progress don't update multicurrency values
Commit: 147b35d62e4e2731452c773d2c973b19113599de
https://github.com/Dolibarr/dolibarr/commit/147b35d62e4e2731452c773d2c973b19113599de
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-14 (Wed, 14 Feb 2018)
Changed paths:
M ChangeLog
M htdocs/install/upgrade2.php
M htdocs/langs/en_US/install.lang
Log Message:
-----------
Merge pull request #8194 from hregis/6.0_multicompany
Fix: Update entity field in llx_user_rights and llx_usergroup_rights
Commit: b21feca9d7a69f0d2599637f8b93a231a19d259c
https://github.com/Dolibarr/dolibarr/commit/b21feca9d7a69f0d2599637f8b93a231a19d259c
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-14 (Wed, 14 Feb 2018)
Changed paths:
M htdocs/contrat/services.php
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into 6.0
Commit: 15ab37b46e872cdc6102fb22f0379353280704cd
https://github.com/Dolibarr/dolibarr/commit/15ab37b46e872cdc6102fb22f0379353280704cd
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-14 (Wed, 14 Feb 2018)
Changed paths:
M ChangeLog
M htdocs/adherents/type.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/contrat/tpl/linkedobjectblock.tpl.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/install/upgrade2.php
M htdocs/langs/en_US/install.lang
M htdocs/product/fournisseurs.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 6.0
Commit: 7f8cbc0f6224f744103235973dee27bc97538898
https://github.com/Dolibarr/dolibarr/commit/7f8cbc0f6224f744103235973dee27bc97538898
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-14 (Wed, 14 Feb 2018)
Changed paths:
M ChangeLog
M htdocs/adherents/type.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/contrat/services_list.php
M htdocs/contrat/tpl/linkedobjectblock.tpl.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/modBlockedLog.class.php
M htdocs/install/upgrade2.php
M htdocs/langs/en_US/install.lang
M htdocs/product/fournisseurs.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/adherents/type.php
htdocs/contrat/services.php
htdocs/contrat/tpl/linkedobjectblock.tpl.php
htdocs/install/upgrade2.php
Commit: 4e145f0e5bf94bffff19c77bdea0716b445b94f4
https://github.com/Dolibarr/dolibarr/commit/4e145f0e5bf94bffff19c77bdea0716b445b94f4
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-14 (Wed, 14 Feb 2018)
Changed paths:
M htdocs/compta/tva/class/tva.class.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Compare:
https://github.com/Dolibarr/dolibarr/compare/06357e62da37...4e145f0e5bf9