Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
68,347 Commits 36 Branches 189 Tags
b8c88a214449d5129fd4c479249cfa7c2373d10d
Commit Graph

68347 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frédéric FRANCE
d6e98d3b05 Update CMailFile.class.php 2018-03-12 15:14:41 +01:00
Laurent Destailleur
f40e6e25c6 Move picto 2018-03-12 15:12:58 +01:00
Laurent Destailleur
1603837933 Report error in phpunit 2018-03-12 15:03:03 +01:00
Laurent Destailleur
a190732135 Add ticketsup in module to init 2018-03-12 15:01:59 +01:00
Frédéric FRANCE
cf77ef4f45 Update actions_ticketsup.class.php 2018-03-12 14:16:52 +01:00
Laurent Destailleur
8fa3cf7c6a Fix setup 2018-03-12 13:39:32 +01:00
Laurent Destailleur
735156f4b8 Try to fix phpunit error 2018-03-12 13:22:09 +01:00
Laurent Destailleur
0d1e26b02c Fix error management 2018-03-12 13:19:09 +01:00
Laurent Destailleur
97c93e35fc Add phpunit for ticket 2018-03-12 12:57:39 +01:00
Laurent Destailleur
591b0993af Fix PHPUnit for Ticket 2018-03-12 12:54:48 +01:00
Laurent Destailleur
0dfaa14d6e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-12 12:41:54 +01:00
Laurent Destailleur
3dfc94787c Fix sql injection 2018-03-12 12:41:43 +01:00
Laurent Destailleur
18b6b70f45 Merge pull request #8358 from frederic34/patch-2 
Update llx_ticketsup.sql
 2018-03-12 12:28:40 +01:00
Laurent Destailleur
98b7d4c2e2 NEW Can set the start/end date of service line in invoice templates 2018-03-12 12:27:40 +01:00
Frédéric FRANCE
98320ffad2 Update 7.0.0-8.0.0.sql 2018-03-12 08:36:18 +01:00
Frédéric FRANCE
478b3dfa42 Update llx_ticketsup.sql 2018-03-12 08:34:47 +01:00
Laurent Destailleur
f447d1287c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-11 23:56:27 +01:00
Laurent Destailleur
ae82d045f8 Dolibarrize module ticket 2018-03-11 23:56:17 +01:00
Laurent Destailleur
1ede43971d Dolibarrize module ticket 2018-03-11 23:40:25 +01:00
Laurent Destailleur
6ac070823f Fix phpcs 2018-03-11 23:22:55 +01:00
Laurent Destailleur
6da3fbe3c9 Translation 2018-03-11 23:21:14 +01:00
Laurent Destailleur
b5ca4ca391 PHPunit 2018-03-11 23:19:43 +01:00
Laurent Destailleur
f1f539d2a7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-11 23:08:10 +01:00
Laurent Destailleur
d1fbf2a80e Dolibarrize 2018-03-11 23:07:57 +01:00
Laurent Destailleur
cd10ed9308 Merge pull request #8355 from aspangaro/8.0-a8 
Fix : Remove two langs->load("sendings") and use loadLangs instead
 2018-03-11 23:05:10 +01:00
Laurent Destailleur
b965240439 Merge pull request #8353 from frederic34/patch-8 
Update ticketsup.php
 2018-03-11 23:03:45 +01:00
Laurent Destailleur
6d7b7ad4fe Merge pull request #8352 from frederic34/patch-2 
Update ticketsup.lang
 2018-03-11 23:03:28 +01:00
Alexandre SPANGARO
c0d4ca3682 Fix : Remove two langs->load("sendings") and use loadLangs instead 2018-03-11 22:28:27 +01:00
TuxGasy
34145ed443 Do not display multicurrency cols if currency of object is same as main currency 2018-03-11 21:58:32 +01:00
Laurent Destailleur
93f4d6fdcd Translation 2018-03-11 21:34:38 +01:00
Laurent Destailleur
51c94fadfa Look and feel v7 2018-03-11 21:31:34 +01:00
Laurent Destailleur
e1654f4215 Fix division by zero 2018-03-11 21:18:18 +01:00
Frédéric FRANCE
683486eaf1 Update html.formticketsup.class.php 2018-03-11 21:00:39 +01:00
Frédéric FRANCE
ad05ddfe5c Update ticketsup_extrafields.php 2018-03-11 20:42:39 +01:00
Frédéric FRANCE
111bbd98ce Update ticketsup.php 2018-03-11 20:36:52 +01:00
Frédéric FRANCE
b04d38e760 Update ticketsup.lang 2018-03-11 20:16:06 +01:00
Laurent Destailleur
b084ca4a50 Fix 2018-03-11 19:44:19 +01:00
Laurent Destailleur
2245a2eaf6 Merge pull request #8351 from hregis/develop_dict 
Fix: dolibarrizzzz
 2018-03-11 19:33:36 +01:00
Laurent Destailleur
21e15e19b0 Merge pull request #8350 from frederic34/patch-2 
Update ticketsup new.php
 2018-03-11 19:33:03 +01:00
Laurent Destailleur
43ac1adbc4 Fix phpcs 2018-03-11 19:32:28 +01:00
Laurent Destailleur
95e7062ca3 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-03-11 19:29:01 +01:00
Laurent Destailleur
d5d6939fd9 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-03-11 19:28:39 +01:00
Laurent Destailleur
a3d25b24d3 FIX #8285 Extrafields now reported by /api/index.php/agendaevents/{id} 2018-03-11 19:27:03 +01:00
Regis Houssin
a09bad6d69 Fix: wrong year 2018-03-11 18:59:45 +01:00
Regis Houssin
ecb44e2f53 Fix: wrong copy/paste 2018-03-11 18:57:36 +01:00
Frédéric FRANCE
da48dc6eab Update new.php 2018-03-11 18:56:04 +01:00
Regis Houssin
7c3984c9db Fix: dolibarrizzzz 2018-03-11 18:54:38 +01:00
Laurent Destailleur
6709b0934b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-11 18:35:01 +01:00
Laurent Destailleur
d28680e3ed Fix phpcs 2018-03-11 18:34:47 +01:00
Laurent Destailleur
43e297b142 Merge pull request #8138 from frederic34/patch-2 
Update price.php
 2018-03-11 18:33:16 +01:00