Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
112,950 Commits 36 Branches 189 Tags
11780b0f12152ee83e2cb0ee9b4ce3c8d6505a4e
Commit Graph

8598 Commits

Author SHA1 Message Date
Laurent Destailleur
bd2285ab91 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-11-12 22:58:37 +01:00
Laurent Destailleur
1dbb3f1f34 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/product/stock/stockatdate.php
 2023-11-12 22:58:23 +01:00
Laurent Destailleur
17ca6f651c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-11-12 22:18:06 +01:00
lvessiller-opendsi
785c85205b FIX substitute project variables in invoice documents (#26445) 
* FIX substitute project variables in invoice documents

* Keep key to substitute if no link with project
 2023-11-08 17:32:23 +01:00
Laurent Destailleur
1a2e49cebe Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2023-11-05 19:45:42 +01:00
Laurent Destailleur
9c7381601f Backport or better module compatibility 2023-11-05 19:35:34 +01:00
Andrés Maldonado
54a0245c4d FIX: modification of complementary attributes in commercial proposals 
The db object must not be cloned in order to avoid a PHP Fatal error:  Uncaught Exception: Serialization of 'PgSql\Connection' is not allowed

This commit replaces the dol_clone function by the one in the 17.0 branch
 2023-10-04 17:48:30 +02:00
Laurent Destailleur
342cdc81ac Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-10-04 13:01:09 +02:00
Laurent Destailleur
a201f54777 css 2023-10-04 12:59:00 +02:00
Laurent Destailleur
9ac5270626 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/lib/signature.lib.php
 2023-10-04 10:38:46 +02:00
Laurent Destailleur
8fc2beda1f Fix regression 2023-10-04 10:36:07 +02:00
Laurent Destailleur
f6f25e1117 Fix regression 2023-10-04 10:34:47 +02:00
Laurent Destailleur
517b19cc6f Fix regression 2023-10-04 10:33:38 +02:00
Laurent Destailleur
4298150413 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/signature.lib.php
 2023-10-04 10:22:33 +02:00
Eric Seigne
563cdcefb3 fix #26104 : remove global object 2023-10-04 00:10:19 +02:00
Laurent Destailleur
b0b3d0e1e0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-10-01 15:43:40 +02:00
Laurent Destailleur
9923331ac1 Better backward compatibility of modules 2023-09-16 14:16:31 +02:00
Laurent Destailleur
9b16c56074 Fix warning 2023-08-26 10:05:33 +02:00
am97
954c54ad3f Fix SQL syntax error (#25562) 
Single quotes are needed to indicate that 'project' and 'external' are strings, otherwise the requests fail
 2023-08-09 12:50:14 +02:00
Laurent Destailleur
b55be51b4f Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/lib/agenda.lib.php
 2023-07-19 01:50:18 +02:00
atm-gauthier
88a8bcdb22 FIX : We should always be able to filter on action type no matter if we can't read actions of others (#24462) 2023-07-16 12:14:18 +02:00
atm-steve
b307ecea40 FIX display project tasks list columns (#24557) 
* fix: display columns

* fix fix

* fix: IDE
 2023-07-16 12:02:14 +02:00
Noé Courtier
6102139531 Fix: remove unwanted var_dump() 2023-06-09 15:43:19 +02:00
Laurent Destailleur
1d235c2fd9 FIX Creation of thumbs when images.lib.php was already included 2023-04-25 11:49:05 +02:00
Laurent Destailleur
95d774d750 Merge pull request #24337 from hregis/fix_right_access_problem 
FIX missing "multidir_output" for project sharing (Multicompany)
 2023-03-31 11:25:47 +02:00
Laurent Destailleur
e0cd351b3e Fix sanitize website module 2023-03-27 17:37:09 +02:00
Regis Houssin
7a12ba9c20 FIX missing "multidir_output" for project sharing (Multicompany) 2023-03-24 16:07:34 +01:00
Laurent Destailleur
9a192e443e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-19 19:05:47 +01:00
Laurent Destailleur
249a6ea9a9 Remove warning 2023-03-19 14:49:54 +01:00
Laurent Destailleur
d3f679f2b1 Fix sql regression 2023-03-19 12:54:11 +01:00
Laurent Destailleur
502badad4b Better error management 2023-03-19 11:32:46 +01:00
Laurent Destailleur
6e17c0c961 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-03-18 10:51:07 +01:00
Laurent Destailleur
b81cb7e963 Merge pull request #24070 from Daviid-P/ignore_localtaxes_if_localtax_type_zero 
Ignore localtaxes if localtax1_type or localtax2_type is 0
 2023-03-18 10:48:23 +01:00
Laurent Destailleur
91cf865583 Update functions.lib.php 2023-03-18 10:41:07 +01:00
David Pareja Rodriguez
927d0a2fa1 ORDER BY rowid 2023-03-13 11:16:37 +01:00
Laurent Destailleur
3300905599 Fix add a protection against bad param of dol_eval 2023-03-13 11:15:46 +01:00
Laurent Destailleur
ade0592a9b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-13 10:23:52 +01:00
noec764
353d451e5a Correct dolForgeCriteriaCallback 2023-03-10 15:48:26 +01:00
David Pareja Rodriguez
590373a620 Forgot to loop on the results 2023-02-28 13:33:52 +01:00
David Pareja Rodriguez
b191330a79 Ignore localtaxes if localtax1_type or localtax2_type is 0 2023-02-28 13:24:11 +01:00
Laurent Destailleur
da503e6c58 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-22 14:33:59 +01:00
Laurent Destailleur
70c99b1f79 Fix pdf 2023-02-21 18:32:36 +01:00
Laurent Destailleur
1f3aa24c8a Fix missing date delivery on invoice 2023-02-21 16:56:16 +01:00
Guenter Lukas
9d43d51888 FIX: #23966 Error "Param dbt_keyfield is required but not defined" 2023-02-20 12:57:14 +01:00
Laurent Destailleur
396c7b5d33 Merge pull request #23904 from hregis/fix_php8_compatibility 
FIX multicompany compatibility
 2023-02-16 21:36:09 +01:00
Regis Houssin
33e345a280 FIX missing getEntity filter 2023-02-16 15:51:55 +01:00
Regis Houssin
89a2f7a0c1 FIX multicompany compatibility 2023-02-14 10:53:59 +01:00
Laurent Destailleur
393f3a9480 Merge pull request #23811 from evarisk-theo/FIX-clicktodial-backtopage 
FIX: fatal error on clicktodial backtopage
 2023-02-09 15:40:28 +01:00
Laurent Destailleur
3dc8937ad3 Provide an object for computed extrafields 2023-02-07 00:11:33 +01:00
Théo David
394c3f847c FIX clicktodial backtopage 2023-02-06 17:03:51 +01:00