Laurent Destailleur
|
9b07f33649
|
Clear code
|
2017-11-09 09:50:55 +01:00 |
|
Laurent Destailleur
|
d18f65a6e2
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/core/lib/functions.lib.php
|
2017-11-09 01:25:41 +01:00 |
|
Laurent Destailleur
|
ad71a22994
|
Code comment
|
2017-11-09 01:21:02 +01:00 |
|
Laurent Destailleur
|
c8a551e7de
|
Reorganize javascript at end of page.
|
2017-11-09 01:00:43 +01:00 |
|
Laurent Destailleur
|
864e747f51
|
CSS
|
2017-11-07 19:46:28 +01:00 |
|
Laurent Destailleur
|
9f2e9ce6ef
|
Shorter translation
|
2017-11-07 19:38:31 +01:00 |
|
Laurent Destailleur
|
f8a44431b5
|
Fix visibility of extrafields
|
2017-11-07 13:41:59 +01:00 |
|
Laurent Destailleur
|
14a43ba4d2
|
FIX sort on a date that is result of a MIN with mysql
|
2017-11-07 13:33:24 +01:00 |
|
Laurent Destailleur
|
bc79aced6c
|
Fix extrafields with column perms not filled are not visible
|
2017-11-07 12:33:13 +01:00 |
|
Laurent Destailleur
|
2ab943f85a
|
Fix size of image by using fa picto
|
2017-11-07 00:18:55 +01:00 |
|
Laurent Destailleur
|
e7abc92f97
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/bank/transfer.php
htdocs/core/lib/functions.lib.php
|
2017-11-06 21:37:19 +01:00 |
|
Laurent Destailleur
|
6eb2204c2b
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
htdocs/product/list.php
|
2017-11-06 21:20:06 +01:00 |
|
Laurent Destailleur
|
1d9873e1a9
|
FIX #7756 Add better error message
|
2017-11-06 21:17:30 +01:00 |
|
Laurent Destailleur
|
9cc923f317
|
Fix for ch accounting account.
|
2017-11-06 21:12:29 +01:00 |
|
Laurent Destailleur
|
d90e3e88c2
|
NEW Add method executeCLI and a phpunit
|
2017-11-06 20:24:12 +01:00 |
|
Laurent Destailleur
|
1f1809dd3e
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-11-06 19:29:14 +01:00 |
|
Laurent Destailleur
|
bc093ef969
|
FIX #7775 Order of deletion in delete method (trigger first)
|
2017-11-06 19:27:10 +01:00 |
|
Laurent Destailleur
|
40cb301915
|
Merge pull request #7773 from frederic34/accountingexport
NEW Can setup csv accounting export from admin config
|
2017-11-06 19:06:06 +01:00 |
|
Laurent Destailleur
|
bc9b816719
|
Fix deletion of files that contains __
|
2017-11-06 17:54:18 +01:00 |
|
Laurent Destailleur
|
45fc5701ae
|
NEW Add a profile to import product translations
|
2017-11-06 12:59:58 +01:00 |
|
Laurent Destailleur
|
825ceeaa8d
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-11-06 11:47:20 +01:00 |
|
Laurent Destailleur
|
864af9cc3b
|
Fix error not returned if output directory not writable
|
2017-11-06 11:47:03 +01:00 |
|
Laurent Destailleur
|
8429de031f
|
Code comment
|
2017-11-06 11:32:02 +01:00 |
|
Laurent Destailleur
|
fe103f0492
|
Remove too verbose log
|
2017-11-06 11:14:16 +01:00 |
|
Laurent Destailleur
|
ea5dd3eb3d
|
NEW Add REST API for supplier proposals
|
2017-11-06 11:06:31 +01:00 |
|
Laurent Destailleur
|
534c50f46e
|
Move api that are admin features into a dedicated /admin api
|
2017-11-06 09:55:31 +01:00 |
|
Laurent Destailleur
|
34bd785785
|
Prepre 7.0 (not stable code hidden)
|
2017-11-06 09:30:30 +01:00 |
|
Laurent Destailleur
|
fa999dfa65
|
Merge pull request #7742 from aspangaro/7.0-accountancyproductvariant
NEW Accountancy Add variant on sell account for intracommunity sales & export sales
|
2017-11-06 09:25:14 +01:00 |
|
Frédéric FRANCE
|
ea910adeb2
|
Merge branch 'develop' into accountingexport
|
2017-11-05 21:11:41 +01:00 |
|
Laurent Destailleur
|
7139cbb490
|
Fix regression
|
2017-11-05 19:00:43 +01:00 |
|
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
|
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
|
202d36d582
|
Work on modulebuilder
|
2017-11-05 18:15:59 +01:00 |
|
Frédéric FRANCE
|
bb252846e3
|
accounting export admin config
|
2017-11-05 11:48:41 +01: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 |
|