[Dolibarr-git] [Dolibarr/dolibarr] 5b5473: Fix: [ bug #1509 ] Expedition admin submit error

[Laurent Destailleur]

  Branch: refs/heads/3.5
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 5b5473bc7c09fa98d55321944cd5db6cc21137c2
      
https://github.com/Dolibarr/dolibarr/commit/5b5473bc7c09fa98d55321944cd5db6cc21137c2
  Author: Francis Appels <address@hidden>
  Date:   2014-06-19 (Thu, 19 Jun 2014)

  Changed paths:
    M ChangeLog
    M htdocs/admin/expedition.php

  Log Message:
  -----------
  Fix: [ bug #1509 ] Expedition admin submit error

Expedition admin free text & watermark submit error


  Commit: 1cffc8d8f6abfa7fca7e46b6583df2dc05eb0aee
      
https://github.com/Dolibarr/dolibarr/commit/1cffc8d8f6abfa7fca7e46b6583df2dc05eb0aee
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

  Changed paths:
    M ChangeLog
    M htdocs/admin/expedition.php

  Log Message:
  -----------
  Merge branch '3.5' of github.com:fappels/dolibarr into fappels-3.5


  Commit: ab2e88bc661f2ceb236c408d64ae4d2877928510
      
https://github.com/Dolibarr/dolibarr/commit/ab2e88bc661f2ceb236c408d64ae4d2877928510
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

  Changed paths:
    M ChangeLog
    M htdocs/admin/expedition.php

  Log Message:
  -----------
  Merge branch 'fappels-3.5' into 3.5


  Commit: c903fe9340a835d471427fcbdcf79ea9ada9b81a
      
https://github.com/Dolibarr/dolibarr/commit/c903fe9340a835d471427fcbdcf79ea9ada9b81a
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

  Changed paths:
    M ChangeLog
    M htdocs/comm/propal.php
    M htdocs/commande/fiche.php
    M htdocs/compta/facture.php
    M htdocs/core/js/lib_head.js
    M htdocs/core/lib/ajax.lib.php
    M htdocs/fourn/commande/fiche.php
    M htdocs/fourn/facture/fiche.php

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

Conflicts:
        ChangeLog


Compare: 
https://github.com/Dolibarr/dolibarr/compare/6740e0321aaa...c903fe9340a8