lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
121,269 Commits 43 Branches 150 Tags 886 MiB
add_rest_api_region
Commit Graph

2682 Commits

Author SHA1 Message Date
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Frédéric FRANCE
b277ab9ee3
Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-22 21:49:17 +01:00
Laurent Destailleur
6b8312aab0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-17 20:51:25 +01:00
Laurent Destailleur
d19aca7192 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-02-17 20:50:03 +01:00
Laurent Destailleur
ea4eed31f5
Merge pull request #20066 from javieralapps4up/develop 
FIX Andorra needs Code Banque
 2022-02-16 20:38:26 +01:00
Frédéric FRANCE
eb77f10d7b
Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-15 19:11:24 +01:00
Frédéric FRANCE
a613553f37
Merge branch 'hookgetnomurl' into patch-1 2022-02-15 18:44:06 +01:00
javieralapps4up
81c2631b00
FIX Andorra needs Code Banque 2022-02-14 20:06:42 +01:00
Regis Houssin
15b7f37027 FIX missing default or current value 2022-02-14 09:14:06 +01:00
Laurent Destailleur
16e4e736fd Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-10 16:28:29 +01:00
Laurent Destailleur
10d2e0cec0 Fix link to reconcile 2022-02-10 16:27:40 +01:00
Laurent Destailleur
d69f9eca40 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2022-02-10 11:25:15 +01:00
Laurent Destailleur
a295725368 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-10 11:23:45 +01:00
Laurent Destailleur
06fe8c391e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
	htdocs/install/mysql/tables/llx_propaldet.sql
 2022-02-10 10:23:42 +01:00
Regis Houssin
3eabeb2380 FIX broken feature, wrong div name again 2022-02-10 10:18:06 +01:00
Laurent Destailleur
d5d34930a8
Update card.php 2022-02-10 09:58:08 +01:00
Regis Houssin
8dffa020b4 FIX broken feature, wrong div name 2022-02-10 09:54:09 +01:00
Laurent Destailleur
9f377b7fe4 Better responsive on small screen 2022-01-24 23:58:16 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
144a8af438 Debug v15 2022-01-07 14:28:58 +01:00
Laurent Destailleur
bdac615cba Fix empty column 2022-01-07 14:01:15 +01:00
Laurent Destailleur
a887e41600 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/bankentries_list.php
	htdocs/compta/bank/info.php
	htdocs/compta/bank/line.php
	htdocs/compta/bank/releve.php
	htdocs/compta/bank/various_payment/card.php
	htdocs/fourn/class/fournisseur.product.class.php
 2022-01-04 09:45:31 +01:00
Laurent Destailleur
807f2841d4 FIX Navigation on bank transaction list 2022-01-04 09:33:52 +01:00
Laurent Destailleur
64c7472965 Fix link to account id 2022-01-03 22:01:08 +01:00
Laurent Destailleur
809c8f993b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/modPropale.class.php
	htdocs/filefunc.inc.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
 2021-12-30 19:03:46 +01:00
Maxime Kohlhaas
12880f1716 Fix : replace old filters by new ones 2021-12-28 16:02:51 +01:00
Maxime Kohlhaas
1d20694f33 Fix #19667 : bankentries wrong SQL parenthesis + missing filter 2021-12-28 15:47:46 +01:00
Henry
559b0b4bfa
Fix - Currency of Account Statement 2021-12-28 17:12:12 +08:00
Laurent Destailleur
86b6f9c742 Fix warning 2021-12-21 15:01:41 +01:00
Laurent Destailleur
2de5db83a9 Fix iban_prefix 2021-12-21 14:51:57 +01:00
Laurent Destailleur
0387b9922e FIX error message on sqlfilter in API 2021-12-20 20:49:32 +01:00
Laurent Destailleur
fbce09f21b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/compta/facture/card.php
	htdocs/reception/card.php
 2021-12-19 00:36:22 +01:00
jpb
ac8538a812 add info for acces right 2021-12-13 16:53:34 +01:00
Laurent Destailleur
ecf98530bb Debug SEPA payment module 2021-12-09 12:42:04 +01:00
Laurent Destailleur
69cd7ae2ab Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/don/card.php
	htdocs/public/test/badges.php
	htdocs/public/test/test_exec.php
 2021-12-08 18:27:03 +01:00
