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

8361 Commits

Author SHA1 Message Date
Laurent Destailleur
da01c7ea49 Trans 2022-08-23 12:05:23 +02:00
Laurent Destailleur
26eb4a7bd7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-08-23 11:58:08 +02:00
Laurent Destailleur
df9b4b9814
Merge pull request #17520 from bb2a/add_option_pdf_global_sales_rep 
NEW - PDF show "Sales rep" option
 2022-08-23 11:55:34 +02:00
Philippe GRAND
117aed6a10 FIX php8 compatibility 2022-08-23 10:14:07 +02:00
Philippe GRAND
28b60d9003 FIX php8 compatibility 2022-08-23 10:13:14 +02:00
Philippe GRAND
1a92621bd7 FIX php8 compatibility 2022-08-23 10:12:34 +02:00
Philippe GRAND
5fdd5e7597 FIX php8 compatibility 2022-08-23 10:11:59 +02:00
Philippe GRAND
9df948db5a FIX php8 compatibility 2022-08-23 10:10:41 +02:00
Philippe GRAND
00a855bc5e FIX php8 compatibility 2022-08-23 10:09:31 +02:00
Philippe GRAND
66b3a926ce FIX php8 compatibility 2022-08-23 10:08:34 +02:00
Philippe GRAND
9d8fc785b1 FIX php8 compatibility 2022-08-23 10:07:15 +02:00
Philippe GRAND
5bbee11c42 FIX php8 compatibility 2022-08-23 10:06:26 +02:00
Philippe GRAND
c264308329 FIX php8 compatibility 2022-08-23 10:05:01 +02:00
Laurent Destailleur
406e40b8a4 Fix setup of param of operation for emailcollector 2022-08-23 04:03:24 +02:00
Laurent Destailleur
79f9d793e1
Merge branch 'develop' into add_option_pdf_global_sales_rep 2022-08-23 01:58:07 +02:00
Laurent Destailleur
f5004012ed Removed hard coded fetch 2022-08-23 01:03:53 +02:00
Laurent Destailleur
a99c698cfe Removed hard coded fetch 2022-08-23 00:16:59 +02:00
Laurent Destailleur
4c13b08258 Move state into llx_oauth_token 2022-08-22 22:12:13 +02:00
Philippe GRAND
3540ca3720 FIX php8 compatibility 2022-08-22 14:14:09 +02:00
Philippe GRAND
0676413bce FIX php8 compatibility 2022-08-22 14:12:51 +02:00
Laurent Destailleur
2b5205b639 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-22 13:05:22 +02:00
Laurent Destailleur
6f34072a27
Merge pull request #21806 from frederic34/patch-5 
fix php8 warnings
 2022-08-22 10:50:59 +02:00
Laurent Destailleur
558ae00f66 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/ajax/onlineSign.php
 2022-08-21 23:48:44 +02:00
Christian Humpel
fbadce46c5 Fix: left and top menu can't create. Now the checks are correct. GETPOST with method 3 (POST then GET). 2022-08-21 22:33:41 +02:00
Christian Humpel
9c9e1b776c Fix: left menu can't create. Now the check is correct. 2022-08-20 19:19:31 +02:00
Frédéric FRANCE
7f60a34799 use isModEnabled 2022-08-19 18:07:21 +02:00
Frédéric FRANCE
18f0ee07d5
Update barcode.php 2022-08-19 17:59:57 +02:00
Frédéric FRANCE
545db83ecd
remove duplicate 2022-08-16 20:17:44 +02:00
Faustin
3bf8730c55 New imap by oauth2 works, but somes features left 2022-08-16 17:23:57 +02:00
Laurent Destailleur
3b195fa1fb Can add Permissions-Policy on web sites 2022-08-16 16:58:28 +02:00
Laurent Destailleur
5ef941311a NEW can set header "Strict-Transport-Security" in web sites 2022-08-16 16:06:09 +02:00
Laurent Destailleur
f404eddad0 Fix recommended value 2022-08-16 15:23:53 +02:00
Laurent Destailleur
94da628cf4 Clean code for http header + better support for Content-Security-Policy 2022-08-16 15:19:45 +02:00
Laurent Destailleur
6cf47d0ed1 Fix trans 2022-08-15 02:35:17 +02:00
Laurent Destailleur
826b9a6d62 Fix trans 2022-08-15 02:27:07 +02:00
This Charlène
c82f23b8c3
php V8 warning 2022-08-13 14:41:51 +02:00
Laurent Destailleur
533e4f2424 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/fr_FR/accountancy.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/fr_FR/members.lang
	htdocs/langs/fr_FR/products.lang
 2022-08-12 16:03:09 +02:00
Laurent Destailleur
059d0073ff FIX Maxi debug v16 2022-08-12 15:54:50 +02:00
lvessiller
74a2b58e85 FIX resolve conflicts 2022-08-12 14:55:06 +02:00
Laurent Destailleur
98b5247b27 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-08-12 12:20:23 +02:00
Laurent Destailleur
2d8b544ace Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2022-08-12 12:19:20 +02:00
fboitel
6f05b20926
Merge branch 'Dolibarr:develop' into NEW-imap-by-oauth2 2022-08-12 11:38:20 +02:00
Laurent Destailleur
01484757aa Debug v16 2022-08-12 11:31:40 +02:00
Faustin
56fa4d3413 Mail collection 2022-08-12 10:30:22 +02:00
Laurent Destailleur
daf3b928c7 Debug v16 2022-08-11 22:31:01 +02:00
stickler-ci
a4097c9bc1 Fixing style errors. 2022-08-11 07:09:11 +00:00
This Charlène
2d8c629200
if we set another view list mode, we keep it 
if we set another view list mode, we keep it (till we change one more time)
 2022-08-11 09:01:55 +02:00
Laurent Destailleur
97e198c4ec
Merge pull request #21704 from frederic34/patch-5 
fix php8 warning
 2022-08-11 01:29:54 +02:00
Frédéric FRANCE
8465c08253
fix php8 warning 2022-08-10 14:29:13 +02:00
Frédéric FRANCE
f704d1feb2 Merge remote-tracking branch 'upstream/develop' into outh2forswiftmailer 2022-08-10 13:27:18 +02:00
Laurent Destailleur
95b1b3f990 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/commande/card.php
	htdocs/emailcollector/class/emailcollector.class.php
	htdocs/index.php
	htdocs/website/index.php
 2022-08-10 13:16:02 +02:00
Laurent Destailleur
9e55377f0a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-08-10 13:10:52 +02:00
Frédéric FRANCE
32c617b786 add oauth2 for swiftmailer 2022-08-10 09:54:14 +02:00
Frédéric FRANCE
b1814a45ce add oauth2 for swiftmailer 2022-08-10 09:33:58 +02:00
Laurent Destailleur
3f62cd27eb
Merge pull request #21632 from fboitel/NEW-smtp-by-oauth2 
NEW smtp by oauth2
 2022-08-10 05:26:31 +02:00
Regis Houssin
bbe74c5d77 FIX errors when search by code 2022-08-06 13:44:56 +02:00
lvessiller
a3b240bd3b FIX resolve conflicts 2022-08-05 11:23:02 +02:00
lmarcouiller
bcd5aacb4c Fix : Spam db public page 2022-08-04 16:53:58 +02:00
Laurent Destailleur
4a9c9a97e5 WIP Implement a generic handler for OAuth. 2022-08-04 15:58:00 +02:00
Laurent Destailleur
1093084e9b Better doc 2022-08-04 14:00:04 +02:00
Laurent Destailleur
39dccc4fdf FIX Scan IMAP must not be done automatically 2022-08-04 13:46:47 +02:00
Laurent Destailleur
a7a1c70c65 FIX Scan IMAP must not be done automatically 2022-08-04 13:42:57 +02:00
Faustin
f06de750eb oauth provider now showed in small caps 2022-08-03 21:14:38 +02:00
Faustin
29bb03a25b Conflict 2022-08-03 20:07:16 +02:00
Faustin
868d07ae96 New prop : select auth type with radio box 2022-08-03 20:01:13 +02:00
Laurent Destailleur
ad17d39da4
Merge pull request #21592 from bb2a/FIX---php-V8-admin-stock 
FIX - php V8 setup module stock
 2022-08-03 18:37:54 +02:00
Laurent Destailleur
064c95baef CSS 2022-08-03 18:26:06 +02:00
Laurent Destailleur
e70bdc099f
Merge pull request #21581 from badre-agtaib/backupwizard2 
FIX #21473
 2022-08-03 18:03:12 +02:00
