dolibarr-git
[Top][All Lists]
Advanced

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

[Dolibarr-git] [Dolibarr/dolibarr] 4311a1: fix: #11187


From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] 4311a1: fix: #11187
Date: Mon, 20 May 2019 06:47:11 -0700

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 4311a1ece8ae08226ae6d2bab94a3b2b0fede48f
      
https://github.com/Dolibarr/dolibarr/commit/4311a1ece8ae08226ae6d2bab94a3b2b0fede48f
  Author: florian HENRY <address@hidden>
  Date:   2019-05-19 (Sun, 19 May 2019)

  Changed paths:
    M htdocs/projet/class/project.class.php

  Log Message:
  -----------
  fix: #11187


  Commit: 6e7fe1a6c26f95c73ed36547e268b0e3061cdb97
      
https://github.com/Dolibarr/dolibarr/commit/6e7fe1a6c26f95c73ed36547e268b0e3061cdb97
  Author: florian HENRY <address@hidden>
  Date:   2019-05-19 (Sun, 19 May 2019)

  Changed paths:
    M ChangeLog
    M htdocs/admin/multicurrency.php
    M htdocs/comm/action/index.php
    M htdocs/comm/remx.php
    M htdocs/compta/facture/card.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/contrat/list.php
    M htdocs/contrat/services_list.php
    M htdocs/core/class/html.formmargin.class.php
    M htdocs/core/js/timesheet.js
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/usergroups.lib.php
    M htdocs/core/modules/project/doc/pdf_beluga.modules.php
    M htdocs/expensereport/list.php
    M htdocs/filefunc.inc.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/commande/orderstoinvoice.php
    M htdocs/install/mysql/migration/7.0.0-8.0.0.sql
    M htdocs/install/mysql/tables/llx_actioncomm.sql
    M htdocs/modulebuilder/template/class/myobject.class.php
    M htdocs/product/list.php
    M htdocs/product/reassort.php
    M htdocs/product/reassortlot.php
    M htdocs/product/stock/tpl/stockcorrection.tpl.php
    M htdocs/projet/list.php

  Log Message:
  -----------
  Merge branch '8.0' of https://github.com/Dolibarr/dolibarr into 8.0


  Commit: e4d87ab2e7c1bdb09f9d7a302f621547ae37dd8f
      
https://github.com/Dolibarr/dolibarr/commit/e4d87ab2e7c1bdb09f9d7a302f621547ae37dd8f
  Author: florian HENRY <address@hidden>
  Date:   2019-05-19 (Sun, 19 May 2019)

  Changed paths:
    M htdocs/core/class/extrafields.class.php

  Log Message:
  -----------
  fix: #11189


  Commit: ea5ffbb0bf43d9d6923f8c535b67dee8d0c33995
      
https://github.com/Dolibarr/dolibarr/commit/ea5ffbb0bf43d9d6923f8c535b67dee8d0c33995
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-19 (Sun, 19 May 2019)

  Changed paths:
    M htdocs/core/class/extrafields.class.php
    M htdocs/projet/class/project.class.php

  Log Message:
  -----------
  Merge pull request #11216 from atm-florian/8.0

 fix:  #11187


  Commit: 2a2fcf6784843606297ab573cc86edf3425ed158
      
https://github.com/Dolibarr/dolibarr/commit/2a2fcf6784843606297ab573cc86edf3425ed158
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-20 (Mon, 20 May 2019)

  Changed paths:
    M htdocs/admin/pdf.php

  Log Message:
  -----------
  FIX only profid1 to 4 were editable for pdf option to show. Not 5 and 6.


  Commit: ebf252f8a37f46b963ebcb9892bc4c13ccd2e497
      
https://github.com/Dolibarr/dolibarr/commit/ebf252f8a37f46b963ebcb9892bc4c13ccd2e497
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-20 (Mon, 20 May 2019)

  Changed paths:
    M htdocs/core/class/extrafields.class.php
    M htdocs/projet/class/project.class.php

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


  Commit: ae3605d82d5986184573dc8e6d345d69aa694b0a
      
https://github.com/Dolibarr/dolibarr/commit/ae3605d82d5986184573dc8e6d345d69aa694b0a
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-20 (Mon, 20 May 2019)

  Changed paths:
    M htdocs/admin/pdf.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/projet/class/project.class.php

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

Conflicts:
        htdocs/admin/pdf.php
        htdocs/core/class/extrafields.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/321544b3fae3...ae3605d82d59



reply via email to

[Prev in Thread] Current Thread [Next in Thread]