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

8384 Commits

Author SHA1 Message Date
lvessiller
0a5b2097e7 FIX resolve conflicts 2022-05-12 17:07:23 +02:00
lvessiller
7c17f6b1cf NEW create third-party with contact if not found on public ticket 2022-05-12 16:52:02 +02:00
Laurent Destailleur
dc6f90c4a7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-12 10:38:26 +02:00
Laurent Destailleur
91110b938e Fix bad db var 2022-05-12 01:38:46 +02:00
Laurent Destailleur
23b1658081 Fix null object 2022-05-12 01:37:20 +02:00
Laurent Destailleur
bf8ba511cb Fix missing index.php file on "regenerate all files" button for alt lang 2022-05-12 01:28:20 +02:00
Laurent Destailleur
c5a4877eb8 php8 2022-05-11 10:28:12 +02:00
Laurent Destailleur
3a5fe5063d Debug v16 2022-05-10 16:19:00 +02:00
Laurent Destailleur
c9a0dd327f Fix default value 2022-05-10 16:04:20 +02:00
Anthony Berton
8e75b7102b
Update pdf.lib.php 2022-05-10 15:40:45 +02:00
Laurent Destailleur
cffec01451 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
	test/phpunit/SecurityTest.php
 2022-05-09 22:04:36 +02:00
Laurent Destailleur
ef18456724 Fix regression in dol_eval 2022-05-09 21:56:21 +02:00
Laurent Destailleur
720a09dacb Fix regression 2022-05-09 15:57:10 +02:00
Laurent Destailleur
7c32ac2f42 Debug v16 2022-05-09 11:16:58 +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
Laurent Destailleur
9dbeccb8d8 Doc 2022-05-06 05:02:29 +02:00
Laurent Destailleur
f9942dfeaa Debug v16 2022-05-05 23:02:23 +02:00
Laurent Destailleur
6c624a9a45 Fix name of sql file 2022-05-05 12:26:15 +02:00
lvessiller
9f8a9db39e NEW field required on mandatory fields 2022-05-02 15:55:32 +02:00
Laurent Destailleur
e2bf596589 Fix missing picto 2022-05-01 17:58:37 +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
7c058c9ae6 NEW Add param to keep the robot=index meta tag on public pages 2022-05-01 11:48:11 +02:00
Laurent Destailleur
fed14db94a css 2022-04-29 13:22:46 +02:00
Laurent Destailleur
708d3610a5 Look and feel v16 2022-04-29 13:04:29 +02:00
Laurent Destailleur
bdd9b2acf4 Clean css 2022-04-29 12:36:38 +02:00
Regis Houssin
7e7ae863c7 FIX syntax error 2022-04-25 10:19:52 +02:00
Regis Houssin
8a2cc52b5c FIX wrong website data root with multicompany 2022-04-25 10:14:30 +02:00
Laurent Destailleur
599c90ae6b FIX dol_string_onlythesehtmltags can keep html comments 2022-04-12 14:57:12 +02:00
Laurent Destailleur
cb15a21e41 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/originproductline.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/user/card.php
 2022-04-11 21:22:27 +02:00
Laurent Destailleur
3ac268c200 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/holiday/card.php
	htdocs/user/card.php
 2022-04-11 21:14:51 +02:00
Laurent Destailleur
c65b7fd2ff Fix regression php8 2022-04-09 02:51:40 +02:00
Laurent Destailleur
1d879bc996 FIX numbering method when mask include {cccc} 2022-04-08 10:19:20 +02:00
Laurent Destailleur
994b500a68 PHP 8.0 compatibility 2022-04-08 00:14:29 +02:00
Laurent Destailleur
e66b4a687d Close #19414 2022-04-07 19:23:45 +02:00
Adrien Raze
41ee9739db FIX: Add 'recruitment' into check array 2022-04-07 17:16:02 +02:00
Laurent Destailleur
56d5df4387
Merge pull request #19997 from habot-it/pdf_pagefoot 
Add options in function pdf_pagefoot of pdf.lib.php
 2022-04-07 14:33:41 +02:00
habot-it
49a0485427 Add options in function pdf_pagefoot of pdf.lib.php - Revision 2022-04-07 08:54:59 +00:00
UT from dolibit
9db2f2c3f2
Update company.lib.php 
add D of THIR-D-PARTIES

