Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-22 01:11:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
88,160 Commits 36 Branches 190 Tags
2627bec686d2bc3d3bfe0b945320d4b51f863cdb
Commit Graph

20896 Commits

Author SHA1 Message Date
Laurent Destailleur
bdc73b5cae Update pdf_crabe.modules.php 2020-05-28 17:37:53 +02:00
stickler-ci
56259bae9a Fixing style errors. 2020-05-28 14:18:00 +00:00
glu000
9915d97adf Fix #13991 2020-05-28 16:11:02 +02:00
atm-lena
edc6abcea8 FIX Rounding Total TVA in "crabe" model pdf 2020-05-28 15:19:37 +02:00
Supermanu
e9d94c878b Fix compatibility with delete perm in massactions 2020-05-28 14:56:20 +02:00
Laurent Destailleur
1838cf92ef Look and feel v12 2020-05-28 11:51:49 +02:00
Laurent Destailleur
32aecb553b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
 2020-05-28 11:44:58 +02:00
Laurent Destailleur
45615081ec FIX Bad use/detetion of text/html when forging template email. 2020-05-28 11:41:48 +02:00
Laurent Destailleur
f66555b396 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-27 23:38:46 +02:00
Laurent Destailleur
689289acd0 Doc 2020-05-27 23:20:26 +02:00
Laurent Destailleur
479ca770ba Removed database handler for MSSql since it rely on a function that does 
not exist anymore in PHP 7+
 2020-05-27 23:15:41 +02:00
Laurent Destailleur
e787978890 Doc 2020-05-27 23:12:26 +02:00
Laurent Destailleur
a2a15ceb5b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/demandes.php
	htdocs/core/class/html.form.class.php
 2020-05-27 23:07:18 +02:00
Laurent Destailleur
e37e45f984 Debug credit transfer 2020-05-27 22:35:55 +02:00
Laurent Destailleur
15f2165c12 Fix work on payment by bank transfer (avoid confusion between record) 2020-05-27 20:14:11 +02:00
Laurent Destailleur
ceda05a879 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-05-27 14:39:38 +02:00
Laurent Destailleur
e2680fa29a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/html.form.class.php
 2020-05-27 14:39:19 +02:00
Laurent Destailleur
16625af34e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/files.lib.php
	htdocs/core/tpl/filemanager.tpl.php
 2020-05-27 14:28:20 +02:00
Laurent Destailleur
3ef1ca1764 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/files.lib.php
	htdocs/ecm/class/ecmfiles.class.php
	htdocs/ecm/index.php
 2020-05-27 14:24:03 +02:00
Laurent Destailleur
a207365bd2 FIX XSS using the renaming of .noexe files - reported by Nolan. 2020-05-27 13:12:18 +02:00
Laurent Destailleur
0b48ffe3cd Removed not used var $useglobalvars 2020-05-27 11:38:28 +02:00
Laurent Destailleur
c0ce584487 Look and feel v12 2020-05-27 00:26:04 +02:00
Laurent Destailleur
00484d5938 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-26 23:23:31 +02:00
Laurent Destailleur
9aeb79e80c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-05-26 23:22:45 +02:00
Laurent Destailleur
e02aa4e41b FIX Default bank account was not loaded for document generation. 2020-05-26 23:22:14 +02:00
Laurent Destailleur
c607c2daa0 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-26 22:31:47 +02:00
Laurent Destailleur
91ecd3455f Fix CSS 2020-05-26 22:30:11 +02:00
Laurent Destailleur
da8bd7507e NEW Add mass action to set category on a list of website pages. 2020-05-26 22:29:46 +02:00
Laurent Destailleur
05ac3de2f0 Enhance search / filter 2020-05-26 12:46:51 +02:00
Laurent Destailleur
2d30d33303 NEW Can filter on container type, language and tags in the list of pages 
of website module.
 2020-05-26 12:25:41 +02:00
atm-quentin
1c45866409 FIX missing accountancy report menu for simple accountancy conf 2020-05-26 10:33:07 +02:00
Laurent Destailleur
3aaefd15b0 Fix set of categories 2020-05-26 01:07:43 +02:00
Laurent Destailleur
5f90596bb7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-26 00:20:36 +02:00
Laurent Destailleur
ab176cd078 Merge pull request #13937 from frederic34/Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 
add new rule
 2020-05-26 00:20:12 +02:00
Laurent Destailleur
f9f5beb064 NEW Can set tags/categories to website pages. 2020-05-26 00:19:32 +02:00
Laurent Destailleur
89e32d33a4 Merge pull request #13969 from Dolibarr/revert-13782-free_email 
Revert "NEW enable free emails input with select2"
 2020-05-25 23:13:13 +02:00
Laurent Destailleur
80ace3b52c Revert due to regressions 2020-05-25 23:05:29 +02:00
Laurent Destailleur
a80270ebb5 Revert "clean" 
This reverts commit 7e7a10f8d2.
 2020-05-25 23:01:25 +02:00
Laurent Destailleur
faf7a379ba Revert "clean" 
This reverts commit 8f9ee3250d.
 2020-05-25 23:01:20 +02:00
Laurent Destailleur
d169162ef1 Revert "NEW enable free emails input with select2" 2020-05-25 22:56:29 +02:00
Laurent Destailleur
26eab1f285 Merge pull request #13782 from frederic34/free_email 
NEW enable free emails input with select2
 2020-05-25 22:55:36 +02:00
Laurent Destailleur
40816c02ce Merge branch 'develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-25 22:40:59 +02:00
Laurent Destailleur
d08fc174c4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-25 22:23:51 +02:00
Laurent Destailleur
2fe8e03ed6 Fix missing quote 2020-05-25 22:23:22 +02:00
Laurent Destailleur
41d5d9b6f8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-25 22:21:52 +02:00
Laurent Destailleur
ba047428e2 Fix duplicate \n 2020-05-25 22:21:36 +02:00
Laurent Destailleur
17382051c2 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-25 22:19:50 +02:00
Laurent Destailleur
19bcdb6418 Fix structured data 2020-05-25 22:19:28 +02:00
Laurent Destailleur
e4ef6334aa Look and feel v12 2020-05-25 14:08:36 +02:00
Laurent Destailleur
26177489c9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-25 13:46:39 +02:00