Commit Graph

7377 Commits

Author SHA1 Message Date
Norbert Penel
64e58e305f FIX #18893 : source was overwrited by mistake 2021-10-23 16:32:16 +02:00
Laurent Destailleur
06bc357409 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-23 14:49:50 +02:00
Laurent Destailleur
3f60cbbedc Remove the div class="ficheaddleft" 2021-10-23 14:49:35 +02:00
Frédéric FRANCE
2d92e6006c fix warnings 2021-10-23 07:04:13 +02:00
Frédéric FRANCE
46c4f28478 fix multiple warnings 2021-10-22 22:15:59 +02:00
Laurent Destailleur
e43b33028c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/card.php
2021-10-20 15:06:10 +02:00
Laurent Destailleur
c6ef6a162b NEW Can edit fields of proposal when proposal is not yet signed 2021-10-19 22:20:23 +02:00
Laurent Destailleur
f4b5d14a34 Merge pull request #17536 from bb2a/Edit_in_propal
[NEW] Add edit option in propal
2021-10-19 22:10:12 +02:00
Laurent Destailleur
12d211815b Debug v15 2021-10-19 21:38:36 +02:00
Laurent Destailleur
c40a73162e Look and feel v15 2021-10-18 21:20:58 +02:00
lvessiller
a52ceaf1d2 FIX generate documents with PDF options 2021-10-18 12:12:00 +02:00
Laurent Destailleur
b66155de4b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/action/list.php
	htdocs/filefunc.inc.php
2021-10-17 13:30:13 +02:00
Laurent Destailleur
8bdece7101 CSS 2021-10-16 21:43:48 +02:00
Laurent Destailleur
f2757a63a1 Clean code 2021-10-16 20:06:58 +02:00
Laurent Destailleur
dd0809b528 Fix trans labels status 2021-10-16 19:37:57 +02:00
Laurent Destailleur
f8010dfcbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/reception/list.php
	htdocs/takepos/pay.php
2021-10-16 13:01:03 +02:00
Anthony Berton
8bbbe7b8bb Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into Edit_in_propal 2021-10-11 12:11:08 +02:00
Laurent Destailleur
33761f9de3 Merge pull request #18917 from FHenry/NEW_dev_filter_from_dt_to_dt_actionlist
NEW:Add filter from date to date into action/evt list
2021-10-11 11:51:48 +02:00
Laurent Destailleur
874731af84 The 'action=delete&file=...' has been replaced with
'action=deletefile&file=...' to avoid confusion with deletion of object
lines.
2021-10-10 21:11:48 +02:00
lvessiller
be4a00213c FIX optional visibility on create card 2021-10-08 15:58:08 +02:00
Florian HENRY
f52e2be10e NEW:Add filter from date to date into action/evt list 2021-10-06 16:23:11 +02:00
Laurent Destailleur
ff56415c00 Merge pull request #18903 from aspangaro/15a21
HTML5 - <font> tag is deprecated, replace by <span>
2021-10-05 16:51:41 +02:00
Alexandre SPANGARO
c57aea1ead HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 09:10:37 +02:00
Laurent Destailleur
b3cb56f2ef Clean css 2021-10-04 04:14:31 +02:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
Laurent Destailleur
673a2982a5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/opensurvey/card.php
2021-09-30 16:32:40 +02:00
Laurent Destailleur
ed264182c6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/product/card.php
	htdocs/takepos/receipt.php
2021-09-30 16:28:42 +02:00
Laurent Destailleur
bb6399e12a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/product/card.php
2021-09-30 16:21:36 +02:00
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