[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 8a0947: Fix: civility_id is not an in
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 8a0947: Fix: civility_id is not an integer ! |
|
Date: |
Fri, 06 Oct 2017 04:09:30 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 8a09472def1ad1a5dd5ed1ea15275c95a7fa500a
https://github.com/Dolibarr/dolibarr/commit/8a09472def1ad1a5dd5ed1ea15275c95a7fa500a
Author: Regis Houssin <address@hidden>
Date: 2017-09-28 (Thu, 28 Sep 2017)
Changed paths:
M htdocs/adherents/class/adherent.class.php
Log Message:
-----------
Fix: civility_id is not an integer !
Commit: f58fb6b6f6a8e91912ecca669ac85a106cadb87d
https://github.com/Dolibarr/dolibarr/commit/f58fb6b6f6a8e91912ecca669ac85a106cadb87d
Author: Regis Houssin <address@hidden>
Date: 2017-09-28 (Thu, 28 Sep 2017)
Changed paths:
M htdocs/adherents/class/adherent.class.php
Log Message:
-----------
Fix: syntax error
Commit: 660c5dd03d437ff793713df6c1f87b67d0ad22e5
https://github.com/Dolibarr/dolibarr/commit/660c5dd03d437ff793713df6c1f87b67d0ad22e5
Author: Regis Houssin <address@hidden>
Date: 2017-09-28 (Thu, 28 Sep 2017)
Changed paths:
M htdocs/adherents/class/adherent.class.php
M htdocs/admin/ldap_members.php
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Fix: avoid ldap error when firstname and lastname is empty
Commit: 35b290a7dfff248ae1d4783362c491b69dbeda18
https://github.com/Dolibarr/dolibarr/commit/35b290a7dfff248ae1d4783362c491b69dbeda18
Author: Regis Houssin <address@hidden>
Date: 2017-09-28 (Thu, 28 Sep 2017)
Changed paths:
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Fix: Trad already exists
Commit: 76c89aed9bc5cafceecf9bd67537f48752e0b2a5
https://github.com/Dolibarr/dolibarr/commit/76c89aed9bc5cafceecf9bd67537f48752e0b2a5
Author: Regis Houssin <address@hidden>
Date: 2017-09-28 (Thu, 28 Sep 2017)
Changed paths:
M htdocs/adherents/class/adherent.class.php
Log Message:
-----------
Fix: add lastname
Commit: 7e7dd6c126c01e76c4bd6c3c20bbcdfab5a8ca0f
https://github.com/Dolibarr/dolibarr/commit/7e7dd6c126c01e76c4bd6c3c20bbcdfab5a8ca0f
Author: Regis Houssin <address@hidden>
Date: 2017-09-29 (Fri, 29 Sep 2017)
Changed paths:
M htdocs/adherents/list.php
M htdocs/comm/propal/card.php
M htdocs/comm/propal/list.php
M htdocs/commande/list.php
M htdocs/compta/bank/bankentries.php
M htdocs/compta/bank/index.php
M htdocs/compta/facture/invoicetemplate_list.php
M htdocs/compta/facture/list.php
M htdocs/contact/list.php
M htdocs/contrat/list.php
M htdocs/contrat/services.php
M htdocs/core/actions_extrafields.inc.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/tpl/admin_extrafields_add.tpl.php
M htdocs/core/tpl/admin_extrafields_edit.tpl.php
M htdocs/core/tpl/admin_extrafields_view.tpl.php
M htdocs/core/tpl/document_actions_post_headers.tpl.php
A htdocs/core/tpl/extrafields_add.tpl.php
A htdocs/core/tpl/extrafields_edit.tpl.php
M htdocs/expedition/list.php
M htdocs/expensereport/list.php
M htdocs/fichinter/list.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/facture/list.php
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/install/mysql/tables/llx_extrafields.sql
M htdocs/modulebuilder/template/class/myobject.class.php
M htdocs/modulebuilder/template/lib/myobject.lib.php
M htdocs/modulebuilder/template/myobject_card.php
M htdocs/modulebuilder/template/myobject_document.php
M htdocs/modulebuilder/template/myobject_list.php
M htdocs/product/inventory/list.php
M htdocs/product/list.php
M htdocs/product/stock/productlot_list.php
M htdocs/projet/list.php
M htdocs/projet/tasks/list.php
M htdocs/projet/tasks/time.php
M htdocs/societe/list.php
M htdocs/supplier_proposal/list.php
M htdocs/user/index.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_ldap
Commit: ffc4f5021af5855283b84a636e3c85c5841a0bbb
https://github.com/Dolibarr/dolibarr/commit/ffc4f5021af5855283b84a636e3c85c5841a0bbb
Author: Regis Houssin <address@hidden>
Date: 2017-09-29 (Fri, 29 Sep 2017)
Changed paths:
M htdocs/adherents/admin/adherent.php
Log Message:
-----------
Fix: wrong contante value
Commit: 7134884a08e724948bc080423f785b37b94634a7
https://github.com/Dolibarr/dolibarr/commit/7134884a08e724948bc080423f785b37b94634a7
Author: Regis Houssin <address@hidden>
Date: 2017-09-29 (Fri, 29 Sep 2017)
Changed paths:
M htdocs/adherents/admin/adherent.php
Log Message:
-----------
Revert "Fix: wrong contante value"
This reverts commit ffc4f5021af5855283b84a636e3c85c5841a0bbb.
Commit: df1603de6db16143d315207936379546f6b26cca
https://github.com/Dolibarr/dolibarr/commit/df1603de6db16143d315207936379546f6b26cca
Author: Regis Houssin <address@hidden>
Date: 2017-09-30 (Sat, 30 Sep 2017)
Changed paths:
M htdocs/comm/action/card.php
M htdocs/comm/action/document.php
M htdocs/comm/action/info.php
M htdocs/core/class/html.form.class.php
M htdocs/core/tpl/notes.tpl.php
M htdocs/resource/element_resource.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_ldap
Commit: 46cc23c568115152c02895036b037175b1c7c023
https://github.com/Dolibarr/dolibarr/commit/46cc23c568115152c02895036b037175b1c7c023
Author: Regis Houssin <address@hidden>
Date: 2017-09-30 (Sat, 30 Sep 2017)
Changed paths:
M htdocs/adherents/class/adherent.class.php
M htdocs/core/lib/security.lib.php
M htdocs/user/class/user.class.php
Log Message:
-----------
Fix: $this->pass is empty if DATABASE_PWD_ENCRYPTED is used
Commit: cb9d627f025d17c866ec1d6a34ae604fdb999284
https://github.com/Dolibarr/dolibarr/commit/cb9d627f025d17c866ec1d6a34ae604fdb999284
Author: Regis Houssin <address@hidden>
Date: 2017-09-30 (Sat, 30 Sep 2017)
Changed paths:
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/ldap.php
M htdocs/admin/ldap_users.php
M htdocs/user/class/user.class.php
M htdocs/user/ldap.php
Log Message:
-----------
Fix: Set LDAP password when LDAP key changed
Commit: c1b6f59c1bf1370258acb82ab92d93c18ccf8796
https://github.com/Dolibarr/dolibarr/commit/c1b6f59c1bf1370258acb82ab92d93c18ccf8796
Author: Regis Houssin <address@hidden>
Date: 2017-10-02 (Mon, 02 Oct 2017)
Changed paths:
M htdocs/admin/ldap_users.php
M htdocs/core/class/ldap.class.php
M htdocs/user/class/user.class.php
Log Message:
-----------
Fix: restore possible ldap keys
Commit: 475c881e676612a554a587ca16dc5807257b45d4
https://github.com/Dolibarr/dolibarr/commit/475c881e676612a554a587ca16dc5807257b45d4
Author: Regis Houssin <address@hidden>
Date: 2017-10-02 (Mon, 02 Oct 2017)
Changed paths:
M htdocs/admin/ldap_users.php
M htdocs/user/class/user.class.php
Log Message:
-----------
Fix: add missing ldap fields
Commit: 8d3ad9ddc869bdabf5026c5ed33e6fd4140ad0a2
https://github.com/Dolibarr/dolibarr/commit/8d3ad9ddc869bdabf5026c5ed33e6fd4140ad0a2
Author: Regis Houssin <address@hidden>
Date: 2017-10-04 (Wed, 04 Oct 2017)
Changed paths:
M .travis.yml
M ChangeLog
M dev/initdata/import-thirdparties.php
A dev/resources/iso-normes/code_nace.txt
M htdocs/adherents/agenda.php
M htdocs/adherents/card.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/document.php
M htdocs/adherents/ldap.php
M htdocs/adherents/note.php
M htdocs/adherents/subscription.php
M htdocs/adherents/type.php
M htdocs/adherents/type_ldap.php
M htdocs/admin/agenda.php
M htdocs/admin/defaultvalues.php
M htdocs/admin/delais.php
M htdocs/admin/dict.php
M htdocs/admin/security_file.php
M htdocs/api/class/api.class.php
M htdocs/api/class/api_dictionary.class.php
M htdocs/api/class/api_documents.class.php
M htdocs/cashdesk/validation_verif.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/card.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/annuel.php
R htdocs/compta/bank/bankentries.php
A htdocs/compta/bank/bankentries_list.php
M htdocs/compta/bank/budget.php
M htdocs/compta/bank/card.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/bank/document.php
M htdocs/compta/bank/graph.php
R htdocs/compta/bank/index.php
M htdocs/compta/bank/info.php
M htdocs/compta/bank/ligne.php
A htdocs/compta/bank/list.php
M htdocs/compta/bank/releve.php
M htdocs/compta/bank/treso.php
M htdocs/compta/bank/various_payment/index.php
M htdocs/compta/charges/index.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/class/paymentterm.class.php
M htdocs/compta/facture/contact.php
M htdocs/compta/facture/document.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/compta/facture/info.php
M htdocs/compta/facture/note.php
M htdocs/compta/facture/prelevement.php
M htdocs/compta/paiement.php
M htdocs/compta/paiement/avalider.php
M htdocs/compta/paiement/cheque/class/remisecheque.class.php
M htdocs/compta/paiement/cheque/list.php
M htdocs/compta/paiement/class/paiement.class.php
M htdocs/compta/paiement/list.php
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/resultat/index.php
M htdocs/compta/salaries/card.php
M htdocs/compta/salaries/index.php
M htdocs/compta/sociales/card.php
M htdocs/compta/sociales/class/chargesociales.class.php
M htdocs/compta/sociales/class/paymentsocialcontribution.class.php
M htdocs/compta/sociales/payments.php
M htdocs/compta/tva/reglement.php
M htdocs/contact/agenda.php
M htdocs/contact/card.php
M htdocs/contact/class/contact.class.php
M htdocs/contact/document.php
M htdocs/contact/info.php
M htdocs/contact/ldap.php
M htdocs/contact/note.php
M htdocs/contact/perso.php
M htdocs/contrat/card.php
M htdocs/contrat/class/contrat.class.php
M htdocs/contrat/contact.php
M htdocs/contrat/document.php
M htdocs/contrat/info.php
M htdocs/contrat/list.php
M htdocs/contrat/note.php
M htdocs/core/actions_linkedfiles.inc.php
M htdocs/core/class/antivir.class.php
M htdocs/core/class/commondocgenerator.class.php
M htdocs/core/class/commoninvoice.class.php
M htdocs/core/class/commonobject.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/translate.class.php
M htdocs/core/js/lib_head.js.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/geturl.lib.php
M htdocs/core/lib/security.lib.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/auguria.lib.php
M htdocs/core/menus/standard/auguria_menu.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/menus/standard/eldy_menu.php
M htdocs/core/menus/standard/empty.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/modFacture.class.php
M htdocs/core/modules/modSalaries.class.php
M htdocs/core/modules/modSociete.class.php
M htdocs/core/modules/rapport/pdf_paiement.class.php
M htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/photos_resize.php
M htdocs/don/card.php
M htdocs/don/class/don.class.php
M htdocs/don/class/paymentdonation.class.php
M htdocs/expedition/card.php
M htdocs/expedition/class/expedition.class.php
M htdocs/expedition/contact.php
M htdocs/expedition/list.php
M htdocs/expedition/note.php
M htdocs/expedition/shipment.php
M htdocs/expensereport/card.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/expensereport/class/paymentexpensereport.class.php
M htdocs/expensereport/document.php
M htdocs/expensereport/info.php
M htdocs/expensereport/note.php
M htdocs/fichinter/card.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fichinter/contact.php
M htdocs/fichinter/document.php
M htdocs/fichinter/info.php
M htdocs/fichinter/note.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/fourn/commande/card.php
M htdocs/fourn/facture/card.php
M htdocs/fourn/facture/contact.php
M htdocs/fourn/facture/document.php
M htdocs/fourn/facture/info.php
M htdocs/fourn/facture/note.php
M htdocs/fourn/facture/paiement.php
M htdocs/holiday/card.php
M htdocs/holiday/class/holiday.class.php
M htdocs/holiday/define_holiday.php
M htdocs/holiday/document.php
M htdocs/holiday/list.php
M htdocs/imports/import.php
M htdocs/index.php
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/install/mysql/tables/llx_c_paiement.key.sql
M htdocs/install/mysql/tables/llx_c_paiement.sql
A htdocs/install/mysql/tables/llx_c_payment_term.key.sql
M htdocs/install/mysql/tables/llx_c_payment_term.sql
M htdocs/install/mysql/tables/llx_holiday.sql
A htdocs/install/mysql/tables/llx_holiday_users.key.sql
M htdocs/install/mysql/tables/llx_holiday_users.sql
M htdocs/install/mysql/tables/llx_website_page.sql
M htdocs/install/upgrade2.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/modulebuilder.lang
M htdocs/langs/en_US/website.lang
M htdocs/livraison/card.php
M htdocs/livraison/class/livraison.class.php
M htdocs/loan/card.php
M htdocs/loan/class/loanschedule.class.php
M htdocs/loan/class/paymentloan.class.php
M htdocs/margin/tabs/productMargins.php
M htdocs/margin/tabs/thirdpartyMargins.php
M htdocs/modulebuilder/index.php
M htdocs/modulebuilder/template/README.md
M htdocs/modulebuilder/template/class/myobject.class.php
M htdocs/modulebuilder/template/myobject_card.php
M htdocs/product/card.php
M htdocs/product/class/product.class.php
M htdocs/product/composition/card.php
M htdocs/product/document.php
M htdocs/product/fournisseurs.php
M htdocs/product/info.php
M htdocs/product/note.php
M htdocs/product/price.php
M htdocs/product/stats/card.php
M htdocs/product/stats/commande.php
M htdocs/product/stats/commande_fournisseur.php
M htdocs/product/stats/contrat.php
M htdocs/product/stats/facture.php
M htdocs/product/stats/facture_fournisseur.php
M htdocs/product/stats/propal.php
M htdocs/product/stats/supplier_proposal.php
M htdocs/product/stock/product.php
M htdocs/product/traduction.php
M htdocs/projet/class/task.class.php
M htdocs/societe/card.php
M htdocs/supplier_proposal/card.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
M htdocs/supplier_proposal/document.php
M htdocs/supplier_proposal/info.php
M htdocs/supplier_proposal/note.php
M htdocs/user/class/user.class.php
M htdocs/websites/class/websitepage.class.php
M htdocs/websites/index.php
M test/phpunit/FactureTest.php
M test/phpunit/NumberingModulesTest.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_ldap
Commit: feea6246c2b31194584149c485637f8ec8a6d2fb
https://github.com/Dolibarr/dolibarr/commit/feea6246c2b31194584149c485637f8ec8a6d2fb
Author: Regis Houssin <address@hidden>
Date: 2017-10-04 (Wed, 04 Oct 2017)
Changed paths:
M htdocs/core/lib/contact.lib.php
M htdocs/core/lib/member.lib.php
M htdocs/core/lib/usergroups.lib.php
M htdocs/user/card.php
M htdocs/user/group/card.php
M htdocs/user/index.php
Log Message:
-----------
NEW add possibility to hide LDAP tab for non admin
Commit: 59bf61f9b31e4fe4ae6257a6693cae3e0f5554ce
https://github.com/Dolibarr/dolibarr/commit/59bf61f9b31e4fe4ae6257a6693cae3e0f5554ce
Author: Regis Houssin <address@hidden>
Date: 2017-10-04 (Wed, 04 Oct 2017)
Changed paths:
M htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
Log Message:
-----------
NEW add possibility to disabled the LDAP trigger
Commit: 723bc4d4361e7217f00bc3358bf6beb61b9d9ba0
https://github.com/Dolibarr/dolibarr/commit/723bc4d4361e7217f00bc3358bf6beb61b9d9ba0
Author: Regis Houssin <address@hidden>
Date: 2017-10-04 (Wed, 04 Oct 2017)
Changed paths:
M htdocs/adherents/class/adherent.class.php
M htdocs/core/class/ldap.class.php
M htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
M htdocs/user/class/user.class.php
Log Message:
-----------
NEW add ldap_rename for avoid password if ldap key changed
Commit: 66ad30feb014b369e00fc0504494c598aad3202e
https://github.com/Dolibarr/dolibarr/commit/66ad30feb014b369e00fc0504494c598aad3202e
Author: Regis Houssin <address@hidden>
Date: 2017-10-04 (Wed, 04 Oct 2017)
Changed paths:
M htdocs/adherents/class/api_members.class.php
M htdocs/categories/class/api_categories.class.php
M htdocs/categories/class/categorie.class.php
M htdocs/categories/viewcat.php
A htdocs/core/actions_comments.inc.php
A htdocs/core/class/comment.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/lib/project.lib.php
A htdocs/core/tpl/bloc_comment.tpl.php
M htdocs/holiday/list.php
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/projects.lang
M htdocs/langs/fr_FR/main.lang
M htdocs/langs/fr_FR/projects.lang
M htdocs/product/class/api_products.class.php
M htdocs/projet/admin/project.php
M htdocs/projet/class/project.class.php
M htdocs/projet/class/task.class.php
A htdocs/projet/comment.php
M htdocs/projet/tasks/comment.php
M htdocs/societe/class/api_contacts.class.php
M htdocs/societe/class/api_thirdparties.class.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_ldap
Commit: a124f47dcd8816695fe570b169ff86df9c6844ab
https://github.com/Dolibarr/dolibarr/commit/a124f47dcd8816695fe570b169ff86df9c6844ab
Author: Regis Houssin <address@hidden>
Date: 2017-10-04 (Wed, 04 Oct 2017)
Changed paths:
M htdocs/categories/class/categorie.class.php
M htdocs/core/class/comment.class.php
M htdocs/core/class/ldap.class.php
Log Message:
-----------
Fix: PHPCS
Commit: fd2188a8c719ebf3a5d41dc6d290d0b38b9f76b5
https://github.com/Dolibarr/dolibarr/commit/fd2188a8c719ebf3a5d41dc6d290d0b38b9f76b5
Author: Regis Houssin <address@hidden>
Date: 2017-10-04 (Wed, 04 Oct 2017)
Changed paths:
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
Log Message:
-----------
Fix: remove back quote
Commit: a259057dd3e626c76a1b49d19a4ef172e9697eb5
https://github.com/Dolibarr/dolibarr/commit/a259057dd3e626c76a1b49d19a4ef172e9697eb5
Author: Regis Houssin <address@hidden>
Date: 2017-10-04 (Wed, 04 Oct 2017)
Changed paths:
M htdocs/core/class/comment.class.php
Log Message:
-----------
Fix: Found non escaped string
Commit: 537fc63da5ec9cb9510676791ed15cd16a6596d3
https://github.com/Dolibarr/dolibarr/commit/537fc63da5ec9cb9510676791ed15cd16a6596d3
Author: Regis Houssin <address@hidden>
Date: 2017-10-04 (Wed, 04 Oct 2017)
Changed paths:
M htdocs/core/class/comment.class.php
Log Message:
-----------
Fix: add by error
Commit: c563c3d3acb7db5408999d9d33000412ee09d398
https://github.com/Dolibarr/dolibarr/commit/c563c3d3acb7db5408999d9d33000412ee09d398
Author: Regis Houssin <address@hidden>
Date: 2017-10-04 (Wed, 04 Oct 2017)
Changed paths:
M htdocs/adherents/agenda.php
M htdocs/adherents/card.php
M htdocs/comm/action/listactions.php
M htdocs/comm/action/rapport/index.php
M htdocs/contact/agenda.php
M htdocs/core/actions_comments.inc.php
M htdocs/core/class/html.formactions.class.php
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/project.lib.php
M htdocs/core/tpl/bloc_comment.tpl.php
M htdocs/langs/en_US/agenda.lang
M htdocs/langs/en_US/main.lang
M htdocs/projet/card.php
M htdocs/projet/class/project.class.php
M htdocs/projet/info.php
M htdocs/projet/tasks.php
M htdocs/societe/agenda.php
M htdocs/societe/card.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_ldap
Commit: 8a791987698a33c57b3666199ecd7c421152cbf4
https://github.com/Dolibarr/dolibarr/commit/8a791987698a33c57b3666199ecd7c421152cbf4
Author: Regis Houssin <address@hidden>
Date: 2017-10-04 (Wed, 04 Oct 2017)
Changed paths:
M htdocs/accountancy/class/accountancyexport.class.php
M htdocs/api/class/api.class.php
M htdocs/comm/propal/class/api_proposals.class.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/list.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/actions_builddoc.inc.php
M htdocs/core/class/comment.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/fichinter/card.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/commande/list.php
M htdocs/langs/en_US/admin.lang
M htdocs/product/stock/replenish.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_ldap
Conflicts:
htdocs/core/class/comment.class.php
Commit: 6adae89c477fd130bf9832ec4fb9995ab50d29f1
https://github.com/Dolibarr/dolibarr/commit/6adae89c477fd130bf9832ec4fb9995ab50d29f1
Author: Regis Houssin <address@hidden>
Date: 2017-10-05 (Thu, 05 Oct 2017)
Changed paths:
M htdocs/accountancy/bookkeeping/card.php
M htdocs/accountancy/bookkeeping/list.php
M htdocs/accountancy/bookkeeping/thirdparty_lettrage.php
M htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php
M htdocs/accountancy/customer/index.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/api/class/api_documents.class.php
M htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
M htdocs/document.php
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/langs/en_US/accountancy.lang
M htdocs/langs/en_US/modulebuilder.lang
M htdocs/modulebuilder/index.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_ldap
Conflicts:
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
Commit: 4bc7eb0ec194bc5747fa21b6fb3e01b7db8c42fc
https://github.com/Dolibarr/dolibarr/commit/4bc7eb0ec194bc5747fa21b6fb3e01b7db8c42fc
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-06 (Fri, 06 Oct 2017)
Changed paths:
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/ldap.php
M htdocs/admin/ldap_members.php
M htdocs/admin/ldap_users.php
M htdocs/core/class/comment.class.php
M htdocs/core/class/ldap.class.php
M htdocs/core/lib/contact.lib.php
M htdocs/core/lib/member.lib.php
M htdocs/core/lib/security.lib.php
M htdocs/core/lib/usergroups.lib.php
M htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
M htdocs/user/card.php
M htdocs/user/class/user.class.php
M htdocs/user/group/card.php
M htdocs/user/index.php
M htdocs/user/ldap.php
Log Message:
-----------
Merge pull request #7520 from hregis/develop_ldap
Fix: Set LDAP password when LDAP key changed
Compare:
https://github.com/Dolibarr/dolibarr/compare/ad12aff31db9...4bc7eb0ec194
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] 8a0947: Fix: civility_id is not an integer !,
Laurent Destailleur <=