Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-11 12:01:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
69,068 Commits 36 Branches 190 Tags
cefaeb583ff12ad09c836fcbf6b39d01209e901b
Commit Graph

4426 Commits

Author SHA1 Message Date
Laurent Destailleur
ba47b6d051 NEW Add tab contact on supplier proposals 2018-03-16 10:21:53 +01:00
Laurent Destailleur
8bfac66f04 Escape db 2018-03-16 09:52:45 +01:00
Laurent Destailleur
6f95a7c2b1 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-15 23:48:14 +01:00
Laurent Destailleur
ce7da41bef Fix save setup 2018-03-15 23:47:16 +01:00
Laurent Destailleur
71c51eb789 NEW Add hook printEmail 2018-03-15 22:22:42 +01:00
Laurent Destailleur
7f8f0c5dc1 Fix parameter silent was inverted 2018-03-15 21:48:51 +01:00
Laurent Destailleur
7c62f22408 Remove doubtful code 2018-03-15 14:02:32 +01:00
Laurent Destailleur
6a70d268e0 Fix SQLi reported by op7ica 2018-03-15 01:22:32 +01:00
Laurent Destailleur
c62d68f4be Fix SQLi reported by op7ica 2018-03-15 01:21:44 +01:00
Laurent Destailleur
302fed8646 More fa image to replace png picto 2018-03-14 20:08:44 +01:00
Laurent Destailleur
cc9a6ee6e0 Merge pull request #7428 from ruistrecht-alt/NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE 
NEW Show region in company info & Global option to show state code MAIN_SHOW_STATE_CODE
 2018-03-14 10:49:54 +01:00
Laurent Destailleur
35fbcb2c84 Update company.lib.php 2018-03-14 10:48:56 +01:00
Laurent Destailleur
da617f7d32 Can work both with remote and local payment modes 2018-03-13 22:43:50 +01:00
Laurent Destailleur
2566170c68 Use code of societeaccount 2018-03-13 17:47:43 +01:00
Laurent Destailleur
944ba69cd8 Add unique key. Dolibarrize view of stripe card. 2018-03-13 17:32:49 +01:00
Laurent Destailleur
e6d8219396 Dolibarrize module ticket 2018-03-13 13:26:03 +01:00
Laurent Destailleur
8048259733 Work on ticket module integration 2018-03-13 12:13:47 +01:00
Laurent Destailleur
0d1e26b02c Fix error management 2018-03-12 13:19:09 +01:00
Laurent Destailleur
ae82d045f8 Dolibarrize module ticket 2018-03-11 23:56:17 +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
d9b55f2275 Merge branch 'develop' into dev_ticketsup 2018-03-11 18:12:47 +01:00
Laurent Destailleur
0005b1bc48 Merge pull request #8342 from atm-florian/dev_fixscrunitiz 
fix scrunitizer
 2018-03-11 18:11:13 +01:00
florian HENRY
cfdaa7c88d ticket sup make it work 2018-03-11 16:07:13 +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
e14d2f08b8 Dolibarize 2018-03-11 11:12:38 +01:00
jfefe
79acb79ae0 Begin integration of module « Ticketsup » 
Related to #4948
 2018-03-11 09:44:58 +01:00
florian HENRY
888afe0e33 fix scrunitizer 2018-03-11 00:25:14 +01:00
Laurent Destailleur
65aa5953f4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-08 20:36:07 +01:00
Laurent Destailleur
bf1bada435 Contact tab after main tab 2018-03-08 20:35:50 +01:00
Laurent Destailleur
1c9e7145e7 Merge pull request #8276 from ATM-Consulting/develop_atm 
NEW: supplier credit notes & discounts (absolute and relative)
 2018-03-08 20:06:37 +01:00
Laurent Destailleur
235db1f405 Enhance OAuth module to store the stripe account in llx_oauth_token 2018-03-08 19:51:18 +01:00
Laurent Destailleur
5b8006a6bb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/payment/paymentok.php
	htdocs/public/paypal/paymentok.php
 2018-03-08 16:37:17 +01:00
Laurent Destailleur
af9fff4f83 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-08 16:35:12 +01:00
Laurent Destailleur
3762ed12c7 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2018-03-08 16:33:51 +01:00
Laurent Destailleur
343ca1bc77 Merge pull request #8294 from hregis/7.0_bug5 
Fix: avoid conflict between invoice and invoicenumber sharings
 2018-03-08 16:24:05 +01:00
Regis Houssin
861a831e24 Fix: debug 2018-03-08 11:53:46 +01:00
Laurent Destailleur
c02e8e9831 Css 2018-03-07 19:13:15 +01:00
Regis Houssin
a0774d523d Fix: avoid conflict between invoice and invoicenumber sharings 2018-03-07 15:24:23 +01:00
Laurent Destailleur
1419eaf15f Debug last stripe PR 2018-03-07 15:05:49 +01:00
Laurent Destailleur
d060cf840d Merge branch 'develop' into develop 2018-03-07 13:19:25 +01:00
Laurent Destailleur
7e6ba51780 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/tasks/comment.php
 2018-03-07 13:06:29 +01:00
Laurent Destailleur
004839b368 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-07 13:03:40 +01:00
Laurent Destailleur
1ca5c7083a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
 2018-03-07 11:54:48 +01:00
alexis Algoud
cb27eb98e1 FIX natural search double quote 2018-03-07 11:42:47 +01:00
Laurent Destailleur
23a4a60970 Fix status of task 2018-03-06 21:51:43 +01:00
ptibogxiv
10b16187d4 NEW convert rib.php to gateway.php 2018-03-06 13:26:40 +01:00
Marc de Lima Lucio
c4950d4f0c FIX: supplier discounts: wrong source invoice ref in DOCs 2018-03-05 11:49:04 +01:00
Marc de Lima Lucio
1765b09fda Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-03-05 11:05:38 +01:00