Commit Graph

112767 Commits

Author SHA1 Message Date
stickler-ci
1457afb9b9 Fixing style errors. 2021-09-01 15:35:23 +00:00
Laurent Destailleur
60e4e23870
Update object_discounts.tpl.php 2021-09-01 17:33:18 +02:00
Laurent Destailleur
7c5621a2d4
Merge pull request #18552 from aspangaro/15a12
NEW Invoice list - Use complete country select field with EEC or not
2021-09-01 17:17:48 +02:00
Laurent Destailleur
443827ff42 FIX #18531 2021-09-01 17:10:26 +02:00
Laurent Destailleur
65c92f176c
Merge pull request #18553 from Hystepik/develop#1
Fix : KnowledgeManagement menu permission
2021-09-01 16:43:01 +02:00
Givriz
688d217bed Compatibility phpv8 2021-09-01 16:39:28 +02:00
Laurent Destailleur
4b7b54e196
Update 14.0.0-15.0.0.sql 2021-09-01 16:32:25 +02:00
Laurent Destailleur
3b236f677d
Update llx_product_association.sql 2021-09-01 16:31:16 +02:00
Laurent Destailleur
ef2bb99476
Update commonobject.class.php 2021-09-01 16:29:08 +02:00
Laurent Destailleur
8dd4dae8f8
Merge pull request #18558 from FHenry/dev_more_inv_task_comment
From #18530 display date and duration in invoice generation from task time spent
2021-09-01 16:27:24 +02:00
Laurent Destailleur
b66bd781a4 Clean code 2021-09-01 16:26:59 +02:00
Vincent Dieltiens
2bad48bdcc FournisseurCommandDispatch extends CommonObjectLine instead of CommonObject 2021-09-01 16:25:29 +02:00
Laurent Destailleur
4ba189fffb
Merge pull request #18560 from vincentjdc/supplier-order-dispatch-common-object-line
FournisseurCommandDispatch extends CommonObjectLine instead of CommonObject
2021-09-01 16:23:28 +02:00
Laurent Destailleur
1027f1059e
Merge pull request #18574 from FHenry/14_eventorg
fix: disabled module Event Org when project disabled
2021-09-01 16:17:55 +02:00
Laurent Destailleur
14ca7db5d7 Typo in log 2021-09-01 16:17:31 +02:00
Vincent Dieltiens
59e917cd5f regroup BILL_SUPPLIER_VALIDATE actions
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
2021-09-01 16:14:44 +02:00
Vincent Dieltiens
65ccbb6249 Regroup BILL_SUPPLIER_VALIDATE triggers under the same condition 2021-09-01 16:06:36 +02:00
Laurent Destailleur
46a38506a5
Merge pull request #18562 from vincentjdc/bill-supplier-validate
Bill supplier validate
2021-09-01 16:04:50 +02:00
Damien BENOIT
2d5be77561
Merge pull request #34 from Dolibarr/develop
Update fork
2021-09-01 15:40:30 +02:00
Laurent Destailleur
3728cca2f3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-01 15:23:53 +02:00
Florian HENRY
bb6dda087c Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_eventorg 2021-09-01 15:23:04 +02:00
Florian HENRY
bae73b9a52 disabled module on inactive 2021-09-01 15:16:11 +02:00
Laurent Destailleur
741bc5da20 Fix label 2021-09-01 15:13:31 +02:00
Laurent Destailleur
375557e092 FIX Menu List of project was not visible. 2021-09-01 15:10:02 +02:00
Alexandre SPANGARO
dbe6861f79 Merge remote-tracking branch 'upstream/develop' into 15a8 2021-09-01 14:09:02 +02:00
Laurent Destailleur
239599d1b1
Merge pull request #18564 from OPEN-DSI/new-agenda-ext-enable-default
NEW can enable/disable external calendar by default
2021-09-01 13:44:12 +02:00
Laurent Destailleur
cd09099409
Merge pull request #18563 from atm-maxime/patch-3
Fix supplier invoice pdf generation canelle
2021-09-01 13:37:50 +02:00
Laurent Destailleur
9da82af74f
Merge pull request #18566 from Dolibarr/scrutinizer-patch-2
Scrutinizer Auto-Fixes
2021-09-01 13:36:20 +02:00
Laurent Destailleur
fb0bd41178 Fix trans 2021-09-01 13:02:36 +02:00
Laurent Destailleur
bcd835ddbd Fix tooltips 2021-09-01 12:34:59 +02:00
Laurent Destailleur
a48473ba7a Missing trans exclude 2021-09-01 12:22:44 +02:00
Laurent Destailleur
da8dcaa0c9 Fix look and feel v14 2021-09-01 12:15:23 +02:00
Francis Appels
9ad9145db3 Merge remote-tracking branch 'Dolibarr/14.0' into 14 2021-09-01 10:28:42 +02:00
Laurent Destailleur
dad4c34ec5 Debug module conference or booth 2021-08-31 23:51:45 +02:00
Laurent Destailleur
19f0db23df Fix scrutinizer bugs 2021-08-31 20:31:05 +02:00
Laurent Destailleur
f257d4372a Fix bad test 2021-08-31 20:21:20 +02:00
Scrutinizer Auto-Fixer
312ca95feb Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-08-31 18:18:28 +00:00
Laurent Destailleur
d2d7b0defd Fix duplicate ; 2021-08-31 20:15:41 +02:00
lvessiller
163b12925a FIX stickler-ci 2021-08-31 18:37:34 +02:00
lvessiller
d64bc49d10 FIX stickler-ci 2021-08-31 18:35:56 +02:00
lvessiller
c367c1009b FIX stickler-ci 2021-08-31 18:34:26 +02:00
lvessiller
4781dca2c2 FIX stickler-ci 2021-08-31 18:30:11 +02:00
lvessiller
6c2cf4377a NEW can enable/disable external calendar by default 2021-08-31 18:14:16 +02:00
Laurent Destailleur
72131110e7 Fix protect public pages 2021-08-31 18:03:37 +02:00
Maxime Kohlhaas
d09d036f06
Fix supplier invoice pdf generation canelle
Thirdparty wrongly fetched was causing errors on mass generation
2021-08-31 16:10:55 +02:00
Laurent Destailleur
c7444865a1 Fix css 2021-08-31 13:16:37 +02:00
Laurent Destailleur
0aa4868c34 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-31 13:14:01 +02:00
Laurent Destailleur
bbf219fd7b FIX Export of website generates a package that contains a sql error 2021-08-31 13:09:52 +02:00
Vincent Dieltiens
a3f4ba11aa regroup BILL_SUPPLIER_VALIDATE actions 2021-08-31 12:47:32 +02:00
Vincent Dieltiens
19587fb88b Regroup BILL_SUPPLIER_VALIDATE triggers under the same condition 2021-08-31 12:45:03 +02:00