dolibarr

mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00

Author	SHA1	Message	Date
Philippe GRAND	69bf43f851	Merge remote-tracking branch 'upstream/develop' into new_branch_11_09_2018	2018-09-12 14:48:50 +02:00
Laurent Destailleur	fcabe67e4b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-12 13:30:28 +02:00
Laurent Destailleur	af2e19eba8	Replace skype module with social networks module to support more fields	2018-09-12 10:55:45 +02:00
Philippe GRAND	c51a0ef901	Standardize and update code	2018-09-12 10:10:07 +02:00
ias-ceo	b4691df8d9	use correct resultset	2018-09-10 17:29:29 +02:00
Frédéric FRANCE	a558c3bdac	replace select_date	2018-09-09 11:25:59 +02:00
Laurent Destailleur	0ef17fe581	FIX Problems with permissions of module to record payment of salaries	2018-09-07 13:32:56 +02:00
Frédéric FRANCE	ab4ae0f7bb	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-06 21:28:30 +02:00
Frédéric FRANCE	70ba223788	move phpcs:ignore	2018-09-06 21:27:18 +02:00
Frédéric FRANCE	cbf4a20a13	move phpcs:ignore	2018-09-06 19:03:09 +02:00
Frédéric FRANCE	3ecf788438	move phpcs:ignore	2018-09-06 18:29:01 +02:00
Laurent Destailleur	f7c87a9ad3	Clean cron init	2018-09-05 22:46:08 +02:00
Frédéric FRANCE	4cbfa2073a	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-05 21:02:16 +02:00
Frédéric FRANCE	85df267a5b	move phpcs:ignore	2018-09-05 20:36:44 +02:00
Laurent Destailleur	4ac67e6409	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-05 20:31:10 +02:00
Frédéric FRANCE	f7c3ca9d20	move phpcs:ignore	2018-09-05 18:49:06 +02:00
Laurent Destailleur	3650dc3ec9	FIX #8452	2018-09-05 15:25:47 +02:00
Frédéric FRANCE	ecc6c118a6	move phpcs:ignore	2018-09-04 23:26:37 +02:00
Frédéric FRANCE	7799774ca1	move phpcs:ignore	2018-09-04 22:52:55 +02:00
Frédéric FRANCE	3847df1de6	move phpcs:ignore	2018-09-04 21:53:53 +02:00
Frédéric FRANCE	c6cef85ccd	move phpcs:ignore	2018-09-04 21:16:17 +02:00
Frédéric FRANCE	65b74ad30f	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-04 20:48:35 +02:00
Frédéric FRANCE	fd6281b364	move phpcs:ignore	2018-09-04 20:00:09 +02:00
Frédéric FRANCE	1ae1afe843	move phpcs:ignore	2018-09-04 08:09:48 +02:00
Frédéric FRANCE	d08b68e8ed	move phpcs:ignore	2018-09-03 20:38:52 +02:00
Frédéric FRANCE	5f4a922c1d	move phpcs:ignore	2018-09-03 19:00:37 +02:00
Philippe GRAND	7a0c19485e	fix merge	2018-09-03 09:34:08 +02:00
Frédéric FRANCE	e4946cc8eb	move phpcs:ignore	2018-09-03 00:03:17 +02:00
Frédéric FRANCE	9c3352d2de	move phpcs:ignore	2018-09-02 23:44:53 +02:00
Frédéric FRANCE	489074af5c	move phpcs:ignore	2018-09-02 23:25:10 +02:00
Frédéric FRANCE	2a9ef8dc05	move phpcs:ignore	2018-09-02 22:05:19 +02:00
Laurent Destailleur	0bf850c1ea	Fix phpcs	2018-09-02 16:26:00 +02:00
Laurent Destailleur	3baaa2e975	Fix syntax error	2018-09-02 16:18:08 +02:00
Laurent Destailleur	b34731afb4	Merge pull request #9385 from frederic34/patch-15 Update html_cerfafr.modules.php	2018-09-02 15:38:19 +02:00
Laurent Destailleur	91809de1c3	Merge pull request #9383 from frederic34/patch-13 Update doc_generic_user_odt.modules.php	2018-09-02 15:35:54 +02:00
Philippe GRAND	5cd9557318	Standardize and Update code	2018-09-01 23:12:20 +02:00
Philippe GRAND	5d273960dc	fix conflict	2018-09-01 22:40:38 +02:00
Frédéric FRANCE	49a1e33fc9	Update html_cerfafr.modules.php	2018-09-01 16:23:30 +02:00
Laurent Destailleur	c8912d6a4f	Merge pull request #9242 from frederic34/camelCaps mark non camelCaps function	2018-09-01 15:37:56 +02:00
Frédéric FRANCE	ae52b737b3	Update doc_generic_user_odt.modules.php	2018-09-01 15:29:41 +02:00
Philippe GRAND	17e349eba2	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2018-09-01 14:27:53 +02:00
Laurent Destailleur	bcee0ef0ae	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/commande/dispatch.php htdocs/societe/class/societe.class.php htdocs/stripe/config.php	2018-09-01 14:16:57 +02:00
Philippe GRAND	bd473059ae	precise label comment	2018-09-01 14:13:05 +02:00
Laurent Destailleur	26cff9e11f	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/langs/en_US/blockedlog.lang htdocs/stripe/config.php	2018-09-01 14:13:01 +02:00
Frédéric FRANCE	10200374ef	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-09-01 14:06:23 +02:00
Frédéric FRANCE	57fb3dc2f4	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-09-01 13:52:51 +02:00
Laurent Destailleur	b6f4b1dff7	Merge pull request #9363 from frederic34/patch-21 Update modSociete.class.php	2018-09-01 13:31:23 +02:00
Philippe GRAND	d8e6492e93	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2018-09-01 13:07:30 +02:00
Laurent Destailleur	5604f3b0c3	Merge pull request #9376 from frederic34/functionCommentMissing function Comment Missing	2018-09-01 12:59:32 +02:00
Philippe GRAND	0e5d4206c9	Merge remote-tracking branch 'upstream/develop' into develop	2018-09-01 12:47:34 +02:00
Josep Lluís	bfaf7ae473	Fix: undefined rights_class on modules When a module has the permission variable rights_class undefined, on unactivate the module are deleted all rows in cronjobs and menu tables with module=''.	2018-09-01 12:44:16 +02:00
Josep Lluís	79ee31df5c	Fix: undefined rights_class on modules When a module has the permission variable rights_class undefined, on unactivate the module are deleted all rows in cronjobs and menu tables with module=''.	2018-09-01 12:43:02 +02:00
Laurent Destailleur	8bd231adb0	Merge pull request #9357 from joseplluis/patch-3 FIX undefined rights_class on modules may lose setup when module disabled	2018-09-01 12:42:22 +02:00
Philippe GRAND	1944ef0dc3	conflict resolution	2018-09-01 12:38:22 +02:00
Laurent Destailleur	b863b5176d	Merge pull request #9322 from grandoc/new_branch_29_08_2018 New branch 29 08 2018	2018-09-01 12:11:01 +02:00
Frédéric FRANCE	9454f897ef	doxygen fix	2018-09-01 09:40:50 +02:00
Frédéric FRANCE	3b2e7732c2	function Comment Missing	2018-08-31 22:49:11 +02:00
Frédéric FRANCE	c2e49c82f8	function Comment Missing	2018-08-31 22:34:02 +02:00
Philippe GRAND	3a8bde227b	Standardize and update code	2018-08-31 19:26:08 +02:00
Frédéric FRANCE	2eade6ea68	Update modSociete.class.php	2018-08-30 23:22:06 +02:00
Josep Lluís	d70e548f94	Fix: undefined rights_class on modules When a module has the permission variable rights_class undefined, on unactivate the module are deleted all rows in cronjobs and menu tables with module=''.	2018-08-30 18:12:02 +02:00
Philippe GRAND	2e66c65650	WTF...	2018-08-30 12:03:20 +02:00
Frédéric FRANCE	6aee680a4f	PSR2 ClassDeclaration	2018-08-29 22:06:05 +02:00
Frédéric FRANCE	b03f4004ea	PSR2 FunctionClosingBrace	2018-08-29 21:25:22 +02:00
Frédéric FRANCE	cbdc669ba9	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-29 18:45:36 +02:00
Philippe Grand	0ab593fdb1	Merge branch 'develop' into new_branch_29_08_2018	2018-08-29 12:47:01 +02:00
Philippe GRAND	d948c9e2db	Fix white spaces	2018-08-29 12:42:55 +02:00
Laurent Destailleur	0eb4f8bb96	NEW Can set the datestart and dateend of cron job into module descriptor	2018-08-29 11:47:20 +02:00
Philippe Grand	fa992c3e6d	Update modules_import.php	2018-08-28 10:44:18 +02:00
Philippe GRAND	65af8f902f	Update and standardize code	2018-08-28 09:44:54 +02:00
Frédéric FRANCE	fe4260a014	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-28 09:34:53 +02:00
Laurent Destailleur	7219bac0b2	Merge pull request #9168 from frederic34/trimtrailing Trimtrailing	2018-08-28 02:30:02 +02:00
Laurent Destailleur	1842a4bb41	Merge pull request #9278 from grandoc/new_branch_21_08_2018 Update and standardize code	2018-08-28 02:13:28 +02:00
Frédéric FRANCE	d8bf4a0ecf	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-25 09:07:04 +02:00
Laurent Destailleur	7a35b560a6	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-23 19:51:52 +02:00
Philippe GRAND	74ce0bfea6	Standardize and update code	2018-08-23 16:54:24 +02:00
Philippe GRAND	aafa16afa5	Update and standardize code	2018-08-23 11:11:46 +02:00
Philippe GRAND	95349365ba	Update and standardize code	2018-08-22 11:39:37 +02:00
Philippe GRAND	0ffad50974	Update and standardize code	2018-08-22 11:24:31 +02:00
Philippe GRAND	d91b1fd895	Update and standardize code	2018-08-22 11:06:34 +02:00
Philippe GRAND	a669830427	Update and standardize code	2018-08-22 10:37:16 +02:00
Frédéric FRANCE	6b6daf178f	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-21 20:57:58 +02:00
Frédéric FRANCE	c76a33fb4f	remove superfluous spaces	2018-08-21 20:12:27 +02:00
Frédéric FRANCE	0fbccce9a7	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-21 19:59:07 +02:00
Laurent Destailleur	21a9fd625f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-21 14:15:22 +02:00
Laurent Destailleur	5f6c165fb6	Module builder is stable	2018-08-21 14:14:27 +02:00
Frédéric FRANCE	aba69b94b2	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-21 14:03:02 +02:00
Laurent Destailleur	9dbb0eaab0	Fix cron task label	2018-08-21 14:01:03 +02:00
Laurent Destailleur	0799970804	Merge pull request #9248 from frederic34/FunctionDeclaration function declaration	2018-08-21 13:41:56 +02:00
Laurent Destailleur	85eed6cf80	Merge branch 'develop' into trimtrailing	2018-08-21 13:40:04 +02:00
Laurent Destailleur	b40e32b8c3	Merge pull request #9264 from grandoc/new_branch_17_08_2018 standardize code	2018-08-21 12:52:34 +02:00
Laurent Destailleur	d8365e9260	Module DAV	2018-08-19 02:17:12 +02:00
Philippe GRAND	c48211ad70	Update and standardize code	2018-08-17 19:31:22 +02:00
Philippe GRAND	edb566501d	Update and standardize code	2018-08-17 18:54:41 +02:00
Philippe GRAND	78e9e05f95	Update and standardize code	2018-08-17 18:35:51 +02:00
Frédéric FRANCE	d68f176e7e	replace obsolete phpcs tags	2018-08-16 14:59:06 +02:00
Laurent Destailleur	4e02b134da	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2018-08-16 14:50:04 +02:00
Laurent Destailleur	4c52384609	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-08-16 14:48:42 +02:00
Laurent Destailleur	0c654bd452	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-08-16 14:47:56 +02:00
Frédéric FRANCE	39462742e2	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-16 08:17:55 +02:00
Laurent Destailleur	b515511ad6	Merge branch 'develop' into FunctionDeclaration	2018-08-16 00:52:55 +02:00
Laurent Destailleur	5c712a6cd3	Merge branch 'develop' into trimtrailing	2018-08-16 00:47:09 +02:00
Frédéric FRANCE	69a7af88e7	function declaration	2018-08-15 18:14:02 +02:00
Frédéric FRANCE	54a078149a	function declaration	2018-08-15 17:34:35 +02:00
Frédéric FRANCE	c0478cb42f	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-14 15:54:40 +02:00
Frédéric FRANCE	a0a6afc224	return comment	2018-08-14 12:23:10 +02:00
florian HENRY	20309665e6	fix : ODT project substitution	2018-08-14 10:45:08 +02:00
Frédéric FRANCE	d30874750f	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-14 09:02:12 +02:00
Frédéric FRANCE	850ac34020	mark non camelCaps function	2018-08-13 17:26:32 +02:00
Frédéric FRANCE	0b5a87a443	Update modules_holiday.php	2018-08-13 17:25:41 +02:00
Frédéric FRANCE	82e8efe792	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-12 20:14:14 +02:00
Laurent Destailleur	9fc5d39d07	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-12 20:09:36 +02:00
Laurent Destailleur	dc8c4402ee	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-12 20:09:22 +02:00
Laurent Destailleur	0a1c6e7194	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/comm/propal/list.php htdocs/compta/facture/list.php htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php	2018-08-12 20:08:20 +02:00
Laurent Destailleur	2d571acc03	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/commande/list.php	2018-08-12 19:25:44 +02:00
Laurent Destailleur	30b4d88428	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/compta/facture/list.php htdocs/product/reassort.php htdocs/societe/list.php	2018-08-12 19:23:45 +02:00
Frédéric FRANCE	6f74ecceaf	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-12 18:21:59 +02:00
John BOTELLA	6fad0ea5bd	Add retained warranty to pdf	2018-08-10 16:03:39 +02:00
gauthier	391230babc	FIX : global $mysoc missing (to avoid php notice on lines 279, 280 & 281)	2018-08-10 15:39:49 +02:00
Frédéric FRANCE	79aaddbb66	test phpcs v3	2018-08-09 14:46:00 +02:00
Laurent Destailleur	61d7629ab1	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/propal/list.php	2018-08-08 17:44:22 +02:00
Laurent Destailleur	8d54df4263	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/core/modules/propale/doc/pdf_azur.modules.php	2018-08-08 17:31:23 +02:00
Frédéric FRANCE	9025c452ef	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-07 16:40:03 +02:00
Ferran Marcet	5ce31f65a4	Fix: Bad position when document have incoterms/notes	2018-08-07 11:40:11 +02:00
Juanjo Menent	788060aa28	Merge pull request #9178 from aspangaro/9.0_a3 NEW : Add project on salaries	2018-08-02 11:19:34 +02:00
florian HENRY	ceb85cfa45	fix : odt project and task extrafields management	2018-07-31 17:29:08 +02:00
Alexandre SPANGARO	0509a176ca	Merge branch 'develop' into 9.0_a3	2018-07-31 07:47:43 +02:00
Alexandre SPANGARO	b0e2e69ed0	New : Add project on salaries	2018-07-31 07:45:03 +02:00
Frédéric FRANCE	6cb0fb10d6	trim trailing	2018-07-26 19:05:34 +02:00
Frédéric FRANCE	a0a5d33641	test include	2018-07-26 17:30:53 +02:00
Laurent Destailleur	dc2fec8f57	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-24 19:37:04 +02:00
Laurent Destailleur	d871b8964f	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-07-24 19:23:40 +02:00
Laurent Destailleur	20f178fdfe	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/comm/action/index.php htdocs/core/lib/functions.lib.php	2018-07-24 19:22:00 +02:00
Laurent Destailleur	3e54ee5df7	Merge pull request #9131 from fappels/7.0_Fix_syslog_infinite_loop Fix chromephp firephp Syslog infinite loop	2018-07-24 16:53:32 +02:00
Frédéric FRANCE	4341e367d2	remove % in supplier order pdf	2018-07-23 10:30:28 +02:00
fappels	b697307bac	Fix chromephp firephp Syslog infinite loop. When chromephp/firephp not found ->trans causes infinite loop. Can happen when files moved to other server or location.	2018-07-22 10:41:39 +02:00
Laurent Destailleur	2c7029850a	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/website.lib.php htdocs/website/index.php	2018-07-21 20:28:26 +02:00
Laurent Destailleur	1d8c42265c	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/modules/modFacture.class.php	2018-07-21 20:26:19 +02:00
Laurent Destailleur	a1180f79bd	Fix missing customer code and ref customer	2018-07-21 12:56:18 +02:00
Laurent Destailleur	41605ed4a7	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.form.class.php	2018-07-16 11:29:47 +02:00
Laurent Destailleur	c94437c3cf	Fix file in wrong dir	2018-07-16 10:14:51 +02:00
Laurent Destailleur	76c6f28d85	Merge pull request #9035 from grandoc/new_branch_29_06_2018 update code	2018-07-16 10:09:46 +02:00
Laurent Destailleur	6bf4ef5ef4	Fix double " Fix double "	2018-07-16 10:09:13 +02:00
Laurent Destailleur	e72e56ce2d	Merge pull request #9041 from grandoc/new_branch_02_07_2018 update description code	2018-07-16 10:03:54 +02:00
Laurent Destailleur	9b644fb92f	Merge pull request #9054 from grandoc/new_branch_05_07_2018 docs: complete comments	2018-07-15 20:12:21 +02:00
Laurent Destailleur	29c76a3f56	Merge pull request #9090 from grandoc/new_branch_10_07_2018 New branch 10 07 2018	2018-07-15 19:52:07 +02:00
Philippe GRAND	6945680e03	update code and typo	2018-07-12 10:11:42 +02:00
Philippe GRAND	72adc485f0	Docs : Update and complete	2018-07-10 22:32:55 +02:00
Philippe GRAND	0d10722a7f	Docs : Update and complete	2018-07-10 14:57:23 +02:00
Laurent Destailleur	64517d4c0b	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/langs/en_US/admin.lang	2018-07-10 14:06:51 +02:00
Laurent Destailleur	5f52dfa873	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-10 14:02:40 +02:00
Laurent Destailleur	3231f0031c	Merge pull request #9085 from grandoc/new_branch_10_07_2018 Docs : Update and complete	2018-07-10 10:43:32 +02:00
Philippe GRAND	243bc49a90	Docs : Typo	2018-07-10 09:38:05 +02:00
Philippe GRAND	b92190ac69	Docs : Update and complete	2018-07-10 09:32:55 +02:00
Philippe GRAND	df1bead49b	Docs : update and complete comments	2018-07-09 19:04:50 +02:00
Philippe GRAND	b4b3e33e3e	Docs : update and complete comments	2018-07-09 17:22:34 +02:00
Laurent Destailleur	3cda462faf	Merge pull request #9065 from aspangaro/9.0_a1 Add customer accountancy code on deposit slips export	2018-07-09 17:08:13 +02:00
Laurent Destailleur	f5d9403c7d	Fix permission to see HR tab on user. All HR on same tabs.	2018-07-09 15:38:00 +02:00
Laurent Destailleur	ba6566867e	Merge pull request #9064 from grandoc/new_branch_06_07_2018 fix : typo and update code	2018-07-09 15:33:25 +02:00
Philippe GRAND	2c4d7c4835	Docs : update and complete	2018-07-09 14:06:59 +02:00
Philippe GRAND	12d4880e7b	Docs : update and complete	2018-07-09 10:08:27 +02:00
Philippe GRAND	47e80123d5	Docs : update code	2018-07-07 11:36:46 +02:00
Philippe GRAND	fe5bfe3aaf	Docs : update comments	2018-07-07 10:51:09 +02:00
Philippe GRAND	1e1ed485f5	Docs : update comments	2018-07-07 10:47:56 +02:00
Alexandre SPANGARO	655d55eae6	Add customer accountancy code on deposit slips export	2018-07-07 02:46:56 +02:00
Laurent Destailleur	a62fd8ef84	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-06 16:10:45 +02:00
Laurent Destailleur	45d1a14c8e	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-06 16:10:37 +02:00
Laurent Destailleur	05ed721a8c	Fix name of constant for module TICKET	2018-07-06 13:09:07 +02:00
Philippe GRAND	988130d2a1	docs: complete comments	2018-07-05 17:04:11 +02:00
Philippe GRAND	4cbe3a5bc7	docs: complete comments	2018-07-05 17:01:47 +02:00
Maxime Kohlhaas	39f890d84a	Fix TICKETSUP var name	2018-07-05 14:51:00 +02:00
Maxime Kohlhaas	74b9f87cab	Fix ticket : missing file for numbering	2018-07-05 14:35:12 +02:00
Philippe GRAND	1cc73ae8ca	docs: complete comments	2018-07-05 10:16:20 +02:00
Philippe GRAND	afd3868a8a	docs: complete comments	2018-07-04 14:38:56 +02:00
Laurent Destailleur	38cd5180d9	FIX for migration from old versions	2018-07-03 20:11:59 +02:00
Laurent Destailleur	275f981545	FIX for migration from old versions	2018-07-03 20:08:55 +02:00
Laurent Destailleur	f7b8e09268	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: .travis.yml	2018-07-03 13:53:34 +02:00
Laurent Destailleur	f93f5bd6e0	Fix travis	2018-07-03 13:49:41 +02:00
Laurent Destailleur	12c43d7722	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-03 12:33:17 +02:00
Laurent Destailleur	4e7f9b1b4d	Merge pull request #9038 from hregis/8.0_multicompany Fix: possibility to overload permissions (multicompany sharing)	2018-07-02 16:12:40 +02:00
Philippe GRAND	0aa58537bb	update code comment	2018-07-02 15:07:00 +02:00
Philippe GRAND	74c45fa876	update code comment	2018-07-02 14:30:30 +02:00
Philippe GRAND	f43cce34c8	update code comment	2018-07-02 13:34:21 +02:00
Philippe GRAND	8497f56a04	update description code	2018-07-02 12:35:06 +02:00
Laurent Destailleur	9c5d34fc5f	Fix translation	2018-07-02 12:26:32 +02:00
Laurent Destailleur	a2c89d8110	Fix page code in pdf	2018-07-02 12:25:09 +02:00
Laurent Destailleur	63f3143718	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-02 12:18:34 +02:00
Laurent Destailleur	7bf33b1bac	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/hrm/index.php htdocs/install/mysql/tables/llx_website_account.key.sql htdocs/modulebuilder/template/myobject_card.php	2018-07-02 12:16:51 +02:00
Laurent Destailleur	11021353da	Fix text in payment area of crabe pdf	2018-07-02 11:33:33 +02:00
Laurent Destailleur	93184c5f66	Fix travis	2018-07-01 23:57:54 +02:00
Regis Houssin	05c666c18b	Fix: use numbering model corresponding to the entity of the object	2018-07-01 17:06:19 +02:00
Regis Houssin	80adac12c0	Fix: use object entity ID instead current entity	2018-07-01 16:01:30 +02:00
Laurent Destailleur	e06eb9e2fc	Fix phpcs	2018-06-30 18:38:23 +02:00
Laurent Destailleur	751ddb46d2	Update pdf_blochet.class.php	2018-06-30 18:31:32 +02:00
Philippe GRAND	640f7697e4	update code	2018-06-30 11:45:49 +02:00
Laurent Destailleur	df96c5ca81	Merge pull request #8796 from defrance/patch-113 introduce serial and document for holiday module	2018-06-30 02:09:28 +02:00
Laurent Destailleur	e4388e63fa	Merge pull request #8891 from inoveaconseil/develop NEW: ADD url to see the last version of a external module	2018-06-30 01:17:10 +02:00
John	008163628a	New pdf documents using new column system	2018-06-26 08:03:25 +02:00
Laurent Destailleur	2649c136cf	Fix SYSLOG_FILE_ONEPERSESSION	2018-06-24 14:31:03 +02:00
Laurent Destailleur	848c8cdc4b	Fix mode SYSLOG_FILE_ONEPERSESSION to work as expected	2018-06-24 13:59:37 +02:00
Laurent Destailleur	1b5c5cfafb	Fix select status	2018-06-24 10:42:07 +02:00
Laurent Destailleur	c405181393	Merge pull request #8987 from a-schild/develop Added mailing by thirdparty filtering by prospect type and status	2018-06-24 10:31:09 +02:00
Marc de Lima Lucio	dc951029cd	Merge branch 'develop' of github.com:Dolibarr/dolibarr into FIX_pdf_note_incoterm	2018-06-20 10:31:35 +02:00
Marc de Lima Lucio	babc99465c	FIX PR #8841	2018-06-20 10:22:43 +02:00
Marc de Lima Lucio	9fa9a716d5	FIX: pdf: overlap when linked elements and incoterms/public note displayed + port PR #8155 into supplier docs & contracts	2018-06-20 10:22:43 +02:00
Laurent Destailleur	fb2e820329	Fix menu not visible on jmobile	2018-06-19 13:17:46 +02:00
Laurent Destailleur	b364412a4a	FIX Menu scheduled jobs not visible on jmobile conf	2018-06-19 13:10:13 +02:00
a-schild	baba0757d7	Added filtering by prospect type and status Added filtering by prospect type and status	2018-06-19 11:46:03 +02:00
a-schild	211bb87e46	Moved functionality to select by categories Moved functionality to select by categories	2018-06-19 11:45:27 +02:00
Philippe GRAND	62586c7c5d	clean and upsdate code	2018-06-18 12:47:17 +02:00
a-schild	3e9bc75c9c	Added mailings to thirdparties Allows to select third parties as mailing targets, depending client/lead and active/inactive status	2018-06-18 12:23:27 +02:00
Laurent Destailleur	5675c8fc01	Update modFournisseur.class.php	2018-06-18 11:26:03 +02:00
Laurent Destailleur	e993a41160	Update modFournisseur.class.php	2018-06-18 11:24:58 +02:00
Laurent Destailleur	5632228153	Update modFournisseur.class.php	2018-06-18 11:23:36 +02:00
Marc de Lima Lucio	a5898b830b	Merge branch 'develop' of github.com:Dolibarr/dolibarr into 7.0	2018-06-14 10:48:09 +02:00
Marc de Lima Lucio	a80e1c601c	NEW: supplier order/order lines export: add supplier product ref	2018-06-14 10:43:01 +02:00
Laurent Destailleur	8d1456fb7f	Merge pull request #8949 from atm-greg/Manage_product_units_in_supplier_proposal add product units management in supplier proposal documents	2018-06-13 21:41:39 +02:00
Laurent Destailleur	b8e927d347	Merge pull request #8915 from grandoc/new_branch_04_06_2018 clean and update code	2018-06-13 20:16:19 +02:00
Laurent Destailleur	6fbdcea356	Code comment	2018-06-13 19:22:50 +02:00
atm-greg	d14f40f722	add product units management in supplier proposal documents	2018-06-12 14:36:32 +02:00
Laurent Destailleur	87d073b5cd	Fix conflict with external ticketsup module	2018-06-04 21:49:29 +02:00
Philippe GRAND	909fa496e5	clean and update code	2018-06-04 17:37:17 +02:00
Laurent Destailleur	69dd11f7c6	Fix: Must use a standard (internationnal) date format.	2018-06-04 14:05:47 +02:00
Laurent Destailleur	eca66492ce	Merge pull request #8913 from aspangaro/8.0-a26 NEW : Accountancy Add import on general ledger	2018-06-04 14:02:34 +02:00
Alexandre SPANGARO	a3030e4057	Update works	2018-06-03 22:35:39 +02:00
Inovea Conseil	78b3067de3	NEW: ADD admin page for modulebuilder ADD custom README ADD choice to generate about page and documentation folder	2018-05-30 13:54:43 +02:00
Laurent Destailleur	c1f5c6becf	Merge pull request #8877 from frederic34/longlines soft limit length of lines to 500 chars	2018-05-30 11:19:29 +02:00
Laurent Destailleur	2ae9591d0d	Fix english name	2018-05-29 11:10:21 +02:00
Frédéric FRANCE	e2a557aadd	limit length of lines to 500 chars	2018-05-27 15:04:12 +02:00
Laurent Destailleur	fa252d5cbd	Merge branch 'develop' into FIX_6.0_pdf_note_incoterm	2018-05-25 11:59:22 +02:00
Laurent Destailleur	9d407cdc03	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-05-25 11:27:04 +02:00
Laurent Destailleur	0e6aa3def3	Fix duplicate deprecated file	2018-05-25 11:26:50 +02:00
Laurent Destailleur	7f77f1bd5a	Merge pull request #8825 from atm-florian/develop_advtrgtml new : add adv targt emailing amdin with main feature level 1	2018-05-25 11:10:51 +02:00
Laurent Destailleur	b9fbf13eba	Fix look and feel v8	2018-05-25 09:36:49 +02:00
Laurent Destailleur	9f2f8ca7e0	Fix scrutinizer	2018-05-25 09:31:16 +02:00
Laurent Destailleur	23e2bb20d9	Look and feel v8	2018-05-24 12:32:04 +02:00
Laurent Destailleur	e51aa68284	Fix link to warehouses for events	2018-05-24 12:16:04 +02:00
Laurent Destailleur	488c0c030e	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/modules/modProduct.class.php	2018-05-23 18:09:25 +02:00
Laurent Destailleur	3a06918b16	FIX Missing extrafields in export of stock or products	2018-05-23 18:00:27 +02:00
Laurent Destailleur	d1d8494666	FIX Missing extrafields in export	2018-05-23 17:48:18 +02:00
Marc de Lima Lucio	111f3a9649	FIX: pdf: overlap when linked elements and incoterms/public note displayed + port PR #8155 into supplier docs & contracts	2018-05-23 11:11:33 +02:00
Laurent Destailleur	a1c799507a	Fix $contactobject not always defined	2018-05-23 08:16:24 +02:00
florian HENRY	22cdbffb0a	new : add adv targt emailing amdin with main feature level 1	2018-05-21 10:58:16 +02:00
Alexandre SPANGARO	e2665bd30e	NEW : Accountancy Add import on general ledger	2018-05-19 07:29:17 +02:00
Laurent Destailleur	e503aeb2e5	Merge pull request #8787 from aspangaro/8.0-a24 Update module assets	2018-05-18 09:05:46 +02:00
Laurent Destailleur	ef395fc36b	Fix scrutinizer bugs	2018-05-16 15:23:52 +02:00
Alexandre SPANGARO	cb815e5e3b	Update works	2018-05-13 07:50:24 +02:00
Laurent Destailleur	9315d9c423	NEW Introduce permission "approve" for "leave request" like for "expense report"	2018-05-10 18:56:21 +02:00
Laurent Destailleur	a65170ba2d	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-05-10 14:16:19 +02:00
Laurent Destailleur	0c35bc5284	Standardize code	2018-05-10 14:15:52 +02:00
Laurent Destailleur	3c6d1ccbac	Merge branch 'develop' into develop	2018-05-10 13:13:53 +02:00
Laurent Destailleur	2fb5de6136	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-05-10 12:30:14 +02:00
Laurent Destailleur	c094a6c43e	Reorder permissions	2018-05-10 12:29:58 +02:00
Laurent Destailleur	afa9db2a88	Merge pull request #8752 from delcroip/patch-14 FIX Add properly the project models	2018-05-10 11:54:00 +02:00
Laurent Destailleur	9e807c1c01	Merge pull request #8751 from wdammak/patch-7 Add models pdf to warehouse module	2018-05-10 11:41:03 +02:00
BENKE Charlene	79bb8ef6c7	Update modHoliday.class.php	2018-05-07 22:47:24 +02:00
BENKE Charlene	3d268933a4	Create mod_holiday_madonna.php	2018-05-07 22:35:19 +02:00
BENKE Charlene	a20632d31d	Create mod_holiday_immaculate.php	2018-05-07 22:34:26 +02:00
BENKE Charlene	ffaff97af1	Create modules_holiday.php	2018-05-07 22:33:14 +02:00
BENKE Charlene	8546943898	Create index.html	2018-05-07 22:30:40 +02:00
atm-quentin	8cd6c72a2f	NEW advanced rights	2018-05-07 10:04:43 +02:00
wdammak	d038bf3e4b	Merge pull request #8 from Dolibarr/develop Update rep	2018-05-06 17:01:44 +01:00
delcroix Patrick	a2c93e56ae	fixAdd properly the project models Previous code was adding only the Task model (project model where actually push during the installation) and only one of the two model available.	2018-05-06 13:36:37 +02:00
wdammak	fb81088a4b	Add models warehouse and movement	2018-05-05 13:44:11 +01:00
Laurent Destailleur	546da0ceda	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/admin/account.php htdocs/core/modules/modStock.class.php htdocs/product/inventory/list.php	2018-05-05 14:40:39 +02:00
wdammak	c269699679	Add model_pdf to warehouse module	2018-05-05 13:33:34 +01:00
Laurent Destailleur	f6ca1eb624	Fix permission name	2018-05-05 13:24:46 +02:00
atm-quentin	ec5e84075e	NEW Rights to ignore price min	2018-05-03 10:18:38 +02:00
wdammak	2cf1aa967c	Add warehouse models pdf	2018-05-03 01:01:05 +01:00
Laurent Destailleur	cb76d2ce0f	Better logging	2018-05-01 18:58:19 +02:00
Laurent Destailleur	8be8249f85	Clean code, fix warnings	2018-05-01 12:40:42 +02:00
Laurent Destailleur	f50a6149d5	Look and feel v8 (menu statistics at end)	2018-05-01 11:09:03 +02:00
Laurent Destailleur	55f982e504	Removed deprecated FPDI option and reorganise PDF setup page	2018-04-30 09:28:24 +02:00
Laurent Destailleur	82a8513aed	Standardize code	2018-04-29 19:52:14 +02:00
Laurent Destailleur	e168240ab0	Debug module DAV	2018-04-29 18:32:15 +02:00
Regis Houssin	2906358383	Fix: use "socpeople" instead "societe"	2018-04-27 10:42:10 +02:00
Laurent Destailleur	ae412f228d	NEW Experimental DAV module provides a public and private directory	2018-04-25 12:22:02 +02:00
Laurent Destailleur	32511422ab	Fix PSR2	2018-04-22 20:08:29 +02:00
Laurent Destailleur	69adf73f4f	Clean code from $var = True	2018-04-22 19:27:37 +02:00
Laurent Destailleur	fec9303d18	Remove useless $var	2018-04-22 18:51:03 +02:00
Laurent Destailleur	46e448a086	Fix default agenda view	2018-04-22 17:57:20 +02:00
Laurent Destailleur	f83369d268	Remove travis warnings	2018-04-22 11:27:26 +02:00
Laurent Destailleur	9eeaf5c3eb	dol_syslog now strftime instead of dol_print_date	2018-04-21 12:22:21 +02:00
Laurent Destailleur	f6743484dd	Better support of option COMPANY_AQUARIUM_CLEAN_REGEX	2018-04-21 00:58:42 +02:00
Laurent Destailleur	38d200d8a6	Fix left menu	2018-04-20 13:23:34 +02:00
Laurent Destailleur	7baf0eddbc	NEW Add hidden option COMPANY_AQUARIUM_CLEAN_REGEX to clean generated accounting account.	2018-04-20 01:10:57 +02:00
Laurent Destailleur	7256edc831	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-18 03:28:50 +02:00
Laurent Destailleur	013f95f54b	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-04-18 00:02:51 +02:00
Laurent Destailleur	5713a048fe	Merge pull request #8632 from aspangaro/8.0-a21 Fix Accountancy	2018-04-17 21:30:16 +02:00
Alexandre SPANGARO	e0c0f7fd9b	Fix Accountancy	2018-04-17 20:04:55 +02:00
Laurent Destailleur	fee4966219	Merge pull request #8601 from frederic34/esign NEW add optional esign field in pdf propal	2018-04-17 16:12:53 +02:00
atm-greg	90f1ab8af4	add hooks on supplier documents	2018-04-16 06:46:22 +02:00
Laurent Destailleur	e2838aa074	NEW Show also size in bytes in tooltip if visible unit is not bytes	2018-04-15 17:58:13 +02:00
Frédéric FRANCE	46cfe1e2e7	Merge remote-tracking branch 'upstream/develop' into esign	2018-04-15 14:33:03 +02:00
Frédéric FRANCE	d4c03230a0	add optional esign field in pdf propal	2018-04-15 11:34:21 +02:00
Regis Houssin	d97c052d08	Fix: broken $pdf object !	2018-04-14 10:41:38 +02:00
Laurent Destailleur	6e288fca75	Merge pull request #8575 from all3kcis/develop-patch-16 NEW Add files management on products lot	2018-04-13 00:57:13 +02:00
All-3kcis	f7e58f3c73	Add files management on products lot	2018-04-12 15:10:37 +02:00
Laurent Destailleur	ea2fd67e0d	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/bank/card.php htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php htdocs/core/tpl/admin_extrafields_view.tpl.php htdocs/langs/de_DE/admin.lang	2018-04-12 13:31:14 +02:00
Laurent Destailleur	e437989853	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-04-12 13:25:27 +02:00
atm-greg	ae34fa6fbd	add supplier contact name on supplier documents	2018-04-11 17:42:26 +02:00
Laurent Destailleur	419b225120	Clean code	2018-04-07 21:11:58 +02:00
Laurent Destailleur	d7d9c8c338	Fix module descriptor of dav module	2018-04-07 21:04:08 +02:00
Laurent Destailleur	98b9f6bb47	DAV module	2018-04-07 19:12:41 +02:00
Laurent Destailleur	049b9b2a5f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-06 14:19:25 +02:00
Laurent Destailleur	8e778df0ff	Debug stripe module	2018-04-06 14:05:07 +02:00
Alexandre SPANGARO	06dc70df09	Merge remote-tracking branch 'uptream/develop' into 8.0-a13	2018-04-05 20:42:28 +02:00
Laurent Destailleur	48ff89c63b	Fix regression	2018-04-05 19:52:54 +02:00
Laurent Destailleur	0223d54107	FIX Support or multicompany for sheduled jobs FIX Use priority to define order of sheduled jobs Conflicts: htdocs/cron/list.php	2018-04-05 12:38:42 +02:00
Laurent Destailleur	0de65b7822	FIX Support or multicompany for sheduled jobs FIX Use priority to define order of sheduled jobs	2018-04-05 12:36:14 +02:00
Alexandre SPANGARO	a5428cc8c7	NEW Module Assets	2018-04-01 21:26:52 +02:00
Philippe GRAND	5b1efc2227	New [use loadLangs for translation files] and update code	2018-03-27 19:30:31 +02:00
Laurent Destailleur	6eca679f68	Merge pull request #8453 from OPEN-DSI/fix-import-insert-foreign-key FIX #7581 Import INSERT foreign key	2018-03-27 17:47:45 +02:00
Laurent Destailleur	d41908e52a	Update import_xlsx.modules.php	2018-03-27 17:46:50 +02:00
Laurent Destailleur	86c4bb23ad	Update import_csv.modules.php	2018-03-27 17:46:28 +02:00
Laurent Destailleur	3eee68c404	NEW Prototype of a module DAV	2018-03-27 16:18:12 +02:00
François J	e892089afd	Fix Import INSERT foreign key Check the row referencing this foreign key exists first instead of always trying to perform an UPDATE.	2018-03-26 17:52:43 +02:00
Laurent Destailleur	9f11cf77df	Merge ticket css in main css	2018-03-26 15:45:56 +02:00
Laurent Destailleur	852191010a	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2018-03-25 15:29:11 +02:00
Laurent Destailleur	934d2d8881	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/filefunc.inc.php	2018-03-25 15:27:31 +02:00
Laurent Destailleur	7363ae17ee	Move setup of email for module module into email templates	2018-03-23 16:09:46 +01:00
florian HENRY	1feb22ea9c	fix user right on modRessource	2018-03-21 22:24:11 +01:00
Laurent Destailleur	423bd56646	Merge pull request #8423 from grandoc/new_branch_20_03_2018 New [use loadLangs for translation files]	2018-03-21 20:39:40 +01:00
Laurent Destailleur	517301f014	Work on subscription reminder	2018-03-21 16:40:09 +01:00
Laurent Destailleur	200fd88132	Fix output message in log rotation job	2018-03-21 13:56:24 +01:00
Philippe GRAND	0d7ffefc8f	New [use loadLangs for translation files]	2018-03-20 19:47:25 +01:00
Laurent Destailleur	09beb9186e	Merge pull request #8403 from atm-maxime/develop New filter on product supplier price import update	2018-03-18 14:18:20 +01:00
Philippe GRAND	68b1e5f8fd	New [use loadLangs for translation files]	2018-03-16 17:40:19 +01:00
Maxime Kohlhaas	3ccdb4d829	New filter on product supplier price import update	2018-03-16 14:22:46 +01:00
Laurent Destailleur	5a397fff72	Fix scrutinizer bugs	2018-03-16 00:16:32 +01:00
Laurent Destailleur	7f8f0c5dc1	Fix parameter silent was inverted	2018-03-15 21:48:51 +01:00
Philippe GRAND	e8df916770	New [use loadLangs for translation files]	2018-03-15 17:14:11 +01:00
Laurent Destailleur	ea3fbf63cd	Merge pull request #8390 from grandoc/new_branch_14_03_2018 New [use loadLangs for translation files]	2018-03-15 15:07:55 +01:00
Laurent Destailleur	9256faf6fb	Update pdf_merou.modules.php	2018-03-15 15:07:08 +01:00
Philippe Grand	c8e672d01a	use $outputlangs instead of $langs	2018-03-15 09:18:40 +01:00
Philippe Grand	3f0764f282	use $outputlangs instead of $langs	2018-03-15 09:17:53 +01:00
Philippe Grand	e6d2effba1	use $outputlangs instead of $langs	2018-03-15 09:15:22 +01:00
Philippe Grand	09d0dc7ba7	use $outputlangs instead of $langs	2018-03-15 09:14:09 +01:00
Philippe Grand	f6fd03a4f3	Change $langs by $outputlangs	2018-03-15 09:06:01 +01:00
Alexandre SPANGARO	9ce6ab915c	Merge remote-tracking branch 'uptream/develop' into 8.0-a9	2018-03-15 06:24:51 +01:00
Alexandre SPANGARO	5eccc6bcbc	NEW Add stats in salaries module	2018-03-15 06:23:20 +01:00
Philippe GRAND	743a61159d	use loadLangs for translation files	2018-03-14 19:34:33 +01:00
Philippe GRAND	13ce041313	use loadLangs for translation files	2018-03-14 19:26:46 +01:00
Philippe GRAND	a5dc583906	use loadLangs for translation files	2018-03-14 19:10:22 +01:00
Laurent Destailleur	4bd05f854c	Merge pull request #8371 from frederic34/pdfaddress add object in pdf_build_address source	2018-03-13 14:04:49 +01:00
Laurent Destailleur	9f07ff0f9b	Fix travis	2018-03-13 14:00:35 +01:00
Laurent Destailleur	e6dd312bd5	Debug ticket module	2018-03-13 13:56:45 +01:00
Frédéric FRANCE	c76dce64d3	add object in pdf_build_address source	2018-03-13 12:15:03 +01:00
Laurent Destailleur	8048259733	Work on ticket module integration	2018-03-13 12:13:47 +01:00
Laurent Destailleur	cd71e49762	Picto ticket module	2018-03-13 10:42:58 +01:00
Laurent Destailleur	78b0585798	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/taxes.php	2018-03-12 19:09:57 +01:00
Laurent Destailleur	55d3e72463	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/contact/class/contact.class.php htdocs/societe/card.php	2018-03-12 19:02:30 +01:00
Laurent Destailleur	ae82d045f8	Dolibarrize module ticket	2018-03-11 23:56:17 +01:00
Laurent Destailleur	70490e2b4b	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/ticketsup/class/actions_ticketsup.class.php	2018-03-11 18:29:19 +01:00
Laurent Destailleur	8b6dea218b	Dolibarrize module	2018-03-11 18:28:27 +01:00
Laurent Destailleur	d9b55f2275	Merge branch 'develop' into dev_ticketsup	2018-03-11 18:12:47 +01:00
Laurent Destailleur	40cf236f92	Merge branch 'develop' into ticketsup_core	2018-03-11 18:10:11 +01:00
Laurent Destailleur	d6eee30ee9	Merge pull request #8336 from defrance/patch-106 add sql log on install debug	2018-03-11 18:06:18 +01:00
Laurent Destailleur	dea80eba4e	Use a constant name starting with MAIN	2018-03-11 18:06:08 +01:00
jfefe	c3fab4c54c	Fix Phpunit issue	2018-03-11 16:48:26 +01:00
florian HENRY	cfdaa7c88d	ticket sup make it work	2018-03-11 16:07:13 +01:00
Laurent Destailleur	e14d2f08b8	Dolibarize	2018-03-11 11:12:38 +01:00
BENKE Charlene	bfaffe6692	Changes Done	2018-03-11 10:51:05 +01:00
jfefe	79acb79ae0	Begin integration of module « Ticketsup » Related to #4948	2018-03-11 09:44:58 +01:00
Laurent Destailleur	897b3f7b79	Fix setup	2018-03-11 00:31:26 +01:00
Laurent Destailleur	64f21b8a3c	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/expensereport/card.php	2018-03-11 00:10:13 +01:00
BENKE Charlene	923bad4da6	add sql log on install debug new global variable INSTALL_DISPLAY_SQL_LOG to display sql log on module install	2018-03-10 23:59:34 +01:00
Maxime Kohlhaas	c008853842	Fix #8057	2018-03-10 23:05:33 +01:00
Laurent Destailleur	d00b549f91	Remove duplicate perm	2018-03-10 12:46:45 +01:00
Laurent Destailleur	6ff3ac82c6	Merge pull request #8309 from ATM-Marc/NEW_syslog_file_autoclean NEW: syslog file autoclean	2018-03-09 22:34:30 +01:00
Laurent Destailleur	d858426b7b	Update modSyslog.class.php	2018-03-09 22:33:39 +01:00
Marc de Lima Lucio	d6b4bc14e4	NEW: syslog file autoclean	2018-03-09 16:52:06 +01:00
Regis Houssin	3eeeaf2d2d	Fix: REST API must be enabled for all entities	2018-03-09 12:54:34 +01:00
florian HENRY	f37d482331	fix warning and sql error	2018-03-09 11:37:23 +01:00
Laurent Destailleur	235db1f405	Enhance OAuth module to store the stripe account in llx_oauth_token	2018-03-08 19:51:18 +01:00
Laurent Destailleur	5b8006a6bb	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/public/payment/paymentok.php htdocs/public/paypal/paymentok.php	2018-03-08 16:37:17 +01:00
Regis Houssin	93a9430e49	Fix: regression, restore primary key	2018-03-08 07:41:54 +01:00
Laurent Destailleur	8c128a2985	Stripe has drop PHP 5.3	2018-03-07 19:28:04 +01:00
Regis Houssin	a0774d523d	Fix: avoid conflict between invoice and invoicenumber sharings	2018-03-07 15:24:23 +01:00
Laurent Destailleur	05c1150477	Fix bad links	2018-03-07 15:13:22 +01:00
Laurent Destailleur	a597dc8b11	Merge pull request #8281 from ptibogxiv/patch-10 NEW: add link to stripe's info in bank menu	2018-03-07 15:09:46 +01:00
Laurent Destailleur	62a339e582	Minor fix in multicurrency for supplier prices	2018-03-07 14:13:46 +01:00
Laurent Destailleur	7e6ba51780	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/projet/tasks/comment.php	2018-03-07 13:06:29 +01:00
Laurent Destailleur	004839b368	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-03-07 13:03:40 +01:00
Laurent Destailleur	8b9041b93e	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2018-03-07 13:02:18 +01:00
Laurent Destailleur	4caefbe926	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2018-03-07 12:59:52 +01:00
Marc de Lima Lucio	dd208348c4	FIX: add planned delivery to order exports	2018-03-07 12:18:08 +01:00
ptibogxiv	afa8b37239	NEW: add link to stripe's info in bank menu	2018-03-05 19:45:55 +01:00
Laurent Destailleur	0270e21289	Merge pull request #8242 from hregis/develop_multicompany Fix: use "multidir_output" instead "dir_output" (propal)	2018-03-02 17:49:25 +01:00
Laurent Destailleur	e073fa15f7	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-03-02 14:00:27 +01:00
Laurent Destailleur	8d11f1efa1	FIX Payment mode not correctly set in donation and document	2018-03-02 12:32:49 +01:00
Laurent Destailleur	a01287b211	Fix template donation	2018-03-02 12:25:43 +01:00
Laurent Destailleur	2368cb615f	Look and feel v8	2018-03-01 11:51:25 +01:00
Laurent Destailleur	04934cc4aa	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/contrat/class/contrat.class.php htdocs/core/lib/functions.lib.php htdocs/projet/tasks/time.php	2018-02-27 19:18:43 +01:00
Regis Houssin	093ea49cc6	Fix: use "multidir_output" instead "dir_output"	2018-02-26 11:35:30 +01:00
Laurent Destailleur	41638e6dff	Fix back link of look and feel v7	2018-02-26 09:20:05 +01:00
Laurent Destailleur	003827eb06	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-25 15:01:19 +01:00
Laurent Destailleur	1f60d9ba81	Fix travis	2018-02-25 13:14:55 +01:00
Laurent Destailleur	6c16f2af1e	Merge pull request #8226 from hregis/7.0_multicompany Fix: differentiate sharing of "member" and "member_type"	2018-02-25 12:54:51 +01:00
Laurent Destailleur	029ef534d0	Clean deprecated code (property "special" removed from mod descriptor)	2018-02-25 10:55:02 +01:00
Laurent Destailleur	619e0d3792	FIX Bad var for substitution of free text	2018-02-24 14:03:27 +01:00
Laurent Destailleur	e2e0f23d29	FIX Bad var for substitution of free text	2018-02-24 14:01:52 +01:00
Laurent Destailleur	38d1fc27e0	Start to introduce common substitution rules for odt substitutions	2018-02-24 13:41:01 +01:00
Laurent Destailleur	c8078b54b5	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php	2018-02-24 12:52:57 +01:00
Laurent Destailleur	03d9bf1376	Restore deprecated var	2018-02-24 12:35:36 +01:00
Laurent Destailleur	cbfe241c1b	FIX Can use odx templates that does not include lines tags	2018-02-24 12:34:15 +01:00
Laurent Destailleur	daeebae647	FIX Can use odx templates that does not include lines tags	2018-02-24 12:32:48 +01:00
Regis Houssin	4c06384197	Fix: differentiate sharing of "member" and "member_type"	2018-02-24 11:13:14 +01:00
Laurent Destailleur	812911bd44	Fix type of expense report output in PDF	2018-02-23 15:33:42 +01:00
Laurent Destailleur	f002c84a76	Fix type of expense report output in PDF	2018-02-23 15:33:00 +01:00
Laurent Destailleur	0d0451e5c7	Code comment	2018-02-21 22:43:03 +01:00
Laurent Destailleur	b4446764f8	Clean code of deprecated usage	2018-02-21 14:48:25 +01:00
Laurent Destailleur	0ff148da1f	Fix import of chart account	2018-02-21 11:22:27 +01:00
Laurent Destailleur	15ba0c3b49	Close #7989 Merge manually in existing class	2018-02-20 15:35:42 +01:00
Laurent Destailleur	6b74c79798	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/langs/en_US/website.lang	2018-02-15 15:34:17 +01:00
Laurent Destailleur	7722f004c8	FIX #8153	2018-02-15 14:08:42 +01:00
Laurent Destailleur	f1a9f81fb4	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/langs/en_US/website.lang	2018-02-14 22:19:59 +01:00
Laurent Destailleur	7f8cbc0f62	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/adherents/type.php htdocs/contrat/services.php htdocs/contrat/tpl/linkedobjectblock.tpl.php htdocs/install/upgrade2.php	2018-02-14 22:08:18 +01:00
atm-quentin	144c13998a	NEW_einstein_pdf_modules	2018-02-13 09:51:33 +01:00
Laurent Destailleur	36ac380cac	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-12 22:26:48 +01:00
Laurent Destailleur	a4f48fcfb6	Fix feature must be hidden (not stable)	2018-02-12 16:09:22 +01:00
Laurent Destailleur	109c447171	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-12 03:21:37 +01:00
Laurent Destailleur	c03ceb2205	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-02-12 02:56:51 +01:00
Laurent Destailleur	eb8664e649	NEW Can export leave requests	2018-02-09 16:08:28 +01:00
atm-ph	b074f580db	Fix can't update $nblignes on beforePDFCreation if we update $object->lines	2018-02-08 16:59:17 +01:00
Laurent Destailleur	eccdc9a075	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php htdocs/langs/pt_PT/companies.lang	2018-02-08 15:20:24 +01:00
Laurent Destailleur	dde631c97b	Merge pull request #8149 from frederic34/patch-8 NEW Add delivery_time_days of suppliers in export profile	2018-02-08 14:09:33 +01:00
Laurent Destailleur	ab21769aa2	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/compta/facture/card.php	2018-02-08 12:58:47 +01:00
Laurent Destailleur	507328d83a	Fix syntax error	2018-02-07 17:50:16 +01:00
Laurent Destailleur	37afc58c48	The module ExpenseReport use numbering rules that you can setup (like other modules do). If you need to keep the hard coded numbering rule of expenses report used in 6.0, just add constant EXPENSEREPORT_USE_OLD_NUMBERING_RULE to 1.	2018-02-07 17:45:13 +01:00
Laurent Destailleur	cb5d0b1677	Fix compatibility option EXPENSEREPORT_USE_OLD_NUMBERING_RULE	2018-02-07 17:43:16 +01:00
Laurent Destailleur	510fc22172	Fix expense report	2018-02-07 17:01:14 +01:00
Laurent Destailleur	d8872a412b	Fix numbering for expense report	2018-02-07 15:52:57 +01:00
atm-ph	6254e20c67	Fix position if module use pdf hook "linkedobjects"	2018-02-07 15:41:39 +01:00
Frédéric FRANCE	1cff0593f8	Update modProduct.class.php	2018-02-07 10:42:21 +01:00
Frédéric FRANCE	c39f5ed26a	Update pdf_rouget.modules.php	2018-02-07 09:00:47 +01:00
Laurent Destailleur	ea92f6beae	Fix for multicompany	2018-02-06 10:57:53 +01:00
Laurent Destailleur	930d58ab96	Fix import supplier product price vat	2018-02-06 10:03:06 +01:00
Laurent Destailleur	4cfec30f93	Start to work on PDF template for timesheet	2018-02-05 15:35:55 +01:00
Laurent Destailleur	51847dfa8a	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/menus/init_menu_auguria.sql htdocs/core/menus/standard/eldy.lib.php	2018-02-05 15:34:50 +01:00
Laurent Destailleur	72f6b2956a	Fix: pagination into belugo template	2018-02-05 14:31:39 +01:00
Laurent Destailleur	775085e1b8	Border of comment box	2018-02-05 14:10:24 +01:00
Laurent Destailleur	13e71306ac	Start to work on payment import	2018-02-05 02:27:48 +01:00
Laurent Destailleur	8fe773204e	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-04 23:18:33 +01:00
Laurent Destailleur	5455ab3280	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/projet/card.php	2018-02-04 23:17:09 +01:00
Laurent Destailleur	f3700b66c6	Fix size of columns when using PRODUCT_USE_UNIT	2018-02-04 11:17:45 +01:00
Laurent Destailleur	5c6dd0b061	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-03 19:00:04 +01:00
Laurent Destailleur	fa3f06aaaa	Merge pull request #8123 from atm-florian/7.0 fix warning class declaration	2018-02-03 16:33:39 +01:00
Laurent Destailleur	756f8a1b9f	Update modules_expensereport.php	2018-02-03 16:33:27 +01:00
Laurent Destailleur	97a29e87ea	Fix pdf template baleine (pb with page breaks and long task desc)	2018-02-03 16:31:36 +01:00
Laurent Destailleur	a41847d084	Fix: date of modificaiton in ledger not visible. Fix: show hours in date of creation in ledger. Fix: label in export. Fix: label in export of draft journal is same than on screen. Fix: missing line desc in csv export of draft bank journal.	2018-02-02 14:27:07 +01:00
florian HENRY	5d20af7751	fix warning class declaration	2018-02-01 16:15:57 +01:00
Laurent Destailleur	7f9d6a5458	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/public/paybox/newpayment.php htdocs/public/payment/newpayment.php htdocs/public/paypal/newpayment.php htdocs/public/stripe/newpayment.php	2018-01-31 20:25:24 +01:00
Laurent Destailleur	b49a7e245c	Add hidden option INVOICE_NO_PAYMENT_DETAILS required by some countries	2018-01-31 20:22:19 +01:00
Laurent Destailleur	8d983717a3	Merge pull request #8068 from atm-quentin/NEW_filter_export_model_by_user NEW export filter models can be share or not by user	2018-01-29 21:19:50 +01:00
Laurent Destailleur	e9441f7881	Fix name of log module to avoid confusion with blocked log	2018-01-25 17:56:46 +01:00
Laurent Destailleur	3987033aab	Fix substitution in public notes of pdf	2018-01-21 20:53:36 +01:00
atm-quentin	ce29331c05	NEW Filter export model by user	2018-01-18 12:34:22 +01:00
Laurent Destailleur	3d34a839a3	Doc	2018-01-15 17:43:18 +01:00
Laurent Destailleur	e56d74f5c4	Fix generation of doc for supplier payment	2018-01-11 19:01:47 +01:00
Laurent Destailleur	0b893c11fd	Revert "Fix wrong address used into PDF model of supplier payment" This reverts commit `22d92c0540`.	2018-01-11 18:09:05 +01:00
Laurent Destailleur	90ddfc3f7f	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/translation.php	2018-01-11 01:14:20 +01:00
Laurent Destailleur	0ae02d76a3	Merge pull request #8049 from fmarcet/6.0 Fix: Still using property ->client instead of ->thirdparty.	2018-01-11 01:03:47 +01:00
Laurent Destailleur	af6b84ba3a	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/list.php htdocs/contact/document.php htdocs/product/list.php	2018-01-11 01:03:13 +01:00
Laurent Destailleur	f2b8c3c97d	Fix check of customer/supplier code	2018-01-10 18:19:54 +01:00
Ferran Marcet	d99535d9da	Fix: Still using property ->client instead of ->thirdparty.	2018-01-10 16:40:43 +01:00
atm-ph	22d92c0540	Fix wrong address used into PDF model of supplier payment	2018-01-08 15:25:18 +01:00
Laurent Destailleur	836a94fab2	Merge pull request #7988 from OPEN-DSI/core_pdf_modele_propal_payment_mode_flag Fix PROPALE_PDF_HIDE_PAYMENTTERMMODE and SUPPLIER_PROPOSAL_PDF_SHOW_PAYMENTTERMMODE	2017-12-28 07:18:57 +01:00
Laurent Destailleur	d1cfbc2906	Code comment	2017-12-22 01:03:40 +01:00
KHELIFA	d069ccdb7f	Core Modele PDF: Fix globale variable for hide payment mode with PROPALE_PDF_HIDE_PAYMENTTERMMODE and SUPPLIER_PROPOSAL_PDF_SHOW_PAYMENTTERMMODE - Fix hide payment condition for supplier proposal	2017-12-21 16:58:37 +01:00
Laurent Destailleur	2e87318b58	Fix sql error	2017-12-18 19:15:42 +01:00
Laurent Destailleur	9f2a42b67d	NEW Can filter on user on unalterable log	2017-12-16 21:50:58 +01:00
Laurent Destailleur	4abcbae79f	NEW The unalterable log can be browse by any user with he permission	2017-12-16 21:36:36 +01:00
Laurent Destailleur	394eeb3cd9	Fix rendering MD files of images by adding a css	2017-12-16 15:11:40 +01:00
Laurent Destailleur	5af153550d	Debug blockedlog: - Add a track into log when we disable/enable module - Add a protection to avoid disable of module when recording was started - Better compatibility with multicompany - Can filter on ref and amount - Add a permission to read the blockedlog - Add more information on payments/invoice/thirdparty into log - Reset of module data after a migration from v6 (not compatible)	2017-12-15 16:56:08 +01:00
Laurent Destailleur	9a08ee269e	Menu not visible	2017-12-14 23:43:04 +01:00
Laurent Destailleur	4a9b61047f	Filter on blockedlog	2017-12-14 17:08:43 +01:00
Laurent Destailleur	e3dcff7f5b	Fix substition for menus title and urls	2017-12-09 15:35:01 +01:00
Laurent Destailleur	95cb5025a2	Fix length of month too large More complete template	2017-12-08 16:15:41 +01:00
alexis Algoud	62cd77d999	NEW automatic activation of external module on country set	2017-12-08 10:13:03 +01:00
Alexis Algoud	ad46bf9a94	NEW option to avoid countries to disable there blockedlog	2017-12-05 18:30:48 +01:00
alexis Algoud	a2df87ab15	NEW warning on module blocked log reset if country code is FR fix wrong paste click	2017-12-05 11:40:42 +01:00
Laurent Destailleur	1ce155728f	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/modules/mailings/fraise.modules.php	2017-12-01 16:25:13 +01:00
Laurent Destailleur	09e611aa21	Move status of blockedlog to experimental	2017-12-01 13:41:37 +01:00
ptibogxiv	c194538609	Update fraise.modules.php	2017-11-29 10:45:16 +01:00
ptibogxiv	883c9dbf99	Fix for multicompany last fix for multicompany compliance	2017-11-29 09:28:03 +01:00
Laurent Destailleur	3b98a06ebb	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/modules/mailings/fraise.modules.php	2017-11-28 12:18:01 +01:00
Laurent Destailleur	07bdd3213a	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-11-28 12:16:13 +01:00
Laurent Destailleur	f8d6897888	Fix bug	2017-11-28 12:08:04 +01:00
ptibogxiv	10b0eafba7	Update fraise.modules.php	2017-11-27 18:12:52 +01:00
ptibogxiv	ea9071512d	Update fraise.modules.php	2017-11-27 17:08:15 +01:00
ptibogxiv	0a5a50263d	fix for multicompany	2017-11-27 16:07:40 +01:00
ptibogxiv	a9e4fcfdca	Update fraise.modules.php	2017-11-27 15:49:28 +01:00
ptibogxiv	780e8ce470	fix for multicompany	2017-11-27 15:13:14 +01:00
Laurent Destailleur	f9e99e93c3	Fux utf8 trouble on direct printing message	2017-11-27 14:34:29 +01:00
Laurent Destailleur	43c60ec224	Fix error management at wrong place	2017-11-27 13:45:59 +01:00
Laurent Destailleur	7ea96d53a2	Minor fixes	2017-11-24 18:12:01 +01:00
Laurent Destailleur	63d2d38c5f	Fix export stock with lot	2017-11-24 17:47:40 +01:00
Laurent Destailleur	8659d97e97	Fix export of lot must use properties of lot from product_lot	2017-11-24 17:44:19 +01:00
Laurent Destailleur	0370368d04	Restore lost field during merge	2017-11-24 16:46:50 +01:00
Laurent Destailleur	d7f5f14f46	Merge branch 'develop' into new_export_stock_valo	2017-11-24 16:40:36 +01:00
Laurent Destailleur	aa2397ff1d	Merge pull request #7859 from vvnt/patch-9 modPropale.class.php permissions in English	2017-11-24 16:34:02 +01:00
Laurent Destailleur	8bd2707678	Merge pull request #7858 from vvnt/patch-8 modFacture.class.php permissions in English	2017-11-24 16:33:42 +01:00
Laurent Destailleur	a18824050c	Merge pull request #7857 from vvnt/patch-7 modSociete.class.php permissions in English	2017-11-24 16:33:22 +01:00
Laurent Destailleur	438a68968f	Fix regression	2017-11-24 16:28:24 +01:00
Maxime Kohlhaas	cad2fedf70	New add pmp and cost price in product stock export	2017-11-23 18:41:48 +01:00
Laurent Destailleur	b93e35cdd2	Fix a lot of request to use the IN getentity instead of = Fix a lot of request to use left join on type of payment table	2017-11-23 15:06:16 +01:00
Laurent Destailleur	295b4483d4	Enhance the repair.php tool	2017-11-23 13:23:16 +01:00
vvnt	09f4abd38e	modPropale.class.php permissions in English	2017-11-22 23:22:43 +01:00
vvnt	10ba9a2fee	modFacture.class.php permissions in English	2017-11-22 23:16:15 +01:00
vvnt	1b646f755d	modSociete.class.php permissions in English	2017-11-22 23:11:36 +01:00
Laurent Destailleur	5fa8db1650	Work on timesheets	2017-11-22 21:19:40 +01:00
Laurent Destailleur	d2b3fc5813	Merge pull request #7849 from IonAgorria/resources-card NEW: Merge resource/add.php to resource/card.php	2017-11-22 11:33:56 +01:00
Laurent Destailleur	30d0c4f210	Merge pull request #7845 from vvnt/patch-6 modSociete.class.php (spelling correction)	2017-11-22 11:33:03 +01:00
Laurent Destailleur	918a51b9da	Merge pull request #7844 from vvnt/patch-5 modPropale.class.php (spelling correction)	2017-11-22 11:28:25 +01:00
Ion	7c6622f5b3	Merge resource/add.php to resource/card.php	2017-11-21 20:12:55 +01:00
vvnt	c74eef03dd	modSociete.class.php (spelling correction) Minor spelling correction.	2017-11-21 15:17:02 +01:00
vvnt	005be3f69b	modPropale.class.php (spelling correction) Minor spelling correction	2017-11-21 15:13:13 +01:00
vvnt	98998a7060	Update modFacture.class.php	2017-11-21 15:07:53 +01:00
Laurent Destailleur	7349b5d793	Fix php 7.2	2017-11-17 17:23:56 +01:00
Laurent Destailleur	2705030006	Code comment	2017-11-17 15:34:15 +01:00
Laurent Destailleur	2cb190fc5c	Fix return code	2017-11-17 15:27:59 +01:00
Laurent Destailleur	c527189088	Standardize page name	2017-11-16 12:18:25 +01:00
Laurent Destailleur	c85acbfc11	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/fiche-rec.php htdocs/core/class/commonobject.class.php htdocs/core/modules/import/import_xlsx.modules.php htdocs/install/repair.php	2017-11-14 19:47:33 +01:00
Laurent Destailleur	a2c80a704f	Code comment	2017-11-13 19:06:58 +01:00
Laurent Destailleur	f33182acc5	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-11-12 20:49:53 +01:00
atm-ph	2636c2470b	Fix width of payment term is to large	2017-11-10 10:52:58 +01:00
Laurent Destailleur	45fc5701ae	NEW Add a profile to import product translations	2017-11-06 12:59:58 +01:00
Laurent Destailleur	8429de031f	Code comment	2017-11-06 11:32:02 +01:00
Laurent Destailleur	32303d30fa	Fix search on special char in module list	2017-10-31 10:46:23 +01:00
Laurent Destailleur	a40bebec40	Fix translation of module descriptions	2017-10-27 13:06:14 +02:00
Laurent Destailleur	6b65a9ac56	Fix position of resource menu	2017-10-24 09:58:32 +02:00
Laurent Destailleur	812687e10c	FIX Restore feature to enable a module during CLI upgrade	2017-10-22 16:08:52 +02:00
Laurent Destailleur	728e36f70f	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/api/index.php htdocs/comm/propal/class/api_proposals.class.php htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/class/api_invoices.class.php htdocs/core/actions_massactions.inc.php htdocs/core/actions_sendmails.inc.php	2017-10-22 01:43:33 +02:00
Laurent Destailleur	cad44ee68a	FIX substitution in ODT of thirdparties documents	2017-10-22 01:25:59 +02:00
Laurent Destailleur	1426737a26	Work on website	2017-10-21 12:26:14 +02:00
Laurent Destailleur	3bca0ad07d	More modern picto for switch on/off Work on website module	2017-10-20 21:39:19 +02:00
Laurent Destailleur	0e397b3e81	Work on website module	2017-10-20 18:44:03 +02:00
Laurent Destailleur	985675d680	Clean code	2017-10-20 18:04:46 +02:00
Laurent Destailleur	6165bcdbd0	NEW Can export list of stock movements	2017-10-20 14:52:01 +02:00
Laurent Destailleur	d82af57b57	NEW Add tab "Expense report" on user card	2017-10-19 20:56:23 +02:00
Laurent Destailleur	9c45e86a1c	Introduce main_doc into table of objects to know what is main doc. Work on option PROPOSAL_USE_ONLINE_SIGN	2017-10-19 11:40:40 +02:00
Laurent Destailleur	1e7f726168	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-11 12:21:52 +02:00
Laurent Destailleur	99afa3a3e0	Use a shorter key for column title	2017-10-11 12:19:44 +02:00
Laurent Destailleur	f23a82b9a7	Merge pull request #7614 from dolibarr95/patch-25 Fix : translation error	2017-10-11 11:57:51 +02:00
Laurent Destailleur	e644f7df58	Merge pull request #7597 from hregis/develop_member NEW add company alias name when create company from member	2017-10-11 11:31:55 +02:00
dolibarr95	1b3f746ce0	Fix translation error InvoiceProForma translation is available in bills.lang	2017-10-11 11:16:01 +02:00
Laurent Destailleur	f93ecc1584	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog htdocs/filefunc.inc.php htdocs/projet/activity/perweek.php htdocs/projet/element.php	2017-10-10 11:24:17 +02:00
Regis Houssin	e2206d9bf2	Fix: uniformize substitution tags	2017-10-09 16:33:22 +02:00
Maxime Kohlhaas	8513ddb9b4	Fix : missing new target type in advance target selection	2017-10-08 10:08:49 +02:00
Scrutinizer Auto-Fixer	328d39bc71	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2017-10-07 11:09:31 +00:00
Laurent Destailleur	f9d9642340	FIX #6981	2017-10-06 14:07:28 +02:00
Laurent Destailleur	e644d9d53f	Fix syntax code	2017-10-06 01:49:07 +02:00
Laurent Destailleur	801a5180d6	Fix scrutinizer bug reports	2017-10-06 01:16:19 +02:00
Regis Houssin	1cee16a802	Fix: minimal num, maj and special character with value 0 not work	2017-10-04 18:32:52 +02:00
Laurent Destailleur	8e0da9bfeb	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/holiday/document.php	2017-10-04 13:32:53 +02:00
Laurent Destailleur	c22cd1cfe9	Fix test on entity must always be done using the "IN" instead of "="	2017-10-03 17:41:22 +02:00
Laurent Destailleur	f2e0ff0d30	Merge branch 'develop_dict' of https://github.com/hregis/dolibarr into hregis-develop_dict	2017-10-03 17:25:01 +02:00
Laurent Destailleur	1f11dcb4bd	Fix no loose of configuration of action auto after upgrade Close #7527	2017-10-03 17:21:18 +02:00
Regis Houssin	09e71f1390	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-10-02 11:51:27 +02:00
Laurent Destailleur	0feae17ef5	Fix file not always defined	2017-09-30 11:51:34 +02:00
Laurent Destailleur	537a551bb5	Fix vat visiblity on pdf	2017-09-27 21:58:42 +02:00
Regis Houssin	9823d6622c	Fix: use default $shared value	2017-09-27 17:40:02 +02:00
Regis Houssin	20684b4505	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/core/modules/rapport/pdf_paiement.class.php htdocs/core/modules/rapport/pdf_paiement_fourn.class.php	2017-09-27 17:22:18 +02:00
Laurent Destailleur	f1a563625b	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/actions_massactions.inc.php htdocs/install/mysql/migration/5.0.0-6.0.0.sql	2017-09-26 22:11:00 +02:00
Laurent Destailleur	6b9e754221	Merge pull request #7496 from papoteur-mga/rapports_paiements Rapports paiements	2017-09-26 20:02:09 +02:00
Laurent Destailleur	0dfbc8d72f	doxygen	2017-09-26 16:03:08 +02:00
Laurent Destailleur	e140878458	NEW Can import local tax rates in prices	2017-09-26 13:00:09 +02:00
Papoteur	cc9954e95e	Clean debug messages	2017-09-26 12:51:14 +02:00
Papoteur	50d639f1fa	Add total and subtotal in payments reports	2017-09-26 12:10:51 +02:00
Papoteur	cbe1683fe7	Invoice number on one line instead of two (issue#7487)	2017-09-26 11:30:28 +02:00
Papoteur	d2c55ea07b	Factorize code between payments reports client/provider	2017-09-26 11:27:53 +02:00
Regis Houssin	d592664150	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-09-25 06:48:26 +02:00
Laurent Destailleur	77d1a15016	Activate warning for french "Loi Finance 2016"	2017-09-19 12:03:48 +02:00
Laurent Destailleur	0355b0d9ed	Merge pull request #7414 from aspangaro/7.0-4 Accountancy - Finish moving admin to specific menu & some cleaning	2017-09-18 11:16:36 +02:00
Regis Houssin	a03ef95eaa	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/install/mysql/tables/llx_c_payment_term.sql	2017-09-18 09:11:04 +02:00
Laurent Destailleur	630dc92a13	NEW Mass PDF Merging is available on contracts	2017-09-16 15:39:52 +02:00
Laurent Destailleur	279988bd60	Remove warning	2017-09-16 12:45:54 +02:00
Laurent Destailleur	ad40d27324	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/actions_sendmails.inc.php	2017-09-16 12:22:18 +02:00
Laurent Destailleur	ff7a17eb96	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/compta/facture.php	2017-09-16 12:17:30 +02:00
Laurent Destailleur	e4767b1a51	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/compta/facture/fiche-rec.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/fourn/facture/card.php	2017-09-16 12:11:18 +02:00
Alexandre SPANGARO	c2e1e2491d	Accountancy - Finish moving admin to specific menu & some cleaning	2017-09-16 06:53:29 +02:00
Laurent Destailleur	bb6b3db0ac	FIX Position of signature on strato template Conflicts: htdocs/core/modules/contract/doc/pdf_strato.modules.php	2017-09-16 00:50:54 +02:00
Laurent Destailleur	f4de75afc3	FIX Position of signature on strato template	2017-09-16 00:49:00 +02:00
Laurent Destailleur	3c9532841f	Fix regression db => this->db	2017-09-15 19:37:23 +02:00
Regis Houssin	db17eb80ec	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/compta/facture/class/paymentterm.class.php	2017-09-15 16:45:49 +02:00
Laurent Destailleur	5e34b121dd	Add more robust php unit to detect not escaped sql. Fix not escaped sql	2017-09-15 15:41:07 +02:00
Laurent Destailleur	e02c220c08	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-15 11:04:27 +02:00
Laurent Destailleur	cce1549f66	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/commande/card.php htdocs/core/lib/functions.lib.php htdocs/fourn/card.php htdocs/public/members/new.php	2017-09-15 11:02:34 +02:00
Regis Houssin	a494e01f00	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2017-09-14 12:07:19 +02:00
Laurent Destailleur	dbb50d7b16	Fix PHP 7.2	2017-09-14 11:56:43 +02:00
Laurent Destailleur	eadfbfe2bd	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/core/lib/functions2.lib.php	2017-09-13 20:57:53 +02:00
Laurent Destailleur	e0eef2080e	FIX PDF output was sharing 2 different currencies in same total Conflicts: htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/core/modules/product/doc/pdf_standard.modules.php htdocs/core/modules/propale/doc/pdf_azur.modules.php	2017-09-13 18:13:43 +02:00
Laurent Destailleur	60078300b8	FIX PDF output was sharing 2 different currencies in same total	2017-09-13 17:57:41 +02:00
Laurent Destailleur	a4665e17d4	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/customer/index.php htdocs/accountancy/expensereport/index.php htdocs/compta/facture/class/facture-rec.class.php htdocs/fichinter/class/fichinter.class.php htdocs/societe/class/societe.class.php htdocs/societe/list.php	2017-09-12 13:26:25 +02:00
Regis Houssin	b5de8da3a6	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/core/modules/modFacture.class.php	2017-09-11 08:07:55 +02:00
Regis Houssin	67e9b65a2e	Fix: use $array_key value instead	2017-09-09 17:07:08 +02:00
Regis Houssin	db02c32a9f	Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0_bug3	2017-09-09 12:14:22 +02:00
Laurent Destailleur	8b20c5edab	FIX Remove warning when using log into syslog	2017-09-08 15:46:06 +02:00
Laurent Destailleur	259cca0230	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/dict.php htdocs/admin/mails_templates.php	2017-09-08 13:30:54 +02:00
Regis Houssin	d4c20a919d	Fix: avoid warning	2017-09-08 12:52:56 +02:00
Laurent Destailleur	c546243f00	Merge pull request #7328 from Dolibarr/scrutinizer-patch-1 Scrutinizer Auto-Fixes	2017-09-07 17:56:24 +02:00
Neil Orley	e43b13968e	New: Adds an hide hour button in the "intervention" module Adds a way to set the visibility of hours/mins of the intervention date field from the administration interface of the "intervention" module	2017-09-07 15:31:19 +02:00
Regis Houssin	66e548427c	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/compta/resultat/clientfourn.php htdocs/core/lib/functions.lib.php htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2017-09-07 10:50:35 +02:00
Laurent Destailleur	859d0dfe97	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2017-09-06 19:24:42 +02:00
Laurent Destailleur	9cc344f8cc	Fix problem in type and customer code substitution in numbering module	2017-09-06 10:11:07 +02:00
fappels	5a75e14a8a	Add supplier qty and supplier discount for export	2017-09-05 22:50:34 +02:00
Scrutinizer Auto-Fixer	c2d32aaf18	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2017-09-04 10:42:51 +00:00
Laurent Destailleur	ca93be5eed	Fix priority of crons	2017-09-03 02:40:00 +02:00
Laurent Destailleur	4b9f54e571	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/install/mysql/data/llx_accounting.sql htdocs/install/mysql/migration/5.0.0-6.0.0.sql htdocs/install/mysql/tables/llx_holiday_config.sql	2017-09-01 17:34:57 +02:00
Regis Houssin	8e8f94df11	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/compta/facture/card.php htdocs/compta/facture/class/facture-rec.class.php	2017-08-30 19:33:23 +02:00
Laurent Destailleur	8f34de1036	NEW Can include tag {uuu} into some numbering masks to replace with user	2017-08-29 19:44:35 +02:00
Laurent Destailleur	4d908c2dd0	Merge pull request #7299 from atm-maxime/new_expense_numbering New : add expense report numbering mask	2017-08-29 18:24:17 +02:00
Laurent Destailleur	d96a83adac	Fix bad total included tax when mutlicurrency is on	2017-08-29 16:37:00 +02:00
Laurent Destailleur	7218a9de0e	Fix translation of total VAT	2017-08-29 13:52:24 +02:00
Laurent Destailleur	9312005318	NEW Move accountancy features into a dedicated menu	2017-08-29 12:43:47 +02:00
Laurent Destailleur	1b1ce4fdf5	Code comment	2017-08-27 19:40:43 +02:00
Laurent Destailleur	f33289ed6a	Better examples	2017-08-27 19:15:06 +02:00
Maxime Kohlhaas	350b24f32b	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_expense_numbering	2017-08-27 17:53:19 +02:00
Maxime Kohlhaas	9eeacd8982	Fix const name	2017-08-27 10:58:01 +02:00
Maxime Kohlhaas	61fadfd0e1	New numbering module for expense report + admin setup	2017-08-27 10:49:51 +02:00
Laurent Destailleur	c573df4f0e	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/user/card.php	2017-08-26 22:33:56 +02:00
BENKE Charlene	831947b6d1	Little cleaning code $bottomlastpage is same in two case	2017-08-26 16:37:32 +02:00
Laurent Destailleur	a9e7f8b9e6	Fix trans	2017-08-25 21:27:19 +02:00
Laurent Destailleur	54cc1ac800	Merge emailing target selectors.	2017-08-25 21:20:27 +02:00
Regis Houssin	ad39c30c21	Fix: change old email	2017-08-23 21:23:18 +02:00
Regis Houssin	2f537a1ade	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/compta/charges/index.php htdocs/compta/paiement/list.php htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2017-08-22 18:49:40 +02:00
Laurent Destailleur	9cd5c8a564	Code comment	2017-08-22 18:34:58 +02:00
Laurent Destailleur	2104ab9aed	Disable event reminder	2017-08-21 13:11:29 +02:00
Laurent Destailleur	fe724a2e69	Fix syntax error	2017-08-21 12:35:43 +02:00
Laurent Destailleur	260beed512	NEW Generated files are now indexed in database	2017-08-18 23:19:55 +02:00
Laurent Destailleur	4d46b2ae58	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/modules/propale/doc/pdf_azur.modules.php htdocs/filefunc.inc.php	2017-08-17 22:21:30 +02:00
Laurent Destailleur	0dd5bcde40	Merge pull request #7135 from apachler/develop NEW Added functionality to get order customer contact as contact_xx tags	2017-08-17 18:28:23 +02:00
Laurent Destailleur	d37d1a033a	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/compta/bank/bankentries.php htdocs/core/lib/admin.lib.php htdocs/install/mysql/migration/repair.sql	2017-08-11 19:56:17 +02:00
fappels	34153eec7f	Add reading of picture paths	2017-08-07 22:36:12 +02:00
fappels	7fc359df5d	Fix pic position when VAT column hidden	2017-08-07 21:48:01 +02:00
fappels	3ef4b0fd2b	Add pictures to pdf muscadet	2017-08-07 21:47:45 +02:00
fappels	ea5dcbf611	Fix constant to show pics and remove pics column line	2017-08-07 21:35:30 +02:00
Laurent Destailleur	fd38a55f51	FIX amount overlap other amount when a pagebreak is done due to an image at the bottom of page.	2017-08-07 15:49:54 +02:00
Laurent Destailleur	402e6bf650	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/bank/various_payment/card.php htdocs/compta/bank/various_payment/index.php htdocs/compta/paiement/list.php htdocs/core/modules/modCron.class.php	2017-08-04 15:39:00 +02:00
Laurent Destailleur	8a71b9e95e	Avoid creation of dir that is not indexed	2017-08-04 13:51:25 +02:00
Laurent Destailleur	f058fa1938	Better detection if a module provide triggers	2017-08-03 12:19:31 +02:00
Laurent Destailleur	00a1893d93	Better help	2017-08-03 12:04:13 +02:00
Laurent Destailleur	8cd2235b4b	Start to introduce cron for email reminder.	2017-08-03 11:42:22 +02:00
Laurent Destailleur	a8e2f95c39	Better help	2017-08-03 10:47:35 +02:00
Laurent Destailleur	fa752348c8	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/bank/various_payment/index.php htdocs/contact/list.php htdocs/langs/en_US/errors.lang	2017-08-02 17:56:09 +02:00
Laurent Destailleur	71d49f1c6f	Fix pb in ecm	2017-08-01 18:44:34 +02:00
Laurent Destailleur	03b3f54c2c	Fix class not found	2017-08-01 13:10:15 +02:00
Laurent Destailleur	b6a7ce6822	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-08-01 10:22:37 +02:00
Regis Houssin	0dc0fe81fc	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-31 07:40:01 +02:00
Laurent Destailleur	d8121c133e	Merge pull request #7205 from atm-quentin/6.0 FIX invoice situation division by zero	2017-07-31 02:23:37 +02:00
Laurent Destailleur	80f096a9d8	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-07-31 02:09:15 +02:00
Laurent Destailleur	46586f3055	Can export Websites pages. Work on export to be able to use the generic declaration of fields.	2017-07-28 14:54:13 +02:00
Laurent Destailleur	ef3c002144	Module website not stable enough	2017-07-28 12:37:52 +02:00
Laurent Destailleur	cb5b0f3352	NEW Module "Product variants" is moved as stable.	2017-07-28 11:20:01 +02:00
atm-quentin	8451ba1f14	FIX invoice situation division by zero	2017-07-26 14:43:10 +02:00
Regis Houssin	acd5780e32	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-26 08:58:56 +02:00
Laurent Destailleur	5b9ac2a7a9	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/index.php	2017-07-25 21:11:36 +02:00
Laurent Destailleur	c386a02889	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/langs/en_US/stocks.lang	2017-07-25 21:10:08 +02:00
Laurent Destailleur	8b793a261f	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/core/modules/DolibarrModules.class.php	2017-07-25 21:08:31 +02:00
Laurent Destailleur	6a3add6e57	Merge pull request #7196 from hregis/6.0_bug Fix: translation error	2017-07-25 13:33:18 +02:00
florian HENRY	d6d454edc8	fix : Various misspelling class (eclipse Oxygen standard PHP control)	2017-07-25 13:32:27 +02:00
Laurent Destailleur	149e1f9c67	Merge pull request #7195 from atm-florian/6.0 fix : Various misspelling class (eclipse Oxygen standard PHP control)	2017-07-25 13:31:40 +02:00
Regis Houssin	88968aae22	Fix: translation error	2017-07-24 09:10:59 +02:00
florian HENRY	b9d5f4ba10	fix : Various misspelling class (eclipse Oxygen standard PHP control)	2017-07-24 09:02:32 +02:00
Regis Houssin	26df1389f4	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/install/mysql/migration/5.0.0-6.0.0.sql	2017-07-21 20:42:21 +02:00
Regis Houssin	2e63393bf2	Fix: wrong values if array used to force entity 0	2017-07-21 19:35:08 +02:00
Regis Houssin	48d79357a0	New: add specific translation for title of documents	2017-07-21 10:03:09 +02:00
Regis Houssin	c8bd11660d	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-18 15:23:43 +02:00
Marc de Lima Lucio	447fdd542d	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_units_import_products	2017-07-18 10:30:43 +02:00
Marc de Lima Lucio	3a05b6a164	NEW add fk_unit field into product/service import/export	2017-07-18 10:20:16 +02:00
Laurent Destailleur	4fa04247a9	Finished dev	2017-07-17 11:09:32 +02:00
Regis Houssin	200f232164	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-16 07:51:20 +02:00
Laurent Destailleur	e5513cff91	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/accountancy/journal/bankjournal.php	2017-07-15 21:24:21 +02:00
Laurent Destailleur	4e45c7fdba	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/supplier_proposal/class/supplier_proposal.class.php	2017-07-15 21:21:40 +02:00
Laurent Destailleur	1735a649e9	Fix permission on salary module	2017-07-15 13:02:41 +02:00
Laurent Destailleur	0763d15b4c	Debug journalization Debug edition of user BAN.	2017-07-15 12:37:31 +02:00
Laurent Destailleur	de66971d93	Fix bad setup	2017-07-14 15:49:33 +02:00
Regis Houssin	f745c87394	Fix: error during upgrade process	2017-07-11 21:27:51 +02:00
Regis Houssin	cb6b81d897	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-11 19:10:22 +02:00
Andreas Pachler	0932ebd6c8	Added functionality to get order customer contact as contact_xx tags	2017-07-10 14:09:21 +02:00
Laurent Destailleur	d223283359	Fix phpcs	2017-07-08 20:59:53 +02:00
Laurent Destailleur	f40afcf023	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/accountancy/class/bookkeeping.class.php htdocs/compta/facture/list.php htdocs/compta/paiement/class/cpaiement.class.php htdocs/compta/sociales/card.php htdocs/core/lib/functions.lib.php htdocs/expensereport/card.php htdocs/expensereport/class/expensereport.class.php htdocs/product/stats/facture.php	2017-07-08 18:32:34 +02:00
Laurent Destailleur	cf6745b1ae	Debug module builder	2017-07-08 17:08:07 +02:00
Laurent Destailleur	bcbd2a8a91	Merge pull request #7108 from atm-ph/fix_develop_import_update Fix update row on xlsx import do not work as csv import	2017-07-07 20:00:28 +02:00
Laurent Destailleur	c6fc7313b1	Merge pull request #7116 from atm-ph/fix_7109 FIX 7109 - class name already exist for customer payment	2017-07-07 19:01:10 +02:00
Laurent Destailleur	252d8da8fc	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/categories/class/categorie.class.php htdocs/core/class/commondocgenerator.class.php htdocs/core/lib/functions.lib.php htdocs/core/modules/DolibarrModules.class.php htdocs/filefunc.inc.php htdocs/societe/class/societe.class.php htdocs/supplier_proposal/class/supplier_proposal.class.php	2017-07-07 15:11:53 +02:00
alexis Algoud	3d18c71201	FIX invoice situation VAT total rounding into PDF crabe	2017-07-05 17:21:37 +02:00
phf	31b94c1d3f	Fix 7109 - class name already exist for customer payment	2017-07-05 16:52:37 +02:00
phf	3892da7606	Fix update row on xlsx import do not work as csv import	2017-07-04 12:09:56 +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
Laurent Destailleur	53708c138a	Add option to be able to debug problem of apache lock page	2017-07-01 16:52:28 +02:00
Laurent Destailleur	ea504a0516	FIX We should be able to insert data with value '0' into const	2017-06-30 11:10:05 +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
BENKE Charlene	b17937ce0d	Error fields and add date end on rapport pdf percentage instead percent	2017-06-28 21:29:01 +02:00
Maxime Kohlhaas	cef5c0b375	Fix column position in PDF when VAT is hidden	2017-06-28 00:38:24 +02:00
Maxime Kohlhaas	3664956b8c	Update pdf_azur.modules.php	2017-06-28 00:31:33 +02:00
Laurent Destailleur	7e6e0ee3a4	Fix link to image of MD files	2017-06-27 20:02:46 +02:00
Laurent Destailleur	08af9bf365	List before	2017-06-27 10:37:00 +02:00
Laurent Destailleur	3fdfebf7ef	Fix position of top menu does not follow 'position' field.	2017-06-27 04:25:41 +02:00
BENKE Charlene	03cb850442	$forceimgscaleheight instead $forceimgscalewidth	2017-06-24 20:48:11 +02:00
Laurent Destailleur	b0c5616ff0	Fix in the way markdown README and ChangeLog are output on module page.	2017-06-24 16:01:18 +02:00
Laurent Destailleur	81a473d547	Warning not required for the moment	2017-06-23 23:40:02 +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	efe5d79a86	Work on #6958 . Only one type of invoice supported for supplier invoices	2017-06-20 12:58:43 +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	24f7128742	Fix pb with postgresql	2017-06-19 21:04:46 +02:00
Inovea Conseil	85efe6ef74	Add import fields for societe rib Add import fields for rib account, this fields are used in a new external module bankwire for supplier invoice. But we must copy the translation of banks.lang in bills.lang are there an other solution ?	2017-06-19 11:32:11 +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	7c41c9a3e4	Fix activation of dependency for a dedicated country. BlockedLog depends now on CashDesk only.	2017-06-17 11:43:00 +02:00
Laurent Destailleur	1c8daf9700	Standardize and debug code of module BlockedLog	2017-06-16 12:46:15 +02:00
Laurent Destailleur	097be322a6	Modify code to match new v6 structure.	2017-06-15 19:29:00 +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	c088ccea32	Fix better management of export of extrafield computed.	2017-06-13 18:50:31 +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	ba3a74576c	Merge 5.0	2017-06-12 18:22:51 +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
Laurent Destailleur	36b18f0300	Save MAIN_VERSION_FIRST_INSTALL that is not erased.	2017-06-10 22:11:12 +02:00
atm-ph	0d24df9ffc	Fix 6939 new path for pictures is not used	2017-06-10 14:40:17 +02:00
Alexis Algoud	3d5899edf3	final blockedlog init	2017-06-10 09:25:32 +02:00
Regis Houssin	fa58f0f3e8	Fix: add entity filter	2017-06-09 09:25:15 +02:00
Regis Houssin	2df33d1df3	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc	2017-06-03 11:45:15 +02:00
Laurent Destailleur	66420d0e80	Restore lost file and better generation of modules	2017-06-02 23:02:48 +02:00
Laurent Destailleur	7ad92c3a4d	Fix new generic substitution system	2017-06-01 13:32:20 +02:00
Laurent Destailleur	77df19009d	Removed duplicated code	2017-06-01 12:11:45 +02:00
Regis Houssin	5c5663c5ae	New: getEntity function use true $shared value by default	2017-05-30 18:50:54 +02:00
Laurent Destailleur	5cb38ece19	Fix travis errors	2017-05-21 19:37:15 +02:00
Laurent Destailleur	80cbc28385	NEW Add REST API to push a file.	2017-05-20 15:52:36 +02:00
Laurent Destailleur	4e7353f8a0	Clean code	2017-05-19 13:39:00 +02:00
Laurent Destailleur	88fc7dbc3e	Fix remove warning	2017-05-18 19:24:44 +02:00
Laurent Destailleur	4a46480ef5	Fix preview of PDF contract	2017-05-18 12:40:20 +02:00
Laurent Destailleur	998254d9c6	Finish rewrite and debug of module Stripe.	2017-05-14 16:17:23 +02:00
Laurent Destailleur	57ba598b15	Merge pull request #6771 from aspangaro/6.0-stripe New : Module Stripe	2017-05-13 19:55:29 +02:00
Laurent Destailleur	6f9e67b1fb	Remove no more used constant	2017-05-13 13:08:25 +02:00
Laurent Destailleur	fa290c34fa	Fix against SQL injection. Add phpunit to detect missing escapement.	2017-05-12 16:55:11 +02:00
Laurent Destailleur	cd72c50356	Merge pull request #6799 from Dolibarr/scrutinizer-patch-2 Scrutinizer Auto-Fixes	2017-05-11 00:04:12 +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	823e5b48e3	Code comment	2017-05-10 18:56:18 +02:00
BENKE Charlie	d570df5089	inverted value between FRST & RECUR	2017-05-10 18:17:28 +02:00
Thomas Raschbacher	70de54e97d	fix project extrafields for ODT for some raeson the code was checking for already existing extra fields before even fetching it. removed the if condition, now it works fine.	2017-05-10 15:21:53 +02:00
Thomas Raschbacher	267e66abfa	Add more fields to projectcontacts substitution civility added + extrafields for external contacts + isInternal to decide in template wether to list internal or not	2017-05-10 08:48:28 +02:00
Laurent Destailleur	cf04e5a6e0	Fix duplicate id	2017-05-09 10:45:49 +02:00
Alexandre SPANGARO	16a41242d3	Merge remote-tracking branch 'uptream/develop' into 6.0-stripe	2017-05-08 06:39:14 +02:00
Laurent Destailleur	46ff62fc87	Work on inventory module debug	2017-05-06 22:28:07 +02:00
Laurent Destailleur	910a925167	NEW Add last activation author and ip of modules	2017-05-06 20:43:14 +02:00
Scrutinizer Auto-Fixer	d93552c8c5	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2017-05-05 17:13:29 +00:00
Laurent Destailleur	d60e98a797	No payment information on a supplier proposal by default.	2017-05-05 13:50:14 +02:00
Laurent Destailleur	68b63927e0	Maxi miscellaneous debug	2017-05-05 12:33:49 +02:00
Laurent Destailleur	768df56c07	Uniformize name of standard PDF template	2017-05-04 20:16:55 +02:00
Laurent Destailleur	c196e79bf4	Merge branch 'develop' into FIX_inventory	2017-05-04 13:50:53 +02:00
Laurent Destailleur	3871da0324	Merge pull request #6729 from atm-florian/dev_importexport_ressources NEW : Add module resources import/export	2017-05-04 09:43:00 +02:00
alexis Algoud	12e91f1c1b	fix rights inventory only for MAIN_LEVEL_FEATURES = 2	2017-05-02 15:25:30 +02:00
alexis Algoud	6138d197e4	FIX major issues for inventory - Move all needed declaration from coreobject to commonobject for updateCommon, fetchCommon, deleteCommon, createCommon - Just leave method for child object into coreobject, check later if is useless - debug inventory card, PHP 7.0 compatibility - activate rights for inventory into stock module - add inventory options into stock admin module	2017-05-02 15:19:55 +02:00
Marcos García de La Fuente	7ae405a254	Corrected PHP7 warnings for several PDF document models	2017-05-02 14:08:20 +02:00
Marcos García de La Fuente	6e7fddee7d	Corrected PHP7 warnings for function pdf_einstein::write_file	2017-05-02 14:07:04 +02:00
Laurent Destailleur	92b5f8d85e	Move new feature inventory into module stock.	2017-04-29 21:53:01 +02:00
Laurent Destailleur	f5bdfc426f	Merge pull request #6584 from atm-ph/NEW_inventory_coreobject_listview New inventory coreobject listview	2017-04-29 21:31:46 +02:00
Laurent Destailleur	a8c775dcbd	Fix compatibility with the removal of "constant".	2017-04-29 18:48:30 +02:00
Alexandre SPANGARO	586ea54bfc	Merge remote-tracking branch 'uptream/develop' into 6.0-stripe	2017-04-29 07:05:02 +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	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	10e2b128d1	Fix warning during install	2017-04-24 05:20:45 +02:00
Laurent Destailleur	65fec95458	Fix debian package	2017-04-24 04:17:59 +02:00
Alexandre SPANGARO	3b626b75c4	Update works	2017-04-22 06:58:44 +02:00
Alexandre SPANGARO	c3fe1c963a	Merge remote-tracking branch 'uptream/develop' into 6.0-stripe	2017-04-22 06:33:31 +02:00
Laurent Destailleur	cfc31e91e8	FIX overwrapping of weight/volume on rouget template	2017-04-18 18:13:43 +02:00
florian HENRY	a52db08cd6	NEW : Add module resources import/export	2017-04-18 15:25:04 +02:00
Alexandre SPANGARO	d0e27f67e7	Add plugins Stripe	2017-04-18 05:44:08 +02:00
Laurent Destailleur	0994622bf8	NEW Can use translations into all substitutions (watermark, freetext...)	2017-04-17 23:54:09 +02:00
Alexandre SPANGARO	fed6d71d8a	Merge remote-tracking branch 'uptream/develop' into 6.0-stripe	2017-04-17 06:51:02 +02:00
Laurent Destailleur	e97e202deb	NEW Can import users	2017-04-17 04:22:53 +02:00
Laurent Destailleur	7354cb148a	Fix scrutinizer	2017-04-15 03:13:17 +02:00
Laurent Destailleur	8c07f514c8	Add php unit tests on expense reports	2017-04-14 16:51:30 +02:00
Laurent Destailleur	c7160ad2b9	Avoid warning	2017-04-14 14:19:21 +02:00
Laurent Destailleur	62394abb8b	Introduce skeleton for a collab module. Volunteer wanted.	2017-04-14 14:11:52 +02:00
Laurent Destailleur	e6e9b65594	NEW Reduce memory usage by removing deprecated constant loading.	2017-04-14 12:38:52 +02:00
Laurent Destailleur	39ebaec064	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00
Laurent Destailleur	3e9ccc186a	NEW Small PDF template for products	2017-04-13 10:26:12 +02:00
Laurent Destailleur	26a9999fbf	Support of preview for pdf with several pages	2017-04-12 11:38:55 +02:00
Laurent Destailleur	d49d264bec	Merge pull request #6608 from LordVan/patch-2 NEW Add phone numbers of project contacts as ODT vars	2017-04-01 00:30:28 +02:00
Laurent Destailleur	18e1e5b780	NEW Add "depends on" and "required by "into module informations	2017-03-30 15:54:48 +02:00
Laurent Destailleur	8e70c4a0b7	Work on 6.0 new look and feel	2017-03-30 15:39:50 +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	141ef91dea	Fix default auto events	2017-03-30 11:53:58 +02:00
Laurent Destailleur	78cc976e9f	Work on module builder	2017-03-30 10:40:15 +02:00
Laurent Destailleur	4df8dcf980	Work on module modBlockedLog and modModuleBuilder	2017-03-29 21:50:15 +02:00
Thomas Raschbacher	a76ddc8b3f	Add phone phone numbers to project contacts Add phone number(s) for project contacts to be used in odt	2017-03-29 15:33:32 +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	219bcb0d54	Work on 6.0 features.	2017-03-27 22:44:50 +02:00
Laurent Destailleur	8c2b70c4a7	Fix filechecker	2017-03-25 20:51:02 +01: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	21e30e43d9	Update entries menus	2017-03-25 19:10:16 +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
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
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	be0d5bee78	Fix phpcs	2017-03-23 20:07:46 +01:00
Laurent Destailleur	3adb43c6e5	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture.php htdocs/core/boxes/box_produits.php htdocs/core/boxes/box_produits_alerte_stock.php htdocs/langs/en_US/bills.lang htdocs/product/class/product.class.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php	2017-03-23 12:52:19 +01:00
Laurent Destailleur	7df9c25e60	Several fixes on multicurrency	2017-03-23 12:44:20 +01:00
Laurent Destailleur	b5e646daa0	NEW Show by default README.md file found into root dir of ext module.	2017-03-21 16:43:09 +01:00
Laurent Destailleur	a5c11dc840	NEW Add function dolMd2Html	2017-03-21 16:03:13 +01:00
Laurent Destailleur	1b0b4c9609	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-03-20 23:53:47 +01:00
Laurent Destailleur	b9a9997688	Page societe/soc.php and compta/facture.php was renamed into card.php to match page naming conventions.	2017-03-20 21:29:22 +01:00
Laurent Destailleur	ac19aba07e	FIX multicurrency management on supplier order/invoice Conflicts: htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php	2017-03-19 15:41:55 +01:00
Laurent Destailleur	e85206dee5	FIX multicurrency management on supplier order/invoice	2017-03-19 15:37:07 +01:00
Alexandre SPANGARO	16b12b33fc	First step : remove BANK_DISABLE_DIRECT_INPUT	2017-03-18 07:24:55 +01:00
Laurent Destailleur	35b79818b7	Uniformize css rules	2017-03-16 20:33:51 +01:00
Laurent Destailleur	d951114c18	Merge branch 'develop' into NEW_odt_others_objects	2017-03-14 10:44:05 +01:00
arnaud	192a825de8	NEW ODT docs for USER USERGROUP CONTRACT and PRODUCT class	2017-03-14 09:25:29 +01:00
Laurent Destailleur	d3e1a01273	Translation	2017-03-13 02:12:18 +01:00
Laurent Destailleur	520bdac510	Translation	2017-03-13 01:35:04 +01:00
Laurent Destailleur	4bf0e31299	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.form.class.php htdocs/langs/en_US/loan.lang htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php	2017-03-11 02:40:42 +01:00
Laurent Destailleur	8f338a155a	Fix last_insert_id at a better place	2017-03-10 15:19:15 +01:00
Laurent Destailleur	fd3837e1d5	Merge pull request #6492 from aspangaro/6.0-donation NEW Add donations statistics in home statistics	2017-03-10 12:31:46 +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	1d31603ad2	Merge branch '3.9' of github.com:Dolibarr/dolibarr into 3.9_dalibo	2017-03-10 11:46:59 +01:00
Laurent Destailleur	e44234a47f	NEW add property to show warnings when activating modules	2017-03-09 15:16:45 +01:00
Laurent Destailleur	c962daabac	NEW add property to show warnings when activating modules	2017-03-09 15:16:16 +01:00
arnaud	4a7e3fb387	NEW odt usergroup	2017-03-08 11:34:21 +01:00
Alexandre SPANGARO	fd0a46c5cf	New : add donations statistics in home statistics	2017-03-07 22:31:34 +01:00
Alexandre SPANGARO	6ce8aa7d6f	Merge remote-tracking branch 'uptream/develop' into 6.0-stripe	2017-03-07 22:08:23 +01:00
Laurent Destailleur	2a1060c0fc	Merge pull request #6475 from defrance/patch-87 Situation total row left a col if bank enabled	2017-03-05 21:39:02 +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
arnaud	cff9fa0e6b	FIX user odt	2017-03-03 12:01:58 +01:00
BENKE Charlie	83622c62be	Update pdf_crabe.modules.php	2017-03-01 21:54:30 +01:00
BENKE Charlie	a371b27564	better management of situation progress in pdf	2017-03-01 16:48:09 +01:00
Laurent Destailleur	3c54cb5ba9	Fix avoid trigger during migration	2017-02-28 20:55:14 +01:00
Laurent Destailleur	0f22beb774	Upgrade to ckeditor 4.6.2.	2017-02-28 10:49:58 +01:00
Alexandre SPANGARO	05e50e1027	Merge remote-tracking branch 'uptream/develop' into 6.0-stripe	2017-02-28 05:52:43 +01:00
Laurent Destailleur	4f24613de0	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/expensereport/class/expensereport.class.php	2017-02-27 01:19:03 +01:00
Laurent Destailleur	92acbbd8a8	Fix parameters	2017-02-27 00:22:11 +01:00
Laurent Destailleur	63bee0c2d0	Doxygen	2017-02-24 16:23:43 +01:00
Laurent Destailleur	d0ee8c0e2d	Merge pull request #6458 from defrance/patch-83 inverted value between FRST & RECUR	2017-02-24 15:27:32 +01:00
Laurent Destailleur	fb88eaf2a4	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2017-02-23 02:55:50 +01:00
BENKE Charlie	299551f851	inverted value between FRST & RECUR	2017-02-22 15:59:10 +01:00
Laurent Destailleur	a0fb53d5b1	Merge branch 'develop' into NEW_pdf_supplier_payment	2017-02-22 14:20:47 +01:00
Alexandre SPANGARO	942b58efaf	New : Integration of Stripe	2017-02-22 06:33:52 +01:00
Laurent Destailleur	89b52e24f6	Fix menu navigation	2017-02-22 02:41:21 +01:00
Laurent Destailleur	7ab600781d	NEW Move login information on home page into a widget	2017-02-21 11:57:52 +01:00
arnaud	26b8112d4e	FIX travis check	2017-02-20 09:22:57 +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
arnaud	fc0abe659a	NEW PDF with numbertoword	2017-02-17 16:39:36 +01:00
Laurent Destailleur	afa5ef2913	NEW Introduce fields that can be computed during export in export profiles.	2017-02-17 00:19:28 +01:00
Laurent Destailleur	c3d78bf1b4	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/tools/update.php	2017-02-16 22:09:37 +01:00
arnaud	977c18513d	FIX pdf supplier payment work	2017-02-14 12:00:56 +01:00
Laurent Destailleur	f5569ee890	Add tasktime_task_duration_sec tag in odt substitution	2017-02-11 13:50:30 +01:00
Laurent Destailleur	d72e5a3646	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-10 17:34:23 +01:00
Laurent Destailleur	ca67917e80	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/core/modules/modFacture.class.php	2017-02-10 17:33:32 +01:00
arnaud	4230b075c2	INIT pdf supplier payment	2017-02-10 17:28:00 +01:00
Laurent Destailleur	d463511cff	Fix: no way to know type of invoice.	2017-02-10 17:24:47 +01:00
Laurent Destailleur	5d94c8ddac	Merge pull request #6403 from laudeco/feature/expense_report_wrong_placement [FIX] - Expense report on multiple page	2017-02-08 19:34:16 +01:00
Laurent Destailleur	4d16540207	Merge pull request #6393 from aspangaro/6.0-export NEW : [FP17] Accountancy - Add export of charts of accounts	2017-02-08 19:22:26 +01:00
De Coninck Laurent	a042c30b28	fix nex line	2017-02-08 19:00:48 +01:00
Ion	22b85b3aba	Show delay in syslog	2017-02-08 17:30:51 +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	4c3255857c	Fix bad syntax into criteria to filter on date in export. Fix missing type in export of invoices.	2017-02-08 10:45:20 +01:00
De Coninck Laurent	49e6192e62	fix the type width column and the nextY	2017-02-08 09:23:15 +01:00
Alexandre SPANGARO	e4fc52497e	New : [FP17] Accountancy - Add export of charts of accounts	2017-02-08 06:18:56 +01:00
Laurent Destailleur	2d77cb2da5	FIX #6379	2017-02-07 00:54:54 +01:00
Laurent Destailleur	8f52a34e71	Report of supplier payment is name "supplier_payments"	2017-02-06 20:37:42 +01:00
arnaud	7f6ab748c5	NEW add rapport file for supplier paiement	2017-02-03 16:42:06 +01:00
arnaud	6d3e43ddaf	NEW Report page and menu for suppliers paiements	2017-02-03 16:34:14 +01:00
Laurent Destailleur	bdca134e99	NEW Change to allow a specific numbering rule for invoice with POS module.	2017-02-02 23:49:17 +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	c3fb559d3b	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/modules/modProduct.class.php	2017-02-01 20:58:17 +01:00
Laurent Destailleur	5e4509953d	Associated product must be on another export profile	2017-01-29 21:25:29 +01:00
Laurent Destailleur	b4b81d8dcb	Fix css and missing translation key	2017-01-29 15:07:18 +01:00
Laurent Destailleur	70091eceed	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/expensereport/card.php	2017-01-27 01:26:11 +01:00
Laurent Destailleur	0c14e1d233	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-01-27 01:24:55 +01:00
Laurent Destailleur	8a4e957554	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2017-01-27 01:23:44 +01:00
Laurent Destailleur	4c28e1598b	Merge branch '5.0' into 5.0	2017-01-27 00:25:12 +01:00
Laurent Destailleur	053afe21dd	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/user/class/user.class.php	2017-01-26 23:40:16 +01:00
Laurent Destailleur	c1b59b1950	Fix several security bugs on expense report	2017-01-26 18:08:00 +01:00
Laurent Destailleur	c39fcce9f1	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-26 10:45:38 +01:00
Laurent Destailleur	9889f0a4a2	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/core/modules/modProjet.class.php htdocs/filefunc.inc.php	2017-01-26 10:44:50 +01:00
Laurent Destailleur	eac6ac0247	Fix fields into projet export	2017-01-26 10:41:02 +01:00
Ferran Marcet	0df39149c4	Fix: Hidden option not showing correctly	2017-01-25 19:28:20 +01:00
fappels	2be6011069	Fix product elephant verify for service	2017-01-23 20:59:32 +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
Laurent Destailleur	9a5670787f	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-21 12:26:50 +01:00
Laurent Destailleur	809e3ce4d5	Debug browser notification	2017-01-20 20:10:16 +01:00
Laurent Destailleur	0a4b29e1c4	Merge pull request #6284 from atm-gauthier/FIX_pdf_invoice_with_situation Fix pdf invoice with situation	2017-01-20 18:10:24 +01:00
Juanjo Menent	2374aa351e	Merge remote-tracking branch 'upstream/develop' into develop	2017-01-20 15:55:51 +01:00
Laurent Destailleur	412be59f78	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2017-01-20 12:09:39 +01:00
gauthier	a944c82d86	FIX : $progress_width initialized	2017-01-19 09:11:06 +01:00
Laurent Destailleur	227b616ca3	Fix bad default value	2017-01-18 16:51:42 +01:00
Laurent Destailleur	ed98227303	Merge pull request #6292 from marcosgdf/remove-pdf-create-functions NEW Removed deprecated pdf_create functions	2017-01-18 16:48:23 +01:00
Laurent Destailleur	82492dc023	Fix oauth2 token generation for Google. The refresh token was not received.	2017-01-17 20:05:10 +01:00
Laurent Destailleur	16779be162	Fix missing email/multicompany field	2017-01-17 10:51:30 +01:00
Laurent Destailleur	1ded1bd52a	Fix: missing email	2017-01-17 10:34:35 +01:00
Marcos García de La Fuente	8225b06018	NEW Removed commande_pdf_create, contract_pdf_create,expedition_pdf_create, facture_pdf_create, delivery_order_pdf_create, task_pdf_create, project_pdf_create, propale_pdf_create, supplier_invoice_pdf_create, supplier_order_pdf_create, supplier_proposal_pdf_create deprecated functions	2017-01-16 21:59:02 +01:00
Philippe GRAND	2525a6e3a4	update code for next php versions	2017-01-16 17:24:50 +01:00
Laurent Destailleur	1b1bab94ca	More complete commit for #6114	2017-01-16 10:43:22 +01:00
Laurent Destailleur	9d72f1df62	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-16 01:12:11 +01:00
Laurent Destailleur	a07a77e323	Not yet ready for php 7.1	2017-01-16 01:11:38 +01:00
Laurent Destailleur	d95ac3bbdd	Fix warning	2017-01-16 00:16:20 +01:00
Laurent Destailleur	7bccaff28a	Fix remove warnings	2017-01-15 23:32:14 +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
Juanjo Menent	6cc3ef0c99	NEW: Events notifications in browser	2017-01-13 16:08:49 +01:00
gauthier	a90ec7a8c7	FIX : hidetop progression	2017-01-13 14:59:29 +01:00
gauthier	1886e68731	FIX : progress size	2017-01-12 17:07:22 +01:00
gauthier	307c06dfc3	FIX : pdf invoice when we use situation	2017-01-12 16:26:09 +01:00
Laurent Destailleur	9671810d13	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-12 11:33:25 +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	25dcb10c1d	Merge pull request #6066 from atm-florian/dev_exportthirdparty NEW : Can export thirdparty with sale representative that is a subordinate (Need hidden option SOCIETE_EXPORT_SUBORDINATES_CHILDS)	2017-01-12 11:17:15 +01:00
Laurent Destailleur	7476a3c8ae	Fix error during migration	2017-01-12 10:59:27 +01:00
Alexis Algoud	8b4a43ec77	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview	2017-01-09 10:31:05 +01:00
Laurent Destailleur	f00f3101d9	Merge pull request #6013 from aljawaid/develop NEW: Make Top Menu Entries Independent Translation Strings	2017-01-07 20:45:44 +01:00
Laurent Destailleur	9cfc8d4095	Fix several problems into OAuth2 module.	2017-01-06 19:58:46 +01:00
arnaud	b813144edb	NEW generation ODT	2017-01-06 16:44:09 +01:00
Alexis Algoud	370be70e46	Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview	2017-01-03 16:30:50 +01:00
Laurent Destailleur	c635baa848	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/langs/en_US/errors.lang	2017-01-03 01:34:15 +01:00
Laurent Destailleur	157b17b6d5	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 Conflicts: htdocs/filefunc.inc.php htdocs/langs/en_US/errors.lang	2017-01-03 01:31:58 +01:00
Laurent Destailleur	b642a3a602	Prepare release 5.0	2016-12-31 16:35:56 +01:00
Marcos García de La Fuente	47a444b2ab	Merge branch 'develop' into prod-attr	2016-12-27 15:54:53 +01:00
Marcos García de La Fuente	98599b0bbf	FIX #6227 Document models table header "Unit" is shown in 2 lines in Spanish	2016-12-27 12:56:49 +01:00
Laurent Destailleur	bbd3734a21	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/list.php htdocs/filefunc.inc.php	2016-12-26 12:42:23 +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	8ce5ed0192	Fix position of discount on PDF with US letter format	2016-12-23 15:57:31 +01:00
Laurent Destailleur	9948b6d4d9	Merge pull request #6202 from GPCsolutions/supplierpaymentdateexport NEW: Export max payment date with supplier invoices	2016-12-23 00:50:30 +01:00
Laurent Destailleur	594ecf400b	Merge pull request #6196 from aspangaro/5.0-b12 Fix: Travis	2016-12-23 00:44:16 +01:00
Laurent Destailleur	77c320a092	Fix warning for expense report late	2016-12-22 15:33:43 +01:00
Raphaël Doursenaud	590fcf8399	NEW: Export max payment date with supplier invoices	2016-12-20 18:32:57 +01:00
Laurent Destailleur	3c79f3acb5	Minor fixes or code comment	2016-12-20 12:06:26 +01:00
aspangaro	9901aaa9fe	Try to correct travis public underscore problem	2016-12-19 06:34:17 +01:00
Laurent Destailleur	9d3bd9d36f	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/langs/en_US/errors.lang	2016-12-18 11:57:04 +01:00
Laurent Destailleur	0e7da2cd22	FIX Label of project is in field title not label.	2016-12-18 11:55:30 +01:00
Laurent Destailleur	d8e394d3aa	FIX Missing field	2016-12-16 17:09:15 +01:00
Alexis Algoud	79867a85d0	fix list issue	2016-12-16 16:09:02 +01:00
Alexis Algoud	4d375bcf95	debug translate	2016-12-16 11:31:14 +01:00
Alexis Algoud	b7a6a71dff	move file to core	2016-12-15 17:20:46 +01:00
Gustavo Novaro	da7a4a9283	Replace var to public Improve code style	2016-12-15 10:31:46 -03:00
Alexis Algoud	703b8708e3	fix create	2016-12-15 10:39:59 +01:00
florian HENRY	a99ac7fb6b	taking account @eldy remarks	2016-12-13 16:52:49 +01:00
florian HENRY	2f138c0c37	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_exportthirdparty	2016-12-13 16:49:39 +01:00
Maxime Kohlhaas	04ed2df827	Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_modimport_update_option # Conflicts: # htdocs/imports/import.php	2016-12-11 16:20:46 +01:00
Maxime Kohlhaas	4296a2802c	Wrong menu in tab link on user card	2016-12-11 14:27:10 +01:00
Maxime Kohlhaas	5ed041c0cd	Rights should not be given by default	2016-12-11 14:11:28 +01:00
florian HENRY	a797c45e3b	sdf	2016-12-09 16:28:06 +01:00
florian HENRY	101afeeb73	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_exportthirdparty	2016-12-09 16:18:36 +01:00
florian HENRY	1e39805945	integrate Eldy remarks	2016-12-09 16:14:43 +01:00
Laurent Destailleur	455a9ed4da	FIX security in import of files	2016-12-07 12:41:48 +01:00
Laurent Destailleur	db9af0118c	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/modules/modAdherent.class.php	2016-12-06 14:08:43 +01:00
Laurent Destailleur	cfff6a8cb8	FIX Export of opportunity status must be code, not id.	2016-12-06 14:05:43 +01:00
Laurent Destailleur	0d7ab3301b	FIX in export. Error when using a separate extrafields.	2016-12-06 11:52:07 +01:00
Laurent Destailleur	761a795294	Maxi debug on REST APIs	2016-12-05 13:31:29 +01:00
florian HENRY	c1652169f2	NEW : Add in export thirdparty for user limit on view thirpdarty to sales team also to subsidiaries	2016-11-30 16:09:59 +01:00
Alexis Algoud	360c952e5a	FIX column too small, header on 2 lines	2016-11-29 09:50:55 +01:00
Marcos García de La Fuente	91be05932e	Added missing modAttributes file	2016-11-27 21:50:27 +01:00
Laurent Destailleur	ce10dc618c	Merge pull request #6040 from atm-florian/DEV_thirpdarty_extrafields_export_on_contact FIX missing extrafields of thirdparty on contact export	2016-11-27 15:20:14 +01:00
Laurent Destailleur	a8c3ce4e55	FIX A form should not be inside a table. Create javascript troubles.	2016-11-26 12:21:50 +01:00
florian HENRY	8ea49d8887	add extrafields thirdparty on contact export	2016-11-25 10:55:09 +01:00
Laurent Destailleur	5acd09b2d5	Fix require_once instead of require.	2016-11-24 17:03:18 +01:00
Laurent Destailleur	52fac193ad	MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE does not works as it needs the add contact manually. Quick hack added to use the creator instead.	2016-11-23 11:50:01 +01:00
IJ	9f28795159	Add Unique Top Menu Translation Add unique top menu translation for products/services so it can be better translated separately from other words/links using the same text. ** Requires re-enabling module	2016-11-19 11:29:35 +00: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
Laurent Destailleur	ad981a0f07	FIX the key for getEntity was different for same element.	2016-11-18 12:54:08 +01:00
Laurent Destailleur	d197a0e0aa	NEW Can create expense report for someone else (advanced permission) NEW Can clone an expense report	2016-11-13 22:01:22 +01:00
Laurent Destailleur	ee14eab802	Multi devise	2016-11-13 18:47:10 +01:00
Laurent Destailleur	0f1b34f556	Fix code unreachable	2016-11-13 18:17:49 +01:00
Laurent Destailleur	fe1c83b206	Fix code not reachable	2016-11-13 18:15:31 +01:00
Maxime Kohlhaas	edef8f883b	Add update option on product module	2016-11-13 09:40:09 +01:00
Maxime Kohlhaas	1dcecf4873	Fix select and update done check	2016-11-13 09:32:43 +01:00
Maxime Kohlhaas	5f704fe5e5	Import update, new way of working with a select	2016-11-13 09:03:34 +01:00
Maxime Kohlhaas	d18adc1231	Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_modimport_update_option	2016-11-12 09:02:35 +01:00
aspangaro	c65678d00a	Update cactus numbering model	2016-11-11 07:36:26 +01:00
aspangaro	60219fa84d	Update tulip model	2016-11-11 07:06:45 +01:00
Laurent Destailleur	52080fb917	Fix code not reachable	2016-11-08 20:06:50 +01:00
Laurent Destailleur	18d1878775	Debug accountancy module	2016-11-06 13:07:49 +01:00
Maxime Kohlhaas	e5418a7624	Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_modimport_update_option	2016-11-06 11:36:08 +01:00
BENKE Charlie	7be49e47b8	indenting and little refactoring	2016-11-01 17:09:51 +01:00
Laurent Destailleur	03b882d095	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/list.php	2016-10-29 19:12:58 +02:00
Laurent Destailleur	17c1b3f1d2	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 Conflicts: htdocs/fourn/class/fournisseur.commande.class.php	2016-10-29 19:00:43 +02:00
Laurent Destailleur	78eaeab168	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9	2016-10-29 18:44:55 +02:00
Maxime Kohlhaas	be493fcf09	Fix bad parameter in hook call	2016-10-28 10:16:58 +02:00
Laurent Destailleur	27808b7f81	Merge pull request #5915 from aspangaro/5.0-p29 NEW Expense report documents are now available in ECM module	2016-10-26 10:57:23 +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
phf	3e2f39fbc0	Fix on first activate module it must create if needed the first currency rate from general settings	2016-10-25 13:31:36 +02:00
aspangaro	d0544b0aea	Merge remote-tracking branch 'Upstream/develop' into 5.0-p29	2016-10-24 05:27:49 +02:00
aspangaro	337e9db046	New: Expense report documents are now available in ECM module	2016-10-24 05:26:19 +02:00
Laurent Destailleur	ffcfe30529	FIX Avoid errors on debian	2016-10-22 16:51:54 +02:00
florian HENRY	5f3eb9097e	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_resource_extrafields	2016-10-21 13:51:53 +02:00
Laurent Destailleur	c4dd689b08	Clean unreachable code	2016-10-21 11:53:41 +02:00
florian HENRY	54a154fa4f	NEW : Add ressource extrafields	2016-10-19 22:14:51 +02:00
Laurent Destailleur	28933c31dd	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php htdocs/projet/card.php	2016-10-16 19:04:33 +02:00
Laurent Destailleur	2db38b4bcc	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 Conflicts: htdocs/categories/class/categorie.class.php htdocs/societe/list.php	2016-10-16 19:02:36 +02:00
Laurent Destailleur	b51b6fa8c8	Merge pull request #5865 from atm-florian/develop NEW : Export thirdparty with payement terms and mode	2016-10-15 02:18:07 +02:00
Laurent Destailleur	4fb66cf7a4	Better explanation for ftp module setup to avoid error with FTPS/SFTP.	2016-10-15 02:11:49 +02:00
Laurent Destailleur	78182ab504	Fix sepa mandate translation	2016-10-14 17:47:05 +02:00
florian HENRY	0b78f7f101	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop	2016-10-14 10:05:28 +02:00
Sergio Sanchis Climent	567f7e5365	FIX: #5340	2016-10-14 00:43:10 +02:00
Laurent Destailleur	7c1b74133a	Debug accountancy module	2016-10-13 22:29:49 +02:00
florian HENRY	4e34b6e0c6	Merge remote-tracking branch 'origin/develop' into develop	2016-10-12 19:00:32 +02:00
florian HENRY	cc28391944	NEW : Export thirdparty with payement terms and mode	2016-10-12 18:59:34 +02:00
Laurent Destailleur	ba52eb870c	Enhancement of Oauth module	2016-10-07 18:43:44 +02:00
Laurent Destailleur	03876ba637	Merge pull request #5773 from atm-gauthier/NEW_reopen_bills_is_a_distinct_right NEW : Reopen a paid bill is a user right	2016-10-07 13:31:10 +02:00
Laurent Destailleur	c982409c72	Fix a deadlock feature	2016-10-06 15:29:10 +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
Maxime Kohlhaas	c4b9692575	Missing comment	2016-10-03 09:46:31 +02:00
Maxime Kohlhaas	51d5de2e22	Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_modimport_update_option	2016-10-03 01:07:04 +02:00
Laurent Destailleur	a192045be2	FIX PHPCS	2016-10-03 00:47:11 +02:00
Laurent Destailleur	45a808e034	NEW Generation of document is available on member card	2016-10-03 00:08:47 +02:00
Laurent Destailleur	51df25509e	Fix conflicts on default doc template when enabling/disabling modules	2016-10-02 20:00:57 +02:00
Maxime Kohlhaas	578cab9a70	Error management + show nb insert/update + langs	2016-10-02 19:14:28 +02:00
Laurent Destailleur	f92ca518f7	Uniformize look and feel	2016-10-02 16:38:58 +02:00
Laurent Destailleur	3efa0e411d	NEW Add a direct debit mandate PDF template.	2016-10-02 15:29:43 +02:00
Laurent Destailleur	a52ad545eb	Enhancement on module Direct Debit SEPA.	2016-10-02 13:03:45 +02:00
Laurent Destailleur	e3aa84ff5a	NEW Add last activation date as info in module list.	2016-10-02 10:41:22 +02:00
Laurent Destailleur	2668cb20cc	Work on SEPA mandate	2016-10-01 20:45:50 +02:00
Laurent Destailleur	c9792ff047	Fix translation	2016-10-01 20:12:00 +02:00
Laurent Destailleur	5a1e96b598	FIX #5823 better multicompany support for member module	2016-10-01 18:55:37 +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	521008a698	FIX #5746 chrome php Try a fix. Not sure it solved all problems reported	2016-10-01 17:27:52 +02:00
Laurent Destailleur	d079247b2b	FIX #5813 Bug: Incoterms not being read correctly	2016-10-01 13:32:24 +02:00
Laurent Destailleur	d9ff53eb7f	Fix travis errors	2016-09-30 15:22:58 +02:00
Laurent Destailleur	287f9972a8	Merge branch 'new_no_default_rights' of https://github.com/atm-maxime/dolibarr into atm-maxime-new_no_default_rights Conflicts: htdocs/langs/en_US/admin.lang	2016-09-30 13:04:14 +02:00
Laurent Destailleur	94dbe3da3f	Fix the info if module are provided by module or not was wrong	2016-09-30 13:02:13 +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	214dc2cba0	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2016-09-29 10:49:00 +02:00
Laurent Destailleur	0b49d6316e	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9	2016-09-29 10:48:14 +02:00
gauthier	03d126810c	FIX : "reopen " new right must respect advanced user rights management	2016-09-29 10:15:34 +02:00
Laurent Destailleur	4702fdc8d7	Merge pull request #5805 from simnandez/develop New: Add thirdparty extrafields to export thirdparty categories	2016-09-28 20:25:04 +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	bfd5bb37c5	Code comment	2016-09-28 18:07:31 +02:00
Juanjo Menent	b99b97573d	New: Add thirdparty extrafields to export thirdparty categories	2016-09-28 10:53:22 +02:00
Juanjo Menent	30050b51f0	FIX: Failed to export contact categories with contact extra fields	2016-09-28 10:15:41 +02:00
gauthier	ad03bdf3b9	FIX : reopen invoice is an advanced right and default value is 1	2016-09-26 17:39:46 +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
gauthier	7ad2fda289	NEW : Reopen a paid bill is a user right	2016-09-22 15:06:39 +02:00
Laurent Destailleur	f1166f1898	Fix warning	2016-09-22 13:00:02 +02:00
Laurent Destailleur	d598e206cd	Fix warning	2016-09-22 12:56:48 +02:00
Laurent Destailleur	619b65e0b6	Fix warning	2016-09-22 11:06:39 +02:00
Laurent Destailleur	95f2cae825	Start to work on sepa mandate generation	2016-09-19 00:26:30 +02:00
Laurent Destailleur	5ea9fc7467	NEW Support extrafields on product lot.	2016-09-12 17:27:44 +02:00
Laurent Destailleur	03c312e35c	Fix bad name for modules_action.php	2016-09-10 16:09:46 +02:00
Laurent Destailleur	858291c3a3	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-09-09 09:32:51 +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
Laurent Destailleur	417b2f566f	FIX Translation of "Name" is not a good choice for floow-up.	2016-09-08 17:31:42 +02:00
Raphaël Doursenaud	d89a877a00	Added the new familyinfo property from 4.0.0	2016-09-08 16:58:01 +02:00
Raphaël Doursenaud	f97f011cd3	Added missing properties in modules class. Enhanced modules class documentation.	2016-09-08 16:37:48 +02:00
Raphaël Doursenaud	4126928804	Fixed code discrepancy Most places and samples used editor_url so I opted for that.	2016-09-08 16:37:45 +02:00
Laurent Destailleur	5aaa3028a2	FIX Better position of fields in expense report PDF.	2016-09-07 01:47:09 +02:00
Laurent Destailleur	cc9230c07f	FIX Columns truncated and translation missing	2016-09-06 13:08:49 +02:00
Laurent Destailleur	8419202588	NEW Support free bottom text and watermark on expense report template	2016-09-06 12:47:18 +02:00
Laurent Destailleur	571aae7026	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-09-02 21:52:20 +02:00
Laurent Destailleur	0e4b4ee321	Merge branch 'develop-external-logging' of https://github.com/GPCsolutions/dolibarr into GPCsolutions-develop-external-logging Conflicts: composer.json	2016-09-02 21:51:25 +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	e62299d67e	NEW Add date into list of print jobs for Google Print.	2016-08-31 14:36:08 +02:00
Laurent Destailleur	524dd79198	Merge remote-tracking branch 'origin/4.0' into develop Conflicts: htdocs/compta/bank/search.php htdocs/core/class/html.form.class.php htdocs/filefunc.inc.php htdocs/projet/tasks/time.php	2016-08-31 00:16:07 +02:00
aspangaro	b5f093436e	NEW: Move Expense report menu from module to menu files (Again)	2016-08-30 21:43:17 +02:00
Laurent Destailleur	6ddd264178	Fix not used field	2016-08-28 17:45:20 +02:00
Laurent Destailleur	fac28f9589	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/commande/card.php htdocs/compta/facture.php htdocs/compta/sociales/charges.php htdocs/core/boxes/modules_boxes.php htdocs/core/class/commonobject.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/commande/card.php htdocs/fourn/facture/card.php	2016-08-28 02:40:20 +02:00
Maxime Kohlhaas	5b9acef10c	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_modimport_update_option	2016-08-23 10:51:00 +02:00
Maxime Kohlhaas	e6411dd246	Start work to allow updates in import module	2016-08-22 12:25:03 +02:00
Laurent Destailleur	1fc5715040	Fix date of contract not used	2016-08-20 00:30:09 +02:00
Laurent Destailleur	69e6f6a489	Merge pull request #5608 from aspangaro/4.0-p40 Fix: Some problems on export with language	2016-08-17 15:54:36 +02:00
Laurent Destailleur	ba8c2dbf9f	Fix order of module for demo.	2016-08-17 11:39:11 +02:00
Laurent Destailleur	47489265b1	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0	2016-08-17 11:15:30 +02:00
Raphaël Doursenaud	49cb61b530	CLOSE #5627 Allowed external logging modules. Removed Sentry logging.	2016-08-16 03:24:04 +02:00
Laurent Destailleur	7cc7ac5485	Fix translation	2016-08-11 17:41:09 +02:00
aspangaro	26df66f9ac	Fix: Missing language file for salaries export	2016-08-10 15:11:51 +02:00
aspangaro	4e39c41215	Fix: Typo on invoice export	2016-08-10 15:07:53 +02:00
aspangaro	cdd84244b2	Fix: Missing Language file and key for category contact export	2016-08-10 14:48:26 +02:00
aspangaro	8028b77966	Fix: MIssing language file for category members export	2016-08-10 14:39:51 +02:00
aspangaro	c442ff0d2b	Fix: Missing language file for user export when the module members is on	2016-08-10 14:29:19 +02:00
aspangaro	43ffb061ef	FIX : Accountancy - BANK_DISABLE_DIRECT_INPUT Add an option	2016-08-10 08:07:27 +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	2133b1c3b5	NEW Table with list of lots/serial can be viewed (module product batch).	2016-08-08 20:31:03 +02:00
Laurent Destailleur	782ab6a02b	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 Conflicts: htdocs/core/modules/barcode/modules_barcode.class.php htdocs/product/admin/product.php	2016-08-05 00:42:40 +02:00
Laurent Destailleur	5126786d60	NEW Add option SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED	2016-08-04 15:48:34 +02:00
Laurent Destailleur	d688681605	Use standard prefix for supplier order for new install	2016-08-04 15:45:55 +02:00
florian HENRY	5144f21c6c	FIX php Strict	2016-08-02 15:36:00 +02:00
Laurent Destailleur	4a1e263e68	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-08-01 15:19:25 +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	97dd1f4bbb	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 Conflicts: htdocs/core/modules/expedition/doc/pdf_rouget.modules.php htdocs/filefunc.inc.php	2016-08-01 15:03:59 +02:00
Laurent Destailleur	803fe68061	Merge remote-tracking branch 'origin/3.8' into 3.9 Conflicts: htdocs/compta/facture.php htdocs/core/modules/expedition/doc/pdf_rouget.modules.php htdocs/filefunc.inc.php	2016-08-01 15:01:14 +02:00
Laurent Destailleur	49258db58d	NEW Option DOC_SHOW_FIRST_SALES_REP shows name of buyer or saler on PDF.	2016-08-01 14:20:41 +02:00
Laurent Destailleur	edbd92ee3e	NEW Option SUPPLIER_ORDER_SHOW_FIRST_SALES_REP shows name of buyer on PO	2016-08-01 11:16:22 +02:00
Laurent Destailleur	0414f09e48	Fix permissions	2016-07-30 21:09:30 +02:00
Laurent Destailleur	ceb6199e87	Fix default numbering module of customer code was not enabled.	2016-07-30 12:31:32 +02:00
Laurent Destailleur	45d354ad82	Fix variable names MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN...	2016-07-29 22:58:39 +02:00
Laurent Destailleur	eafaa6f4dd	Fix doxygen	2016-07-29 17:30:33 +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	27243069cb	FIX #5535 bad dependency. Conflicts: htdocs/fourn/facture/list.php	2016-07-29 15:19:04 +02:00
Sergio Sanchis Climent	2a4afb8195	FIX Notice: Trying to get property of non-object when update 3.9 -> 4.0	2016-07-29 15:13:12 +02:00
Laurent Destailleur	5d97ce038b	Fix page break when using a large html footer.	2016-07-28 23:58:13 +02:00
florian HENRY	7b72965315	FIX incoterms	2016-07-28 16:48:16 +02:00
florian HENRY	c13c15188b	FIX: incoterms do not output into crabe invoice PDF	2016-07-28 16:44:08 +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
Laurent Destailleur	889b15689b	FIX #5510	2016-07-27 19:42:09 +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	799226728d	Fix default rule for margin is choice 3: so cost price, then pmp if not defined, then bestu supplier price if not defined	2016-07-27 18:05:44 +02:00
Laurent Destailleur	c23fe43b62	Merge pull request #5556 from olsesacl/#5516 FIX #5516 PHP7 warning on supplier module's invoices configuration page	2016-07-27 11:15:21 +02:00
Laurent Destailleur	198adcf440	Merge pull request #5555 from olsesacl/#5515 FIX #5515 PHP7 warnings on project module's configuration page	2016-07-27 11:14:50 +02:00
Laurent Destailleur	51566970ce	Merge pull request #5554 from olsesacl/#5514 FIX #5514 PHP7 Warning on barcode module's configuration page	2016-07-27 11:13:49 +02:00
Maxime Kohlhaas	34b4d0225e	Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_modimport_update_option	2016-07-27 09:13:29 +02:00
Sergio Sanchis Climent	227c6906a8	FIX #5516	2016-07-26 23:26:29 +02:00
Sergio Sanchis Climent	3b57727542	PHP7 warnings on project module's configuration page	2016-07-26 22:22:55 +02:00
Sergio Sanchis Climent	c9fa12a8f9	PHP7 Warning on barcode module's configuration page	2016-07-26 22:09:06 +02:00
Sergio Sanchis Climent	7eed738fce	Fix: Accessing Direct Printing Jobs clears left menu	2016-07-26 21:53:03 +02:00
Laurent Destailleur	6d0ebbc4a3	Merge pull request #5424 from atm-florian/dev_fix5353 NEW #5353 IBAN and BIC should be now always mandatory for all country regarding accounting managment	2016-07-26 15:57:56 +02:00
Laurent Destailleur	a1c959e9d6	Merge pull request #5536 from defrance/patch-17 NEW add edition feature on action/agenda element	2016-07-26 15:29:45 +02:00
Laurent Destailleur	a3d0c01b68	Fix warning	2016-07-26 13:51:13 +02:00
florian HENRY	419dd3095b	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_fix5353 Conflicts: htdocs/societe/class/societe.class.php	2016-07-26 08:59:40 +02:00
BENKE Charlie	e948002353	New : edition feature on action/agenda	2016-07-25 11:21:00 +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	1624894346	Fix missing load	2016-07-21 19:35:45 +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	adc9c28369	Merge pull request #5336 from atm-gauthier/develop_new_add_dorade_model New: Develop new add dorade model	2016-07-20 18:31:47 +02:00
Laurent Destailleur	e2a03d18dd	Merge remote-tracking branch 'origin/4.0' into develop	2016-07-16 19:58:36 +02:00
Laurent Destailleur	553981426e	Several minor fixes in expense reports	2016-07-16 15:21:38 +02:00
Laurent Destailleur	68227d91d9	FIX after enabling module expense report, the document template is not active by default.	2016-07-16 14:14:28 +02:00
Laurent Destailleur	7263b29cb4	Merge pull request #5301 from atm-ph/fix_develop_issue_2858 NEW issue 2858 - Option to allow negative transfer	2016-07-15 18:15:20 +02:00
Laurent Destailleur	9512bf1ac7	Add phpunit tests for option USE_STRICT_CSV_RULES	2016-07-15 12:30:24 +02:00
Laurent Destailleur	f7f812e11c	Merge pull request #5269 from defrance/patch-5 NEW Add option to generate strict CSV. Currently if \n or \r we replaced chars, now we can addquote too	2016-07-15 11:27:02 +02:00
Laurent Destailleur	3722274029	Merge pull request #5317 from atm-gauthier/develop_add_restrictions_on_exports Develop add restrictions on exports	2016-07-14 20:08:59 +02:00
Laurent Destailleur	a5123c06db	Save the virtualhost so we can test without entering it each time.	2016-07-14 19:42:04 +02:00
Laurent Destailleur	490336b2e8	Fix bad dependency.	2016-07-12 20:07:53 +02:00
Laurent Destailleur	56e374ff0d	Fix remove warnings	2016-07-07 15:41:11 +02:00
florian HENRY	1bb28648c4	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_fix5353 Conflicts: build/pad/DoliWamp.pml build/pad/Dolibarr.pml build/pad/pad_dolibarr.xml build/pad/pad_doliwamp.xml	2016-07-07 09:05:13 +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
Maxime Kohlhaas	d658e2cf31	FIX task ODT company object not correctly retrieved	2016-07-05 16:04:18 +02:00
florian HENRY	1d96f5316e	travis	2016-07-05 15:14:28 +02:00
florian HENRY	afb924043f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_fix5353 Conflicts: htdocs/core/modules/mailings/advthirdparties.modules.php	2016-07-04 20:43:14 +02:00
Maxime Kohlhaas	142aedc0cd	CSV import : listfields and listvalues are now arrays	2016-07-03 11:15:28 +02:00
Maxime Kohlhaas	de62e4cdb8	CSV import : refactor SQL insert construction	2016-07-03 11:11:43 +02:00
Laurent Destailleur	3d72f788b9	Fix phpcs	2016-07-02 18:02:39 +02:00
Laurent Destailleur	fe86ef5774	Thirdparty into keyword, encoded with convToOutputCharset	2016-07-02 17:00:45 +02:00
Laurent Destailleur	7d9671f6d3	Fix bad separator in url	2016-07-02 11:44:46 +02:00
Laurent Destailleur	3eaf0bc4bf	Fix bad translation	2016-07-02 11:32:06 +02:00
Laurent Destailleur	59f86a12d2	Fix delete of documents generated on project. Fix missin translation	2016-07-01 17:49:13 +02:00
florian HENRY	9bbde79755	fix travis	2016-07-01 15:09:28 +02:00
Laurent Destailleur	5713d293e3	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/core/lib/pdf.lib.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php	2016-07-01 03:22:16 +02:00
Laurent Destailleur	625213580c	Merge remote-tracking branch 'origin/3.8' into 3.9 Conflicts: htdocs/core/lib/pdf.lib.php	2016-07-01 03:17:20 +02:00
Laurent Destailleur	f3821c30f3	Merge pull request #5412 from atm-florian/dev_compta Dev compta	2016-06-30 21:58:45 +02:00
florian HENRY	37ee64ae9b	fix 4672	2016-06-30 17:10:06 +02:00
phf	8c133d8546	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_develop_issue_2858 Conflicts: htdocs/core/class/ldap.class.php	2016-06-30 17:09:22 +02:00
Alexis Algoud	22bc44620b	FIX #5170 tva sign with INVOICE_POSITIVE_CREDIT_NOTE option	2016-06-30 14:27:58 +02:00
florian HENRY	ea3e851ec0	Fix stuff in accoutancy	2016-06-29 16:54:37 +02:00
Laurent Destailleur	9ebf7a1e35	Try to fix the group_concat function for pgsql.	2016-06-25 02:21:54 +02:00
Laurent Destailleur	2767df2e01	FIX Solve problem of sending joinded files of another email when several tabs are opened on form to send emails.	2016-06-24 16:10:52 +02:00
gauthier	1233c44333	FIX : hidden configuration on pdf rouget for amount ht display to avoid using new model	2016-06-24 12:39:54 +02:00
Laurent Destailleur	453c6264bf	FIX: Hidden option EXPORTTOOL_CATEGORIES was not working correctly	2016-06-24 02:19:41 +02:00
Laurent Destailleur	2e4c6597d8	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/core/modules/expensereport/doc/pdf_standard.modules.php	2016-06-23 21:05:00 +02:00
Laurent Destailleur	f6119cfee8	Merge remote-tracking branch 'origin/3.8' into 3.9 Conflicts: htdocs/core/modules/expensereport/doc/pdf_standard.modules.php	2016-06-23 21:03:08 +02:00
Laurent Destailleur	d0f03d9ff6	Merge pull request #5376 from atm-florian/develop FIX php warning method declaration	2016-06-23 10:02:13 +02:00
Laurent Destailleur	00749b2a65	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/imports/import.php htdocs/includes/odtphp/odf.php htdocs/product/stock/product.php htdocs/projet/list.php	2016-06-22 20:22:22 +02:00
florian HENRY	c34ef410e8	FIX php warning method declaration	2016-06-20 15:50:00 +02:00
Laurent Destailleur	386b19d4b1	Fix regression. Add hidden option PROPAL_DISABLE_SIGNATURE to restore old behaviour.	2016-06-19 17:56:34 +02:00
Laurent Destailleur	4382f2a437	Clean language files	2016-06-18 11:06:11 +02:00
Laurent Destailleur	5b5b7a2bf9	FIX Bad value used for task warning delay FIX Compatibility datee and date_end for warning of tasks	2016-06-15 14:05:48 +02:00
gauthier	e6dabb0422	NEW : "dorade" expedition model with unit price ht and total ht	2016-06-10 12:02:57 +02:00
root	b3d58e9510	FIX large expense note	2016-06-08 14:36:52 +02:00
Laurent Destailleur	9019576394	Fix css class opacitymedium was not used everywhere.	2016-06-07 15:58:02 +02:00
gauthier	2aa688e6f2	NEW : tests for LEFT JOIN	2016-06-07 09:39:48 +02:00
gauthier	ff605a4cff	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_add_restrictions_on_exports	2016-06-06 17:51:51 +02:00
gauthier	a2df6dc59f	NEW : add restrictions on standard exports (agenda, order, deplacement, facture, fournisseur)	2016-06-06 17:51:39 +02:00
gauthier	85740a618e	NEW : add restrictions on standard exports (societe, propal, expedition)	2016-06-06 16:21:05 +02:00
Laurent Destailleur	47308d27c3	Missing column import_key and import for vat payments	2016-06-06 14:37:06 +02:00
Laurent Destailleur	1f93425193	Merge pull request #5308 from atm-maxime/develop FIX #5044	2016-06-06 13:35:59 +02:00
Laurent Destailleur	52fefc2d02	Debug module resource	2016-06-06 13:14:05 +02:00
Maxime Kohlhaas	caaffdb0c3	FIX #5044	2016-06-05 02:54:25 +02:00
Laurent Destailleur	293c8e145a	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/fourn/commande/card.php htdocs/imports/import.php htdocs/langs/en_US/admin.lang	2016-06-05 02:20:27 +02:00
BENKE Charlie	7cd8e270cc	Update export_csv.modules.php	2016-06-04 19:25:32 +02:00
BENKE Charlie	2f36611cad	Update export_csv.modules.php	2016-06-04 19:22:15 +02:00
phf	c62a69ccc8	Merge branch 'fix_3.7_issue_2858' into develop	2016-06-04 18:54:55 +02:00
phf	3cbbdf5e20	Fix #2858	2016-06-04 18:23:22 +02:00
phf	01b881a0a6	Fix builddoc with odt lost value of extrafields as "sellist" on view card	2016-06-04 13:24:42 +02:00
Maxime Kohlhaas	857454a28d	For each module, no default permission on activation	2016-06-04 12:16:30 +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
Laurent Destailleur	085fa6902b	Merge remote-tracking branch 'origin/3.8' into 3.9 Conflicts: htdocs/contrat/list.php htdocs/fourn/ajax/getSupplierPrices.php	2016-06-04 00:58:16 +02:00
BENKE Charlie	2a8f17bc40	Update export_csv.modules.php	2016-06-03 23:58:37 +02:00
BENKE Charlie	41856a920e	if \n or \r we addquote too	2016-06-03 23:41:32 +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	028ff5e84c	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/fourn/facture/card.php htdocs/langs/en_US/products.lang htdocs/societe/list.php	2016-06-01 17:59:50 +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	ed05321438	comment don't need to be updated	2016-05-31 23:24:35 +02:00
Florian HENRY	3c42a32690	FIX: #5151	2016-05-31 23:22:15 +02:00
Laurent Destailleur	ed148f70b3	FIX Filter on assigned to was preselected on current user on list "All events" (instead of no filtering)	2016-05-30 18:12:27 +02:00
Laurent Destailleur	3ddf427ff1	FIX Legal issue for GB. Add hidden option for this.	2016-05-30 00:52:16 +02:00
gauthier	1ce91bac06	FIX : same page added several times on mergepropal option	2016-05-25 11:25:19 +02:00
Laurent Destailleur	b476153b8b	Move POS at end of top menu	2016-05-25 00:02:48 +02:00
Laurent Destailleur	7935967c62	Fix duplicate translation key	2016-05-21 12:30:58 +02:00
Laurent Destailleur	b1bd6b5d6e	Fix regression	2016-05-18 18:23:38 +02:00
Laurent Destailleur	cf8c180fa4	Fix perm and CRLF	2016-05-18 16:26:15 +02:00
Laurent Destailleur	f3cd4b3ee8	Fix doxygen	2016-05-18 14:43:56 +02:00
florian HENRY	4e98f57385	FIX : php strict warning	2016-05-17 09:02:22 +02:00
Laurent Destailleur	55e904bc01	Debug for expert accounting module	2016-05-12 20:45:05 +02:00
Laurent Destailleur	c8d98dbfdc	FIX error reported by scrutinizer	2016-05-08 11:33:46 +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	816dda5a8b	Merge pull request #5158 from aspangaro/4.0-p29 FIX: Accountancy - Little fix et add page to assign massively the category	2016-05-05 22:52:20 +02:00
Laurent Destailleur	d50e9cde34	Merge pull request #5090 from atm-maxime/fix_pdffoot_details PDF foot details	2016-05-05 21:09:46 +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
aspangaro	7749425468	Modify right to access on chart of accounts	2016-05-02 20:02:45 +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
Laurent Destailleur	b434dad21a	Fix: remove a debug code	2016-04-29 18:34:56 +02:00
Laurent Destailleur	cea1c06f7d	Merge pull request #4764 from benlo06/fr_4763 FR4763 add possibility to export contacts/thirdparty categories	2016-04-29 18:33:58 +02:00
Sergio Sanchis Climent	61fda99fc5	FIX Bug insert cronjobs in modules, default values	2016-04-29 01:13:10 +02:00
Maxime Kohlhaas	02aa3f5688	Debug double conf	2016-04-24 12:14:03 +02:00
Maxime Kohlhaas	651213123f	Oups missing $conf	2016-04-23 17:45:38 +02:00
Maxime Kohlhaas	930b4a9be0	New var name	2016-04-23 17:36:55 +02:00
Maxime Kohlhaas	ad26fb2824	New option to show details in pdf page foot	2016-04-23 17:23:44 +02:00
Laurent Destailleur	5bfc65676c	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: ChangeLog htdocs/commande/class/commande.class.php htdocs/filefunc.inc.php htdocs/theme/eldy/style.css.php	2016-04-22 21:02:20 +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
Laurent Destailleur	63d04f4f2d	Merge pull request #5066 from atm-maxime/fix_thirdparty_instead_client Fix order creation bug because of ->client	2016-04-22 19:20:48 +02:00
Laurent Destailleur	bfc5be1aad	FIX Fix and move dolGetFirstLine function into main FIX Hang on ->client not defined	2016-04-22 19:07:32 +02:00
Laurent Destailleur	c939273fd5	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-04-22 13:38:56 +02:00
Laurent Destailleur	78d18185e4	Several css enhancements	2016-04-22 11:11:08 +02:00
Laurent Destailleur	a10d97cce0	NEW Can filter on status employee when building emailing from users	2016-04-22 11:09:31 +02:00
Maxime Kohlhaas	e881701968	Fix pdf generation with thirdparty	2016-04-22 09:46:47 +02:00
aspangaro	24fddaa039	Hidden old functions	2016-04-22 06:58:18 +02:00
Frédéric FRANCE	fd9fb505b9	Update printgcp.modules.php	2016-04-21 07:53:22 +02:00
Frédéric FRANCE	e1d55d280e	Update printgcp.modules.php	2016-04-20 22:29:27 +02:00
Fixit Management	c3a5a7aab8	Rollback modification in this file	2016-04-19 12:54:46 +02:00
Fixit Management	ee9f1f32c1	Update conf	2016-04-19 12:43:50 +02:00
Fixit Management	5778ba0bd8	Merge remote-tracking branch 'upstream/develop' into fr_4763	2016-04-19 12:31:05 +02:00
Marcos García de La Fuente	e2c86d3fd8	NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead	2016-04-17 15:24:22 +02:00
Juanjo Menent	b5f7f962cc	FIX Travis fails	2016-04-15 16:05:47 +02:00
Laurent Destailleur	8d46d76f96	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/fourn/facture/paiement.php	2016-04-12 15:05:18 +02:00
Laurent Destailleur	357877b1fe	Debug multicurrency and clean properties of some modules	2016-04-12 14:45:59 +02:00
Laurent Destailleur	b60e90a7b7	NEW A module can add, into its import profiles, a sql request to execute at end of import. This allow to update dernormalized data after import.	2016-04-11 18:08:03 +02:00
Laurent Destailleur	3678e05270	Mutualize code by moving getter into parent class.	2016-04-11 16:36:00 +02:00
Laurent Destailleur	03f43d7c55	Removed a TODO by moving detection of line of records of a file to import into the import driver.	2016-04-11 15:19:58 +02:00
Laurent Destailleur	0e7fb80a34	FIX: We should be able to import value '0'	2016-04-11 14:56:42 +02:00
Laurent Destailleur	695cccca1c	Import wizard accept both id or ref into imported fields. But if the ref is numeric, there is no way to know if it is a ref or id. So i introduct support of syntax id: or ref: into value of field to import to force type.	2016-04-11 14:44:14 +02:00
Laurent Destailleur	b16d9a88d5	Fix regression after renaming vars	2016-04-09 19:03:34 +02:00
Laurent Destailleur	83644dcb93	Fix errors reported by scrutinizer	2016-04-09 15:38:15 +02:00
Laurent Destailleur	f2f672a801	FIX variable outpulang not defined	2016-04-09 15:14:27 +02:00
Scrutinizer Auto-Fixer	c2243909e9	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2016-04-09 13:07:33 +00: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	1b04eabf1f	Merge log with events tabs	2016-04-08 14:28:49 +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
Raphaël Doursenaud	9d6efde935	Prevent sentry logging error with 3.9 update Since we don't ship the required libraries anymore, if the module had been enabled before upgrade, the code was failing making Dolibarr totally unusable. Mitigated the issue by disabling sentry logging if the required libraries are unavailable.	2016-04-07 17:16:42 +02:00
Laurent Destailleur	ee53a8b1a8	NEW Can filter modules on publisher	2016-04-06 16:45:22 +02:00
Laurent Destailleur	a43a0a3f4c	Debug module loan and disable non working features	2016-04-06 11:21:55 +02:00
Laurent Destailleur	f9d7c27bd2	FIX Export must use a left join to not loose lines	2016-04-05 17:17:40 +02:00
Laurent Destailleur	dd87195a07	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9	2016-04-05 17:11:54 +02:00
Laurent Destailleur	ed0ab05b93	FIX Damn, where was the project ref ?	2016-04-05 17:11:44 +02:00
Juanjo Menent	10df0e33d4	Merge pull request #4896 from grandoc/3.9 fix a lot of beug	2016-04-05 16:49:22 +02:00
Laurent Destailleur	2d102d3132	Bad translation key	2016-04-05 10:24:28 +02:00
Laurent Destailleur	6c87dfafae	FIX Bad translation key	2016-04-05 10:12:03 +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	cab1c0f5cd	Merge pull request #4886 from apachler/develop Added functionality to get project customer contact as contact_xx tags	2016-04-04 00:11:19 +02:00
Juanjo Menent	e8b2d6baab	NEW #3510 : Working	2016-04-03 12:22:18 +02:00
Juanjo Menent	9d189b3c04	NEW #3510 : Working	2016-04-03 12:14:51 +02:00
Juanjo Menent	d55d12baeb	NEW #3510 : Working	2016-04-03 11:56:31 +02:00
Florian HENRY	0ab40f11be	Merge branch 'develop' into develop_advtargetemailiing	2016-04-03 11:29:17 +02:00
Laurent Destailleur	10f639507f	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/core/lib/files.lib.php	2016-04-02 15:54:51 +02:00
Florian HENRY	038b928ea4	fix travis	2016-04-01 17:09:03 +02:00
Florian HENRY	ae51321040	Debug Advance target emailing	2016-04-01 14:30:02 +02:00
Florian HENRY	304aab957b	Start implement advance arget emalaing	2016-04-01 10:52:19 +02:00
Laurent Destailleur	a47accb1c3	FIX PMP is deprecated at warehouse level	2016-03-30 18:08:08 +02:00
Andreas Pachler	7eded39e28	Reworked functionality to get project contact as contact_xx tags	2016-03-30 08:34:32 +02:00
Laurent Destailleur	6188c3fced	NEW Introduce a predefined job to run database backup	2016-03-29 14:52:27 +02:00
philippe grand	b3285996dc	fix travis issue from commit 139dc9a7	2016-03-26 12:39:08 +01:00
Laurent Destailleur	aab7575528	FIX Problem when disabling module product or service. They both include same boxes, we must not disable box if the other is still active	2016-03-26 12:28:31 +01:00
philippe grand	08970e67d7	fix a lot of beug	2016-03-25 18:16:58 +01:00
Laurent Destailleur	6aba69c69c	Merge pull request #4885 from aspangaro/4.0-p6 NEW: Move HRM dictionary from module to core dictionaries	2016-03-25 18:06:57 +01:00
Laurent Destailleur	bb8e53deea	Revert "Fix regression" This reverts commit `5cd5a3a5fb`.	2016-03-25 15:57:19 +01:00
Laurent Destailleur	88e5616622	Prepare code to be able to download ODT templates	2016-03-25 15:56:50 +01:00
Laurent Destailleur	5cd5a3a5fb	Fix regression	2016-03-25 15:56:44 +01:00
Laurent Destailleur	91caea5707	Code was corrupted with very bad commits. I restore files manually.	2016-03-25 15:53:44 +01:00
Laurent Destailleur	630f5a632d	Revert "Corrected non-static usages of Form::selectarray function" This reverts commit `87cd6e1e40`.	2016-03-25 15:34:37 +01:00
Laurent Destailleur	26de415b77	Revert commit that break compatibility of 100% of modules	2016-03-25 15:24:57 +01:00
Andreas Pachler	0d308f74be	Added functionality to get project customer contact as contact_xx tags	2016-03-24 09:16:24 +01:00
aspangaro	bec5e5958a	NEW: Move HRM dictionary from module to core dictionaries	2016-03-24 06:28:12 +01:00
Juanjo Menent	922c57da76	NEW #3510 : Standardize module	2016-03-23 22:45:04 +01:00
Laurent Destailleur	54ac3c0a7b	Fix regression	2016-03-22 17:41:42 +01:00
Laurent Destailleur	95a45e8f87	Prepare code to be able to download ODT templates	2016-03-22 17:35:58 +01:00
Laurent Destailleur	ced1462b75	Fix regression	2016-03-22 16:59:54 +01:00
Laurent Destailleur	4f3f1eda7b	FIX Duplicate records into export	2016-03-22 12:55:29 +01:00
Laurent Destailleur	876484dfb5	FIX Duplicate records into export	2016-03-22 12:54:26 +01:00
Marcos García de La Fuente	89bd173c2f	NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate	2016-03-21 21:51:29 +01:00
aspangaro	3c09e67453	Merge remote-tracking branch 'Upstream/develop' into 4.0-p2 Conflicts: htdocs/core/menus/init_menu_auguria.sql	2016-03-21 20:38:17 +01:00
Marcos García de La Fuente	5a046125db	Missing changes from previous commits	2016-03-20 14:24:49 +01:00
Marcos García de La Fuente	4d78932fe8	NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions	2016-03-20 14:15:21 +01:00
Marcos García de La Fuente	87cd6e1e40	Corrected non-static usages of Form::selectarray function	2016-03-20 14:15:17 +01:00
aspangaro	57ebb7c997	NEW: Move Expense report menu from module to menu files	2016-03-20 07:34:48 +01:00
Laurent Destailleur	2b1f57f01e	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: dev/initdata/savedemo.sh htdocs/filefunc.inc.php htdocs/user/card.php	2016-03-18 11:54:14 +01:00
Laurent Destailleur	7fa71214bc	Merge remote-tracking branch 'origin/3.8' into 3.9 Conflicts: htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php htdocs/core/modules/commande/doc/pdf_proforma.modules.php	2016-03-18 11:06:41 +01:00
Laurent Destailleur	2c4f01859c	Merge pull request #4802 from grandoc/3.9 [fix]: define to avoid issue with external pdf models	2016-03-17 23:13:13 +01:00
Laurent Destailleur	aa7eb4935c	FIX VAT rate can be negative. Example spain selling to morroco.	2016-03-17 12:18:47 +01:00
Laurent Destailleur	1683609d9a	FIX Check of EAN13 barcode when mask was set to use 13 digits instead of 12	2016-03-17 12:00:38 +01:00
philippe grand	d434cee3fa	[Qual] Typo	2016-03-17 09:40:05 +01:00
Laurent Destailleur	12bb3932d0	NEW Add filter on a keyword, status and nature into list of modules	2016-03-14 19:40:52 +01:00
Laurent Destailleur	543f5cef63	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: dev/initdata/initdemo.sh htdocs/accountancy/journal/bankjournal.php htdocs/accountancy/journal/purchasesjournal.php htdocs/commande/card.php htdocs/compta/facture.php	2016-03-13 01:31:12 +01:00
Laurent Destailleur	1b30c1adb4	Fix regression on vat calculation when invoice was not a situation invoice	2016-03-12 20:49:38 +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	e0681d0165	Fix unit not visible if not defined	2016-03-09 23:20:44 +01:00
Florian HENRY	a8e2b49c5b	FIX : #4768	2016-03-08 10:22:31 +01:00
Benlo	0166d2ec3a	FR4763 add possibility to export contacts/thirdparty categories	2016-03-07 17:49:26 +01:00
Laurent Destailleur	896f60a478	hidden solution to solve files overwriting each other	2016-03-06 00:47:00 +01:00
Laurent Destailleur	210d8435da	FIX The part added with hidden option MAIN_DOC_USE_TIMING was included with a . instead of -. This make os think it is part of extension instead of file name.	2016-03-06 00:39:13 +01:00
Laurent Destailleur	d1777a6783	Replace function rand with mt_rand (prepare php 8)	2016-03-05 15:01:25 +01:00
Laurent Destailleur	c63ee8ceb5	Debug module supplier proposal	2016-03-04 16:08:51 +01:00
abb	f9162aa444	new:advanced permissions to validate and unvalidate interventions	2016-02-29 19:16:09 +01:00
Laurent Destailleur	16a716ebbc	Merge pull request #4655 from defrance/patch-103 ODT generation : No segment defined in odt file is not an error	2016-02-26 11:15:34 +01:00
Laurent Destailleur	54034ea852	NEW Add $object in parameter of pdf_build_address so we could include hook into the function.	2016-02-25 18:30:31 +01:00
Laurent Destailleur	8c43276fda	FIX Extrafields of shipments was not included into export fields	2016-02-25 15:46:14 +01:00
Laurent Destailleur	b3c3d3aac5	NEW Add total weight and volume on PDF NEW Can hide column qty ordered.	2016-02-25 14:18:32 +01:00
Laurent Destailleur	a95240e33d	FIX Some troubles into weight and volume calculation when unit differs. NEW Introduce a function showDimensionInBestUnit	2016-02-25 13:46:38 +01:00
Laurent Destailleur	b0f816a400	NEW Add weight/volume for one product into shipment export	2016-02-25 02:22:40 +01:00
Laurent Destailleur	02c0f52880	NEW Include sales representative into export of thirdparties	2016-02-24 16:56:24 +01:00
Laurent Destailleur	ac6001cec8	Fix do not show warning if account defined	2016-02-23 12:44:46 +01:00
Laurent Destailleur	843dada35d	Fix translation export/import	2016-02-22 17:42:41 +01:00
Laurent Destailleur	ef497e2129	Merge pull request #4669 from peckpeck/translation_import Add support to product translation imports	2016-02-22 16:17:19 +01:00
Laurent Destailleur	77cbd885f2	NEW Add minimum stock and desired stock into import/export profiles. NEW Add state into thirdparty export fields	2016-02-22 15:30:27 +01:00
Laurent Destailleur	f6d1913bb7	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/fourn/class/fournisseur.commande.class.php	2016-02-22 13:35:46 +01:00
Laurent Destailleur	e7e6957073	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9	2016-02-22 09:27:53 +01:00
Laurent Destailleur	a4f189eea7	Fix do not show warning if account defined	2016-02-22 09:27:18 +01:00
Benoît Peccatte	c969b09ef7	Add support to product translation imports	2016-02-21 22:04:47 +01:00
Laurent Destailleur	fb0e74645e	Merge pull request #4663 from peckpeck/xlsx_support NEW Allow imports from xlsx files	2016-02-21 19:12:38 +01:00
Benoît Peccatte	5a8d1f1c95	Allow imports from xlsx files	2016-02-21 14:10:19 +01:00
Laurent Destailleur	277d92af75	Secure migration for people using a RC	2016-02-20 03:14:29 +01:00
Laurent Destailleur	82f57b2ccf	Better position for modules	2016-02-19 20:05:25 +01:00
Laurent Destailleur	da284cda8c	Add category Supplier Relationship Manager	2016-02-19 19:20:21 +01:00
BENKE Charlie	8349446340	No segment defined is not an error This is a proposition of correction on all ODT file If we don't define table of segment on odt we have an error But in some case we don't want an table on ODT	2016-02-19 10:59:50 +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	52c82508e4	Merge remote-tracking branch 'origin/3.8' into 3.9 Conflicts: htdocs/compta/charges/index.php	2016-02-18 23:27:57 +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
Regis Houssin	d55ac472c3	Fix: issue when bank module is disabled Fix: missing entity filter for lines of payment	2016-02-16 11:27:58 +01:00
Laurent Destailleur	c78997ed23	Tons of fixes and enhancement on recurring invoice generation	2016-02-16 00:31:05 +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	3bcc7b0f8f	Merge remote-tracking branch 'origin/3.8' into 3.9 Conflicts: htdocs/comm/remise.php htdocs/expedition/card.php htdocs/expedition/class/expedition.class.php htdocs/filefunc.inc.php htdocs/societe/price.php	2016-02-15 01:37:23 +01:00
Laurent Destailleur	0d5f30f627	Merge pull request #4589 from frederic34/patch-8 Update google_oauthcallback.php	2016-02-15 00:34:22 +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
Laurent Destailleur	51ededc794	Fix duplicate template crabe and crevette. crevette was not updated and contains old code compared to crabe. To manage situation invoice with a PDF, code must be included into crabe (with some test if invoice is a situation invoice or not to manage if to have different code)	2016-02-15 00:02:07 +01:00
Laurent Destailleur	4bb980830f	Merge pull request #4571 from defrance/patch-99 Add Good Customers Boxes	2016-02-14 20:56:22 +01:00
Laurent Destailleur	d973596601	Merge pull request #4587 from frederic34/patch-7 Update modOauth.class.php	2016-02-14 12:21:03 +01:00
Laurent Destailleur	ecc338b1eb	Clean module	2016-02-13 03:25:20 +01:00
Laurent Destailleur	969314e731	Fix: disabling option lead in not working dolibarr	2016-02-12 12:19:32 +01:00
Laurent Destailleur	0d7f67ade5	Merge remote-tracking branch 'origin/3.9' into develop	2016-02-10 23:59:15 +01:00
Laurent Destailleur	e169cd3364	Fix usage of filter into selection of email members into emailing.	2016-02-10 23:48:18 +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
Frédéric FRANCE	c28f977e02	Update printgcp.modules.php	2016-02-09 14:12:34 +01:00
Frédéric FRANCE	51da5ea1f0	Update printgcp.modules.php	2016-02-09 14:07:54 +01:00
Frédéric FRANCE	73041b0be5	Update google_oauthcallback.php	2016-02-09 14:05:05 +01:00
Frédéric FRANCE	5dd016c3bc	Update modOauth.class.php	2016-02-08 17:55:29 +01:00
Laurent Destailleur	7445a0f71c	Clean code for generating sheet of barcode. Can choose output filename.	2016-02-08 16:42:34 +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
philippe grand	a15d03a676	fix : Strict Standards: Only variables should be passed by reference	2016-02-08 10:06:32 +01:00
Laurent Destailleur	ad63d5c48d	NEW Move load module to status experimental	2016-02-07 22:47:16 +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
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
BENKE Charlie	e2afe5460e	Update modSociete.class.php	2016-02-05 23:37:31 +01:00
Laurent Destailleur	fd7a05490d	DiscountOffered text was too long	2016-02-05 20:06:07 +01:00
phf	a8e480e392	FIX #3509 payment ref for suppliers	2016-02-04 23:15:06 +01:00
BENKE Charlie	5498b1cd5a	Update modSociete.class.php	2016-02-04 18:06:43 +01:00
BENKE Charlie	f87bfffdd9	add edition feacture on product element	2016-02-04 16:12:00 +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
Laurent Destailleur	547ffd7fcc	Add missing phpunit tests	2016-02-02 17:26:14 +01:00
Laurent Destailleur	d88cd500ce	Merge pull request #4547 from bafbes/dev1 fix:remove project info in standard document model for expense reports when project module is disabled	2016-02-02 16:41:12 +01:00
Laurent Destailleur	0def82f596	Merge pull request #4543 from aspangaro/develop-export New: Add User accountancy code in user export	2016-02-02 15:32:56 +01:00
abb	3bcfe849a1	fix:remove project info in standard document model for expense reports when project module is disabled	2016-01-31 22:35:09 +01:00
Laurent Destailleur	928336c835	NEW Clean and enhance code for cron engine	2016-01-31 15:14:50 +01:00
aspangaro	6a12cdc876	New: Add User accountancy code in export	2016-01-31 08:18:47 +01:00
Laurent Destailleur	e3a4124a58	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/accountancy/bookkeeping/card.php htdocs/accountancy/class/html.formventilation.class.php htdocs/core/menus/standard/eldy.lib.php htdocs/langs/fr_FR/bills.lang	2016-01-30 16:13:06 +01:00
Laurent Destailleur	5e9fd25a6e	Merge remote-tracking branch 'origin/3.8' into 3.9	2016-01-30 15:59:40 +01:00
Laurent Destailleur	d21908755e	FIX Import/Export NPR VAT	2016-01-30 15:29:35 +01:00
Laurent Destailleur	19d119d3a4	Debug cron module. Task to delete temporary files older than 24 is on by default.	2016-01-30 02:51:26 +01:00
Laurent Destailleur	cd58c93de6	FIX If option to hide automatic ECM is on, dont show menu.	2016-01-28 12:51:34 +01:00
phf	83f90e2b1f	Merge branch 'new_multicurrency_module' of github.com:atm-ph/dolibarr into new_multicurrency_module Conflicts: htdocs/commande/card.php	2016-01-25 21:50:43 +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	ba833dc412	Work on CMS module	2016-01-24 21:35:41 +01:00
Laurent Destailleur	8d46a56dac	Work on CMS module	2016-01-24 21:17:11 +01:00
phf	9376699299	FIX travis missing comment for new param	2016-01-23 16:16:15 +01:00
phf	373225272b	FIX reorder the display of currency and rate on propal/order FIX update line on propal/order NEW add mulitcurrency on customer invoice	2016-01-23 16:01:55 +01:00
Laurent Destailleur	4df584e57b	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/core/lib/files.lib.php	2016-01-23 11:51:56 +01:00
Laurent Destailleur	a406334643	Merge pull request #4458 from atm-alexis/FIX_bad_pdf_refetch_erase_hook_modification FIX line refetch incompatible with hook practice	2016-01-22 04:10:06 +01:00
Laurent Destailleur	93b2013aa7	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/compta/bank/card.php htdocs/projet/tasks/list.php	2016-01-22 03:29:55 +01:00
Laurent Destailleur	cceeefb7c2	Merge remote-tracking branch 'origin/3.8' into 3.9 Conflicts: htdocs/societe/index.php	2016-01-22 03:25:30 +01:00
Laurent Destailleur	cc71445b45	Fix: Only one name for one same feature.	2016-01-22 02:41:51 +01:00
Laurent Destailleur	e6653ea14f	Merge pull request #4333 from defrance/patch-94 Parameters harmonization of hook call	2016-01-22 02:35:21 +01:00
Laurent Destailleur	219ce73ea2	Merge pull request #4417 from atm-arnaud/3.8_fix_factures_nblignes_after_hook FIX nblignes not calculated after hook and hook can't modify this val...	2016-01-22 02:10:36 +01:00
phf	68857499d7	NEW display multicurrency price on azur pdf model	2016-01-21 22:26:51 +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
Laurent Destailleur	03461d124a	Fix activation of cron jobs by external module Clean code for task lists pages.	2016-01-19 23:45:03 +01:00
Alexis Algoud	48d674578b	FIX line is refetch (and seems useless) unless it was modified by the hook previous calling	2016-01-19 11:54:07 +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	be4f9baac6	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2016-01-16 10:21:52 +01:00
Laurent Destailleur	d46c655fb4	FIX: Sql syntax error in doc_generic_task_odt	2016-01-16 10:20:14 +01:00
arnaud	8b2541ebf9	FIX nblignes not calculated after hook and hook can't modify this value. Usefull for modules	2016-01-14 14:10:50 +01:00
Laurent Destailleur	7b14b5e115	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/core/menus/standard/eldy.lib.php	2016-01-14 13:30:27 +01:00
Laurent Destailleur	63ebd40ceb	Fix bad var value	2016-01-14 11:22:59 +01:00
Laurent Destailleur	0f5e208127	Merge remote-tracking branch 'origin/3.9' into develop	2016-01-13 20:43:49 +01:00
phf	d213fbae08	FIX invoice situation	2016-01-13 13:42:58 +01:00
Laurent Destailleur	9ba25be9bb	Change category for application	2016-01-13 13:37:24 +01:00
Laurent Destailleur	f74dfe282b	Fix missing default setup when module is enabled	2016-01-13 13:36:44 +01:00
Laurent Destailleur	381eea0dbf	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-01-12 23:10:25 +01:00
phf	f280061a90	FIX if we dont use SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE the hour is displayed on pdf	2016-01-12 11:09:47 +01:00
Laurent Destailleur	6684bdce84	Merge pull request #4349 from benlo06/fr_4347 CLOSE #4347 Add payment label to invoices csv exports	2016-01-10 11:47:25 +01:00
aspangaro	965a96784c	Fix: Donation some problems with french article	2016-01-10 07:35:00 +01:00
Laurent Destailleur	8653e7fa5c	Merge remote-tracking branch 'origin/3.9' into develop	2016-01-10 00:12:51 +01:00
Juanjo Menent	56af0761ee	Merge pull request #4295 from aspangaro/develop-a8 Accountancy Add a list to select accounting account on donation admin	2016-01-09 17:46:02 +01:00
Laurent Destailleur	e5d0bc9d57	Fix permission not used	2016-01-09 00:34:15 +01:00
Benlo	4aef3d29c1	FIX 4347 : Add labels in translations and change order	2016-01-08 15:03:46 +01:00
Benlo	00b77bafbe	CLOSE #4347 Add payment label to invoices csv exports For CSV export, add the possibility to export the column libelle (name of payment)	2016-01-07 14:20:54 +01:00
philippe grand	7b7f2e9fed	translations	2016-01-07 10:07:05 +01:00
Laurent Destailleur	d6c5a73264	Fix missing payment fields definition in export	2016-01-06 17:37:01 +01:00
BENKE Charlie	428b10d26b	Update doc_generic_supplier_proposal_odt.modules.php	2016-01-06 10:55:37 +01:00
BENKE Charlie	cd2e4a5e1e	Update doc_generic_proposal_odt.modules.php	2016-01-06 10:53:11 +01:00
BENKE Charlie	cbb5f522eb	Update doc_generic_task_odt.modules.php	2016-01-06 10:39:18 +01:00
BENKE Charlie	e6fd718e51	Update doc_generic_project_odt.modules.php	2016-01-06 10:38:06 +01:00
BENKE Charlie	16d43b169c	Update doc_generic_invoice_odt.modules.php	2016-01-06 10:36:34 +01:00
BENKE Charlie	743967a9b3	Update doc_generic_shipment_odt.modules.php	2016-01-06 10:35:43 +01:00
BENKE Charlie	ef597395ba	Update doc_generic_order_odt.modules.php	2016-01-06 10:34:55 +01:00
BENKE Charlie	5e9b7f07d6	Update doc_generic_odt.modules.php	2016-01-04 15:09:18 +01:00
BENKE Charlie	7d6eb270b8	Update doc_generic_proposal_odt.modules.php	2016-01-04 15:08:44 +01:00
BENKE Charlie	16770d3d3f	Update doc_generic_task_odt.modules.php	2016-01-04 15:08:08 +01:00
BENKE Charlie	0d2a6a9868	Update doc_generic_project_odt.modules.php	2016-01-04 15:07:42 +01:00
BENKE Charlie	522f17e6f9	Update doc_generic_invoice_odt.modules.php	2016-01-04 15:07:17 +01:00
BENKE Charlie	11bef2d044	Update doc_generic_shipment_odt.modules.php	2016-01-04 15:06:50 +01:00
BENKE Charlie	99f3df6128	Update doc_generic_order_odt.modules.php	2016-01-04 15:06:28 +01:00
BENKE Charlie	2f56df4899	Update doc_generic_odt.modules.php	2016-01-04 15:03:05 +01:00
BENKE Charlie	a4d24a04a7	Update doc_generic_proposal_odt.modules.php	2016-01-04 15:00:46 +01:00
BENKE Charlie	b308baaf27	Update doc_generic_task_odt.modules.php	2016-01-04 14:58:57 +01:00
BENKE Charlie	f4953a3a6e	Update doc_generic_project_odt.modules.php	2016-01-04 14:55:53 +01:00
BENKE Charlie	e41fe61ab0	Update doc_generic_invoice_odt.modules.php	2016-01-04 14:53:28 +01:00
BENKE Charlie	88912b29d9	Update doc_generic_shipment_odt.modules.php	2016-01-04 14:51:15 +01:00
BENKE Charlie	66834df34c	Update doc_generic_order_odt.modules.php	2016-01-04 14:47:47 +01:00
BENKE Charlie	768ef73f49	Parameters harmonization of hook execute call	2016-01-04 14:43:38 +01:00
Laurent Destailleur	1e1d6d4955	Fix to be able to use dolibarr with a smartphone	2016-01-03 19:34:19 +01:00
aspangaro	e0da56bcd0	Accountancy Add a list to select accounting account on donation admin	2015-12-26 05:56:14 +01:00
Laurent Destailleur	db7a98f0ef	Fix: When a payment mode was disabled, it was not visible on old records. Fix: init of $limit not correctly set according to 3.9 rules on most pages.	2015-12-21 13:56:59 +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	f25a9030eb	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: .travis.yml htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php htdocs/core/modules/commande/doc/pdf_proforma.modules.php htdocs/includes/adodbtime/adodb-time.inc.php htdocs/langs/en_US/accountancy.lang	2015-12-18 22:12:03 +01:00
Laurent Destailleur	dd3f5a32d3	Merge remote-tracking branch 'origin/3.7' into 3.8 Conflicts: .travis.yml composer.json htdocs/accountancy/admin/card.php	2015-12-18 21:20:12 +01:00
Laurent Destailleur	ebf68ecbe0	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: .travis.yml htdocs/contrat/class/contrat.class.php htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php htdocs/core/modules/project/pdf/pdf_baleine.modules.php	2015-12-18 21:03:57 +01:00
Laurent Destailleur	dc8e5f45ae	Merge pull request #4254 from grandoc/develop [Qual] Uniformize code	2015-12-18 17:13:22 +01:00
Laurent Destailleur	c328860af0	Merge pull request #4250 from GPCsolutions/dolibarr-4242 FIX #4242 Allow disabling dashes in documents	2015-12-18 17:07:00 +01:00
Laurent Destailleur	b10f9d4ca3	Fix: when doing an export of extrafields, we must use different table alias for each extrafield table.	2015-12-17 20:40:33 +01:00
philippe grand	367d9de0b7	fix some translation	2015-12-17 17:12:28 +01:00
Raphaël Doursenaud	4f9ab7da24	FIX #4242 Allow disabling dashes in documents 3.9 specific fix since document have moved	2015-12-17 10:39:55 +01:00
Raphaël Doursenaud	7e98cfd5b6	FIX #4242 Allow disabling dashes in documents 3.8 specific fix for new documents	2015-12-17 10:33:17 +01:00
Raphaël Doursenaud	02e053acc6	FIX #4242 Allow disabling dashes in documents 3.7 specific fix since document files have moved	2015-12-17 10:26:27 +01:00
Raphaël Doursenaud	e6ec797af8	FIX #4242 Allow disabling dashes in documents	2015-12-17 10:21:44 +01:00
Laurent Destailleur	90dbfc4870	Fix: to avoid confusion between amount of payment and amount distributed on invoice when a payment is done for several invoices, export of payment can export both fields.	2015-12-15 15:52:20 +01:00
Laurent Destailleur	40269c3c70	Fix Remove syntax warnings	2015-12-15 09:43:39 +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	2a6fbe3526	Fix debug shipment doc generation (bad position of fields, code differences, text size, ...)	2015-12-12 14:55:32 +01:00
Laurent Destailleur	0330d8237f	Fix: Color too dark	2015-12-12 14:13:45 +01:00
Laurent Destailleur	84205b5be4	Fix: text too long	2015-12-12 14:12:53 +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
Laurent Destailleur	2b149aa514	Merge pull request #4148 from AlainRnet/develop Update fraise.modules.php	2015-12-04 10:31:34 +01:00
AlainRnet	ebc1105b5c	Update fraise.modules.php following discussion with eldy (https://github.com/Dolibarr/dolibarr/pull/4079#issuecomment-161601400) to mix a french forum membre to select mailing member by type, I try to update this selector to integrate selection by type. Thanks in advance for feedback	2015-12-03 21:09:09 +01:00
Romain DESCHAMPS	94101412e9	Progress column not wide enough for 100% Progress column not wide enough for 100%	2015-11-30 12:20:14 +01:00
aspangaro	d12e3ca91f	Finish work on better integration of skype	2015-11-28 14:43:16 +01:00
aspangaro	9817ce8b20	Merge remote-tracking branch 'Upstream/develop' into develop-skype	2015-11-26 07:12:04 +01:00
Laurent Destailleur	8746ee1310	Merge pull request #4067 from aspangaro/develop-donation NEW: Donation complete cerfa 11580*03 Fr - Thanks Benoit21	2015-11-25 23:33:13 +01:00
Laurent Destailleur	9d10533f3d	Merge pull request #4066 from aspangaro/develop-hrm Fix: Auguria Menu & wrong table in dictionary HRM	2015-11-25 23:32:36 +01:00
aspangaro	3457a732f5	New: Better integration of skype	2015-11-25 20:19:18 +01:00
Laurent Destailleur	5568ff1c54	Fix bad picto on export	2015-11-25 16:41:40 +01:00
Laurent Destailleur	a1824955f6	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-11-23 12:21:02 +01:00
Laurent Destailleur	12358c9721	FIX The import help was not visible on calculated fields	2015-11-23 12:20:43 +01:00
Laurent Destailleur	61b46352b7	Dash line was not visible.	2015-11-23 09:36:34 +01:00
aspangaro	71189248d9	Correct description	2015-11-22 21:35:19 +01:00
aspangaro	5bed70b04e	New: Donation complete cerfa 11580*03 Fr - Thanks Benoit21	2015-11-22 21:31:05 +01:00
aspangaro	f9e82721d7	Fix: Auguria Menu & wrong table in dictionary HRM	2015-11-22 20:13:48 +01:00
Laurent Destailleur	ffeae34f51	Update doc	2015-11-22 18:41:35 +01:00
Laurent Destailleur	73bcc3bfe3	The temp dir for cache used by rester is correctly managed: No temp or data files must be stored outside of documents directory.	2015-11-22 17:39:13 +01:00
Laurent Destailleur	296e04022f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-11-22 17:19:45 +01:00
Laurent Destailleur	99fa751edc	Test lib is available	2015-11-22 17:19:20 +01:00
Laurent Destailleur	3c55479705	Restler #3544	2015-11-22 17:17:06 +01:00
Laurent Destailleur	3aa25cd2be	Merge pull request #4064 from frederic34/escpos Add profile escpos printer	2015-11-22 17:09:15 +01:00
Laurent Destailleur	cb3765bc92	Debug module Resource	2015-11-22 12:23:10 +01:00
frederic34	bfd97d5226	Add profile escpos printer	2015-11-22 11:04:27 +01:00
Laurent Destailleur	2a345b6fc0	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/admin/company.php htdocs/admin/menus/edit.php htdocs/core/class/hookmanager.class.php htdocs/core/class/html.form.class.php htdocs/core/lib/pdf.lib.php	2015-11-21 12:48:41 +01:00
Laurent Destailleur	758b8e1f7e	Merge remote-tracking branch 'origin/3.7' into 3.8 Conflicts: htdocs/core/boxes/box_project.php	2015-11-21 12:32:03 +01:00
Laurent Destailleur	c04743aa84	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-11-21 12:23:51 +01:00
arnaud	4233d24f4b	FIX export with category contact extrafields	2015-11-19 18:01:58 +01:00
aspangaro	ad457b416d	Use menu & add mode 'employee' in user/index.php	2015-11-17 22:51:34 +01:00
aspangaro	258ac45519	Remove obsolete code	2015-11-17 22:14:39 +01:00
aspangaro	a5ca6cb732	Merge remote-tracking branch 'Upstream/develop' into develop-hrm3	2015-11-17 20:34:37 +01:00
Laurent Destailleur	f5631cac45	NEW Introduce property module_position so a module can decide where it appears into list of modules.	2015-11-17 00:58:12 +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	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
aspangaro	0f75d76296	Merge remote-tracking branch 'Upstream/develop' into develop-hrm3	2015-11-13 07:52:44 +01:00
Laurent Destailleur	471bcdd29f	Remove hard coded list of permissions.	2015-11-13 02:21:27 +01:00
arnaud	aaa6f00d11	FIX export propal and order with extrafields	2015-11-12 12:37:04 +01:00
aspangaro	30c4f1c896	HRM : language	2015-11-12 07:40:46 +01:00
aspangaro	bedba7ffb7	HRM: add a mode 'employee' for development to show tab	2015-11-12 07:26:51 +01:00
aspangaro	20872498ba	HRM: Add a tab for holiday module in employee card	2015-11-12 06:58:26 +01:00
Laurent Destailleur	350ef610e9	Fix beluga pdf for projects. Add missing expense reports.	2015-11-07 12:36:34 +01:00
philippe grand	5f74a0f1c0	Traduction	2015-11-06 09:46:18 +01:00
Laurent Destailleur	2dc644da30	Debug Direct print module using the OAuth setup.	2015-11-06 01:33:49 +01:00
Laurent Destailleur	e4bd99aaf3	Merge pull request #3904 from frederic34/printgcp Google Cloud Print	2015-11-05 21:57:08 +01:00
Laurent Destailleur	a7cea65710	Merge pull request #3903 from atm-alexis/3.9_FIX_crabe_model_for_ISO_address_emplacement NEW add an option to use standard ISO location for bill in crabe model	2015-11-05 21:51:38 +01:00
Laurent Destailleur	f3b8df3ea5	Merge pull request #3889 from frederic34/escpos Receipt Printer conf and lang	2015-11-05 21:32:43 +01:00
frederic34	3ef6a92bb1	Google Cloud Print	2015-11-05 18:04:00 +01:00
Alexis Algoud	8221817087	NEW add an option to use standard ISO location for bill in crabe model For electronic sending solutions, it could be required	2015-11-05 16:17:09 +01:00
Laurent Destailleur	41ccfc411a	Better error message	2015-11-05 10:11:39 +01:00
frederic34	1a374ddd2c	Receipt Printer conf and lang	2015-11-05 08:42:03 +01:00
Laurent Destailleur	1f4481a6b0	Merge pull request #3172 from atm-maxime/new_creditnote NEW Add hidden option INVOICE_CREDIT_NOTE_STANDALONE to allow to create credit note without invoice	2015-11-05 02:45:15 +01:00
Laurent Destailleur	11b7d8a44c	Merge pull request #3873 from frederic34/escpos Escpos Receipt printer	2015-11-05 02:18:09 +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
frederic34	644a104d5f	start to parse template	2015-11-04 23:14:50 +01:00
Laurent Destailleur	09f3cd6f1d	Fix class cant be abstract	2015-11-04 16:43:24 +01:00
frederic34	5c725aceb8	sql	2015-11-03 22:12:03 +01:00
frederic34	d362d889f6	wip	2015-11-03 20:50:01 +01:00
Laurent Destailleur	cd68ea9d0f	Fix: We must use external URL for OAuth.	2015-11-02 21:42:11 +01:00
Laurent Destailleur	1bcda200e3	A module to setup OAuth. OK, but what to do once setup of a client id/secret is done ?	2015-11-02 20:48:27 +01:00
Laurent Destailleur	563a020595	NEW Free text for cheque deposit receipt can be HTML content.	2015-11-02 20:35:33 +01:00
Laurent Destailleur	ffe1284a85	Merge pull request #3840 from frederic34/printgcp Printing with Google Cloud Print	2015-11-02 20:09:13 +01:00
Laurent Destailleur	da0aa2f937	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/core/class/html.form.class.php htdocs/core/lib/pdf.lib.php htdocs/langs/en_US/main.lang htdocs/product/list.php htdocs/product/stock/mouvement.php	2015-11-02 19:31:42 +01:00
Laurent Destailleur	67a2f6ee91	Merge pull request #3854 from fmarcet/3.8 FIX: Send emails to contacts who should not receive emails	2015-11-02 18:03:59 +01:00
Laurent Destailleur	f928062e2b	FIX #3726 Better support for PRODUCT_USE_OLD_PATH_FOR_PHOTO	2015-11-02 17:56:32 +01:00
fmarcet	3c5903f75a	FIX: Contacts are not added to the list with the status "no contact"	2015-11-02 11:52:58 +01:00
frederic34	9149032a03	Merge remote branch 'upstream/develop' into printgcp Conflicts: htdocs/core/actions_printing.inc.php	2015-11-02 11:43:34 +01:00
aspangaro	6df524bcb0	Remove blank page	2015-11-01 22:54:04 +01:00
frederic34	b9367bb196	Errors management	2015-11-01 11:24:51 +01:00
frederic34	2b4224d4c4	List Jobs	2015-11-01 10:10:14 +01:00
frederic34	2f3e6958f9	Receipt Printer	2015-11-01 00:58:08 +01:00
frederic34	bb06a55844	Work on list jobs	2015-10-31 23:27:10 +01:00
frederic34	b6be372c4b	Merge remote branch 'upstream/develop' into printgcp	2015-10-30 18:12:34 +01:00
frederic34	e90f68906e	SQL tables for oauth	2015-10-30 17:59:45 +01:00
frederic34	1694c690ed	Printing with Google Cloud Print	2015-10-30 17:22:06 +01:00
Ferran Marcet	5862037d34	FIX Bad parameters	2015-10-30 13:03:34 +01:00
Laurent Destailleur	87c240252c	FIX Can export a field into task time table with export project profile	2015-10-27 22:24:18 +01:00
Maxime Kohlhaas	bd831b1f24	Merge branch 'new_creditnote' of github.com:atm-maxime/dolibarr into new_creditnote	2015-10-26 09:40:50 +01:00
Laurent Destailleur	90a221ef6d	Fix version of module	2015-10-22 19:46:30 +02:00
aspangaro	8e37da55c3	Add searchform, language key and correct code	2015-10-10 08:34:15 +02:00
aspangaro	8f8de587b8	Add admin & first version to manage establishment	2015-10-10 06:39:59 +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
Laurent Destailleur	ab4b423567	Merge pull request #3712 from GPCsolutions/fixunittests Fix unittests regression	2015-10-09 20:19:21 +02:00
Laurent Destailleur	796a87e254	Merge pull request #3673 from apachler/develop Changes to ODT creation of proposal and invoice	2015-10-09 20:18:55 +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	d9693ba2f2	New : Module HRM	2015-10-09 06:16:43 +02:00
philippe grand	0e343ae3b2	syntax error	2015-10-08 09:34:02 +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
Andreas, OE8APR	3aeeab9654	Get proposal customer contact Added functionality to get proposal customer contact as contact_xx tags	2015-10-05 17:51:26 +02:00
Andreas, OE8APR	e3bdc8aaaa	Get invoice customer contact Added functionality to get invoice customer contact as contact_xx tags	2015-10-05 17:50:56 +02:00
Laurent Destailleur	85a5b0fc69	Merge pull request #3652 from grandoc/develop FIX : typo	2015-10-04 19:57:12 +02:00
Laurent Destailleur	77218194c6	Merge pull request #3657 from frederic34/patch-16 Fix: #3552	2015-10-04 19:56:22 +02:00
Frédéric FRANCE	6f513fabef	Update DolibarrModules.class.php	2015-10-03 23:45:25 +02:00
Juanjo Menent	9d60dee781	Issue #3509 : Ready for customers	2015-10-03 17:15:25 +02:00
Juanjo Menent	03a2fd740d	Issue #3509 : Ready for customers	2015-10-03 16:58:46 +02:00
Juanjo Menent	92f4c0d015	Merge remote-tracking branch 'upstream/develop' into dolibarr-3509	2015-10-03 16:01:24 +02:00
philippe grand	298fafd7d2	fix : internationalization	2015-10-03 15:10:53 +02:00
philippe grand	b6de2a954c	fix : internationalization	2015-10-03 15:04:03 +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
philippe grand	82c7022e20	Fix : internationalization	2015-10-03 14:47:11 +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	e76124add5	FIX #3606	2015-10-01 16:09:51 +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	9c28894ec3	Merge pull request #3615 from FHenry/3.7 FIX : When delete actioncomm also delete actioncomm_resources	2015-10-01 10:34:54 +02:00
Florian HENRY	a96b92a618	FIX : Email selector contact must not include inactive contact	2015-09-30 14:06:45 +02:00
Laurent Destailleur	3f506552e3	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/filefunc.inc.php htdocs/theme/md_exp/style.css.php	2015-09-27 21:29:16 +02:00
philippe	1454d942ef	missing translation	2015-09-27 11:06:45 +02:00
Laurent Destailleur	d119e04963	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2015-09-26 14:17:02 +02:00
Laurent Destailleur	9ecc8e5e6b	FIX Regression on bad use of fk_account showing the bad bank account on PDF.	2015-09-26 14:11:39 +02:00
Laurent Destailleur	62792c08eb	Merge pull request #3591 from GPCsolutions/inherited [Qual] Cleanup of inherited class properties	2015-09-26 11:23:59 +02:00
Laurent Destailleur	f3ba115ef0	Fix missing default value	2015-09-26 10:53:59 +02:00
Juanjo Menent	4fa1be0e35	Issue #3509 : Init works	2015-09-26 10:37:36 +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
Raphaël Doursenaud	67ddb6c94e	[Qual] Cleanup of inherited class properties	2015-09-24 20:12:55 +02:00
Raphaël Doursenaud	3feffdb84f	[Qual] Removed unused deprecated fields	2015-09-24 17:50:39 +02:00
Juanjo Menent	5dc78a337d	Merge remote-tracking branch 'upstream/develop' into dolibarr-3509	2015-09-23 22:49:23 +02:00
Juanjo Menent	342e3413db	Issue 3509: Init works	2015-09-23 22:48:48 +02:00
Laurent Destailleur	f81df66564	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/.gitignore htdocs/categories/edit.php	2015-09-23 00:34:57 +02:00
Laurent Destailleur	c2bdd9b465	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2015-09-22 11:29:49 +02:00
Laurent Destailleur	7d4a9b17b6	FIX Creation of tables or keys must not be done with a random order.	2015-09-21 14:00:02 +02:00
aspangaro	49f671eb1d	Correct name	2015-09-19 07:24:32 +02:00
aspangaro	1901b2fb3b	Missing translations in checks deposits exports	2015-09-19 07:15:13 +02:00
Laurent Destailleur	f01b9c09a3	Removed duplicate code. Use inheritance instead.	2015-09-18 10:36:23 +02:00
Laurent Destailleur	1b836dc31e	Merge pull request #3408 from aspangaro/develop-60 New: CkEditor add possibility to choose skin	2015-09-15 17:09:11 +02:00
Laurent Destailleur	94723a9b83	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/accountancy/journal/purchasesjournal.php htdocs/accountancy/journal/sellsjournal.php htdocs/langs/en_US/accountancy.lang	2015-09-12 15:23:02 +02:00
Laurent Destailleur	97096536b1	Fix #2526 The filter on type numeric is ok now. Sometimes we used "Number", sometimes "Numeric". I moved to "Numeric" everywhere to solve bug and added a warning in log if an unknow value is still used in code.	2015-09-12 15:20:55 +02:00
Laurent Destailleur	db1d9d6d8e	Merge remote-tracking branch 'origin/3.7' into 3.8 Conflicts: htdocs/fourn/commande/dispatch.php	2015-09-12 11:50:46 +02:00
Laurent Destailleur	309e1604e1	Fix migration missing for leave request module Fix permission label for expense report and leave request	2015-09-12 11:35:49 +02:00
Laurent Destailleur	24a216b154	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-09-12 11:33:49 +02:00
Laurent Destailleur	5e81eb7586	Merge pull request #3505 from GPCsolutions/firephp Setup FirePHP like ChromePHP	2015-09-12 11:02:31 +02:00
Raphaël Doursenaud	fc91e553ad	Setup FirePHP like ChromePHP	2015-09-11 17:45:30 +02:00
Laurent Destailleur	4b97fae28f	Fix migration missing for leave request module Fix permission label for expense report and leave request	2015-09-11 07:52:06 +02:00
Laurent Destailleur	7951483c5f	Fix: examples ko for import Fix bad picto for export	2015-09-10 12:47:25 +02:00
Florian HENRY	6cb993c0b4	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-09-10 11:20:03 +02:00
aspangaro	3a90bfa6d3	Merge remote-tracking branch 'Upstream/develop' into develop-60	2015-09-10 06:59:23 +02:00
Laurent Destailleur	2234d95a7b	Merge pull request #3481 from grandoc/develop translations missing	2015-09-09 20:52:36 +02:00
Laurent Destailleur	a726cd210b	Merge pull request #3483 from GPCsolutions/sentry Fix regression introduced by `f3c71a9a5a`	2015-09-09 20:10:01 +02:00
Laurent Destailleur	8c1760fbcf	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-09-09 13:26:35 +02:00
Laurent Destailleur	d3f1a7d5b8	FIX Bad condition into invoice export request making reporting too many rows.	2015-09-09 13:26:10 +02:00
Florian HENRY	89b723b2a7	FIX : multientity warehouse management	2015-09-08 16:23:00 +02:00
aspangaro	16585553c1	Merge remote-tracking branch 'Upstream/develop' into develop-64	2015-09-07 21:52:08 +02:00
aspangaro	46b0e259b1	Add constant in modAccounting.class.php	2015-09-07 21:51:48 +02:00
philippe grand	706f62d8f2	better display for code	2015-09-07 17:02:53 +02:00
Raphaël Doursenaud	1168f0b6ae	Fix regression introduced by `f3c71a9a5a`	2015-09-07 16:20:17 +02:00
philippe grand	ec21916d3b	translations missing	2015-09-07 15:55:26 +02:00
philippe grand	9532baf0e5	translations missing	2015-09-07 15:46:57 +02:00
philippe grand	887a4107a1	translations missing	2015-09-07 15:40:55 +02:00
philippe grand	3a6271e714	translations missing	2015-09-07 15:29:51 +02:00
Laurent Destailleur	5d285bf56d	Merge pull request #3478 from grandoc/develop translations missing	2015-09-07 15:09:31 +02:00
philippe grand	ff3968b07f	translations missing	2015-09-07 12:46:49 +02:00
Laurent Destailleur	28c62fb214	Introduce a function to return a warning by loggers.	2015-09-07 12:21:26 +02:00
Laurent Destailleur	f3c71a9a5a	Dolibarr must not contains autoload feature. The developer and user must decide which lib is used and it must not be a random feature that take a library "randomly" (first one found is same a randomly found). By default, library embedded of dolibarr must be used. If we want to use another one, an option to set the path of external libray must be available.	2015-09-07 12:09:42 +02:00
Laurent Destailleur	77ef046af4	Start to mutualize the builddoc and remove_file action.	2015-09-06 14:02:21 +02:00
Laurent Destailleur	51c5e01290	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-09-05 00:48:56 +02:00
Laurent Destailleur	7926fd8083	NEW ODT generators can set meta properties of ODT file	2015-09-05 00:47:06 +02:00
Raphaël Doursenaud	7bb917e637	NEW Support logging to a Sentry server Sentry is an Open Source error logging and aggregation platform. It can be used on-premise or hosted at https://getsentry.com	2015-09-04 19:10:13 +02:00
Raphaël Doursenaud	11402debbd	Install ChromePHP from composer	2015-09-04 19:06:00 +02:00
Laurent Destailleur	dcaef54f9b	Fix can't disable a module that were removed.	2015-09-04 16:47:43 +02:00
Laurent Destailleur	d19ec89bf1	Merge remote-tracking branch 'origin/3.7' into 3.8 Conflicts: htdocs/core/modules/modHoliday.class.php htdocs/holiday/card.php	2015-09-03 23:27:47 +02:00
Laurent Destailleur	2e3d25c055	Merge pull request #3462 from grandoc/3.7 fix : Typo	2015-09-03 19:15:31 +02:00
Laurent Destailleur	54214cfddf	Merge branch 'bug-3383' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-3383 Conflicts: ChangeLog	2015-09-03 19:12:01 +02:00
philippe grand	8bf093a7ce	fix : Typo	2015-09-03 12:12:10 +02:00
Marcos García de La Fuente	67b7162c59	Merge branch '3.7' into bug-3383 # Conflicts: # ChangeLog	2015-09-03 12:05:19 +02:00
Marcos García de La Fuente	86dd751f29	Merge branch '3.7' into bug-incorrect-pdf-bank # Conflicts: # ChangeLog	2015-09-03 12:03:24 +02:00
Laurent Destailleur	19ac160696	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/compta/facture/impayees.php htdocs/compta/index.php htdocs/core/boxes/box_prospect.php htdocs/includes/tcpdf/fonts/dejavusanscondensed.ctg.z htdocs/includes/tcpdf/fonts/dejavusanscondensed.z htdocs/includes/tcpdf/fonts/dejavusanscondensedb.ctg.z htdocs/includes/tcpdf/fonts/dejavusanscondensedb.z htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.ctg.z htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.z htdocs/includes/tcpdf/fonts/dejavusanscondensedi.ctg.z htdocs/includes/tcpdf/fonts/dejavusanscondensedi.z htdocs/includes/tcpdf/fonts/dejavusansextralight.ctg.z htdocs/includes/tcpdf/fonts/dejavusansextralight.z htdocs/includes/tcpdf/fonts/dejavusansmono.ctg.z htdocs/includes/tcpdf/fonts/dejavusansmono.z htdocs/includes/tcpdf/fonts/dejavusansmonob.ctg.z htdocs/includes/tcpdf/fonts/dejavusansmonob.z htdocs/includes/tcpdf/fonts/dejavusansmonobi.ctg.z htdocs/includes/tcpdf/fonts/dejavusansmonobi.z htdocs/includes/tcpdf/fonts/dejavusansmonoi.ctg.z htdocs/includes/tcpdf/fonts/dejavusansmonoi.z	2015-09-03 10:49:41 +02:00
Marcos García de La Fuente	3134950dbe	FIX [ bug #3383 ] Company name is overlapped with company direction in PDF models Close #3383	2015-09-01 11:19:05 +02:00
Marcos García de La Fuente	c4f9bde14d	FIX [ bug #3431 ] Invoice bank account is not respected Close #3431	2015-09-01 11:09:37 +02:00
Raphaël Doursenaud	3b493ab0ed	Fix #2863 Sensible defaults for ChromePHP path Use the provided ChromePHP class by default	2015-08-31 21:08:37 +02:00
Laurent Destailleur	302b61c5ce	Fix Can't download generated document for cheque summary deposit.	2015-08-27 22:43:09 +02:00
Juanjo Menent	ddb9c6a025	Merge remote-tracking branch 'origin/3.8' into develop	2015-08-26 21:01:39 +02:00
Juanjo Menent	0a33f0728a	Fix translations of contract exports	2015-08-26 21:01:01 +02:00
Juanjo Menent	4cd61073e2	Merge remote-tracking branch 'origin/3.8' into develop	2015-08-26 20:26:27 +02:00
Juanjo Menent	6321e96e49	Close #3223	2015-08-26 20:25:52 +02:00
Laurent Destailleur	603c44c37c	Merge pull request #3405 from aspangaro/3.8-13 Fast review 3.8	2015-08-26 11:27:16 +02:00
Juanjo Menent	9deaa3cceb	Merge remote-tracking branch 'origin/3.8' into develop	2015-08-25 22:01:33 +02:00
Juanjo Menent	f32a7ba228	Close #3224	2015-08-25 21:59:46 +02:00
aspangaro	73d8f20c6b	Fix: Correct directory where the donation is generated & add the action to remove_file who are generated	2015-08-25 08:09:14 +02:00
Laurent Destailleur	feed3f714c	Fix to avoid warning	2015-08-24 11:17:11 +02:00
aspangaro	a6701aeb69	New: CkEditor add possibility to choose skin	2015-08-23 15:39:55 +02:00
Laurent Destailleur	1b409538a8	Fix #3400 Conflicts: htdocs/core/lib/date.lib.php	2015-08-20 15:51:28 +02:00
Laurent Destailleur	4541d189ac	Fix #3400	2015-08-20 15:50:00 +02:00
Florian HENRY	91c8057d51	NEW : import Third parties/Sales representatives	2015-08-19 16:59:43 +02:00
Laurent Destailleur	fabd751be4	Fix Server hang with long loop when reading specimen pdf and high number of tasks.	2015-08-17 20:07:14 +02:00
Laurent Destailleur	76ce98630f	Fix translation	2015-08-17 19:42:19 +02:00
Laurent Destailleur	fc8a822f1d	Merge remote-tracking branch 'origin/3.7' into develop	2015-08-13 04:03:23 +02:00
Laurent Destailleur	c73fe965d2	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/commande/class/commande.class.php htdocs/compta/facture/class/facture.class.php	2015-08-13 03:58:32 +02:00
Laurent Destailleur	1595765ec8	Merge remote-tracking branch 'origin/3.5' into 3.6 Conflicts: htdocs/compta/facture/class/facture.class.php	2015-08-13 03:18:02 +02:00
Laurent Destailleur	f1e87478ff	Fix translation of printing menu	2015-08-12 23:12:15 +02:00
Laurent Destailleur	d4aabf99db	Fix permission of module	2015-08-12 22:32:29 +02:00
Juanjo Menent	a6d7977d4f	Merge pull request #3354 from defrance/patch-74 New pdf for project - listing of elements	2015-08-10 20:51:58 +02:00
Marcos García de La Fuente	f3ef4fed93	Fix: [ bug #3313 ] Error enabling module with PostgreSQL database Close #3313	2015-08-09 13:58:03 +02:00
Juanjo Menent	f695b5cd11	Merge remote-tracking branch 'origin/3.8' into develop	2015-08-07 13:01:53 +02:00
Juanjo Menent	38afb1a4e6	Merge remote-tracking branch 'origin/3.7' into 3.8 # Conflicts: # htdocs/core/modules/modBarcode.class.php	2015-08-07 12:57:16 +02:00
Juanjo Menent	12b83fd3e8	Fix #3304	2015-08-07 12:45:27 +02:00
BENKE Charlie	01671d02d1	New pdf for project - listing of elements	2015-08-07 00:39:44 +02:00
Juanjo Menent	98072ec73e	Merge remote-tracking branch 'origin/3.8' into develop	2015-08-06 18:00:59 +02:00
Florian HENRY	2a7f5da4a7	FIX : export SQL instruction on modProduct with extrafields	2015-08-04 11:49:26 +02:00
Juanjo Menent	9ae31f3a08	Merge remote-tracking branch 'origin/3.8' into develop	2015-08-01 15:01:19 +02:00
Juanjo Menent	05b0a9b675	Merge remote-tracking branch 'origin/3.7' into 3.8 # Conflicts: # htdocs/core/menus/standard/eldy.lib.php	2015-08-01 14:50:07 +02:00
Laurent Destailleur	13dee1876a	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/compta/resultat/clientfourn.php	2015-07-30 15:07:22 +02:00
Laurent Destailleur	a6bac40f0a	Fix bad translation	2015-07-29 13:03:52 +02:00
Laurent Destailleur	ff8969073c	Merge remote-tracking branch 'origin/3.7' into 3.8 Conflicts: htdocs/contrat/class/contrat.class.php htdocs/core/class/extrafields.class.php htdocs/main.inc.php	2015-07-28 18:57:13 +02:00
fmarcet	6676114501	Fix: Not showing product supplier reference when page break	2015-07-27 16:31:40 +02:00
fmarcet	e130af8033	Fix: Not showing delivery date on rouget pdf (expedition)	2015-07-27 13:11:07 +02:00
Laurent Destailleur	cb98d6cb93	Merge remote-tracking branch 'origin/3.8' into develop	2015-07-19 15:32:20 +02:00
Laurent Destailleur	2f2b0df6f8	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/contact/exportimport.php htdocs/contact/info.php htdocs/core/class/commonobject.class.php htdocs/core/class/html.form.class.php htdocs/core/modules/DolibarrModules.class.php htdocs/core/modules/modSociete.class.php htdocs/core/tpl/document_actions_pre_headers.tpl.php htdocs/langs/fr_FR/categories.lang htdocs/main.inc.php htdocs/product/reassort.php htdocs/projet/list.php htdocs/societe/info.php	2015-07-19 12:26:31 +02:00
Laurent Destailleur	2bb1945a2f	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/compta/prelevement/class/rejetprelevement.class.php htdocs/compta/sociales/class/paymentsocialcontribution.class.php htdocs/contact/exportimport.php htdocs/contact/ldap.php htdocs/contact/perso.php htdocs/contact/vcard.php htdocs/core/class/commonobject.class.php htdocs/product/reassort.php htdocs/projet/liste.php htdocs/societe/consumption.php htdocs/societe/info.php	2015-07-19 12:04:30 +02:00
aspangaro	b9b6abd7a8	Merge remote-tracking branch 'Upstream/3.8' into 3.8-1	2015-07-18 05:29:57 +02:00
Juanjo Menent	06684ea362	Merge pull request #3250 from aspangaro/3.8-patch7 Fix: #3228 [Export] Missing member ID field in users	2015-07-17 19:15:53 +02:00
Juanjo Menent	0971e88531	Merge pull request #3249 from aspangaro/3.8-patch6 Fix: #3230 [Leaves] Module setup page is useless	2015-07-17 19:15:31 +02:00
aspangaro	a0d74cc1a1	Fix: #3228 [Export] Missing member ID field in users	2015-07-16 22:50:50 +02:00
aspangaro	440e144892	Fix: #3230 [Leaves] Module setup page is useless	2015-07-16 22:29:04 +02:00
aspangaro	2d3d78ecc0	Fix: #3232 [Agenda] Setup page tab order is weird	2015-07-16 22:16:11 +02:00
Laurent Destailleur	cbce66bba8	Merge pull request #3190 from hregis/3.8_bug2 Fix: wrong path and add index.html	2015-07-16 10:07:31 +02:00
aspangaro	4ae15adc69	Fix: wrong link on leave tabs in user card	2015-07-16 06:10:51 +02:00
aspangaro	59e88590e0	Move my address email to new one	2015-07-15 20:30:33 +02:00
Laurent Destailleur	a9289de616	Several fixes. Fix #2927	2015-07-13 11:22:18 +02:00
Regis Houssin	f23afc3453	Fix: wrong path and add index.html	2015-07-13 10:07:38 +02:00
Laurent Destailleur	8690b5e70e	FIX #3173 Overlapping of shipment ref	2015-07-12 16:22:06 +02:00
Laurent Destailleur	688562a816	Fix regression: We can't yet set method __construct of DolibarrModules abstract because this break compatibility with a lot of external module and generate FATAL errors after migration. Because PHP is not yet able to manage try catch on FATAL error, we can't catch such error. Using bstract on constructor is so postponed.	2015-07-10 09:40:18 +02:00
Maxime Kohlhaas	9f9ba12802	New : option to allow credit note without related invoice	2015-07-08 14:32:57 +02:00
Marcos García de La Fuente	eff573e753	Removed duplicated code from core modules	2015-07-07 13:08:26 +02:00
Marcos García de La Fuente	56ff0c7350	Created abstract functions DolibarrModules::__construct, DolibarrModules::init and DolibarrModules::remove	2015-07-07 13:08:12 +02:00
Laurent Destailleur	56560d9379	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-07-04 10:49:01 +02:00
Regis Houssin	4273c4aad9	Fix: data can be just a value, not an array	2015-07-03 11:35:11 +02:00
Regis Houssin	b70dfd0d54	New: possibility to defined a tab for all entities in module descriptor	2015-07-03 11:16:24 +02:00
Regis Houssin	4fb5af7442	Fix: reset the current entity	2015-07-03 10:58:55 +02:00
Laurent Destailleur	312281f4d4	Debug askpricesupplier Try to continue work on position of menu entries.	2015-07-02 22:43:51 +02:00
Laurent Destailleur	dc050d39eb	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: build/makepack-dolibarr.pl htdocs/adherents/type.php htdocs/core/boxes/box_task.php htdocs/core/class/commonobject.class.php htdocs/core/class/html.form.class.php htdocs/core/js/lib_batch.js htdocs/core/modules/modUser.class.php htdocs/fichinter/card.php htdocs/fourn/commande/card.php htdocs/societe/consumption.php htdocs/user/info.php htdocs/user/note.php htdocs/user/param_ihm.php htdocs/user/perms.php	2015-06-29 00:09:28 +02:00
Laurent Destailleur	b6efa5ed11	NEW Can upload files on leave requests. Use more standard permissions.	2015-06-27 11:45:23 +02:00
Laurent Destailleur	c218843cdb	FIX Save of filters into export profiles failed.	2015-06-24 18:29:29 +02:00
Florian HENRY	daab394c81	add extrafields into import product	2015-06-24 12:40:56 +02:00
Laurent Destailleur	0780c84012	Fix missing payment mode into export invoice profile	2015-06-23 23:58:04 +02:00
Laurent Destailleur	040a643ee9	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/expensereport/card.php htdocs/projet/element.php	2015-06-23 18:34:39 +02:00
phf	06962cb4e6	FIX : tool export handle the type "select" extrafields and return the value instead of id	2015-06-23 16:26:05 +02:00
Laurent Destailleur	27cc7ef2b3	Time spent	2015-06-23 10:13:08 +02:00
aspangaro	20582b9ea5	Merge remote-tracking branch 'Upstream/develop' into develop-36	2015-06-21 07:31:43 +02:00
Laurent Destailleur	2c5ef858d0	NEW Filter "active" by default on user list. Fix label of permission of project module	2015-06-20 20:35:57 +02:00
aspangaro	0ff97da1ea	Review ER : remove fk_c_tva and add option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT	2015-06-20 09:06:20 +02:00
Marcos García de La Fuente	a496606826	Merge branch 'develop' into commercial-name Conflicts: htdocs/societe/soc.php	2015-06-13 02:45:42 +02:00
Laurent Léonard	a337b6f874	Rename "duree" property of interventions to "duration" This also fixes the display problem of total duration on the "soleil" document model	2015-06-11 23:18:29 +02:00
Regis Houssin	edd5c33c5b	Fix: Strict standards: Only variables should be passed by reference http://geoffray.be/blog/php/only-variables-should-be-passed-by-reference	2015-06-10 18:22:47 +02:00
aspangaro	592d124f26	Merge remote-tracking branch 'Upstream/develop' into develop-28	2015-06-08 21:33:45 +02:00
aspangaro	1d1f19b976	NEW: Add a tab document in donation card	2015-06-08 21:28:32 +02:00
Raphaël Doursenaud	143a7d7328	Use rfc6761 example.com domain instead of domain.com in examples Fix #2988	2015-06-08 17:13:23 +02:00

... 32 33 34 35 36 ...

5030 Commits