Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
118,969 Commits 36 Branches 189 Tags
ce4dc610ed013ae4c15f306b51fa64e8f60e5f79
Commit Graph

30321 Commits

Author SHA1 Message Date
Laurent Destailleur
ce4dc610ed Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-03-01 19:01:13 +01:00
Laurent Destailleur
615a80835a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-03-01 19:00:32 +01:00
Delthair
9ab1f56f83 Update expensereport.lib.php (#28553) 
ISSUE #28552
 2024-03-01 18:49:37 +01:00
Laurent Destailleur
c3ad0bc9e7 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2024-02-29 20:07:53 +01:00
Laurent Destailleur
284fb49f60 Try a better fix for #28526 2024-02-29 19:35:34 +01:00
Laurent Destailleur
4c116e1577 Doc 2024-02-29 17:59:17 +01:00
Eric
af062aa5f6 datenextrun is mandatory as dolibarr 16.0 (#28344) 2024-02-22 11:34:39 +01:00
Laurent Destailleur
88da45d9dd Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-02-22 00:16:14 +01:00
Laurent Destailleur
a76eafa0d4 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-02-22 00:15:35 +01:00
Laurent Destailleur
8c2a910a94 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-02-22 00:13:59 +01:00
Saami PERDRIX
52646ee9f5 fix aperçu/dl fichier quand il est dans {userid}/temp (#27211) 2024-02-22 00:10:04 +01:00
Laurent Destailleur
46afde019b Fix missing cash control menu in auguria 2024-02-19 15:59:11 +01:00
Florian Mortgat
6e5fd5eb58 FIX: notification module: for supplier orders (any of the 3 triggers), user can choose an e-mail template in conf, but the conf is not used when sending the notification (#28216) 2024-02-18 16:31:12 +01:00
William Mead
92afb654db Fixed default value for radio extrafield (#27066) 2024-02-10 01:58:36 +01:00
Laurent Destailleur
2f1eecd709 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-02-09 19:04:06 +01:00
noec764
2c07bd764d FIX: Bar code verification should be done by entity because generation does (#28087) 
* FIX: Bar code verification should be done by entity because generation does

* FIX: handle Entities shared tables

* FIX: Remove unused global

---------

Co-authored-by: Noé <noe@scopen.fr>
 2024-02-09 14:07:04 +01:00
Frédéric FRANCE
b92b8c443d fix cunits.class.php (backport) (#28068) 2024-02-08 13:09:39 +01:00
Laurent Destailleur
5a756ffc4c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/takepos/invoice.php
 2024-02-07 17:44:39 +01:00
Laurent Destailleur
7b178844e8 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-02-01 12:16:50 +01:00
Laurent Destailleur
5f24f79b4d Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-02-01 12:14:50 +01:00
Laurent Destailleur
07d0093fbc Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-02-01 12:14:30 +01:00
Laurent Destailleur
ab585b6efc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-02-01 12:11:25 +01:00
Laurent Destailleur
662ab45037 Merge pull request #27904 from rycks/14.0_fix_zero_could_be_a_value_into_conf_global_key 
fix #27883 : zero could be a value stored
 2024-02-01 10:59:11 +01:00
Eric Seigne
1f21e1a945 fix #27883 : zero could be a value stored 2024-01-30 21:42:57 +01:00
Eric Seigne
8d9ddf4a51 fix comment about datehour -> datetime 2024-01-30 21:35:19 +01:00
atm-florian
101c5a2dca FIX 17.0 - php8 warnings: test for $field existence before checking if it is null or empty 2024-01-30 16:21:51 +01:00
Laurent Destailleur
d34f9ffece Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-01-29 01:25:37 +01:00
Quentin VIAL-GOUTEYRON
bb2f13aed4 FIX : crabe PDF is generating in conf->entity instead of object->entity 2024-01-25 14:40:11 +01:00
Laurent Destailleur
fcf024ef4f Merge pull request #27742 from FHenry/17_fix_online_link 
fix: onligne Signaturelink is bad for locaorexternal
 2024-01-23 17:13:44 +01:00
Florian HENRY
a5422d2fc4 fix: onligne Signaturelink is bad for locaorexternal 2024-01-23 11:37:44 +01:00
Laurent Destailleur
90ddcaab8b Merge pull request #27647 from FHenry/17.0_fix_filter_entity 
FIX: filter by entity on contact is missing
 2024-01-19 18:02:48 +01:00
William Mead
e222842864 Added fk_facture_source to invoice exports. Added contributor details. 2024-01-19 09:43:26 +01:00
Florian HENRY
26bb72d12f FIX: filter by entity on contact is missing 2024-01-19 09:17:21 +01:00
Florian HENRY
d04cfa89ce FIX: filter by entity on contact is missing 2024-01-19 09:15:30 +01:00
Laurent Destailleur
a2cdfa5492 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-01-18 15:59:40 +01:00
Laurent Destailleur
387a06fdc5 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-01-18 15:59:10 +01:00
Laurent Destailleur
7c0ccba344 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-01-18 15:58:19 +01:00
Eric Seigne
5a04b2393d end fix #10417 : custom payment number for supplier invoices 2024-01-15 18:43:17 +01:00
Laurent Destailleur
0cc66bbed6 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-01-15 14:35:18 +01:00
Laurent Destailleur
2de0c09e8e Try a better fix for #27477 2024-01-13 15:44:37 +01:00
MDW
72210dc19b Fix: discount - add missing db parameter to dol_print_error (#27337) 
# Fix: discount - add missing db parameter to dol_print_error

dol_print_error requires the db instance to be the first parameter
 2024-01-10 16:57:10 +01:00
Noé
c2f3ce1491 FIX: BarCode Header not well displayed 2024-01-09 15:38:35 +01:00
Florian HENRY
053e0981ad fix: pregmatch all always return empty array, muxt be tested like in findHtmlImages 2024-01-04 11:49:10 +01:00
Florian HENRY
43fceaf468 fix: pregmatch all always return empty array, muxt be tested like in findHtmlImages 2024-01-04 11:47:43 +01:00
Florian HENRY
06037295c4 Merge branch '17.0' of https://github.com/Dolibarr/dolibarr into 17_fix_img_in_mail 2023-12-13 11:34:41 +01:00
Florian HENRY
67ad440381 typo 2023-12-13 11:33:18 +01:00
Florian HENRY
6bb952bf9a typo 2023-12-13 11:32:48 +01:00
Florian HENRY
82c49e62d1 add unit test for image in email with src=../media/ or src=base64 2023-12-13 11:31:42 +01:00
Laurent Destailleur
e732a3b989 Merge pull request #27000 from W1W1-M/fix-pdf-cornas-page-head-cell-width 
FIX pdf cornas page head multicell width (backport v17)
 2023-12-06 15:39:47 +01:00
William Mead
f74073f1a3 Added contributor details 2023-12-06 15:18:25 +01:00