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

11680 Commits

Author SHA1 Message Date
Laurent Destailleur
e8f7b755f1 Standardize code 2021-11-22 12:18:15 +01:00
Laurent Destailleur
441af6b6fb Fix add rel="noopener noreferrer" 2021-11-22 02:35:55 +01:00
lvessiller
cdde6ecf94 NEW add form confirm hook in paiement card 2021-11-18 12:17:02 +01:00
lvessiller
ef447bacbf NEW add form confirm hook in paiement card 2021-11-18 12:12:30 +01:00
Gauthier PC portable 024
23249751d5 FIX : reorder all lines when delete document line everywhere 2021-11-17 12:10:12 +01:00
Laurent Destailleur
47f32ef19b NEW Can modify amount when cloning a social contribution 2021-11-15 19:40:26 +01:00
Alexandre SPANGARO
15115a133d Merge remote-tracking branch 'upstream/develop' into 15a30 2021-11-15 04:26:30 +01:00
Alexandre SPANGARO
ce8b94a625 Translation 2021-11-15 04:26:14 +01:00
Laurent Destailleur
55e089118c Fix trans 2021-11-13 15:19:03 +01:00
Laurent Destailleur
21c2dba922 Fix phpcs 2021-11-11 19:06:55 +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
8997368e76
Merge pull request #19347 from frederic34/patch-1 
error display
 2021-11-11 14:39:06 +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
Frédéric FRANCE
06e6479a12
Update cashcontrol_card.php 2021-11-10 12:24:53 +01:00
Frédéric FRANCE
005254ad34
Update cashcontrol_card.php 2021-11-10 12:21:03 +01:00
Frédéric FRANCE
e5d40bf464
error display 2021-11-10 12:06:39 +01:00
Alexandre SPANGARO
d611b99d95 GNU version 3 2021-11-09 03:01:48 +01:00
Laurent Destailleur
9f8e21bc2c Fix filter on dates 2021-11-08 20:39:52 +01:00
Laurent Destailleur
d28edae460 Fix idate must be jdate 2021-11-08 20:11:32 +01:00
Laurent Destailleur
ebdcff3b49 FIX filter for export of accounting documents 2021-11-08 20:07:03 +01:00
Laurent Destailleur
cb65903537 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/langs/en_US/bills.lang
 2021-11-08 03:09:30 +01:00
Laurent Destailleur
e8b3875e2e FIX bad sign of amount stored for multicurrency columns on credit notes 2021-11-08 02:57:21 +01:00
Laurent Destailleur
2b6d296e63 Rename var 2021-11-05 13:58:11 +01:00
kamel
d91c24233c NEW: Can show Paid button if invoice or supplier invoice has no payments with global INVOICE_CAN_FORCE_PAID_WHEN_NO_PAIEMENTS and SUPPLIER_INVOICE_CAN_FORCE_PAID_WHEN_NO_PAIEMENTS 2021-11-02 16:43:09 +01:00
Laurent Destailleur
1d1e75683d
Merge pull request #19183 from frederic34/patch-5 
fix warning
 2021-10-31 17:47:23 +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
Laurent Destailleur
a635dc6df3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/bookmarks/card.php
 2021-10-31 16:50:34 +01:00
Laurent Destailleur
c73c962459
Merge pull request #19220 from frederic34/patch-4 
remove duplicate code
 2021-10-31 16:47:33 +01:00
Laurent Destailleur
d891dd8ddc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/stocks.lang
	htdocs/product/stats/card.php
	htdocs/projet/element.php
	htdocs/salaries/card.php
 2021-10-31 16:19:10 +01:00
Laurent Destailleur
da4fe03be7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/html.formticket.class.php
	htdocs/ticket/card.php
 2021-10-31 14:37:33 +01:00
Laurent Destailleur
ca8dab36a3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/class/html.formticket.class.php
	htdocs/core/modules/modAdherent.class.php
	htdocs/core/modules/modProjet.class.php
 2021-10-31 14:33:44 +01:00
