Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-21 00:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
68,062 Commits 36 Branches 190 Tags
2c7029850aadb9106ee5341f11f079dda48c0fd6
Commit Graph

14378 Commits

Author SHA1 Message Date
ptibogxiv
3aa0bdfe5c ADD trigger when modify, delete thirdparty 
More fix todo with new class of stripe.class.php
 2018-03-13 12:17:57 +01:00
Frédéric FRANCE
c76dce64d3 add object in pdf_build_address source 2018-03-13 12:15:03 +01:00
Laurent Destailleur
8048259733 Work on ticket module integration 2018-03-13 12:13:47 +01:00
Laurent Destailleur
cd71e49762 Picto ticket module 2018-03-13 10:42:58 +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
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
Frédéric FRANCE
d6e98d3b05 Update CMailFile.class.php 2018-03-12 15:14:41 +01:00
Laurent Destailleur
0d1e26b02c Fix error management 2018-03-12 13:19:09 +01:00
Laurent Destailleur
591b0993af Fix PHPUnit for Ticket 2018-03-12 12:54:48 +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
Laurent Destailleur
ae82d045f8 Dolibarrize module ticket 2018-03-11 23:56:17 +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
Frédéric FRANCE
683486eaf1 Update html.formticketsup.class.php 2018-03-11 21:00:39 +01:00
Laurent Destailleur
b084ca4a50 Fix 2018-03-11 19:44:19 +01:00
Regis Houssin
a09bad6d69 Fix: wrong year 2018-03-11 18:59:45 +01:00
Regis Houssin
7c3984c9db Fix: dolibarrizzzz 2018-03-11 18:54:38 +01:00
Laurent Destailleur
70490e2b4b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/ticketsup/class/actions_ticketsup.class.php
 2018-03-11 18:29:19 +01:00
Laurent Destailleur
8b6dea218b Dolibarrize module 2018-03-11 18:28:27 +01:00
Laurent Destailleur
d9b55f2275 Merge branch 'develop' into dev_ticketsup 2018-03-11 18:12:47 +01:00
Laurent Destailleur
baf6fc6a8b Merge pull request #8343 from atm-maxime/develop 
Fix mail send
 2018-03-11 18:11:37 +01:00
Laurent Destailleur
0005b1bc48 Merge pull request #8342 from atm-florian/dev_fixscrunitiz 
fix scrunitizer
 2018-03-11 18:11:13 +01:00
Laurent Destailleur
40cf236f92 Merge branch 'develop' into ticketsup_core 2018-03-11 18:10:11 +01:00
Laurent Destailleur
d6eee30ee9 Merge pull request #8336 from defrance/patch-106 
add sql log on install debug
 2018-03-11 18:06:18 +01:00
Laurent Destailleur
dea80eba4e Use a constant name starting with MAIN 2018-03-11 18:06:08 +01:00
jfefe
3b814ebba2 Try to fix phpunit test (br tag isuue) 2018-03-11 16:54:39 +01:00
Laurent Destailleur
7ffce2a28f Dolibarize 2018-03-11 16:48:44 +01:00
jfefe
c3fab4c54c Fix Phpunit issue 2018-03-11 16:48:26 +01:00
florian HENRY
cfdaa7c88d ticket sup make it work 2018-03-11 16:07:13 +01:00
Maxime Kohlhaas
df185de6ae Fix mail send 2018-03-11 15:09:25 +01:00
florian HENRY
6d8566a238 fix scrunitizer 2018-03-11 12:41:48 +01:00
jfefe
0f96575b41 Fix PHPCS errors with ticketsup module 2018-03-11 12:06:57 +01:00
Laurent Destailleur
0ac1d8b226 Dolibarize 2018-03-11 11:33:24 +01:00
Laurent Destailleur
e14d2f08b8 Dolibarize 2018-03-11 11:12:38 +01:00
BENKE Charlene
bfaffe6692 Changes Done 2018-03-11 10:51:05 +01:00
jfefe
79acb79ae0 Begin integration of module « Ticketsup » 
Related to #4948
 2018-03-11 09:44:58 +01:00
Laurent Destailleur
5d86b8e621 Merge pull request #8337 from atm-florian/dev_fixscrunitiz 
fix scrunitizer
 2018-03-11 02:08:35 +01:00
Laurent Destailleur
897b3f7b79 Fix setup 2018-03-11 00:31:26 +01:00
florian HENRY
888afe0e33 fix scrunitizer 2018-03-11 00:25:14 +01:00
Laurent Destailleur
64f21b8a3c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/card.php
 2018-03-11 00:10:13 +01:00
BENKE Charlene
923bad4da6 add sql log on install debug 
new global variable INSTALL_DISPLAY_SQL_LOG to display sql log on module install
 2018-03-10 23:59:34 +01:00
Maxime Kohlhaas
c008853842 Fix #8057 2018-03-10 23:05:33 +01:00
Laurent Destailleur
72bccd9c6b Merge branch 'develop' into bug-6980 2018-03-10 22:27:07 +01:00
Alexis Algoud
74dc815bfa fix commonobject isInt for module builder capabilities 2018-03-10 19:02:06 +01:00
Laurent Destailleur
72eff36cd6 Merge pull request #8328 from atm-alexis/FIX_commonObject_isInt_linked 
Fix commonobject isInt for module builder capabilities
 2018-03-10 18:59:12 +01:00
Laurent Destailleur
b2677c35e2 Merge pull request #8317 from frederic34/swifmailer 
Add dkim signing with Swiftmailer
 2018-03-10 18:48:08 +01:00
Laurent Destailleur
e3ace1f89f Fix morecss not provided 2018-03-10 18:17:54 +01:00
Alexis Algoud
b370a3096c fix commonobject isInt for module builder capabilities 2018-03-10 14:14:31 +01:00
Laurent Destailleur
96aaeb2fd0 Merge pull request #8326 from atm-florian/dev_fixscrunitiz 
fix scrunitizer
 2018-03-10 12:57:51 +01:00
Laurent Destailleur
f6918a5d88 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-10 12:47:00 +01:00