Commit Graph

70702 Commits

Author SHA1 Message Date
Laurent Destailleur
20d7c8bb8c FIX Total of timespent 2018-10-26 15:01:50 +02:00
Laurent Destailleur
5d249d71ca Fix menu at wrong place 2018-10-26 14:38:26 +02:00
Laurent Destailleur
0ba86d4e5b Trans 2018-10-26 12:22:31 +02:00
Laurent Destailleur
2ce7429735 Remove Google advert 2018-10-26 12:09:52 +02:00
Laurent Destailleur
cae83cd8e7 Add solution to translate 2018-10-26 11:10:04 +02:00
Laurent Destailleur
af18e1b043 FIX XSS 2018-10-25 19:38:45 +02:00
Laurent Destailleur
61ab507ba4 Fix navigation 2018-10-25 18:53:00 +02:00
Laurent Destailleur
8b601bd7fd Fix numbering of holidays 2018-10-25 18:50:53 +02:00
Laurent Destailleur
094bcc519f Fix show customer code only if customer in company tooltip 2018-10-25 17:25:36 +02:00
Laurent Destailleur
1ba716b82c Fix do not allow use of second or third tax without using 1st one. 2018-10-25 14:39:54 +02:00
Laurent Destailleur
5daf095fc6 FIX Title and content of automatic email of expense report 2018-10-25 14:05:22 +02:00
Laurent Destailleur
9ccdd10a81 FIXx format (html/text) of emails sent on leave request module 2018-10-25 13:19:56 +02:00
Laurent Destailleur
25a374bd9a NEW Notification module support expense report+holiday validation and
approval event.
2018-10-25 12:45:13 +02:00
Laurent Destailleur
277655b911 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-24 13:31:31 +02:00
Laurent Destailleur
f44162715e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-10-24 13:31:04 +02:00
Laurent Destailleur
30a2004d53 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-10-24 13:30:54 +02:00
Laurent Destailleur
4785884457 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-24 13:30:16 +02:00
Laurent Destailleur
8eb1af2b40 Start beta 2018-10-24 13:29:59 +02:00
Laurent Destailleur
c9dca22df2
Merge pull request #9854 from atm-john/NEW_missing_payment_date_col
NEW Add due date column in payment lists
2018-10-24 12:27:59 +02:00
Laurent Destailleur
9972521456
Merge pull request #9861 from atm-john/FIX_unit_select_form
FIX translation in select unit form
2018-10-24 12:25:55 +02:00
Laurent Destailleur
7a14a1716d
Merge pull request #9860 from atm-gauthier/7.0_fix_nb_occurrences_contrat
FIX : wrong occurence number of contract on contact card, we must only count externals
2018-10-24 12:24:57 +02:00
Laurent Destailleur
e23b11e52b
Merge pull request #9858 from frederic34/patch-9
fix phpcs
2018-10-24 12:24:06 +02:00
Laurent Destailleur
6edaf3a422
Merge branch 'develop' into patch-9 2018-10-24 12:24:00 +02:00
Laurent Destailleur
24f37c7bd7 CSS 2018-10-24 12:12:06 +02:00
Laurent Destailleur
36323752ed Project must be on a dedicated field 2018-10-24 12:00:54 +02:00
Laurent Destailleur
c2c4366c62 Removed duplicate translation 2018-10-24 11:38:16 +02:00
Laurent Destailleur
6d86727c0b Lang not loaded 2018-10-24 11:34:00 +02:00
Laurent Destailleur
2e0de15f95 Add public 2018-10-24 11:26:50 +02:00
Laurent Destailleur
f0743c55bb Fix phpcs 2018-10-24 11:24:10 +02:00
Laurent Destailleur
5f22d8c7ef Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-24 11:23:30 +02:00
Laurent Destailleur
1a4bb7ed12 FIX hover on line of movement list 2018-10-24 11:23:21 +02:00
Laurent Destailleur
aa0bcc6878 Fix phpcs 2018-10-24 11:15:14 +02:00
Laurent Destailleur
3e92582c1e Fix phpcs 2018-10-24 11:14:44 +02:00
Laurent Destailleur
d0ab12ba6e Fix not used var 2018-10-24 11:10:55 +02:00
John BOTELLA
fccea99e23 FIX translation in select unit form 2018-10-24 10:23:27 +02:00
gauthier
036f70860e FIX : wrong occurence number of contract on contact card, we must only count externals 2018-10-24 10:17:21 +02:00
John BOTELLA
a380d3e89b Fix missing group by in query 2018-10-24 09:21:30 +02:00
Frédéric FRANCE
2bc208675f
Update pdf_cyan.modules.php 2018-10-24 09:06:54 +02:00
Frédéric FRANCE
d9d346aab2
Update pdf_sponge.modules.php 2018-10-24 08:22:17 +02:00
Frédéric FRANCE
4747e93e39
Update pdf_eratosthene.modules.php 2018-10-24 08:18:21 +02:00
Frédéric FRANCE
2a6478a2c4
fix phpcs 2018-10-24 08:15:00 +02:00
Laurent Destailleur
eaab953ba2 Renamed mouvement.php into movement_list.php to follow dev rules 2018-10-24 03:50:18 +02:00
Laurent Destailleur
65a39269d9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/class/commondocgenerator.class.php
2018-10-24 03:39:33 +02:00
Laurent Destailleur
047d130081 Fix phpcs 2018-10-24 03:38:12 +02:00
Laurent Destailleur
01adaf253c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/bank/class/account.class.php
	htdocs/product/list.php
2018-10-24 03:35:44 +02:00
Laurent Destailleur
f0dc2df526 Fix code comment 2018-10-24 03:30:06 +02:00
Laurent Destailleur
2794439da5
Merge pull request #9839 from oas-services/7.0
NEW Compatibility with new Paybox HMAC requirement
2018-10-24 03:27:12 +02:00
Laurent Destailleur
1d80e16ad1
Merge pull request #9831 from frederic34/payment
payments
2018-10-24 03:25:01 +02:00
Laurent Destailleur
5c72a7630e
Merge pull request #9833 from IAS-SYSTEMS-CSC/develop
Fix : missing semicolon
2018-10-24 03:24:09 +02:00
Laurent Destailleur
094625f27c
Merge pull request #9821 from frederic34/fixpdf
fix new pdf
2018-10-24 03:02:28 +02:00