lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

2232 Commits

Author SHA1 Message Date
Laurent Destailleur
7bcc76c1aa Fix margin rates and mark rates are 2 different columns 2021-10-17 19:41:02 +02:00
Laurent Destailleur
b318ccb2af Fix margin rates and mark rates are 2 different columns 2021-10-17 19:39:56 +02:00
Laurent Destailleur
f8010dfcbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/reception/list.php
	htdocs/takepos/pay.php
 2021-10-16 13:01:03 +02:00
Laurent Destailleur
4e9c7c9efb FIX Attachment of pdf into shipment when sending email 2021-10-11 20:04:45 +02:00
Laurent Destailleur
7180f5eeff css 2021-10-10 21:25:46 +02:00
Laurent Destailleur
874731af84 The 'action=delete&file=...' has been replaced with 
'action=deletefile&file=...' to avoid confusion with deletion of object
lines.
 2021-10-10 21:11:48 +02:00
Laurent Destailleur
ff56415c00
Merge pull request #18903 from aspangaro/15a21 
HTML5 - <font> tag is deprecated, replace by <span>
 2021-10-05 16:51:41 +02:00
Laurent Destailleur
379dd9ccbb Fix position of text 2021-10-05 12:09:03 +02:00
Alexandre SPANGARO
3f26ab195b HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 09:46:48 +02:00
Laurent Destailleur
5ad02ccc32 MAIN_EMAIL_ADD_TRACK_ID removed, MAIN_FIX_FOR_BUGGED_MTA 1 by defaut 2021-10-05 09:11:20 +02:00
Laurent Destailleur
6060f0bfb0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/main.lang
 2021-10-04 14:53:44 +02:00
Laurent Destailleur
b3cb56f2ef Clean css 2021-10-04 04:14:31 +02:00
Laurent Destailleur
d6e1a6be93 Look and feel v14 2021-10-03 18:20:01 +02:00
Laurent Destailleur
902fed1f0d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/ecm/index.php
 2021-10-02 20:09:06 +02:00
Laurent Destailleur
166d3b08d6 Add LIBXML_NONET to simplexml_load_string 2021-09-30 20:12:01 +02:00
Laurent Destailleur
d764080636 Add tag data-ignoreidfordnd=1 to ignor lines for drage and drop lines 2021-09-30 14:43:19 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
4f6586d6a8 Fix token 2021-09-26 20:35:54 +02:00
Laurent Destailleur
c39c823b66 Debug Date of line of services mandatory 2021-09-23 13:01:04 +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
Laurent Destailleur
14c8bdce1a Better desciption of option 2021-09-19 19:25:38 +02:00
Laurent Destailleur
a747c71cf5 css 2021-09-19 19:19:28 +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
8909702619 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/bom/class/bom.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/product/class/productfournisseurprice.class.php
 2021-09-16 13:40:05 +02:00
Laurent Destailleur
b1cb32c743 Fix some sql 2021-09-15 20:03:38 +02:00
Laurent Destailleur
a1e51e212e Array of fields accept 'tdcss' property 2021-09-10 17:16:42 +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
f1758b6f0c
Merge pull request #18623 from atm-gauthier/14.0_fix_salary_extrafields 
14.0 fix salary extrafields are no more available
 2021-09-09 14:58:54 +02:00
stickler-ci
dd7f6b6a5c Fixing style errors. 2021-09-09 08:17:52 +00:00
jpb
91e624fd5d change test 2021-09-09 10:14:39 +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
b92784c04b Fix autoselect of thirdparty 2021-09-07 23:38:33 +02:00
stickler-ci
1043bc964d Fixing style errors. 2021-09-06 12:58:06 +00:00
Gauthier PC portable 024
be1c08ddfe FIX : salary extrafields don't work and table is not well named 2021-09-06 12:30:39 +02:00
jpb
06b9f90383 merge conflict 2021-09-06 09:52:28 +02:00
jpb
65a2486f94 merge conflict 2021-09-06 09:43:52 +02:00
Laurent Destailleur
8e90a374e0 Responsive 2021-09-06 01:47:18 +02:00
Laurent Destailleur
f288f36b71 NEW Can use textarea field into confirm popup. 
Reponsive
 2021-09-06 01:42:54 +02:00
