Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-03 15:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
125,218 Commits 37 Branches 191 Tags
c263fccb5f8bedd828ef2fd34b64b51fb8812c06
Commit Graph

124 Commits

Author SHA1 Message Date
Laurent Destailleur
987bde3142 Trans 2023-07-10 15:38:53 +02:00
Laurent Destailleur
80b6e78679 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-04-27 14:19:09 +02:00
Laurent Destailleur
04bca1cc1f Fix when membership type option "Any amount" when Yes. 2023-04-24 14:51:20 +02:00
Laurent Destailleur
9a68d1df22 Debug v17 2022-12-11 22:39:30 +01:00
Laurent Destailleur
38676b6c04 Fix phpunit 2022-09-10 00:54:16 +02:00
Laurent Destailleur
9a09e0f304 Merge SEPA payment using Stripe manually. 2022-09-09 02:26:45 +02:00
Laurent Destailleur
c06963f2ff Trans 2022-09-06 14:22:55 +02:00
Laurent Destailleur
307476786c Fix label of remain to pay on vendor invoices 
FIX tool to fix bank account not in main currency for vendor invoice
 2022-04-19 23:24:08 +02:00
Laurent Destailleur
8f93584f97 Fix trans 2022-04-06 16:56:23 +02:00
Laurent Destailleur
26e8496c46 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/card.php
 2022-01-06 16:15:58 +01:00
Maxime Kohlhaas
1e848f0ebb Fix prelevement right management and action buttons 2021-12-28 18:17:57 +01:00
Maxime Kohlhaas
93393b82a3 Fix nav + translations on supplier invoice credit transfer 2021-12-28 17:40:25 +01:00
Laurent Destailleur
12645926cc Fix text 2021-12-21 12:12:32 +01:00
Laurent Destailleur
9465edd8ec Add warning making payment if pending direct debit or credit trans 2021-12-16 14:09:56 +01:00
Laurent Destailleur
ecf98530bb Debug SEPA payment module 2021-12-09 12:42:04 +01:00
Laurent Destailleur
bec87f5739 Fix translation ICS 2021-08-04 13:12:07 +02:00
Laurent Destailleur
fd3354142b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/viewcat.php
 2021-02-06 01:17:05 +01:00
Laurent Destailleur
c6badeed57 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/categories/viewcat.php
	htdocs/compta/prelevement/card.php
 2021-02-06 01:14:48 +01:00
Laurent Destailleur
4428e2b18e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/prelevement/card.php
	htdocs/product/price.php
 2021-02-06 01:08:37 +01:00
Laurent Destailleur
87c8d917e9 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/prelevement/card.php
 2021-02-06 01:03:31 +01:00
Florian Mortgat
3f862bf43e FIX 10.0 - before crediting a withdrawal receipt, check whether it has been credited already 2021-02-05 11:34:39 +01:00
Frédéric FRANCE
a5678147dd add missing translation 2021-01-13 16:52:32 +01:00
Laurent Destailleur
71e4a672f5 Merge branch 'develop' into develop_patch-1 2021-01-01 20:52:43 +01:00
Laurent Destailleur
744bc56953 Merge pull request #15283 from prietojc/12.0.3 
NEW massaction for Bank Transfer
 2020-12-30 13:11:31 +01:00
jcp
10ae18fe44 Update SQL migration 2020-11-12 19:42:20 +01:00
jcp
50d530733e NEW: ICS fields moved into bank account table 2020-11-09 14:08:34 +01:00
jcp
518a225f7b NEW massaction for BankTransfer 2020-11-03 20:53:26 +01:00
Laurent Destailleur
9d4e672475 FIX Debug direct debit module and credit transfer module 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/prelevement/create.php
 2020-08-04 21:12:03 +02:00
Laurent Destailleur
5189e8beea FIX Debug direct debit module and credit transfer module 2020-08-04 20:26:57 +02:00
Laurent Destailleur
da76775fbd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/prelevement/factures.php
	htdocs/compta/prelevement/fiche-rejet.php
 2020-08-03 21:18:45 +02:00
Laurent Destailleur
f62717a16a FIX Debug module direct debit order. Solve conflict with credit transfer 2020-08-03 20:16:33 +02:00
Laurent Destailleur
679625daee Trans 2020-08-03 09:51:15 +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
d18ce3b39e Look and feel v12 
Conflicts:
	htdocs/langs/en_US/cashdesk.lang
 2020-07-05 12:54:42 +02:00
Laurent Destailleur
9057559ab5 Trans 2020-07-05 12:47:32 +02:00
Laurent Destailleur
16b327f106 Debug module credit transfer 2020-07-02 15:45:11 +02:00
Laurent Destailleur
68b4866438 Trans 2020-06-29 09:43:39 +02:00
Laurent Destailleur
02e022ebfa Fix class not found for supplier credit. Class must be into 
commoninvoice
 2020-06-24 19:59:06 +02:00
Laurent Destailleur
566c1aaf84 Fix for credit transfer module 2020-06-22 22:54:33 +02:00
Laurent Destailleur
4cfe1fcd6b Typo 2020-06-18 15:57:50 +02:00
Laurent Destailleur
70bdd59548 Fix trans 2020-06-08 11:52:43 +02:00
Laurent Destailleur
c386f4b2e3 Maxi debug of direct debit order 2020-06-08 11:43:20 +02:00
Laurent Destailleur
156f09729e Debug module Payment by credit transfer 2020-05-30 02:10:41 +02:00
Laurent Destailleur
e37e45f984 Debug credit transfer 2020-05-27 22:35:55 +02:00
Laurent Destailleur
15f2165c12 Fix work on payment by bank transfer (avoid confusion between record) 2020-05-27 20:14:11 +02:00
Laurent Destailleur
106fe7bde6 Clean conflict between direct debit and direct credit orders. 2020-05-17 15:06:09 +02:00
Laurent Destailleur
57a15b88fa Fix UMR 2019-09-06 14:07:42 +02:00
Maxime Kohlhaas
be6ad7b6a4 New : can define RUM date on third bank account 2019-07-28 17:10:37 +02:00
Laurent Destailleur
afb6362317 Fix look and feel v10 
Fix link to direct debit payment order
 2019-06-20 13:37:06 +02:00
markus
de9b8f427d Add configurable days to SEPA Withdrawal Execution Date 2019-01-18 16:16:55 +01:00