Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
126,677 Commits 36 Branches 189 Tags
fca403b49bbee1ac7af7f99d34706d44eb8d3afc
Commit Graph

12715 Commits

Author SHA1 Message Date
Laurent Destailleur
f43249916e Fix management of password type in extrafields 2023-11-17 23:01:59 +01:00
Laurent Destailleur
6ca0154784 Fix management of password type with pass_crypted 2023-11-17 22:09:35 +01:00
Laurent Destailleur
a0bba05b02 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/api_orders.class.php
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/project.lib.php
	htdocs/fourn/class/api_supplier_orders.class.php
	htdocs/fourn/class/fournisseur.facture-rec.class.php
	htdocs/langs/en_US/stocks.lang
 2023-11-17 18:24:53 +01:00
Saami PERDRIX
57eb6136a4 Trigger on update note (#26666) 
* ajout trigger sur update_note

* nom des triggers adapté selon objet
 2023-11-17 14:14:28 +01:00
Laurent Destailleur
042d583070 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-11-17 12:03:38 +01:00
Laurent Destailleur
3a0b3fd8a8 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-11-17 12:02:36 +01:00
Laurent Destailleur
6ea48ac22a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-11-17 12:02:21 +01:00
HENRY Florian
102356d2c4 fix: When sendmail failed it return false, result is KO, need to say it to user (#26631) 
* fix: When sendmail failed it return false, need to be tested as is

* fix: When sendmail failed it return false, so >=0 do not trigger error

* fix: When sendmail failed it return false, so >=0 do not trigger error

* Update CMailFile.class.php

* Update actions_sendmails.inc.php

* Update actions_sendmails.inc.php

* Update CMailFile.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-11-17 12:01:03 +01:00
HENRY Florian
70a5a85eac fix: various getDol, display error on public page (#26652) 
* fix: various getDol, display error on public page

* fix: various getDol, display error on public page
 2023-11-17 11:39:16 +01:00
Laurent Destailleur
7c68dc3d1e Fix phpcs 2023-11-17 01:17:23 +01:00
Laurent Destailleur
144be811fc Fix phpcs 2023-11-17 00:54:15 +01:00
lvessiller-opendsi
3dd502b38f NEW subject and message paramaeters on notification hook (#26625) 2023-11-16 23:27:50 +01:00
MDW
c4542895d7 Fix recurrent supplier invoice generation (title) (#26601) 2023-11-16 15:43:48 +01:00
Lucas Marcouiller
68d996b482 fix some phpstan errors (#26608) 
Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
 2023-11-16 15:01:46 +01:00
Laurent Destailleur
c0510fc0f5 Debug v19 2023-11-14 20:59:31 +01:00
Charlène Benke
8c8e806a8f NEW : extrafields based on fontawesome (#26598) 
* NEW : extrafields based on fontawesome

allow to define a field contain a icon based on fontawesome
on input we have an icon picker
on ouput we display the icon

* Update extrafields.class.php

* Update extrafields.class.php

* Update extrafields.class.php
 2023-11-14 20:51:43 +01:00
Laurent Destailleur
0072986060 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-14 17:59:59 +01:00
Laurent Destailleur
d9df238ac4 Clean code and prepare database for reception from any source 2023-11-14 17:33:50 +01:00
Frédéric FRANCE
79b4c0f1b9 clean code (#26585) 
* clean code

* Update commoninvoice.class.php

* Update commoninvoice.class.php
 2023-11-14 14:43:54 +01:00
Laurent Destailleur
0770ce640e Debug v19 2023-11-14 02:42:02 +01:00
Laurent Destailleur
804ee3b517 Debug v19 and option MAIN_DISALLOW_URL_INTO_DESCRIPTIONS 2023-11-14 01:32:42 +01:00
Laurent Destailleur
7659bba97a Fix bad delete of lines into llx_ecm_files 2023-11-13 12:24:47 +01:00
Laurent Destailleur
a48e541093 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/core/class/html.formadmin.class.php
	htdocs/core/lib/functions.lib.php
 2023-11-12 23:18:19 +01:00
Laurent Destailleur
2f340a1a77 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 
Conflicts:
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/comm/propal/card.php
 2023-11-12 23:06:31 +01:00
sonikf
65b9f4e6de NEW: Add invoice subtype in customer template invoice (#26543) 
* Add invoice subtype in template invoice

* Add invoice subtype in template invoice

* Add invoice subtype in template invoice
 2023-11-12 22:08:46 +01:00
HENRY Florian
5a23bb27b0 fix: bad sql on delete discount (#26517) 2023-11-09 14:51:42 +01:00
Laurent Destailleur
398077462c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-09 14:29:05 +01:00
Laurent Destailleur
c16ac9b7de Debug v19. Prepare compatibility 8.2 2023-11-09 14:28:50 +01:00
Mohamed DAOUD
6db7c487d2 NEW #19501 Add two hooks in dolreceiptprinter.php (#26439) 
* Add two hooks in dolreceiptprinter.php

* fix PHPCS error

* fix PHPCS errors
 2023-11-09 11:47:10 +01:00
Laurent Destailleur
a9f8b1d8bb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-09 11:31:38 +01:00
Laurent Destailleur
4cd4221a52 Debug v19. Remove some TODO. 2023-11-09 10:56:13 +01:00
Mohamed DAOUD
00cbaa094c fix-warnings (#26500) 2023-11-08 17:26:00 +01:00
V-Py
7f0da987a3 Fix #26504 Default value extrafield line object (#26506) 2023-11-08 17:25:07 +01:00
Regis Houssin
56e9df9091 FIX avoid warning : Cannot use a scalar value as an array (#26437) 2023-11-07 18:53:37 +01:00
Mohamed DAOUD
1e053e4d7f fix-warnings-1 (#26490) 2023-11-07 17:58:35 +01:00
Laurent Destailleur
de3fec95f5 Debug v19 2023-11-07 02:27:47 +01:00
Mohamed DAOUD
a1597e6eb1 Fix some warnings -technical debt- (#26466) 
* fix warnings 1

* fix previous commit 1

* Update facture-rec.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-11-06 16:00:24 +01:00
Laurent Destailleur
b962cce609 Code comment 2023-11-06 15:26:57 +01:00
Florian Mortgat
73524c2f81 [modulebuilder] FIX handling of the $filter parameter in fetchAll() method (#25931) 
* FIX handling of the $filter parameter for fetchAll: the previous version can result in invalid SQL

* Remove #[AllowDynamicProperties] attribute from Conf class (cf. PR #25931)

* Ensure sql-building strings are detectably sanitized to avoid PR rejection
 2023-11-03 23:01:57 +01:00
Laurent Destailleur
127de7e7d8 FIX On object validation, ecm index are not updated for uploaded files 2023-11-01 16:17:54 +01:00
Laurent Destailleur
74e1ec4099 FIX On object validation, ecm index are not updated for uploaded files 2023-10-31 19:28:11 +01:00
Laurent Destailleur
564c5cd5e8 Debug v19 2023-10-31 00:15:31 +01:00
Laurent Destailleur
1558772d83 Debug v19 2023-10-30 17:14:46 +01:00
Laurent Destailleur
b53d845085 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-30 13:39:28 +01:00
Laurent Destailleur
24e043934a Debug delete evaluation 2023-10-30 13:23:46 +01:00
William Mead
3c87423364 Qual cleaner code for InterfaceLogevents (#26347) 
* Renamed text variable to label

* Added label variable

* Fixed typos

* Fixed PHPDoc

* Added runTrigger method return type

* Refactored to use super class constructor

* Added contributor details. Cleaned indentation.

* Added user login failed string

* Added label & description localized strings

* Converted event label, description & date variables to class properties. Added class method to initialize event data. Refactored & cleaned code.

* Added user string parameter

* Cleaned code

* Moved langs loading

* Added code comment

* Cleaned code

* Added code comment

* Fixed PHPDoc comments

* Refactored event label & description assignment

* Deleted unneeded empty lines

* Added event action text dictionary. Refactored event data initialization. Added static class method for dynamic localization to check if event text has an event action key n.

* Updated string parameter placement

* Added condition to check if event description has an event action key in order to do dynamic frontend translation

* Updated code comments. Renamed event action array.

* Added user status key

* Cleaned code

* Update interface_20_all_Logevents.class.php

---------

Co-authored-by: William Mead <william.mead@manchenumerique.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-10-30 04:12:43 +01:00
Laurent Destailleur
197f0a19ec NEW Add more param on fetch() to prepare perf optimization 2023-10-26 21:05:37 +02:00
Laurent Destailleur
b4da41c8e8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-26 13:40:57 +02:00
Laurent Destailleur
3e146187ec Doc 2023-10-26 13:31:20 +02:00
Lucas Marcouiller
af17b767c0 fix some warnings php8 (#26346) 
Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
 2023-10-26 12:37:18 +02:00