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
Laurent Destailleur
83962ca70b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-15 18:43:58 +01:00
Laurent Destailleur
e1a0df263d Fix code with the new return structure of getEmailTemplate 2018-03-15 18:43:47 +01:00
Laurent Destailleur
16b356d25b Merge pull request #8395 from grandoc/new_branch_15_03_2018 
New [*use loadLangs for translation files*]
 2018-03-15 17:36:25 +01:00
Philippe GRAND
e8df916770 New [*use loadLangs for translation files*] 2018-03-15 17:14:11 +01:00
Laurent Destailleur
c83b0bd53c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-15 15:11:35 +01:00
Laurent Destailleur
c4ca4a5a16 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/tva/index.php
	htdocs/install/mysql/data/llx_accounting_category.sql
 2018-03-15 15:11:18 +01:00
Laurent Destailleur
ea3fbf63cd Merge pull request #8390 from grandoc/new_branch_14_03_2018 
New [*use loadLangs for translation files*]
 2018-03-15 15:07:55 +01:00
Laurent Destailleur
9256faf6fb Update pdf_merou.modules.php 2018-03-15 15:07:08 +01:00
Laurent Destailleur
c9566e9501 Merge pull request #8392 from aspangaro/8.0-a9 
NEW Add stats in salaries module
 2018-03-15 14:28:35 +01:00
Laurent Destailleur
618627f137 Merge pull request #8393 from atm-maxime/new_siret_check 
New rule for FR siret value check
 2018-03-15 14:27:59 +01:00
Laurent Destailleur
620ceb54e3 Clean code to avoid confusion 2018-03-15 14:25:09 +01:00
Laurent Destailleur
7c62f22408 Remove doubtful code 2018-03-15 14:02:32 +01:00
Laurent Destailleur
ff4d60dd96 Removed no more required hidden option 2018-03-15 14:00:46 +01:00
Laurent Destailleur
ce0144e645 Add code to help debug 2018-03-15 13:21:02 +01:00
Laurent Destailleur
542eb2e5f4 Comment 2018-03-15 13:19:29 +01:00
Laurent Destailleur
85e307d6b8 Fix report when group is not dedicated to a country 2018-03-15 12:31:24 +01:00
Maxime Kohlhaas
3de6e1a6cb Simplify SIREN check function 2018-03-15 12:02:49 +01:00
Laurent Destailleur
b2e4c6cf14 Clean code 2018-03-15 11:53:47 +01:00
Laurent Destailleur
73005d81a7 FIX country must not be mandatory for accounting report groups 2018-03-15 11:42:59 +01:00
Laurent Destailleur
db18db9488 Clean code 2018-03-15 11:27:39 +01:00
Laurent Destailleur
b379a2f83c FIX css 2018-03-15 10:43:04 +01:00
Laurent Destailleur
d804764134 Standardize look and feel 2018-03-15 10:41:43 +01:00
Laurent Destailleur
97c8504915 Fix remove log 2018-03-15 10:26:06 +01:00
Maxime Kohlhaas
8ae90bebaf New rule for FR siret value check 2018-03-15 09:50:33 +01:00
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
852bf8dab7 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/societe/class/societe.class.php
 2018-03-15 01:57:35 +01:00
Laurent Destailleur
f0f6f71161 Fix Sqli 2018-03-15 01:55:47 +01:00
Laurent Destailleur
4957ea9178 Fix SQLi reported by op7ica 2018-03-15 01:55:16 +01:00
Laurent Destailleur
c3b9c91200 Fix SQLi reported by op7ica 2018-03-15 01:33:46 +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
821a75cef0 Fix payment modes 2018-03-15 00:53:24 +01:00
Laurent Destailleur
f75334f131 Merge pull request #8386 from ptibogxiv/patch-21 
FIX support for stripeconnect mode
 2018-03-15 00:40:52 +01:00
Laurent Destailleur
87bbb4ef87 Can create card from dolibarr 2018-03-15 00:40:29 +01:00
Laurent Destailleur
f3be6045f9 Merge pull request #8385 from ATM-Nicolas/fix_project_delete_task 
FIX : Delete tasks on project delete will now trigger TASK_DELETE
 2018-03-15 00:39:18 +01:00
Laurent Destailleur
14a33af603 Merge pull request #8384 from fmarcet/7.0 
FIX Activate all also if there are inactive services
 2018-03-15 00:37:37 +01:00
Laurent Destailleur
c69f5843da Update card.php 2018-03-15 00:36:56 +01:00
Laurent Destailleur
ffc91bdfdf Merge pull request #8383 from ggg44473/7.0 
Add missing $mode in BookKeeping::createStd()
 2018-03-15 00:33:37 +01:00
Laurent Destailleur
cca1a58249 Can create card from dolibarr 2018-03-15 00:18:43 +01:00
Laurent Destailleur
3c8c5102c3 Rename var to avoid conflicts 2018-03-14 23:37:14 +01:00
Laurent Destailleur
bf4a0e46aa Add a credit card on stripe 2018-03-14 21:07:45 +01:00
Laurent Destailleur
302fed8646 More fa image to replace png picto 2018-03-14 20:08:44 +01:00