[Dolibarr-git] [Dolibarr/dolibarr] 8ea4d6: Merge pull request #11 from Dolibarr/develop

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 8ea4d6e21d1547860627518ef9fe2246e5f1a356
      
https://github.com/Dolibarr/dolibarr/commit/8ea4d6e21d1547860627518ef9fe2246e5f1a356
  Author: Jean Traullé <address@hidden>
  Date:   2019-08-26 (Mon, 26 Aug 2019)

  Changed paths:
    M .github/CONTRIBUTING.md
    A .github/FUNDING.yml
    R .github/ISSUE_TEMPLATE.md
    A .github/ISSUE_TEMPLATE/bug_report.md
    A .github/ISSUE_TEMPLATE/feature_request.md
    M .travis.yml
    M ChangeLog
    A SECURITY.md
    M build/exe/doliwamp/php.ini.install
    M build/rpm/httpd-dolibarr.conf
    A dev/namespacemig/README.md
    A dev/namespacemig/aaa.class.php
    A dev/namespacemig/bbb.class.php
    A dev/namespacemig/bbb.php
    A dev/namespacemig/main.inc.php
    M dev/setup/codesniffer/php.ini
    M dev/setup/codesniffer/ruleset.xml
    M htdocs/accountancy/bookkeeping/balancebymonth.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/admin/dav.php
    M htdocs/admin/delais.php
    M htdocs/admin/geoipmaxmind.php
    M htdocs/admin/modules.php
    M htdocs/admin/pdf.php
    M htdocs/admin/tools/dolibarr_export.php
    M htdocs/admin/tools/eaccelerator.php
    M htdocs/admin/website.php
    M htdocs/api/admin/index.php
    M htdocs/api/class/api.class.php
    M htdocs/api/class/api_documents.class.php
    M htdocs/api/class/api_login.class.php
    M htdocs/api/index.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/propal/card.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/propal/list.php
    M htdocs/commande/card.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/document.php
    M htdocs/commande/index.php
    M htdocs/commande/list.php
    M htdocs/commande/orderstoinvoice.php
    M htdocs/compta/bank/card.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/bank/class/api_bankaccounts.class.php
    M htdocs/compta/bank/treso.php
    M htdocs/compta/bank/various_payment/card.php
    M htdocs/compta/cashcontrol/cashcontrol_card.php
    M htdocs/compta/cashcontrol/report.php
    M htdocs/compta/facture/card.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/document.php
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/compta/facture/list.php
    M htdocs/compta/paiement.php
    M htdocs/compta/paiement/cheque/class/remisecheque.class.php
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/compta/resultat/result.php
    M htdocs/compta/sociales/card.php
    M htdocs/compta/sociales/class/chargesociales.class.php
    M htdocs/compta/tva/card.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contact/list.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/actions_linkedfiles.inc.php
    M htdocs/core/ajax/pingresult.php
    A htdocs/core/boxes/box_birthdays_members.php
    M htdocs/core/boxes/box_task.php
    M htdocs/core/class/commoninvoice.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/conf.class.php
    M htdocs/core/class/discount.class.php
    M htdocs/core/class/dolgeoip.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/core/class/html.formwebsite.class.php
    A htdocs/core/class/lessc.class.php
    M htdocs/core/class/utils.class.php
    M htdocs/core/class/workboardresponse.class.php
    M htdocs/core/js/lib_head.js.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/lib/order.lib.php
    M htdocs/core/lib/project.lib.php
    M htdocs/core/lib/report.lib.php
    M htdocs/core/lib/security2.lib.php
    M htdocs/core/lib/usergroups.lib.php
    M htdocs/core/lib/website.lib.php
    M htdocs/core/lib/website2.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/cheque/doc/pdf_blochet.class.php
    M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
    M htdocs/core/modules/commande/mod_commande_marbre.php
    M htdocs/core/modules/commande/mod_commande_saphir.php
    M htdocs/core/modules/contract/doc/pdf_strato.modules.php
    M htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
    M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
    M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/facture/doc/pdf_sponge.modules.php
    M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
    M htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
    M htdocs/core/modules/modAdherent.class.php
    M htdocs/core/modules/modResource.class.php
    M htdocs/core/modules/modSyslog.class.php
    M htdocs/core/modules/modWebsite.class.php
    M htdocs/core/modules/oauth/stripelive_oauthcallback.php
    M htdocs/core/modules/oauth/stripetest_oauthcallback.php
    M htdocs/core/modules/product/doc/pdf_standard.modules.php
    M htdocs/core/modules/project/doc/pdf_baleine.modules.php
    M htdocs/core/modules/project/doc/pdf_beluga.modules.php
    M htdocs/core/modules/project/doc/pdf_timespent.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/propale/doc/pdf_cyan.modules.php
    M htdocs/core/modules/reception/doc/pdf_squille.modules.php
    M htdocs/core/modules/stock/doc/pdf_standard.modules.php
    M htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
    M htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
    M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
    M htdocs/core/tpl/contacts.tpl.php
    M htdocs/core/tpl/extrafields_view.tpl.php
    M htdocs/core/tpl/filemanager.tpl.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/cron/list.php
    M htdocs/dav/fileserver.php
    M htdocs/expedition/list.php
    M htdocs/expensereport/card.php
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/fichinter/class/api_interventions.class.php
    M htdocs/filefunc.inc.php
    M htdocs/fourn/class/api_supplier_invoices.class.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/facture/list.php
    M htdocs/holiday/class/holiday.class.php
    M htdocs/includes/geoip/geoip.inc
    M htdocs/includes/geoip/geoipcity.inc
    M htdocs/includes/geoip/geoipregionvars.php
    A htdocs/includes/geoip/timezone.php
    A htdocs/includes/geoip2/geoip2.phar
    M htdocs/index.php
    R htdocs/install/doctemplates/websites/website-template-corporate.jpg
    A htdocs/install/doctemplates/websites/website_template-corporate.jpg
    M htdocs/install/doctemplates/websites/website_template-corporate.zip
    A htdocs/install/doctemplates/websites/website_template-stellar.jpg
    A htdocs/install/doctemplates/websites/website_template-stellar.zip
    M htdocs/install/inc.php
    M htdocs/install/mysql/migration/10.0.0-11.0.0.sql
    M htdocs/install/mysql/tables/llx_oauth_token.sql
    M htdocs/install/mysql/tables/llx_stock_mouvement.sql
    M htdocs/install/step2.php
    M htdocs/install/step4.php
    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/companies.lang
    M htdocs/langs/en_US/contracts.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/members.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/langs/en_US/website.lang
    M htdocs/langs/fr_FR/products.lang
    M htdocs/loan/card.php
    M htdocs/main.inc.php
    M htdocs/master.inc.php
    M htdocs/modulebuilder/template/admin/setup.php
    M htdocs/product/admin/product.php
    M htdocs/product/class/product.class.php
    M htdocs/product/fournisseurs.php
    M htdocs/product/list.php
    M htdocs/product/stock/card.php
    M htdocs/product/stock/class/mouvementstock.class.php
    M htdocs/product/stock/movement_list.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/index.php
    M htdocs/projet/jsgantt_language.js.php
    M htdocs/projet/tasks.php
    M htdocs/projet/tasks/time.php
    M htdocs/public/payment/newpayment.php
    M htdocs/salaries/card.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/list.php
    M htdocs/societe/paymentmodes.php
    M htdocs/stripe/class/stripe.class.php
    M htdocs/stripe/payment.php
    M htdocs/supplier_proposal/class/supplier_proposal.class.php
    M htdocs/takepos/admin/setup.php
    M htdocs/takepos/invoice.php
    M htdocs/takepos/takepos.php
    M htdocs/theme/eldy/global.inc.php
    M htdocs/theme/eldy/img/title_bank.png
    M htdocs/theme/eldy/img/title_commercial.png
    A htdocs/theme/eldy/img/title_document.png
    M htdocs/theme/eldy/img/title_home.png
    M htdocs/theme/eldy/img/title_products.png
    A htdocs/theme/eldy/info-box.inc.php
    A htdocs/theme/eldy/progress.inc.php
    M htdocs/theme/eldy/theme_vars.inc.php
    A htdocs/theme/md/badges.inc.php
    A htdocs/theme/md/btn.inc.php
    A htdocs/theme/md/img/title_document.png
    A htdocs/theme/md/info-box.inc.php
    A htdocs/theme/md/progress.inc.php
    M htdocs/theme/md/style.css.php
    M htdocs/theme/md/theme_vars.inc.php
    M htdocs/user/card.php
    M htdocs/user/home.php
    M htdocs/website/class/website.class.php
    M htdocs/website/class/websitepage.class.php
    M htdocs/website/index.php
    R htdocs/website/samples/page-sample-corporatehome.html
    A htdocs/website/samples/page-sample-dynamiccontent.html
    M htdocs/website/samples/page-sample-empty.html

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

