Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,767 Commits 35 Branches 179 Tags 1.7 GiB
e3a0220658
Commit Graph

28370 Commits

Author SHA1 Message Date
Laurent Destailleur
393f3a9480
Merge pull request #23811 from evarisk-theo/FIX-clicktodial-backtopage 
FIX: fatal error on clicktodial backtopage
 2023-02-09 15:40:28 +01:00
Laurent Destailleur
ec8aacaddb Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-09 15:30:05 +01:00
stickler-ci
78e1fad6bd Fixing style errors. 2023-02-09 14:27:50 +00:00
Quentin VIAL-GOUTEYRON
e83559afb0 FIX strato pdf 2023-02-09 15:20:07 +01:00
Laurent Destailleur
ac27f5ef74 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-02-09 14:46:45 +01:00
Laurent Destailleur
3dc8937ad3 Provide an object for computed extrafields 2023-02-07 00:11:33 +01:00
Théo David
394c3f847c FIX clicktodial backtopage 2023-02-06 17:03:51 +01:00
kkhelifa
2c826a4fcc FIX: Remove orphelan $this->db->rollback() in the function insertExtrafields() 2023-02-04 16:15:18 +01:00
Laurent Destailleur
d3a26efb0e
Merge pull request #23755 from frederic34/patch-4 
fix #23753
 2023-02-04 15:39:01 +01:00
Noé Courtier
9cf71e7d1c FIX: Cannot import find type_fees with cgenericdic.class because its have id and not rowid 2023-02-03 16:34:36 +01:00
VESSILLER
c2f91b2e15 FIX attach file and send by mail in ticket 2023-02-03 14:02:46 +01:00
Laurent Destailleur
45dd6c8f0b Prepare option PDF_SWISS_QRCODE_USE_OWNER_OF_ACCOUNT_AS_CREDITOR 2023-02-02 15:06:19 +01:00
Frédéric FRANCE
eb6c25f64d
fix https://github.com/Dolibarr/dolibarr/issues/23753 2023-02-01 22:06:22 +01:00
Rémi Champlon
b1a7c23daa fix updateExtrafield option key empty set null 2023-02-01 11:20:44 +01:00
Laurent Destailleur
c4d8268ea5 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-30 02:27:28 +01:00
Laurent Destailleur
84934046b9
Merge pull request #23670 from Daviid-P/fix_database_backtick 
Encase database name in backticks
 2023-01-29 20:49:47 +01:00
Laurent Destailleur
ba21d9ff83 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-26 02:16:47 +01:00
Laurent Destailleur
f6004d1b01 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-26 02:16:32 +01:00
Laurent Destailleur
3c9ba08369 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-26 02:10:54 +01:00
Laurent Destailleur
1a4cb5b4e2 FIX #22964 #23012 2023-01-26 02:06:40 +01:00
Laurent Destailleur
00d9aa2378
Merge pull request #23296 from IC-Florian/FIX#23087 
FIX : Product list in setup.php in new Module
 2023-01-26 01:30:30 +01:00
Laurent Destailleur
3aec1289f8
Merge pull request #23618 from ATM-Consulting/FIX_16.0_fieldvalue_emailtemplate 
FIX : Empty FormSetup emailTemplate type IF empty fieldvalue
 2023-01-25 18:28:26 +01:00
GregM
934bcc72c4 update space 2023-01-25 17:34:57 +01:00
VESSILLER
b2ac7a72be FIX simple quote in generated file name from build doc mass action 2023-01-24 11:21:59 +01:00
David Pareja Rodriguez
7f6d993040 Encase database name in backticks 2023-01-24 10:54:48 +01:00
Laurent Destailleur
17b6cb2724 Fix warning 2023-01-19 13:23:08 +01:00
Laurent Destailleur
055cecc4e2
Merge pull request #23519 from comaiteseb/16.0 
correction bug sur le filtre des langues module Emailing
 2023-01-18 23:34:54 +01:00