Laurent Destailleur
6d918ad1c7 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-10-31 14:24:19 +01:00
Laurent Destailleur
3dcd1aa05d
Update info.php 2021-10-31 14:02:34 +01:00
Laurent Destailleur
8dfe4fe05f
Update note.php 2021-10-31 14:02:14 +01:00
Laurent Destailleur
65d59405da
Update document.php 2021-10-31 14:01:56 +01:00
Laurent Destailleur
0e2e8fe27f
Update contact.php 2021-10-31 14:01:40 +01:00
Laurent Destailleur
fe7e1d4118 Look and feel v15 2021-10-29 09:40:38 +02:00
Marc de Lima Lucio
eb8d7f92c3 FIX: invoice: inpossible to create an invoice because of very bad check + warnings when trying to print tabs for invoice with no ID 2021-10-28 15:26:40 +02:00
Frédéric FRANCE
dc15d09f12
remove duplicate code 2021-10-27 09:37:22 +02:00
Laurent Destailleur
e9ba9fc103 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
 2021-10-26 13:52:00 +02:00
Laurent Destailleur
da2ce063b3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/contact/card.php
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
	htdocs/product/card.php
	htdocs/public/emailing/mailing-unsubscribe.php
 2021-10-26 13:42:30 +02:00
Laurent Destailleur
fde44f2792 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
 2021-10-26 13:29:47 +02:00
Laurent Destailleur
181991ee47 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-10-26 13:10:23 +02: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
Frédéric FRANCE
ead9b396c6
fix warning 2021-10-24 16:02:59 +02:00
Laurent Destailleur
9cd59bf2c4
Merge pull request #18508 from henrynopo/patch-3 
NEW Additional reason for Customer's partial payment - bank fees
 2021-10-24 12:54:19 +02:00
Laurent Destailleur
f2cd7a7a56 Removed the div class="ficheaddleft" 2021-10-24 00:37:37 +02:00
Laurent Destailleur
6ad9eb8ef1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/class/api_products.class.php
	htdocs/recruitment/recruitmentcandidature_list.php
	htdocs/recruitment/recruitmentjobposition_list.php
 2021-10-24 00:02:15 +02:00
Laurent Destailleur
f1f00be99c
Merge pull request #19160 from frederic34/comptacashcontrol 
fix warnings
 2021-10-23 22:45:55 +02:00
Laurent Destailleur
321cfb3811
Update cashcontrol_list.php 2021-10-23 22:44:37 +02:00
Scrutinizer Auto-Fixer
f7a41f1848 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-10-23 20:22:10 +00:00
Frédéric FRANCE
b9075660af
fix warnings 2021-10-23 22:15:23 +02:00
Laurent Destailleur
ce4fe3f400 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-23 18:33:47 +02:00
Laurent Destailleur
6832893cb8
Merge pull request #19143 from andreubisquerra/develop 
TakePOS Split Sale fixes and improvements
 2021-10-23 17:25:53 +02:00
Laurent Destailleur
8604f9b153 Clean DOM (remove ficheaddleft div) 2021-10-23 17:18:35 +02:00
Norbert Penel
e2ff96a096
FIX #18835 : addition of number + unsure string 
risky, may produce a warning
 2021-10-23 16:47:10 +02:00
andreubisquerra
85cc5851ef
BUG When load a draft invoice from history I can't add products 2021-10-23 16:07:47 +02:00
Laurent Destailleur
6ec19bca9d
Merge pull request #19128 from frederic34/warnfixes 
fix warnings
 2021-10-23 11:38:03 +02:00
Hystepik
67711bdea9
Merge branch 'develop' into develop#3 2021-10-23 10:59:36 +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
Frédéric FRANCE
9bd31d2b85
fix warnings 2021-10-23 07:13:08 +02:00
Laurent Destailleur
67f5ef913e
Merge pull request #19037 from aspangaro/14p24 
FIX Accountancy simplified - Salaries are not present in report
 2021-10-22 22:54:23 +02:00
