lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
100,208 Commits 43 Branches 150 Tags 886 MiB
617338cccd
Commit Graph

24541 Commits

Author SHA1 Message Date
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
Alexandre SPANGARO
100b0f297e Fix Title supplier proposal contact card 2021-05-10 06:32:28 +02:00
Alexandre SPANGARO
c0062e2d41 Move title to v14 ergonomy 2021-05-10 06:26:58 +02:00
stickler-ci
3ee26fc881 Fixing style errors. 2021-05-09 21:37:58 +00:00
andreubisquerra
8aa8c14323
Fix 2021-05-09 22:53:05 +02:00
andreubisquerra
5a5811a716
NEW DOL_VALUE_PLACE tag in TakePOS template 
Very important in restaurant orders
 2021-05-09 22:37:00 +02:00
Laurent Destailleur
19bae333c9 Add option MAIN_SHOW_PASSWORD_INTO_LOG 2021-05-09 22:07:08 +02:00
Laurent Destailleur
1fb5b0f681 Fix rtl languages 2021-05-09 20:25:57 +02:00
Laurent Destailleur
3ad8827c8a Clean code 2021-05-09 20:17:17 +02:00
Laurent Destailleur
8cc100012d Fix vulnerabiity: External users can set a public note 2021-05-09 12:50:46 +02:00
Alexis LAURIER
e4a430f638 add entity check on verif_dispo mod_codeclient_elephant 2021-05-08 10:24:08 +02:00
Alexis LAURIER
d04c741a3b add payment_fourn delete proper check into security.lib 2021-05-08 09:12:17 +02:00
daraelmin
bfac47c84e
Too much underscore 2021-05-07 17:16:58 +02:00
daraelmin
a75d6e9050
Add tooltip 2021-05-07 17:14:33 +02:00
lmarcouiller
f054169036 revert of last push error of branch 2021-05-07 15:56:33 +02:00
lmarcouiller
0466704dc7 Fix #17477 : Sql error in invoices cards 2021-05-07 15:49:49 +02:00
lmarcouiller
bf64bde571 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-05-07 15:22:10 +02:00
lmarcouiller
b41a87ff70 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-05-07 12:06:46 +02:00
stickler-ci
d108496c67 Fixing style errors. 2021-05-07 07:47:49 +00:00
lmarcouiller
c39dbd81b3 Fix #17491 : Update of fix date extrafield filter 2021-05-07 09:47:15 +02:00
lmarcouiller
5dcdb06e91 Merge branch '13.0' of github.com:Dolibarr/dolibarr into develop_v13#2 2021-05-07 09:46:37 +02:00
lmarcouiller
f4291dc985 commit missing file 2021-05-07 09:20:18 +02:00
lmarcouiller
0f2ce8687d Fix #17475 : Update of previous fix 2021-05-07 09:19:44 +02:00
Frédéric FRANCE
a56dc4ff65
fix mulitple module using completeTabsHead 
complete $template['head'] in module and return 0 to not replace instead return $head and replace
 2021-05-06 22:28:03 +02:00
Laurent Destailleur
6159321bed NEW Show picto of module into the list of dictionaries 2021-05-06 18:31:36 +02:00
Laurent Destailleur
6b825cbc3b Clean code 2021-05-06 18:06:19 +02:00
Laurent Destailleur
a22d3f8627
Merge pull request #17301 from andreubisquerra/master 
NEW More permission in TakePOS (Can edit added line, can modify once order sent to kitchen)
 2021-05-06 17:20:46 +02:00
Laurent Destailleur
d5c737ddb6
Update modTakePos.class.php 2021-05-06 17:19:28 +02:00
Laurent Destailleur
bd5e141d26 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/mails_templates.php
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
	htdocs/societe/consumption.php
 2021-05-06 17:07:44 +02:00
