2
0
forked from Wavyzz/dolibarr
Commit Graph

201 Commits

Author SHA1 Message Date
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
fa4786a3f6 Fix permission 2021-06-08 16:19:21 +02:00
Laurent Destailleur
ba6e675273 css 2021-05-12 22:21:20 +02:00
Laurent Destailleur
fd2d317b4a Fix #yogosha5881 2021-04-25 15:55:36 +02:00
Laurent Destailleur
358bb87ae2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/projet/card.php
	htdocs/public/payment/newpayment.php
	htdocs/societe/list.php
	htdocs/ticket/document.php
2021-04-13 20:19:05 +02:00
Alexandre SPANGARO
4b9bf40a8f move include_once to include when it's a tpl 2021-04-12 21:25:58 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
UT from dolibit
888dfdba4a Create index.html 2021-04-05 20:19:23 +02:00
Laurent Destailleur
b929641fe1 Look and feel v14 2021-03-29 13:00:17 +02:00
Laurent Destailleur
ca1715df96 Add some protection for SQL injection 2021-03-22 13:31:06 +01:00
Alexandre SPANGARO
03481a0197 Uniformize translation 2021-03-16 04:22:43 +01:00
Laurent Destailleur
0670a00b83 Fix phpcs 2021-03-02 02:06:09 +01:00
Laurent Destailleur
222012da37 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/bank/class/paymentvarious.class.php
	htdocs/compta/bank/various_payment/card.php
	htdocs/don/card.php
	htdocs/langs/en_US/main.lang
	htdocs/public/payment/newpayment.php
	test/phpunit/DateLibTzFranceTest.php
2021-03-01 15:48:30 +01:00
Alexandre SPANGARO
0abe576fdc FIX: Various payment - Missing fields for check transmitter & bank name 2021-03-01 04:49:06 +01:00
Frédéric FRANCE
61600a9e65 code syntax compta directory 2021-02-23 21:09:01 +01:00
Laurent Destailleur
2be6992916 Fix include_once into include for inc.php file. See comment in #16338 2021-02-19 16:10:19 +01:00
Laurent Destailleur
3285dd3199 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	ChangeLog
	htdocs/compta/bank/various_payment/list.php
2021-02-19 14:11:08 +01:00
Laurent Destailleur
d7c3cc4d18 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/compta/bank/various_payment/list.php
2021-02-19 14:08:36 +01:00
Iván Mestre
a2051fc01e V13 Fix #16241 Date filter resets on Miscellaneous Payments
Changed $search_datep_start, $search_datep_end, $search_datev_start and $search_datev_end variables to get values from search_datep_start, search_datep_end, search_datev_start and search_datev_end GET parameters if their value is empty after checking POST parameters
2021-02-10 15:20:10 -03:00
Iván Mestre
a249f4f35a Fix #16241 Date filter resets on Miscellaneous Payments
Changed $search_date_start and $search_date_end variables to get values from search_date_start and search_date_end GET parameters if no their value is empty after checking POST parameters
2021-02-10 15:03:17 -03:00
Iván Mestre
cb4cfbd27d Fixed Bank Account filter resets on payment various
Changed GET search bank account GET parameter from search_amount to search_account
2021-02-10 14:43:19 -03:00
Laurent Destailleur
7ff5cd50c3 Fix responsive 2021-02-02 11:41:32 +01:00
Laurent Destailleur
d2c86578fa Update card.php 2021-01-11 15:58:20 +01:00
Alexandre SPANGARO
004ee952d9 Various payment - Add Amount & Sens in clone mode 2021-01-10 08:16:19 +01:00
Laurent Destailleur
5a097b21e4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/compta/bank/various_payment/card.php
2020-12-30 13:21:33 +01:00
Alexandre SPANGARO
0e2b7d8b3c Remove typo 2020-12-30 07:23:26 +01:00
Laurent Destailleur
88e441412c CSS 2020-12-24 01:35:59 +01:00
Laurent Destailleur
4471d7d1da FIX debug report expense/income 2020-12-23 22:18:38 +01:00
Frédéric FRANCE
870f2073ad fix warning 2020-12-11 22:13:30 +01:00
Laurent Destailleur
be163c684f Fix phpcs 2020-12-10 12:54:13 +01:00
Laurent Destailleur
dac0267a38 Fix debug various payment module.
Fix debug report income/expense (for situation that should not happen
but if it happen, result is consistent with other screens).
2020-12-09 21:51:01 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel"
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
2020-11-23 15:12:52 +01:00
Givriz
c48129e279 Ajout de la class "button-save"
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
2020-11-19 20:23:38 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Laurent Destailleur
c187b41714 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-29 13:10:39 +01:00
Laurent Destailleur
ee4a827627 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/compta/bank/various_payment/card.php
	htdocs/compta/bank/various_payment/list.php
	htdocs/core/db/DoliDB.class.php
2020-10-29 13:10:10 +01:00
Laurent Destailleur
2a386b6fea Fix set subledger account 2020-10-29 11:13:18 +01:00
Laurent Destailleur
91cf5de54d Fix bad sort order 2020-10-29 11:06:18 +01:00
Laurent Destailleur
b1b7a7c725 Fix missing transaction 2020-10-29 10:40:50 +01:00
Frédéric FRANCE
5a3780e062 end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Laurent Destailleur
6fa174d13f Merge pull request #15051 from laudeco/feature/11878_select_bank_account
11878 - select the only bank account
2020-10-25 14:56:08 +01:00
Laurent De Coninck
1d62834b2c use the second version for default bank account 2020-10-24 17:15:48 +02:00
Frédéric FRANCE
9a470fa42d replace deprecated 2020-10-22 22:50:03 +02:00
Laurent De Coninck
d2e2cad028 select by default, remove the show empty everywhere the field is required 2020-10-17 21:15:52 +02:00
Alexandre SPANGARO
973502bb1e Fix 2020-10-07 09:36:29 +02:00
Alexandre SPANGARO
503f190fd4 Fix 2020-10-06 14:39:10 +02:00
Alexandre SPANGARO
050a4770d3 WIP NEW Add clone functionality on miscellaneous payment 2020-10-06 10:04:15 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
Tobias Sekan
a72519f353 Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-23 09:09:42 +02:00
Laurent Destailleur
6c06d2f0aa Look and feel v13 2020-09-22 15:26:29 +02:00