Commit Graph

101 Commits

Author SHA1 Message Date
atm-thomasb
8a3e845b5b New RIB selector instead of default (#30899)
* Initial commit - adding new code

* backup, selector added

* NEW: column fk_iban in sql files

* changing the place of the selector

* fix: solved conflicts

* fix: reverted some extremely minor changes

* NEW_first_version_of_form

* TEST: removing chanbges on one file

* same test

* no idea how it's working

* FIX: button is working again

* First version of task working

* FIX: code cleanup to prepare for PR

* FIX: PR preparation part 2

* Revert "FIX: PR preparation part 2"

This reverts commit d11daa6da9.

* WIP added translated error for no iban found when creating bank transfert

* QUAL: simplifying readability of sql

* FIX: renaming fk_iban to fk_societe_rib

* WIP: new simplification of sql

* NEW: xml updated correctly

* FIX: wysiwig fixes

* FIX: PR preparation

* FIX: reverted default rib for llx_user

* FIX: last changes before standard PR

* Initial commit - adding new code

* backup, selector added

* NEW: column fk_iban in sql files

* changing the place of the selector

* fix: solved conflicts

* fix: reverted some extremely minor changes

* NEW_first_version_of_form

* TEST: removing chanbges on one file

* same test

* no idea how it's working

* FIX: button is working again

* First version of task working

* FIX: code cleanup to prepare for PR

* FIX: PR preparation part 2

* Revert "FIX: PR preparation part 2"

This reverts commit d11daa6da9.

* WIP added translated error for no iban found when creating bank transfert

* QUAL: simplifying readability of sql

* FIX: renaming fk_iban to fk_societe_rib

* WIP: new simplification of sql

* NEW: xml updated correctly

* FIX: wysiwig fixes

* FIX: PR preparation

* FIX: reverted default rib for llx_user

* FIX: last changes before standard PR

* FIX: resolved conflicts

* FIX: fixed automatic check warnings

* FIX: more check warnings fixed

* Update htdocs/compta/facture/prelevement.php

Co-authored-by: Florian Mortgat <50440633+atm-florianm@users.noreply.github.com>

* FIX: Added intval checks

* FIX: added escape

* FIX: forgot one entity

* FIX: added more escape for travis

* fix: removed an error handling that caused ci/cr conflicts

* fix: bonPrelevement create error that triggered when not error but empty result

* fix: added one space

---------

Co-authored-by: Florian Mortgat <50440633+atm-florianm@users.noreply.github.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-10-30 23:15:33 +01:00
Laurent Destailleur
d16101d037 Sync translation 2024-07-14 20:12:46 +02:00
Laurent Destailleur
05db4b9f8e Sync transifex 2023-12-15 13:34:39 +01:00
Laurent Destailleur
85977fa402 Sync transifex 2023-11-07 21:10:28 +01:00
Laurent Destailleur
6fc0a868f5 Debug v19 2023-11-06 16:51:37 +01:00
lamrani abdelwadoud
23ce23021f NEW functionality for request_transfer (#26078)
* NEW functionality for request_transfer

* fix problem

* fix problem in transferBank

* fix request sql

* ajust functions for salary invoices

* add badges for each onglet invoice and salary

* Fix update in table bon_prelevement for amount

* Fix in section virement_request list of bonPrelevements

* for prelevemts lignes

* for prelevemts lignes

* update sql for get lignes prelevement with correct info

* update sql for get lignes prelevement with correct info

* add function for check if invoice salaries

* adjust bonprelevement for get salaries

* fix incoherences in create function for class BonPrelevement

* fix request sql for insert in prelevement ligne table

* fix problems and incoherences

* remove parametre  from function

* add parenthensises for cast  in sql request

* disable button when make demande virement

* fix condition for type

* fix conflit "

* fix whitespace

* fix condition for sourcetype

* fix page demandes.php for list salaries invoices

* add prefix db

* fix incoherences for conditions

* Update virement_request.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-06 16:09:05 +01:00
HENRY Florian
a283c6f30c Merge branch 'develop' into dev_sign_soeciete_rib 2023-08-28 15:18:30 +02:00
Laurent Destailleur
64c45aea78 Sync transifex 2023-08-13 19:09:07 +02:00
Laurent Destailleur
987bde3142 Trans 2023-07-10 15:38:53 +02:00
Laurent Destailleur
28b7f7d20a Fix remove foreign key on user
Transifex sync
2023-06-27 13:56:18 +02:00
Florian HENRY
ce2b2f345f feat: RIB Online Sign 2023-05-05 11:48:24 +02:00
Laurent Destailleur
1a7c700ed4 Sync transifex 2023-01-06 14:03:36 +01:00
Laurent Destailleur
e4dc10f6bd Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-01-06 12:26:54 +01:00
Laurent Destailleur
9ce11683de Transifex sync 2022-10-12 16:38:10 +02:00
Laurent Destailleur
4e87e47451 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-05-12 10:35:00 +02:00
Laurent Destailleur
8f93584f97 Fix trans 2022-04-06 16:56:23 +02:00
Laurent Destailleur
31ca78acda Sync transifex.
Fix install.
2022-02-07 14:25:20 +01:00
Laurent Destailleur
cdbcad9c4f Sync transifex 2022-01-16 12:51:08 +01:00
Laurent Destailleur
48c990a8bf Sync transifex 2022-01-02 18:22:18 +01:00
Laurent Destailleur
ec78f21c26 Sync transifex 2021-11-13 15:17:06 +01:00
Laurent Destailleur
39654260d6 Sync transifex 2021-04-20 00:45:48 +02: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
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
Laurent Destailleur
79fb672674 Sync transifex 2021-01-22 01:47:29 +01:00
Laurent Destailleur
69c614ec2a Sync transifex 2021-01-08 11:22:11 +01:00
Laurent Destailleur
d94d7a1d0b Sync transifex 2020-08-30 16:28:07 +02:00
Laurent Destailleur
fb811a1656 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/system/database-tables.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/langs/fr_FR/withdrawals.lang
	htdocs/societe/class/societe.class.php
2020-08-03 14:44:01 +02:00
Laurent Destailleur
e64b8eaf40 Fix debug credit transfer module 2020-08-03 11:21:13 +02:00
Laurent Destailleur
d054aedc80 Sync language 2020-08-02 18:32:54 +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
ade542eee7 Sync language 2020-06-18 10:05:00 +02:00
Laurent Destailleur
b3e9cf3be7 Sync transifex 2019-08-12 17:37:23 +02:00
Laurent Destailleur
907ba62054 Sync transifex 2019-07-24 14:59:03 +02:00
Laurent Destailleur
7f9b407c37 Sync transifex 2019-06-27 13:52:46 +02:00
Laurent Destailleur
a3782f7060 Transifex sync 2019-04-11 16:08:50 +02:00
Laurent Destailleur
b652c53379 Sync transifex 2018-04-11 13:26:23 +02:00
Laurent Destailleur
a3851ec32a Sync transifex 2018-03-27 12:23:39 +02:00
Laurent Destailleur
6a96a9765f Transifex sync 2017-12-21 15:04:04 +01:00
Laurent Destailleur
9dcec5d6cf Sync transifex 2017-11-28 12:32:23 +01:00
Laurent Destailleur
219364703f Sync transifex 2017-11-01 10:48:21 +01:00
Laurent Destailleur
e41dcd173e Sync language 2017-10-19 17:55:24 +02:00
Laurent Destailleur
fa752348c8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/bank/various_payment/index.php
	htdocs/contact/list.php
	htdocs/langs/en_US/errors.lang
2017-08-02 17:56:09 +02:00
Laurent Destailleur
32eb2aba43 Sync transifex 2017-08-02 15:30:46 +02:00
Laurent Destailleur
d07741ada1 Merge branch 'develop' into patch-rib 2017-07-21 14:58:33 +02:00
cam.lafit
f0d95fcbd9 fixup! Allow RUM on creation step 2017-07-19 16:29:56 +02:00
Laurent Destailleur
e3943155f3 Sync transifex 2017-07-09 19:32:35 +02:00
Laurent Destailleur
807eb56807 Add BHD currency 2017-03-03 13:15:20 +01:00
Laurent Destailleur
6c40110613 Sync transifex 2017-02-21 10:26:11 +01:00
Laurent Destailleur
e7a09c07f9 Sync and clean language files 2016-10-11 10:38:38 +02:00