Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
129,526 Commits 36 Branches 189 Tags
4ad9e9b8288288cc5bfc69e4bcb2e4ab21f198df
Commit Graph

837 Commits

Author SHA1 Message Date
Laurent Destailleur
dc961b46ca Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-31 03:51:47 +01:00
Laurent Destailleur
f0392a0caf Fix link with entity 2024-01-29 15:03:46 +01:00
Laurent Destailleur
23f85df9d9 Fix trans 2024-01-11 12:58:24 +01:00
Laurent Destailleur
4957eacfa6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2024-01-11 11:45:00 +01:00
Laurent Destailleur
52dfdbc7ad Merge branch 'develop' into 18a3 2024-01-11 11:27:10 +01:00
MDW
71f906c280 Qual: Spelling of admin code. (#27412) 
# Qual: Fix spelling of admin code.

Mostly changes in the comments.
Some french text was modified to not trigger a bad spelling.

htdocs/admin/contract.php has a change to $langs->trans(Activated)
which probably fixes a bug.

htdocs/admin/system/xcache.php used ->trans(Recommanded)
but the proper key is ->trans(Recommended).
 2024-01-11 09:59:52 +01:00
Laurent Destailleur
4501872f17 Clean code with rector 2 2024-01-05 04:33:58 +01:00
Hystepik
5e4a4da130 Fix some php codce smell 2023-12-20 14:22:45 +01:00
Laurent Destailleur
987d6c41b9 Fix with php-cs-fixer 2023-12-04 11:41:14 +01:00
Laurent Destailleur
b69059af76 Fix warning 2023-11-27 12:24:18 +01:00
Laurent Destailleur
5b15b5c647 QUAL Move conf->global into getDolGlobal... 2023-10-24 17:00:13 +02:00
Laurent Destailleur
7939e9e4e9 Debug v19 2023-10-08 14:11:31 +02:00
Laurent Destailleur
7bbc3bab05 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-27 17:17:41 +02:00
Regis Houssin
be9adbec41 FIX uniformize getEntity sql request 2023-09-27 00:05:36 +02:00
Alexandre SPANGARO
1419bad738 Merge branch 'develop' into 18a3 2023-09-26 16:20:36 +02:00
Regis Houssin
5fccbcb9ae FIX add field "entity" only in $tabfieldinsert 2023-09-23 10:05:36 +02:00
Laurent Destailleur
924da777bf Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-04 23:26:35 +02:00
Laurent Destailleur
2cb6b158c1 Fix edit record in state dictionary 2023-09-04 23:20:25 +02:00
Laurent Destailleur
f403558a8f QUAL: Standardize code and look and feel for dictionaries 2023-09-04 22:49:55 +02:00
Laurent Destailleur
4f1f9ec455 NEW Add filter on status of line of a dictionary 2023-09-04 21:23:07 +02:00
Laurent Destailleur
6e2962f22c Removed not expected line 2023-09-04 20:23:15 +02:00
Laurent Destailleur
da99ce702e css 2023-09-04 16:14:18 +02:00
Laurent Destailleur
b6430fb897 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-01 00:40:48 +02:00
Laurent Destailleur
5581deed7e FIX Bad message on menu to go to setup of accounting custom groups 2023-09-01 00:34:40 +02:00
Laurent Destailleur
f7300eeaa4 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-31 00:10:26 +02:00
Laurent Destailleur
30bfefeb4a Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-08-31 00:07:31 +02:00
Laurent Destailleur
dcd751aa47 FIX fatal error with bad definition of dictionaries 2023-08-31 00:04:07 +02:00
Laurent Destailleur
bf1549e6e0 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-24 00:14:55 +02:00
Laurent Destailleur
9595d3df82 Fix warning 2023-08-23 21:52:29 +02:00
Laurent Destailleur
a3021ce24b Debug v18 2023-08-11 10:06:06 +02:00
Alexandre SPANGARO
ffd68671b8 Merge branch 'develop' into 18a9 2023-08-11 06:10:13 +02:00
Alexandre SPANGARO
c8ba1c06e0 Merge branch 'develop' into 18a3 2023-08-11 05:55:41 +02:00
Florian HENRY
32cf30110e again 2023-06-09 12:17:58 +02:00
Alexandre SPANGARO
092ef32501 NEW VAT rate - Add entity 2023-06-06 04:56:57 +02:00
Laurent Destailleur
476f95c4f6 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/comm/action/index.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
	htdocs/cron/class/cronjob.class.php
	htdocs/eventorganization/class/conferenceorbooth.class.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/public/ticket/list.php
	htdocs/supplier_proposal/list.php
	htdocs/ticket/class/ticket.class.php
 2023-05-17 00:57:17 +02:00
Laurent Destailleur
77b976163c Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 
Conflicts:
	htdocs/expedition/card.php
 2023-05-17 00:37:40 +02:00
Laurent Destailleur
c8186209ad Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 
Conflicts:
	htdocs/expedition/card.php
	htdocs/install/mysql/migration/15.0.0-16.0.0.sql
	htdocs/install/mysql/tables/llx_overwrite_trans.key.sql
	htdocs/projet/tasks.php
	htdocs/projet/tasks/time.php
 2023-05-17 00:36:12 +02:00
Francis Appels
25eb177bea Fix search in hidden ecotaxe dictionary by code. 2023-05-08 22:39:52 +02:00
Alexandre SPANGARO
13e9ca577e Merge remote-tracking branch 'upstream/develop' into 18a3 2023-05-01 22:39:35 +02:00
Laurent Destailleur
00d4e09c68 Fix filter lost 2023-04-26 13:20:28 +02:00
Laurent Destailleur
e375252a83 Clean code of dictionnary page 2023-04-26 12:45:02 +02:00
Alexandre SPANGARO
f7d1dc961a Merge remote-tracking branch 'upstream/develop' into 18a3 2023-04-26 06:28:11 +02:00
Laurent Destailleur
b1c51954dd NEW Add link to edit VAT list from error message of missing VAT 2023-04-25 22:15:51 +02:00
Laurent Destailleur
9a420b8f41 Clean code 2023-04-18 16:15:27 +02:00
Alexandre SPANGARO
027587148a Merge remote-tracking branch 'upstream/develop' into 18a3 2023-04-07 02:48:48 +02:00
Laurent Destailleur
19e960db18 Doc 2023-03-05 16:09:00 +01:00
Laurent Destailleur
040958f73d Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-02 21:28:32 +01:00
Laurent Destailleur
6f8b1108ca css 2023-03-02 21:21:16 +01:00
Laurent Destailleur
a64ed59e18 Merge 2023-02-23 22:25:56 +01:00
Laurent Destailleur
fb4e3ec123 Debug v17 2023-02-22 15:50:46 +01:00