Laurent Destailleur
c3bfd5caa4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/adherents/type.php
	htdocs/asset/type.php
	htdocs/categories/edit.php
	htdocs/comm/action/card.php
	htdocs/compta/bank/card.php
	htdocs/contact/card.php
	htdocs/contact/list.php
	htdocs/core/class/extrafields.class.php
	htdocs/don/card.php
	htdocs/product/stock/card.php
	htdocs/projet/card.php
	htdocs/projet/tasks/task.php
	htdocs/user/group/card.php
 2021-12-08 18:21:20 +01:00
Laurent Destailleur
f1dac82a53 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/adherents/card.php
	htdocs/categories/edit.php
	htdocs/contact/card.php
	htdocs/core/class/extrafields.class.php
	htdocs/product/stock/card.php
 2021-12-08 17:56:05 +01:00
Quentin VIAL-GOUTEYRON
826bde0656 FIX set optional from post 2021-12-06 11:19:12 +01:00
Christian Foellmann
6608f5f0d8 update all script tags to be uniform. language="javascript" removed 
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
 2021-11-29 15:09:18 +01:00
Laurent Destailleur
1fa3e9f37d Look and feel v15 2021-11-29 01:13:43 +01:00
Laurent Destailleur
81e7483911 css 2021-11-28 23:51:20 +01:00
Frédéric FRANCE
99cddfa235
can merge products but experimental 2021-11-23 22:36:14 +01:00
Frédéric FRANCE
dc3bfcfb87
can modify tooltip by reference 2021-11-22 19:57:26 +01:00
Laurent Destailleur
55e089118c Fix trans 2021-11-13 15:19:03 +01:00
Laurent Destailleur
32185beec5
Merge pull request #19338 from aspangaro/15a30 
GNU version 3
 2021-11-11 14:39:43 +01:00
Laurent Destailleur
28aa17e4fd FIX calculation of balance in conciliation page on desc sorting. 2021-11-11 14:27:17 +01:00
Laurent Destailleur
67baaeb5de Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-11-11 13:51:19 +01:00
Laurent Destailleur
0443302c3d FIX calculation of balance in conciliation page on desc sorting. 2021-11-11 13:49:21 +01:00
Laurent Destailleur
fd3fd9d945 Fix getpost 2021-11-11 13:46:58 +01:00
Alexandre SPANGARO
d611b99d95 GNU version 3 2021-11-09 03:01:48 +01:00
Laurent Destailleur
216eb7bd5a
Merge pull request #19185 from frederic34/bankentrieslist 
fix warnings in bankentries list
 2021-10-31 17:47:14 +01:00
Laurent Destailleur
43b4a783a5
Merge pull request #19184 from frederic34/patch-7 
fix search
 2021-10-31 17:47:05 +01:00
Scrutinizer Auto-Fixer
5567310e44 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-10-25 20:07:31 +00:00
Laurent Destailleur
ad2e567571 Fix bug huntr.dev 2021-10-25 15:32:10 +02:00
Frédéric FRANCE
b1555bc4fc
fix set categories for bank line 2021-10-24 17:06:37 +02:00
Frédéric FRANCE
71541fa299
fix warnings in bankentrie list 2021-10-24 16:52:02 +02:00
Frédéric FRANCE
f6cd0818b3
fix warnings in bankentrie list 2021-10-24 16:47:01 +02:00
Frédéric FRANCE
de312cf8b4
Update bankentries_list.php 2021-10-24 16:39:57 +02:00
Frédéric FRANCE
c21593a5ab
fix search 2021-10-24 16:28:18 +02:00
Laurent Destailleur
8604f9b153 Clean DOM (remove ficheaddleft div) 2021-10-23 17:18:35 +02:00
Laurent Destailleur
6ec19bca9d
Merge pull request #19128 from frederic34/warnfixes 
fix warnings
 2021-10-23 11:38:03 +02:00
Lucas Marcouiller
0270d1c1b7 fix syntax 2021-10-23 10:57:21 +02:00
Lucas Marcouiller
953a56b08c Fix: PHP 8.0 Warnings 2021-10-23 10:57:03 +02:00
Frédéric FRANCE
cad2cf9b6f
fix warnings 2021-10-23 07:20:30 +02:00
Laurent Destailleur
dd0809b528 Fix trans labels status 2021-10-16 19:37:57 +02:00
Laurent Destailleur
f8010dfcbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/reception/list.php
	htdocs/takepos/pay.php
 2021-10-16 13:01:03 +02:00
lvessiller
be4a00213c FIX optional visibility on create card 2021-10-08 15:58:08 +02:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
Laurent Destailleur
8ab9524d0d
Merge pull request #18849 from javieralapps4up/develop 
FIX: #18848 Add Andorra (AD) in the public function useDetailedBBAN () Feature request
 2021-09-30 13:30:02 +02:00
