lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
117,434 Commits 43 Branches 150 Tags 886 MiB
00a0e4e246
Commit Graph

1092 Commits

Author SHA1 Message Date
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Laurent Destailleur
04148dd5fb
Merge pull request #17789 from aspangaro/14b10 
NEW Add field date from/to in customer payment list
 2021-06-29 19:54:12 +02:00
Laurent Destailleur
68b8a6a916 css 2021-06-20 16:35:49 +02:00
Laurent Destailleur
306b7779ff
Merge branch 'develop' into 11p1 2021-06-11 19:55:37 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Alexandre SPANGARO
ffb1b232d4 Fix Withdraw - link is missing in llx_bank_url when the debit is rejected 2021-06-06 21:27:48 +02:00
Alexandre SPANGARO
c1757bdbd8 Remove warning 2021-06-06 06:28:38 +02:00
Alexandre SPANGARO
a92bd31ce1 Fix search_datexxx 2021-06-05 07:39:15 +02:00
Alexandre SPANGARO
3744ccdd28 Look & feel v14 2021-06-01 22:50:55 +02:00
Alexandre SPANGARO
b5904e49a0 NEW Add field date from/to in customer payment list 2021-06-01 22:43:43 +02:00
Laurent Destailleur
6bf66adff0 Fix remove some $_REQUEST 2021-05-17 07:27:02 +02:00
Laurent Destailleur
6e32efdb40 Fix phpcs 2021-05-03 20:22:36 +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
Indelog
c18848c944 Fix: simplify code with dol_dir_list() 2021-05-03 17:17:44 +02:00
Indelog
dba9b17275 Fix forgot payment filter on file name 2021-05-03 16:00:14 +02:00
Indelog
9727768192 Fix show table of pdf payments repports in file order 
Use scandir() rather opendir() and readdir() to get a sorted list of
files.
 2021-05-03 09:46:51 +02:00
Laurent Destailleur
b1d8ca0701 Fix phpcs 2021-04-27 17:45:13 +02:00
Laurent Destailleur
0c1f8b96ef Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-27 02:55:07 +02:00
Laurent Destailleur
0a0b3f414a Fix phpcs 2021-04-27 02:54:33 +02:00
Laurent Destailleur
ea19747bc6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-04-27 02:16:16 +02:00
Laurent Destailleur
2e9cf8d00b Fix phpcs 2021-04-27 02:15:58 +02:00
Laurent Destailleur
c7f38c4cf0 Fix bad var 2021-04-27 02:10:52 +02:00
Laurent Destailleur
098582d7a7 Fix bad merge 2021-04-27 02:09:43 +02:00
Laurent Destailleur
27aa7cdb48 Fix bad merge 2021-04-27 02:08:36 +02:00
Laurent Destailleur
d6cdfcdd8c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/paiement/card.php
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/public/members/new.php
 2021-04-27 02:07:48 +02:00
Laurent Destailleur
12a4bc64ad Remove $_REQUEST 2021-04-27 02:01:46 +02:00
Laurent Destailleur
48a50f3b10 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/paiement/card.php
	htdocs/compta/paiement/class/paiement.class.php
 2021-04-27 01:58:19 +02:00
Laurent Destailleur
804eac55e9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-04-27 01:46:04 +02:00
Laurent Destailleur
42938ffe31 FIX #yogosha5879 2021-04-24 21:15:09 +02:00
Marc de Lima Lucio
ce022ab36c FIX: payment validation: invoices PDF were no re-generated, make it with correct display options 2021-04-22 15:57:06 +02:00
Marc de Lima Lucio
ee96fb6470 FIX: payment creation: re-generate invoice PDF with correct display options 2021-04-22 15:56:12 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Laurent Destailleur
fae3cca494 FIX #yogosha5746 - next step (work in progress) 2021-03-30 17:45:15 +02:00
Laurent Destailleur
6e422d26f3 FIX #yogosha5746 - next step (wip) 2021-03-30 16:20:18 +02:00
Laurent Destailleur
fb84608586 Clean sql 2021-03-30 03:37:54 +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
2d5fbfc105 Fix php8 2021-03-22 23:43:28 +01:00
Laurent Destailleur
cce4ebdb8c Clean code 2021-03-22 18:50:47 +01:00
Laurent Destailleur
ca1715df96 Add some protection for SQL injection 2021-03-22 13:31:06 +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
71370bd558 Fix links in cheque receipt pages 2021-03-03 21:18:14 +01:00
Frédéric FRANCE
a4e25359e7
add missing rule 2021-03-01 20:37:16 +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
Laurent Destailleur
3ff80ac1f8 FIX #16304 2021-02-19 14:15:58 +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
5340c30db3 FIX missing security test on payment page 
FIX sql error on group by on payment list
 2021-02-19 12:35:26 +01:00