lmarcouiller
c7652af3bc New : Add DoS security on GETPOST with img 2022-08-03 14:24:27 +02:00
Laurent Destailleur
528d54ba79 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-02 20:28:07 +02:00
Faustin
d21fbd5a0f fix GETPOST on none 2022-08-01 13:11:57 +02:00
Faustin
809c6acf44 fix GETPOST on none 2022-08-01 12:03:33 +02:00
Faustin
a990480ba6 Use of oauth for smtp is available (tested only with google) 2022-08-01 11:31:32 +02:00
Laurent Destailleur
5d2d0384f8 Debug v16 2022-07-29 17:05:02 +02:00
Laurent Destailleur
51d022914b Fix missing auto increment key. Fix error duplicate of type of contact. 2022-07-29 16:03:21 +02:00
Laurent Destailleur
b6a6dd91d8 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-07-28 18:52:44 +02:00
Laurent Destailleur
eac926e01d Fix phpv8 2022-07-28 18:30:26 +02:00
bagtaib
f1b3f51b3a add missing </tr> 2022-07-27 14:14:34 +02:00
Laurent Destailleur
fc9b3e3d70 Factorize code into a function dolJSToSetRandomPassword() 2022-07-27 13:42:43 +02:00
stickler-ci
1d8b39260b Fixing style errors. 2022-07-27 09:50:43 +00:00
bagtaib
26033b9297 changed the button to a link 2022-07-27 11:50:18 +02:00
Anthony Berton
f8a7f0290e FIX - php V8 setup module stock 2022-07-27 11:50:05 +02:00
bagtaib
3f81d21c7c make a button look like a link 2022-07-26 18:32:48 +02:00
lvessiller
bae3583fe3 FIX resolve conflicts 2022-07-26 16:49:35 +02:00
bagtaib
4776c9fdaa change button position 2022-07-26 16:30:21 +02:00
Laurent Destailleur
5903a9f87f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-07-26 12:24:24 +02:00
Laurent Destailleur
41bb01339a Fix warning 2022-07-25 12:09:27 +02:00
Laurent Destailleur
122c27885f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-25 10:29:11 +02:00
Laurent Destailleur
8fb7d129c9 Trans 2022-07-25 00:36:38 +02:00
Laurent Destailleur
ab81492fa4 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formwebsite.class.php
	htdocs/core/lib/cron.lib.php
 2022-07-24 22:17:25 +02:00
Laurent Destailleur
adde84a508
Merge pull request #21232 from defrance/patch-207 
php V8 warning
 2022-07-24 20:32:22 +02:00
Laurent Destailleur
d622bfd774
Update modulehelp.php 2022-07-24 20:32:06 +02:00
Laurent Destailleur
60117bbaee Debug v16 2022-07-24 19:45:37 +02:00
Laurent Destailleur
e465c0f34b Debug v16 2022-07-24 19:05:55 +02:00
Laurent Destailleur
fe7346a9c6 Hide var not usefull and dangerous 2022-07-24 18:31:55 +02:00
Laurent Destailleur
40ae516034 Debug v16 2022-07-24 17:37:02 +02:00
Laurent Destailleur
2503b37bdd Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-24 14:33:55 +02:00
Laurent Destailleur
0bcc03cd5d css 2022-07-24 14:32:13 +02:00
Laurent Destailleur
cf0a1d1e14 Merge 2022-07-24 11:26:10 +02:00
Laurent Destailleur
56a8912c9b Fix do not erase global option when configuring ticket 2022-07-22 19:47:59 +02:00
Laurent Destailleur
ca323f99ba Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-22 19:37:55 +02:00
Laurent Destailleur
16c087e04c Clean htmlentities 2022-07-22 19:25:15 +02:00
lvessiller
c4fbbd8796 Merge branch 'develop' of github.com:Dolibarr/dolibarr into new-event-list-with-color 2022-07-21 11:15:40 +02:00
Laurent Destailleur
5e4eb58a43 FIX phpv8 2022-07-21 11:09:35 +02:00
Laurent Destailleur
3079ab2737 FIX phpv8 2022-07-21 10:59:15 +02:00
lvessiller
ba1a607afc FIX resolve conflicts 2022-07-20 14:21:24 +02:00
Laurent Destailleur
36226c7b4b FIX Picto google plus 2022-07-18 13:17:37 +02:00
Laurent Destailleur
95ee25660e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-18 13:16:25 +02:00
Laurent Destailleur
311d69da4e FIX Picto google plus 2022-07-18 11:07:48 +02:00
Laurent Destailleur
1855236027 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2022-07-16 02:26:35 +02:00
Laurent Destailleur
f63281ffef php8 2022-07-16 02:10:21 +02:00
Laurent Destailleur
07216577e4 FIX #yogosha11806 2022-07-16 02:03:38 +02:00
Laurent Destailleur
4f54fb4f00 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-14 11:54:30 +02:00
lvessiller
f69d592449 FIX stickler-ci 2022-07-13 17:38:18 +02:00
lvessiller
cda6e9184d NEW color in action list and translated 2022-07-13 16:52:57 +02:00
lvessiller
1414f72794 NEW color in action list 2022-07-13 16:37:50 +02:00
Laurent Destailleur
71045cbe83 Fix popup message 2022-07-13 14:00:19 +02:00
Laurent Destailleur
97acf949fc Clean message on email limit 2022-07-13 13:39:16 +02:00
This Charlène
7205cb0c21
Update modulehelp.php 2022-07-12 08:30:51 +02:00
Laurent Destailleur
25e034721c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-11 00:06:57 +02:00
Laurent Destailleur
24dc936000 Revert "default to create on card.php if $action is empty" 
This reverts commit e0b664066b.
 2022-07-11 00:05:50 +02:00
Christian Foellmann
e0b664066b default to create on card.php if $action is empty 2022-07-11 00:01:42 +02:00
Laurent Destailleur
2ce695f939 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-10 19:48:20 +02:00
Laurent Destailleur
5de434eb37 css 2022-07-10 19:14:33 +02:00
Laurent Destailleur
c71616f45d css 2022-07-10 19:13:09 +02:00
Laurent Destailleur
c0977e5ee8
Merge pull request #21469 from cfoellmann/PR/card-empty-action 
FIX default to create on card.php if $action is empty
 2022-07-10 18:50:48 +02:00
Christian Foellmann
aaca9bc03d default to create on card.php if $action is empty 2022-07-08 09:16:02 +02:00
bagtaib
147140bdc2 Show/hide advanced Options 2022-07-08 05:55:23 +02:00
Laurent Destailleur
6365bdb35c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-06 19:10:45 +02:00
Laurent Destailleur
9a10e3f971
Merge branch 'develop' into NEW#21395 2022-07-06 15:53:22 +02:00
Laurent Destailleur
c0c97286f5
Merge pull request #21407 from fboitel/NEW#21397 
NEW #21397
 2022-07-06 15:51:09 +02:00
Laurent Destailleur
aba782057f Fix bad link 2022-07-05 09:44:42 +02:00
Laurent Destailleur
a61e5c854c Fix link 2022-07-05 09:41:53 +02:00
stickler-ci
6d796fc820 Fixing style errors. 2022-07-03 19:52:56 +00:00
UT from dolibit
08881a0e87
Update accountant.php 2022-07-03 21:47:37 +02:00
Laurent Destailleur
dea9a9e68d
Merge pull request #21409 from aspangaro/16p5-php8 
PHP8 Warning
 2022-07-01 16:35:40 +02:00
Laurent Destailleur
cfca565189 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-01 11:39:52 +02:00
Laurent Destailleur
68ca43c848
Merge pull request #21422 from bb2a/FIX---php-V8-admin-translation 
FIX - php V8 admin translation
 2022-07-01 11:36:28 +02:00
Laurent Destailleur
014a9cab9d
Update translation.php 2022-07-01 11:36:12 +02:00
Laurent Destailleur
591b7bae43 Fix var 2022-07-01 11:24:52 +02:00
Laurent Destailleur
69a900b260 FIX unset of default template for users. 2022-07-01 10:53:31 +02:00
Laurent Destailleur
0d43069220 Force creation of dir 2022-07-01 10:45:36 +02:00
BB2A Anthony Berton
80ce80f7cc FIX - php V8 admin translation 2022-06-30 17:29:02 +02:00
Laurent Destailleur
07aebba254 Debug v16 2022-06-30 01:55:56 +02:00
Laurent Destailleur
a98599084d Debug v16 2022-06-30 01:34:58 +02:00
Alexandre SPANGARO
d6814b2586 Merge remote-tracking branch 'upstream/develop' into 16p5-php8 2022-06-29 16:31:41 +02:00
Laurent Destailleur
770a160b8b Debug v16 2022-06-29 14:31:21 +02:00
Alexandre SPANGARO
df85137772 PHP8 Warning 2022-06-29 07:32:25 +02:00
Faustin
23cbb5212d NEW #21397 : code intrusion 2022-06-28 16:40:59 +02:00
Faustin
3f7fe8d688 NEW #21397 : small fix 2022-06-28 16:39:34 +02:00
Faustin
811b11cab2 NEW #21397 : added option to auto define barcode numbers for third-parties in barcode module setup 2022-06-28 16:33:00 +02:00
Laurent Destailleur
0e0c9888a2 Typo 2022-06-27 22:43:29 +02:00
Laurent Destailleur
34464ac92b Maxi debug of OAuth module. Solve tons of problems. 2022-06-27 22:35:58 +02:00
Faustin
d7d02fee9a NEW #21395 : Added option for dark theme mode in display - color and theme 2022-06-27 16:08:06 +02:00
Laurent Destailleur
7262a097e3 Better error message 2022-06-26 20:27:51 +02:00
Laurent Destailleur
00649e791c Fix #yogosha11452 2022-06-25 02:18:16 +02:00
Laurent Destailleur
b1ab8ba9b3
Merge branch 'develop' into patch-211 2022-06-23 11:41:09 +02:00
Laurent Destailleur
264f8ab4ce
Merge pull request #21342 from frederic34/useismodenabled 
Use getDolGlobalString
 2022-06-23 09:55:31 +02:00
