Commit Graph

226 Commits

Author SHA1 Message Date
Laurent Destailleur
644e509265 Rename "Reconciled" with "BankLineReconciled" for bank conciliation 2022-03-25 14:43:48 +01:00
Laurent Destailleur
16e4e736fd Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-10 16:28:29 +01:00
Laurent Destailleur
10d2e0cec0 Fix link to reconcile 2022-02-10 16:27:40 +01:00
Laurent Destailleur
9f377b7fe4 Better responsive on small screen 2022-01-24 23:58:16 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
bdac615cba Fix empty column 2022-01-07 14:01:15 +01:00
Laurent Destailleur
a887e41600 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/bank/bankentries_list.php
	htdocs/compta/bank/info.php
	htdocs/compta/bank/line.php
	htdocs/compta/bank/releve.php
	htdocs/compta/bank/various_payment/card.php
	htdocs/fourn/class/fournisseur.product.class.php
2022-01-04 09:45:31 +01:00
Laurent Destailleur
807f2841d4 FIX Navigation on bank transaction list 2022-01-04 09:33:52 +01:00
Laurent Destailleur
64c7472965 Fix link to account id 2022-01-03 22:01:08 +01:00
Laurent Destailleur
809c8f993b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/modPropale.class.php
	htdocs/filefunc.inc.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
2021-12-30 19:03:46 +01:00
Maxime Kohlhaas
12880f1716 Fix : replace old filters by new ones 2021-12-28 16:02:51 +01:00
Maxime Kohlhaas
1d20694f33 Fix #19667 : bankentries wrong SQL parenthesis + missing filter 2021-12-28 15:47:46 +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
0443302c3d FIX calculation of balance in conciliation page on desc sorting. 2021-11-11 13:49:21 +01:00
Laurent Destailleur
216eb7bd5a
Merge pull request #19185 from frederic34/bankentrieslist
fix warnings in bankentries list
2021-10-31 17:47:14 +01:00
Frédéric FRANCE
71541fa299
fix warnings in bankentrie list 2021-10-24 16:52:02 +02:00
Frédéric FRANCE
f6cd0818b3
fix warnings in bankentrie list 2021-10-24 16:47:01 +02:00
Frédéric FRANCE
de312cf8b4
Update bankentries_list.php 2021-10-24 16:39:57 +02:00
Frédéric FRANCE
c21593a5ab
fix search 2021-10-24 16:28:18 +02:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
Laurent Destailleur
0749d01c5a Fix add action delete* as sensitive action 2021-09-18 22:04:41 +02:00
Christian Foellmann
fd1d4d9073 add missing css classes to buttons 2021-09-16 11:33:42 +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
d0c57dac34 FIx #18217 - Salary - link 'salary' of bank_url not managed 2021-08-03 15:02:09 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
73c482ca64 Fix escape 2021-04-25 19:36:48 +02:00
Laurent Destailleur
9f03054fc4 Fix #yogosha5877 2021-04-24 20:52:48 +02:00
Anthony Berton
a612831e28 next_change 2021-04-14 14:45:55 +02:00
Laurent Destailleur
6bc56b7671 Look and feel v14 2021-03-29 13:41:28 +02:00
Laurent Destailleur
b929641fe1 Look and feel v14 2021-03-29 13:00:17 +02:00
Laurent Destailleur
d9108362ba War against $_POST 2021-03-25 16:59:47 +01:00
Laurent Destailleur
ca1715df96 Add some protection for SQL injection 2021-03-22 13:31:06 +01:00
Laurent Destailleur
ebf409f831 FIX #yogosha5668 2021-03-19 12:08:40 +01:00
Laurent Destailleur
d2ef4b0506 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/bank/bankentries_list.php
	htdocs/opensurvey/card.php
	htdocs/opensurvey/index.php
	htdocs/opensurvey/results.php
2021-03-18 12:24:34 +01:00
Laurent Destailleur
26dc3ef1b0 FIX Filter on debit/credit
Conflicts:
	htdocs/compta/bank/bankentries_list.php
2021-03-16 18:59:28 +01:00
Laurent Destailleur
9ea7c92b1b FIX Filter on debit/credit 2021-03-16 18:56:10 +01:00
Laurent Destailleur
10a6774ede
Merge pull request #16534 from atm-lena/develop_FIX_OrderBy_UserThirdParty_BankEntries
Bank Entries : Error order by user/thirdparty
2021-03-04 17:08:12 +01:00
Laurent Destailleur
7d20df8054
Merge pull request #16177 from atm-gauthier/NEW/add_real_payments_on_salaries
NEW Salary payment request and Salary payment are 2 different steps in workflow on Salary payment recording
2021-03-04 16:53:54 +01:00
atm-lena
cd1c1c54d4 Merge branch 'FIX_BankEntries_OrderByUserSoc' of github.com:atm-lena/dolibarr into develop_FIX_OrderBy_UserThirdParty_BankEntries 2021-03-04 11:50:08 +01:00
atm-lena
0cce782a21 No orderby for user/thirdparty in bankentries list 2021-03-04 11:42:47 +01:00
Frédéric FRANCE
a4e25359e7
add missing rule 2021-03-01 20:37:16 +01:00
Gauthier PC portable 024
c996871f98 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-26 11:50:18 +01:00
Frédéric FRANCE
61600a9e65
code syntax compta directory 2021-02-23 21:09:01 +01:00
Gauthier PC portable 024
939d406ab1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-22 09:10:24 +01:00
Laurent Destailleur
0dabbcd7f5
Update bankentries_list.php 2021-02-19 17:48:15 +01:00
stickler-ci
af32ef266c Fixing style errors. 2021-02-19 09:05:04 +00:00
atm-lena
a6999a2be7 Clean code 2021-02-19 09:54:51 +01:00
atm-lena
12dce74a47 Merge branch 'BankEntries_FIX_SearchUSerThirdparty_Reconstruct' of github.com:atm-lena/dolibarr into develop_BankEntries_FIX_SearchUSerThirdparty_Reconstruct 2021-02-19 09:46:55 +01:00
atm-lena
687d0556aa Clean code 2021-02-19 09:39:06 +01:00