Laurent Destailleur
|
a329f7dc75
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
build/exe/doliwamp/doliwamp.iss
htdocs/accountancy/customer/list.php
htdocs/accountancy/supplier/list.php
|
2017-11-05 18:50:14 +01:00 |
|
Laurent Destailleur
|
0f298fdd68
|
Merge pull request #7772 from MagicFab/develop
FIX 7751 Improved missing Windows component message
|
2017-11-05 18:43:07 +01:00 |
|
Laurent Destailleur
|
d4d370d8c4
|
Merge pull request #7769 from aspangaro/7.0-7
Small code improve on bookkeeping card movement
|
2017-11-05 18:40:49 +01:00 |
|
Laurent Destailleur
|
8a8842c8f0
|
Merge pull request #7768 from hregis/develop_bug
Fix: move transversal mode management in multicompany module
|
2017-11-05 18:39:26 +01:00 |
|
Laurent Destailleur
|
d0e354f729
|
Merge pull request #7766 from aspangaro/7.0-6
FIX Missing fields for the table bookeeping_tmp on migration
|
2017-11-05 18:38:01 +01:00 |
|
Laurent Destailleur
|
fd8f65341b
|
Merge pull request #7765 from bomuux/patch-3
Fix: vat reports now include expense reports vat
|
2017-11-05 18:37:25 +01:00 |
|
Laurent Destailleur
|
3bca988968
|
Merge pull request #7764 from grandoc/new_branch_03_11_17
fix : Warning: A non-numeric value encountered
|
2017-11-05 18:35:35 +01:00 |
|
Laurent Destailleur
|
eb66a890cb
|
Merge pull request #7763 from grandoc/develop
fix : Warning: A non-numeric value encountered
|
2017-11-05 18:35:14 +01:00 |
|
Laurent Destailleur
|
1e939ec90c
|
Merge pull request #7761 from hregis/develop_member
Fix: broken feature (add more attr and css class)
|
2017-11-05 18:33:43 +01:00 |
|
Laurent Destailleur
|
aa7e9e156a
|
Merge pull request #7762 from atm-maxime/new_socmerge_cat
NEW merge categories while merging thirdparties
|
2017-11-05 18:30:53 +01:00 |
|
Laurent Destailleur
|
d453961afc
|
Merge pull request #7758 from atm-maxime/fix_search_service
Fix : type was forced to 0 so service are not in the list
|
2017-11-05 18:30:20 +01:00 |
|
Laurent Destailleur
|
21a0f11395
|
Merge pull request #7760 from Oeris/develop-api
NEW Adds the payment reference to the return of the function getListOfPayements
|
2017-11-05 18:29:59 +01:00 |
|
Laurent Destailleur
|
d3a0cff30a
|
Merge pull request #7755 from frederic34/currency
default currency on propal create
|
2017-11-05 18:28:40 +01:00 |
|
Laurent Destailleur
|
52421406ce
|
FIX #7751
|
2017-11-05 18:25:33 +01:00 |
|
Laurent Destailleur
|
eb4a5f6570
|
Fix link can't be a htm link in innosetup
|
2017-11-05 18:21:29 +01:00 |
|
Laurent Destailleur
|
202d36d582
|
Work on modulebuilder
|
2017-11-05 18:15:59 +01:00 |
|
Fabian Rodriguez
|
504219cedc
|
Improved missing Windows component message, see #7751
|
2017-11-05 10:46:43 -05:00 |
|
Alexandre SPANGARO
|
7d524f3364
|
Small code improve on bookkeeping card movement
|
2017-11-05 08:45:05 +01:00 |
|
Laurent Destailleur
|
e4ba6cfa10
|
Debu website module
|
2017-11-05 03:57:26 +01:00 |
|
Laurent Destailleur
|
c78c06776b
|
Fix bug reported by scrutinizer
|
2017-11-05 03:39:27 +01:00 |
|
Laurent Destailleur
|
91950ccbc7
|
Fix regression in getRandomPassword
|
2017-11-05 03:03:17 +01:00 |
|
Laurent Destailleur
|
a066bbcd89
|
Debug filemanager
|
2017-11-05 02:50:02 +01:00 |
|
Laurent Destailleur
|
ef6fcbbc67
|
Clean code to have the filemanager beeing a reusable component
|
2017-11-05 02:04:05 +01:00 |
|
Laurent Destailleur
|
05ee3e3825
|
Fix show message "files uploaded" only once even when n files.
|
2017-11-05 01:06:34 +01:00 |
|
Laurent Destailleur
|
51c705a84b
|
NEW Reduce size of HTML page by removing duplicate tooltips
|
2017-11-05 01:00:15 +01:00 |
|
Laurent Destailleur
|
8aec77fd8b
|
Fix restore the blockui on refresh
|
2017-11-05 00:48:19 +01:00 |
|
Laurent Destailleur
|
d8ef24ff0b
|
Clean code of the filemanager
|
2017-11-05 00:37:21 +01:00 |
|
Laurent Destailleur
|
800fe9e1d8
|
Add warning test to avoid sql errors
|
2017-11-04 20:03:08 +01:00 |
|
Laurent Destailleur
|
6802f1f5b8
|
Debug module builder
|
2017-11-04 17:20:08 +01:00 |
|
Laurent Destailleur
|
bac6a434f4
|
Add link to make a direct download on card
|
2017-11-04 17:11:58 +01:00 |
|
Laurent Destailleur
|
403067812d
|
Modulebuilder
|
2017-11-04 16:42:32 +01:00 |
|
Regis Houssin
|
ef44dfc472
|
Fix: move transversal mode management in multicompany module
|
2017-11-04 15:40:35 +01:00 |
|
Laurent Destailleur
|
86eb028beb
|
Repair datec empty for products
|
2017-11-04 15:25:52 +01:00 |
|
Laurent Destailleur
|
141bef0b8a
|
Fix translation and css
|
2017-11-04 15:21:35 +01:00 |
|
Alexandre SPANGARO
|
26cb4bc6f6
|
FIX Missing fields for the table bookeeping_tmp on migration
|
2017-11-04 08:10:05 +01:00 |
|
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 |
|