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

Conflicts:
	htdocs/filefunc.inc.php

2017-09-25 19:55:52 +02:00

..

index.html

…

llx_00_c_country.sql

…

llx_10_c_regions.sql

…

llx_20_c_departements.sql

…

llx_accounting_category.sql

Danish accounting accounts.

2017-09-09 21:19:02 +02:00

llx_accounting.sql

Fixed.

2017-09-09 22:21:55 +02:00

llx_c_action_trigger.sql

NEW Can send email from the member card using email templates.

2017-09-22 17:48:38 +02:00

llx_c_actioncomm.sql

Clean some code for type of event deprecated since 3.3

2017-05-19 12:58:38 +02:00

llx_c_availability.sql

…

llx_c_chargesociales.sql

…

llx_c_civilite.sql

…

llx_c_currencies.sql

Fix links

2017-08-23 18:52:03 +02:00

llx_c_ecotaxe.sql

…

llx_c_effectif.sql

…

llx_c_email_templates.sql

Convert sode to send member info email into new generic email template

2017-09-22 20:18:11 +02:00

llx_c_exp_tax_cat.sql

Fix travis and rename 2 fields

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

llx_c_exp_tax_range.sql

Fix travis and rename 2 fields

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

llx_c_format_cards.sql

…

llx_c_forme_juridique.sql

…

llx_c_holiday_type.sql

…

llx_c_hrm_department.sql

Less data example

2017-04-30 04:09:50 +02:00

llx_c_hrm_function.sql

…

llx_c_incoterms.sql

…

llx_c_input_method.sql

…

llx_c_input_reason.sql

…

llx_c_lead_status.sql

…

llx_c_paiement.sql

…

llx_c_paper_format.sql

…

llx_c_payment_term.sql

Move french text into english

2017-08-22 09:24:26 +02:00

llx_c_propalst.sql

…

llx_c_prospectlevel.sql

…

llx_c_revenuestamp.sql

…

llx_c_shipment_mode.sql

Better translation

2017-05-16 23:58:42 +02:00

llx_c_stcomm.sql

…

llx_c_tva.sql

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

2017-09-25 19:55:52 +02:00

llx_c_type_contact.sql

…

llx_c_type_fees.sql

Fix sql install

2017-08-26 21:03:13 +02:00

llx_c_type_resource.sql

…

llx_c_typent.sql

…

llx_c_units.sql

…

llx_const.sql

NEW data files are now also parsed by phpunit for sql syntax

2017-06-20 13:28:34 +02:00

llx_expensereport_ik.sql

Fix travis and rename 2 fields

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

llx_holiday_config.sql

…