jpb
|
b1cba14718
|
merge conflict
|
2021-08-12 09:36:34 +02:00 |
|
Laurent Destailleur
|
d7317025e9
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/pdf_other.php
|
2021-08-11 22:09:05 +02:00 |
|
Laurent Destailleur
|
ef4468153d
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/extrafields_list_search_sql.tpl.php
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
htdocs/fourn/class/fournisseur.commande.class.php
|
2021-08-11 22:07:13 +02:00 |
|
Laurent Destailleur
|
0cf2164260
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
htdocs/fourn/class/fournisseur.commande.class.php
|
2021-08-11 21:15:30 +02:00 |
|
Laurent Destailleur
|
eba55d0cf2
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/core/tpl/extrafields_list_search_sql.tpl.php
|
2021-08-11 21:06:33 +02:00 |
|
Laurent Destailleur
|
8da328b183
|
Update extrafields_list_search_sql.tpl.php
|
2021-08-11 15:44:48 +02:00 |
|
Quentin VIAL-GOUTEYRON
|
108a5ff7cb
|
FIX postgre filter select search extrafield
|
2021-08-09 15:14:25 +02:00 |
|
jpb
|
04d406bd39
|
remove useless boolean statment
|
2021-08-05 09:09:11 +02:00 |
|
jpb
|
f99ba2c1e1
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_field_in_service_object
|
2021-08-04 17:26:23 +02:00 |
|
Laurent Destailleur
|
6f449cfd6c
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-07-31 16:33:38 +02:00 |
|
Laurent Destailleur
|
2b2c8f076b
|
Merge pull request #18231 from ptibogxiv/patch-429
Fix for php 8
|
2021-07-28 17:37:07 +02:00 |
|
ptibogxiv
|
3cb56d3ec6
|
Fix for php8
|
2021-07-26 15:35:31 +02:00 |
|
ptibogxiv
|
b0e2ef4a6c
|
Update extrafields_edit.tpl.php
|
2021-07-26 14:53:18 +02:00 |
|
ptibogxiv
|
026e61f1ec
|
Update extrafields_edit.tpl.php
|
2021-07-26 14:53:06 +02:00 |
|
ptibogxiv
|
d443485939
|
Update extrafields_edit.tpl.php
|
2021-07-26 14:52:24 +02:00 |
|
stickler-ci
|
5524320fbc
|
Fixing style errors.
|
2021-07-23 17:46:44 +00:00 |
|
netdrag
|
6cfd8c6f24
|
Order Supplier Email Sender Extension
Extended the advanced options to specify an email address for the order supplier. Useful if you operate under a brand, but order under a different.
|
2021-07-22 18:38:22 +02:00 |
|
stickler-ci
|
252765303e
|
Fixing style errors.
|
2021-07-21 07:48:57 +00:00 |
|
jpb
|
0396573b91
|
fix focusout on mandatoryPeriod only
|
2021-07-21 09:46:38 +02:00 |
|
jpb
|
2189af1f2a
|
Merge branch 'NEW_field_in_service_object' of github.com:atm-jpb/dolibarr into NEW_field_in_service_object
|
2021-07-21 08:57:09 +02:00 |
|
jpb
|
62d007e232
|
add focusout constraint
|
2021-07-21 08:56:40 +02:00 |
|
stickler-ci
|
c93e2cda0d
|
Fixing style errors.
|
2021-07-21 06:31:07 +00:00 |
|
jpb
|
32f9b1a556
|
fix cmd fourn no msg
|
2021-07-21 08:26:41 +02:00 |
|
jpb
|
d61b831737
|
add field in create product
|
2021-07-20 22:39:30 +02:00 |
|
stickler-ci
|
2f0ba41a53
|
Fixing style errors.
|
2021-07-20 13:35:10 +00:00 |
|
jpb
|
367e839239
|
change class css and behavior js
|
2021-07-20 13:56:30 +02:00 |
|
jpb
|
e11afb7da0
|
add color on date dield and warning on line
|
2021-07-20 11:23:35 +02:00 |
|
lmarcouiller
|
35b29481c7
|
Close #18131 : new massaction for thirdparty
|
2021-07-13 10:05:38 +02:00 |
|
Laurent Destailleur
|
e7b3280c17
|
Debug v14 with nojs
|
2021-07-11 01:12:52 +02:00 |
|
Laurent Destailleur
|
ad11f7b66d
|
Fix type of param
Fix test of ckeditor for html doc
Fix when MAIN_RESTRICTHTML_ONLY_VALID_HTML is on
|
2021-07-08 13:59:04 +02:00 |
|
Laurent Destailleur
|
82e96016cd
|
Merge pull request #18092 from fappels/14_fix_php8_part3
Fix php8 warning
|
2021-07-06 18:52:05 +02:00 |
|
Laurent Destailleur
|
37801184c0
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
htdocs/comm/propal/list.php
htdocs/holiday/class/holiday.class.php
Fix case of newByMonth
|
2021-07-06 15:35:17 +02:00 |
|
Laurent Destailleur
|
e2d7de3146
|
css
|
2021-07-05 18:56:24 +02:00 |
|
Laurent Destailleur
|
d414bcb572
|
Fix phpcs
|
2021-07-05 17:08:10 +02:00 |
|
Francis Appels
|
1333ca3660
|
Fix php 8 warning on not set field keys
|
2021-07-05 14:51:34 +02:00 |
|
Laurent Destailleur
|
7013f01a41
|
Fix look and feel v14
|
2021-07-04 21:14:46 +02:00 |
|
Laurent Destailleur
|
5853aa4c1e
|
Look and feel v14
|
2021-07-04 20:08:34 +02:00 |
|
Laurent Destailleur
|
6ae1d192e4
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
htdocs/comm/propal/list.php
htdocs/compta/facture/card.php
|
2021-07-02 16:14:12 +02:00 |
|
Laurent Destailleur
|
9392624e54
|
Fix deletion of line on replacement invoice
|
2021-07-01 13:36:04 +02:00 |
|
Laurent Destailleur
|
7c2121c439
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/tpl/objectline_edit.tpl.php
|
2021-06-30 15:06:16 +02:00 |
|
Laurent Destailleur
|
51456741d9
|
FIX Can't edit replacement invoice
FIX Status of invoice when making a replacement invoice
|
2021-06-30 12:43:44 +02:00 |
|
Laurent Destailleur
|
2860e12b65
|
Update objectline_view.tpl.php
|
2021-06-29 19:16:29 +02:00 |
|
Francis Appels
|
051bb3f3ef
|
Fix some core php8 warnings.
Fixing php 8 warnings seems also to solve some situations like a paiment condition removed from dictionary can not be selected.
|
2021-06-29 16:37:07 +02:00 |
|
Francis Appels
|
9b59f264fd
|
Fix some php 8 warning
|
2021-06-28 20:00:10 +02:00 |
|
Laurent Destailleur
|
6e3647af2c
|
Debug v14
|
2021-06-26 00:08:19 +02:00 |
|
Laurent Destailleur
|
acce226c05
|
Debug cash fence feature (missing report per vat rate)
|
2021-06-23 13:00:50 +02:00 |
|
Laurent Destailleur
|
8df9815049
|
Add warning to help understand bug of post_max_size.
|
2021-06-20 01:04:16 +02:00 |
|
Laurent Destailleur
|
4a3da84098
|
Clean code
|
2021-06-19 23:52:52 +02:00 |
|
Laurent Destailleur
|
61bd572a9c
|
Fix token for ajax call
|
2021-06-17 03:37:52 +02:00 |
|
Laurent Destailleur
|
8b238c43ce
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-06-15 22:23:46 +02:00 |
|