javieralapps4up
f6c8932cfa
Update account.class.php 2021-09-28 17:25:31 +02:00
javieralapps4up
b6bb27e0f7
FIX: #18848 2021-09-28 17:21:22 +02:00
Laurent Destailleur
80165811e0 Clean code 2021-09-27 15:50:19 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
d760686239 Fix case of newtoken() 2021-09-18 22:24:00 +02:00
Laurent Destailleur
0749d01c5a Fix add action delete* as sensitive action 2021-09-18 22:04:41 +02:00
Laurent Destailleur
8bdc53f469 Fix Add action classify as sensitive actions 2021-09-18 20:49:24 +02:00
Christian Foellmann
fd1d4d9073 add missing css classes to buttons 2021-09-16 11:33:42 +02:00
Laurent Destailleur
ee066ad725 Cast sql var 2021-09-03 21:25:43 +02:00
Laurent Destailleur
77e9f15360 Work on #18448 2021-09-02 22:52:17 +02:00
Laurent Destailleur
fb8723d884
Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons 
replace remaining SubmitCancel buttons
 2021-08-28 18:39:06 +02:00
Laurent Destailleur
2dd91bf312 Clean code 2021-08-27 23:36:06 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
2f225ee7e5 Clean code by adding cast int. 2021-08-27 16:33:03 +02:00
Christian Foellmann
f094b4c70c fix up most of the remaining submit inputs 2021-08-24 17:04:17 +02:00
Laurent Destailleur
22339a3ed3
Merge pull request #18451 from cfoellmann/PR/form-buttons-function 
improve forms - buttonsSaveCreate()
 2021-08-24 15:26:03 +02:00
Laurent Destailleur
dc006b0ebb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-08-23 19:44:02 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Christian Foellmann
d706c3b1ec use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination 2021-08-20 14:41:30 +02:00
Laurent Destailleur
84073c6373
Merge branch 'develop' into patch-169 2021-08-17 19:31:30 +02:00
Laurent Destailleur
bf72143823 Fix phpcs 2021-08-11 21:04:03 +02:00
Christophe Battarel
cbc7589559 NEW: add constant MAIN_IBAN_NOT_MANDATORY 2021-08-06 16:35:49 +02:00
Laurent Destailleur
bec87f5739 Fix translation ICS 2021-08-04 13:12:07 +02:00
Laurent Destailleur
1c981ccb9d Fix look and feel v14 2021-08-03 17:03:34 +02:00
Laurent Destailleur
d0c57dac34 FIx #18217 - Salary - link 'salary' of bank_url not managed 2021-08-03 15:02:09 +02:00
BENKE Charlene
1a23cfc6f9
Update list.php 2021-07-19 10:01:11 +02:00
Laurent Destailleur
b7c42c70ef Fix date for planned entries 2021-07-09 13:33:37 +02:00
Laurent Destailleur
abb1ad6bf0 Fix sql injection 2021-07-05 18:46:27 +02:00
Laurent Destailleur
0cccfb1cee Fix phpcs v14 2021-07-04 19:23:04 +02:00
Laurent Destailleur
ab1ba5bc6a css 2021-07-03 19:26:04 +02:00
Laurent Destailleur
bda36337cd Prepare fix #yogosha6443 2021-06-30 17:22:36 +02:00
Laurent Destailleur
834fc289b6 Fix look and feel v14 2021-06-16 20:35:55 +02:00
Frédéric FRANCE
cf9c595568
fix unknown right 
supprimer doesn't exists
 2021-06-16 12:01:52 +02:00
Laurent Destailleur
eefc6ddf83 Fix phpcs 2021-06-11 18:44:01 +02:00
lvessiller
ed53301cec NEW do actions hook on bank card 2021-06-10 16:18:20 +02:00
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
39adaec7eb Fix var not found 2021-06-05 01:29:24 +02:00
Laurent Destailleur
cfd035e1de css 2021-05-20 21:25:36 +02:00
Laurent Destailleur
6bf66adff0 Fix remove some $_REQUEST 2021-05-17 07:27:02 +02:00
Laurent Destailleur
ba6e675273 css 2021-05-12 22:21:20 +02:00
Frédéric FRANCE
23858f0ab1
fix php8 warning 2021-05-11 18:25:20 +02:00
Laurent Destailleur
907ea1a8bd Fix sql error 2021-05-07 18:21:11 +02:00
Frédéric FRANCE
7897469963
Update account.class.php 2021-05-06 20:34:45 +02:00
Laurent Destailleur
bd5e141d26 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/mails_templates.php
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
	htdocs/societe/consumption.php
 2021-05-06 17:07:44 +02:00
