[Dolibarr-git] [Dolibarr/dolibarr] 96f16b: Update commondocgenerator.class.php

[Laurent Destailleur]

  Branch: refs/heads/8.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 96f16b74975b2b7730056012ff54ffa58e7e74ef
      
https://github.com/Dolibarr/dolibarr/commit/96f16b74975b2b7730056012ff54ffa58e7e74ef
  Author: Frédéric FRANCE <address@hidden>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

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

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


  Commit: 343e6ce8b3ba610f4199421d9d1b35cfa54c8b7e
      
https://github.com/Dolibarr/dolibarr/commit/343e6ce8b3ba610f4199421d9d1b35cfa54c8b7e
  Author: Frédéric FRANCE <address@hidden>
  Date:   2018-08-23 (Thu, 23 Aug 2018)

  Changed paths:
    M htdocs/comm/action/class/actioncomm.class.php

  Log Message:
  -----------
  typo


  Commit: 79aa390fe84cee2690974e9d55639f121cf9883c
      
https://github.com/Dolibarr/dolibarr/commit/79aa390fe84cee2690974e9d55639f121cf9883c
  Author: gauthier <address@hidden>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

  Changed paths:
    M htdocs/install/mysql/migration/6.0.0-7.0.0.sql

  Log Message:
  -----------
  FIX : table llx_chargessociales doesn't exists


  Commit: 1f807b921658ec4aa70102646c87741c4ea9e081
      
https://github.com/Dolibarr/dolibarr/commit/1f807b921658ec4aa70102646c87741c4ea9e081
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-08-28 (Tue, 28 Aug 2018)

  Changed paths:
    M htdocs/install/mysql/migration/6.0.0-7.0.0.sql

  Log Message:
  -----------
  Merge pull request #9305 from atm-gauthier/7.0_fix_altertable_charges

FIX : table llx_chargessociales doesn't exists


  Commit: d90eed30985e1fb5ca31ec21b5dd04e0bfc4d33a
      
https://github.com/Dolibarr/dolibarr/commit/d90eed30985e1fb5ca31ec21b5dd04e0bfc4d33a
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-08-28 (Tue, 28 Aug 2018)

  Changed paths:
    M htdocs/comm/action/class/actioncomm.class.php

  Log Message:
  -----------
  Merge pull request #9291 from frederic34/patch-23

typo


  Commit: 4369be7b393913698d64e0fc00defcb615654471
      
https://github.com/Dolibarr/dolibarr/commit/4369be7b393913698d64e0fc00defcb615654471
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-08-28 (Tue, 28 Aug 2018)

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

  Log Message:
  -----------
  Merge pull request #9284 from frederic34/patch-20

Update commondocgenerator.class.php


  Commit: 0a7ce338f96d53319045c91eaaba3d062bbf08b3
      
https://github.com/Dolibarr/dolibarr/commit/0a7ce338f96d53319045c91eaaba3d062bbf08b3
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-08-28 (Tue, 28 Aug 2018)

  Changed paths:
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/install/mysql/migration/6.0.0-7.0.0.sql

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

Conflicts:
        htdocs/core/class/commondocgenerator.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/0d138b8fc032...0a7ce338f96d
      **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.