Laurent Destailleur 90afbcb034 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/admin/bank.php
	htdocs/core/lib/functions.lib.php

2017-08-23 17:02:53 +02:00

..

dolistore

Fix for old php

2017-08-23 17:00:50 +02:00

menus

Fix menu editor

2017-07-30 19:41:45 +02:00

system

Fix var not sanitized

2017-05-16 13:27:32 +02:00

tools

Fix translation done twice into field title of array

2017-08-02 13:31:53 +02:00

agenda_extrafields.php

Fix help url

2017-08-22 08:12:30 +02:00

agenda_extsites.php

Fix help url

2017-08-22 08:12:30 +02:00

agenda_other.php

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

2017-08-23 17:02:53 +02:00

agenda_reminder.php

Prepare setup for email reminder

2017-08-20 16:07:22 +02:00

agenda_xcal.php

Fix help url

2017-08-22 08:12:30 +02:00

agenda.php

Fix help url

2017-08-22 08:12:30 +02:00

bank_extrafields.php

FIX #6850

2017-05-29 15:25:37 +02:00

bank.php

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

2017-08-23 17:02:53 +02:00

barcode.php

Removed duplicated code

2017-06-01 12:11:45 +02:00

boxes.php

New: big refactorization of multicompany transverse mode

2017-06-06 10:23:33 +02:00

chequereceipts.php

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

2017-08-23 16:11:51 +02:00

clicktodial.php

Fix var not sanitized

2017-05-16 13:27:32 +02:00

commande.php

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

2017-08-23 16:11:51 +02:00

company.php

Fix var not sanitized

2017-05-16 13:27:32 +02:00

compta.php

Update compta.php

2017-05-04 13:46:25 +02:00

confexped.php

Uniformize code

2017-03-22 20:34:01 +01:00

const.php

Replace usage of $bc[$var] with class="oddeven"

2017-04-14 13:02:29 +02:00

contract.php

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

2017-08-23 16:11:51 +02:00

defaultvalues.php

Fix translation done twice into field title of array

2017-08-02 13:31:53 +02:00

delais.php

Fix alignement

2017-06-27 11:32:52 +02:00

dict.php

Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report

2017-07-27 16:01:53 +02:00

ecm.php

Replace usage of $bc[$var] with class="oddeven"

2017-04-14 11:22:48 +02:00

events.php

Fix var not sanitized

2017-05-16 13:27:32 +02:00

expedition_extrafields.php

Uniformize code

2017-03-22 20:34:01 +01:00

expedition.php

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

2017-08-23 16:11:51 +02:00

expeditiondet_extrafields.php

Uniformize code

2017-03-22 20:34:01 +01:00

expensereport_extrafields.php

Add more substitution keys for PDFs.

2017-05-04 20:40:13 +02:00

expensereport_ik.php

Fix travis and rename 2 fields

2017-07-07 10:22:37 +02:00

expensereport_rules.php

New expense report rules and ik (index kilometers) - MAIN_USE_EXPENSE_IK - MAIN_USE_EXPENSE_RULE

2017-07-05 10:44:52 +02:00

expensereport.php

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

2017-08-23 16:11:51 +02:00

external_rss.php

Fix var not sanitized

2017-05-16 13:27:32 +02:00

facture.php

FIX image from medias directory into PDF free text

2017-06-17 00:16:22 +02:00

fckeditor.php

Replace usage of $bc[$var] with class="oddeven"

2017-04-14 11:22:48 +02:00

fichinter.php

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

2017-08-23 16:11:51 +02:00

geoipmaxmind.php

Fix var not sanitized

2017-05-16 13:27:32 +02:00

ihm.php

Complete work for mutualizing generic substitution system.

2017-06-01 01:57:22 +02:00

index.php

Fix translation

2017-06-17 12:00:33 +02:00

ldap_contacts.php

Fix style and align when no permission on widget

2017-06-10 00:05:47 +02:00

ldap_groups.php

Fix style and align when no permission on widget

2017-06-10 00:05:47 +02:00

ldap_members.php

Fix style and align when no permission on widget

2017-06-10 00:05:47 +02:00

ldap_users.php

Fix style and align when no permission on widget

2017-06-10 00:05:47 +02:00

ldap.php

Fix style and align when no permission on widget

2017-06-10 00:05:47 +02:00

limits.php

Replace usage of $bc[$var] with class="oddeven"

2017-04-14 13:02:29 +02:00

livraison_extrafields.php

Uniformize code

2017-03-22 20:34:01 +01:00

livraison.php

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

2017-08-23 16:11:51 +02:00

