Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-10 11:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
71,061 Commits 36 Branches 190 Tags
01e7b5747d3ece7bb4623c8889ffa98ebb39bc7c
Commit Graph

4615 Commits

Author SHA1 Message Date
Laurent Destailleur
d10c9cf565 FIX dir for modules must not have s at end (fix contracts into contract) 2018-06-06 23:47:48 +02:00
Laurent Destailleur
bb97119233 Fix duplicate function name 2018-06-06 18:07:32 +02:00
Laurent Destailleur
30b04c0d3d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/files.lib.php
 2018-06-05 18:16:32 +02:00
Laurent Destailleur
4c21ad4e4e FIX: dol_delete_file must work in a context without db handler loaded 
Conflicts:
	htdocs/core/lib/files.lib.php
 2018-06-05 18:12:14 +02:00
Laurent Destailleur
1671c8b6cc Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-06-05 18:06:30 +02:00
Laurent Destailleur
9c32e49bd3 FIX: dol_delete_file must work in a context without db handler loaded 2018-06-05 18:05:33 +02:00
Laurent Destailleur
87d073b5cd Fix conflict with external ticketsup module 2018-06-04 21:49:29 +02:00
Laurent Destailleur
29ee5dffc4 Clean code 2018-06-04 12:55:55 +02:00
Laurent Destailleur
d8d4d15b4b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-30 12:13:40 +02:00
Laurent Destailleur
de59892438 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2018-05-30 12:13:18 +02:00
Laurent Destailleur
02da9b6992 FIX #8893 to get formatted price as substitution vars 2018-05-30 11:04:44 +02:00
BENKE Charlene
4a7ac774f7 introduce fichinter rec models 2018-05-28 16:38:11 +02:00
Frédéric FRANCE
e2a557aadd limit length of lines to 500 chars 2018-05-27 15:04:12 +02:00
patrick Delcroix
ef37fccef4 Merge origin/patch-modulebuilder-supportsellist into patch-modulebuilder-supportsellist 2018-05-26 23:43:17 +02:00
patrick Delcroix
adda3144bc Fix Show double(x,y) fields 2018-05-26 23:39:36 +02:00
Laurent Destailleur
75b6dc6f61 Update modulebuilder.lib.php 2018-05-25 12:23:39 +02:00
Laurent Destailleur
8303dc1e6f Merge pull request #8815 from atm-florian/develop_fixproject 
NEW: add filter on project task list
 2018-05-25 10:56:10 +02:00
Laurent Destailleur
c56ef86bc3 Update project.lib.php 2018-05-25 10:50:16 +02:00
Laurent Destailleur
e51aa68284 Fix link to warehouses for events 2018-05-24 12:16:04 +02:00
delcroix Patrick
c85d216f8e Merge branch 'develop' into patch-modulebuilder-supportsellist 2018-05-22 22:24:20 +02:00
patrick Delcroix
2ccaf1ad95 New: support sellist in modulebuilder 2018-05-22 22:00:20 +02:00
Laurent Destailleur
1b20ec05d1 Save translation 2018-05-21 19:37:47 +02:00
florian HENRY
dd946dd197 add ressource 2018-05-21 11:03:48 +02:00
florian HENRY
f5c245cd19 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_fixproject 2018-05-21 10:59:10 +02:00
florian HENRY
986b4f78ba fix eldy comment 2018-05-18 13:54:07 +02:00
florian HENRY
a27c263747 NEW: add filter on project task list 2018-05-18 10:33:32 +02:00
Laurent Destailleur
e503aeb2e5 Merge pull request #8787 from aspangaro/8.0-a24 
Update module assets
 2018-05-18 09:05:46 +02:00
Laurent Destailleur
ef395fc36b Fix scrutinizer bugs 2018-05-16 15:23:52 +02:00
Alexandre SPANGARO
9c6f92986e Upgrade works 2018-05-11 21:48:22 +02:00
Laurent Destailleur
63b9384ef6 No transmormation of data objectid before calling trigger 2018-05-10 12:34:23 +02:00
Laurent Destailleur
2fb5de6136 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-10 12:30:14 +02:00
Laurent Destailleur
c094a6c43e Reorder permissions 2018-05-10 12:29:58 +02:00
Laurent Destailleur
fddd628f08 Merge pull request #8764 from hregis/develop_email 
NEW add pdf function to check if pdf file is protected/encrypted
 2018-05-10 12:08:58 +02:00
Laurent Destailleur
9077f18dd6 Update security.lib.php 2018-05-10 11:37:22 +02:00
Laurent Destailleur
8837193545 Merge branch 'develop' into permissions_hook 2018-05-10 11:36:08 +02:00
Laurent Destailleur
bc9eaaab84 Update security.lib.php 2018-05-10 11:34:20 +02:00
Laurent Destailleur
7be804dcf5 Update security.lib.php 2018-05-10 11:32:08 +02:00
Laurent Destailleur
0891766a3e Update security.lib.php 2018-05-10 11:31:27 +02:00
Laurent Destailleur
ea4c48047a All new hooks must be addreplace hooks 2018-05-10 11:30:27 +02:00
Regis Houssin
415b7425fd NEW add pdf function to check if pdf file is protected/encrypted 2018-05-08 09:45:10 +02:00
Laurent Destailleur
546da0ceda Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/core/modules/modStock.class.php
	htdocs/product/inventory/list.php
 2018-05-05 14:40:39 +02:00
altatof
a8ecce9e6d add hook for more permissions control 2018-05-05 14:31:17 +02:00
Laurent Destailleur
5cff4c152b Add tab "time spent" in project view. Can swith gantt/list. 2018-05-04 11:25:21 +02:00
Laurent Destailleur
08cf034e2f FIX to allow IRPF not null even if main VAT is null. 
From https://www.javierrguez.com/problema-facturas-irpf-sin-iva-dolibarr/
 2018-05-03 13:39:44 +02:00
Laurent Destailleur
124abd39b6 Code comment 2018-05-01 20:31:57 +02:00
Laurent Destailleur
dc9892f803 Fix bad log 2018-05-01 20:17:03 +02:00
Laurent Destailleur
3cad7c6998 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-01 12:51:46 +02:00
Laurent Destailleur
4eb4cf6506 Merge pull request #8693 from Librethic/fix-api-product-check-perm 
FIX : missing english name for object
 2018-05-01 10:19:27 +02:00
Laurent Destailleur
55f982e504 Removed deprecated FPDI option and reorganise PDF setup page 2018-04-30 09:28:24 +02:00
Laurent Destailleur
2fc2c44de4 Fix phpcs 2018-04-29 20:18:50 +02:00