($conf->global->THIRDPARTIES_DISABLE_RELATED_OBJECT_TAB)
 2022-04-06 20:12:35 +02:00
Laurent Destailleur
e1143eb468
Merge pull request #20081 from bb2a/border_theme-md 
NEW - add param boder table for md theme
 2022-04-05 18:02:51 +02:00
Laurent Destailleur
89eb19bafb
Update modulebuilder.lib.php 2022-04-05 17:51:42 +02:00
Laurent Destailleur
d143b8bf6e Debug dol_uncompress and add phpunit tests 2022-04-05 17:19:12 +02:00
Laurent Destailleur
17c719e760 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-04-05 15:24:15 +02:00
Laurent Destailleur
000ab8ce5f
Merge pull request #20164 from Hystepik/develop#3 
NEW dol_uncompress() supports extensions (.gz, .bz2, .zstd). Only .zip was supported before.
 2022-04-05 15:21:09 +02:00
Laurent Destailleur
3385cb8071
Update files.lib.php 2022-04-05 15:19:55 +02:00
Laurent Destailleur
759f7e051e
Update files.lib.php 2022-04-05 15:18:52 +02:00
Laurent Destailleur
ed7fd09925 Fix regression 2022-04-05 14:36:09 +02:00
Laurent Destailleur
d514d72ac5 Doxygen 2022-04-03 12:35:30 +02:00
Laurent Destailleur
45fca25408 NEW Upgrade chartjs library to 3.7.1 2022-04-03 11:52:25 +02:00
Laurent Destailleur
f07e11179d
Merge pull request #20472 from hregis/fix_avoid_hooks_conflict 
NEW add hooks contact tab badge and hooks parameter for avoid conflicts
 2022-04-02 18:06:01 +02:00
jpb
5fe9a4404a add hook doactions on expensereport_rule 2022-03-31 16:43:37 +02:00
ATM john
d50e0457f3 add todo comment 2022-03-30 12:33:17 +02:00
ATM john
c1d9ea95dc fix function name 2022-03-30 12:16:17 +02:00
ATM john
16968b08f9 Add GETPOSTISARRAY 2022-03-30 11:49:48 +02:00
Laurent Destailleur
63d9f69732 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
 2022-03-29 15:55:47 +02:00
Laurent Destailleur
f21e3364dd Code comment 2022-03-29 14:27:22 +02:00
Laurent Destailleur
b3f0681d7c Fix price2num when $langs not defined 2022-03-29 10:22:03 +02:00
Regis Houssin
009ad3be0f FIX remove unused code 2022-03-26 13:10:23 +01:00
Regis Houssin
97a1774bf3 NEW add hooks contact tab badge and hooks parameter for avoid conflicts 2022-03-26 12:57:30 +01:00
Laurent Destailleur
c2a088c5ff Fix regression in phpunit 2022-03-26 12:34:52 +01:00
Laurent Destailleur
396b532400 Can cumulate error message on different authentication modes 2022-03-26 09:40:22 +01:00
Laurent Destailleur
8e610ddce7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-25 15:10:50 +01:00
Laurent Destailleur
644e509265 Rename "Reconciled" with "BankLineReconciled" for bank conciliation 2022-03-25 14:43:48 +01:00
Alexandre SPANGARO
9db7d29237 Accountancy - Removed old code for reconciled (or lettering...) 2022-03-24 23:14:23 +01:00
Laurent Destailleur
1f7e1c3c91
Merge pull request #20307 from bb2a/complete_label_tab_custom_module 
NEW - Record count badge in custom modules tab
 2022-03-23 16:40:19 +01:00
Laurent Destailleur
d82aae1871
Update functions.lib.php 2022-03-23 16:39:55 +01:00
Laurent Destailleur
eac3a6cf86
Update functions.lib.php 2022-03-23 16:38:57 +01:00
Regis Houssin
fcb1bdaca1 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
new_add_hook_load_state_board
 2022-03-23 15:53:09 +01:00
