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

102325 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
3b7c385c6c Fix syntax error 2021-11-07 13:53:30 +01:00
Laurent Destailleur
ccc1d4d1fa Fix warning 2021-11-07 12:24:25 +01:00
Laurent Destailleur
7e68f9e013 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/db/DoliDB.class.php
	htdocs/resource/list.php
 2021-11-06 21:04:17 +01:00
Laurent Destailleur
ddb68a3ae8 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-11-06 20:40:34 +01:00
Laurent Destailleur
edbcf78495 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-11-06 20:39:05 +01:00
Laurent Destailleur
0bc5ec8c78 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-11-06 20:38:29 +01:00
Laurent Destailleur
65105a3e05 Better log 2021-11-06 19:27:50 +01:00
daraelmin
9d7f7e2090
Better condition 2021-11-05 14:03:56 +01:00
Laurent Destailleur
c0c894d6f4
Merge pull request #19288 from OPEN-DSI/fix_00018 
FIX second approval back in stable feature as is the setting for minimum amount (last part from PR#14286)
 2021-11-05 14:00:41 +01:00
Laurent Destailleur
f8cc75ecf2
Merge pull request #19296 from daraelmin/daraelmin-stats-1 
Add link year subscription list in subscription by year stats page
 2021-11-05 13:19:05 +01:00
Laurent Destailleur
15bc4a7d6b
Update index.php 2021-11-05 13:18:37 +01:00
Laurent Destailleur
a0fffbae04
Merge pull request #19298 from daraelmin/daraelmin-stats-2 
Fix Bad count of subscription by year
 2021-11-05 13:06:17 +01:00
Laurent Destailleur
19b9412c13 FIX #19305 2021-11-05 12:49:33 +01:00
Laurent Destailleur
23749b57ec
Merge pull request #19311 from atm-john/12.0_fix_missing_return_status_for_getrow 
FIX : missing return status
 2021-11-05 12:42:54 +01:00
Laurent Destailleur
3959d12a39
Update DoliDB.class.php 2021-11-05 12:42:42 +01:00
ATM john
dd8d4e9e98 Fix missing return status 2021-11-04 12:10:19 +01:00
stickler-ci
586005ff2e Fixing style errors. 2021-11-03 21:43:30 +00:00
daraelmin
f9db196512
Update subscription.php 2021-11-03 22:31:45 +01:00
daraelmin
0e91b32e99
Update subscription.php 2021-11-03 20:40:09 +01:00
daraelmin
973f408b6e
Fix default enddate subscription must be in futur 2021-11-03 20:35:57 +01:00
daraelmin
d334fe1292
Fix Bad count of subscription by year 
If
 2021-11-03 13:12:33 +01:00
daraelmin
b02c89bd8b
Add link year subscription list in subscription by year stats page 2021-11-02 23:07:46 +01:00
Benjamin Chantalat
49d955b794 Uniformization of the table code as the line above 2021-11-02 15:53:57 +01:00
Benjamin Chantalat
0c1d4c9d51 No need of escape htmltag thanks to GETPOST before 2021-11-02 15:48:12 +01:00
Benjamin Chantalat
126fbf9f63 Change date format to be equal to mass stock transfert 2021-11-02 15:46:04 +01:00
kamel
82b7f0e9e4 FIX second approval back in stable feature as is the setting for minimum amount (last part from PR#14286) 2021-11-02 15:21:14 +01:00
stickler-ci
899f0bee9a Fixing style errors. 2021-11-02 12:59:38 +00:00
Henry
b56eaf91e8
Update paiement.php 2021-11-02 20:53:00 +08:00
Laurent Destailleur
b4895c4dd2
Merge pull request #18975 from aspangaro/14p23 
FIX Accountancy - If deposit invoice is used, force binding in deposit accounting account to solve transaction
 2021-10-31 18:13:54 +01:00
Laurent Destailleur
fdf5d457a8
Merge pull request #19196 from atm-gauthier/FIX_default_price_base_type_with_variants 
FIX : We need a default price base type in variant creation case with…
 2021-10-31 17:42:58 +01:00
Laurent Destailleur
cee573cf96
Update ProductCombination.class.php 2021-10-31 17:42:43 +01:00
Laurent Destailleur
eecd82a0fd
Merge pull request #19202 from frederic34/patch-11 
backport fix
 2021-10-31 17:34:38 +01:00
Laurent Destailleur
dbf330b49c Comment on test 2021-10-31 17:17:21 +01:00
Laurent Destailleur
05cdbcc092 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-31 17:12:13 +01:00
Laurent Destailleur
b966286895 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-31 17:12:04 +01:00
Laurent Destailleur
0e4c113e7f Fix phpcs 2021-10-31 17:11:23 +01:00
Laurent Destailleur
ffc1d8fb97
Merge pull request #19211 from FHenry/14_fix_modulebuilder 
fix: setup template on module builder (error SQL when not tag exists)
 2021-10-31 17:09:15 +01:00
Laurent Destailleur
42b043feef
Merge pull request #19213 from atm-greg/FIX_restrictedArea_for_payment_delete 
FIX restrictedArea for payment delete
 2021-10-31 17:06:47 +01:00
Laurent Destailleur
682ad98918
Update security.lib.php 2021-10-31 17:06:37 +01:00
Laurent Destailleur
fb6a1d1f51 FIX #19210 2021-10-31 16:59:48 +01:00
Laurent Destailleur
51b0758263
Merge pull request #19219 from FHenry/14_fix_warning 
fix: warning dol_print_date setTimeStamp when time empty
 2021-10-31 16:49:13 +01:00
Laurent Destailleur
c73c962459
Merge pull request #19220 from frederic34/patch-4 
remove duplicate code
 2021-10-31 16:47:33 +01:00
Laurent Destailleur
82898b1aca Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-31 16:25:46 +01:00
Laurent Destailleur
9989180c5f Fix target is lost 2021-10-31 16:25:29 +01:00
Laurent Destailleur
9247bbcc1d
Merge pull request #19223 from noec764/12.0_FIX_resource_list_extrafields_filter 
FIX: resource list : Use standard code to handle list filters
 2021-10-31 16:15:08 +01:00
Laurent Destailleur
15406f16d2
Merge pull request #19215 from FHenry/14_fix_catagorie_method 
fix: getFilterSelectQuery get correct table
 2021-10-31 16:13:36 +01:00
Laurent Destailleur
707dd85f43
Merge pull request #19242 from aspangaro/14p25 
FIX Accountancy - Product admin - Log error when we affect accounting account with product_perentity activated
 2021-10-31 15:22:01 +01:00
Laurent Destailleur
e6e440e573 Fix #19257 error in the page Overview of a project 2021-10-31 15:14:15 +01:00
Laurent Destailleur
8064ecce73 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-31 14:38:07 +01:00
Laurent Destailleur
da4fe03be7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/html.formticket.class.php
	htdocs/ticket/card.php
 2021-10-31 14:37:33 +01:00