[Dolibarr-git] [Dolibarr/dolibarr] c89fd4: New: Can conciliate several lines in one operation...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: c89fd4b1e75cf66a2c8e60b282546ba23dced5f0
      
https://github.com/Dolibarr/dolibarr/commit/c89fd4b1e75cf66a2c8e60b282546ba23dced5f0
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-02-15 (Wed, 15 Feb 2012)

  Changed paths:
    M ChangeLog
  M htdocs/compta/bank/class/account.class.php
  M htdocs/compta/bank/ligne.php
  M htdocs/compta/bank/rappro.php
  M htdocs/compta/bank/releve.php
  A htdocs/core/ajax/bankconciliate.php
  M htdocs/langs/fr_FR/banks.lang
  M htdocs/langs/fr_FR/errors.lang
  M htdocs/langs/fr_FR/main.lang

  Log Message:
  -----------
  New: Can conciliate several lines in one operation.


  Commit: e178077e1eb8e3af246bd03576c4b25a90270566
      
https://github.com/Dolibarr/dolibarr/commit/e178077e1eb8e3af246bd03576c4b25a90270566
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-02-15 (Wed, 15 Feb 2012)

  Changed paths:
    M htdocs/admin/commande.php
  M htdocs/admin/workflow.php
  M htdocs/comm/propal/class/propal.class.php
  M htdocs/commande/class/commande.class.php
  M htdocs/compta/bank/account.php
  M htdocs/compta/bank/ligne.php
  M htdocs/compta/facture/class/facture.class.php
  M htdocs/core/ajax/row.php
  M htdocs/core/lib/bank.lib.php
  M htdocs/core/tpl/ajaxrow.tpl.php
  M htdocs/ecm/index.php
  M htdocs/main.inc.php

  Log Message:
  -----------
  Merge branch 'develop' of ssh://address@hidden/Dolibarr/dolibarr.git
into develop

Conflicts:
        htdocs/compta/bank/ligne.php


  Commit: 42082129247d40ab28bddb35a67148d4700819b9
      
https://github.com/Dolibarr/dolibarr/commit/42082129247d40ab28bddb35a67148d4700819b9
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-02-15 (Wed, 15 Feb 2012)

  Changed paths:
    M htdocs/ecm/index.php

  Log Message:
  -----------
  Some dev tests to use ajax parts for documents


Compare: https://github.com/Dolibarr/dolibarr/compare/8eaf960...4208212