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

Conflicts:
	htdocs/filefunc.inc.php
	htdocs/install/mysql/data/llx_c_payment_term.sql
	htdocs/langs/en_US/bills.lang
	htdocs/langs/en_US/mails.lang

2016-12-16 13:56:55 +01:00

..

index.html

…

llx_00_c_country.sql

Fix missing countries

2016-10-10 17:00:11 +02:00

llx_10_c_regions.sql

NEW Add Panama datas

2016-08-03 09:45:12 +02:00

llx_20_c_departements.sql

NEW Add Panama datas

2016-08-03 09:45:12 +02:00

llx_accounting_category.sql

Cannot reproduce 4793 still fix other bug on PgSQL

2016-06-30 17:28:13 +02:00

llx_accounting.sql

Fix duplicate accounting account with same number. Add unique key.

2016-10-14 18:46:30 +02:00

llx_c_action_trigger.sql

FIX The project was lost when creating the event "sent by email". Also,

2016-07-21 13:49:10 +02:00

llx_c_actioncomm.sql

…

llx_c_availability.sql

…

llx_c_chargesociales.sql

added social charges for Austria

2015-12-09 09:32:21 +01:00

llx_c_civilite.sql

…

llx_c_currencies.sql

Add missing currency for madagascar

2016-11-29 12:28:17 +01:00

llx_c_ecotaxe.sql

…

llx_c_effectif.sql

…

llx_c_format_cards.sql

data

2016-02-06 12:16:12 +01:00

llx_c_forme_juridique.sql

NEW Add Panama datas

2016-08-03 09:45:12 +02:00

llx_c_holiday_type.sql

…

llx_c_hrm_department.sql

…

llx_c_hrm_function.sql

…

llx_c_incoterms.sql

…

llx_c_input_method.sql

Fix #3930 Removed executable bit

2015-12-09 13:28:36 +01:00

llx_c_input_reason.sql

Fix #3930 Removed executable bit

2015-12-09 13:28:36 +01:00

llx_c_lead_status.sql

…

llx_c_paiement.sql

…

llx_c_paper_format.sql

…

llx_c_payment_term.sql

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

2016-12-16 13:56:55 +01:00

llx_c_propalst.sql

…

llx_c_prospectlevel.sql

…

llx_c_revenuestamp.sql

…

llx_c_shipment_mode.sql

…

llx_c_stcomm.sql

…

llx_c_tva.sql

Debug accounting module

2016-10-21 14:48:55 +02:00

llx_c_type_contact.sql

Debug module resource

2016-06-06 12:29:15 +02:00

llx_c_type_fees.sql

…

llx_c_type_resource.sql

Fix resource module can't work because mandatory data not available.

2016-07-27 19:16:21 +02:00

llx_c_typent.sql

…

llx_c_units.sql

…

llx_const.sql

Fix constant

2016-11-29 11:23:15 +01:00

llx_holiday_config.sql

…