Laurent Destailleur
e698d20789
Merge branch 'develop' into develop#6 2022-06-22 12:09:58 +02:00
Frédéric France
287f868fbb use getDolGlobalString 2022-06-22 08:36:24 +02:00
Frédéric France
889856d55f use getDolGlobalString 2022-06-21 23:39:31 +02:00
Frédéric France
62c171c26d isModEnabled 2022-06-21 20:54:28 +02:00
Frédéric France
9f32100fef Merge remote-tracking branch 'upstream/develop' into useismodenabled 2022-06-21 20:27:57 +02:00
Frédéric France
1f7fc7a2ae getDolGlobalString 2022-06-21 20:25:25 +02:00
BENKE Charlene
b37d874936
Update expedition.php 2022-06-20 16:01:25 +02:00
Laurent Destailleur
8ee30e067f Rename var 2022-06-20 02:23:37 +02:00
Laurent Destailleur
e97f021380 Fix #yogosha11295 2022-06-19 19:02:16 +02:00
Laurent Destailleur
233d712e39 NEW Support the Swiss QR-Code 2022-06-19 13:06:07 +02:00
Hystepik
45439e055c
Merge branch 'develop' into develop#6 2022-06-17 11:05:12 +02:00
Laurent Destailleur
cef7f6b96b
Merge pull request #21279 from hregis/fix_missing_entity 
FIX missing field entity
 2022-06-14 21:14:56 +02:00
Regis Houssin
abcf77c80a FIX missing field entity 2022-06-14 18:16:41 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Laurent Destailleur
293b08ab1d Debug v16 2022-06-14 11:47:56 +02:00
Laurent Destailleur
bc11cf62f8 FIX #hunterdev2acfc8fe-247c-4f88-aeaa-042b6b8690a0 2022-06-13 10:44:20 +02:00
BENKE Charlene
b6bd8b3619
php V8 warning 2022-06-13 08:20:29 +02:00
Laurent Destailleur
00446a10d7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-12 12:42:01 +02:00
Laurent Destailleur
426c1635c4 Clean code 2022-06-12 12:41:15 +02:00
Frédéric France
3fdbce7a31 use isModEnabled function 2022-06-11 09:46:28 +02:00
Frédéric FRANCE
38b18a68d7
Merge branch 'develop' into useismodenabled 2022-06-10 10:07:41 +02:00
Frédéric France
5dcfc28913 use isModEnabled function 2022-06-09 22:41:59 +02:00
Frédéric France
400afc937f use isModEnabled function 2022-06-09 22:16:48 +02:00
Laurent Destailleur
1f26dee554 Fix deprecated functions 2022-06-08 17:19:12 +02:00
Laurent Destailleur
b9e376fb1d Disable option not complete 2022-06-07 10:58:19 +02:00
Laurent Destailleur
93ba5db6d3
Merge pull request #19940 from bb2a/add_option_pdf_global_thirdparty_alias 
NEW - Add option pdf global thirdparty alias
 2022-06-07 10:43:18 +02:00
Laurent Destailleur
418bd481f3 FIX #21128 2022-06-07 09:51:19 +02:00
Laurent Destailleur
166082d3cb Debug v16 2022-06-03 12:53:55 +02:00
Laurent Destailleur
be729ab5f3 Debug v16 2022-06-03 03:10:31 +02:00
Laurent Destailleur
500a81dda1 Clean database 2022-06-03 02:56:25 +02:00
Laurent Destailleur
cd041c9ea1 Clean code 2022-06-03 02:41:00 +02:00
Laurent Destailleur
6cab758841 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/knowledgemanagement/knowledgerecord_list.php
	htdocs/theme/md/style.css.php
 2022-06-01 21:55:36 +02:00
Laurent Destailleur
62ee0ff29c
Merge pull request #21054 from frederic34/patch-1 
force refresh css
 2022-06-01 21:34:23 +02:00
Laurent Destailleur
e3fa24fab2
Merge pull request #18283 from atm-gauthier/NEW_stockstransfers 
NEW : Stocks transfers objects management
 2022-06-01 14:49:21 +02:00
Laurent Destailleur
d6ecbe65b7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/langs/en_US/errors.lang
 2022-05-31 15:16:54 +02:00
Laurent Destailleur
c9eda09964 FIX ODT generation of BOM document 2022-05-31 14:30:47 +02:00
Laurent Destailleur
2d0958ba7f Look and feel v16 2022-05-31 11:00:21 +02:00
Laurent Destailleur
1655890f84 Debug v16 2022-05-31 10:35:36 +02:00
Frédéric FRANCE
489aa22e56
force refresh css 2022-05-30 14:14:18 +02:00
Laurent Destailleur
dc3121dc42
Merge pull request #21043 from defrance/patch-194 
php V8 warning ($conf->global-b*)
 2022-05-29 10:52:50 +02:00
BENKE Charlene
eba9f695c2
fix php 8 warning 2022-05-28 10:02:02 +02:00
BENKE Charlene
b1c4aa07f0
fix php 8 warning 2022-05-28 09:58:54 +02:00
BENKE Charlene
ebfc566698
php V8 warning 2022-05-27 16:16:41 +02:00
Laurent Destailleur
b93b9a784c Trans 2022-05-26 00:30:35 +02:00
Laurent Destailleur
baae99fbb4 Support ZATCA 2022-05-25 09:06:59 +02:00
Laurent Destailleur
58d82841e3 css 2022-05-24 12:11:51 +02:00
Laurent Destailleur
43be070300 PHP8.1 strftime("%Y%m%d%H%M") => dol_print_date(dol_now('gmt'), 
"dayhourlogsmall", 'tzuser')
 2022-05-24 11:55:21 +02:00
Laurent Destailleur
f276c66614 NEWW Add selection of the mode to show icon/text in setup 2022-05-23 09:45:42 +02:00
Laurent Destailleur
bc9859c7bd Fix phpcs 2022-05-23 00:12:16 +02:00
ptibogxiv
648c524eb5
Fix php error 2022-05-22 14:45:56 +02:00
Regis Houssin
82e19879d5 FIX php8.1 warning 2022-05-21 23:43:01 +02:00
Nicolas SILOBRE
2b6154050c
Fix : php warning 8 / backup 2022-05-21 16:16:59 +02:00
Maxime Kohlhaas
6445dd3882
Merge branch 'develop' into NEW_stockstransfers 2022-05-21 16:06:59 +02:00
Laurent Destailleur
c02e3f959f
Merge pull request #20899 from atm-gauthier/NEW/sortorder_on_holiday_type_dictionnary 
New/sortorder on holiday type dictionnary
 2022-05-21 00:43:52 +02:00
Laurent Destailleur
420feba56f
Merge branch 'develop' into develop#6 2022-05-20 23:06:30 +02:00
stickler-ci
8b5c4b02c1 Fixing style errors. 2022-05-19 12:17:45 +00:00
Gauthier PC portable 024
8438c7cd6c FIX : sortorder 2022-05-19 14:09:50 +02:00
Gauthier PC portable 024
1e0972f0a1 NEW : sortorder on holiday type dictionnary 2022-05-19 12:34:05 +02:00
Laurent Destailleur
09cf9e82f8 Debug v16 2022-05-19 11:47:43 +02:00
Laurent Destailleur
5f9ef61d32 Debug v16 2022-05-19 09:36:47 +02:00
Laurent Destailleur
25e70bead8 phpcs 2022-05-18 23:27:26 +02:00
Laurent Destailleur
e1c2968ae7 Look and feel v16 2022-05-18 23:11:59 +02:00
Laurent Destailleur
5736709991 Look and feel v16 2022-05-18 16:55:03 +02:00
Laurent Destailleur
ed2e1bda46 Clean code v16 2022-05-18 11:00:43 +02:00
Laurent Destailleur
4de50da0dd Repare code to forbidden var_dump() into code 2022-05-17 14:55:38 +02:00
Laurent Destailleur
402398912b
Merge pull request #20866 from Easya-Solutions/new-ticket-public-interface 
NEW create third-party with contact if not found on pulic ticket
 2022-05-16 20:44:40 +02:00
