Commit Graph

63374 Commits

Author SHA1 Message Date
Laurent Destailleur
e1484caa59 Fix responsive 2017-11-25 17:21:53 +01:00
Laurent Destailleur
4c8b8dcba5 Fix sort order 2017-11-25 16:53:37 +01:00
Laurent Destailleur
9b8011f75b Fix class not found 2017-11-25 16:52:04 +01:00
Laurent Destailleur
1ea9137863 Fix sort order 2017-11-25 16:21:44 +01:00
Laurent Destailleur
5ba4a57b61 Fix sort on last actions 2017-11-25 16:05:45 +01:00
Laurent Destailleur
e99f190ff1 Save search context on list of template invoices 2017-11-25 15:56:36 +01:00
Laurent Destailleur
dbcb38dd3b Use short label on table 2017-11-25 15:13:39 +01:00
Laurent Destailleur
1d97dd2bd8 NEW can filter on status of template invoices 2017-11-25 15:08:19 +01:00
Laurent Destailleur
bb1efb42ce Update doc 2017-11-25 14:58:16 +01:00
Laurent Destailleur
6a8388dd57 Add table for online signature 2017-11-25 14:11:34 +01:00
Laurent Destailleur
5bc2b34386 Fix error in api to get a member 2017-11-25 13:30:08 +01:00
Laurent Destailleur
7d3325c087 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	dev/dolibarr_changes.txt
	htdocs/user/class/api_users.class.php
2017-11-25 13:17:38 +01:00
Laurent Destailleur
77509ee37a Removed deprecated apis 2017-11-25 13:14:28 +01:00
Laurent Destailleur
a5dda258cd Fix scrutinizer 2017-11-25 12:18:23 +01:00
Laurent Destailleur
0b9a3087ea Fix bug reported by scrutinizer 2017-11-25 12:11:02 +01:00
Laurent Destailleur
944d666d1a Fix bugs 2017-11-25 11:27:24 +01:00
Laurent Destailleur
aaf08ade2f Fix bug reported by scrutinizer 2017-11-25 11:21:31 +01:00
Laurent Destailleur
412c4e335d Fix method of herited object has same signature than parent 2017-11-25 11:10:52 +01:00
Laurent Destailleur
61798d1af0 FIX list of module not complete when module mb_strlen not available
Conflicts:
	dev/dolibarr_changes.txt
2017-11-25 02:34:24 +01:00
Laurent Destailleur
bdecef56f9 FIX list of module not complete when module mb_strlen not available 2017-11-25 02:32:25 +01:00
Laurent Destailleur
88841ccbae FIX #7590 2017-11-25 01:58:11 +01:00
Laurent Destailleur
4cbcf5189a FIX #7806 2017-11-25 01:24:24 +01:00
Laurent Destailleur
38c770ffb3 FIX #7806 2017-11-25 01:16:12 +01:00
Laurent Destailleur
d90f68837a Missing migration line 2017-11-25 00:59:25 +01:00
Laurent Destailleur
3edc18696d
Merge pull request #5906 from defrance/patch-34
introduce SHIPPING on proposal (like in order)
2017-11-25 00:57:27 +01:00
Laurent Destailleur
0ec8c3c296
Merge branch 'develop' into patch-34 2017-11-25 00:57:10 +01:00
Laurent Destailleur
6876049779
Update 4.0.0-5.0.0.sql 2017-11-25 00:56:24 +01:00
Laurent Destailleur
b8251bac97 Fix rename files with accents 2017-11-25 00:48:19 +01:00
Laurent Destailleur
4cff4c6935 Simplify and standardize code for agenda pages 2017-11-25 00:12:45 +01:00
Laurent Destailleur
c16a150a70 NEW Remove background on agenda view when event is a not busy event. 2017-11-24 20:02:46 +01:00
Laurent Destailleur
7ea96d53a2 Minor fixes 2017-11-24 18:12:01 +01:00
Laurent Destailleur
63d2d38c5f Fix export stock with lot 2017-11-24 17:47:40 +01:00
Laurent Destailleur
8659d97e97 Fix export of lot must use properties of lot from product_lot 2017-11-24 17:44:19 +01:00
Laurent Destailleur
4f4f929efb Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/holiday/class/holiday.class.php
2017-11-24 17:02:14 +01:00
Laurent Destailleur
07cd1fb3c2 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-11-24 16:54:38 +01:00
Laurent Destailleur
2493c2468d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
	htdocs/core/class/conf.class.php
	htdocs/core/lib/files.lib.php
2017-11-24 16:51:59 +01:00
Laurent Destailleur
0370368d04 Restore lost field during merge 2017-11-24 16:46:50 +01:00
Laurent Destailleur
e109be4a23
Merge pull request #7865 from atm-maxime/new_export_stock_valo
New add pmp and cost price in product stock export
2017-11-24 16:44:16 +01:00
Laurent Destailleur
b54e42f852
Merge branch 'develop' into new_export_stock_valo 2017-11-24 16:42:19 +01:00
Laurent Destailleur
d7f5f14f46
Merge branch 'develop' into new_export_stock_valo 2017-11-24 16:40:36 +01:00
Laurent Destailleur
306dcf3600
Merge pull request #7863 from atm-quentin/6.0
FIX too much users on holiday list
2017-11-24 16:39:06 +01:00
Laurent Destailleur
c2f84309db
Update holiday.class.php 2017-11-24 16:38:52 +01:00
Laurent Destailleur
9836f42bc8
Merge pull request #7862 from atm-john/add_puschasesjournal_hook
Add new doActions hook
2017-11-24 16:37:26 +01:00
Laurent Destailleur
06de67cb8a
Update purchasesjournal.php 2017-11-24 16:37:19 +01:00
Laurent Destailleur
b052722cf1
Merge pull request #7861 from hregis/develop_member
Fix: wrong table name and id field name
2017-11-24 16:36:22 +01:00
Laurent Destailleur
e22d13cf55
Merge pull request #7860 from IonAgorria/resources-country
Add country to resource
2017-11-24 16:35:52 +01:00
Laurent Destailleur
aa2397ff1d
Merge pull request #7859 from vvnt/patch-9
modPropale.class.php permissions in English
2017-11-24 16:34:02 +01:00
Laurent Destailleur
8bd2707678
Merge pull request #7858 from vvnt/patch-8
modFacture.class.php permissions in English
2017-11-24 16:33:42 +01:00
Laurent Destailleur
a18824050c
Merge pull request #7857 from vvnt/patch-7
modSociete.class.php permissions in English
2017-11-24 16:33:22 +01:00
Laurent Destailleur
21764ed0cf
Merge pull request #7856 from frederic34/patch-1
Update html.form.class.php
2017-11-24 16:33:00 +01:00