Laurent Destailleur
138af805b3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-04 14:11:38 +02:00
Laurent Destailleur
4e7549ab7d css 2021-09-04 13:53:31 +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
stickler-ci
1457afb9b9 Fixing style errors. 2021-09-01 15:35:23 +00:00
Laurent Destailleur
60e4e23870
Update object_discounts.tpl.php 2021-09-01 17:33:18 +02:00
Givriz
688d217bed Compatibility phpv8 2021-09-01 16:39:28 +02:00
Laurent Destailleur
19f0db23df Fix scrutinizer bugs 2021-08-31 20:31:05 +02:00
Laurent Destailleur
c7444865a1 Fix css 2021-08-31 13:16:37 +02:00
Laurent Destailleur
0aa4868c34 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-31 13:14:01 +02:00
Laurent Destailleur
b29fc5552d Fix id in link 2021-08-30 22:10:26 +02:00
Laurent Destailleur
8639956b79 Fix position of information on lines of documents 2021-08-30 21:22:00 +02: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
c1d3ddf10b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-28 18:31:06 +02:00
Laurent Destailleur
881d176996 css 2021-08-28 17:30:53 +02:00
Laurent Destailleur
29abbbe2fb Clean code 2021-08-28 01:45:53 +02:00
Christian Foellmann
f094b4c70c fix up most of the remaining submit inputs 2021-08-24 17:04:17 +02:00
Laurent Destailleur
366fa13fc0 NEW Add property "copytoclipboard" in modulebuilder 2021-08-24 13:19:53 +02:00
jpb
a3bae451d5 Merge branch 'NEW_field_in_service_object' of github.com:atm-jpb/dolibarr into NEW_field_in_service_object 2021-08-20 14:06:43 +02:00
jpb
ed65bca666 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_field_in_service_object 2021-08-20 14:06:13 +02:00
jpb
d9a07acfa3 remove duplicate code 2021-08-20 14:05:22 +02:00
Laurent Destailleur
335e1ff405 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-20 12:45:37 +02:00
Laurent Destailleur
10ddd621ca Fix escape error message 2021-08-20 12:40:49 +02:00
Laurent Destailleur
399a44ea20
Update objectline_create.tpl.php 2021-08-18 21:40:49 +02:00
jpb
fcd485f614 merge conflict 2021-08-18 09:16:28 +02:00
Laurent Destailleur
82db3ae1a9 NEW Use lang selector when using a field key 'lang' in modulebuilder 2021-08-18 01:54:13 +02:00
Laurent Destailleur
3bc8a7345c
Merge branch 'develop' into develop#1 2021-08-18 00:37:23 +02:00
Laurent Destailleur
5d70ce4f99
Merge pull request #18310 from Hystepik/develop#2 
Close #18302 : Mass action leave requests aproval
 2021-08-17 19:23:30 +02:00
jpb
b1cba14718 merge conflict 2021-08-12 09:36:34 +02:00
Laurent Destailleur
d7317025e9 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/pdf_other.php
 2021-08-11 22:09:05 +02:00
Laurent Destailleur
ef4468153d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-08-11 22:07:13 +02:00
Laurent Destailleur
0cf2164260 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-08-11 21:15:30 +02:00
Laurent Destailleur
eba55d0cf2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
 2021-08-11 21:06:33 +02:00
Laurent Destailleur
8da328b183
Update extrafields_list_search_sql.tpl.php 2021-08-11 15:44:48 +02:00
Quentin VIAL-GOUTEYRON
108a5ff7cb FIX postgre filter select search extrafield 2021-08-09 15:14:25 +02:00
jpb
04d406bd39 remove useless boolean statment 2021-08-05 09:09:11 +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
Hystepik
e02d93c401
Merge branch 'develop' into develop#1 2021-08-04 16:15:50 +02:00
lmarcouiller
8cbbcc01a9 Update to make lan field common 2021-08-04 11:25:23 +02:00
lmarcouiller
1cef6d31e8 Close #18302 : Mass action leave requests 2021-08-02 15:45:55 +02:00
Laurent Destailleur
6f449cfd6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-31 16:33:38 +02:00
Laurent Destailleur
2b2c8f076b
Merge pull request #18231 from ptibogxiv/patch-429 
Fix for php 8
 2021-07-28 17:37:07 +02:00
ptibogxiv
3cb56d3ec6
Fix for php8 2021-07-26 15:35:31 +02:00
ptibogxiv
b0e2ef4a6c
Update extrafields_edit.tpl.php 2021-07-26 14:53:18 +02:00
ptibogxiv
026e61f1ec
Update extrafields_edit.tpl.php 2021-07-26 14:53:06 +02:00
ptibogxiv
d443485939
Update extrafields_edit.tpl.php 2021-07-26 14:52:24 +02:00
stickler-ci
5524320fbc Fixing style errors. 2021-07-23 17:46:44 +00:00
netdrag
6cfd8c6f24
Order Supplier Email Sender Extension 
Extended the advanced options to specify an email address for the order supplier. Useful if you operate under a brand, but order under a different.
 2021-07-22 18:38:22 +02:00
