[Dolibarr-git] [Dolibarr/dolibarr] 2b056b: BUG Fix of old hidden feature price per quantity

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 2b056b01774f78ae7461de0c39ed676bdfcb5388
      
https://github.com/Dolibarr/dolibarr/commit/2b056b01774f78ae7461de0c39ed676bdfcb5388
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-12-22 (Fri, 22 Dec 2017)

  Changed paths:
    M htdocs/core/class/html.form.class.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
    M htdocs/install/mysql/tables/llx_product_price_by_qty.sql
    M htdocs/langs/en_US/products.lang
    M htdocs/product/admin/product.php
    M htdocs/product/class/product.class.php
    M htdocs/product/price.php

  Log Message:
  -----------
  BUG Fix of old hidden feature price per quantity


  Commit: 3b54be5dac0822de3c43fd988a8fe8c12ae308dc
      
https://github.com/Dolibarr/dolibarr/commit/3b54be5dac0822de3c43fd988a8fe8c12ae308dc
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-12-22 (Fri, 22 Dec 2017)

  Changed paths:
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php

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

Conflicts:
        htdocs/product/price.php


  Commit: fb8326a9bbec1834ac7ea53ef42c42b6e1408e03
      
https://github.com/Dolibarr/dolibarr/commit/fb8326a9bbec1834ac7ea53ef42c42b6e1408e03
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-12-22 (Fri, 22 Dec 2017)

  Changed paths:
    A htdocs/includes/fonts/LICENSE-Roboto.txt
    A htdocs/includes/fonts/Roboto-Black.ttf
    A htdocs/includes/fonts/Roboto-BlackItalic.ttf
    A htdocs/includes/fonts/Roboto-Bold.ttf
    A htdocs/includes/fonts/Roboto-BoldItalic.ttf
    A htdocs/includes/fonts/Roboto-Italic.ttf
    A htdocs/includes/fonts/Roboto-Light.ttf
    A htdocs/includes/fonts/Roboto-LightItalic.ttf
    A htdocs/includes/fonts/Roboto-Medium.ttf
    A htdocs/includes/fonts/Roboto-MediumItalic.ttf
    A htdocs/includes/fonts/Roboto-Regular.ttf
    A htdocs/includes/fonts/Roboto-Thin.ttf
    A htdocs/includes/fonts/Roboto-ThinItalic.ttf

  Log Message:
  -----------
  Css use roboto but files does not exists


Compare: 
https://github.com/Dolibarr/dolibarr/compare/ff245aa64649...fb8326a9bbec