Laurent Destailleur
12db2a8f67 Doc 2022-03-23 13:02:49 +01:00
Regis Houssin
4efe10a9a5 NEW add hook printFieldListWhere in "show_contacts" function 2022-03-22 10:46:26 +01:00
BB2A Anthony Berton
f0e3c33dc3 $labeltemp is alwase true 2022-03-18 16:55:53 +01:00
BB2A Anthony Berton
006dc787c1 method_exists skip fatal error 2022-03-18 16:34:44 +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
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
600657223b
Update functions.lib.php 2022-03-16 20:12:01 +01:00
Gauthier PC portable 024
4731ce9f1d FIX : allow all maths classical operators in custom groups accountancy report 2022-03-16 16:40:08 +01:00
Laurent Destailleur
0102832679 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-16 16:01:55 +01:00
Laurent Destailleur
149f3e6517 Fix for #20372 2022-03-16 16:01:03 +01:00
lmarcouiller
133721904d add pre-commit changes 2022-03-16 15:57:04 +01:00
lmarcouiller
43c39d833a Fix bug preview on closed status page 2022-03-16 15:56:39 +01:00
Hystepik
bbed6b8198
Merge branch 'develop' into develop#2 2022-03-15 10:36:42 +01:00
lmarcouiller
8d11813ea5 fix security problems and add zstd support 2022-03-14 11:45:23 +01:00
Laurent Destailleur
22fb2845ae Fix position of tabs 2022-03-13 18:40:43 +01:00
Laurent Destailleur
2367f0d030 Fix missing badge 2022-03-13 18:39:45 +01:00
Laurent Destailleur
ec4ba46582 NEW Add private and public notes on tax files. 2022-03-13 18:30:31 +01:00
ptibogxiv
b1197d4f4e
Fix for multicompany on online sign url 2022-03-13 15:31:37 +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
e76afe475b Fix responsive 2022-03-09 11:42:15 +01:00
BB2A Anthony Berton
cef9cf8670 int 2022-03-08 18:34:56 +01:00
BB2A Anthony Berton
eae3fe78f1 init 2022-03-08 18:06:26 +01:00
Laurent Destailleur
32711e5f1f
Merge pull request #20145 from atm-GregM/Fix_dolGetButtonAction 
FIX: function dolGetButtonAction change title if html not set
 2022-03-07 17:14:33 +01:00
Laurent Destailleur
88944656be Doc 2022-03-03 02:05:13 +01:00
Laurent Destailleur
0fed4dae13 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2022-03-03 01:59:31 +01:00
Laurent Destailleur
3c3d6ab0da Fix regression. Add unit test to detect it. 2022-03-03 01:17:44 +01:00
Laurent Destailleur
72965fdb2e # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
 2022-03-01 19:13:28 +01:00
Laurent Destailleur
3e1580475c Fix phpunit 2022-03-01 19:05:33 +01:00
Laurent Destailleur
7c253c7e28 Clean code 2022-03-01 19:05:00 +01:00
Laurent Destailleur
762de973eb Fix sql injection 2022-03-01 18:43:16 +01:00
Laurent Destailleur
e5fd841fe3 Make verifCond more robust against RCE 2022-03-01 18:21:30 +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
883f13b388 Fix regression verifCond 2022-03-01 18:14:24 +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
0d024147bf Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-28 22:36:31 +01:00
Laurent Destailleur
dfba29b3c6 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/api/class/api.class.php
	htdocs/compta/facture/card.php
	htdocs/reception/list.php
 2022-02-28 22:30:17 +01:00
Laurent Destailleur
67881a7932
Merge branch 'develop' into 16a12_assets_code 2022-02-28 22:03:26 +01:00
Laurent Destailleur
c2fb5d577c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/langs/en_US/banks.lang
	htdocs/projet/list.php
 2022-02-28 20:12:28 +01:00
