[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] ddbd6c: MERGE DEGUEU
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] ddbd6c: MERGE DEGUEU |
|
Date: |
Sat, 15 Apr 2017 08:02:33 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: ddbd6c371d08c09018149eca014242f1f98bb70d
https://github.com/Dolibarr/dolibarr/commit/ddbd6c371d08c09018149eca014242f1f98bb70d
Author: arnaud <address@hidden>
Date: 2017-01-20 (Fri, 20 Jan 2017)
Changed paths:
M build/pad/DoliWamp.pml
M build/pad/Dolibarr.pml
M build/pad/pad_dolibarr.xml
M build/pad/pad_doliwamp.xml
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/en/uk/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions
Log Message:
-----------
MERGE DEGUEU
Commit: 8199ac9f89600273b91fe20a118b466c0f1d3381
https://github.com/Dolibarr/dolibarr/commit/8199ac9f89600273b91fe20a118b466c0f1d3381
Author: Laurent Destailleur <address@hidden>
Date: 2017-03-22 (Wed, 22 Mar 2017)
Changed paths:
M htdocs/core/lib/files.lib.php
Log Message:
-----------
FIX Can't download delivery receipts (function
dol_check_secure_access_document)
Commit: 9b42177bd5c47079a030053bef0ad37caad06d53
https://github.com/Dolibarr/dolibarr/commit/9b42177bd5c47079a030053bef0ad37caad06d53
Author: Laurent Destailleur <address@hidden>
Date: 2017-03-23 (Thu, 23 Mar 2017)
Changed paths:
M htdocs/hrm/index.php
Log Message:
-----------
Fix half day for leave request.
Commit: 22b4d0c2761eede3130b0cb861ddaa50657713be
https://github.com/Dolibarr/dolibarr/commit/22b4d0c2761eede3130b0cb861ddaa50657713be
Author: Laurent Destailleur <address@hidden>
Date: 2017-03-23 (Thu, 23 Mar 2017)
Changed paths:
M htdocs/comm/propal/card.php
M htdocs/commande/card.php
M htdocs/compta/facture.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/boxes/box_factures_imp.php
M htdocs/core/boxes/box_produits.php
M htdocs/core/boxes/box_produits_alerte_stock.php
M htdocs/core/boxes/box_project.php
M htdocs/core/boxes/box_services_contracts.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.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/expensereport/info.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/facture/card.php
M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
M htdocs/install/mysql/tables/llx_supplier_proposaldet.sql
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/agenda.lang
M htdocs/langs/en_US/banks.lang
M htdocs/langs/en_US/bills.lang
M htdocs/langs/en_US/companies.lang
M htdocs/langs/en_US/compta.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/projects.lang
M htdocs/langs/en_US/propal.lang
M htdocs/langs/en_US/sendings.lang
M htdocs/langs/en_US/stocks.lang
M htdocs/langs/en_US/supplier_proposal.lang
M htdocs/main.inc.php
M htdocs/product/admin/price_rules.php
M htdocs/product/class/product.class.php
M htdocs/projet/class/project.class.php
M htdocs/projet/element.php
M htdocs/projet/list.php
M htdocs/supplier_proposal/card.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Commit: aa9d991923ba17f675c883472d953501f21bd90f
https://github.com/Dolibarr/dolibarr/commit/aa9d991923ba17f675c883472d953501f21bd90f
Author: Laurent Destailleur <address@hidden>
Date: 2017-03-25 (Sat, 25 Mar 2017)
Changed paths:
M htdocs/comm/index.php
Log Message:
-----------
Fix css
Commit: df59a595de716f16a3c7aa2ca75debf1c355f7af
https://github.com/Dolibarr/dolibarr/commit/df59a595de716f16a3c7aa2ca75debf1c355f7af
Author: Laurent Destailleur <address@hidden>
Date: 2017-03-25 (Sat, 25 Mar 2017)
Changed paths:
M htdocs/core/lib/files.lib.php
M htdocs/core/tpl/ajaxrow.tpl.php
Log Message:
-----------
Fix link to files
Commit: 2f4a4f493e4a04507ce96748d15e81ace1afd4bc
https://github.com/Dolibarr/dolibarr/commit/2f4a4f493e4a04507ce96748d15e81ace1afd4bc
Author: Laurent Destailleur <address@hidden>
Date: 2017-03-25 (Sat, 25 Mar 2017)
Changed paths:
M htdocs/product/fournisseurs.php
Log Message:
-----------
Missin translation
Commit: 106d19a8af74db6cc24c0862cdd4138e106a6ea3
https://github.com/Dolibarr/dolibarr/commit/106d19a8af74db6cc24c0862cdd4138e106a6ea3
Author: Laurent Destailleur <address@hidden>
Date: 2017-03-25 (Sat, 25 Mar 2017)
Changed paths:
M htdocs/comm/action/card.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/commande/dispatch.php
M htdocs/langs/en_US/errors.lang
Log Message:
-----------
FIX #6468 + Fix missing translation
Commit: 4012aeff908e0ecaf158275713feeb9dbda55056
https://github.com/Dolibarr/dolibarr/commit/4012aeff908e0ecaf158275713feeb9dbda55056
Author: Laurent Destailleur <address@hidden>
Date: 2017-03-25 (Sat, 25 Mar 2017)
Changed paths:
M dev/translation/sanity_check_en_langfiles.php
M htdocs/core/boxes/box_graph_product_distribution.php
M htdocs/langs/en_US/mails.lang
Log Message:
-----------
Fix translation
Commit: ce58ba5c2fe8680a63bdcf143e08eee80aeef484
https://github.com/Dolibarr/dolibarr/commit/ce58ba5c2fe8680a63bdcf143e08eee80aeef484
Author: Laurent Destailleur <address@hidden>
Date: 2017-03-26 (Sun, 26 Mar 2017)
Changed paths:
M htdocs/accountancy/admin/defaultaccounts.php
M htdocs/compta/salaries/index.php
M htdocs/expedition/card.php
M htdocs/holiday/card.php
A htdocs/theme/md/img/object_multicurrency.png
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Commit: 68656dd29cb8e4df78cfc199b3ca087310d13b1b
https://github.com/Dolibarr/dolibarr/commit/68656dd29cb8e4df78cfc199b3ca087310d13b1b
Author: BENKE Charlie <address@hidden>
Date: 2017-03-26 (Sun, 26 Mar 2017)
Changed paths:
M htdocs/supplier_proposal/card.php
Log Message:
-----------
FIX : supplier default condition not retrived on create
Commit: f4a7217f20382e39fc29265d5a10fd4f41a97d04
https://github.com/Dolibarr/dolibarr/commit/f4a7217f20382e39fc29265d5a10fd4f41a97d04
Author: BENKE Charlie <address@hidden>
Date: 2017-03-26 (Sun, 26 Mar 2017)
Changed paths:
M htdocs/comm/propal/list.php
Log Message:
-----------
display total line for all total line
Commit: afefb475984ae29ef30e014e3c3f50da3b75e096
https://github.com/Dolibarr/dolibarr/commit/afefb475984ae29ef30e014e3c3f50da3b75e096
Author: BENKE Charlie <address@hidden>
Date: 2017-03-26 (Sun, 26 Mar 2017)
Changed paths:
M htdocs/commande/list.php
Log Message:
-----------
Update list.php
Commit: 8d6819c6642e976c0e9235e72a06474f3785c334
https://github.com/Dolibarr/dolibarr/commit/8d6819c6642e976c0e9235e72a06474f3785c334
Author: BENKE Charlie <address@hidden>
Date: 2017-03-26 (Sun, 26 Mar 2017)
Changed paths:
M htdocs/fourn/facture/list.php
Log Message:
-----------
Update list.php
Commit: 6e133e5bf6f3c03083cefaa5355a65015ad8d97d
https://github.com/Dolibarr/dolibarr/commit/6e133e5bf6f3c03083cefaa5355a65015ad8d97d
Author: Laurent Destailleur <address@hidden>
Date: 2017-03-26 (Sun, 26 Mar 2017)
Changed paths:
M htdocs/loan/card.php
Log Message:
-----------
Fix security escapment
Commit: e38ad37ce33df734439f73ab4df49d7393a2659c
https://github.com/Dolibarr/dolibarr/commit/e38ad37ce33df734439f73ab4df49d7393a2659c
Author: Laurent Destailleur <address@hidden>
Date: 2017-03-26 (Sun, 26 Mar 2017)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/agenda.lib.php
M htdocs/societe/ajax/company.php
Log Message:
-----------
FIX #6517 #6525 Autocompletion of thirdparty after n chars not
implemented
Commit: ef7a334414b07a203d86f802a7904b1e6ef19c66
https://github.com/Dolibarr/dolibarr/commit/ef7a334414b07a203d86f802a7904b1e6ef19c66
Author: arnaud <address@hidden>
Date: 2017-04-04 (Tue, 04 Apr 2017)
Changed paths:
M ChangeLog
M build/debian/conf.php.install
M htdocs/admin/dict.php
M htdocs/admin/system/constall.php
M htdocs/admin/system/dolibarr.php
M htdocs/comm/action/index.php
M htdocs/comm/mailing/card.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/comm/remx.php
M htdocs/commande/list.php
M htdocs/compta/bank/categ.php
M htdocs/compta/localtax/clients.php
M htdocs/conf/conf.php.example
M htdocs/contrat/class/contrat.class.php
M htdocs/core/class/CMailFile.class.php
M htdocs/core/class/doleditor.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.formprojet.class.php
M htdocs/core/class/smtps.class.php
M htdocs/core/extrafieldsinexport.inc.php
M htdocs/core/filemanagerdol/connectors/php/config.php
M htdocs/core/lib/functions.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/product/mod_codeproduct_elephant.php
M htdocs/core/modules/propale/doc/pdf_azur.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/expensereport/class/paymentexpensereport.class.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/filefunc.inc.php
M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
M htdocs/langs/en_US/errors.lang
M htdocs/langs/en_US/mails.lang
M htdocs/langs/fr_FR/companies.lang
M htdocs/margin/agentMargins.php
M htdocs/master.inc.php
M htdocs/product/admin/price_rules.php
M htdocs/product/class/product.class.php
M htdocs/product/price.php
M htdocs/product/stock/mouvement.php
M htdocs/product/stock/product.php
M htdocs/projet/class/project.class.php
M htdocs/societe/consumption.php
M htdocs/viewimage.php
M scripts/emailings/mailing-send.php
Log Message:
-----------
Merge branch '3.9' of github.com:Dolibarr/dolibarr into 3.9_dolibarr
Commit: 6b2d8a3c34e911de4f110ae512d33565178c92ed
https://github.com/Dolibarr/dolibarr/commit/6b2d8a3c34e911de4f110ae512d33565178c92ed
Author: arnaud <address@hidden>
Date: 2017-04-06 (Thu, 06 Apr 2017)
Changed paths:
M htdocs/compta/facture/list.php
Log Message:
-----------
FIX limit+1 dosn't show Total line
Commit: 44302f1aea23de6bcc53dd476ed29a7e1b7bb600
https://github.com/Dolibarr/dolibarr/commit/44302f1aea23de6bcc53dd476ed29a7e1b7bb600
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-06 (Thu, 06 Apr 2017)
Changed paths:
M htdocs/compta/facture/list.php
Log Message:
-----------
Merge pull request #6650 from atm-arnaud/FIX_total_line_on_list_facture
Fix total line on list facture
Commit: 76687028063578ceae53b626d93348bbeee32161
https://github.com/Dolibarr/dolibarr/commit/76687028063578ceae53b626d93348bbeee32161
Author: florian HENRY <address@hidden>
Date: 2017-04-07 (Fri, 07 Apr 2017)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
fix: missing attribute update
Commit: a6ec22d7fee41c954b37249909271c6370047eff
https://github.com/Dolibarr/dolibarr/commit/a6ec22d7fee41c954b37249909271c6370047eff
Author: altatof <address@hidden>
Date: 2017-04-07 (Fri, 07 Apr 2017)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
FIX: dont lose supplier ref if no supplier price in database
Commit: 919633b2beb65208d4b9c309b3dbf28a4ffd8d36
https://github.com/Dolibarr/dolibarr/commit/919633b2beb65208d4b9c309b3dbf28a4ffd8d36
Author: altatof <address@hidden>
Date: 2017-04-07 (Fri, 07 Apr 2017)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
escape supplier ref
Commit: d892a89f453e7a1be99d0a8fa3b620d8fa04c0bf
https://github.com/Dolibarr/dolibarr/commit/d892a89f453e7a1be99d0a8fa3b620d8fa04c0bf
Author: altatof <address@hidden>
Date: 2017-04-07 (Fri, 07 Apr 2017)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
FIX: dont get empty "Incoterms : - " string if no incoterm
Commit: 74f0ae5bbb8a3a8660b7e6fbfff50605153d42e8
https://github.com/Dolibarr/dolibarr/commit/74f0ae5bbb8a3a8660b7e6fbfff50605153d42e8
Author: Marcos García de La Fuente <address@hidden>
Date: 2017-04-09 (Sun, 09 Apr 2017)
Changed paths:
M htdocs/user/agenda_extsites.php
M htdocs/user/bank.php
M htdocs/user/card.php
M htdocs/user/clicktodial.php
M htdocs/user/document.php
M htdocs/user/info.php
M htdocs/user/ldap.php
M htdocs/user/note.php
M htdocs/user/param_ihm.php
M htdocs/user/perms.php
Log Message:
-----------
FIX #6623 User card shows "Return to list" link even if the user has no
rights to list users
Close #6623
Commit: a8da0776132cb31314a13f83093939dbf96ac65e
https://github.com/Dolibarr/dolibarr/commit/a8da0776132cb31314a13f83093939dbf96ac65e
Author: Marcos García de La Fuente <address@hidden>
Date: 2017-04-09 (Sun, 09 Apr 2017)
Changed paths:
M htdocs/supplier_proposal/card.php
Log Message:
-----------
FIX #6613 Default subject for Supplier proposal emails is filled with a
non-existing key
Close #6613
Commit: 411d276ed2dea990fee8d6e5266b02f569b4fe71
https://github.com/Dolibarr/dolibarr/commit/411d276ed2dea990fee8d6e5266b02f569b4fe71
Author: Marcos García de La Fuente <address@hidden>
Date: 2017-04-09 (Sun, 09 Apr 2017)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
FIX #6669 User with no permission to edit customer invoices can see a edit
button in project entry
Close #6669
Commit: da0af36086ab39407da9b3fdaee47ff68487a69b
https://github.com/Dolibarr/dolibarr/commit/da0af36086ab39407da9b3fdaee47ff68487a69b
Author: Marcos García de La Fuente <address@hidden>
Date: 2017-04-09 (Sun, 09 Apr 2017)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIX #6671 Cannot remove thirdparty type with "#" in its name
Close #6671
Commit: 2d83efc7e303778a595e6cfe31979bdbe0ee07f9
https://github.com/Dolibarr/dolibarr/commit/2d83efc7e303778a595e6cfe31979bdbe0ee07f9
Author: Marcos García de La Fuente <address@hidden>
Date: 2017-04-09 (Sun, 09 Apr 2017)
Changed paths:
M htdocs/societe/list.php
Log Message:
-----------
FIX #6673 Missing "nature" table header in thirdparty list
Close #6673
Commit: 2057613ad91bed05e3843151baedb1b6b656b95c
https://github.com/Dolibarr/dolibarr/commit/2057613ad91bed05e3843151baedb1b6b656b95c
Author: Marcos García de La Fuente <address@hidden>
Date: 2017-04-09 (Sun, 09 Apr 2017)
Changed paths:
M htdocs/contact/list.php
Log Message:
-----------
FIX #6675 Restricted user with no agenda permissions can see a button to
create appointment in thirdparty contact list
Close #6675
Commit: 59fa5c2fe69d42ac84d545068c4b2ea2ae88590f
https://github.com/Dolibarr/dolibarr/commit/59fa5c2fe69d42ac84d545068c4b2ea2ae88590f
Author: Marcos García de La Fuente <address@hidden>
Date: 2017-04-09 (Sun, 09 Apr 2017)
Changed paths:
M htdocs/fourn/facture/card.php
Log Message:
-----------
FIX #6680 User with restricted supplier invoice permissions sees "reopen"
button even if he has no permission to do it
Close #6680
Commit: 12df7b6ab904bdcb11dcf5b818528fcfc3e3a7a0
https://github.com/Dolibarr/dolibarr/commit/12df7b6ab904bdcb11dcf5b818528fcfc3e3a7a0
Author: Marcos García de La Fuente <address@hidden>
Date: 2017-04-09 (Sun, 09 Apr 2017)
Changed paths:
M htdocs/fourn/facture/card.php
Log Message:
-----------
FIX #6679 User with restricted supplier invoice permissions can edit project,
payment conditions, payment mode
Close #6679
Commit: 996b5e9f874e47f68a46e34886df06c6eefb01ee
https://github.com/Dolibarr/dolibarr/commit/996b5e9f874e47f68a46e34886df06c6eefb01ee
Author: Marcos García de La Fuente <address@hidden>
Date: 2017-04-09 (Sun, 09 Apr 2017)
Changed paths:
M htdocs/compta/facture/fiche-rec.php
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Corrected translation errors and little bug showing a non-available button to
a restricted user
Commit: a6b7c812f2e0a9c0e9e9ce53bdaf767e0ddf077f
https://github.com/Dolibarr/dolibarr/commit/a6b7c812f2e0a9c0e9e9ce53bdaf767e0ddf077f
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-11 (Tue, 11 Apr 2017)
Changed paths:
M htdocs/compta/facture/fiche-rec.php
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Merge pull request #6684 from marcosgdf/recurring
Corrected translation errors and little bug showing a non-available button to a
restricted user
Commit: f5f062936e0c31b3e97ca3987f78b01da6ea4434
https://github.com/Dolibarr/dolibarr/commit/f5f062936e0c31b3e97ca3987f78b01da6ea4434
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-11 (Tue, 11 Apr 2017)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
Merge pull request #6654 from atm-florian/5.0
fix: missing attribute update
Commit: abf87a6946263aa80597ba11c81c72d201d7d8a0
https://github.com/Dolibarr/dolibarr/commit/abf87a6946263aa80597ba11c81c72d201d7d8a0
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-11 (Tue, 11 Apr 2017)
Changed paths:
M ChangeLog
M dev/initdemo/initdemo.sh
M htdocs/admin/external_rss.php
M htdocs/admin/modules.php
M htdocs/admin/tools/update.php
M htdocs/categories/class/categorie.class.php
M htdocs/comm/action/card.php
M htdocs/comm/action/index.php
M htdocs/comm/mailing/card.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/comm/remx.php
M htdocs/commande/class/api_commande.class.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/list.php
M htdocs/compta/bank/card.php
M htdocs/compta/bank/categ.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/bank/class/bankcateg.class.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/compta/facture/list.php
M htdocs/compta/paiement.php
M htdocs/contact/class/contact.class.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/boxes/box_factures_imp.php
M htdocs/core/boxes/box_services_contracts.php
M htdocs/core/class/CMailFile.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.formmargin.class.php
M htdocs/core/class/html.formprojet.class.php
M htdocs/core/class/smtps.class.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/treeview.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/modFacture.class.php
M htdocs/core/modules/modProjet.class.php
M htdocs/core/modules/product/mod_codeproduct_elephant.php
M htdocs/core/tpl/login.tpl.php
M htdocs/core/tpl/objectline_view.tpl.php
M htdocs/expensereport/class/paymentexpensereport.class.php
M htdocs/expensereport/payment/payment.php
M htdocs/fichinter/card.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/commande/dispatch.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/facture/list.php
M htdocs/fourn/facture/paiement.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/categories.lang
M htdocs/langs/en_US/errors.lang
M htdocs/langs/en_US/main.lang
M htdocs/main.inc.php
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/lib/margins.lib.php
M htdocs/margin/productMargins.php
M htdocs/product/admin/price_rules.php
M htdocs/product/class/product.class.php
M htdocs/product/stats/card.php
M htdocs/product/stock/massstockmove.php
M htdocs/projet/card.php
M htdocs/projet/class/project.class.php
M htdocs/projet/contact.php
M htdocs/projet/document.php
M htdocs/projet/element.php
M htdocs/projet/ganttview.php
M htdocs/projet/index.php
M htdocs/projet/info.php
M htdocs/projet/list.php
M htdocs/projet/note.php
M htdocs/projet/tasks.php
M htdocs/projet/tasks/contact.php
M htdocs/projet/tasks/document.php
M htdocs/projet/tasks/list.php
M htdocs/projet/tasks/note.php
M htdocs/projet/tasks/task.php
M htdocs/projet/tasks/time.php
M htdocs/societe/class/api_contact.class.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/soc.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
M htdocs/user/class/user.class.php
M htdocs/user/hierarchy.php
Log Message:
-----------
Merge branch '4.0' into fix_reffourn
Commit: e357aed3e181b7faa0eebfb50acc221389e99d1b
https://github.com/Dolibarr/dolibarr/commit/e357aed3e181b7faa0eebfb50acc221389e99d1b
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-11 (Tue, 11 Apr 2017)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
Merge pull request #6655 from altatof/fix_reffourn
FIX: dont lose supplier ref if no supplier price in database
Commit: d4de81ed6dd669ab84f6822c7bad7ea7f8d2b634
https://github.com/Dolibarr/dolibarr/commit/d4de81ed6dd669ab84f6822c7bad7ea7f8d2b634
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-11 (Tue, 11 Apr 2017)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Merge pull request #6659 from altatof/fix_incoterm
FIX: dont get empty "Incoterms : - " string if no incoterm
Commit: cd90dcb1e1eefe6f0faf9ab4067945610dc58afd
https://github.com/Dolibarr/dolibarr/commit/cd90dcb1e1eefe6f0faf9ab4067945610dc58afd
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-11 (Tue, 11 Apr 2017)
Changed paths:
M htdocs/user/agenda_extsites.php
M htdocs/user/bank.php
M htdocs/user/card.php
M htdocs/user/clicktodial.php
M htdocs/user/document.php
M htdocs/user/info.php
M htdocs/user/ldap.php
M htdocs/user/note.php
M htdocs/user/param_ihm.php
M htdocs/user/perms.php
Log Message:
-----------
Merge pull request #6667 from marcosgdf/bug-6623
FIX #6623 User card shows "Return to list" link even if the user has no rights
to list users
Commit: 50dbe39cda3e4a6c47e80326c0614d297e51d4b0
https://github.com/Dolibarr/dolibarr/commit/50dbe39cda3e4a6c47e80326c0614d297e51d4b0
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-11 (Tue, 11 Apr 2017)
Changed paths:
M htdocs/supplier_proposal/card.php
Log Message:
-----------
Merge pull request #6668 from marcosgdf/bug-6613
FIX #6613 Default subject for Supplier proposal emails is filled with a
non-existing key
Commit: eb4236011b81aaddc629f585a182099c48f47205
https://github.com/Dolibarr/dolibarr/commit/eb4236011b81aaddc629f585a182099c48f47205
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-11 (Tue, 11 Apr 2017)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Merge pull request #6670 from marcosgdf/bug-6669
FIX #6669 User with no permission to edit customer invoices can see a edit
button in project entry
Commit: fc735eaa4fd3d740fb6081777947887ffeefdd37
https://github.com/Dolibarr/dolibarr/commit/fc735eaa4fd3d740fb6081777947887ffeefdd37
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-11 (Tue, 11 Apr 2017)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
Merge pull request #6672 from marcosgdf/bug-6671
FIX #6671 Cannot remove thirdparty type with "#" in its name
Commit: 5ae1b5457b8531c2ef490b8fe412f4dd3a77960a
https://github.com/Dolibarr/dolibarr/commit/5ae1b5457b8531c2ef490b8fe412f4dd3a77960a
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-11 (Tue, 11 Apr 2017)
Changed paths:
M htdocs/societe/list.php
Log Message:
-----------
Merge pull request #6674 from marcosgdf/bug-6673
FIX #6673 Missing "nature" table header in thirdparty list
Commit: a7ccb175e566218e523bc2e9d73acab138400256
https://github.com/Dolibarr/dolibarr/commit/a7ccb175e566218e523bc2e9d73acab138400256
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-11 (Tue, 11 Apr 2017)
Changed paths:
M htdocs/contact/list.php
Log Message:
-----------
Merge pull request #6676 from marcosgdf/bug-6675
FIX #6675 Restricted user with no agenda permissions can see a button to create
appointment in thirdparty contact list
Commit: 4d721652882394d51380344c72042cad86397883
https://github.com/Dolibarr/dolibarr/commit/4d721652882394d51380344c72042cad86397883
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-11 (Tue, 11 Apr 2017)
Changed paths:
M htdocs/fourn/facture/card.php
Log Message:
-----------
Merge pull request #6681 from marcosgdf/bug-6680
FIX #6680 User with restricted supplier invoice permissions sees "reopen"
button even if he has no permission to do it
Commit: 17da4f64a7fb81404b3e2ece29e489aa2e2379aa
https://github.com/Dolibarr/dolibarr/commit/17da4f64a7fb81404b3e2ece29e489aa2e2379aa
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-11 (Tue, 11 Apr 2017)
Changed paths:
M htdocs/fourn/facture/card.php
Log Message:
-----------
Merge pull request #6683 from marcosgdf/bug-6679
FIX #6679 User with restricted supplier invoice permissions can edit project,
payment conditions, payment mode
Commit: 2af3f010bf8600cbf1aa444e03bf48e1cfa44fe0
https://github.com/Dolibarr/dolibarr/commit/2af3f010bf8600cbf1aa444e03bf48e1cfa44fe0
Author: BENKE Charlie <address@hidden>
Date: 2017-04-11 (Tue, 11 Apr 2017)
Changed paths:
M htdocs/core/lib/files.lib.php
Log Message:
-----------
expedition->dir_output is used by livraison
not livraison->dir_output who not exist
Commit: 2446cb5431d00298745005096bcf9fe3ff3c2ffb
https://github.com/Dolibarr/dolibarr/commit/2446cb5431d00298745005096bcf9fe3ff3c2ffb
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-11 (Tue, 11 Apr 2017)
Changed paths:
M htdocs/admin/dict.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/contact/list.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/html.form.class.php
M htdocs/fourn/facture/card.php
M htdocs/societe/list.php
M htdocs/supplier_proposal/card.php
M htdocs/user/agenda_extsites.php
M htdocs/user/bank.php
M htdocs/user/card.php
M htdocs/user/clicktodial.php
M htdocs/user/document.php
M htdocs/user/info.php
M htdocs/user/ldap.php
M htdocs/user/note.php
M htdocs/user/param_ihm.php
M htdocs/user/perms.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/compta/facture.php
htdocs/compta/facture/fiche-rec.php
htdocs/contact/list.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/facture/card.php
htdocs/societe/list.php
htdocs/user/document.php
Commit: 8e33c8090db925391831b6f00193614969fe2fe8
https://github.com/Dolibarr/dolibarr/commit/8e33c8090db925391831b6f00193614969fe2fe8
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-11 (Tue, 11 Apr 2017)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
FIX No filter on company when showing the link to elements.
Commit: a6b05bb4da172ffd0907677400f1cd5987ae665f
https://github.com/Dolibarr/dolibarr/commit/a6b05bb4da172ffd0907677400f1cd5987ae665f
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-12 (Wed, 12 Apr 2017)
Changed paths:
M ChangeLog
M build/debian/control
M htdocs/accountancy/customer/card.php
M htdocs/accountancy/expensereport/card.php
M htdocs/accountancy/expensereport/lines.php
M htdocs/accountancy/expensereport/list.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/supplier/card.php
M htdocs/adherents/agenda.php
M htdocs/admin/dict.php
M htdocs/admin/facture.php
M htdocs/categories/class/categorie.class.php
M htdocs/comm/action/index.php
M htdocs/compta/bank/bankentries.php
M htdocs/compta/bank/categ.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/compta/paiement/card.php
M htdocs/contact/list.php
M htdocs/core/class/CMailFile.class.php
M htdocs/core/class/commonobject.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.formfile.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/class/smtps.class.php
M htdocs/core/lib/company.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/modAgenda.class.php
M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
M htdocs/core/triggers/interface_50_modNotification_Notification.class.php
M htdocs/filefunc.inc.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/facture/card.php
M htdocs/fourn/facture/paiement.php
M htdocs/install/mysql/data/llx_c_action_trigger.sql
M htdocs/install/repair.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/agenda.lang
M htdocs/langs/en_US/categories.lang
M htdocs/langs/en_US/propal.lang
M htdocs/product/stock/class/mouvementstock.class.php
M htdocs/societe/list.php
M htdocs/supplier_proposal/card.php
M htdocs/user/agenda_extsites.php
M htdocs/user/bank.php
M htdocs/user/card.php
M htdocs/user/clicktodial.php
M htdocs/user/document.php
M htdocs/user/info.php
M htdocs/user/ldap.php
M htdocs/user/note.php
M htdocs/user/param_ihm.php
M htdocs/user/perms.php
Log Message:
-----------
Merge branch '5.0' of github.com:Dolibarr/dolibarr into 5.0
Commit: 6f4ce8dc2fd8c26ab1a1799c80575d52a201343f
https://github.com/Dolibarr/dolibarr/commit/6f4ce8dc2fd8c26ab1a1799c80575d52a201343f
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-12 (Wed, 12 Apr 2017)
Changed paths:
M htdocs/compta/facture/list.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.9' into 4.0
Commit: 1cffa8c9fc754c3469518806f86fb3576d46e853
https://github.com/Dolibarr/dolibarr/commit/1cffa8c9fc754c3469518806f86fb3576d46e853
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-13 (Thu, 13 Apr 2017)
Changed paths:
M build/debian/control
Log Message:
-----------
Fix for debian 8
Commit: 5e4697b62d987a67f482736d796a4b6e4a64df27
https://github.com/Dolibarr/dolibarr/commit/5e4697b62d987a67f482736d796a4b6e4a64df27
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-13 (Thu, 13 Apr 2017)
Changed paths:
M dev/translation/sanity_check_en_langfiles.php
M htdocs/comm/action/card.php
M htdocs/comm/index.php
M htdocs/comm/propal/list.php
M htdocs/commande/list.php
M htdocs/core/boxes/box_graph_product_distribution.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/agenda.lib.php
M htdocs/core/lib/files.lib.php
M htdocs/core/tpl/ajaxrow.tpl.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/commande/dispatch.php
M htdocs/fourn/facture/list.php
M htdocs/hrm/index.php
M htdocs/langs/en_US/errors.lang
M htdocs/langs/en_US/mails.lang
M htdocs/loan/card.php
M htdocs/product/fournisseurs.php
M htdocs/societe/ajax/company.php
M htdocs/supplier_proposal/card.php
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Commit: db23a5222baedc5e8c5e38b11e5d185213de02ec
https://github.com/Dolibarr/dolibarr/commit/db23a5222baedc5e8c5e38b11e5d185213de02ec
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-13 (Thu, 13 Apr 2017)
Changed paths:
M htdocs/langs/en_US/bills.lang
Log Message:
-----------
Fix translation
Commit: d99de641e8351f9e3237cbbbe2ba97e40ffc6554
https://github.com/Dolibarr/dolibarr/commit/d99de641e8351f9e3237cbbbe2ba97e40ffc6554
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-15 (Sat, 15 Apr 2017)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Fic on vat npr
Commit: 086fa4385f73b9da3ba2903f055ecc1e9cfab1b6
https://github.com/Dolibarr/dolibarr/commit/086fa4385f73b9da3ba2903f055ecc1e9cfab1b6
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-15 (Sat, 15 Apr 2017)
Changed paths:
M htdocs/install/repair.php
Log Message:
-----------
Fix clean of product_batch
Commit: 2e759d51562f87b00c28bf1a7572806d9612cd33
https://github.com/Dolibarr/dolibarr/commit/2e759d51562f87b00c28bf1a7572806d9612cd33
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-15 (Sat, 15 Apr 2017)
Changed paths:
M htdocs/compta/facture/list.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 3.9
Commit: 72ff353e9f48ccf01b7eb6ead491595258763b18
https://github.com/Dolibarr/dolibarr/commit/72ff353e9f48ccf01b7eb6ead491595258763b18
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-15 (Sat, 15 Apr 2017)
Changed paths:
M htdocs/install/repair.php
Log Message:
-----------
Fix repair of product_stock
Commit: 7fe66581f15f8d3b2552f8bfb455d62b2210e906
https://github.com/Dolibarr/dolibarr/commit/7fe66581f15f8d3b2552f8bfb455d62b2210e906
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-15 (Sat, 15 Apr 2017)
Changed paths:
M htdocs/compta/facture/list.php
M htdocs/install/repair.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 4.0
Commit: d2173c1fa4a199178713ba8c43f19e1038a07b43
https://github.com/Dolibarr/dolibarr/commit/d2173c1fa4a199178713ba8c43f19e1038a07b43
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-15 (Sat, 15 Apr 2017)
Changed paths:
M htdocs/admin/dict.php
M htdocs/compta/facture.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/contact/list.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/html.form.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/facture/card.php
M htdocs/societe/list.php
M htdocs/supplier_proposal/card.php
M htdocs/user/agenda_extsites.php
M htdocs/user/bank.php
M htdocs/user/card.php
M htdocs/user/clicktodial.php
M htdocs/user/document.php
M htdocs/user/info.php
M htdocs/user/ldap.php
M htdocs/user/note.php
M htdocs/user/param_ihm.php
M htdocs/user/perms.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 4.0
Commit: ac884ec463ea480049ec34f644a4228dfd839e11
https://github.com/Dolibarr/dolibarr/commit/ac884ec463ea480049ec34f644a4228dfd839e11
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-15 (Sat, 15 Apr 2017)
Changed paths:
M htdocs/compta/facture/list.php
M htdocs/install/repair.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/install/repair.php
Commit: 4c056d68d8736b1e04fd8bbea37a6cc8b6342e00
https://github.com/Dolibarr/dolibarr/commit/4c056d68d8736b1e04fd8bbea37a6cc8b6342e00
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-15 (Sat, 15 Apr 2017)
Changed paths:
M build/debian/control
M dev/translation/sanity_check_en_langfiles.php
M htdocs/comm/action/card.php
M htdocs/comm/index.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/compta/facture/list.php
M htdocs/core/boxes/box_graph_product_distribution.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/agenda.lib.php
M htdocs/core/lib/files.lib.php
M htdocs/core/tpl/ajaxrow.tpl.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/commande/dispatch.php
M htdocs/fourn/facture/card.php
M htdocs/hrm/index.php
M htdocs/install/repair.php
M htdocs/langs/en_US/bills.lang
M htdocs/langs/en_US/errors.lang
M htdocs/langs/en_US/mails.lang
M htdocs/loan/card.php
M htdocs/product/fournisseurs.php
M htdocs/societe/ajax/company.php
M htdocs/societe/list.php
M htdocs/supplier_proposal/card.php
M htdocs/user/agenda_extsites.php
M htdocs/user/bank.php
M htdocs/user/card.php
M htdocs/user/clicktodial.php
M htdocs/user/document.php
M htdocs/user/info.php
M htdocs/user/ldap.php
M htdocs/user/note.php
M htdocs/user/param_ihm.php
M htdocs/user/perms.php
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/dict.php
htdocs/commande/list.php
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/bills.lang
htdocs/societe/list.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/4490477cfbf0...4c056d68d873