[Dolibarr-git] [Dolibarr/dolibarr] a9e636: Fixed bug #866: Standing order from an invoice sug...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: a9e63610aeed320007509ce72a78befb9eafb0f6
      
https://github.com/Dolibarr/dolibarr/commit/a9e63610aeed320007509ce72a78befb9eafb0f6
  Author: Marcos García <address@hidden>
  Date:   2013-05-01 (Wed, 01 May 2013)

  Changed paths:
    M ChangeLog
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/prelevement.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php

  Log Message:
  -----------
  Fixed bug #866: Standing order from an invoice suggests invoice total amount 
instead of remaining to pay


  Commit: f8f4fd3a6f255bb36b52f54ca8d126038a7ee345
      
https://github.com/Dolibarr/dolibarr/commit/f8f4fd3a6f255bb36b52f54ca8d126038a7ee345
  Author: Marcos García <address@hidden>
  Date:   2013-05-02 (Thu, 02 May 2013)

  Changed paths:
    M htdocs/compta/prelevement/class/bonprelevement.class.php

  Log Message:
  -----------
  Enhanced fix


  Commit: c65620ab629fc2aaf20bb4f6dbbf73bc9dfedc6d
      
https://github.com/Dolibarr/dolibarr/commit/c65620ab629fc2aaf20bb4f6dbbf73bc9dfedc6d
  Author: Marcos García <address@hidden>
  Date:   2013-05-02 (Thu, 02 May 2013)

  Changed paths:
    M ChangeLog
    M htdocs/compta/clients.php
    M htdocs/compta/prelevement/bons.php
    M htdocs/compta/prelevement/factures.php
    M htdocs/compta/prelevement/fiche-rejet.php
    M htdocs/compta/prelevement/fiche-stat.php
    M htdocs/compta/prelevement/lignes.php
    M htdocs/compta/prelevement/rejets.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/lib/security.lib.php
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/es_ES/withdrawals.lang
    M htdocs/product/ajax/products.php
    M htdocs/product/class/product.class.php
    M htdocs/projet/element.php

  Log Message:
  -----------
  Merge branch '3.3' of git://github.com/Dolibarr/dolibarr into bug-866

Conflicts:
        ChangeLog


  Commit: 7428c114894a72eb20466cdd800a4b9ccacbb4a1
      
https://github.com/Dolibarr/dolibarr/commit/7428c114894a72eb20466cdd800a4b9ccacbb4a1
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-05-03 (Fri, 03 May 2013)

  Changed paths:
    M ChangeLog
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/prelevement.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php

  Log Message:
  -----------
  Merge pull request #909 from marcosgdf/bug-866

Fixed bug #866: Standing order from an invoice suggests invoice total am...


  Commit: 7382a972238662463572df4ac58c36230c25a68e
      
https://github.com/Dolibarr/dolibarr/commit/7382a972238662463572df4ac58c36230c25a68e
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-05-03 (Fri, 03 May 2013)

  Changed paths:
    M ChangeLog
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/prelevement.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php

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

Conflicts:
        htdocs/compta/facture/class/facture.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/c17cd04686c8...7382a9722386