Laurent Destailleur
3090c124f0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-06 16:59:06 +02:00
Laurent Destailleur
8410f4a9c9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/mails_templates.php
	htdocs/societe/consumption.php
	htdocs/user/class/user.class.php
 2021-05-06 16:57:49 +02:00
Laurent Destailleur
f6f4968af6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/societe/consumption.php
 2021-05-06 16:52:36 +02:00
Laurent Destailleur
7515de456f
Merge pull request #17495 from daraelmin/daraelmin-patch-2 
New 5 substitutions keys "online payment link" in mailing
 2021-05-06 16:36:10 +02:00
Laurent Destailleur
7a76dc4648
Merge pull request #17382 from DorianVabre/dev_EventOrganizer_payment 
new: working on conference or booth object and event type #FoundationFunding
 2021-05-06 16:31:30 +02:00
Laurent Destailleur
0867be4af5
Merge pull request #17513 from dolibit-ut/patch-320 
Update modules_member.class.php
 2021-05-06 16:27:45 +02:00
lmarcouiller
7d649dd90e Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-05-06 16:26:30 +02:00
Laurent Destailleur
864c2a0bf7
Merge pull request #17506 from atm-gauthier/FIX_column_adding_management_in_dom_added_with_ajax_case 
FIX : if dom is added with ajax, selector needs to keep working
 2021-05-06 16:24:26 +02:00
Laurent Destailleur
5a927702c0
Merge pull request #17500 from fmarcet/develop 
NEW: Add import on BOM
 2021-05-06 16:21:09 +02:00
Laurent Destailleur
9e057332f0
Merge pull request #17486 from NextGestion/dolibarr_partnership 
Dolibarr partnership
 2021-05-06 16:11:13 +02:00
UT from dolibit
9cd78e6ecf
Update modules_member.class.php 2021-05-06 16:00:49 +02:00
Laurent Destailleur
a0f85044fc
Merge pull request #17510 from Hystepik/develo#2 
Fix #17501 : Undownloable attached file
 2021-05-06 16:00:20 +02:00
Laurent Destailleur
21ce99338b
Merge pull request #17504 from FHenry/13.0 
fix missing token
 2021-05-06 15:57:45 +02:00
lmarcouiller
d55309c847 fix rename file 2021-05-06 09:46:54 +02:00
Laurent Destailleur
19f78b2e8f More compact gui 2021-05-05 19:13:40 +02:00
Gauthier PC portable 024
9108651a7a FIX : if dom is added with ajax, selector need to keep working 2021-05-05 17:25:12 +02:00
Florian HENRY
adc8620506 fix: allow webdavs link type 2021-05-05 17:14:58 +02:00
Florian HENRY
e62c6be54c Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0 2021-05-05 17:06:03 +02:00
Florian HENRY
7857da4db7 fix missing token 2021-05-05 17:05:51 +02:00
lmarcouiller
6589bab20a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develo#2 2021-05-05 16:48:28 +02:00
lmarcouiller
ed59a8851f Fix #17501 : Undownloable attached file 2021-05-05 16:48:04 +02:00
Ferran Marcet
6f66efacb8 New: Add import on BOM 2021-05-05 13:47:43 +02:00
Marc de Lima Lucio
139ae3db00 FIX: pgsql: prevent 'WHERE 1' 2021-05-05 11:49:11 +02:00
stickler-ci
95be7e8a63 Fixing style errors. 2021-05-05 09:29:52 +00:00
lmarcouiller
b739e7ba22 Fix #17491 : date extrafield filter works well now 2021-05-05 11:26:15 +02:00
Laurent Destailleur
f1929eb106 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-05 00:16:27 +02:00
Laurent Destailleur
3807804acc Fix option MAIN_GENERATE_SUPPLIER_ORDER_WITH_PICTURE 2021-05-05 00:15:52 +02:00
stickler-ci
fb3c8e698e Fixing style errors. 2021-05-04 20:59:32 +00:00
daraelmin
b04dfcadc7
Add function to get html online payment link 2021-05-04 21:55:19 +02:00
Laurent Destailleur
bf52b54db6 Add date in error message 2021-05-04 19:43:33 +02:00
lmarcouiller
457a96bc34 Fix #17475 : Add of List-Unsubscribe in mass emailing 2021-05-04 15:11:30 +02:00
Laurent Destailleur
526235d020 Fix substitution of mix html/nohtml 
Fix send email reminder for past due date of invoices
More PHPUnit test
 2021-05-04 13:33:18 +02:00