Laurent Destailleur
900d7512f2
Merge pull request #19121 from frederic34/fixrightswarning 
fix multiple warnings
 2021-10-22 22:47:28 +02:00
Frédéric FRANCE
46c4f28478
fix multiple warnings 2021-10-22 22:15:59 +02:00
Laurent Destailleur
c81bf68578 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/compta/cashcontrol/cashcontrol_list.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/modulebuilder/index.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/product/class/api_products.class.php
 2021-10-22 15:56:44 +02:00
Frédéric FRANCE
c789b12715 fix more than one extrafield cause bug sql 2021-10-22 11:07:38 +02:00
Florian HENRY
6c71cc1e14 better correction from modulebuilder source of #19081 2021-10-22 11:03:35 +02:00
Alexandre SPANGARO
0c8291b60f Fix INNER JOIN & Add urlencode() 2021-10-22 04:35:23 +02:00
Laurent Destailleur
6c870bb3d1
Merge pull request #19059 from FHenry/fix_introduced_scrutinizer 
fix: scrutinizer
 2021-10-21 22:52:20 +02:00
Florian HENRY
10a518749d fix: scrutinizer 2021-10-21 16:46:04 +02:00
Alexandre SPANGARO
d2b96fe0f6 Correct link to salary list with user search 2021-10-21 06:08:48 +02:00
Alexandre SPANGARO
a1c0e1ad1f Better fix with backward compatibility with old salary module 2021-10-21 05:45:37 +02:00
Alexandre SPANGARO
be7c1c8a23 Typo & translation 2021-10-21 05:18:56 +02:00
Alexandre SPANGARO
02bb39d438 FIX Accountancy simplified - Salaries are not present in report 2021-10-21 05:06:50 +02:00
JC Prieto
0756a01002
Fix card.php 
Error adding localtax
 2021-10-20 19:33:28 +02:00
Laurent Destailleur
e43b33028c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
 2021-10-20 15:06:10 +02:00
Laurent Destailleur
0cae464bfa Debug v15 2021-10-19 16:47:43 +02:00
Laurent Destailleur
c40a73162e Look and feel v15 2021-10-18 21:20:58 +02:00
Laurent Destailleur
bd73545d08
Merge pull request #18985 from henrynopo/patch-5 
Fix the rounding issue in case of multi-currency
 2021-10-17 13:50:35 +02:00
Laurent Destailleur
48f6ebc344
Merge pull request #18971 from javieralapps4up/develop 
Update factures.php
 2021-10-16 21:24:29 +02:00
Laurent Destailleur
dd0809b528 Fix trans labels status 2021-10-16 19:37:57 +02:00
Laurent Destailleur
bd52613331 Fix phpcs 2021-10-16 17:06:10 +02:00
Laurent Destailleur
7ff3e4253f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-16 13:01:27 +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
Laurent Destailleur
52890c64c1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/compta/facture/stats/index.php
	htdocs/compta/prelevement/create.php
 2021-10-16 12:53:57 +02:00
Laurent Destailleur
faf80b94e9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/stats/index.php
 2021-10-16 12:49:18 +02:00
Laurent Destailleur
07052196e2 Fix popup message on sepa creation 2021-10-16 12:33:19 +02:00
stickler-ci
fb79aaeb0c Fixing style errors. 2021-10-15 07:19:49 +00:00
Henry
0cb1972674
Update card.php 2021-10-15 15:07:48 +08:00
Laurent Destailleur
a6c3c6b7ec url 2021-10-14 15:56:01 +02:00
Laurent Destailleur
3875d26a2f Fix filter for supplierinvoice stats 2021-10-14 15:55:12 +02:00
Laurent Destailleur
db3d16f080 Fix filter tag for supplier invoice statistics 2021-10-14 15:43:35 +02:00
Laurent Destailleur
bc230dbfc2 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-10-14 12:00:33 +02:00
Laurent Destailleur
371c75e76a FIX list of categories in stats of supplier invoices 2021-10-14 11:58:21 +02:00
stickler-ci
d264bbca3c Fixing style errors. 2021-10-13 12:36:58 +00:00
javieralapps4up
230af38010
Update factures.php 
When the list is greater than $ conf-> liste_limit, no more pages are output
 2021-10-13 14:34:50 +02:00
