[Dolibarr-git] [Dolibarr/dolibarr] 69bdf3: Fix: The scale was hardcoded.

[Laurent Destailleur]

  Branch: refs/heads/3.4_backported
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 69bdf3a453ca17a97525f9d0fcb90c35f06e31dc
      
https://github.com/Dolibarr/dolibarr/commit/69bdf3a453ca17a97525f9d0fcb90c35f06e31dc
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-01-04 (Sat, 04 Jan 2014)

  Changed paths:
    M htdocs/core/modules/barcode/phpbarcode.modules.php

  Log Message:
  -----------
  Fix: The scale was hardcoded.
Comment in english


  Commit: 427567b85834d73da8fe61b78466ac6262909ecd
      
https://github.com/Dolibarr/dolibarr/commit/427567b85834d73da8fe61b78466ac6262909ecd
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-01-04 (Sat, 04 Jan 2014)

  Changed paths:
    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/langs/en_US/products.lang
    M htdocs/langs/fr_FR/products.lang

  Log Message:
  -----------
  Fix: A lot of bug into generation of sticker pages or address pages
form members module:
- Position of element was wrong for non A4 pages.
- Removed bugged definition of 5164 sticker template.
- Solve problem of image proportions.
- Margin of right was wrong.

Conflicts:
        htdocs/core/modules/member/doc/pdf_standard.class.php
        htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php

Conflicts:
        htdocs/core/modules/member/doc/pdf_standard.class.php
        htdocs/langs/en_US/products.lang
        htdocs/langs/fr_FR/products.lang


Compare: 
https://github.com/Dolibarr/dolibarr/compare/c64234a5bfd4...427567b85834