stickler-ci
252765303e Fixing style errors. 2021-07-21 07:48:57 +00:00
jpb
0396573b91 fix focusout on mandatoryPeriod only 2021-07-21 09:46:38 +02:00
jpb
2189af1f2a Merge branch 'NEW_field_in_service_object' of github.com:atm-jpb/dolibarr into NEW_field_in_service_object 2021-07-21 08:57:09 +02:00
jpb
62d007e232 add focusout constraint 2021-07-21 08:56:40 +02:00
stickler-ci
c93e2cda0d Fixing style errors. 2021-07-21 06:31:07 +00:00
jpb
32f9b1a556 fix cmd fourn no msg 2021-07-21 08:26:41 +02:00
jpb
d61b831737 add field in create product 2021-07-20 22:39:30 +02:00
stickler-ci
2f0ba41a53 Fixing style errors. 2021-07-20 13:35:10 +00:00
jpb
367e839239 change class css and behavior js 2021-07-20 13:56:30 +02:00
jpb
e11afb7da0 add color on date dield and warning on line 2021-07-20 11:23:35 +02:00
lmarcouiller
35b29481c7 Close #18131 : new massaction for thirdparty 2021-07-13 10:05:38 +02:00
Laurent Destailleur
e7b3280c17 Debug v14 with nojs 2021-07-11 01:12:52 +02:00
Laurent Destailleur
ad11f7b66d Fix type of param 
Fix test of ckeditor for html doc
Fix when MAIN_RESTRICTHTML_ONLY_VALID_HTML is on
 2021-07-08 13:59:04 +02:00
Laurent Destailleur
82e96016cd
Merge pull request #18092 from fappels/14_fix_php8_part3 
Fix php8 warning
 2021-07-06 18:52:05 +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
e2d7de3146 css 2021-07-05 18:56:24 +02:00
Laurent Destailleur
d414bcb572 Fix phpcs 2021-07-05 17:08:10 +02:00
Francis Appels
1333ca3660 Fix php 8 warning on not set field keys 2021-07-05 14:51:34 +02:00
Laurent Destailleur
7013f01a41 Fix look and feel v14 2021-07-04 21:14:46 +02:00
Laurent Destailleur
5853aa4c1e Look and feel v14 2021-07-04 20:08:34 +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
9392624e54 Fix deletion of line on replacement invoice 2021-07-01 13:36:04 +02:00
Laurent Destailleur
7c2121c439 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/tpl/objectline_edit.tpl.php
 2021-06-30 15:06:16 +02:00
Laurent Destailleur
51456741d9 FIX Can't edit replacement invoice 
FIX Status of invoice when making a replacement invoice
 2021-06-30 12:43:44 +02:00
Laurent Destailleur
2860e12b65
Update objectline_view.tpl.php 2021-06-29 19:16:29 +02:00
Francis Appels
051bb3f3ef Fix some core php8 warnings. 
Fixing php 8 warnings seems also to solve some situations like a paiment condition removed from dictionary can not be selected.
 2021-06-29 16:37:07 +02:00
Francis Appels
9b59f264fd Fix some php 8 warning 2021-06-28 20:00:10 +02:00
Laurent Destailleur
6e3647af2c Debug v14 2021-06-26 00:08:19 +02:00
Laurent Destailleur
acce226c05 Debug cash fence feature (missing report per vat rate) 2021-06-23 13:00:50 +02:00
Laurent Destailleur
8df9815049 Add warning to help understand bug of post_max_size. 2021-06-20 01:04:16 +02:00
Laurent Destailleur
4a3da84098 Clean code 2021-06-19 23:52:52 +02:00
Laurent Destailleur
61bd572a9c Fix token for ajax call 2021-06-17 03:37:52 +02:00
Laurent Destailleur
8b238c43ce Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-15 22:23:46 +02:00
Laurent Destailleur
36f599519e
Merge pull request #17935 from frederic34/patch-8 
fix php warning
 2021-06-15 22:18:26 +02:00
Laurent Destailleur
6bf8e425c5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-15 22:18:07 +02:00
Laurent Destailleur
87a19af86d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/tpl/contacts.tpl.php
 2021-06-15 22:17:53 +02:00
