Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
111,864 Commits 36 Branches 189 Tags
a2e74e37f50fd81cf3b55fb33f98d33d467fcdd0
Commit Graph

10949 Commits

Author SHA1 Message Date
Laurent Destailleur
c2fe5de852 Merge pull request #21195 from frederic34/useismodenabled 
use isModEnabled function
 2022-06-12 11:56:31 +02:00
Laurent Destailleur
559ec051ab Fix scrutinizer 2022-06-12 11:43:29 +02:00
Alexandre SPANGARO
33ecfddf83 Fix PHP 8.1.7 - $out not defined 2022-06-12 07:36:12 +02:00
Laurent Destailleur
ca2bcfa594 Fix php8 2022-06-11 21:56:25 +02:00
Frédéric France
3fdbce7a31 use isModEnabled function 2022-06-11 09:46:28 +02:00
Frédéric FRANCE
38b18a68d7 Merge branch 'develop' into useismodenabled 2022-06-10 10:07:41 +02:00
Frédéric France
5dcfc28913 use isModEnabled function 2022-06-09 22:41:59 +02:00
Frédéric France
400afc937f use isModEnabled function 2022-06-09 22:16:48 +02:00
BB2A Anthony Berton
293141e578 checkbox PHP error 2022-06-09 15:52:47 +02:00
BENKE Charlene
d335bb22a2 Update html.formmail.class.php 2022-06-09 15:13:29 +02:00
NASDAMI Quatadah
793e95d88c fixing bug (colspan should be int) 2022-06-09 14:04:32 +02:00
Abdelaziz MISBAH
14e7c5454e FIX #21141 Update condition to check for attached file to E-mail Template 
Update condition to check for attached file to E-ail Template, initial Commit doesn't check for  if null (may generate fatal error depending on context), now we check if is an object, before checking if we join files.
 2022-06-09 11:47:34 +01:00
Laurent Destailleur
7a7d296533 Fix fatal error on canvas 2022-06-09 10:49:24 +02:00
Laurent Destailleur
2b9dbe4c98 Doc 2022-06-09 03:21:31 +02:00
Laurent Destailleur
b5a1ded537 Merge branch 'develop' into 15_fix_reception_stock_move 2022-06-09 02:41:51 +02:00
Sylvain Legrand
ab3f19dd59 Fix error when supplier deposit are used to pay supplier invoice 2022-06-08 22:07:48 +02:00
Laurent Destailleur
1838baaa5c Debug v16 2022-06-08 21:20:12 +02:00
Laurent Destailleur
8688ba23b4 Merge pull request #21145 from bb2a/FIX---php-V8-warning-class-html-form 
FIX - php V8 warning class html form
 2022-06-08 15:02:58 +02:00
Laurent Destailleur
7ee4cccc84 FIX ODT tags for subobjects {object_subobject_yyy} was not working. 2022-06-07 19:59:33 +02:00
Laurent Destailleur
8303347ab8 FIX label and get_substitutionarray_each_var_object on ODT generation 2022-06-07 19:27:43 +02:00
Laurent Destailleur
32c6daee2f CSS 2022-06-07 18:18:01 +02:00
Laurent Destailleur
0033a1a02a CSS 2022-06-07 17:54:51 +02:00
BB2A Anthony Berton
03f8d49c94 FIX - php V8 warning class html form 2022-06-07 17:25:33 +02:00
Abdelaziz MISBAH
a29aa48100 Send Notification Without File when E-mail Template does'nt attach file 
When we create an Email Template that does'nt require main file to be attached, we still send notification with an attached file, eg: when we send a notification when validating proposal it send proposal with attached file with mention NOT VALIDATED.
I added OR condition on checking pdf_path.
 2022-06-07 13:13:08 +01:00
Laurent Destailleur
07f4ebf8b8 Merge pull request #21125 from bb2a/FIX---php-V8-warning-class-extrafields 
FIX - php V8 warning class extrafields
 2022-06-07 09:58:50 +02:00
Laurent Destailleur
33d9c164c2 Update extrafields.class.php 2022-06-07 09:57:15 +02:00
Laurent Destailleur
2b8de78572 Merge pull request #21126 from bb2a/FIX---php-V8-warning-class-commonobject-extrafields 
FIX - php V8 warning class commonobject extrafields
 2022-06-07 09:53:52 +02:00
Laurent Destailleur
fc0f624445 Debug v16 2022-06-04 02:08:08 +02:00
Laurent Destailleur
0f7b84cfae Fix phpcs 2022-06-03 18:20:02 +02:00
BB2A Anthony Berton
d8e6ce1ae8 FIX - php V8 warning class commonobject extrafields 2022-06-03 16:06:25 +02:00
BB2A Anthony Berton
fc26196a7f FIX - php V8 warning class extrafields 2022-06-03 15:35:20 +02:00
Laurent Destailleur
87230795cc Fix warning 2022-06-03 14:23:37 +02:00
Laurent Destailleur
b2e6f9fc68 Update commonobject.class.php 2022-06-03 11:12:55 +02:00
Sylvain Legrand
2fe29627e6 Fix error on change payment term 2022-06-03 08:59:19 +02:00
Laurent Destailleur
6f6d7d7f48 Fix ODT tags in BOM template 
Conflicts:
	htdocs/core/class/commonobjectline.class.php
 2022-06-02 20:18:11 +02:00
Laurent Destailleur
69a7b01f20 Fix ODT tags in BOM template 2022-06-02 20:15:49 +02:00
Laurent Destailleur
f5705e89a8 Merge branch 'develop' into patch-195 2022-06-01 22:03:19 +02:00
Laurent Destailleur
731702c7eb Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-01 22:01:47 +02:00
Laurent Destailleur
958833484f Fix bad var 2022-06-01 22:01:03 +02:00
Laurent Destailleur
cbd12288d3 Merge pull request #21067 from bb2a/php-V8-warning-class-commonobject 
php V8 warning class commonobject
 2022-06-01 21:28:22 +02:00
Laurent Destailleur
f89892f7e4 Merge pull request #21069 from bb2a/php-V8-warning-class-html-form 
php V8 warning class html form
 2022-06-01 20:58:22 +02:00
BENKE Charlene
0126f043c9 fixed 2022-06-01 10:53:52 +02:00
Laurent Destailleur
d6ecbe65b7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/langs/en_US/errors.lang
 2022-05-31 15:16:54 +02:00
Laurent Destailleur
64a683c8e7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/projet/tasks/task.php
 2022-05-31 14:33:19 +02:00
Laurent Destailleur
0b9d4de20d Fix warning 2022-05-31 14:20:59 +02:00
BB2A Anthony Berton
d917ac46e7 php V8 warning class html form 2022-05-31 14:14:22 +02:00
BB2A Anthony Berton
d7eebeb913 php V8 warning class commonobject 2022-05-31 11:41:38 +02:00
Laurent Destailleur
1655890f84 Debug v16 2022-05-31 10:35:36 +02:00
Laurent Destailleur
b95440b83f Fix picto phone 2022-05-31 09:57:49 +02:00
BENKE Charlene
008800cf52 correct it 2022-05-30 07:46:21 +02:00