[Dolibarr-git] [Dolibarr/dolibarr] 06e6d3: Merge pull request #1 from Dolibarr/develop

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 06e6d3ab00aa635159bef35813c84ffea5ae8314
      
https://github.com/Dolibarr/dolibarr/commit/06e6d3ab00aa635159bef35813c84ffea5ae8314
  Author: aurelien goudeneche <address@hidden>
  Date:   2018-12-01 (Sat, 01 Dec 2018)

  Changed paths:
    M .travis.yml
    M ChangeLog
    M build/docker/Dockerfile
    M htdocs/accountancy/admin/card.php
    M htdocs/accountancy/bookkeeping/balance.php
    M htdocs/accountancy/class/lettering.class.php
    M htdocs/admin/salaries.php
    M htdocs/comm/action/list.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/propal/list.php
    M htdocs/compta/localtax/quadri_detail.php
    M htdocs/compta/salaries/card.php
    M htdocs/contact/class/contact.class.php
    M htdocs/core/actions_extrafields.inc.php
    M htdocs/core/boxes/box_task.php
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/dolgraph.class.php
    M htdocs/core/js/lib_head.js.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/report.lib.php
    M htdocs/core/lib/usergroups.lib.php
    M htdocs/core/modules/modAccounting.class.php
    M htdocs/core/modules/modCashDesk.class.php
    M htdocs/core/modules/modDav.class.php
    M htdocs/core/modules/modTakePos.class.php
    M htdocs/core/modules/modWebsite.class.php
    M htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
    M htdocs/core/modules/project/doc/pdf_beluga.modules.php
    M htdocs/core/modules/rapport/pdf_paiement.class.php
    M htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
    M htdocs/don/class/don.class.php
    M htdocs/emailcollector/class/emailcollectoraction.class.php
    M htdocs/expensereport/card.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/fourn/facture/card.php
    M htdocs/install/doctemplates/websites/website_template-corporate.zip
    M htdocs/install/mysql/migration/8.0.0-9.0.0.sql
    M htdocs/install/mysql/tables/llx_societe_rib.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/banks.lang
    M htdocs/langs/en_US/cashdesk.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/website.lang
    M htdocs/langs/es_ES/accountancy.lang
    M htdocs/langs/es_ES/commercial.lang
    M htdocs/langs/es_ES/orders.lang
    M htdocs/langs/es_ES/suppliers.lang
    M htdocs/product/list.php
    M htdocs/product/stock/product.php
    M htdocs/product/stock/replenishorders.php
    M htdocs/projet/activity/perday.php
    M htdocs/public/payment/newpayment.php
    M htdocs/societe/checkvat/checkVatPopup.php
    M htdocs/stripe/class/actions_stripe.class.php
    M htdocs/takepos/invoice.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php
    M htdocs/user/class/user.class.php
    M htdocs/variants/card.php
    M htdocs/website/class/website.class.php
    M htdocs/website/index.php

  Log Message:
  -----------
  Merge pull request #1 from Dolibarr/develop

Fork Update


  Commit: 86ea0f523b167cba2e735b8b756a50d339ef2224
      
https://github.com/Dolibarr/dolibarr/commit/86ea0f523b167cba2e735b8b756a50d339ef2224
  Author: aurelien goudeneche <address@hidden>
  Date:   2018-12-03 (Mon, 03 Dec 2018)

  Changed paths:
    M htdocs/accountancy/bookkeeping/balance.php
    M htdocs/adherents/card.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/admin/mails_templates.php
    M htdocs/comm/action/index.php
    M htdocs/contact/list.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formactions.class.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/lib/ajax.lib.php
    M htdocs/core/modules/contract/doc/pdf_strato.modules.php
    M htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
    M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
    M htdocs/core/modules/modAdherent.class.php
    M htdocs/core/modules/modProduct.class.php
    M htdocs/core/modules/modProjet.class.php
    M htdocs/core/modules/modResource.class.php
    M htdocs/core/modules/modService.class.php
    M htdocs/core/modules/modSociete.class.php
    M htdocs/core/modules/modUser.class.php
    M htdocs/core/modules/project/doc/pdf_beluga.modules.php
    M htdocs/emailcollector/class/emailcollector.class.php
    M htdocs/expensereport/card.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/class/paiementfourn.class.php
    M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
    M htdocs/install/mysql/migration/8.0.0-9.0.0.sql
    M htdocs/install/mysql/tables/llx_emailcollector_emailcollector.sql
    M htdocs/install/step1.php
    M htdocs/install/upgrade2.php
    M htdocs/langs/en_US/cashdesk.lang
    M htdocs/langs/en_US/ecm.lang
    M htdocs/langs/en_US/install.lang
    M htdocs/langs/es_ES/cashdesk.lang
    M htdocs/langs/fr_FR/cashdesk.lang
    M htdocs/langs/lv_LV/cashdesk.lang
    M htdocs/product/price.php
    M htdocs/public/payment/newpayment.php
    M htdocs/societe/class/societe.class.php
    M htdocs/takepos/admin/setup.php
    M htdocs/takepos/floors.php
    M htdocs/takepos/invoice.php
    M htdocs/takepos/pay.php
    M htdocs/takepos/takepos.php
    M htdocs/ticket/class/actions_ticket.class.php
    M htdocs/user/card.php

  Log Message:
  -----------
  Merge pull request #2 from Dolibarr/develop

update fork


  Commit: 41ee56c9e9ca25c59b644b80cfe9c1030311bd81
      
https://github.com/Dolibarr/dolibarr/commit/41ee56c9e9ca25c59b644b80cfe9c1030311bd81
  Author: aurelien goudeneche <address@hidden>
  Date:   2018-12-03 (Mon, 03 Dec 2018)

  Changed paths:
    M htdocs/takepos/pay.php

  Log Message:
  -----------
  Apply andreubisquerra's fix to cheque payment

Apply andreubisquerra's fix (#10147) to cheque payment button


  Commit: 1f089d3ee2c44afd66bc05d7b3ef06c0818b0cdc
      
https://github.com/Dolibarr/dolibarr/commit/1f089d3ee2c44afd66bc05d7b3ef06c0818b0cdc
  Author: aurelien goudeneche <address@hidden>
  Date:   2018-12-03 (Mon, 03 Dec 2018)

  Changed paths:
    M htdocs/takepos/pay.php

  Log Message:
  -----------
  Update pay.php


  Commit: a87978eca43e1177f42f381ea2f84c02428f3745
      
https://github.com/Dolibarr/dolibarr/commit/a87978eca43e1177f42f381ea2f84c02428f3745
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-12-04 (Tue, 04 Dec 2018)

  Changed paths:
    M htdocs/takepos/pay.php

  Log Message:
  -----------
  Merge pull request #10168 from AurelGDN/develop

Fix: Apply andreubisquerra's fix to cheque payment


Compare: 
https://github.com/Dolibarr/dolibarr/compare/1d9c0f6b77bc...a87978eca43e
      **NOTE:** This service has been marked for deprecation: 
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.