[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 6fd5c4: Merge remote-tracking branch
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 6fd5c4: Merge remote-tracking branch 'Dolibarr/develop' in... |
|
Date: |
Mon, 16 Jul 2018 00:31:23 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 6fd5c46dadb503ab51c54ec9d71a9dc5300aff88
https://github.com/Dolibarr/dolibarr/commit/6fd5c46dadb503ab51c54ec9d71a9dc5300aff88
Author: Inovea Conseil <address@hidden>
Date: 2018-06-28 (Thu, 28 Jun 2018)
Changed paths:
M ChangeLog
M htdocs/accountancy/admin/journals_list.php
M htdocs/accountancy/bookkeeping/balance.php
M htdocs/accountancy/bookkeeping/card.php
M htdocs/accountancy/customer/index.php
M htdocs/accountancy/customer/lines.php
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/expensereport/index.php
M htdocs/accountancy/expensereport/lines.php
M htdocs/accountancy/expensereport/list.php
M htdocs/accountancy/index.php
M htdocs/accountancy/supplier/index.php
M htdocs/accountancy/supplier/lines.php
M htdocs/accountancy/supplier/list.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/list.php
M htdocs/admin/barcode.php
M htdocs/admin/dict.php
M htdocs/admin/orderdet_extrafields.php
M htdocs/asset/list.php
M htdocs/comm/card.php
M htdocs/comm/mailing/advtargetemailing.php
M htdocs/comm/mailing/cibles.php
M htdocs/comm/mailing/class/advtargetemailing.class.php
M htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/comm/propal/list.php
M htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
M htdocs/commande/card.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/list.php
M htdocs/commande/tpl/linkedobjectblock.tpl.php
M htdocs/compta/bank/list.php
M htdocs/compta/clients.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/class/facture-rec.class.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/compta/facture/invoicetemplate_list.php
M htdocs/compta/facture/list.php
M htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
M htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
M htdocs/compta/index.php
M htdocs/compta/paiement.php
M htdocs/compta/paiement/class/paiement.class.php
M htdocs/compta/paiement_charge.php
M htdocs/compta/recap-compta.php
M htdocs/compta/salaries/index.php
M htdocs/compta/sociales/index.php
M htdocs/compta/sociales/payments.php
M htdocs/compta/stats/byratecountry.php
M htdocs/compta/stats/cabyprodserv.php
M htdocs/compta/stats/cabyuser.php
M htdocs/compta/stats/casoc.php
M htdocs/compta/stats/index.php
M htdocs/compta/tva/list.php
M htdocs/contact/list.php
M htdocs/contrat/card.php
M htdocs/contrat/class/contrat.class.php
M htdocs/contrat/list.php
M htdocs/contrat/services_list.php
M htdocs/contrat/tpl/linkedobjectblock.tpl.php
M htdocs/core/actions_addupdatedelete.inc.php
M htdocs/core/ajax/ajaxdirtree.php
M htdocs/core/boxes/box_clients.php
M htdocs/core/class/CMailFile.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/conf.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.formmail.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/class/smtps.class.php
M htdocs/core/get_menudiv.php
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/payments.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/menus/standard/eldy_menu.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/contract/doc/pdf_strato.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/mailings/thirdparties.modules.php
M htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
M htdocs/core/modules/modBarcode.class.php
M htdocs/core/modules/modCron.class.php
M htdocs/core/modules/modFournisseur.class.php
M htdocs/core/modules/modModuleBuilder.class.php
M htdocs/core/modules/modOauth.class.php
M htdocs/core/modules/modPrinting.class.php
M htdocs/core/modules/modProduct.class.php
M htdocs/core/modules/modReceiptPrinter.class.php
M htdocs/core/modules/modService.class.php
M htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
M htdocs/core/modules/syslog/mod_syslog_file.php
A htdocs/core/tpl/advtarget.tpl.php
M htdocs/core/tpl/contacts.tpl.php
M htdocs/core/tpl/extrafields_view.tpl.php
M htdocs/core/tpl/resource_view.tpl.php
M htdocs/cron/list.php
M htdocs/don/list.php
M htdocs/don/payment/payment.php
M htdocs/don/tpl/linkedobjectblock.tpl.php
M htdocs/expedition/card.php
M htdocs/expedition/class/expedition.class.php
M htdocs/expedition/list.php
M htdocs/expedition/tpl/linkedobjectblock.tpl.php
M htdocs/expensereport/card.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/expensereport/list.php
M htdocs/exports/class/export.class.php
M htdocs/exports/export.php
M htdocs/exports/index.php
M htdocs/externalsite/admin/externalsite.php
M htdocs/fichinter/card.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fichinter/index.php
M htdocs/fichinter/list.php
M htdocs/fichinter/stats/index.php
M htdocs/fichinter/tpl/linkedobjectblock.tpl.php
M htdocs/filefunc.inc.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/commande/dispatch.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/facture/card.php
M htdocs/fourn/facture/list.php
M htdocs/fourn/facture/rapport.php
M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/js/lib_dispatch.js
M htdocs/fourn/recap-fourn.php
M htdocs/ftp/admin/ftpclient.php
M htdocs/ftp/index.php
M htdocs/holiday/card.php
M htdocs/holiday/list.php
M htdocs/hrm/admin/admin_establishment.php
M htdocs/imports/class/import.class.php
M htdocs/imports/import.php
M htdocs/imports/index.php
M htdocs/install/inc.php
M htdocs/install/mysql/data/llx_c_ecotaxe.sql
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/install/mysql/migration/7.0.0-8.0.0.sql
M htdocs/install/mysql/migration/repair.sql
M htdocs/install/mysql/tables/llx_advtargetemailing.sql
M htdocs/install/mysql/tables/llx_c_ecotaxe.sql
M htdocs/install/mysql/tables/llx_website_page.sql
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/bills.lang
M htdocs/langs/en_US/compta.lang
M htdocs/langs/en_US/install.lang
M htdocs/langs/en_US/other.lang
M htdocs/langs/en_US/paypal.lang
M htdocs/langs/en_US/products.lang
M htdocs/langs/en_US/propal.lang
M htdocs/langs/en_US/stocks.lang
M htdocs/langs/en_US/ticket.lang
M htdocs/langs/en_US/users.lang
M htdocs/langs/fr_FR/mails.lang
M htdocs/langs/fr_FR/other.lang
M htdocs/main.inc.php
M htdocs/modulebuilder/template/myobject_card.php
M htdocs/modulebuilder/template/myobject_list.php
M htdocs/product/canvas/product/actions_card_product.class.php
M htdocs/product/canvas/product/tpl/card_create.tpl.php
M htdocs/product/canvas/product/tpl/card_edit.tpl.php
M htdocs/product/canvas/service/actions_card_service.class.php
M htdocs/product/canvas/service/tpl/card_create.tpl.php
M htdocs/product/canvas/service/tpl/card_edit.tpl.php
M htdocs/product/card.php
M htdocs/product/class/product.class.php
M htdocs/product/composition/card.php
M htdocs/product/index.php
M htdocs/product/inventory/card.php
M htdocs/product/inventory/list.php
M htdocs/product/list.php
M htdocs/product/reassort.php
M htdocs/product/reassortlot.php
M htdocs/product/stock/list.php
M htdocs/product/stock/mouvement.php
M htdocs/product/stock/product.php
M htdocs/product/stock/productlot_list.php
M htdocs/product/traduction.php
M htdocs/projet/class/projectstats.class.php
M htdocs/projet/class/task.class.php
M htdocs/projet/list.php
M htdocs/projet/tasks.php
M htdocs/projet/tasks/list.php
M htdocs/public/payment/newpayment.php
M htdocs/societe/ajax/company.php
M htdocs/societe/class/api_contacts.class.php
M htdocs/societe/class/api_thirdparties.class.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/index.php
M htdocs/societe/list.php
M htdocs/societe/website.php
M htdocs/stripe/config.php
M htdocs/supplier_proposal/card.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
M htdocs/supplier_proposal/list.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
M htdocs/ticket/card.php
M htdocs/ticket/list.php
M htdocs/user/card.php
M htdocs/user/class/user.class.php
M htdocs/user/class/usergroup.class.php
M htdocs/user/group/list.php
M htdocs/user/home.php
M htdocs/user/list.php
M htdocs/website/websiteaccount_card.php
M scripts/cron/cron_run_jobs.php
M scripts/user/sync_groups_ldap2dolibarr.php
Log Message:
-----------
Merge remote-tracking branch 'Dolibarr/develop' into develop
Commit: d8dd658ec18c7404c8240cdc61cd0df1d9ee9d31
https://github.com/Dolibarr/dolibarr/commit/d8dd658ec18c7404c8240cdc61cd0df1d9ee9d31
Author: Inovea Conseil <address@hidden>
Date: 2018-07-05 (Thu, 05 Jul 2018)
Changed paths:
M .travis.yml
M ChangeLog
M htdocs/admin/agenda_extrafields.php
M htdocs/admin/bank_extrafields.php
M htdocs/admin/dict.php
M htdocs/admin/expedition_extrafields.php
M htdocs/admin/expeditiondet_extrafields.php
M htdocs/admin/expensereport_extrafields.php
A htdocs/admin/holiday.php
M htdocs/admin/livraison_extrafields.php
M htdocs/admin/livraisondet_extrafields.php
M htdocs/admin/modules.php
M htdocs/admin/order_extrafields.php
M htdocs/admin/orderdet_extrafields.php
M htdocs/admin/prelevement.php
M htdocs/admin/resource_extrafields.php
M htdocs/admin/supplierinvoice_extrafields.php
M htdocs/admin/supplierinvoicedet_extrafields.php
M htdocs/admin/supplierorder_extrafields.php
M htdocs/admin/supplierorderdet_extrafields.php
M htdocs/admin/workflow.php
M htdocs/asset/card.php
M htdocs/categories/admin/categorie_extrafields.php
M htdocs/comm/admin/propaldet_extrafields.php
M htdocs/comm/propal/card.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/card.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/list.php
M htdocs/compta/facture/admin/facture_cust_extrafields.php
M htdocs/compta/facture/admin/facture_rec_cust_extrafields.php
M htdocs/compta/facture/admin/facturedet_cust_extrafields.php
M htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/contact/list.php
M htdocs/contrat/admin/contract_extrafields.php
M htdocs/contrat/admin/contractdet_extrafields.php
M htdocs/core/class/CMailFile.class.php
M htdocs/core/class/canvas.class.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/extrafields.class.php
M htdocs/core/class/hookmanager.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formcontract.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/class/html.formprojet.class.php
M htdocs/core/class/menubase.class.php
M htdocs/core/lib/fichinter.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/lib/holiday.lib.php
M htdocs/core/lib/modulebuilder.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/lib/security.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
A htdocs/core/modules/holiday/index.html
A htdocs/core/modules/holiday/mod_holiday_immaculate.php
A htdocs/core/modules/holiday/mod_holiday_madonna.php
A htdocs/core/modules/holiday/modules_holiday.php
M htdocs/core/modules/modHoliday.class.php
M htdocs/core/modules/modModuleBuilder.class.php
M htdocs/core/modules/modSupplierProposal.class.php
M htdocs/core/modules/propale/mod_propale_marbre.php
M htdocs/core/modules/propale/mod_propale_saphir.php
M htdocs/core/tpl/advtarget.tpl.php
M htdocs/core/tpl/extrafields_view.tpl.php
M htdocs/core/tpl/notes.tpl.php
M htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
M htdocs/fichinter/admin/fichinter_extrafields.php
M htdocs/fichinter/admin/fichinterdet_extrafields.php
A htdocs/fichinter/card-rec.php
M htdocs/fichinter/card.php
M htdocs/filefunc.inc.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/commande/dispatch.php
M htdocs/hrm/index.php
M htdocs/index.php
M htdocs/install/check.php
M htdocs/install/inc.php
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
A htdocs/install/mysql/migration/8.0.0-9.0.0.sql
M htdocs/install/mysql/tables/llx_c_field_list.sql
M htdocs/install/mysql/tables/llx_extrafields.sql
A htdocs/install/mysql/tables/llx_fichinter_rec.key.sql
A htdocs/install/mysql/tables/llx_fichinter_rec.sql
A htdocs/install/mysql/tables/llx_fichinterdet_rec.sql
M htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
M htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql
M htdocs/install/mysql/tables/llx_user.sql
A htdocs/install/mysql/tables/llx_website_account.key.sql
A htdocs/install/mysql/tables/llx_website_account.sql
M htdocs/install/repair.php
M htdocs/install/step1.php
M htdocs/install/upgrade2.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/bills.lang
M htdocs/langs/en_US/compta.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/modulebuilder.lang
M htdocs/langs/en_US/sendings.lang
M htdocs/langs/en_US/stocks.lang
M htdocs/langs/fr_FR/bills.lang
M htdocs/livraison/card.php
M htdocs/loan/index.php
M htdocs/main.inc.php
M htdocs/margin/admin/margin.php
M htdocs/margin/agentMargins.php
A htdocs/modulebuilder/admin/setup.php
M htdocs/modulebuilder/index.php
M htdocs/modulebuilder/template/core/modules/modMyModule.class.php
M htdocs/modulebuilder/template/myobject_card.php
M htdocs/printing/admin/printing.php
M htdocs/product/admin/product.php
M htdocs/product/admin/product_extrafields.php
M htdocs/product/admin/product_lot_extrafields.php
M htdocs/product/admin/product_tools.php
M htdocs/product/canvas/product/actions_card_product.class.php
M htdocs/product/canvas/product/tpl/card_create.tpl.php
M htdocs/product/canvas/product/tpl/card_edit.tpl.php
M htdocs/product/canvas/product/tpl/card_view.tpl.php
R htdocs/product/canvas/product/tpl/list.tpl.php
M htdocs/product/canvas/service/actions_card_service.class.php
M htdocs/product/canvas/service/tpl/card_create.tpl.php
M htdocs/product/canvas/service/tpl/card_edit.tpl.php
M htdocs/product/canvas/service/tpl/card_view.tpl.php
R htdocs/product/canvas/service/tpl/list.tpl.php
M htdocs/product/card.php
M htdocs/product/composition/card.php
M htdocs/product/fournisseurs.php
M htdocs/product/index.php
M htdocs/product/inventory/card.php
M htdocs/product/list.php
M htdocs/product/stock/massstockmove.php
M htdocs/product/stock/mouvement.php
M htdocs/product/stock/productlot_list.php
M htdocs/projet/activity/perday.php
M htdocs/projet/activity/perweek.php
M htdocs/projet/class/project.class.php
M htdocs/societe/admin/contact_extrafields.php
M htdocs/societe/admin/societe_extrafields.php
M htdocs/societe/card.php
M htdocs/societe/class/api_thirdparties.class.php
M htdocs/societe/class/companybankaccount.class.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/list.php
M htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
M htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
M htdocs/theme/eldy/style.css.php
M htdocs/user/admin/group_extrafields.php
M htdocs/user/admin/user_extrafields.php
M htdocs/user/card.php
M htdocs/user/class/user.class.php
M htdocs/website/websiteaccount_card.php
M test/phpunit/FunctionsLibTest.php
M test/phpunit/SupplierProposalTest.php
Log Message:
-----------
Merge remote-tracking branch 'Dolibarr/develop' into develop
Commit: 30cff2bb369b6ea31a8629d693253e3359bfeab7
https://github.com/Dolibarr/dolibarr/commit/30cff2bb369b6ea31a8629d693253e3359bfeab7
Author: Inovea Conseil <address@hidden>
Date: 2018-07-05 (Thu, 05 Jul 2018)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/user/class/user.class.php
Log Message:
-----------
ADD check user's rights
Commit: 5011f252c12db7e994fa4d9c89399e56cf918f25
https://github.com/Dolibarr/dolibarr/commit/5011f252c12db7e994fa4d9c89399e56cf918f25
Author: Inovea Conseil <address@hidden>
Date: 2018-07-05 (Thu, 05 Jul 2018)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
ADD check user's rights
Commit: 7f137adef96a3a8018ac62dfe56ea35293262a3f
https://github.com/Dolibarr/dolibarr/commit/7f137adef96a3a8018ac62dfe56ea35293262a3f
Author: Inovea Conseil <address@hidden>
Date: 2018-07-06 (Fri, 06 Jul 2018)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
ADD check user's rights
Commit: 387abf2da8b3c5a5c602152198b253fec8ca3c4c
https://github.com/Dolibarr/dolibarr/commit/387abf2da8b3c5a5c602152198b253fec8ca3c4c
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-16 (Mon, 16 Jul 2018)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/user/class/user.class.php
Log Message:
-----------
Merge pull request #9057 from inoveaconseil/checkRightOnLink
ADD Check right on link
Compare:
https://github.com/Dolibarr/dolibarr/compare/ae76e6188535...387abf2da8b3
**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] 6fd5c4: Merge remote-tracking branch 'Dolibarr/develop' in...,
Laurent Destailleur <=