[Dolibarr-git] [Dolibarr/dolibarr] 973d61: [ task #712 ] Add warning when creating invoice fr...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 973d61fe135fa2da3dce87e165cb6b727b21796d
      
https://github.com/Dolibarr/dolibarr/commit/973d61fe135fa2da3dce87e165cb6b727b21796d
  Author: KreizIT <address@hidden>
  Date:   2014-08-07 (Thu, 07 Aug 2014)

  Changed paths:
    M ChangeLog
    M htdocs/compta/facture.php
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/fr_FR/bills.lang

  Log Message:
  -----------
  [ task #712 ] Add warning when creating invoice from proposal or order, when 
there is already one invoice


  Commit: cc86e280f96d5caf8244fc2e756a595dee194529
      
https://github.com/Dolibarr/dolibarr/commit/cc86e280f96d5caf8244fc2e756a595dee194529
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-14 (Thu, 14 Aug 2014)

  Changed paths:
    M ChangeLog
    M htdocs/compta/facture.php
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/fr_FR/bills.lang

  Log Message:
  -----------
  Merge branch 'task712' of github.com:KreizIT/dolibarr into
KreizIT-task712

Conflicts:
        ChangeLog


  Commit: 4343d8287421e853abbfd0ab2357bd0e3799ef20
      
https://github.com/Dolibarr/dolibarr/commit/4343d8287421e853abbfd0ab2357bd0e3799ef20
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-14 (Thu, 14 Aug 2014)

  Changed paths:
    M ChangeLog
    M htdocs/compta/facture.php
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/fr_FR/bills.lang

  Log Message:
  -----------
  Merge branch 'KreizIT-task712' into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/e3f96802fb4e...4343d8287421