Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
103,106 Commits 36 Branches 189 Tags
901bab2ca2608559d8865800e8768fc24c29fde4
Commit Graph

7144 Commits

Author SHA1 Message Date
Marc de Lima Lucio
5f826f78a1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_block_leave_if_negative_balance 2021-09-30 17:41:38 +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
608b6f5fa3 Clean code 2021-09-30 15:24:57 +02:00
Laurent Destailleur
620d7109b5 Update dict.php 2021-09-30 14:04:56 +02:00
Florian HENRY
332fa77d90 fix: search code on tva dict 2021-09-30 13:49:02 +02:00
Laurent Destailleur
3d239e7528 Trans 2021-09-29 17:28:06 +02:00
Laurent Destailleur
a395ff5ee3 Css 2021-09-29 16:19:47 +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
Laurent Destailleur
43637c936c Merge pull request #18825 from grandoc/new_branch_25_09_2021 
fix : warning: Undefined property: stdClass:: in C:\wamp64\www\doliba…
 2021-09-28 12:56:43 +02:00
Laurent Destailleur
e6e224f33c Better translation 2021-09-28 11:53:00 +02:00
Laurent Destailleur
d4cc60640b Clean code 2021-09-27 15:41:58 +02:00
Laurent Destailleur
5c8b893877 Doc 2021-09-27 12:50:51 +02:00
Laurent Destailleur
72be24a835 Doc 2021-09-27 12:37:10 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
6d92591358 Fix look and feel v15 2021-09-27 11:28:34 +02:00
Laurent Destailleur
4a85304572 Fix security 2021-09-26 21:01:34 +02:00
Laurent Destailleur
1436f0de7d Fix newToken 2021-09-26 20:26:20 +02:00
Laurent Destailleur
5497d7d730 Fix look and feel v15 2021-09-26 20:23:15 +02:00
Philippe Grand
a29ed0229b Update barcode.php 2021-09-25 19:00:47 +02:00
Philippe GRAND
661f13adb3 fix :Warning: Undefined property: stdClass:: in C:\wamp64\www\dolibarr-dev\htdocs\admin\barcode.php on line 376 2021-09-25 18:58:06 +02:00
Christian Foellmann
08b395e127 another set of cleanup for action buttons 2021-09-22 08:43:30 +02:00
Laurent Destailleur
1d597e8a72 Fix add unset* action as sensible GET actions 2021-09-19 18:03:38 +02:00
Laurent Destailleur
5631e8cc15 css 2021-09-19 15:01:57 +02:00
Laurent Destailleur
5c8fb38426 Fix add del* action into list of sensitive actions 2021-09-19 14:41:46 +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
62b721a904 Add deletecontact as sentitive action 
Replace dol_buildpath with DOL_URL_ROOT
 2021-09-18 19:34:46 +02:00
Laurent Destailleur
6c37836b3e Show value of MAIN_SECURITY_CSRF_WITH_TOKEN in setup page 2021-09-18 18:28:02 +02:00
Laurent Destailleur
1a705adf6e Merge pull request #18726 from cfoellmann/PR/button-classes 
add missing css classes to buttons
 2021-09-17 10:52:13 +02:00
Laurent Destailleur
fd3418d91d NEW Can edit the translation key of an overwrote translation key. 2021-09-16 15:13:15 +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
Christian Foellmann
fd1d4d9073 add missing css classes to buttons 2021-09-16 11:33:42 +02:00
Laurent Destailleur
b18e25db87 Code comment 2021-09-16 03:13:44 +02:00
Laurent Destailleur
f859967c24 Fix look and feel v14 2021-09-15 20:28:47 +02:00
Laurent Destailleur
21462d0b82 Fix can reset filter in setup 2021-09-14 17:24:53 +02:00
Laurent Destailleur
aeead15a62 css 2021-09-14 17:07:29 +02:00
Laurent Destailleur
f3fcb7a48a Fix insertion of email templates 2021-09-14 16:59:49 +02:00
Laurent Destailleur
ce9a10bd90 Fix description of some options 2021-09-13 03:43:25 +02:00
Laurent Destailleur
5869975ed1 Fix phpcs 2021-09-13 02:59:09 +02:00
Laurent Destailleur
bbacb4e740 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-13 02:45:00 +02:00
Laurent Destailleur
7efd810d57 Clean code 2021-09-13 01:18:24 +02:00
Frédéric FRANCE
88cba08475 doxygen 2021-09-11 09:52:21 +02:00
Laurent Destailleur
c005a20cc0 Fix ldap with ssl 2021-09-11 03:27:59 +02:00
Laurent Destailleur
6a296bf6c2 Debug setup 2021-09-10 10:18:46 +02:00
Laurent Destailleur
d382e8d8c9 Clean setup and translation 2021-09-10 09:21:37 +02:00
Laurent Destailleur
875b93aff2 Merge branch 'develop' into 15a8 2021-09-09 19:26:01 +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