[Dolibarr-git] [Dolibarr/dolibarr] 116988: Fix [ bug #1001 ] Charge sociale : état incorrect

[Laurent Destailleur]

  Branch: refs/heads/3.3_backported
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 116988febdc7128831bb04305005c1d7b8a86677
      
https://github.com/Dolibarr/dolibarr/commit/116988febdc7128831bb04305005c1d7b8a86677
  Author: Florian Henry <address@hidden>
  Date:   2013-07-26 (Fri, 26 Jul 2013)

  Changed paths:
    M htdocs/compta/payment_sc/fiche.php

  Log Message:
  -----------
   Fix [ bug #1001 ] Charge sociale : état incorrect


  Commit: 7af45ccdf3abafdd8939b7d1abaac6785b3a8c49
      
https://github.com/Dolibarr/dolibarr/commit/7af45ccdf3abafdd8939b7d1abaac6785b3a8c49
  Author: Florian Henry <address@hidden>
  Date:   2013-07-26 (Fri, 26 Jul 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  update changelog


  Commit: d0af692ed58153954aba0aa010259f81c3695c88
      
https://github.com/Dolibarr/dolibarr/commit/d0af692ed58153954aba0aa010259f81c3695c88
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-26 (Fri, 26 Jul 2013)

  Changed paths:
    M htdocs/core/class/html.formfile.class.php

  Log Message:
  -----------
  Fix: date must be reported according to user timezone

Conflicts:
        htdocs/core/class/html.formfile.class.php


  Commit: ae9c3cd780dca1de208cf736185d46960e87b506
      
https://github.com/Dolibarr/dolibarr/commit/ae9c3cd780dca1de208cf736185d46960e87b506
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-26 (Fri, 26 Jul 2013)

  Changed paths:
    M build/debian/changelog
    M build/exe/doliwamp/doliwamp.iss
    M build/makepack-dolibarr.pl
    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/filefunc.inc.php

  Log Message:
  -----------
  Prepare 3.3.4


  Commit: 3cd46d5e20d6c0adadf5349f94c3738f574a6826
      
https://github.com/Dolibarr/dolibarr/commit/3cd46d5e20d6c0adadf5349f94c3738f574a6826
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-27 (Sat, 27 Jul 2013)

  Changed paths:
    M ChangeLog
    M htdocs/compta/payment_sc/fiche.php

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

 Fix [ bug #1001 ] Charge sociale : état incorrect


  Commit: 80bcf8bbbe6ff326eaaf85cfea623a0e3385354b
      
https://github.com/Dolibarr/dolibarr/commit/80bcf8bbbe6ff326eaaf85cfea623a0e3385354b
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-27 (Sat, 27 Jul 2013)

  Changed paths:
    M ChangeLog
    M build/debian/changelog
    M build/exe/doliwamp/doliwamp.iss
    M build/makepack-dolibarr.pl
    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/compta/payment_sc/fiche.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/filefunc.inc.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/64847ce5977b...80bcf8bbbe6f