Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-07 18:18:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
111,473 Commits 36 Branches 190 Tags
29e64bee8b13c384ce77dbcc1bf3929ba0884c20
Commit Graph

10938 Commits

Author SHA1 Message Date
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
Laurent Destailleur
f5da6ebfe2 Merge pull request #21036 from OPEN-DSI/14.0_fix_show_category_on_sellist_extrafields 
FIX: Show sellist type of extrafield when none category selected
 2022-05-29 11:24:35 +02:00
Laurent Destailleur
a56a6abb20 Merge pull request #21045 from defrance/patch-196 
fix php V8 warning
 2022-05-29 10:50:18 +02:00
Laurent Destailleur
23eb0b3264 Clean code 2022-05-28 21:07:52 +02:00
BENKE Charlene
4c96921a5f php 8 fix warning 2022-05-28 09:54:59 +02:00
BENKE Charlene
8963a41085 php V8 warning 
and don instead donation
 2022-05-27 16:47:23 +02:00
Laurent Destailleur
2b5e21379b Fix phpcs 2022-05-25 23:54:03 +02:00
Laurent Destailleur
271fb43bc6 FIX Import of fk_stcomm 2022-05-25 23:08:53 +02:00
Laurent Destailleur
571110f60a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2022-05-25 23:04:58 +02:00
kamel
f1914ff66f FIX: Show sellist type of extrafield when none category selected 2022-05-25 18:02:18 +02:00
Florian HENRY
4e289741f9 fix: extrafields chkbxlst or checkbox or badly displayed in line object 2022-05-25 16:59:23 +02:00
Laurent Destailleur
d0b6daaf4c Fix length of field 2022-05-25 16:50:09 +02:00
Laurent Destailleur
9a7c28d61d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-05-25 09:12:59 +02:00
Laurent Destailleur
0e3d7c4e2e Merge pull request #19099 from johnvan7/develop 
New: receipt beep alternative and current date/time
 2022-05-24 22:13:59 +02:00
Laurent Destailleur
8385ca604f Merge pull request #20098 from atm-lena/NEW_OF_Child 
Create MO Child
 2022-05-24 22:00:19 +02:00
Laurent Destailleur
4c10c04f9f Merge pull request #20495 from atm-john/new_fix_regression_select_extrafield_search 
FIX : regression select extrafield search + fix function name
 2022-05-24 21:55:33 +02:00
Laurent Destailleur
259a292704 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-24 16:33:24 +02:00
Laurent Destailleur
34199cf0fb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/core/modules/modRecruitment.class.php
 2022-05-24 16:31:45 +02:00
Laurent Destailleur
58d82841e3 css 2022-05-24 12:11:51 +02:00