[Dolibarr-git] [Dolibarr/dolibarr] f652a4: Script to prepare 3.3.5

[Laurent Destailleur]

  Branch: refs/heads/3.4_backported
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: f652a4d807c05f59ac6ba00ffaaf135110634b4c
      
https://github.com/Dolibarr/dolibarr/commit/f652a4d807c05f59ac6ba00ffaaf135110634b4c
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-09 (Sun, 09 Mar 2014)

  Changed paths:
    M build/debian/dolibarr.install
    M build/makepack-dolibarr.pl

  Log Message:
  -----------
  Script to prepare 3.3.5


  Commit: 7a741e06918fe5bd6d65f5da9a3cf427e3ea463c
      
https://github.com/Dolibarr/dolibarr/commit/7a741e06918fe5bd6d65f5da9a3cf427e3ea463c
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-09 (Sun, 09 Mar 2014)

  Changed paths:
    M build/debian/dolibarr.install
    M build/makepack-dolibarr.pl

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

Conflicts:
        build/makepack-dolibarr.pl


  Commit: e7791a3ade56b8a642d298070537765e66640c61
      
https://github.com/Dolibarr/dolibarr/commit/e7791a3ade56b8a642d298070537765e66640c61
  Author: bouna <address@hidden>
  Date:   2014-03-14 (Fri, 14 Mar 2014)

  Changed paths:
    M htdocs/comm/prospect/list.php

  Log Message:
  -----------
  Update list.php

to save the town filtre on prospect list, just i replace: 
$param='&amp;stcomm='.$stcomm.'&amp;search_nom='.urlencode($search_nom).'&amp;search_zipcode='.urlencode($search_zipcode).'&amp;search_ville
 ='.urlencode($search_ville );

search_ville by search_town


  Commit: 90cf1ba3a5c4b69a7435a094d69bb1c6910ae620
      
https://github.com/Dolibarr/dolibarr/commit/90cf1ba3a5c4b69a7435a094d69bb1c6910ae620
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-15 (Sat, 15 Mar 2014)

  Changed paths:
    M htdocs/comm/prospect/list.php

  Log Message:
  -----------
  Merge pull request #1468 from bouna/patch-1

Update list.php


  Commit: 062c150bc1662c92099cb8ab780db0e59cc7244d
      
https://github.com/Dolibarr/dolibarr/commit/062c150bc1662c92099cb8ab780db0e59cc7244d
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-19 (Wed, 19 Mar 2014)

  Changed paths:
    M htdocs/core/modules/import/import_csv.modules.php

  Log Message:
  -----------
  Fix: import of fields with value "auto"


  Commit: 9cd7f68ae88251298f8147b6ececccebc1e32ecf
      
https://github.com/Dolibarr/dolibarr/commit/9cd7f68ae88251298f8147b6ececccebc1e32ecf
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-19 (Wed, 19 Mar 2014)

  Changed paths:
    M htdocs/comm/prospect/list.php

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


  Commit: ecdba9d9489c92c3e76c0d64c5b09d6044643f5c
      
https://github.com/Dolibarr/dolibarr/commit/ecdba9d9489c92c3e76c0d64c5b09d6044643f5c
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-19 (Wed, 19 Mar 2014)

  Changed paths:
    M build/debian/dolibarr.install
    M build/makepack-dolibarr.pl
    M htdocs/comm/prospect/list.php
    M htdocs/core/modules/import/import_csv.modules.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/559c652ba88b...ecdba9d9489c