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
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
fc0f624445
Debug v16
2022-06-04 02:08:08 +02:00
Laurent Destailleur
0f7b84cfae
Fix phpcs
2022-06-03 18:20:02 +02:00
Laurent Destailleur
bed0cf8339
Fix phpcs
2022-06-03 18:12:58 +02:00
Laurent Destailleur
d85e4e1bce
Fix warning
2022-06-03 15:25:38 +02:00
Laurent Destailleur
a8edff5167
Sync transifex
2022-06-03 14:46:00 +02:00
Laurent Destailleur
7f3826609a
Fix var not defined
2022-06-03 14:34:38 +02:00
Laurent Destailleur
87230795cc
Fix warning
2022-06-03 14:23:37 +02:00
Laurent Destailleur
20b5eb15d3
Fix missing position
2022-06-03 14:02:41 +02:00
Laurent Destailleur
f475991b20
Typo
2022-06-03 13:56:28 +02:00
Laurent Destailleur
a9ea1c8fbb
More logs
2022-06-03 13:51:47 +02:00
Laurent Destailleur
a402730355
Log
2022-06-03 13:30:31 +02:00
Laurent Destailleur
4cdaba0166
More logs
2022-06-03 12:59:53 +02:00
Laurent Destailleur
166082d3cb
Debug v16
2022-06-03 12:53:55 +02:00
Laurent Destailleur
3d80cb9b66
Debug emailcollector
2022-06-03 12:29:47 +02:00
Laurent Destailleur
afd9787e99
Help debug cron
2022-06-03 11:52:39 +02:00
Laurent Destailleur
41caf67ecf
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-06-03 11:34:29 +02:00
Laurent Destailleur
af6a025caa
css
2022-06-03 11:34:19 +02:00
Laurent Destailleur
b69cdb266a
Merge pull request #21120 from SylvainLegrand/fix_change_payment_term_error
...
Fix error on change payment term
2022-06-03 11:13:38 +02:00
Laurent Destailleur
b2e6f9fc68
Update commonobject.class.php
2022-06-03 11:12:55 +02:00
Laurent Destailleur
41ce28996c
PHP 8.1 #21121
2022-06-03 11:10:08 +02:00
Sylvain Legrand
2fe29627e6
Fix error on change payment term
2022-06-03 08:59:19 +02:00
Laurent Destailleur
be729ab5f3
Debug v16
2022-06-03 03:10:31 +02:00
Laurent Destailleur
500a81dda1
Clean database
2022-06-03 02:56:25 +02:00
Laurent Destailleur
cd041c9ea1
Clean code
2022-06-03 02:41:00 +02:00
Laurent Destailleur
bfd5ed3281
Trans
2022-06-03 02:31:09 +02:00
Laurent Destailleur
c9ef83d9a7
Trans
2022-06-03 02:29:30 +02:00
Laurent Destailleur
e5b8c00618
Fix look and feel v16
2022-06-03 02:02:49 +02:00
Laurent Destailleur
91a1f97029
Cronjobs ready for future.
2022-06-03 01:42:10 +02:00
Laurent Destailleur
69a7b01f20
Fix ODT tags in BOM template
2022-06-02 20:15:49 +02:00
Laurent Destailleur
9df4e4dcb2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-06-02 19:40:06 +02:00
Laurent Destailleur
cbead0fa5a
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/class/productbatch.class.php
2022-06-02 19:39:42 +02:00
Laurent Destailleur
f9f902f7f4
# WARNING: head commit changed in the meantime
...
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-06-02 19:37:47 +02:00
Laurent Destailleur
867168fcf4
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2022-06-02 19:35:58 +02:00
Laurent Destailleur
10aa1a66bc
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2022-06-02 19:35:17 +02:00
Laurent Destailleur
12f3c016d3
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2022-06-02 19:35:03 +02:00
Laurent Destailleur
4e033ba576
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2022-06-02 19:34:32 +02:00
Laurent Destailleur
ed5b8df385
FIX Bank account not set when creating invoice from order
2022-06-02 19:34:16 +02:00
Laurent Destailleur
c1637d9807
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-06-02 19:30:17 +02:00
Laurent Destailleur
10c101077b
Fix auto check
2022-06-02 19:28:18 +02:00
Laurent Destailleur
a579859ab5
Merge pull request #21044 from defrance/patch-195
...
php V8 warning ($conf->c part 1
2022-06-02 15:44:04 +02:00
Laurent Destailleur
e085594950
Merge pull request #21104 from jyhere/jyhere-patch-1
...
FIX : array merges in expedition class
2022-06-02 14:51:22 +02:00
Laurent Destailleur
6115461b30
Merge pull request #21102 from jyhere/patch-3
...
FIX errors in getLinesArray()
2022-06-02 14:50:40 +02:00
Laurent Destailleur
2fb5cdbb78
Merge pull request #21099 from aspangaro/14a35
...
Typo in CSS class
2022-06-02 14:46:16 +02:00
Laurent Destailleur
00c22eff6b
Merge pull request #21106 from frederic34/patch-1
...
New isModEnabled function
2022-06-02 14:45:56 +02:00
Laurent Destailleur
701d4a1f47
Merge pull request #21107 from Hystepik/develop#1
...
fix: php8.0 warnings
2022-06-02 14:44:57 +02:00
Laurent Destailleur
1fc29d6d40
Missing token
2022-06-02 14:26:57 +02:00
Laurent Destailleur
cb5f2333b2
Fix default sort order
2022-06-02 13:02:06 +02:00
Laurent Destailleur
b9a05ded29
Typo
2022-06-02 12:48:05 +02:00