[Dolibarr-git] [Dolibarr/dolibarr] b6b161: Work on payment loan

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: b6b161774122623c73645d38d584027f6b395f11
      
https://github.com/Dolibarr/dolibarr/commit/b6b161774122623c73645d38d584027f6b395f11
  Author: frederic34 <address@hidden>
  Date:   2015-03-29 (Sun, 29 Mar 2015)

  Changed paths:
    M htdocs/compta/bank/ligne.php
    M htdocs/langs/en_US/loan.lang
    M htdocs/loan/class/paymentloan.class.php
    M htdocs/loan/payment/payment.php

  Log Message:
  -----------
  Work on payment loan


  Commit: b83e9ea32fc096456205e4dd29e6787ac719fe05
      
https://github.com/Dolibarr/dolibarr/commit/b83e9ea32fc096456205e4dd29e6787ac719fe05
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-03-30 (Mon, 30 Mar 2015)

  Changed paths:
    M htdocs/admin/supplier_order.php
    M htdocs/categories/admin/categorie_extrafields.php
    M htdocs/compta/bank/ligne.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/tpl/admin_extrafields_add.tpl.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/loan.lang
    M htdocs/langs/en_US/suppliers.lang
    M htdocs/loan/class/paymentloan.class.php
    M htdocs/loan/payment/payment.php

  Log Message:
  -----------
  Merge branch 'loan' of https://github.com/frederic34/dolibarr into
frederic34-loan

Conflicts:
        htdocs/compta/bank/ligne.php


  Commit: f174b662c392d9b27f8bedb177ac8198d0550bc7
      
https://github.com/Dolibarr/dolibarr/commit/f174b662c392d9b27f8bedb177ac8198d0550bc7
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-03-30 (Mon, 30 Mar 2015)

  Changed paths:
    M htdocs/admin/supplier_order.php
    M htdocs/categories/admin/categorie_extrafields.php
    M htdocs/compta/bank/ligne.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/tpl/admin_extrafields_add.tpl.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/loan.lang
    M htdocs/langs/en_US/suppliers.lang
    M htdocs/loan/class/paymentloan.class.php
    M htdocs/loan/payment/payment.php

  Log Message:
  -----------
  git push origin developMerge branch 'frederic34-loan' into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/63ec6febec84...f174b662c392