Laurent Destailleur
7386a223e8
Update account.class.php 2021-05-06 16:38:34 +02:00
Florian HENRY
c4e0d8da42 FIX: merge thirparty also work for bank URL entry 2021-05-04 17:28:20 +02:00
Laurent Destailleur
9973085613 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/comm/propal/card.php
	htdocs/compta/bank/releve.php
	htdocs/compta/paiement/rapport.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/reception/card.php
	htdocs/societe/societecontact.php
 2021-05-03 19:36:49 +02:00
Laurent Destailleur
1d2f8b09d9
Update releve.php 2021-05-03 18:55:25 +02:00
WimpyMan
706545081c FIX #17476 releve.php: Fix SQL statement 
Single quotes `'` should be uses instead of double quotes `"` for
string values.
 2021-05-03 18:29:53 +02:00
Laurent Destailleur
1c95e2b7c7 FIX #17453 2021-05-03 14:58:29 +02:00
Laurent Destailleur
e99355a0c2 Clean html 2021-04-30 15:22:17 +02:00
Laurent Destailleur
655056ed31 Debug v14 2021-04-29 12:10:55 +02:00
Laurent Destailleur
4926ac1e24 Fix make protected method not visible 2021-04-28 15:25:06 +02:00
Laurent Destailleur
f54d14bfd6 Add method checkValForAPI to clean data from API input 2021-04-27 01:05:14 +02:00
Laurent Destailleur
73c482ca64 Fix escape 2021-04-25 19:36:48 +02:00
Laurent Destailleur
a8939377de Escape string 2021-04-25 19:31:19 +02:00
Laurent Destailleur
389b71bc7e Clean API 2021-04-25 19:21:48 +02:00
Laurent Destailleur
fd2d317b4a Fix #yogosha5881 2021-04-25 15:55:36 +02:00
Laurent Destailleur
42938ffe31 FIX #yogosha5879 2021-04-24 21:15:09 +02:00
Laurent Destailleur
9f03054fc4 Fix #yogosha5877 2021-04-24 20:52:48 +02:00
Laurent Destailleur
d0cc64479d Fix protect sql 2021-04-24 20:18:11 +02:00
Laurent Destailleur
ce9d707040
Merge pull request #17269 from bb2a/picto_massactions 
Next picto mass actions
 2021-04-16 20:40:19 +02:00
Laurent Destailleur
754b0e9853 Debug v14 2021-04-15 15:30:02 +02:00
Anthony Berton
a612831e28 next_change 2021-04-14 14:45:55 +02:00
Laurent Destailleur
9154e07689 Fix picto for tags 2021-04-14 12:33:53 +02:00
Laurent Destailleur
dcf460e248 Use css on img_picto 2021-04-14 12:28:01 +02:00
Anthony Berton
707bf5adca picto_mass_actions 2021-04-14 10:20:34 +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
Laurent Destailleur
a68378da3f Fix #yogosha5840 2021-04-12 10:32:41 +02:00
Laurent Destailleur
97ace5e3bb Look and feel v14 2021-04-12 10:19:38 +02:00
UT from dolibit
888dfdba4a
Create index.html 2021-04-05 20:19:23 +02:00
UT from dolibit
ba84a36282
Update card.php 
$help_url = 'EN:Module_Banks_and_Cash|FR:Module_Banques_et_Caisses|ES:Módulo_Bancos_y_Cajas|DE:Modul_Banken_und_Barbestände';
 2021-03-30 22:12:13 +02:00
Laurent Destailleur
3744bc6a7a FIX #yogosha5746 - next step (work in progress) 2021-03-30 18:17:13 +02:00
Laurent Destailleur
6e422d26f3 FIX #yogosha5746 - next step (wip) 2021-03-30 16:20:18 +02:00
Laurent Destailleur
d61f61ab45 Clean $_GET 2021-03-30 03:55:17 +02:00
Laurent Destailleur
32bec56529 Using " for html is better 2021-03-29 23:14:42 +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
d9108362ba War against $_POST 2021-03-25 16:59:47 +01:00
Laurent Destailleur
ca1715df96 Add some protection for SQL injection 2021-03-22 13:31:06 +01:00
Laurent Destailleur
6a0e0f4c06 Fix #ygosha5698 2021-03-22 12:10:51 +01:00
Laurent Destailleur
15440917b1 Fix #ygosha5698 2021-03-22 11:30:18 +01:00
Laurent Destailleur
4c811d462c
Merge pull request #16837 from dolibit-ut/patch-129 
Update document.php
 2021-03-20 11:50:20 +01:00
