[Dolibarr-git] [Dolibarr/dolibarr] 6b5b10: FIX #7224

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 6b5b10fc949fd04451a595a59cb14c33beca904c
      
https://github.com/Dolibarr/dolibarr/commit/6b5b10fc949fd04451a595a59cb14c33beca904c
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-08-23 (Wed, 23 Aug 2017)

  Changed paths:
    M htdocs/product/class/productcustomerprice.class.php

  Log Message:
  -----------
  FIX #7224


  Commit: 947acfffe204575feeee6eb5bb38cd88bd09424a
      
https://github.com/Dolibarr/dolibarr/commit/947acfffe204575feeee6eb5bb38cd88bd09424a
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-08-23 (Wed, 23 Aug 2017)

  Changed paths:
    M htdocs/adherents/subscription.php

  Log Message:
  -----------
  FIX #7173


  Commit: 1b1d1a8d0b093f0bc34d717acce479048afea69e
      
https://github.com/Dolibarr/dolibarr/commit/1b1d1a8d0b093f0bc34d717acce479048afea69e
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-08-23 (Wed, 23 Aug 2017)

  Changed paths:
    M htdocs/societe/soc.php

  Log Message:
  -----------
  FIX #7156


  Commit: bf1f60b31e55fb4bd24a4d790444d79810a36f12
      
https://github.com/Dolibarr/dolibarr/commit/bf1f60b31e55fb4bd24a4d790444d79810a36f12
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-08-23 (Wed, 23 Aug 2017)

  Changed paths:
    M htdocs/adherents/subscription.php
    M htdocs/product/class/productcustomerprice.class.php
    M htdocs/societe/card.php

  Log Message:
  -----------
  Merge


  Commit: 9079d2890c429ac8012a70a3546f238d1330e1b8
      
https://github.com/Dolibarr/dolibarr/commit/9079d2890c429ac8012a70a3546f238d1330e1b8
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-08-23 (Wed, 23 Aug 2017)

  Changed paths:
    M htdocs/install/mysql/data/llx_c_currencies.sql

  Log Message:
  -----------
  Fix ajout du code devise Franc Pacifique


  Commit: ccb5344d32b803dd8abb02d27e2888f856f24612
      
https://github.com/Dolibarr/dolibarr/commit/ccb5344d32b803dd8abb02d27e2888f856f24612
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-08-23 (Wed, 23 Aug 2017)

  Changed paths:
    M htdocs/core/boxes/box_activity.php
    M htdocs/install/mysql/data/llx_c_currencies.sql

  Log Message:
  -----------
  Fix links


  Commit: ab37794f616a4f8df4a5a5ba5d6b308b55015b1c
      
https://github.com/Dolibarr/dolibarr/commit/ab37794f616a4f8df4a5a5ba5d6b308b55015b1c
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-08-23 (Wed, 23 Aug 2017)

  Changed paths:
    M htdocs/core/class/html.formmail.class.php

  Log Message:
  -----------
  Fix text


  Commit: 326d3df63f2a0b9151c1b303f2807607a8acd3a1
      
https://github.com/Dolibarr/dolibarr/commit/326d3df63f2a0b9151c1b303f2807607a8acd3a1
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-08-24 (Thu, 24 Aug 2017)

  Changed paths:
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/install/mysql/migration/repair.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/modulebuilder/template/myobject_list.php
    M htdocs/societe/list.php

  Log Message:
  -----------
  FIX select of category
FIX pb with extrafield list and key '0'

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


  Commit: 2416c387f5069174b4a984a193b15383ba89d2df
      
https://github.com/Dolibarr/dolibarr/commit/2416c387f5069174b4a984a193b15383ba89d2df
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-08-24 (Thu, 24 Aug 2017)

  Changed paths:
    M htdocs/societe/list.php

  Log Message:
  -----------
  Fix trad


  Commit: ef31c47c15f0de49bf2a0fa01117334e0987ac86
      
https://github.com/Dolibarr/dolibarr/commit/ef31c47c15f0de49bf2a0fa01117334e0987ac86
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-08-24 (Thu, 24 Aug 2017)

  Changed paths:
    M htdocs/contrat/services.php

  Log Message:
  -----------
  Fix clear filter


  Commit: 433700141885d8d01e9e7063760abcb72a5d563a
      
https://github.com/Dolibarr/dolibarr/commit/433700141885d8d01e9e7063760abcb72a5d563a
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-08-24 (Thu, 24 Aug 2017)

  Changed paths:
    M htdocs/adherents/subscription.php
    M htdocs/contrat/services.php
    M htdocs/core/boxes/box_activity.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/install/mysql/data/llx_c_currencies.sql
    M htdocs/product/class/productcustomerprice.class.php
    M htdocs/societe/card.php
    M htdocs/societe/list.php

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

Conflicts:
        htdocs/societe/list.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/8e6546497a14...433700141885