Commit Graph

63668 Commits

Author SHA1 Message Date
bomuux
0a2d8a820b
FIX: make vat reports work with expensereports
function tax_by_date : Fixed sql query for expense reports vat, now returning pad vat for expense report, previously returning nothing.
2017-11-03 21:06:56 +01:00
Laurent Destailleur
e78406e120 Debug cronjob 2017-11-03 20:04:18 +01:00
Philippe GRAND
acc69b1f80 fix : Warning: A non-numeric value encountered 2017-11-03 19:52:02 +01:00
Philippe GRAND
c31f852f67 fix : Warning: A non-numeric value encountered 2017-11-03 19:37:54 +01:00
Laurent Destailleur
f32f3ff17f Better default function to generate passwords 2017-11-03 18:02:17 +01:00
Laurent Destailleur
a72703d316 Fix deprecated code 2017-11-03 17:29:25 +01:00
Laurent Destailleur
048766bd24 Fix sql error 2017-11-03 17:24:14 +01:00
Laurent Destailleur
cd70e1506b Work on common core code 2017-11-03 17:20:08 +01:00
Laurent Destailleur
4ac8cb9168 Fix sql syntax 2017-11-03 16:31:33 +01:00
Laurent Destailleur
c479efa480 Fix encoding with select2 2017-11-03 16:29:23 +01:00
Laurent Destailleur
a346a1a5e9 Work on website module 2017-11-03 15:56:16 +01:00
Maxime Kohlhaas
73d3cc7ce3 New : merge categories while merging thirdparties 2017-11-03 15:23:18 +01:00
Regis Houssin
2d4717b745 Fix: broken feature (add more attr and css class) 2017-11-03 14:46:45 +01:00
Laurent Destailleur
458be3c814 Clean translation files 2017-11-03 14:38:00 +01:00
Laurent Destailleur
55386a3ae2 Work on website module 2017-11-03 13:52:03 +01:00
Laurent Destailleur
fa1fbe7db7 Work on websiteaccounts 2017-11-03 13:25:49 +01:00
Neil Orley
3ecccadb8b NEW Adds the payment reference to the return of the function getListOfPayements
Adds the payment reference to the return of the function getListOfPayements
2017-11-03 13:04:23 +01:00
Laurent Destailleur
ce3e586bd0 Fix doxygen 2017-11-03 11:44:31 +01:00
Laurent Destailleur
4381c35835 Standardize code 2017-11-03 11:42:40 +01:00
Laurent Destailleur
5f5c7a9126 NEW Show user id of web process in system info - web server 2017-11-03 11:42:24 +01:00
Maxime Kohlhaas
e992e4bea5 Fix : type was forced to 0 so service are not in the list 2017-11-03 09:09:07 +01:00
Maxime Kohlhaas
13667e4850 Fix display of product/service list 2017-11-03 08:56:23 +01:00
Alexandre SPANGARO
2d17e4094c Merge remote-tracking branch 'uptream/develop' into 7.0-accountancyproductvariant
# Conflicts:
#	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-11-03 06:18:27 +01:00
Laurent Destailleur
2a2c0aaa5f Clean and debug code to execute CLI commands 2017-11-02 20:17:27 +01:00
Frédéric FRANCE
b58df17545
default currency on propal create 2017-11-02 18:14:55 +01:00
Laurent Destailleur
26b01792b2 Code comment 2017-11-02 17:58:46 +01:00
Laurent Destailleur
a291919cf7
Merge pull request #7754 from atm-gauthier/6.0_fix_filter_typeactioncomm_with_multiselect
FIX : Wrong alias sql
2017-11-02 16:40:40 +01:00
gauthier
03544f783a FIX : Wrong alias sql 2017-11-02 16:16:29 +01:00
Laurent Destailleur
608f87d03b Set focus on first field to fill. 2017-11-02 16:14:24 +01:00
Laurent Destailleur
309e83a946 Remove the "add" in addpayment. Action in API is hosted by the method 2017-11-02 16:06:44 +01:00
Laurent Destailleur
36f7f32205 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-11-02 16:02:24 +01:00
Laurent Destailleur
d70f9e053e Remove the get in url. The GET is already in the method. 2017-11-02 16:01:13 +01:00
Laurent Destailleur
93ab4cadff
Merge pull request #7753 from Oeris/develop-api
NEW Add REST API to add payment line to a specific invoice
2017-11-02 15:54:22 +01:00
Laurent Destailleur
6ea69f421f
Merge pull request #7752 from atm-gauthier/6.0_fix_filter_typeactioncomm_with_multiselect
FIX : Filter type on actioncomm with multiselect doesn't work
2017-11-02 15:51:49 +01:00
Laurent Destailleur
310bf4bde4
Update peruser.php 2017-11-02 15:51:35 +01:00
Laurent Destailleur
ec3a07cd52
Try to restore compatibility when actioncode=CODE1,CODE2,... 2017-11-02 15:50:55 +01:00
Laurent Destailleur
63a363080e
Update index.php 2017-11-02 15:48:56 +01:00
Laurent Destailleur
323a0d7d0d
Update index.php 2017-11-02 15:48:24 +01:00
Laurent Destailleur
952bea4026
Merge pull request #7746 from fappels/7.0_new_shipment_update
New to #7702 option to add and delete lot from line
2017-11-02 15:44:52 +01:00
Laurent Destailleur
bdb685ddc4
Merge branch 'develop' into 7.0_new_shipment_update 2017-11-02 15:44:38 +01:00
Laurent Destailleur
feb04b4a22
Merge branch 'develop' into 7.0_new_shipment_update 2017-11-02 15:43:31 +01:00
Laurent Destailleur
f5e1ca3178 Fix break on project 2017-11-02 15:33:04 +01:00
Laurent Destailleur
1b28c45e2c PERF Links in getNomUrl use only one tag a instead of 2. 2017-11-02 15:19:14 +01:00
Neil Orley
be36a79e45 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api 2017-11-02 15:03:16 +01:00
Neil Orley
5febdf7bae NEW Add payment line to a specific invoice using the REST API
Add payment line to a specific invoice using the REST API
2017-11-02 15:01:38 +01:00
gauthier
b7cf434ebd FIX : Filter type on actioncomm with multiselect doesn't work 2017-11-02 14:58:33 +01:00
Laurent Destailleur
1f33c251fa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-11-02 14:17:08 +01:00
Laurent Destailleur
e39c73a916 Fix translation 2017-11-02 14:16:28 +01:00
Laurent Destailleur
555b37411f
Merge pull request #7750 from atm-florian/6.0_missinghook
fix : missing hook in accountancy
2017-11-02 13:53:45 +01:00
Laurent Destailleur
4d02984ae0
Merge pull request #7749 from hregis/develop_member
Fix: move some check in multicompany module
2017-11-02 13:52:36 +01:00