Laurent Destailleur
a41be55251 FIx #16306 2021-02-16 20:11:51 +01:00
Laurent Destailleur
b5c75ecbd5 FIx #16306 2021-02-16 20:10:03 +01:00
Laurent Destailleur
89bda722bf
Merge pull request #16232 from frederic34/paymentvat 
use camelCaps name
 2021-02-09 13:29:40 +01:00
Laurent Destailleur
a5386246cd
Merge pull request #16225 from frederic34/facturerec 
clean deprecated modelpdf to model_pdf
 2021-02-09 13:23:25 +01:00
Frédéric FRANCE
f394e55ade
deprecate non camelCaps functions 2021-02-09 10:26:17 +01:00
Frédéric FRANCE
6d961a1f79
deprecate non camelCaps functions 2021-02-09 09:40:07 +01:00
Laurent Destailleur
401b4f641d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
 2021-02-08 22:13:50 +01:00
Frédéric FRANCE
815f3602e3
clean deprecated modelpdf to model_pdf 2021-02-08 18:30:09 +01:00
Florian HENRY
fcb5b3900d FIX: #16189, fix download/see check deposit PDF 2021-02-06 12:39:40 +01: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
bee0849290 Fix when nothing found, we should show message nothing found 2021-02-06 00:42:53 +01:00
Laurent Destailleur
c15deff817 FIX #16185 2021-02-06 00:30:44 +01:00
Laurent Destailleur
59faccbc60 Load note_private 2021-02-05 00:34:15 +01:00
Laurent Destailleur
21dccadb3a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/banks.lang
	htdocs/stripe/class/stripe.class.php
 2021-01-24 15:32:39 +01:00
Laurent Destailleur
7365974594 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/langs/en_US/banks.lang
	htdocs/stripe/class/stripe.class.php
 2021-01-24 15:24:56 +01:00
Laurent Destailleur
9b6b1e055c Fix trans 2021-01-23 12:20:18 +01:00
Laurent Destailleur
86e853f27d Look and feel v12 2021-01-23 12:18:07 +01:00
Laurent Destailleur
2acf2353a3 Fix bad link 2021-01-23 12:16:25 +01:00
Laurent Destailleur
0d704b0714 FIX error managent and db transaction balance 2021-01-14 19:09:57 +01:00
Laurent Destailleur
8d65dff93d Fix missing param 2021-01-13 11:16:48 +01:00
Aisuko
2d22c1d5d1 Fix wrong cast for pos_change 
The variable pos_change was cast in "int" where it should be cast in "float". It results in rounded value making the receipt showing wrong cash exchange.
 2021-01-02 15:59:43 +01:00
Laurent Destailleur
60d1b08f84 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/takepos/invoice.php
 2020-12-30 22:58:40 +01:00
Laurent Destailleur
65edc377c3 FIX Visible date of payment 2020-12-30 22:53:21 +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
1b939ab8f4
Merge pull request #15183 from frederic34/dol_fiche_end 
end of dol_fiche_end
 2020-10-27 19:00:32 +01:00
Laurent Destailleur
358ac4cd36 Fix scrutinizer 2020-10-27 18:55:55 +01:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Frédéric FRANCE
9a470fa42d
replace deprecated 2020-10-22 22:50:03 +02:00
Frédéric FRANCE
78bc3ecbfd
Add ref instead id in bank check remittance 2020-10-19 14:10:48 +02:00
Laurent Destailleur
2155c0123d
Merge pull request #15021 from Givriz/dev 
Fix : correction de commentaires
 2020-10-15 20:15:12 +02:00
