[Dolibarr-git] [Dolibarr/dolibarr] fd3932: FIX you should prefer "elseif" than "else if"

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: fd393218d34c3cf50c403ccc968b7c29c8abbfbd
      
https://github.com/Dolibarr/dolibarr/commit/fd393218d34c3cf50c403ccc968b7c29c8abbfbd
  Author: Regis Houssin <address@hidden>
  Date:   2019-03-14 (Thu, 14 Mar 2019)

  Changed paths:
    M htdocs/takepos/ajax.php

  Log Message:
  -----------
  FIX you should prefer "elseif" than "else if"


  Commit: 39b2298270aea476bd3b5eb7245e8f5711e4f520
      
https://github.com/Dolibarr/dolibarr/commit/39b2298270aea476bd3b5eb7245e8f5711e4f520
  Author: Regis Houssin <address@hidden>
  Date:   2019-03-14 (Thu, 14 Mar 2019)

  Changed paths:
    M htdocs/accountancy/index.php
    M htdocs/admin/facture.php
    M htdocs/admin/prelevement.php
    M htdocs/admin/propal.php
    M htdocs/comm/propal/contact.php
    M htdocs/commande/contact.php
    M htdocs/compta/resultat/result.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/expedition/card.php
    M htdocs/expedition/contact.php
    M htdocs/reception/card.php
    M htdocs/reception/contact.php
    M htdocs/societe/societecontact.php

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


  Commit: f43f3e003895999c62f0c26008f1b178c830e242
      
https://github.com/Dolibarr/dolibarr/commit/f43f3e003895999c62f0c26008f1b178c830e242
  Author: Regis Houssin <address@hidden>
  Date:   2019-03-14 (Thu, 14 Mar 2019)

  Changed paths:
    M htdocs/accountancy/admin/productaccount.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/public/agenda/agendaexport.php

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


  Commit: a40cba194f68588ff10d223b7225403db79b264d
      
https://github.com/Dolibarr/dolibarr/commit/a40cba194f68588ff10d223b7225403db79b264d
  Author: Regis Houssin <address@hidden>
  Date:   2019-03-14 (Thu, 14 Mar 2019)

  Changed paths:
    M htdocs/takepos/takepos.php

  Log Message:
  -----------
  FIX wrong url


  Commit: 56104e6d8962acc76be6128831c9206684cd562e
      
https://github.com/Dolibarr/dolibarr/commit/56104e6d8962acc76be6128831c9206684cd562e
  Author: Regis Houssin <address@hidden>
  Date:   2019-03-14 (Thu, 14 Mar 2019)

  Changed paths:
    M htdocs/takepos/takepos.php

  Log Message:
  -----------
  FIX regression


  Commit: f865d1c378fda5f3499539000392ebbb9a2f1292
      
https://github.com/Dolibarr/dolibarr/commit/f865d1c378fda5f3499539000392ebbb9a2f1292
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-03-14 (Thu, 14 Mar 2019)

  Changed paths:
    M htdocs/takepos/takepos.php

  Log Message:
  -----------
  Merge pull request #10840 from hregis/develop_takepos

FIX wrong url


Compare: 
https://github.com/Dolibarr/dolibarr/compare/f9d76c372d54...f865d1c378fd