Merge from upstream


  Commit: 7d8f86c6146f2aa80bea912a014aa4d9c3de22f9
      
https://github.com/Dolibarr/dolibarr/commit/7d8f86c6146f2aa80bea912a014aa4d9c3de22f9
  Author: Jean Traullé <address@hidden>
  Date:   2019-08-26 (Mon, 26 Aug 2019)

  Changed paths:
    A .stickler.yml

  Log Message:
  -----------
  Create .stickler.yml


  Commit: c08c3b5c9c101a6aadc4f836ef3ce8c915415117
      
https://github.com/Dolibarr/dolibarr/commit/c08c3b5c9c101a6aadc4f836ef3ce8c915415117
  Author: Jean Traullé <address@hidden>
  Date:   2019-08-26 (Mon, 26 Aug 2019)

  Changed paths:
    M .stickler.yml

  Log Message:
  -----------
  Enable fixer to auto-fix code style issues


  Commit: 0702ef4e0ffc71e74066374b62708355a4b8e3e2
      
https://github.com/Dolibarr/dolibarr/commit/0702ef4e0ffc71e74066374b62708355a4b8e3e2
  Author: Jean Traullé <address@hidden>
  Date:   2019-08-27 (Tue, 27 Aug 2019)

  Changed paths:
    M htdocs/core/class/commoninvoice.class.php
    M htdocs/core/class/discount.class.php

  Log Message:
  -----------
  Fix CI (code style)


  Commit: dd1e7bbc3ddc267b81d0b10304c318f25c3de344
      