Laurent Destailleur
f3c16ba490
Merge pull request #18905 from indelog/fix_origin_invoice_custom 
Fix creataing invoice originating for custom module object
 2021-10-11 15:26:07 +02:00
Laurent Destailleur
b29bd325fe
Update card.php 2021-10-11 15:25:25 +02:00
atm-florian
57052e2fba FIX PR#18931 Remove useless explicit call to dol_shutdown 2021-10-11 11:10:14 +02:00
Laurent Destailleur
da815476fd Fix edit field from tab bank transfer of invoice 2021-10-11 02:00:12 +02:00
Laurent Destailleur
dbf2c0be7e Fix warning 2021-10-11 01:49:50 +02:00
Laurent Destailleur
a57925b0b7 FIX edition of fields on credit transfer tab 2021-10-11 01:43:36 +02:00
Laurent Destailleur
977a596500 Fix edit link 2021-10-11 01:27:21 +02:00
Laurent Destailleur
7c1d955f6c Fix: avoid to show warning in some cases 2021-10-11 01:23:00 +02:00
atm-florian
2da16ade6c FIX: consistent UX when calling a tab from the invoice card with empty ref / id 2021-10-08 17:24:52 +02:00
lvessiller
be4a00213c FIX optional visibility on create card 2021-10-08 15:58:08 +02:00
Laurent Destailleur
2cb0edb5eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/project/suggestbooth.php
	htdocs/public/project/suggestconference.php
 2021-10-07 11:01:53 +02:00
Laurent Destailleur
9b5909300e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/paiement/card.php
	htdocs/fourn/facture/card.php
 2021-10-07 11:00:00 +02:00
Laurent Destailleur
efd44b0ec0 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-10-07 10:57:03 +02:00
Laurent Destailleur
5910d10021 Add hidden option to allow to fix corrupted situations 2021-10-07 10:43:50 +02:00
Laurent Destailleur
e004d39ed4 Fix status of supplier invoice 2021-10-06 19:30:37 +02:00
Laurent Destailleur
ff56415c00
Merge pull request #18903 from aspangaro/15a21 
HTML5 - <font> tag is deprecated, replace by <span>
 2021-10-05 16:51:41 +02:00
stickler-ci
39cc2ca5b6 Fixing style errors. 2021-10-05 09:42:52 +00:00
Indelog
6c82b1d0e1 Fix creataing invoice originating for custom module 
This fix the invoice create form when we provide `origin` element in
url. The actual create form overide the value for origin field with
`$objectsrc->element`. This make creation of invoice originating from a custom
module module impossible because we need the module part to instantiate
the class for the custom module object.

This also modify Common Object::fetch Object Linked() to append the
module part for `$sourcetype` and `$targettype` if it not set and object
have module property and it not in core module.
 2021-10-05 11:35:43 +02:00
Alexandre SPANGARO
edf91ce77c HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 09:41:03 +02:00
Laurent Destailleur
b6ec7ae77a Fix permissions on module PaymentByBankTransfer 2021-10-04 04:36:58 +02:00
Laurent Destailleur
b3cb56f2ef Clean css 2021-10-04 04:14:31 +02:00
Frédéric FRANCE
5c4b55fe7f
doxygen 
https://doxygen.dolibarr.org/develop/doxygen-warnings.log
 2021-10-02 13:35:17 +02:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
Laurent Destailleur
2671eeb4e5 Responsive 2021-10-01 18:54:14 +02:00
Laurent Destailleur
673a2982a5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/card.php
 2021-09-30 16:32:40 +02:00