livraisondet_extrafields.php

Uniformize code

2017-03-22 20:34:01 +01:00

loan.php

Move html.formventilation.class.php to html.formaccounting.class.php

2017-05-25 06:57:28 +02:00

mailing.php

Replace usage of $bc[$var] with class="oddeven"

2017-04-14 13:02:29 +02:00

mailman.php

Fix var not sanitized

2017-05-16 13:27:32 +02:00

mails_templates.php

Fix remove warnings

2017-07-13 00:35:10 +02:00

mails.php

Look and feel v6

2017-07-14 02:07:01 +02:00

menus.php

Fix var not sanitized

2017-05-16 13:27:32 +02:00

modulehelp.php

Better detection if a module provide triggers

2017-08-03 12:19:31 +02:00

modules.php

Add option MAIN_DISABLE_DOLISTORE_SEARCH

2017-08-22 14:55:01 +02:00

multicurrency.php

Merge pull request #7152 from dolibarr95/patch-14

2017-07-21 15:07:00 +02:00

notification.php

Fix remove warnings

2017-07-09 20:31:27 +02:00

oauth.php

Update code using new css class

2017-04-25 11:59:18 +02:00

oauthlogintokens.php

Replace usage of $bc[$var] with class="oddeven"

2017-04-14 11:22:48 +02:00

order_extrafields.php

NEW Can use translations into all substitutions (watermark, freetext...)

2017-04-17 23:54:09 +02:00

orderdet_extrafields.php

NEW Can use translations into all substitutions (watermark, freetext...)

2017-04-17 23:54:09 +02:00

payment.php

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

2017-08-23 16:11:51 +02:00

pdf.php

Look and feel v6

2017-05-05 20:45:06 +02:00

perms.php

Fix style and align when no permission on widget

2017-06-10 00:05:47 +02:00

prelevement.php

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

2017-08-23 16:11:51 +02:00

propal.php

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

2017-08-23 16:11:51 +02:00

proxy.php

Fix var not sanitized

2017-05-16 13:27:32 +02:00

receiptprinter.php

Replace usage of $bc[$var] with class="oddeven"

2017-04-14 11:22:48 +02:00

resource_extrafields.php

…

resource.php

Replace usage of $bc[$var] with class="oddeven"

2017-04-14 11:22:48 +02:00

salaries.php

Move html.formventilation.class.php to html.formaccounting.class.php

2017-05-25 06:57:28 +02:00

security_file.php

Mutualize code

2017-08-18 16:25:00 +02:00

security_other.php

Replace usage of $bc[$var] with class="oddeven"

2017-04-14 11:22:48 +02:00

security.php

Fix var not sanitized

2017-05-16 13:27:32 +02:00

sms.php

Fix var not sanitized

2017-05-16 13:27:32 +02:00

spip.php

Fix var not sanitized

2017-05-16 13:27:32 +02:00

stock.php

Merge pull request #6805 from grandoc/new_branch_06_05

2017-05-10 22:51:31 +02:00

supplier_invoice.php

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

2017-08-23 16:11:51 +02:00

supplier_order.php

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

2017-08-23 16:11:51 +02:00

supplier_payment.php

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

2017-08-23 16:11:51 +02:00

supplier_proposal.php

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

2017-08-23 16:11:51 +02:00

supplierinvoice_extrafields.php

Maxi miscellaneous debug

2017-05-05 12:33:49 +02:00

supplierinvoicedet_extrafields.php

Maxi miscellaneous debug

2017-05-05 12:33:49 +02:00

supplierorder_extrafields.php

Maxi miscellaneous debug

2017-05-05 12:33:49 +02:00

supplierorderdet_extrafields.php

Maxi miscellaneous debug

2017-05-05 12:33:49 +02:00

syslog.php

Help/Need debug of some online instances with the log view

2017-06-20 16:54:37 +02:00

taxes.php

Move html.formventilation.class.php to html.formaccounting.class.php

2017-05-25 06:57:28 +02:00

translation.php

Fix translation done twice into field title of array

2017-08-02 13:31:53 +02:00

triggers.php

Do some TODO on modulebuilder module.

2017-07-16 13:00:35 +02:00

user.php

Removed duplicated code

2017-06-01 12:11:45 +02:00

usergroup.php

Removed duplicated code

2017-06-01 12:11:45 +02:00

websites.php

Fix invalid link after renaming a website key.

2017-08-22 15:32:45 +02:00

workflow.php

FIX Option to classify proposal/order in workflow module must not set

2017-07-13 12:42:32 +02:00