Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-17 23:11:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
115,678 Commits 36 Branches 190 Tags
f85c239e4f0482d96cfef1743494b51f00b90509
Commit Graph

11347 Commits

Author SHA1 Message Date
Laurent Destailleur
c81bf68578 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/compta/cashcontrol/cashcontrol_list.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/modulebuilder/index.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/product/class/api_products.class.php
 2021-10-22 15:56:44 +02:00
Theo
29f847c13a add: quick link categories to project 2021-10-22 15:48:39 +02:00
Laurent Destailleur
d54423990d Merge pull request #19077 from polkiko/email_contentlines 
FIX Content line substitution in email
 2021-10-22 15:37:45 +02:00
Laurent Destailleur
808e9e030a Merge pull request #19094 from Hystepik/scrutinizerfix 
Fix: scrutinizer errors + boxes activation
 2021-10-22 15:37:17 +02:00
Giovanni Vella
c77d1206d3 NEW: receipt beep alternative and current date/time 
I have added the alternative command for the beep (when that does not work) and the possibility to print the current date and time on the receipt.
 2021-10-22 14:45:28 +02:00
Lucas Marcouiller
daafe652b9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2 2021-10-22 14:39:18 +02:00
Laurent Destailleur
c1b2778ffc Merge pull request #19093 from Hystepik/develop#3 
Fix : Error on fetchAll on line
 2021-10-22 14:23:05 +02:00
Lucas Marcouiller
75b1518611 Merge branch 'develop' of github.com:Dolibarr/dolibarr into scrutinizerfix 2021-10-22 12:02:33 +02:00
Lucas Marcouiller
33e4d750d7 Fix: scrutinizer errors + boxes activation 2021-10-22 12:01:46 +02:00
Laurent Destailleur
f354427b3c Fix warning 2021-10-22 11:58:00 +02:00
Lucas Marcouiller
b3f15167dc Fix : Error on fetchAll on line 2021-10-22 11:55:21 +02:00
Polkiko
0c47a88098 FIX Content line substitution in email 2021-10-21 23:53:37 +02:00
Laurent Destailleur
6c870bb3d1 Merge pull request #19059 from FHenry/fix_introduced_scrutinizer 
fix: scrutinizer
 2021-10-21 22:52:20 +02:00
Florian HENRY
96722d55ef fix scrutinzer 2021-10-21 19:13:05 +02:00
atm-lena
bdc8854baa Clean 2021-10-21 18:54:07 +02:00
atm-lena
03765528e1 Contract line : update boolean 2021-10-21 18:42:06 +02:00
Florian HENRY
85ec2c408c fix scrutinizer 2021-10-21 18:15:15 +02:00
Lucas Marcouiller
4d2b96d029 fix inventory scan 2021-10-21 18:08:20 +02:00
Lucas Marcouiller
1f64b09430 WIP : fix inventory scan 2021-10-21 18:07:54 +02:00
Florian HENRY
4795190a75 fix: scrutinizer 2021-10-21 17:09:48 +02:00
Florian HENRY
e9fe668725 fix: scrutinizer 2021-10-21 16:48:04 +02:00
atm-lena
806c53d4c4 FIX Ret PR 2021-10-21 09:49:14 +02:00
Laurent Destailleur
e43b33028c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
 2021-10-20 15:06:10 +02:00
Laurent Destailleur
e4d0bf7a91 Merge pull request #18967 from aspangaro/15a23 
NEW Add sortorder on units list
 2021-10-20 12:50:32 +02:00
kamel
7b41d1d87f Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into fix_00008 2021-10-20 09:35:30 +02:00
Laurent Destailleur
12d211815b Debug v15 2021-10-19 21:38:36 +02:00
Laurent Destailleur
4764075cc7 Merge pull request #19016 from hregis/fix_possibility_to_bypass_main_antivirus_constants 
FIX add possibility to bypass MAIN_ANTIVIRUS_* constants
 2021-10-19 19:04:09 +02:00
kamel
f328bb32f6 Corrections 2021-10-19 17:34:03 +02:00
lmarcouiller
f5942300e0 fix CI bot error 2021-10-19 16:09:06 +02:00
lmarcouiller
d8cd6b6f55 Fix autoselect multilevel 2021-10-19 15:54:25 +02:00
Regis Houssin
db01fed447 FIX error when defining an already existing constant 2021-10-19 12:36:33 +02:00
Regis Houssin
acbae5cafb FIX add possibility to bypass MAIN_ANTIVIRUS_* constants 2021-10-19 12:14:42 +02:00
lmarcouiller
dd6457b259 FIX: boxes php 8.0 errors and warnings 2021-10-19 10:24:59 +02:00
lvessiller
98a613edec FIX show end hours in events linked to objects 2021-10-18 14:31:37 +02:00
kamel
152aab4903 Add test if actual entity is different to the entity provided 2021-10-18 10:10:31 +02:00
Laurent Destailleur
099b2da2dc FIX #18974 2021-10-17 18:58:34 +02:00
Laurent Destailleur
0aa90e82ea Clean code 2021-10-17 15:47:29 +02:00
Laurent Destailleur
79177b0a11 Rename method into selectLotDataList 2021-10-17 14:38:12 +02:00
stickler-ci
9fa6a8daa7 Fixing style errors. 2021-10-17 10:05:58 +00:00
Regis Houssin
84e4bd8820 NEW add zstd compression 2021-10-17 11:59:25 +02:00
Laurent Destailleur
94c48d3573 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-10-16 19:40:22 +02:00
Laurent Destailleur
dd0809b528 Fix trans labels status 2021-10-16 19:37:57 +02:00
Laurent Destailleur
1bee543eef Merge pull request #18987 from atm-gauthier/NEW_more_param_on_function_deleteByParentField 
NEW : we need to be able to put more filters on deleteByParentField() function
 2021-10-16 19:11:52 +02:00
Laurent Destailleur
9469c0dc2b Update commonobject.class.php 2021-10-16 19:10:50 +02:00
Laurent Destailleur
bbe867a7a9 Update commonobject.class.php 2021-10-16 19:06:50 +02:00
Laurent Destailleur
f8010dfcbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/reception/list.php
	htdocs/takepos/pay.php
 2021-10-16 13:01:03 +02:00
Gauthier PC portable 024
5ef681ef91 FIX : stickler 2021-10-15 10:36:47 +02:00
Gauthier PC portable 024
412746ec8f NEW : we need to be able to put more filters on deleteByParentField() function 2021-10-15 10:18:32 +02:00
atm-lena
ff7727466a Function updateExtrafield : replace empty value to null 2021-10-14 17:13:44 +02:00
Marc de Lima Lucio
29768a1c6e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2021-10-13 11:33:04 +02:00