Florian HENRY
0425becc03 add c_action_trigger and fix travis 2022-05-13 11:23:49 +02:00
lvessiller
d624a1e25e FIX stickler-ci 2022-05-13 08:57:08 +02:00
lvessiller
94dcee622b FIX stickler 2022-05-12 17:58:31 +02:00
lvessiller
7c17f6b1cf NEW create third-party with contact if not found on public ticket 2022-05-12 16:52:02 +02:00
Anthony Berton
273f119631
Update pdf.php 2022-05-10 16:14:37 +02:00
Laurent Destailleur
86b4c97287
Merge branch 'develop' into develop#6 2022-05-10 11:43:27 +02:00
Laurent Destailleur
d0c95d87af Debug v16 2022-05-09 18:59:11 +02:00
Laurent Destailleur
720a09dacb Fix regression 2022-05-09 15:57:10 +02:00
Gauthier PC portable 024
60defe4108 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-05-09 13:29:46 +02:00
Laurent Destailleur
e9d7e216e2 Debug v16 2022-05-09 12:13:31 +02:00
Laurent Destailleur
c3c24fe342 NEW The 'reposition' class works on ajax constantonoff that redirects 2022-05-09 11:52:19 +02:00
Laurent Destailleur
7c32ac2f42 Debug v16 2022-05-09 11:16:58 +02:00
Laurent Destailleur
104b4dcfe5 Trans 2022-05-09 09:31:43 +02:00
Laurent Destailleur
b3b6337c4c
Merge branch 'develop' into NEW_deposit_payment_terms 2022-05-08 23:09:06 +02:00
Laurent Destailleur
6592eb5d73 Debug for php 8.1 2022-05-08 18:25:22 +02:00
Laurent Destailleur
f52a7a26f6 Debug v16 - Fix for postgresql - Fix for sql loading per module - php8 2022-05-08 15:18:34 +02:00
Gauthier PC portable 024
2c840e80fb Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-05-06 11:41:18 +02:00
Laurent Destailleur
e0a690bead Clean code 2022-05-05 19:51:19 +02:00
Laurent Destailleur
62dd7244a3 css 2022-05-05 18:29:36 +02:00
Laurent Destailleur
935b3c300a Debug v16 2022-05-05 16:41:21 +02:00
Laurent Destailleur
207373d37d FIX sending email on payment of registration of event 2022-05-03 20:07:21 +02:00
Laurent Destailleur
51e9a7c251 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2022-05-03 13:05:51 +02:00
Laurent Destailleur
9f379dfcf4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/core/modules/modCashDesk.class.php
	htdocs/debugbar/class/DataCollector/DolLogsCollector.php
	htdocs/langs/en_US/admin.lang
 2022-05-03 12:17:54 +02:00
Laurent Destailleur
affde55169 FIX deprecated module are not more viewed as external modules 
Trans debugbar
 2022-05-03 12:08:24 +02:00
lmarcouiller
1dba611907 Merge branch 'develop#6' of github.com:Hystepik/dolibarr into develop#6 2022-05-02 15:42:43 +02:00
lmarcouiller
ce41d3ed09 remove target extrafields 2022-05-02 15:42:26 +02:00
Hystepik
0be15e3c74
Merge branch 'develop' into develop#6 2022-05-02 15:16:15 +02:00
Laurent Destailleur
08d78dd33b NEW More feature that can be modifed after module generation 2022-05-01 15:05:25 +02:00
Laurent Destailleur
22a2aa55e2 Show tooltip on nb of translation files 2022-05-01 13:39:22 +02:00
Laurent Destailleur
48342cd3c5 Fix td balance 2022-05-01 12:49:53 +02:00
Laurent Destailleur
9af68679d1
Merge branch 'develop' into 16a20 2022-05-01 12:45:08 +02:00
Laurent Destailleur
fe2324ac7e
Merge pull request #20669 from ymollard/tickets-collector 
FIX and NEW i18n for creating tickets via the mail collector
 2022-05-01 12:36:16 +02:00
Laurent Destailleur
82b65f3517
Merge pull request #20707 from hregis/fix_wrong_data_root_with_multicompany 
NEW Module website now supports the multicompany module
 2022-05-01 12:33:07 +02:00
Laurent Destailleur
c96e3bdddf PHP v8 compatibility 2022-04-30 19:50:20 +02:00
Laurent Destailleur
477d681c49 Fix warnings 2022-04-30 17:47:45 +02:00
Yoan Mollard
bdfe7f12d9 Use the existing $form instead of a new $formcategory 2022-04-30 00:32:15 +02:00
Laurent Destailleur
8ad57b3d7a Fix td 2022-04-29 13:43:51 +02:00
Laurent Destailleur
40d0c3b996 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/tva/card.php
	htdocs/langs/en_US/admin.lang
 2022-04-28 19:23:13 +02:00
lmarcouiller
8629651659 NEW : module webhook 2022-04-28 11:13:21 +02:00
Regis Houssin
8a2cc52b5c FIX wrong website data root with multicompany 2022-04-25 10:14:30 +02:00
Laurent Destailleur
aa86b2c71f Fix root passfield not editable on install 
Fix user photo when gravatar not reachable
 2022-04-19 22:26:27 +02:00
stickler-ci
aa36e396a3 Fixing style errors. 2022-04-18 22:23:44 +00:00
Yoan Mollard
37ab728846 Allow users to switch on e-mail headers again in UI 2022-04-19 00:13:40 +02:00
Yoan Mollard
ad0199afd1 Rephrased ticket labels 2022-04-19 00:13:40 +02:00
Yoan Mollard
7f27b8c499 Use default e-mail sender/notif/body/signature for tickets if they exist 
Otherwise, when params have not been configured, error message due to an
empty "from e-mail" is unclear
 2022-04-19 00:13:40 +02:00
Alexandre SPANGARO
ffd9693b17 NEW Add an option to show quick add feature 2022-04-18 07:35:05 +02:00
Laurent Destailleur
f61ca0b516
Merge branch 'develop' into NEW_stockstransfers 2022-04-14 22:50:31 +02:00
Laurent Destailleur
3d21023110 Label of option 2022-04-14 14:11:40 +02:00
Gauthier PC portable 024
6faefa7d86 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-04-12 09:08:57 +02:00
Laurent Destailleur
10367f2cb1
Merge pull request #20536 from atm-jpb/NEW_Add_class_name_on_expensereport_rule 
add class name on tds  expensereport rule card
 2022-04-07 14:22:46 +02:00
Laurent Destailleur
524b001f3b Add $dolibarr_main_restrict_os_commands in security center. 2022-04-06 21:14:35 +02:00
jpb
32f601a48b rename css class name 2022-04-06 09:15:53 +02:00
jpb
f4a780f3f6 add name on tr data 2022-04-04 16:28:42 +02:00
jpb
04140d8dc0 add class name on tds expensereport rule card 2022-04-04 15:45:16 +02:00
Thomas Negre
ac7f02e0d3 stickler corrections 2022-04-04 09:29:03 +02:00
Thomas Negre
4790006c3a workflow config: add button for WORKFLOW_TICKET_CREATE_INTERVENTION 2022-04-04 09:29:03 +02:00
Laurent Destailleur
564382ec6c Upgrade ACE Editor from 1.4.7 to 1.4.14 2022-04-03 12:56:07 +02:00
Laurent Destailleur
f1d5695cb0
Merge pull request #20225 from thomas-Ngr/develop_new_ticket_workflow_auto_link_contract 
NEW: add a workflow to auto link contract on a ticket
 2022-04-02 18:15:27 +02:00
Laurent Destailleur
7e34ce7245 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/main.inc.php
 2022-04-02 15:39:15 +02:00
Laurent Destailleur
d4accb97c5 FIX #yogosha9754 2022-04-02 15:26:40 +02:00
Laurent Destailleur
89b0a7b2b5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-04-01 14:34:15 +02:00
Laurent Destailleur
497117416b
Update mails_templates.php 2022-04-01 14:32:32 +02:00
Laurent Destailleur
02d1bd2868
Merge branch 'develop' into develop 2022-04-01 14:32:05 +02:00
Laurent Destailleur
7031995820
Merge pull request #20505 from atm-jpb/NEW_add_hook_in_expensereport_rule 
add hook doactions on expensereport_rule
 2022-04-01 13:26:03 +02:00
Laurent Destailleur
e10f9b4435 css 2022-03-31 17:07:13 +02:00
Laurent Destailleur
5b86476f0b Link of country not defined, jump on country setup line 2022-03-31 16:57:15 +02:00
stickler-ci
63b8c126d0 Fixing style errors. 2022-03-31 14:52:41 +00:00
jpb
be82fd73ed remove var_dump 2022-03-31 16:47:06 +02:00
jpb
5fe9a4404a add hook doactions on expensereport_rule 2022-03-31 16:43:37 +02:00
Laurent Destailleur
1304ed5763
Merge branch 'develop' into Notify 2022-03-30 12:41:57 +02:00
Laurent Destailleur
f7f318feb2
Update notification.php 2022-03-30 12:38:34 +02:00
Laurent Destailleur
636188f28a
Merge pull request #20247 from thomas-Ngr/develop_new_check_invoice_date 
NEW: check invoice date
 2022-03-29 16:07:31 +02:00
Laurent Destailleur
a80a831ea3 Partnership module swtich from status development to experimental 2022-03-26 12:04:31 +01:00
Marc de Lima Lucio
cbba7d7d5f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-25 16:14:53 +01:00
Laurent Destailleur
6177e914e2
Merge pull request #20293 from atm-quentin/NEW_Availibility_dictionary_field 
NEW Availibility dictionnary new column unit and number
 2022-03-24 20:28:38 +01:00
