dolibarr-git
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr/dolibarr] 0f4420: Merge pull request #6 from Dolibarr/develop


From: Laurent Destailleur
Subject: [Dolibarr/dolibarr] 0f4420: Merge pull request #6 from Dolibarr/develop
Date: Tue, 28 Jan 2020 02:51:41 -0800

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 0f4420407d795b0d6e3f777464d2c0d17dd2f107
      
https://github.com/Dolibarr/dolibarr/commit/0f4420407d795b0d6e3f777464d2c0d17dd2f107
  Author: Tobias Sekan <address@hidden>
  Date:   2020-01-28 (Tue, 28 Jan 2020)

  Changed paths:
    M ChangeLog
    M dev/initdemo/mysqldump_dolibarr_11.0.0.sql
    M htdocs/accountancy/admin/account.php
    M htdocs/accountancy/class/accountancyexport.class.php
    M htdocs/adherents/type.php
    M htdocs/admin/agenda_other.php
    M htdocs/admin/agenda_xcal.php
    M htdocs/admin/bom.php
    M htdocs/admin/commande.php
    M htdocs/admin/contract.php
    M htdocs/admin/dict.php
    M htdocs/admin/facture.php
    M htdocs/admin/fichinter.php
    M htdocs/admin/holiday.php
    M htdocs/admin/ihm.php
    M htdocs/admin/mails.php
    M htdocs/admin/mails_senderprofile_list.php
    M htdocs/admin/mrp.php
    M htdocs/admin/order_extrafields.php
    M htdocs/admin/orderdet_extrafields.php
    M htdocs/admin/propal.php
    M htdocs/admin/reception_setup.php
    M htdocs/admin/stock.php
    M htdocs/admin/supplier_invoice.php
    M htdocs/admin/supplier_order.php
    M htdocs/admin/supplier_payment.php
    M htdocs/admin/supplier_proposal.php
    M htdocs/admin/ticket.php
    M htdocs/admin/tools/dolibarr_export.php
    M htdocs/admin/tools/export_files.php
    M htdocs/admin/tools/listevents.php
    M htdocs/barcode/printsheet.php
    M htdocs/bom/class/bom.class.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/index.php
    M htdocs/comm/action/list.php
    M htdocs/comm/card.php
    M htdocs/comm/multiprix.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/list.php
    M htdocs/compta/bank/account_statement_document.php
    M htdocs/compta/bank/bankentries_list.php
    M htdocs/compta/bank/releve.php
    M htdocs/compta/bank/various_payment/list.php
    M htdocs/compta/cashcontrol/cashcontrol_card.php
    M htdocs/compta/cashcontrol/cashcontrol_list.php
    M htdocs/compta/cashcontrol/class/cashcontrol.class.php
    M htdocs/compta/cashcontrol/report.php
    M htdocs/compta/facture/card-rec.php
    M htdocs/compta/facture/card.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/list.php
    M htdocs/compta/facture/prelevement.php
    M htdocs/compta/index.php
    M htdocs/compta/paiement.php
    M htdocs/compta/prelevement/card.php
    M htdocs/compta/prelevement/create.php
    M htdocs/compta/prelevement/demandes.php
    M htdocs/compta/sociales/card.php
    M htdocs/compta/sociales/class/chargesociales.class.php
    M htdocs/compta/sociales/list.php
    M htdocs/compta/tva/document.php
    M htdocs/contrat/card.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/contrat/services_list.php
    M htdocs/core/actions_massactions.inc.php
    M htdocs/core/actions_sendmails.inc.php
    M htdocs/core/actions_setmoduleoptions.inc.php
    M htdocs/core/actions_setnotes.inc.php
    M htdocs/core/boxes/box_factures_imp.php
    M htdocs/core/boxes/box_services_expired.php
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/conf.class.php
    M htdocs/core/class/doleditor.class.php
    M htdocs/core/class/dolgraph.class.php
    M htdocs/core/class/dolreceiptprinter.class.php
    M htdocs/core/class/emailsenderprofile.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formaccounting.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/class/smtps.class.php
    M htdocs/core/class/utils.class.php
    M htdocs/core/extrafieldsinexport.inc.php
    M htdocs/core/js/lib_foot.js.php
    M htdocs/core/lib/admin.lib.php
    M htdocs/core/lib/bank.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/pdf.lib.php
    M htdocs/core/lib/project.lib.php
    M htdocs/core/lib/security2.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/DolibarrModules.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/doc/pdf_proforma.modules.php
    M htdocs/core/modules/expedition/doc/pdf_espadon.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/facture/modules_facture.php
    M htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
    M htdocs/core/modules/modAgenda.class.php
    M htdocs/core/modules/modCashDesk.class.php
    M htdocs/core/modules/modFournisseur.class.php
    M htdocs/core/modules/modMrp.class.php
    M htdocs/core/modules/modTakePos.class.php
    M htdocs/core/modules/modUser.class.php
    M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/propale/doc/pdf_cyan.modules.php
    A htdocs/core/modules/supplier_invoice/doc/index.html
    A htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
    R htdocs/core/modules/supplier_invoice/pdf/index.html
    R htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    A 
htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
    A htdocs/core/modules/supplier_order/doc/index.html
    A htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
    A htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
    R 
htdocs/core/modules/supplier_order/pdf/doc_generic_supplier_order_odt.modules.php
    R htdocs/core/modules/supplier_order/pdf/index.html
    R htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
    R 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/massactions_pre.tpl.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/cron/class/cronjob.class.php
    M htdocs/cron/list.php
    M htdocs/emailcollector/class/emailcollector.class.php
    M htdocs/expedition/list.php
    M htdocs/expensereport/card.php
    M htdocs/expensereport/class/expensereportstats.class.php
    M htdocs/expensereport/stats/index.php
    M htdocs/exports/class/export.class.php
    M htdocs/exports/export.php
    M htdocs/fourn/ajax/getSupplierPrices.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/facture/card.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/holiday/card.php
    M htdocs/index.php
    M htdocs/install/doctemplates/websites/website_template-corporate.zip
    M htdocs/install/doctemplates/websites/website_template-stellar.zip
    M htdocs/install/mysql/data/llx_00_c_country.sql
    M htdocs/install/mysql/data/llx_c_forme_juridique.sql
    M htdocs/install/mysql/migration/11.0.0-12.0.0.sql
    M htdocs/install/mysql/migration/repair.sql
    M htdocs/install/mysql/tables/llx_c_country.sql
    M htdocs/install/mysql/tables/llx_c_email_senderprofile.sql
    M htdocs/install/mysql/tables/llx_inventorydet.sql
    M htdocs/install/upgrade2.php
    M htdocs/langs/de_DE/holiday.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/agenda.lang
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/cashdesk.lang
    M htdocs/langs/en_US/compta.lang
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/mrp.lang
    M htdocs/langs/en_US/orders.lang
    M htdocs/langs/en_US/other.lang
    M htdocs/langs/en_US/propal.lang
    M htdocs/langs/en_US/stocks.lang
    M htdocs/langs/fr_FR/trips.lang
    M htdocs/loan/class/loan.class.php
    M htdocs/loan/list.php
    M htdocs/main.inc.php
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php
    M htdocs/modulebuilder/index.php
    M htdocs/modulebuilder/template/class/actions_mymodule.class.php
    M htdocs/modulebuilder/template/class/myobject.class.php
    M htdocs/modulebuilder/template/myobject_list.php
    M htdocs/mrp/class/mo.class.php
    M htdocs/opensurvey/index.php
    M htdocs/product/ajax/products.php
    M htdocs/product/class/api_products.class.php
    M htdocs/product/class/product.class.php
    M htdocs/product/index.php
    M htdocs/product/inventory/card.php
    M htdocs/product/inventory/class/inventory.class.php
    M htdocs/product/inventory/inventory.php
    R htdocs/product/inventory/tpl/inventory.tpl.php
    M htdocs/product/list.php
    M htdocs/product/reassortlot.php
    M htdocs/product/stock/class/api_stockmovements.class.php
    M htdocs/product/stock/class/entrepot.class.php
    M htdocs/product/stock/class/mouvementstock.class.php
    M htdocs/product/stock/movement_list.php
    M htdocs/product/stock/product.php
    M htdocs/product/stock/productlot_list.php
    M htdocs/projet/class/task.class.php
    M htdocs/projet/tasks.php
    M htdocs/projet/tasks/time.php
    M htdocs/public/agenda/agendaexport.php
    A htdocs/public/demo/demo-profile-health.jpg
    A htdocs/public/demo/demo-profile-manufacturing.jpg
    M htdocs/public/demo/demo.css
    R htdocs/public/demo/dolibarr_screenshot2.png
    R htdocs/public/demo/dolibarr_screenshot6.png
    R htdocs/public/demo/dolibarr_screenshot8.png
    R htdocs/public/demo/dolibarr_screenshot9.png
    M htdocs/public/demo/index.php
    M htdocs/public/members/new.php
    M htdocs/public/payment/newpayment.php
    M htdocs/resource/card.php
    M htdocs/resource/class/dolresource.class.php
    M htdocs/salaries/list.php
    M htdocs/societe/card.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/paymentmodes.php
    M htdocs/stripe/charge.php
    M htdocs/supplier_proposal/card.php
    M htdocs/supplier_proposal/class/supplier_proposal.class.php
    M htdocs/takepos/admin/setup.php
    M htdocs/takepos/admin/terminal.php
    A htdocs/takepos/css/colorful.css
    R htdocs/takepos/css/pos.css
    A htdocs/takepos/css/pos.css.php
    M htdocs/takepos/floors.php
    M htdocs/takepos/freezone.php
    M htdocs/takepos/invoice.php
    M htdocs/takepos/pay.php
    M htdocs/takepos/receipt.php
    M htdocs/takepos/send.php
    M htdocs/takepos/takepos.php
    R htdocs/theme/common/dolibarr_logo_256x256.png
    R htdocs/theme/common/dolibarr_logo_bw.png
    A htdocs/theme/dolibarr_logo_256x256.png
    A htdocs/theme/dolibarr_logo_bw.png
    M htdocs/theme/eldy/dropdown.inc.php
    M htdocs/theme/eldy/global.inc.php
    M htdocs/theme/eldy/info-box.inc.php
    M htdocs/theme/eldy/manifest.json.php
    M htdocs/theme/eldy/theme_vars.inc.php
    M htdocs/theme/md/info-box.inc.php
    M htdocs/theme/md/style.css.php
    M htdocs/theme/md/theme_vars.inc.php
    M htdocs/ticket/class/ticket.class.php
    M htdocs/user/home.php
    M htdocs/user/list.php
    M htdocs/variants/card.php
    M phpstan.neon

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

merge from develop


  Commit: 713fb1a29043ce3ba708bf918b4df462980afb1e
      
https://github.com/Dolibarr/dolibarr/commit/713fb1a29043ce3ba708bf918b4df462980afb1e
  Author: Tobias Sekan <address@hidden>
  Date:   2020-01-28 (Tue, 28 Jan 2020)

  Changed paths:
    M htdocs/core/class/html.form.class.php

  Log Message:
  -----------
  Fix additional space after card name


  Commit: d1f3e5b1c26c6281e2b007942032c70eeda29afd
      
https://github.com/Dolibarr/dolibarr/commit/d1f3e5b1c26c6281e2b007942032c70eeda29afd
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-01-28 (Tue, 28 Jan 2020)

  Changed paths:
    M htdocs/core/class/html.form.class.php

  Log Message:
  -----------
  Merge pull request #12941 from TobiasSekan/FixExtraSpaceInCardName

Fix extra space in card name


Compare: 
https://github.com/Dolibarr/dolibarr/compare/40636adb560f...d1f3e5b1c26c



reply via email to

[Prev in Thread] Current Thread [Next in Thread]