[Dolibarr-git] [Dolibarr/dolibarr] a0cfe9: New add payment with multicurrency module

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: a0cfe9aad873bcf283ad063757d130293c8063af
      
https://github.com/Dolibarr/dolibarr/commit/a0cfe9aad873bcf283ad063757d130293c8063af
  Author: phf <address@hidden>
  Date:   2016-02-10 (Wed, 10 Feb 2016)

  Changed paths:
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/paiement.php
    M htdocs/compta/paiement/class/paiement.class.php
    M htdocs/core/class/commoninvoice.class.php
    M htdocs/core/class/discount.class.php
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    M htdocs/install/mysql/tables/llx_paiement.sql
    M htdocs/install/mysql/tables/llx_societe_remise_except.sql
    M htdocs/langs/en_US/bills.lang
    M htdocs/multicurrency/class/multicurrency.class.php

  Log Message:
  -----------
  New add payment with multicurrency module


  Commit: 86c8998742667c5d92515372d042018eaa7293d5
      
https://github.com/Dolibarr/dolibarr/commit/86c8998742667c5d92515372d042018eaa7293d5
  Author: phf <address@hidden>
  Date:   2016-02-15 (Mon, 15 Feb 2016)

  Changed paths:
    M ChangeLog
    M build/debian/dolibarr.desktop
    M build/debian/install.forced.php.install
    M build/debian/patches/use-etc-dolibarr-conf.patch
    M build/makepack-dolibarr.pl
    M build/rpm/dolibarr-forrpm.patch
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    M dev/skeletons/skeleton_list.php
    M htdocs/accountancy/admin/productaccount.php
    A htdocs/accountancy/bookkeeping/balance.php
    M htdocs/accountancy/bookkeeping/listbyyear.php
    M htdocs/accountancy/class/bookkeeping.class.php
    M htdocs/accountancy/journal/purchasesjournal.php
    M htdocs/adherents/cotisations.php
    M htdocs/adherents/list.php
    M htdocs/admin/confexped.php
    M htdocs/admin/delais.php
    M htdocs/admin/dict.php
    M htdocs/admin/multicurrency.php
    M htdocs/admin/oauth.php
    A htdocs/admin/supplier_payment.php
    M htdocs/admin/workflow.php
    M htdocs/comm/action/index.php
    M htdocs/comm/action/listactions.php
    M htdocs/comm/action/peruser.php
    M htdocs/comm/action/rapport/index.php
    M htdocs/comm/index.php
    M htdocs/comm/mailing/card.php
    M htdocs/comm/mailing/cibles.php
    M htdocs/comm/mailing/class/mailing.class.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/propal/list.php
    M htdocs/comm/remise.php
    M htdocs/commande/card.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/list.php
    M htdocs/compta/bank/rappro.php
    M htdocs/compta/bank/releve.php
    M htdocs/compta/bank/search.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture-rec.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/compta/facture/list.php
    M htdocs/compta/paiement/cheque/list.php
    M htdocs/compta/paiement/list.php
    M htdocs/compta/tva/index.php
    M htdocs/contact/list.php
    M htdocs/contrat/list.php
    A htdocs/core/boxes/box_goodcustomers.php
    M htdocs/core/class/CMailFile.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/commonobjectline.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formcompany.class.php
    M htdocs/core/class/smtps.class.php
    M htdocs/core/lib/admin.lib.php
    M htdocs/core/lib/ajax.lib.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/fourn.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/lib/geturl.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    R htdocs/core/modules/facture/doc/pdf_crevette.modules.php
    M htdocs/core/modules/mailings/fraise.modules.php
    M htdocs/core/modules/modExpedition.class.php
    M htdocs/core/modules/modMultiCurrency.class.php
    M htdocs/core/modules/modOauth.class.php
    M htdocs/core/modules/modSociete.class.php
    M htdocs/core/modules/oauth/google_oauthcallback.php
    M htdocs/core/modules/printing/printgcp.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    A htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
    A htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
    A htdocs/core/modules/supplier_payment/modules_supplier_payment.php
    M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
    M htdocs/core/search.php
    M htdocs/custom/README.md
    M htdocs/expedition/card.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/list.php
    M htdocs/exports/class/export.class.php
    M htdocs/fichinter/list.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/fourn/class/paiementfourn.class.php
    M htdocs/fourn/commande/list.php
    M htdocs/fourn/facture/list.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/imports/class/import.class.php
    M htdocs/includes/jquery/plugins/select2/release.sh
    M htdocs/index.php
    M htdocs/install/inc.php
    M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    M htdocs/install/mysql/tables/llx_contratdet.sql
    M htdocs/install/mysql/tables/llx_facture_rec.sql
    M htdocs/install/mysql/tables/llx_facturedet_rec.sql
    M htdocs/install/mysql/tables/llx_mailing_cibles.sql
    M htdocs/install/mysql/tables/llx_multicurrency.sql
    M htdocs/install/mysql/tables/llx_multicurrency_rate.sql
    M htdocs/install/mysql/tables/llx_paiementfourn.sql
    M htdocs/langs/en_US/accountancy.lang
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/boxes.lang
    M htdocs/langs/en_US/mails.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/supplier_proposal.lang
    M htdocs/langs/fr_FR/bills.lang
    M htdocs/loan/index.php
    M htdocs/main.inc.php
    A htdocs/margin/checkMargins.php
    M htdocs/margin/lib/margins.lib.php
    M htdocs/product/admin/dynamic_prices.php
    M htdocs/product/card.php
    M htdocs/product/class/productcustomerprice.class.php
    M htdocs/product/list.php
    M htdocs/product/price.php
    M htdocs/projet/list.php
    M htdocs/projet/tasks/list.php
    M htdocs/public/test/test_arrays.php
    M htdocs/societe/list.php
    M htdocs/societe/price.php
    M htdocs/societe/soc.php
    M htdocs/supplier_proposal/card.php
    M htdocs/supplier_proposal/list.php
    M htdocs/support/inc.php
    R htdocs/theme/common/weather/index.html
    R htdocs/theme/common/weather/weather-clear-night.png
    R htdocs/theme/common/weather/weather-clear.png
    R htdocs/theme/common/weather/weather-clouds-night.png
    R htdocs/theme/common/weather/weather-clouds.png
    R htdocs/theme/common/weather/weather-few-clouds-night.png
    R htdocs/theme/common/weather/weather-few-clouds.png
    R htdocs/theme/common/weather/weather-freezing-rain.png
    R htdocs/theme/common/weather/weather-hail.png
    R htdocs/theme/common/weather/weather-many-clouds.png
    R htdocs/theme/common/weather/weather-mist.png
    R htdocs/theme/common/weather/weather-showers-day.png
    R htdocs/theme/common/weather/weather-showers-night.png
    R htdocs/theme/common/weather/weather-showers-scattered-day.png
    R htdocs/theme/common/weather/weather-showers-scattered-night.png
    R htdocs/theme/common/weather/weather-showers-scattered.png
    R htdocs/theme/common/weather/weather-showers.png
    R htdocs/theme/common/weather/weather-snow-rain.png
    R htdocs/theme/common/weather/weather-snow-scattered-day.png
    R htdocs/theme/common/weather/weather-snow-scattered-night.png
    R htdocs/theme/common/weather/weather-snow-scattered.png
    R htdocs/theme/common/weather/weather-snow.png
    R htdocs/theme/common/weather/weather-storm-day.png
    R htdocs/theme/common/weather/weather-storm-night.png
    R htdocs/theme/common/weather/weather-storm.png
    M htdocs/theme/eldy/img/next.png
    M htdocs/theme/eldy/img/previous.png
    A htdocs/theme/eldy/img/weather/index.html
    A htdocs/theme/eldy/img/weather/weather-clear-night.png
    A htdocs/theme/eldy/img/weather/weather-clear.png
    A htdocs/theme/eldy/img/weather/weather-clouds-night.png
    A htdocs/theme/eldy/img/weather/weather-clouds.png
    A htdocs/theme/eldy/img/weather/weather-few-clouds-night.png
    A htdocs/theme/eldy/img/weather/weather-few-clouds.png
    A htdocs/theme/eldy/img/weather/weather-freezing-rain.png
    A htdocs/theme/eldy/img/weather/weather-hail.png
    A htdocs/theme/eldy/img/weather/weather-many-clouds.png
    A htdocs/theme/eldy/img/weather/weather-mist.png
    A htdocs/theme/eldy/img/weather/weather-showers-day.png
    A htdocs/theme/eldy/img/weather/weather-showers-night.png
    A htdocs/theme/eldy/img/weather/weather-showers-scattered-day.png
    A htdocs/theme/eldy/img/weather/weather-showers-scattered-night.png
    A htdocs/theme/eldy/img/weather/weather-showers-scattered.png
    A htdocs/theme/eldy/img/weather/weather-showers.png
    A htdocs/theme/eldy/img/weather/weather-snow-rain.png
    A htdocs/theme/eldy/img/weather/weather-snow-scattered-day.png
    A htdocs/theme/eldy/img/weather/weather-snow-scattered-night.png
    A htdocs/theme/eldy/img/weather/weather-snow-scattered.png
    A htdocs/theme/eldy/img/weather/weather-snow.png
    A htdocs/theme/eldy/img/weather/weather-storm-day.png
    A htdocs/theme/eldy/img/weather/weather-storm-night.png
    A htdocs/theme/eldy/img/weather/weather-storm.png
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/img/next.png
    M htdocs/theme/md/img/previous.png
    A htdocs/theme/md/img/weather/index.html
    A htdocs/theme/md/img/weather/weather-clear-night.png
    A htdocs/theme/md/img/weather/weather-clear.png
    A htdocs/theme/md/img/weather/weather-clouds-night.png
    A htdocs/theme/md/img/weather/weather-clouds.png
    A htdocs/theme/md/img/weather/weather-few-clouds-night.png
    A htdocs/theme/md/img/weather/weather-few-clouds.png
    A htdocs/theme/md/img/weather/weather-freezing-rain.png
    A htdocs/theme/md/img/weather/weather-hail.png
    A htdocs/theme/md/img/weather/weather-many-clouds.png
    A htdocs/theme/md/img/weather/weather-mist.png
    A htdocs/theme/md/img/weather/weather-showers-day.png
    A htdocs/theme/md/img/weather/weather-showers-night.png
    A htdocs/theme/md/img/weather/weather-showers-scattered-day.png
    A htdocs/theme/md/img/weather/weather-showers-scattered-night.png
    A htdocs/theme/md/img/weather/weather-showers-scattered.png
    A htdocs/theme/md/img/weather/weather-showers.png
    A htdocs/theme/md/img/weather/weather-snow-rain.png
    A htdocs/theme/md/img/weather/weather-snow-scattered-day.png
    A htdocs/theme/md/img/weather/weather-snow-scattered-night.png
    A htdocs/theme/md/img/weather/weather-snow-scattered.png
    A htdocs/theme/md/img/weather/weather-snow.png
    A htdocs/theme/md/img/weather/weather-storm-day.png
    A htdocs/theme/md/img/weather/weather-storm-night.png
    A htdocs/theme/md/img/weather/weather-storm.png
    M htdocs/theme/md/style.css.php
    M htdocs/user/card.php
    M htdocs/user/group/index.php
    M htdocs/user/home.php
    M scripts/emailings/mailing-send.php
    M test/phpunit/SqlTest.php

  Log Message:
  -----------
  Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into 