Thomas Negre
2709e69a32 rename $form into $formcategory 2022-03-24 11:00:37 +01:00
atm-greg
07b0a4e516 Merge branch 'FIX_develop_missing_hooks_for_dictionaryadmin' of github.com:atm-greg/dolibarr into FIX_develop_missing_hooks_for_dictionaryadmin 2022-03-24 09:42:50 +01:00
atm-greg
7fb343b3ef add context 2022-03-24 09:42:02 +01:00
stickler-ci
efbaf030ec Fixing style errors. 2022-03-24 08:41:13 +00:00
atm-greg
f70ceb9398 add more specific context and doAction hook 2022-03-24 09:34:11 +01:00
Laurent Destailleur
ee611e8517 Hide not important options 2022-03-23 16:56:07 +01:00
Laurent Destailleur
94224e9275
Merge pull request #20255 from Easya-Solutions/new-proposal-clone-update-prices 
NEW option update prices on proposal cloning
 2022-03-23 16:49:12 +01:00
Laurent Destailleur
60d9db248f NEW The backup tools has an "lowmemory" for mysqldump on large database 2022-03-18 13:38:07 +01:00
Thomas Negre
c68e16c087 admin/ticket.php: correct parameters table 2022-03-17 16:05:35 +01:00
Thomas Negre
c745237ee9 Stickler corrections 2022-03-17 16:05:35 +01:00
Thomas Negre
5fba0dc237 ticket config : select product type matching tickets. 2022-03-17 16:05:35 +01:00
Thomas Negre
8d997de3bb add options in workflow admin panel : WORKFLOW_TICKET_LINK_CONTRACT, WORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS 2022-03-17 16:05:35 +01:00
Laurent Destailleur
5709f168a8 NEW: MAIN_MAIL_AUTOCOPY_TO can accept several email and special keys 2022-03-17 12:55:12 +01:00
lvessiller
a4508e656c NEW pull develop 2022-03-17 12:20:15 +01:00
Quentin VIAL-GOUTEYRON
4aa87f3f85 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_Availibility_dictionary_field 2022-03-17 11:37:19 +01:00
Laurent Destailleur
079fcacf13 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/products.lang
 2022-03-17 00:16:14 +01:00
Laurent Destailleur
38a8f52e8b Missing init of model 2022-03-16 22:21:04 +01:00
Laurent Destailleur
983bfc4ca9 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
 2022-03-16 22:02:40 +01:00
Laurent Destailleur
f0161d1939 Fix revert a change was not a bug fix but a new feature 2022-03-16 21:59:58 +01:00
Laurent Destailleur
b0525c7a7f
Merge pull request #20358 from atm-greg/FIX_missing_hooks_for_dictionaryadmin 
add more specific context and doAction hook
 2022-03-16 21:52:25 +01:00
Laurent Destailleur
ac22b1ce81 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-03-16 21:31:08 +01:00
Laurent Destailleur
fe5bf529db # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-03-16 20:34:30 +01:00
Alexandre SPANGARO
536bae97e8 FIX Update icon of module reception 2022-03-16 15:49:49 +01:00
Laurent Destailleur
cf13eb7ac7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-15 18:22:37 +01:00
Laurent Destailleur
69654b2b43 Fix sort not working on security page to test file upload 2022-03-15 12:14:46 +01:00
stickler-ci
43ab784be2 Fixing style errors. 2022-03-15 10:26:47 +00:00
atm-greg
0be989dceb add more specific context and doAction hook 2022-03-15 11:18:11 +01:00
BB2A Anthony Berton
899598bbb3 Cop 2022-03-12 16:50:48 +01:00
Laurent Destailleur
06804c3547 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/template/myobject_list.php
 2022-03-11 17:04:23 +01:00
BB2A Anthony Berton
f2377627ec Add template custom module 2022-03-11 10:50:11 +01:00
Laurent Destailleur
994ea81ce0 Fix test send email feature 2022-03-10 17:24:54 +01:00
Laurent Destailleur
88ffe1827e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/ajax/row.php
	htdocs/filefunc.inc.php
 2022-03-10 15:59:09 +01:00
Laurent Destailleur
0ec5595504 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/admin/tools/export_files.php
 2022-03-10 14:12:57 +01:00
Laurent Destailleur
f6cfe0557b FIX exclusion of other backup files into backup file 
Conflicts:
	htdocs/admin/tools/export_files.php
 2022-03-10 14:04:16 +01:00
Gauthier PC portable 024
c103c7d61e Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-03-10 10:31:56 +01:00
Laurent Destailleur
eadd8da3d5 FIX exclusion of other backup files into backup file 2022-03-09 23:32:59 +01:00
javieralapps4up
8ddd37a419
Enabled to add links to local object with local browser in email templates 
It is forbidden by default
 2022-03-09 13:16:09 +01:00
Quentin VIAL-GOUTEYRON
7ae96b9839 convert number into qty 2022-03-09 10:34:23 +01:00
Thomas Negre
9ce51ba4b7 admin/facture: don't show the modify button if not in an HTML form 2022-03-09 09:25:52 +01:00
Thomas Negre
02693ba5ea Facture : add config option for INVOICE_CHECK_POSTERIOR_DATE 2022-03-09 09:25:52 +01:00
Marc de Lima Lucio
4efcbe8799 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-08 15:23:52 +01:00
Marc de Lima Lucio
1993a8d7b1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-08 15:07:37 +01:00
lvessiller
bbe3cfffb1 FIX stickler-ci 2022-03-08 10:17:47 +01:00
lvessiller
2561fcbb85 FIX translate update prices and add const in proposal setup 2022-03-08 10:06:57 +01:00
Quentin VIAL-GOUTEYRON
771fa0b6ed Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_Availibility_dictionary_field 2022-03-08 08:50:22 +01:00
Laurent Destailleur
9dfb7b4328 Revert "CSS" 
This reverts commit 7847e04925.
 2022-03-07 19:46:24 +01:00
Laurent Destailleur
7847e04925 CSS 2022-03-07 19:45:00 +01:00
Laurent Destailleur
1d9a79e980 css 2022-03-07 19:42:57 +01:00
Laurent Destailleur
0020f4e48a
Merge pull request #20222 from thomas-Ngr/develop_new_ticket_notify_at_closing 
New - Ticket: notify contacts at closing
 2022-03-07 16:23:27 +01:00
Laurent Destailleur
1ce8ecb43d Clean setup page 2022-03-07 16:21:37 +01:00
Quentin VIAL-GOUTEYRON
af8ecd1a38 NEW Availibility dictionnary column unit and number 2022-03-07 16:02:49 +01:00
Alexandre SPANGARO
13b69bcf93 NEW Dictionaries - add possibility to manage countries in EEC 2022-03-04 07:00:02 +01:00
Laurent Destailleur
9bda7ba8c7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/doleditor.class.php
 2022-03-03 00:16:55 +01:00
Laurent Destailleur
8051128665 Split section experimental and stable 2022-03-02 11:37:19 +01:00
Laurent Destailleur
12b2a10865 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-01 18:15:13 +01:00
Laurent Destailleur
237b6fc922 Fix value recommended 2022-03-01 17:07:28 +01:00
Laurent Destailleur
358f21f06e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/customreports.php
 2022-03-01 16:48:29 +01:00
Laurent Destailleur
2a48dd349e Fix #hunterb03d4415-d4f9-48c8-9ae2-d3aa248027b5 2022-03-01 16:38:06 +01:00
Laurent Destailleur
d76e002822 Fix explanation on setup page 2022-03-01 15:17:03 +01:00
Laurent Destailleur
67881a7932
Merge branch 'develop' into 16a12_assets_code 2022-02-28 22:03:26 +01:00
Thomas Negre
e1e643efba Ticket : add option TICKET_NOTIFY_AT_CLOSING to ticket config panel 2022-02-28 17:10:45 +01:00
Laurent Destailleur
409da7f091 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-25 19:17:41 +01:00
Laurent Destailleur
84db3437bd Add missing ' in command 2022-02-25 14:13:42 +01:00
Laurent Destailleur
8c61a29051 Show value of short_open_tags 2022-02-25 01:30:34 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Laurent Destailleur
77e2969411 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-22 22:27:32 +01:00
Laurent Destailleur
27cc6078ed Clean code 2022-02-22 22:15:29 +01:00
Thomas Negre
5d10d6cb78 allow delays configuration from ticket module params 2022-02-21 11:57:59 +01:00
ptibogxiv
b8d82671b3
Update filecheck.php 2022-02-20 10:39:59 +01:00
ptibogxiv
996dcdde82
FIX error with php8 2022-02-19 18:34:53 +01:00
Laurent Destailleur
6b8312aab0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-17 20:51:25 +01:00
Laurent Destailleur
d19aca7192 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-02-17 20:50:03 +01:00
Laurent Destailleur
ec71eb410e
Merge pull request #20040 from thomas-Ngr/develop_ticket_config_auto_read 
ticket config: auto read ticket
 2022-02-17 19:58:01 +01:00
Laurent Destailleur
39bb854ef8
Update ticket.php 2022-02-17 19:57:45 +01:00
Laurent Destailleur
7e33794f66
Merge pull request #20047 from simicar29/14-dolistore 
Fix urlencode breaking links in Market Place page
 2022-02-17 19:54:04 +01:00
Laurent Destailleur
c529af90c6 Fix trans 2022-02-17 12:06:48 +01:00
Laurent Destailleur
3697cb9ca4 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/reception/class/reception.class.php
 2022-02-17 11:34:54 +01:00
