[Dolibarr-git] [Dolibarr/dolibarr] 9146bb: Work on merging all payment modes in one page

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 9146bb336e460dc342242e214cabe2d883adbb9d
      
https://github.com/Dolibarr/dolibarr/commit/9146bb336e460dc342242e214cabe2d883adbb9d
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-08-31 (Thu, 31 Aug 2017)

  Changed paths:
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formactions.class.php
    M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
    M htdocs/langs/en_US/paybox.lang
    M htdocs/langs/en_US/paypal.lang
    M htdocs/langs/en_US/stripe.lang
    M htdocs/paybox/admin/paybox.php
    M htdocs/paypal/admin/paypal.php
    M htdocs/paypal/lib/paypal.lib.php
    M htdocs/public/onlinesign/newonlinesign.php
    M htdocs/public/paybox/newpayment.php
    M htdocs/public/paybox/paymentko.php
    M htdocs/public/paybox/paymentok.php
    M htdocs/public/payment/newpayment.php
    M htdocs/public/payment/paymentko.php
    M htdocs/public/payment/paymentok.php
    M htdocs/public/paypal/newpayment.php
    M htdocs/public/paypal/paymentko.php
    M htdocs/public/paypal/paymentok.php
    M htdocs/public/stripe/newpayment.php
    M htdocs/public/stripe/paymentko.php
    M htdocs/public/stripe/paymentok.php
    M htdocs/stripe/admin/stripe.php
    M htdocs/theme/eldy/style.css.php

  Log Message:
  -----------
  Work on merging all payment modes in one page


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

  Changed paths:
    M README.md

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/5c885e9f9339...f230c6703275