NextGestion
6f85cab6c4 Merge https://github.com/Dolibarr/dolibarr into dolibarr_partnership 2021-05-04 10:55:19 +01:00
daraelmin
729a5677ad
Group tooltip by key type 2021-05-04 01:53:46 +02:00
daraelmin
9ab7f4ec01
Add tooltip for new substitution keys 2021-05-04 01:41:32 +02:00
Laurent Destailleur
1d0c0a8d2a Fix phpcs 2021-05-04 00:35:36 +02:00
Laurent Destailleur
bb64c330f6
Merge pull request #17441 from fappels/13_tokenonactiondelete 
FIX missing token on dolGetButtonAction for action delete
 2021-05-04 00:21:55 +02:00
Laurent Destailleur
b2901bfae0 Make code simpler 2021-05-04 00:15:06 +02:00
Laurent Destailleur
16f1651d4e Add missing action events in trigger 2021-05-04 00:04:44 +02:00
Laurent Destailleur
6e32efdb40 Fix phpcs 2021-05-03 20:22:36 +02:00
Laurent Destailleur
e4499976e9 Disable empty tabs 2021-05-03 19:56:31 +02:00
Laurent Destailleur
a3431a790a
Merge pull request #17404 from bb2a/doctemplate 
New Add option for doctemplate
 2021-05-03 19:45:40 +02:00
Laurent Destailleur
9973085613 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/comm/propal/card.php
	htdocs/compta/bank/releve.php
	htdocs/compta/paiement/rapport.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/reception/card.php
	htdocs/societe/societecontact.php
 2021-05-03 19:36:49 +02:00
Laurent Destailleur
9dc36d13c3 Enhance error management 2021-05-03 19:25:16 +02:00
Laurent Destailleur
cbc481dc60 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/adherents/list.php
	htdocs/adherents/type.php
	htdocs/core/lib/company.lib.php
 2021-05-03 19:01:47 +02:00
Laurent Destailleur
17cb441569 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-03 18:58:50 +02:00
Laurent Destailleur
540e4f3d2e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-03 18:58:41 +02:00
Laurent Destailleur
b7816f3d96 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-03 18:58:03 +02:00
Laurent Destailleur
2d7ecb8a44 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/boxes/box_produits_alerte_stock.php
 2021-05-03 18:57:52 +02:00
Laurent Destailleur
33a20ae9a1
Update extrafields.class.php 2021-05-03 16:16:44 +02:00
Laurent Destailleur
5962f1cccd
Merge pull request #17445 from OPEN-DSI/new-societe-compta-code-digiteria 
NEW rise code tries in digeteria customer and supplier accountant code
 2021-05-03 15:57:46 +02:00
Laurent Destailleur
7b706d6fe5 Fix phpunit for crop of image 2021-05-03 15:56:56 +02:00
Laurent Destailleur
5d870d5802 FIx #17447 2021-05-03 15:36:34 +02:00
Laurent Destailleur
1c95e2b7c7 FIX #17453 2021-05-03 14:58:29 +02:00
Laurent Destailleur
c6a9117a00 Graph color 2021-05-03 14:03:50 +02:00
Laurent Destailleur
b22f2dd2c8
Merge pull request #17415 from Hystepik/develo#2 
Close #17271 : Replacement of 2 graphes in /compta/index.php
 2021-05-03 13:56:44 +02:00
