dolibarr

Author	SHA1	Message	Date
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
Frédéric FRANCE	c11fd091e2	fix translation	2021-02-25 21:18:51 +01:00
Frédéric FRANCE	5931051c88	code syntax comm directory	2021-02-23 18:59:19 +01:00
Frédéric FRANCE	926a88ff51	Update propal.class.php	2021-02-22 21:00:24 +01:00
Frédéric FRANCE	6f93deae40	fix propal fetch	2021-02-22 18:21:12 +01:00
Frédéric FRANCE	84a5f69834	fix propal sqls	2021-02-22 13:14:13 +01:00
Alexandre SPANGARO	2cd181b86d	Code enhanced - Standardize field name #14697	2021-02-21 22:07:58 +01:00
Laurent Destailleur	e3419df36e	Merge branch 'develop' into 14a20	2021-02-21 20:28:06 +01:00
Laurent Destailleur	93381f1d7d	Fix regression in renaming of field	2021-02-21 19:29:42 +01:00
Frédéric FRANCE	e94c78deaf	Update card.php	2021-02-20 17:47:12 +01:00
Frédéric FRANCE	aa7b7101e4	Update index.php	2021-02-20 17:45:55 +01:00
Laurent Destailleur	7c25f06f58	Merge pull request #16353 from aspangaro/14a18 Code enhanced - Standardize field name #14697	2021-02-20 16:51:34 +01:00
Alexandre SPANGARO	542af217bb	Revert "Code enhanced - Standardize field name" This reverts commit `ba80f35b7e`.	2021-02-20 08:08:41 +01:00
Alexandre SPANGARO	ba80f35b7e	Code enhanced - Standardize field name	2021-02-20 08:06:30 +01:00
Alexandre SPANGARO	3dcfe40e71	Code enhanced - Standardize field name #14697	2021-02-20 08:00:27 +01:00
Laurent Destailleur	994dde91da	Responsive	2021-02-19 22:22:09 +01:00
Laurent Destailleur	259a398f2d	Remove hard coded link with getNomUrl	2021-02-19 22:19:23 +01:00
Laurent Destailleur	2be6992916	Fix include_once into include for inc.php file. See comment in #16338	2021-02-19 16:10:19 +01:00
Alexandre SPANGARO	041390dc22	Code enhanced - Standardize field name #14697	2021-02-19 06:49:24 +01:00
Laurent Destailleur	485dd07f67	NEW Can show the holidays on the agenda view.	2021-02-18 23:13:55 +01:00
Alexandre SPANGARO	042038d185	Code enhanced - Standardize field name #14697	2021-02-18 22:42:55 +01:00
Laurent Destailleur	acc3915576	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-02-18 17:08:27 +01:00
Laurent Destailleur	27818b68ae	Fix tz pb in week view	2021-02-18 17:07:39 +01:00
Laurent Destailleur	2afc85cb88	Fix navigation link in agenda views	2021-02-18 16:35:38 +01:00
Laurent Destailleur	72e4c00760	Fix showifmore	2021-02-18 16:13:30 +01:00
Laurent Destailleur	041a7f54e3	Fix cursor	2021-02-18 16:10:46 +01:00
Laurent Destailleur	b607ed6259	Look and feel v14	2021-02-18 15:58:38 +01:00
Laurent Destailleur	76a729147c	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-02-18 15:42:38 +01:00
Laurent Destailleur	9d12aeee49	Fix timezone problem with drag and drop	2021-02-18 15:41:52 +01:00
Laurent Destailleur	72ad47c75f	Fix link to create a new event in calendar	2021-02-18 15:20:05 +01:00
Laurent Destailleur	2904cc803f	Fix selection in combo	2021-02-18 13:56:13 +01:00
Laurent Destailleur	56d2ac274a	NEW Support color of type of event	2021-02-18 12:46:42 +01:00
Laurent Destailleur	fc9d6cef97	Enhancement Auto and manual calendar. Better separation.	2021-02-18 11:16:36 +01:00
Laurent Destailleur	d16276ea2c	Clean code	2021-02-16 11:15:42 +01:00
Laurent Destailleur	026259ebd7	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/propal/list.php htdocs/core/class/html.form.class.php htdocs/core/lib/ajax.lib.php htdocs/core/tpl/objectline_create.tpl.php htdocs/product/fournisseurs.php	2021-02-15 13:12:27 +01:00
Laurent Destailleur	9e16cd5b77	Look and feel v14	2021-02-14 20:47:57 +01:00
Laurent Destailleur	66c7770146	Factorize some common code for type of event	2021-02-14 20:12:43 +01:00
Laurent Destailleur	8b125d8076	Fix MVC. Actions must be before output.	2021-02-10 16:44:20 +01:00
Laurent Destailleur	c2df267858	Merge pull request #16242 from frederic34/patch-4 remove deprecated	2021-02-10 01:29:47 +01:00
Laurent Destailleur	beb9f4f1e9	Fix 2 lines on one line when there is 2 or more sale representatives	2021-02-09 21:35:50 +01:00
Frédéric FRANCE	aecb185c8d	Update card.php	2021-02-09 18:07:58 +01:00
Frédéric FRANCE	075d2c3ded	remove deprecated	2021-02-09 17:58:59 +01:00
Laurent Destailleur	1b129831a9	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-02-09 14:09:46 +01:00
Laurent Destailleur	48a4ed656b	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/expensereport/class/expensereport.class.php htdocs/projet/element.php htdocs/supplier_proposal/class/supplier_proposal.class.php	2021-02-09 14:08:49 +01:00
Laurent Destailleur	a84bc05f01	Merge pull request #16146 from FHenry/12_fix_pricemin_PRODUIT_CUSTOMER_PRICES FIX: manage price min for PRODUIT_CUSTOMER_PRICES	2021-02-09 13:39:25 +01:00
Florian HENRY	6bcb63c53d	fix indent	2021-02-08 20:46:59 +01:00
Florian HENRY	dbbebba497	this->errors is set on triggers action must be set by callers	2021-02-08 20:44:40 +01:00
Frédéric FRANCE	898bf55202	Merge remote-tracking branch 'upstream/develop' into facturerec	2021-02-08 20:21:46 +01:00
Frédéric FRANCE	148bbb3997	clean deprecated modelpdf to model_pdf	2021-02-08 18:30:35 +01:00
Laurent Destailleur	8041ef641a	Merge branch 'develop' into dev_typent_jax_workcorrectly	2021-02-08 15:29:36 +01:00
Laurent Destailleur	caea73b1f2	Merge pull request #16204 from frederic34/nbsp fix html	2021-02-07 19:56:34 +01:00
Laurent Destailleur	45789ec21c	Fix TZ problems Conflicts: htdocs/core/lib/company.lib.php	2021-02-07 19:47:33 +01:00
Laurent Destailleur	8c71c8335e	Fix TZ problems	2021-02-07 19:44:22 +01:00
Frédéric FRANCE	e0b2e26da6	fix html	2021-02-07 19:05:10 +01:00
Laurent Destailleur	7b72ac5a7a	Look and feel v14	2021-02-06 12:10:27 +01:00
Laurent Destailleur	f0e1c02caa	Look and feel v14 - Use placeholder on combolists	2021-02-06 00:05:24 +01:00
Laurent Destailleur	67df1e1b94	Use same visual picto everywhere for nature of thirdparty	2021-02-05 17:29:11 +01:00
Laurent Destailleur	4efdbc71e0	Fix phpcs	2021-02-04 10:46:58 +01:00
stickler-ci	149d2a1d55	Fixing style errors.	2021-02-04 08:52:16 +00:00
Florian HENRY	ec41bf58e5	always ajax now	2021-02-04 09:48:17 +01:00
Laurent Destailleur	6e7e8d7d36	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: test/phpunit/CodingPhpTest.php	2021-02-03 23:26:08 +01:00
Laurent Destailleur	d608a46c95	Fix dates	2021-02-03 22:47:35 +01:00
Laurent Destailleur	3e2b1370dd	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-02-03 21:02:46 +01:00
Laurent Destailleur	f301635681	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.formmail.class.php	2021-02-03 21:02:32 +01:00
Laurent Destailleur	369a835abb	Merge pull request #16151 from bb2a/mass_action_propal_nosigned NEW: add massActions to set a commercial proposal to status "Refused"	2021-02-03 20:36:10 +01:00
Laurent Destailleur	47ac349f2d	Update list.php	2021-02-03 20:34:57 +01:00
Laurent Destailleur	3798892fd3	FIX Hide/Unhide external ICSS calendars	2021-02-03 19:53:28 +01:00
stickler-ci	609428bc09	Fixing style errors.	2021-02-03 10:37:15 +00:00
Anthony Berton	eb15c4d800	20200203	2021-02-03 11:29:54 +01:00
Laurent Destailleur	2e7de1d137	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/commande/card.php test/phpunit/ExportTest.php	2021-02-02 16:17:53 +01:00
Florian HENRY	d3d0617996	fix: manage price min for PRODUIT_CUSTOMER_PRICES	2021-02-02 13:43:33 +01:00
Laurent Destailleur	c94ecb8a42	Limit list of draft element in home sections	2021-02-02 11:34:34 +01:00
Laurent Destailleur	2e9656a5b2	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.formactions.class.php htdocs/filefunc.inc.php	2021-02-02 03:26:20 +01:00
Laurent Destailleur	daf88944f8	FIX #16118 Timezone problem on some fields	2021-02-02 00:19:41 +01:00
Laurent Destailleur	7de4e622a9	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-31 19:12:26 +01:00
Laurent Destailleur	7ffa9c6d99	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 Conflicts: htdocs/comm/action/class/actioncomm.class.php	2021-01-31 19:11:34 +01:00
Paul Vincent M. Ancajas	d80709a7b9	Fix/FIX: making sure the return agenda is only specific to user	2021-02-01 01:41:19 +08:00
Laurent Destailleur	7887d4cc8e	Fix price2num on all GETPOST('remise_percent')	2021-01-31 12:48:40 +01:00
Laurent Destailleur	b24aac1e6b	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/propal/list.php htdocs/commande/list.php	2021-01-31 12:03:39 +01:00
Laurent Destailleur	044b4eee48	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 Conflicts: htdocs/expedition/list.php	2021-01-31 11:54:45 +01:00
stickler-ci	726e0ceff0	Fixing style errors.	2021-01-31 08:16:59 +00:00
Paul Vincent M. Ancajas	80714d8d6d	Fix/FIX: Show notification in Event box of user in his dashboard if assigned by others	2021-01-31 16:09:35 +08:00
Laurent Destailleur	244ee05a9c	FIX #14290 #15900	2021-01-30 18:09:13 +01:00
Laurent Destailleur	e5b4c76a26	Fix combo to select action status	2021-01-28 19:38:47 +01:00
Laurent Destailleur	9ec5ba46fb	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/functions.lib.php	2021-01-28 14:47:06 +01:00
Laurent Destailleur	ba3e902292	FIX #16080	2021-01-28 09:25:58 +01:00
Laurent Destailleur	452aea1d8b	Fix bad test	2021-01-23 17:59:56 +01:00
Laurent Destailleur	dd69aed27b	Fix error test	2021-01-23 17:49:08 +01:00
Frédéric FRANCE	55d3eec200	add more infos in link	2021-01-20 22:04:24 +01:00
Frédéric FRANCE	118c9ac990	add more infos in link	2021-01-20 21:02:01 +01:00
Frédéric FRANCE	9e5f0a8cb9	add more infos in link	2021-01-20 18:45:44 +01:00
Laurent Destailleur	d82765c6da	Update card.php	2021-01-19 12:15:56 +01:00
Laurent Destailleur	fe537fb2fc	Fix MVC	2021-01-19 12:14:54 +01:00
Anthony Berton	bb1af10cf1	warehouse thirparty affect on proposal or order	2021-01-17 16:48:51 +01:00
Anthony Berton	89ac5e8803	1	2021-01-17 02:09:21 +01:00
Anthony Berton	daf472b781	Update card.php	2021-01-17 00:15:32 +01:00
Laurent Destailleur	828f1c8314	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/propal/card.php	2021-01-15 14:04:22 +01:00
Laurent Destailleur	cac7fdd058	Look and feel v13	2021-01-15 14:02:18 +01:00
Laurent Destailleur	dc9cd28437	Look and feel v14	2021-01-15 13:14:21 +01:00
Laurent Destailleur	aaddda9a6e	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/bookkeeping/list.php htdocs/accountancy/bookkeeping/listbysubaccount.php htdocs/accountancy/class/accountancyexport.class.php htdocs/user/class/usergroup.class.php	2021-01-14 14:13:08 +01:00
Laurent Destailleur	75323859e4	Add some hooks to add new buttons (compensation of removal of tabs).	2021-01-12 13:58:16 +01:00
Laurent Destailleur	bad4b14ba5	Fix properties	2021-01-12 10:34:15 +01:00
kevin	5ff18baaa8	Add hook to allow external modules to add their own shortlist of recent objects	2021-01-11 17:13:07 +01:00
Laurent Destailleur	de9835ae47	Merge pull request #15936 from bb2a/warhouse_in_propal NEW Can ask the warehouse in proposal	2021-01-11 16:23:15 +01:00
Laurent Destailleur	c4de93fbb7	Update card.php	2021-01-11 16:21:15 +01:00
Laurent Destailleur	e3a1cabd87	Merge pull request #15942 from bb2a/add_alias_on_lists NEW Add column "alias" of company in list of proposal, order, invoice	2021-01-11 15:56:22 +01:00
Laurent Destailleur	16253a79ee	FIX GETPOST of qty with wrong parameters Conflicts: htdocs/bom/bom_card.php	2021-01-11 13:11:40 +01:00
Laurent Destailleur	f3e28c2dd0	FIX GETPOST of qty with wrong parameters	2021-01-11 13:00:29 +01:00
Anthony Berton	b3dfe5d934	Update list.php	2021-01-10 21:48:49 +01:00
Anthony Berton	52c9dab72a	Update list.php	2021-01-10 21:47:17 +01:00
stickler-ci	55e6010d85	Fixing style errors.	2021-01-10 00:15:00 +00:00
Anthony Berton	d3fa8b9f20	20210110	2021-01-10 01:07:27 +01:00
Anthony Berton	8eaf7b3a3f	1	2021-01-09 17:36:14 +01:00
Anthony Berton	5effd4e897	20210109	2021-01-09 02:45:46 +01:00
Laurent Destailleur	8c3e7b4dc6	Fix vardump	2021-01-07 12:43:15 +01:00
Laurent Destailleur	6da3ed1a51	Merge 2 exclusive options into 1	2021-01-07 12:39:51 +01:00
Laurent Destailleur	26fa8b45ac	Merge pull request #15153 from FHenry/dev_new_add_desc_when_select_product NEW: preload product description on selection for customer propal/order/invoice	2021-01-07 11:19:53 +01:00
Laurent Destailleur	4f55d51eac	Merge pull request #15886 from FHenry/dev_add_column_propal_order NEW : Column shippement method, payment mode, payment term in propal and order list	2021-01-07 11:04:30 +01:00
Regis Houssin	f80a476bc5	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0	2021-01-06 11:37:56 +01:00
Florian HENRY	6e7172887a	Merge branch '13_backport' into dev_add_column_propal_order	2021-01-05 22:58:00 +01:00
Florian HENRY	510c619c85	space	2021-01-05 22:56:55 +01:00
Florian HENRY	b9bb48a01f	better place and noadmininfo	2021-01-05 22:50:54 +01:00
Florian HENRY	939fecc611	add column payment mode terms shipping on order list	2021-01-05 20:32:29 +01:00
Florian HENRY	253349ced2	add column payment mode terms shipping on propal list	2021-01-05 20:23:45 +01:00
Laurent Destailleur	ba68c958e1	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-05 19:12:57 +01:00
Laurent Destailleur	8dc4e5929c	Fix var not defined	2021-01-05 12:43:57 +01:00
Regis Houssin	ec6c14beb8	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0	2021-01-05 09:41:52 +01:00
Laurent Destailleur	8baa4c67ae	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-04 12:34:09 +01:00
Laurent Destailleur	b0738643fb	FIX Solve problem with TZ	2021-01-03 18:42:45 +01:00
Laurent Destailleur	645b7694c9	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 Conflicts: htdocs/core/db/DoliDB.class.php	2021-01-03 15:26:31 +01:00
Florian HENRY	dfaf77b03f	merge develop	2021-01-03 15:14:34 +01:00
Laurent Destailleur	8ad5dc81de	GETPOST	2021-01-03 15:13:29 +01:00
Regis Houssin	3b7f5a92cb	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0	2021-01-02 17:20:24 +01:00
Laurent Destailleur	150b338764	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-02 17:02:08 +01:00
Laurent Destailleur	7b3ed7301d	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 Conflicts: htdocs/compta/facture/class/facture-rec.class.php htdocs/fichinter/class/fichinterrec.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/supplier_proposal/class/supplier_proposal.class.php	2021-01-02 17:01:03 +01:00
Laurent Destailleur	fd4dab495f	FIX Bad cleaning of VAT rate when numbers are into code	2021-01-02 16:51:34 +01:00
Regis Houssin	e36ae4ac90	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0	2021-01-02 13:14:30 +01:00
Laurent Destailleur	17b68a30d7	Merge branch 'develop' into dev_add_tag_on_massaction	2020-12-30 13:10:02 +01:00
Regis Houssin	aec01a95fc	FIX again and again	2020-12-29 17:48:52 +01:00
Laurent Destailleur	cefd66c18f	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-12-29 16:56:39 +01:00
Laurent Destailleur	e07486b626	Fix columns of download of list of targets of emailing	2020-12-29 02:20:10 +01:00
Florian HENRY	806b40662f	merge develop	2020-12-28 21:15:25 +01:00
Laurent Destailleur	7c3688c66f	Fix var not defined	2020-12-28 12:36:36 +01:00
Laurent Destailleur	a6eb14f68b	Merge pull request #15585 from cfoellmann/fckeditor-notes NEW Can toggle FCKeditor on public/private notes	2020-12-27 15:06:35 +01:00
Frédéric FRANCE	12f4a74a74	Merge remote-tracking branch 'upstream/develop' into mailingcard	2020-12-27 14:04:04 +01:00
Florian HENRY	d3bdb72cc8	finish	2020-12-24 15:03:12 +01:00
Florian HENRY	1b6a4fc4ae	Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_add_tag_on_massaction	2020-12-24 15:00:15 +01:00
Florian HENRY	f03574d061	bank ok	2020-12-24 14:56:26 +01:00
Florian HENRY	79fe5ee34c	actioncomm ok	2020-12-24 14:35:40 +01:00
Laurent Destailleur	58cd7c97a5	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 Conflicts: htdocs/comm/mailing/card.php htdocs/comm/mailing/cibles.php htdocs/comm/mailing/class/mailing.class.php	2020-12-24 13:05:17 +01:00
Laurent Destailleur	739695c442	Fix delay to wait between email for emailing refused float.	2020-12-24 12:49:17 +01:00
Laurent Destailleur	360a85cbbc	FIX add autofix of count of email target when data is corrupted	2020-12-24 12:32:34 +01:00
Laurent Destailleur	d65dc85a10	FIX for php 8	2020-12-23 19:16:25 +01:00
Laurent Destailleur	361f13154b	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/functions2.lib.php htdocs/fourn/card.php htdocs/margin/tabs/thirdpartyMargins.php htdocs/societe/card.php htdocs/societe/note.php htdocs/societe/notify/card.php htdocs/societe/societecontact.php htdocs/ticket/list.php	2020-12-20 14:31:54 +01:00
Laurent Destailleur	8c87050703	FIX Check of customer/vendor code fails in some cases	2020-12-20 13:54:02 +01:00
Laurent Destailleur	5fe8c599d2	Fix warning	2020-12-16 00:28:57 +01:00
Laurent Destailleur	427fb16256	Fix warning	2020-12-13 13:29:47 +01:00
Laurent Destailleur	a5d2e04dea	Debug v13	2020-12-12 19:09:07 +01:00
Laurent Destailleur	aa8a6fde84	Merge pull request #15726 from FHenry/develop fix: manage price min for PRODUIT_CUSTOMER_PRICES	2020-12-11 14:36:32 +01:00
Laurent Destailleur	697ca3e4f5	Fix selection of duration type	2020-12-11 02:23:43 +01:00
Florian HENRY	2a2b372ba9	fix: manage price min for PRICE PER CUSTOMER	2020-12-10 15:08:36 +01:00
Frédéric FRANCE	cb77d9f175	Merge remote-tracking branch 'upstream/develop' into mailingcard	2020-12-09 08:55:46 +01:00
Laurent Destailleur	769a8886b9	Debug notification on events	2020-12-08 20:32:37 +01:00
Laurent Destailleur	bfa813e1b0	Load langs	2020-12-08 20:16:41 +01:00
Laurent Destailleur	0234df6224	Merge pull request #15705 from StephaneLesage/fix-boxes-thirdparty Fix boxes third-parties information	2020-12-08 17:58:09 +01:00
Laurent Destailleur	240648d540	css	2020-12-08 17:09:48 +01:00
Stephane Lesage	e25862ec8d	Third-party details in Lists in comm index	2020-12-08 15:47:34 +01:00
Laurent Destailleur	efc3bad7c6	Merge pull request #15678 from frederic34/fk_element doxygen	2020-12-07 22:31:08 +01:00
Laurent Destailleur	6e403e6ce0	Fix warnings	2020-12-07 18:29:14 +01:00
Frédéric FRANCE	4e18f46f28	doxygen	2020-12-05 23:53:55 +01:00
Laurent Destailleur	3b55eb1d82	FIX master must be after session_start but dol_getprefix must be before and after filefunc.inc.php.	2020-12-05 13:26:58 +01:00
Laurent Destailleur	f06d920460	FIX #15583	2020-12-03 16:22:03 +01:00
Laurent Destailleur	5bd6d6f388	Look and feel v13	2020-12-03 14:34:15 +01:00
Scrutinizer Auto-Fixer	6df4954b20	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-12-01 01:41:19 +00:00
Christian Foellmann	f801dd7d66	PR toggle FCKeditor on public/private notes	2020-11-30 16:39:14 +01:00
Laurent Destailleur	958893228a	Fix combo to add contact and status of contact on popup	2020-11-30 15:18:58 +01:00
Laurent Destailleur	00ad6df395	Fight against $_POST	2020-11-30 14:47:07 +01:00
Laurent Destailleur	7634212811	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/system/phpinfo.php htdocs/commande/stats/index.php htdocs/compta/facture/stats/index.php	2020-11-29 21:35:03 +01:00
Laurent Destailleur	d3a2aa664f	FIX #15572	2020-11-29 20:27:40 +01:00
Laurent Destailleur	59b445a103	Clean dead code	2020-11-28 14:47:39 +01:00
Laurent Destailleur	2989ff50fa	Fix syntax error	2020-11-28 13:52:52 +01:00
Frédéric FRANCE	391e643eb7	doxygen	2020-11-27 20:33:40 +01:00
Frédéric FRANCE	ba352c2374	remove warnings	2020-11-27 20:20:04 +01:00
stickler-ci	aaf8d43780	Fixing style errors.	2020-11-27 13:33:37 +00:00
iouston	59c40227ff	Add PROPAL_ENABLE_NEGATIVE in the case of a call for tenders it is possible to have to figure in less value with quotations whose total is negative	2020-11-27 14:31:14 +01:00
Frédéric FRANCE	fa6d02fb3f	doxygen	2020-11-27 00:25:45 +01:00
Frédéric FRANCE	bb09c84417	doxygen	2020-11-27 00:23:03 +01:00
Frédéric FRANCE	446997d0ba	doxygen	2020-11-27 00:15:07 +01:00
Laurent Destailleur	69b06a25e8	Fix code of deletion of objects	2020-11-26 09:16:16 +01:00
Laurent Destailleur	944e2a8032	Fix delete of expense report	2020-11-25 15:29:18 +01:00
Laurent Destailleur	5030f0c587	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/opensurvey/wizard/create_survey.php	2020-11-25 14:55:31 +01:00
Laurent Destailleur	bf7b6ee00d	Fix delete of proposal	2020-11-25 14:15:59 +01:00
StephaneLesage	2bf44d276b	simple & dirty refresh of prospection status icon/label by re-fetching after update	2020-11-25 06:35:05 +01:00
Laurent Destailleur	81566289cd	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/commande/class/commande.class.php	2020-11-24 11:07:35 +01:00
Laurent Destailleur	f046673d80	Merge pull request #15485 from frederic34/patch-8 The variable does not seem to be defined for all execution path	2020-11-23 22:07:49 +01:00
Laurent Destailleur	5822fcfbed	FIX several warning with the barcode use in ODT templates	2020-11-23 21:38:45 +01:00
Givriz	dca4cf5987	Feature : ajout de la class "button-cancel" Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.	2020-11-23 15:12:52 +01:00
Frédéric FRANCE	b3350e033a	The variable does not seem to be defined for all execution path	2020-11-22 20:36:05 +01:00
Laurent Destailleur	fe0764be6e	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/action/class/actioncomm.class.php htdocs/expedition/class/expedition.class.php htdocs/product/class/product.class.php	2020-11-22 02:32:47 +01:00
Laurent Destailleur	a30e842521	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2020-11-21 23:48:34 +01:00
Laurent Destailleur	60bfbe2e57	Merge pull request #15448 from Givriz/dev Feature : creation of a "button-save" class	2020-11-21 23:44:30 +01:00
Laurent Destailleur	9004be1df2	Debug feature to send remind by email	2020-11-21 17:42:07 +01:00
Laurent Destailleur	bf94ce6aad	Fix warnings	2020-11-21 16:49:54 +01:00
Laurent Destailleur	3534555909	Fix setup of scheduled jobs	2020-11-21 14:14:53 +01:00
Givriz	c48129e279	Ajout de la class "button-save" Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)	2020-11-19 20:23:38 +01:00
Florian HENRY	46326d7659	merge from develop	2020-11-19 13:53:34 +01:00
quentin	6ce006f853	FIX cant empty action comm desc	2020-11-16 15:46:16 +01:00
Laurent Destailleur	6c42535eb2	Maxi debug v13	2020-11-16 12:20:18 +01:00
Frédéric FRANCE	f375640350	Update cactioncomm.class.php	2020-11-11 23:24:09 +01:00
Laurent Destailleur	90884d8085	Fix compatibility with date_delivery	2020-11-11 18:08:40 +01:00
Laurent Destailleur	6536208a14	Merge pull request #15322 from OPEN-DSI/new-list-include-array-extra-fields-with-langfile NEW include tpl for loading lang file for extra fields in list	2020-11-10 14:42:21 +01:00
Laurent Destailleur	a9fbe9dd6c	Fix remove warning	2020-11-08 00:18:41 +01:00
lvessiller	4ddff7173f	NEW include tpl for loading lang file for extra fields in list	2020-11-06 12:19:45 +01:00
bahfir abbes	078a60bac5	fix:initialize ref with id value	2020-11-06 00:41:49 +01:00
Laurent Destailleur	7294a47ef5	Fix generation of user from member, contact, applications for job	2020-11-04 13:33:52 +01:00
Laurent Destailleur	9e967a578e	FIX #14985 - I vertion option RELOAD_PAGE_ON_CUSTOMER_CHANGE	2020-11-03 02:17:51 +01:00
Laurent Destailleur	83a7b19333	Look and feel v13	2020-11-02 11:41:07 +01:00
Scrutinizer Auto-Fixer	ab25e047c0	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-10-31 17:51:30 +00:00
Scrutinizer Auto-Fixer	7f52920716	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-10-31 13:32:18 +00:00
Frédéric FRANCE	7b6bc3de63	Update propal.class.php	2020-10-31 13:25:19 +01:00
Laurent Destailleur	e42dee3c8e	Merge pull request #15224 from frederic34/apiclean doxygen	2020-10-31 04:24:53 +01:00
Laurent Destailleur	44f532e1da	Fix look and feel v13	2020-10-31 03:50:16 +01:00
Frédéric FRANCE	8190711342	doxygen	2020-10-30 18:01:01 +01:00
Scrutinizer Auto-Fixer	208740c9c4	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-10-28 16:49:52 +00:00
Florian HENRY	d77a0b40a8	tested and approuve feaure #15036	2020-10-28 16:37:41 +01:00
Florian HENRY	a3073be8e4	Merge github.com:Dolibarr/dolibarr into dev_new_add_desc_when_select_product	2020-10-28 08:52:29 +01:00
Laurent Destailleur	33e56a2d7c	Fix decimal qty for #14666	2020-10-27 19:56:36 +01:00
Frédéric FRANCE	5a3780e062	end of dol_fiche_end	2020-10-27 18:19:31 +01:00
Francis Appels	93ab281d81	Fix tab indent	2020-10-26 18:21:47 +01:00
Francis Appels	3ff6f6a04a	Move phpcs enable to correct location @frederic34	2020-10-26 18:13:25 +01:00
Francis Appels	7fa7f0a390	Re-add set_date_livraison as a deprecated function. Use correct naming convention for new method naming.	2020-10-26 16:50:52 +01:00
Florian HENRY	7c2b5b614f	NEW: preload product description on selection for customer propal/order/invoice	2020-10-25 19:13:09 +01:00
Laurent Destailleur	cd4d738a56	Merge branch 'translateModLivraison2ModDelivery' of https://github.com/orebd/dolibarr into develop # Conflicts: # htdocs/install/mysql/migration/12.0.0-13.0.0.sql	2020-10-25 16:01:18 +01:00
Laurent Destailleur	4d9c8e2225	Merge pull request #15124 from frederic34/retrieve retrieve the spelling	2020-10-25 14:48:51 +01:00
Laurent Destailleur	bb147d2599	FIX #15140	2020-10-25 14:12:34 +01:00
Frédéric FRANCE	ae3228b9e0	retrieve the spelling 🎉	2020-10-23 20:08:35 +02:00
Laurent Destailleur	572637b726	Enhance update of 1 extrafield (simple update instead of delete+insert)	2020-10-23 15:31:13 +02:00
Frédéric FRANCE	9a470fa42d	replace deprecated	2020-10-22 22:50:03 +02:00
Laurent Destailleur	8074d2cc1d	NEW Add validation of MX domain for emails	2020-10-22 20:01:59 +02:00
David	12a599d1c7	Allow "demand reason" field update though API	2020-10-22 15:53:55 +02:00
Laurent Destailleur	ef182bed07	Fix browser reminder	2020-10-18 14:00:47 +02:00
Laurent Destailleur	547b3602cc	FIX refresh of tasks combo must use an ajax page not a full html page	2020-10-17 21:14:19 +02:00
Laurent Destailleur	a9521b13f9	FIX Assignement of event to create when created from view per user.	2020-10-17 19:52:23 +02:00
Laurent Destailleur	05535556c7	css	2020-10-17 16:39:47 +02:00
Laurent Destailleur	1a1e23bf5d	Clean code	2020-10-17 16:01:43 +02:00
Laurent Destailleur	7b20e703ee	Clean code	2020-10-17 15:53:31 +02:00
Laurent Destailleur	e3552e7e02	Clean code	2020-10-16 20:17:54 +02:00
Laurent Destailleur	e74b833d7f	Look and feel v13	2020-10-16 15:40:52 +02:00
Laurent Destailleur	4c684536d1	Merge pull request #15031 from FHenry/dev_add_lateOutsatndingAmount_into_customer_tab NEW: Thirdparty module : box on customer/supplier tab for invoice outsantding amount late	2020-10-15 20:16:45 +02:00
Laurent Destailleur	2155c0123d	Merge pull request #15021 from Givriz/dev Fix : correction de commentaires	2020-10-15 20:15:12 +02:00
Laurent Destailleur	5b37ff0bfd	Html entities use now HTML5. Enhance the Dolibarr WAF. More PHPUnit tests.	2020-10-15 19:36:08 +02:00
stickler-ci	cd5201e40a	Fixing style errors.	2020-10-15 10:24:00 +00:00
Florian HENRY	0cb04d14d7	NEW: Thirdparty module : box on customer/supplier tab for outsantding amount late	2020-10-15 12:20:37 +02:00
Laurent Destailleur	bc1ad96ad1	FIX #14993	2020-10-14 19:28:59 +02:00
Givriz	c50e288a07	Correction de commentaires Correction de commentaires (passage de français à anglais ou correction d'un mauvais anglais).	2020-10-14 18:26:05 +02:00
Laurent Destailleur	7838ca32ba	Fix sql injection reported by Jason Nordenstam	2020-10-14 01:52:53 +02:00
Laurent Destailleur	7c67dbf6d5	Better responsive	2020-10-13 10:05:47 +02:00
Alexandre SPANGARO	ca7ad35342	Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport	2020-10-09 06:39:42 +02:00
Aurélien	b6283c1a5d	Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery	2020-10-08 16:19:10 +02:00
Laurent Destailleur	eb41a72e27	Properties ->titre have been renamed into ->title	2020-10-07 17:41:36 +02:00
Scrutinizer Auto-Fixer	1512521d91	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-10-07 13:01:28 +00:00
AurelienBinard	39d538befc	Merge branch 'develop' into translateModLivraison2ModDelivery	2020-10-06 16:20:25 +02:00
Laurent Destailleur	95f67309e2	Clean code	2020-10-06 15:11:45 +02:00
Laurent Destailleur	e3542c6d4f	Merge pull request #14848 from TobiasSekan/ShowCategoryInListOnlyWithRights NEW Show category filter on lists only when user have rights to read categories	2020-10-06 12:29:10 +02:00
Aurélien	5571a166c6	change variable #14697	2020-10-06 11:37:55 +02:00
Laurent Destailleur	ee40aeecce	Standardize API	2020-10-05 12:21:54 +02:00
Laurent Destailleur	5256229089	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2020-10-02 13:51:47 +02:00
Laurent Destailleur	10deb1baad	Clean code - Removed no more used files orderstoinvoice.php	2020-10-02 13:51:32 +02:00
Laurent Destailleur	d297e0b05a	Update card.php	2020-10-02 13:46:44 +02:00
stickler-ci	4707ea2a27	Fixing style errors.	2020-10-02 06:48:14 +00:00
Nicolas	d976d474df	NEW Hook on propal card	2020-10-02 08:42:48 +02:00
Laurent Destailleur	813deee4a5	Fix phpcs	2020-10-02 01:14:43 +02:00
Laurent Destailleur	ed69b6ad15	Merge pull request #14863 from bomuux/patch-2 Bug: ActionComm::ref_ext is not saved properly	2020-10-01 19:21:28 +02:00
Laurent Destailleur	d912908aef	NEW Can build vendor invoice from vendor orders	2020-10-01 19:05:20 +02:00
Laurent Destailleur	ece8037f42	The button "Invoice orders" switch to page with lines autoselected.	2020-10-01 18:08:46 +02:00
Laurent Destailleur	7b3a7c9921	Add token on all url with action=delete	2020-10-01 10:50:54 +02:00
Laurent Destailleur	f442dac2c9	Add token on most GET url for admin action	2020-09-30 15:13:28 +02:00
Laurent Destailleur	a3da2afe7a	Add option MAIN_LIST_ALLOW_PUBLIC_NOTES + MAIN_LIST_ALLOW_PRIVATE_NOTES	2020-09-30 11:58:40 +02:00
bomuux	9ed6092ed8	Bug: ActionComm::ref_ext is not saved properly ActionComm::ref_ext is considered to be a timestamp in ActionComm::create(), (but not in ActionComm::create()). Correction to consider it a string.	2020-09-29 19:56:22 +02:00
Laurent Destailleur	708ac91a39	Merge pull request #14825 from atm-greg/fix_notification_system Fix notification system	2020-09-29 14:13:33 +02:00
atm-greg	a61f79c039	only update reminders if event is not past	2020-09-29 14:10:24 +02:00
atm-greg	1ed6312f4b	add modification of the notifications	2020-09-29 14:08:49 +02:00
atm-greg	988a532bed	fix br	2020-09-28 16:37:17 +02:00
Sekan, Tobias	2bf15b3a92	Show category filter only on rights to read it	2020-09-28 10:42:49 +02:00
Laurent Destailleur	f851ce2f0f	Merge pull request #14741 from Tim-Otte/fix-zero-price-lines FIX: Allow product price equal zero in new lines	2020-09-27 20:46:36 +02:00
Laurent Destailleur	3c6dda9dd5	Clean code	2020-09-25 10:27:30 +02:00
atm-greg	554948d3e2	bad user for getNomUrl	2020-09-24 15:34:52 +02:00
atm-greg	5244c05abb	reminders in the future can be displayed too	2020-09-24 15:30:29 +02:00
atm-greg	b269af5bf6	delete reminders on ActionComm::delete	2020-09-24 15:26:35 +02:00
atm-greg	e6eff6511e	fix reminder offsetunit and display problems	2020-09-24 15:20:30 +02:00
atm-greg	101405b052	fix notification creation => must create for every user linked to the event	2020-09-24 12:31:28 +02:00
Tobias Sekan	a72519f353	Merge branch 'develop' into PreselectThirpartyOnNewFromList	2020-09-23 09:09:42 +02:00
Laurent Destailleur	6c06d2f0aa	Look and feel v13	2020-09-22 15:26:29 +02:00
Tim Otte	e373de91d9	Fixed a bug where a price equal zero would be replaced with the product price	2020-09-22 14:43:09 +02:00
Laurent Destailleur	e52559783f	Look and feel v13	2020-09-21 13:54:26 +02:00
Laurent Destailleur	3e977bc5d6	Fix css	2020-09-21 12:55:06 +02:00
Laurent Destailleur	b3dd51b790	Fix warnings	2020-09-20 16:46:29 +02:00
Laurent Destailleur	a3d0835c37	Fix param	2020-09-20 16:11:02 +02:00
Laurent Destailleur	216b3c885d	Fix escaping	2020-09-20 01:30:36 +02:00
Laurent Destailleur	c191dd1a34	Fix escaping	2020-09-19 23:27:11 +02:00
Laurent Destailleur	eb36c3f144	Fix must use GETPOST	2020-09-19 02:27:32 +02:00
Laurent Destailleur	b6c6473cce	Fix sql injection when forging requests with IN	2020-09-18 17:47:40 +02:00
Laurent Destailleur	4e2aff2cdc	Fix sql injection when forging requests with IN	2020-09-18 17:28:02 +02:00
Laurent Destailleur	2d38644ae1	Sanitize sortfield	2020-09-18 17:13:01 +02:00
Tobias Sekan	b2a953ed5b	Merge branch 'develop' into PreselectThirpartyOnNewFromList	2020-09-18 12:21:41 +02:00
Sekan, Tobias	eac9e54e0b	fix more different button visibility	2020-09-18 11:48:53 +02:00
Sekan, Tobias	ae8c302c19	merge variable declaration	2020-09-18 10:52:17 +02:00
Sekan, Tobias	dc4250aed7	Make button visiblity identical on most lists	2020-09-18 10:46:23 +02:00
Sekan, Tobias	d1f70a37df	Preselect thirparty on new from list (part 1)	2020-09-18 07:56:13 +02:00
Laurent Destailleur	c4b5f5a249	Maxi clean of code	2020-09-18 01:29:17 +02:00
Laurent Destailleur	9a758b7edd	FIX #yogosha4483	2020-09-17 14:31:25 +02:00
Laurent Destailleur	5e3f6ce736	Merge pull request #14749 from TobiasSekan/UseNewTableFunctionAndCleanup Use new table function for comm/propal + cleanup	2020-09-17 11:20:31 +02:00
Laurent Destailleur	bfbb217607	Fix GETPOST on 'action'	2020-09-16 19:39:50 +02:00
Sekan, Tobias	91641e593f	MAIN_DASHBOARD_USE_TOTAL_HT + more clean	2020-09-16 14:03:41 +02:00
stickler-ci	be27617e68	Fixing style errors.	2020-09-16 09:11:01 +00:00
Sekan, Tobias	ac1fdb4a59	Use new table function for comm/propal + cleanup	2020-09-16 10:51:19 +02:00
Laurent Destailleur	e5191cad24	Move code of incoterm into the Incoterm Trait.	2020-09-16 02:50:18 +02:00
Laurent Destailleur	bd577e253a	Fix phpcs	2020-09-14 22:31:57 +02:00
Laurent Destailleur	cf423add2e	Reminders visible on edit page too	2020-09-14 21:09:48 +02:00
Laurent Destailleur	59c10235b5	Show reminders on the event page	2020-09-14 21:06:40 +02:00
Laurent Destailleur	f626bd70d0	Look and feel v13	2020-09-14 20:53:42 +02:00
Scrutinizer Auto-Fixer	73915d51c8	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-09-14 02:30:04 +00:00
Laurent Destailleur	1f8278c8ca	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/bookkeeping/balance.php htdocs/core/class/html.formmail.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/langs/en_US/other.lang htdocs/product/class/product.class.php htdocs/supplier_proposal/class/supplier_proposal.class.php	2020-09-12 04:42:59 +02:00
Laurent Destailleur	5ea3f09e17	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/core/class/translate.class.php	2020-09-12 04:29:28 +02:00
Laurent Destailleur	990af9d5cf	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 Conflicts: htdocs/accountancy/class/accountancyexport.class.php htdocs/comm/propal/class/propal.class.php htdocs/core/class/commonobject.class.php htdocs/core/class/html.formmail.class.php	2020-09-12 04:25:54 +02:00
Laurent Destailleur	9dad8f0fb7	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2020-09-12 03:02:27 +02:00
Laurent Destailleur	f45054df06	Close #14604 Merge manually change to get notification to show Remains: support call of the action=closereminderid done by browser once notif has be thrown.	2020-09-12 03:02:08 +02:00
Laurent Destailleur	fab3a774d2	Merge pull request #14636 from TobiasSekan/AddTableHelperMethod NEW Add helper function for table headers with numbers	2020-09-12 01:21:24 +02:00
Laurent Destailleur	3930b00e4d	Debug a not used page to show agenda per type of event	2020-09-11 14:35:52 +02:00
Laurent Destailleur	c4383747a1	Look and feel v13	2020-09-11 13:57:16 +02:00
Laurent Destailleur	64b28020c8	Look and feel v13	2020-09-11 13:14:14 +02:00
stickler-ci	be32a24eed	Fixing style errors.	2020-09-10 09:07:10 +00:00
Sekan, Tobias	d2903c5de6	adress feedback + massive cleanup	2020-09-10 11:04:41 +02:00
Laurent Destailleur	b8fe2188a6	Standardize code around model_pdf	2020-09-10 01:49:09 +02:00
Scrutinizer Auto-Fixer	c263c8a76c	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-09-08 19:27:28 +00:00
stickler-ci	413bb10913	Fixing style errors.	2020-09-08 09:22:02 +00:00
Sekan, Tobias	bd96e0fe42	finished helper method and usage of it	2020-09-08 11:15:33 +02:00
Laurent Destailleur	5a471d38c2	Merge pull request #14611 from atm-adrien/NEW_propal_massAction_validate_sign New : add massActions "Validate" and "Sign"	2020-09-07 12:13:29 +02:00
Laurent Destailleur	570c72f6c9	Update list.php	2020-09-07 12:12:28 +02:00
Adrien Raze	c8c6be2038	Retours PR	2020-09-07 10:50:01 +02:00
Scrutinizer Auto-Fixer	b78ff67d7e	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-09-07 08:18:17 +00:00
Laurent Destailleur	d700649fb9	The deprecated subsitution key __SIGNATURE__ has been removed. Replace with __USER_SIGNATURE__ if you still use old syntax in your email templates.	2020-09-06 19:25:25 +02:00
Sekan, Tobias	0375f5fd37	Add helper function for table headers with numbers	2020-09-04 15:24:45 +02:00
Laurent Destailleur	7094cec42a	Fix use same duration code 'on 1 letter' than the production duration record, also than tha sprintf.	2020-09-04 14:37:55 +02:00
Laurent Destailleur	07fc85c222	Fix minor	2020-09-04 12:25:16 +02:00
Juanjo Menent	9bd5ed627f	Fix travis issues	2020-09-04 09:55:02 +02:00
Laurent Destailleur	1408c862f6	css	2020-09-03 21:23:58 +02:00
Laurent Destailleur	aafe323405	css	2020-09-03 19:11:56 +02:00
Laurent Destailleur	3f243aa457	Merge pull request #14622 from kev-73/develop NEW: add week number for month view in agenda	2020-09-03 19:02:59 +02:00
stickler-ci	43590587e5	Fixing style errors.	2020-09-03 12:30:04 +00:00
Adrien Raze	bcd9a0b29f	Retours PR	2020-09-03 14:25:17 +02:00
kev-73	38ed033b8a	New: add week number for month view in agenda Agenda, view by month : add a column on left side of agenda, which containt the week number for each line, so for each week. Column width at 2%, no change for width of others columns, because with 14% by defalut, so 14*7=98, the 2% for new column is available. For get date and week number, use fonctions and variables already define in file.	2020-09-03 14:03:40 +02:00
Juanjo Menent	bb92e64e43	FIX: #14474 Error when deleting	2020-09-03 12:43:38 +02:00
Laurent Destailleur	5af1eff2d9	Fix phpcs	2020-09-03 10:46:46 +02:00
stickler-ci	8c514c8025	Fixing style errors.	2020-09-03 08:24:12 +00:00
Adrien Raze	c043501ee5	Retours PR standard	2020-09-03 10:19:57 +02:00
Adrien Raze	0898a1e28a	Merge branch 'NEW_propal_massAction_validate_sign' of https://github.com/atm-adrien/dolibarr into NEW_propal_massAction_validate_sign	2020-09-03 10:06:13 +02:00
Adrien Raze	675fe05808	Retours PR Standard	2020-09-03 09:51:49 +02:00
Laurent Destailleur	31548c6fbb	Better error message	2020-09-02 21:42:29 +02:00
Laurent Destailleur	f642fc9ad9	Fix	2020-09-02 21:40:17 +02:00
Laurent Destailleur	ed743c9dbb	Fix phpcs More secured sendEmailsReminder()	2020-09-02 21:39:22 +02:00
Laurent Destailleur	9868140693	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2020-09-02 19:20:12 +02:00
Laurent Destailleur	80f824569a	Use english	2020-09-02 19:15:03 +02:00
Laurent Destailleur	a58dcc3886	Doc	2020-09-02 19:10:07 +02:00
Laurent Destailleur	a984c8e969	Use english	2020-09-02 18:57:56 +02:00
Laurent Destailleur	6d52721246	Merge pull request #14609 from atm-lena/NEW_AddDefaultMailModelToSelect_EventReminder Event Reminder : Add "Default Mail Model" to select Mail Model	2020-09-02 18:08:40 +02:00
Laurent Destailleur	d913736bd1	Update list.php	2020-09-02 17:59:21 +02:00
Laurent Destailleur	ee003ed499	Update list.php	2020-09-02 17:57:09 +02:00
Laurent Destailleur	2a4f0fc034	Fix backto link	2020-09-02 16:37:02 +02:00
stickler-ci	a713286579	Fixing style errors.	2020-09-02 13:58:04 +00:00
Adrien Raze	d6113acfc8	action presign/prevalidate + action sign/validate + Traductions	2020-09-02 15:20:10 +02:00
atm-lena	7b91c8efc8	Event Reminder : Add "Default Mail Model" to select Mail Model	2020-09-02 09:58:55 +02:00
Laurent Destailleur	e4557b3dd3	Responsive	2020-09-01 23:04:29 +02:00
Laurent Destailleur	619a9a3679	Look and feel v13	2020-09-01 22:53:49 +02:00
Laurent Destailleur	8e02d39cb3	Fix prefill of end date when event type is rendez-vous	2020-09-01 22:44:03 +02:00
Laurent Destailleur	f18a852510	Merge pull request #14599 from TobiasSekan/AllowClickOnAllNumOnCommerceOverview NEW Allow click on all header numbers on commerce area	2020-09-01 15:38:42 +02:00
Laurent Destailleur	a424515835	Merge pull request #14596 from atm-lena/NEW_AgendaEvent_Remind_Part2 Agenda Remind (Part 2 & 3)	2020-09-01 15:33:52 +02:00
Laurent Destailleur	a626b252bd	Optimize code	2020-09-01 15:33:02 +02:00
atm-lena	1b225706db	FIX create remind : dateremind save	2020-09-01 14:48:03 +02:00
Sekan, Tobias	ba107361fd	Allow click all num on comm. overview	2020-09-01 13:20:56 +02:00
stickler-ci	763515a4ca	Fixing style errors.	2020-09-01 08:17:19 +00:00
atm-lena	86c6ef23e3	Errors management v2	2020-09-01 10:05:55 +02:00
atm-lena	b747f6285e	Errors management	2020-09-01 10:01:59 +02:00
atm-lena	d2ed43d913	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind_Part2	2020-09-01 09:43:14 +02:00
atm-lena	13f91f1de8	FIX getEmailTemplat() in sendEmailsReminder() reminder function	2020-09-01 09:41:59 +02:00
Laurent Destailleur	b69a992324	Fix option AGENDA_SUPPORT_PRIORITY_IN_EVENTS	2020-09-01 04:29:57 +02:00
Laurent Destailleur	e353d4a42d	Add tooltip if label truncated	2020-09-01 03:59:57 +02:00
atm-lena	a8c9e76ef6	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind_Part2	2020-08-31 16:57:49 +02:00
Laurent Destailleur	1a353a5742	Merge pull request #14592 from TobiasSekan/UniformAvailabilityDescOnPropal FIX Uniform availability delay description on commercial proposal (new and card)	2020-08-31 16:25:42 +02:00
atm-lena	f8c79db4a9	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind_Part2	2020-08-31 14:14:27 +02:00
Sekan, Tobias	070a09d5cc	Uniform availability desc. on propal	2020-08-31 13:41:22 +02:00
Laurent Destailleur	e030b2089a	Look and feel v13	2020-08-30 13:14:28 +02:00
Laurent Destailleur	8adf1852b1	Clean code	2020-08-30 03:00:35 +02:00
Laurent Destailleur	6293f76692	Debug	2020-08-29 06:17:26 +02:00
Laurent Destailleur	bca9a84710	Enhance autofill of end date when creating an event	2020-08-29 06:05:52 +02:00
Laurent Destailleur	b721930b3b	Merge pull request #14568 from atm-lena/NEW_AgendaEvent_Remind Agenda Remind (Part 1)	2020-08-29 05:19:21 +02:00
Laurent Destailleur	82f93fed92	css	2020-08-29 03:52:27 +02:00
Laurent Destailleur	983a3c59c8	css	2020-08-29 01:11:08 +02:00
Laurent Destailleur	ad87e753b4	Clean trim on GETPOST (already included inside GETPOST when not 'none'	2020-08-28 21:27:50 +02:00
atm-lena	6562334f7b	FIX sendEmailsReminder() function	2020-08-28 09:37:18 +02:00
Laurent Destailleur	4624cf98ee	Merge pull request #14545 from cfoellmann/defaults-payment-selections FIX allow use of default settings for payment term and condition on proposal creation	2020-08-27 21:04:10 +02:00
Laurent Destailleur	f997d11761	Update card.php	2020-08-27 21:02:01 +02:00
Laurent Destailleur	7730569dff	Update card.php	2020-08-27 21:00:01 +02:00
Laurent Destailleur	9f8d1f0e63	Merge pull request #14520 from TobiasSekan/ShowUserOnExternalCalenderEvents NEW Show user on external calender events (when found)	2020-08-27 20:10:13 +02:00
Laurent Destailleur	0309510ab8	Fix avoid duplicate event recorded from email collector	2020-08-27 18:50:08 +02:00
atm-lena	c0f254d10c	Translation + decode	2020-08-27 16:03:25 +02:00
atm-lena	e3ce3cbb7c	Function sendEmailsReminder()	2020-08-27 15:49:56 +02:00
atm-lena	f57325237a	WIP : sendEmailsReminder()	2020-08-27 12:30:59 +02:00
atm-lena	5856033892	Replace "agenda_send" and "event_push" to "actioncomm_send"	2020-08-27 11:15:08 +02:00
stickler-ci	b0fe7bc2e0	Fixing style errors.	2020-08-27 08:47:57 +00:00
atm-lena	4ef2644300	Use date.lib.php functions	2020-08-27 10:29:23 +02:00
atm-lena	9d1fc28eba	Fix type reminder "push" to "browser"	2020-08-27 09:35:02 +02:00
atm-lena	bbc554070c	Fix	2020-08-27 09:33:40 +02:00
atm-lena	6a60228bc3	Translation	2020-08-26 17:11:32 +02:00
atm-lena	efe60ebc58	Error management	2020-08-26 17:02:34 +02:00
atm-lena	cc29654f47	WIP : rename fk_project to fk_actioncomm + add line to sql file to install	2020-08-26 16:48:09 +02:00
atm-lena	a01d1b58c7	Add fk_email_template	2020-08-26 16:06:20 +02:00
atm-lena	cf9337b644	Add fk_project to actioncommreminder object	2020-08-26 15:58:14 +02:00
atm-lena	c10556473f	Clean	2020-08-26 15:35:12 +02:00
atm-lena	552e655668	Add field "entity" in actioncommrminder object and table	2020-08-26 15:22:32 +02:00
atm-lena	2fb5824836	Calcul date of reminder for event create	2020-08-26 15:12:08 +02:00
atm-lena	d3ac39589a	WIP	2020-08-26 12:48:12 +02:00
atm-lena	42f492877e	WIP	2020-08-26 11:36:32 +02:00
atm-lena	3046556d7b	Add checkbox "AddReminder"	2020-08-26 11:19:14 +02:00
atm-lena	a4018f41f7	WIP	2020-08-26 10:52:36 +02:00
atm-lena	7df993c7ed	Add "select_model_mail" function + add select to create event	2020-08-25 17:26:32 +02:00
atm-lena	94b2f3c5e1	Add $conf conditions	2020-08-25 12:57:36 +02:00
atm-lena	25840c2b3d	Create Event - Add fields	2020-08-25 12:40:29 +02:00
Sekan, Tobias	a7895f3496	Merge branch 'ShowUserOnExternalCalenderEvents' of https://github.com/TobiasSekan/dolibarr into ShowUserOnExternalCalenderEvents	2020-08-25 12:20:10 +02:00
Sekan, Tobias	4c851884e5	Address feedback	2020-08-25 12:16:44 +02:00
stickler-ci	a60968e95b	Fixing style errors.	2020-08-24 14:17:15 +00:00
Christian Foellmann	0e9677fd34	allow default settings for "cond_reglement_id" and "mode_reglement_id" (cherry picked from commit 2e5475d181af2e8ceb6ea220424fd1329e72e342)	2020-08-24 16:08:44 +02:00
Laurent Destailleur	d23e83779f	Merge branch 'develop' into ParseTranspAndPrioFromExternalCalendar	2020-08-23 18:21:18 +02:00
Laurent Destailleur	053aa1b750	Merge pull request #14509 from TobiasSekan/ShowLocationOnImportCalenderEvents NEW Show place from events on import calender	2020-08-23 18:11:02 +02:00
Laurent Destailleur	a265bec7ca	NEW Events in agenda for contact FIX Saving contacts of an events	2020-08-23 02:38:56 +02:00
Laurent Destailleur	6ad18ceef0	Remove useless code	2020-08-21 19:48:31 +02:00
stickler-ci	183013e9ed	Fixing style errors.	2020-08-21 12:02:03 +00:00
Sekan, Tobias	9af5354dfe	Parse priority and transparency from external calender events	2020-08-21 13:57:03 +02:00
stickler-ci	61cce2e700	Fixing style errors.	2020-08-21 06:46:00 +00:00
Sekan, Tobias	22ff5a320f	fix not working external calender on/off	2020-08-21 08:40:23 +02:00
Sekan, Tobias	bb1452917b	fix wrong event percentage	2020-08-21 08:33:19 +02:00
Sekan, Tobias	ba98db934d	Show user on external calender events	2020-08-21 08:18:26 +02:00
Laurent Destailleur	ad0625b6ec	Debug posting message from ticket page	2020-08-21 01:11:22 +02:00
Sekan, Tobias	546571a6f8	Show place from events on import calender	2020-08-20 08:20:00 +02:00
Laurent Destailleur	7217dc3114	Better perf for phpunit on very large databases	2020-08-19 01:43:48 +02:00
Laurent Destailleur	964c4ef0d2	Standardize code. Use model_pdf.	2020-08-18 14:48:38 +02:00
Alexandre SPANGARO	27c36713d3	Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport	2020-08-16 22:10:02 +02:00
Tim Otte	0e03578e91	Fixed translation of product units in documents	2020-08-04 11:51:40 +02:00
Laurent Destailleur	e455f8afa6	Merge pull request #14369 from Tim-Otte/fix-product-unit-translation Fixed translation of product units in documents	2020-08-04 11:50:50 +02:00
Tim Otte	360afccecc	Fixed translation of product units in documents	2020-08-04 11:02:16 +02:00
Laurent Destailleur	4afdfdda53	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/card.php	2020-08-02 22:42:17 +02:00
Laurent Destailleur	66d4b7372e	FIX Look and feel v12 Conflicts: htdocs/comm/card.php htdocs/societe/tpl/linesalesrepresentative.tpl.php	2020-08-02 22:38:20 +02:00
Laurent Destailleur	87f71e7681	FIX Look and feel v12	2020-08-02 22:36:14 +02:00
kkhelifa-opendsi	fe0f77b967	Merge branch 'develop' into stcommcontact	2020-07-31 16:41:17 +02:00
Tim Otte	85c5f423b1	Added fetch_thirdparty (without the site crashes)	2020-07-29 12:55:58 +02:00
Tim Otte	c5816478d9	Added fetch_thirdparty (without the site crashes)	2020-07-28 11:14:55 +02:00
Laurent Destailleur	dd86c21382	FIX dolGetElementUrl and agenda page for external modules	2020-07-25 03:01:04 +02:00
Laurent Destailleur	46fccf8eb1	FIX dolGetElementUrl and agenda page for external modules	2020-07-24 11:53:44 +02:00
Laurent Destailleur	42234ba506	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/price.lib.php	2020-07-24 00:07:57 +02:00
VERDOL Gauthier	55298317e3	FIX : wrong link to third invoice templates	2020-07-20 16:22:48 +02:00
Abdessalam@MEGALOGI	1e6273b92d	Update card.php La description d'un produit/service libre (HTML) d'un devis est formatée en texte simple.	2020-07-18 23:11:17 +02:00
Laurent Destailleur	8b5f4fe9a6	Fix massaction delete on events	2020-07-11 12:21:53 +02:00
Laurent Destailleur	b6452dbbc0	Merge pull request #14196 from Tim-Otte/fix-proposals-urgent FIX: Hotfix for "Call to a member function getNomUrl() on null in comm/propal/card.php"	2020-07-10 02:51:25 +02:00
Laurent Destailleur	46119dc786	Fix per user	2020-07-09 12:49:48 +02:00
Laurent Destailleur	b2bd90ae1a	Fix link to list of event	2020-07-09 12:33:28 +02:00
Laurent Destailleur	9592fdb3fc	CSS	2020-07-09 11:55:16 +02:00
Laurent Destailleur	1dfd2d565b	FIX Reposition and nav	2020-07-08 18:18:47 +02:00
Laurent Destailleur	96d935832c	FIX Reposition and nav	2020-07-08 18:18:08 +02:00
Laurent Destailleur	5ea47f3ade	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/resultat/index.php htdocs/product/admin/product.php htdocs/projet/tasks/list.php	2020-07-08 18:11:58 +02:00
Laurent Destailleur	96729769f7	Standardize Agenda view	2020-07-08 18:06:14 +02:00
Tim Otte	a73f77cfef	Fixed same error like before	2020-07-07 12:43:15 +02:00
Laurent Destailleur	4fd970af28	Fix phpcs	2020-07-07 01:29:31 +02:00
Laurent Destailleur	14c98f277b	NEW Can change VAT rate of all lines of a draft object in one step.	2020-07-06 22:48:22 +02:00
Laurent Destailleur	f72a836231	Fix look and feel v12	2020-07-06 16:59:25 +02:00
Laurent Destailleur	4dcc073b3a	Fix param GETPOST	2020-07-06 16:54:30 +02:00
Laurent Destailleur	3939a640e9	Fix note in creation	2020-07-06 16:52:28 +02:00
stickler-ci	19eef8aa93	Fixing style errors.	2020-07-06 01:26:46 +00:00
Alexandre SPANGARO	59ee22537d	Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport	2020-07-06 03:24:27 +02:00
Laurent Destailleur	83eaddb17b	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/core/class/evalmath.class.php htdocs/core/class/extrafields.class.php htdocs/install/mysql/migration/11.0.0-12.0.0.sql htdocs/langs/en_US/cashdesk.lang htdocs/societe/class/societe.class.php	2020-07-04 13:13:17 +02:00
Tim Otte	bce0a93227	Hotfix for an error in v12	2020-07-03 00:33:54 +02:00
Laurent Destailleur	0ea55209ae	Merge pull request #14165 from ptibogxiv/patch-345 FIX non numeric value on comm/card.php	2020-07-03 00:24:32 +02:00
Regis Houssin	a5431a40da	FIX missing possibility to change entity when propal cloning	2020-07-02 10:16:20 +02:00
ptibogxiv	cc132775f3	FIX non numeric value on comm/car.php	2020-07-01 16:18:19 +02:00
Tim Otte	94a1d71fba	Hotfix for an error in v12	2020-06-30 15:20:30 +02:00
Laurent Destailleur	0aa08edb38	Merge pull request #14139 from OPEN-DSI/new-societe-card-set-sales-representative NEW can edit and set sales representatives directly on thirdparty card	2020-06-28 21:08:24 +02:00
Laurent Destailleur	90d4458aab	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/class/facture.class.php	2020-06-27 00:38:51 +02:00
Laurent Destailleur	29ba9c82c3	Fix #14120	2020-06-26 17:17:13 +02:00
lvessiller	ad36447295	NEW can edit and set sales representatives directly on thirdparty card	2020-06-26 12:20:53 +02:00
Laurent Destailleur	333d4873c3	Properties ->contactid has been renamed into ->contact_id	2020-06-25 12:17:47 +02:00
Laurent Destailleur	18c23680f7	Fix bad object	2020-06-25 12:17:06 +02:00
Laurent Destailleur	ee5156034d	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-06-24 20:03:40 +02:00
Laurent Destailleur	de62037ba5	Fix signed only in margin calculation of project	2020-06-24 12:58:10 +02:00
Laurent Destailleur	6d25b8630b	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/prelevement.php htdocs/core/class/rssparser.class.php	2020-06-23 11:38:20 +02:00
Laurent Destailleur	4d2cbf7006	Fix alert picto of expired services not visible Fix CSS	2020-06-23 11:27:40 +02:00
Laurent Destailleur	501fd2f7a3	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/takepos/admin/receipt.php	2020-06-21 20:48:41 +02:00
Laurent Destailleur	bb3320f103	FIX #14104	2020-06-20 18:34:19 +02:00
Laurent Destailleur	c54294285a	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/mailing/class/html.formadvtargetemailing.class.php htdocs/core/class/commonobject.class.php htdocs/core/class/html.form.class.php	2020-06-20 12:28:14 +02:00
florian HENRY	7fef9a813e	fix warning and clean old code about multiselect category	2020-06-18 20:03:03 +02:00
Laurent Destailleur	4627f06c70	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-06-16 22:57:50 +02:00
Laurent Destailleur	b7d835eceb	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-06-15 16:10:27 +02:00
Laurent Destailleur	40e16672e3	FIX BlindBoolean SQL injection reported by Christian Weiler <sak1.s3curity@gmail.com>	2020-06-15 15:08:52 +02:00
Laurent Destailleur	90b5ed9908	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/website.lib.php	2020-06-11 23:41:35 +02:00
Laurent Destailleur	e94ef09977	css	2020-06-10 22:24:15 +02:00
Laurent Destailleur	8dbc0ff040	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/prelevement.php htdocs/admin/system/phpinfo.php htdocs/modulebuilder/index.php	2020-05-31 00:31:14 +02:00
Laurent Destailleur	94e02269ee	Fix: missing fk_project	2020-05-31 00:20:01 +02:00
Laurent Destailleur	ddebe1bbba	FIX Missing ref into popup	2020-05-30 23:52:47 +02:00
Laurent Destailleur	02bf646abe	FIX Missing ref into popup	2020-05-30 23:51:02 +02:00
stickler-ci	029f5570e5	Fixing style errors.	2020-05-28 12:55:29 +00:00
Supermanu	0baea21947	NEW Add mass deletion for events Only users with the right `allactions->delete` will be able to mass delete.	2020-05-28 14:45:54 +02:00
Supermanu	721b99bb2f	Add calendar selection for agenda view	2020-05-28 11:24:37 +02:00
Frédéric FRANCE	e5402988d9	Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword	2020-05-24 17:58:18 +02:00
Laurent Destailleur	fd61214b97	Merge	2020-05-24 01:06:45 +02:00
Frédéric FRANCE	5c78eca68a	prepare new rule	2020-05-23 21:14:44 +02:00
Frédéric FRANCE	174ddc5fd4	prepare new rule	2020-05-23 21:07:47 +02:00
Laurent Destailleur	127534ef55	Fix common var name seems to be $objref for subdir of doc	2020-05-23 20:09:31 +02:00
stickler-ci	66637ba0b6	Fixing style errors.	2020-05-23 16:39:06 +00:00
Frédéric FRANCE	2085ac73e7	Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword	2020-05-23 18:34:58 +02:00
Laurent Destailleur	4e3fbb9d05	Merge pull request #13912 from TobiasSekan/NewEventMassactionPercent NEW mass-actions for the event list view	2020-05-23 14:26:51 +02:00
Laurent Destailleur	7397806ae7	Update actioncomm.class.php	2020-05-23 14:26:28 +02:00
Frédéric FRANCE	b41ac00b98	add new rule	2020-05-21 15:05:19 +02:00
Frédéric FRANCE	ee6fadd0d5	add new rule	2020-05-21 01:41:27 +02:00
Laurent Destailleur	92cbff7749	Clean code	2020-05-20 23:40:04 +02:00
stickler-ci	f0bb7d233f	Fixing style errors.	2020-05-19 06:29:23 +00:00
Tobias Sekan	7fd6151c43	Add massactions for event list	2020-05-19 08:18:38 +02:00
Tobias Sekan	223224d12c	Add function to update the event percent + const	2020-05-19 08:07:21 +02:00
Laurent Destailleur	ff8d22a80d	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 Conflicts: htdocs/expedition/class/expedition.class.php scripts/cron/cron_run_jobs.php	2020-05-18 15:57:01 +02:00
Laurent Destailleur	9336828710	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 Conflicts: htdocs/comm/action/class/actioncomm.class.php htdocs/compta/paiement/card.php htdocs/expedition/class/expedition.class.php	2020-05-18 15:54:39 +02:00
Laurent Destailleur	45345440a4	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/expedition/class/expedition.class.php scripts/cron/cron_run_jobs.php	2020-05-18 15:50:36 +02:00
Maxime Kohlhaas	cf96383bf9	Fix : entity was missing in actioncomm fetch	2020-05-18 10:44:55 +02:00
Laurent Destailleur	ab07330668	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-05-14 16:34:45 +02:00
Laurent Destailleur	f5b9151f17	Merge pull request #13871 from FHenry/11.0 fix template email on propal list	2020-05-14 16:10:33 +02:00
Laurent Destailleur	136d002639	Merge pull request #13872 from simnandez/11.0 FIX: Do not show stats panel if the user does not have permissions	2020-05-14 16:09:37 +02:00
ptibogxiv	e1db0ef855	Update index.php	2020-05-12 10:57:51 +02:00
Juanjo Menent	66beb7c14f	FIX: Do not show stats panel if the user does not have permissions	2020-05-12 10:17:47 +02:00
florian HENRY	d9e26b8569	fix template email on prpal list	2020-05-12 08:38:03 +02:00
Laurent Destailleur	4584fa1aa6	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/asset/list.php htdocs/compta/bank/list.php htdocs/contrat/services_list.php htdocs/core/lib/date.lib.php htdocs/expensereport/list.php htdocs/fichinter/list.php htdocs/holiday/list.php htdocs/projet/tasks/list.php htdocs/supplier_proposal/list.php htdocs/user/list.php	2020-05-11 19:43:06 +02:00
Laurent Destailleur	44d36815bd	Look and feel v12	2020-05-11 19:00:27 +02:00
Laurent Destailleur	42ee755ea5	Look and feel v12	2020-05-08 02:52:55 +02:00
Maxime Kohlhaas	1a9afe6b20	Fix missing hook params for printFieldListValue	2020-05-08 01:40:25 +02:00
Laurent Destailleur	206b16410e	Revert the option to avoid to introduce a feature that is duplicate with already existing view "Events/Agenda". It also keeps a common behaviour between other tools. Maxi debug on messages of tickets	2020-05-07 22:52:32 +02:00
Scrutinizer Auto-Fixer	8f0e00b4aa	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-05-02 01:39:56 +00:00
Laurent Destailleur	8208e81622	Merge pull request #13767 from indelog/statsbytype Add possibility to filter stats by ThirdParty type and categorie	2020-05-01 22:05:06 +02:00
Laurent Destailleur	c27b3c5966	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/tpl/extrafields_list_search_sql.tpl.php	2020-04-30 18:49:20 +02:00
DEMAREST Maxime (Indelog)	790cffb7ae	Correct select label for categories in stats pages	2020-04-29 15:24:13 +02:00
DEMAREST Maxime (Indelog)	1bd9372022	Forgot comments to document news params for the modified methods	2020-04-29 10:00:29 +02:00
DEMAREST Maxime (Indelog)	40f1bed8d0	Add possibility to filter stats by ThirdParty type and categorie	2020-04-29 09:17:44 +02:00
kamel	4dd42496fa	Correction pour validation Stickler CI / stickler-ci	2020-04-27 17:48:05 +02:00
kamel	9cb90cb384	NEW: Add prospect status managment for the contact with managment of custom icon	2020-04-27 17:35:14 +02:00
Laurent Destailleur	1c70e49695	Merge branch 'develop' into 12.0_a23	2020-04-27 14:14:13 +02:00
gauthier	7f56c4a785	FIX : Another "Access to undeclared static property: Contact::$table_element" && "Societe::$table_element"	2020-04-27 11:18:53 +02:00
Laurent Destailleur	4c605283f5	Fix phpcs	2020-04-27 00:09:21 +02:00
Laurent Destailleur	31157931a9	Fix phpcs	2020-04-26 23:52:23 +02:00
Laurent Destailleur	1121d2c1c6	Look and feel v12	2020-04-25 13:49:44 +02:00
Laurent Destailleur	7bbfd2175d	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/class/fournisseur.commande.dispatch.class.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/reception/class/reception.class.php	2020-04-24 18:58:47 +02:00
Laurent Destailleur	9679b1f04c	Merge pull request #13704 from frederic34/actioncomm_note actioncomm note deprecated	2020-04-23 18:52:56 +02:00
Marc Guenneugues	94be1870ec	Clean line extrafields when deleting proposal	2020-04-23 18:02:53 +02:00
Laurent Destailleur	72c6ac1c72	Complete #13708 , normalization of code	2020-04-23 13:21:39 +02:00
Frédéric FRANCE	177008ab65	actioncomm note deprecated	2020-04-23 00:45:33 +02:00
Frédéric FRANCE	4220d6b253	actioncomm note deprecated	2020-04-23 00:38:42 +02:00
Laurent Destailleur	16e46c672c	Clean code	2020-04-20 15:06:27 +02:00
Laurent Destailleur	d847f67e45	Look and feel v12	2020-04-20 03:10:26 +02:00
Laurent Destailleur	5c18404083	Move to jquery 4.0.13 with fix in reponsive Restore some files modified by error.	2020-04-18 15:15:35 +02:00
Laurent Destailleur	8f7c3fc867	Fix: restore jselect2 4.0.5 (4.0.6 create troubles in responsive)	2020-04-18 14:39:02 +02:00
Laurent Destailleur	47ff3f866a	css	2020-04-18 12:54:28 +02:00
Laurent Destailleur	7c6c600225	CSS	2020-04-18 11:38:24 +02:00
Laurent Destailleur	07ce3fc34d	Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop	2020-04-18 11:08:21 +02:00
Laurent Destailleur	23876684cb	Responsive	2020-04-18 11:06:28 +02:00
Laurent Destailleur	5254a94038	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/ldap.php htdocs/commande/class/commande.class.php htdocs/commande/index.php htdocs/commande/list.php htdocs/compta/facture/list.php htdocs/expedition/list.php htdocs/fourn/commande/list.php htdocs/fourn/facture/list.php htdocs/loan/list.php htdocs/product/class/product.class.php htdocs/supplier_proposal/list.php	2020-04-16 15:58:59 +02:00
atm-quentin	f7c07640dd	viewstatut to search_status	2020-04-15 15:01:00 +02:00
Scrutinizer Auto-Fixer	387ea73bf3	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-04-13 11:24:42 +00:00
Laurent Destailleur	96d087c99d	Fix clean event report	2020-04-13 02:59:33 +02:00
Laurent Destailleur	596ba8d679	Clean deprecated code.	2020-04-13 01:10:35 +02:00
Laurent Destailleur	92b6b1a042	Look and feel v12	2020-04-12 18:13:43 +02:00
stickler-ci	a873afdad9	Fixing style errors.	2020-04-12 15:08:44 +00:00
Laurent Destailleur	51f73526f9	Merge branch 'develop' into patch-8	2020-04-12 17:07:57 +02:00
Laurent Destailleur	fe4cd2e7bc	Update actioncomm.class.php	2020-04-12 17:05:12 +02:00
Laurent Destailleur	422e33a68b	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/ihm.php htdocs/comm/action/class/actioncomm.class.php htdocs/compta/stats/cabyprodserv.php htdocs/filefunc.inc.php htdocs/takepos/invoice.php	2020-04-12 17:01:44 +02:00
Laurent Destailleur	1cda760621	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 Conflicts: htdocs/comm/action/class/actioncomm.class.php	2020-04-12 16:54:09 +02:00
Laurent Destailleur	eebf48b27c	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/comm/action/class/actioncomm.class.php	2020-04-12 16:52:58 +02:00
Frédéric FRANCE	e2660fd31c	Update actioncomm.class.php	2020-04-11 22:38:28 +02:00
Frédéric FRANCE	88f18ec3ce	can't remove actioncomm if there is a category	2020-04-11 22:24:50 +02:00
Laurent Destailleur	0845f0bcd3	Merge pull request #13523 from bb2a/patch-2 add in default search	2020-04-10 12:12:28 +02:00
Laurent Destailleur	5ff981bf61	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/user/perms.php	2020-04-10 12:04:21 +02:00
Laurent Destailleur	874cbcefc7	Fix permission to close a proposal or order was not correctly used #13547	2020-04-10 11:54:14 +02:00
Scrutinizer Auto-Fixer	444c293c01	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-04-10 08:59:32 +00:00
Anthony Berton	a7440687ec	Update list.php	2020-04-10 10:38:31 +02:00
Laurent Destailleur	4ff503d20a	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/product/stock/list.php htdocs/supplier_proposal/list.php	2020-04-10 02:07:51 +02:00
Laurent Destailleur	7fe8c7eab3	FIX #11855	2020-04-10 01:37:04 +02:00
Laurent Destailleur	83af4ebea4	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/modules/expedition/doc/pdf_espadon.modules.php htdocs/product/stock/class/entrepot.class.php htdocs/product/stock/list.php	2020-04-10 01:22:22 +02:00
Laurent Destailleur	63f0c07a07	Add warning	2020-04-08 18:32:13 +02:00
Laurent Destailleur	1adee36314	Upgrade to font awesome 5.13	2020-04-07 21:11:18 +02:00
Laurent Destailleur	ff1b3db54b	Fix regression on hamburger picto	2020-04-06 23:38:30 +02:00
Laurent Destailleur	28a1b7af35	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/modulebuilder/index.php htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php htdocs/supplier_proposal/class/supplier_proposal.class.php	2020-04-03 18:07:24 +02:00
Laurent Destailleur	193a10bc39	FIX cloning of emailing when no content selected	2020-04-03 02:29:10 +02:00
Laurent Destailleur	84cda962c1	Clean dead code	2020-04-02 12:03:29 +02:00
Laurent Destailleur	4207d94f53	FIX Bad position of total in column Conflicts: htdocs/fourn/facture/paiement.php	2020-03-27 19:10:01 +01:00
Laurent Destailleur	a4797634d5	FIX Bad position of total in column	2020-03-27 19:08:39 +01:00
Laurent Destailleur	c27592bad2	Clean deprecated params on all fetch_optionals()	2020-03-27 16:02:58 +01:00
Laurent Destailleur	004397304e	FIX Foreign currency lost when splitting a discount	2020-03-26 02:32:53 +01:00
Laurent Destailleur	f0de10897a	FIX Foreign currency lost when splitting a discount	2020-03-26 02:32:24 +01:00
Laurent Destailleur	fa3bba942f	Start to save the VAT src code into table of discounts to reuse them later	2020-03-26 02:01:30 +01:00

... 19 20 21 22 23 ...

8366 Commits