dolibarr

Author	SHA1	Message	Date
phf	49b8689f2d	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact	2017-07-05 11:02:39 +02:00
phf	b8865c425f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report	2017-07-05 10:48:01 +02:00
phf	1beec51928	New expense report rules and ik (index kilometers) - MAIN_USE_EXPENSE_IK - MAIN_USE_EXPENSE_RULE	2017-07-05 10:44:52 +02:00
phf	42183877e8	Fix sql syntax	2017-07-04 09:30:53 +02:00
Laurent Destailleur	9e26e6b0a3	Fix bad value for ref of old contracts	2017-07-03 11:42:17 +02:00
Regis Houssin	3f882cb33a	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-03 09:24:05 +02:00
Darkjeff	30153f8c2e	add in bookkeeping date lim reglement Date lim reglement for export Sage and Iris correct avoir when write in bookkeeping	2017-07-03 07:21:15 +02:00
Laurent Destailleur	db1d97c9ac	Fix bad value for ref of old contracts	2017-07-03 02:09:14 +02:00
Laurent Destailleur	d57fe35efc	Add option to fix corrupted database with bad pagecode	2017-07-03 01:36:04 +02:00
Laurent Destailleur	aa1351d483	Fix to be sure database is not created using utf8mb4 (not yet supported)	2017-07-03 01:10:09 +02:00
Laurent Destailleur	efecb32ec9	Fix migration	2017-07-03 00:11:22 +02:00
Laurent Destailleur	b95dea3b50	Fix missing ;	2017-07-02 23:37:52 +02:00
Laurent Destailleur	727085f3ec	Fix missing migration column zip	2017-06-30 19:01:49 +02:00
Regis Houssin	fa247ffd98	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-29 08:51:42 +02:00
Laurent Destailleur	2f9cc1c919	Fix avoid errors with postgresql	2017-06-27 18:35:10 +02:00
Laurent Destailleur	c213624c14	Fix migration into product_lot	2017-06-27 16:42:37 +02:00
Laurent Destailleur	3b7667292b	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-27 11:59:40 +02:00
Laurent Destailleur	75006f9970	Fix data	2017-06-26 13:30:14 +02:00
Laurent Destailleur	3a6314b1a0	Fix data	2017-06-26 13:29:18 +02:00
Laurent Destailleur	78ebffe4f1	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog htdocs/install/fileconf.php	2017-06-25 02:31:38 +02:00
Laurent Destailleur	6298436a1b	Clean old lot numbers	2017-06-25 02:26:30 +02:00
Laurent Destailleur	ab9be29356	Fix installers	2017-06-24 21:36:51 +02:00
Laurent Destailleur	fed5999a6c	Update doc	2017-06-24 16:57:42 +02:00
Laurent Destailleur	0fd1308f93	Add force_disable_of_modules_not_found to clean database and removed false warning when modules files were removed with disabling it before	2017-06-22 14:06:48 +02:00
Laurent Destailleur	64eef9f89c	Fix compatibility with pgsql	2017-06-22 11:04:15 +02:00
Regis Houssin	2fffd2fa6f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-20 23:26:21 +02:00
Laurent Destailleur	f1701469e0	NEW data files are now also parsed by phpunit for sql syntax	2017-06-20 13:28:34 +02:00
Laurent Destailleur	095155a58b	Enhance sql quality. Refused double quotes into sql content.	2017-06-20 10:06:17 +02:00
Regis Houssin	909826e24f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-20 06:25:35 +02:00
Laurent Destailleur	74c509eac8	Fix bad var type (must be array)	2017-06-20 02:36:13 +02:00
Laurent Destailleur	d78d5d60c4	Fix pgsql Fix missing vat rate info.	2017-06-20 01:45:44 +02:00
Laurent Destailleur	2695cc416e	Fix comment	2017-06-19 21:06:16 +02:00
Laurent Destailleur	24f7128742	Fix pb with postgresql	2017-06-19 21:04:46 +02:00
Laurent Destailleur	64d8b97afe	Fix sql syntax errors	2017-06-19 20:35:14 +02:00
Laurent Destailleur	099ef585b2	Fix pgsql	2017-06-19 20:07:33 +02:00
Laurent Destailleur	1745d06bb7	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9	2017-06-19 19:56:16 +02:00
Laurent Destailleur	12d7b92556	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8	2017-06-19 19:52:49 +02:00
Laurent Destailleur	bdeddd3617	Fix pgsql migration	2017-06-19 19:48:19 +02:00
Laurent Destailleur	6fb0fc7b71	Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.7	2017-06-19 19:42:56 +02:00
Laurent Destailleur	f694939fc7	Fix migration with pgsql	2017-06-19 19:39:37 +02:00
Laurent Destailleur	3c73b426d7	Fix migration. Must make reload only on last version step.	2017-06-19 18:32:18 +02:00
Laurent Destailleur	c8b4ab87cb	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-19 15:08:10 +02:00
Laurent Destailleur	241ec01adf	FIX #7031 missing change column "state_id" since dolibarr 3.5 !!	2017-06-19 15:07:55 +02:00
Laurent Destailleur	cffb368bbd	Merge pull request #7030 from aspangaro/6.0-fec3 Fix : Accountancy - Debug and add information in database	2017-06-19 15:02:30 +02:00
Regis Houssin	c50b180e18	Fix: revert fix	2017-06-19 07:32:14 +02:00
Regis Houssin	544d051fe3	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-19 07:06:57 +02:00
Laurent Destailleur	caf48f32c4	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-19 03:01:01 +02:00
Laurent Destailleur	43f25b49a1	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-06-19 03:00:29 +02:00
Laurent Destailleur	5cd5986211	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2017-06-19 02:59:49 +02:00
Laurent Destailleur	39419bb411	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9	2017-06-19 02:59:16 +02:00
Laurent Destailleur	774c624687	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8	2017-06-19 02:58:44 +02:00
Laurent Destailleur	52eeeebac9	Fix bad data in sql dump	2017-06-19 02:57:49 +02:00
Laurent Destailleur	5439390461	Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.7	2017-06-19 02:57:12 +02:00
Laurent Destailleur	6fc4dacd42	Fix migration opensurvey	2017-06-19 02:55:33 +02:00
Laurent Destailleur	8d84277e8c	Complete repair script	2017-06-19 02:18:04 +02:00
Alexandre SPANGARO	e9b6afd2aa	Add last session coding - Add temporaly ledger	2017-06-18 22:17:32 +02:00
Regis Houssin	dcc152d4a4	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-18 06:52:20 +02:00
Laurent Destailleur	0482137620	Fix warning	2017-06-17 18:03:53 +02:00
Regis Houssin	a0299042e4	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-17 12:05:33 +02:00
Laurent Destailleur	81f1a34112	Revert "Fix SPEC #7013 : use database type "numeric" to store monetary values"	2017-06-16 13:06:35 +02:00
Laurent Destailleur	549bb2c55f	Merge pull request #7020 from aspangaro/7.0-1 Fix SPEC #7013 : use database type "numeric" to store monetary values	2017-06-16 12:59:52 +02:00
Laurent Destailleur	e813fd2dfa	Fix missing key import_key and extraparams	2017-06-16 12:57:30 +02:00
Alexandre SPANGARO	f424f96589	Fix SPEC #7013 : use database type "numeric" to store monetary values	2017-06-16 05:15:00 +02:00
Laurent Destailleur	8b7ca1f280	Fix missing vat_src_code into table of expense report	2017-06-15 21:27:20 +02:00
Laurent Destailleur	097be322a6	Modify code to match new v6 structure.	2017-06-15 19:29:00 +02:00
Laurent Destailleur	71c0be20b9	Change data structure for bookkeeping v6	2017-06-15 10:30:32 +02:00
Regis Houssin	cd095e99c9	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-14 12:16:10 +02:00
Laurent Destailleur	b889db997a	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture.php htdocs/core/datepicker.php htdocs/core/get_menudiv.php htdocs/core/menus/standard/auguria.lib.php htdocs/core/menus/standard/eldy.lib.php htdocs/core/search_page.php htdocs/main.inc.php htdocs/master.inc.php htdocs/product/list.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php htdocs/user/card.php htdocs/user/index.php	2017-06-14 10:48:34 +02:00
Laurent Destailleur	7939daa225	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/core/lib/functions.lib.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php htdocs/user/index.php	2017-06-14 10:18:24 +02:00
Regis Houssin	773abff80e	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-12 21:24:10 +02:00
Laurent Destailleur	ecf29332f3	Merge pull request #6989 from atm-alexis/NEW_blocklog_develop_refactor NEW Blokedlog stuff	2017-06-12 17:44:27 +02:00
Alexis Algoud	0312d2479d	add block info popin, translation, hidden authority feature	2017-06-12 10:26:24 +02:00
Laurent Destailleur	b80ee49032	Add missing currency for bengladesh	2017-06-11 19:27:21 +02:00
Laurent Destailleur	ca324346e4	Update doc	2017-06-11 19:08:40 +02:00
Regis Houssin	8b0354cfdf	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/compta/paiement/class/paiement.class.php htdocs/install/mysql/migration/5.0.0-6.0.0.sql	2017-06-11 16:43:31 +02:00
Laurent Destailleur	5471170a97	Merge pull request #6969 from atm-alexis/NEW_blocklog_develop_refactor NEW blockedlog hash and authority	2017-06-11 15:54:47 +02:00
Regis Houssin	3445c9d329	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/core/lib/functions.lib.php	2017-06-11 06:27:49 +02:00
Alexis Algoud	11d2a5538b	fix entity default value and add link to download blockchain	2017-06-11 00:03:01 +02:00
Laurent Destailleur	542a72c684	NEW custom dir is enabled dy default on first install. Fix modulebuilder when custom dir not defined.	2017-06-10 23:50:46 +02:00
Laurent Destailleur	acfaec684d	FIX CVE-2017-7888	2017-06-10 22:31:22 +02:00
Laurent Destailleur	36b18f0300	Save MAIN_VERSION_FIRST_INSTALL that is not erased.	2017-06-10 22:11:12 +02:00
Laurent Destailleur	9c482b9f2a	FIX CVE-2017-7886	2017-06-10 21:37:27 +02:00
Alexis Algoud	63b3010c2e	fix sql	2017-06-10 09:28:07 +02:00
Alexis Algoud	3d5899edf3	final blockedlog init	2017-06-10 09:25:32 +02:00
Regis Houssin	fc08adff0f	Fix: syntax error	2017-06-09 14:44:29 +02:00
Regis Houssin	1056473cdc	Try to fix travis error	2017-06-09 13:45:36 +02:00
Regis Houssin	c95b5a4567	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-09 08:04:08 +02:00
Laurent Destailleur	811b0d9af4	Fix missing thumbs images for products	2017-06-09 00:27:44 +02:00
alexis Algoud	9b3b2e600f	init blockedlog trigger and hash store	2017-06-08 17:52:02 +02:00
Regis Houssin	ade915af5f	New: add dictionnary sharing (multicompany)	2017-06-08 16:36:42 +02:00
Regis Houssin	4b98a1aefd	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-08 15:05:45 +02:00
phf	d6d451b54a	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact	2017-06-08 12:03:59 +02:00
phf	711f9696aa	New multi contacts on actioncomm	2017-06-08 12:02:39 +02:00
Laurent Destailleur	a1144e1f66	Fix missing init of hookmanager	2017-06-08 11:18:41 +02:00
Regis Houssin	1baa620688	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-08 10:33:26 +02:00
Regis Houssin	44dba391c1	New: add dictionnary sharing (multicompany)	2017-06-08 10:24:16 +02:00
Regis Houssin	bb37c2f980	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_transverse	2017-06-06 13:54:33 +02:00
Laurent Destailleur	4bda7fcafc	Merge pull request #6949 from aspangaro/6.0-vat2 NEW : VAT payment v6 look and feel	2017-06-06 11:08:50 +02:00
Regis Houssin	7ed0643b52	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_transverse	2017-06-06 10:54:16 +02:00
Laurent Destailleur	c50006c91b	Merge pull request #6936 from aspangaro/6.0-multijournal Accountancy - Activate multijournal on bank_journal	2017-06-06 10:38:05 +02:00
Regis Houssin	79a0b959d1	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_transverse	2017-06-06 10:36:37 +02:00
Regis Houssin	b66da3d148	New: big refactorization of multicompany transverse mode	2017-06-06 10:23:33 +02:00
Laurent Destailleur	22efbabfa6	NEW Add hook doUpgrade2	2017-06-06 01:34:25 +02:00
Alexandre SPANGARO	e547aa8aee	NEW : VAT payment v6 look and feel	2017-06-05 15:41:33 +02:00
Alexandre SPANGARO	806d25ae41	Activate multi-journal on expensereport journal	2017-06-05 06:44:53 +02:00
Alexandre SPANGARO	ef9275d031	Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal # Conflicts: # htdocs/core/menus/standard/eldy.lib.php	2017-06-03 07:48:50 +02:00
Alexandre SPANGARO	90c1a38486	Accountancy - Activate multijournal on bank_journal	2017-06-03 07:23:14 +02:00
Laurent Destailleur	504ea85334	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-03 01:55:27 +02:00
Laurent Destailleur	7f18dfee0d	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: dev/skeletons/build_class_from_table.php dev/skeletons/skeleton_card.php htdocs/compta/facture/class/facture.class.php htdocs/core/lib/functions.lib.php htdocs/filefunc.inc.php htdocs/projet/card.php	2017-06-03 01:55:05 +02:00
Laurent Destailleur	af01e544d5	Merge branch 'develop' into fix_develop_missing_entity_column	2017-06-03 01:11:49 +02:00
Laurent Destailleur	4e397107e1	Merge pull request #6934 from atm-florian/dev_loancalc NEW : Add calculation function for Loan schedule	2017-06-03 01:10:39 +02:00
atm-ph	70a188c042	Fix missing column entity on llx_accounting_journal after init demo with the bash	2017-06-02 21:45:02 +02:00
florian HENRY	b0f2db7aaa	NEW : Add calculation function for Loan schedule	2017-06-02 17:48:29 +02:00
Laurent Destailleur	447db1b324	Fix orphelins for categories tables	2017-06-02 13:46:30 +02:00
Laurent Destailleur	9b4c929d79	NEW Add phpunit to check the engine is defined into sql create files.	2017-06-01 16:09:09 +02:00
Laurent Destailleur	733d1caac6	Correct usage of parameter 'none' in GETPOST	2017-06-01 12:37:16 +02:00
Laurent Destailleur	07a6bb5664	More files to delete in migration	2017-06-01 12:26:17 +02:00
Laurent Destailleur	c9a09adf79	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/langs/en_US/main.lang	2017-05-31 12:50:29 +02:00
Laurent Destailleur	d2813eabbc	FIX #6877 Conflicts: htdocs/install/mysql/migration/5.0.0-6.0.0.sql	2017-05-29 13:41:59 +02:00
Laurent Destailleur	19b8918caf	FIX #6881	2017-05-29 13:40:08 +02:00
Laurent Destailleur	4824942369	FIX #6877	2017-05-29 13:39:07 +02:00
Laurent Destailleur	85e0ded573	FIX #6881	2017-05-29 13:35:51 +02:00
Laurent Destailleur	1da648402d	Merge pull request #6886 from hregis/develop_bug Fix: use encrypt for llx_const data	2017-05-29 10:16:07 +02:00
Laurent Destailleur	d19a8929df	Merge pull request #6875 from atm-ph/fix_develop_ref_column_inventory Fix missing column ref on migration for inventory	2017-05-29 10:11:26 +02:00
Laurent Destailleur	7a1480d362	Look and feel v6	2017-05-26 00:02:41 +02:00
Laurent Destailleur	ca08f814c1	Remove deprecated files	2017-05-25 19:38:42 +02:00
Laurent Destailleur	e5fe629a0e	NEW Extrafields support formulas to be computed using PHP expressions	2017-05-24 22:48:44 +02:00
Regis Houssin	55121c5e05	Fix: use encrypt for llx_const data	2017-05-24 16:35:02 +02:00
Laurent Destailleur	cea98ce5cb	Look and feel v6	2017-05-23 15:30:56 +02:00
Laurent Destailleur	80ce8da7a3	Fix migration errors and responsive design	2017-05-23 15:13:52 +02:00
phf	9bc60b8aa5	Fix missing column ref on migration for inventory	2017-05-22 09:26:10 +02:00
Laurent Destailleur	80cbc28385	NEW Add REST API to push a file.	2017-05-20 15:52:36 +02:00
Laurent Destailleur	e340a53f7c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-05-20 11:58:50 +02:00
Laurent Destailleur	df05980c3a	Prepare table of notification per object (exemple agenda events)	2017-05-20 10:42:45 +02:00
Alexandre SPANGARO	1da0959a3a	Merge remote-tracking branch 'uptream/develop' into 6.0-grh	2017-05-20 08:03:29 +02:00
Alexandre SPANGARO	4ff9607011	Update table accounting_bookeeping to prepare FEC format and harmonization	2017-05-20 07:56:33 +02:00
Laurent Destailleur	330b9e7038	Merge pull request #6866 from absnc/project_element_shipping NEW Enable shipments in Project overview tab	2017-05-19 17:10:51 +02:00
Laurent Destailleur	aec4cef5de	Clean some code for type of event deprecated since 3.3	2017-05-19 12:58:38 +02:00
absnc	7b784a1dcb	Enable shipments for project overview tab	2017-05-19 17:50:10 +11:00
Laurent Destailleur	0b0dbd9649	Code comment	2017-05-18 17:57:20 +02:00
Laurent Destailleur	56989ae5af	Add missing fields making not possible to enter reference price of products into another currency	2017-05-17 15:10:45 +02:00
Laurent Destailleur	7931c548c7	Better translation	2017-05-16 23:58:42 +02:00
Laurent Destailleur	68e333879f	Fix var not sanitized	2017-05-16 13:27:32 +02:00
Laurent Destailleur	ce84990414	NEW On invoices generated by template, we save if of source template.	2017-05-16 02:46:19 +02:00
Laurent Destailleur	9b550ae178	Fix migration of accountancy_journal from char to num.	2017-05-14 12:54:26 +02:00
Laurent Destailleur	b5b97816c8	FIX #6803	2017-05-13 14:06:14 +02:00
Laurent Destailleur	6f9e67b1fb	Remove no more used constant	2017-05-13 13:08:25 +02:00
Laurent Destailleur	0d11fce834	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-05-12 15:45:30 +02:00
Laurent Destailleur	5581e5da72	FIX New vat code not correctly implemented if "1 price per customer".	2017-05-12 13:12:17 +02:00
Laurent Destailleur	30cf3f2bda	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/bank/class/account.class.php htdocs/core/class/html.formfile.class.php htdocs/core/lib/functions.lib.php htdocs/filefunc.inc.php htdocs/install/mysql/tables/llx_bank_account.sql	2017-05-11 00:03:06 +02:00
Laurent Destailleur	1c7d9b9d9a	Merge pull request #6804 from aspangaro/6.0-multijournal New : Accountancy - Add a list to select the bank journal in bank card	2017-05-10 22:46:30 +02:00
Laurent Destailleur	52de60c49b	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-05-10 18:17:58 +02:00
Laurent Destailleur	002bebd837	Fix missing extraparams make sql syntax error	2017-05-10 18:15:01 +02:00
Laurent Destailleur	fe8d34c73b	Add field extraparams on llx_bank_account	2017-05-10 17:50:10 +02:00
Laurent Destailleur	8781f6bcf2	Add vat code on predefined invoice	2017-05-10 14:53:20 +02:00
Laurent Destailleur	b8b91db007	Use function top_httphead to include headers in pages.	2017-05-09 21:46:57 +02:00
Laurent Destailleur	39b4549813	Make option MAIN_SECURITY_CSRF_WITH_TOKEN more visible	2017-05-09 19:43:50 +02:00
Laurent Dinclaux	2b7dcfa56d	Add missing vat_src_code field to predefined invoices table	2017-05-09 21:07:32 +11:00
Laurent Destailleur	9fe28c9b2c	NEW Can disable all overwrote translations in one click.	2017-05-09 10:08:04 +02:00
Alexandre SPANGARO	dd97bbdc82	Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal	2017-05-07 15:10:30 +02:00
Laurent Destailleur	46ff62fc87	Work on inventory module debug	2017-05-06 22:28:07 +02:00
Alexandre SPANGARO	7c4b47f20d	Update works	2017-05-06 08:33:12 +02:00
Alexandre SPANGARO	68aaef2f66	Add list to select journal in bank	2017-05-06 08:06:01 +02:00
Laurent Destailleur	fc5f4007a1	Debug accountancy module. Page for bank journalization is still KO.	2017-05-05 16:54:05 +02:00
Laurent Destailleur	885a636351	Debug new journal list page	2017-05-05 16:35:05 +02:00
Laurent Destailleur	11b1a2adac	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/journal/bankjournal.php htdocs/accountancy/journal/expensereportsjournal.php htdocs/accountancy/journal/purchasesjournal.php htdocs/accountancy/journal/sellsjournal.php htdocs/comm/propal/class/api_proposals.class.php htdocs/comm/propal/class/propal.class.php htdocs/compta/bank/index.php htdocs/compta/facture.php htdocs/core/class/html.form.class.php htdocs/includes/odtphp/Segment.php htdocs/langs/en_US/admin.lang htdocs/societe/soc.php	2017-05-05 14:49:25 +02:00
Laurent Destailleur	b7f7683e5a	Merge pull request #6774 from aspangaro/6.0-multijournal Finish to move accountancy journals list to page like dictionnary	2017-05-05 14:21:55 +02:00
Laurent Destailleur	91c505c9c9	Update llx_accounting.sql	2017-05-05 14:20:59 +02:00
Laurent Destailleur	0bffac6dc4	Use constant vor status.	2017-05-05 13:43:43 +02:00
Laurent Destailleur	f069ef9844	FIX #6767	2017-05-05 09:16:11 +02:00
Laurent Destailleur	f32d19fb73	FIX #6767 serious critical error no login possible	2017-05-05 09:15:14 +02:00
Laurent Destailleur	8009370f04	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/contact/document.php htdocs/core/tpl/objectline_create.tpl.php htdocs/install/mysql/migration/repair.sql	2017-05-04 10:01:11 +02:00
Laurent Destailleur	b8f5e93ab0	Debug inventory data model	2017-05-02 21:40:18 +02:00
Laurent Destailleur	0bc46facd7	Add missing vat_src_code on recurring invoices	2017-05-02 21:24:18 +02:00
Laurent Destailleur	31d99bbfe6	Complete event tracked automatically	2017-05-02 12:17:25 +02:00
Laurent Destailleur	9641a240ea	Complete vat dictionnary	2017-05-02 11:27:35 +02:00
Alexandre SPANGARO	6afd0d642a	Finish to move accountancy journals list to page like dictionnary	2017-05-01 08:16:09 +02:00
Laurent Destailleur	60951cf307	Less data example	2017-04-30 04:09:50 +02:00
Laurent Destailleur	b57bf6460b	Start debug inventory	2017-04-30 02:34:00 +02:00
Laurent Destailleur	50d65e3a9f	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 Conflicts: htdocs/install/mysql/migration/repair.sql	2017-04-29 17:40:47 +02:00
phf	8219ff84c8	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview	2017-04-28 14:45:04 +02:00
Laurent Destailleur	0ba6433a61	Work on module website	2017-04-28 13:10:08 +02:00
Laurent Destailleur	cfde27820e	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/translation.php htdocs/comm/card.php htdocs/core/menus/standard/eldy.lib.php	2017-04-27 17:20:40 +02:00
Laurent Destailleur	e97fae0c43	Fix typo	2017-04-27 12:10:08 +02:00
Laurent Destailleur	1c20bbb287	NEW Add index and constraints keys on supplier proposal detail table	2017-04-26 12:11:33 +02:00
Laurent Destailleur	84e774ff32	Better translation	2017-04-25 12:57:20 +02:00
Laurent Destailleur	a2287fd183	Add example of sql request to fix llx_product_price	2017-04-24 13:46:41 +02:00
Laurent Destailleur	65fec95458	Fix debian package	2017-04-24 04:17:59 +02:00
Laurent Destailleur	e97e202deb	NEW Can import users	2017-04-17 04:22:53 +02:00
Laurent Destailleur	4c056d68d8	Merge branch '5.0' of git@github.com: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	2017-04-15 17:02:05 +02:00
Laurent Destailleur	ac884ec463	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/install/repair.php	2017-04-15 16:28:08 +02:00
Laurent Destailleur	7fe66581f1	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2017-04-15 16:24:30 +02:00
Laurent Destailleur	72ff353e9f	Fix repair of product_stock	2017-04-15 16:22:15 +02:00
Laurent Destailleur	086fa4385f	Fix clean of product_batch	2017-04-15 16:17:22 +02:00
Laurent Destailleur	39ebaec064	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00
Laurent Destailleur	a73d72f243	Add tables for default values	2017-04-14 10:14:23 +02:00
Laurent Destailleur	26a9999fbf	Support of preview for pdf with several pages	2017-04-12 11:38:55 +02:00
Laurent Destailleur	f598bf8bef	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2017-04-06 21:59:11 +02:00
Laurent Destailleur	dc14268ac6	FIX complete hourly rate when not defined into table of time spent	2017-04-05 15:24:41 +02:00
Laurent Destailleur	9678c2128e	Add field langs into extrafields definition table	2017-04-03 10:29:20 +02:00
Laurent Destailleur	cab944a1a1	Merge pull request #6602 from aspangaro/6.0-multijournal New : [FP17] Accounting multi-journals	2017-03-31 17:45:10 +02:00
Laurent Destailleur	01a74a8d23	Work on 6.0 look and feel	2017-03-31 17:41:20 +02:00
Laurent Destailleur	979bcd3a9b	NEW Can add a background image on login page	2017-03-31 11:40:31 +02:00
Laurent Destailleur	aca1c1944d	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/install/mysql/data/llx_c_action_trigger.sql	2017-03-30 12:02:27 +02:00
Laurent Destailleur	f01815519a	Fix trigger of automatic events	2017-03-30 11:25:28 +02:00
Laurent Destailleur	e416ea275e	Work on 6.0 look and feel	2017-03-28 21:04:38 +02:00
phf	c3e8a5be62	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview	2017-03-28 17:20:50 +02:00
Laurent Destailleur	6bf61c677f	FIX #6586 Introduce processing status	2017-03-28 13:20:31 +02:00
Alexandre SPANGARO	fc2b9a858b	New : [FP17] Add multijournals in accountancy admin	2017-03-28 06:35:03 +02:00
Alexandre SPANGARO	aa924bf010	Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal # Conflicts: # htdocs/install/mysql/migration/5.0.0-6.0.0.sql	2017-03-27 22:35:06 +02:00
BENKE Charlie	9871bc3d9a	Update 5.0.0-6.0.0.sql	2017-03-26 19:35:00 +02:00
BENKE Charlie	d60f1d8402	add price_level on product_customer_price_log fk_soc can be 0 when generic price is stored on log	2017-03-26 19:29:16 +02:00
atm-ph	76b95aeec0	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview	2017-03-25 19:15:25 +01:00
atm-ph	e3afa06cf3	Fix inventory sql	2017-03-25 18:01:43 +01:00
Laurent Destailleur	278bbf184c	Merge pull request #6546 from aspangaro/6.0-new_bank_direct_input New : Add Various payment submodule linked to the accountancy to replace free input in bank	2017-03-24 22:52:39 +01:00
Laurent Destailleur	6f3231745e	Merge pull request #6564 from tiaris/devcamp bug 6563 installation issue with	2017-03-24 22:47:50 +01:00
atm-ph	edc2d39702	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview	2017-03-24 17:06:40 +01:00
jean	cdb1de7596	bug 6563 installation issue with doctemplates/usergroups/template_usergroups.odt	2017-03-24 16:48:44 +01:00
BENKE Charlie	80f78e66bb	error on install	2017-03-24 15:30:46 +01:00
Laurent Destailleur	f241bfefd0	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-03-23 20:20:59 +01:00
Laurent Destailleur	53a04703d6	Uniformize code	2017-03-23 16:10:38 +01:00
gauthier	6cecab4c92	FIX : forgottent fk_unit field on llx_supplier_propaldet	2017-03-22 16:43:12 +01:00
Laurent Destailleur	db35db127c	Do not allow to migrate n+2 before n+1	2017-03-20 19:21:26 +01:00
Alexandre SPANGARO	6d5578a876	Reactivated constant BANK_DISABLE_DIRECT_INPUT	2017-03-19 20:47:30 +01:00
Laurent Destailleur	4831fb4dcb	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/adherents/class/adherent.class.php htdocs/filefunc.inc.php	2017-03-19 11:26:49 +01:00
Alexandre SPANGARO	0e910616b6	Update table	2017-03-19 07:25:19 +01:00
Laurent Destailleur	5871d59db9	Fix error "Invalid default value for 'date_price'"	2017-03-18 15:25:49 +01:00
Alexandre SPANGARO	8328c04624	2nd step : Add table	2017-03-18 08:12:29 +01:00
Alexandre SPANGARO	16b12b33fc	First step : remove BANK_DISABLE_DIRECT_INPUT	2017-03-18 07:24:55 +01:00
Laurent Destailleur	d951114c18	Merge branch 'develop' into NEW_odt_others_objects	2017-03-14 10:44:05 +01:00
arnaud	3ab7bac511	FIX fresh install const	2017-03-14 09:37:51 +01:00
arnaud	192a825de8	NEW ODT docs for USER USERGROUP CONTRACT and PRODUCT class	2017-03-14 09:25:29 +01:00
Alexandre SPANGARO	c6c07bf9f4	New : Add project to social contributions	2017-03-12 14:32:49 +01:00
arnaud	a796a321cc	Merge branch '3.9_dalibo' of github.com:ATM-Consulting/dolibarr into NEW_odt_others_objects Conflicts: htdocs/core/class/html.formfile.class.php htdocs/product/admin/product.php htdocs/product/card.php	2017-03-10 12:16:55 +01:00
arnaud	4a7e3fb387	NEW odt usergroup	2017-03-08 11:34:21 +01:00
Laurent Destailleur	5f79b2d0c6	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/admin/account.php htdocs/accountancy/admin/categories.php htdocs/expensereport/class/expensereport.class.php htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2017-03-05 22:11:35 +01:00
Laurent Destailleur	f67c967d0b	FIX The vat rate line used when adding a predefined product was wrong if there is several vat line with same rate.	2017-03-04 22:27:44 +01:00
Laurent Destailleur	832c91417a	Fix the default_vat_code was not correctly saved and shown on the product price.	2017-03-04 19:16:09 +01:00
Laurent Destailleur	5d18aad15f	Add the vat_code on all table of prices	2017-03-04 14:18:04 +01:00
Laurent Destailleur	bef5f2c236	FIX #6465	2017-03-03 15:06:17 +01:00
Laurent Destailleur	28ad50e059	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/tpl/objectline_create.tpl.php htdocs/langs/de_DE/bills.lang htdocs/langs/fr_FR/bills.lang htdocs/langs/fr_FR/main.lang htdocs/langs/fr_FR/suppliers.lang	2017-03-03 14:31:35 +01:00
Laurent Destailleur	807eb56807	Add BHD currency	2017-03-03 13:15:20 +01:00
Laurent Destailleur	57b532cdd0	Fix status of opportunity is required if an amount is defined	2017-03-02 12:56:22 +01:00
Laurent Destailleur	8487f0fc96	Fix missing setup of new option	2017-03-01 11:18:11 +01:00
Laurent Destailleur	0f22beb774	Upgrade to ckeditor 4.6.2.	2017-02-28 10:49:58 +01:00
Laurent Destailleur	821324868a	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-27 12:15:31 +01:00
Laurent Destailleur	1f693ca586	Code comment	2017-02-27 12:07:14 +01:00
Laurent Destailleur	1ef899dacc	Prepare database to follow supplier discounts	2017-02-24 15:22:32 +01:00
Laurent Destailleur	a0fb53d5b1	Merge branch 'develop' into NEW_pdf_supplier_payment	2017-02-22 14:20:47 +01:00
Laurent Destailleur	7ab600781d	NEW Move login information on home page into a widget	2017-02-21 11:57:52 +01:00
Laurent Destailleur	eef3824f8c	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/admin/categories.php htdocs/admin/dict.php htdocs/langs/de_DE/bills.lang htdocs/langs/en_US/main.lang htdocs/langs/fr_FR/bills.lang	2017-02-21 10:34:52 +01:00
Laurent Destailleur	847f408508	More complete repair	2017-02-17 20:47:22 +01:00
arnaud	4ec664029d	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_pdf_supplier_payment	2017-02-17 16:40:14 +01:00
Laurent Destailleur	8d03f86f45	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-17 13:10:46 +01:00
Laurent Destailleur	beaa56306c	Add united arab emirates to states.	2017-02-17 10:06:49 +01:00
Alexandre SPANGARO	c06aedc54d	[FP17] : Add data in llx_accountancy_journal	2017-02-15 20:55:52 +01:00
arnaud	977c18513d	FIX pdf supplier payment work	2017-02-14 12:00:56 +01:00
Laurent Destailleur	f4e64685e8	Merge pull request #6397 from apachler/develop added additional payment terms often needed in Austria	2017-02-08 16:47:40 +01:00
Laurent Destailleur	072fa9987b	Update 4.0.0-5.0.0.sql	2017-02-08 16:47:27 +01:00
Andreas Pachler	c45b40075d	fixed typos	2017-02-08 12:55:03 +01:00
Andreas Pachler	ae3ace7e94	added additional payment terms often needed in Austria	2017-02-08 12:46:42 +01:00
Laurent Destailleur	e1a6e6e4ab	Rename "attributes" into "variants" to avoid confusion with extrafields	2017-02-08 12:37:38 +01:00
Laurent Destailleur	b24f244f67	Merge pull request #5533 from marcosgdf/prod-attr Feature Request: NEW Added product attributes feature	2017-02-08 11:20:33 +01:00
Laurent Destailleur	31c3398b7f	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/modules.php	2017-02-08 10:59:05 +01:00
Laurent Destailleur	b0ee04c079	FIX #6379	2017-02-07 01:13:50 +01:00
Laurent Destailleur	2d77cb2da5	FIX #6379	2017-02-07 00:54:54 +01:00
Marcos García de La Fuente	d06fb423c0	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/fourn/commande/card.php # htdocs/fourn/facture/card.php # htdocs/langs/en_US/products.lang	2017-02-02 20:07:41 +01:00
Laurent Destailleur	13f37b2cb9	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-02 02:25:49 +01:00
Laurent Destailleur	1785ef9957	Code comment	2017-02-02 00:59:07 +01:00
Laurent Destailleur	218e49298a	Uniformize field names	2017-01-31 14:10:06 +01:00
Laurent Destailleur	4cec071af5	Add tms field	2017-01-31 14:00:53 +01:00
Laurent Destailleur	fcfea4e6d1	Add missing field fk_user_modif	2017-01-27 13:26:31 +01:00
Laurent Destailleur	29df2c9115	Merge branch 'develop' into mail-lines	2017-01-27 01:29:58 +01:00
Laurent Destailleur	39151d7a74	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-22 12:14:18 +01:00
Laurent Destailleur	65f7de8f64	Fix css and look 5.0	2017-01-22 12:13:32 +01:00
Marcos García de La Fuente	d09a3628c5	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/compta/facture.php	2017-01-14 23:59:14 +01:00
Laurent Destailleur	2c6672d17a	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/tpl/login.tpl.php	2017-01-12 11:32:51 +01:00
Laurent Destailleur	749f8cf252	Fix translation	2017-01-12 00:15:00 +01:00
Alexis Algoud	65b956b011	NEW sql for inventory	2017-01-09 10:33:33 +01:00
Gustavo Novaro	3e77fed815	Fix missing ,	2017-01-08 01:59:04 -03:00
Laurent Destailleur	e9853f3cd7	Merge branch 'develop' of https://github.com/Franck-MOREAU/dolibarr into Franck-MOREAU-develop Conflicts: htdocs/core/lib/functions.lib.php htdocs/install/mysql/migration/4.0.0-5.0.0.sql htdocs/loan/card.php htdocs/loan/class/loan.class.php htdocs/projet/element.php	2017-01-07 17:45:05 +01:00
Laurent Destailleur	1d291ee0e8	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-07 17:07:29 +01:00
Laurent Destailleur	4002ec9fd5	Fix css install and login	2017-01-06 15:51:08 +01:00
Laurent Destailleur	206335bc56	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-01-04 18:14:19 +01:00
Laurent Destailleur	983efdd6ee	FIX repair tool was ko to restore extrafields with type select.	2017-01-04 18:13:36 +01:00
Laurent Destailleur	febd23fe41	Clean dead code	2017-01-03 11:22:03 +01:00
Laurent Destailleur	728dd3f7b3	Add field ref into ecm_files table.	2017-01-03 11:06:24 +01:00
Laurent Destailleur	c27a1c1705	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-03 01:34:46 +01:00
Laurent Destailleur	598e559563	Fix migration	2017-01-02 19:30:12 +01:00
Laurent Destailleur	afe5c6b296	Fix migration	2017-01-02 18:44:11 +01:00
Laurent Destailleur	f023d6485f	Prepare 6.0 dev	2017-01-02 18:39:55 +01:00
Laurent Destailleur	7dc55daf38	FIX #6229	2017-01-02 14:37:07 +01:00
Ion Agorria	522fb4cf7a	Add email template for each line in object	2016-12-31 17:39:01 +01:00
Laurent Destailleur	f1961b0207	Work on sorting/indexing upload files	2016-12-31 03:43:22 +01:00
Marcos García de La Fuente	47a444b2ab	Merge branch 'develop' into prod-attr	2016-12-27 15:54:53 +01:00
Laurent Destailleur	b5c815367c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6	2016-12-26 15:44:31 +01:00
Laurent Destailleur	b9e362833f	More complete label	2016-12-26 13:15:14 +01:00
Laurent Destailleur	45028de51f	Better fix for install on distant server	2016-12-25 23:47:25 +01:00
Marcos García de La Fuente	5669f734b8	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/comm/propal/card.php # htdocs/commande/card.php # htdocs/compta/facture.php # htdocs/core/class/html.form.class.php # htdocs/core/tpl/objectline_create.tpl.php # htdocs/fourn/commande/card.php # htdocs/fourn/facture/card.php # htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-12-24 21:39:40 +01:00
Laurent Destailleur	46a8041143	Clean orphelins	2016-12-23 15:22:25 +01:00
Laurent Destailleur	cb4e0233b9	Fix orphelins	2016-12-23 15:21:38 +01:00
Laurent Destailleur	2bfbf0f6a7	Fix css	2016-12-23 00:37:32 +01:00
Laurent Destailleur	1e1028605d	FIX If mysql server is distant, the creation of user must use % as host with mysql.	2016-12-23 00:23:57 +01:00
Laurent Destailleur	ba7ca3da6e	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6 Conflicts: htdocs/core/photos_resize.php htdocs/install/mysql/data/llx_c_action_trigger.sql	2016-12-22 17:57:42 +01:00
Laurent Destailleur	3c79f3acb5	Minor fixes or code comment	2016-12-20 12:06:26 +01:00
Laurent Destailleur	08449a2d4f	Prepare action tracking on products	2016-12-20 12:05:00 +01:00
Laurent Destailleur	ac44aa6d81	FIX security bugs	2016-12-18 13:24:06 +01:00
Laurent Destailleur	a736f3782c	FIX security bugs	2016-12-18 13:21:09 +01:00
Laurent Destailleur	78bf209119	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6	2016-12-18 02:21:57 +01:00
Gustavo Novaro	99c73cf11a	HTML 5 doctype Improve install header to use html 5 doctype	2016-12-17 04:48:41 -03:00
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
Laurent Destailleur	d32fd7aa11	FIX javascript xss injection and a translation	2016-12-15 11:55:33 +01:00
Laurent Destailleur	c11888bcde	Fix responsive	2016-12-13 02:18:14 +01:00
Laurent Destailleur	76195f9e45	Fix translation	2016-12-13 01:58:28 +01:00
Laurent Destailleur	e1a5a90f0a	NEW Uploaded files are indexed into database	2016-12-13 00:15:21 +01:00
Laurent Destailleur	71d2ee3aa9	Fix default of a column	2016-12-12 20:30:21 +01:00
Laurent Destailleur	e26cb0f238	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6	2016-12-12 13:00:20 +01:00
jfefe	d5128a1889	FIX #6129 : correct test on database connection	2016-12-10 23:12:03 +01:00
Juanjo Menent	829ff2299e	Fix: Delete surplus migration file	2016-12-10 12:46:26 +01:00
Laurent Destailleur	d5c7151bc8	FIX #6102	2016-12-10 12:11:09 +01:00
Laurent Destailleur	3396dfc7f6	NEW Index upload files into database.	2016-12-08 22:12:45 +01:00
Laurent Destailleur	788cbf9a01	Complete work on dol_banner on contracts	2016-12-04 13:30:17 +01:00
Laurent Destailleur	888c4cd2ad	Fix corrupted value for pointoftax field	2016-12-03 20:15:56 +01:00
Laurent Destailleur	17bc24e83e	Complete repair	2016-12-03 20:05:49 +01:00
Laurent Destailleur	fb2f33cfac	FIX Clean corrupted data	2016-12-03 19:48:08 +01:00
Laurent Destailleur	495ba00cb6	Fix: Slurp, database corruption due to missing unique key on main key.	2016-12-02 14:21:46 +01:00
Laurent Destailleur	0ec9dd9b88	Merge pull request #6048 from ozit/patch-1 an extra comma at the end	2016-11-29 23:37:41 +01:00
Laurent Destailleur	9ff38ee136	Add missing currency for madagascar	2016-11-29 12:28:17 +01:00
Laurent Destailleur	39c2088aa5	Fix constant	2016-11-29 11:23:15 +01:00
Laurent Destailleur	83972b39ce	Complete work on dol_banner. Fix errors due to missing columns.	2016-11-28 23:58:36 +01:00
Oziel AO	2c8f2f220a	an extra comma at the end note text not note text,	2016-11-28 12:29:30 +01:00
Marcos García de La Fuente	cf0ee36150	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-11-27 18:10:01 +01:00
Laurent Destailleur	e6fb118155	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2016-11-26 15:52:17 +01:00
Laurent Destailleur	b63ad019ce	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2016-11-26 15:49:11 +01:00
Laurent Destailleur	e9b78db1ac	Several bug fixes: missing import_key field, ref generator parameter must be task not project, import must use css, serious database integrity problem accepting duplicate tasks.	2016-11-19 02:16:12 +01:00
florian HENRY	44aa601848	again revert to fk_project instead of fk_projet	2016-11-16 11:11:50 +01:00
florian HENRY	a251f0df51	Various fix on Loan and project link	2016-11-16 09:38:13 +01:00
moreauf	f97bab6fb8	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop Conflicts: htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-11-15 08:35:25 +01:00
moreauf	081be37787	NEW: Add project and Hook to Loan BUG: Correct discard_closed parametters management in project	2016-11-14 19:25:50 +01:00
florian HENRY	7bf6ad49da	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop Conflicts: htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-11-14 12:23:17 +01:00
florian HENRY	37a9f15fb4	FIX : increase size of llx_c_actioncomm type column	2016-11-14 12:21:08 +01:00
Laurent Destailleur	af2f4cf78d	Merge branch 'patch-20' of https://github.com/defrance/dolibarr into defrance-patch-20 Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/install/mysql/migration/4.0.0-5.0.0.sql htdocs/install/mysql/tables/llx_facturedet.sql	2016-11-12 13:36:45 +01:00
Laurent Destailleur	645eee57db	Fix syntax error	2016-11-12 11:22:18 +01:00
Laurent Destailleur	7953ea8b4d	Merge pull request #5979 from aspangaro/5.0-p35 Vat expense report integration in reports	2016-11-12 11:09:58 +01:00
Regis Houssin	97a8a84b9d	Fix: missing encrypt/decrypt with llx_const	2016-11-12 09:57:41 +01:00
Regis Houssin	a1cccc021e	Fix: missing encrypt data for llx_const	2016-11-12 09:48:34 +01:00
aspangaro	137561aec9	Merge remote-tracking branch 'Upstream/develop' into 5.0-p35	2016-11-12 06:31:06 +01:00
BENKE Charlie	eda718a91b	Update llx_facturedet.sql	2016-11-11 15:25:19 +01:00
BENKE Charlie	056e26e595	Update 4.0.0-5.0.0.sql	2016-11-11 15:05:56 +01:00
Laurent Destailleur	787f508172	More complete fix for #5974	2016-11-11 14:25:22 +01:00
Laurent Destailleur	360d697fc3	Add missing field to store result of email sending	2016-11-11 13:45:18 +01:00
Laurent Destailleur	fe9c880984	NEW Add missing unique key on table llx_links	2016-11-10 14:24:29 +01:00
Laurent Destailleur	bc245165c0	Merge pull request #5961 from defrance/patch-40 When constant change, please add update of constant	2016-11-08 14:35:50 +01:00
Laurent Destailleur	608ca669fd	Update doc Add missing table in upgrade script	2016-11-07 03:18:53 +01:00
Laurent Destailleur	bcd3a1a888	NEW Default collation for mysql is now utf8_unicode_ci	2016-11-07 01:53:34 +01:00
Laurent Destailleur	84ece61e0f	Update doc	2016-11-07 01:34:46 +01:00
Marcos García de La Fuente	286095f5cd	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/core/tpl/objectline_create.tpl.php # htdocs/fourn/facture/card.php # htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-11-06 15:01:40 +01:00
BENKE Charlie	b3fdf4b872	Update 4.0.0-5.0.0.sql	2016-11-06 14:49:16 +01:00
BENKE Charlie	29196eedde	When constant change, please add update of constant	2016-11-06 12:03:28 +01:00
aspangaro	5ed79800e0	Begin to wok on Vat expense report integration in reports	2016-11-05 07:48:42 +01:00
BENKE Charlie	965f73940a	just add a comment to launch again travis...	2016-10-31 13:35:32 +01:00
Laurent Destailleur	3fbba59f69	Better management of status of events	2016-10-30 13:12:35 +01:00
Laurent Destailleur	c858c5b39b	Merge pull request #5941 from simnandez/develop Fix bad sql query introduced by #38e6c9c	2016-10-29 17:50:10 +02:00
Laurent Destailleur	69fe2bfad6	Fix a case of corrupted data	2016-10-29 17:16:14 +02:00
Laurent Destailleur	cb3f0dadab	NEW Can see/edit the customer ref of a shipment	2016-10-29 14:52:13 +02:00
Juanjo Menent	9bd44185c7	Fix bad sql query introduced by #38e6c9c	2016-10-29 14:46:57 +02:00
Laurent Destailleur	38e6c9cc57	Fix multientity on overwritting translation not yet supported.	2016-10-28 22:47:37 +02:00
Juanjo Menent	a59cf0e13b	Merge pull request #5935 from aspangaro/5.0-p32 Accountancy - Add binding and journal for expense reports	2016-10-28 11:25:21 +02:00
Laurent Destailleur	7d182c286c	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/install/step1.php htdocs/projet/tasks/time.php	2016-10-26 10:40:03 +02:00
aspangaro	883446c5bb	Merge remote-tracking branch 'Upstream/develop' into 5.0-p32 Conflicts: htdocs/core/menus/standard/eldy.lib.php	2016-10-25 22:09:40 +02:00
Laurent Destailleur	f67863e1aa	NEW Can use any filter on all REST API to list.	2016-10-25 19:15:47 +02:00
aspangaro	6e7f104c5f	Update works	2016-10-25 07:41:01 +02:00
Laurent Destailleur	f1421a2ee4	Rename constant with english name	2016-10-24 13:10:35 +02:00
Laurent Destailleur	fdcc858008	Merge branch 'dev_resource_extrafields' of https://github.com/atm-florian/dolibarr into atm-florian-dev_resource_extrafields Conflicts: htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-10-24 02:05:34 +02:00
Laurent Destailleur	3c3c5d06a1	Merge branch 'NEW_parent_warehouse' of https://github.com/atm-gauthier/dolibarr into atm-gauthier-NEW_parent_warehouse Conflicts: htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-10-24 00:58:02 +02:00
Laurent Destailleur	abc471575a	Fix sql error	2016-10-22 17:00:19 +02:00
BENKE Charlie	a7786a2900	Update 4.0.0-5.0.0.sql	2016-10-21 23:06:18 +02:00
BENKE Charlie	3c9663d3e8	Introduce SHIPPING on propal (like order)	2016-10-21 23:04:07 +02:00
Laurent Destailleur	304a44ffc2	Debug accounting module	2016-10-21 14:48:55 +02:00
Laurent Destailleur	d18097da28	Prepare database to manage different vat rate with same rate value.	2016-10-21 14:09:11 +02:00
florian HENRY	54a154fa4f	NEW : Add ressource extrafields	2016-10-19 22:14:51 +02:00
Laurent Destailleur	30e6dd93a6	Missing perf key on the most important table	2016-10-15 17:10:05 +02:00
Laurent Destailleur	850a275b47	Fix duplicate accounting account with same number. Add unique key.	2016-10-14 18:46:30 +02:00
Laurent Destailleur	79d376ee12	Debug accountancy module	2016-10-14 13:05:01 +02:00
gauthier	805b65addd	FIX : semicolon	2016-10-14 12:02:24 +02:00
gauthier	416311a7b9	NEW : allow to save a parent warehouse # Conflicts: # htdocs/product/stock/card.php	2016-10-14 11:29:14 +02:00
Laurent Destailleur	7c1b74133a	Debug accountancy module	2016-10-13 22:29:49 +02:00
Bruno Généré	966b31de0f	Bug Fix : issue with commas in the SQL script.	2016-10-11 11:35:06 +02:00
Laurent Destailleur	44f9c65f6a	Fix missing countries	2016-10-10 17:00:11 +02:00
philippe grand	df825e2d49	better help	2016-10-09 11:45:39 +02:00
philippe grand	c46f76c0f2	better help	2016-10-09 11:32:48 +02:00
Laurent Destailleur	77e87b3c07	NEW Add tooltip in payment term edition in dictionnary	2016-10-07 00:37:06 +02:00
Laurent Destailleur	c908af6758	Merge pull request #5833 from atm-gauthier/develop_NEW_cdr_current_or_next_month NEW Develop new cdr (current or next month) for payment terms.	2016-10-07 00:06:59 +02:00
Laurent Destailleur	a91f93eeda	Merge pull request #5831 from atm-florian/dev_fix5764_for_PgSQL FIX : New add limit stock product by warehouse #5764 for PgSQL	2016-10-07 00:00:53 +02:00
Laurent Destailleur	db3e3642b0	NEW Can generate SEPA mandate for each bank account of your customers	2016-10-06 00:14:25 +02:00
Laurent Destailleur	9ad96c2be3	Debug module accountancy expert	2016-10-05 20:50:47 +02:00
Laurent Destailleur	dff7f73dc9	Better terminology	2016-10-05 18:31:55 +02:00
Laurent Destailleur	31ce725d73	Maxi debug of accountancy expert module	2016-10-04 19:31:05 +02:00
gauthier	71eb4ff1a0	NEW : ALTER TABLE in migration script	2016-10-04 16:07:23 +02:00
gauthier	b35a4eb1b2	Merge branch 'NEW_cdr_current_or_next_month' of github.com:atm-gauthier/dolibarr into develop_NEW_cdr_current_or_next_month	2016-10-04 16:01:26 +02:00
gauthier	1c98979ca1	NEW : option "Current/Next" for limit payment date (in payment terms) to use a specific day of current month or jump to same day of next month	2016-10-04 15:45:23 +02:00
Laurent Destailleur	3599f2c840	Uniformize code for recurring invoices	2016-10-04 12:31:45 +02:00
florian HENRY	d3146234b8	FIX : New add limit stock product by warehouse #5764 for PgSQL	2016-10-04 09:23:13 +02:00
Laurent Destailleur	45a808e034	NEW Generation of document is available on member card	2016-10-03 00:08:47 +02:00
Laurent Destailleur	96426de416	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-10-01 19:25:35 +02:00
Laurent Destailleur	56ae7bf328	Merge pull request #5822 from aspangaro/4.0-p1 Fix: Not remove expensereport from menu. Menu of the module still in module file descriptor	2016-10-01 19:00:41 +02:00
Laurent Destailleur	ee252f549a	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog dev/skeletons/skeleton_list.php htdocs/accountancy/class/html.formventilation.class.php htdocs/core/lib/cron.lib.php htdocs/core/tpl/admin_extrafields_add.tpl.php	2016-10-01 18:42:50 +02:00
Laurent Destailleur	b45ea754ec	FIX #5748 Bug: Error updating to 4.0.1 with Postgresql. Field must be varchar.	2016-10-01 16:58:35 +02:00
Laurent Destailleur	fcb00dbaf2	Fix missing unique key	2016-10-01 16:53:33 +02:00
aspangaro	34cad213da	Fix: Not remove expensereport from menu. Menu of the module still in module file descriptor.	2016-10-01 07:37:26 +02:00
Laurent Destailleur	20ad359c9b	FIX Warning to grant permission must be visible only if one module add some permissions	2016-09-30 18:26:32 +02:00
Laurent Destailleur	5d26565199	Package add version into xml integrity file.	2016-09-30 15:41:08 +02:00
Laurent Destailleur	2a6d8e77db	FIX Lost filter on opportunities	2016-09-30 11:45:36 +02:00
Laurent Destailleur	b412baa880	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-09-29 10:49:47 +02:00
Laurent Destailleur	ccd7100b7f	Minor code fix	2016-09-29 10:43:53 +02:00
Laurent Destailleur	8fc857fdcb	Missing entity in the bookkeeping table	2016-09-29 10:10:32 +02:00
Laurent Destailleur	e99f115a8f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/install/mysql/tables/llx_user.sql	2016-09-28 19:49:36 +02:00
Laurent Destailleur	2d6877ac67	Add tables to store working employee contracts	2016-09-28 19:33:51 +02:00
arnaud	c904b8030c	Merge branch 'NEW_user_date_employment' of github.com:atm-arnaud/dolibarr into HEAD Conflicts: htdocs/langs/en_US/users.lang	2016-09-27 15:25:29 +02:00
arnaud	b717d530cd	NEW User date of employment added	2016-09-27 15:16:16 +02:00
Laurent Destailleur	586b223221	Work on remote integrity checker	2016-09-26 15:24:43 +02:00
Laurent Destailleur	0ab3728276	Merge pull request #5780 from aspangaro/5.0-p14 Review of subscription	2016-09-26 01:09:50 +02:00
aspangaro	2dbeeedd14	Move tab menu for subscription in member.lib Move all pages for subscription member in adherent/subscription (Card / Info / List) Rename llx_cotisation in llx_subscription Rename all db field cotisation in subscription Rename class Cotisation in class Subscription	2016-09-24 06:48:40 +02:00
Laurent Destailleur	3eaec4d4b8	Uniformise fields in tables	2016-09-23 10:55:44 +02:00
Laurent Destailleur	8fa8bc7d34	Rename table for a better understanding	2016-09-22 11:39:43 +02:00
gauthier	576ef9e541	FIX : sql syntax for travis test	2016-09-21 09:31:40 +02:00
gauthier	d508d44fef	NEW : migration script from 4.0.0 to 5.0.0 and langs	2016-09-20 12:10:25 +02:00
gauthier	a0ec91cb94	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_add_limit_stock_product_by_warehouse	2016-09-20 12:03:55 +02:00
Laurent Destailleur	c4c7ccc226	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/tpl/objectline_create.tpl.php htdocs/societe/note.php htdocs/societe/rib.php	2016-09-19 14:05:16 +02:00
Laurent Destailleur	97e396af69	Work on module website	2016-09-17 21:03:20 +02:00
gauthier	7a0577ccfc	NEW : add limit stock product by warehouse	2016-09-16 17:09:38 +02:00
Juanjo Menent	8b13c36670	Merge pull request #5735 from atm-ph/fix_4.0_error_sql Fix bad query	2016-09-14 16:27:51 +02:00
Laurent Destailleur	20141ec9bc	Fix default value of new table	2016-09-12 17:31:36 +02:00
Laurent Destailleur	5ea9fc7467	NEW Support extrafields on product lot.	2016-09-12 17:27:44 +02:00
phf	bd734de437	Fix bad query	2016-09-12 09:52:35 +02:00
Laurent Destailleur	ce137e3987	Fix migration when field was added without null flag.	2016-09-10 17:58:13 +02:00
Laurent Destailleur	0debcf745a	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/cron/card.php htdocs/cron/list.php htdocs/filefunc.inc.php	2016-09-09 09:32:14 +02:00
Juanjo Menent	ecfd3a0af5	Merge pull request #5722 from atm-ph/fix_4.0_multicurrency_rate_entity Fix miss entity column in llx_multicurrency_rate	2016-09-08 18:16:21 +02:00
phf	7229b572dc	Default entity 1 in llx_multicurrency_rate	2016-09-08 14:59:16 +02:00
phf	7917169961	Fix miss entity column in llx_multicurrency_rate	2016-09-08 14:53:59 +02:00
Sergiu Sandu	02698c5abb	fileconf.php redundant else statements Is it ok the 2 else blocks are the same?	2016-09-07 17:02:41 +01:00
florian HENRY	abda9146f1	FIX : cannot add order line (if fk column is not in user they whould be NULL by defaut.	2016-09-07 11:32:45 +02:00
Marcos García de La Fuente	05728075d6	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/core/tpl/objectline_create.tpl.php # htdocs/install/mysql/migration/3.9.0-4.0.0.sql # htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-09-06 21:06:33 +02:00
Laurent Destailleur	898bbd6031	NEW Support extrafields for expense reports	2016-09-06 13:00:32 +02:00
Laurent Destailleur	b01d1979f8	Merge pull request #5680 from aspangaro/5.0-p7 NEW: Move Expense report menu from module to menu files (Again)	2016-09-02 18:39:49 +02:00
Laurent Destailleur	91ede48390	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-09-01 11:37:40 +02:00
Laurent Destailleur	f04a3bf0c8	Fix sql error	2016-08-31 18:46:47 +02:00
Laurent Destailleur	3edb04c5b8	Fix missing migration to create entity	2016-08-31 12:54:44 +02:00
Laurent Destailleur	c49508c415	Revert "Fix migration for entity in remise table" This reverts commit `452f7be441`.	2016-08-31 12:52:25 +02:00
aspangaro	b5f093436e	NEW: Move Expense report menu from module to menu files (Again)	2016-08-30 21:43:17 +02:00
Maxime Kohlhaas	452f7be441	Fix migration for entity in remise table	2016-08-30 14:44:35 +02:00
Laurent Destailleur	98eb3fec5a	Fix avoid migration when already migrated	2016-08-29 21:07:36 +02:00
Laurent Destailleur	867525cc91	Fix missing migration instructions	2016-08-29 17:50:31 +02:00
Laurent Destailleur	c49c23df3d	Fix debug project categories	2016-08-29 17:30:54 +02:00
Laurent Destailleur	b8201c9f86	Fix fk_soc can be null because we can set notification for users only.	2016-08-28 23:46:12 +02:00
Laurent Destailleur	2e7e5151b7	Merge pull request #5463 from hregis/develop_origin New: Add entity field in llx_societe_remise_except and llx_societe_remise	2016-08-28 12:23:04 +02:00
Laurent Destailleur	bc8e203019	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9	2016-08-28 01:58:43 +02:00
Regis Houssin	6e40f9e700	Merge remote-tracking branch 'dolibarr/develop' into develop_origin Conflicts: htdocs/core/class/html.form.class.php Change-Id: I87bdc02d611c2978a5a8b427f0e1b718b6453b59	2016-08-25 10:15:26 +02:00
BENKE Charlie	777b9fe4d8	Update 4.0.0-5.0.0.sql	2016-08-23 11:28:10 +02:00
BENKE Charlie	4a2b7e1bba	add link to commande fourn if resplenish	2016-08-23 11:25:14 +02:00
BENKE Charlie	8707bb04fb	Update 4.0.0-5.0.0.sql	2016-08-17 16:38:02 +02:00
BENKE Charlie	5f587efc72	Update llx_facturedet.sql	2016-08-17 16:36:22 +02:00
Laurent Destailleur	15a40f6401	Fix default value of entity	2016-08-11 15:50:18 +02:00
Laurent Destailleur	4d4fc87e2b	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/commande/dispatch.php htdocs/product/stock/productlot_list.php htdocs/websites/index.php	2016-08-09 13:26:08 +02:00
Laurent Destailleur	f1ee2bdddf	Remove deprecated field	2016-08-09 13:10:34 +02:00
Laurent Destailleur	54b47d7f4f	Fix edit of page in module website Conflicts: htdocs/websites/class/website.class.php	2016-08-08 19:09:37 +02:00
BENKE Charlie	432fad6ed7	Update 4.0.0-5.0.0.sql	2016-08-07 14:22:05 +02:00
BENKE Charlie	908bf50e69	new : add user id on line for tracking feature	2016-08-07 14:16:56 +02:00
Laurent Destailleur	0e3ec5df38	Merge branch 'remove-mysql-driver' of https://github.com/marcosgdf/dolibarr into marcosgdf-remove-mysql-driver Conflicts: htdocs/core/db/mysql.class.php	2016-08-05 13:12:43 +02:00
Laurent Destailleur	57a542d52d	Fix: we still need gd	2016-08-05 04:45:05 +02:00
Juanjo Menent	28efc3e50f	NEW Add Panama datas	2016-08-03 09:45:12 +02:00
Laurent Destailleur	7dec327995	FIX #5568	2016-08-01 15:43:40 +02:00
Laurent Destailleur	b267402df6	Merge remote-tracking branch 'origin/4.0' into develop Conflicts: htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/filefunc.inc.php htdocs/langs/en_US/main.lang htdocs/societe/rib.php	2016-08-01 15:15:32 +02:00
Laurent Destailleur	e0c232548e	Fix theme crazy after migration	2016-08-01 10:55:41 +02:00
Laurent Destailleur	246321cd8f	Fix clean orphelins of leave request logs in repair tools Fix date of supplier proposal missing.	2016-07-30 18:08:07 +02:00
Laurent Destailleur	0c456add13	A more complete example of odt template	2016-07-29 16:33:31 +02:00
Laurent Destailleur	b85bb8c0f8	Merge remote-tracking branch 'origin/3.9' into 4.0 Conflicts: htdocs/core/modules/facture/doc/pdf_crabe.modules.php	2016-07-29 16:24:02 +02:00
Laurent Destailleur	f54946bacb	Merge remote-tracking branch 'origin/4.0' into develop Conflicts: htdocs/core/menus/init_menu_auguria.sql	2016-07-28 10:10:58 +02:00
Regis Houssin	6bf655c882	Merge remote-tracking branch 'dolibarr/develop' into develop_origin Conflicts: htdocs/societe/class/societe.class.php Change-Id: I760cee3a4d7a59d6625efed8aa5dc16c9df043bb	2016-07-28 09:53:10 +02:00
Laurent Destailleur	2a28d77eeb	FIX #5465 - Fix type account_parent	2016-07-27 19:53:16 +02:00
Laurent Destailleur	7e37cbb9e3	Fix resource module can't work because mandatory data not available.	2016-07-27 19:16:21 +02:00
Laurent Destailleur	8b3136cb96	Merge remote-tracking branch 'origin/4.0' into develop Conflicts: htdocs/compta/facture/list.php htdocs/langs/en_US/admin.lang htdocs/langs/fr_FR/companies.lang	2016-07-27 19:04:55 +02:00
Laurent Destailleur	e747c39809	Add test on curl prerequisite. Remove test on GD lib.	2016-07-27 16:52:02 +02:00
Laurent Destailleur	eb06f56164	Fix bad version into error message	2016-07-27 16:49:00 +02:00
Regis Houssin	4b8f42949c	# WARNING: head commit changed in the meantime Change-Id: I27dc1da6ca41955468f3661433e41c72a277f670	2016-07-25 21:05:11 +02:00
Juanjo Menent	437a8b53ae	Merge pull request #5530 from GPCsolutions/forcedinstallfixes Forced install fixes	2016-07-25 10:24:33 +02:00
Marcos García de La Fuente	b1c552ee9d	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/install/mysql/tables/llx_product_attribute.key.sql # htdocs/install/mysql/tables/llx_product_attribute_combination2val.sql	2016-07-24 11:54:38 +02:00
Marcos García de La Fuente	c082505021	NEW Added product attributes feature	2016-07-24 11:27:52 +02:00
Laurent Destailleur	9c89bc4095	Remove deprecated tables and code	2016-07-23 10:57:27 +02:00
Raphaël Doursenaud	1cfa26d400	Fix HTML syntax for forced install process. Make sure we have a space between attributes.	2016-07-23 02:01:57 +02:00
Raphaël Doursenaud	2c000c20da	Prevent PHP notice on unitialized variables. These variables are expected to be uninitialized when the forced install process is not used.	2016-07-23 02:01:49 +02:00
Laurent Destailleur	af09528738	NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and __AMOUNT_WO_TAX__ into emails templates.	2016-07-21 20:45:30 +02:00
Laurent Destailleur	058c431483	FIX The project was lost when creating the event "sent by email". Also, event company "create" was not tracked by default like others.	2016-07-21 13:49:10 +02:00
Laurent Destailleur	b90ed8d677	Merge pull request #5375 from frederic34/charges NEW select bank and payment mode for social contrib	2016-07-20 19:00:10 +02:00
Raphaël Doursenaud	f2a479695e	New: Improved forced install process Tamper proofed the process by not relying on POST values for forced fields. Disabled all fields set when $force_install_noedit is set. Added a full-featured forced install config file template. On the side: Improved Dolibarr root and url detection. Prevent install locking if install was not successful. Added missing translation on failed administrator creation. Better escaping of posted values.	2016-07-20 14:22:35 +02:00
Laurent Destailleur	038526bb71	Code comment	2016-07-18 14:40:10 +02:00
Laurent Destailleur	fd7c494cb6	Add VAT for cyprus	2016-07-18 13:20:04 +02:00
Laurent Destailleur	9ba1ca5acb	Merge branch 'abb-14' of https://github.com/bafbes/dolibarr into bafbes-abb-14 Conflicts: htdocs/langs/en_US/companies.lang	2016-07-15 17:05:12 +02:00
Laurent Destailleur	00d80d827f	To match new standard, next version will be called 5.0, 6.0, ...	2016-07-15 11:17:33 +02:00
Laurent Destailleur	f758f3466e	Merge pull request #5260 from atm-gauthier/develop_add_selectbank_on_thirdparty_card NEW : select default bank account on thirdparty card	2016-07-15 11:16:17 +02:00
frederic34	2de3d4ec7b	Merge remote branch 'upstream/develop' into charges Conflicts: htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-07-15 10:41:56 +02:00
Laurent Destailleur	74f28b3861	NEW Complete table llx_ecm_files with field generated_or_uploaded	2016-07-15 10:38:13 +02:00
Laurent Destailleur	409d6df067	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-07-15 10:27:34 +02:00
Laurent Destailleur	eb47ec5823	Drop another deprecated table llx_ecm_documents (replace by llx_ecm_files)	2016-07-15 10:27:20 +02:00
Laurent Destailleur	09306ba974	Drop not used table llx_document_generator (list of generators must be managed by submodules like are the templates of document or engines to select emailing targets (scan of a dedicated dir)	2016-07-15 10:23:36 +02:00
frederic34	f25ff0581c	sql changes	2016-07-15 10:07:02 +02:00
frederic34	7e3978c403	sql changes	2016-07-15 10:04:04 +02:00
Laurent Destailleur	da4d28ae3f	Merge pull request #5359 from GPCsolutions/autoset_install New: Autoset port and admin user from db type	2016-07-14 23:16:48 +02:00
Laurent Destailleur	ec6640af63	Add field virtualhost for website module	2016-07-14 15:54:46 +02:00
Laurent Destailleur	73f574b649	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/core/class/html.form.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/install/repair.php	2016-07-12 19:30:01 +02:00
Laurent Destailleur	a258663175	Fix edition of status were loosing old percent. We show it to allow user to keep it if required.	2016-07-09 14:58:51 +02:00
Laurent Destailleur	47d7ac8031	Fix the repair tool to correct corrupted stock for batch numbers	2016-07-08 23:11:55 +02:00
Laurent Destailleur	a48c79b68b	Fix corrupted stock	2016-07-08 23:02:25 +02:00
Laurent Destailleur	0f23cef46c	Fix warning of the repair tool.	2016-07-08 18:59:36 +02:00
Laurent Destailleur	d940cc392a	FIX Several fix to exclude WON/LOST of reporting of opportunities amount (sometimes we need, sometimes not).	2016-07-08 10:59:13 +02:00
Regis Houssin	08725003b9	Fix: add entity field in llx_societe_remise, useful when third-sharing is used with multicompany	2016-07-07 12:43:02 +02:00
Regis Houssin	ee02ff43d7	Fix: add entity field in llx_societe_remise_except, useful when third-sharing is used with multicompany	2016-07-07 12:26:30 +02:00
Sof	9b5bcc6dcd	FIX: Missing semicolon	2016-07-07 10:25:17 +02:00
Laurent Destailleur	061ccadd03	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/fourn/commande/list.php htdocs/fourn/commande/orderstoinvoice.php htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions htdocs/install/pgsql/functions/functions.sql	2016-07-06 15:11:29 +02:00
Laurent Destailleur	a8f06d78b1	Merge remote-tracking branch 'origin/3.8' into 3.9 Conflicts: htdocs/install/pgsql/functions/functions.sql	2016-07-06 14:53:05 +02:00
florian HENRY	2520ee921a	llx_ecm_directories	2016-07-01 08:37:24 +02:00
florian HENRY	08fbc21bb1	llx_ecm_directories	2016-07-01 08:36:20 +02:00
florian HENRY	215f397f33	Cannot reproduce 4793 still fix other bug on PgSQL	2016-06-30 17:28:13 +02:00
florian HENRY	855550e274	FIX 4926	2016-06-30 17:00:09 +02:00
florian HENRY	8097298c80	FIX #4756	2016-06-30 16:55:59 +02:00
Laurent Destailleur	5950178c7a	Fix create of admin user	2016-06-30 00:38:13 +02:00
Laurent Destailleur	266fef40ad	Add a way to enhance security check.	2016-06-25 15:16:32 +02:00
Regis Houssin	25631b236b	Fix: missing rename field "shortname" to "ref"	2016-06-23 16:47:21 +02:00
Laurent Destailleur	8356dd1080	Fix minor	2016-06-20 10:22:08 +02:00
Laurent Destailleur	b4384c13e1	Merge pull request #5349 from atm-maxime/3.9 FIX #5343	2016-06-16 20:19:08 +02:00
Laurent Destailleur	8e8b14af78	Merge pull request #5347 from olsesacl/develop-fix-install Fix: install with mysql 5.7.9	2016-06-16 20:11:56 +02:00
Laurent Destailleur	a1c2f35ebb	Merge pull request #5357 from ndrosis/patch-23 New TVA for Greece 24%	2016-06-16 20:08:16 +02:00
Raphaël Doursenaud	eb54c3f8af	Fix #5350 date_pointoftax prevented creating invoices	2016-06-16 13:09:11 +02:00
Drosis Nikos	5a51850d54	Greece VAT 23 -> 24	2016-06-16 14:03:11 +03:00
Raphaël Doursenaud	c365d14c2c	New: Autoset port and admin user from db type [Usability] Enhance install procedure by automatically suggesting the database port and administrative user on database type selection.	2016-06-16 13:00:38 +02:00
Drosis Nikos	2ef3d7cedb	New TVA for Greece 24%	2016-06-16 13:50:35 +03:00
Maxime Kohlhaas	f51386c59f	FIX #5343	2016-06-15 08:06:22 +02:00
Sergio Sanchis Climent	d9d247e49d	Fix install mysql 5.7.9	2016-06-14 00:37:13 +02:00
Laurent Destailleur	6034ba658c	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2016-06-10 18:59:05 +02:00
Laurent Destailleur	09270aa8bd	Not used table	2016-06-09 07:27:24 +02:00
Laurent Destailleur	47308d27c3	Missing column import_key and import for vat payments	2016-06-06 14:37:06 +02:00
Laurent Destailleur	681249de8a	Debug module resource	2016-06-06 12:29:15 +02:00
Laurent Destailleur	b57476153f	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/admin/menus/edit.php htdocs/fourn/ajax/getSupplierPrices.php htdocs/societe/consumption.php	2016-06-04 01:14:36 +02:00
Maxime Kohlhaas	f2e4fdcce4	Fix import model not correctly saved #5185	2016-06-04 00:16:01 +02:00
Maxime Kohlhaas	8901b99e2d	Fix import model not correctly saved #5185	2016-06-04 00:14:08 +02:00
gauthier	ab06ffda58	NEW : select default bank account on thirdparty card	2016-06-03 15:43:05 +02:00
Laurent Destailleur	537c9637f6	Merge pull request #5255 from atm-florian/dev_fix5151 FIX: #5151	2016-06-02 10:05:02 +02:00
Laurent Destailleur	7519c4a602	FIX Log of tax FIX Missing import key on social contributions and missing class to manage type of social contributions.	2016-06-01 13:24:27 +02:00
Florian HENRY	d17a879f33	add into migratino script	2016-05-31 23:32:21 +02:00
Florian HENRY	3c42a32690	FIX: #5151	2016-05-31 23:22:15 +02:00
Laurent Destailleur	3ddf427ff1	FIX Legal issue for GB. Add hidden option for this.	2016-05-30 00:52:16 +02:00
Juanjo Menent	a63dac3a9c	Merge pull request #5240 from fmarcet/peru Fix: Update Peru regions and departaments	2016-05-28 11:51:46 +02:00
Laurent Destailleur	27da82df1f	FIX Missing columns in migration	2016-05-26 21:20:10 +02:00
Laurent Destailleur	9a3251bcc9	FIX Missing columns in migration	2016-05-26 21:18:08 +02:00
Laurent Destailleur	db56e1b8a1	FIX Missing columns in migration	2016-05-26 21:17:43 +02:00
Your Name	c581b05c26	Fix: Update Peru regions and departaments	2016-05-23 18:38:55 +02:00
Laurent Destailleur	f398174772	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/core/menus/standard/auguria_menu.php htdocs/core/menus/standard/eldy.lib.php	2016-05-22 19:34:27 +02:00
Laurent Destailleur	db432e2cc4	Fix lot number	2016-05-21 18:12:03 +02:00
Laurent Destailleur	b95981a2be	Fix missing ; at end of sql	2016-05-21 18:03:13 +02:00
Sof	da2c9a0f74	Syntax error : bad name of field	2016-05-19 17:42:57 +02:00
Laurent Destailleur	cd75b43d58	Can enable modules during migration	2016-05-18 00:44:55 +02:00
Laurent Destailleur	a36b780c53	Fix phpunit	2016-05-17 20:30:04 +02:00
Laurent Destailleur	be251cd2b0	Add high risk sql at end	2016-05-17 18:22:48 +02:00
Laurent Destailleur	d083ad9382	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/product/class/product.class.php htdocs/resource/class/html.formresource.class.php	2016-05-17 18:21:22 +02:00
Laurent Destailleur	79be93d998	FIX The table llx_product_lot is now filled/used to store eatby/sellby dates.	2016-05-17 18:19:36 +02:00
Laurent Destailleur	3b99fb01ee	Fix duplicate table	2016-05-17 10:51:03 +02:00
Laurent Destailleur	63d0710842	FIX Creation of the second ressource type fails.	2016-05-17 10:44:30 +02:00
Laurent Destailleur	05cbfbb38f	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/install/mysql/migration/repair.sql	2016-05-17 01:19:49 +02:00
Laurent Destailleur	95ea20eb44	Clean code for stock movement when lot are used. We should not get duplicate records into llx_product_batch	2016-05-17 01:10:11 +02:00
Laurent Destailleur	75b4c61fbc	Merge remote-tracking branch 'origin/3.8' into 3.9 Conflicts: htdocs/contrat/card.php	2016-05-17 00:02:54 +02:00
Laurent Destailleur	94c532dd8a	Clean splitted lines into llx_product_batch	2016-05-16 23:58:06 +02:00
Laurent Destailleur	929787006e	Clean data	2016-05-16 22:40:29 +02:00
Ion Agorria	9b11907c70	Update existing linked elements to new type	2016-05-11 18:50:25 +02:00
Laurent Destailleur	9d3ad36b78	NEW If error is reported during migration process, you can ignore it to avoid to be locked.	2016-05-09 11:06:18 +02:00
Laurent Destailleur	6bb269381a	Merge pull request #5143 from frederic34/morecateg categories account like other categories	2016-05-07 20:25:17 +02:00
Laurent Destailleur	82745d32df	NEW Survey system has now a status like other objects. You can close or reopen a survey.	2016-05-07 17:12:31 +02:00
Laurent Destailleur	cdbbe8d87b	Minor fixes	2016-05-05 23:44:44 +02:00
Laurent Destailleur	aa55cdadac	Merge pull request #4944 from FHenry/develop_advtargetemailiing NEW : Advance target emailing	2016-05-05 23:18:27 +02:00
Laurent Destailleur	ed3e15b39e	Merge pull request #5150 from fmarcet/peru New: Add Perú regions	2016-05-05 22:48:02 +02:00
Laurent Destailleur	1f23909899	Merge pull request #5146 from aspangaro/4.0-p26 NEW: Accountancy - Prepare multiple journals	2016-05-05 22:46:36 +02:00
Laurent Destailleur	7e34581952	Merge pull request #5139 from aspangaro/4.0-p25 FIX: Accountancy - Chart of accounts are limited on only one country	2016-05-05 22:27:05 +02:00
Florian HENRY	3d57e83094	Merge branch 'develop' into develop_advtargetemailiing Conflicts: htdocs/install/mysql/migration/3.9.0-4.0.0.sql htdocs/install/mysql/tables/llx_c_accounting_category.sql	2016-05-02 20:40:42 +02:00
Laurent Destailleur	d69904c14d	Can set the home page of web sites	2016-05-02 15:51:18 +02:00
fmarcet	bc43c87f51	New: Add Perú regions	2016-05-02 11:36:29 +02:00
Laurent Destailleur	f59f3032c6	NEW: Rename path for generic medias files into '/medias' instead of fckeditor. Add location of medias into title of media browser of ckeditor. Work on website module	2016-05-01 16:34:50 +02:00
aspangaro	88435a0d80	NEW: Accountancy - Prepare multiple journals	2016-05-01 08:03:40 +02:00
frederic34	17463b4927	categories account like other categories	2016-04-30 14:45:24 +02:00
aspangaro	7041a041ce	FIX: Accountancy - Chart of accounts are limited on only one country	2016-04-30 06:52:21 +02:00
Laurent Destailleur	19162fc8d5	Merge branch 'patch-1' of https://github.com/PeartreeG/dolibarr into PeartreeG-patch-1 Conflicts: htdocs/install/mysql/migration/3.9.0-4.0.0.sql htdocs/resource/element_resource.php	2016-04-29 18:31:11 +02:00
Juanjo Menent	5ca989c836	Merge pull request #5126 from FHenry/dev_fixpgsql FIX Postgres migration from 3.9 to 4.0	2016-04-29 12:18:49 +02:00
Juanjo Menent	d6b1cd8a1c	Merge pull request #5083 from aspangaro/4.0-p22 FIX: Accountancy - Work on categories for report - Add french example & other	2016-04-29 11:59:41 +02:00
Florian HENRY	e698c410f5	FIX Postgres migration from 3.9 to 4.0	2016-04-28 13:56:17 +02:00
Laurent Destailleur	e723966583	FIX: Qty in stock must be float like it is in stock movement. FIX: Can't create a stock transfer from product card Performance enhancement of stock information loading.	2016-04-28 11:01:56 +02:00
Laurent Destailleur	66ea799eb7	Uniformize code and add more comment to understand workflow	2016-04-26 13:27:32 +02:00
Laurent Destailleur	bcb4b2b607	Work on website module	2016-04-23 21:34:10 +02:00
aspangaro	1454f5cafa	FIX: Accountancy - Table account integer 0 by default	2016-04-23 15:44:31 +02:00
aspangaro	04fd5a20ef	FIX: Accountancy Work on categories for Report - Add french example	2016-04-23 15:43:28 +02:00
Laurent Destailleur	7e047ada2b	Merge pull request #5064 from aspangaro/4.0-p21 FIX: Accountancy - Road to stable version	2016-04-22 19:21:18 +02:00
aspangaro	4a078db060	FIX: Migration script	2016-04-22 06:57:37 +02:00
Frédéric FRANCE	adde434708	Update 3.9.0-4.0.0.sql	2016-04-21 08:52:10 +02:00
Laurent Destailleur	d9e846e586	Update migrate script	2016-04-21 02:47:34 +02:00
Laurent Destailleur	349c1c2d69	Merge pull request #4999 from fappels/develop Fix migration script	2016-04-19 19:22:37 +02:00
Laurent Destailleur	4619040983	Work on website module	2016-04-19 18:41:05 +02:00
Laurent Destailleur	3a807d9cdb	Revert a commit. The field was already added.	2016-04-18 21:07:26 +02:00
Laurent Destailleur	a88b3a8cc4	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-04-18 21:02:34 +02:00
Laurent Destailleur	f68f5677bb	Start to use the vat code to identify a vat into combo list instead of just "rate" and "npr".	2016-04-18 21:02:14 +02:00
Juanjo Menent	5a87218622	Merge pull request #5034 from aspangaro/4.0-p19 NEW: Accountancy - Add Result page	2016-04-18 20:17:27 +02:00
Frédéric FRANCE	c6226e63b7	Update 3.9.0-4.0.0.sql	2016-04-18 08:13:01 +02:00
aspangaro	b59c94e056	NEW: Accountancy - Add Result page & review	2016-04-17 15:44:04 +02:00
Marcos García de La Fuente	257d9b2f8d	NEW #4772 Removed support for Mysql deprecated driver. Please use Mysqli instead	2016-04-17 15:39:46 +02:00
Juanjo Menent	f86952dfaa	FIX Add missing field fk_shipping_method_id	2016-04-15 16:57:11 +02:00
fappels	2462716eb4	Fix migration script	2016-04-12 16:24:00 +02:00
Laurent Destailleur	357877b1fe	Debug multicurrency and clean properties of some modules	2016-04-12 14:45:59 +02:00
Laurent Destailleur	27217ccccd	Maxi debug of supplier order workflow. Add trigger ORDER_SUPPLIER_CLASSIFY_BILLED Parameter user is added so it is defined into triggers.	2016-04-09 18:51:09 +02:00
Laurent Destailleur	874c65dfda	Fix unique key of table	2016-04-09 10:13:56 +02:00
Laurent Destailleur	7b16482cee	Add comment to show directoves to solve conception error on lot management (add a table to store all lots and their properties: date, note, ...) Removed deprecated field pmp at stock level (pmp is at product level)	2016-04-09 10:01:22 +02:00
Laurent Destailleur	448758bbf4	Merge branch 'develop_NEW_supplier_price_reputation' of https://github.com/atm-alexis/dolibarr into atm-alexis-develop_NEW_supplier_price_reputation Conflicts: htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-04-08 22:01:55 +02:00
Laurent Destailleur	010a4f8929	Merge pull request #4945 from frederic34/shipcust NEW : Select Preferred Sending Method for a third party	2016-04-08 21:31:06 +02:00
Laurent Destailleur	f14b03a230	NEW Add more trackable events (create, submit and receive supplier order). So we will be able to use generic features to log what was done with the specific table llx_commande_fournisseur_log	2016-04-08 17:07:25 +02:00
Laurent Destailleur	b1c2198154	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/core/ajax/selectsearchbox.php htdocs/core/lib/price.lib.php htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/core/modules/modCommande.class.php htdocs/core/modules/modFacture.class.php htdocs/projet/list.php htdocs/societe/list.php	2016-04-07 20:01:52 +02:00
Alexis Algoud	c2a5ad7d9c	FIX sql	2016-04-06 10:05:03 +02:00
Laurent Destailleur	e7adae13ca	Code comment	2016-04-05 12:59:17 +02:00
Laurent Destailleur	3738dae38d	NEW Add date_rum into table of thirdparty bank account.	2016-04-05 12:06:47 +02:00
Laurent Destailleur	0f0850664d	FIX Remove duplicates of shipment modes	2016-04-05 11:47:52 +02:00
frederic34	198b9ce8fe	Select Preferred Sending Method for a customer	2016-04-04 18:28:55 +02:00
Florian HENRY	344a87f970	Merge branch 'develop' into develop_advtargetemailiing Conflicts: htdocs/admin/dict.php htdocs/core/class/html.formaccounting.class.php htdocs/install/mysql/migration/3.9.0-4.0.0.sql htdocs/install/mysql/tables/llx_c_accounting_category.sql	2016-04-04 14:43:17 +02:00
Laurent Destailleur	f3c032ba21	Merge pull request #4925 from frederic34/patch-9 Update llx_propal_merge_pdf_product.sql	2016-04-04 00:34:40 +02:00
Laurent Destailleur	bd4bdcea37	Merge pull request #4924 from frederic34/patch-8 FIX Remove sql error when creating table llx_usergroup_extrafields.sql	2016-04-04 00:33:23 +02:00
Juanjo Menent	b3a5c8bae2	Merge pull request #4937 from simnandez/dolibarr-3510 Close #3510 Add a numbering module for check deposits	2016-04-03 16:22:34 +02:00
Juanjo Menent	8f2fb64efb	Merge pull request #4929 from aspangaro/4.0-p12 FIX: Problem with dolibarr installation/migration script. Range is a reserved name...	2016-04-03 16:20:31 +02:00
Juanjo Menent	cd6c6f64c5	Merge remote-tracking branch 'upstream/develop' into dolibarr-3510 Conflicts: htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-04-03 12:41:14 +02:00
Juanjo Menent	d55d12baeb	NEW #3510 : Working	2016-04-03 11:56:31 +02:00
aspangaro	0c5f504881	FIX: Accountancy - Correct the display of account_parent	2016-04-02 06:22:31 +02:00
Florian HENRY	ae51321040	Debug Advance target emailing	2016-04-01 14:30:02 +02:00
Florian HENRY	081c7824d2	FIX : range is MySQL reserved word, cannot be used as column names	2016-04-01 14:00:14 +02:00
aspangaro	1df1e775ee	Space2	2016-04-01 06:49:24 +02:00
aspangaro	84d326e036	FIX: Problem with dolibarr installation/migration script. Range is a reserved name.	2016-04-01 06:41:49 +02:00
Frédéric FRANCE	90e74b346e	Update llx_propal_merge_pdf_product.sql No need IF NOT EXISTS at install time	2016-03-31 17:13:38 +02:00
Frédéric FRANCE	125256c825	Update llx_usergroup_extrafields.sql No need IF NOT EXISTS at install time	2016-03-31 17:11:17 +02:00
Frédéric FRANCE	1419b0e385	Update llx_establishment.sql	2016-03-31 17:06:10 +02:00
Laurent Destailleur	a15a46449c	Merge pull request #4910 from aspangaro/4.0-p11 NEW: Accountancy - Drop old table not used (Informations are already presents in llx_accounting_bookkeeping)	2016-03-30 14:00:50 +02:00
aspangaro	9cac252641	NEW: Accountancy - Drop old table not used (Informations are already presents in llx_accounting_bookkeeping)	2016-03-30 06:54:28 +02:00
aspangaro	c9271e04a0	Merge remote-tracking branch 'Upstream/develop' into 4.0-p9 Conflicts: htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-03-29 19:54:41 +02:00
Laurent Destailleur	2e5b61dac7	Merge pull request #4909 from dzroot/patch-1 Update llx_20_c_departements.sql	2016-03-29 19:44:40 +02:00
AbdelHakim ALLAL	ed0fd32d15	Update llx_20_c_departements.sql Correcting ALGERIA Provinces numbers Missing AL10 Correcting the rest	2016-03-29 15:23:48 +01:00
aspangaro	8acf39cbb1	Uniformize name of table	2016-03-28 13:58:14 +02:00
aspangaro	432cc44ab6	NEW: Accountancy - Add category	2016-03-28 13:51:19 +02:00
aspangaro	85d51b0d6f	Correct of problem of merging with my last commits	2016-03-28 07:46:55 +02:00
Laurent Destailleur	22bed60a07	Remove manually other PR that should not be validated (travis errors reported on PR with serious mysql error in migration due to use of reserved keyword "range" as a name of a field).	2016-03-26 11:19:45 +01:00
Laurent Destailleur	46fe16be0b	Merge pull request #4871 from sbechet/develop Postgresql compatibility patch + cosmetic	2016-03-25 17:57:29 +01:00
aspangaro	1d780e7e77	NEW: Accountancy - Add category to manage the display of the income statement and the balance sheet Conflicts: htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-03-25 15:59:31 +01:00
Laurent Destailleur	91caea5707	Code was corrupted with very bad commits. I restore files manually.	2016-03-25 15:53:44 +01:00
aspangaro	252f37b363	NEW: Accountancy - Add category to manage the display of the income statement and the balance sheet	2016-03-23 21:36:52 +01:00
aspangaro	72abdde912	Add in migration file 3.9 - 4.0, a sql operation to delete old menu of expense report	2016-03-22 12:57:45 +01:00
Sebastien Bechet	82f74ceb38	Postgresql compatibility patch + cosmetic	2016-03-22 10:09:41 +01:00
Laurent Destailleur	7dac7c4f04	Merge remote-tracking branch 'origin/3.9' into develop	2016-03-11 11:00:53 +01:00
Laurent Destailleur	7a5353efb2	Make things clearer about option MAIN_ENABLE_LOG_TO_HTML	2016-03-10 18:36:09 +01:00
Laurent Destailleur	2e1a63a1f3	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/langs/de_DE/companies.lang htdocs/langs/fr_FR/compta.lang htdocs/societe/class/societe.class.php htdocs/societe/commerciaux.php htdocs/societe/consumption.php	2016-03-10 15:09:30 +01:00
Laurent Destailleur	3b035819a9	Merge remote-tracking branch 'origin/3.8' into 3.9 Conflicts: htdocs/core/modules/askpricesupplier/doc/doc_generic_askpricesupplier_odt.modules.php htdocs/product/document.php htdocs/societe/commerciaux.php	2016-03-10 15:03:53 +01:00
Laurent Destailleur	d663b28dac	Fix no database structure change is allowed into minor versions	2016-03-10 13:49:13 +01:00
Laurent Destailleur	f742d4ec66	Fix code corrupting database	2016-03-10 13:46:52 +01:00
Laurent Destailleur	80805f78ea	Disable too dangerous patch. Fix must be done by doing an insert only without creating/renaming databases.	2016-03-10 13:43:09 +01:00
Florian HENRY	b58e155a6f	FIX : #4785	2016-03-10 12:22:49 +01:00
Florian HENRY	6138da8db6	Extend element type of action comm (for long name external modules)	2016-03-10 11:39:26 +01:00
Laurent Destailleur	09a29322c3	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/accountancy/customer/list.php htdocs/accountancy/supplier/list.php htdocs/commande/orderstoinvoice.php htdocs/public/demo/index.php htdocs/societe/commerciaux.php	2016-03-08 17:40:21 +01:00
Florian HENRY	4bf2da4af7	revert SQL changes	2016-03-08 10:24:59 +01:00
Laurent Destailleur	144c410b52	Add var commented into conf file Fix disabled of module for demo	2016-03-05 01:38:14 +01:00
Laurent Destailleur	66a95be78a	custom dir seems stable enough to be on by default.	2016-03-05 00:09:08 +01:00
Laurent Destailleur	c00860fdd5	Merge pull request #4719 from hregis/3.9_holiday Fix: best compatibility with multicompany and others security issue	2016-03-04 15:30:18 +01:00
Laurent Destailleur	e7511dd267	Fix consistency into data for time spent on tasks	2016-03-04 14:27:05 +01:00
Laurent Destailleur	bc2043cb79	Merge remote-tracking branch 'origin/3.9' into develop	2016-03-03 20:48:47 +01:00
Laurent Destailleur	7dc5fd334f	Italian vat to 22	2016-03-03 19:21:17 +01:00
Regis Houssin	25686e82c9	Fix: best compatibility with multicompany and others security issue	2016-03-03 08:49:24 +01:00
Laurent Destailleur	3a58613e45	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/accountancy/bookkeeping/listbyyear.php htdocs/accountancy/journal/bankjournal.php htdocs/compta/facture/list.php htdocs/filefunc.inc.php htdocs/fourn/facture/list.php htdocs/install/mysql/migration/3.9.0-4.0.0.sql htdocs/projet/activity/index.php	2016-03-02 23:40:11 +01:00
Frédéric FRANCE	222ce45e0c	Update 3.9.0-4.0.0.sql	2016-03-02 18:57:34 +01:00
Laurent Destailleur	d39dca21d7	Add franc guinéen in currency	2016-03-01 22:48:35 +01:00
Laurent Destailleur	724f06a5eb	Merge pull request #4694 from simnandez/3.9 FIX : Remove bad migration file for this version	2016-03-01 01:47:09 +01:00
Laurent Destailleur	a26f880843	Fix missing declarion of form Fix by adding MAIN_USE_OLD_SEARCH_FORM to restore a way for backward compatibility Fix to have delay for payment term at least 1 day (to avoid immediate warning after creation of an invoice)	2016-03-01 00:59:42 +01:00
Juanjo Menent	486488795a	FIX : Remove bad migration file for this version	2016-02-27 09:44:48 +01:00
Juanjo Menent	77173344fe	NEW : Add Malta VAT into 3.9	2016-02-27 09:36:09 +01:00
Juanjo Menent	27b86be62b	Remove from 4.0	2016-02-27 09:29:28 +01:00
Juanjo Menent	673cf602e9	NEW Added Malta VAT into migration script	2016-02-26 20:12:39 +01:00
Laurent Destailleur	1fa94e4d6a	NEW Introduce position of records into dictionnary of type of contacts	2016-02-26 15:03:07 +01:00
BENKE Charlie	f0736a30a6	Added Malta VAT Hope use it Soon ;-)	2016-02-25 14:53:06 +01:00
Laurent Destailleur	715b2024cd	Better repair script	2016-02-24 17:17:41 +01:00
Laurent Destailleur	371dec8503	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql htdocs/langs/en_US/products.lang htdocs/langs/fr_FR/companies.lang	2016-02-24 12:13:12 +01:00
Juanjo Menent	6db0f01fa4	FIX : Bad Argentina provences	2016-02-22 19:53:39 +01:00
Laurent Destailleur	ff9a82c96f	Merge pull request #4670 from atm-ph/new_add_multicurrency_supplier_invoice_payment New add multicurrency supplier invoice payment	2016-02-22 16:26:31 +01:00
Laurent Destailleur	f759f26db9	Fix travis error	2016-02-22 16:20:21 +01:00
phf	fd4cda819c	New add supplier payment	2016-02-21 22:47:52 +01:00
Benoît Peccatte	c969b09ef7	Add support to product translation imports	2016-02-21 22:04:47 +01:00
Laurent Destailleur	351ce6228d	NEW Add width and height on product card	2016-02-20 04:49:02 +01:00
Laurent Destailleur	277d92af75	Secure migration for people using a RC	2016-02-20 03:14:29 +01:00
Laurent Destailleur	0a02d58afb	Merge pull request #4656 from defrance/patch-104 Add model_pdf fields for edition feature on product	2016-02-20 02:29:58 +01:00
Laurent Destailleur	4754ba5683	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/install/mysql/data/llx_10_c_regions.sql htdocs/install/mysql/data/llx_20_c_departements.sql htdocs/install/mysql/data/llx_c_forme_juridique.sql htdocs/langs/de_DE/companies.lang htdocs/langs/fr_FR/bills.lang htdocs/langs/fr_FR/companies.lang htdocs/langs/fr_FR/compta.lang	2016-02-19 20:17:51 +01:00
Laurent Destailleur	f8956f785d	Fix syntax error	2016-02-19 16:12:39 +01:00
Laurent Destailleur	6ab8ba1cb1	Fix sql error	2016-02-19 16:10:14 +01:00
BENKE Charlie	d96c89afa1	Update 3.9.0-4.0.0.sql	2016-02-19 15:55:59 +01:00
BENKE Charlie	8f866254ac	add model_pdf fields for edition feature	2016-02-19 15:47:37 +01:00
Laurent Destailleur	994715f8bb	Upgrade romania	2016-02-19 15:47:00 +01:00
Laurent Destailleur	9c8d69eaa9	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/core/menus/init_menu_auguria.sql htdocs/core/menus/standard/eldy.lib.php	2016-02-19 04:46:11 +01:00
Laurent Destailleur	4d0b9946f5	FIX Maxi serious problem when updating prices and vat of a product. All mode (one price, price per level, ...) were impacted. Localtax setup were lost.	2016-02-19 02:41:00 +01:00
phf	e24a35b904	New add multicurrency on supplier proposal/order	2016-02-16 23:58:21 +01:00
Laurent Destailleur	9d418bca7f	Merge branch 'new_add_customer_multicurrency_payment' of https://github.com/atm-ph/dolibarr into atm-ph-new_add_customer_multicurrency_payment Conflicts: htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-02-16 15:06:39 +01:00
Laurent Destailleur	8fb0f8d9d1	Merge branch 'patch-100' of https://github.com/defrance/dolibarr into defrance-patch-100 Conflicts: htdocs/install/mysql/migration/3.9.0-4.0.0.sql htdocs/user/card.php	2016-02-16 13:54:56 +01:00
Laurent Destailleur	36b0cb5b23	NEW Merge all admin tools (system and module admin tools) into same entry "Admin tools", so now things are clear: All features restricted to an admin user is inside "setup" (for setup) or "admin tools" (for action tools) instead of 3 different entries.	2016-02-16 12:50:15 +01:00
phf	86c8998742	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_add_customer_multicurrency_payment Conflicts: htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-02-15 20:53:06 +01:00
Laurent Destailleur	9cbbf07351	Add fields to link recurring invoice lines with contract origin when it comes from this.	2016-02-15 16:13:33 +01:00
Laurent Destailleur	d4c3258385	Fix missing field Fix bad value for default value of next date	2016-02-15 07:36:45 +01:00
Laurent Destailleur	7aaae143fc	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/core/menus/standard/eldy.lib.php htdocs/expedition/card.php	2016-02-15 02:01:58 +01:00
Laurent Destailleur	e8bc88fffe	Merge branch 'new_recurring_invoice' of https://github.com/atm-ph/dolibarr into atm-ph-new_recurring_invoice Conflicts: htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-02-15 00:45:39 +01:00
Laurent Destailleur	71a12824c9	Merge branch 'new_numbering_module_supplier_payment' of https://github.com/atm-ph/dolibarr into atm-ph-new_numbering_module_supplier_payment Conflicts: htdocs/accountancy/admin/productaccount.php htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-02-15 00:31:33 +01:00
BENKE Charlie	23cb0d437c	Update 3.9.0-4.0.0.sql	2016-02-13 10:53:01 +01:00
BENKE Charlie	b21b5e7bb8	Create llx_categorie_user.key.sql	2016-02-13 10:51:24 +01:00
BENKE Charlie	e3444e08a7	Create llx_categorie_user.sql	2016-02-13 10:50:46 +01:00
Laurent Destailleur	d0ab1db19b	NEW When emailing is not sent completely, show progression	2016-02-12 14:21:44 +01:00
phf	c4812abd62	Fix can update fields of facture rec Fix create invoice from facture rec don't get all properties and add fk_account	2016-02-12 12:31:43 +01:00
Frédéric FRANCE	ad534c90e6	Update 3.8.0-3.9.0.sql	2016-02-12 10:34:21 +01:00
phf	875e01aeee	New add recurrence fields on create form of invoice model Fix missing fields in database about multicurrency	2016-02-11 09:50:35 +01:00
phf	a0cfe9aad8	New add payment with multicurrency module	2016-02-10 23:16:38 +01:00
Florian HENRY	23e35a6012	update size of elementtype column into llx_actioncomm (module_subelement name can be longer than 32)	2016-02-10 14:21:57 +01:00
Laurent Destailleur	5ea9c6dd83	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/accountancy/admin/productaccount.php htdocs/core/class/html.formprojet.class.php htdocs/core/menus/standard/eldy.lib.php htdocs/filefunc.inc.php htdocs/langs/en_US/accountancy.lang	2016-02-09 14:40:25 +01:00
Laurent Destailleur	fcf1e20d5b	Merge pull request #4578 from frederic34/sticker Dictionnary for label sticker and card format	2016-02-08 14:49:31 +01:00
Laurent Destailleur	d2708a4225	Merge pull request #4475 from atm-ph/new_multicurrency_module New multicurrency module	2016-02-08 14:44:49 +01:00
Laurent Destailleur	4c859999e8	Fix first install on debian.	2016-02-06 17:19:57 +01:00
Laurent Destailleur	c6fe8e5479	Fix first install on debian.	2016-02-06 17:13:24 +01:00
phf	d66bc6f1b3	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_numbering_module_supplier_payment Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2016-02-06 12:57:30 +01:00
Laurent Destailleur	2e1011ca0c	Add hidden option MAIN_CAN_HIDE_EXTRAFIELDS to disable a feature that seems useless.	2016-02-06 12:29:02 +01:00
frederic34	e079021de3	data	2016-02-06 12:16:12 +01:00
frederic34	0d11d94234	Merge remote branch 'upstream/develop' into sticker Conflicts: htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-02-06 12:12:35 +01:00
frederic34	9c74af63af	Dictionnary for label sticker and card format	2016-02-06 12:06:05 +01:00
Laurent Destailleur	cb66448148	Merge pull request #4564 from atm-ph/new_feature_hidden_extrafields NEW feature hidden extrafields	2016-02-05 17:22:51 +01:00
Laurent Destailleur	04043cdb31	Merge pull request #4569 from abcnet-lu/raisons-socials-luxembourg Fix: legal forms and professional IDs in Luxembourg	2016-02-05 10:58:03 +01:00
Laurent Destailleur	807e7b8304	Merge pull request #4560 from abcnet-lu/revert-develop-20160203 Fix : Add districts and cantons for Luxembourg	2016-02-05 10:53:51 +01:00
phf	a8e480e392	FIX #3509 payment ref for suppliers	2016-02-04 23:15:06 +01:00
abcnet-lu	490f3eaf82	[#4566 ] Add legal forms for Luxembourg	2016-02-04 14:41:26 +01:00
phf	75c4888364	NEW feature hidden extrafields	2016-02-03 22:49:43 +01:00
phf	1b552a0b3b	Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module Conflicts: htdocs/core/class/link.class.php htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-02-03 18:30:59 +01:00
abcnet-lu	d430676e51	[Close] [#4558 ] Add districts and cantons for Luxembourg	2016-02-03 12:14:26 +01:00
abcnet-lu	d65ee22529	[Close] [#4555 ] Update label of intermediary VAT rate for Luxembourg (fix inverted labels)	2016-02-03 09:27:48 +01:00
PeartreeG	cc8af4fba1	Update llx_element_resources.sql	2016-02-02 18:05:24 +01:00
PeartreeG	b0579cc39b	Update 3.9.0-4.0.0.sql	2016-02-02 18:05:00 +01:00
Laurent Destailleur	1fb1da5be4	Work on website module	2016-02-02 16:24:12 +01:00
Laurent Destailleur	f28d8669d9	Fix: no change of data ref.	2016-02-02 14:43:19 +01:00
Laurent Destailleur	335914ed3e	Merge pull request #4554 from abcnet-lu/develop Fix: Update VAT rates + label of intermediary VAT rate for Luxembourg	2016-02-02 14:41:41 +01:00
Florian HENRY	9298f167a7	Fix Travis	2016-02-02 12:32:25 +01:00
abcnet-lu	a196e163e0	[Close] [#4555 ] Update label of intermediary VAT rate for Luxembourg (fix spaces)	2016-02-02 09:32:38 +01:00
abcnet-lu	755758dd7a	[Close] [#4555 ] Update label of intermediary VAT rate for Luxembourg	2016-02-02 09:28:45 +01:00
bosseal	fb7e1adad7	[Close] [#4553 ] Update VAT rates for Luxembourg (as they changed in 2015)	2016-02-02 08:23:46 +01:00
PeartreeG	ceb1cd5798	Update 3.9.0-4.0.0.sql	2016-01-31 18:16:53 +01:00
PeartreeG	e2404b57b3	adding additionnal fields for tracking resource use	2016-01-31 18:15:11 +01:00
PeartreeG	f6dc4757d0	add fields for resource tracking	2016-01-31 18:13:14 +01:00
Laurent Destailleur	928336c835	NEW Clean and enhance code for cron engine	2016-01-31 15:14:50 +01:00
PeartreeG	1fbfdbfefd	add new ressources fields	2016-01-31 12:47:18 +01:00
PeartreeG	b47065862a	Update llx_resource.sql	2016-01-31 12:38:05 +01:00
PeartreeG	91e46b1d35	add somes fields on resource	2016-01-31 12:37:03 +01:00
Laurent Destailleur	7c2ac4b3ee	NEW The probability of lead/opportunity can be defined per lead.	2016-01-28 20:04:02 +01:00
phf	8e933ebb2d	Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module	2016-01-25 19:31:35 +01:00
Laurent Destailleur	274caf61eb	NEW Add statistics for interventions module	2016-01-25 13:34:05 +01:00
Laurent Destailleur	467dc12a7b	NEW Module "Supplier commercial proposal" (price request) is set to stable status.	2016-01-25 12:33:38 +01:00
Laurent Destailleur	d65229998b	Work on website module	2016-01-25 10:25:52 +01:00
Laurent Destailleur	8d46a56dac	Work on CMS module	2016-01-24 21:17:11 +01:00
Laurent Destailleur	c1ebdd3b4f	Default url is home	2016-01-24 11:35:33 +01:00
phf	2d4f355792	FIX back quote into migration sql file	2016-01-21 21:57:09 +01:00
phf	f7afbcff68	NEW integration of multicurrency module (creation fields in database and admin) NEW add multicurrency_code on create, update and fetch company object NEW add multicurrency on propal FIX travis FIX back quote into sql file	2016-01-21 21:38:52 +01:00
aspangaro	84ff86ab50	Merge remote-tracking branch 'Upstream/develop' into develop-p3	2016-01-21 20:53:42 +01:00
aspangaro	ddc2e8bfbe	Fix: Modify length of code journal for accountancy in bank account	2016-01-21 20:52:15 +01:00
Laurent Destailleur	4dc812618a	NEW Add index on invoice status NEW Add constant MAIN_LOGTOHTML to 0 into other setup by default to save time when we need to make debug on hosted instance.	2016-01-21 10:37:43 +01:00
Laurent Destailleur	6bccac5691	NEW Add Expense report to approve into workboard NEW Selection of boxes is move on top	2016-01-18 11:35:45 +01:00
Laurent Destailleur	4a009d2ad2	NEW On translation admin page, admin can overwrite a translation value.	2016-01-16 00:48:14 +01:00
Laurent Destailleur	e01d964652	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-01-14 23:46:30 +01:00
Laurent Destailleur	89fad007b4	Fix constant() need the string name of a constant to return value of	2016-01-14 11:17:47 +01:00
Laurent Destailleur	97e96bed87	Merge pull request #4360 from GPCsolutions/develop-morelock [Security] Detect lockfile even without configuration	2016-01-12 23:24:34 +01:00
Raphaël Doursenaud	4d8a9abdbc	[Security] Detect lockfile even without configuration	2016-01-11 11:10:04 +01:00
Laurent Destailleur	03eccb3336	Prepare database to be able to manage a different opportunity probability for each opportunity.	2016-01-10 19:48:59 +01:00
Laurent Destailleur	59765f81c5	Prepare 4.0 dev	2016-01-10 11:59:21 +01:00
Laurent Destailleur	8653e7fa5c	Merge remote-tracking branch 'origin/3.9' into develop	2016-01-10 00:12:51 +01:00
Juanjo Menent	9c0b6ff5a4	Fix: Move table interventions modify from 3.9 to 4.0	2016-01-09 18:08:55 +01:00
Juanjo Menent	66c5d7c9ce	Merge pull request #4150 from defrance/patch-84 Add date start and end of intervention	2016-01-09 17:56:39 +01:00
Laurent Destailleur	f9933aba0c	Install style match application style	2016-01-08 22:23:57 +01:00
Laurent Destailleur	cbe65fbc79	Fix: fields added into 3.8 to store email event was not enough. To late to use them. Will be done into 4.0	2016-01-08 13:05:56 +01:00
Laurent Destailleur	0cad938e09	Merge remote-tracking branch 'origin/3.5' into 3.6 Conflicts: htdocs/install/upgrade.php	2016-01-02 12:19:49 +01:00
Laurent Destailleur	b46aec8e7e	Fix to allow phpunit of migration process for 3.5 to 3.6	2016-01-02 12:18:26 +01:00
Laurent Destailleur	35ce670bf2	Fix to allow phpunit of migration process for 3.4 to 3.5	2016-01-02 12:18:12 +01:00
Laurent Destailleur	5a49b8ce53	Fix: error when running install twice Fix: a minor error was locking the full upgrade process.	2015-12-31 12:02:22 +01:00
bobby	e557c002c8	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-12-26 11:56:10 +01:00
Laurent Destailleur	8c1f271356	Maxi debug of module leave requests.	2015-12-24 12:37:38 +01:00
Florian HENRY	8006baf592	ry	2015-12-21 13:09:22 +01:00
Laurent Destailleur	a4edd90320	Debug the cron module	2015-12-19 03:27:55 +01:00
Laurent Destailleur	a973c91c24	Fix pagination on cron jobs Fix perf when too much lines	2015-12-19 02:39:44 +01:00
Laurent Destailleur	dc9c5ed5ef	Enhance transifex sync	2015-12-18 18:25:09 +01:00
cla	cb96618460	Merge branch 'develop' into develop_sunimport	2015-12-18 10:49:57 +01:00
Laurent Destailleur	5eea1ce7d9	Fix several warnings	2015-12-17 19:37:24 +01:00
cla	ef487c48a4	NEW Extrafields for: - expedition, expeditiondet, livraison, livraisondet	2015-12-16 16:18:29 +01:00
aspangaro	5cd5413836	Accountancy add a column in table bookkeeping to validate operations	2015-12-16 05:22:50 +01:00
BENKE Charlie	85344aa955	Update llx_fichinter.sql	2015-12-15 11:46:56 +01:00
BENKE Charlie	3e8c670e84	Update 3.8.0-3.9.0.sql	2015-12-15 11:46:20 +01:00
Laurent Destailleur	3b595f0247	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/accountancy/bookkeeping/list.php htdocs/accountancy/customer/list.php htdocs/accountancy/journal/bankjournal.php htdocs/core/lib/date.lib.php htdocs/core/lib/report.lib.php htdocs/langs/en_US/accountancy.lang	2015-12-13 16:23:33 +01:00
Laurent Destailleur	a462cd232d	Merge remote-tracking branch 'origin/3.7' into 3.8	2015-12-13 16:09:09 +01:00
Laurent Destailleur	4a88c9ea9f	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/product/class/product.class.php	2015-12-13 15:53:57 +01:00
Laurent Destailleur	5f4be14dd2	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-12-12 13:19:55 +01:00
Laurent Destailleur	47fce16778	Merge branch 'develop' of https://github.com/FHenry/dolibarr into FHenry-develop Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2015-12-11 17:04:19 +01:00
Andreas Pachler	019bc7ba8e	added austrian Regions, Departements, Forme Juridique and social charges to migration file from 3.8 to 3.9	2015-12-10 12:56:05 +01:00
Raphaël Doursenaud	c0862762a5	Fix #3930 Removed executable bit These files doesn't contain executable code and may pose a security threat.	2015-12-09 13:28:36 +01:00
Florian HENRY	96a95d6ae1	Debug accountancy on 3.9	2015-12-09 12:55:08 +01:00
Andreas Pachler	4885c64ab3	added social charges for Austria	2015-12-09 09:32:21 +01:00
Laurent Destailleur	984068c136	Fix length of password too low (password was truncated making them inoperent)	2015-12-06 19:17:39 +01:00
Laurent Destailleur	7f3531a04c	Enhance script to track duplicate translation string and use it to remove around 50 duplicates.	2015-12-06 13:34:57 +01:00
BENKE Charlie	1da6b06605	Update 3.8.0-3.9.0.sql	2015-12-04 13:23:13 +01:00
aspangaro	c30728326e	Merge remote-tracking branch 'Upstream/develop' into develop-bank	2015-12-04 12:41:51 +01:00
BENKE Charlie	46aaf9c270	Update 3.8.0-3.9.0.sql	2015-12-04 12:34:17 +01:00
BENKE Charlie	2c95344f05	Add date start and end of intervention	2015-12-04 11:09:05 +01:00
Laurent Destailleur	2f02919c70	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-12-03 10:01:51 +01:00
Laurent Destailleur	c664a492e6	Removed a not used field making mysql error (reserved word). Also this field is not required by dolibarr core.	2015-12-03 10:01:40 +01:00
Laurent Destailleur	055e650adf	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-12-02 23:23:38 +01:00
aspangaro	09a6cc9625	wrong table	2015-12-01 20:17:14 +01:00
aspangaro	882b66c586	HRM - Add bank tab in user to pay salary or expense report	2015-12-01 06:56:26 +01:00
Laurent Destailleur	de730c9762	NEW Introduce cost price on product.	2015-11-30 21:20:45 +01:00
Laurent Destailleur	c55d11869b	Billing of supplier or customer order is a process that can be done in parallel with shipment or reception, so we show the status on another field into lists.	2015-11-29 15:54:32 +01:00
Laurent Destailleur	b47dbc7a5f	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/install/pgsql/functions/functions.sql htdocs/projet/element.php	2015-11-26 01:32:21 +01:00
Laurent Destailleur	e438d76df9	NEW Option encrypt password into databae is set to on by default on first install.	2015-11-22 11:32:31 +01:00
Laurent Destailleur	69757210ce	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-11-21 02:40:21 +01:00
Laurent Destailleur	2eba3c9e81	Comment	2015-11-21 02:39:49 +01:00
Laurent Destailleur	9db71098ac	Merge pull request #4031 from FHenry/develop PG SQL	2015-11-21 01:50:47 +01:00
Laurent Destailleur	a906774595	Merge pull request #3979 from atm-alexis/3.9_NEW_add_billed_status_for_supplier_order NEW 3.9 add billed status for supplier order	2015-11-21 00:20:17 +01:00
Laurent Destailleur	401b2a7389	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/theme/md/style.css.php	2015-11-20 23:47:07 +01:00
Florian HENRY	eac28076c9	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-11-20 11:59:39 +01:00
Juanjo Menent	9ecdfa8be8	Merge pull request #4017 from apachler/develop added Regions, Departements and Forme Juridique for Austria	2015-11-18 22:04:19 +01:00
Florian HENRY	fbe8a181a9	fix pgsql	2015-11-18 14:03:25 +01:00
Laurent Destailleur	735c7b7d68	Code comment	2015-11-18 13:57:01 +01:00
Florian HENRY	0ffc2a226c	fix pg migration script	2015-11-18 13:53:04 +01:00
Florian HENRY	28196a5fd9	add pgsql function	2015-11-18 12:24:52 +01:00
Laurent Destailleur	b1c5768de9	NEW Add fields into llx_cronjobs to be able to use job table to queue one shot jobs.	2015-11-17 18:22:39 +01:00
Laurent Destailleur	6dc6bab556	Support of 'small', 'mini' and '' image size everywhere.	2015-11-17 10:38:00 +01:00
Laurent Destailleur	86db029cb3	Merge pull request #4013 from fappels/develop Fix migration - remove default for text field	2015-11-17 10:06:07 +01:00
Andreas Pachler	161b75acfc	added Regions, Departements and Forme Juridique for Austria	2015-11-17 06:56:49 +01:00
fappels	e9be3d19f4	Fix migration - remove default for text field remove default for user_param value text field lang typo	2015-11-16 21:24:08 +01:00
Alexis Algoud	55b23c4918	FIX add billed field in supplier order	2015-11-16 14:55:46 +01:00
fmarcet	9e51cf66dd	New: Bolivian regions and departmens	2015-11-16 12:34:59 +01:00
Laurent Destailleur	6bd6be0912	Debug and rename experimental module "supplier proposal". Still work to do: Must fix the PDF to be compliant with a request quotation to a supplier (so no need to show vat, unit price, ...).	2015-11-15 19:23:39 +01:00
Laurent Destailleur	01058be44c	NEW Introduce a "code" into fiels to describe vat. This will allow to suggest different vat lines with same value with ability to differentiate them.	2015-11-14 17:53:58 +01:00
Laurent Destailleur	ab177b43af	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: ChangeLog htdocs/.gitignore htdocs/comm/mailing/card.php htdocs/commande/list.php htdocs/compta/facture.php htdocs/expedition/class/expedition.class.php	2015-11-13 12:35:10 +01:00
Frédéric FRANCE	bab41e40e7	Update 3.8.0-3.9.0.sql	2015-11-12 17:50:52 +01:00
Frédéric FRANCE	bd7687b6ab	Update llx_accounting_account.key.sql	2015-11-12 17:47:08 +01:00
aspangaro	05b0ab2eab	HRM: Add fk_establishment in llx_user to link an user to an establishment	2015-11-11 15:45:55 +01:00
Laurent Destailleur	f49fab8a7e	Rename some files in english and increase fields size.	2015-11-09 16:48:30 +01:00
Laurent Destailleur	6ec33a94c6	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-11-08 15:39:10 +01:00
Laurent Destailleur	bd56396394	Fix migration error	2015-11-08 15:38:57 +01:00
Juanjo Menent	a02100e3c7	Merge pull request #3924 from atm-gauthier/develop_fix_script_creation FIX : wrong coma in llx_opensurvey_sondage.sql creation script	2015-11-08 11:03:26 +01:00
Laurent Destailleur	fa8863d2ea	Fix sql migration requests	2015-11-08 01:38:03 +01:00
Florian HENRY	a4fafae109	FIX : Remove column creation for table llx_product_fournisseur_price, the column use un calss is fk_supplier_price_expression, and fk_price_expression does not exist into lx_product_fournisseur_price sql file declaration	2015-11-07 17:19:13 +01:00
Laurent Destailleur	439e4a483d	Doc comment	2015-11-07 12:37:05 +01:00
Laurent Destailleur	09fb87e47d	Prepare tables for categories/tags on projects. Looking for a dev to implement categories/tags on projects !	2015-11-07 11:40:31 +01:00
Laurent Destailleur	b2d9f21253	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-11-06 18:57:46 +01:00
Gauthier	ef3c7f927e	FIX : wrong coma in llx_opensurvey_sondage.sql creation script	2015-11-06 16:38:26 +01:00
Florian HENRY	28b229c83a	FIX: #3916	2015-11-06 11:24:52 +01:00
Laurent Destailleur	11f0cad2ab	FIX #3912	2015-11-06 11:22:50 +01:00
Florian HENRY	d3d62f7db5	FIX: #3913	2015-11-06 11:11:23 +01:00
Florian HENRY	b0be2b04c7	FIX : #3912	2015-11-06 10:53:33 +01:00
Florian HENRY	f6b8c3a130	FIX : #3912	2015-11-06 10:50:08 +01:00
Laurent Destailleur	0433f20354	Code comment	2015-11-05 22:20:31 +01:00
Laurent Destailleur	e26940ddf7	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/core/lib/admin.lib.php htdocs/core/modules/DolibarrModules.class.php htdocs/fourn/ajax/getSupplierPrices.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/install/filelist.xml htdocs/install/mysql/migration/3.8.0-3.9.0.sql htdocs/societe/price.php	2015-11-05 01:50:30 +01:00
Laurent Destailleur	81f0b516b9	Prepare module opensurvey for 'Form' type.	2015-11-04 11:08:46 +01:00
Laurent Destailleur	826cc6db1b	Repair old deprecated data	2015-11-04 09:54:13 +01:00
Laurent Destailleur	ea0bf44670	The ckecksum file should not be into sources. Only into packages.	2015-11-03 09:43:39 +01:00
Laurent Destailleur	85af140420	More complete example of odt template for invoices	2015-11-02 15:46:27 +01:00
Laurent Destailleur	8f2fb3cbee	Merge pull request #3845 from frederic34/patch-19 Remove incomplete llx_stock_lotserial migration	2015-11-02 10:43:55 +01:00
Juanjo Menent	a58b5f26f6	Merge pull request #3774 from marcosgdf/multiprice-generator NEW Level multiprice generator based on per cent variations over base price	2015-10-31 23:03:19 +01:00
Marcos García de La Fuente	592348850f	Added missing SQL statements + reordered them	2015-10-31 11:48:17 +01:00
Marcos García de La Fuente	e1f2efee4d	Merge branch 'develop' into multiprice-generator # Conflicts: # htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2015-10-31 11:46:14 +01:00
Frédéric FRANCE	f3f83fa6c1	Remove incomplete llx_stock_lotserial migration There is two creation of this table in migration script, keeping the more complete	2015-10-31 10:32:41 +01:00
Frédéric FRANCE	4108f55c1e	Update 3.8.0-3.9.0.sql	2015-10-31 10:07:13 +01:00
Frédéric FRANCE	4160342656	Update llx_c_hrm_function.sql	2015-10-31 10:05:34 +01:00
Maxime Kohlhaas	59714e4b32	Fix : migration wrong index	2015-10-30 12:41:36 +01:00
Laurent Destailleur	6cc3df7e71	NEW Quick searh filter works on invoice, proposal, order, intervention, contract	2015-10-30 08:35:56 +01:00
Laurent Destailleur	2b5746aec3	Add field position into some dictionaries tables	2015-10-29 21:25:18 +01:00
Laurent Destailleur	282972784e	Prepare table for budget lines	2015-10-29 19:18:41 +01:00
Laurent Destailleur	8f52d426d0	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2015-10-28 22:08:28 +01:00
Laurent Destailleur	8c84ce1576	Create table llx_stock_serial. This table may be used to store eatby and sellby date for a couple product-batch number in one place only.	2015-10-28 22:05:37 +01:00
Marcos García de La Fuente	eff1f73950	Merge branch 'develop' into multiprice-generator # Conflicts: # htdocs/install/mysql/migration/3.8.0-3.9.0.sql # htdocs/product/price.php	2015-10-27 10:41:50 +01:00
aspangaro	b90c56fbb5	HRM : move migration into 3.8 to 3.9	2015-10-27 06:29:18 +01:00
Laurent Destailleur	24c3491ff7	Code comment	2015-10-26 22:56:54 +01:00
Laurent Destailleur	07b277b23f	Prepare fields in dtabase to store if time spent was invoiced or not.	2015-10-26 15:22:33 +01:00
Laurent Destailleur	1f1e72f2b6	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/compta/facture/list.php htdocs/core/class/html.form.class.php htdocs/core/lib/functions.lib.php htdocs/filefunc.inc.php htdocs/fourn/facture/list.php htdocs/main.inc.php	2015-10-25 19:54:41 +01:00
Laurent Destailleur	2cbfb69f9b	Update template	2015-10-23 15:28:14 +02:00
Laurent Destailleur	016dbd39ee	Fix sql phpunit regression	2015-10-23 15:24:47 +02:00
Sergio Sanchis Climent	2a412af00b	Fix: Bug: if $this->employe no exist Fix: if this->employee no exist default 0	2015-10-23 13:04:33 +02:00
Laurent Destailleur	633055fe5b	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-10-22 19:44:00 +02:00
Laurent Destailleur	1000fd1b21	Add field employee for hr module	2015-10-22 19:43:50 +02:00
Laurent Destailleur	8df59134a9	Merge pull request #3705 from aspangaro/develop-hrm New : Module HRM	2015-10-22 19:15:49 +02:00
Laurent Destailleur	cac4a85ccd	Merge pull request #3788 from atm-maxime/new_customer_recap New customer recap	2015-10-22 18:02:38 +02:00
Laurent Destailleur	3d7050e051	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-10-22 12:29:35 +02:00
Laurent Destailleur	9cbb9129c2	FIX #3772	2015-10-22 12:29:24 +02:00
Laurent Destailleur	ce681081c1	Merge pull request #3776 from frederic34/patch-15 Set warehouse for order	2015-10-22 12:16:40 +02:00
Laurent Destailleur	40adaf716d	Uniformize index names	2015-10-22 10:33:42 +02:00
Laurent Destailleur	4453ba53fd	Fix migration error	2015-10-22 10:28:59 +02:00
Frédéric FRANCE	6a524eeabb	Update 3.8.0-3.9.0.sql	2015-10-19 21:04:05 +02:00
Frédéric FRANCE	1d9f9c7f5b	Update llx_commande.sql	2015-10-19 21:00:47 +02:00
Frédéric FRANCE	2264ecfb2c	Update llx_commande.sql	2015-10-19 20:58:36 +02:00
Maxime Kohlhaas	a953a66616	New : allow to define list size for object list on customer card	2015-10-19 19:05:04 +02:00
Laurent Destailleur	ec04306348	Fix #3772 Test lower value to avoid mysql limit	2015-10-19 18:31:38 +02:00
Marcos García de La Fuente	e7e152c122	NEW Level multiprice generator based on per cent variations over base price	2015-10-19 15:13:19 +02:00
Laurent Destailleur	dcf7d344cd	Prepare database for future portal website	2015-10-19 12:54:22 +02:00
Laurent Destailleur	b9001d7ab8	NEW Prepare database to store information per files (for example to define if an image ca, be used as a cover or not)	2015-10-18 22:43:19 +02:00
Laurent Destailleur	d0e590f8ea	Move variables	2015-10-18 20:56:10 +02:00
aspangaro	aac88519de	Merge remote-tracking branch 'Upstream/develop' into develop-hrm Conflicts: htdocs/user/card.php	2015-10-17 07:19:46 +02:00
Laurent Destailleur	91a2341e88	Add missing column	2015-10-17 03:32:19 +02:00
Laurent Destailleur	b3491ef4e5	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: ChangeLog htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/admin/facture_cust_extrafields.php htdocs/compta/facture/admin/facturedet_cust_extrafields.php htdocs/compta/facture/class/facture.class.php htdocs/contrat/card.php	2015-10-16 10:12:36 +02:00
Laurent Destailleur	577776b950	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-10-15 12:19:01 +02:00
Laurent Destailleur	e2478eea07	NEW Increase length of bank code to 128 char #3704	2015-10-15 12:18:17 +02:00
Laurent Destailleur	7fe92bdf0a	Merge pull request #3722 from GPCsolutions/zenfusion-23 [Qual] Use default data root path if no conf	2015-10-15 12:06:04 +02:00
Laurent Destailleur	7f75a3da9d	NEW On list of thirdparties, user can select fields to show. Make phpunit test working again localy. Add missing columns into llx_expedition.	2015-10-15 03:29:35 +02:00
Laurent Destailleur	e9aed15bed	Work on the feature to select which field to show	2015-10-14 18:48:03 +02:00
Raphaël Doursenaud	ddb23eaf3b	[Qual] Use default data root path if no conf Installation can be protected by an install.lock file in the data root path. This protection was ineffective if no configuration file was available. Whith this change, it still searches the default path.	2015-10-12 15:25:36 +02:00
Laurent Destailleur	1acaf44acf	Merge pull request #3718 from hregis/3.8_bug Fix: wrong files name	2015-10-11 19:48:25 +02:00
Laurent Destailleur	a9a3c3b97f	Exclude file from sources. It is generated when building package.	2015-10-11 19:47:47 +02:00
Laurent Destailleur	a8e52f9c54	Update filelist	2015-10-11 19:45:53 +02:00
Regis Houssin	f8f600828d	Fix: wrong files name	2015-10-11 19:18:03 +02:00
aspangaro	8b97196c2f	Correct term status & sql error	2015-10-10 08:50:55 +02:00
aspangaro	5d7e05e313	Correct review	2015-10-10 06:00:55 +02:00
aspangaro	f6947afc2f	Merge remote-tracking branch 'Upstream/develop' into develop-hrm	2015-10-10 05:42:06 +02:00
Raphaël Doursenaud	b785db86a8	Fix unittests regression Introduced by incomplete renaming of modSyncSupplierWebServices to modWebServicesClient in `4b103ba8ce`	2015-10-09 19:02:44 +02:00
aspangaro	bde7279aa1	Review by Rdoursenaud. Tkanks	2015-10-09 13:00:51 +02:00
aspangaro	b571cc86ff	Add a yn form in user card to know if the user is also an employee	2015-10-09 07:30:48 +02:00
aspangaro	6a7892ca52	Add the first tables	2015-10-09 06:41:36 +02:00
Laurent Destailleur	4b103ba8ce	Work on a better way to manage modules. All one page. Introduce a way to choose order of modules family. We should also be able to introduce filters.	2015-10-07 08:13:23 +02:00
frederic34	7f86797f73	Add contact photo	2015-10-04 17:25:46 +02:00
Juanjo Menent	92f4c0d015	Merge remote-tracking branch 'upstream/develop' into dolibarr-3509	2015-10-03 16:01:24 +02:00
Juanjo Menent	67d28d6991	Merge remote-tracking branch 'upstream/develop' into dolibarr-3509 Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2015-10-03 14:59:56 +02:00
Laurent Destailleur	c0c0cc2415	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/compta/facture/list.php htdocs/langs/fr_FR/admin.lang htdocs/langs/fr_FR/interventions.lang htdocs/theme/md_exp/style.css.php	2015-10-03 14:28:31 +02:00
Laurent Destailleur	920803518f	Removed not used table	2015-10-02 16:31:34 +02:00
Laurent Destailleur	53269a2703	Removed old theme with no maintener.	2015-10-01 23:27:41 +02:00
Laurent Destailleur	fcf3a0966c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-10-01 23:19:58 +02:00
Laurent Destailleur	3f8b95de77	Work on default theme	2015-10-01 23:19:50 +02:00
Laurent Destailleur	09e5d71796	Merge pull request #3631 from hregis/develop_origin Fix: missing llx_const encryption	2015-10-01 13:57:47 +02:00
Regis Houssin	45a70d7dc3	Fix: wrong test	2015-10-01 12:41:29 +02:00
Regis Houssin	1c023e291c	Fix: avoid error during update if db port not defined	2015-10-01 12:35:38 +02:00
Regis Houssin	259f7af3e6	Fix: missing llx_const encryption	2015-10-01 12:06:45 +02:00
Laurent Destailleur	b57c156b60	Merge remote-tracking branch 'origin/3.7' into 3.8 Conflicts: htdocs/core/modules/modContrat.class.php htdocs/fichinter/card.php htdocs/install/upgrade2.php	2015-10-01 11:16:35 +02:00
Laurent Destailleur	c7e05d2473	Add field pass_crypted to uniformize fields between members and users.	2015-09-30 19:27:36 +02:00
Florian HENRY	bb0de1dcad	FIX : update2.php test res befre assign it	2015-09-29 15:00:11 +02:00
Juanjo Menent	f14c806439	Merge branch 'develop' into dolibarr-3509 Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2015-09-26 09:03:50 +02:00
Juanjo Menent	342e3413db	Issue 3509: Init works	2015-09-23 22:48:48 +02:00
aspangaro	918c323f8f	Salaries : Add info card / add field datec / rename field user_creat to user_author	2015-09-23 06:37:14 +02:00
Laurent Destailleur	81b447dd0f	NEW Add color on categories	2015-09-17 19:51:56 +02:00
Laurent Destailleur	b1168d223a	NEW Introduce table llx_overwrite_trans to be able to overwrite translations by simple database edition.	2015-09-17 18:44:42 +02:00
Laurent Destailleur	9cbd236c8c	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/filefunc.inc.php	2015-09-16 22:09:21 +02:00
Laurent Destailleur	e0a88fabd9	FIX #3521	2015-09-14 17:54:53 +02:00
Laurent Destailleur	b4c964760d	Sync transifex	2015-09-13 23:25:55 +02:00
Laurent Destailleur	4eedec0274	Fix tool to generate filecheck	2015-09-13 20:25:33 +02:00

... 17 18 19 20 21 ...

4584 Commits