lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
102,250 Commits 43 Branches 150 Tags 886 MiB
94e708d196
Commit Graph

102250 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
94e708d196 Fix sql error 2021-09-03 21:59:13 +02:00
Laurent Destailleur
ee066ad725 Cast sql var 2021-09-03 21:25:43 +02:00
Laurent Destailleur
f1fc17b663 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-03 18:04:31 +02:00
Laurent Destailleur
c4621f0433 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2021-09-03 18:04:14 +02:00
Laurent Destailleur
2e3b6b2fc8 Backport sql injection fix from develop 2021-09-03 18:00:28 +02:00
Laurent Destailleur
a7d9889c40
Merge pull request #18592 from fr69400/develop 
FIX : delete image from card.php page dont remove the thumbs
 2021-09-03 15:12:04 +02:00
fr69400
a89a6b6343 bug image delete 
Remove linked image from card.php (section builddoc) dont remove the thumbs of image file
 2021-09-03 14:18:44 +02:00
Laurent Destailleur
248e68aada Code comment 2021-09-03 13:39:08 +02:00
Laurent Destailleur
30c29f13c8 Fix go back on thirdparty file after Save 2021-09-03 13:19:37 +02:00
Laurent Destailleur
531037ddb6 Prepare 14.0.2 2021-09-03 11:04:49 +02:00
Laurent Destailleur
e965d6d6f2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/pdf.php
	htdocs/api/class/api_access.class.php
 2021-09-03 11:02:21 +02:00
Laurent Destailleur
dc81f1de68 Fix var_dump 2021-09-03 11:00:14 +02:00
Laurent Destailleur
35e5480f2f Fix var init 2021-09-03 10:58:43 +02:00
Laurent Destailleur
77e9f15360 Work on #18448 2021-09-02 22:52:17 +02:00
Laurent Destailleur
3598816763 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-02 21:05:00 +02:00
Laurent Destailleur
dd6647e6cb Fix label import fields 2021-09-02 21:03:49 +02:00
Laurent Destailleur
8ea1a9602b NEW Add import / export of MO and BOMLines - Close #18499 2021-09-02 21:00:31 +02:00
henrynopo
4c1d857991 Update remx.php 2021-09-02 19:36:48 +02:00
Laurent Destailleur
b217c5d43e
Merge pull request #18537 from henrynopo/patch-15 
Fix error no value of multicurrency discount amount consumed as payment to invoice
 2021-09-02 19:36:12 +02:00
henrynopo
6e5258f482 Update stocks.lang 2021-09-02 19:26:32 +02:00
Laurent Destailleur
0c72734c4a
Merge pull request #18536 from henrynopo/patch-14 
Fix error of ValidateSending
 2021-09-02 19:23:59 +02:00
Laurent Destailleur
2123d9ce44
Merge pull request #18585 from Givriz/dev_5 
Compatibility phpv8
 2021-09-02 19:21:03 +02:00
Laurent Destailleur
67cd41fe17
Update list.php 2021-09-02 19:20:21 +02:00
Laurent Destailleur
cc86ab8c5e
Update list.php 2021-09-02 19:19:35 +02:00
Laurent Destailleur
74372a3bae
Update index.php 2021-09-02 19:17:38 +02:00
Laurent Destailleur
67db0f1bdb Add link "Now" on date selection when cloning social contribution 2021-09-02 19:15:21 +02:00
Givriz
1c99bd7c4a Compatibility phpv8 2021-09-02 18:48:46 +02:00
Laurent Destailleur
51b1cd583b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-09-02 18:48:20 +02:00
Laurent Destailleur
7017a98071
Merge pull request #18446 from henrynopo/patch-6 
Added function - using list of location_incoterms
 2021-09-02 18:47:15 +02:00
Damien BENOIT
baaf1519d6
Merge pull request #36 from Dolibarr/develop 
Update fork
 2021-09-02 17:55:39 +02:00
Laurent Destailleur
9ec5470adf
Merge pull request #18583 from ksar-ksar/patch-7 
FIX #18565
 2021-09-02 17:36:07 +02:00
Laurent Destailleur
9e994e6373
Merge pull request #18579 from Hystepik/develop_v14#1 
Fix #18443 : overwrite file works fine
 2021-09-02 17:27:19 +02:00
Laurent Destailleur
147583d58b Remove useless parameters 2021-09-02 17:25:11 +02:00
Laurent Destailleur
9619791eaa
Merge pull request #18580 from frederic34/patch-8 
fix tooltip info
 2021-09-02 17:21:10 +02:00
Laurent Destailleur
fd2bfc82f2 Fix #18581 Fix #18582 2021-09-02 17:20:14 +02:00
ksar
260049c917
FIX #18565 2021-09-02 17:15:57 +02:00
Laurent Destailleur
7758c0b8a7 Fix phpcs 2021-09-02 16:06:19 +02:00
Laurent Destailleur
cd313d7506 Save type (manufacture/disassemble) on MO. 2021-09-02 15:23:31 +02:00
Laurent Destailleur
b04ea59a51 More sql sanitizing 2021-09-02 13:58:42 +02:00
Laurent Destailleur
cac1a7ba5f Fix sql request when using encrypt 2021-09-02 13:45:44 +02:00
Frédéric FRANCE
18d61574d3
fix tooltip info 2021-09-02 12:40:05 +02:00
Damien BENOIT
09308c1035
Merge pull request #35 from Dolibarr/develop 
Update fork
 2021-09-02 11:53:45 +02:00
stickler-ci
e01ccabbd5 Fixing style errors. 2021-09-02 08:56:53 +00:00
lmarcouiller
ae38490042 Fix #18443 : overwrite file works fine 2021-09-02 10:53:22 +02:00
Laurent Destailleur
e22bd5c048 Fix better format address for jp in romaji 2021-09-02 10:39:56 +02:00
Laurent Destailleur
8600d8d00d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-01 22:50:06 +02:00
Laurent Destailleur
8193e792b5 Fix responsive 2021-09-01 22:39:01 +02:00
Laurent Destailleur
076bfd82a3 FIX option "Default value for field 'Refuse bulk emailings'" 2021-09-01 22:38:47 +02:00
Laurent Destailleur
c762840dec FIX option "Default value for field 'Refuse bulk emailings'" 2021-09-01 22:37:15 +02:00
Laurent Destailleur
1bce356efa Fix responsive 2021-09-01 21:34:59 +02:00