Commit Graph

205 Commits

Author SHA1 Message Date
Laurent Destailleur
bfbb217607 Fix GETPOST on 'action' 2020-09-16 19:39:50 +02:00
Laurent Destailleur
cc37f4b29c Clean code. <input name="token" value="$_SESSION['newtoken']" is now
forbidden by CI. You must use newToken().
2020-09-14 16:24:02 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-07 08:18:17 +00:00
Laurent Destailleur
5189e8beea FIX Debug direct debit module and credit transfer module 2020-08-04 20:26:57 +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
8c34acbf55 FIX Warning if no bank account defined 2020-08-03 14:11:15 +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
e256ce5c4b Debug credit transfer module 2020-07-03 19:27:23 +02:00
Laurent Destailleur
16b327f106 Debug module credit transfer 2020-07-02 15:45:11 +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
ff9312c96a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/prelevement/card.php
	htdocs/compta/prelevement/class/ligneprelevement.class.php
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/line.php
2020-06-08 20:36:54 +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
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
1121d2c1c6 Look and feel v12 2020-04-25 13:49:44 +02:00
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-30 00:48:28 +00:00
Laurent Destailleur
7438f92912 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/demandes.php
	htdocs/compta/tva/document.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/societe/card.php
2020-01-27 01:50:02 +01:00
florian HENRY
5ad5578f40 fix create SEPA withdraw with limit select and working pagination 2020-01-23 17:47:00 +01:00
florian HENRY
210e0511d0 fix create SEPA withdraw with limit select and working pagination 2020-01-23 17:45:16 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Laurent Destailleur
ce47de453e Fix HTML5 2019-12-12 10:31:08 +01:00
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Laurent Destailleur
dbdc62b028 Fix td 2019-10-14 18:41:46 +02:00
Laurent Destailleur
24570f7165 Look and feel v11. Picto are fontawesome. 2019-10-02 18:14:41 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
61cf47aa16 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-10 00:14:07 +02:00
Laurent Destailleur
cad9a59d2a Add option to be able to find behaviour before the fix of list of
invoice in direct debit order.
2019-09-06 14:45:55 +02:00
Laurent Destailleur
09d6826e62 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/supplier_order.php
	htdocs/langs/en_US/admin.lang
2019-09-06 14:27:01 +02:00
Laurent Destailleur
bc0b8dfad0 FIX Consistency in direct debit order lists.
FIX Confirmation of deletion
2019-09-06 14:24:33 +02:00
Laurent Destailleur
d7a41c6b72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/admin.lang
2019-08-01 12:54:27 +02:00
Laurent Destailleur
5eb8f05061 FIX #11584 2019-08-01 12:23:02 +02:00
Laurent Destailleur
50480bf517 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/opensurvey/index.php
2019-07-18 18:23:24 +02:00
Laurent Destailleur
3cffd70ed3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/prelevement/create.php
	htdocs/core/class/commonobject.class.php
	htdocs/expedition/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/commande/dispatch.php
	htdocs/fourn/product/list.php
	htdocs/opensurvey/index.php
	htdocs/ticket/index.php
	htdocs/ticket/list.php
