lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
72,930 Commits 43 Branches 150 Tags 886 MiB
d9ce99a314
Commit Graph

72930 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
ecb790ad8f
Merge branch 'develop' into new_branch_20_12_2018 2018-12-22 18:23:44 +01:00
Laurent Destailleur
ccc7f2e206
Merge pull request #10256 from grandoc/new_branch_19_12_2018 
add comments
 2018-12-22 18:22:57 +01:00
Laurent Destailleur
b8d0e6ed8b
Update index.php 2018-12-22 18:22:12 +01:00
Laurent Destailleur
b76c45e8d0
Merge pull request #10264 from hregis/7.0_price 
FIX avoid Class 'AdherentType' not found
 2018-12-22 18:16:40 +01:00
Laurent Destailleur
2b3fbecd49 Fix when random_int is not available 2018-12-22 18:15:49 +01:00
Laurent Destailleur
415fbc19af Fix param 2018-12-22 18:12:29 +01:00
Laurent Destailleur
a5dccd1cc3 Enable by default the test on anti CSRF token 2018-12-22 18:09:26 +01:00
Laurent Destailleur
6c54ea925b Add token into confirm link so we will be able to check we accept the 
confirmation on interface for critical actions
 2018-12-22 17:42:33 +01:00
Laurent Destailleur
91f63f025b Add rolling token into confirm url 2018-12-22 17:34:57 +01:00
Laurent Destailleur
3fee4c3309 The delete of a user need the parameter $user 2018-12-22 17:34:27 +01:00
Laurent Destailleur
f8b0e535fa Code comment 2018-12-22 17:30:22 +01:00
Laurent Destailleur
2b088a73c1 FIX CVE-2018-19998 2018-12-22 17:16:08 +01:00
Laurent Destailleur
74e75a7e2b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-22 17:12:48 +01:00
Laurent Destailleur
bacd5110fb FIX CVE-2018-19995 and CVE-2018-19998 2018-12-22 17:12:38 +01:00
Laurent Destailleur
4b8be6ed64 FIX CVE-2018-19995 2018-12-22 17:08:55 +01:00
Laurent Destailleur
850b939ffd FIX CVE-2018-19994 2018-12-22 17:03:50 +01:00
Laurent Destailleur
fc3fcc5455 FIX CVE-2018-19993 2018-12-22 16:59:30 +01:00
Laurent Destailleur
0f06e39d23 FIX CVE-2018-19992 2018-12-22 16:55:31 +01:00
Laurent Destailleur
33564ddafc Fix css 2018-12-22 16:45:57 +01:00
Laurent Destailleur
7d1b48815d Fix css 2018-12-22 11:57:23 +01:00
Laurent Destailleur
9b55cc401e Fix trans 2018-12-22 11:32:27 +01:00
Regis Houssin
09ce84ca93 FIX avoid Class 'AdherentType' not found 2018-12-21 16:38:02 +01:00
Laurent Destailleur
afee39ea68 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-21 12:09:27 +01:00
Laurent Destailleur
4859d944d8 Sync transifex 2018-12-21 12:09:03 +01:00
Laurent Destailleur
f09efbf1cd Fix var_dump 2018-12-21 12:07:13 +01:00
Regis Houssin
9b215e117a FIX check if "entity" is already defined in "$param" 2018-12-21 11:23:44 +01:00
Laurent Destailleur
391f916bd5 Fix trans 2018-12-21 10:21:56 +01:00
Laurent Destailleur
b7b69b79dc Fix phpdoc 2018-12-21 09:59:21 +01:00
Laurent Destailleur
ae6596cac7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-21 09:57:29 +01:00
Laurent Destailleur
9b441dd369 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-21 09:57:15 +01:00
Laurent Destailleur
8a70cf9ede NEW Add parameter replaceambiguouschars on getRandomPassword function 2018-12-21 09:56:54 +01:00
torvista
2ff35895b6 minor improvements 
new constants for missing direct debit terms
 2018-12-20 23:36:35 +01:00
Steve
70c0adc3d1 import.php 
HTML5 validation
ADDED htmlentities to enclosure and separator
CHANGED td aligns to css, removed nospan tag
ADDED clause to box generator to stop multiple duplicate ids when no $key
REMOVED height attribute
REMOVED nested b tag
CHANGED deprecated Center tag for div style center
FIX
Added check
if ($objimport->array_import_updatekeys[0] && count($objimport->array_import_updatekeys[0]
to stop php warning
------------------
modProduct.class.php
Products Import
ordered fields as per table structure order
ADDED and changed import fields and examples
------------------
modSociete.class.php
Third Party Import
Changed field orders to match table field order so future additions will be easier to manage.
REMOVED s.datec repeated in import example
ADDED: alias, payment mode, payment conditions, sales tax VAT, multicurrency, currency
Additional Address Import
Changed field orders to match table field order
import example csv was missing birthday
Bank Account Import
Changed field orders to match table field order
ADDED label (required for a bank account
ADDED datec (required for d.debit UMR)
ADDED to address import: s.fk_departement
modified text to import example csv
-------------------
companies.lang
various new constants for import file column headers
 2018-12-20 16:49:17 +01:00
Philippe GRAND
27facab545 fix typo and translation 2018-12-20 14:18:22 +01:00
Josep Lluís
f496945677
FIX search by fax field 
Search by fax field is looking for another field
 2018-12-20 14:02:10 +01:00
Philippe GRAND
c3a898daa6 better form display and fix 2018-12-20 13:44:49 +01:00
torvista
54436f72c7 minor improvements 2018-12-20 13:38:49 +01:00
Philippe GRAND
33d035139f fix typo and add translation 2018-12-20 10:17:52 +01:00
andreubisquerra
c4be1b141d Temporary ticket improvement in TakePOS 2018-12-19 22:52:16 +01:00
torvista
9f9a468f6a more fine tuning 2018-12-19 16:22:27 +01:00
Laurent Destailleur
d9b8a8c8ae Debug cash fence feature 2018-12-19 16:12:55 +01:00
Philippe GRAND
1fea8a2968 fix : syntax error 2018-12-19 15:58:23 +01:00
Laurent Destailleur
b0652494b5 Debug cash fence 2018-12-19 15:40:01 +01:00
Philippe GRAND
76e3390c2e fix : bad url 2018-12-19 15:25:25 +01:00
Philippe GRAND
1d59b582d7 add comments 2018-12-19 13:56:51 +01:00
Laurent Destailleur
772761e587
Merge pull request #10255 from AXeL-dev/patch-4 
fix proposals menu title in auguria menu manager
 2018-12-19 13:02:43 +01:00
Laurent Destailleur
86502d881a
Merge pull request #10253 from grandoc/new_branch_18_12_2018 
fix align issue
 2018-12-19 13:02:25 +01:00
Laurent Destailleur
ed13f7b729
Merge pull request #10252 from ATM-Nicolas/fix_call_to_update_price 
FIX : Function updatePrice with wrong parameters
 2018-12-19 13:02:00 +01:00
Laurent Destailleur
2978522006
Merge pull request #10251 from ATM-Marc/FIX_7.0_contact_change 
FIX: contact/address tab issue when changing company
 2018-12-19 12:59:32 +01:00
Laurent Destailleur
396dcb0729
Merge pull request #10247 from andreubisquerra/master 
Improve responsive design in TakePOS
 2018-12-19 12:55:15 +01:00