[Dolibarr-git] [Dolibarr/dolibarr] f08ce6: Fix bug on DDLCreateDb in Mysql

[Laurent Destailleur]

  Branch: refs/heads/3.4
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: f08ce6d96adc78d8e04ab32828c3c13c5b82f497
      
https://github.com/Dolibarr/dolibarr/commit/f08ce6d96adc78d8e04ab32828c3c13c5b82f497
  Author: fhenry <address@hidden>
  Date:   2013-05-21 (Tue, 21 May 2013)

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

  Log Message:
  -----------
  Fix bug on DDLCreateDb in Mysql


  Commit: b36a16ed43bc156e332c546b917391383a03224b
      
https://github.com/Dolibarr/dolibarr/commit/b36a16ed43bc156e332c546b917391383a03224b
  Author: fhenry <address@hidden>
  Date:   2013-05-21 (Tue, 21 May 2013)

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

  Log Message:
  -----------
  

Change-Id: I2e25d4b82388f6a0fc83b97f9162a095247e3fa1


  Commit: 992600664e2fb397fb23dc26878b55ee5c5ff6f3
      
https://github.com/Dolibarr/dolibarr/commit/992600664e2fb397fb23dc26878b55ee5c5ff6f3
  Author: Christophe Battarel <address@hidden>
  Date:   2013-05-22 (Wed, 22 May 2013)

  Changed paths:
    M htdocs/fichinter/fiche.php

  Log Message:
  -----------
  fix wrong construction of description when creatin from orders (it was 
putting a mess on update)


  Commit: 1109527528e2d7d3a261792f6195d5d02e7f0c32
      
https://github.com/Dolibarr/dolibarr/commit/1109527528e2d7d3a261792f6195d5d02e7f0c32
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-05-22 (Wed, 22 May 2013)

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

  Log Message:
  -----------
  Merge pull request #968 from FHenry/3.3

3.3


  Commit: d5d4bc33ba6aa1db75842ef84233ba1399bf2ee8
      
https://github.com/Dolibarr/dolibarr/commit/d5d4bc33ba6aa1db75842ef84233ba1399bf2ee8
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-05-22 (Wed, 22 May 2013)

  Changed paths:
    M htdocs/fichinter/fiche.php

  Log Message:
  -----------
  Merge pull request #971 from cbattarel/3.3

fix wrong construction of description when creating from orders


  Commit: 469ae91e70a4517e9bcc0849fd7111dac9ef98ae
      
https://github.com/Dolibarr/dolibarr/commit/469ae91e70a4517e9bcc0849fd7111dac9ef98ae
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-05-22 (Wed, 22 May 2013)

  Changed paths:
    M htdocs/core/lib/json.lib.php

  Log Message:
  -----------
  Fix: regression


  Commit: 7856b7f613ce7e884c455759e249c1f1bfa8a444
      
https://github.com/Dolibarr/dolibarr/commit/7856b7f613ce7e884c455759e249c1f1bfa8a444
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-05-22 (Wed, 22 May 2013)

  Changed paths:
    M build/obs/README
    M htdocs/webservices/demo_wsclient_category.php-NORUN
    M htdocs/webservices/server_category.php

  Log Message:
  -----------
  Removed warning


  Commit: ee8445710444430fd4f08e23a8e0fa05b15d95ae
      
https://github.com/Dolibarr/dolibarr/commit/ee8445710444430fd4f08e23a8e0fa05b15d95ae
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-05-23 (Thu, 23 May 2013)

  Changed paths:
    M htdocs/core/modules/mailings/thirdparties_services_expired.modules.php

  Log Message:
  -----------
  Fix: not defined default value


  Commit: 7b29e587606fd14ff3150742fcc94a448e3817f7
      
https://github.com/Dolibarr/dolibarr/commit/7b29e587606fd14ff3150742fcc94a448e3817f7
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-05-24 (Fri, 24 May 2013)

  Changed paths:
    M build/obs/README
    M htdocs/fichinter/fiche.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.3' into 3.4

Conflicts:
        htdocs/core/modules/mailings/thirdparties_services_expired.modules.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/eecfbf9670ec...7b29e587606f