[Dolibarr-git] [Dolibarr/dolibarr] e08165: Add fk_projet in table various_payment

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: e081653cef9cb616292ea029fef04cd235ccba88
      
https://github.com/Dolibarr/dolibarr/commit/e081653cef9cb616292ea029fef04cd235ccba88
  Author: Alexandre SPANGARO <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
    M htdocs/install/mysql/tables/llx_payment_various.sql

  Log Message:
  -----------
  Add fk_projet in table various_payment


  Commit: 84fcbb724e24b37b5a9d3cbdb9d28979efa70cea
      
https://github.com/Dolibarr/dolibarr/commit/84fcbb724e24b37b5a9d3cbdb9d28979efa70cea
  Author: Alexandre SPANGARO <address@hidden>
  Date:   2017-09-01 (Fri, 01 Sep 2017)

  Changed paths:
    M htdocs/compta/bank/class/paymentvarious.class.php
    M htdocs/compta/bank/various_payment/card.php
    M htdocs/compta/bank/various_payment/index.php
    M htdocs/langs/en_US/banks.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/projet/element.php

  Log Message:
  -----------
  Add project on various_payment


  Commit: c4d2ca661f77716230015b87010b59ade3e03c5f
      
https://github.com/Dolibarr/dolibarr/commit/c4d2ca661f77716230015b87010b59ade3e03c5f
  Author: Alexandre SPANGARO <address@hidden>
  Date:   2017-09-01 (Fri, 01 Sep 2017)

  Changed paths:
    M README.md
    M htdocs/accountancy/admin/account.php
    M htdocs/accountancy/admin/categories_list.php
    M htdocs/accountancy/class/accountancycategory.class.php
    M htdocs/accountancy/index.php
    R htdocs/accountancy/report/index.html
    R htdocs/accountancy/report/result.php
    M htdocs/compta/journal/purchasesjournal.php
    M htdocs/compta/journal/sellsjournal.php
    M htdocs/compta/localtax/clients.php
    M htdocs/compta/localtax/quadri_detail.php
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/compta/resultat/index.php
    A htdocs/compta/resultat/result.php
    M htdocs/compta/stats/cabyprodserv.php
    M htdocs/compta/stats/cabyuser.php
    M htdocs/compta/stats/casoc.php
    M htdocs/compta/stats/index.php
    M htdocs/compta/tva/clients.php
    M htdocs/compta/tva/quadri_detail.php
    M htdocs/compta/tva/quarter_report.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formactions.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/report.lib.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/install/mysql/data/llx_accounting.sql
    M htdocs/install/mysql/data/llx_accounting_category.sql
    M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
    M htdocs/langs/en_US/accountancy.lang
    M htdocs/langs/en_US/compta.lang
    M htdocs/langs/en_US/paybox.lang
    M htdocs/langs/en_US/paypal.lang
    M htdocs/langs/en_US/stripe.lang
    M htdocs/modulebuilder/template/class/myobject.class.php
    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:
  -----------
  Merge remote-tracking branch 'uptream/develop' into 7.0-f2

# Conflicts:
#       htdocs/install/mysql/migration/6.0.0-7.0.0.sql


  Commit: c1e54b7e230648d5348cdd5251ce76a0f036273f
      
https://github.com/Dolibarr/dolibarr/commit/c1e54b7e230648d5348cdd5251ce76a0f036273f
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-09-02 (Sat, 02 Sep 2017)

  Changed paths:
    M htdocs/compta/bank/class/paymentvarious.class.php
    M htdocs/compta/bank/various_payment/card.php
    M htdocs/compta/bank/various_payment/index.php
    M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
    M htdocs/install/mysql/tables/llx_payment_various.sql
    M htdocs/langs/en_US/banks.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/projet/element.php

  Log Message:
  -----------
  Merge pull request #7315 from aspangaro/7.0-f2

NEW Add project on a various payment


Compare: 
https://github.com/Dolibarr/dolibarr/compare/91e75b581241...c1e54b7e2306