Laurent Destailleur
|
7e6d52c137
|
Merge pull request #22168 from Hystepik/develop#2
Fix : php 8.1 warnings
|
2022-09-09 15:51:03 +02:00 |
|
lmarcouiller
|
68b72ac17d
|
Fix : php 8.1 warnings
|
2022-09-09 10:06:16 +02:00 |
|
Frédéric France
|
da8617e3ff
|
Merge remote-tracking branch 'upstream/develop' into loaddolibarrenv
|
2022-09-08 18:59:23 +02:00 |
|
Laurent Destailleur
|
ee05abaa27
|
Clean code
|
2022-09-08 15:13:16 +02:00 |
|
Frédéric France
|
8d33953142
|
add comment
|
2022-09-07 20:08:59 +02:00 |
|
Frédéric France
|
8e66b7207e
|
replace ! empty by !empty
|
2022-08-31 22:14:20 +02:00 |
|
Laurent Destailleur
|
a5c18ea776
|
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2022-08-31 17:57:14 +02:00 |
|
Alexandre SPANGARO
|
5dc2230c88
|
Use isModEnabled
|
2022-08-29 12:03:32 +02:00 |
|
Alexandre SPANGARO
|
34e036ab1c
|
Use isModEnabled
|
2022-08-29 12:03:25 +02:00 |
|
Alexandre SPANGARO
|
a283ab61c2
|
Use isModEnabled
|
2022-08-29 11:25:24 +02:00 |
|
Alexandre SPANGARO
|
38882a6324
|
Use isModEnabled
|
2022-08-29 11:25:20 +02:00 |
|
Alexandre SPANGARO
|
ef3b8b3b31
|
Use isModEnabled
|
2022-08-29 11:25:14 +02:00 |
|
Philippe GRAND
|
b886210df3
|
FIX php8 compatibility
|
2022-08-28 13:51:29 +02:00 |
|
Philippe GRAND
|
51fb06ed67
|
FIX php8 compatibility
|
2022-08-28 13:50:58 +02:00 |
|
Frédéric France
|
e78f9a56be
|
use isModEnabled
|
2022-08-23 20:16:28 +02:00 |
|
Frédéric France
|
4bef0f5745
|
use isModEnabled
|
2022-08-23 20:01:34 +02:00 |
|
lvessiller
|
0e0c297ed5
|
NEW filter on reception dates (from / to) in cheque paiement card
|
2022-08-08 14:56:28 +02:00 |
|
Laurent Destailleur
|
5e4eb58a43
|
FIX phpv8
|
2022-07-21 11:09:35 +02:00 |
|
Laurent Destailleur
|
3079ab2737
|
FIX phpv8
|
2022-07-21 10:59:15 +02:00 |
|
Laurent Destailleur
|
08a942dca8
|
# WARNING: head commit changed in the meantime
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
|
2022-06-17 14:52:51 +02:00 |
|
Laurent Destailleur
|
12ee8eb40b
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
htdocs/core/class/commonobject.class.php
|
2022-06-13 13:32:11 +02:00 |
|
Laurent Destailleur
|
cedf6f8057
|
# WARNING: head commit changed in the meantime
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
|
2022-06-13 13:26:59 +02:00 |
|
Nicolas F
|
5decd00149
|
fix: remove duplication bank transaction
do not duplicate previous bank transaction when value is 0
|
2022-06-13 10:40:41 +00:00 |
|
Laurent Destailleur
|
7f3826609a
|
Fix var not defined
|
2022-06-03 14:34:38 +02:00 |
|
Laurent Destailleur
|
baae99fbb4
|
Support ZATCA
|
2022-05-25 09:06:59 +02:00 |
|
Laurent Destailleur
|
259a292704
|
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2022-05-24 16:33:24 +02:00 |
|
Laurent Destailleur
|
34199cf0fb
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
htdocs/comm/propal/card.php
htdocs/core/modules/modRecruitment.class.php
|
2022-05-24 16:31:45 +02:00 |
|
Laurent Destailleur
|
c1ef208c0f
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
htdocs/adherents/subscription.php
htdocs/core/lib/security.lib.php
htdocs/expensereport/card.php
|
2022-05-24 16:27:26 +02:00 |
|
Maxime Kohlhaas
|
c3fb7647c5
|
Fix delete customer payment
|
2022-05-22 02:30:35 +02:00 |
|
Philippe GRAND
|
526c6fcc0e
|
fix : The property num_prelevement does not exist on Paiement
|
2022-05-21 22:41:27 +02:00 |
|
Philippe GRAND
|
7580a4c1ff
|
fix : The property id_prelevement does not exist on Paiement
|
2022-05-21 22:35:49 +02:00 |
|
Laurent Destailleur
|
86d34af4b0
|
Fix deprecated code
|
2022-05-18 11:38:56 +02:00 |
|
Laurent Destailleur
|
6592eb5d73
|
Debug for php 8.1
|
2022-05-08 18:25:22 +02:00 |
|
Laurent Destailleur
|
223db9bb76
|
Fix: Not SetEventMessages inside a CRUD class.
|
2022-04-29 14:32:47 +02:00 |
|
Laurent Destailleur
|
cb15a21e41
|
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/originproductline.tpl.php
htdocs/fourn/facture/card.php
htdocs/install/mysql/migration/14.0.0-15.0.0.sql
htdocs/user/card.php
|
2022-04-11 21:22:27 +02:00 |
|
Laurent Destailleur
|
d6860ca41b
|
FIX bad bank amount in accounting with multicurrency
|
2022-04-09 02:22:45 +02:00 |
|
Laurent Destailleur
|
eecbc05bc3
|
Show amount into popup of payment
|
2022-04-09 00:06:02 +02:00 |
|
Laurent Destailleur
|
003bcd60fa
|
FIX Add protection on bad input of payment on multicurrency invoices
|
2022-04-08 19:52:40 +02:00 |
|
Laurent Destailleur
|
6169f76a34
|
Add log for debug. Make new method for stripe payment an option.
|
2022-04-08 12:38:49 +02:00 |
|
Laurent Destailleur
|
71012a7933
|
FIX #19777 #20281
|
2022-04-04 15:25:29 +02:00 |
|
Laurent Destailleur
|
644e509265
|
Rename "Reconciled" with "BankLineReconciled" for bank conciliation
|
2022-03-25 14:43:48 +01:00 |
|
Laurent Destailleur
|
2142440b6c
|
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/action/index.php
htdocs/langs/en_US/errors.lang
|
2022-03-07 13:23:47 +01:00 |
|
Laurent Destailleur
|
378dab69a6
|
FIX #19777 #20281
|
2022-03-07 13:21:32 +01:00 |
|
Laurent Destailleur
|
c2fb5d577c
|
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/install/mysql/migration/14.0.0-15.0.0.sql
htdocs/langs/en_US/banks.lang
htdocs/projet/list.php
|
2022-02-28 20:12:28 +01:00 |
|
Laurent Destailleur
|
5a24552930
|
Fix doc
|
2022-02-28 20:03:21 +01:00 |
|
Laurent Destailleur
|
ca236c556a
|
FIX Blocking situation when a payment was deleted in bank.
FIX Missing or bad permissions
|
2022-02-28 19:45:53 +01:00 |
|
Laurent Destailleur
|
aff7148ed8
|
Fix missing error management
|
2022-02-28 16:39:42 +01:00 |
|
Laurent Destailleur
|
e96061dd18
|
Fix phpunit SecurityTest
|
2022-02-22 23:46:57 +01:00 |
|
Laurent Destailleur
|
0517e2e2d3
|
Fix error
|
2022-02-18 18:35:21 +01:00 |
|
Laurent Destailleur
|
3b6f7bff66
|
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2022-02-18 16:32:51 +01:00 |
|
Laurent Destailleur
|
3d9cdbf136
|
FIX Debug v15
|
2022-02-18 16:24:11 +01:00 |
|
Frédéric FRANCE
|
935482ee22
|
uniformize
|
2022-02-15 19:04:18 +01:00 |
|
Frédéric FRANCE
|
502aa1b14b
|
Update paiement.class.php
|
2022-02-15 11:21:40 +01:00 |
|
Laurent Destailleur
|
054116900a
|
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2022-01-13 11:59:05 +01:00 |
|
Laurent Destailleur
|
cb03f88fbc
|
Fix link
|
2022-01-13 11:58:10 +01:00 |
|
Laurent Destailleur
|
13510b9929
|
Clean sortfield, sortorder
|
2022-01-13 11:17:25 +01:00 |
|
Laurent Destailleur
|
f51720879b
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
|
2022-01-13 11:05:57 +01:00 |
|
Laurent Destailleur
|
dc3670bc91
|
Clean search_status
|
2022-01-13 11:00:52 +01:00 |
|
Laurent Destailleur
|
fbce09f21b
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/compta/facture/card.php
htdocs/reception/card.php
|
2021-12-19 00:36:22 +01:00 |
|
Jay Yeo
|
492fe288bd
|
NEW : add margin in paiement/card.php
|
2021-12-17 14:44:47 +07:00 |
|
Jay Yeo
|
4c4d362348
|
NEW : add margin in paiement/card.php
|
2021-12-17 14:31:06 +07:00 |
|
Laurent Destailleur
|
43e682b56f
|
Fix several pb with down payments
|
2021-12-16 12:33:45 +01:00 |
|
Laurent Destailleur
|
7ce6009958
|
Removed deprecated option
|
2021-12-09 09:53:32 +01:00 |
|
Christian Foellmann
|
6608f5f0d8
|
update all script tags to be uniform. language="javascript" removed
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
|
2021-11-29 15:09:18 +01:00 |
|
Frédéric FRANCE
|
ead9b396c6
|
fix warning
|
2021-10-24 16:02:59 +02:00 |
|
Laurent Destailleur
|
8604f9b153
|
Clean DOM (remove ficheaddleft div)
|
2021-10-23 17:18:35 +02:00 |
|
Frédéric FRANCE
|
46c4f28478
|
fix multiple warnings
|
2021-10-22 22:15:59 +02:00 |
|
Laurent Destailleur
|
dd0809b528
|
Fix trans labels status
|
2021-10-16 19:37:57 +02:00 |
|
Laurent Destailleur
|
2cb0edb5eb
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/public/project/suggestbooth.php
htdocs/public/project/suggestconference.php
|
2021-10-07 11:01:53 +02:00 |
|
Laurent Destailleur
|
9b5909300e
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
htdocs/compta/paiement/card.php
htdocs/fourn/facture/card.php
|
2021-10-07 11:00:00 +02:00 |
|
Laurent Destailleur
|
efd44b0ec0
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
|
2021-10-07 10:57:03 +02:00 |
|
Laurent Destailleur
|
5910d10021
|
Add hidden option to allow to fix corrupted situations
|
2021-10-07 10:43:50 +02:00 |
|
Laurent Destailleur
|
608b6f5fa3
|
Clean code
|
2021-09-30 15:24:57 +02:00 |
|
Laurent Destailleur
|
37603b451a
|
Fix token in url
|
2021-09-27 12:24:01 +02:00 |
|
Laurent Destailleur
|
deb1965cd5
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/action/card.php
htdocs/compta/paiement/list.php
htdocs/core/class/commonobject.class.php
htdocs/mrp/mo_list.php
htdocs/projet/tasks/task.php
htdocs/public/payment/newpayment.php
|
2021-09-20 17:15:12 +02:00 |
|
Laurent Destailleur
|
d760686239
|
Fix case of newtoken()
|
2021-09-18 22:24:00 +02:00 |
|
Laurent Destailleur
|
0749d01c5a
|
Fix add action delete* as sensitive action
|
2021-09-18 22:04:41 +02:00 |
|
Laurent Destailleur
|
3d9be1437a
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
htdocs/compta/paiement/list.php
htdocs/fourn/paiement/list.php
htdocs/projet/tasks/time.php
|
2021-09-17 12:29:58 +02:00 |
|
Ferran Marcet
|
7a637104b2
|
Fix: Not filter by company when it is an external user
|
2021-09-15 11:29:12 +02:00 |
|
javieralapps4up
|
e1203d115a
|
Update list.php
|
2021-09-14 02:22:30 +02:00 |
|
javieralapps4up
|
0763846805
|
Bug: #18670 date, account and payment type are lost when sorting by any field
Filtereds $date, $search_account and $search_paymenttype are not saved when sorting by any field
|
2021-09-14 02:15:22 +02:00 |
|
javieralapps4up
|
d7126e8d24
|
Update list.php
$search_account and $search_paymenttype are not saved when sorting by any field
|
2021-09-14 01:49:24 +02:00 |
|
Laurent Destailleur
|
ee066ad725
|
Cast sql var
|
2021-09-03 21:25:43 +02:00 |
|
Laurent Destailleur
|
fb8723d884
|
Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons
replace remaining SubmitCancel buttons
|
2021-08-28 18:39:06 +02:00 |
|
Laurent Destailleur
|
2dd91bf312
|
Clean code
|
2021-08-27 23:36:06 +02:00 |
|
Laurent Destailleur
|
46d993c9a6
|
Clean code
|
2021-08-27 22:42:04 +02:00 |
|
Laurent Destailleur
|
2f225ee7e5
|
Clean code by adding cast int.
|
2021-08-27 16:33:03 +02:00 |
|
Christian Foellmann
|
f094b4c70c
|
fix up most of the remaining submit inputs
|
2021-08-24 17:04:17 +02:00 |
|
Laurent Destailleur
|
dc006b0ebb
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.form.class.php
|
2021-08-23 19:44:02 +02:00 |
|
Laurent Destailleur
|
d4b5ee6c85
|
Fix cast into variable into sql request.
|
2021-08-23 17:41:11 +02:00 |
|
Laurent Destailleur
|
04148dd5fb
|
Merge pull request #17789 from aspangaro/14b10
NEW Add field date from/to in customer payment list
|
2021-06-29 19:54:12 +02:00 |
|
Laurent Destailleur
|
68b8a6a916
|
css
|
2021-06-20 16:35:49 +02:00 |
|
Laurent Destailleur
|
306b7779ff
|
Merge branch 'develop' into 11p1
|
2021-06-11 19:55:37 +02:00 |
|
Laurent Destailleur
|
fb46ece906
|
Fix yogosha 6347
|
2021-06-09 15:36:47 +02:00 |
|
Alexandre SPANGARO
|
ffb1b232d4
|
Fix Withdraw - link is missing in llx_bank_url when the debit is rejected
|
2021-06-06 21:27:48 +02:00 |
|
Alexandre SPANGARO
|
c1757bdbd8
|
Remove warning
|
2021-06-06 06:28:38 +02:00 |
|
Alexandre SPANGARO
|
a92bd31ce1
|
Fix search_datexxx
|
2021-06-05 07:39:15 +02:00 |
|
Alexandre SPANGARO
|
3744ccdd28
|
Look & feel v14
|
2021-06-01 22:50:55 +02:00 |
|
Alexandre SPANGARO
|
b5904e49a0
|
NEW Add field date from/to in customer payment list
|
2021-06-01 22:43:43 +02:00 |
|
Laurent Destailleur
|
6bf66adff0
|
Fix remove some $_REQUEST
|
2021-05-17 07:27:02 +02:00 |
|