2019-07-18 18:09:37 +02:00
Laurent Destailleur
b3182f65bc
Update create.php 2019-07-18 17:23:52 +02:00
atm-ph
984fe98342 Fix missing hook 2019-07-18 16:12:42 +02:00
Louis Sautier
818a8c7d59
Fix missing form end tag in prelevement 2019-07-03 10:46:32 +02:00
Philippe GRAND
9670228f06 update with html5 compliant code 2019-02-10 16:00:59 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
markus
a45ea9239d Rename consts and cleanup 2019-01-19 14:24:20 +01:00
markus
de9b8f427d Add configurable days to SEPA Withdrawal Execution Date 2019-01-18 16:16:55 +01:00
atm-quentin
013c078c8b Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice 2019-01-16 10:52:46 +01:00
Laurent Destailleur
88a52aa11d
Merge branch 'develop' into develop_mc 2018-12-14 15:58:52 +01:00
Laurent Destailleur
2011afe6fb
Merge branch 'develop' into actionrefused 2018-12-14 15:48:24 +01:00
Maxime Kohlhaas
2e496ea83a QUAL rename facnumber by ref 2018-12-02 17:33:44 +01:00
atm-quentin
c18f486179 set facture to invoice AND check invoicenumber conf 2018-11-16 11:20:03 +01:00
atm-quentin
a8ab666d62 remplacement en masse des $conf->entity par des getEntity('facture') 2018-11-16 11:17:18 +01:00
Regis Houssin
aaa9a4f47c FIX use getEntity('invoice') instead getEntity('facture') 2018-11-15 17:27:49 +01:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused 2018-11-13 21:40:17 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Philippe GRAND
d98ebbd9ee Standardize and update code 2018-10-13 10:39:27 +02:00
Frédéric FRANCE
a3fa13994b
replace select_date 2018-09-09 09:36:12 +02:00
Laurent Destailleur
9fc5d39d07 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-12 20:09:36 +02:00
Laurent Destailleur
0a1c6e7194 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/list.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
2018-08-12 20:08:20 +02:00
ATM-Nicolas
d8d54d246c FIX : Pagination on withdraw request list 2018-08-10 15:05:21 +02:00
Philippe GRAND
5b8b4a1415 Standardize 2018-08-08 12:29:36 +02:00
Frédéric FRANCE
a0a5d33641
test include 2018-07-26 17:30:53 +02:00
Frédéric FRANCE
4d5c28b597
loadlangs 2018-05-27 09:27:09 +02:00
Laurent Destailleur
69adf73f4f Clean code from $var = True 2018-04-22 19:27:37 +02:00
Inovea Conseil
975300b90b Add execution date on prelevement 2018-03-10 11:23:35 +01:00
Laurent Destailleur
ea92f6beae Fix for multicompany 2018-02-06 10:57:53 +01:00
Laurent Destailleur
1730feeb4f Fix error message 2018-01-18 17:52:48 +01:00
Scrutinizer Auto-Fixer
165741517e Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-13 11:28:26 +00:00
Laurent Destailleur
dd15884f83 Fix recur - rcur 2017-10-12 01:35:04 +02:00
Laurent Destailleur
7c29bb5818 Fix must use differently FRST and SEPA 2017-10-12 01:24:19 +02:00
Laurent Destailleur
15bcbc8b43 FIX Check on bank info for sepa must be done on iban/swift not on ban 2017-10-12 00:38:59 +02:00
Laurent Destailleur
56e437a6c3 Bed fetch 2017-10-12 00:03:24 +02:00
Laurent Destailleur
5715f44fe6 Better error messages 2017-10-12 00:02:24 +02:00
Laurent Destailleur
f87614e2d3 Fix missing translation 2017-09-19 19:12:54 +02:00
Laurent Destailleur
17eec5f9e9 Fix look and field for direct debit notes 2017-09-15 17:23:41 +02:00
Laurent Destailleur
1820649175 Maxi debug of v6 2017-06-07 19:28:31 +02:00
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
Laurent Destailleur
ebe625aa16 Fix debug direct debit module 2017-02-21 13:16:28 +01:00
Laurent Destailleur
d461c0dfa4 Fix left align 2017-02-10 10:47:19 +01:00
Laurent Destailleur
c1d6ad90b3 FIX #6255 2017-01-16 12:35:19 +01:00
Laurent Destailleur
43cb9c30b2 Fix var_dump 2017-01-16 12:21:37 +01:00
aspangaro
8dc6a8fd1d Correct presentation 2016-09-24 14:47:51 +02:00
Laurent Destailleur
9019576394 Fix css class opacitymedium was not used everywhere. 2016-06-07 15:58:02 +02:00
Laurent Destailleur
368b4c621f Fix phpcs 2016-03-12 18:25:41 +01:00
philippe grand
b495fdb58e [Qal] uniformize code 2016-03-10 15:51:31 +01:00
philippe grand
30eb08151d [Qual] Close database handler should be after Footer 2015-12-11 14:19:38 +01:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
Laurent Destailleur
7d1d1caf30 Debug withdraw module 2015-06-21 17:09:00 +02:00
Laurent Destailleur
230fd7a7e4 Debug withdraw module 2015-06-21 17:05:49 +02:00
maxime peyrot
f99a127a57 NEW : Enter amount for withdraws requests 2015-06-19 13:45:14 +02:00
Laurent Destailleur
63f2bfed24 Fixed: Maxi debug of withdrawal module. 2014-12-09 11:19:16 +01:00