Laurent Destailleur
a806a18455 Reduce sql 2021-05-03 13:35:10 +02:00
Laurent Destailleur
39e27b6f38 Minor perf enhancement 2021-05-03 12:32:31 +02:00
Laurent Destailleur
2a47128e2d Code comment 2021-05-03 11:00:41 +02:00
Laurent Destailleur
2bef447229 Clean code 2021-05-02 16:24:52 +02:00
Laurent Destailleur
efda17657d Fix conversion in webp 2021-05-02 15:29:52 +02:00
Laurent Destailleur
39f7d0bed8 Fix conversion of images 2021-05-02 15:15:27 +02:00
Laurent Destailleur
92c1022b8e Fix duplicate in webp 2021-05-02 14:49:07 +02:00
Laurent Destailleur
8176898430 Fix lang 2021-05-02 14:31:03 +02:00
Laurent Destailleur
a54e60d345 Look and feel v14 2021-05-02 13:13:55 +02:00
Laurent Destailleur
3edb929f9e Debug v14 2021-05-02 12:43:28 +02:00
Laurent Destailleur
24a58b1956 Removed not used permission 2021-05-02 11:21:01 +02:00
Laurent Destailleur
4e7e6048de Debug generation of webp 2021-05-01 15:42:49 +02:00
Laurent Destailleur
99d655b983 Debug generation of webp 2021-05-01 15:38:58 +02:00
Laurent Destailleur
575d335374 Debug generation of webp 2021-05-01 15:12:30 +02:00
Laurent Destailleur
0ee1d4b322 Reduce log verbosity 2021-05-01 13:22:01 +02:00
Laurent Destailleur
69511e2706 Debug 2021-04-30 16:15:35 +02:00
lvessiller
ab89fe73c2 NEW rise code tries in digeteria customer and supplier accountant code 2021-04-30 16:08:46 +02:00
Laurent Destailleur
e99355a0c2 Clean html 2021-04-30 15:22:17 +02:00
ATM john
6e4962bb39 Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0_fix_showInputField_checkbox_selection 2021-04-30 12:22:31 +02:00
ATM john
6c1e0919c8 Fix checkbox multiselect pre-selected value from get/post 2021-04-30 12:20:43 +02:00
Laurent Destailleur
67fd5477c9
Merge pull request #17427 from Hystepik/develop#4 
New Module Knowledge Management
 2021-04-30 12:12:15 +02:00
Francis Appels
773b16928d only if no token 2021-04-30 11:15:01 +02:00
Laurent Destailleur
5a1f2db024 Clean sql 2021-04-30 10:57:21 +02:00
Francis Appels
05a96b3ee2 FIX missing token on dolGetButtonAction for action delete 2021-04-30 10:46:05 +02:00
stickler-ci
81b964db45 Fixing style errors. 2021-04-30 08:12:24 +00:00
atm-lena
5e98d99321 FIX SQL Error show_contacts : socialnetworks 2021-04-30 10:04:21 +02:00
Laurent Destailleur
e7e2953a9e Look and feel 2021-04-29 15:49:44 +02:00
Laurent Destailleur
e3767557d8 Fix phpcs 2021-04-29 12:33:49 +02:00
Laurent Destailleur
655056ed31 Debug v14 2021-04-29 12:10:55 +02:00
Florian HENRY
a7b093ed81 FIX: Espadon PDF shippment model with long public note now wroking 2021-04-29 11:34:09 +02:00
lmarcouiller
d4fb9c7c47 knowledgemanager finished 2021-04-29 10:49:56 +02:00
Dorian Vabre
cb21131259
Merge branch 'develop' into dev_EventOrganizer_payment 2021-04-29 10:31:43 +02:00
Laurent Destailleur
a2245bd7db Fix add of box 2021-04-29 10:13:43 +02:00
Laurent Destailleur
de8e291c7e Debug v14 2021-04-29 10:01:10 +02:00
lmarcouiller
6da32015f4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#4 2021-04-29 09:45:30 +02:00
lmarcouiller
799d1de830 Update incoice.lib.php and index.php match eldy's requests 2021-04-29 09:31:49 +02:00
Laurent Destailleur
6f1f26096e Debug partnership module 2021-04-28 23:25:26 +02:00
Anthony Berton
5d17e26738 add_pdf_template_and_read_if_module_activate 2021-04-28 23:25:03 +02:00
Laurent Destailleur
64374f46da Debug v14 2021-04-28 23:01:20 +02:00
Laurent Destailleur
846bab38da Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-28 22:45:10 +02:00
Laurent Destailleur
b1d858eb26 Fix translation of new modules 2021-04-28 22:44:57 +02:00
Laurent Destailleur
9934e28c2a
Merge pull request #17423 from FHenry/dev_new_notif_trigger 
Add ORDER_CREATE trigger for notificiation
 2021-04-28 21:39:45 +02:00
