[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 259c8e: Merge remote-tracking branch
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 259c8e: Merge remote-tracking branch 'Dolibarr/develop' in... |
Date: |
Mon, 18 Jun 2018 02:14:50 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 259c8ed60d338b8a328559b8dfe67a2942a96298
https://github.com/Dolibarr/dolibarr/commit/259c8ed60d338b8a328559b8dfe67a2942a96298
Author: Inovea Conseil <address@hidden>
Date: 2018-06-15 (Fri, 15 Jun 2018)
Changed paths:
M .gitignore
M htdocs/accountancy/admin/account.php
M htdocs/accountancy/admin/index.php
M htdocs/accountancy/bookkeeping/list.php
M htdocs/accountancy/bookkeeping/listbyaccount.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/journal/expensereportsjournal.php
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/adherents/agenda.php
M htdocs/adherents/list.php
M htdocs/adherents/subscription/list.php
M htdocs/adherents/type.php
M htdocs/admin/mails.php
M htdocs/admin/supplier_order.php
M htdocs/bookmarks/list.php
M htdocs/comm/action/list.php
M htdocs/comm/mailing/list.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/comm/propal/list.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/list.php
M htdocs/compta/bank/annuel.php
M htdocs/compta/bank/bankentries_list.php
M htdocs/compta/bank/budget.php
M htdocs/compta/bank/list.php
M htdocs/compta/bank/treso.php
M htdocs/compta/bank/various_payment/index.php
M htdocs/compta/charges/index.php
M htdocs/compta/deplacement/list.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/list.php
M htdocs/compta/localtax/clients.php
M htdocs/compta/localtax/list.php
M htdocs/compta/paiement/cheque/index.php
M htdocs/compta/paiement/cheque/list.php
M htdocs/compta/prelevement/bons.php
M htdocs/compta/salaries/index.php
M htdocs/contact/list.php
M htdocs/contrat/list.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/conf.class.php
M htdocs/core/class/dolgraph.class.php
M htdocs/core/class/extrafields.class.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/company.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/website.lib.php
M htdocs/core/modules/printing/printgcp.modules.php
M htdocs/core/modules/printing/printipp.modules.php
M htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
M htdocs/core/tpl/commonfields_edit.tpl.php
M htdocs/core/tpl/commonfields_view.tpl.php
M htdocs/core/tpl/extrafields_view.tpl.php
M htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
M htdocs/cron/list.php
M htdocs/don/list.php
M htdocs/expedition/card.php
M htdocs/expedition/list.php
M htdocs/expedition/shipment.php
M htdocs/expensereport/list.php
M htdocs/expensereport/payment/payment.php
M htdocs/expensereport/stats/index.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fichinter/list.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/facture/list.php
M htdocs/holiday/list.php
M htdocs/install/mysql/data/llx_accounting_abc.sql
A htdocs/install/mysql/data/llx_accounting_account_de.sql
M htdocs/install/mysql/data/llx_c_tva.sql
M htdocs/install/mysql/migration/7.0.0-8.0.0.sql
M htdocs/install/mysql/tables/llx_website_page.sql
M htdocs/install/upgrade2.php
M htdocs/langs/en_US/accountancy.lang
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/banks.lang
M htdocs/langs/en_US/compta.lang
M htdocs/langs/en_US/ecm.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/paybox.lang
M htdocs/langs/en_US/stripe.lang
M htdocs/langs/en_US/ticket.lang
M htdocs/langs/en_US/website.lang
A htdocs/langs/fr_FR/ticket.lang
R htdocs/langs/fr_FR/ticketsup.lang
M htdocs/loan/index.php
M htdocs/modulebuilder/template/admin/setup.php
M htdocs/modulebuilder/template/core/modules/modMyModule.class.php
M htdocs/modulebuilder/template/myobject_list.php
M htdocs/opensurvey/list.php
M htdocs/product/card.php
M htdocs/product/class/product.class.php
M htdocs/product/list.php
M htdocs/product/stock/list.php
M htdocs/projet/activity/index.php
M htdocs/projet/admin/project.php
M htdocs/projet/class/projectstats.class.php
M htdocs/projet/class/taskstats.class.php
M htdocs/projet/index.php
M htdocs/projet/info.php
M htdocs/projet/list.php
M htdocs/projet/stats/index.php
M htdocs/projet/tasks/list.php
M htdocs/projet/tasks/stats/index.php
M htdocs/public/payment/newpayment.php
M htdocs/public/website/index.php
M htdocs/resource/list.php
M htdocs/societe/agenda.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/consumption.php
M htdocs/societe/list.php
M htdocs/societe/paymentmodes.php
M htdocs/societe/website.php
M htdocs/stripe/payment.php
M htdocs/supplier_proposal/index.php
M htdocs/supplier_proposal/list.php
M htdocs/theme/eldy/style.css.php
M htdocs/ticket/list.php
M htdocs/user/class/user.class.php
M htdocs/user/group/list.php
M htdocs/user/list.php
M htdocs/user/notify/card.php
M htdocs/user/param_ihm.php
M htdocs/variants/list.php
M htdocs/website/index.php
M htdocs/website/page-sample-empty.html
M test/phpunit/ActionCommTest.php
M test/phpunit/AllTests.php
Log Message:
-----------
Merge remote-tracking branch 'Dolibarr/develop' into develop
Commit: d5a3e63e05c13e043136a6371dde3371c66d5c0a
https://github.com/Dolibarr/dolibarr/commit/d5a3e63e05c13e043136a6371dde3371c66d5c0a
Author: Inovea Conseil <address@hidden>
Date: 2018-06-15 (Fri, 15 Jun 2018)
Changed paths:
M htdocs/adherents/class/adherent.class.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/contrat/class/contrat.class.php
M htdocs/expedition/class/expedition.class.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/class/paiementfourn.class.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
M htdocs/user/class/user.class.php
M htdocs/user/class/usergroup.class.php
Log Message:
-----------
Fix missing paramater for generateDocument
Commit: 9d048281dc835ffd87ed9e7ee943e91c3ff426c4
https://github.com/Dolibarr/dolibarr/commit/9d048281dc835ffd87ed9e7ee943e91c3ff426c4
Author: Laurent Destailleur <address@hidden>
Date: 2018-06-18 (Mon, 18 Jun 2018)
Changed paths:
M htdocs/adherents/class/adherent.class.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/contrat/class/contrat.class.php
M htdocs/expedition/class/expedition.class.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/class/paiementfourn.class.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
M htdocs/user/class/user.class.php
M htdocs/user/class/usergroup.class.php
Log Message:
-----------
Merge pull request #8970 from inoveaconseil/FixParamGenerateDocument
Fix missing params on generateDocument
Compare:
https://github.com/Dolibarr/dolibarr/compare/5d56969bd942...9d048281dc83
**NOTE:** This service 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.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] 259c8e: Merge remote-tracking branch 'Dolibarr/develop' in...,
Laurent Destailleur <=