Commit Graph

65694 Commits

Author SHA1 Message Date
Laurent Destailleur
7a3f088fcb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-19 18:19:11 +01:00
Laurent Destailleur
77bc1c4313 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/core/actions_massactions.inc.php
2018-11-19 18:18:43 +01:00
Laurent Destailleur
fcb9b693cf
Merge pull request #10042 from atm-gauthier/6.0_fix_massaction_sendinvoicebymail
FIX : We want to be able to send PDF of paid invoices
2018-11-19 18:14:12 +01:00
Laurent Destailleur
1e50e0576b
Merge pull request #10039 from atm-florian/7.0
fix list agenda extrafield visibility
2018-11-19 18:09:21 +01:00
gauthier
ecdfa5219b FIX : We want to be able to send PDF of paid invoices 2018-11-19 17:31:45 +01:00
florian HENRY
dc2f1e9812 fix list agenda extrafield visibility 2018-11-19 11:25:48 +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
1b377c0c48
Merge pull request #10004 from atm-gauthier/7.0_fix_payment_modes
FIX : fourn payment modes musn't be available on customer docs
2018-11-15 16:28:26 +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
Laurent Destailleur
7f79bb1ffb
Merge pull request #10002 from tarrsalah/fix-sql-performance-on-create-supplier-invoice
FIX slow SQL query on creating a new supplier invoice
2018-11-12 12:54:05 +01:00
tarrsalah
5eb897e049 FIX sql query performance on list_qualified_avoir_supplier_invoices. 2018-11-12 12:11:40 +01:00
Laurent Destailleur
c492b3328b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-10 15:50:00 +01:00
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
d827601857 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-09 01:25:35 +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
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
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
e84e7f02c8
Merge pull request #9963 from atm-john/fix_marge_sign
FIX marge sign
2018-11-08 19:37:52 +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
e92a63ba73 FIX If we change customer/supplier rule we can't edit old thirdparty. 2018-11-08 17:15:35 +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
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
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
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
02eaaaa53e
Merge pull request #9934 from atm-maxime/fix_mandatory_tracking
Fix tracking field in dictionnary should not be mandatory #8919
2018-11-05 09:22:24 +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
Maxime Kohlhaas
29c0448a2e Fix parent link was not removed on societe deletion #9106 2018-11-01 15:41:58 +01:00
Maxime Kohlhaas
d1133916e0 Fix tracking field in dictionnary should not be mandatory 2018-11-01 15:33:14 +01:00
Laurent Destailleur
4b402aa6d1 Fix regression on name of array 2018-10-31 15:41:00 +01:00
Laurent Destailleur
07719eaf1e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-31 15:31:44 +01:00
Laurent Destailleur
ca726e6c94 FIX Error generating ODT when option to use contact on doc on 2018-10-31 15:31:22 +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