[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 1718d9: Merge https://github.com/Doli
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 1718d9: Merge https://github.com/Dolibarr/dolibarr into de... |
|
Date: |
Fri, 22 Mar 2019 04:56:48 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 1718d913a8bd3ffeadbe17221f142cd0ca52443e
https://github.com/Dolibarr/dolibarr/commit/1718d913a8bd3ffeadbe17221f142cd0ca52443e
Author: Christophe Battarel <address@hidden>
Date: 2019-03-14 (Thu, 14 Mar 2019)
Changed paths:
M README.md
A dev/resources/iso-normes/Accountancy-format_Ebp_txt.pdf
M htdocs/accountancy/class/accountancyexport.class.php
M htdocs/admin/bank.php
M htdocs/admin/emailcollector_card.php
M htdocs/admin/facture.php
M htdocs/admin/menus.php
M htdocs/admin/menus/index.php
M htdocs/admin/propal.php
M htdocs/bom/bom_card.php
M htdocs/bom/bom_document.php
M htdocs/bom/bom_list.php
M htdocs/bom/bom_note.php
M htdocs/bom/class/bom.class.php
M htdocs/comm/action/card.php
M htdocs/comm/action/list.php
M htdocs/comm/mailing/card.php
M htdocs/comm/propal/card.php
M htdocs/commande/card.php
M htdocs/compta/facture/card.php
M htdocs/compta/resultat/result.php
M htdocs/compta/sociales/card.php
M htdocs/contrat/card.php
M htdocs/core/actions_addupdatedelete.inc.php
M htdocs/core/class/commoninvoice.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/notify.class.php
M htdocs/core/class/translate.class.php
M htdocs/core/class/utils.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/tpl/commonfields_edit.tpl.php
M htdocs/core/tpl/commonfields_view.tpl.php
M htdocs/datapolicy/class/actions_datapolicy.class.php
M htdocs/expedition/card.php
M htdocs/expensereport/card.php
M htdocs/fichinter/card.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/facture/card.php
M htdocs/hrm/index.php
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
M htdocs/install/mysql/migration/8.0.0-9.0.0.sql
M htdocs/install/mysql/migration/9.0.0-10.0.0.sql
M htdocs/install/mysql/tables/llx_bom_bom.sql
M htdocs/langs/en_US/accountancy.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/compta.lang
M htdocs/langs/en_US/contracts.lang
M htdocs/langs/en_US/interventions.lang
M htdocs/langs/en_US/mails.lang
M htdocs/langs/en_US/modulebuilder.lang
M htdocs/langs/en_US/mrp.lang
M htdocs/langs/en_US/orders.lang
M htdocs/langs/en_US/products.lang
M htdocs/langs/en_US/projects.lang
M htdocs/langs/en_US/propal.lang
M htdocs/langs/en_US/supplier_proposal.lang
M htdocs/langs/en_US/trips.lang
M htdocs/langs/fr_FR/main.lang
M htdocs/modulebuilder/admin/setup.php
M htdocs/modulebuilder/index.php
M htdocs/modulebuilder/template/class/myobject.class.php
M htdocs/modulebuilder/template/myobject_card.php
M htdocs/modulebuilder/template/myobject_list.php
M htdocs/product/card.php
M htdocs/product/class/html.formproduct.class.php
M htdocs/product/class/product.class.php
M htdocs/product/dynamic_price/class/price_parser.class.php
M htdocs/societe/list.php
M htdocs/supplier_proposal/card.php
M htdocs/takepos/receipt.php
M htdocs/theme/eldy/badges.inc.php
M htdocs/theme/eldy/global.inc.php
M htdocs/theme/eldy/theme_vars.inc.php
M htdocs/theme/md/style.css.php
M htdocs/ticket/list.php
M htdocs/variants/combinations.php
Log Message:
-----------
Merge https://github.com/Dolibarr/dolibarr into develop
Commit: 042cceb8f8a31a1de5071e4b48b64fcc776205ed
https://github.com/Dolibarr/dolibarr/commit/042cceb8f8a31a1de5071e4b48b64fcc776205ed
Author: Christophe Battarel <address@hidden>
Date: 2019-03-18 (Mon, 18 Mar 2019)
Changed paths:
M COPYRIGHT
M ChangeLog
M dev/initdemo/mysqldump_dolibarr_4.0.0.sql
M dev/initdemo/mysqldump_dolibarr_5.0.0.sql
M dev/initdemo/mysqldump_dolibarr_6.0.0.sql
M dev/initdemo/mysqldump_dolibarr_7.0.0.sql
M dev/initdemo/mysqldump_dolibarr_8.0.0.sql
M dev/initdemo/mysqldump_dolibarr_9.0.0.sql
M htdocs/accountancy/admin/categories.php
M htdocs/accountancy/admin/productaccount.php
M htdocs/accountancy/class/accountancycategory.class.php
M htdocs/accountancy/class/accountancyexport.class.php
M htdocs/accountancy/index.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/list.php
A htdocs/admin/debugbar.php
M htdocs/admin/facture.php
M htdocs/admin/ihm.php
M htdocs/admin/prelevement.php
M htdocs/admin/propal.php
M htdocs/admin/syslog.php
M htdocs/admin/system/perf.php
M htdocs/bom/bom_list.php
M htdocs/bom/class/bom.class.php
M htdocs/categories/admin/categorie.php
M htdocs/categories/class/categorie.class.php
M htdocs/categories/photos.php
M htdocs/categories/viewcat.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/card.php
M htdocs/comm/index.php
M htdocs/comm/propal/card.php
M htdocs/comm/propal/class/api_proposals.class.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/comm/propal/contact.php
M htdocs/comm/propal/index.php
M htdocs/commande/card.php
M htdocs/commande/class/api_orders.class.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/contact.php
M htdocs/compta/bank/bankentries_list.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/class/api_invoices.class.php
M htdocs/compta/facture/class/facture-rec.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/list.php
M htdocs/compta/paiement/class/paiement.class.php
M htdocs/compta/resultat/result.php
M htdocs/compta/tva/class/tva.class.php
M htdocs/contrat/card.php
A htdocs/core/boxes/box_birthdays.php
M htdocs/core/boxes/box_graph_product_distribution.php
M htdocs/core/class/comment.class.php
M htdocs/core/class/commoninvoice.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/cunits.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/class/utils.class.php
M htdocs/core/lib/ajax.lib.php
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/doleditor.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/invoice2.lib.php
M htdocs/core/lib/parsemd.lib.php
M htdocs/core/lib/product.lib.php
M htdocs/core/lib/project.lib.php
M htdocs/core/lib/security.lib.php
M htdocs/core/lib/sendings.lib.php
M htdocs/core/lib/treeview.lib.php
M htdocs/core/lib/usergroups.lib.php
M htdocs/core/modules/dons/html_cerfafr.html
M htdocs/core/modules/fichinter/mod_arctic.php
M htdocs/core/modules/holiday/mod_holiday_immaculate.php
M htdocs/core/modules/livraison/mod_livraison_saphir.php
M htdocs/core/modules/modDav.class.php
A htdocs/core/modules/modDebugBar.class.php
M htdocs/core/modules/modUser.class.php
M htdocs/core/modules/payment/mod_payment_ant.php
M htdocs/core/modules/product/mod_codeproduct_elephant.php
M htdocs/core/modules/project/mod_project_universal.php
M htdocs/core/modules/project/task/mod_task_universal.php
M htdocs/core/modules/propale/mod_propale_saphir.php
M htdocs/core/modules/reception/mod_reception_moonstone.php
M htdocs/core/modules/societe/mod_codeclient_elephant.php
M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
M htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
M htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
M htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
M htdocs/core/modules/ticket/mod_ticket_universal.php
M htdocs/core/tpl/commonfields_edit.tpl.php
M htdocs/core/tpl/document_actions_post_headers.tpl.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/cron/class/cronjob.class.php
M htdocs/cron/list.php
A htdocs/debugbar/class/DataCollector/DolConfigCollector.php
A htdocs/debugbar/class/DataCollector/DolExceptionsCollector.php
A htdocs/debugbar/class/DataCollector/DolLogsCollector.php
A htdocs/debugbar/class/DataCollector/DolMemoryCollector.php
A htdocs/debugbar/class/DataCollector/DolMessagesCollector.php
A htdocs/debugbar/class/DataCollector/DolQueryCollector.php
A htdocs/debugbar/class/DataCollector/DolRequestDataCollector.php
A htdocs/debugbar/class/DataCollector/DolTimeDataCollector.php
A htdocs/debugbar/class/DataCollector/DolibarrCollector.php
A htdocs/debugbar/class/DebugBar.php
A htdocs/debugbar/class/TraceableDB.php
A htdocs/debugbar/class/actions_debugbar.class.php
A htdocs/debugbar/class/autoloader.php
A htdocs/debugbar/js/widgets.js
M htdocs/don/card.php
M htdocs/ecm/search.php
M htdocs/expedition/card.php
M htdocs/expedition/contact.php
M htdocs/expedition/shipment.php
M htdocs/expensereport/card.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/expensereport/index.php
M htdocs/expensereport/list.php
M htdocs/expensereport/payment/card.php
M htdocs/expensereport/payment/payment.php
M htdocs/expensereport/stats/index.php
M htdocs/expensereport/tpl/linkedobjectblock.tpl.php
M htdocs/fichinter/card-rec.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/class/fournisseur.product.class.php
M htdocs/fourn/class/paiementfourn.class.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/facture/card.php
M htdocs/fourn/facture/paiement.php
M htdocs/fourn/facture/rapport.php
M htdocs/holiday/card.php
M htdocs/holiday/class/holiday.class.php
M htdocs/holiday/document.php
M htdocs/hrm/index.php
A htdocs/includes/DebugBar/Bridge/CacheCacheCollector.php
A htdocs/includes/DebugBar/Bridge/DoctrineCollector.php
A htdocs/includes/DebugBar/Bridge/MonologCollector.php
A htdocs/includes/DebugBar/Bridge/PropelCollector.php
A htdocs/includes/DebugBar/Bridge/SlimCollector.php
A htdocs/includes/DebugBar/Bridge/SwiftMailer/SwiftLogCollector.php
A htdocs/includes/DebugBar/Bridge/SwiftMailer/SwiftMailCollector.php
A htdocs/includes/DebugBar/Bridge/Twig/TraceableTwigEnvironment.php
A htdocs/includes/DebugBar/Bridge/Twig/TraceableTwigTemplate.php
A htdocs/includes/DebugBar/Bridge/Twig/TwigCollector.php
A htdocs/includes/DebugBar/DataCollector/AggregatedCollector.php
A htdocs/includes/DebugBar/DataCollector/AssetProvider.php
A htdocs/includes/DebugBar/DataCollector/ConfigCollector.php
A htdocs/includes/DebugBar/DataCollector/DataCollector.php
A htdocs/includes/DebugBar/DataCollector/DataCollectorInterface.php
A htdocs/includes/DebugBar/DataCollector/ExceptionsCollector.php
A htdocs/includes/DebugBar/DataCollector/LocalizationCollector.php
A htdocs/includes/DebugBar/DataCollector/MemoryCollector.php
A htdocs/includes/DebugBar/DataCollector/MessagesAggregateInterface.php
A htdocs/includes/DebugBar/DataCollector/MessagesCollector.php
A htdocs/includes/DebugBar/DataCollector/PDO/PDOCollector.php
A htdocs/includes/DebugBar/DataCollector/PDO/TraceablePDO.php
A htdocs/includes/DebugBar/DataCollector/PDO/TraceablePDOStatement.php
A htdocs/includes/DebugBar/DataCollector/PDO/TracedStatement.php
A htdocs/includes/DebugBar/DataCollector/PhpInfoCollector.php
A htdocs/includes/DebugBar/DataCollector/Renderable.php
A htdocs/includes/DebugBar/DataCollector/RequestDataCollector.php
A htdocs/includes/DebugBar/DataCollector/TimeDataCollector.php
A htdocs/includes/DebugBar/DataFormatter/DataFormatter.php
A htdocs/includes/DebugBar/DataFormatter/DataFormatterInterface.php
A htdocs/includes/DebugBar/DebugBar.php
A htdocs/includes/DebugBar/DebugBarException.php
A htdocs/includes/DebugBar/HttpDriverInterface.php
A htdocs/includes/DebugBar/JavascriptRenderer.php
A htdocs/includes/DebugBar/OpenHandler.php
A htdocs/includes/DebugBar/PhpHttpDriver.php
A htdocs/includes/DebugBar/RequestIdGenerator.php
A htdocs/includes/DebugBar/RequestIdGeneratorInterface.php
A htdocs/includes/DebugBar/Resources/debugbar.css
A htdocs/includes/DebugBar/Resources/debugbar.js
A htdocs/includes/DebugBar/Resources/openhandler.css
A htdocs/includes/DebugBar/Resources/openhandler.js
A
htdocs/includes/DebugBar/Resources/vendor/font-awesome/css/font-awesome.min.css
A
htdocs/includes/DebugBar/Resources/vendor/font-awesome/fonts/FontAwesome.otf
A
htdocs/includes/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.eot
A
htdocs/includes/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.svg
A
htdocs/includes/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.ttf
A
htdocs/includes/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.woff
A htdocs/includes/DebugBar/Resources/vendor/highlightjs/highlight.pack.js
A htdocs/includes/DebugBar/Resources/vendor/highlightjs/styles/github.css
A htdocs/includes/DebugBar/Resources/vendor/jquery/dist/jquery.min.js
A htdocs/includes/DebugBar/Resources/widgets.css
A htdocs/includes/DebugBar/Resources/widgets.js
A htdocs/includes/DebugBar/Resources/widgets/mails/widget.css
A htdocs/includes/DebugBar/Resources/widgets/mails/widget.js
A htdocs/includes/DebugBar/Resources/widgets/sqlqueries/widget.css
A htdocs/includes/DebugBar/Resources/widgets/sqlqueries/widget.js
A htdocs/includes/DebugBar/Resources/widgets/templates/widget.css
A htdocs/includes/DebugBar/Resources/widgets/templates/widget.js
A htdocs/includes/DebugBar/StandardDebugBar.php
A htdocs/includes/DebugBar/Storage/FileStorage.php
A htdocs/includes/DebugBar/Storage/MemcachedStorage.php
A htdocs/includes/DebugBar/Storage/PdoStorage.php
A htdocs/includes/DebugBar/Storage/RedisStorage.php
A htdocs/includes/DebugBar/Storage/StorageInterface.php
A htdocs/includes/DebugBar/Storage/pdo_storage_schema.sql
A htdocs/includes/Psr/Log/AbstractLogger.php
A htdocs/includes/Psr/Log/InvalidArgumentException.php
A htdocs/includes/Psr/Log/LogLevel.php
A htdocs/includes/Psr/Log/LoggerAwareInterface.php
A htdocs/includes/Psr/Log/LoggerAwareTrait.php
A htdocs/includes/Psr/Log/LoggerInterface.php
A htdocs/includes/Psr/Log/LoggerTrait.php
A htdocs/includes/Psr/Log/NullLogger.php
A htdocs/includes/Psr/Log/Test/LoggerInterfaceTest.php
M htdocs/install/mysql/migration/8.0.0-9.0.0.sql
M htdocs/install/mysql/migration/9.0.0-10.0.0.sql
M htdocs/install/mysql/tables/llx_expensereport_det.sql
M htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql
M htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
M htdocs/langs/en_US/accountancy.lang
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/boxes.lang
M htdocs/langs/en_US/categories.lang
M htdocs/langs/en_US/modulebuilder.lang
M htdocs/langs/en_US/other.lang
M htdocs/langs/en_US/trips.lang
M htdocs/langs/fr_FR/companies.lang
M htdocs/livraison/card.php
M htdocs/main.inc.php
M htdocs/modulebuilder/index.php
M htdocs/modulebuilder/template/README.md
M htdocs/modulebuilder/template/class/myobject.class.php
M htdocs/modulebuilder/template/core/modules/modMyModule.class.php
A htdocs/modulebuilder/template/doc/Documentation.asciidoc
A htdocs/modulebuilder/template/doc/Documentation_full_en.example.asciidoc
R htdocs/modulebuilder/template/doc/Specifications.asciidoc
R htdocs/modulebuilder/template/doc/Specifications_full_en.example.asciidoc
M htdocs/product/card.php
M htdocs/product/fournisseurs.php
M htdocs/product/list.php
M htdocs/projet/activity/perweek.php
M htdocs/projet/card.php
M htdocs/projet/class/task.class.php
M htdocs/projet/element.php
M htdocs/projet/tasks/stats/index.php
M htdocs/public/agenda/agendaexport.php
M htdocs/public/donations/donateurs_code.php
M htdocs/public/members/new.php
M htdocs/public/opensurvey/studs.php
M htdocs/public/test/test_arrays.php
M htdocs/public/ticket/list.php
M htdocs/reception/card.php
M htdocs/reception/class/reception.class.php
M htdocs/reception/contact.php
M htdocs/societe/card.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/societecontact.php
M htdocs/societe/website.php
M htdocs/stripe/payment.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/ajax.php
M htdocs/takepos/css/pos.css
M htdocs/takepos/customers.php
M htdocs/takepos/invoice.php
M htdocs/takepos/receipt.php
M htdocs/takepos/takepos.php
M htdocs/theme/eldy/global.inc.php
A htdocs/theme/eldy/img/object_debugbar.png
M htdocs/theme/eldy/main_menu_fa_icons.inc.php
A htdocs/theme/md/img/object_debugbar.png
M htdocs/theme/md/style.css.php
M htdocs/user/agenda_extsites.php
M htdocs/user/bank.php
M htdocs/user/notify/card.php
M htdocs/webservices/server_invoice.php
M test/phpunit/CodingSqlTest.php
Log Message:
-----------
Merge https://github.com/Dolibarr/dolibarr into develop
Commit: 8b3fd2eacfc4128f1167a902f0aa5396c4d54193
https://github.com/Dolibarr/dolibarr/commit/8b3fd2eacfc4128f1167a902f0aa5396c4d54193
Author: Christophe Battarel <address@hidden>
Date: 2019-03-18 (Mon, 18 Mar 2019)
Changed paths:
M htdocs/comm/propal/card.php
M htdocs/commande/card.php
M htdocs/compta/facture/card.php
Log Message:
-----------
NEW : add constant NO_CONCAT_DESCRIPTION
Commit: a7181750c630af2ef36bdeda14a8b7d52663b519
https://github.com/Dolibarr/dolibarr/commit/a7181750c630af2ef36bdeda14a8b7d52663b519
Author: Laurent Destailleur <address@hidden>
Date: 2019-03-22 (Fri, 22 Mar 2019)
Changed paths:
M htdocs/comm/propal/card.php
M htdocs/commande/card.php
M htdocs/compta/facture/card.php
Log Message:
-----------
Merge pull request #10879 from altatof/noconcatdesc
NEW : add constant NO_CONCAT_DESCRIPTION
Compare:
https://github.com/Dolibarr/dolibarr/compare/1b558d70c1fc...a7181750c630
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] 1718d9: Merge https://github.com/Dolibarr/dolibarr into de...,
Laurent Destailleur <=