[Dolibarr-git] [Dolibarr/dolibarr] 703d4a: FIX #7648

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 703d4a6aeebaa87c391910eaa20a9447b08d8763
      
https://github.com/Dolibarr/dolibarr/commit/703d4a6aeebaa87c391910eaa20a9447b08d8763
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-22 (Sun, 22 Oct 2017)

  Changed paths:
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/facture/card.php

  Log Message:
  -----------
  FIX #7648


  Commit: be0cd601a98f054e27799f0efb13fff6f17a5d5f
      
https://github.com/Dolibarr/dolibarr/commit/be0cd601a98f054e27799f0efb13fff6f17a5d5f
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-22 (Sun, 22 Oct 2017)

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

  Log Message:
  -----------
  Fix dead code


  Commit: 745c4625a62699501e8a67e290cd47271395a1b3
      
https://github.com/Dolibarr/dolibarr/commit/745c4625a62699501e8a67e290cd47271395a1b3
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-22 (Sun, 22 Oct 2017)

  Changed paths:
    M htdocs/societe/class/api_contacts.class.php
    M htdocs/societe/class/api_thirdparties.class.php

  Log Message:
  -----------
  FIX #7619


  Commit: 79279caa2e4d0eec54c2a39d8a908d655670927e
      
https://github.com/Dolibarr/dolibarr/commit/79279caa2e4d0eec54c2a39d8a908d655670927e
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-22 (Sun, 22 Oct 2017)

  Changed paths:
    M htdocs/societe/class/api_contacts.class.php
    M htdocs/societe/class/api_thirdparties.class.php

  Log Message:
  -----------
  FIX #7619


  Commit: 98674f6d82c8ae84f6407ebbc5e2aa5433ccbb21
      
https://github.com/Dolibarr/dolibarr/commit/98674f6d82c8ae84f6407ebbc5e2aa5433ccbb21
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-22 (Sun, 22 Oct 2017)

  Changed paths:
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/facture/card.php
    M htdocs/societe/class/api_contacts.class.php
    M htdocs/societe/class/api_thirdparties.class.php

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

Conflicts:
        htdocs/fourn/facture/card.php
        htdocs/societe/class/api_contacts.class.php
        htdocs/societe/class/api_thirdparties.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/f3c6442a93ee...98674f6d82c8