[Dolibarr/dolibarr] c77169: FIX : Problem with column label in subscription list

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: c77169ad878e49fec353f4e720bc8be972ae913b
      
https://github.com/Dolibarr/dolibarr/commit/c77169ad878e49fec353f4e720bc8be972ae913b
  Author: Alexandre SPANGARO <address@hidden>
  Date:   2020-02-10 (Mon, 10 Feb 2020)

  Changed paths:
    M htdocs/adherents/subscription/list.php

  Log Message:
  -----------
  FIX : Problem with column label in subscription list


  Commit: 8d9de521f3bca87a5fde77c6cf25352f0ddfff1e
      
https://github.com/Dolibarr/dolibarr/commit/8d9de521f3bca87a5fde77c6cf25352f0ddfff1e
  Author: Ruger <address@hidden>
  Date:   2020-02-11 (Tue, 11 Feb 2020)

  Changed paths:
    M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php

  Log Message:
  -----------
  FIX: #13038 ExpenseReport PDF - custom category description is not correct


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

  Changed paths:
    M htdocs/accountancy/journal/bankjournal.php

  Log Message:
  -----------
  Fix the display of the banner with multicompany

Before : if a account of a entity require to define the Journal code, Banner 
displayed in all entities.

Now : Show the banner only in the entity concerned.


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

  Changed paths:
    M htdocs/adherents/subscription/list.php

  Log Message:
  -----------
  Merge pull request #13076 from aspangaro/10.0_p35

FIX : Problem with column label in subscription list


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

  Changed paths:
    M htdocs/accountancy/journal/bankjournal.php

  Log Message:
  -----------
  Update bankjournal.php


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

  Changed paths:
    M htdocs/accountancy/journal/bankjournal.php

  Log Message:
  -----------
  Merge pull request #13089 from mapiolca/patch-31

Fix the display of the banner with multicompany


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

  Changed paths:
    M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php

  Log Message:
  -----------
  Merge pull request #13079 from RubenRuCh/11.0

FIX: #13038 ExpenseReport PDF - custom category description is not correct


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

  Changed paths:
    M htdocs/langs/en_US/mrp.lang
    M htdocs/mrp/class/mo.class.php
    M htdocs/mrp/mo_card.php
    M htdocs/mrp/mo_production.php

  Log Message:
  -----------
  Debug MRP module


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

  Changed paths:
    M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php

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


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

  Changed paths:
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/adherents/subscription/list.php

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

Conflicts:
        htdocs/adherents/subscription/list.php
        htdocs/comm/propal/list.php
        htdocs/core/class/html.formmail.class.php


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

  Changed paths:
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/adherents/subscription/list.php
    M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
    M htdocs/langs/en_US/mrp.lang
    M htdocs/mrp/class/mo.class.php
    M htdocs/mrp/mo_card.php
    M htdocs/mrp/mo_production.php

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

Conflicts:
        htdocs/adherents/subscription/list.php
        htdocs/mrp/class/mo.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/2ce0aa87e628...4762bafb023e