Commit Graph

65414 Commits

Author SHA1 Message Date
Laurent Destailleur
cd71e49762 Picto ticket module 2018-03-13 10:42:58 +01:00
Laurent Destailleur
5d512af4b4 Fix migration 2018-03-13 09:53:33 +01:00
Laurent Destailleur
c375fd58be
Merge pull request #8366 from ptibogxiv/patch-12
ADD key_account variable for stripe or other gateway
2018-03-13 09:40:52 +01:00
Laurent Destailleur
c75cb4167e
Merge pull request #8364 from frederic34/patch-2
Update ticketsup.class.php
2018-03-13 09:39:25 +01:00
Laurent Destailleur
b34e176060
Merge pull request #8365 from ptibogxiv/patch-11
Fix SQL and ADD support LIVE/TEST mode
2018-03-13 09:38:22 +01:00
Laurent Destailleur
490acd96dc
It is better to let the caller decide which mode (live or not) to take 2018-03-13 09:37:59 +01:00
ptibogxiv
d6be9651a0
ADD key_account variable for stripe or other gateway 2018-03-13 00:29:28 +01:00
ptibogxiv
9408a98c52
Fix SQL and ADD support LIVE/TEST mode 2018-03-13 00:26:09 +01:00
Laurent Destailleur
01f25b00b0 Test 2018-03-12 23:43:47 +01:00
Laurent Destailleur
16dc00a7fc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-12 21:29:34 +01:00
Laurent Destailleur
7b864aeaec Fix regression with live box 2018-03-12 21:29:03 +01:00
Frédéric FRANCE
08bca60ae2
Update ticketsup.class.php 2018-03-12 20:52:39 +01:00
Frédéric FRANCE
56d023165e
Update ticketsup.class.php 2018-03-12 20:43:38 +01:00
Laurent Destailleur
e6de2ab40e
Merge pull request #8362 from frederic34/patch-9
Update CMailFile.class.php for swiftmailer
2018-03-12 20:32:44 +01:00
Laurent Destailleur
a4fd9e83ba
Merge pull request #8361 from frederic34/patch-2
Update typo actions_ticketsup.class.php
2018-03-12 20:32:08 +01:00
Laurent Destailleur
717a1daf28 Fix sql injection 2018-03-12 20:26:47 +01:00
Laurent Destailleur
3e1cc1f03f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-12 20:16:58 +01:00
Laurent Destailleur
ae5080dab4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-12 20:16:23 +01:00
Laurent Destailleur
f2bba8fb03 Fix translation 2018-03-12 20:11:34 +01:00
Laurent Destailleur
d045dca003 Fix financial commitment 2018-03-12 20:04:25 +01:00
Laurent Destailleur
8f21f0e265 Fix financial commitment 2018-03-12 20:03:32 +01:00
Laurent Destailleur
7a338de15d Fix enable module 2018-03-12 19:33:47 +01:00
Laurent Destailleur
612d36a2f8 Fix phpunit 2018-03-12 19:32:57 +01:00
Laurent Destailleur
bf36d671ba Fix ticket deletion 2018-03-12 19:30:21 +01:00
Laurent Destailleur
78b0585798 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/taxes.php
2018-03-12 19:09:57 +01:00
Laurent Destailleur
55d3e72463 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/contact/class/contact.class.php
	htdocs/societe/card.php
2018-03-12 19:02:30 +01:00
Laurent Destailleur
4068bbd0b2 Enable module ticketsup 2018-03-12 18:22:39 +01:00
Laurent Destailleur
cbbaf4763b Start to introduce thirdparty website accounts 2018-03-12 16:04:23 +01:00
Laurent Destailleur
7362b3f3d7 Add table to store thirparty account in external web sites 2018-03-12 15:59:03 +01:00
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