[Dolibarr-git] [Dolibarr/dolibarr] aa3778: Fix migration errors reported by Softaculous

[Laurent Destailleur]

  Branch: refs/heads/8.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: aa377865963220c73bf2d5d6659a190cb8f3806d
      
https://github.com/Dolibarr/dolibarr/commit/aa377865963220c73bf2d5d6659a190cb8f3806d
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-06-26 (Tue, 26 Jun 2018)

  Changed paths:
    M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
    M htdocs/install/mysql/tables/llx_website_account.key.sql
    M htdocs/install/mysql/tables/llx_website_page.sql

  Log Message:
  -----------
  Fix migration errors reported by Softaculous


  Commit: ed2ec78332d2161079f2a26ad0f56d8d271dd6bb
      
https://github.com/Dolibarr/dolibarr/commit/ed2ec78332d2161079f2a26ad0f56d8d271dd6bb
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-06-28 (Thu, 28 Jun 2018)

  Changed paths:
    M htdocs/fourn/commande/card.php

  Log Message:
  -----------
  FIX combo of stock in popup are crazy in IE


  Commit: da138db528a93f2545df81bd4af61491f2cf2253
      
https://github.com/Dolibarr/dolibarr/commit/da138db528a93f2545df81bd4af61491f2cf2253
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-06-28 (Thu, 28 Jun 2018)

  Changed paths:
    M htdocs/commande/card.php
    M htdocs/compta/facture/card.php
    M htdocs/fourn/commande/card.php
    M htdocs/modulebuilder/template/myobject_card.php
    M htdocs/product/inventory/card.php
    M htdocs/website/websiteaccount_card.php

  Log Message:
  -----------
  FIX combo into popup become crazy with IE10

Conflicts:
        htdocs/asset/card.php
        htdocs/modulebuilder/template/myobject_card.php


  Commit: 7ebf54fbead8bae82238a754d1a26262baff162f
      
https://github.com/Dolibarr/dolibarr/commit/7ebf54fbead8bae82238a754d1a26262baff162f
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2018-06-28 (Thu, 28 Jun 2018)

  Changed paths:
    M htdocs/index.php

  Log Message:
  -----------
  Fix : division by 0 on homepage if nothing to do


  Commit: 2175a012e1f18ddfd63da161cbde7a83bea1c0fb
      
https://github.com/Dolibarr/dolibarr/commit/2175a012e1f18ddfd63da161cbde7a83bea1c0fb
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

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

  Log Message:
  -----------
  Fix lang


  Commit: ca8144c5eaf1fda2fefa3d26f12cc9a275d4ac1a
      
https://github.com/Dolibarr/dolibarr/commit/ca8144c5eaf1fda2fefa3d26f12cc9a275d4ac1a
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M htdocs/hrm/index.php

  Log Message:
  -----------
  Fix error message


  Commit: 932ff0be183b6a3ca3a1ab9c28f5a9dff5083539
      
https://github.com/Dolibarr/dolibarr/commit/932ff0be183b6a3ca3a1ab9c28f5a9dff5083539
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M htdocs/langs/en_US/compta.lang

  Log Message:
  -----------
  Trans


  Commit: 03306fa56e51464366d3300e15adc8fb2392bced
      
https://github.com/Dolibarr/dolibarr/commit/03306fa56e51464366d3300e15adc8fb2392bced
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M htdocs/index.php

  Log Message:
  -----------
  Merge pull request #9022 from atm-maxime/7.0

Fix : division by 0 on homepage if nothing to do


  Commit: 11021353da7da3d57bd347a9fbc1e539c62934ce
      
https://github.com/Dolibarr/dolibarr/commit/11021353da7da3d57bd347a9fbc1e539c62934ce
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

  Changed paths:
    M htdocs/compta/facture/card.php
    M htdocs/core/class/commoninvoice.class.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/langs/en_US/bills.lang

  Log Message:
  -----------
  Fix text in payment area of crabe pdf


  Commit: e8b97b0be4e1c46ac4080559bab58fc1915c1f83
      
https://github.com/Dolibarr/dolibarr/commit/e8b97b0be4e1c46ac4080559bab58fc1915c1f83
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

  Changed paths:
    M htdocs/index.php

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


  Commit: af21222c3050be4630ca2ca9bf31f57134e33e12
      
https://github.com/Dolibarr/dolibarr/commit/af21222c3050be4630ca2ca9bf31f57134e33e12
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

  Changed paths:
    M htdocs/langs/fr_FR/bills.lang

  Log Message:
  -----------
  Fix translation


  Commit: 7bf33b1bac4fe9ad835ab2356d03baf75c502257
      
https://github.com/Dolibarr/dolibarr/commit/7bf33b1bac4fe9ad835ab2356d03baf75c502257
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

  Changed paths:
    M htdocs/compta/facture/card.php
    M htdocs/core/class/CMailFile.class.php
    M htdocs/core/class/commoninvoice.class.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/hrm/index.php
    M htdocs/index.php
    M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
    A htdocs/install/mysql/tables/llx_website_account.key.sql
    A htdocs/install/mysql/tables/llx_website_account.sql
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/compta.lang
    M htdocs/langs/fr_FR/bills.lang
    M htdocs/modulebuilder/template/myobject_card.php

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

Conflicts:
        htdocs/hrm/index.php
        htdocs/install/mysql/tables/llx_website_account.key.sql
        htdocs/modulebuilder/template/myobject_card.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/16b4d2aee7db...7bf33b1bac4f
      **NOTE:** This service 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.