lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
61,857 Commits 43 Branches 150 Tags 886 MiB
154d5c876c
Commit Graph

61857 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Laurent Destailleur
0dfbc8d72f doxygen 2017-09-26 16:03:08 +02:00
florian HENRY
eacb221ffe fix : add missing column into service's contract lines 2017-09-26 15:15:39 +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
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
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
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
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
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
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