Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
68,347 Commits 36 Branches 189 Tags
b8c88a214449d5129fd4c479249cfa7c2373d10d
Commit Graph

4381 Commits

Author SHA1 Message Date
Laurent Destailleur
186c8cdbf0 Fix selection of contact into creation of event 2017-11-12 13:40:05 +01:00
Laurent Destailleur
836f6bf3c9 Fix search filter when using extrafields 'links' 2017-11-12 12:39:23 +01:00
Laurent Destailleur
cba3a3846f Merge pull request #7790 from frederic34/facrecmodelpdf 
NEW generate also document when invoice is build from recurring template
 2017-11-11 17:42:26 +01:00
Laurent Destailleur
cb6bf91044 Merge pull request #7787 from libersoft/feature/correct-italian-address-format 
NEW Support Italian addresses format. Fixes #7785
 2017-11-11 17:38:29 +01:00
Laurent Destailleur
01a41237bf CSS 2017-11-11 14:20:08 +01:00
Laurent Destailleur
debc0480dd CSS 2017-11-10 20:20:59 +01:00
Laurent Destailleur
c2d7b88bdd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-11-10 13:51:59 +01:00
Laurent Destailleur
ab78007a54 Work on filemanager generic component 2017-11-10 13:45:38 +01:00
Frédéric FRANCE
6f647f8a40 generate doc on cron jobs 2017-11-09 23:39:28 +01:00
Laurent Destailleur
9b07f33649 Clear code 2017-11-09 09:50:55 +01:00
Laurent Destailleur
d18f65a6e2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/lib/functions.lib.php
 2017-11-09 01:25:41 +01:00
Laurent Destailleur
ad71a22994 Code comment 2017-11-09 01:21:02 +01:00
Laurent Destailleur
c8a551e7de Reorganize javascript at end of page. 2017-11-09 01:00:43 +01:00
Valerio Baldisserotto
15a501467e FR: Support Italian address format. Fixes #7785 2017-11-08 11:43:52 +01:00
Laurent Destailleur
e7abc92f97 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/transfer.php
	htdocs/core/lib/functions.lib.php
 2017-11-06 21:37:19 +01:00
Laurent Destailleur
bc093ef969 FIX #7775 Order of deletion in delete method (trigger first) 2017-11-06 19:27:10 +01:00
Laurent Destailleur
bc9b816719 Fix deletion of files that contains __ 2017-11-06 17:54:18 +01:00
Laurent Destailleur
864af9cc3b Fix error not returned if output directory not writable 2017-11-06 11:47:03 +01:00
Laurent Destailleur
ea5dd3eb3d NEW Add REST API for supplier proposals 2017-11-06 11:06:31 +01:00
Laurent Destailleur
534c50f46e Move api that are admin features into a dedicated /admin api 2017-11-06 09:55:31 +01:00
Laurent Destailleur
7139cbb490 Fix regression 2017-11-05 19:00:43 +01:00
Laurent Destailleur
fd8f65341b Merge pull request #7765 from bomuux/patch-3 
Fix: vat reports now include expense reports vat
 2017-11-05 18:37:25 +01:00
Laurent Destailleur
1e939ec90c Merge pull request #7761 from hregis/develop_member 
Fix: broken feature (add more attr and css class)
 2017-11-05 18:33:43 +01:00
Laurent Destailleur
202d36d582 Work on modulebuilder 2017-11-05 18:15:59 +01:00
Laurent Destailleur
e4ba6cfa10 Debu website module 2017-11-05 03:57:26 +01:00
Laurent Destailleur
c78c06776b Fix bug reported by scrutinizer 2017-11-05 03:39:27 +01:00
Laurent Destailleur
91950ccbc7 Fix regression in getRandomPassword 2017-11-05 03:03:17 +01:00
Laurent Destailleur
05ee3e3825 Fix show message "files uploaded" only once even when n files. 2017-11-05 01:06:34 +01:00
Laurent Destailleur
bac6a434f4 Add link to make a direct download on card 2017-11-04 17:11:58 +01:00
bomuux
0a2d8a820b FIX: make vat reports work with expensereports 
function tax_by_date : Fixed sql query for expense reports vat, now returning pad vat for expense report, previously returning nothing.
 2017-11-03 21:06:56 +01:00
Laurent Destailleur
e78406e120 Debug cronjob 2017-11-03 20:04:18 +01:00
Laurent Destailleur
f32f3ff17f Better default function to generate passwords 2017-11-03 18:02:17 +01:00
Laurent Destailleur
a346a1a5e9 Work on website module 2017-11-03 15:56:16 +01:00
Regis Houssin
2d4717b745 Fix: broken feature (add more attr and css class) 2017-11-03 14:46:45 +01:00
Laurent Destailleur
fa1fbe7db7 Work on websiteaccounts 2017-11-03 13:25:49 +01:00
Laurent Destailleur
ce3e586bd0 Fix doxygen 2017-11-03 11:44:31 +01:00
Laurent Destailleur
2a2c0aaa5f Clean and debug code to execute CLI commands 2017-11-02 20:17:27 +01:00
Laurent Destailleur
f5e1ca3178 Fix break on project 2017-11-02 15:33:04 +01:00
Laurent Destailleur
cfacfab6cf NEW Show badge with nbr of shipment on shimpen tab of order 
NEW Add button cancel on shipment creation
 2017-11-02 12:38:36 +01:00
Laurent Destailleur
dbd85321b3 Merge pull request #7735 from grandoc/new_branc_30_10_17 
Warning: trim() expects parameter 1 to be string, array given in /htt…
 2017-11-02 09:58:57 +01:00
Laurent Destailleur
6ea558b639 Update functions.lib.php 2017-11-02 09:58:22 +01:00
Laurent Destailleur
f26d970d58 Remove option MAIN_HTML5_PLACEHOLDER (on by default now) 2017-11-01 10:17:24 +01:00
Laurent Destailleur
9458c80c48 Work on reminders 2017-10-31 23:10:29 +01:00
Laurent Destailleur
d39a19e976 Replace on/off img tick with fa-font 2017-10-31 12:32:30 +01:00
Laurent Destailleur
bd94ec0f1d Use fontawesome for picto for on/off default. 2017-10-31 12:25:06 +01:00
Laurent Destailleur
068f5e32cb NEW Tooltip for substitutions variables on tooltips on admin pages 2017-10-31 11:17:44 +01:00
Laurent Destailleur
b29f32171c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/contrat/card.php
	htdocs/core/lib/project.lib.php
	htdocs/filefunc.inc.php
 2017-10-30 18:22:26 +01:00
Philippe GRAND
f904c46a10 Warning: trim() expects parameter 1 to be string, array given in /httpdocs/core/lib/functions.lib.php on line 520 2017-10-30 14:22:34 +01:00
Laurent Destailleur
33aa0f3160 Code comment 2017-10-29 17:49:24 +01:00
Laurent Destailleur
cd5e43483e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/lib/project.lib.php
	htdocs/expedition/card.php
	htdocs/projet/class/task.class.php
 2017-10-28 22:08:16 +02:00