Laurent Destailleur 4bf0e31299 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/loan.lang
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php

2017-03-11 02:40:42 +01:00

..

menus

Fix more then 30 security defects

2016-12-18 01:44:26 +01:00

system

Clean admin menu entries

2017-02-22 02:32:35 +01:00

tools

NEW Can set number of dump to keep with job "local database backup"

2017-02-27 02:04:25 +01:00

agenda_extrafields.php

[Qual] comments should be in english

2015-12-22 09:37:27 +01:00

agenda_extsites.php

Revert commit that break compatibility of 100% of modules

2016-03-25 15:24:57 +01:00

agenda_other.php

Debug browser notification

2017-01-20 20:10:16 +01:00

agenda_xcal.php

[Qual] Uniformize code

2015-10-23 12:58:30 +02:00

agenda.php

[Qual] Uniformize code

2015-10-23 12:58:30 +02:00

bank_extrafields.php

[Qual] comments should be in english

2015-12-22 09:37:27 +01:00

bank.php

Enhancement on module Direct Debit SEPA.

2016-10-02 13:03:45 +02:00

barcode.php

select engine for code 128 didn't work

2016-06-02 11:41:26 +02:00

boxes.php

Fix responsive

2017-01-17 20:04:41 +01:00

chequereceipts.php

NEW #3510 : Working

2016-04-03 12:14:51 +02:00

clicktodial.php

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

commande.php

Fix regression: Textarea to enter data was crushed.

2017-02-07 01:13:04 +01:00

company.php

Fix css and look 5.0

2017-01-22 12:13:32 +01:00

compta.php

internationalization of code comment

2016-06-21 17:00:52 +02:00

confexped.php

Fix label on tab

2016-11-07 00:32:28 +01:00

const.php

Fix responsive

2017-01-17 20:04:41 +01:00

contract.php

Fix regression: Textarea to enter data was crushed.

2017-02-07 01:13:04 +01:00

delais.php

Fix warning for expense report late

2016-12-22 15:33:43 +01:00

dict.php

add selectform choice for private mailing

2017-02-24 11:12:14 +01:00

ecm.php

[Qual] Replaced deprecated print_fiche_titre()

2015-09-24 18:34:58 +02:00

events.php

Move online help link at a better place (top right). Link is also always

2015-11-14 22:49:34 +01:00

expedition_extrafields.php

[Qual] comments should be in english

2015-12-22 09:37:27 +01:00

expedition.php

Fix label on tab

2016-11-07 00:32:28 +01:00

expeditiondet_extrafields.php

[Qual] comments should be in english

2015-12-22 09:37:27 +01:00

expensereport_extrafields.php

NEW Support extrafields for expense reports

2016-09-06 13:00:32 +02:00

expensereport.php

NEW Support free bottom text and watermark on expense report template

2016-09-06 12:47:18 +02:00

external_rss.php

FIX #6330

2017-02-07 01:34:21 +01:00

facture.php

Fix regression: Textarea to enter data was crushed.

2017-02-07 01:13:04 +01:00

fckeditor.php

Upgrade to ckeditor 4.6.2.

2017-02-28 10:49:58 +01:00

fichinter.php

Fix regression: Textarea to enter data was crushed.

2017-02-07 01:13:04 +01:00

geoipmaxmind.php

[Qual] Uniformize code

2015-10-28 19:28:18 +01:00

ihm.php

Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop

2016-12-03 16:01:18 +01:00

index.php

If manage zero is set, we must NOT set length. So we can here make a

2017-03-10 11:50:57 +01:00

ldap_contacts.php

[Qual] Close database handler should be after Footer

2015-12-11 14:19:38 +01:00

ldap_groups.php

[Qual] Close database handler should be after Footer

2015-12-11 14:19:38 +01:00

ldap_members.php

NEW Add a filter field to restrict list of member when doing a LDAP list

2015-10-30 19:23:23 +01:00

ldap_users.php

NEW Do not use Functions Aliases

2016-07-15 17:58:14 +02:00

ldap.php

Update ldap translation

2016-07-27 17:26:04 +02:00

limits.php

Revert commit that break compatibility of 100% of modules

2016-03-25 15:24:57 +01:00

livraison_extrafields.php

[Qual] comments should be in english

2015-12-22 09:37:27 +01:00

livraison.php

Revert commit that break compatibility of 100% of modules

