Commit Graph

61931 Commits

Author SHA1 Message Date
Laurent Destailleur
edc59b9290 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-11-10 15:49:20 +01:00
Laurent Destailleur
24c499aa44 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2018-11-10 15:48:53 +01:00
Laurent Destailleur
8eac45a762 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2018-11-10 15:48:07 +01:00
Laurent Destailleur
3d85407619 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2018-11-10 15:46:31 +01:00
Laurent Destailleur
ca1e3b4d55 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8 2018-11-10 15:15:33 +01:00
Laurent Destailleur
94bb1ac511 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.7 2018-11-10 12:49:22 +01:00
Laurent Destailleur
8893d8d59f Fix compatiblity with new version of PHP 2018-11-10 11:56:23 +01:00
Laurent Destailleur
aad0b700d4 Fix travis 2018-11-09 01:22:56 +01:00
Laurent Destailleur
f889c9994b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-11-09 01:21:13 +01:00
Laurent Destailleur
0d6709c9f7 Update phpcs config 2018-11-09 01:20:57 +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
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
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
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
Laurent Destailleur
064417dcf1
Merge pull request #9889 from atm-maxime/fix_invoice_from_contract2
Fix invoice creation from contract was invoicing closed services #9087
2018-10-30 21:13:38 +01:00
Marc de Lima Lucio
2fbc305683 FIX: task time screen: last fix was overkill 2018-10-30 16:00:56 +01:00
Laurent Destailleur
38396e490a
Merge pull request #9891 from frederic34/patch-17
Update brouillon when validate order
2018-10-30 14:17:29 +01:00
Marc de Lima Lucio
8911d72be8 FIX: task time screen: prevent users with access to all project from assigning to tasks they're not allowed to do 2018-10-30 12:28:04 +01:00
Frédéric FRANCE
a30091fd74
Update commande.class.php 2018-10-27 09:51:19 +02:00
Maxime Kohlhaas
1b054f1b36 Fix invoice creation from contract was invoicing closed services #9087 2018-10-27 09:21:49 +02:00
Laurent Destailleur
7c81124e66
Merge pull request #9869 from ATM-Marc/FIX_6.0_typhon_order_ref
FIX: pdf typhon: order reference duplicate
2018-10-26 15:18:19 +02:00
Marc de Lima Lucio
16c35035c1 FIX: pdf typhon: order reference duplicate 2018-10-25 12:07:40 +02:00
Laurent Destailleur
4060dd5377
Merge pull request #9826 from frederic34/patch-9
Update ajax.lib.php
2018-10-24 02:29:20 +02:00
Laurent Destailleur
52364f0fd9
Merge pull request #9834 from frederic34/patch-19
missing semicolon in MD style css
2018-10-24 02:29:02 +02:00
Laurent Destailleur
2ba6f96765
Update style.css.php 2018-10-24 02:27:59 +02:00
Laurent Destailleur
acaaf53085
Merge pull request #9843 from ATM-Nicolas/fix_variable
FIX : Variable name
2018-10-24 02:07:11 +02:00
ATM-Nicolas
cf28e4e442 FIX : Variable name 2018-10-22 15:19:33 +02:00
Frédéric FRANCE
83e2951107
Update style.css.php 2018-10-21 09:59:14 +02:00
Frédéric FRANCE
28c86a613d
Update style.css.php 2018-10-21 09:39:07 +02:00
Frédéric FRANCE
c4029f5e5f
Update style.css.php 2018-10-21 09:23:33 +02:00
Frédéric FRANCE
f322c73dd7
Update ajax.lib.php 2018-10-19 22:52:18 +02:00
Laurent Destailleur
6fde6e4250
Merge pull request #9787 from fmarcet/6.0
FIX: When delete a product, llx_product_association rows are not deleted
2018-10-19 14:06:50 +02:00
Ferran Marcet
ffde353441 FIX When delete a product, llx_product_association rows are not deleted 2018-10-17 10:06:06 +02:00
Ferran Marcet
bdae4e1c4d FIX When delete a product, llx_product_association rows are not deleted 2018-10-17 10:04:42 +02:00
Ferran Marcet
b462e7b217 FIX When delete a product, llx_product_association rows are not deleted 2018-10-17 10:01:02 +02:00
Laurent Destailleur
7cd8b36cea
Merge pull request #9755 from atm-greg/fix_massaction_delete_tasks
FIX modify parenting before task deletion
2018-10-16 19:45:43 +02:00
Laurent Destailleur
330824748b
Merge pull request #9750 from frederic34/patch-16
code comment
2018-10-16 19:37:32 +02:00
atm-greg
06477b40a0 modify parenting before task deletion 2018-10-15 12:34:14 +02:00
Frédéric FRANCE
4d6d3afbea
code comment 2018-10-15 08:39:46 +02:00
Laurent Destailleur
fabc11191d
Merge pull request #9739 from frederic34/patch-11
fix size of $head when replacing by hook
2018-10-14 16:27:14 +02:00
Laurent Destailleur
f9a66a34d0
Merge pull request #9738 from frederic34/patch-9
fix doc in import.lib.php
2018-10-14 16:24:47 +02:00
Laurent Destailleur
995f54ca52
Merge pull request #9735 from atm-ph/fix_6.0_sort_product_stock_list
Fix 6.0 sort product stock list
2018-10-14 16:23:30 +02:00
Frédéric FRANCE
70a98743e8
Update functions.lib.php 2018-10-14 10:48:06 +02:00
Frédéric FRANCE
1f1a614b47
Update import.lib.php 2018-10-14 10:21:06 +02:00
atm-ph
7b17b453bf Fix sort and switch page 2018-10-12 23:29:35 +02:00
atm-ph
23e4cd57f3 Fix warnings PHP7 2018-10-12 23:27:38 +02:00
Laurent Destailleur
87f744896d
Merge pull request #9733 from ATM-Marc/FIX_6.0_propal_customcode
FIX: propal pdf: missing parenthesis for customs code
2018-10-12 21:14:40 +02:00
Laurent Destailleur
d4b02c0552 Release 6.0.8 2018-10-12 19:03:03 +02:00