Laurent Destailleur
520645a02c Renamed all methods valide() into validate() 2020-10-15 10:15:37 +02:00
Givriz
c50e288a07 Correction de commentaires 
Correction de commentaires (passage de français à anglais ou correction d'un mauvais anglais).
 2020-10-14 18:26:05 +02:00
Laurent Destailleur
7838ca32ba Fix sql injection reported by Jason Nordenstam 2020-10-14 01:52:53 +02:00
Laurent Destailleur
c539c6d00d Responsive 2020-10-13 17:36:45 +02:00
stickler-ci
6b3f20dc65 Fixing style errors. 2020-10-09 07:29:25 +00:00
Sekan, Tobias
35fbc602ee Add global payment search 2020-10-09 09:22:26 +02:00
Laurent Destailleur
ef2e531d34
Merge pull request #14928 from TobiasSekan/SelectableColumnsOnCustomerInvoicePaymentList 
NEW Select-able columns on customer invoice paymnet list
 2020-10-06 12:28:20 +02:00
stickler-ci
8f542a8572 Fixing style errors. 2020-10-06 06:56:08 +00:00
Sekan, Tobias
33b7d06bb9 address feedback + tooltip + reduce indent 2020-10-06 08:46:53 +02:00
Sekan, Tobias
8447817f8c fix swapped array entries 2020-10-05 11:38:07 +02:00
Sekan, Tobias
3984d8c2b8 Add selectable columns on cust. invoice pay. list 2020-10-05 11:27:44 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
Laurent Destailleur
8b2ba8cbba Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/bom/bom_card.php
	htdocs/core/class/ldap.class.php
	htdocs/core/lib/files.lib.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/admin.lang
 2020-09-29 13:28:22 +02:00
Laurent Destailleur
9973ffab01 Fix sanitizing 2020-09-28 13:05:12 +02:00
Tobias Sekan
a72519f353
Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-23 09:09:42 +02:00
Regis Houssin
fcfe5423f4 FIX missing field entity 2020-09-22 16:34:38 +02:00
Laurent Destailleur
e5cca13ea0 Fix escaping 2020-09-20 03:32:43 +02:00
Laurent Destailleur
216b3c885d Fix escaping 2020-09-20 01:30:36 +02:00
Laurent Destailleur
7dd69a2b2b Fix escape 2020-09-19 20:11:04 +02:00
Laurent Destailleur
2d38644ae1 Sanitize sortfield 2020-09-18 17:13:01 +02:00
Tobias Sekan
b2a953ed5b
Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-18 12:21:41 +02:00
Sekan, Tobias
ae8c302c19 merge variable declaration 2020-09-18 10:52:17 +02:00
Sekan, Tobias
dc4250aed7 Make button visiblity identical on most lists 2020-09-18 10:46:23 +02:00
Sekan, Tobias
1b04ef8aad Add function to all list that support $socid 2020-09-18 10:36:40 +02:00
Laurent Destailleur
c4b5f5a249 Maxi clean of code 2020-09-18 01:29:17 +02:00
Laurent Destailleur
9a758b7edd FIX #yogosha4483 2020-09-17 14:31:25 +02:00
Laurent Destailleur
bfbb217607 Fix GETPOST on 'action' 2020-09-16 19:39:50 +02:00
Laurent Destailleur
6117e0d8d7 Fix tooltip into tooltip 2020-09-14 12:47:43 +02:00
Laurent Destailleur
970995d728 Clean code. Replace num_paiement with num_payment everywhere. 2020-09-14 01:03:51 +02:00
stickler-ci
2cfe740d85 Fixing style errors. 2020-09-12 17:08:44 +00:00
Cédric
d728d268ca
Update paiement.class.php 2020-09-12 18:49:52 +02:00
Laurent Destailleur
30838f01d4 Fix warning 2020-08-27 22:03:52 +02:00
Laurent Destailleur
3b4508b44f
Update paiement.class.php 2020-08-27 19:59:46 +02:00
andreubisquerra
a5ab711b27
Change variable to pos_change 2020-08-23 22:22:05 +02:00
andreubisquerra
e36eb42568
Fix travis 2020-08-22 18:46:39 +02:00
jove@bisquerra.com
d9cbd8f998 NEW: Print payment method and change in TakePOS 2020-08-22 18:28:15 +02:00
Laurent Destailleur
52f238a351 Fix label 2020-07-25 14:50:09 +02:00
Laurent Destailleur
54a77a604c FIX Missing token 2020-07-05 12:55:08 +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
c9e5536fbc FIX Missing token 2020-07-05 12:46:53 +02:00
Laurent Destailleur
176f678a85 Look and feel v12 2020-07-05 12:46:15 +02:00
Laurent Destailleur
c54294285a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
 2020-06-20 12:28:14 +02:00
Laurent Destailleur
b54c18730b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/paiement/class/paiement.class.php
 2020-06-20 12:25:08 +02:00
Laurent Destailleur
da9c25348e
Update paiement.class.php 2020-06-20 12:15:48 +02:00
Mistral Oz - LWEP
2f7bb18e2b
Fix: Bug when delete payment when already deleted in account 
Related to : 
https://github.com/Dolibarr/dolibarr/blame/11.0/htdocs/compta/bank/class/account.class.php#L1976

Mistake between id / rowid. I prefere add the fix here (but a fix in account class can be also a good fix). 
And best fix may use setter to do it (but to complicated : maybe latter ? i may check it in september if you want in all CommonObject properties)
 2020-06-18 20:56:46 +02:00
Laurent Destailleur
c36c8ed447 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_linkedfiles.inc.php
 2020-06-17 15:28:19 +02:00
Laurent Destailleur
1a7f0741b5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/fourn/class/paiementfourn.class.php
 2020-06-17 14:53:24 +02:00
Florian Mortgat
3d69a1dc70 FIX 11.0 - multicurrency amount not fetched when fetching payments from llx_paiement or llx_paiementfourn 2020-06-17 11:06:31 +02:00
Laurent Destailleur
4627f06c70 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-16 22:57:50 +02:00
Laurent Destailleur
b7d835eceb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-06-15 16:10:27 +02:00
Laurent Destailleur
40e16672e3 FIX BlindBoolean SQL injection reported by Christian Weiler 
<sak1.s3curity@gmail.com>
 2020-06-15 15:08:52 +02:00
Frédéric FRANCE
174ddc5fd4
prepare new rule 2020-05-23 21:07:47 +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
88c40633d5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-18 15:57:29 +02:00
Laurent Destailleur
ff8d22a80d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	scripts/cron/cron_run_jobs.php
 2020-05-18 15:57:01 +02:00
Laurent Destailleur
9336828710 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/paiement/card.php
	htdocs/expedition/class/expedition.class.php
 2020-05-18 15:54:39 +02:00
ptibogxiv
a9d1519f96
FIX php error if multicompany disabled 2020-05-18 14:52:33 +02:00
DEMAREST Maxime (Indelog)
740b2c9228 NEW possibilty to group payments by mode and show their subtotal 
This add two params (PAYMENTS_REPORT_GROUP_BY_MOD and
PAYMENTS_FOURN_REPORT_GROUP_BY_MOD) for payments and supplier payments
to group them by mode and get subtotals for each mode. Add the
corresponding configuration options on admin page fore each payments and
supplier payments.
 2020-04-28 09:01:00 +02:00
Laurent Destailleur
31ba277da7 Fix phpcs 2020-04-26 23:18:09 +02:00
Laurent Destailleur
6caa872280 Enable more PHPCS rules 2020-04-25 19:27:42 +02:00
Laurent Destailleur
1121d2c1c6 Look and feel v12 2020-04-25 13:49:44 +02:00
Laurent Destailleur
67a7d6b77d Look and feel v12 2020-04-20 15:57:15 +02:00
Laurent Destailleur
5254a94038 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ldap.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/index.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/expedition/list.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/list.php
	htdocs/loan/list.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/list.php
 2020-04-16 15:58:59 +02:00
atm-quentin
f7c07640dd viewstatut to search_status 2020-04-15 15:01:00 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Laurent Destailleur
6a60678186 Look and feel v12 2020-04-09 16:36:39 +02:00
Laurent Destailleur
73f2e9e5de WIP migrate num_paiement into num_payment 
Fix label for free product in takepos
 2020-03-16 19:23:18 +01:00
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +01:00
Scrutinizer Auto-Fixer
e44865d8b5 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-21 16:53:37 +00:00