[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 282145: Fix: avoid php warning
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 282145: Fix: avoid php warning |
|
Date: |
Thu, 28 Dec 2017 00:56:45 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 28214598943d0bbb46013fb661448954e5a584d0
https://github.com/Dolibarr/dolibarr/commit/28214598943d0bbb46013fb661448954e5a584d0
Author: Regis Houssin <address@hidden>
Date: 2017-12-20 (Wed, 20 Dec 2017)
Changed paths:
M htdocs/compta/paiement.php
Log Message:
-----------
Fix: avoid php warning
Commit: ae7f8c3fe499bd061ce157cb948314a785508bdb
https://github.com/Dolibarr/dolibarr/commit/ae7f8c3fe499bd061ce157cb948314a785508bdb
Author: arnaud <address@hidden>
Date: 2017-12-21 (Thu, 21 Dec 2017)
Changed paths:
M htdocs/contact/list.php
Log Message:
-----------
FIX search on contact list
Commit: 4ba039d2296d6e09c2f1e15ffa8a9e443231b0fc
https://github.com/Dolibarr/dolibarr/commit/4ba039d2296d6e09c2f1e15ffa8a9e443231b0fc
Author: arnaud <address@hidden>
Date: 2017-12-21 (Thu, 21 Dec 2017)
Changed paths:
M htdocs/contrat/card.php
Log Message:
-----------
FIX trans unactivate on contractline
Commit: b1ce3fc5c806b44512f51b436681a276df540e8c
https://github.com/Dolibarr/dolibarr/commit/b1ce3fc5c806b44512f51b436681a276df540e8c
Author: arnaud <address@hidden>
Date: 2017-12-21 (Thu, 21 Dec 2017)
Changed paths:
M htdocs/langs/fr_FR/other.lang
Log Message:
-----------
FIX stats trad for customerinvoice
Commit: 1c7b99d3dcd08e0a545ae4feeb0d7922047d52a7
https://github.com/Dolibarr/dolibarr/commit/1c7b99d3dcd08e0a545ae4feeb0d7922047d52a7
Author: Ferran Marcet <address@hidden>
Date: 2017-12-26 (Tue, 26 Dec 2017)
Changed paths:
M htdocs/comm/propal/document.php
M htdocs/comm/propal/info.php
M htdocs/comm/propal/note.php
M htdocs/commande/document.php
M htdocs/commande/info.php
M htdocs/commande/note.php
M htdocs/compta/facture/contact.php
M htdocs/compta/facture/document.php
M htdocs/compta/facture/info.php
M htdocs/compta/facture/note.php
M htdocs/compta/facture/prelevement.php
M htdocs/contrat/contact.php
M htdocs/contrat/document.php
M htdocs/contrat/info.php
M htdocs/contrat/note.php
M htdocs/fichinter/document.php
M htdocs/fichinter/info.php
M htdocs/fichinter/note.php
M htdocs/fourn/commande/contact.php
M htdocs/fourn/commande/document.php
M htdocs/fourn/commande/info.php
M htdocs/fourn/commande/note.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/loan/document.php
M htdocs/loan/info.php
M htdocs/loan/note.php
M htdocs/supplier_proposal/document.php
M htdocs/supplier_proposal/info.php
M htdocs/supplier_proposal/note.php
Log Message:
-----------
Fix: Missing include for Project class
Commit: de305cb3b25bc7d6a05cfe87bc566582d49118b7
https://github.com/Dolibarr/dolibarr/commit/de305cb3b25bc7d6a05cfe87bc566582d49118b7
Author: Laurent Destailleur <address@hidden>
Date: 2017-12-28 (Thu, 28 Dec 2017)
Changed paths:
M htdocs/compta/paiement.php
Log Message:
-----------
Merge pull request #7980 from hregis/6.0_bug2
Fix: avoid php warning
Commit: 31b5d9df520b5445dbded68f38669e09e544360c
https://github.com/Dolibarr/dolibarr/commit/31b5d9df520b5445dbded68f38669e09e544360c
Author: Laurent Destailleur <address@hidden>
Date: 2017-12-28 (Thu, 28 Dec 2017)
Changed paths:
M htdocs/contact/list.php
Log Message:
-----------
Merge pull request #7985 from atm-arnaud/FIX_search_contact_list
FIX search on contact list
Commit: 56bc0dbd25c72af448d0484b94c788904e3f7faf
https://github.com/Dolibarr/dolibarr/commit/56bc0dbd25c72af448d0484b94c788904e3f7faf
Author: Laurent Destailleur <address@hidden>
Date: 2017-12-28 (Thu, 28 Dec 2017)
Changed paths:
M htdocs/contrat/card.php
Log Message:
-----------
Merge pull request #7986 from atm-arnaud/FIX_contractline_trans_unactivate
FIX trans unactivate on contractline
Commit: 3d4e6c916947a5febf2ccfca9a8bf6d94c128278
https://github.com/Dolibarr/dolibarr/commit/3d4e6c916947a5febf2ccfca9a8bf6d94c128278
Author: Laurent Destailleur <address@hidden>
Date: 2017-12-28 (Thu, 28 Dec 2017)
Changed paths:
M htdocs/langs/fr_FR/other.lang
Log Message:
-----------
Merge pull request #7987 from atm-arnaud/FIX_trans_product_stats
FIX stats trad for customerinvoice
Commit: 3ac413084f30a13c09890989ece2ea017934d66b
https://github.com/Dolibarr/dolibarr/commit/3ac413084f30a13c09890989ece2ea017934d66b
Author: Laurent Destailleur <address@hidden>
Date: 2017-12-28 (Thu, 28 Dec 2017)
Changed paths:
M ChangeLog
M build/generate_filelist_xml.php
M build/makepack-dolibarr.pl
M dev/dolibarr_changes.txt
M htdocs/accountancy/tpl/export_journal.tpl.php
M htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
M htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
M htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
M htdocs/adherents/subscription/info.php
M htdocs/adherents/tpl/linkedobjectblock.tpl.php
M htdocs/admin/system/filecheck.php
M htdocs/cashdesk/tpl/facturation1.tpl.php
M htdocs/cashdesk/tpl/liste_articles.tpl.php
M htdocs/cashdesk/tpl/menu.tpl.php
M htdocs/cashdesk/tpl/ticket.tpl.php
M htdocs/cashdesk/tpl/validation1.tpl.php
M htdocs/cashdesk/tpl/validation2.tpl.php
M htdocs/comm/multiprix.php
M htdocs/comm/propal/card.php
M htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
M htdocs/commande/card.php
M htdocs/commande/tpl/linkedobjectblock.tpl.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/document.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/paiement.php
M htdocs/compta/paiement/cheque/card.php
M htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
M htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
M htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
M htdocs/contact/list.php
M htdocs/contrat/card.php
M htdocs/contrat/tpl/linkedobjectblock.tpl.php
M htdocs/core/actions_builddoc.inc.php
M htdocs/core/actions_sendmails.inc.php
M htdocs/core/ajax/saveinplace.php
M htdocs/core/class/conf.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/js/editinplace.js
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/security.lib.php
M htdocs/core/modules/mailings/fraise.modules.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/ajax/fileupload_main.tpl.php
M htdocs/core/tpl/ajax/fileupload_view.tpl.php
M htdocs/core/tpl/ajaxrow.tpl.php
M htdocs/core/tpl/bloc_showhide.tpl.php
M htdocs/core/tpl/contacts.tpl.php
M htdocs/core/tpl/document_actions_post_headers.tpl.php
M htdocs/core/tpl/extrafields_view.tpl.php
M htdocs/core/tpl/login.tpl.php
M htdocs/core/tpl/notes.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/core/tpl/originproductline.tpl.php
M htdocs/core/tpl/passwordforgotten.tpl.php
M htdocs/core/tpl/resource_add.tpl.php
M htdocs/core/tpl/resource_view.tpl.php
M htdocs/don/index.php
M htdocs/don/list.php
M htdocs/ecm/tpl/enablefiletreeajax.tpl.php
M htdocs/expedition/card.php
M htdocs/expedition/list.php
M htdocs/expedition/tpl/linkedobjectblock.tpl.php
M htdocs/expensereport/tpl/linkedobjectblock.tpl.php
M htdocs/fichinter/tpl/linkedobjectblock.tpl.php
M htdocs/filefunc.inc.php
M htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/index.php
M htdocs/holiday/class/holiday.class.php
M htdocs/includes/jquery/plugins/jeditable/jquery.jeditable.js
M htdocs/includes/parsedown/Parsedown.php
M htdocs/index.php
M htdocs/langs/fr_FR/other.lang
M htdocs/loan/card.php
M htdocs/loan/class/loan.class.php
M htdocs/main.inc.php
M htdocs/modulebuilder/template/core/tpl/mytemplate.tpl.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
M htdocs/product/canvas/product/tpl/list.tpl.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
M htdocs/product/canvas/service/tpl/list.tpl.php
M htdocs/product/class/product.class.php
M htdocs/product/inventory/tpl/inventory.tpl.php
M htdocs/product/stock/replenishorders.php
M htdocs/product/stock/tpl/stockcorrection.tpl.php
M htdocs/product/stock/tpl/stocktransfer.tpl.php
M htdocs/projet/activity/perday.php
M htdocs/projet/tasks/time.php
M htdocs/societe/canvas/company/tpl/card_create.tpl.php
M htdocs/societe/canvas/company/tpl/card_edit.tpl.php
M htdocs/societe/canvas/company/tpl/card_view.tpl.php
M htdocs/societe/canvas/individual/tpl/card_create.tpl.php
M htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
M htdocs/societe/canvas/individual/tpl/card_view.tpl.php
M htdocs/societe/list.php
M htdocs/societe/tpl/linesalesrepresentative.tpl.php
M htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
M htdocs/user/card.php
M htdocs/user/class/api_users.class.php
M htdocs/webservices/server_supplier_invoice.php
Log Message:
-----------
Merge branch '6.0' into 6.0
Commit: 70e75753f89d90a1a78e9fd8f7739c6f38b8b381
https://github.com/Dolibarr/dolibarr/commit/70e75753f89d90a1a78e9fd8f7739c6f38b8b381
Author: Laurent Destailleur <address@hidden>
Date: 2017-12-28 (Thu, 28 Dec 2017)
Changed paths:
M htdocs/comm/propal/document.php
M htdocs/comm/propal/info.php
M htdocs/comm/propal/note.php
M htdocs/commande/document.php
M htdocs/commande/info.php
M htdocs/commande/note.php
M htdocs/compta/facture/contact.php
M htdocs/compta/facture/document.php
M htdocs/compta/facture/info.php
M htdocs/compta/facture/note.php
M htdocs/compta/facture/prelevement.php
M htdocs/contrat/contact.php
M htdocs/contrat/document.php
M htdocs/contrat/info.php
M htdocs/contrat/note.php
M htdocs/fichinter/document.php
M htdocs/fichinter/info.php
M htdocs/fichinter/note.php
M htdocs/fourn/commande/contact.php
M htdocs/fourn/commande/document.php
M htdocs/fourn/commande/info.php
M htdocs/fourn/commande/note.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/loan/document.php
M htdocs/loan/info.php
M htdocs/loan/note.php
M htdocs/supplier_proposal/document.php
M htdocs/supplier_proposal/info.php
M htdocs/supplier_proposal/note.php
Log Message:
-----------
Merge pull request #7994 from fmarcet/6.0
Fix: Missing include for Project class
Commit: bbcf70cf4ea200830bda74f2294875a49cbd0bba
https://github.com/Dolibarr/dolibarr/commit/bbcf70cf4ea200830bda74f2294875a49cbd0bba
Author: Laurent Destailleur <address@hidden>
Date: 2017-12-28 (Thu, 28 Dec 2017)
Changed paths:
M htdocs/compta/facture/document.php
Log Message:
-----------
Remove spaces
Commit: 6676178435b1c6fe46c0330b20ab8eda133021b5
https://github.com/Dolibarr/dolibarr/commit/6676178435b1c6fe46c0330b20ab8eda133021b5
Author: Laurent Destailleur <address@hidden>
Date: 2017-12-28 (Thu, 28 Dec 2017)
Changed paths:
M htdocs/comm/propal/document.php
M htdocs/comm/propal/info.php
M htdocs/comm/propal/note.php
M htdocs/commande/document.php
M htdocs/commande/info.php
M htdocs/commande/note.php
M htdocs/compta/facture/contact.php
M htdocs/compta/facture/document.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/contact/list.php
M htdocs/contrat/card.php
M htdocs/contrat/contact.php
M htdocs/contrat/document.php
M htdocs/contrat/info.php
M htdocs/contrat/note.php
M htdocs/fichinter/document.php
M htdocs/fichinter/info.php
M htdocs/fichinter/note.php
M htdocs/fourn/commande/contact.php
M htdocs/fourn/commande/document.php
M htdocs/fourn/commande/info.php
M htdocs/fourn/commande/note.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/langs/fr_FR/other.lang
M htdocs/loan/document.php
M htdocs/loan/info.php
M htdocs/loan/note.php
M htdocs/supplier_proposal/document.php
M htdocs/supplier_proposal/info.php
M htdocs/supplier_proposal/note.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/contact/list.php
htdocs/contrat/card.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/836a94fab207...6676178435b1