[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] d49205: FIX multicompany compatibilit
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] d49205: FIX multicompany compatibility ! |
Date: |
Wed, 08 Aug 2018 08:31:44 -0700 |
Branch: refs/heads/8.0
Home: https://github.com/Dolibarr/dolibarr
Commit: d4920521b5c89c7d803b986ab21ddf5043962814
https://github.com/Dolibarr/dolibarr/commit/d4920521b5c89c7d803b986ab21ddf5043962814
Author: Regis Houssin <address@hidden>
Date: 2018-07-24 (Tue, 24 Jul 2018)
Changed paths:
M htdocs/install/mysql/data/llx_accounting_account_be.sql
M htdocs/install/mysql/data/llx_accounting_account_bf.sql
M htdocs/install/mysql/data/llx_accounting_account_bj.sql
M htdocs/install/mysql/data/llx_accounting_account_cd.sql
M htdocs/install/mysql/data/llx_accounting_account_cf.sql
M htdocs/install/mysql/data/llx_accounting_account_cg.sql
M htdocs/install/mysql/data/llx_accounting_account_ch.sql
M htdocs/install/mysql/data/llx_accounting_account_ci.sql
M htdocs/install/mysql/data/llx_accounting_account_cl.sql
M htdocs/install/mysql/data/llx_accounting_account_cm.sql
M htdocs/install/mysql/data/llx_accounting_account_dk.sql
M htdocs/install/mysql/data/llx_accounting_account_es.sql
M htdocs/install/mysql/data/llx_accounting_account_fr.sql
M htdocs/install/mysql/data/llx_accounting_account_ga.sql
M htdocs/install/mysql/data/llx_accounting_account_gb.sql
M htdocs/install/mysql/data/llx_accounting_account_gq.sql
M htdocs/install/mysql/data/llx_accounting_account_km.sql
M htdocs/install/mysql/data/llx_accounting_account_lu.sql
M htdocs/install/mysql/data/llx_accounting_account_ma.sql
M htdocs/install/mysql/data/llx_accounting_account_ml.sql
M htdocs/install/mysql/data/llx_accounting_account_ne.sql
M htdocs/install/mysql/data/llx_accounting_account_sn.sql
M htdocs/install/mysql/data/llx_accounting_account_td.sql
M htdocs/install/mysql/data/llx_accounting_account_tg.sql
M htdocs/install/mysql/data/llx_accounting_account_tn.sql
Log Message:
-----------
FIX multicompany compatibility !
Commit: 835cb046314e0c30e325b77e0f800a0d3c6d642a
https://github.com/Dolibarr/dolibarr/commit/835cb046314e0c30e325b77e0f800a0d3c6d642a
Author: Regis Houssin <address@hidden>
Date: 2018-07-24 (Tue, 24 Jul 2018)
Changed paths:
M htdocs/install/mysql/data/llx_accounting_account_be.sql
M htdocs/install/mysql/data/llx_accounting_account_bf.sql
M htdocs/install/mysql/data/llx_accounting_account_bj.sql
M htdocs/install/mysql/data/llx_accounting_account_cd.sql
M htdocs/install/mysql/data/llx_accounting_account_cf.sql
M htdocs/install/mysql/data/llx_accounting_account_cg.sql
M htdocs/install/mysql/data/llx_accounting_account_ch.sql
M htdocs/install/mysql/data/llx_accounting_account_ci.sql
M htdocs/install/mysql/data/llx_accounting_account_cl.sql
M htdocs/install/mysql/data/llx_accounting_account_cm.sql
M htdocs/install/mysql/data/llx_accounting_account_dk.sql
M htdocs/install/mysql/data/llx_accounting_account_es.sql
M htdocs/install/mysql/data/llx_accounting_account_fr.sql
M htdocs/install/mysql/data/llx_accounting_account_ga.sql
M htdocs/install/mysql/data/llx_accounting_account_gb.sql
M htdocs/install/mysql/data/llx_accounting_account_gq.sql
M htdocs/install/mysql/data/llx_accounting_account_km.sql
M htdocs/install/mysql/data/llx_accounting_account_lu.sql
M htdocs/install/mysql/data/llx_accounting_account_ma.sql
M htdocs/install/mysql/data/llx_accounting_account_ml.sql
M htdocs/install/mysql/data/llx_accounting_account_ne.sql
M htdocs/install/mysql/data/llx_accounting_account_sn.sql
M htdocs/install/mysql/data/llx_accounting_account_td.sql
M htdocs/install/mysql/data/llx_accounting_account_tg.sql
M htdocs/install/mysql/data/llx_accounting_account_tn.sql
Log Message:
-----------
FIX remove rowid for multicompany compatibility
Commit: b7dfc9988284a8d8aa5c33b894ec66d6f7eeb9f3
https://github.com/Dolibarr/dolibarr/commit/b7dfc9988284a8d8aa5c33b894ec66d6f7eeb9f3
Author: Regis Houssin <address@hidden>
Date: 2018-07-24 (Tue, 24 Jul 2018)
Changed paths:
M htdocs/product/stock/replenish.php
Log Message:
-----------
Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_price
Commit: c95d6271a9485a621981bc35da3785b95c39974d
https://github.com/Dolibarr/dolibarr/commit/c95d6271a9485a621981bc35da3785b95c39974d
Author: gauthier <address@hidden>
Date: 2018-07-25 (Wed, 25 Jul 2018)
Changed paths:
M htdocs/societe/consumption.php
Log Message:
-----------
FIX : missing hook to edit sql
Commit: 8278a9fa528836f55423994753d56c524022aabd
https://github.com/Dolibarr/dolibarr/commit/8278a9fa528836f55423994753d56c524022aabd
Author: tarrsalah <address@hidden>
Date: 2018-07-29 (Sun, 29 Jul 2018)
Changed paths:
M htdocs/fourn/facture/list.php
Log Message:
-----------
FIX filter supplier invoice list by societe name.
Commit: 1536bbc65e002226fa7da99ec6f810bffefa2ef5
https://github.com/Dolibarr/dolibarr/commit/1536bbc65e002226fa7da99ec6f810bffefa2ef5
Author: ATM-Nicolas <address@hidden>
Date: 2018-07-30 (Mon, 30 Jul 2018)
Changed paths:
M htdocs/expedition/card.php
Log Message:
-----------
FIX : Keep same project when creating shipping from order
Commit: 5d193617827f1f460fa15337a2d0f8d8c504b61e
https://github.com/Dolibarr/dolibarr/commit/5d193617827f1f460fa15337a2d0f8d8c504b61e
Author: florian HENRY <address@hidden>
Date: 2018-07-31 (Tue, 31 Jul 2018)
Changed paths:
M htdocs/contact/list.php
Log Message:
-----------
fix: keep context filter on contact list on change column displayed
Commit: cadf931e8d104626c8751c9b15b55fc160983cb5
https://github.com/Dolibarr/dolibarr/commit/cadf931e8d104626c8751c9b15b55fc160983cb5
Author: gauthier <address@hidden>
Date: 2018-07-31 (Tue, 31 Jul 2018)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
FIX : extrafieldkey
Commit: e6f416e745c55c991b10ca043a97d806b93d787d
https://github.com/Dolibarr/dolibarr/commit/e6f416e745c55c991b10ca043a97d806b93d787d
Author: Juanjo Menent <address@hidden>
Date: 2018-08-02 (Thu, 02 Aug 2018)
Changed paths:
M htdocs/install/mysql/data/llx_accounting_account_be.sql
M htdocs/install/mysql/data/llx_accounting_account_bf.sql
M htdocs/install/mysql/data/llx_accounting_account_bj.sql
M htdocs/install/mysql/data/llx_accounting_account_cd.sql
M htdocs/install/mysql/data/llx_accounting_account_cf.sql
M htdocs/install/mysql/data/llx_accounting_account_cg.sql
M htdocs/install/mysql/data/llx_accounting_account_ch.sql
M htdocs/install/mysql/data/llx_accounting_account_ci.sql
M htdocs/install/mysql/data/llx_accounting_account_cl.sql
M htdocs/install/mysql/data/llx_accounting_account_cm.sql
M htdocs/install/mysql/data/llx_accounting_account_dk.sql
M htdocs/install/mysql/data/llx_accounting_account_es.sql
M htdocs/install/mysql/data/llx_accounting_account_fr.sql
M htdocs/install/mysql/data/llx_accounting_account_ga.sql
M htdocs/install/mysql/data/llx_accounting_account_gb.sql
M htdocs/install/mysql/data/llx_accounting_account_gq.sql
M htdocs/install/mysql/data/llx_accounting_account_km.sql
M htdocs/install/mysql/data/llx_accounting_account_lu.sql
M htdocs/install/mysql/data/llx_accounting_account_ma.sql
M htdocs/install/mysql/data/llx_accounting_account_ml.sql
M htdocs/install/mysql/data/llx_accounting_account_ne.sql
M htdocs/install/mysql/data/llx_accounting_account_sn.sql
M htdocs/install/mysql/data/llx_accounting_account_td.sql
M htdocs/install/mysql/data/llx_accounting_account_tg.sql
M htdocs/install/mysql/data/llx_accounting_account_tn.sql
Log Message:
-----------
Merge pull request #9147 from hregis/7.0_price
FIX multicompany compatibility !
Commit: 99f29a9764aa46a98170b7b5e538fe82421a1c65
https://github.com/Dolibarr/dolibarr/commit/99f29a9764aa46a98170b7b5e538fe82421a1c65
Author: Juanjo Menent <address@hidden>
Date: 2018-08-02 (Thu, 02 Aug 2018)
Changed paths:
M htdocs/install/mysql/data/llx_accounting_account_be.sql
M htdocs/install/mysql/data/llx_accounting_account_bf.sql
M htdocs/install/mysql/data/llx_accounting_account_bj.sql
M htdocs/install/mysql/data/llx_accounting_account_cd.sql
M htdocs/install/mysql/data/llx_accounting_account_cf.sql
M htdocs/install/mysql/data/llx_accounting_account_cg.sql
M htdocs/install/mysql/data/llx_accounting_account_ch.sql
M htdocs/install/mysql/data/llx_accounting_account_ci.sql
M htdocs/install/mysql/data/llx_accounting_account_cl.sql
M htdocs/install/mysql/data/llx_accounting_account_cm.sql
M htdocs/install/mysql/data/llx_accounting_account_dk.sql
M htdocs/install/mysql/data/llx_accounting_account_es.sql
M htdocs/install/mysql/data/llx_accounting_account_fr.sql
M htdocs/install/mysql/data/llx_accounting_account_ga.sql
M htdocs/install/mysql/data/llx_accounting_account_gb.sql
M htdocs/install/mysql/data/llx_accounting_account_gq.sql
M htdocs/install/mysql/data/llx_accounting_account_km.sql
M htdocs/install/mysql/data/llx_accounting_account_lu.sql
M htdocs/install/mysql/data/llx_accounting_account_ma.sql
M htdocs/install/mysql/data/llx_accounting_account_ml.sql
M htdocs/install/mysql/data/llx_accounting_account_ne.sql
M htdocs/install/mysql/data/llx_accounting_account_sn.sql
M htdocs/install/mysql/data/llx_accounting_account_td.sql
M htdocs/install/mysql/data/llx_accounting_account_tg.sql
M htdocs/install/mysql/data/llx_accounting_account_tn.sql
Log Message:
-----------
Revert "FIX multicompany compatibility !"
Commit: 2206eb98d1c9c66dada99f991eeb8daa824d1ed5
https://github.com/Dolibarr/dolibarr/commit/2206eb98d1c9c66dada99f991eeb8daa824d1ed5
Author: Juanjo Menent <address@hidden>
Date: 2018-08-02 (Thu, 02 Aug 2018)
Changed paths:
M htdocs/install/mysql/data/llx_accounting_account_be.sql
M htdocs/install/mysql/data/llx_accounting_account_bf.sql
M htdocs/install/mysql/data/llx_accounting_account_bj.sql
M htdocs/install/mysql/data/llx_accounting_account_cd.sql
M htdocs/install/mysql/data/llx_accounting_account_cf.sql
M htdocs/install/mysql/data/llx_accounting_account_cg.sql
M htdocs/install/mysql/data/llx_accounting_account_ch.sql
M htdocs/install/mysql/data/llx_accounting_account_ci.sql
M htdocs/install/mysql/data/llx_accounting_account_cl.sql
M htdocs/install/mysql/data/llx_accounting_account_cm.sql
M htdocs/install/mysql/data/llx_accounting_account_dk.sql
M htdocs/install/mysql/data/llx_accounting_account_es.sql
M htdocs/install/mysql/data/llx_accounting_account_fr.sql
M htdocs/install/mysql/data/llx_accounting_account_ga.sql
M htdocs/install/mysql/data/llx_accounting_account_gb.sql
M htdocs/install/mysql/data/llx_accounting_account_gq.sql
M htdocs/install/mysql/data/llx_accounting_account_km.sql
M htdocs/install/mysql/data/llx_accounting_account_lu.sql
M htdocs/install/mysql/data/llx_accounting_account_ma.sql
M htdocs/install/mysql/data/llx_accounting_account_ml.sql
M htdocs/install/mysql/data/llx_accounting_account_ne.sql
M htdocs/install/mysql/data/llx_accounting_account_sn.sql
M htdocs/install/mysql/data/llx_accounting_account_td.sql
M htdocs/install/mysql/data/llx_accounting_account_tg.sql
M htdocs/install/mysql/data/llx_accounting_account_tn.sql
Log Message:
-----------
Merge pull request #9191 from Dolibarr/revert-9147-7.0_price
Revert "FIX multicompany compatibility !"
Commit: 98dada47de2ea25a8ae61c80baa85d6bfc2cc1b7
https://github.com/Dolibarr/dolibarr/commit/98dada47de2ea25a8ae61c80baa85d6bfc2cc1b7
Author: Juanjo Menent <address@hidden>
Date: 2018-08-02 (Thu, 02 Aug 2018)
Changed paths:
M htdocs/fourn/facture/list.php
Log Message:
-----------
Merge pull request #9174 from tarrsalah/fix-soc-filter-on-supplier-invoices
FIX filter supplier invoice list by societe name.
Commit: ce49230d7148844c0cf1f5e11546595accd85f2d
https://github.com/Dolibarr/dolibarr/commit/ce49230d7148844c0cf1f5e11546595accd85f2d
Author: Juanjo Menent <address@hidden>
Date: 2018-08-02 (Thu, 02 Aug 2018)
Changed paths:
M htdocs/expedition/card.php
Log Message:
-----------
Merge pull request #9177 from ATM-Nicolas/fix_preselect_project
FIX : Keep same project when creating shipping from order
Commit: 1fbbaf28952ede7298fe86b4e60d165a740e1497
https://github.com/Dolibarr/dolibarr/commit/1fbbaf28952ede7298fe86b4e60d165a740e1497
Author: Juanjo Menent <address@hidden>
Date: 2018-08-02 (Thu, 02 Aug 2018)
Changed paths:
M htdocs/contact/list.php
Log Message:
-----------
Merge pull request #9180 from atm-florian/7.0
FIX: keep context filter on contact list on change column displayed
Commit: 5b3c6de06cbfd39e60abcda44427acb8a946084c
https://github.com/Dolibarr/dolibarr/commit/5b3c6de06cbfd39e60abcda44427acb8a946084c
Author: Juanjo Menent <address@hidden>
Date: 2018-08-02 (Thu, 02 Aug 2018)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
Merge pull request #9184 from atm-gauthier/7.0_fix_extrafieldkey
FIX : extrafieldkey
Commit: f3090e48197003ad5ce2770488216737980175e8
https://github.com/Dolibarr/dolibarr/commit/f3090e48197003ad5ce2770488216737980175e8
Author: ATM-Nicolas <address@hidden>
Date: 2018-08-02 (Thu, 02 Aug 2018)
Changed paths:
M htdocs/core/actions_massactions.inc.php
Log Message:
-----------
FIX : Wrong variable and trigger name
Commit: d84bacad0073ca96c4d504d8bbccd7e5ef13f3ca
https://github.com/Dolibarr/dolibarr/commit/d84bacad0073ca96c4d504d8bbccd7e5ef13f3ca
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-02 (Thu, 02 Aug 2018)
Changed paths:
M htdocs/core/actions_massactions.inc.php
Log Message:
-----------
Merge pull request #9196 from ATM-Nicolas/fix_wrong_variable_and_trigger_name
FIX : Wrong variable and trigger name
Commit: 17ed19503c125f59b94b4df44001c036e14a6a11
https://github.com/Dolibarr/dolibarr/commit/17ed19503c125f59b94b4df44001c036e14a6a11
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-02 (Thu, 02 Aug 2018)
Changed paths:
M htdocs/api/class/api.class.php
Log Message:
-----------
Code comment
Commit: 6010d9de4b3eca9ec6388dba2d5e28c90c5096d6
https://github.com/Dolibarr/dolibarr/commit/6010d9de4b3eca9ec6388dba2d5e28c90c5096d6
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-02 (Thu, 02 Aug 2018)
Changed paths:
M htdocs/societe/consumption.php
Log Message:
-----------
Merge pull request #9158 from atm-gauthier/7.0_missing_hook
FIX : missing hook to edit sql
Commit: 61e1f0508db68397784d3373d98bd16377f55c4d
https://github.com/Dolibarr/dolibarr/commit/61e1f0508db68397784d3373d98bd16377f55c4d
Author: Philippe <address@hidden>
Date: 2018-08-03 (Fri, 03 Aug 2018)
Changed paths:
M htdocs/commande/list.php
Log Message:
-----------
FIX : Search on Ref project on order list
Commit: 5b15e688afcfb43d0d2ba0681cab29c906c0f79e
https://github.com/Dolibarr/dolibarr/commit/5b15e688afcfb43d0d2ba0681cab29c906c0f79e
Author: ATM-Nicolas <address@hidden>
Date: 2018-08-07 (Tue, 07 Aug 2018)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
FIX : PHP warning, undefined index notnull
Commit: 5ce31f65a44ac4b655bbe0ad43b84ca6936f1c8c
https://github.com/Dolibarr/dolibarr/commit/5ce31f65a44ac4b655bbe0ad43b84ca6936f1c8c
Author: Ferran Marcet <address@hidden>
Date: 2018-08-07 (Tue, 07 Aug 2018)
Changed paths:
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
Log Message:
-----------
Fix: Bad position when document have incoterms/notes
Commit: 9f09c97eb9ecd74f2c89a74382301da1ec2c2a31
https://github.com/Dolibarr/dolibarr/commit/9f09c97eb9ecd74f2c89a74382301da1ec2c2a31
Author: Juanjo Menent <address@hidden>
Date: 2018-08-08 (Wed, 08 Aug 2018)
Changed paths:
M htdocs/commande/list.php
Log Message:
-----------
Merge pull request #9198 from OPEN-DSI/fix_cmd_list
FIX : Search on Ref project on order list
Commit: b840152bcd6f5f66be399a3a981ead2d91d4263c
https://github.com/Dolibarr/dolibarr/commit/b840152bcd6f5f66be399a3a981ead2d91d4263c
Author: Juanjo Menent <address@hidden>
Date: 2018-08-08 (Wed, 08 Aug 2018)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Merge pull request #9217 from ATM-Nicolas/fix_undefined_index_notnull
FIX : PHP warning, undefined index notnull
Commit: e2499392a975ac5718f1681e400db73e016747f2
https://github.com/Dolibarr/dolibarr/commit/e2499392a975ac5718f1681e400db73e016747f2
Author: Juanjo Menent <address@hidden>
Date: 2018-08-08 (Wed, 08 Aug 2018)
Changed paths:
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
Log Message:
-----------
Merge pull request #9215 from fmarcet/7.0
Fix: Bad position when document have incoterms/notes
Commit: de1386c83cc47f87316cc1a7552d364c5b2791bc
https://github.com/Dolibarr/dolibarr/commit/de1386c83cc47f87316cc1a7552d364c5b2791bc
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-08 (Wed, 08 Aug 2018)
Changed paths:
M htdocs/commande/list.php
M htdocs/contact/list.php
M htdocs/core/actions_massactions.inc.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/extrafields.class.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/expedition/card.php
M htdocs/fourn/facture/list.php
M htdocs/societe/consumption.php
Log Message:
-----------
Merge branch '7.0' of github.com:Dolibarr/dolibarr into 7.0
Commit: 8d54df42636c032dd0b6012d7ddcd30a67eab770
https://github.com/Dolibarr/dolibarr/commit/8d54df42636c032dd0b6012d7ddcd30a67eab770
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-08 (Wed, 08 Aug 2018)
Changed paths:
M htdocs/api/class/api.class.php
M htdocs/commande/list.php
M htdocs/core/actions_massactions.inc.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/extrafields.class.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/expedition/card.php
M htdocs/fourn/facture/list.php
M htdocs/societe/consumption.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/63898b205e11...8d54df42636c
**NOTE:** This service has been marked for deprecation:
https://developer.github.com/changes/2018-04-25-github-services-deprecation/
Functionality will be removed from GitHub.com on January 31st, 2019.