Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
130,797 Commits 36 Branches 189 Tags
a2c92f183cc54c35013469638780c28e65df0b51
Commit Graph

10504 Commits

Author SHA1 Message Date
Laurent Destailleur
150de687bf Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-05 20:13:38 +02:00
Laurent Destailleur
0e11cd1ee3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-09-05 19:39:00 +02:00
Laurent Destailleur
f43ef55b26 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 
Conflicts:
	htdocs/modulebuilder/template/class/myobject.class.php
	htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php
	htdocs/modulebuilder/template/core/modules/modMyModule.class.php
	htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
	htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
	htdocs/modulebuilder/template/myobject_agenda.php
	htdocs/modulebuilder/template/myobject_list.php
 2023-09-05 19:38:45 +02:00
Laurent Destailleur
e2de78d9b4 Fix permission on recurring invoice 2023-09-05 19:13:51 +02:00
Lamrani Abdel
b739b5b76d add badge for each tabs 2023-09-05 18:50:04 +02:00
Laurent Destailleur
e9cb81ded8 Code comment 2023-09-05 17:40:09 +02:00
Laurent Destailleur
6459c862b8 Comment 2023-09-05 16:50:23 +02:00
Laurent Destailleur
36c1c6be6a Fix test on entity for project 2023-09-05 16:33:37 +02:00
Laurent Destailleur
82e7f829b0 NEW Support of js into the Dolibarr server preview 2023-09-05 15:55:44 +02:00
Lamrani Abdel
8f7d68ac8e add function for check comments for sections before any actions 2023-09-05 15:43:23 +02:00
Laurent Destailleur
0ed6a63fb0 FIX #CVE-2023-4197 2023-09-05 00:49:01 +02:00
Laurent Destailleur
f403558a8f QUAL: Standardize code and look and feel for dictionaries 2023-09-04 22:49:55 +02:00
Florian HENRY
0694c8224d review SQL for develop 2023-09-04 19:35:33 +02:00
Florian HENRY
d9674c1503 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_sign_soeciete_rib 2023-09-04 19:31:12 +02:00
Laurent Destailleur
4b5c7677d2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-09-04 16:42:55 +02:00
Laurent Destailleur
1d537c2ec0 Merge branch 'develop' into remove_unnecessary_queries_from_bonprelevement_class_php 2023-09-04 12:40:44 +02:00
Florian HENRY
43d20f8cc0 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_sign_soeciete_rib 2023-09-04 10:52:31 +02:00
Laurent Destailleur
3343a47244 NEW billing on shipment+reception. Can be done before or after delivery. 2023-09-03 21:38:11 +02:00
Laurent Destailleur
345668b2ca Default html for an url is no more a 'float' div 2023-09-03 17:31:50 +02:00
Laurent Destailleur
d0ef625ba0 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-03 17:14:37 +02:00
Laurent Destailleur
b1492ed4ff Merge pull request #25768 from mc2contributor/fixWarning 
Fix attempt to access stdClass::$* on query result
 2023-09-01 20:32:10 +02:00
Roger Dueck
725d870669 Fix attempt to access stdClass::$* on query result 2023-09-01 09:27:24 -06:00
David
5888d2db0c Merge branch 'develop' into remove_unnecessary_queries_from_bonprelevement_class_php 2023-09-01 11:43:48 +02:00
Laurent Destailleur
6f3b0f8493 Merge pull request #25737 from lamrani002/writeProps 
NEW function for parsing props and update Write props
 2023-08-31 19:41:41 +02:00
Laurent Destailleur
5d9d44479e Code comment 2023-08-31 01:06:13 +02:00
Lamrani Abdel
2ba38eaaae update function for writeProps and deleteProps and parsing string 2023-08-30 17:00:12 +02:00
HENRY Florian
a283c6f30c Merge branch 'develop' into dev_sign_soeciete_rib 2023-08-28 15:18:30 +02:00
Frédéric FRANCE
7f69c3fd5f phpstan 2023-08-27 21:05:27 +02:00
Laurent Destailleur
552a079379 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-27 16:05:46 +02:00
Laurent Destailleur
45d323a6f8 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-08-27 16:02:57 +02:00
Laurent Destailleur
cd960d30df Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-08-27 16:01:05 +02:00
Laurent Destailleur
4302a6bc04 Fix empty on getDolGlobal 2023-08-27 15:55:44 +02:00
Laurent Destailleur
b49c326824 Clean deprecated code on old fields skype, twitter, ... 2023-08-26 10:57:49 +02:00
Laurent Destailleur
9b16c56074 Fix warning 2023-08-26 10:05:33 +02:00
Laurent Destailleur
256fe9ecf8 Add more REST phpunit tests 2023-08-25 14:48:41 +02:00
Laurent Destailleur
b679603c83 Merge pull request #25667 from ultrasites/feature/email-template-shipping-method 
add email variable for shipping method
 2023-08-24 22:25:08 +02:00
Laurent Destailleur
23f4fb9cdd NEW Add more tables activated by module activation only 2023-08-24 20:12:02 +02:00
Laurent Destailleur
272c51164b Fix typo Productcustomerprice into ProductCustomerPrice 2023-08-24 15:08:33 +02:00
Manuel Dierkes
e1fa825213 add email variable for shipping method 2023-08-24 06:18:21 +00:00
Laurent Destailleur
a64f5bf3da Add a tool to build statistics on project 2023-08-23 16:36:29 +02:00
Laurent Destailleur
ce009a82d1 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-23 03:00:27 +02:00
Laurent Destailleur
3f06e78569 Fix css 2023-08-23 02:18:31 +02:00
Laurent Destailleur
329473c3cb Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-21 14:14:44 +02:00
Laurent Destailleur
50bf5281c8 FIX encrypt sensitive data not be done for const MAIN_AGENDA_ACTIONAUTO 2023-08-20 22:20:15 +02:00
Laurent Destailleur
151cd24b32 Merge pull request #25634 from lamrani002/addApiUrlToDoc 
NEW functionality for Add api url to documentation in ModuleBuilder
 2023-08-19 22:11:17 +02:00
David Pareja Rodriguez
0890c37ae2 Fix check always ended up setting to null 2023-08-19 22:09:57 +02:00
David Pareja Rodriguez
f471bbae20 Forgot to modify checkSwiftForAccount and checkIbanForAccount 2023-08-19 22:09:57 +02:00
VESSILLER
b1190826ed NEW webportal site account 2023-08-18 17:37:41 +02:00
Laurent Destailleur
3359b93b50 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-16 20:05:49 +02:00
Laurent Destailleur
28b71e8a8e Debug v18 - fix css and trans 2023-08-16 19:53:27 +02:00