Laurent Destailleur
2a3b330e1e Fix newToken() 2021-06-15 22:10:59 +02:00
Frédéric FRANCE
5ceb957059
fix php warning 2021-06-15 08:48:52 +02:00
Frédéric FRANCE
8fbdde9ec3
Update contacts.tpl.php 2021-06-15 08:43:14 +02:00
Frédéric FRANCE
cd615b1717
fix php warning 2021-06-15 08:31:08 +02:00
Laurent Destailleur
046215f64a Fix PHP8 2021-06-14 02:08:28 +02:00
Laurent Destailleur
abfc87c1de Fix separator extrafields must not appear as selected fields 2021-06-13 13:32:41 +02:00
Laurent Destailleur
1933072712
Merge pull request #17893 from atm-john/develop_fix_missing_hooks_for_stock_mvm 
New :  Missing hook for stock movements list
 2021-06-11 19:58:21 +02:00
Laurent Destailleur
9e6890c719
Merge pull request #17884 from frederic34/patch-12 
fix warning
 2021-06-11 18:02:54 +02:00
John BOTELLA
99cada2d43 Fix missing hooks 2021-06-11 14:42:51 +02:00
Frédéric FRANCE
acc41adb8d
fix warning 2021-06-10 22:22:24 +02:00
Frédéric FRANCE
3cb17d7535
fix warning 2021-06-10 20:40:10 +02:00
Laurent Destailleur
f7c5a9e13a
Merge pull request #17757 from frederic34/patch-19 
fix warning
 2021-06-04 11:54:26 +02:00
Frédéric FRANCE
ee55a5568f
fix warning 2021-06-03 15:14:31 +02:00
Laurent Destailleur
d2bda7ad09 Set a maxlength on fields 2021-05-30 19:01:43 +02:00
Frédéric FRANCE
d0b8a80c7a
fix warning 2021-05-27 22:56:20 +02:00
Laurent Destailleur
dd48c3ee9d Remove deprecated __REFCLIENT__ (Replaced with __REF_CLIENT__) 2021-05-25 00:08:06 +02:00
Givriz
1cf7d0cee7 Compatibility phpv8 2021-05-18 20:13:26 +02:00
Laurent Destailleur
1b25c4daa0 Fix phpcs 2021-05-17 11:29:51 +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
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
6bf66adff0 Fix remove some $_REQUEST 2021-05-17 07:27:02 +02:00
Maxime Kohlhaas
7af0bda3a5
Update admin_extrafields_view.tpl.php 2021-05-16 11:33:07 +02:00
Laurent Destailleur
91312f0411 Fix url for emailing unsubscribe 2021-05-11 21:13:52 +02:00
Frédéric FRANCE
9725c8f309
fix php8 warning 2021-05-11 08:05:30 +02:00
stickler-ci
d108496c67 Fixing style errors. 2021-05-07 07:47:49 +00:00
lmarcouiller
c39dbd81b3 Fix #17491 : Update of fix date extrafield filter 2021-05-07 09:47:15 +02:00
stickler-ci
95be7e8a63 Fixing style errors. 2021-05-05 09:29:52 +00:00
lmarcouiller
b739e7ba22 Fix #17491 : date extrafield filter works well now 2021-05-05 11:26:15 +02:00
NextGestion
6f85cab6c4 Merge https://github.com/Dolibarr/dolibarr into dolibarr_partnership 2021-05-04 10:55:19 +01:00
Laurent Destailleur
92c1022b8e Fix duplicate in webp 2021-05-02 14:49:07 +02:00
Laurent Destailleur
8176898430 Fix lang 2021-05-02 14:31:03 +02:00
Laurent Destailleur
4e7e6048de Debug generation of webp 2021-05-01 15:42:49 +02:00
Laurent Destailleur
99d655b983 Debug generation of webp 2021-05-01 15:38:58 +02:00
Laurent Destailleur
575d335374 Debug generation of webp 2021-05-01 15:12:30 +02:00
Laurent Destailleur
de8e291c7e Debug v14 2021-04-29 10:01:10 +02:00
lmarcouiller
7782e849e2 changes to implement eldy's advices 2021-04-28 09:22:10 +02:00
lmarcouiller
758ba67adc Fix #17219 : new complement of PR 17161 2021-04-27 10:50:45 +02:00
lmarcouiller
080bd90c93 Fix #17219 : complement of PR 17161 2021-04-26 16:15:09 +02:00
Laurent Destailleur
fd2d317b4a Fix #yogosha5881 2021-04-25 15:55:36 +02:00
Laurent Destailleur
18d87ae575
Merge pull request #17255 from Givriz/dev_1 
Compatibility phpv8
 2021-04-19 21:44:25 +02:00