Laurent Destailleur
95ecb95ff1 FIX dol_print_date for %a and %b with some timezone 2021-04-28 20:47:28 +02:00
Laurent Destailleur
18e911a636 FIX dol_print_date for %a and %b with some Timezone 2021-04-28 20:44:22 +02:00
Laurent Destailleur
2dc597f5d0 Make setup easier to understand 2021-04-28 18:04:00 +02:00
Florian HENRY
8dd331d461 Add ORDER CREATE trigger for notificiation 2021-04-28 17:55:03 +02:00
Laurent Destailleur
75a8dc28ea
Merge pull request #17261 from aspangaro/14a39 
Maxi debug of societe/product per entity
 2021-04-28 17:06:45 +02:00
Laurent Destailleur
6b74a656ed
Merge pull request #17412 from daraelmin/daraelmin-patch-box-adhstatusconst 
Clean code (use adh status const in boxes)
 2021-04-28 16:48:31 +02:00
Laurent Destailleur
9f56ce6c53
Merge pull request #17405 from Hystepik/develop#1 
Fix #17219 : complement of PR 17161
 2021-04-28 15:48:38 +02:00
lmarcouiller
d753ef6393 edit of modKnowledgeManagement.class 2021-04-28 15:28:00 +02:00
lmarcouiller
97043ca665 New module KnowledgeManagement 2021-04-28 14:57:49 +02:00
Laurent Destailleur
e50494152d Fix label 2021-04-28 11:22:45 +02:00
lmarcouiller
be22d43c60 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develo#2 2021-04-28 09:24:18 +02:00
lmarcouiller
7782e849e2 changes to implement eldy's advices 2021-04-28 09:22:10 +02:00
lmarcouiller
c1069c5f16 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-04-28 09:03:36 +02:00
daraelmin
50a5dd7ff3
Use adh const 2021-04-27 23:28:49 +02:00
daraelmin
e7f1170736
Use adherent status const 2021-04-27 23:22:29 +02:00
Laurent Destailleur
cb72a010cd FIX notifications for expense report has disappeared. 2021-04-27 22:14:19 +02:00
Laurent Destailleur
0a871546ee
Merge pull request #17379 from atm-adrien/FIX_add_function_price2num_to_productAlertStock_box_12.0 
FIX : Add function price2num for rounding values in productAlertStock…
 2021-04-27 18:45:26 +02:00
lmarcouiller
52bf0f0359 Close #17271 : Replament of 2 graph in compta/index.php 2021-04-27 16:02:46 +02:00
kamel
3a673c9210 Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_00007 2021-04-27 12:29:10 +02:00
lmarcouiller
8896e7c0d5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-04-27 11:18:33 +02:00
lmarcouiller
758ba67adc Fix #17219 : new complement of PR 17161 2021-04-27 10:50:45 +02:00
Adrien Raze
e8c2085abd FIX : Change parameters MF to MS for price2num() function 2021-04-27 09:24:22 +02:00
Laurent Destailleur
4b204301a9 Enhance logs 2021-04-27 03:25:49 +02:00
Laurent Destailleur
3e013ebad0 Fix mass action delete of cron jobs 2021-04-27 03:16:11 +02:00
Laurent Destailleur
5bb2531364 Enhance ticket module 2021-04-27 02:52:24 +02:00
Laurent Destailleur
d6cdfcdd8c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/paiement/card.php
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/public/members/new.php
 2021-04-27 02:07:48 +02:00
