Commit Graph

3848 Commits

Author SHA1 Message Date
Laurent Destailleur
b93e35cdd2 Fix a lot of request to use the IN getentity instead of =
Fix a lot of request to use left join on type of payment table
2017-11-23 15:06:16 +01:00
Laurent Destailleur
b0cecab22b Removed useless code 2017-11-22 21:26:24 +01:00
Laurent Destailleur
240f67d82b Disable tab if not on develop mode 2017-11-22 21:23:42 +01:00
Laurent Destailleur
5fa8db1650 Work on timesheets 2017-11-22 21:19:40 +01:00
Laurent Destailleur
c3d8ef2104 Update functions.lib.php 2017-11-22 11:14:52 +01:00
Regis Houssin
848a27283b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_member 2017-11-22 09:51:57 +01:00
Regis Houssin
1595bb1148 NEW add possibility to remove address field 2017-11-22 09:51:46 +01:00
Laurent Destailleur
4b4412d5da Standardize file names for ECM 2017-11-20 19:40:34 +01:00
Laurent Destailleur
e19ca7b6d4 Work on generic filemanager 2017-11-20 18:19:41 +01:00
Laurent Destailleur
304819a726 Work on module builder 2017-11-19 16:26:39 +01:00
Laurent Destailleur
80bdb45be8 Look and feel v6 - Show status of thirdparty in dol_banner 2017-11-18 01:48:16 +01:00
Laurent Destailleur
742bf29c65 Look and feel v6 - Show status of thirdparty in dol_banner 2017-11-18 01:29:42 +01:00
Laurent Destailleur
2cb190fc5c Fix return code 2017-11-17 15:27:59 +01:00
Laurent Destailleur
ead629708c Look and feel v6 2017-11-17 14:57:14 +01:00
Laurent Destailleur
405275693f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/stock/replenishorders.php
	htdocs/projet/activity/perday.php
2017-11-17 14:20:08 +01:00
Laurent Destailleur
68f477eaf7 Merge pull request #7818 from dolibarr95/patch-29
Fix : syntax error in dol_print_graph()
2017-11-17 13:18:11 +01:00
Laurent Destailleur
e06087888b NEW Show line "other filtered task" when using filter on timesheet. 2017-11-16 22:55:04 +01:00
Laurent Destailleur
f153d9c9ff Fix time spent counted twice 2017-11-16 19:41:31 +01:00
Laurent Destailleur
4f25bc5e3b NEW detection of edge browser 2017-11-16 14:44:55 +01:00
Laurent Destailleur
c527189088 Standardize page name 2017-11-16 12:18:25 +01:00
dolibarr95
c6c1552c01 syntax error
bad syntax when add an url in dol_print_graph()
2017-11-15 11:11:45 +01:00
Laurent Destailleur
451d3ed8ed NEW Add API to activate/unactivate a contract 2017-11-14 17:51:04 +01:00
florian HENRY
e195cf0b95 fix : return vat code for supplier price 2017-11-14 09:53:06 +01:00
Laurent Destailleur
97c9549087 Fix ref supplier must be output if it exists, even for free products 2017-11-13 11:30:41 +01:00
Laurent Destailleur
f33182acc5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-11-12 20:49:53 +01:00
Laurent Destailleur
356525730d FIX #7786 2017-11-12 20:12:56 +01:00
Laurent Destailleur
955ed7dbbf NEW Show the supplier ref into supplier cards 2017-11-12 15:30:21 +01:00
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