https://github.com/Dolibarr/dolibarr/commit/dd1e7bbc3ddc267b81d0b10304c318f25c3de344
  Author: Jean Traullé <address@hidden>
  Date:   2019-08-27 (Tue, 27 Aug 2019)

  Changed paths:
    M .github/FUNDING.yml
    M README.md
    M htdocs/admin/system/perf.php
    M htdocs/commande/card.php
    M htdocs/compta/paiement.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/tpl/contacts.tpl.php
    M htdocs/product/stock/class/entrepot.class.php
    M htdocs/product/stock/list.php
    M htdocs/product/stock/movement_list.php
    M htdocs/product/stock/product.php
    M htdocs/societe/class/societe.class.php
    M test/phpunit/AllTests.php
    M test/phpunit/FormAdminTest.php
    A test/phpunit/FormTest.php

  Log Message:
  -----------
  Merge branch 'develop' into stickler-ci


  Commit: 9ca85b8e19cc23fa5c92d871309f91b9fbb01b78
      
https://github.com/Dolibarr/dolibarr/commit/9ca85b8e19cc23fa5c92d871309f91b9fbb01b78
  Author: Jean Traullé <address@hidden>
  Date:   2019-08-27 (Tue, 27 Aug 2019)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Disabling coding style checks for Pull Requests

Because coding style would have been checked by SticklerCI, we can safely skip 
this in Travis-CI when in Pull Request context.
It will increase build speed by about 50%.


  Commit: 442793aa65748e6004d7dd3ab7fd17c6b4fbbca7
      
https://github.com/Dolibarr/dolibarr/commit/442793aa65748e6004d7dd3ab7fd17c6b4fbbca7
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-08-27 (Tue, 27 Aug 2019)

  Changed paths:
    A .stickler.yml
    M .travis.yml
    M htdocs/core/class/discount.class.php

  Log Message:
  -----------
  Merge pull request #11755 from jtraulle/stickler-ci

Add .stickler.yml config file


Compare: 
https://github.com/Dolibarr/dolibarr/compare/69688a22e0a0...442793aa6574