new_add_customer_multicurrency_payment

Conflicts:
        htdocs/install/mysql/migration/3.9.0-4.0.0.sql


  Commit: 9d418bca7f03575d6ad26aad6eeb755de8153f6c
      
https://github.com/Dolibarr/dolibarr/commit/9d418bca7f03575d6ad26aad6eeb755de8153f6c
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-02-16 (Tue, 16 Feb 2016)

  Changed paths:
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/paiement.php
    M htdocs/compta/paiement/class/paiement.class.php
    M htdocs/core/class/commoninvoice.class.php
    M htdocs/core/class/discount.class.php
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    M htdocs/install/mysql/tables/llx_paiement.sql
    M htdocs/install/mysql/tables/llx_societe_remise_except.sql
    M htdocs/langs/en_US/bills.lang
    M htdocs/multicurrency/class/multicurrency.class.php

  Log Message:
  -----------
  Merge branch 'new_add_customer_multicurrency_payment' of
https://github.com/atm-ph/dolibarr into
atm-ph-new_add_customer_multicurrency_payment

Conflicts:
        htdocs/install/mysql/migration/3.9.0-4.0.0.sql


  Commit: e3e68dec7434d0a0856151c8211933f07bca59aa
      
https://github.com/Dolibarr/dolibarr/commit/e3e68dec7434d0a0856151c8211933f07bca59aa
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-02-16 (Tue, 16 Feb 2016)

  Changed paths:
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/paiement.php
    M htdocs/compta/paiement/class/paiement.class.php
    M htdocs/core/class/commoninvoice.class.php
    M htdocs/core/class/discount.class.php
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    M htdocs/install/mysql/tables/llx_paiement.sql
    M htdocs/install/mysql/tables/llx_societe_remise_except.sql
    M htdocs/langs/en_US/bills.lang
    M htdocs/multicurrency/class/multicurrency.class.php

  Log Message:
  -----------
  git push origin developMerge branch 
'atm-ph-new_add_customer_multicurrency_payment' into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/9e5f54daaaf7...e3e68dec7434