[Dolibarr-git] [Dolibarr/dolibarr] 9c74af: Dictionnary for label sticker and card format

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 9c74af63af3a56f1bad38fa6e351991679178bd2
      
https://github.com/Dolibarr/dolibarr/commit/9c74af63af3a56f1bad38fa6e351991679178bd2
  Author: frederic34 <address@hidden>
  Date:   2016-02-06 (Sat, 06 Feb 2016)

  Changed paths:
    M htdocs/admin/dict.php
    M htdocs/core/lib/format_cards.lib.php
    M htdocs/core/modules/member/doc/pdf_standard.class.php
    M htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
    M htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    A htdocs/install/mysql/tables/llx_c_format_cards.sql

  Log Message:
  -----------
  Dictionnary for label sticker and card format


  Commit: 0d11d94234f90549a7df5565fd86183200d8b29e
      
https://github.com/Dolibarr/dolibarr/commit/0d11d94234f90549a7df5565fd86183200d8b29e
  Author: frederic34 <address@hidden>
  Date:   2016-02-06 (Sat, 06 Feb 2016)

  Changed paths:
    M htdocs/contact/list.php
    M htdocs/core/actions_extrafields.inc.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/html.formpropal.class.php
    M htdocs/core/js/select2_locale.js.php
    A htdocs/core/modules/product/modules_product.php
    M htdocs/core/tpl/admin_extrafields_add.tpl.php
    M htdocs/core/tpl/admin_extrafields_edit.tpl.php
    M htdocs/core/tpl/admin_extrafields_view.tpl.php
    M htdocs/core/tpl/contacts.tpl.php
    M htdocs/core/tpl/extrafields_view.tpl.php
    M htdocs/install/mysql/data/llx_10_c_regions.sql
    M htdocs/install/mysql/data/llx_20_c_departements.sql
    M htdocs/install/mysql/data/llx_c_forme_juridique.sql
    M htdocs/install/mysql/data/llx_c_tva.sql
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    M htdocs/install/mysql/tables/llx_extrafields.sql
    M htdocs/langs/de_DE/companies.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/langs/fr_FR/companies.lang
    M htdocs/product/admin/product.php
    M htdocs/product/card.php

  Log Message:
  -----------
  Merge remote branch 'upstream/develop' into sticker

Conflicts:
        htdocs/install/mysql/migration/3.9.0-4.0.0.sql


  Commit: e079021de3c454f5ed53e79e542f0c01b3038425
      
https://github.com/Dolibarr/dolibarr/commit/e079021de3c454f5ed53e79e542f0c01b3038425
  Author: frederic34 <address@hidden>
  Date:   2016-02-06 (Sat, 06 Feb 2016)

  Changed paths:
    A htdocs/install/mysql/data/llx_c_format_cards.sql

  Log Message:
  -----------
  data


  Commit: fcf1e20d5bfd30278e247d46621a764d5a939956
      
https://github.com/Dolibarr/dolibarr/commit/fcf1e20d5bfd30278e247d46621a764d5a939956
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-02-08 (Mon, 08 Feb 2016)

  Changed paths:
    M htdocs/admin/dict.php
    M htdocs/core/lib/format_cards.lib.php
    M htdocs/core/modules/member/doc/pdf_standard.class.php
    M htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
    M htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
    A htdocs/install/mysql/data/llx_c_format_cards.sql
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    A htdocs/install/mysql/tables/llx_c_format_cards.sql

  Log Message:
  -----------
  Merge pull request #4578 from frederic34/sticker

Dictionnary for label sticker and card format


Compare: 
https://github.com/Dolibarr/dolibarr/compare/b5ca02fddfab...fcf1e20d5bfd