[Dolibarr-git] [Dolibarr/dolibarr] 047aa8: Fix: avoid error when multiple files uploaded

[Laurent Destailleur]

  Branch: refs/heads/3.4
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 047aa8ea29f7ef92dc4701fd5f3b3b0c4b048fce
      
https://github.com/Dolibarr/dolibarr/commit/047aa8ea29f7ef92dc4701fd5f3b3b0c4b048fce
  Author: Regis Houssin <address@hidden>
  Date:   2013-05-14 (Tue, 14 May 2013)

  Changed paths:
    M htdocs/core/tpl/ajax/fileupload_main.tpl.php

  Log Message:
  -----------
  Fix: avoid error when multiple files uploaded


  Commit: e3615d43bd762a206ee2a5968edf886ceb4de0fa
      
https://github.com/Dolibarr/dolibarr/commit/e3615d43bd762a206ee2a5968edf886ceb4de0fa
  Author: Christophe Battarel <address@hidden>
  Date:   2013-05-17 (Fri, 17 May 2013)

  Changed paths:
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/tpl/objectline_view.tpl.php

  Log Message:
  -----------
  fix bug : external users should not see costprice and margin infos


  Commit: 7efe39495a0d5ec0416f515c1460d00117811940
      
https://github.com/Dolibarr/dolibarr/commit/7efe39495a0d5ec0416f515c1460d00117811940
  Author: Christophe Battarel <address@hidden>
  Date:   2013-05-17 (Fri, 17 May 2013)

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

  Log Message:
  -----------
  french translation for CostPrice


  Commit: 2879a09a03f204bf86429b9b1cf05593c124d6e1
      
https://github.com/Dolibarr/dolibarr/commit/2879a09a03f204bf86429b9b1cf05593c124d6e1
  Author: simnandez <address@hidden>
  Date:   2013-05-18 (Sat, 18 May 2013)

  Changed paths:
    M htdocs/comm/propal.php
    M htdocs/core/tpl/freeproductline_create.tpl.php

  Log Message:
  -----------
  Fix: Remove windows CR/LF


  Commit: e2f2ad30ae7877b4c58ad3996a53e06b96f33541
      
https://github.com/Dolibarr/dolibarr/commit/e2f2ad30ae7877b4c58ad3996a53e06b96f33541
  Author: simnandez <address@hidden>
  Date:   2013-05-18 (Sat, 18 May 2013)

  Changed paths:
    M htdocs/core/tpl/predefinedproductline_create.tpl.php

  Log Message:
  -----------
  Fix: Remove windows CR/LF


  Commit: 347fc6d714cdf12b0abdd5b95f09c9fb8a86ee2f
      
https://github.com/Dolibarr/dolibarr/commit/347fc6d714cdf12b0abdd5b95f09c9fb8a86ee2f
  Author: Christophe Battarel <address@hidden>
  Date:   2013-05-19 (Sun, 19 May 2013)

  Changed paths:
    M htdocs/core/modules/modMargin.class.php

  Log Message:
  -----------
  fix unauthorized access to margins for external user


  Commit: fea0e6de54077d46c6ec6e31f788c6dc6551772a
      
https://github.com/Dolibarr/dolibarr/commit/fea0e6de54077d46c6ec6e31f788c6dc6551772a
  Author: Christophe Battarel <address@hidden>
  Date:   2013-05-19 (Sun, 19 May 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Fix - external users should not see costprice and margin infos


  Commit: f8ca8426856c341dbcde7add82580bf74864a46d
      
https://github.com/Dolibarr/dolibarr/commit/f8ca8426856c341dbcde7add82580bf74864a46d
  Author: Christophe Battarel <address@hidden>
  Date:   2013-05-20 (Mon, 20 May 2013)

  Changed paths:
    M htdocs/core/modules/modMargin.class.php

  Log Message:
  -----------
  fix typo error


  Commit: 416cdd2f9c460654611c9681512823f2fa08c589
      
https://github.com/Dolibarr/dolibarr/commit/416cdd2f9c460654611c9681512823f2fa08c589
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-05-20 (Mon, 20 May 2013)

  Changed paths:
    M ChangeLog
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/modules/modMargin.class.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/langs/fr_FR/margins.lang

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

fix bug : external users should not see costprice and margin infos


  Commit: 71e14df62fd29bec1053f26c2557492cda6511b7
      
https://github.com/Dolibarr/dolibarr/commit/71e14df62fd29bec1053f26c2557492cda6511b7
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-05-20 (Mon, 20 May 2013)

  Changed paths:
    M ChangeLog
    M htdocs/comm/propal.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/modules/modMargin.class.php
    M htdocs/core/tpl/freeproductline_create.tpl.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/core/tpl/predefinedproductline_create.tpl.php
    M htdocs/langs/fr_FR/margins.lang

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

Conflicts:
        ChangeLog
        htdocs/comm/propal.php
        htdocs/core/class/commonobject.class.php
        htdocs/core/tpl/freeproductline_create.tpl.php
        htdocs/core/tpl/predefinedproductline_create.tpl.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/e00df581539d...71e14df62fd2