Laurent Destailleur
668519e7f5
Merge pull request #16836 from dolibit-ut/patch-128 
Update card.php
 2021-03-20 11:49:57 +01:00
Laurent Destailleur
ebf409f831 FIX #yogosha5668 2021-03-19 12:08:40 +01:00
UT from dolibit
6e6609d876
Update document.php 
$help_url = "EN:Module_Banks_and_Cash|FR:Module_Banques_et_Caisses";

llxHeader("", $title, $help_url);
 2021-03-19 09:33:10 +01:00
UT from dolibit
e5f8ca77a9
Update card.php 
$help_url = "EN:Module_Banks_and_Cash|FR:Module_Banques_et_Caisses";

llxHeader("", $title, $help_url);
 2021-03-19 09:30:28 +01:00
Laurent Destailleur
a200f6f6ea
Merge pull request #16785 from frederic34/fixextrafieldsadmin 
fix php8 warning
 2021-03-18 23:08:15 +01:00
Laurent Destailleur
9ba568eb25 Fix security check 2021-03-18 20:57:50 +01:00
Laurent Destailleur
d2ef4b0506 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/bankentries_list.php
	htdocs/opensurvey/card.php
	htdocs/opensurvey/index.php
	htdocs/opensurvey/results.php
 2021-03-18 12:24:34 +01:00
Frédéric FRANCE
75cf5e3599
fix php8 warning 2021-03-17 23:55:46 +01:00
Laurent Destailleur
22ed95a629 Look and feel v14 2021-03-16 19:09:56 +01:00
Laurent Destailleur
26dc3ef1b0 FIX Filter on debit/credit 
Conflicts:
	htdocs/compta/bank/bankentries_list.php
 2021-03-16 18:59:28 +01:00
Laurent Destailleur
9ea7c92b1b FIX Filter on debit/credit 2021-03-16 18:56:10 +01:00
Laurent Destailleur
26931a7e52
Merge pull request #16705 from dolibit-ut/patch-86 
Update card.php
 2021-03-16 10:36:27 +01:00
Laurent Destailleur
8a23d515e9
Merge pull request #16715 from frederic34/patch-12 
fix php8 warning
 2021-03-16 10:31:09 +01:00
Alexandre SPANGARO
6960f0dc25 Uniformize translation 2021-03-16 04:22:55 +01:00
Alexandre SPANGARO
03481a0197 Uniformize translation 2021-03-16 04:22:43 +01:00
Frédéric FRANCE
50cd8274a5
fix php8 warning 2021-03-15 21:07:30 +01:00
UT from dolibit
7b8d2e55b7
Update card.php 
$helpurl = "EN:Module_Banks_and_Cash";
 2021-03-15 19:46:51 +01:00
Frédéric FRANCE
99cd866eba
fix php8 warning 2021-03-15 15:12:10 +01:00
Laurent Destailleur
cc10106a21 Fix protection on int 2021-03-14 12:20:23 +01:00
Laurent Destailleur
12f50a76d7 Fix yogosha #5627 2021-03-14 11:48:39 +01:00
Laurent Destailleur
3cbced439a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/listevents.php
	htdocs/compta/bank/line.php
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/paiement/cheque/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/ticket.lib.php
	htdocs/core/modules/mailings/modules_mailings.php
	htdocs/core/tpl/extrafields_view.tpl.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/cron/list.php
	htdocs/expedition/card.php
	htdocs/mrp/mo_list.php
	htdocs/product/stock/productlot_card.php
	htdocs/public/emailing/mailing-read.php
	htdocs/public/emailing/mailing-unsubscribe.php
	htdocs/ticket/list.php
	test/phpunit/FactureRecTest.php
 2021-03-05 19:29:09 +01:00
Laurent Destailleur
10a6774ede
Merge pull request #16534 from atm-lena/develop_FIX_OrderBy_UserThirdParty_BankEntries 
Bank Entries : Error order by user/thirdparty
 2021-03-04 17:08:12 +01:00