Alexandre SPANGARO
6593449806 Dictionary 2022-02-14 04:20:42 +01:00
Laurent Destailleur
d5e5e8d436 Debug v15 2022-02-13 17:09:40 +01:00
Laurent Destailleur
1097111706 Fix autofocus 2022-02-13 16:37:08 +01:00
Laurent Destailleur
cafdcb7206 Show translation value 2022-02-13 16:13:38 +01:00
Laurent Destailleur
b623b88674 css 2022-02-11 18:06:39 +01:00
Marc GUENNEUGUES
c552030b69 Fix urlencode breaking links in Market Place page 2022-02-11 15:18:38 +01:00
Laurent Destailleur
b84fd3ec3d Clean code 2022-02-11 12:46:45 +01:00
Thomas Negre
c5d1310373 handle workflow constants in appropriate category 2022-02-10 17:51:32 +01:00
Thomas Negre
39bd5dd6dc ticket config : add TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND option to config panel 2022-02-10 17:50:59 +01:00
Laurent Destailleur
3b18462a62 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
 2022-02-07 15:51:01 +01:00
Laurent Destailleur
31ca78acda Sync transifex. 
Fix install.
 2022-02-07 14:25:20 +01:00
Laurent Destailleur
9b1f04209d NEW Change in theme colors does not need to use the refresh button 2022-02-06 22:11:44 +01:00
Laurent Destailleur
86da9c610e
Merge pull request #17887 from marc-dll/develop_NEW_block_leave_if_negative_balance 
NEW: leave requests: add field into type dictionary to block request if balance is negative
 2022-02-04 20:23:04 +01:00
BB2A Anthony Berton
d4414634eb Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into add_option_pdf_global_sales_rep 2022-02-04 17:39:07 +01:00
BB2A Anthony Berton
0e1e65e180 only one option 2022-02-04 17:29:13 +01:00
BB2A Anthony Berton
b4fffc6a23 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into add_option_pdf_global_thirdparty_alias 2022-02-04 15:38:46 +01:00
Laurent Destailleur
aef646bb2a Change order of options and removed useless option 2022-02-04 12:17:38 +01:00
Anthony Berton
a85f27248e
Update pdf.php 2022-02-04 09:28:01 +01:00
Laurent Destailleur
44bc197d03 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-01 13:25:45 +01:00
Laurent Destailleur
9db0b7d0ef Fix look and feel v15 2022-02-01 11:57:33 +01:00
Laurent Destailleur
38e39cfa96 CSS 2022-01-28 19:57:07 +01:00
Laurent Destailleur
288a6564dc CSS 2022-01-28 19:28:37 +01:00
Anthony Berton
328a358010
Merge branch 'Dolibarr:develop' into add_option_pdf_global_sales_rep 2022-01-26 19:11:40 +01:00
BB2A Anthony Berton
e8f27ca058 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into add_option_pdf_global_thirdparty_alias 2022-01-26 18:57:01 +01:00
BB2A Anthony Berton
fea897f323 Fix lang and erreur 2022-01-26 18:46:51 +01:00
BB2A Anthony Berton
b9cd22c60a Add fonction invert and traduc 2022-01-26 18:36:04 +01:00
Anthony Berton
49efba7ded
Merge branch 'develop' into Add_param_color_button_action 2022-01-26 15:12:16 +01:00
BB2A Anthony Berton
28b9ead688 ADD config text color 2022-01-26 15:06:51 +01:00
Laurent Destailleur
38408f916b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-01-26 13:51:25 +01:00
Laurent Destailleur
416543a5f5 Standardize code to allow deletion of an odt template 2022-01-26 13:49:46 +01:00
BB2A Anthony Berton
656dc02e7d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into Add_param_color_button_action 2022-01-26 13:03:01 +01:00
BB2A Anthony Berton
54b5fed67b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into Add_param_color_button_action 2022-01-25 16:45:30 +01:00
Juanjo Menent
56cb81287e Merge remote-tracking branch 'upstream/develop' into develop_hotfix19760 
# Conflicts:
#	htdocs/install/mysql/migration/15.0.0-16.0.0.sql
 2022-01-25 16:25:44 +01:00
Laurent Destailleur
34d3fdad02
Merge pull request #19699 from atm-john/new_convert_setup_to_new_setup 
NEW : convert situation setup to new setup system
 2022-01-25 15:17:14 +01:00
Laurent Destailleur
8dbadc0aa8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-24 14:12:06 +01:00
Laurent Destailleur
1eb4d76253 Clean code 2022-01-24 13:15:32 +01:00
Laurent Destailleur
8ceec043e8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-24 12:50:10 +01:00
Laurent Destailleur
67fa80cf18
Merge pull request #19841 from fappels/15_fix_dolibarr_export 
Fix view after generate database export
 2022-01-23 18:20:36 +01:00
Laurent Destailleur
9049134556 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-23 12:07:11 +01:00
Laurent Destailleur
e06ca2ea08 css 2022-01-23 02:38:34 +01:00
Laurent Destailleur
e3cf5fecbe css 2022-01-23 02:06:47 +01:00
Laurent Destailleur
a16293f9b7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-22 17:27:57 +01:00
Laurent Destailleur
65e58943b3 FIX exclude the pdf png preview files from backup 2022-01-21 20:57:45 +01:00
Juanjo Menent
18e308e800 remove leftover if 2022-01-21 13:47:20 +01:00
Laurent Destailleur
1dcfb88ad4 Debug v15 2022-01-21 13:44:40 +01:00
Juanjo Menent
59921d60b3 Length label control 2022-01-21 13:38:59 +01:00
Laurent Destailleur
de30b68f9e Code comment 2022-01-20 17:10:30 +01:00
Laurent Destailleur
ee836305ba Fix state field 2022-01-19 20:51:53 +01:00
Laurent Destailleur
d38784f45a WIP Login with Google 2022-01-19 20:33:20 +01:00
Laurent Destailleur
ff1037634b Clean OAuth feature 2022-01-19 18:23:31 +01:00
Laurent Destailleur
60b90056c4 Fix #yogosha8450 2022-01-19 15:20:10 +01:00
Laurent Destailleur
9d067d74ab Fix responsive 2022-01-17 17:51:03 +01:00
Francis Appels
89869a2485 Fix view after generate export 2022-01-15 12:09:36 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
cc72418ab9 Fix example 2022-01-09 14:22:42 +01:00
Laurent Destailleur
4ce77e62c6 Debug v15 2022-01-09 14:19:55 +01:00
ATM john
29e5fb0250 Merge branch 'fix_stuff_on_setup_class' into new_convert_setup_to_new_setup 2022-01-09 10:27:34 +01:00
Laurent Destailleur
6cb0374784 Fix responsive 2022-01-06 18:02:44 +01:00
Laurent Destailleur
1e467c60f3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/compta/facture/list.php
	htdocs/product/stock/movement_list.php
 2022-01-06 11:15:28 +01:00
Laurent Destailleur
61cbf52a94 Fix tooltip email collector 2022-01-05 21:27:00 +01:00
Laurent Destailleur
1471c2422d Fix trans 2022-01-05 20:49:38 +01:00
Laurent Destailleur
949c154f15 Fix missing html id 2022-01-05 20:21:11 +01:00
Laurent Destailleur
f3251f1ef9 css 2022-01-05 14:42:45 +01:00
Laurent Destailleur
e8f792732e Fix #yogosha8227 2022-01-05 14:42:40 +01:00
John BOTELLA
70a1975ad2
Merge branch 'develop' into new_convert_setup_to_new_setup 2022-01-03 21:53:45 +01:00
Laurent Destailleur
f8a97ef928 FIX a lot of problem with rules for password validation 2022-01-03 16:09:08 +01:00
Laurent Destailleur
cecb11bb1c Debug v15 2022-01-03 12:28:42 +01:00
Laurent Destailleur
7fd601a29d Fix navigation on security audit list 2022-01-01 20:47:01 +01:00
Laurent Destailleur
0b443a203e Fix navigation on security audit list 2022-01-01 20:37:03 +01:00
Laurent Destailleur
0037ee2254 Fix ckeditor plugins 2022-01-01 19:37:53 +01:00
Laurent Destailleur
7b10d7d001
Merge pull request #19676 from grandoc/new_branch_22_12_2021 
fix : Fatal error: Uncaught Error: Class 'AccountingAccount' not foun…
 2021-12-30 17:29:18 +01:00
