gauthier
4084da28d1
FIX : revert wrong code
2017-09-27 15:21:36 +02:00
arnaud
f29ea35dc8
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_comment_generic_element
2017-09-27 14:56:52 +02:00
Neil Orley
bb4b2c5d88
NEW Get the list of payments terms
...
Adds the ability to get the list of payments terms using the REST API.
2017-09-27 12:34:41 +02:00
Neil Orley
8c8868d76d
Remove spaces
2017-09-27 12:32:18 +02:00
Neil Orley
b8afabfd0b
Change RestException return code 503 to 400 (Bad request) when the request is incorrect : SQL error or wrong sqlfilter
...
Add comment to getPaymentTypes function
Change the "API class for" description from "payment type" to "dictionaries"
Change Copyright to add all previous devs
2017-09-27 12:27:47 +02:00
Neil Orley
154d5c876c
NEW Get the list of payments terms
...
Adds the ability to get the list of payments terms using the REST API.
2017-09-27 12:24:19 +02:00
dolibarr95
00862913d8
Add the attribute accept to input tag
...
I know this is not a security check but it is more convenient for the user when in a form only images or pdf are accepted for example.
see :
*https://www.w3.org/wiki/HTML/Elements/input/file
*https://www.w3schools.com/TagS/att_input_accept.asp
Hope every body needs it.
tks
2017-09-27 11:12:38 +02:00
arnaud
8866683a72
Merge branch '6.0' of github.com:Dolibarr/dolibarr into FIX_replenish_stock_line_0
2017-09-27 10:55:49 +02:00
arnaud
7f807986d7
FIX replenish if line test GETPOST on line 0
2017-09-27 10:53:29 +02:00
Rui Strecht
f05495b439
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2017-09-27 09:34:32 +01:00
gauthier
1694737e0b
NEW : new param on load_board() function in ActionComm class to avoid duplicate code
2017-09-27 10:09:21 +02:00
dolibarr95
3849da4fe4
Line missing (error 500)
...
Create an instance of ProductFournisseur.
2017-09-27 09:09:38 +02:00
Laurent Destailleur
8ae798f2e5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-26 22:11:27 +02:00
Laurent Destailleur
f1a563625b
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
2017-09-26 22:11:00 +02:00
Laurent Destailleur
c5f30f0d80
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2017-09-26 22:07:31 +02:00
Laurent Destailleur
04f4a81736
FIX #7505
2017-09-26 22:06:59 +02:00
Laurent Destailleur
d232f8e3d5
Merge pull request #7500 from dolibarr95/patch-19
...
Try to fix 7492
2017-09-26 20:57:37 +02:00
Laurent Destailleur
7cf1a41853
Try to replace error into warning, so we can still make the order if qty too low
2017-09-26 20:57:09 +02:00
Laurent Destailleur
68708d7344
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-26 20:32:00 +02:00
Laurent Destailleur
938989d2e4
Update doc
2017-09-26 20:31:39 +02:00
Laurent Destailleur
36b199e78c
Merge pull request #7433 from tysauron/patch-11
...
For use ajax combobox for societe and contacts in action card create.
2017-09-26 20:13:52 +02:00
Laurent Destailleur
4dd737fe44
Merge pull request #7503 from fappels/develop
...
Dispatch clean code and remove deprecated code
2017-09-26 20:06:44 +02:00
Laurent Destailleur
6b9e754221
Merge pull request #7496 from papoteur-mga/rapports_paiements
...
Rapports paiements
2017-09-26 20:02:09 +02:00
Laurent Destailleur
5b0440e66b
Merge pull request #7491 from Oeris/6.0-api
...
NEW get payment types using the REST API + consolidates REST dictionary APIs
2017-09-26 19:58:22 +02:00
Laurent Destailleur
dc790e62ce
Merge pull request #7501 from atm-florian/fix_missing_into_service_list
...
fix : add missing column into service's contract lines
2017-09-26 19:55:57 +02:00
Laurent Destailleur
53997c5d8c
Merge pull request #7488 from AurelienC/patch-1
...
FIX Solve bug with alias name shown on wrong thirdparty in list
2017-09-26 19:35:24 +02:00
Laurent Destailleur
15c8515d53
Fix default
2017-09-26 19:08:04 +02:00
Rui Strecht
d6037f269c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2017-09-26 16:27:23 +01:00
Laurent Destailleur
7178bf0132
Work on direct external link for dolibarr objects
2017-09-26 16:56:33 +02:00
fappels
ca6ad909e7
remove deprecated file
2017-09-26 16:23:00 +02:00
fappels
7d965f58d6
Clean code
2017-09-26 16:21:28 +02:00
Laurent Destailleur
d7dd6ed334
Fix undefined var
2017-09-26 16:15:22 +02:00
fappels
35835a8b09
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop
2017-09-26 16:13:17 +02:00
gauthier
d270a8e009
FIX : same than precedent commit
2017-09-26 16:09:40 +02:00
Laurent Destailleur
0dfbc8d72f
doxygen
2017-09-26 16:03:08 +02:00
fappels
d4488cb040
Fix for 'lessone' mode
2017-09-26 15:44:40 +02:00
florian HENRY
eacb221ffe
fix : add missing column into service's contract lines
2017-09-26 15:15:39 +02:00
gauthier
8de9c5cd36
FIX : forgotten php doc on function parameter
2017-09-26 14:18:26 +02:00
dolibarr95
7b106bc642
Try to fix 7492
...
check if enough quantity
2017-09-26 14:13:11 +02:00
Laurent Destailleur
d1bee67b40
FIX #3991
2017-09-26 13:09:19 +02:00
florian HENRY
6fcfe89565
NEW : lettrage in accountancy
2017-09-26 13:02:29 +02:00
Laurent Destailleur
e140878458
NEW Can import local tax rates in prices
2017-09-26 13:00:09 +02:00
Papoteur
cc9954e95e
Clean debug messages
2017-09-26 12:51:14 +02:00
Laurent Destailleur
74a2a4c257
Better translation
2017-09-26 12:34:18 +02:00
gauthier
7f938bc517
NEW : unexistant function load_state_board() on several objects
2017-09-26 12:32:58 +02:00
fappels
2fe0736b87
Update qty dispatched on qty change
...
Store qty dispatched and qty ordered only once per orderline
2017-09-26 12:32:50 +02:00
Laurent Destailleur
76f1dbe16b
FIX #7288
2017-09-26 12:25:26 +02:00
Papoteur
50d639f1fa
Add total and subtotal in payments reports
2017-09-26 12:10:51 +02:00
Laurent Destailleur
49982b36ac
FIX #7490
2017-09-26 11:55:19 +02:00
Papoteur
cbe1683fe7
Invoice number on one line instead of two (issue#7487)
2017-09-26 11:30:28 +02:00