Laurent Destailleur
7d20df8054
Merge pull request #16177 from atm-gauthier/NEW/add_real_payments_on_salaries 
NEW Salary payment request and Salary payment are 2 different steps in workflow on Salary payment recording
 2021-03-04 16:53:54 +01:00
atm-lena
cd1c1c54d4 Merge branch 'FIX_BankEntries_OrderByUserSoc' of github.com:atm-lena/dolibarr into develop_FIX_OrderBy_UserThirdParty_BankEntries 2021-03-04 11:50:08 +01:00
atm-lena
0cce782a21 No orderby for user/thirdparty in bankentries list 2021-03-04 11:42:47 +01:00
Laurent Destailleur
71370bd558 Fix links in cheque receipt pages 2021-03-03 21:18:14 +01:00
Laurent Destailleur
acb7b30eb0
Merge pull request #16507 from frederic34/add_rule 
Add rule
 2021-03-02 12:52:03 +01:00
Laurent Destailleur
0670a00b83 Fix phpcs 2021-03-02 02:06:09 +01:00
Frédéric FRANCE
c54a61bb67
fix 2021-03-01 23:54:03 +01:00
Frédéric FRANCE
f2cdbf6bb2
Merge remote-tracking branch 'upstream/develop' into add_rule 2021-03-01 21:22:34 +01:00
Frédéric FRANCE
a4e25359e7
add missing rule 2021-03-01 20:37:16 +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
Gauthier PC portable 024
6da28f5e44 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-03-01 11:12:03 +01:00
Alexandre SPANGARO
0abe576fdc FIX: Various payment - Missing fields for check transmitter & bank name 2021-03-01 04:49:06 +01:00
daraelmin
1b6bc8b132
Fix #16418 missing in "Tags of transactions" 2021-02-26 17:18:09 +01:00
daraelmin
0749585687
Fix #16418 title in "Transaction list by category" 2021-02-26 17:11:18 +01:00
daraelmin
ea18a47113
Fix #16418 missing title in "internal transfer" 2021-02-26 17:01:53 +01:00
Gauthier PC portable 024
c996871f98 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-26 11:50:18 +01:00
Frédéric FRANCE
61600a9e65
code syntax compta directory 2021-02-23 21:09:01 +01:00
Gauthier PC portable 024
939d406ab1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-22 09:10:24 +01:00
Laurent Destailleur
0ede8c2b9c
Merge pull request #16356 from atm-lena/develop_BankEntries_FIX_SearchUSerThirdparty_Reconstruct 
Develop bank entries fix search user thirdparty reconstruct
 2021-02-19 17:48:37 +01:00
Laurent Destailleur
0dabbcd7f5
Update bankentries_list.php 2021-02-19 17:48:15 +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
b6211a7990 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-19 14:12:00 +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
stickler-ci
af32ef266c Fixing style errors. 2021-02-19 09:05:04 +00:00
atm-lena
a6999a2be7 Clean code 2021-02-19 09:54:51 +01:00
atm-lena
12dce74a47 Merge branch 'BankEntries_FIX_SearchUSerThirdparty_Reconstruct' of github.com:atm-lena/dolibarr into develop_BankEntries_FIX_SearchUSerThirdparty_Reconstruct 2021-02-19 09:46:55 +01:00
atm-lena
687d0556aa Clean code 2021-02-19 09:39:06 +01:00
atm-lena
d7c59edd11 Clean code 2021-02-19 09:36:15 +01:00
atm-lena
a4d9e3b9d3 WIP final 2021-02-19 09:33:28 +01:00
atm-lena
9cdb6ce31c WIP 2021-02-18 17:35:09 +01:00
Gauthier PC portable 024
134d7e00ec Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-17 16:56:50 +01:00
atm-lena
9f9b7554ed FIX error commit : only type user 2021-02-17 11:00:14 +01:00
atm-lena
84c259d87a Merge branch 'FIX_BankEntries_SearchType_Salary' of github.com:atm-lena/dolibarr into develop_FIX_BankEntries_SearchType_Salary 2021-02-16 16:26:18 +01:00
atm-lena
aceefa2de1 FIX search type salary too for bank entries users 2021-02-16 16:19:35 +01:00
Laurent Destailleur
026259ebd7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ajax.lib.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/product/fournisseurs.php
 2021-02-15 13:12:27 +01:00