2016-03-25 15:24:57 +01:00

livraisondet_extrafields.php

[Qual] comments should be in english

2015-12-22 09:37:27 +01:00

loan.php

NEW: Loan - Add list to select accounting account in admin

2016-04-23 16:06:33 +02:00

mailing.php

[Qual] Uniformize code

2015-10-28 19:28:18 +01:00

mailman.php

[Qual] Uniformize code

2015-10-28 19:28:18 +01:00

mails_templates.php

Fix support for option MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES

2017-02-12 18:38:24 +01:00

mails.php

Move edition of emails templates out of dictionaries so we would be able

2017-02-12 18:13:49 +01:00

menus.php

Revert commit that break compatibility of 100% of modules

2016-03-25 15:24:57 +01:00

modulehelp.php

Fix php7 error

2017-02-12 20:40:20 +01:00

modules.php

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-03-11 02:40:42 +01:00

multicurrency.php

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-02-17 13:10:46 +01:00

notification.php

Merge branch 'abb-14' of https://github.com/bafbes/dolibarr into bafbes-abb-14

2016-07-15 17:05:12 +02:00

oauth.php

Enhancement of Oauth module

2016-10-07 18:43:44 +02:00

oauthlogintokens.php

Fix error on expired tokens

2017-01-07 14:48:05 +01:00

order_extrafields.php

[Qual] comments should be in english

2015-12-22 09:37:27 +01:00

orderdet_extrafields.php

[Qual] comments should be in english

2015-12-22 09:37:27 +01:00

payment.php

Debug multicurrency

2016-10-13 21:17:46 +02:00

pdf.php

Missing translation

2016-05-21 12:21:17 +02:00

perms.php

Fix responsive

2017-01-17 20:04:41 +01:00

prelevement.php

Work on SEPA mandate

2016-10-01 20:45:50 +02:00

propal.php

Fix regression: Textarea to enter data was crushed.

2017-02-07 01:13:04 +01:00

proxy.php

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

receiptprinter.php

Fix better perfomance in for

2016-06-04 13:12:05 +02:00

resource_extrafields.php

NEW : Add ressource extrafields

2016-10-19 22:14:51 +02:00

resource.php

Fix setup page

2016-10-19 22:24:04 +02:00

salaries.php

Modify a style center

2015-12-26 06:41:03 +01:00

security_file.php

Fix pb of responsive design

2016-07-31 18:28:59 +02:00

security_other.php

Revert commit that break compatibility of 100% of modules

2016-03-25 15:24:57 +01:00

security.php

Move online help link at a better place (top right). Link is also always

2015-11-14 22:49:34 +01:00

sms.php

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

spip.php

[Qual] Uniformize code

2015-10-29 13:58:16 +01:00

stock.php

Fix translation

2016-11-14 15:25:45 +01:00

supplier_invoice.php

Fix regression: Textarea to enter data was crushed.

2017-02-07 01:13:04 +01:00

supplier_order.php

Fix regression: Textarea to enter data was crushed.

2017-02-07 01:13:04 +01:00

supplier_payment.php

FIX pdf supplier payment work

2017-02-14 12:00:56 +01:00

supplier_proposal.php

Fix regression: Textarea to enter data was crushed.

2017-02-07 01:13:04 +01:00

supplierinvoice_extrafields.php

[Qual] comments should be in english

2015-12-22 09:37:27 +01:00

supplierinvoicedet_extrafields.php

[Qual] comments should be in english

2015-12-22 09:37:27 +01:00

supplierorder_extrafields.php

[Qual] comments should be in english

2015-12-22 09:37:27 +01:00

supplierorderdet_extrafields.php

[Qual] comments should be in english

2015-12-22 09:37:27 +01:00

syslog.php

CLOSE #5627 Allowed external logging modules.

2016-08-16 03:24:04 +02:00

taxes.php

Accountancy Add a list to select accounting account on tax admin

2015-12-26 06:35:56 +01:00

translation.php

Typo in SQL request

2016-12-28 10:26:31 +01:00

triggers.php

Fix css and look 5.0

2017-01-22 12:13:32 +01:00

user.php

Debug and rename experimental module "supplier proposal". Still work to

2015-11-15 19:23:39 +01:00

websites.php

Fix php7 compatibility

2016-10-31 21:24:23 +01:00

workflow.php

Uniformize code

2016-10-29 16:18:39 +02:00