dolibarr

Author	SHA1	Message	Date
Laurent Destailleur	f6ad688ddd	FIX module for emailing target selection must use a condition on module	2022-05-28 20:50:24 +02:00
BENKE Charlene	8bc313980a	php V8 warning	2022-05-27 16:32:11 +02:00
BENKE Charlene	35a1f9ac4b	php V8 warning	2022-05-27 16:30:26 +02:00
BENKE Charlene	959278e315	php V8 warning	2022-05-24 22:36:16 +02:00
Laurent Destailleur	4c10c04f9f	Merge pull request #20495 from atm-john/new_fix_regression_select_extrafield_search FIX : regression select extrafield search + fix function name	2022-05-24 21:55:33 +02:00
Laurent Destailleur	00e65eb106	Fix bad management when inserting contacts of actioncomm	2022-05-23 00:49:59 +02:00
Laurent Destailleur	e271616bea	Scrutinizer	2022-05-23 00:22:26 +02:00
Laurent Destailleur	a193474fa3	Update card.php	2022-05-22 17:15:43 +02:00
Laurent Destailleur	3d5b322d98	Debug v16	2022-05-22 16:27:42 +02:00
Laurent Destailleur	7b4dae8773	CSS	2022-05-22 16:16:17 +02:00
Laurent Destailleur	324721ac1e	Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/commande/card.php htdocs/core/tpl/list_print_total.tpl.php htdocs/fichinter/list.php htdocs/fourn/class/fournisseur.commande.class.php	2022-05-22 12:54:40 +02:00
Eric Seigne	1ca1afd734	fix #18339 : Attempt to read property creer	2022-05-22 01:50:10 +02:00
Eric Seigne	45bc1ff287	fix #18339 : Attempt to read property creer	2022-05-22 01:50:01 +02:00
Regis Houssin	6372bea326	FIX php8 warning	2022-05-22 00:14:01 +02:00
Laurent Destailleur	0f268b682a	Merge pull request #20882 from FHenry/dev_new_add_ref_clinet_intervention NEW: Add Customer Ref on Intervention	2022-05-21 22:36:17 +02:00
Laurent Destailleur	2c2544d471	Fix scrutinizer	2022-05-21 15:31:08 +02:00
Laurent Destailleur	d38b9187f3	Merge branch 'develop' into dev_new_add_ref_clinet_intervention	2022-05-21 10:48:09 +02:00
Laurent Destailleur	21c3f27e72	Merge pull request #20941 from inovea-conseil/FIX#20448 FIX#20448 missing preg_replace for vat rate when adding a free line	2022-05-21 10:33:41 +02:00
IC-Ilies	c12ae28ad7	FIX#20448 missing preg_replace for vat rate when adding a free line	2022-05-21 09:31:33 +02:00
Maxime Kohlhaas	0d7386ab89	Fix select projet on event creation	2022-05-21 01:23:39 +02:00
Laurent Destailleur	ef32179ba7	Merge pull request #20935 from atm-maxime/fix_fields_check_enabled Fix : fields must check module enabled	2022-05-21 00:48:22 +02:00
Maxime Kohlhaas	cff5ec8605	Fix : fields must check module enabled	2022-05-21 00:08:18 +02:00
Laurent Destailleur	d9dbfd063b	Debug v16	2022-05-20 23:34:58 +02:00
Florian HENRY	8af848c539	add Ref client in PDF and send to propal on create	2022-05-20 10:40:59 +02:00
Laurent Destailleur	4b996f79a9	Debug v16	2022-05-19 13:52:29 +02:00
Laurent Destailleur	7fd3bb0aae	Remove deprecated code	2022-05-19 12:08:03 +02:00
Laurent Destailleur	09cf9e82f8	Debug v16	2022-05-19 11:47:43 +02:00
Laurent Destailleur	5f9ef61d32	Debug v16	2022-05-19 09:36:47 +02:00
Laurent Destailleur	38aced687b	Fix scrutinizer	2022-05-18 23:52:43 +02:00
Laurent Destailleur	6d848edba7	Fix scrutinizer	2022-05-18 23:28:53 +02:00
Laurent Destailleur	25e70bead8	phpcs	2022-05-18 23:27:26 +02:00
Laurent Destailleur	177e8c17fb	Fix scrutinizer	2022-05-18 11:23:21 +02:00
Laurent Destailleur	68b25b35b4	Look and feel v16	2022-05-17 23:53:36 +02:00
Laurent Destailleur	a483af70df	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/contrat/index.php	2022-05-17 23:27:11 +02:00
Laurent Destailleur	c475789433	Debug v16	2022-05-17 23:23:50 +02:00
atm-lena	f18dc89bdf	Add ddate signature in fetch propal	2022-05-17 16:26:43 +02:00
Laurent Destailleur	4de50da0dd	Repare code to forbidden var_dump() into code	2022-05-17 14:55:38 +02:00
Christophe Battarel	2b59b677bf	Merge branch 'develop' into PROPAL_SKIP_ACCEPT_REFUSE	2022-05-16 14:17:13 +02:00
Laurent Destailleur	a92974c818	Fix typo	2022-05-16 14:08:16 +02:00
Christophe Battarel	7cf581148c	change buttons labels	2022-05-16 12:20:58 +02:00
stickler-ci	f70a9ad04c	Fixing style errors.	2022-05-11 13:42:27 +00:00
Gauthier PC portable 024	da2a8a59f3	Merge branch '14.0_NEW_rang_on_api_put_line' of github.com:atm-gauthier/dolibarr into NEW/can_update_rank_on_api_put_function	2022-05-11 14:38:16 +02:00
Gauthier PC portable 024	b053dee279	NEW : update rank line is possible on API for orders propal and supplier invoice	2022-05-11 14:26:21 +02:00
Laurent Destailleur	fc718e68ee	css	2022-05-10 11:38:56 +02:00
Laurent Destailleur	720a09dacb	Fix regression	2022-05-09 15:57:10 +02:00
Laurent Destailleur	522c092aeb	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2022-05-09 09:26:10 +02:00
Laurent Destailleur	b3b6337c4c	Merge branch 'develop' into NEW_deposit_payment_terms	2022-05-08 23:09:06 +02:00
Laurent Destailleur	6592eb5d73	Debug for php 8.1	2022-05-08 18:25:22 +02:00
Laurent Destailleur	bdc80d22ea	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2022-05-04 01:23:25 +02:00
Laurent Destailleur	a99e647348	Merge pull request #20658 from Hystepik/develop#1 NEW #20653 edit discount pourcentage for all lines in one shot	2022-05-04 01:20:49 +02:00
Laurent Destailleur	0a7d7d503b	Make syntax for field_, titlefieldcreate, valuefieldcreate standard.	2022-05-04 00:52:49 +02:00
Philippe GRAND	356bc0d1e5	fix : do not display html tags into list	2022-05-03 17:41:26 +02:00
Laurent Destailleur	fa7254be9a	Fix picto and perm	2022-05-03 17:05:14 +02:00
Laurent Destailleur	8023e1b0cd	Debug v16	2022-04-30 20:41:18 +02:00
Laurent Destailleur	2e1dfc9a43	Fix method "file" for external URLs is forbidden.	2022-04-30 20:06:08 +02:00
Laurent Destailleur	c96e3bdddf	PHP v8 compatibility	2022-04-30 19:50:20 +02:00
Laurent Destailleur	147e61472c	Clean code: Remove all &ensp; entities.	2022-04-29 13:10:28 +02:00
Laurent Destailleur	708d3610a5	Look and feel v16	2022-04-29 13:04:29 +02:00
lmarcouiller	a77ae1ecd9	fix style errors	2022-04-15 14:31:59 +02:00
lmarcouiller	1ccf209c47	Close #20653 : edit discount pourcentage	2022-04-15 14:31:44 +02:00
Laurent Destailleur	0145fbebb6	Merge pull request #20626 from bb2a/formquestion-clone-order-or-propal FIX - add morecss select_compagny	2022-04-14 21:05:09 +02:00
Laurent Destailleur	fa010f401a	Merge pull request #20639 from FHenry/dev_new_date_sign_in_propal_list NEW: Add column date Signature on propal list	2022-04-14 21:03:43 +02:00
Florian HENRY	f15438dd03	NEW: data sign on propal list	2022-04-14 12:28:51 +02:00
BB2A Anthony Berton	d154696c32	morecss select_compagny	2022-04-13 16:15:07 +02:00
Laurent Destailleur	cb15a21e41	Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/commonobject.class.php htdocs/core/tpl/originproductline.tpl.php htdocs/fourn/facture/card.php htdocs/install/mysql/migration/14.0.0-15.0.0.sql htdocs/user/card.php	2022-04-11 21:22:27 +02:00
Laurent Destailleur	3ac268c200	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 Conflicts: htdocs/core/lib/security.lib.php htdocs/holiday/card.php htdocs/user/card.php	2022-04-11 21:14:51 +02:00
Laurent Destailleur	631d2da6b3	Fix php8	2022-04-09 03:26:38 +02:00
Gauthier PC portable 024	83e8e07416	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop	2022-04-08 09:25:08 +02:00
Marc de Lima Lucio	6e0888ca0e	FIX: action comm list: holiday last day not included + handle duration with halfdays	2022-04-07 17:17:20 +02:00
Laurent Destailleur	26c3e235cf	Merge pull request #19459 from frederic34/productmerge can merge products	2022-04-07 15:02:03 +02:00
Laurent Destailleur	0ed7c643f8	Close #20547	2022-04-07 13:28:24 +02:00
Laurent Destailleur	4693ef42bd	Enhance responsive	2022-04-07 11:18:56 +02:00
Laurent Destailleur	f17db2a919	Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop	2022-04-05 15:33:29 +02:00
Laurent Destailleur	40ad12c3c3	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0	2022-04-05 15:29:54 +02:00
bomuux	63016b79ea	Bug: Cannot set thirdparty customer accountancy code to empty string When thirdparty customer accountancy code is set to a non empty string, one cannot set it back to empty string due to thirdparty property deprecation : code_compta to code_compta_client	2022-04-05 14:06:52 +02:00
bomuux	b03d7c60ff	Bug: Cannot set thirdparty customer accountancy code to empty string When thirdparty customer accountancy code is set to a non empty string, one cannot set it back to empty string due to thirdparty property deprecation : code_compta to code_compta_client	2022-04-04 18:06:11 +02:00
Atm-Gregr	53b185ce9c	fix condition on remx	2022-04-04 10:19:51 +02:00
Laurent Destailleur	5b91ae062f	All triggers with a name XXX_UPDATE have been renamed XXX_MODIFY for code consistency purpose.	2022-04-02 10:31:58 +02:00
Laurent Destailleur	a51c868a8e	Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/card.php	2022-04-01 14:40:50 +02:00
Laurent Destailleur	d0ee40e55d	# WARNING: head commit changed in the meantime Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0	2022-04-01 14:39:10 +02:00
Laurent Destailleur	106e3072dc	Update card.php	2022-04-01 13:20:40 +02:00
Laurent Destailleur	a3dbcd0c27	Clean language files	2022-04-01 13:09:11 +02:00
Florian HENRY	e7db103b57	fix: on update with action reminder in future there is user key error	2022-03-31 18:55:54 +02:00
Laurent Destailleur	7b84b3e92d	css	2022-03-31 13:27:14 +02:00
ATM john	c1d9ea95dc	fix function name	2022-03-30 12:16:17 +02:00
Laurent Destailleur	95dc25587c	Standardize code of the fetch_lines()	2022-03-28 13:50:47 +02:00
Laurent Destailleur	78ee498151	Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop	2022-03-26 16:13:54 +01:00
Marc de Lima Lucio	cbba7d7d5f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms	2022-03-25 16:14:53 +01:00
Laurent Destailleur	488b35d096	Merge pull request #20232 from hregis/fix_missing_advanced_perms FIX missing advanced perms	2022-03-24 20:32:58 +01:00
Laurent Destailleur	6438a99960	Fix php syntax	2022-03-24 11:48:51 +01:00
Laurent Destailleur	6abeb2804e	Fix phpcs	2022-03-24 11:47:12 +01:00
Laurent Destailleur	4a80f35aaa	Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/commande/class/commande.class.php htdocs/fourn/class/fournisseur.commande.class.php	2022-03-23 17:26:25 +01:00
Laurent Destailleur	c620757dbc	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 Conflicts: htdocs/comm/propal/list.php htdocs/langs/en_US/projects.lang htdocs/product/price.php htdocs/reception/class/reception.class.php	2022-03-23 17:23:21 +01:00
Laurent Destailleur	32f2499c36	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 Conflicts: htdocs/comm/propal/list.php htdocs/langs/en_US/projects.lang htdocs/langs/en_US/propal.lang htdocs/product/price.php htdocs/projet/card.php htdocs/reception/class/reception.class.php	2022-03-23 17:04:31 +01:00
Laurent Destailleur	94224e9275	Merge pull request #20255 from Easya-Solutions/new-proposal-clone-update-prices NEW option update prices on proposal cloning	2022-03-23 16:49:12 +01:00
Laurent Destailleur	a06fc4691b	Merge pull request #20394 from hregis/new_add_hook_in_commercialindex NEW add hooks in commercial index	2022-03-23 16:05:12 +01:00
Laurent Destailleur	bc9ec3e2b9	Merge pull request #20395 from hregis/fix_uniformize_with_element_name FIX uniformize with element name "contact"	2022-03-23 16:04:53 +01:00
Laurent Destailleur	a5e9970866	Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2022-03-22 16:58:57 +01:00
Marc de Lima Lucio	3aae8cc3bb	FIX: propal list: bad error management for set not ssigned mass action	2022-03-22 10:54:04 +01:00
Marc de Lima Lucio	d4f55ae116	FIX: propal list: bad error management in mass actions	2022-03-22 10:11:10 +01:00
Laurent Destailleur	6c0e333c7d	Fix we must user relative timezone of date.	2022-03-20 16:33:35 +01:00
Laurent Destailleur	8603d493ad	Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/contrat/list.php htdocs/install/mysql/tables/llx_partnership.key.sql	2022-03-19 17:34:26 +01:00
Laurent Destailleur	ed631b2b06	Fix doxygen, missing error message	2022-03-18 16:14:20 +01:00
Regis Houssin	b70d3eb8eb	FIX uniformize with element name "contact"	2022-03-18 12:05:59 +01:00
Regis Houssin	56280f340f	NEW add hooks in commercial index	2022-03-18 11:55:45 +01:00
Laurent Destailleur	167df9593b	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 Conflicts: htdocs/comm/action/card.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/langs/en_US/products.lang htdocs/reception/class/reception.class.php	2022-03-17 19:08:51 +01:00
lvessiller	a4508e656c	NEW pull develop	2022-03-17 12:20:15 +01:00
Laurent Destailleur	62f6686ad0	Merge pull request #20311 from Easya-Solutions/14.0_fix_error_propagation_and_triggers_position_on_delete_propal_line [FIX] errors propagation and trigger position on delete proposal line	2022-03-17 02:35:30 +01:00
Laurent Destailleur	143660799b	Clean code using dolGetFirstLineOfText()	2022-03-16 21:22:03 +01:00
Florian HENRY	a028e795f7	add missing colspan	2022-03-16 13:54:21 +01:00
BB2A Anthony Berton	a1ac38ae03	entity	2022-03-12 21:03:11 +01:00
BB2A Anthony Berton	368a247f95	New method	2022-03-12 18:53:27 +01:00
BB2A Anthony Berton	4f4c95344e	Other	2022-03-12 16:36:32 +01:00
BB2A Anthony Berton	db799d7913	comm card propal preview	2022-03-12 16:00:22 +01:00
BB2A Anthony Berton	f3f1c9ba78	comm card order	2022-03-12 15:54:25 +01:00
Regis Houssin	c9cc067075	FIX missing parenthesis	2022-03-11 10:48:51 +01:00
Regis Houssin	e59befa76b	Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into fix_missing_advanced_perms	2022-03-11 10:46:14 +01:00
Gauthier PC portable 024	5b715978e4	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop	2022-03-10 10:02:57 +01:00
kamel	1f00dff4da	Correction Stickler CI / stickler-ci	2022-03-09 11:40:26 +01:00
kamel	e06c386507	Fix errors propagation and trigger position on delete proposal line	2022-03-09 11:32:07 +01:00
Marc de Lima Lucio	4efcbe8799	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms	2022-03-08 15:23:52 +01:00
Marc de Lima Lucio	1993a8d7b1	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms	2022-03-08 15:07:37 +01:00
lvessiller	2561fcbb85	FIX translate update prices and add const in proposal setup	2022-03-08 10:06:57 +01:00
Laurent Destailleur	6bb49797f8	Merge pull request #20243 from JohnXLivingston/fix_template_name_typo Fix: typo in template name	2022-03-07 14:55:02 +01:00
Laurent Destailleur	2142440b6c	Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/action/index.php htdocs/langs/en_US/errors.lang	2022-03-07 13:23:47 +01:00
Laurent Destailleur	f4cb5810a7	FIX list of visible type of event was not correctly filtered FIX Error management on mass action "Approve holiday"	2022-03-07 12:01:34 +01:00
Florian HENRY	801402f46a	fix: #20267	2022-03-04 11:58:52 +01:00
lvessiller	6c172d6441	NEW option update prices on proposal cloning	2022-03-03 11:58:29 +01:00
John Livingston	1ece554c92	Fix: typo in template name There was a typo in generated HTML comment.	2022-03-01 17:39:38 +01:00
Laurent Destailleur	358f21f06e	Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.formother.class.php htdocs/core/customreports.php	2022-03-01 16:48:29 +01:00
Laurent Destailleur	bd288f980d	FIX On large proposal or invoice, fix n(n+1) sql into a n sql.	2022-03-01 14:52:47 +01:00
Regis Houssin	e5fd11c8e0	FIX missing advanced perms	2022-03-01 09:28:38 +01:00
Frédéric FRANCE	018fc53554	Merge remote-tracking branch 'upstream/develop' into productmerge	2022-02-27 08:40:01 +01:00
Laurent Destailleur	409da7f091	Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop	2022-02-25 19:17:41 +01:00
Laurent Destailleur	f8a5749fc4	# WARNING: head commit changed in the meantime Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0	2022-02-25 19:00:10 +01:00
Laurent Destailleur	73b04deb19	Fix error management.	2022-02-23 00:17:49 +01:00
Laurent Destailleur	e96061dd18	Fix phpunit SecurityTest	2022-02-22 23:46:57 +01:00
Frédéric FRANCE	b277ab9ee3	Merge remote-tracking branch 'upstream/develop' into productmerge	2022-02-22 21:49:17 +01:00
Laurent Destailleur	3697cb9ca4	Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/reception/class/reception.class.php	2022-02-17 11:34:54 +01:00
Laurent Destailleur	cebada1966	Merge pull request #20071 from frederic34/patch-1 NEW Hook getNomUrl available everywhere in tooltip of ref links	2022-02-16 20:36:02 +01:00
Laurent Destailleur	aad292b41b	Merge pull request #20074 from altairisfr/fix_parentline_13.0 More generic management of parentline	2022-02-16 20:25:04 +01:00
lvessiller	7e17167faf	NEW total mark rate in list	2022-02-16 11:45:29 +01:00
Frédéric FRANCE	eb77f10d7b	Merge remote-tracking branch 'upstream/develop' into productmerge	2022-02-15 19:11:24 +01:00
Frédéric FRANCE	c8640f329e	add missing global	2022-02-15 18:31:05 +01:00
Frédéric FRANCE	0ba912b1e5	add missing global	2022-02-15 18:14:44 +01:00
Frédéric FRANCE	a6a1e3886a	Update propal.class.php	2022-02-15 11:03:50 +01:00
Frédéric FRANCE	b2815c4973	add hook in propal tooltip	2022-02-15 10:53:33 +01:00
Christophe Battarel	288c58e533	fix parent line on propal	2022-02-15 10:41:21 +01:00
Laurent Destailleur	271e9da425	Add option MAIN_STORE_FULL_EVENT_IN_GMT to fix TZ pb with full day event	2022-02-11 15:15:50 +01:00
Laurent Destailleur	b84fd3ec3d	Clean code	2022-02-11 12:46:45 +01:00
Laurent Destailleur	27df3cc02c	FIX events on several days may missing the last day in calendar view. FIX the drag and drop was not available on some events	2022-02-11 11:27:50 +01:00
Laurent Destailleur	30d7f807e4	Fix url	2022-02-10 21:03:10 +01:00
lvessiller	241a65e2ae	NEW add margin info in proposal and order list	2022-02-03 10:39:03 +01:00
Laurent Destailleur	44bc197d03	Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop	2022-02-01 13:25:45 +01:00
Laurent Destailleur	d167e022eb	Debug v15	2022-01-31 12:08:51 +01:00
Laurent Destailleur	2fea78c90a	Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/install/mysql/data/llx_c_action_trigger.sql	2022-01-29 16:48:40 +01:00
Laurent Destailleur	d75dd51bb7	Clean code to debug fulldayevent	2022-01-29 00:39:20 +01:00
Gauthier PC portable 024	3abe391f65	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop	2022-01-28 15:08:02 +01:00
Laurent Destailleur	eb336c81a1	Merge pull request #19926 from aspangaro/16a9 NEW API Proposals - Add POST lines	2022-01-26 12:06:33 +01:00
Alexandre SPANGARO	31787a99f0	NEW Proposal - Add filter on proposal get lines	2022-01-26 08:50:57 +01:00
stickler-ci	71876755d2	Fixing style errors.	2022-01-26 06:35:26 +00:00
Alexandre SPANGARO	68ba60896f	Copyright	2022-01-26 07:31:17 +01:00
Alexandre SPANGARO	30fd55addc	NEW API Proposals - Add POST lines	2022-01-26 07:29:37 +01:00
Laurent Destailleur	d06f570c23	Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop	2022-01-19 16:50:11 +01:00
Laurent Destailleur	60b90056c4	Fix #yogosha8450	2022-01-19 15:20:10 +01:00
Laurent Destailleur	1087ddb22f	Clean code	2022-01-18 14:00:38 +01:00
Laurent Destailleur	ebc3ef2f37	Removed no more used property	2022-01-18 13:52:09 +01:00
Laurent Destailleur	fb6e5f03f9	Clean code and translation	2022-01-18 13:44:52 +01:00
Laurent Destailleur	e19994c756	Fix drag event on week view	2022-01-18 00:07:45 +01:00
Laurent Destailleur	254ed31fb1	Fix combo	2022-01-17 23:47:23 +01:00
Laurent Destailleur	70e4705149	Clean code	2022-01-17 22:52:56 +01:00
Laurent Destailleur	0e44bfd4e4	Fix remove $_GET	2022-01-17 18:53:57 +01:00
Laurent Destailleur	9d067d74ab	Fix responsive	2022-01-17 17:51:03 +01:00
Laurent Destailleur	6826b373fd	css	2022-01-16 13:22:21 +01:00
Laurent Destailleur	f51554fd4d	Fix missing token	2022-01-13 20:40:42 +01:00
Laurent Destailleur	13510b9929	Clean sortfield, sortorder	2022-01-13 11:17:25 +01:00
Laurent Destailleur	8e2f76ca66	Merge pull request #17577 from OGPayet/feature/addThirdpartyCustomerCodeToEmailingSubstitutionArray add thirdparty customer code to substitutionarray	2022-01-11 13:31:32 +01:00
Laurent Destailleur	54cf91eda4	Update card.php	2022-01-11 13:31:16 +01:00
Gauthier PC portable 024	6799d48944	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop	2022-01-11 09:59:25 +01:00
Laurent Destailleur	60b2479389	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/action/list.php	2022-01-07 16:00:19 +01:00
Laurent Destailleur	7618966f81	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 Conflicts: htdocs/comm/action/list.php htdocs/core/class/utils.class.php htdocs/install/mysql/data/llx_20_c_departements.sql	2022-01-07 15:56:21 +01:00
Laurent Destailleur	37daf7764d	Merge pull request #19753 from atm-lena/13.0_FIX_ActionCommList_LateWarning FIX : late warning calculation on action comm list	2022-01-06 12:55:37 +01:00
stickler-ci	ec11be2480	Fixing style errors.	2022-01-06 10:31:50 +00:00
atm-lena	97d9b4571a	FIX : late warning calculation on action comm list	2022-01-06 11:21:46 +01:00
Laurent Destailleur	ef56631c80	FIX #yogosha8186	2022-01-03 18:15:19 +01:00
Laurent Destailleur	a49af456ce	Debug page customreports.php	2022-01-03 04:47:17 +01:00
Laurent Destailleur	3774eae510	Responsive	2022-01-02 15:08:46 +01:00
Laurent Destailleur	bdb03c8bd0	Fix responsive	2022-01-02 13:51:30 +01:00
Laurent Destailleur	a7d4aa9fb3	Responsive	2022-01-02 12:49:15 +01:00
Laurent Destailleur	7edba34107	Debug and secure the signature feature	2021-12-25 17:08:40 +01:00
Laurent Destailleur	0387b9922e	FIX error message on sqlfilter in API	2021-12-20 20:49:32 +01:00
Laurent Destailleur	19efa37e4b	Fix default value #19562	2021-12-19 20:55:24 +01:00
Laurent Destailleur	e2e2e69379	Fix bad link	2021-12-19 03:54:04 +01:00
Laurent Destailleur	4cd512738f	Merge pull request #19543 from mbinformatique68/develop FIX Get societe terms of payment if getpost terms of payment is 0 on creating propal	2021-12-16 18:19:29 +01:00
Laurent Destailleur	84400cf1d3	Fix backto page	2021-12-16 13:35:17 +01:00
Laurent Destailleur	bb1d5daa82	css	2021-12-12 23:47:40 +01:00
Laurent Destailleur	2bc417fcf7	FIX parameter $action replaced with $mode. $action reserved for action	2021-12-11 13:22:43 +01:00
Laurent Destailleur	b2611e4cdb	CSS	2021-12-10 13:56:51 +01:00
Laurent Destailleur	d80f83caf4	Clean code	2021-12-09 17:19:31 +01:00
Laurent Destailleur	69cd7ae2ab	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/don/card.php htdocs/public/test/badges.php htdocs/public/test/test_exec.php	2021-12-08 18:27:03 +01:00
Laurent Destailleur	d4501a6f67	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0	2021-12-08 18:21:56 +01:00
Laurent Destailleur	c3bfd5caa4	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 Conflicts: htdocs/adherents/type.php htdocs/asset/type.php htdocs/categories/edit.php htdocs/comm/action/card.php htdocs/compta/bank/card.php htdocs/contact/card.php htdocs/contact/list.php htdocs/core/class/extrafields.class.php htdocs/don/card.php htdocs/product/stock/card.php htdocs/projet/card.php htdocs/projet/tasks/task.php htdocs/user/group/card.php	2021-12-08 18:21:20 +01:00
Laurent Destailleur	f1dac82a53	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 Conflicts: htdocs/adherents/card.php htdocs/categories/edit.php htdocs/contact/card.php htdocs/core/class/extrafields.class.php htdocs/product/stock/card.php	2021-12-08 17:56:05 +01:00
Laurent Destailleur	6886cca1fa	CSS	2021-12-07 02:35:46 +01:00
Quentin VIAL-GOUTEYRON	826bde0656	FIX set optional from post	2021-12-06 11:19:12 +01:00
mbinformatique68	1e845434e0	Get societe terms of payment if getpost terms of payment is 0	2021-12-03 09:42:50 +01:00
atm-greg	db06de0ac2	add printFieldListHaving hook	2021-11-30 16:28:21 +01:00
Laurent Destailleur	8bace4c64e	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-11-30 16:24:42 +01:00
Laurent Destailleur	a298a845f1	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/bookkeeping/list.php htdocs/core/actions_massactions.inc.php htdocs/core/lib/functions.lib.php htdocs/core/lib/memory.lib.php htdocs/langs/en_US/holiday.lang htdocs/ticket/card.php	2021-11-30 16:24:18 +01:00
Laurent Destailleur	4189229b84	Merge pull request #19165 from Hystepik/develop#5 Fix: php 8.0 warning commercial part	2021-11-30 15:31:51 +01:00
Laurent Destailleur	31393802ff	Update card.php	2021-11-30 15:29:19 +01:00
Laurent Destailleur	efe4b2363a	Merge pull request #19514 from atm-greg/FIX_Uniformize_printFieldListFrom_hook uniformize hooks behaviour	2021-11-30 11:20:22 +01:00
atm-greg	71d4b3f082	add hook // Add from hooks	2021-11-29 17:02:57 +01:00
atm-greg	1dffc1c0fa	add hook to uniformize printFieldListFrom hook	2021-11-29 16:54:26 +01:00
Christian Foellmann	6608f5f0d8	update all script tags to be uniform. `language="javascript"` removed https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language	2021-11-29 15:09:18 +01:00
Frédéric FRANCE	661e404a14	fix tests	2021-11-24 22:56:32 +01:00
Frédéric FRANCE	ebc54f82e6	move actioncomm	2021-11-24 18:16:48 +01:00
Frédéric FRANCE	d601f62194	can merge products but experimental	2021-11-23 21:38:29 +01:00
Gauthier PC portable 024	2c2f456827	Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop	2021-11-23 11:10:01 +01:00
Gauthier PC portable 024	74f5c092dc	FIX : use $linecount = count($this->lines);	2021-11-23 10:44:43 +01:00
Gauthier PC portable 024	e02405edc9	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop	2021-11-22 16:23:26 +01:00
Gauthier PC portable 024	9840c1e0fa	Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop	2021-11-22 16:17:55 +01:00
Gauthier PC portable 024	e75b6ae0b4	FIX : it's better with an input number	2021-11-22 16:13:46 +01:00
Laurent Destailleur	441af6b6fb	Fix add rel="noopener noreferrer"	2021-11-22 02:35:55 +01:00
Laurent Destailleur	48d7378282	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog htdocs/comm/action/card.php htdocs/core/lib/functions.lib.php htdocs/filefunc.inc.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/langs/ar_IQ/bills.lang htdocs/langs/ar_IQ/cashdesk.lang htdocs/langs/ar_IQ/modulebuilder.lang htdocs/langs/ar_IQ/partnership.lang htdocs/langs/ar_IQ/propal.lang htdocs/langs/ar_IQ/stocks.lang htdocs/langs/ar_IQ/ticket.lang htdocs/langs/en_AE/admin.lang htdocs/langs/en_US/receptions.lang htdocs/langs/en_ZA/admin.lang htdocs/product/stock/class/mouvementstock.class.php htdocs/reception/class/reception.class.php	2021-11-19 23:14:39 +01:00
lmarcouiller	d1f5cb9184	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#5	2021-11-19 14:01:52 +01:00
lmarcouiller	3bcafb548a	fix errors	2021-11-19 14:01:37 +01:00
Gauthier PC portable 024	72614ecc0d	Merge branch 'NEW/addline_with_position_choice_develop' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop	2021-11-16 16:43:01 +01:00
Gauthier PC portable 024	375dcf7028	FIX : dev name	2021-11-16 16:42:48 +01:00
stickler-ci	19171d4f8e	Fixing style errors.	2021-11-16 15:15:55 +00:00
Gauthier PC portable 024	9d41c1390d	Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop	2021-11-16 14:20:24 +01:00
Gauthier PC portable 024	1e0d7d92a9	NEW : addline with position choice when MAIN_VIEW_LINE_NUMBER is enabled	2021-11-16 14:09:18 +01:00
Florian HENRY	bc64aba3a6	FIX: preselect task on create event from task	2021-11-16 13:43:08 +01:00
Laurent Destailleur	897b00faf0	Clean code	2021-11-05 14:23:19 +01:00
Laurent Destailleur	960319fd8a	dol_htmlentities is better for future than htmlentities	2021-11-01 10:33:54 +01:00
Laurent Destailleur	d21278b0ef	Merge branch 'develop' into fix_php8	2021-10-31 17:54:32 +01:00
Laurent Destailleur	40683720a3	Merge pull request #19182 from frederic34/propallist fix warnings in propal list	2021-10-31 17:51:52 +01:00
Laurent Destailleur	e1047afb05	Merge pull request #19194 from atm-florianm/FIX_minor_remove_two_unused_js_lines [minor] remove two unused js lines	2021-10-31 17:46:00 +01:00
Laurent Destailleur	8ebbe32781	Merge pull request #19205 from frederic34/patch-13 fix warnings	2021-10-31 17:34:46 +01:00
Laurent Destailleur	ef21b5ca78	Merge pull request #19206 from frederic34/patch-14 fix warning	2021-10-31 17:34:18 +01:00
Laurent Destailleur	0017c15974	Debug v15	2021-10-30 17:19:46 +02:00
Laurent Destailleur	fe7e1d4118	Look and feel v15	2021-10-29 09:40:38 +02:00
Marc de Lima Lucio	7e059c0a22	NEW: deposit payment terms: futureproof evolutions by storing field as a string	2021-10-28 16:53:28 +02:00
Marc de Lima Lucio	03c24b2274	FIX: deposit payment terms: getDictvalue() renamed to getDictionaryValue()	2021-10-28 16:51:59 +02:00
Marc de Lima Lucio	668088a63f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms	2021-10-28 15:54:18 +02:00
Laurent Destailleur	97d97af932	Clean: Remove fields for social networks (merged into "socialnetworks")	2021-10-27 16:39:34 +02:00
Laurent Destailleur	299376f221	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-10-26 01:32:37 +02:00
Laurent Destailleur	c376d40346	css	2021-10-26 01:30:00 +02:00
Scrutinizer Auto-Fixer	5567310e44	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2021-10-25 20:07:31 +00:00
Frédéric FRANCE	5469d49102	fix warning	2021-10-25 22:04:19 +02:00
Frédéric FRANCE	e3f4c70aea	Update list.php	2021-10-25 22:01:36 +02:00
Frédéric FRANCE	7638a2a8a0	fix warnings	2021-10-25 22:00:45 +02:00
Florian HENRY	52a4f4869d	Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_php8	2021-10-25 16:54:30 +02:00
Laurent Destailleur	28926ab174	Fix permission on page to set resource of an object	2021-10-25 16:25:32 +02:00
atm-florian	28c5b105ba	FIX: remove two lines of javascript referring to DOM elements that no longer exist in Dolibarr (form#move_event)	2021-10-25 11:20:28 +02:00
Florian HENRY	b282673f61	fix php8 warning	2021-10-25 09:01:05 +02:00
Frédéric FRANCE	677ac4635d	fix warnings in propal list	2021-10-24 14:34:47 +02:00
Lucas Marcouiller	051f6ca717	Fix: php 8.0 warning commercial part	2021-10-23 23:12:42 +02:00
Laurent Destailleur	ce4fe3f400	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-10-23 18:33:47 +02:00
Laurent Destailleur	8604f9b153	Clean DOM (remove ficheaddleft div)	2021-10-23 17:18:35 +02:00
Norbert Penel	64e58e305f	FIX #18893 : source was overwrited by mistake	2021-10-23 16:32:16 +02:00
Laurent Destailleur	06bc357409	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-10-23 14:49:50 +02:00
Laurent Destailleur	3f60cbbedc	Remove the div class="ficheaddleft"	2021-10-23 14:49:35 +02:00
Frédéric FRANCE	2d92e6006c	fix warnings	2021-10-23 07:04:13 +02:00
Florian HENRY	bb4eb2feea	Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_php8	2021-10-22 23:38:44 +02:00
Florian HENRY	1f1e01aa88	fix php 8 warning	2021-10-22 23:38:35 +02:00
Frédéric FRANCE	46c4f28478	fix multiple warnings	2021-10-22 22:15:59 +02:00
Laurent Destailleur	e43b33028c	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/adherents/card.php	2021-10-20 15:06:10 +02:00
Laurent Destailleur	c6ef6a162b	NEW Can edit fields of proposal when proposal is not yet signed	2021-10-19 22:20:23 +02:00
Laurent Destailleur	f4b5d14a34	Merge pull request #17536 from bb2a/Edit_in_propal [NEW] Add edit option in propal	2021-10-19 22:10:12 +02:00
Laurent Destailleur	12d211815b	Debug v15	2021-10-19 21:38:36 +02:00
Laurent Destailleur	c40a73162e	Look and feel v15	2021-10-18 21:20:58 +02:00
lvessiller	a52ceaf1d2	FIX generate documents with PDF options	2021-10-18 12:12:00 +02:00
Laurent Destailleur	b66155de4b	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/action/list.php htdocs/filefunc.inc.php	2021-10-17 13:30:13 +02:00
Laurent Destailleur	8bdece7101	CSS	2021-10-16 21:43:48 +02:00
Laurent Destailleur	f2757a63a1	Clean code	2021-10-16 20:06:58 +02:00
Laurent Destailleur	dd0809b528	Fix trans labels status	2021-10-16 19:37:57 +02:00
Laurent Destailleur	f8010dfcbc	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog htdocs/reception/list.php htdocs/takepos/pay.php	2021-10-16 13:01:03 +02:00
Marc de Lima Lucio	9a963da77c	FIX: deposit payment terms: adapt Form::form_conditions_reglement() calls to new parameter added in between PRs	2021-10-13 11:39:09 +02:00
Marc de Lima Lucio	29768a1c6e	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms	2021-10-13 11:33:04 +02:00
Anthony Berton	8bbbe7b8bb	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into Edit_in_propal	2021-10-11 12:11:08 +02:00
Laurent Destailleur	33761f9de3	Merge pull request #18917 from FHenry/NEW_dev_filter_from_dt_to_dt_actionlist NEW:Add filter from date to date into action/evt list	2021-10-11 11:51:48 +02:00
Laurent Destailleur	874731af84	The 'action=delete&file=...' has been replaced with 'action=deletefile&file=...' to avoid confusion with deletion of object lines.	2021-10-10 21:11:48 +02:00
lvessiller	be4a00213c	FIX optional visibility on create card	2021-10-08 15:58:08 +02:00
Florian HENRY	f52e2be10e	NEW:Add filter from date to date into action/evt list	2021-10-06 16:23:11 +02:00
Laurent Destailleur	ff56415c00	Merge pull request #18903 from aspangaro/15a21 HTML5 - <font> tag is deprecated, replace by <span>	2021-10-05 16:51:41 +02:00
Marc de Lima Lucio	9d92260ec1	FIX: deposit payment terms: fatal error for lack of inclusion on class Facture	2021-10-05 14:57:14 +02:00
Marc de Lima Lucio	8a647f3f5b	FIX: deposit payment terms: sql syntax error	2021-10-05 14:01:34 +02:00
Marc de Lima Lucio	4059b64288	FIX: deposit payment terms: langs	2021-10-05 13:00:25 +02:00
Marc de Lima Lucio	47b9941203	FIX: deposit payment terms: show correct percentage is proposal/order lists	2021-10-05 11:18:49 +02:00
Marc de Lima Lucio	337531f832	FIX: deposit payment terms: correctly restrict them to objet other than invoices and template invoices	2021-10-05 10:54:22 +02:00
Alexandre SPANGARO	c57aea1ead	HTML5 - <font> tag is deprecated, replace by <span>	2021-10-05 09:10:37 +02:00
Laurent Destailleur	950fccc186	Merge branch 'develop' into NEW_deposit_payment_terms	2021-10-04 19:06:42 +02:00
Marc de Lima Lucio	cfc78a17f7	FIX: deposit payment terms: bad test for already existing deposit	2021-10-04 18:21:28 +02:00
Marc de Lima Lucio	1b2494855d	NEW: deposit payment terms: set required invoice fields + filter payment terms with deposits in select + UI	2021-10-04 18:09:24 +02:00
Marc de Lima Lucio	087157890e	FIX: deposit payment terms: unused variable	2021-10-04 15:06:52 +02:00
Laurent Destailleur	b3cb56f2ef	Clean css	2021-10-04 04:14:31 +02:00
Laurent Destailleur	d064ab2b17	Add more action to GET action to check	2021-10-02 12:58:15 +02:00
Laurent Destailleur	157112758b	Fix phpcs	2021-09-30 20:14:59 +02:00
Laurent Destailleur	673a2982a5	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/opensurvey/card.php	2021-09-30 16:32:40 +02:00
Laurent Destailleur	ed264182c6	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 Conflicts: htdocs/admin/dict.php htdocs/comm/action/class/actioncomm.class.php htdocs/product/card.php htdocs/takepos/receipt.php	2021-09-30 16:28:42 +02:00
Laurent Destailleur	bb6399e12a	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 Conflicts: htdocs/admin/dict.php htdocs/comm/action/class/actioncomm.class.php htdocs/product/card.php	2021-09-30 16:21:36 +02:00
stickler-ci	f6b9336a82	Fixing style errors.	2021-09-30 10:59:29 +00:00
Marc de Lima Lucio	d74776622d	NEW: deposit payment terms: check invoice module activation + rights	2021-09-30 12:57:00 +02:00
stickler-ci	e1c5d01361	Fixing style errors.	2021-09-30 10:43:40 +00:00
Marc de Lima Lucio	81ddc6c0f6	NEW: deposit payment terms: generate deposit from proposal	2021-09-30 12:41:07 +02:00
Marc de Lima Lucio	b0aa502ed4	NEW: deposit payment terms: set deposit percentage in proposals/orders + get from origin document or company	2021-09-29 14:51:30 +02:00
Marc de Lima Lucio	4d6c1d892b	NEW: deposit payment terms: set deposit percentage in company card	2021-09-29 14:03:35 +02:00
Marc de Lima Lucio	004b52f590	NEW: deposit payment terms: add field into CRUD methods	2021-09-29 12:05:38 +02:00
Laurent Destailleur	e15277bb6c	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-09-28 17:23:07 +02:00
Alexandre SPANGARO	43ed88f056	FIX Propal list - Problem of pagination on date	2021-09-27 23:02:19 +02:00
Laurent Destailleur	d4cc60640b	Clean code	2021-09-27 15:41:58 +02:00
Laurent Destailleur	37603b451a	Fix token in url	2021-09-27 12:24:01 +02:00
Laurent Destailleur	0176ab6057	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/bookkeeping/list.php	2021-09-27 11:40:47 +02:00
Laurent Destailleur	c9ae46db50	FIX Filter on categories	2021-09-27 11:34:26 +02:00
Laurent Destailleur	bb5eb9e292	FIX Filter on categories	2021-09-26 20:56:17 +02:00
lmarcouiller	f88d12f55d	Fix #18809 : error on client tooltip	2021-09-24 11:16:34 +02:00
Laurent Destailleur	38b8ed9092	Merge pull request #18792 from cfoellmann/PR/minor-button-fixes another set of cleanup for action buttons	2021-09-24 01:55:25 +02:00
Laurent Destailleur	27c41946b7	Merge pull request #18182 from atm-jpb/NEW_field_in_service_object NEW : field and behavior in product object	2021-09-23 12:14:09 +02:00
Christian Foellmann	08b395e127	another set of cleanup for action buttons	2021-09-22 08:43:30 +02:00
kamel	9266b4e8fd	FIX Button text on proposal card for create a invoice	2021-09-21 19:44:49 +02:00
Laurent Destailleur	8cfccdcc5f	Merge pull request #18782 from OPEN-DSI/fix_00017 FIX Button text on proposal card for create a invoice	2021-09-21 19:44:05 +02:00
kamel	86a6e8af1f	FIX Button text on proposal card for create a invoice	2021-09-21 14:15:17 +02:00
Laurent Destailleur	deb1965cd5	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/action/card.php htdocs/compta/paiement/list.php htdocs/core/class/commonobject.class.php htdocs/mrp/mo_list.php htdocs/projet/tasks/task.php htdocs/public/payment/newpayment.php	2021-09-20 17:15:12 +02:00
Laurent Destailleur	1d597e8a72	Fix add unset* action as sensible GET actions	2021-09-19 18:03:38 +02:00
Laurent Destailleur	5c8fb38426	Fix add del* action into list of sensitive actions	2021-09-19 14:41:46 +02:00
Laurent Destailleur	1f76165e46	Fix do not show link on objects for object with existing hard link field	2021-09-19 01:35:42 +02:00
Laurent Destailleur	96436cac3d	FIX unprivileged user can attach agenda with leave.	2021-09-19 00:50:23 +02:00
Laurent Destailleur	89e8f24e15	Fix CSRF protection for all massactions	2021-09-18 22:38:25 +02:00
Laurent Destailleur	d760686239	Fix case of newtoken()	2021-09-18 22:24:00 +02:00
Laurent Destailleur	0749d01c5a	Fix add action delete* as sensitive action	2021-09-18 22:04:41 +02:00
Laurent Destailleur	8bdc53f469	Fix Add action classify as sensitive actions	2021-09-18 20:49:24 +02:00
Laurent Destailleur	7dfedd242a	Fix add confirm_deleteline as sensitive action	2021-09-18 19:43:38 +02:00
Laurent Destailleur	62b721a904	Add deletecontact as sentitive action Replace dol_buildpath with DOL_URL_ROOT	2021-09-18 19:34:46 +02:00
Laurent Destailleur	675a30d500	Fix phpcs	2021-09-17 19:42:41 +02:00
Laurent Destailleur	3d9be1437a	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 Conflicts: htdocs/comm/action/class/actioncomm.class.php htdocs/compta/paiement/list.php htdocs/fourn/paiement/list.php htdocs/projet/tasks/time.php	2021-09-17 12:29:58 +02:00
Laurent Destailleur	b546f21ef4	Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 13.0 Conflicts: htdocs/comm/action/class/actioncomm.class.php	2021-09-17 12:21:25 +02:00
Julien Gainza	65c4a21898	FIX move fetch_optionnal into $ac_static->fetch()	2021-09-13 16:35:13 +02:00
Laurent Destailleur	fa28621709	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/reception/list.php	2021-09-09 16:11:29 +02:00
Laurent Destailleur	5406e3d34e	Fix phpcs	2021-09-09 16:06:16 +02:00
Laurent Destailleur	5d5b7c3af4	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 Conflicts: htdocs/comm/action/peruser.php htdocs/main.inc.php	2021-09-09 15:15:26 +02:00
Laurent Destailleur	ff74fbdf16	Update card.php	2021-09-09 02:37:47 +02:00
Laurent Destailleur	034c5651c8	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/eventorganization/class/conferenceorbooth.class.php htdocs/langs/en_US/eventorganization.lang htdocs/public/eventorganization/attendee_subscription.php	2021-09-08 22:13:35 +02:00
Laurent Destailleur	4705d41ed2	FIX Relative discount with high nb of decimals	2021-09-08 22:00:16 +02:00
Regis Houssin	52419f28c5	FIX add DISTINCT	2021-09-07 12:38:15 +02:00
Regis Houssin	4aaaa8e21a	FIX multicompany transverse mode compatibility	2021-09-07 12:10:35 +02:00
Julien Gainza	9d89e48d15	Fix : Add extrafields on API "get events list"	2021-09-06 15:55:33 +02:00
jpb	65a2486f94	merge conflict	2021-09-06 09:43:52 +02:00
Laurent Destailleur	ee066ad725	Cast sql var	2021-09-03 21:25:43 +02:00
Laurent Destailleur	248e68aada	Code comment	2021-09-03 13:39:08 +02:00
Laurent Destailleur	77e9f15360	Work on #18448	2021-09-02 22:52:17 +02:00
henrynopo	4c1d857991	Update remx.php	2021-09-02 19:36:48 +02:00
Laurent Destailleur	b217c5d43e	Merge pull request #18537 from henrynopo/patch-15 Fix error no value of multicurrency discount amount consumed as payment to invoice	2021-09-02 19:36:12 +02:00
Laurent Destailleur	8193e792b5	Fix responsive	2021-09-01 22:39:01 +02:00
Laurent Destailleur	1bce356efa	Fix responsive	2021-09-01 21:34:59 +02:00
Laurent Destailleur	a7b0a837d4	Fix cancel button must be named "$cancel" everywhere.	2021-09-01 18:46:06 +02:00
Laurent Destailleur	4810db3dbf	Merge pull request #18498 from GurvanKervern/undefVars2 Undef vars2	2021-09-01 18:36:26 +02:00
Laurent Destailleur	c4acfe5fc0	Merge pull request #18577 from Givriz/dev_2 Compatibility phpv8	2021-09-01 18:06:06 +02:00
Laurent Destailleur	38c0e93285	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/adherents/card.php htdocs/core/class/commonobjectline.class.php htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php htdocs/public/project/index.php	2021-09-01 17:52:04 +02:00
Laurent Destailleur	443827ff42	FIX #18531	2021-09-01 17:10:26 +02:00
Givriz	688d217bed	Compatibility phpv8	2021-09-01 16:39:28 +02:00
Laurent Destailleur	239599d1b1	Merge pull request #18564 from OPEN-DSI/new-agenda-ext-enable-default NEW can enable/disable external calendar by default	2021-09-01 13:44:12 +02:00
Laurent Destailleur	d2d7b0defd	Fix duplicate ;	2021-08-31 20:15:41 +02:00
lvessiller	163b12925a	FIX stickler-ci	2021-08-31 18:37:34 +02:00
lvessiller	6c2cf4377a	NEW can enable/disable external calendar by default	2021-08-31 18:14:16 +02:00
henrynopo	c9db6bfdf6	Update remx.php	2021-08-29 08:51:02 +08:00
Gurvan Kervern	39fcc53fa7	Update peruser.php	2021-08-29 00:51:01 +08:00
Laurent Destailleur	fb8723d884	Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons replace remaining SubmitCancel buttons	2021-08-28 18:39:06 +02:00
Laurent Destailleur	8b996627eb	Merge pull request #18462 from grandoc/new_branch_22_08_2021 fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\ht…	2021-08-28 18:35:40 +02:00
Laurent Destailleur	a5bb833a0a	Update peruser.php	2021-08-28 17:39:23 +02:00
Laurent Destailleur	64c4e25c02	Fix warning	2021-08-28 05:40:07 +02:00
Laurent Destailleur	aab6281ba6	Clean code	2021-08-28 05:38:40 +02:00
Laurent Destailleur	1b859fe723	Fix warning	2021-08-28 05:24:53 +02:00
Laurent Destailleur	2dd91bf312	Clean code	2021-08-27 23:36:06 +02:00
Laurent Destailleur	46d993c9a6	Clean code	2021-08-27 22:42:04 +02:00
Laurent Destailleur	2f225ee7e5	Clean code by adding cast int.	2021-08-27 16:33:03 +02:00
Anthony Berton	4880973ec5	Merge branch 'develop' into Edit_in_propal	2021-08-26 16:11:41 +02:00
stickler-ci	601cc865fb	Fixing style errors.	2021-08-25 10:54:09 +00:00
GurvanKervern	d34e44e55c	Fix undef vars 3 To remove PHP8 warnings	2021-08-25 18:02:57 +08:00
Christian Foellmann	f094b4c70c	fix up most of the remaining submit inputs	2021-08-24 17:04:17 +02:00
Philippe Grand	ff47bf5226	Update card.php	2021-08-24 16:46:21 +02:00
Philippe Grand	0286a2e75d	Update card.php	2021-08-24 16:42:04 +02:00
Laurent Destailleur	07ab352877	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/list.php	2021-08-24 16:37:18 +02:00
Christian Foellmann	227f61a711	replace remaining SubmitCancel buttons	2021-08-24 16:10:20 +02:00
Laurent Destailleur	22339a3ed3	Merge pull request #18451 from cfoellmann/PR/form-buttons-function improve forms - buttonsSaveCreate()	2021-08-24 15:26:03 +02:00
Laurent Destailleur	a6ddc90d5b	Fix responsive	2021-08-23 23:53:58 +02:00
Laurent Destailleur	dc006b0ebb	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.form.class.php	2021-08-23 19:44:02 +02:00
Laurent Destailleur	8485fee5f9	Cast numeric into on sql request	2021-08-23 19:33:24 +02:00
Laurent Destailleur	d4b5ee6c85	Fix cast into variable into sql request.	2021-08-23 17:41:11 +02:00
Philippe GRAND	ba9ede39bf	fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\htdocs\comm\propal\card.php on line 265	2021-08-22 22:28:53 +02:00
Philippe GRAND	665dfb48e4	fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\htdocs\comm\propal\card.php on line 125	2021-08-22 11:40:32 +02:00
Christian Foellmann	d706c3b1ec	use Forms::buttonsSaveCreate() to generate most of the Save\|Cancel forms combination	2021-08-20 14:41:30 +02:00
Laurent Destailleur	3ee4a6556a	Merge branch 'develop' into undefined	2021-08-19 13:43:32 +02:00
stickler-ci	172b672437	Fixing style errors.	2021-08-19 10:19:25 +00:00
Gurvan Kervern	476dfc289e	Update index.php	2021-08-19 18:16:47 +08:00
Laurent Destailleur	7af265db8a	Update card.php	2021-08-18 22:03:16 +02:00
Laurent Destailleur	1df2aeb233	Update card.php	2021-08-18 22:01:53 +02:00
stickler-ci	88b0408e42	Fixing style errors.	2021-08-18 13:57:19 +00:00
Gurvan Kervern	ab95c5f463	Update index.php	2021-08-18 21:55:00 +08:00
Gurvan Kervern	2d35106e0b	Update card.php	2021-08-18 17:52:21 +08:00
Laurent Destailleur	84073c6373	Merge branch 'develop' into patch-169	2021-08-17 19:31:30 +02:00
Laurent Destailleur	59479a4c6e	Merge pull request #18405 from atm-gauthier/NEW/printFieldListFrom_on_several_lists NEW : printFieldListFrom hook call on several lists	2021-08-17 15:58:28 +02:00
Laurent Destailleur	23083427e8	NEW Can use the result_mode of mysqli driver. Save memory for list count	2021-08-16 22:36:30 +02:00
Laurent Destailleur	06a0d922cc	NEW Can use the result_mode of mysqli driver. Save memory for list count	2021-08-16 22:01:58 +02:00
stickler-ci	af1f29bb16	Fixing style errors.	2021-08-16 11:22:49 +00:00
Gurvan Kervern	9f1ced1fd0	fix warnings 6 Removing PHP8 warnings	2021-08-16 19:06:38 +08:00
Gurvan Kervern	b0ea9fed0a	fix warnings 1 Removing all PHP8 warnings from error logs	2021-08-16 18:05:29 +08:00
Gauthier PC portable 024	b2dad4d2ce	Merge branch 'NEW/printFieldListFrom_on_commande_list' of github.com:atm-gauthier/dolibarr into NEW/printFieldListFrom_on_several_lists	2021-08-12 15:44:20 +02:00
Gauthier PC portable 024	22eda3fd63	NEW : add missing printFieldListFrom hook call on several lists	2021-08-12 15:39:52 +02:00
Laurent Destailleur	012eee7e06	Merge pull request #18317 from altairisfr/PROPAL_NOT_BILLABLE NEW : add constant PROPOSAL_ARE_NOT_BILLABLE	2021-08-11 21:00:53 +02:00
Francis Appels	68482c637b	Update actioncomm.class Property contactid should be contact_id	2021-08-06 18:45:25 +02:00
jpb	f99ba2c1e1	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_field_in_service_object	2021-08-04 17:26:23 +02:00
Laurent Destailleur	7245fcec11	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-08-04 00:09:51 +02:00
Laurent Destailleur	a571fab177	css	2021-08-03 23:54:36 +02:00
Christophe Battarel	f00694470f	rename constant to PROPOSAL_ARE_NOT_BILLABLE	2021-08-03 15:40:01 +02:00
Christophe Battarel	7a7287489d	NEW : add constant PROPAL_REOPEN_UNSIGNED_ONLY	2021-08-03 11:24:21 +02:00
Christophe Battarel	2998c94884	NEW : add constant PROPAL_NOT_BILLABLE	2021-08-03 11:12:19 +02:00
Christophe Battarel	dfbefed0f6	remove PROPAL_REOPEN_TO_DRAFT	2021-08-03 10:58:40 +02:00
Christophe Battarel	8e9d02efb7	draft close	2021-08-03 10:37:37 +02:00
Christophe Battarel	14567fb115	rename constant PROPAL_CLOSE_AS_SIGNED to PROPAL_SKIP_ACCEPT_REFUSE	2021-08-03 10:31:37 +02:00
Christophe Battarel	57729dfc83	NEW constant PROPAL_CLOSE_AS_SIGNED	2021-08-03 09:44:42 +02:00
Christophe Battarel	c3f3d41a26	NEW constant PROPAL_CLOSE_AS_SIGNED	2021-08-03 09:38:48 +02:00
Laurent Destailleur	0058e32207	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-08-02 19:03:38 +02:00
Laurent Destailleur	bd35d86268	Debug v14	2021-07-31 17:20:48 +02:00
jpb	15578c2ec2	merge conflict	2021-07-30 10:57:04 +02:00
Laurent Destailleur	079b014b14	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-07-26 00:41:35 +02:00
Laurent Destailleur	505543e18e	Fix #yogosha6704	2021-07-26 00:37:47 +02:00
Laurent Destailleur	062c39c40d	Fix html entities when we should not	2021-07-21 01:40:45 +02:00
stickler-ci	2f0ba41a53	Fixing style errors.	2021-07-20 13:35:10 +00:00
jpb	1237c5ba55	add msg to formconfirm on propal invoice and commande	2021-07-20 14:46:56 +02:00
BENKE Charlene	29bdbe02f2	Update index.php	2021-07-19 10:21:18 +02:00
Laurent Destailleur	0fd980b005	Update index.php	2021-07-14 13:57:17 +02:00
BENKE Charlene	7406f2cc85	a interventional drafts on commercial index	2021-07-14 12:55:33 +02:00
Laurent Destailleur	d91051488c	Merge pull request #18125 from fr69400/develop NEW add hookmanager on note pages	2021-07-11 20:25:16 +02:00
stickler-ci	cc4defd212	Fixing style errors.	2021-07-11 07:44:41 +00:00
fr69400	bf03a30a9f	Update note.php	2021-07-11 09:44:18 +02:00
stickler-ci	4272f93aa4	Fixing style errors.	2021-07-09 16:41:41 +00:00
fr69400	e45d5c1d0d	NEW add hookmanager on note pages	2021-07-09 18:36:21 +02:00
Laurent Destailleur	34f1cfe575	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/product/index.php	2021-07-07 02:09:53 +02:00
Laurent Destailleur	3bc896be57	Debug v14	2021-07-07 02:07:35 +02:00
Laurent Destailleur	48435eb911	Fix navigation links	2021-07-07 01:58:06 +02:00
Laurent Destailleur	ff94c60cc7	Fix GETPOST with restricthtml	2021-07-07 01:45:31 +02:00
Laurent Destailleur	ced4ea1314	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/propal/list.php htdocs/core/tpl/objectline_view.tpl.php	2021-07-06 15:59:59 +02:00
Laurent Destailleur	37801184c0	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 Conflicts: htdocs/comm/propal/list.php htdocs/holiday/class/holiday.class.php Fix case of newByMonth	2021-07-06 15:35:17 +02:00
Laurent Destailleur	c901e518a7	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-07-06 02:11:28 +02:00
Laurent Destailleur	3dff7e29cc	Fix #yogosha6567	2021-07-06 01:44:05 +02:00
Laurent Destailleur	5779a56ae0	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-07-04 21:23:53 +02:00
Laurent Destailleur	7013f01a41	Fix look and feel v14	2021-07-04 21:14:46 +02:00
Laurent Destailleur	f6efe51032	Fix trouble with product id = -1	2021-07-04 21:02:02 +02:00
Laurent Destailleur	9b7c0a9246	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2021-07-03 18:32:31 +02:00
Laurent Destailleur	6ae1d192e4	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 Conflicts: htdocs/comm/propal/list.php htdocs/compta/facture/card.php	2021-07-02 16:14:12 +02:00
Laurent Destailleur	8bade0e4e7	Fix add permission	2021-07-02 16:11:42 +02:00
Laurent Destailleur	5b34ea6c22	FIX permission to close a proposal when using advanced permissions	2021-07-01 03:06:40 +02:00
Laurent Destailleur	1a63a379cc	Fix missing permission	2021-07-01 03:03:59 +02:00
Francis Appels	b83f57da48	Fix some proposal php 8 warning	2021-06-29 16:26:48 +02:00
Laurent Destailleur	5dc82ccb71	Merge pull request #18023 from frederic34/patch-8 fix inexistent right	2021-06-26 12:18:42 +02:00
Frédéric FRANCE	fde23632ce	Update list.php	2021-06-24 20:20:50 +02:00
Frédéric FRANCE	aad45a8157	fix warnings in propal list	2021-06-24 20:15:57 +02:00
Frédéric FRANCE	7a2ec389a1	fix inexistent right	2021-06-24 18:57:22 +02:00
Laurent Destailleur	c03958a867	Fix look and feel v14	2021-06-23 19:02:14 +02:00
Laurent Destailleur	312968eeac	Clean code	2021-06-22 11:38:02 +02:00
Laurent Destailleur	05c0bc4fac	css	2021-06-22 10:44:49 +02:00
Laurent Destailleur	aca190d977	Fix css	2021-06-21 12:46:24 +02:00
Laurent Destailleur	ab2e50ef49	Fix css	2021-06-21 12:46:03 +02:00
Laurent Destailleur	88ff0e4795	Fix PHPCS	2021-06-18 00:59:18 +02:00
Laurent Destailleur	ceaa2a9c5e	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: .travis.yml htdocs/ticket/class/actions_ticket.class.php	2021-06-17 22:06:26 +02:00
Laurent Destailleur	10dadb2247	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-06-17 22:02:29 +02:00
Laurent Destailleur	51eaecdc6b	Fix phpcs	2021-06-17 22:02:06 +02:00
Laurent Destailleur	5063f29532	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 Conflicts: htdocs/comm/mailing/class/mailing.class.php htdocs/core/modules/expedition/doc/pdf_espadon.modules.php htdocs/product/stock/replenish.php	2021-06-17 21:35:31 +02:00
atm-lena	9769e33eab	notigger parameter	2021-06-17 10:41:55 +02:00
atm-lena	5b8a6f1d71	Add Trigger "MAILING_DELETE"	2021-06-17 10:41:03 +02:00
Laurent Destailleur	c4e8866727	Clean code	2021-06-16 21:20:27 +02:00
Laurent Destailleur	347c6ae8a8	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/langs/en_US/main.lang htdocs/projet/class/project.class.php htdocs/projet/list.php	2021-06-14 20:13:27 +02:00
Laurent Destailleur	d154ec2344	FIX Collector to create lead was broken	2021-06-14 20:06:52 +02:00
Laurent Destailleur	34cebe6aa3	Look and feel v14	2021-06-14 01:11:39 +02:00
Laurent Destailleur	95bea52984	Merge pull request #17854 from frederic34/patch-11 add warning if outstanding limit is exceeded	2021-06-10 12:19:50 +02:00
Laurent Destailleur	7b31ef0ff3	Fix warnings	2021-06-10 00:00:49 +02:00
Laurent Destailleur	fb46ece906	Fix yogosha 6347	2021-06-09 15:36:47 +02:00
Frédéric FRANCE	af6bbe23ca	add warning if outstanding limit is exceeded	2021-06-08 17:39:13 +02:00
Laurent Destailleur	fa4786a3f6	Fix permission	2021-06-08 16:19:21 +02:00
Laurent Destailleur	6eab0f5661	Fix css	2021-06-08 15:49:26 +02:00
Laurent Destailleur	f55be9fd3a	Merge pull request #17689 from DorianVabre/dev_EventOrganizer_suggest new: working on conference or booth object and event type #FoundationFunding	2021-06-04 13:12:32 +02:00
Laurent Destailleur	5a3d7663d1	Merge pull request #17764 from Hystepik/develop#3 Fix of a bug on mass mailing	2021-06-04 12:32:48 +02:00
Laurent Destailleur	920f8b0b58	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-06-04 12:29:04 +02:00
lmarcouiller	c77dee0922	changes to fetch after send	2021-06-04 12:27:50 +02:00
Laurent Destailleur	84f2e06b91	Merge pull request #17754 from frederic34/patch-16 fix warnings	2021-06-04 11:55:14 +02:00
Laurent Destailleur	ca1da3c83c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-06-04 11:53:21 +02:00
Laurent Destailleur	e73dad30bb	Warning	2021-06-04 11:53:12 +02:00
Laurent Destailleur	5650deec58	Merge branch 'develop' into patch-15	2021-06-04 11:52:29 +02:00
Laurent Destailleur	81cc8cef75	Merge pull request #17797 from Hystepik/develop#7 Fix propal/index.php error on thirdparty display	2021-06-04 09:07:53 +02:00
Frédéric FRANCE	ca66cdad01	debug intracomm report transport mode	2021-06-03 21:47:10 +02:00
lmarcouiller	431691cec4	Fix propal/index.php error on thirdparty display	2021-06-02 15:18:45 +02:00
lmarcouiller	05a966b93e	Fix of a bug on mass mailing	2021-05-28 10:29:46 +02:00
Frédéric FRANCE	e1a427f160	fix warnings	2021-05-27 22:40:26 +02:00
Frédéric FRANCE	3b381dccc3	fix warnings	2021-05-27 22:33:25 +02:00
Laurent Destailleur	2caaa52e85	Doc	2021-05-27 02:52:51 +02:00
Laurent Destailleur	4f61286ae2	Small perf fix	2021-05-27 02:36:16 +02:00
Dorian Vabre	fe6b25ede6	fix on $value	2021-05-26 09:48:13 +02:00
Frédéric FRANCE	9e3de39245	fix status/percent in sql it is a.datep as dp, not datep	2021-05-25 23:00:21 +02:00
Frédéric FRANCE	332d8c9105	fix warnings	2021-05-25 22:24:46 +02:00
Laurent Destailleur	a09db63c7b	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/bookkeeping/balance.php htdocs/contrat/list.php htdocs/don/class/api_donations.class.php htdocs/societe/class/societe.class.php	2021-05-25 20:17:54 +02:00
Laurent Destailleur	1b5f7b78b5	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-05-25 20:12:34 +02:00
Dorian Vabre	fe272d3292	wip name of contact to add on ics file	2021-05-21 16:01:44 +02:00
Dorian Vabre	720a368b29	link ics ok (todo: add name of speaker)	2021-05-20 17:24:27 +02:00
Dorian Vabre	307ab92bc0	Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganizer_suggest	2021-05-20 16:13:42 +02:00
Laurent Destailleur	91f85abb7e	Fix only comment to understand code are allowed	2021-05-20 14:55:37 +02:00
Sylvain Legrand	a3d1b49c65	Error in list when using alias name of thirdparty	2021-05-19 19:08:58 +02:00
Laurent Destailleur	cf0da5cee7	css	2021-05-19 15:00:44 +02:00
Laurent Destailleur	3550fa2be4	Fix css	2021-05-19 14:48:30 +02:00
Laurent Destailleur	92ccf5982a	Fix responsive	2021-05-19 14:38:39 +02:00
Laurent Destailleur	a8d36a3a55	Debug v14	2021-05-19 13:56:13 +02:00
Laurent Destailleur	8e39eff180	Look and feel v14	2021-05-18 18:18:00 +02:00
Adrien Raze	90d159fbc3	FIX : Missing hook in cibles.php (for mailing)	2021-05-18 14:58:46 +02:00
Laurent Destailleur	c2cb055b0a	Fix look and feel v14	2021-05-18 14:00:29 +02:00
Laurent Destailleur	2ef713bd5f	Merge branch 'develop' into look_feel_user_author_list	2021-05-18 12:27:30 +02:00
Laurent Destailleur	7b9161ec63	Merge pull request #17644 from bb2a/thirdparty_infos_list Add popup thirdparty info in list	2021-05-18 12:15:51 +02:00
Laurent Destailleur	b6dbe45242	Fix permissions on page to move position of file	2021-05-18 01:58:54 +02:00
Anthony Berton	6fe9fe330d	delete fetch	2021-05-17 23:54:31 +02:00
Anthony Berton	58db723502	thirdparty info popup list	2021-05-17 23:27:33 +02:00
Anthony Berton	31cd71d8a3	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into look_feel_user_author_list	2021-05-17 18:34:41 +02:00
Anthony Berton	9dcf2044a9	Update list.php	2021-05-17 18:33:27 +02:00
Anthony Berton	0b7f474dd3	look_feel user author in list	2021-05-17 18:04:21 +02:00
Laurent Destailleur	d0c634a99c	Merge pull request #17489 from Hystepik/develop#1 Fix #17475 : Add of List-Unsubscribe in mass emailing	2021-05-17 10:23:21 +02:00
Laurent Destailleur	a4f4cca895	Prefix length may have different length and be at a different place so i remove this tag. Must be replaced by a generic method to substring a substitution variable.	2021-05-17 08:36:49 +02:00
Laurent Destailleur	4768729c09	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/propal/list.php htdocs/commande/list.php htdocs/compta/facture/list.php htdocs/core/class/rssparser.class.php htdocs/core/tpl/admin_extrafields_view.tpl.php htdocs/core/tpl/extrafields_list_search_sql.tpl.php htdocs/expedition/list.php	2021-05-17 07:57:32 +02:00
Laurent Destailleur	ea78462167	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-05-17 07:33:37 +02:00
Laurent Destailleur	2f2ba933f8	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 Conflicts: htdocs/core/tpl/admin_extrafields_view.tpl.php htdocs/user/class/usergroup.class.php	2021-05-17 07:33:28 +02:00
Laurent Destailleur	5a15dbf545	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 Conflicts: htdocs/user/class/usergroup.class.php	2021-05-17 07:29:19 +02:00
Maxime Kohlhaas	db32f882e8	Fix use of DatePropal instead of Date	2021-05-15 07:45:04 +02:00
stickler-ci	50d4d28c14	Fixing style errors.	2021-05-14 11:54:50 +00:00
Ferran Marcet	ce6df0ee4a	FIX: Filter of the dates in the lists is lost	2021-05-14 13:50:12 +02:00
lmarcouiller	06c1817930	Update mailing-send script and mailling card	2021-05-12 09:21:28 +02:00
lmarcouiller	cd4583a841	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1	2021-05-12 09:08:19 +02:00
Laurent Destailleur	60dd26f21d	Fix do not lose selection if error	2021-05-11 22:10:40 +02:00
Laurent Destailleur	91312f0411	Fix url for emailing unsubscribe	2021-05-11 21:13:52 +02:00
Laurent Destailleur	207aa8550a	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-05-11 21:02:38 +02:00
Laurent Destailleur	dc2c5aa0a8	Add substitution __UNSUBSCRIBE_URL__ for link to unsubscribe Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/theme/eldy/global.inc.php htdocs/theme/eldy/info-box.inc.php	2021-05-11 21:02:27 +02:00
Laurent Destailleur	8cf99448e1	Merge pull request #17523 from bb2a/warhouse_mod_stock_activ Warehouse filter if stock activate and not sending	2021-05-11 20:43:28 +02:00
Pierre Payet	4ce81ee535	set new outside the loop, add fetch result check	2021-05-11 20:30:57 +02:00
Laurent Destailleur	780254bfd4	Merge pull request #17533 from daraelmin/daraelmin-mailing-subskey New substitution key for member new form url in mailing	2021-05-11 19:41:12 +02:00
Laurent Destailleur	8024e769fd	Merge pull request #17552 from aspangaro/14b2 Fix Title customer proposal	2021-05-11 18:55:02 +02:00
Pierre Payet	ff178667a3	add thirdparty customer code to substitutionarray	2021-05-11 12:33:35 +02:00
Dorian Vabre	e31d8f89f5	wip filter	2021-05-10 17:13:57 +02:00
Dorian Vabre	c85b75924f	wip on adding a filter for the ics file + fix on class name	2021-05-10 16:57:48 +02:00
Alexandre SPANGARO	6e9597cd90	Fix Title company customer card	2021-05-09 22:06:05 +02:00
Alexandre SPANGARO	c2319c0a20	Fix Title customer proposal info card	2021-05-09 21:19:13 +02:00
Alexandre SPANGARO	9cec7e5936	Fix Title customer proposal documents card	2021-05-09 21:15:54 +02:00
Alexandre SPANGARO	dbccb75294	Fix Title customer proposal notes card	2021-05-09 21:13:29 +02:00
Alexandre SPANGARO	dd76ff0f24	Fix Title customer proposal contact card	2021-05-09 21:11:14 +02:00
Alexandre SPANGARO	2dc2256545	Fix Title customer proposal card	2021-05-09 21:08:55 +02:00
daraelmin	22d9c4c166	Update card.php	2021-05-08 09:35:41 +02:00
daraelmin	2e1158934b	Copyright	2021-05-08 09:20:59 +02:00
daraelmin	33d68db9a1	add entity in new subst publiclink_newmemberform	2021-05-08 09:18:41 +02:00
Anthony Berton	2e50fde9aa	edit_in_propal	2021-05-07 22:13:53 +02:00
daraelmin	7c27e9f931	too much underscore	2021-05-07 17:19:33 +02:00
daraelmin	0173d8db5f	Add substitution key for membernewform url in mailing	2021-05-07 17:09:59 +02:00
lmarcouiller	b41a87ff70	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1	2021-05-07 12:06:46 +02:00
lmarcouiller	0f2ce8687d	Fix #17475 : Update of previous fix	2021-05-07 09:19:44 +02:00
Anthony Berton	d84b0bae9d	init	2021-05-06 23:23:50 +02:00
daraelmin	866857c111	Html link instead of url in substitutionarray	2021-05-04 21:57:59 +02:00
lmarcouiller	457a96bc34	Fix #17475 : Add of List-Unsubscribe in mass emailing	2021-05-04 15:11:30 +02:00
daraelmin	034378a958	Add online substitution keys link in mailing	2021-05-04 00:58:29 +02:00
Laurent Destailleur	9973085613	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/action/card.php htdocs/comm/propal/card.php htdocs/compta/bank/releve.php htdocs/compta/paiement/rapport.php htdocs/core/class/extrafields.class.php htdocs/core/modules/expedition/doc/pdf_espadon.modules.php htdocs/reception/card.php htdocs/societe/societecontact.php	2021-05-03 19:36:49 +02:00
Florian HENRY	9278228e20	FIX: create event from contact card preselect contact correctly	2021-05-03 18:08:49 +02:00
Laurent Destailleur	1c95e2b7c7	FIX #17453	2021-05-03 14:58:29 +02:00
Laurent Destailleur	d1f11d2e65	Merge pull request #17429 from fr69400/develop FIX formAddObjectLine cant be overloaded by hook	2021-05-03 13:16:45 +02:00
Laurent Destailleur	5a1f2db024	Clean sql	2021-04-30 10:57:21 +02:00
fr69400	96baa1ef49	wrong variable name	2021-04-29 17:36:45 +02:00
fr69400	d9e25c61bb	formAddObjectLine cant be overloaded by hook	2021-04-29 15:32:15 +02:00
Laurent Destailleur	655056ed31	Debug v14	2021-04-29 12:10:55 +02:00
Laurent Destailleur	4926ac1e24	Fix make protected method not visible	2021-04-28 15:25:06 +02:00
Laurent Destailleur	6dcee425a1	Update card.php	2021-04-28 15:07:31 +02:00
Sylvain Legrand	18d2bef8f3	Error 500 on propal card when we change the deadline if we don't use the automatic generation for PDF documents (MAIN_DISABLE_PDF_AUTOUPDATE is set to 1) when we change the deadline on a proposal we get an error 500.	2021-04-28 11:58:34 +02:00
Laurent Destailleur	d6cdfcdd8c	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/paiement/card.php htdocs/compta/paiement/class/paiement.class.php htdocs/public/members/new.php	2021-04-27 02:07:48 +02:00
Laurent Destailleur	48a50f3b10	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 Conflicts: htdocs/compta/paiement/card.php htdocs/compta/paiement/class/paiement.class.php	2021-04-27 01:58:19 +02:00
Laurent Destailleur	804eac55e9	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2021-04-27 01:46:04 +02:00
Laurent Destailleur	e9b8e81773	Update advtargetemailing.class.php	2021-04-27 01:45:10 +02:00
Laurent Destailleur	539954f760	Clean code	2021-04-27 01:12:40 +02:00
Laurent Destailleur	d2b91e934a	Clean code	2021-04-27 01:09:46 +02:00
Laurent Destailleur	f54d14bfd6	Add method checkValForAPI to clean data from API input	2021-04-27 01:05:14 +02:00
Laurent Destailleur	d138e7410b	Clean code	2021-04-26 19:12:23 +02:00
Laurent Destailleur	87393cee98	Clean code	2021-04-26 11:59:47 +02:00
Laurent Destailleur	c9d6bc70e8	Clean code	2021-04-26 10:22:28 +02:00
Laurent Destailleur	389b71bc7e	Clean API	2021-04-25 19:21:48 +02:00
Laurent Destailleur	fd2d317b4a	Fix #yogosha5881	2021-04-25 15:55:36 +02:00
Laurent Destailleur	d0cc64479d	Fix protect sql	2021-04-24 20:18:11 +02:00
Laurent Destailleur	46ea1084f5	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/mailing/cibles.php htdocs/core/extrafieldsinexport.inc.php htdocs/product/stock/card.php	2021-04-19 20:59:10 +02:00
Laurent Destailleur	61df76dd9a	Fix pb in date format %a %b when using a negative timezone Enhance date management and unit tests.	2021-04-19 12:48:08 +02:00
Laurent Destailleur	a74b237a7b	Add a schedule dtask to send reminder by email on date due.	2021-04-19 10:35:19 +02:00
stickler-ci	318a783237	Fixing style errors.	2021-04-19 07:19:45 +00:00
Gauthier PC portable 024	8c428081ab	FIX : test on link type	2021-04-19 09:17:33 +02:00
Gauthier PC portable 024	ff8aae1209	Merge branch 'fix_adv_target_emailing_extrafields_link' of github.com:atm-gauthier/dolibarr into fix_adv_target_emailing_extrafields_link	2021-04-19 09:16:06 +02:00
Gauthier PC portable 024	5b6439ca5e	FIX : cast int	2021-04-19 09:15:47 +02:00
Laurent Destailleur	12e2055faa	Merge pull request #17259 from bb2a/mass_action_propal_right Workflo mass action propal sign or NotSigned and notification #17143	2021-04-16 20:45:14 +02:00
Laurent Destailleur	4bc0c5b0b6	Fix cast	2021-04-16 20:43:04 +02:00
Laurent Destailleur	af9c2384ef	Add warning	2021-04-16 19:14:01 +02:00
stickler-ci	37f44f4a07	Fixing style errors.	2021-04-16 14:58:57 +00:00
Gauthier PC portable 024	f8fcf7c16b	FIX : type link extrafield case for advanced target emailing	2021-04-16 16:55:19 +02:00
Laurent Destailleur	db5dcd3e52	NEW When a doc file is shared, link is visible from main page of doc.	2021-04-15 17:56:55 +02:00
Laurent Destailleur	9154e07689	Fix picto for tags	2021-04-14 12:33:53 +02:00
stickler-ci	26767c1550	Fixing style errors.	2021-04-14 00:36:07 +00:00
Anthony Berton	3b2a27de16	Update list.php	2021-04-14 02:35:39 +02:00
Anthony Berton	5a68718eb2	Update list.php	2021-04-14 02:32:39 +02:00
Anthony Berton	e1557b15ee	Update list.php	2021-04-14 01:12:20 +02:00
Anthony Berton	c7d0ff94f9	Update list.php	2021-04-14 01:03:32 +02:00
Anthony Berton	992cf0a091	Update list.php	2021-04-14 00:29:06 +02:00
Anthony Berton	2c18e31ee0	Merge branch 'mass_action_propal_right' of https://github.com/bb2a/dolibarr into mass_action_propal_right	2021-04-14 00:28:07 +02:00
Anthony Berton	9e40b8bf4c	Update list.php	2021-04-14 00:27:46 +02:00
stickler-ci	78b08586e3	Fixing style errors.	2021-04-13 22:11:04 +00:00
Anthony Berton	29dd2e4b67	Update list.php	2021-04-14 00:07:29 +02:00
Anthony Berton	22d48c9cb6	Update list.php	2021-04-14 00:03:33 +02:00
Laurent Destailleur	358bb87ae2	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/action/index.php htdocs/core/class/html.form.class.php htdocs/core/lib/payments.lib.php htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/core/modules/facture/doc/pdf_sponge.modules.php htdocs/core/modules/propale/doc/pdf_azur.modules.php htdocs/core/modules/propale/doc/pdf_cyan.modules.php htdocs/projet/card.php htdocs/public/payment/newpayment.php htdocs/societe/list.php htdocs/ticket/document.php	2021-04-13 20:19:05 +02:00
Laurent Destailleur	f54fd1063b	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-04-13 19:39:08 +02:00
Laurent Destailleur	c93f88e47a	Debug mass action after regression on close on proposal	2021-04-13 19:38:55 +02:00
Laurent Destailleur	8c9cacba4d	Merge branch 'develop' into 14a36	2021-04-13 16:05:57 +02:00
Anthony Berton	69d489c12b	Update list.php	2021-04-13 13:00:44 +02:00
Anthony Berton	b2eaca75bf	Update list.php	2021-04-13 10:55:48 +02:00
Anthony Berton	1b995226b7	add_filter_warehouse_propal	2021-04-13 10:43:36 +02:00
Alexandre SPANGARO	44133166de	Merge remote-tracking branch 'upstream/develop' into 14a36	2021-04-12 21:35:03 +02:00
Alexandre SPANGARO	4b9bf40a8f	move include_once to include when it's a tpl	2021-04-12 21:25:58 +02:00
Laurent Destailleur	8a62d97b89	Remove one thousand of useless files	2021-04-12 15:57:16 +02:00
Laurent Destailleur	81487d76b2	Clean code of ol deprecated option	2021-04-12 15:37:26 +02:00
Laurent Destailleur	8fa943edc3	Fix select field in multiselect of languages	2021-04-12 14:26:09 +02:00
Laurent Destailleur	eb3438baa7	css	2021-04-12 13:02:34 +02:00
Alexandre SPANGARO	8d72448f43	Add right supplier_order	2021-04-12 09:47:16 +02:00
Alexandre SPANGARO	80c6458faa	Work on split module fournisseur	2021-04-11 22:25:45 +02:00
Alexandre SPANGARO	ab5599a672	Merge remote-tracking branch 'upstream/develop' into 14a36	2021-04-11 20:53:30 +02:00
Laurent Destailleur	91fc78ac9c	FIX #17192 - With tz < 0, event is show in bad day on calendar views Conflicts: htdocs/comm/action/index.php	2021-04-11 16:18:16 +02:00
Laurent Destailleur	053be7a63c	FIX #17192 - With tz < 0, event is show in bad day on calendar views	2021-04-11 16:02:52 +02:00
Alexandre SPANGARO	ce7c5a0c7b	Work on split module fournisseur	2021-04-11 04:24:21 +02:00
Laurent Destailleur	42ddb6e5f0	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/index.php htdocs/core/class/html.form.class.php htdocs/core/lib/accounting.lib.php htdocs/core/lib/website2.lib.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/class/paiementfourn.class.php htdocs/public/ticket/view.php	2021-04-09 14:17:41 +02:00
Laurent Destailleur	7f91713c4a	Fix merge not complete	2021-04-09 14:06:30 +02:00
Laurent Destailleur	f5881c6199	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 Conflicts: htdocs/comm/index.php htdocs/fourn/class/fournisseur.commande.class.php	2021-04-09 14:02:14 +02:00
Laurent Destailleur	fe7654c067	Complete doc	2021-04-09 13:34:19 +02:00
Laurent Destailleur	667481acd5	Fix #yogosha5832 - Missin test on permission for /index routes on APIs	2021-04-08 19:05:28 +02:00
Laurent Destailleur	de7c3f5e0c	Merge pull request #17139 from OPEN-DSI/fix_00001 FIX: Fix when add or modify ressources on events with duplicate entries	2021-04-08 15:50:00 +02:00
kamel	fcc27e9177	Corrections	2021-04-07 09:49:20 +02:00
Laurent Destailleur	12e847ade1	Fix color of reports. Fix include_once into include.	2021-04-06 22:18:32 +02:00
kamel	c44522594a	FIX: Fix when add or modify ressources on events with duplicate entries	2021-04-06 16:04:30 +02:00
Alexandre SPANGARO	36e4f5aa22	Merge remote-tracking branch 'upstream/develop' into 14a22	2021-04-06 10:29:44 +02:00
Laurent Destailleur	a3fb8d3e14	Factorize code	2021-04-05 19:34:56 +02:00
ptibogxiv	bd88806982	Fix order status label in comm index page	2021-04-05 12:07:51 +02:00
Laurent Destailleur	6fc19c626d	Try fix for #17094	2021-04-04 17:05:01 +02:00
Alexandre SPANGARO	f64d0377c5	Merge remote-tracking branch 'upstream/develop' into 14a22	2021-04-04 06:03:41 +02:00
Laurent Destailleur	354adbde54	Look and feel v14	2021-04-01 12:27:02 +02:00
Laurent Destailleur	4b35645920	FIX #yogosha5753	2021-04-01 10:11:54 +02:00
Laurent Destailleur	9c92dfd3e1	Function set_price_level() has been renamed into setPriceLevel() to follow camelcase rules	2021-04-01 10:05:37 +02:00
Florian HENRY	73d7eefdcf	Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation	2021-03-31 20:09:44 +02:00
Laurent Destailleur	cdd3e385e7	Merge branch 'new-propal-signature-date-and-user' of https://github.com/OPEN-DSI/dolibarr into OPEN-DSI-new-propal-signature-date-and-user # Conflicts: # htdocs/install/mysql/migration/13.0.0-14.0.0.sql	2021-03-30 19:34:25 +02:00
Laurent Destailleur	3744bc6a7a	FIX #yogosha5746 - next step (work in progress)	2021-03-30 18:17:13 +02:00
Laurent Destailleur	6e422d26f3	FIX #yogosha5746 - next step (wip)	2021-03-30 16:20:18 +02:00
lvessiller	85fff685db	Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-propal-signature-date-and-user	2021-03-30 08:19:54 +02:00
lvessiller	d0ce60ff49	Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-propal-signature-date-and-user	2021-03-30 08:04:19 +02:00
Laurent Destailleur	d61f61ab45	Clean $_GET	2021-03-30 03:55:17 +02:00
Laurent Destailleur	fb84608586	Clean sql	2021-03-30 03:37:54 +02:00
Laurent Destailleur	ce5bea7b34	FIX #yogosha5751	2021-03-29 22:43:39 +02:00
Laurent Destailleur	a4987c6e4f	Merge branch 'develop' into 14a22	2021-03-29 20:35:35 +02:00
Florian HENRY	11dcf656c6	Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation	2021-03-29 20:30:31 +02:00
Laurent Destailleur	5c2ee240b2	FIX #yogosha5752	2021-03-29 15:59:37 +02:00
Florian HENRY	f25360cc4c	Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation	2021-03-29 15:49:43 +02:00
Laurent Destailleur	3a4bb69c05	FIX #yogosha5749	2021-03-29 15:32:09 +02:00
Laurent Destailleur	ce1f8289a4	FIX #yogosha5746	2021-03-29 15:07:23 +02:00
Laurent Destailleur	b929641fe1	Look and feel v14	2021-03-29 13:00:17 +02:00
Florian HENRY	2def98809c	Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation	2021-03-29 11:55:26 +02:00
Alexandre SPANGARO	2a1cc04b66	Merge remote-tracking branch 'upstream/develop' into 14a22	2021-03-28 06:16:33 +02:00
Florian HENRY	a8b486c7b9	fix error translation	2021-03-26 19:00:56 +01:00
Laurent Destailleur	01c1101b29	Look and feel v14	2021-03-26 18:16:12 +01:00
lvessiller	05bf3cdab1	FIX stickler-ci errors	2021-03-26 17:59:16 +01:00
lvessiller	8a2e49d6e7	NEW date and user signature on proposal (Issue 16062)	2021-03-26 17:44:41 +01:00
Laurent Destailleur	d9108362ba	War against $_POST	2021-03-25 16:59:47 +01:00
Laurent Destailleur	a1366da130	FIX #yogosha5715	2021-03-23 03:45:17 +01:00
Laurent Destailleur	e06b8bb586	Look and feel v14	2021-03-23 03:20:23 +01:00
Laurent Destailleur	ca1715df96	Add some protection for SQL injection	2021-03-22 13:31:06 +01:00
Laurent Destailleur	6a0e0f4c06	Fix #ygosha5698	2021-03-22 12:10:51 +01:00
Laurent Destailleur	15440917b1	Fix #ygosha5698	2021-03-22 11:30:18 +01:00
Laurent Destailleur	e334e83a64	Merge branch 'develop' into 14a22	2021-03-20 13:42:54 +01:00
Laurent Destailleur	d8aa5f5eab	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-03-20 12:43:07 +01:00
Laurent Destailleur	3d3a7bfd37	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/propal/card.php htdocs/projet/card.php htdocs/projet/contact.php htdocs/projet/element.php htdocs/projet/tasks.php htdocs/projet/tasks/comment.php htdocs/projet/tasks/contact.php htdocs/projet/tasks/document.php htdocs/projet/tasks/note.php htdocs/projet/tasks/task.php htdocs/projet/tasks/time.php	2021-03-20 12:42:46 +01:00
Frédéric FRANCE	bae1770176	uniformise comments to remove nested comments	2021-03-20 10:00:24 +01:00
Florian HENRY	df4a243f18	fix: PRODUIT_PDF_MERGE_PROPAL options do not work with new product feature	2021-03-18 17:13:34 +01:00
Frédéric FRANCE	8ab8043557	fix php8 warning	2021-03-17 22:27:39 +01:00
Laurent Destailleur	8829d42e1d	Merge pull request #16742 from frederic34/fix-php8-20210306 Fix php8	2021-03-17 16:58:05 +01:00
Laurent Destailleur	1e402f9ea2	Merge pull request #16754 from frederic34/patch-13 fix php8 warnings	2021-03-17 16:55:54 +01:00
Laurent Destailleur	9cbb2e8d42	Merge pull request #16755 from frederic34/patch-14 fix php7 php8 warning	2021-03-17 16:52:07 +01:00
Laurent Destailleur	8de1b4c94e	Factorize code	2021-03-17 11:34:19 +01:00
Frédéric FRANCE	11a6961c13	fix php8 warning	2021-03-16 23:02:28 +01:00
Frédéric FRANCE	ff690861c4	fix php8 warnings	2021-03-16 22:50:14 +01:00
Frédéric FRANCE	358dcff0cf	fix php8	2021-03-16 17:38:12 +01:00
Laurent Destailleur	9480e15755	Merge pull request #16703 from dolibit-ut/patch-84 Update card.php	2021-03-16 10:37:07 +01:00
Laurent Destailleur	a733275559	Merge pull request #16702 from dolibit-ut/patch-83 Update card.php	2021-03-16 10:36:53 +01:00
Laurent Destailleur	e00e6cfd9a	Merge pull request #16721 from aspangaro/14a25 Translation "Generated documents"	2021-03-16 10:25:31 +01:00
Alexandre SPANGARO	6960f0dc25	Uniformize translation	2021-03-16 04:22:55 +01:00
Alexandre SPANGARO	4fd24c6855	Translation "Generated documents"	2021-03-16 04:04:18 +01:00
Alexandre SPANGARO	6e17a588bb	Merge remote-tracking branch 'upstream/develop' into 14a22	2021-03-16 03:26:28 +01:00
UT from dolibit	9eb87ab43a	Update card.php $help_url add -> DE:Modul_Angebot	2021-03-15 19:28:48 +01:00
UT from dolibit	1d11dfd468	Update card.php $help_url add -> DE:Modul_Geschäftspartner	2021-03-15 19:24:49 +01:00
Laurent Destailleur	7d1e18f5ab	Merge pull request #16625 from FHenry/dev_EventOrganisation new: working on conference or booth object and event type #FoundationFunding	2021-03-15 11:37:57 +01:00
Laurent Destailleur	a46bbb83f8	Merge pull request #16678 from frederic34/patch-32 fix php8 warnings	2021-03-15 10:54:23 +01:00
Frédéric FRANCE	5d99dfea50	fix php8 warning	2021-03-15 08:08:05 +01:00
Frédéric FRANCE	1e85e8f37d	fix php8 warnings	2021-03-15 00:53:34 +01:00
Laurent Destailleur	cc10106a21	Fix protection on int	2021-03-14 12:20:23 +01:00
Laurent Destailleur	12f50a76d7	Fix yogosha #5627	2021-03-14 11:48:39 +01:00
Frédéric FRANCE	67abd6d1d6	go back actioncomm create after create project	2021-03-12 17:05:11 +01:00
Florian HENRY	862926316a	working on list	2021-03-11 19:09:42 +01:00
Laurent Destailleur	c3a047ee06	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/action/class/api_agendaevents.class.php	2021-03-08 19:31:47 +01:00
Laurent Destailleur	2f0c4038fb	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 Conflicts: htdocs/comm/action/class/api_agendaevents.class.php htdocs/compta/sociales/card.php htdocs/societe/consumption.php	2021-03-08 19:27:34 +01:00
Frédéric FRANCE	c0c9ac439f	Update api_agendaevents.class.php	2021-03-08 00:23:05 +01:00
Frédéric FRANCE	45189de496	Update api_agendaevents.class.php	2021-03-08 00:16:28 +01:00
Laurent Destailleur	3cbced439a	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/tools/listevents.php htdocs/compta/bank/line.php htdocs/compta/facture/class/facture-rec.class.php htdocs/compta/facture/class/facture.class.php htdocs/compta/paiement/cheque/card.php htdocs/core/class/commonobject.class.php htdocs/core/class/extrafields.class.php htdocs/core/lib/date.lib.php htdocs/core/lib/ticket.lib.php htdocs/core/modules/mailings/modules_mailings.php htdocs/core/tpl/extrafields_view.tpl.php htdocs/core/tpl/objectline_view.tpl.php htdocs/cron/list.php htdocs/expedition/card.php htdocs/mrp/mo_list.php htdocs/product/stock/productlot_card.php htdocs/public/emailing/mailing-read.php htdocs/public/emailing/mailing-unsubscribe.php htdocs/ticket/list.php test/phpunit/FactureRecTest.php	2021-03-05 19:29:09 +01:00
Laurent Destailleur	3cfcad284b	Fix unsubscribe to MLs	2021-03-05 17:48:55 +01:00
Florian HENRY	6844c57413	fix sql	2021-03-04 07:53:32 +01:00
Florian HENRY	ec52ed445c	fix ambigous	2021-03-03 22:18:42 +01:00
Florian HENRY	04c6d5dd8f	fix sql	2021-03-03 22:16:35 +01:00
Florian HENRY	91b93ac7ce	fix sql	2021-03-03 22:10:17 +01:00
Florian HENRY	9c256ab8a8	fix review	2021-03-03 21:40:37 +01:00
Florian HENRY	4e2f929460	test	2021-03-03 21:11:04 +01:00
Florian HENRY	55e9a6596b	test	2021-03-03 21:10:50 +01:00
Florian HENRY	1913564b38	fix travis	2021-03-03 16:28:14 +01:00
Florian HENRY	c909306f34	Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation	2021-03-03 16:27:05 +01:00
Laurent Destailleur	f11a85a3e3	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/propal/card.php htdocs/compta/facture/card.php htdocs/contrat/card.php htdocs/fichinter/card.php htdocs/fourn/commande/card.php htdocs/fourn/facture/card.php htdocs/supplier_proposal/card.php	2021-03-03 11:37:34 +01:00
Laurent Destailleur	7eb3e324c7	FIX #16503	2021-03-02 23:09:55 +01:00
stickler-ci	e28f844d54	Fixing style errors.	2021-03-02 21:31:48 +00:00
Florian HENRY	e5e3abd685	class conference or booth or and table actioncomm ok	2021-03-02 22:23:54 +01:00
Florian HENRY	6862c206aa	merge from develop	2021-03-02 21:48:35 +01:00
Laurent Destailleur	1756d2833c	Merge pull request #16513 from AlexisLaurier/develop Avoid loss of data on RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED	2021-03-02 19:15:22 +01:00
Alexis LAURIER	516e7a3955	Merge branch 'develop' of https://github.com/AlexisLaurier/dolibarr into develop	2021-03-02 16:04:37 +01:00
Alexis LAURIER	e219972936	avoid lost of data for RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED	2021-03-02 16:04:26 +01:00
Laurent Destailleur	42329b10c9	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: build/generate_filelist_xml.php htdocs/comm/propal/card.php htdocs/commande/card.php htdocs/compta/facture/card.php htdocs/core/class/commonobject.class.php htdocs/core/lib/modulebuilder.lib.php htdocs/fourn/commande/card.php htdocs/fourn/facture/card.php htdocs/supplier_proposal/card.php htdocs/ticket/list.php	2021-03-02 15:27:20 +01:00
Laurent Destailleur	7144e80063	Merge pull request #16322 from FHenry/dev_new_conf_defaulteventstatus NEW: Conf for default actiomm status when created from card (and DefaultValues CRUD class)	2021-03-02 14:45:05 +01:00
Laurent Destailleur	acb7b30eb0	Merge pull request #16507 from frederic34/add_rule Add rule	2021-03-02 12:52:03 +01:00
Florian HENRY	0f7144a391	Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_conf_defaulteventstatus	2021-03-02 11:05:20 +01:00
Laurent Destailleur	07aa533add	Disable box not related to page	2021-03-02 03:08:29 +01:00
Laurent Destailleur	5d6ada77ca	Fix test	2021-03-02 02:42:04 +01:00
Laurent Destailleur	cffea1889f	FIX #16325	2021-03-02 01:17:28 +01:00
Laurent Destailleur	f1f950e8b7	Close #16395 - Can filter on proposal source in list	2021-03-02 00:11:15 +01:00
Florian HENRY	32ef55cd9e	working default status/percent for event actioncomm	2021-03-01 20:58:02 +01:00
Frédéric FRANCE	a4e25359e7	add missing rule	2021-03-01 20:37:16 +01:00
Florian HENRY	b5fd3e4984	on going	2021-03-01 17:06:03 +01:00
Alexandre SPANGARO	abc93446bb	Fix list proposal	2021-03-01 04:12:15 +01:00
Alexandre SPANGARO	94a861c1c8	Code enhanced - Standardize field name	2021-03-01 04:07:31 +01:00
Laurent Destailleur	886cbc61c8	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/commande/card.php htdocs/core/boxes/box_factures_fourn.php htdocs/core/boxes/box_factures_fourn_imp.php htdocs/core/boxes/box_ficheinter.php htdocs/core/boxes/box_members.php htdocs/core/boxes/box_propales.php htdocs/core/class/commonobject.class.php htdocs/core/class/html.formmail.class.php htdocs/core/lib/functions.lib.php htdocs/fourn/class/fournisseur.facture.class.php	2021-02-28 13:37:45 +01:00
Laurent Destailleur	2ce76133f4	FIX #16487	2021-02-28 12:59:58 +01:00
Laurent Destailleur	9cf4222d3a	Look and feel v14	2021-02-27 17:15:40 +01:00
stickler-ci	eca98237f0	Fixing style errors.	2021-02-27 13:57:52 +00:00
Florian HENRY	eb17ae5fe2	fix event type select	2021-02-27 14:13:42 +01:00
Florian HENRY	bf04a8cf1b	ongoing	2021-02-27 13:35:16 +01:00
Laurent Destailleur	5c0ea476e1	Look and feel v14	2021-02-27 12:45:07 +01:00
Laurent Destailleur	cf23df9f28	Fix field hidden by default (not used)	2021-02-27 03:06:05 +01:00
Laurent Destailleur	34d00e5d5e	Look and feel v14	2021-02-27 02:44:52 +01:00
Laurent Destailleur	8086737be7	Merge pull request #16438 from frederic34/patch-5 fix translation	2021-02-26 10:34:47 +01:00

... 13 14 15 16 17 ...

8366 Commits