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

14617 Commits

Author SHA1 Message Date
Philippe Grand
c8e672d01a use $outputlangs instead of $langs 2018-03-15 09:18:40 +01:00
Philippe Grand
3f0764f282 use $outputlangs instead of $langs 2018-03-15 09:17:53 +01:00
Philippe Grand
e6d2effba1 use $outputlangs instead of $langs 2018-03-15 09:15:22 +01:00
Philippe Grand
09d0dc7ba7 use $outputlangs instead of $langs 2018-03-15 09:14:09 +01:00
Philippe Grand
f6fd03a4f3 Change $langs by $outputlangs 2018-03-15 09:06:01 +01:00
Alexandre SPANGARO
9ce6ab915c Merge remote-tracking branch 'uptream/develop' into 8.0-a9 2018-03-15 06:24:51 +01:00
Alexandre SPANGARO
5eccc6bcbc NEW Add stats in salaries module 2018-03-15 06:23:20 +01:00
Laurent Destailleur
5392218806 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/translate.class.php
 2018-03-15 02:13:29 +01:00
Laurent Destailleur
c4eea1f0e0 Fix SQLi 2018-03-15 02:12:01 +01:00
Laurent Destailleur
f0f6f71161 Fix Sqli 2018-03-15 01:55:47 +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
87bbb4ef87 Can create card from dolibarr 2018-03-15 00:40:29 +01:00
Laurent Destailleur
302fed8646 More fa image to replace png picto 2018-03-14 20:08:44 +01:00
Philippe GRAND
743a61159d use loadLangs for translation files 2018-03-14 19:34:33 +01:00
Philippe GRAND
13ce041313 use loadLangs for translation files 2018-03-14 19:26:46 +01:00
Philippe GRAND
a5dc583906 use loadLangs for translation files 2018-03-14 19:10:22 +01:00
Laurent Destailleur
9994b1f133 Work on stripe interface 2018-03-14 17:12:32 +01:00
Laurent Destailleur
b232681318 NEW Add a button to create Stripe customer from the Payment mode tab 2018-03-14 16:53:16 +01:00
Laurent Destailleur
3f7cd8b1bd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-14 13:56:41 +01:00
Laurent Destailleur
5c2a005e75 Work on generic customer payment modes 2018-03-14 13:56:21 +01:00
Laurent Destailleur
268b07bcf0 Can add/delete credit card localy 2018-03-14 11:51:13 +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
a86da671ba Remove verbose log 2018-03-13 18:13:31 +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
9c92e09295 Fix syntax 2018-03-13 14:48:01 +01:00
Laurent Destailleur
b1ac4246a1 Merge pull request #8373 from ptibogxiv/patch-16 
ADD trigger when modify, delete thirdparty
 2018-03-13 14:20:33 +01:00
Laurent Destailleur
59b7187501 Rename interface_99_modStripe_Stripe.class.php to interface_80_modStripe_Stripe.class.php 2018-03-13 14:20:23 +01:00
Laurent Destailleur
4b7f4d29d1 Update interface_99_modStripe_Stripe.class.php 2018-03-13 14:19:26 +01:00
Laurent Destailleur
d6e8872af4 Update interface_99_modStripe_Stripe.class.php 2018-03-13 14:14:33 +01:00
Laurent Destailleur
4bd05f854c Merge pull request #8371 from frederic34/pdfaddress 
add object in pdf_build_address source
 2018-03-13 14:04:49 +01:00
Laurent Destailleur
9f07ff0f9b Fix travis 2018-03-13 14:00:35 +01:00
Laurent Destailleur
e6dd312bd5 Debug ticket module 2018-03-13 13:56:45 +01:00
Laurent Destailleur
e6d8219396 Dolibarrize module ticket 2018-03-13 13:26:03 +01:00
ptibogxiv
3dd90a1f1a FIX name of file 2018-03-13 13:21:36 +01:00
Laurent Destailleur
4380367923 Error management 2018-03-13 12:54:53 +01:00
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