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

90165 Commits

Author SHA1 Message Date
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
Regis Houssin
5649e865c3 FIX wrong check 2021-11-09 18:38:29 +01:00
Regis Houssin
1e20e082fe FIX lost superadmin grade after edit user card ! 2021-11-09 18:36:04 +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
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
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
Laurent Destailleur
ca8dab36a3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/class/html.formticket.class.php
	htdocs/core/modules/modAdherent.class.php
	htdocs/core/modules/modProjet.class.php
 2021-10-31 14:33:44 +01:00
Laurent Destailleur
01c6de1085 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-10-31 14:24:53 +01:00
Laurent Destailleur
6d918ad1c7 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-10-31 14:24:19 +01:00
Laurent Destailleur
3bbb30ccf6
Merge pull request #19257 from aspangaro/14p26 
FIX #19241 Project - Fix display salary in overview
 2021-10-31 14:23:43 +01:00
Laurent Destailleur
ffcc6b6d69
Merge pull request #19235 from noec764/14.0_FIX_Error_in_stock_module 
FIX: Replenish: SQL error when no warehouse has been created
 2021-10-31 14:22:31 +01:00
Laurent Destailleur
13d3ff8ef7
Update replenish.php 2021-10-31 14:22:14 +01:00
Laurent Destailleur
480ad63c5d
Update stocks.lang 2021-10-31 14:21:01 +01:00
Laurent Destailleur
7773f8f017
Update replenish.php 2021-10-31 14:20:30 +01:00
Laurent Destailleur
dfc8698422
Update replenish.php 2021-10-31 14:16:18 +01:00
Laurent Destailleur
3dcd1aa05d
Update info.php 2021-10-31 14:02:34 +01:00
Laurent Destailleur
8dfe4fe05f
Update note.php 2021-10-31 14:02:14 +01:00
Laurent Destailleur
65d59405da
Update document.php 2021-10-31 14:01:56 +01:00
Laurent Destailleur
0e2e8fe27f
Update contact.php 2021-10-31 14:01:40 +01:00
Laurent Destailleur
0d1f67145e
Merge pull request #19237 from ksar-ksar/patch-10 
FIX #19214 : PostgreSQL error on admin/limits.php
 2021-10-31 14:00:13 +01:00
Laurent Destailleur
c1a046601c
Merge pull request #19238 from FHenry/14_fix_deltesuppierorder 
fix: warning on delete supplier order
 2021-10-31 13:58:52 +01:00
Laurent Destailleur
6054e23b4d
Merge pull request #19252 from hregis/fix_totalarray_is_overwritten 
FIX $totalarray is overwritten, totals were lost
 2021-10-31 13:56:37 +01:00
Laurent Destailleur
92f9f3179e
Update list.php 2021-10-31 13:56:19 +01:00
Laurent Destailleur
7232e38dbe
Merge pull request #19248 from fmarcet/12.0 
Fix: Import don't work if extrafield is separator
 2021-10-31 13:54:31 +01:00
Laurent Destailleur
dcc98b6026 Fix filter on product on statistic page 2021-10-31 12:54:08 +01:00
Alexandre SPANGARO
54b81312b5 FIX Ticket - Duplicate field project when we create ticket from project 2021-10-30 22:49:32 +02:00
Alexandre SPANGARO
9142599ea5 copyright 2021-10-30 21:18:52 +02:00
Alexandre SPANGARO
b1c799ee08 FIX #19241 Project - Fix display salary in overview 2021-10-30 21:17:15 +02:00
Regis Houssin
09621af54e FIX $totalarray is overwritten, totals were lost 2021-10-29 22:49:29 +02:00
Ferran Marcet
1336d3e791 Fix: Import don't work if extrafield is separator 2021-10-29 12:25:50 +02:00
Alexandre SPANGARO
da52742421 FIX Accountancy - Product admin - SQL error when we affect accounting account with product_perentity activated 2021-10-29 05:47:29 +02:00
Florian HENRY
9d15a7a18c fix: warning on delete wupplier order 2021-10-28 17:37:30 +02:00
ksar
2b13c05d13
FIX #19214 2021-10-28 15:54:38 +02:00
Marc de Lima Lucio
eb8d7f92c3 FIX: invoice: inpossible to create an invoice because of very bad check + warnings when trying to print tabs for invoice with no ID 2021-10-28 15:26:40 +02:00
Administrator
2a9cd21b71 FIX: Travis Sanitize SQL 2021-10-28 14:14:25 +02:00
Administrator
44eedb8c6e FIX: Replenish: SQL error when no warehouse has been created + Warning when there are no warehouses 2021-10-28 12:58:14 +02:00
Laurent Destailleur
82a35f82b4 CSS 2021-10-28 11:33:22 +02:00
Laurent Destailleur
f033e91cb0 phpcs 2021-10-28 11:03:27 +02:00
Laurent Destailleur
41bba0e879 Fix import of members 2021-10-28 00:12:41 +02:00
Laurent Destailleur
5df25fece7 Trans and log 2021-10-27 11:15:26 +02:00
Administrator
c998abe54e FIX: resource list : Use standard code to handle list filters 2021-10-27 11:09:00 +02:00
Frédéric FRANCE
dc15d09f12
remove duplicate code 2021-10-27 09:37:22 +02:00
Alexandre SPANGARO
9bfd5c4f41 Merge branch '14.0' into 14p23 2021-10-27 09:36:22 +02:00
Florian HENRY
46119c99a2 fix: warning dol_print_date setTimeStamp when time empty 2021-10-27 09:23:54 +02:00
Laurent Destailleur
f12c709ec1 Fix checkbox 2021-10-27 03:09:12 +02:00