Laurent Destailleur
8a12f337ab Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-18 20:54:19 +01:00
Laurent Destailleur
283ad1abcf Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-18 20:54:16 +01:00
Laurent Destailleur
2a299068ad Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-18 20:45:44 +01:00
GregM
a3d4eb404d Fix contact firstname lastname extrafields 2023-01-18 17:36:05 +01:00
GregM
1d50acb3cf Fix fieldvalue emailtemplate 2023-01-18 12:10:58 +01:00
Maxime Kohlhaas
b54a15f504 Fix missing keywords in dol_dir_list_in_database 2023-01-15 09:11:29 +01:00
Laurent Destailleur
ebaae53335
Merge pull request #23526 from FHenry/16_fix_volume_pdf 
Fix: make PDF custom volume work as it work on expedition/card.php
 2023-01-13 21:04:18 +01:00
hystepik
04ce79191f Fix #23531 : fix update bom line 2023-01-13 12:18:58 +01:00
Florian HENRY
4fdf930269 make PDF custom volume work as it work on expedition/card.php 2023-01-12 12:49:45 +01:00
Laurent Destailleur
2ec9d9d409 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-11 21:21:15 +01:00
Laurent Destailleur
e1ea849701 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-11 21:20:10 +01:00
Laurent Destailleur
367987e2f3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-11 21:19:39 +01:00
Sébastien NASSIET
4a40039f56 correction bug selection contact dans emailing 2023-01-11 21:06:55 +01:00
Florian HENRY
45725a1e97 fix: display True volume in PDF 2023-01-11 17:58:26 +01:00
Laurent Destailleur
2da8c1d9bc Fix rounding 2023-01-10 11:33:17 +01:00
VESSILLER
4c9d6b5e51 FIX hide details option in supplier order PDF model 2023-01-09 13:57:20 +01:00
Laurent Destailleur
98e61dc40d Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-07 17:29:24 +01:00
Laurent Destailleur
b2e51a5ef4
Merge pull request #23419 from atm-jpb/fix_border_left_photo 
FIX : add border left on image product when conf activated
 2023-01-07 10:28:47 +01:00
Laurent Destailleur
7218d8419f
Merge pull request #23434 from altairis-noe/too_much_br 
FIX: do not add <br> when dol_concatdesc already does it
 2023-01-07 03:38:57 +01:00
Laurent Destailleur
68e4e71005 FIX: Amount of localtax1 and 2 not correctly save on purchase order (the 
rate was saved instead)
 2023-01-06 12:08:40 +01:00
Noé Cendrier
10018d48a9 do not add <br> when dol_concatdesc already does it 2023-01-06 11:46:59 +01:00
jpb
9a755d8d50 add border left on image product when conf activated 2023-01-05 10:24:17 +01:00
Laurent Destailleur
2378f8067b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-04 15:18:13 +01:00
Laurent Destailleur
7197085126 FIX saving of numbering module for jobs 2023-01-04 15:16:40 +01:00
Francis Appels
cef9a8e8d4 Fix Price by qty for multiprices 2022-12-31 13:42:18 +01:00
Laurent Destailleur
534db40d87 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-30 04:15:10 +01:00
Laurent Destailleur
8d4faf3530 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-27 11:19:11 +01:00
Laurent Destailleur
912428f5a1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-27 11:14:40 +01:00
Laurent Destailleur
a17c417205
Merge pull request #23018 from Easya-Solutions/14.0_fix-22837 
FIX #22837
 2022-12-27 00:26:52 +01:00
stickler-ci
56d05c09b2 Fixing style errors. 2022-12-22 13:52:39 +00:00
IC-Florian
2a68836375
New require for product in generateOutputField 2022-12-22 14:52:03 +01:00
Laurent Destailleur
2b106519e2
Merge pull request #23269 from inovea-conseil/FIX#23072 
FIX#23072
 2022-12-22 14:28:16 +01:00
