Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-17 15:01:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,922 Commits 36 Branches 190 Tags
70b11f18b51fac1f679080f832c3931e825468f5
Commit Graph

11911 Commits

Author SHA1 Message Date
Alexandre SPANGARO
cedf5fb0ed Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal 2017-05-14 20:29:46 +02:00
Laurent Destailleur
998254d9c6 Finish rewrite and debug of module Stripe. 2017-05-14 16:17:23 +02:00
BENKE Charlie
8e68aa86ac problems with additionnal template type 
If i active my new xml templater, and keep odt, the odt folder is added on folder to scan on my xml path
ex : 
odt folder defined : c:\toto
xml folder defined : c:\tata

folder scanned with odt :  c:\toto
folder scanned with odt :  c:\toto,c:\tata
 2017-05-14 15:17:40 +02:00
Alexandre SPANGARO
143c019905 Fix : Sql error on salaries index for accountancy multijournal + debug 2017-05-14 08:07:34 +02:00
Laurent Destailleur
955c9f4217 Standardize the way online payments are working. 
Removed the trigger file of PAYPAL module that stored data that was not
used by Dolibarr. The trigger event still exists, but if an external
module need action on it, it must provides itself its trigger file.
 2017-05-13 21:10:56 +02:00
Laurent Destailleur
57ba598b15 Merge pull request #6771 from aspangaro/6.0-stripe 
New : Module Stripe
 2017-05-13 19:55:29 +02:00
Laurent Destailleur
e0abba5cf2 Merge pull request #6831 from Gecka-Apps/5.0-fixes 
Fix: when sending a mail the default template used should be the first positioned template
 2017-05-13 19:35:58 +02:00
Laurent Destailleur
54088f38fb Code standardization on online payment code 2017-05-13 14:03:09 +02:00
Laurent Destailleur
6f9e67b1fb Remove no more used constant 2017-05-13 13:08:25 +02:00
Laurent Destailleur
f7e042d7b8 Look and feel v6 2017-05-13 13:02:55 +02:00
Laurent Destailleur
fa290c34fa Fix against SQL injection. Add phpunit to detect missing escapement. 2017-05-12 16:55:11 +02:00
Laurent Destailleur
bccfa3dbed Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-05-11 14:39:47 +02:00
Laurent Destailleur
b09300ab61 NEW Can edit background color for odd and even lines in tables 2017-05-11 13:02:29 +02:00
Laurent Destailleur
d3917b6065 FIX Bad return code of dolCpyDir 2017-05-11 12:25:53 +02:00
Laurent Dinclaux
8ae05a9651 Fix: when sending a mail the default template used should be the first positionned template 2017-05-11 13:38:17 +11:00
Laurent Destailleur
cd72c50356 Merge pull request #6799 from Dolibarr/scrutinizer-patch-2 
Scrutinizer Auto-Fixes
 2017-05-11 00:04:12 +02:00
Laurent Destailleur
30cf3f2bda Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/class/account.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/install/mysql/tables/llx_bank_account.sql
 2017-05-11 00:03:06 +02:00
Laurent Destailleur
922fa088b4 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/core/boxes/box_services_expired.php
 2017-05-10 23:47:33 +02:00
Laurent Destailleur
ef5fd503cd Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-05-10 23:43:08 +02:00
Laurent Destailleur
b2e9d4cc21 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-05-10 23:42:49 +02:00
Laurent Destailleur
2da0a129d1 Multiple file upload on by default on desktop. 2017-05-10 23:41:43 +02:00
Laurent Destailleur
164f3954ee Merge pull request #6824 from ATM-Marc/NEW_multiple_fileupload 
NEW permit multiple file upload in linked documents tab
 2017-05-10 23:24:41 +02:00
Laurent Destailleur
2b64cf0ebe Update html.formfile.class.php 2017-05-10 23:24:33 +02:00
Laurent Destailleur
ab019cac8d Merge pull request #6821 from LordVan/patch-3 
Add more fields to projectcontacts substitution
 2017-05-10 23:20:49 +02:00
Laurent Destailleur
1c7d9b9d9a Merge pull request #6804 from aspangaro/6.0-multijournal 
New : Accountancy - Add a list to select the bank journal in bank card
 2017-05-10 22:46:30 +02:00
jfefe
d410a320d7 WIP #6504: CVE-2017-7886 
'defaultlang' attribute was not filtered before database request which cause an SQL injection.
 2017-05-10 20:32:54 +02:00
Laurent Destailleur
5a96ae54b9 FIX Link to files on bank account tab broken with multicompany 
FIX Link to preview on thirdparty broken with multicompany
 2017-05-10 19:08:07 +02:00
Laurent Destailleur
823e5b48e3 Code comment 2017-05-10 18:56:18 +02:00
BENKE Charlie
d570df5089 inverted value between FRST & RECUR 2017-05-10 18:17:28 +02:00
Thomas Raschbacher
70de54e97d fix project extrafields for ODT 
for some raeson the code was checking for already existing extra fields before even fetching it. removed the if condition, now it works fine.
 2017-05-10 15:21:53 +02:00
Marc de Lima Lucio
984531411d NEW: permit multiple file upload in linked documents 2017-05-10 15:01:27 +02:00
Laurent Destailleur
0156e99894 Code comment 2017-05-10 13:46:02 +02:00
Laurent Destailleur
fe053c8603 Better escaping of error message. 2017-05-10 12:03:40 +02:00
Laurent Destailleur
8e25155fc9 Better escaping of error message. 2017-05-10 12:02:41 +02:00
Laurent Destailleur
c4722e3694 FIX XSS 2017-05-10 11:48:45 +02:00
Laurent Destailleur
5c33c1773f FIX XSS 2017-05-10 11:47:34 +02:00
Thomas Raschbacher
267e66abfa Add more fields to projectcontacts substitution 
civility added + extrafields for external contacts + isInternal to decide in template wether to list internal or not
 2017-05-10 08:48:28 +02:00
Laurent Destailleur
ecf3b6ab33 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-05-10 00:51:27 +02:00
Laurent Destailleur
e5c898e0d6 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	build/makepack-dolibarr.pl
	htdocs/fichinter/list.php
	htdocs/product/list.php
	htdocs/projet/tasks/list.php
 2017-05-10 00:48:27 +02:00
Laurent Destailleur
2fc64b8e11 Fix XSS 2017-05-10 00:44:54 +02:00
Laurent Destailleur
b8b91db007 Use function top_httphead to include headers in pages. 2017-05-09 21:46:57 +02:00
Laurent Destailleur
667e3c2876 Add another security sanitizing option 2017-05-09 19:26:28 +02:00
Laurent Destailleur
081d0e7ec2 Debug module RH. Edition of user bank account is ok. 2017-05-09 11:09:21 +02:00
Laurent Destailleur
cf04e5a6e0 Fix duplicate id 2017-05-09 10:45:49 +02:00
Laurent Destailleur
9fe28c9b2c NEW Can disable all overwrote translations in one click. 2017-05-09 10:08:04 +02:00
Laurent Destailleur
05d6c2cd75 Fix no more use of constant 2017-05-09 01:36:20 +02:00
Laurent Destailleur
fd6518182b Fix can force tls version 2017-05-08 12:08:43 +02:00
Alexandre SPANGARO
16a41242d3 Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-05-08 06:39:14 +02:00
Alexandre SPANGARO
a3602ff6b4 Add journal list in new movement card 2017-05-08 06:20:17 +02:00
Alexandre SPANGARO
dd97bbdc82 Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal 2017-05-07 15:10:30 +02:00