Laurent Destailleur
|
21c2dba922
|
Fix phpcs
|
2021-11-11 19:06:55 +01:00 |
|
Laurent Destailleur
|
f5a7275077
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
htdocs/takepos/index.php
|
2021-11-11 18:34:04 +01:00 |
|
Laurent Destailleur
|
a725ffefdd
|
Fix sql error
|
2021-11-11 18:30:17 +01:00 |
|
Laurent Destailleur
|
ddad00c8e4
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
htdocs/takepos/index.php
|
2021-11-11 16:14:48 +01:00 |
|
Laurent Destailleur
|
f24c38db73
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/datapolicy/class/datapolicy.class.php
htdocs/takepos/index.php
|
2021-11-11 16:06:21 +01:00 |
|
Laurent Destailleur
|
e188855dca
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/datapolicy/class/datapolicy.class.php
|
2021-11-11 16:01:37 +01:00 |
|
Laurent Destailleur
|
9aa5c94612
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2021-11-11 15:59:48 +01:00 |
|
Laurent Destailleur
|
ba724204a4
|
FIX Bad use of dol_concatdesc()
|
2021-11-11 15:50:32 +01:00 |
|
Laurent Destailleur
|
88d8f73614
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
|
2021-11-11 15:36:00 +01:00 |
|
Laurent Destailleur
|
fa4b5d99c0
|
FIX Bad use of dol_concatdesc()
|
2021-11-11 15:35:34 +01:00 |
|
Laurent Destailleur
|
aae83d248c
|
Merge pull request #19346 from daraelmin/14.0
Fix wrong sign in test
|
2021-11-11 14:29:56 +01:00 |
|
Laurent Destailleur
|
28aa17e4fd
|
FIX calculation of balance in conciliation page on desc sorting.
|
2021-11-11 14:27:17 +01:00 |
|
Laurent Destailleur
|
fd3fd9d945
|
Fix getpost
|
2021-11-11 13:46:58 +01:00 |
|
daraelmin
|
cea3d93b91
|
Fix wrong sign in test
|
2021-11-09 20:51:27 +01:00 |
|
lvessiller
|
33e40c12c8
|
FIX close cash with some terminals in TakePOS
|
2021-11-09 14:12:28 +01:00 |
|
Laurent Destailleur
|
9f8e21bc2c
|
Fix filter on dates
|
2021-11-08 20:39:52 +01:00 |
|
Laurent Destailleur
|
d28edae460
|
Fix idate must be jdate
|
2021-11-08 20:11:32 +01:00 |
|
Laurent Destailleur
|
6787998c56
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
|
2021-11-08 20:08:35 +01:00 |
|
Laurent Destailleur
|
ebdcff3b49
|
FIX filter for export of accounting documents
|
2021-11-08 20:07:03 +01:00 |
|
Marc de Lima Lucio
|
c1a2e7b12e
|
FIX: project task list: extrafields could not be displayed
|
2021-11-08 17:51:19 +01:00 |
|
Laurent Destailleur
|
a724cadd1f
|
Merge pull request #19290 from PyroShape/142
FIX : Change date format of the inventorycode to be equal as mass stock transfert
|
2021-11-08 03:33:53 +01:00 |
|
Laurent Destailleur
|
621f0812a1
|
Merge pull request #19304 from daraelmin/daraelmin-patch-3
Fix default enddate subscription must be in futur
|
2021-11-08 03:28:35 +01:00 |
|
Laurent Destailleur
|
a94b2b4f7e
|
Clean code
|
2021-11-08 03:22:49 +01:00 |
|
Laurent Destailleur
|
cd4f59bb2a
|
FIX bad sign of amount stored for multicurrency columns on credit notes
|
2021-11-08 03:01:18 +01:00 |
|
Laurent Destailleur
|
e8b3875e2e
|
FIX bad sign of amount stored for multicurrency columns on credit notes
|
2021-11-08 02:57:21 +01:00 |
|
Laurent Destailleur
|
d591a83085
|
css
|
2021-11-08 00:57:00 +01:00 |
|
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
|
19b9412c13
|
FIX #19305
|
2021-11-05 12:49:33 +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 |
|