[Dolibarr-git] [Dolibarr/dolibarr] ba0e9c: Fix [ bug #843 ] Erreur SQL box_stock

[Laurent Destailleur]

  Branch: refs/heads/3.3_backported
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: ba0e9c0c1931694e0cc9c515087b4e39f9ecf9d5
      
https://github.com/Dolibarr/dolibarr/commit/ba0e9c0c1931694e0cc9c515087b4e39f9ecf9d5
  Author: fhenry <address@hidden>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

  Changed paths:
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/core/boxes/box_produits_alerte_stock.php

  Log Message:
  -----------
  Fix [ bug #843 ] Erreur SQL box_stock
fix [ bug #842 ] Erreur SQL Propal


  Commit: 52a1e811475af78e9fbbeaa55aef74768ebbb076
      
https://github.com/Dolibarr/dolibarr/commit/52a1e811475af78e9fbbeaa55aef74768ebbb076
  Author: fhenry <address@hidden>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

  Changed paths:
    M htdocs/comm/propal/class/propal.class.php

  Log Message:
  -----------
  [ bug #842 ] Erreur SQL Propal


  Commit: 23a7aae08455b0f6f145c289db23c8dc633ecb47
      
https://github.com/Dolibarr/dolibarr/commit/23a7aae08455b0f6f145c289db23c8dc633ecb47
  Author: fhenry <address@hidden>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

  Changed paths:
    M htdocs/compta/facture/list.php

  Log Message:
  -----------
  [ bug #841 ] Erreur compta/index


  Commit: 57637d3a07fe67ae46a8682a91bfeede798a90ce
      
https://github.com/Dolibarr/dolibarr/commit/57637d3a07fe67ae46a8682a91bfeede798a90ce
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

  Changed paths:
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/compta/facture/list.php
    M htdocs/core/boxes/box_produits_alerte_stock.php

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

Fix [ bug #843 ] Erreur SQL box_stock


  Commit: fb1c306b31d3f0624f0bf1c7b9693f32c3915a35
      
https://github.com/Dolibarr/dolibarr/commit/fb1c306b31d3f0624f0bf1c7b9693f32c3915a35
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M htdocs/langs/nl_NL/admin.lang
    M htdocs/langs/nl_NL/commercial.lang

  Log Message:
  -----------
  Update nl


  Commit: 08808c58cd1fc20b054674663d18588d045ff666
      
https://github.com/Dolibarr/dolibarr/commit/08808c58cd1fc20b054674663d18588d045ff666
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec

  Log Message:
  -----------
  Prepare 3.3.2


  Commit: 026195689b8f820ec0880bf6e230b9d4ffe7fcff
      
https://github.com/Dolibarr/dolibarr/commit/026195689b8f820ec0880bf6e230b9d4ffe7fcff
  Author: Grand Philippe <address@hidden>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M htdocs/includes/nusoap/lib/nusoap.php

  Log Message:
  -----------
  fix undefined offset


  Commit: 436b6259c05e2fd56610365ad1470e712126ad7d
      
https://github.com/Dolibarr/dolibarr/commit/436b6259c05e2fd56610365ad1470e712126ad7d
  Author: simnandez <address@hidden>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M htdocs/core/modules/syslog/mod_syslog_file.php

  Log Message:
  -----------
  Fix: finish merge


  Commit: b2129a519d070f4bc4793339cf18180a1868561e
      
https://github.com/Dolibarr/dolibarr/commit/b2129a519d070f4bc4793339cf18180a1868561e
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M htdocs/includes/nusoap/lib/nusoap.php

  Log Message:
  -----------
  Merge pull request #875 from grandoc/3.3

fix undefined offset


  Commit: 70de5f1f7b72e888aeb69fccdec06b2edf808c22
      
https://github.com/Dolibarr/dolibarr/commit/70de5f1f7b72e888aeb69fccdec06b2edf808c22
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/compta/facture/list.php
    M htdocs/core/boxes/box_produits_alerte_stock.php
    M htdocs/core/modules/syslog/mod_syslog_file.php
    M htdocs/includes/nusoap/lib/nusoap.php
    M htdocs/langs/nl_NL/admin.lang
    M htdocs/langs/nl_NL/commercial.lang

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/da79a0cc2565...70de5f1f7b72