[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 4f13a4: fix #8521
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 4f13a4: fix #8521 |
Date: |
Thu, 12 Apr 2018 04:31:55 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 4f13a4f45bc38c14d8e2b7ed4a7a917fc8c80669
https://github.com/Dolibarr/dolibarr/commit/4f13a4f45bc38c14d8e2b7ed4a7a917fc8c80669
Author: atm-greg <address@hidden>
Date: 2018-04-10 (Tue, 10 Apr 2018)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
fix #8521
Commit: 84f80795c363033e740011b656c157028206b940
https://github.com/Dolibarr/dolibarr/commit/84f80795c363033e740011b656c157028206b940
Author: florian HENRY <address@hidden>
Date: 2018-04-10 (Tue, 10 Apr 2018)
Changed paths:
M htdocs/expensereport/class/expensereport.class.php
Log Message:
-----------
fix #8474
Commit: 848d76ee78632fc1a642a2293457e99d83433713
https://github.com/Dolibarr/dolibarr/commit/848d76ee78632fc1a642a2293457e99d83433713
Author: atm-arnaud <address@hidden>
Date: 2018-04-10 (Tue, 10 Apr 2018)
Changed paths:
M htdocs/compta/bank/card.php
Log Message:
-----------
FIX #8023
Commit: 26e9f108334e8cb359cca5bcc9e751c73846ec1a
https://github.com/Dolibarr/dolibarr/commit/26e9f108334e8cb359cca5bcc9e751c73846ec1a
Author: atm-arnaud <address@hidden>
Date: 2018-04-10 (Tue, 10 Apr 2018)
Changed paths:
M htdocs/langs/de_DE/admin.lang
Log Message:
-----------
FIX #8389
Commit: 5621d1f8ea3bba85e842ee7aa10f872855f3616a
https://github.com/Dolibarr/dolibarr/commit/5621d1f8ea3bba85e842ee7aa10f872855f3616a
Author: gauthier <address@hidden>
Date: 2018-04-10 (Tue, 10 Apr 2018)
Changed paths:
M htdocs/core/tpl/admin_extrafields_view.tpl.php
Log Message:
-----------
FIX #8478 !empty instead of count to avoid warning
Commit: 1fd5dba118c42875cc84efd00515aa8dde11dc5e
https://github.com/Dolibarr/dolibarr/commit/1fd5dba118c42875cc84efd00515aa8dde11dc5e
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-04-10 (Tue, 10 Apr 2018)
Changed paths:
M htdocs/core/class/commondocgenerator.class.php
Log Message:
-----------
FIX: payment term doc-specific label was not used
Commit: cc832bd9724273959161c79c713c63f617470b46
https://github.com/Dolibarr/dolibarr/commit/cc832bd9724273959161c79c713c63f617470b46
Author: atm-quentin <address@hidden>
Date: 2018-04-10 (Tue, 10 Apr 2018)
Changed paths:
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
Log Message:
-----------
FIX Issue #8455
Commit: 47d5b1f6fdb16c7ea6a50c5f7b0e937b08765c3c
https://github.com/Dolibarr/dolibarr/commit/47d5b1f6fdb16c7ea6a50c5f7b0e937b08765c3c
Author: ATM-Nicolas <address@hidden>
Date: 2018-04-10 (Tue, 10 Apr 2018)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
FIX : update wrong datetime extrafield
Commit: cffe1e977166bb2ab831a24c6668973fd0256bc5
https://github.com/Dolibarr/dolibarr/commit/cffe1e977166bb2ab831a24c6668973fd0256bc5
Author: ATM-Nicolas <address@hidden>
Date: 2018-04-10 (Tue, 10 Apr 2018)
Changed paths:
M htdocs/fourn/commande/card.php
Log Message:
-----------
FIX : Multiple creation of same event
Commit: 96e26100f03bf91ed2338b66b0c456251754256b
https://github.com/Dolibarr/dolibarr/commit/96e26100f03bf91ed2338b66b0c456251754256b
Author: John <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
Add extrafield entity query filter
Commit: c966cdbd476cfc4ed29a158d52431a1180d5e5cc
https://github.com/Dolibarr/dolibarr/commit/c966cdbd476cfc4ed29a158d52431a1180d5e5cc
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
FIX: selectForFormsList: entity checked even is object not multi-entity
managed
Commit: 2f75bfcd83c4f93480f0611142b8b8c16de2c34a
https://github.com/Dolibarr/dolibarr/commit/2f75bfcd83c4f93480f0611142b8b8c16de2c34a
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/core/lib/modulebuilder.lib.php
Log Message:
-----------
FIX: modulebuilder: could not create html fields
Commit: bbc12cf06b8f2cfc58b89462b69c6686a434b0d9
https://github.com/Dolibarr/dolibarr/commit/bbc12cf06b8f2cfc58b89462b69c6686a434b0d9
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/core/actions_addupdatedelete.inc.php
Log Message:
-----------
FIX: default addupdatedelete actions: uniformize add/update value checks
Commit: fa8cf982492f6096c853b620d65a11b854c5b0f6
https://github.com/Dolibarr/dolibarr/commit/fa8cf982492f6096c853b620d65a11b854c5b0f6
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/core/actions_addupdatedelete.inc.php
M htdocs/core/lib/modulebuilder.lib.php
Log Message:
-----------
FIX: modulebuilder: handle 'price' fieldtype
Commit: ab43d9d675dd19d68afd4961834e54819e52adf8
https://github.com/Dolibarr/dolibarr/commit/ab43d9d675dd19d68afd4961834e54819e52adf8
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/core/class/commondocgenerator.class.php
Log Message:
-----------
Merge pull request #8544 from ATM-Marc/FIX_odt_cond_reglement
FIX: payment term doc-specific label was not used (issue #8414)
Commit: 1f21078e0891939681367e470b87ddffd4dcfd0f
https://github.com/Dolibarr/dolibarr/commit/1f21078e0891939681367e470b87ddffd4dcfd0f
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/expensereport/class/expensereport.class.php
Log Message:
-----------
Merge pull request #8536 from atm-florian/7.0_fix8474
fix #8474
Commit: bc1515cb560102b9325cd7e63d875f4900e3726d
https://github.com/Dolibarr/dolibarr/commit/bc1515cb560102b9325cd7e63d875f4900e3726d
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Merge pull request #8535 from atm-greg/Fix_dolGetFirstLastname
fix #8521
Commit: 75bc3d17e6aaa0960acee60afce9283ca0830a8a
https://github.com/Dolibarr/dolibarr/commit/75bc3d17e6aaa0960acee60afce9283ca0830a8a
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/core/tpl/admin_extrafields_view.tpl.php
Log Message:
-----------
Update admin_extrafields_view.tpl.php
Commit: c392b9b8efcc7850f6e642ee53dae8502aad247c
https://github.com/Dolibarr/dolibarr/commit/c392b9b8efcc7850f6e642ee53dae8502aad247c
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/core/tpl/admin_extrafields_view.tpl.php
Log Message:
-----------
Merge pull request #8541 from atm-gauthier/FIX_count_6.0
FIX #8478 !empty instead of count to avoid warning
Commit: 628b437e28750d46ea9454f4be375537229bd2bd
https://github.com/Dolibarr/dolibarr/commit/628b437e28750d46ea9454f4be375537229bd2bd
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/compta/bank/card.php
Log Message:
-----------
Update card.php
Commit: b732844e91c98f62fca4f169875e48bb714fea72
https://github.com/Dolibarr/dolibarr/commit/b732844e91c98f62fca4f169875e48bb714fea72
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/compta/bank/card.php
Log Message:
-----------
Merge pull request #8537 from atm-arnaud/FIX_8023_missing_escape_htmltag
FIX #8023
Commit: ca6b7205efe3e5fad2e9a127f25b7dbd6ba0d42c
https://github.com/Dolibarr/dolibarr/commit/ca6b7205efe3e5fad2e9a127f25b7dbd6ba0d42c
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Update commonobject.class.php
Commit: 23dba46c8cf65d5717179767998eb034ba8b80c5
https://github.com/Dolibarr/dolibarr/commit/23dba46c8cf65d5717179767998eb034ba8b80c5
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Merge pull request #8551 from ATM-Nicolas/fix_datetime_extrafields
FIX : update wrong datetime extrafield
Commit: 307f217d562b26c6ffc6248d1877bea425d93b86
https://github.com/Dolibarr/dolibarr/commit/307f217d562b26c6ffc6248d1877bea425d93b86
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/fourn/commande/card.php
Log Message:
-----------
Merge pull request #8543 from ATM-Nicolas/fix_duplicate_events
FIX : multiple creation of same event
Commit: 73a8966659915b51c186c3ad768ed2da8516f3ac
https://github.com/Dolibarr/dolibarr/commit/73a8966659915b51c186c3ad768ed2da8516f3ac
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/langs/de_DE/admin.lang
Log Message:
-----------
Merge pull request #8538 from atm-arnaud/FIX_8389_html_in_lang_DE
FIX #8389
Commit: 6f526eb78087b02ef3617b249e3e4a6b5072b1a1
https://github.com/Dolibarr/dolibarr/commit/6f526eb78087b02ef3617b249e3e4a6b5072b1a1
Author: atm-ph <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/accountancy/journal/sellsjournal.php
Log Message:
-----------
Fix wrong amount for situation invoice in sellsjournal
Commit: 0518218aed63fbe6fdbbc584a97ec5ba1d53d48a
https://github.com/Dolibarr/dolibarr/commit/0518218aed63fbe6fdbbc584a97ec5ba1d53d48a
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/core/tpl/admin_extrafields_view.tpl.php
Log Message:
-----------
Fix regression
Commit: 9fafefa0d78c39d954dc7957dc4aac9117423c38
https://github.com/Dolibarr/dolibarr/commit/9fafefa0d78c39d954dc7957dc4aac9117423c38
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/compta/bank/card.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 6.0
Commit: 590bc2948a745578d67af7447b42a4e8b8692d96
https://github.com/Dolibarr/dolibarr/commit/590bc2948a745578d67af7447b42a4e8b8692d96
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/compta/bank/card.php
M htdocs/core/class/commondocgenerator.class.php
M htdocs/core/tpl/admin_extrafields_view.tpl.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/compta/bank/card.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
Commit: e4f2e0ecbd0beda6354b75d42b5d9fa2de54a162
https://github.com/Dolibarr/dolibarr/commit/e4f2e0ecbd0beda6354b75d42b5d9fa2de54a162
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/core/class/commonobject.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/fourn/commande/card.php
M htdocs/langs/de_DE/admin.lang
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Commit: 9a83a6ad6e3a0ee7e7fdfbf1cce38f3fbd22751e
https://github.com/Dolibarr/dolibarr/commit/9a83a6ad6e3a0ee7e7fdfbf1cce38f3fbd22751e
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
Log Message:
-----------
Merge pull request #8546 from atm-quentin/FIX_Issue_8455
FIX Issue #8455
Commit: d7da83ebc5718270997fd2a6a945c000b25ee572
https://github.com/Dolibarr/dolibarr/commit/d7da83ebc5718270997fd2a6a945c000b25ee572
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
Merge pull request #8560 from atm-john/Fix_extrafield_list_from_table_entity
Fix extrafield entity query filter
Commit: ae34fa6fbdd574338fe9eea8e3c2af585265b57f
https://github.com/Dolibarr/dolibarr/commit/ae34fa6fbdd574338fe9eea8e3c2af585265b57f
Author: atm-greg <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Log Message:
-----------
add supplier contact name on supplier documents
Commit: 0f3d2cc8df2e42993b14c63278a3935b841a800f
https://github.com/Dolibarr/dolibarr/commit/0f3d2cc8df2e42993b14c63278a3935b841a800f
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/accountancy/journal/sellsjournal.php
Log Message:
-----------
Merge pull request #8564 from atm-ph/fix_6.0_sellsjournal_situation_invoice
Fix wrong amount for situation invoice in sellsjournal
Commit: afdd504e16da651a353c7977246334bf440b3030
https://github.com/Dolibarr/dolibarr/commit/afdd504e16da651a353c7977246334bf440b3030
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/accountancy/journal/sellsjournal.php
Commit: 885c2389af5e3cee6611ceaf41034665037f672a
https://github.com/Dolibarr/dolibarr/commit/885c2389af5e3cee6611ceaf41034665037f672a
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Commit: 9ccba03a1720565d80d52b25a4624859dcb7a854
https://github.com/Dolibarr/dolibarr/commit/9ccba03a1720565d80d52b25a4624859dcb7a854
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Update html.form.class.php
Commit: 3df873ee06c94340c6b725c5df297448d6d686a3
https://github.com/Dolibarr/dolibarr/commit/3df873ee06c94340c6b725c5df297448d6d686a3
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/core/actions_addupdatedelete.inc.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/modulebuilder.lib.php
Log Message:
-----------
Merge pull request #8562 from ATM-Marc/FIX_modulebuilder
FIX: various modulebuilder-related issues
Commit: eec99b436eaa72bfe9b837bb4c2a5772921fe3f3
https://github.com/Dolibarr/dolibarr/commit/eec99b436eaa72bfe9b837bb4c2a5772921fe3f3
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Log Message:
-----------
Merge pull request #8565 from atm-greg/Add_supplierContactName_on_documents
Add supplier contact name on supplier documents
Commit: 8aa41c09c013e122f26a4154a69ab9a6b0a4fb2a
https://github.com/Dolibarr/dolibarr/commit/8aa41c09c013e122f26a4154a69ab9a6b0a4fb2a
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M test/phpunit/AdherentTest.php
Log Message:
-----------
Fix phpunit
Commit: 8da84af973aa200a30fd1a5bd8affbe108192f67
https://github.com/Dolibarr/dolibarr/commit/8da84af973aa200a30fd1a5bd8affbe108192f67
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/core/actions_addupdatedelete.inc.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/modulebuilder.lib.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Commit: 07853b35aa756c43b4c8fdc18a7f4df683ea8c80
https://github.com/Dolibarr/dolibarr/commit/07853b35aa756c43b4c8fdc18a7f4df683ea8c80
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-12 (Thu, 12 Apr 2018)
Changed paths:
M .travis.yml
Log Message:
-----------
Remove php5.3 from travis. PHP 5.3 no more supported with Dolibarr 8
Commit: 2b16ee75cd613d2485adfe0392d64fb9dbcd9e34
https://github.com/Dolibarr/dolibarr/commit/2b16ee75cd613d2485adfe0392d64fb9dbcd9e34
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-12 (Thu, 12 Apr 2018)
Changed paths:
M htdocs/modulebuilder/index.php
Log Message:
-----------
Fix ref must be visible on combolist
Commit: e437989853514b657d1a6149cb1671095e667f71
https://github.com/Dolibarr/dolibarr/commit/e437989853514b657d1a6149cb1671095e667f71
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-12 (Thu, 12 Apr 2018)
Changed paths:
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Commit: ea2fd67e0da2ab314563fe3d76c3daf7323f6283
https://github.com/Dolibarr/dolibarr/commit/ea2fd67e0da2ab314563fe3d76c3daf7323f6283
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-12 (Thu, 12 Apr 2018)
Changed paths:
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/compta/bank/card.php
M htdocs/core/actions_addupdatedelete.inc.php
M htdocs/core/class/commondocgenerator.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/lib/functions.lib.php
M htdocs/core/lib/modulebuilder.lib.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/expensereport/class/expensereport.class.php
M htdocs/fourn/commande/card.php
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/langs/de_DE/admin.lang
M test/phpunit/AdherentTest.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/bank/card.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/langs/de_DE/admin.lang
Commit: dd022ee4234b67dc89d09a1190811bda4c863589
https://github.com/Dolibarr/dolibarr/commit/dd022ee4234b67dc89d09a1190811bda4c863589
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-12 (Thu, 12 Apr 2018)
Changed paths:
M README-FR.md
M README.md
M htdocs/accountancy/admin/categories.php
M htdocs/accountancy/bookkeeping/card.php
M htdocs/admin/mails.php
M htdocs/core/actions_massactions.inc.php
M htdocs/core/actions_sendmails.inc.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/tpl/card_presend.tpl.php
M htdocs/core/tpl/extrafields_list_search_sql.tpl.php
M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
M htdocs/holiday/list.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/mails.lang
M htdocs/modulebuilder/template/myobject_list.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
M htdocs/user/class/user.class.php
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/19b5403cd960...dd022ee4234b