[Dolibarr-git] [Dolibarr/dolibarr] f66750: Fix : Reset every month with @99 was not working p...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: f66750d5e782d5aa91edc6473793db178b665ae6
      
https://github.com/Dolibarr/dolibarr/commit/f66750d5e782d5aa91edc6473793db178b665ae6
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-05-24 (Fri, 24 May 2013)

  Changed paths:
    M htdocs/core/lib/functions2.lib.php

  Log Message:
  -----------
  Fix : Reset every month with @99 was not working properly (for 3.4 branch)


  Commit: 0a041a7705af93020738bbaf97609478220842f6
      
https://github.com/Dolibarr/dolibarr/commit/0a041a7705af93020738bbaf97609478220842f6
  Author: Florian Henry <address@hidden>
  Date:   2013-05-24 (Fri, 24 May 2013)

  Changed paths:
    M htdocs/product/liste.php

  Log Message:
  -----------
  Fix multilangue search product list


  Commit: 4c54bfe3a923efdb5506d0e23758cd9f22d0d2fa
      
https://github.com/Dolibarr/dolibarr/commit/4c54bfe3a923efdb5506d0e23758cd9f22d0d2fa
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-05-25 (Sat, 25 May 2013)

  Changed paths:
    M htdocs/product/liste.php

  Log Message:
  -----------
  Merge pull request #980 from FHenry/3.4

Fix multilangue search product list


  Commit: 7b13be4653023bdc51238da81f92fe93f00f63a4
      
https://github.com/Dolibarr/dolibarr/commit/7b13be4653023bdc51238da81f92fe93f00f63a4
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-05-25 (Sat, 25 May 2013)

  Changed paths:
    M htdocs/core/lib/functions2.lib.php

  Log Message:
  -----------
  Merge pull request #978 from atm-maxime/3.4

Fix : Reset every month with @99 was not working properly (for 3.4 branc...


  Commit: 8656a9f41736212ee021d83920420e22a38d8300
      
https://github.com/Dolibarr/dolibarr/commit/8656a9f41736212ee021d83920420e22a38d8300
  Author: Florian Henry <address@hidden>
  Date:   2013-05-25 (Sat, 25 May 2013)

  Changed paths:
    M htdocs/contrat/fiche.php

  Log Message:
  -----------
  Fix [ bug #895 ] Description is lost when adding a new predefined
product to a contract


  Commit: 982fec65ecd03f7730a34c964c76eba5456474e5
      
https://github.com/Dolibarr/dolibarr/commit/982fec65ecd03f7730a34c964c76eba5456474e5
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-05-25 (Sat, 25 May 2013)

  Changed paths:
    M htdocs/contrat/fiche.php

  Log Message:
  -----------
  Merge pull request #984 from FHenry/3.4

Fix [ bug #895 ] Description is lost when adding a new predefined


  Commit: 2cac1f4c9cd61deb2b3f41c22c594f9d22fc9fb1
      
https://github.com/Dolibarr/dolibarr/commit/2cac1f4c9cd61deb2b3f41c22c594f9d22fc9fb1
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-05-25 (Sat, 25 May 2013)

  Changed paths:
    M htdocs/contrat/fiche.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/product/liste.php

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

Conflicts:
        htdocs/core/lib/functions2.lib.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/1bab0f9f58aa...2cac1f4c9cd6