Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-04 08:02:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
102,201 Commits 37 Branches 191 Tags
b04ea59a514d2c65ca55c4987e9894d95331a6e1
Commit Graph

25183 Commits

Author SHA1 Message Date
Laurent Destailleur
b04ea59a51 More sql sanitizing 2021-09-02 13:58:42 +02:00
Laurent Destailleur
cac1a7ba5f Fix sql request when using encrypt 2021-09-02 13:45:44 +02:00
Laurent Destailleur
8600d8d00d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-01 22:50:06 +02:00
Laurent Destailleur
076bfd82a3 FIX option "Default value for field 'Refuse bulk emailings'" 2021-09-01 22:38:47 +02:00
Laurent Destailleur
c762840dec FIX option "Default value for field 'Refuse bulk emailings'" 2021-09-01 22:37:15 +02:00
Laurent Destailleur
7c7e89cc3b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
 2021-09-01 18:41:44 +02:00
Laurent Destailleur
4810db3dbf Merge pull request #18498 from GurvanKervern/undefVars2 
Undef vars2
 2021-09-01 18:36:26 +02:00
Laurent Destailleur
c4acfe5fc0 Merge pull request #18577 from Givriz/dev_2 
Compatibility phpv8
 2021-09-01 18:06:06 +02:00
Laurent Destailleur
82d878dd7a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
 2021-09-01 17:59:07 +02:00
Laurent Destailleur
79a25248cd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
 2021-09-01 17:55:32 +02:00
Laurent Destailleur
74f3b98ea9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
 2021-09-01 17:54:21 +02:00
Laurent Destailleur
38c0e93285 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/public/project/index.php
 2021-09-01 17:52:04 +02:00
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
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
b66bd781a4 Clean code 2021-09-01 16:26:59 +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
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
375557e092 FIX Menu List of project was not visible. 2021-09-01 15:10:02 +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
19f0db23df Fix scrutinizer bugs 2021-08-31 20:31:05 +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
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
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
Laurent Destailleur
cceba665a2 NEW Option "Add a link on the PDF to make the online payment" 2021-08-31 12:29:14 +02:00
Laurent Destailleur
b29fc5552d Fix id in link 2021-08-30 22:10:26 +02:00
Laurent Destailleur
60832c6e87 css 2021-08-30 21:48:46 +02:00
Laurent Destailleur
8639956b79 Fix position of information on lines of documents 2021-08-30 21:22:00 +02:00
Laurent Destailleur
b78771f8c4 Fix select empty value for thirdparties select combo 2021-08-30 18:56:52 +02:00
lmarcouiller
31abb98a91 Fix : KnowledgeManagement menu permission 2021-08-30 14:38:36 +02:00
Laurent Destailleur
fbdee1316a Code comment 2021-08-29 19:36:11 +02:00
Gurvan Kervern
66d1e5c74d Update eldy.lib.php 2021-08-29 18:15:09 +08:00
Laurent Destailleur
3336b5c405 Fixed implementation for #18373 2021-08-28 21:19:04 +02:00
Laurent Destailleur
c188ef0438 Fixed implementation for #18373 2021-08-28 21:09:52 +02:00
Laurent Destailleur
20e681d025 Revert "[NEW] PDF Document ref in title option" 2021-08-28 20:59:12 +02:00
Laurent Destailleur
f2f3c5daf5 Merge pull request #18373 from bb2a/PDF_Ref_In_Title 
[NEW] PDF Document ref in title option
 2021-08-28 20:41:55 +02:00
Laurent Destailleur
e2eaa9b46e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-28 18:54:48 +02:00
Gurvan Kervern
5fd0e6ac28 Update eldy.lib.php 2021-08-29 00:50:00 +08:00
Laurent Destailleur
de44dcb691 Fix var init 2021-08-28 18:48:24 +02:00
Laurent Destailleur
fb8723d884 Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons 
replace remaining SubmitCancel buttons
 2021-08-28 18:39:06 +02:00