[Dolibarr/dolibarr] bc3a21: FIX compatibility with multicompany (avoid d

dolibarr-git

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr/dolibarr] bc3a21: FIX compatibility with multicompany (avoid d

From:	Laurent Destailleur
Subject:	[Dolibarr/dolibarr] bc3a21: FIX compatibility with multicompany (avoid duplica...
Date:	Wed, 05 Feb 2020 05:38:26 -0800

  Branch: refs/heads/11.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: bc3a210d12add514e6f96f1ec61bef5f6bd2a995
      
https://github.com/Dolibarr/dolibarr/commit/bc3a210d12add514e6f96f1ec61bef5f6bd2a995
  Author: Regis Houssin <address@hidden>
  Date:   2020-02-03 (Mon, 03 Feb 2020)

  Changed paths:
    M htdocs/holiday/class/holiday.class.php

  Log Message:
  -----------
  FIX compatibility with multicompany (avoid duplicate data)


  Commit: e74e63941d6914241a60d5855a891cda1d9a14e8
      
https://github.com/Dolibarr/dolibarr/commit/e74e63941d6914241a60d5855a891cda1d9a14e8
  Author: Regis Houssin <address@hidden>
  Date:   2020-02-03 (Mon, 03 Feb 2020)

  Changed paths:
    M htdocs/holiday/class/holiday.class.php

  Log Message:
  -----------
  FIX use "usergroup" instead "user"


  Commit: d93a597a1eb62db89392aa44b79b73ba19e7c6bb
      
https://github.com/Dolibarr/dolibarr/commit/d93a597a1eb62db89392aa44b79b73ba19e7c6bb
  Author: Pierre Ardoin <address@hidden>
  Date:   2020-02-04 (Tue, 04 Feb 2020)

  Changed paths:
    M htdocs/core/boxes/box_project.php

  Log Message:
  -----------
  Fix Compatbility with Multicompany

Before : Show all projects of all entities
Now : Show only projects that are allowed by permissions


  Commit: 262d889700ac6fb2fb149c149799ccfedcce133e
      
https://github.com/Dolibarr/dolibarr/commit/262d889700ac6fb2fb149c149799ccfedcce133e
  Author: Pierre Ardoin <address@hidden>
  Date:   2020-02-05 (Wed, 05 Feb 2020)

  Changed paths:
    M htdocs/core/boxes/box_project.php

  Log Message:
  -----------
  Update box_project.php


  Commit: d5b74a8ca3d1fc210c0d60160cf8e2d42415f125
      
https://github.com/Dolibarr/dolibarr/commit/d5b74a8ca3d1fc210c0d60160cf8e2d42415f125
  Author: Pierre Ardoin <address@hidden>
  Date:   2020-02-05 (Wed, 05 Feb 2020)

  Changed paths:
    M htdocs/core/boxes/box_project.php

  Log Message:
  -----------
  Update box_project.php


  Commit: 81ed70ffc7ac61844088e1e664324e5fdacb8e78
      
https://github.com/Dolibarr/dolibarr/commit/81ed70ffc7ac61844088e1e664324e5fdacb8e78
  Author: Pierre Ardoin <address@hidden>
  Date:   2020-02-05 (Wed, 05 Feb 2020)

  Changed paths:
    M htdocs/core/boxes/box_project.php

  Log Message:
  -----------
  Update box_project.php


  Commit: c3cf9e62b3bad4145fa1f145f9863e84c2b046df
      
https://github.com/Dolibarr/dolibarr/commit/c3cf9e62b3bad4145fa1f145f9863e84c2b046df
  Author: VESSILLER <address@hidden>
  Date:   2020-02-05 (Wed, 05 Feb 2020)

  Changed paths:
    M htdocs/product/index.php

  Log Message:
  -----------
  FIX links in products/services index


  Commit: 63ba601906cb9e0fda349dd06f0968bc48f3330b
      
https://github.com/Dolibarr/dolibarr/commit/63ba601906cb9e0fda349dd06f0968bc48f3330b
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-02-05 (Wed, 05 Feb 2020)

  Changed paths:
    M htdocs/core/boxes/box_project.php

  Log Message:
  -----------
  Update box_project.php


  Commit: af22eb92d9634a52715e6323e07d11f7b6515060
      
https://github.com/Dolibarr/dolibarr/commit/af22eb92d9634a52715e6323e07d11f7b6515060
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-02-05 (Wed, 05 Feb 2020)

  Changed paths:
    M htdocs/core/boxes/box_project.php

  Log Message:
  -----------
  Merge pull request #13021 from mapiolca/patch-29

Fix Compatbility with Multicompany


  Commit: b589db813ecaf7c9734241bec3ac4820c598af7f
      
https://github.com/Dolibarr/dolibarr/commit/b589db813ecaf7c9734241bec3ac4820c598af7f
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-02-05 (Wed, 05 Feb 2020)

  Changed paths:
    M htdocs/product/index.php

  Log Message:
  -----------
  Merge pull request #13029 from OPEN-DSI/v10-fix-product-index-links

FIX links in products/services index


  Commit: d35994e5db1a79ddea4babe94f466589f8b8a69a
      
https://github.com/Dolibarr/dolibarr/commit/d35994e5db1a79ddea4babe94f466589f8b8a69a
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-02-05 (Wed, 05 Feb 2020)

  Changed paths:
    M htdocs/holiday/class/holiday.class.php

  Log Message:
  -----------
  Update holiday.class.php


  Commit: c101c3dd55ec96f86e23c29618f6a1c4e0ef05ad
      
https://github.com/Dolibarr/dolibarr/commit/c101c3dd55ec96f86e23c29618f6a1c4e0ef05ad
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-02-05 (Wed, 05 Feb 2020)

  Changed paths:
    M htdocs/holiday/class/holiday.class.php

  Log Message:
  -----------
  Update holiday.class.php


  Commit: 9100b8a5486857f964b577e9c81d612ea6253317
      
https://github.com/Dolibarr/dolibarr/commit/9100b8a5486857f964b577e9c81d612ea6253317
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-02-05 (Wed, 05 Feb 2020)

  Changed paths:
    M htdocs/holiday/class/holiday.class.php
    M test/phpunit/HolidayTest.php

  Log Message:
  -----------
  FIX SQL request and phpunit


  Commit: 796cdad6fca04091d47c406c01731a02e9bf4b3d
      
https://github.com/Dolibarr/dolibarr/commit/796cdad6fca04091d47c406c01731a02e9bf4b3d
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-02-05 (Wed, 05 Feb 2020)

  Changed paths:
    M htdocs/holiday/class/holiday.class.php

  Log Message:
  -----------
  Merge pull request #13008 from hregis/10.0_mc

FIX compatibility with multicompany (avoid duplicate data)


  Commit: 334c69841a9d0ba612fe3130e9eb825ac4248f7a
      
https://github.com/Dolibarr/dolibarr/commit/334c69841a9d0ba612fe3130e9eb825ac4248f7a
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-02-05 (Wed, 05 Feb 2020)

  Changed paths:
    M htdocs/core/boxes/box_project.php
    M htdocs/holiday/class/holiday.class.php
    M htdocs/product/index.php

  Log Message:
  -----------
  Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into 10.0


  Commit: a36cf1f86beb63cfe5bda715885bc06bce8ebfd9
      
https://github.com/Dolibarr/dolibarr/commit/a36cf1f86beb63cfe5bda715885bc06bce8ebfd9
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-02-05 (Wed, 05 Feb 2020)

  Changed paths:
    M htdocs/holiday/class/holiday.class.php

  Log Message:
  -----------
  Fix phpunit


  Commit: eca001677817eedb36259cba2fa60dfd3f2e15c8
      
https://github.com/Dolibarr/dolibarr/commit/eca001677817eedb36259cba2fa60dfd3f2e15c8
  Author: Tobias Sekan <address@hidden>
  Date:   2020-02-05 (Wed, 05 Feb 2020)

  Changed paths:
    M htdocs/categories/viewcat.php

  Log Message:
  -----------
  Fix wrong category name on user category card


  Commit: 4d58dd05aaff20cfff83f922e72ab5b782c7b10b
      
https://github.com/Dolibarr/dolibarr/commit/4d58dd05aaff20cfff83f922e72ab5b782c7b10b
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-02-05 (Wed, 05 Feb 2020)

  Changed paths:
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
    M htdocs/core/modules/contract/doc/pdf_strato.modules.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/expensereport/doc/pdf_standard.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/facture/doc/pdf_sponge.modules.php
    M htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
    M htdocs/core/modules/project/doc/pdf_baleine.modules.php
    M htdocs/core/modules/project/doc/pdf_beluga.modules.php
    M htdocs/core/modules/project/doc/pdf_timespent.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/propale/doc/pdf_cyan.modules.php
    M htdocs/core/modules/reception/doc/pdf_squille.modules.php
    M htdocs/core/modules/stock/doc/pdf_standard.modules.php
    M htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
    M htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
    M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
    A htdocs/langs/es_ES/zapier.lang

  Log Message:
  -----------
  Merge branch '11.0' of address@hidden:Dolibarr/dolibarr.git into 11.0


  Commit: 1fe97837608bb18a124098467a243e8fe74c255e
      
https://github.com/Dolibarr/dolibarr/commit/1fe97837608bb18a124098467a243e8fe74c255e
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-02-05 (Wed, 05 Feb 2020)

  Changed paths:
    M htdocs/core/boxes/box_project.php
    M htdocs/holiday/class/holiday.class.php
    M test/phpunit/HolidayTest.php

  Log Message:
  -----------
  Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into 11.0

Conflicts:
        htdocs/holiday/class/holiday.class.php
        htdocs/product/index.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/95154673001a...1fe97837608b

[Prev in Thread]

Current Thread

[Next in Thread]

[Dolibarr/dolibarr] bc3a21: FIX compatibility with multicompany (avoid duplica..., Laurent Destailleur, 2020/02/05
- [Dolibarr/dolibarr] bc3a21: FIX compatibility with multicompany (avoid duplica..., Laurent Destailleur <=

Prev by Date: [Dolibarr/dolibarr] 63f5a7: Merge remote-tracking branch 'upstream/11.0' into ...
Next by Date: [Dolibarr/dolibarr] 63f5a7: Merge remote-tracking branch 'upstream/11.0' into ...
Previous by thread: [Dolibarr/dolibarr] bc3a21: FIX compatibility with multicompany (avoid duplica...
Next by thread: [Dolibarr/dolibarr] db43b2: Fix unique key on llx_holiday_users
Index(es):
- Date
- Thread