Commit Graph

35 Commits

Author SHA1 Message Date
Laurent Destailleur
32875a1e6c Fix trans 2022-04-06 17:06:49 +02:00
Laurent Destailleur
8f93584f97 Fix trans 2022-04-06 16:56:23 +02:00
Laurent Destailleur
2e91b0107a Fix missing data in tooltip 2022-04-06 15:35:49 +02:00
Laurent Destailleur
c2f2f98235 css 2022-04-06 15:25:37 +02:00
Laurent Destailleur
2a18bce2f3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/api/index.php
	htdocs/langs/en_US/productbatch.lang
	htdocs/langs/fr_FR/productbatch.lang
	htdocs/ticket/list.php
2022-02-16 20:31:55 +01:00
Laurent Destailleur
e0563d2bef Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-16 20:27:07 +01:00
Alexis LAURIER
8b0280a9d2 add missing entity check on list of withdraws on index of paymentbybanktransfert 2022-02-16 10:26:44 +01:00
Laurent Destailleur
3cf59ba67f Fix missing button to create new record (Look and feel) 2021-12-18 14:55:35 +01: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
b6ec7ae77a Fix permissions on module PaymentByBankTransfer 2021-10-04 04:36:58 +02:00
Laurent Destailleur
b3cb56f2ef Clean css 2021-10-04 04:14:31 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +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
ca1715df96 Add some protection for SQL injection 2021-03-22 13:31:06 +01:00
Laurent Destailleur
9cf4222d3a Look and feel v14 2021-02-27 17:15:40 +01:00
Frédéric FRANCE
61600a9e65 code syntax compta directory 2021-02-23 21:09:01 +01:00
jcp
50d530733e NEW: ICS fields moved into bank account table 2020-11-09 14:08:34 +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
5189e8beea FIX Debug direct debit module and credit transfer module 2020-08-04 20:26:57 +02:00
Laurent Destailleur
91a50038ff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/fiche-stat.php
2020-07-27 19:35:34 +02:00
Laurent Destailleur
8c06e3577d Fix several trouble with diret debit module and credit transfer module 2020-07-27 19:33:24 +02:00
Laurent Destailleur
83eaddb17b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/evalmath.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/install/mysql/migration/11.0.0-12.0.0.sql
	htdocs/langs/en_US/cashdesk.lang
	htdocs/societe/class/societe.class.php
2020-07-04 13:13:17 +02:00
Laurent Destailleur
ae0c738980 FIX Entry from stripe intent were reported into SEPA payments
FIX Label of popup on thirdparty
FIX Missing the tooltip when creating bank account
2020-07-01 19:42:28 +02:00
Laurent Destailleur
e2a9743dd4 Debug module credit transfer 2020-07-01 14:19:47 +02:00
Laurent Destailleur
a607ff4c1a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/core/lib/project.lib.php
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/products.lang
	htdocs/langs/fr_FR/stocks.lang
	htdocs/langs/fr_FR/ticket.lang
	htdocs/mrp/mo_card.php
2020-06-18 15:50:31 +02:00
Laurent Destailleur
fded55ddef Fix sepa supplier count 2020-06-18 03:44:26 +02:00
Laurent Destailleur
8dbc0ff040 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/prelevement.php
	htdocs/admin/system/phpinfo.php
	htdocs/modulebuilder/index.php
2020-05-31 00:31:14 +02:00
Laurent Destailleur
e8016a5e7e Fix credit-transfer vs direct debit 2020-05-30 23:46:14 +02:00
Laurent Destailleur
a2a15ceb5b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/demandes.php
	htdocs/core/class/html.form.class.php
2020-05-27 23:07:18 +02:00
Laurent Destailleur
15f2165c12 Fix work on payment by bank transfer (avoid confusion between record) 2020-05-27 20:14:11 +02:00
Frédéric FRANCE
b41ac00b98 add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
f5688b2eec add new rule 2020-05-21 01:52:25 +02:00
Laurent Destailleur
106fe7bde6 Clean conflict between direct debit and direct credit orders. 2020-05-17 15:06:09 +02:00