Laurent Destailleur
3d4bb66853 Clean code 2021-09-30 15:59:47 +02:00
Laurent Destailleur
608b6f5fa3 Clean code 2021-09-30 15:24:57 +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
Laurent Destailleur
fca39d9179 css 2021-09-30 01:15:36 +02:00
javieralapps4up
f6c8932cfa
Update account.class.php 2021-09-28 17:25:31 +02:00
Laurent Destailleur
e15277bb6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-28 17:23:07 +02:00
javieralapps4up
b6bb27e0f7
FIX: #18848 2021-09-28 17:21:22 +02:00
Laurent Destailleur
d3e5e3071b css 2021-09-28 00:26:58 +02:00
Laurent Destailleur
0750d4bb6e Look and feel v14 2021-09-28 00:21:54 +02:00
Laurent Destailleur
338d5ac56e Look and feel v14 2021-09-27 22:12:08 +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
0176ab6057 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
 2021-09-27 11:40:47 +02:00
Laurent Destailleur
9b825df158 Clean code 2021-09-27 11:36:40 +02:00
lmarcouiller
f88d12f55d Fix #18809 : error on client tooltip 2021-09-24 11:16:34 +02:00
Laurent Destailleur
38b8ed9092
Merge pull request #18792 from cfoellmann/PR/minor-button-fixes 
another set of cleanup for action buttons
 2021-09-24 01:55:25 +02:00
Laurent Destailleur
27c41946b7
Merge pull request #18182 from atm-jpb/NEW_field_in_service_object 
NEW : field and behavior in product object
 2021-09-23 12:14:09 +02:00
Laurent Destailleur
d38c3028eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
 2021-09-23 02:41:53 +02:00
Laurent Destailleur
128f6d9a5c Fix combo box for thirdparties in invoice stats used bad component 2021-09-23 02:38:53 +02:00
Laurent Destailleur
51b6318f88 FIX Test when date of invoie is in future (pb with TZ and offset) 2021-09-23 02:14:01 +02:00
Laurent Destailleur
60c11725ae Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-23 02:11:11 +02:00
Laurent Destailleur
1e0a7e4342 FIX Test when date of invoie is in future (pb with TZ and offset) 2021-09-23 02:10:39 +02:00
Christian Foellmann
08b395e127 another set of cleanup for action buttons 2021-09-22 08:43:30 +02:00
Laurent Destailleur
e2c389a4a9 Fix delete invoice 2021-09-21 14:23:21 +02:00
Laurent Destailleur
b7105d572a Fix delete of invoice not complete (some fk_invoice still filled) 2021-09-21 14:20:01 +02:00
stickler-ci
d919ef9c4c Fixing style errors. 2021-09-20 17:57:10 +00:00
Yannick Warnier
c40b22facd Add turnover homepage box 2021-09-20 19:41:13 +02:00
Laurent Destailleur
deb1965cd5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/compta/paiement/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_list.php
	htdocs/projet/tasks/task.php
	htdocs/public/payment/newpayment.php
 2021-09-20 17:15:12 +02:00
Laurent Destailleur
5c8fb38426 Fix add del* action into list of sensitive actions 2021-09-19 14:41:46 +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
Laurent Destailleur
62b721a904 Add deletecontact as sentitive action 
Replace dol_buildpath with DOL_URL_ROOT
 2021-09-18 19:34:46 +02:00
Laurent Destailleur
3d9be1437a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/paiement/list.php
	htdocs/fourn/paiement/list.php
	htdocs/projet/tasks/time.php
 2021-09-17 12:29:58 +02:00
Laurent Destailleur
9a6f4bf6d9
Merge pull request #18708 from javieralapps4up/develop 
Fix #18707 $search_account and $search_paymenttype are not saved when sorting by any field
 2021-09-17 11:51:35 +02:00
Laurent Destailleur
5f5c659b76
Merge pull request #18710 from aspangaro/15a14 
NEW Customer invoice template list - Add input date from/to
 2021-09-17 11:50:29 +02:00