Laurent Destailleur
fb0e2f9c6c FIX #yogosha9095 2022-02-26 01:00:22 +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
f8a5749fc4 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-02-25 19:00:10 +01:00
Laurent Destailleur
ac67a5a2bb Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-25 14:34:25 +01:00
Sylvain Legrand
cb86224613 new : allow to show all logos on a table 2022-02-25 13:17:05 +01:00
Laurent Destailleur
c097ee5331 FIX #yogosha9089 2022-02-25 01:49:38 +01:00
Laurent Destailleur
98da84f9b2 FIX #yogosha9086 2022-02-24 18:15:04 +01:00
Laurent Destailleur
118b211807 Fix error on null 2022-02-24 12:37:20 +01:00
Laurent Destailleur
2f0040e9c1 Fix phpunit 2022-02-23 19:24:17 +01:00
GregM
cf470c2306 Add auto tooltip 2022-02-23 16:01:07 +01:00
GregM
3edd478a46 Fix empty url : dont add token 2022-02-23 15:36:43 +01:00
Laurent Destailleur
64ce13e273 Clean setup page 2022-02-23 13:20:14 +01:00
lmarcouiller
57ed890b73 NEW : dol_uncompress new extensions 2022-02-23 12:28:37 +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
209ab708d4 FIX #hunterb812ea22-0c02-46fe-b89f-04519dfb1ebd 2022-02-22 21:24:34 +01:00
Laurent Destailleur
8cc0f3bb58 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-02-22 18:47:26 +01:00
Laurent Destailleur
8a99bc3b04 Try a more complete sanitization 2022-02-22 18:41:14 +01:00
Marc de Lima Lucio
0e0dd1ec6c FIX: invoice pdf: lines originating from deposits were not detailed anymore 2022-02-22 17:42:11 +01:00
Laurent Destailleur
f544219d92 FIX permission to download files of expense report with readall. 2022-02-22 16:44:17 +01:00
lmarcouiller
edbf1bb34b update to fix PR 2022-02-22 16:35:10 +01:00
GregM
e107423c21 fix : change title if html not set 2022-02-22 12:25:30 +01:00
Laurent Destailleur
ff0c4ef635
Merge pull request #19952 from thomas-Ngr/develop_new_ticket_display_statut_warning 
NEW : optional display warning icons on ticket list
 2022-02-22 01:35:33 +01:00
Laurent Destailleur
741fabb983
Merge pull request #20133 from atm-lena/NEW_InventoryExtrafields 
New inventory extrafields
 2022-02-22 00:58:42 +01:00
Laurent Destailleur
eede3aaf17 Fix #yogosha9033 2022-02-21 22:50:32 +01:00
Laurent Destailleur
82250fae62 Fix #yogosha8963 2022-02-21 21:45:28 +01:00
Laurent Destailleur
28ac6a7b55 NEW on redirect of page in website module, GET parameters are kept. 2022-02-21 19:46:11 +01:00
Laurent Destailleur
9dfdce03aa Work on generic reporting tool. 2022-02-21 19:09:26 +01:00
lmarcouiller
192e62fa5c Fix : fix bug class and sql regeneration in modulebuilder 2022-02-21 15:41:41 +01:00
atm-lena
8bbbc843eb Ajout onglet paramètres "Inventaire extrafields" 2022-02-21 15:20:22 +01:00
Laurent Destailleur
00e6d2786d Do not use dol_hash anymore for the name of cookies. 2022-02-21 12:21:43 +01:00
Thomas Negre
e8c48a06c0 Correct typos in ticket.lib 2022-02-21 11:42:09 +01:00
Laurent Destailleur
9e6f782907 Clean code 2022-02-21 11:26:10 +01:00
Laurent Destailleur
3b6f7bff66 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-18 16:32:51 +01:00
Laurent Destailleur
3d9cdbf136 FIX Debug v15 2022-02-18 16:24:11 +01:00
Laurent Destailleur
61e91656e0 FIX setup of member module 
FIX generation of business cards
 2022-02-18 14:14:34 +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
b013c9a15f Fix duplicate div 2022-02-17 20:37:39 +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
0f51fadf38
Merge branch 'develop' into 16a12_assets_code 2022-02-17 04:15:03 +01:00
Laurent Destailleur
a7fab01059
Merge pull request #20069 from vincentjdc/expensse-report-download-fix 
Fixes expensereport downloads
 2022-02-16 20:37:32 +01:00
BB2A Anthony Berton
fd478ba3fa add param for md theme 2022-02-16 15:13:50 +01:00
Laurent Destailleur
1b53ed09f9 Work on custom report feature 2022-02-15 11:03:48 +01:00
Vincent Dieltiens
af0000d568 Fixes expensereport downloads 2022-02-15 10:13:28 +01:00