Commit graph

118463 commits

Author SHA1 Message Date
Laurent Destailleur
dcd751aa47 FIX fatal error with bad definition of dictionaries 2023-08-31 00:04:07 +02:00
Laurent Destailleur
bb36521c3d Fix warnings 2023-08-30 23:53:26 +02:00
Laurent Destailleur
bac3c36436 Fix warning 2023-08-28 13:47:00 +02:00
Laurent Destailleur
cd960d30df Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-08-27 16:01:05 +02:00
Laurent Destailleur
5c03db3b05 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-08-27 15:58:48 +02:00
Laurent Destailleur
3b6b9661fa Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-08-27 15:57:45 +02:00
Laurent Destailleur
459e3a56e0 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-08-27 15:57:38 +02:00
Laurent Destailleur
4302a6bc04 Fix empty on getDolGlobal 2023-08-27 15:55:44 +02:00
Laurent Destailleur
9e3312bdbc
Merge pull request #25684 from hregis/fix_extrafield
FIX avoid php8 warnings
2023-08-26 22:33:19 +02:00
Laurent Destailleur
9b16c56074 Fix warning 2023-08-26 10:05:33 +02:00
Regis Houssin
3b00c76cdd FIX avoid php8 warnings 2023-08-25 15:48:15 +02:00
Laurent Destailleur
a8ac1f48f9
Merge pull request #25659 from Easya-Solutions/14.0_fix-reception-odt-dir-output
FIX dir output path for ODT models on reception card
2023-08-25 00:36:24 +02:00
Laurent Destailleur
4ae0e6ed09 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-08-24 00:00:09 +02:00
Laurent Destailleur
5047fc20ea Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-08-23 23:59:55 +02:00
Laurent Destailleur
e52bde9c94 Fix php 5.6 compat broken 2023-08-23 23:50:07 +02:00
Laurent Destailleur
e179660787 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-08-23 23:43:12 +02:00
Laurent Destailleur
c065675f57 FIX Bad calculation of localtax when price_base_type not defined. 2023-08-23 23:41:16 +02:00
Laurent Destailleur
e9273ea403 Fix javascript error 2023-08-23 22:20:22 +02:00
VESSILLER
ebed2211b6 FIX reception odt dir output path 2023-08-23 11:24:09 +02:00
Laurent Destailleur
658b3cc83a
Merge pull request #25651 from Max13/16.0
FIX TakePOS receipt preview in admin
2023-08-21 13:42:20 +02:00
Laurent Destailleur
91cdf0c241
Merge pull request #25641 from atm-arnaud/FIX_17_TVA_0_ON_SUPPLIER_ADDLINE
FIX Suppliers addlines never have VAT if buyprice for this supplier
2023-08-19 22:01:59 +02:00
Adnan RIHAN
30ec5dfd75
FIX TakePOS receipt preview in admin #25648
Receipt preview in admin shows header and footer repeating themselves because in preview, $constFreeText equals TAKEPOS_HEADER (as there is no $_SESSION['takeposterminal'] defined).

Back compatibility for #25648
2023-08-19 17:27:06 +02:00
Laurent Destailleur
aa159c7d06
Merge pull request #25642 from ATM-Nicolas/fix_17.0_sql_request_parenthesis
FIX : SQL request parenthesis
2023-08-19 12:09:43 +02:00
ATM-Nicolas
2487d5cbc4
FIX : SQL request parenthesis 2023-08-17 13:53:13 +02:00
atm-arnaud
08b355d7c3 FIX Suppliers addlines never have VAT if buyprice for this supplier 2023-08-17 11:48:03 +02:00
Laurent Destailleur
bdd6d7cdbd
Merge pull request #25538 from FHenry/17_fix_supplier_link_on_contact_list
fix: on contact list if thirdparty is only supplier the link comm/card php is bad regarding perms tested and tabs preselected
2023-08-16 02:30:47 +02:00
Laurent Destailleur
862756c46a
Update list.php 2023-08-16 02:30:37 +02:00
Laurent Destailleur
e0da8a2109
Merge pull request #25627 from atm-maxime/fix_emailcoll_socid
Fix : emailcollector must use socid to link event to thirdparty (instead of fk_soc)
2023-08-16 01:41:57 +02:00
Maxime Kohlhaas
6bd9484911 Fix : emailcollector must use socid to link event to thirdparty (instead of fk_soc) 2023-08-14 10:24:40 +02:00
Laurent Destailleur
8c5ddd1108
Merge pull request #25448 from atm-maxime/fix_birthday_0_year
Fix : don't display birthdays when 0 years
2023-08-11 13:39:35 +02:00
Laurent Destailleur
2ec02a9757 Fix bad array init 2023-08-11 13:29:03 +02:00
Laurent Destailleur
7e8674c414
Merge pull request #25492 from atm-quentin/FIX_count_cronjoblist
Fix count cronjoblist
2023-08-11 13:27:15 +02:00
Laurent Destailleur
31af89ef53
Update list.php 2023-08-11 13:26:24 +02:00
Laurent Destailleur
6477c03ce6 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-08-10 10:55:06 +02:00
Laurent Destailleur
5c36c23cdb Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-08-10 10:54:08 +02:00
Laurent Destailleur
17de0d845f Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-08-10 10:52:49 +02:00
Laurent Destailleur
f89c026f3f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2023-08-10 10:51:43 +02:00
Laurent Destailleur
b0c2ccafcd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2023-08-10 10:47:05 +02:00
Laurent Destailleur
d3fc152001 Merge 2023-08-10 10:46:44 +02:00
Laurent Destailleur
e8fd551043 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2023-08-10 10:43:44 +02:00
Laurent Destailleur
34b3113bb7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2023-08-10 10:41:20 +02:00
Laurent Destailleur
9671cd730b Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-08-10 02:09:46 +02:00
Laurent Destailleur
2761f993e9 FIX creation of invoice from contract with discount lines 2023-08-10 02:09:17 +02:00
Laurent Destailleur
eec2aabd50
Merge pull request #25597 from hregis/fix_extrafield
FIX not create/update extrafields for visibility 0,2 and 5
2023-08-09 15:21:30 +02:00
Laurent Destailleur
97b084cf3a Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-08-09 13:52:05 +02:00
Laurent Destailleur
fa62595ed1
Merge pull request #25537 from atm-thibaultf/FIX_reload_linked_objects_on_propal_closeas
FIX_reload_linked_objects_on_propal_closeas
2023-08-09 13:32:54 +02:00
Regis Houssin
75ea7e52b2 FIX not create/update extrafields for visibility 0,2 and 5 2023-08-09 13:18:42 +02:00
atm-greg
bf51e493dd
fix error seteventmessage on white screen (#25523)
* fix error seteventmessage on white screen

* Update card.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-08-09 13:16:58 +02:00
Laurent Destailleur
d50eb39de2 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-08-09 12:55:02 +02:00
am97
954c54ad3f
Fix SQL syntax error (#25562)
Single quotes are needed to indicate that 'project' and 'external' are strings, otherwise the requests fail
2023-08-09 12:50:14 +02:00