Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-21 08:51:24 +01:00
Code Issues Packages Projects Releases Wiki Activity
102,696 Commits 36 Branches 190 Tags
adda436dab9acc806ff33c5ea25e9f21df41f90d
Commit Graph

25142 Commits

Author SHA1 Message Date
Laurent Destailleur
88cdda2b8a Merge pull request #17612 from frederic34/patch-3 
avoid sql error with sql_mode=only_full_group_by
 2021-05-17 07:12:11 +02:00
Laurent Destailleur
ad64b43e30 Update html.form.class.php 2021-05-17 07:11:41 +02:00
Laurent Destailleur
428ab1b67a Merge pull request #17626 from atm-maxime/fix/ticket 
Fix ticket when module societe not enabled
 2021-05-17 06:59:32 +02:00
Laurent Destailleur
78b38f75a1 Minor fixes 2021-05-17 06:39:18 +02:00
Laurent Destailleur
d1ff2e3590 Add comment 2021-05-17 06:18:47 +02:00
Laurent Destailleur
9a8bd2c24b Add missing field 
Fix duplicate / in url
 2021-05-17 06:13:26 +02:00
Maxime Kohlhaas
d3ff549b21 Fix ticket when module societe not enabled 2021-05-16 18:48:18 +02:00
Maxime Kohlhaas
d4aa0ae422 Update box_dolibarr_state_board.php 
Global stats box is always enabled
 2021-05-16 18:26:26 +02:00
Maxime Kohlhaas
7af0bda3a5 Update admin_extrafields_view.tpl.php 2021-05-16 11:33:07 +02:00
piernov
1cbe0e3f2d Fix: properly set gid for Group LDAP synchro 
Even if the gidNumber field was set in the configuration, a gid different from the Dolibarr's one was generated and stored into LDAP.
Now the gidNumber is properly set to Dolibarr's gid if gidNumber field is set in the LDAP module configuration.
 2021-05-15 18:01:34 +02:00
Maxime Kohlhaas
db32f882e8 Fix use of DatePropal instead of Date 2021-05-15 07:45:04 +02:00
Frédéric FRANCE
cff0b69ce0 avoid sql error with sql_mode=only_full_group_by 
SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_customer as ref_client, t.ref_supplier, SUM(td.total_ht) as total_ht FROM llx_societe as s, llx_contrat as t, llx_contratdet as td WHERE t.fk_soc = s.rowid AND td.fk_contrat = t.rowid AND t.fk_soc IN (2) AND t.entity IN (1)[DB_ERROR_1140] In aggregated query without GROUP BY, expression #4 of SELECT list contains nonaggregated column 'dolibarrdev.t.rowid'; this is incompatible with sql_mode=only_full_group_by
 2021-05-14 18:30:56 +02:00
Laurent Destailleur
f504cbcec4 Fix log 2021-05-12 19:18:51 +02:00
Laurent Destailleur
aa2d85276e Debug v14 2021-05-12 18:38:22 +02:00
Florian HENRY
394d43543d fix: when only supplier module is ON top menu should be displayed 2021-05-12 12:04:50 +02:00
Laurent Destailleur
a665ff5bda Copy-Paste works also for hidden fields 2021-05-12 11:51:39 +02:00
Laurent Destailleur
cfded75d11 Debug v14 2021-05-12 09:27:04 +02:00
lmarcouiller
cd4583a841 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-05-12 09:08:19 +02:00
Laurent Destailleur
b8254186ce Clean code 2021-05-12 09:07:36 +02:00
Laurent Destailleur
8971fde420 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-11 23:49:59 +02:00
Laurent Destailleur
f84817f0f6 FIX rss module on servers with allow_url_fopen=0 2021-05-11 23:49:33 +02:00
Frédéric FRANCE
a948fc4ed8 Update extrafields.class.php 2021-05-11 22:12:15 +02:00
Laurent Destailleur
b5a43c8d1d FIX #17502 2021-05-11 21:31:43 +02:00
Laurent Destailleur
4ec763a436 Merge pull request #17497 from Hystepik/develop_v13#2 
Fix #17491 : date extrafield filter works well now
 2021-05-11 21:15:50 +02:00
