Commit Graph

55113 Commits

Author SHA1 Message Date
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
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
d90f68837a Missing migration line 2017-11-25 00:59:25 +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
d7f5f14f46
Merge branch 'develop' into new_export_stock_valo 2017-11-24 16:40:36 +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
Laurent Destailleur
438a68968f Fix regression 2017-11-24 16:28:24 +01:00
Laurent Destailleur
831099fef8 Debug modulebuilder 2017-11-24 16:24:42 +01:00
Laurent Destailleur
5ee85821fc Debug modulebuilder 2017-11-24 15:47:38 +01:00
Laurent Destailleur
9f235e1ff6 Standardize database: field ref of warehouse was renamed label -> ref 2017-11-24 15:27:00 +01:00
Laurent Destailleur
3db52b5f9e Debug responsive of v7 2017-11-24 14:23:25 +01:00
Laurent Destailleur
8450c78dff Fix warning on late surveys 2017-11-24 10:06:42 +01:00
Laurent Destailleur
6d5f2b2f21 Fix filters on surveys 2017-11-24 10:00:46 +01:00
Laurent Destailleur
f0d0969a3b Better name for generated page of barcodes 2017-11-24 09:30:21 +01:00
Laurent Destailleur
abe13d108b Clean code used for autocompletion 2017-11-24 09:23:18 +01:00
Laurent Destailleur
9c22b5f335 Replace deprecated dol_print_graph with DolGraph 2017-11-23 20:24:05 +01:00
Laurent Destailleur
38ef5890dc Replace deprecated dol_print_graph with DolGraph 2017-11-23 18:47:24 +01:00
Maxime Kohlhaas
cad2fedf70 New add pmp and cost price in product stock export 2017-11-23 18:41:48 +01:00
Laurent Destailleur
5cf21fef05 Use autocompletion on list of taxes 2017-11-23 15:46:52 +01:00
Laurent Destailleur
39d00b2ea9 Standardize code 2017-11-23 15:24:25 +01:00
Laurent Destailleur
9bc6acdf0e Fix syntax error 2017-11-23 15:23:45 +01:00
Laurent Destailleur
6a3dc91414 Standardize code 2017-11-23 15:22:32 +01:00
Laurent Destailleur
b93e35cdd2 Fix a lot of request to use the IN getentity instead of =
Fix a lot of request to use left join on type of payment table
2017-11-23 15:06:16 +01:00
atm-quentin
314c30f489 FIX too much users on holiday list 2017-11-23 14:26:26 +01:00
Laurent Destailleur
295b4483d4 Enhance the repair.php tool 2017-11-23 13:23:16 +01:00
Regis Houssin
2a7b04e795 Fix: wrong table name and id field name 2017-11-23 12:18:49 +01:00
John
d8f18e18ce Add new doActions hook 2017-11-23 12:08:33 +01:00
Laurent Destailleur
b22dfcf533 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-11-23 09:49:25 +01:00
Laurent Destailleur
657d1137c0 Disable field if overwrite transaction is off 2017-11-23 09:49:15 +01:00