Commit Graph

59895 Commits

Author SHA1 Message Date
Laurent Destailleur
f85ab8d0a6 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/comm/propal/card.php
2018-11-19 15:55:41 +01:00
Laurent Destailleur
f2bbb54b8f
Merge pull request #10011 from atm-gauthier/7.0_fix_search_categ_product_on_supplierorderlist
FIX : filter on product category doesn't work
2018-11-15 16:44:40 +01:00
Laurent Destailleur
3ca45e0e40 Fix double dot in sql filename 2018-11-15 10:59:55 +01:00
gauthier
85dd0ec2dd FIX : filter on product category doesn't work 2018-11-13 15:24:53 +01:00
gauthier
f404cae546 FIX : Same on customer card 2018-11-12 16:04:42 +01:00
gauthier
66ea8bbe87 FIX : fourn payment modes musn't be available on customer docs 2018-11-12 15:58:41 +01:00
tarrsalah
5eb897e049 FIX sql query performance on list_qualified_avoir_supplier_invoices. 2018-11-12 12:11:40 +01:00
Laurent Destailleur
5ec602cafa
Merge pull request #9983 from hregis/8.0_bug
FIX missing field "visible"
2018-11-10 12:19:35 +01:00
Regis Houssin
ee06f36f4c FIX missing field "visible" 2018-11-09 11:36:20 +01:00
Regis Houssin
5d1d77a966 FIX missing action "edit" for the hook 2018-11-09 10:32:08 +01:00
Laurent Destailleur
8a89da25c6 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/margin/tabs/thirdpartyMargins.php
2018-11-08 20:18:13 +01:00
Laurent Destailleur
400b48bd9b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-08 20:14:59 +01:00
Laurent Destailleur
9012f6ecc5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-08 20:14:40 +01:00
Laurent Destailleur
1b8649be6f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-08 20:14:02 +01:00
Laurent Destailleur
d6bd325f70
Merge pull request #9980 from atm-john/fix_supplier_order_list_socid
FIX supplier order list keep socid
2018-11-08 20:13:52 +01:00
Laurent Destailleur
9a31a61c9d FIX #9971 2018-11-08 20:05:01 +01:00
Laurent Destailleur
f919e6ddb0
Merge pull request #9971 from atm-gauthier/FIX_langs_projet
FIX : OppStatusShort doesn't exists
2018-11-08 20:00:49 +01:00
Laurent Destailleur
76ac3bd457 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-08 19:57:42 +01:00
Laurent Destailleur
be788e6167 FIX responsive 2018-11-08 19:57:31 +01:00
Laurent Destailleur
e84e7f02c8
Merge pull request #9963 from atm-john/fix_marge_sign
FIX marge sign
2018-11-08 19:37:52 +01:00
Laurent Destailleur
01baddb096
Merge pull request #9959 from hregis/8.0_bug
FIX export only prices of the current entity !
2018-11-08 19:26:09 +01:00
Laurent Destailleur
d1aabf9566
Merge pull request #9976 from atm-john/fix_warning
FIX Warning: count()
2018-11-08 19:25:32 +01:00
Laurent Destailleur
78778e4c58
Merge pull request #9948 from frederic34/patch-9
FIX mode is only customer in stats fichinter
2018-11-08 19:16:00 +01:00
Laurent Destailleur
588de2cc86 Fix filter on entity on project 2018-11-08 18:45:02 +01:00
Laurent Destailleur
27dcf18637 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-08 18:43:31 +01:00
Laurent Destailleur
e92a63ba73 FIX If we change customer/supplier rule we can't edit old thirdparty. 2018-11-08 17:15:35 +01:00
John BOTELLA
98548337ae FIX supplier order list keep socid 2018-11-08 15:38:25 +01:00
Frédéric FRANCE
8bb1545ed0
Update index.php 2018-11-08 12:16:05 +01:00
Frédéric FRANCE
670eed1e68
Update index.php 2018-11-08 12:13:07 +01:00
John BOTELLA
7c4dad2728 FIX Warning: count() 2018-11-08 12:12:45 +01:00
Laurent Destailleur
c55f83b0b7 Fix multicompany filter missing 2018-11-08 11:25:29 +01:00
gauthier
70826c3191 FIX : same on lines 2018-11-07 16:32:23 +01:00
gauthier
05a679a10c FIX : OppStatusShort doesn't exists 2018-11-07 16:26:25 +01:00
John BOTELLA
9d780a1722 Fix sign 2018-11-07 10:11:29 +01:00
Regis Houssin
d32fd9fda5 FIX export only prices of the current entity ! 2018-11-06 18:08:29 +01:00
Laurent Destailleur
7e33af6677 Fix max size 2018-11-06 17:40:59 +01:00
Laurent Destailleur
52aa860008 Code comment 2018-11-06 09:39:22 +01:00
Laurent Destailleur
f0305a7beb Prepare 8.0.4 2018-11-05 13:50:12 +01:00
Laurent Destailleur
4c591daab1 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/core/class/html.formprojet.class.php
2018-11-05 10:39:22 +01:00
Laurent Destailleur
56a70ab4e5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-05 10:23:15 +01:00
Laurent Destailleur
693cf72fca
Merge pull request #9920 from ATM-Marc/FIX_6.0_task_activity_access
FIX: task time screen: bad task assignments
2018-11-05 10:21:28 +01:00
Laurent Destailleur
2900947019 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-05 09:56:57 +01:00
Laurent Destailleur
e1e0001fda Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-05 09:56:00 +01:00
Laurent Destailleur
8b373fb7a3
Merge pull request #9935 from atm-maxime/fix_socdelete_unlink_parent
Fix parent link was not removed on societe deletion #9106
2018-11-05 09:35:41 +01:00
Laurent Destailleur
98a3af620b FIX #9934 2018-11-05 09:26:23 +01:00
Laurent Destailleur
d130e79384
Merge pull request #9936 from ptibogxiv/patch-84
Fix payout
2018-11-05 09:17:18 +01:00
Frédéric FRANCE
488ac8c8f0
Update index.php 2018-11-03 23:44:25 +01:00
Frédéric FRANCE
c01113e28b
typo 2018-11-03 22:49:30 +01:00
Frédéric FRANCE
d6b909a280
Update index.php 2018-11-03 18:26:11 +01:00
Frédéric FRANCE
8ab53012b7
mode is only customer in stats fichinter 2018-11-03 18:20:36 +01:00