stickler-ci
6f7a223a8d Fixing style errors. 2021-02-12 10:17:03 +00:00
atm-lena
b3c1bb9706 Merge branch 'NEW_BankEntries_TaxSalarySocial_DisplayUser' of github.com:atm-lena/dolibarr into develop_NEW_BankEntries_TaxSalarySocial_DisplayUser 2021-02-12 11:13:14 +01:00
atm-lena
1f56166801 FIX ret : fetch user instead of search with main sql request 2021-02-12 11:05:15 +01:00
Laurent Destailleur
3b5e6b1140
Update bankentries_list.php 2021-02-11 18:45:06 +01:00
stickler-ci
84e17753eb Fixing style errors. 2021-02-11 10:35:15 +00:00
atm-lena
b83e2dc77a Merge branch 'NEW_BankEntries_TaxSalarySocial_DisplayUser' of github.com:atm-lena/dolibarr into develop_NEW_BankEntries_TaxSalarySocial_DisplayUser 2021-02-11 09:52:59 +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
atm-lena
2e14b9832d Clean code 2021-02-10 17:00:50 +01:00
atm-lena
3aef987f3f Display or not users in terms of user rights 2021-02-10 16:24:45 +01:00
atm-lena
64ab2fa3b1 Bank Entries : add user search 2021-02-10 12:19:50 +01:00
atm-lena
c0354c5e93 NEW Bank Entries : display user linked to salary and social taxes 2021-02-10 12:07:09 +01:00
Laurent Destailleur
4c3a96da08 FIX #16150 2021-02-10 02:57:08 +01:00
Laurent Destailleur
1b129831a9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-09 14:09:46 +01:00
Laurent Destailleur
48a4ed656b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/projet/element.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2021-02-09 14:08:49 +01:00
Gauthier PC portable 024
d106fe7e90 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-09 09:50:46 +01:00
Laurent Destailleur
c9f34cc0d4 Prepare button to the bank conciliation pages 2021-02-08 22:42:21 +01:00
Florian HENRY
dbbebba497 this->errors is set on triggers action must be set by callers 2021-02-08 20:44:40 +01:00
Gauthier PC portable 024
e2a73e6c88 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects 2021-02-08 09:46:48 +01:00
stickler-ci
9bfb7a5cbd Fixing style errors. 2021-02-05 12:08:05 +00:00
Gauthier PC portable 024
24b26b8980 Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries 2021-02-05 12:49:23 +01:00
Gauthier PC portable 024
bed723aec0 FIX : getNomUrl() 2021-02-05 12:47:20 +01:00
Gauthier PC portable 024
df8ca1ef84 Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries 2021-02-05 09:29:20 +01:00
Gauthier PC portable 024
e188ec6cd7 NEW : add real payments on salaries objects 2021-02-04 17:21:08 +01:00
Laurent Destailleur
4d029194d3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/ajax.lib.php
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
 2021-02-02 13:22:23 +01:00
Laurent Destailleur
7ff5cd50c3 Fix responsive 2021-02-02 11:41:32 +01:00
Gauthier PC portable 024
8a5588e518 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects 2021-01-28 10:28:36 +01:00
Frédéric FRANCE
5820758968
fix class name Tva 2021-01-23 20:59:23 +01:00
Gauthier PC portable 024
998aa8f943 Merge branch '12.0_new_payments_on_vat' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_vat_objects 2021-01-19 13:40:13 +01:00
Gauthier PC portable 024
ae6e1db652 FIX : getNomUrl() 2021-01-19 13:32:08 +01:00
Gauthier PC portable 024
e2abbbcece Merge branch '12.0_new_payments_on_vat' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_vat_objects 2021-01-19 08:57:24 +01:00
Gauthier PC portable 024
2cfaf5fbd6 NEW : add real payments on vat objects 2021-01-18 17:08:17 +01:00
Laurent Destailleur
4d42fa2a37 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formaccounting.class.php
 2021-01-17 11:34:19 +01:00
Laurent Destailleur
314cc45c81 Fix message 2021-01-17 11:24:24 +01:00
Florian HENRY
d856b0149d Merge branch '13_backport' into develop 2021-01-12 10:08:12 +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
b553dbb9d2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-06 20:23:07 +01:00
Adrien Raze
6f05ba4db9 NEW : Added of doActions hooks in bank/line.php and bank/transfer.php 2021-01-06 14:26:40 +01:00
Frédéric FRANCE
ff25003025
fix unknown variable 2021-01-05 08:59:46 +01:00
Laurent Destailleur
64b4f1079d Close #15870 manually 2021-01-05 02:23:38 +01:00
Laurent Destailleur
b88ee6eff4
Merge pull request #15815 from FHenry/dev_add_tag_on_massaction 
NEW: Add mass action add tag for product/service, user, thirdparty, warehouse, project, bank account, members
 2021-01-01 21:36:15 +01:00
