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
Papoteur
d2c55ea07b
Factorize code between payments reports client/provider
2017-09-26 11:27:53 +02:00
Laurent Destailleur
1002923dea
Fix css
2017-09-26 10:58:24 +02:00
Laurent Destailleur
7f420f3246
Complete vat rates for india
2017-09-26 10:54:07 +02:00
Rui Strecht
ae47b8d3e6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2017-09-26 09:50:19 +01:00
Neil Orley
f5be144beb
NEW Consolidates REST dictionary APIs into a single tree and a single file
...
The php code of the files "htdocs / api / class / api_dictionary * .class.php" has been integrated into a single file: "htdocs / api / class / api_dictionary.class.php".
2017-09-26 10:48:35 +02:00
Laurent Destailleur
4f76545b62
Add missing fields to manage localtax on supplier products
2017-09-26 10:47:08 +02:00
Rui Strecht
542d00a230
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2017-09-26 09:40:26 +01:00
Laurent Destailleur
5482f80c0e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-26 10:30:47 +02:00
Laurent Destailleur
59571b1ce1
FIX #7473 Mass update of vat rates and other bugs on localtax
2017-09-26 10:29:44 +02:00
Neil Orley
ceb868493e
NEW get payement types using the REST API
...
Adds the ability to get payments types using the REST API
2017-09-26 10:12:42 +02:00
gauthier
79049f55b7
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_custom_meteo
2017-09-26 09:56:00 +02:00
Aurélien
a350a06755
Solve bug with alias name display
...
The bug display the alias name on the following name between brackets after name column.
2017-09-25 21:15:35 +02:00
Laurent Destailleur
f1791b5bf4
Better translation
2017-09-25 19:58:38 +02:00
Laurent Destailleur
c9e9f60f8f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-09-25 19:55:52 +02:00
Laurent Destailleur
c5287e68b1
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/admin/multicurrency.php
htdocs/core/modules/modFournisseur.class.php
2017-09-25 19:54:27 +02:00
Laurent Destailleur
3cc7f66e90
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-09-25 19:48:42 +02:00
Laurent Destailleur
919d29fdf7
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2017-09-25 19:45:40 +02:00
Laurent Destailleur
fe55feb82f
FIX #7461
2017-09-25 19:45:01 +02:00
Rui Strecht
6115093d8f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2017-09-25 18:33:10 +01:00
Laurent Destailleur
4c7b39f49e
FIX #7486 Empty value for multicurrency rate must be forbidden
2017-09-25 19:22:41 +02:00
Laurent Destailleur
698b13a229
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-25 19:08:29 +02:00
Laurent Destailleur
58bc30ae9a
Add indian vat
2017-09-25 19:08:17 +02:00
Laurent Destailleur
845a33653a
Fix translation
2017-09-25 19:07:57 +02:00
Laurent Destailleur
051ca6fdc4
Merge pull request #7162 from hguibourgdev/patch-5
...
NEW Can show stock in alert even if alter is set to 0
2017-09-25 18:17:18 +02:00
Laurent Destailleur
278f37fe5a
Merge pull request #7485 from hregis/develop_trad
...
Fix: uniformize code
2017-09-25 18:13:58 +02:00
Laurent Destailleur
dc362fcd30
NEW Can show currency in list of bank accounts
2017-09-25 18:11:03 +02:00