Laurent Destailleur
e71e5d533d Fix HTML5 2021-04-19 21:30:25 +02:00
NextGestion
0d4a1d061a
Merge branch 'develop' into dolibarr_partnership 2021-04-16 11:01:08 +01:00
NextGestion
9304b3c474 Manage mass action "Send email" for Partnership module 2021-04-16 09:54:11 +01:00
Laurent Destailleur
b298420ac5 Fix bad test 2021-04-14 15:12:40 +02:00
Laurent Destailleur
a68a5b0c04 Look and feel v14 2021-04-14 15:11:26 +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
Givriz
bc78b87020 pvpv8 continuous integration 2021-04-13 16:32:19 +02:00
Laurent Destailleur
d09be1f86f Do not make new twice 2021-04-13 16:18:18 +02:00
Alexandre SPANGARO
44133166de Merge remote-tracking branch 'upstream/develop' into 14a36 2021-04-12 21:35:03 +02:00
Laurent Destailleur
3d681d96c4
Merge pull request #17205 from DorianVabre/dev_EventOrganizer 
new: working on conference or booth object and event type #FoundationFunding
 2021-04-12 16:06:13 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Alexandre SPANGARO
87cc1b2601 Add right supplier_invoice 2021-04-12 07:37:34 +02:00
lmarcouiller
19ee78e123 Close #17193 : Move button convert in webp 2021-04-09 15:44:47 +02:00
Dorian Vabre
60341e8a14 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_EventOrganizer 2021-04-08 17:29:16 +02:00
kamel
c06cc6d75a NEW : Add new permok for edit extrafields on contact card 2021-04-07 17:28:13 +02:00
Dorian Vabre
f7b6e239e9 nouvelle page attendee_subscription créée, lien ajouté sur la conferenceorbooth_card (non cliquable) 2021-04-07 10:06:38 +02:00
Laurent Destailleur
6057d8aabd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/tpl/login.tpl.php
 2021-03-29 21:37:21 +02:00
Florian HENRY
f87711bf2f Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-26 18:30:08 +01:00
Florian HENRY
e898fbb834 almost done 2021-03-24 21:21:53 +01:00
Laurent Destailleur
a5034d44f7 $_POST war 2021-03-24 19:53:31 +01:00
Laurent Destailleur
4ecd1def49 css 2021-03-24 11:00:26 +01:00
ATM john
4f693b86c2 shhhhhh ! There is nothing here... 2021-03-23 19:27:40 +01:00
Laurent Destailleur
70be2dbcf0 Fix regression in tests 2021-03-20 20:51:19 +01:00
Laurent Destailleur
2da85a9ca2
Merge pull request #16842 from hregis/fix_avoid_warning_php8 
FIX avoid php8 warning in products list
 2021-03-20 11:48:53 +01:00
Frédéric FRANCE
239dae03bf
fix php8 warnings 2021-03-19 16:57:12 +01:00
stickler-ci
ee701bb480 Fixing style errors. 2021-03-19 09:05:20 +00:00
Regis Houssin
a1f6886e97 FIX avoid php8 warning in products list 2021-03-19 10:01:40 +01:00
Laurent Destailleur
a200f6f6ea
Merge pull request #16785 from frederic34/fixextrafieldsadmin 
fix php8 warning
 2021-03-18 23:08:15 +01:00
Frédéric FRANCE
37fcaf2a57
fix php8 warning 2021-03-18 22:07:35 +01:00
Frédéric FRANCE
75cf5e3599
fix php8 warning 2021-03-17 23:55:46 +01:00
Regis Houssin
5fc40f2b12 FIX avoid php 8 warning 2021-03-17 14:32:25 +01:00
Florian HENRY
9d8254eff4 fix price output in commoncard 2021-03-16 09:59:45 +01:00
Frédéric FRANCE
e8b994ece5
fix php8 warning 2021-03-15 00:40:10 +01:00
Laurent Destailleur
0a0bb92689 Fix phpcs 2021-03-06 11:37:23 +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
ffa0e6c391 FIX Timezone management for datetime on list of events 2021-03-04 15:34:29 +01:00
Laurent Destailleur
aa1551bf1f FIX class not found when creating recuring invoice from invoice+discount 2021-03-03 22:46:25 +01:00
Frédéric FRANCE
a4e25359e7
add missing rule 2021-03-01 20:37:16 +01:00