Laurent Destailleur
715d3499ff Clean code 2021-01-01 21:06:47 +01:00
Laurent Destailleur
7c74a71305 Fix regression 2021-01-01 21:03:44 +01:00
Laurent Destailleur
71e4a672f5
Merge branch 'develop' into develop_patch-1 2021-01-01 20:52:43 +01:00
stickler-ci
327ec211c4 Fixing style errors. 2020-12-31 09:49:27 +00:00
jcp
e187e77acb ICS and ICS_transfer hide if module not enabled 2020-12-31 10:12:03 +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
a336e45098 FIX: #15751 Miscellaneous payment type change to 0 after updating subledger 2020-12-30 08:11:20 +01:00
Alexandre SPANGARO
0e2b7d8b3c Remove typo 2020-12-30 07:23:26 +01:00
Florian HENRY
1b6a4fc4ae Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_add_tag_on_massaction 2020-12-24 15:00:15 +01:00
Florian HENRY
f03574d061 bank ok 2020-12-24 14:56: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
Laurent Destailleur
d65dc85a10 FIX for php 8 2020-12-23 19:16:25 +01:00
Laurent Destailleur
58b4de8bc3 More complete fix for #15712 2020-12-21 19:27:42 +01:00
Laurent Destailleur
c6f83aaed7 Fix warning 2020-12-16 11:21:48 +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
Laurent Destailleur
5bd6d6f388 Look and feel v13 2020-12-03 14:34:15 +01:00
lmarcouiller
8a86593b13 Fix a bug in bank's graph with option and mode 2020-12-02 16:24:01 +01:00
Laurent Destailleur
00ad6df395 Fight against $_POST 2020-11-30 14:47:07 +01:00
Laurent Destailleur
574919de52 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/adherents/class/subscription.class.php
	htdocs/compta/bank/categ.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commondocgenerator.class.php
	htdocs/core/class/interfaces.class.php
	htdocs/core/lib/project.lib.php
	htdocs/core/modules/modCategorie.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/install/repair.php
	htdocs/main.inc.php
	htdocs/product/price.php
	htdocs/projet/tasks/time.php
	htdocs/reception/card.php
 2020-11-27 15:45:12 +01:00
Laurent Destailleur
ac3c129735 Clean code 2020-11-27 14:24:15 +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
Laurent Destailleur
7195760ade Restore lost param 2020-11-18 18:20:40 +01:00
Laurent Destailleur
1708874306
Merge branch 'develop' into develop 2020-11-18 18:16:29 +01:00
Laurent Destailleur
928330c44b Fix link to reconciliation page 2020-11-16 12:42:59 +01:00
lmarcouiller
304e4ac8e6 FIX : #15373 Reset invalid email script 2020-11-13 11:07:35 +01:00
lmarcouiller
a1f26f2b55 FIX :15373 Reset invalid email script 2020-11-13 11:03:49 +01:00
lmarcouiller
0e5b18a1e9 FIX : #14713 bank graph show all accounts 2020-11-13 10:05:28 +01:00
jcp
10ae18fe44 Update SQL migration 2020-11-12 19:42:20 +01:00
JC Prieto
615342aa77
Update account.class.php 
Doc on ics_transfer var
 2020-11-12 10:32:52 +01:00
jcp
7e3ef08b25 ICS update 2020-11-10 19:17:11 +01:00
Scrutinizer Auto-Fixer
f6e3f58fcb Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-11-09 14:18:56 +00:00
jcp
50d530733e NEW: ICS fields moved into bank account table 2020-11-09 14:08:34 +01:00
Laurent Destailleur
da6c6c9e0a Clean code 2020-11-08 14:39:20 +01:00
Laurent Destailleur
215ecafb32 Look adn feel v13 2020-11-07 15:54:58 +01:00
Frédéric FRANCE
3f164f1a9b
doxygen 2020-11-05 20:13:13 +01:00
Frédéric FRANCE
d80f614e20
doxygen 2020-11-03 20:43:42 +01:00
Laurent Destailleur
b0e2d40533 Debug and fix v13 2020-11-03 14:19:54 +01:00
Scrutinizer Auto-Fixer
ab25e047c0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 17:51:30 +00: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
Frédéric FRANCE
8190711342
doxygen 2020-10-30 18:01:01 +01:00