Commit Graph

63105 Commits

Author SHA1 Message Date
Neil Orley
73fe991aed NEW Return the order object when validate
Return the order object when the order is validated using the REST API
2017-11-10 15:46:53 +01:00
Laurent Destailleur
beacf4225f Work on filemanager 2017-11-10 15:44:43 +01:00
Neil Orley
4e9dae5129 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api 2017-11-10 15:44:31 +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
Ion
cb463d186a Error when fetching empty expression 2017-11-10 12:32:54 +01:00
Ion
e95ee4b878 Fix old parseProductSupplier call 2017-11-10 12:32:54 +01:00
Ion
fdf260a1da Use __METHOD__ on dynamic prices syslog 2017-11-10 12:32:54 +01:00
Ion
f642289160 Add missing arg in supplier min price 2017-11-10 12:32:49 +01:00
atm-ph
2636c2470b Fix width of payment term is to large 2017-11-10 10:52:58 +01:00
Laurent Destailleur
11cc82e6d2 Update doc 2017-11-10 10:15:50 +01:00
Frédéric FRANCE
5621e85c00
comment 2017-11-10 00:26:01 +01:00
Frédéric FRANCE
6f647f8a40
generate doc on cron jobs 2017-11-09 23:39:28 +01:00
Laurent Destailleur
788d22d62d Can sort on link in bookmark page 2017-11-09 18:54:33 +01:00
Laurent Destailleur
9d3cf8f217 Fix can use tooltip with popup even for column titles 2017-11-09 18:50:15 +01:00
Laurent Destailleur
f6a0603fb0 Clean code/constant 2017-11-09 18:16:15 +01:00
Ion Agorria
aa0b811f73 Undefined variable detection in price parser 2017-11-09 17:12:55 +01:00
Ion
e528a82051 Remove price dynamic internal var 2017-11-09 17:12:55 +01:00
Laurent Destailleur
a2daef3450 Update doc 2017-11-09 16:13:39 +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
Neil Orley
e025167747 Modify getAvailability comments 2017-11-08 17:17:25 +01:00
Neil Orley
ac64ada264 NEW Get the list of delivery times
Get the list of delivery times using the REST API
2017-11-08 17:15:28 +01:00
Valerio Baldisserotto
15a501467e FR: Support Italian address format. Fixes #7785 2017-11-08 11:43:52 +01:00
Frédéric FRANCE
1ea6df14d0
Update card.php 2017-11-08 11:35:15 +01:00
Frédéric FRANCE
fe3ce78ae4
Update card.php 2017-11-08 11:24:33 +01:00
Laurent Destailleur
864e747f51 CSS 2017-11-07 19:46:28 +01:00
Laurent Destailleur
9f2e9ce6ef Shorter translation 2017-11-07 19:38:31 +01:00
Frédéric FRANCE
27ace14fb7
Fetch right account 2017-11-07 16:28:51 +01:00
Laurent Destailleur
f8a44431b5 Fix visibility of extrafields 2017-11-07 13:41:59 +01:00
Laurent Destailleur
14a43ba4d2 FIX sort on a date that is result of a MIN with mysql 2017-11-07 13:33:24 +01:00
Laurent Destailleur
bc79aced6c Fix extrafields with column perms not filled are not visible 2017-11-07 12:33:13 +01:00
Maxime Kohlhaas
82ea46c740 New dictionnaries are now pre-filtered on company country 2017-11-07 10:49:04 +01:00
Frédéric FRANCE
45afbae49c
some change 2017-11-07 10:47:58 +01:00
Laurent Destailleur
2ab943f85a Fix size of image by using fa picto 2017-11-07 00:18:55 +01:00
Frédéric FRANCE
d39804e7b5
Merge remote-tracking branch 'upstream/develop' into exportadmin 2017-11-06 21:41:09 +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
6eb2204c2b Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
	htdocs/product/list.php
2017-11-06 21:20:06 +01:00
Laurent Destailleur
1d9873e1a9 FIX #7756 Add better error message 2017-11-06 21:17:30 +01:00
Laurent Destailleur
9cc923f317 Fix for ch accounting account. 2017-11-06 21:12:29 +01:00
Laurent Destailleur
ea42fe28d2 Test ok on travis 2017-11-06 20:39:24 +01:00
Frédéric FRANCE
7f44faf0be
correct merge 2017-11-06 20:29:57 +01:00
Laurent Destailleur
d90e3e88c2 NEW Add method executeCLI and a phpunit 2017-11-06 20:24:12 +01:00
Laurent Destailleur
1f1809dd3e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-11-06 19:29:14 +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
40cb301915
Merge pull request #7773 from frederic34/accountingexport
NEW Can setup csv accounting export from admin config
2017-11-06 19:06:06 +01:00
Laurent Destailleur
bc9b816719 Fix deletion of files that contains __ 2017-11-06 17:54:18 +01:00
Laurent Destailleur
45fc5701ae NEW Add a profile to import product translations 2017-11-06 12:59:58 +01:00