[Dolibarr-git] [Dolibarr/dolibarr] f0c951: Fix: [ bug #1558 ] Product/service edit page title...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: f0c9513fa9de5b1dd73741375f395840199dcdcf
      
https://github.com/Dolibarr/dolibarr/commit/f0c9513fa9de5b1dd73741375f395840199dcdcf
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-16 (Sat, 16 Aug 2014)

  Changed paths:
    M ChangeLog
    M htdocs/product/fiche.php

  Log Message:
  -----------
  Fix: [ bug #1558 ] Product/service edit page title shows new Ref instead
of old ref


  Commit: 3336b5bdcede4664e11886b3f739fb14fd7a807f
      
https://github.com/Dolibarr/dolibarr/commit/3336b5bdcede4664e11886b3f739fb14fd7a807f
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-16 (Sat, 16 Aug 2014)

  Changed paths:
    M ChangeLog
    M htdocs/user/param_ihm.php

  Log Message:
  -----------
  Fix: [ bug #1553 ] Saving User displays setup removes menu


  Commit: 3f8ec47e91b0669a9196b6ade2dde25c8ccec9a1
      
https://github.com/Dolibarr/dolibarr/commit/3f8ec47e91b0669a9196b6ade2dde25c8ccec9a1
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-16 (Sat, 16 Aug 2014)

  Changed paths:
    M ChangeLog
    M htdocs/product/fiche.php
    M htdocs/user/param_ihm.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
        ChangeLog


  Commit: b0ebaec0dab012d205908fddf2f192eabdc17268
      
https://github.com/Dolibarr/dolibarr/commit/b0ebaec0dab012d205908fddf2f192eabdc17268
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-17 (Sun, 17 Aug 2014)

  Changed paths:
    M htdocs/admin/dict.php
    M htdocs/core/db/mysql.class.php
    M htdocs/core/db/mysqli.class.php

  Log Message:
  -----------
  Fix: Add more log and missing error message


  Commit: 0632cbdad060362070abac770f366365c1a66abd
      
https://github.com/Dolibarr/dolibarr/commit/0632cbdad060362070abac770f366365c1a66abd
  Author: Regis Houssin <address@hidden>
  Date:   2014-08-17 (Sun, 17 Aug 2014)

  Changed paths:
    M htdocs/core/js/lib_head.js
    M htdocs/core/lib/ajax.lib.php

  Log Message:
  -----------
  Fix: broken feature: add param for use only "disabled" with delConstant
and "enabled" with setConstant


  Commit: dd9a08120ffc33026cda86ad3e3afc8f3f934323
      
https://github.com/Dolibarr/dolibarr/commit/dd9a08120ffc33026cda86ad3e3afc8f3f934323
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-17 (Sun, 17 Aug 2014)

  Changed paths:
    M htdocs/core/db/pgsql.class.php

  Log Message:
  -----------
  Fix: no ' on command to create user on pgsql


  Commit: d5eb4510e21d6a31ce2435a93ace95cb84dbdd2a
      
https://github.com/Dolibarr/dolibarr/commit/d5eb4510e21d6a31ce2435a93ace95cb84dbdd2a
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-17 (Sun, 17 Aug 2014)

  Changed paths:
    M htdocs/core/js/lib_head.js
    M htdocs/core/lib/ajax.lib.php

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


  Commit: 4f206a21258a977eb0ed26e2739956231cf42aaa
      
https://github.com/Dolibarr/dolibarr/commit/4f206a21258a977eb0ed26e2739956231cf42aaa
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-17 (Sun, 17 Aug 2014)

  Changed paths:
    M htdocs/core/class/extrafields.class.php

  Log Message:
  -----------
  Fix: Missing empty field


  Commit: be6f99c10e0983d8088ec81d008089530270cb20
      
https://github.com/Dolibarr/dolibarr/commit/be6f99c10e0983d8088ec81d008089530270cb20
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-17 (Sun, 17 Aug 2014)

  Changed paths:
    M ChangeLog
    M htdocs/admin/dict.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/db/mysql.class.php
    M htdocs/core/db/mysqli.class.php
    M htdocs/core/db/pgsql.class.php
    M htdocs/product/fiche.php
    M htdocs/user/param_ihm.php

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

Conflicts:
        htdocs/admin/dict.php
        htdocs/core/db/mysql.class.php
        htdocs/core/db/mysqli.class.php
        htdocs/core/lib/ajax.lib.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/b6ff6527bcba...be6f99c10e09