Christian Foellmann
fd1d4d9073 add missing css classes to buttons 2021-09-16 11:33:42 +02:00
Ferran Marcet
7a637104b2 Fix: Not filter by company when it is an external user 2021-09-15 11:29:12 +02:00
Alexandre SPANGARO
cb37c42b5e NEW Customer invoice template list - Add input date from/to 2021-09-14 04:50:05 +02:00
javieralapps4up
e1203d115a
Update list.php 2021-09-14 02:22:30 +02:00
javieralapps4up
0763846805
Bug: #18670 date, account and payment type are lost when sorting by any field 
Filtereds $date, $search_account and $search_paymenttype are not saved when sorting by any field
 2021-09-14 02:15:22 +02:00
javieralapps4up
d7126e8d24
Update list.php 
$search_account and $search_paymenttype are not saved when sorting by any field
 2021-09-14 01:49:24 +02:00
Alexandre SPANGARO
12eb16b8b6 Merge branch '15a12' of https://github.com/aspangaro/dolibarr into 15a12 2021-09-09 22:24:42 +02:00
Alexandre SPANGARO
3ea6314494 Remove $year 2021-09-09 22:24:24 +02:00
stickler-ci
dfe1576b8d Fixing style errors. 2021-09-09 20:18:47 +00:00
Alexandre SPANGARO
f31b7fa3c4 NEW Social Contributions - Add from/to on list 2021-09-09 22:14:26 +02:00
Laurent Destailleur
fa28621709 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/reception/list.php
 2021-09-09 16:11:29 +02:00
Laurent Destailleur
a4d897f609
Merge pull request #18625 from jyhere/patch-1 
Fix : unable to create a direct debit if ics_transfer is empty
 2021-09-09 05:04:06 +02:00
Laurent Destailleur
034c5651c8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/eventorganization/class/conferenceorbooth.class.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/public/eventorganization/attendee_subscription.php
 2021-09-08 22:13:35 +02:00
Laurent Destailleur
4705d41ed2 FIX Relative discount with high nb of decimals 2021-09-08 22:00:16 +02:00
Laurent Destailleur
57a2ea3a53 Fix sql error 2021-09-08 19:49:24 +02:00
Laurent Destailleur
405beb77f5 Fix sql error 2021-09-08 19:45:55 +02:00
Laurent Destailleur
6089de568e Fix sort order 2021-09-07 23:15:06 +02:00
Laurent Destailleur
32a09e9494 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/salaries/paiement_salary.php
 2021-09-07 17:47:00 +02:00
stickler-ci
3537f68c7e Fixing style errors. 2021-09-06 13:24:22 +00:00
jyhere
18da6e6d6f
Update create.php 
Fix : unable to create a direct debit if ics and ics_transfer are empty even though ics_transfer is only used for bank transfer.
 2021-09-06 15:20:47 +02:00
jpb
65a2486f94 merge conflict 2021-09-06 09:43:52 +02:00
Laurent Destailleur
b782e5986a Fix css 2021-09-06 03:29:46 +02:00
Laurent Destailleur
0d6296e417
Merge pull request #18539 from GurvanKervern/undef4 
Undef4
 2021-09-05 01:57:16 +02:00
Laurent Destailleur
ee066ad725 Cast sql var 2021-09-03 21:25:43 +02:00
Laurent Destailleur
c4621f0433 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2021-09-03 18:04:14 +02:00
Laurent Destailleur
2e3b6b2fc8 Backport sql injection fix from develop 2021-09-03 18:00:28 +02:00
Laurent Destailleur
77e9f15360 Work on #18448 2021-09-02 22:52:17 +02:00
Laurent Destailleur
67db0f1bdb Add link "Now" on date selection when cloning social contribution 2021-09-02 19:15:21 +02:00
Laurent Destailleur
8600d8d00d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-01 22:50:06 +02:00
Laurent Destailleur
7c5621a2d4
Merge pull request #18552 from aspangaro/15a12 
NEW Invoice list - Use complete country select field with EEC or not
 2021-09-01 17:17:48 +02:00
Laurent Destailleur
9da82af74f
Merge pull request #18566 from Dolibarr/scrutinizer-patch-2 
Scrutinizer Auto-Fixes
 2021-09-01 13:36:20 +02:00