Laurent Destailleur
48a50f3b10 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/paiement/card.php
	htdocs/compta/paiement/class/paiement.class.php
 2021-04-27 01:58:19 +02:00
Laurent Destailleur
e82965090f
Merge pull request #17395 from Robin-Yann/13-fix-combo-prospect 
13 fix combo prospect
 2021-04-27 01:18:57 +02:00
Anthony Berton
6353084777 init 2021-04-27 00:22:39 +02:00
Laurent Destailleur
d1fd26356f
Merge pull request #17377 from gmilad/gmilad-scayt-210423 
NEW : Update doleditor.class.php for easily activate SCAYT
 2021-04-26 23:38:23 +02:00
Laurent Destailleur
062dc28850
Merge pull request #17388 from aspangaro/14a30 
NEW: Add option SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD
 2021-04-26 21:18:48 +02:00
Laurent Destailleur
f66c506011
Merge pull request #17381 from atm-lena/12.0_FormAttachOptions_AddHookParameters_Options 
Add parameter "option" to hook formattachOptions
 2021-04-26 21:00:12 +02:00
Laurent Destailleur
c849ce79e9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-26 19:21:38 +02:00
Laurent Destailleur
d138e7410b Clean code 2021-04-26 19:12:23 +02:00
kamel
9c46b234cf FIX Supplier invoices (deposit, multicurency in lines) 2021-04-26 17:43:27 +02:00
lmarcouiller
080bd90c93 Fix #17219 : complement of PR 17161 2021-04-26 16:15:09 +02:00
stickler-ci
1a4e1b1ae9 Fixing style errors. 2021-04-26 13:46:37 +00:00
Laurent Destailleur
14baec95dc Clean code 2021-04-26 15:44:24 +02:00
Alexandre SPANGARO
d95be3e08b Merge remote-tracking branch 'upstream/develop' into 14a39 2021-04-26 13:53:16 +02:00
Laurent Destailleur
87393cee98 Clean code 2021-04-26 11:59:47 +02:00
Laurent Destailleur
c9d6bc70e8 Clean code 2021-04-26 10:22:28 +02:00
stickler-ci
ebd3b00016 Fixing style errors. 2021-04-26 07:24:00 +00:00
Robin-Yann
836b811449
Merge branch 'develop' into 13-fix-combo-prospect 2021-04-26 09:21:32 +02:00
Robin
04c97d2695 FIX combo Prospect / Customers / Supplier in society list 2021-04-26 09:05:47 +02:00
Laurent Destailleur
c3d3b79315 Fix test on Local url 2021-04-25 22:11:57 +02:00
Laurent Destailleur
fd2d317b4a Fix #yogosha5881 2021-04-25 15:55:36 +02:00
Laurent Destailleur
2fd2c67139 Clean edit of user card 2021-04-25 15:21:31 +02:00
Laurent Destailleur
9f03054fc4 Fix #yogosha5877 2021-04-24 20:52:48 +02:00
Laurent Destailleur
d0cc64479d Fix protect sql 2021-04-24 20:18:11 +02:00
Alexandre SPANGARO
f60df8964a NEW: Add option SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD 2021-04-24 08:05:00 +02:00
Givriz
a451fee68f Compatibility phpv8 2021-04-23 18:01:11 +02:00
atm-lena
3d3fb17da3 Add parameter "option" to hook formattachOptions 2021-04-23 15:41:43 +02:00
Adrien Raze
c5775cc902 FIX : Add parameter to function price2num() 2021-04-23 12:31:45 +02:00
Adrien Raze
2ab17c44e9 FIX : Add function price2num for rounding values in productAlertStock box 2021-04-23 11:11:47 +02:00
Dorian Vabre
b441c600bb fixing error introduced in a previous commit 2021-04-23 10:32:28 +02:00
gmilad
b9c33fc8b6
Update doleditor.class.php for 
(English below)
Bonjour,