Anthony Berton
78861c1743 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into Add_param_color_button_action 2021-12-29 19:21:03 +01:00
John BOTELLA
e9e100410a Fix empty value 2021-12-28 14:51:19 +01:00
John BOTELLA
817a9594ae Convert setup of situation invoice to new setup system + fix size 2021-12-28 14:32:57 +01:00
John BOTELLA
50801edb84 Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_convert_setup_to_new_setup 2021-12-28 11:29:26 +01:00
Laurent Destailleur
4eb9a7625a Fix notification setup page. 2021-12-23 15:12:35 +01:00
Philippe GRAND
641b0ba88f fix : Fatal error: Uncaught Error: Class 'AccountingAccount' not found in /home/httpd/vhosts/doliweb.com/httpdocs/admin/dict.php on line 1970 2021-12-22 17:38:06 +01:00
John BOTELLA
a3e4ea5699 WIP migrate situation invoice to new setup POO 2021-12-20 10:29:10 +01:00
Laurent Destailleur
3282a89d3f css 2021-12-19 00:48:13 +01:00
Laurent Destailleur
fa5d96d562 Add more info to help debug 2021-12-18 16:48:08 +01:00
Laurent Destailleur
654cd8bd1c Fix for dol_string_onlythesehtmlattributes() 2021-12-17 12:01:25 +01:00
Laurent Destailleur
f3430d94d5 css 2021-12-17 00:48:13 +01:00
Laurent Destailleur
494e9a2745
Merge branch 'develop' into develop_NEW_block_leave_if_negative_balance 2021-12-16 19:12:06 +01:00
Laurent Destailleur
bef1afc7b8 Clean code 2021-12-16 17:01:15 +01:00
Anthony Berton
9bc2a561bc ok 2021-12-14 10:52:16 +01:00
Laurent Destailleur
388500794b Fix for ckeditor 2021-12-13 01:19:48 +01:00
Laurent Destailleur
e46bde3a4a Fix token 2021-12-11 19:58:03 +01:00
Laurent Destailleur
ff54bcedf7 css 2021-12-10 16:02:42 +01:00
Laurent Destailleur
5bca7cf5f1 css 2021-12-10 15:57:10 +01:00
Laurent Destailleur
dcd8c0f53d css 2021-12-10 14:50:20 +01:00
Laurent Destailleur
b238419020 Clean code 2021-12-07 13:39:06 +01:00
Regis Houssin
efda10333c FIX missing default value for more comprehensive 2021-12-01 10:40:10 +01:00
Laurent Destailleur
8bace4c64e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-11-30 16:24:42 +01:00
Laurent Destailleur
a298a845f1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/memory.lib.php
	htdocs/langs/en_US/holiday.lang
	htdocs/ticket/card.php
 2021-11-30 16:24:18 +01:00
Laurent Destailleur
055cb5c0c9
Merge pull request #18526 from cfoellmann/PR/deprecated-html 
deprecated html attributes
 2021-11-30 14:27:12 +01:00
Laurent Destailleur
f66f9082e7
Merge pull request #19509 from fr69400/patch3 
FIX Html conversion check with PDF_BOLD_PRODUCT_LABEL
 2021-11-30 14:04:10 +01:00
Laurent Destailleur
a7f9ffd5d0
Merge pull request #19461 from frederic34/lastactivationversion 
keep info on latest activation version of module
 2021-11-30 12:16:39 +01:00
Christian Foellmann
6608f5f0d8 update all script tags to be uniform. language="javascript" removed 
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
 2021-11-29 15:09:18 +01:00
Laurent Destailleur
2d92130c1e External backups can be downloaded from the "About info page". 2021-11-28 19:25:58 +01:00
stickler-ci
a933793b8a Fixing style errors. 2021-11-28 13:42:25 +00:00
fr69400
5a165ae2bf FIX PDF_NOLD_PRODUCT_LABEL 2021-11-28 14:40:15 +01:00
ptibogxiv
f08adef1e8
Fix ExpenseReport define template 
Can use template for expense report notification but not define it :/
 2021-11-28 12:12:16 +01:00
Laurent Destailleur
7b68ef1fb8 Clean/Debug module hrm. 2021-11-27 14:46:47 +01:00
Laurent Destailleur
f3f91512ae FIX eclude of log files into backup 2021-11-27 12:36:35 +01:00
Laurent Destailleur
6e273e47e5 css 2021-11-27 12:35:30 +01:00
Laurent Destailleur
57670108bf Prepare code to zip a module 2021-11-27 10:57:45 +01:00
Laurent Destailleur
f67c2e5b53 Removed useless button 2021-11-26 17:20:19 +01:00
Laurent Destailleur
4548b4fcee css 2021-11-26 17:09:07 +01:00
Laurent Destailleur
ad8b071e81 Prepare code 2021-11-26 14:13:29 +01:00
Laurent Destailleur
bf1dfac629 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/errors.lang
	htdocs/product/stock/movement_list.php
 2021-11-25 21:54:06 +01:00
Laurent Destailleur
0c54723185 css 2021-11-25 10:28:37 +01:00
Laurent Destailleur
b345c2463c Fix warning on security page 2021-11-25 00:19:55 +01:00
Laurent Destailleur
01038b190d Better error report on id command that failed 2021-11-24 22:35:10 +01:00
Gauthier PC portable 024
641002ae96 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-11-24 09:05:24 +01:00
Frédéric FRANCE
e6af0facdd
keep info on latest activation version of module 2021-11-23 23:27:07 +01:00
Laurent Destailleur
949bc9f9bd Make setup page of widget easier 2021-11-22 18:15:54 +01:00
Laurent Destailleur
34ac517d62 CSS 2021-11-22 17:54:29 +01:00
Laurent Destailleur
522c66915d Fix tooltip for social network of company 2021-11-22 13:34:57 +01:00
Laurent Destailleur
60ef230447 Fix html content 2021-11-22 12:37:47 +01:00
Laurent Destailleur
441af6b6fb Fix add rel="noopener noreferrer" 2021-11-22 02:35:55 +01:00
Laurent Destailleur
c79fa4d3d0 NEW Add workflow action close purchase order on reception validation 
NEW Add workflow action close purchase order on reception closing
 2021-11-19 23:03:12 +01:00
Marc de Lima Lucio
bffd2fc939 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_block_leave_if_negative_balance 2021-11-19 16:12:33 +01:00
Laurent Destailleur
53de97a52f
Merge pull request #19191 from moreauftheobald/develop 
NEW|New Ajout d'un collecteur de pièce jointes a Email collecto
 2021-11-18 20:36:28 +01:00
Laurent Destailleur
649bf38c05 Responsive 2021-11-17 11:14:12 +01:00
Laurent Destailleur
7a6d84f0d5
Merge pull request #19365 from hregis/fix_add_ldap_hash_type_select 
NEW add ldap password hash type select
 2021-11-15 11:16:33 +01:00
Laurent Destailleur
67c9d55e88
Update ldap.php 2021-11-15 10:46:13 +01:00
Laurent Destailleur
5b5f41606a NEW PDF generation support format PDF/A-1b and PDF/A-3b 2021-11-15 09:02:01 +01:00
Laurent Destailleur
a368200036 Add MAIN_MEMORY_LIMIT_ARCHIVE_DATAROOT and MAIN_MEMORY_LIMIT_DUMP 2021-11-13 01:45:38 +01:00
Regis Houssin
317060d915 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_add_ldap_hash_type_select 2021-11-12 16:53:39 +01:00
Laurent Destailleur
715a65eab2 Clean code for md theme 2021-11-12 13:33:59 +01:00
Regis Houssin
084a3f48c1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
fix_add_ldap_hash_type_select
 2021-11-12 10:10:04 +01:00
Alexandre SPANGARO
d611b99d95 GNU version 3 2021-11-09 03:01:48 +01:00
stickler-ci
8adfc4fefe Fixing style errors. 2021-11-08 13:27:01 +00:00
Anthony Berton
3e432bd56a
Merge branch 'develop' into add_option_pdf_global_sales_rep 2021-11-08 14:26:31 +01:00
stickler-ci
becb96f04a Fixing style errors. 2021-11-08 13:24:10 +00:00
Anthony Berton
e52ea01448
Merge branch 'develop' into add_option_pdf_global_thirdparty_alias 2021-11-08 14:23:40 +01:00
Laurent Destailleur
cb65903537 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/langs/en_US/bills.lang
 2021-11-08 03:09:30 +01:00
Laurent Destailleur
d591a83085 css 2021-11-08 00:57:00 +01:00
Laurent Destailleur
1d09ffa4c6 Fix scrutinizer 2021-11-07 18:59:11 +01:00
Laurent Destailleur
47451432a7 Fix warning 2021-11-07 18:49:58 +01:00
Laurent Destailleur
142e9473c5 Responsive 2021-11-07 18:28:59 +01:00
Laurent Destailleur
2234522519 Debug module parnership. Add the type of partnership. 2021-11-07 13:51:31 +01:00
Laurent Destailleur
e8a2fc33c3 Fix visiblity of dictionnary for MAIN_USE_EXPENSE_IK 2021-11-07 12:47:03 +01:00
Laurent Destailleur
dd2207d6c5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/list.php
	htdocs/core/db/DoliDB.class.php
	htdocs/resource/list.php
 2021-11-06 21:11:05 +01:00
Laurent Destailleur
7e68f9e013 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/db/DoliDB.class.php
	htdocs/resource/list.php
 2021-11-06 21:04:17 +01:00
Laurent Destailleur
897b00faf0 Clean code 2021-11-05 14:23:19 +01:00
Regis Houssin
3fb0e3c5ad NEW add html.formldap.class.php 2021-11-03 22:56:15 +01:00
Regis Houssin
c5e6893289 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
fix_add_ldap_hash_type_select

Conflicts:
	htdocs/core/class/ldap.class.php
 2021-11-01 11:16:33 +01:00
Regis Houssin
772c3eb43a Works on ldap password hash type 2021-11-01 11:13:44 +01:00
Laurent Destailleur
7dcd98b9bb
Merge pull request #19234 from hregis/fix_see_ldap_connected_server 
FIX show connected server if we have a primary and secondary ldap server
 2021-11-01 02:46:28 +01:00