Laurent Destailleur
91312f0411 Fix url for emailing unsubscribe 2021-05-11 21:13:52 +02:00
Laurent Destailleur
aa05788d62 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/compta/bank/class/account.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/security.lib.php
	htdocs/core/modules/societe/mod_codeclient_elephant.php
	htdocs/filefunc.inc.php
	test/phpunit/CodingPhpTest.php
 2021-05-11 20:34:46 +02:00
Laurent Destailleur
c0689b3884 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-11 20:18:43 +02:00
Laurent Destailleur
c3b5491805 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-11 20:18:36 +02:00
Laurent Destailleur
971d611eb6 Fix phpcs 2021-05-11 20:12:25 +02:00
Laurent Destailleur
780254bfd4 Merge pull request #17533 from daraelmin/daraelmin-mailing-subskey 
New substitution key for member new form url in mailing
 2021-05-11 19:41:12 +02:00
Laurent Destailleur
6591c3f50e Merge pull request #17538 from AlexisLaurier/fix/restrictedAreaPaymentFournDelete 
bug fix - deletion of invoice supplier payment
 2021-05-11 19:27:05 +02:00
Laurent Destailleur
8336f56b40 Merge pull request #17539 from AlexisLaurier/fix/elephantClientCodeVerifDispoMultiEntity 
add entity check on verif_dispo mod_codeclient_elephant
 2021-05-11 19:13:17 +02:00
Frédéric FRANCE
e0cc6a4981 fix $db in class 2021-05-11 18:34:43 +02:00
Laurent Destailleur
eab3ac0615 Merge pull request #17558 from aspangaro/14b6 
Fix Title supplier proposal
 2021-05-11 18:18:35 +02:00
Laurent Destailleur
22b1d87973 Merge pull request #17555 from andreubisquerra/develop 
NEW DOL_VALUE_PLACE tag in TakePOS template
 2021-05-11 18:17:01 +02:00
Laurent Destailleur
d98e046fbd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-11 18:02:37 +02:00
Laurent Destailleur
56b0b5a1f1 Merge pull request #17575 from frederic34/patch-12 
fix php8 warning
 2021-05-11 18:00:29 +02:00
Laurent Destailleur
bea1b83e3f Merge pull request #17570 from frederic34/patch-7 
fix php8 warning
 2021-05-11 17:58:59 +02:00
Laurent Destailleur
1c79b47147 Merge pull request #17574 from frederic34/patch-11 
fix php8 warning
 2021-05-11 17:58:17 +02:00
Laurent Destailleur
d8cbb735a3 Fix rtl language for pdf 2021-05-11 17:58:00 +02:00
Laurent Destailleur
c37ccc10b1 Debug v14 2021-05-11 14:50:04 +02:00
atm-lena
8fb474c687 Add Hook Extrafields Update - init extrafieldssdao 2021-05-11 11:35:54 +02:00
Frédéric FRANCE
eccfa40396 fix php8 warning 
remove variables not used
 2021-05-11 08:28:35 +02:00
Frédéric FRANCE
7e1ed07910 fix php8 warning 2021-05-11 08:26:03 +02:00
Frédéric FRANCE
9725c8f309 fix php8 warning 2021-05-11 08:05:30 +02:00
Alexandre SPANGARO
427221c8d3 Merge remote-tracking branch 'upstream/develop' into 14b6 2021-05-11 07:02:04 +02:00
Laurent Destailleur
d7a5e342ab Optimize some widgets 2021-05-10 20:16:51 +02:00
Laurent Destailleur
6499270619 v14 2021-05-10 15:29:23 +02:00
Laurent Destailleur
2dd3148e3f Fix look and feel v14 2021-05-10 15:24:07 +02:00
Laurent Destailleur
a2cd181435 FIX Debug reception module 2021-05-10 11:53:19 +02:00