Voici une proposition d'ajout de fonctionnalité afin de pouvoir activer facilement le plugins SpellCheckAsYouType (SCAYT)  de CKEditor, pour l'historique voir ce fils de discutions sur le forum Francophone de Dolibarr :

https://www.dolibarr.fr/forum/t/wysiwyg/28874/11?u=gmilad

Amicalement,
Gaëtan.

(English below)
Hello,

Here is a proposal to add functionality to easily activate the  SpellCheckAsYouType (SCAYT)  plugins of CKEditor, for the history see this thread on the Dolibarr forum:

https://www.dolibarr.fr/forum/t/wysiwyg/28874/11?u=gmilad

Kind regards,
Gaëtan.
 2021-04-23 00:45:07 +02:00
Dorian Vabre
4c57a6c207 wip on mail, sending ok but no content 2021-04-20 17:28:18 +02:00
Dorian Vabre
a500d83c0b linked invoice and attendee 2021-04-20 16:09:22 +02:00
Laurent Destailleur
1bd2bd3237 Fix php8 warning 2021-04-20 12:46:41 +02:00
Laurent Destailleur
14f009f550 Fix CURLOPT_CONNECT_TO 2021-04-20 12:19:46 +02:00
Laurent Destailleur
f1f63cd4e2 Enhance detection of update available 2021-04-20 11:56:26 +02:00
Laurent Destailleur
4fde184afb Add the setup page of module accounting to not search where is setup 2021-04-20 11:40:43 +02:00
Alexandre SPANGARO
d27030df3f Merge remote-tracking branch 'upstream/develop' into 14a39 2021-04-20 04:43:14 +02:00
Alexandre SPANGARO
d66540bf00 Revert "Split mod fournisseur" 
This reverts commit 78dbf4f7ff.
 2021-04-20 04:42:51 +02:00
Laurent Destailleur
3aee28fb1b
Merge pull request #17263 from atm-adrien/NEW_add_userGroup_for_user_exports_develop 
NEW : Add possibility to exports userGroups fields on user exports
 2021-04-19 21:58:38 +02:00
Laurent Destailleur
18d87ae575
Merge pull request #17255 from Givriz/dev_1 
Compatibility phpv8
 2021-04-19 21:44:25 +02:00
Laurent Destailleur
e71e5d533d Fix HTML5 2021-04-19 21:30:25 +02:00
Laurent Destailleur
c966914f67
Merge branch 'develop' into new/check_update_for_module 2021-04-19 21:26:01 +02:00
Laurent Destailleur
46ea1084f5 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/mailing/cibles.php
	htdocs/core/extrafieldsinexport.inc.php
	htdocs/product/stock/card.php
 2021-04-19 20:59:10 +02:00
Laurent Destailleur
3df79dd3c8 Avoid error on PHP 5.6 2021-04-19 20:49:31 +02:00
NextGestion
7cab4dd19d Manage partnership for members & code optimisation 2021-04-19 15:17:57 +01:00
Laurent Destailleur
a8187af8ef Use MAIN_SECURITY_ANTI_SSRF_SERVER_IP as whitelist for local IP. 2021-04-19 15:16:00 +02:00
Laurent Destailleur
08ded970e2 NEW Add option MAIN_SECURITY_ANTI_SSRF_SERVER_IP 2021-04-19 15:01:36 +02:00
NextGestion
263e110ca3 Enhance module Member 2021-04-19 13:19:32 +01:00
Laurent Destailleur
0537fdd1c6 Add local ip into excluded IP for external URL download. 
Fix #yogosha5861
 2021-04-19 13:52:12 +02:00