Mathieu
a4d5a7ed1f FIX#23072 2022-12-20 12:36:50 +01:00
Iliès BENYAHIA
a08c468a5e When no language selected, value is 0 so it enters in the condition filter_lang != '' anyway 2022-12-20 11:00:41 +01:00
Laurent Destailleur
f1d83b695a
Merge pull request #23166 from atm-lena/16.0_FIX_DeleteMOAndLinks 
Delete MO :  object's links must be deleted
 2022-12-17 01:46:42 +01:00
atm-lena
eff01374b1 Change place of deleteobjectlinked in deletecommon function 2022-12-15 15:09:50 +01:00
Laurent Destailleur
62b0447c7b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-14 11:02:23 +01:00
Laurent Destailleur
64de591770 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-14 10:20:47 +01:00
Laurent Destailleur
fe1fafa816 Fix edition of product notes 2022-12-13 11:47:06 +01:00
atm-lena
95f437b45c deleteObjectLinked() in deleteCommon() function 2022-12-12 10:05:44 +01:00
Aloïs Micard
285731200a Add confirm_cancel action 2022-12-09 13:45:15 +01:00
Aloïs Micard
381b998413 Display blank td when action is confirm_valid 2022-12-09 11:45:09 +01:00
Laurent Destailleur
5573b88df8
Merge pull request #23133 from milenmk/16-holidays-list-error-message 
FIX|Fix[#23117]
 2022-12-07 17:14:06 +01:00
Milen Karaganski
2a16198981 Put back error counter $nbignored++; 2022-12-07 17:09:54 +02:00
Laurent Destailleur
28e56de8fd Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-07 12:38:10 +01:00
Milen Karaganski
9b8940ac15 FIX|Fix[#23117] 
Error message not displayed, when trying to mass-delete validated OR approved holiday requests
 2022-12-07 00:13:11 +02:00
Laurent Destailleur
ba582963d6 Fix typo 2022-12-06 19:56:49 +01:00
Laurent Destailleur
ac8914eb19 FIX #23115 FIX #23116 2022-12-06 19:25:56 +01:00
Alexandre SPANGARO
a107c81bf1 Merge branch '14.0' into 14p42 2022-12-06 04:53:10 +01:00
Alexandre SPANGARO
89b10b0dfb Fix css 2022-12-06 04:48:04 +01:00
Frédéric FRANCE
9f4182c924
fetch entity contact to take the right directory 2022-12-02 11:00:52 +01:00
Laurent Destailleur
8236ad34fa Fix revert a new feature that must be in develop 2022-12-01 18:34:20 +01:00
Laurent Destailleur
e8e9086c15
Merge pull request #22999 from inovea-conseil/FIX#20415 
FIX#20415
 2022-12-01 17:52:55 +01:00
Laurent Destailleur
9b5fc20308 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-01 17:46:13 +01:00
Laurent Destailleur
8a8f6e0c16 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-01 17:42:13 +01:00
Laurent Destailleur
cc982adc2f Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-01 17:42:02 +01:00
Noé Courtier
a4ac90a316 FIX: PGSQL Int type does not have a free lenght 2022-12-01 15:15:31 +01:00
Eric Seigne
9a2ce53517 add stamp and signature in pictowithouttext list 2022-11-30 23:41:32 +01:00
antonin_tdj
ef065967ed
Add $langs->load('errors') before radioError 
Add $langs->load('errors') before radioError
 2022-11-30 10:44:10 +01:00
stickler-ci
87526194c5 Fixing style errors. 2022-11-29 19:44:44 +00:00
antonin_tdj
b713f645d4
Update extrafields.class.php error message 
adapt error message for radio buttons
 2022-11-29 20:35:43 +01:00
VESSILLER
ad07fdfd79 FIX #22837 2022-11-27 01:06:40 +01:00
Laurent Destailleur
19c4258e2d
Merge pull request #23004 from nicolas-eoxia/fix_default_value_setSaveQuery 
FIX: #22509 default value on integer fields don't retrieve by setSaveQuery
 2022-11-26 16:37:17 +01:00
Laurent Destailleur
b231bcb64a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/bookkeeping/listbyaccount.php
	htdocs/accountancy/bookkeeping/listbysubaccount.php
 2022-11-26 01:21:51 +01:00
Laurent Destailleur
85e9ac1e40 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-26 01:13:58 +01:00
Nicolas Domenech
b98eaa4d45 #FIX: #22509 default value on integer fields don't retrieve by setSaveQuery 2022-11-26 01:01:22 +01:00
Mathieu
99a34e23c8 FIX#20415 2022-11-26 00:33:23 +01:00
Mathieu
c49e7e882f FIX#20415 2022-11-26 00:20:27 +01:00
Laurent Destailleur
1ec862b491
Merge pull request #22982 from inovea-conseil/fix_19877 
FIX#19877
 2022-11-25 23:41:18 +01:00
Mathieu
023bc7d20e FIX#19877 2022-11-25 22:29:44 +01:00
Laurent Destailleur
f42f083d10 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-25 22:20:58 +01:00
Nicolas Domenech
f2f58e434e fix: can't use parameter morcss in select task because parameter is overwrite 2022-11-25 12:16:34 +01:00
Laurent Destailleur
9a0b10bf9f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-23 12:06:34 +01:00
Laurent Destailleur
207f56ff64 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-23 12:06:21 +01:00
Laurent Destailleur
2f0880020c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-23 12:02:25 +01:00
VESSILLER
ed2a9a22e8 FIX compute next value when year is on one digit for reset counter 2022-11-23 08:36:20 +01:00
Laurent Destailleur
a59bdfba0c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-11-23 00:00:47 +01:00
Laurent Destailleur
2c1571c514 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2022-11-22 22:05:33 +01:00
Laurent Destailleur
1e54e695b2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2022-11-22 22:00:59 +01:00
ATM-Nicolas
3d9b2a1676 FIX : SQL request parenthesis 2022-11-22 15:32:37 +01:00
Laurent Destailleur
d6b77b2404
Merge pull request #22904 from daraelmin/patch-4 
Fix #22675 - avoid warning when weight is empty
 2022-11-21 21:15:50 +01:00
Laurent Destailleur
7c1eac9774 Fix sqli ->escape after ->escapeforlike 2022-11-21 03:58:22 +01:00
daraelmin
4912f6a720
Fix #22675 - avoid warning when weight is empty 2022-11-19 22:15:58 +01:00
Laurent Destailleur
1e3e26e7f9 Fix use of the lowmemorydump for batch of backup 2022-11-16 14:00:52 +01:00
Florian HENRY
85aa9f7481 FIX: base64_decode shloud be forbiden in dol_eval 2022-11-16 09:32:14 +01:00
Laurent Destailleur
4d771ef726 Fix position of tables in sql request for better performance 2022-11-15 21:54:19 +01:00
Laurent Destailleur
2f3cc7ce59 FIX Backup using the low memory mode 2022-11-15 19:02:56 +01:00
Laurent Destailleur
d54e63b60d FIX #22813 2022-11-14 20:51:52 +01:00
Laurent Destailleur
d05abce43f FIX edition notes 2022-11-11 16:24:07 +01:00
Laurent Destailleur
cba92c8bdd Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-11 15:28:04 +01:00
Laurent Destailleur
2155d56095 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-11 14:58:28 +01:00
Gauthier PC portable 024
af6a708523 FIX : Missing $object for online signature link build 2022-11-08 14:20:09 +01:00
Laurent Destailleur
e512c9aeee Fix trans 2022-11-07 14:04:01 +01:00
Florian HENRY
d375aca2c8 fix bad SQL parenthesis in notification 2022-11-04 11:29:52 +01:00
Laurent Destailleur
bc2e226ef8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/societe/class/societe.class.php
 2022-11-02 00:19:23 +01:00
Laurent Destailleur
c28e6a46e2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/install/step5.php
 2022-11-02 00:15:21 +01:00
Laurent Destailleur
8a599ec610 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-29 12:47:36 +02:00
Laurent Destailleur
c67f94ca4b Merge 2022-10-29 12:46:22 +02:00
kkhelifa
c4543eff73 FIX: Fix the request SQL for transversal user, the join on usergroup table must be with getEntity('usergroup') and not other element 2022-10-28 16:31:01 +02:00
lmarcouiller
791927723a Fix #22671 : fix permissions notes.tpl.php 2022-10-26 11:38:07 +02:00
Laurent Destailleur
bf794cacc0
Merge pull request #22615 from marc-dll/14.0_FIX_hidden_extrafields_update 
FIX: only modify hidden checkbox/multislected extrafields on update if they are provided in request
 2022-10-25 19:43:41 +02:00
Laurent Destailleur
257e7f2191 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-24 19:41:04 +02:00
Laurent Destailleur
e9b80fa656 Fix phpcs 2022-10-24 19:40:51 +02:00
Laurent Destailleur
67ebdb12d2
Merge pull request #22642 from atm-gauthier/FIX/filter_on_product 
FIX : we must be able to select only bom of a specific product + seve…
 2022-10-24 19:35:36 +02:00
Laurent Destailleur
010177942e
Merge pull request #22641 from hregis/fix_avoid_unnecessary_multiple_calculation 
FIX avoid unnecessary multiple calculation (#22637)
 2022-10-24 19:29:49 +02:00
Laurent Destailleur
064f3dd209 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-24 19:11:59 +02:00
Laurent Destailleur
937840dbfe
Merge pull request #22655 from hregis/fix_avoid_access_forbidden_with_numeric_ref 
FIX avoid access forbidden with numeric ref
 2022-10-24 17:21:57 +02:00
Gauthier PC portable 024
d9f067eabb FIX : travis & stickler feedbacks 2022-10-24 09:46:41 +02:00
Maxime Kohlhaas
7e1a37c138 Fix : remove duplicate code and fix #22176 2022-10-23 11:35:58 +02:00
Yoan Mollard
7ff84f4e42 Add help picto to remind users to respect SPF/DKIM in FROM e-mails 2022-10-23 03:25:55 +02:00
Regis Houssin
2bf2faef72 FIX avoid access forbidden with numeric ref 2022-10-22 09:22:12 +02:00
Gauthier PC portable 024
02d9c9897a FIX : bug on selected value for select_bom() function 2022-10-20 16:27:20 +02:00
Gauthier PC portable 024
06646d4540 FIX : php doc 2022-10-20 15:56:32 +02:00
Gauthier PC portable 024
c3fb0fde85 FIX : we must be able to select only bom of a specific product + several fixes on select_bom() function 2022-10-20 15:53:03 +02:00
Regis Houssin
765e619cee FIX avoid unnecessary multiple calculation (#22637) 2022-10-20 14:47:55 +02:00
Laurent Destailleur
69ca6c02d7 Add debug for ldap 2022-10-20 12:16:12 +02:00
Laurent Destailleur
0d17026276 FIX Import contact when duplicate thirdparties 
FIX Import of socialnetwork field
 2022-10-19 16:19:22 +02:00
Laurent Destailleur
b562ab9948 Fix debug module eventorganization 2022-10-18 23:33:11 +02:00
Laurent Destailleur
31ef942c96 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-10-18 23:09:52 +02:00
Laurent Destailleur
c727ebd9dd Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-10-18 21:12:04 +02:00
Laurent Destailleur
da3ae71a47 Try to fix rounding error 2022-10-18 13:32:18 +02:00
Marc de Lima Lucio
82ca472245 FIX: only modify hidden checkbox/multislected extrafields on update if they are provided in request 2022-10-18 10:50:21 +02:00
Laurent Destailleur
7df36e4a1f Try fix phpunit 2022-10-18 00:53:13 +02:00