Laurent Destailleur
58e55a3d86
Merge pull request #19263 from frederic34/displaydnsspf 
display spf info from dns
 2021-11-01 02:35:32 +01:00
Laurent Destailleur
3c69fb0ea3
Update mails.php 2021-11-01 02:35:15 +01:00
Frédéric FRANCE
8ce70aac5d
display spf info from dns 2021-10-31 18:43:11 +01:00
Laurent Destailleur
d891dd8ddc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/stocks.lang
	htdocs/product/stats/card.php
	htdocs/projet/element.php
	htdocs/salaries/card.php
 2021-10-31 16:19:10 +01:00
Laurent Destailleur
e6e440e573 Fix #19257 error in the page Overview of a project 2021-10-31 15:14:15 +01:00
Marc de Lima Lucio
fbb1fbf08e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_block_leave_if_negative_balance 2021-10-28 17:09:50 +02:00
ksar
2b13c05d13
FIX #19214 2021-10-28 15:54:38 +02:00
Marc de Lima Lucio
668088a63f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2021-10-28 15:54:18 +02:00
Regis Houssin
390d5eccaf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_see_ldap_connected_server 2021-10-28 15:47:31 +02:00
Regis Houssin
36febed123 FIX syntax error 2021-10-28 15:46:52 +02:00
Regis Houssin
f497492e62 FIX compatibility with php8 2021-10-28 15:40:05 +02:00
Regis Houssin
72484961ab FIX show connected server if we have a primary and secondary ldap server 2021-10-28 12:13:28 +02:00
Laurent Destailleur
d1794d7948 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modAdherent.class.php
 2021-10-28 11:05:38 +02:00
Laurent Destailleur
5df25fece7 Trans and log 2021-10-27 11:15:26 +02:00
Scrutinizer Auto-Fixer
5567310e44 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-10-25 20:07:31 +00:00
MOREAU FRANCK
74ec7c68a2 card Modif 2021-10-25 09:37:51 +02:00
Laurent Destailleur
8076357f93
Merge pull request #17185 from bb2a/formconfirm_notification 
[NEW]  Add option for notification in message form
 2021-10-24 13:00:39 +02:00
Laurent Destailleur
44b030e23e
Merge branch 'develop' into NEW_stockstransfers 2021-10-23 22:57:35 +02:00
Frédéric FRANCE
6d9ee78704
security page doesnt detect xdebug 2021-10-23 21:53:04 +02:00
Laurent Destailleur
8604f9b153 Clean DOM (remove ficheaddleft div) 2021-10-23 17:18:35 +02:00
Frédéric FRANCE
febb48d345
Update loan.php 2021-10-23 07:41:40 +02:00
Laurent Destailleur
ef0b527379 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-22 15:57:16 +02:00
Laurent Destailleur
c81bf68578 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/compta/cashcontrol/cashcontrol_list.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/modulebuilder/index.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/product/class/api_products.class.php
 2021-10-22 15:56:44 +02:00
Laurent Destailleur
d54423990d
Merge pull request #19077 from polkiko/email_contentlines 
FIX Content line substitution in email
 2021-10-22 15:37:45 +02:00
Polkiko
0c47a88098 FIX Content line substitution in email 2021-10-21 23:53:37 +02:00
Frédéric FRANCE
054388be01
doxygen 2021-10-21 11:45:36 +02:00
Regis Houssin
71b9ac384f FIX only ones value is return for dictionaries 2021-10-21 08:43:20 +02:00
Regis Houssin
4b2b2328c3 FIX missing sql filter by entity 2021-10-20 21:33:18 +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
8e68f452ed
Merge branch 'develop' into develop_NEW_block_leave_if_negative_balance 2021-10-20 14:48:06 +02:00
Laurent Destailleur
69d92adb8a
Update dict.php 2021-10-20 14:45:24 +02:00
Laurent Destailleur
b03bad98ae
Update dict.php 2021-10-20 14:42:56 +02:00
Laurent Destailleur
4a5293fc9c Rewrite getDictionaryValue (Use a cache file and consistent return code) 2021-10-20 14:41:40 +02:00
Laurent Destailleur
e4d0bf7a91
Merge pull request #18967 from aspangaro/15a23 
NEW Add sortorder on units list
 2021-10-20 12:50:32 +02:00
Gauthier PC portable 024
4614b0dd65 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-10-20 09:13:58 +02:00
Laurent Destailleur
885e70ff03 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-19 19:52:33 +02:00
Laurent Destailleur
9f9c1d2f7b css 2021-10-19 19:52:18 +02:00
Laurent Destailleur
99a939df57
Merge pull request #17518 from bb2a/add_option_pdf_global_with_picture 
[NEW] PDF width picture option
 2021-10-19 19:32:44 +02:00
Laurent Destailleur
58941e9a95
Update pdf_other.php 2021-10-19 19:31:06 +02:00
Laurent Destailleur
4764075cc7
Merge pull request #19016 from hregis/fix_possibility_to_bypass_main_antivirus_constants 
FIX add possibility to bypass MAIN_ANTIVIRUS_* constants
 2021-10-19 19:04:09 +02:00
Laurent Destailleur
0cae464bfa Debug v15 2021-10-19 16:47:43 +02:00
Regis Houssin
db01fed447 FIX error when defining an already existing constant 2021-10-19 12:36:33 +02:00
Laurent Destailleur
b0230ad42b Look and feel v15 2021-10-18 16:45:14 +02:00
Laurent Destailleur
f1d646bded Look and feel v15 2021-10-18 15:41:55 +02:00
Laurent Destailleur
79177b0a11 Rename method into selectLotDataList 2021-10-17 14:38:12 +02:00
Laurent Destailleur
78523e852d css 2021-10-17 14:04:49 +02:00
Laurent Destailleur
30ba753b34 css 2021-10-17 14:02:37 +02:00
Regis Houssin
84e4bd8820 NEW add zstd compression 2021-10-17 11:59:25 +02:00
Laurent Destailleur
94c48d3573 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-10-16 19:40:22 +02:00
Laurent Destailleur
d60f4121ee
Merge pull request #18991 from FHenry/dev_new_option_pdfA_setting 
NEW: add setting to create PDF in PDF/A - 1b format #18990
 2021-10-16 19:04:52 +02:00
Laurent Destailleur
5dfbd3642f
Update pdf.php 2021-10-16 19:03:20 +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
52890c64c1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/compta/facture/stats/index.php
	htdocs/compta/prelevement/create.php
 2021-10-16 12:53:57 +02:00
Florian HENRY
26c50b9e2c add setting to create PDF in PDF/A - 1b format #18990 2021-10-15 11:59:12 +02:00
Marc de Lima Lucio
29768a1c6e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2021-10-13 11:33:04 +02:00
Alexandre SPANGARO
41d6a96342 Merge remote-tracking branch 'upstream/develop' into 15a23 2021-10-13 03:29:57 +02:00
Laurent Destailleur
4d48be415c
Fight against inflation of minor options 2021-10-13 01:53:44 +02:00
Vincent Dieltiens
7f07d82d3f Rename FORBID_EDIT_PROJECT_ON_SUPPLIER_ORDER into SUPPLIER_ORDER_FORBID_EDIT_PROJECT 2021-10-12 23:34:00 +02:00
Vincent Dieltiens
8370973a9d Add an option to forbird changing the project of a supplier order if validated or if in draft but already has a reference (not ) 2021-10-12 15:17:14 +02:00
atm-lena
7c8bde885b hook createDictioaryFieldList : tr html tag to right place 2021-10-11 16:03:56 +02:00
Gauthier PC portable 024
ca18db8f50 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-10-11 16:01:47 +02:00
Laurent Destailleur
5666c63de2
Merge pull request #18850 from atm-gauthier/NEW/integration_GPEC_code 
New : integration gpec, source code
 2021-10-11 15:39:54 +02:00
Alexandre SPANGARO
754b13a83f NEW Add sortorder on units list 2021-10-11 08:58:00 +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
Gauthier PC portable 024
de48c1bdde Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/integration_GPEC_code 2021-10-07 11:23:37 +02:00
Gauthier PC portable 024
70648477a7 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-10-07 10:37:09 +02:00
Laurent Destailleur
f8d4e2bbf9 Fix phpcs 2021-10-07 04:14:38 +02:00
Gauthier PC portable 024
231f809106 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/integration_GPEC_code 2021-10-06 17:55:36 +02:00
Laurent Destailleur
ad1cb443e4
Merge pull request #18520 from cfoellmann/PR/pdf-no-template 
allow supplier order to not generate pdfs
 2021-10-06 15:35:08 +02:00
Laurent Destailleur
de49e4e375
Merge branch 'develop' into NEW_expense_report_project_required 2021-10-06 14:34:58 +02:00
Laurent Destailleur
0cf18ded80
Merge pull request #18866 from marc-dll/14.0_FIX_holiday_increments_pgsql 
FIX: postgresql compatibility with camelcase fields
 2021-10-06 13:26:57 +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
Marc de Lima Lucio
92c22dc9cf FIX: deposit payment terms: tag deposit_percent field as nullable in dictionary 2021-10-05 15:08:29 +02:00
Marc de Lima Lucio
0d174ebd71 cMerge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2021-10-05 14:57:21 +02:00