Commit Graph

73615 Commits

Author SHA1 Message Date
Laurent Destailleur
22b2af6911 Exclude dir 2018-11-18 15:46:37 +01:00
Laurent Destailleur
a179d45afd Remove deprecated translation keys 2018-11-17 23:40:10 +01:00
Laurent Destailleur
1cce95cb23 Trans 2018-11-17 23:35:49 +01:00
Laurent Destailleur
13d00b2eb1 Sync transifex 2018-11-17 23:14:12 +01:00
Laurent Destailleur
7f33403d43 Fix translation 2018-11-17 22:55:13 +01:00
Frédéric FRANCE
0ba388de5d
typo 2018-11-17 18:03:59 +01:00
Frédéric FRANCE
30b1db34cd
Update CMailFile.class.php 2018-11-17 11:33:01 +01:00
Alexandre SPANGARO
4e39065e29 Fix Page Salaries stats - Look & feel v9 2018-11-17 07:37:32 +01:00
Laurent Destailleur
a2c9fefee0 Fix do not show tool to check european vat if country is not in EEC 2018-11-17 00:40:39 +01:00
Laurent Destailleur
6b8a3094f0 Fix missing some keys in substitution arrays 2018-11-17 00:14:23 +01:00
Frédéric FRANCE
35142ac2fb
wip 2018-11-16 17:58:14 +01:00
Laurent Destailleur
028be21070 Debug 2018-11-16 16:55:53 +01:00
Laurent Destailleur
5d596fe584 Fix trackid must contains an id of instance 2018-11-16 16:43:13 +01:00
atm-quentin
a0d5607ba5 FIX error travis 2018-11-16 15:29:05 +01:00
atm-quentin
56d4a8a737 revert some code 2018-11-16 15:16:48 +01:00
Laurent Destailleur
3b193a8a7b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-16 14:13:18 +01:00
Laurent Destailleur
f32706259a Sync transifex 2018-11-16 14:13:00 +01:00
atm-quentin
7571760fdd fix errors during cherry picking 2018-11-16 11:31:23 +01:00
atm-quentin
4cc3fa1006 FIX we dont share object for accountancy 2018-11-16 11:23:27 +01:00
atm-quentin
70fdff5c27 revert getNextValue function + createfromclone entity 2018-11-16 11:23:14 +01:00
atm-quentin
c18f486179 set facture to invoice AND check invoicenumber conf 2018-11-16 11:20:03 +01:00
atm-quentin
e004fc2f5b FIX block page if cant fetch 2018-11-16 11:17:34 +01:00
atm-quentin
a8ab666d62 remplacement en masse des $conf->entity par des getEntity('facture') 2018-11-16 11:17:18 +01:00
atm-quentin
8e51204dff manage invoice with multicompany 2018-11-16 11:14:33 +01:00
François J
a5777d30e1 Fix Contact Agenda events filter when no Third Party
Handle case where the contact is not linked to any third party.
2018-11-16 10:09:25 +01:00
Frédéric FRANCE
ce6b7adaa0
Merge remote-tracking branch 'upstream/develop' into actionrefused 2018-11-15 22:15:45 +01:00
Frédéric FRANCE
12dcda7e02
Merge remote-tracking branch 'upstream/develop' into fieldlabel 2018-11-15 22:01:36 +01:00
Frédéric FRANCE
fd9d9d3a71
clean again 2018-11-15 21:38:27 +01:00
Frédéric FRANCE
532ce34c53
i put the sword under the carpet 2018-11-15 21:36:20 +01:00
Frédéric FRANCE
7c241620c0
replace random_bytes 2018-11-15 21:20:09 +01:00
Frédéric FRANCE
482c6efdd9
replace php > 5.4 code 2018-11-15 20:35:40 +01:00
Frédéric FRANCE
caa080f103
replace php > 5.4 code 2018-11-15 20:32:51 +01:00
Laurent Destailleur
6d640ab83c Fix feature to drag and drop rows of table (not generic) 2018-11-15 19:58:06 +01:00
Regis Houssin
2350908d4e FIX change getEntity doc and changelog 2018-11-15 19:00:14 +01:00
Regis Houssin
a0709895c5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2018-11-15 18:55:48 +01:00
Laurent Destailleur
0d443c434e
Merge pull request #10025 from hregis/develop_bug
FIX travis error again
2018-11-15 18:34:21 +01:00
Regis Houssin
ffc9b02322 FIX missing one column 2018-11-15 18:28:12 +01:00
Regis Houssin
38b4b719f0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_bug2 2018-11-15 18:27:50 +01:00
Regis Houssin
03acd7a40c FIX travis error again 2018-11-15 18:24:32 +01:00
Laurent Destailleur
e58dd3c0b1
Merge pull request #10024 from hregis/develop_bug
FIX travis errors
2018-11-15 18:21:25 +01:00
Laurent Destailleur
7d5c9959bc Close #9978
Better way to address the feature. Work in most cases, need less code
and less sql access.
2018-11-15 18:20:38 +01:00
Regis Houssin
531b6e8d2b FIX travis errors 2018-11-15 18:13:07 +01:00
Laurent Destailleur
103dfe2aa7 FIX go back to create form if error 2018-11-15 17:55:27 +01:00
Regis Houssin
2d2e836965 FIX more simple 2018-11-15 17:45:33 +01:00
Laurent Destailleur
b51004e809 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-15 17:34:36 +01:00
Laurent Destailleur
2d6f7f926c FIX xss injection on user address 2018-11-15 17:34:11 +01:00
Regis Houssin
aaa9a4f47c FIX use getEntity('invoice') instead getEntity('facture') 2018-11-15 17:27:49 +01:00
Laurent Destailleur
e1407c8289
Merge pull request #10012 from hregis/develop_mc
FIX compatibility between proposal sharing and proposalnumber sharing
2018-11-15 17:19:28 +01:00
Laurent Destailleur
6297e03ea9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-15 17:16:12 +01:00
Laurent Destailleur
4fa694569e
Merge pull request #10018 from Tetras-Libre/develop
Fix issue #9956 User can edit some of their data without permissons
2018-11-15 16:56:57 +01:00