[Dolibarr-git] [Dolibarr/dolibarr] f3eec7: Minor BugFix : Wrong variable reference in getNomU...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: f3eec7582ee281fb59a2659e8154854d6651434a
      
https://github.com/Dolibarr/dolibarr/commit/f3eec7582ee281fb59a2659e8154854d6651434a
  Author: BadPixxel <address@hidden>
  Date:   2014-09-30 (Tue, 30 Sep 2014)

  Changed paths:
    M htdocs/categories/class/categorie.class.php

  Log Message:
  -----------
  Minor BugFix : Wrong variable reference in getNomUrl 

Display of Category Url was incompete due to reference to "$ref" instead of 
"$label"


  Commit: 820e6e5d95fb879776dd51dfa64797401a29fff9
      
https://github.com/Dolibarr/dolibarr/commit/820e6e5d95fb879776dd51dfa64797401a29fff9
  Author: BadPixxel <address@hidden>
  Date:   2014-09-30 (Tue, 30 Sep 2014)

  Changed paths:
    M htdocs/categories/class/categorie.class.php

  Log Message:
  -----------
  Minor BugFix : Compatibility of function getNomUrl 

Using Ref & Label for Category Name display is necessary for compatibility


  Commit: 12e6d1bf6c2d253ee3f051cc5577670bd94581fc
      
https://github.com/Dolibarr/dolibarr/commit/12e6d1bf6c2d253ee3f051cc5577670bd94581fc
  Author: BadPixxel <address@hidden>
  Date:   2014-09-30 (Tue, 30 Sep 2014)

  Changed paths:
    M htdocs/langs/fr_FR/categories.lang

  Log Message:
  -----------
  Missing Key for getNomUrl function


  Commit: cf2ba78fc1be4a46a0d443fc8d510d8eca2ad20b
      
https://github.com/Dolibarr/dolibarr/commit/cf2ba78fc1be4a46a0d443fc8d510d8eca2ad20b
  Author: BadPixxel <address@hidden>
  Date:   2014-09-30 (Tue, 30 Sep 2014)

  Changed paths:
    M htdocs/langs/en_US/categories.lang

  Log Message:
  -----------
  Missing Key for getNomUrl function


  Commit: d6c8f65dad43bc0734b0b4b69dd3f9f14318055f
      
https://github.com/Dolibarr/dolibarr/commit/d6c8f65dad43bc0734b0b4b69dd3f9f14318055f
  Author: BadPixxel <address@hidden>
  Date:   2014-09-30 (Tue, 30 Sep 2014)

  Changed paths:
    M htdocs/categories/class/categorie.class.php

  Log Message:
  -----------
  Minor BugFix : Missing thumbs folder in Category Images List

Sub-folder for thumbs was missing in category image list, url was wrong....


  Commit: f178aa65ca86984817dcfb04ff1c4b8765a95af9
      
https://github.com/Dolibarr/dolibarr/commit/f178aa65ca86984817dcfb04ff1c4b8765a95af9
  Author: BadPixxel <address@hidden>
  Date:   2014-09-30 (Tue, 30 Sep 2014)

  Changed paths:
    M htdocs/categories/photos.php

  Log Message:
  -----------
  removed "thumb\" subdir addition 

Category Image Thumb sub-folder now directly added by function liste_photos


  Commit: 8fc5faf4a843d801e3517399b70ea4e7b17cd125
      
https://github.com/Dolibarr/dolibarr/commit/8fc5faf4a843d801e3517399b70ea4e7b17cd125
  Author: BadPixxel <address@hidden>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    M htdocs/categories/class/categorie.class.php

  Log Message:
  -----------
  Minor BugFix : Missing delete Category Multilangual fields

Delete of Multilangual fields was missing, impossible to delete category.

Fixed Error : 
Cannot delete or update a parent row: a foreign key constraint fails 
(`Dol-3.6`.`llx_categorie_lang`, CONSTRAINT `fk_category_lang_fk_category` 
FOREIGN KEY (`fk_category`) REFERENCES `llx_categorie` (`rowid`))


  Commit: 58c06264e4dc3de518b76dc269ed7864d8fef873
      
https://github.com/Dolibarr/dolibarr/commit/58c06264e4dc3de518b76dc269ed7864d8fef873
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-11-15 (Sat, 15 Nov 2014)

  Changed paths:
    M htdocs/categories/class/categorie.class.php
    M htdocs/categories/photos.php
    M htdocs/langs/en_US/categories.lang
    M htdocs/langs/fr_FR/categories.lang

  Log Message:
  -----------
  Merge branch 'develop' of github.com:BadPixxel/dolibarr into
BadPixxel-develop

Conflicts:
        htdocs/langs/en_US/categories.lang
        htdocs/langs/fr_FR/categories.lang


  Commit: ac2c7c4f81d6f2b0583cfdd949f30c481dd47293
      
https://github.com/Dolibarr/dolibarr/commit/ac2c7c4f81d6f2b0583cfdd949f30c481dd47293
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-11-15 (Sat, 15 Nov 2014)

  Changed paths:
    M htdocs/categories/class/categorie.class.php
    M htdocs/categories/photos.php
    M htdocs/langs/en_US/categories.lang
    M htdocs/langs/fr_FR/categories.lang

  Log Message:
  -----------
  Merge branch 'BadPixxel-develop' into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/eb41fc2765cc...ac2c7c4f81d6