[Dolibarr-git] [Dolibarr/dolibarr] 12b83f: Fix #3304

[Juanjo Menent]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 12b83fd3e8ec3ee5b79f6ce52469c5504dec193d
      
https://github.com/Dolibarr/dolibarr/commit/12b83fd3e8ec3ee5b79f6ce52469c5504dec193d
  Author: Juanjo Menent <address@hidden>
  Date:   2015-08-07 (Fri, 07 Aug 2015)

  Changed paths:
    M htdocs/core/modules/modBarcode.class.php

  Log Message:
  -----------
  Fix #3304


  Commit: 38afb1a4e6eef678ce394f9719e704fcd5f039c8
      
https://github.com/Dolibarr/dolibarr/commit/38afb1a4e6eef678ce394f9719e704fcd5f039c8
  Author: Juanjo Menent <address@hidden>
  Date:   2015-08-07 (Fri, 07 Aug 2015)

  Changed paths:
    M htdocs/core/modules/modBarcode.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.7' into 3.8

# Conflicts:
#       htdocs/core/modules/modBarcode.class.php


  Commit: f695b5cd118b160238fc739bf7ad2688ebe1ada2
      
https://github.com/Dolibarr/dolibarr/commit/f695b5cd118b160238fc739bf7ad2688ebe1ada2
  Author: Juanjo Menent <address@hidden>
  Date:   2015-08-07 (Fri, 07 Aug 2015)

  Changed paths:
    M htdocs/core/modules/modBarcode.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.8' into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/af55c8467b3e...f695b5cd118b