Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,767 Commits 35 Branches 179 Tags 1.7 GiB
e3a0220658
Commit Graph

12406 Commits

Author SHA1 Message Date
Marc de Lima Lucio
6580c2e308 FIX: deposit payment terms: correctly untag deposit as created from an origin 2021-10-04 15:07:27 +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
Marc de Lima Lucio
81ddc6c0f6 NEW: deposit payment terms: generate deposit from proposal 2021-09-30 12:41:07 +02:00
Marc de Lima Lucio
8cb6cdf1bc NEW: deposit payment terms: prefill deposit parameters if coming from an origin with the corresponding payment conditions 2021-09-30 11:48:32 +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
Laurent Destailleur
19f0db23df Fix scrutinizer bugs 2021-08-31 20:31:05 +02:00
Scrutinizer Auto-Fixer
312ca95feb Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-08-31 18:18:28 +00:00
Laurent Destailleur
0aa4868c34 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-31 13:14:01 +02:00
Alexandre SPANGARO
0132788266 NEW Invoice list - Use complete country select field with EEC or not 2021-08-30 13:56:31 +02:00
henrynopo
3240a3652d
Update card.php 2021-08-30 15:34:59 +08:00
GurvanKervern
b242387c43 Fix undef4-2 
PHP8 warnings
 2021-08-29 22:46:39 +08:00
Laurent Destailleur
81a8efd856 Restore error message 2021-08-28 20:14:23 +02:00
Laurent Destailleur
8870662200
Merge pull request #18475 from OPEN-DSI/v14-fix-invoice-fetch-not-found-syslog-level 
FIX invoice fetch not found syslog debug level instead of error
 2021-08-28 20:12:45 +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
5cd609e14e
Merge pull request #18507 from henrynopo/patch-5 
Customer Invoice - Multicurrency Remaining to Pay (updated)
 2021-08-28 17:36:01 +02:00
henrynopo
11497d4bf0
Update card.php 2021-08-28 22:38:17 +08:00
Laurent Destailleur
f825d3fda4 Trans 2021-08-28 13:27:55 +02:00
Laurent Destailleur
51a4d7630f Clean code 2021-08-28 00:56:37 +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
3b6559b1a6 Clean code by adding cast int. 2021-08-27 18:53:45 +02:00
Laurent Destailleur
2f225ee7e5 Clean code by adding cast int. 2021-08-27 16:33:03 +02:00
henrynopo
a79abfd4e0
Update card.php 2021-08-26 10:37:03 +08:00
stickler-ci
bafe22ff77 Fixing style errors. 2021-08-26 02:29:45 +00:00
henrynopo
f6daad4480
Update card.php 2021-08-26 10:25:32 +08:00
Christian Foellmann
f094b4c70c fix up most of the remaining submit inputs 2021-08-24 17:04:17 +02:00
Laurent Destailleur
07ab352877 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/list.php
 2021-08-24 16:37:18 +02:00
lvessiller
a4a44faa7f FIX change LOG_DEBUG with LOG_WARNING in syslog and remove sql error in syslog (already done) 2021-08-24 16:21:55 +02:00
Laurent Destailleur
8aa262f302
Merge pull request #18453 from aspangaro/14p15 
FIX #18353 Invoice list translation issue
 2021-08-24 15:29:32 +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
15da97f1da Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/compta/facture/card.php
	htdocs/product/price.php
 2021-08-24 15:05:14 +02:00
Laurent Destailleur
591059847e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/price.php
 2021-08-24 15:00:35 +02:00
Laurent Destailleur
8b2c82dd23 Fix position of fields 2021-08-24 14:27:18 +02:00
Alexandre SPANGARO
efb78d7431 FIX Invoice list - Wrong name for column total_tva 2021-08-24 14:22:36 +02:00
Alexandre SPANGARO
7b829bc899 FIX Field already present in SQL request 2021-08-24 14:22:21 +02:00
Laurent Destailleur
4a32788bff
Merge pull request #18463 from aspangaro/14p14 
FIX Invoice list - Wrong name for column total_tva
 2021-08-24 14:20:57 +02:00
lvessiller
4efe2a0e09 FIX invoice fetch not found syslog debug level instead of error 2021-08-24 08:20:40 +02:00
Laurent Destailleur
a6ddc90d5b Fix responsive 2021-08-23 23:53:58 +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
8485fee5f9 Cast numeric into on sql request 2021-08-23 19:33:24 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Alexandre SPANGARO
56c23b79e0 FIX Invoice list - Wrong name for column total_tva 2021-08-22 14:02:33 +02:00
Alexandre SPANGARO
dd51e24afc FIX Field already present in SQL request 2021-08-22 14:01:29 +02:00
Alexandre SPANGARO
8bdf58b942 FIX #18353 Invoice list translation issue 2021-08-20 21:42:43 +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
95721d36ab
Merge pull request #17687 from FHenry/dev_massaction_paid_custom_invoice 
NEW : mass action paid customer invoice
 2021-08-17 19:10:49 +02:00
Laurent Destailleur
794db94178
Update list.php 2021-08-17 19:08:55 +02:00
Laurent Destailleur
22e595e572
Merge pull request #18420 from henrynopo/patch-1 
Customer Invoice - Multicurrency Remaining to Pay
 2021-08-17 15:26:36 +02:00
Laurent Destailleur
92d6ad9597 Removed old simple POS module ('cashdesk' module) 2021-08-17 04:57:53 +02:00
Laurent Destailleur
352b413a17 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 02:12:22 +02:00
Laurent Destailleur
eba87ab295 FIX filter on status Draft in modulebuilder 2021-08-17 02:09:38 +02:00
stickler-ci
b92fe38bc0 Fixing style errors. 2021-08-16 01:47:49 +00:00
henrynopo
9a65cbeab7
Customer Invoice - Multicurrency Remaining to Pay 
Added the remainder to be paid in multicurrency mode.
 2021-08-16 09:39:09 +08:00
Laurent Destailleur
896cdf4845
Update list.php 2021-08-11 22:24:07 +02:00
Laurent Destailleur
f9f1440226
Merge branch 'develop' into salesrepresentativeinorderandinvoicelist 2021-08-11 22:22:26 +02:00
Laurent Destailleur
bf72143823 Fix phpcs 2021-08-11 21:04:03 +02:00
Laurent Destailleur
06b50051f1
Merge pull request #18356 from altairisfr/iban 
NEW: add constant MAIN_IBAN_IS_NEVER_MANDATORY
 2021-08-11 21:02:51 +02:00
Marc de Lima Lucio
08f21e3fc4 FIX: invoice validation: when checking if any vat rate has a negative amount, prevent false positives with -1E-14 amounts 2021-08-10 10:23:56 +02:00
Laurent Destailleur
591b4c6793 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-09 16:49:16 +02:00
Laurent Destailleur
6e4fb8dd8b Fix debited instead of credited for bank transfer sepa status 2021-08-09 16:48:36 +02:00
Christophe Battarel
cbc7589559 NEW: add constant MAIN_IBAN_NOT_MANDATORY 2021-08-06 16:35:49 +02:00
Laurent Destailleur
c0c46fb704 FIX Link of download main doc on vat list 2021-08-06 12:20:12 +02:00
Laurent Destailleur
6cefd0a756 FIX Link of download main doc on vat list 2021-08-06 12:18:51 +02:00
jpb
f99ba2c1e1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_field_in_service_object 2021-08-04 17:26:23 +02:00
Laurent Destailleur
0de10cea39 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-04 15:21:31 +02:00
Laurent Destailleur
a9ced1098d Fix lang loaded 2021-08-04 13:51:54 +02:00
Laurent Destailleur
928a2154b3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-04 13:22:55 +02:00
Laurent Destailleur
23ea8d2907 Fix link into message 2021-08-04 13:22:24 +02:00
Laurent Destailleur
354b8aab01 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-04 13:18:33 +02:00
Laurent Destailleur
de228c5687 Fix bad link. Can't delete SEPA bank transfer request 2021-08-04 13:18:03 +02:00
Laurent Destailleur
6a31d4657b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-04 13:12:46 +02:00
Laurent Destailleur
bec87f5739 Fix translation ICS 2021-08-04 13:12:07 +02:00
Laurent Destailleur
a84c994368 Fix no tooltip on link in error message 2021-08-04 12:43:36 +02:00
Laurent Destailleur
bf49309d58 Fix css 2021-08-04 12:41:27 +02:00
Laurent Destailleur
ce0d9f3b17 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-04 12:38:56 +02:00
Laurent Destailleur
aaefb7b324 Fix css 2021-08-04 12:38:28 +02:00
Laurent Destailleur
6dc8024d87 Fix title 2021-08-04 12:30:48 +02:00
Laurent Destailleur
d1af127c81 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-04 12:29:11 +02:00
Laurent Destailleur
4dfc8bab93 Fix bad title 2021-08-04 12:28:13 +02:00
Marc de Lima Lucio
9d234a8541 FIX: multicurrency: fields in discount unitialized when creating deposit 2021-08-03 18:32:22 +02:00
Laurent Destailleur
ede571dcfe Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2021-08-03 17:08:49 +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
Laurent Destailleur
0058e32207 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-02 19:03:38 +02:00
Laurent Destailleur
eced1c824a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/core/class/html.form.class.php
	htdocs/projet/tasks/time.php
 2021-08-02 18:47:09 +02:00
Laurent Destailleur
d822421e10 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/accountancy/tpl/export_journal.tpl.php
	htdocs/projet/tasks/time.php
 2021-08-02 18:31:26 +02:00
Laurent Destailleur
61e3a57de7 Fix label 2021-08-02 18:23:05 +02:00
Laurent Destailleur
8077fae42e Code comment 2021-08-02 17:56:58 +02:00
Alexandre SPANGARO
262dd1600b FIX: Invoice - Missing button to reopen an abandoned situation invoice 2021-07-29 06:23:12 +02:00
stickler-ci
2f0ba41a53 Fixing style errors. 2021-07-20 13:35:10 +00:00
jpb
1237c5ba55 add msg to formconfirm on propal invoice and commande 2021-07-20 14:46:56 +02:00
BENKE Charlene
1a23cfc6f9
Update list.php 2021-07-19 10:01:11 +02:00
Laurent Destailleur
638a66fbb9 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/main.lang
 2021-07-14 14:49:06 +02:00
Laurent Destailleur
b552c6b4fe Fix status color 2021-07-14 14:32:05 +02:00
Laurent Destailleur
af99cab839 CSS 2021-07-13 13:46:20 +02:00
Laurent Destailleur
d91051488c
Merge pull request #18125 from fr69400/develop 
NEW add hookmanager on note pages
 2021-07-11 20:25:16 +02:00
stickler-ci
a8752bf097 Fixing style errors. 2021-07-11 07:46:34 +00:00
fr69400
c7ad0a59c9
Update note.php 2021-07-11 09:45:38 +02:00
stickler-ci
4272f93aa4 Fixing style errors. 2021-07-09 16:41:41 +00:00
fr69400
e45d5c1d0d NEW add hookmanager on note pages 2021-07-09 18:36:21 +02:00
Laurent Destailleur
af8c973050 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-09 13:35:08 +02:00
Laurent Destailleur
b7c42c70ef Fix date for planned entries 2021-07-09 13:33:37 +02:00
Laurent Destailleur
f286017cab Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-06 19:03:55 +02:00
Laurent Destailleur
82e96016cd
Merge pull request #18092 from fappels/14_fix_php8_part3 
Fix php8 warning
 2021-07-06 18:52:05 +02:00
Laurent Destailleur
adec77e449 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-05 18:47:24 +02:00
Laurent Destailleur
abb1ad6bf0 Fix sql injection 2021-07-05 18:46:27 +02:00
Francis Appels
1333ca3660 Fix php 8 warning on not set field keys 2021-07-05 14:51:34 +02:00
Laurent Destailleur
5779a56ae0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-04 21:23:53 +02:00
Laurent Destailleur
7013f01a41 Fix look and feel v14 2021-07-04 21:14:46 +02:00
Laurent Destailleur
f6efe51032 Fix trouble with product id = -1 2021-07-04 21:02:02 +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
9b7c0a9246 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2021-07-03 18:32:31 +02:00
Laurent Destailleur
6ae1d192e4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/card.php
 2021-07-02 16:14:12 +02:00
Laurent Destailleur
01cf608ef4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-07-02 16:06:48 +02:00
Laurent Destailleur
a7f850dafb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-07-02 16:05:51 +02:00
Laurent Destailleur
6cb5ea6ec2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-30 17:27:20 +02:00
Laurent Destailleur
bda36337cd Prepare fix #yogosha6443 2021-06-30 17:22:36 +02:00
Laurent Destailleur
7c2121c439 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/tpl/objectline_edit.tpl.php
 2021-06-30 15:06:16 +02:00
Laurent Destailleur
51456741d9 FIX Can't edit replacement invoice 
FIX Status of invoice when making a replacement invoice
 2021-06-30 12:43:44 +02:00
atm-arnaud
8772c53723 FIX deposit can create credit note in payment conf 2021-06-30 12:37:21 +02:00
Laurent Destailleur
02a5755876 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/langs/nl_NL/main.lang
 2021-06-29 19:59:51 +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
56787bc292
Update card.php 2021-06-29 19:14:03 +02:00
Francis Appels
1b7b45d72a Merge remote-tracking branch 'Dolibarr/14.0' into 14_fix_php8_part2 2021-06-29 16:56:48 +02:00
Francis Appels
e4f61d430f Invoice php 8 issue and warnings. 
Seems if ("" < 0) is true in php 8
 2021-06-29 16:33:24 +02:00
Laurent Destailleur
d788e58f67
Merge pull request #18036 from frederic34/codesample 
remove unused code
 2021-06-29 15:47:03 +02:00
lmarcouiller
923a015aac Fix #18014 : update of compta/facture/card.php 2021-06-28 11:38:34 +02:00
Frédéric FRANCE
58701bef5d
remove unused code 2021-06-26 21:10:59 +02:00
Laurent Destailleur
67e7556f70
Merge pull request #18032 from OPEN-DSI/new-invoice-create-from-clone-errors 
NEW get errors on create invoice from clone
 2021-06-26 11:53:45 +02:00
Laurent Destailleur
bc816f253c Fix tooltip 2021-06-26 02:07:18 +02:00
Laurent Destailleur
12d591b848 css 2021-06-26 00:18:46 +02:00
Laurent Destailleur
ccffb36a37 CSS 2021-06-26 00:14:53 +02:00
Laurent Destailleur
6e3647af2c Debug v14 2021-06-26 00:08:19 +02:00
Laurent Destailleur
d2485033d7 Fix deletion of template invoice 2021-06-25 23:10:42 +02:00
lvessiller
24acc82ca6 NEW get errors on create invoice from clone 2021-06-25 16:40:39 +02:00
Laurent Destailleur
a657fe2fca Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-23 13:31:40 +02:00
Laurent Destailleur
6db44e66d6 FIX #18006 2021-06-23 13:30:00 +02:00
Laurent Destailleur
acce226c05 Debug cash fence feature (missing report per vat rate) 2021-06-23 13:00:50 +02:00
Laurent Destailleur
11a71d8d2f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
 2021-06-23 11:41:30 +02:00
Laurent Destailleur
034906a129 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
	htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
 2021-06-23 11:30:44 +02:00
Laurent Destailleur
c9d4ccd40a
Merge pull request #17845 from atm-gauthier/fix_libstatus_invoice_in_linked_objects_block 
FIX : need to add payment sum to getlibstatus function in object linked block (bug still exists in 13.0)
 2021-06-23 10:48:22 +02:00
Laurent Destailleur
56212508e7
Update linkedobjectblock.tpl.php 2021-06-23 10:47:23 +02:00
Laurent Destailleur
68b8a6a916 css 2021-06-20 16:35:49 +02:00
Laurent Destailleur
7046791377 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-19 14:16:39 +02:00
Laurent Destailleur
53295a0cb1 Fix phpcs 2021-06-18 01:06:28 +02:00
Laurent Destailleur
88ff0e4795 Fix PHPCS 2021-06-18 00:59:18 +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
adfbb9d7d5 Fix VAT column missing 2021-06-15 17:53:25 +02:00
Gauthier PC portable 024
564a3b66c2 FIX : method exists 2021-06-14 17:08:16 +02:00
Scrutinizer Auto-Fixer
55c9f37ffa Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-06-14 13:37:02 +00:00
Laurent Destailleur
3cacad795f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-14 14:26:07 +02:00
Laurent Destailleur
5cc86d2319 Fix #yogosha6370 2021-06-14 13:51:09 +02:00
Laurent Destailleur
046215f64a Fix PHP8 2021-06-14 02:08:28 +02:00
Laurent Destailleur
aceeb9558f css 2021-06-14 01:13:46 +02:00
Laurent Destailleur
34cebe6aa3 Look and feel v14 2021-06-14 01:11:39 +02:00
Frédéric FRANCE
791e4ab056
fix warning 2021-06-13 15:59:22 +02:00
Laurent Destailleur
a8401ca30d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-12 15:47:18 +02:00
Laurent Destailleur
f13dcb5376 Fix merge 2021-06-12 15:44:03 +02:00
Laurent Destailleur
306b7779ff
Merge branch 'develop' into 11p1 2021-06-11 19:55:37 +02:00
Laurent Destailleur
dd1f49b4b0
Merge pull request #17794 from atm-quentin/FIX_jointure_cabyprod 
Fix jointure cabyprod
 2021-06-11 19:12:29 +02:00
Laurent Destailleur
756786f717 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/fourn/facture/card.php
	htdocs/holiday/list.php
	htdocs/paybox/admin/paybox.php
	htdocs/paypal/admin/paypal.php
	htdocs/product/price.php
	htdocs/projet/activity/perday.php
	htdocs/projet/activity/permonth.php
	htdocs/projet/activity/perweek.php
	htdocs/stripe/admin/stripe.php
 2021-06-11 19:05:05 +02:00
Laurent Destailleur
eefc6ddf83 Fix phpcs 2021-06-11 18:44:01 +02:00
Laurent Destailleur
4cde4f6162
Merge pull request #17875 from OPEN-DSI/new-doactions-hook-on-bank-card 
NEW do actions hook on bank card
 2021-06-11 18:18:06 +02:00
Frédéric FRANCE
86eea2c4fc
Update list.php 2021-06-10 20:55:00 +02:00
Frédéric FRANCE
3f40a65f26
fix warnings 2021-06-10 20:53:29 +02:00
Laurent Destailleur
1bf63c7862 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/lib/functions.lib.php
 2021-06-10 16:53:09 +02:00
Laurent Destailleur
1950e50c89 Fix test 2021-06-10 16:31:28 +02:00
Laurent Destailleur
c8c9fb7700 FIX #17847 2021-06-10 16:29:30 +02:00
lvessiller
ed53301cec NEW do actions hook on bank card 2021-06-10 16:18:20 +02:00
Alexandre SPANGARO
08186fdff1 Fix warning - search_societe is already present 2021-06-10 06:28:09 +02:00
Alexandre SPANGARO
b216c81c60 FIX Customer invoice list - Pagination lost search_date_xxx information 2021-06-10 06:22:03 +02:00
Laurent Destailleur
53af424a3d Fix total tva 2021-06-10 02:12:29 +02:00
Laurent Destailleur
5f925d9e3b Fix total -> total_ht 2021-06-10 02:10:58 +02:00
Laurent Destailleur
ae6d2ba9b5 Fix missing user creation/modif of template invoice 2021-06-10 01:56:20 +02:00
Laurent Destailleur
4c89a1146c Fix popup 2021-06-10 01:13:50 +02:00
Laurent Destailleur
9afe8e54a7 Fix 2021-06-10 00:41:15 +02:00
Laurent Destailleur
7b31ef0ff3 Fix warnings 2021-06-10 00:00:49 +02:00
Laurent Destailleur
16f1210e8a Fix phpcs 2021-06-09 17:51:22 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
cfa268e0d3 Fix we must add total vat on cash fence receipts (Ticket Z) 2021-06-09 04:13:57 +02:00
Laurent Destailleur
f17e7a6979 Add more info 2021-06-09 03:54:19 +02:00
Laurent Destailleur
27f803cab0 Fix receipt of cash fence must contains more legal information 2021-06-09 03:35:22 +02:00
Laurent Destailleur
fa4786a3f6 Fix permission 2021-06-08 16:19:21 +02:00
Laurent Destailleur
1aeb91eb9a FIX entry menus that has been lost in v13 
Look and feel v14
 2021-06-08 13:44:11 +02:00
Frédéric FRANCE
0ea0966b09
Update card.php 2021-06-08 12:01:05 +02:00
Frédéric FRANCE
b1c3a7cf48
avoid fatal error 2021-06-08 10:38:34 +02:00
Gauthier PC portable 024
e64c27e1c3 FIX : need to add payment sum to getlibstatus function in object linked block 2021-06-08 10:27:33 +02:00
Quentin VIAL-GOUTEYRON
2a4f6882c5 Merge branch 'FIX_jointure_cabyprod' of github.com:atm-quentin/dolibarr into FIX_jointure_cabyprod 2021-06-07 10:11:19 +02:00
Quentin VIAL-GOUTEYRON
af913cd29f remove and 2021-06-07 10:10:42 +02:00
stickler-ci
98aa374185 Fixing style errors. 2021-06-07 08:10:05 +00:00
Quentin VIAL-GOUTEYRON
80af5e2216 keep where but remove join 2021-06-07 10:05:24 +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
6922359114 Merge remote-tracking branch 'upstream/develop' into 14b10 2021-06-05 07:22:38 +02:00
Laurent Destailleur
39adaec7eb Fix var not found 2021-06-05 01:29:24 +02:00
Laurent Destailleur
2182e7fd54 Look and feel v14 2021-06-04 14:36:52 +02:00
Laurent Destailleur
27018bd4b4 Fix group by 2021-06-04 14:25:32 +02:00
Laurent Destailleur
bcd028c040
Merge pull request #17739 from fbosman/patch-6 
Update card.php
 2021-06-04 12:57:51 +02:00
Laurent Destailleur
8b5922a0df
Update card.php 2021-06-04 12:57:43 +02:00
Laurent Destailleur
43be7cf996
Update card.php 2021-06-04 12:56:40 +02:00
Laurent Destailleur
292d5f6a15
Update card.php 2021-06-04 12:55:03 +02:00
Laurent Destailleur
b674835d89
Merge pull request #17813 from frederic34/patch-25 
fix warning
 2021-06-04 08:39:20 +02:00
Frédéric FRANCE
0b28587e65
fix warnings 2021-06-03 15:28:47 +02:00
Frédéric FRANCE
e83e399cb6
fix warning 2021-06-03 15:19:54 +02:00
Quentin VIAL-GOUTEYRON
b8b30a9af6 wrong where cabyprodserv 2021-06-02 10:53:04 +02:00
Quentin VIAL-GOUTEYRON
89f6b66c2a wrong join, request too long 2021-06-02 10:32:30 +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
stickler-ci
dfb2e54750 Fixing style errors. 2021-05-27 14:25:42 +00:00
Frans Bosman
fd2d10d443
Update card.php 2021-05-27 16:23:33 +02:00
stickler-ci
c31530e7ed Fixing style errors. 2021-05-27 10:24:18 +00:00
Frans Bosman
61753791b4
Update card.php 
Add Batchinfo on invoice detail lines if hidden feature INCUDE_BATCHINFO_ON_INVOICE is set
 2021-05-27 12:20:42 +02:00
Laurent Destailleur
4b47611e23 Debug v14 2021-05-25 21:21:09 +02:00
Laurent Destailleur
cfd035e1de css 2021-05-20 21:25:36 +02:00
Laurent Destailleur
91f85abb7e Fix only comment to understand code are allowed 2021-05-20 14:55:37 +02:00
Florian HENRY
d70bbe29b5 fix 2021-05-20 14:03:18 +02:00
Florian HENRY
7a9102ac60 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_massaction_paid_custom_invoice 2021-05-20 14:02:05 +02:00
Florian HENRY
4d7b09ff2a done 2021-05-20 14:00:43 +02:00
Laurent Destailleur
afd9c09c8f
Merge pull request #17685 from FHenry/dev_fix_search_filter_company_Var 
fix: change societe by company varaible name in all file
 2021-05-20 13:54:01 +02:00
Florian HENRY
5e6d6ccf67 same bug on invoie list 2021-05-20 13:45:52 +02:00
Florian HENRY
7c6ac86d32 ongoing 2021-05-20 13:41:23 +02:00
Florian HENRY
62bc6e9e1f on going 2021-05-20 13:15:32 +02:00
Florian HENRY
7874be6e37 bad comment remove 2021-05-20 12:48:18 +02:00
Florian HENRY
d93cf0beb7 fix: change societe by company varaible name in all file 2021-05-20 12:36:26 +02:00
Laurent Destailleur
dbd7292cd6 Replace doubleval into floatval 2021-05-20 09:22:55 +02:00
Sylvain Legrand
a3d1b49c65 Error in list when using alias name of thirdparty 2021-05-19 19:08:58 +02:00
Laurent Destailleur
217ee260c2 css 2021-05-19 15:11:47 +02:00
Laurent Destailleur
cf0da5cee7 css 2021-05-19 15:00:44 +02:00
Anthony Berton
c02e3eed6b checked 2021-05-18 18:45:07 +02:00
Laurent Destailleur
8e39eff180 Look and feel v14 2021-05-18 18:18:00 +02:00
Laurent Destailleur
74f35177ff Fix group by 2021-05-18 13:20:14 +02:00
Laurent Destailleur
2ef713bd5f
Merge branch 'develop' into look_feel_user_author_list 2021-05-18 12:27:30 +02:00
Laurent Destailleur
a34401aacb
Merge pull request #17646 from aspangaro/14b10 
FIX Social contrib. - Missing language file
 2021-05-18 12:16:14 +02:00
Laurent Destailleur
7b9161ec63
Merge pull request #17644 from bb2a/thirdparty_infos_list 
Add popup thirdparty info in list
 2021-05-18 12:15:51 +02:00
Alexandre SPANGARO
9b0988e7be FIX Social contrib. - Missing language file 2021-05-18 08:40:28 +02:00
Laurent Destailleur
b6dbe45242 Fix permissions on page to move position of file 2021-05-18 01:58:54 +02:00
Anthony Berton
70a062e2c1 change position 2021-05-17 23:59:42 +02:00
Anthony Berton
6fe9fe330d delete fetch 2021-05-17 23:54:31 +02:00
Anthony Berton
58db723502 thirdparty info popup list 2021-05-17 23:27:33 +02:00
Anthony Berton
31cd71d8a3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into look_feel_user_author_list 2021-05-17 18:34:41 +02:00
Anthony Berton
68130ec637 Merge branches 'develop' and 'develop' of https://github.com/Dolibarr/dolibarr into salesrepresentativeinorderandinvoicelist 2021-05-17 18:34:20 +02:00
Anthony Berton
09ab930806 sale_representative_order_invoice_list 2021-05-17 18:31:19 +02:00
Anthony Berton
0b7f474dd3 look_feel user author in list 2021-05-17 18:04:21 +02:00
Laurent Destailleur
608e4e8891
Merge pull request #17601 from ptibogxiv/patch-426 
NEW report contact/adresses on credit note from invoice
 2021-05-17 09:12:12 +02:00
Laurent Destailleur
4768729c09 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/core/class/rssparser.class.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
	htdocs/expedition/list.php
 2021-05-17 07:57:32 +02:00
Laurent Destailleur
6bf66adff0 Fix remove some $_REQUEST 2021-05-17 07:27:02 +02:00
stickler-ci
50d4d28c14 Fixing style errors. 2021-05-14 11:54:50 +00:00
Ferran Marcet
ce6df0ee4a FIX: Filter of the dates in the lists is lost 2021-05-14 13:50:12 +02:00
stickler-ci
05ea8761a1 Fixing style errors. 2021-05-13 08:28:14 +00:00
ptibogxiv
b9336570ff
NEW report contact/adresses on credit note from invoice 
keep same contact/adresses from source invoice (ir: usefull for correct notifications)
 2021-05-13 10:26:09 +02:00
Laurent Destailleur
ba6e675273 css 2021-05-12 22:21:20 +02:00
Laurent Destailleur
b5a43c8d1d FIX #17502 2021-05-11 21:31:43 +02:00
Laurent Destailleur
52d4e7e2a8
Merge pull request #17535 from frederic34/uniformizecode 
uniformize supplier cards
 2021-05-11 19:25:26 +02:00
Laurent Destailleur
bccd1b9a41
Update prelevement.php 2021-05-11 19:21:08 +02:00
Frédéric FRANCE
23858f0ab1
fix php8 warning 2021-05-11 18:25:20 +02:00
Frédéric FRANCE
680092cb8a
Merge remote-tracking branch 'upstream/develop' into uniformizecode 2021-05-11 18:09:05 +02:00
Laurent Destailleur
73972bcbd0 More complete log 2021-05-11 10:30:46 +02:00
Frédéric FRANCE
1d38dc11c6
uniformize supplier cards 2021-05-07 21:28:35 +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
Laurent Destailleur
f2e61ff807 Fix substitution into topic 2021-05-04 18:04:09 +02:00
Florian HENRY
c4e0d8da42 FIX: merge thirparty also work for bank URL entry 2021-05-04 17:28:20 +02:00
Laurent Destailleur
526235d020 Fix substitution of mix html/nohtml 
Fix send email reminder for past due date of invoices
More PHPUnit test
 2021-05-04 13:33:18 +02:00
Laurent Destailleur
c82317c8af Fix missing include 2021-05-04 11:06:24 +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
Laurent Destailleur
17ea41660f
Merge pull request #17469 from indelog/fix_order_payreport 
Fix show table of pdf payments repports in file order
 2021-05-03 19:19:00 +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
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
Laurent Destailleur
1c95e2b7c7 FIX #17453 2021-05-03 14:58:29 +02:00
Laurent Destailleur
b22f2dd2c8
Merge pull request #17415 from Hystepik/develo#2 
Close #17271 : Replacement of 2 graphes in /compta/index.php
 2021-05-03 13:56:44 +02:00
Laurent Destailleur
d1f11d2e65
Merge pull request #17429 from fr69400/develop 
FIX formAddObjectLine cant be overloaded by hook
 2021-05-03 13:16:45 +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
e99355a0c2 Clean html 2021-04-30 15:22:17 +02:00
Laurent Destailleur
5a1f2db024 Clean sql 2021-04-30 10:57:21 +02:00
Laurent Destailleur
8e1ba67928 css 2021-04-29 18:04:10 +02:00
Laurent Destailleur
66103303eb Fix html tag 2021-04-29 18:02:24 +02:00
fr69400
96baa1ef49 wrong variable name 2021-04-29 17:36:45 +02:00
fr69400
d9e25c61bb formAddObjectLine cant be overloaded by hook 2021-04-29 15:32:15 +02:00
Laurent Destailleur
655056ed31 Debug v14 2021-04-29 12:10:55 +02:00
lmarcouiller
799d1de830 Update incoice.lib.php and index.php match eldy's requests 2021-04-29 09:31:49 +02:00
Laurent Destailleur
75a8dc28ea
Merge pull request #17261 from aspangaro/14a39 
Maxi debug of societe/product per entity
 2021-04-28 17:06:45 +02:00
Laurent Destailleur
c946e1ad8a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-28 15:25:19 +02:00
Laurent Destailleur
4926ac1e24 Fix make protected method not visible 2021-04-28 15:25:06 +02:00
stickler-ci
762378c044 Fixing style errors. 2021-04-28 11:12:01 +00:00
Gauthier PC portable 024
c25b044da5 FIX : several fixes on salary and vat 2021-04-28 11:56:07 +02:00
lmarcouiller
be22d43c60 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develo#2 2021-04-28 09:24:18 +02:00
Laurent Destailleur
b1d8ca0701 Fix phpcs 2021-04-27 17:45:13 +02:00
lmarcouiller
97633e34f2 Fix : Bug facture.class.php 2021-04-27 16:47:27 +02:00
lmarcouiller
52bf0f0359 Close #17271 : Replament of 2 graph in compta/index.php 2021-04-27 16:02:46 +02:00
Laurent Destailleur
4b204301a9 Enhance logs 2021-04-27 03:25:49 +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
e82965090f
Merge pull request #17395 from Robin-Yann/13-fix-combo-prospect 
13 fix combo prospect
 2021-04-27 01:18:57 +02:00
Laurent Destailleur
efbed70286
Update card.php 2021-04-27 01:17:26 +02:00
Laurent Destailleur
f54d14bfd6 Add method checkValForAPI to clean data from API input 2021-04-27 01:05:14 +02:00
Laurent Destailleur
fde4beb3b6
Merge pull request #17396 from atm-gauthier/fix_disable_delete_if_payments 
FIX : We must not be able to delete sociale charge, vat or salary if there are payments
 2021-04-26 21:08:29 +02:00
Laurent Destailleur
d138e7410b Clean code 2021-04-26 19:12:23 +02:00
stickler-ci
6387b929cc Fixing style errors. 2021-04-26 12:30:44 +00:00
Robin-Yann
9fc0416664
Update card.php 2021-04-26 14:28:43 +02:00
Robin-Yann
c1f3626cd7
Update card.php 2021-04-26 14:11:24 +02:00
Alexandre SPANGARO
d95be3e08b Merge remote-tracking branch 'upstream/develop' into 14a39 2021-04-26 13:53:16 +02:00
Gauthier PC portable 024
ae1586fcc6 FIX : We must not be able to delete sociale charge, vat or salary if there are payments 2021-04-26 10:48:50 +02:00
Laurent Destailleur
c9d6bc70e8 Clean code 2021-04-26 10:22:28 +02:00
Robin-Yann
676067eafc
Update card.php 2021-04-26 10:21:25 +02:00
stickler-ci
ebd3b00016 Fixing style errors. 2021-04-26 07:24:00 +00:00
Robin-Yann
836b811449
Merge branch 'develop' into 13-fix-combo-prospect 2021-04-26 09:21:32 +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
6c2d9d3b3c Fix permission to reopen invoice. 2021-04-25 13:17:47 +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
48c26fd614 Fix add option INVOICE_DISALLOW_REOPEN to lock problematic feature 2021-04-24 18:43:24 +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
Alexandre SPANGARO
d27030df3f Merge remote-tracking branch 'upstream/develop' into 14a39 2021-04-20 04:43:14 +02:00
Alexandre SPANGARO
d66540bf00 Revert "Split mod fournisseur" 
This reverts commit 78dbf4f7ff.
 2021-04-20 04:42:51 +02:00
Laurent Destailleur
4797c137e8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-19 21:12:19 +02:00
Laurent Destailleur
294cf6cc31
Merge pull request #17312 from prietojc/patch-16 
Update bonprelevement.class.php
 2021-04-19 21:12:06 +02:00
Laurent Destailleur
d6df32eee9 Add invoice id into EndToEnd to guarantee unicity of value. 2021-04-19 21:10:53 +02:00
Laurent Destailleur
7988aaf88f
Update bonprelevement.class.php 2021-04-19 21:02:29 +02:00
Laurent Destailleur
61df76dd9a Fix pb in date format %a %b when using a negative timezone 
Enhance date management and unit tests.
 2021-04-19 12:48:08 +02:00
Laurent Destailleur
23b11491d2 Can filter also on payment mode 2021-04-19 11:11:01 +02:00
JC Prieto
4329b6b99b
Update bonprelevement.class.php 
Change facture reference by supplier reference
 2021-04-19 11:04:50 +02:00
Laurent Destailleur
83b5a325df Load of template before the loop. 2021-04-19 10:47:12 +02:00
Laurent Destailleur
a74b237a7b Add a schedule dtask to send reminder by email on date due. 2021-04-19 10:35:19 +02:00
Alexandre SPANGARO
78dbf4f7ff Split mod fournisseur 2021-04-17 07:49:19 +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
aec2212b44
Merge pull request #17293 from cmfpmatik/cmfpmatik-patch-16042021 
Update facture list.php
 2021-04-16 20:39:23 +02:00
Oarces DEV
593e23220d
Update list.php 
Add filter for "Bill Short Status Draft" and "Bill Short Status Draft", that they has can be viewed together.
Secretaries appreciate having this overall visibility.
 2021-04-16 14:34:23 +02:00
Laurent Destailleur
db5dcd3e52 NEW When a doc file is shared, link is visible from main page of doc. 2021-04-15 17:56:55 +02:00
Laurent Destailleur
f1d55d38ba Show link to shared file if it exists. 2021-04-15 17:09:15 +02:00
Laurent Destailleur
754b0e9853 Debug v14 2021-04-15 15:30:02 +02:00
Laurent Destailleur
37fa8f4c19 Fix method not found 2021-04-15 15:07:06 +02:00
Laurent Destailleur
bd1aa38c64 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/list.php
 2021-04-15 12:04:08 +02:00
Laurent Destailleur
5e2bec9cad Look and feel v14 2021-04-15 02:09:29 +02:00
Laurent Destailleur
e7d64d073a Look and feel v14 2021-04-14 23:14:38 +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
Alexandre SPANGARO
2f31720896 Maxi debug of societe/product per entity 2021-04-14 04:45:17 +02:00
Laurent Destailleur
4dfc90f8cb
Merge pull request #17256 from OGPayet/fix/ComptaFactureDateClosingOptionPosition 
fix date closing option position
 2021-04-13 23:03:02 +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
Pierre Payet
75ed5e45f2 fix date closing option position 2021-04-13 17:21:51 +02:00
Alexandre SPANGARO
44133166de Merge remote-tracking branch 'upstream/develop' into 14a36 2021-04-12 21:35:03 +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
Alexandre SPANGARO
80995c34b5 FIX Write right on document 2021-04-12 07:13:05 +02:00
Alexandre SPANGARO
80c6458faa Work on split module fournisseur 2021-04-11 22:25:45 +02:00
Laurent Destailleur
0ab31a8680 Look and feel v14 2021-04-11 13:30:30 +02:00
Laurent Destailleur
2d771704d0 Better suggestion for data after clone of social contribution 2021-04-09 00:36:08 +02:00
Laurent Destailleur
667481acd5 Fix #yogosha5832 - Missin test on permission for /index routes on APIs 2021-04-08 19:05:28 +02:00
Laurent Destailleur
fcc6431896
Merge pull request #17136 from aspangaro/14a35 
NEW: Add deposit on supplier invoice (& somes ajustments)
 2021-04-07 02:51:32 +02:00
Laurent Destailleur
2e862f815a Fix field total_ht 2021-04-07 00:44:01 +02:00
Laurent Destailleur
e23ddb383e css 2021-04-06 23:38:52 +02:00
Laurent Destailleur
7c27ab6121 Fix css 2021-04-06 23:35:30 +02:00
Laurent Destailleur
dbc1780817
Merge pull request #16376 from aspangaro/14a22 
Code enhanced - Standardize field name #14697
 2021-04-06 20:01:38 +02:00
Laurent Destailleur
e993d4e244
Merge pull request #17127 from dolibit-ut/patch-230 
Create index.html
 2021-04-06 19:32:24 +02:00
Laurent Destailleur
7c4c2deab3
Merge pull request #17128 from dolibit-ut/patch-231 
Create index.html
 2021-04-06 19:29:01 +02:00
Laurent Destailleur
a774a02452
Merge pull request #17129 from dolibit-ut/patch-232 
Create index.html
 2021-04-06 19:28:27 +02:00
Laurent Destailleur
60f6908d83
Merge pull request #17130 from dolibit-ut/patch-233 
Create index.html
 2021-04-06 19:28:12 +02:00
stickler-ci
1419b75f22 Fixing style errors. 2021-04-06 08:32:27 +00:00
Alexandre SPANGARO
36e4f5aa22 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-04-06 10:29:44 +02:00
Alexandre SPANGARO
82b652df8a NEW: Add deposit on supplier invoice (& somes ajustments) 2021-04-06 09:15:34 +02:00
UT from dolibit
904dca335a
Create index.html 2021-04-05 20:24:06 +02:00
UT from dolibit
74cbf34d61
Create index.html 2021-04-05 20:22:41 +02:00
UT from dolibit
c35621a2e7
Create index.html 2021-04-05 20:20:10 +02:00
UT from dolibit
888dfdba4a
Create index.html 2021-04-05 20:19:23 +02:00
UT from dolibit
cd556d3dfc
Create index.html 2021-04-05 20:17:45 +02:00
Laurent Destailleur
a3fb8d3e14 Factorize code 2021-04-05 19:34:56 +02:00
Laurent Destailleur
01eec2b919 FIx #yogosha5774 2021-04-05 15:11:28 +02:00
Alexandre SPANGARO
f64d0377c5 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-04-04 06:03:41 +02:00
Laurent Destailleur
231f441876 Look and feel v14 2021-04-03 02:11:16 +02:00
Laurent Destailleur
3fb69f8ec0 Fix report 2021-03-31 21:28:07 +02:00
Laurent Destailleur
0fd36d96f3 Fix report 2021-03-31 21:25:01 +02:00
Laurent Destailleur
2af8b7078c Fix turnover calculation was wrong. We must include only 2021-03-31 19:50:43 +02:00
Laurent Destailleur
e01b6b6789 FIX filter on date on invoice list 2021-03-31 18:39:59 +02:00
Laurent Destailleur
2e3af575be Look and feel v14 2021-03-31 18:12:26 +02:00
Laurent Destailleur
27bc05a039 Debug report accountancy 2021-03-31 17:59:42 +02:00
Laurent Destailleur
32f9a04776 FIX Must use the server TZ for accounting report 2021-03-31 17:37:45 +02:00
Laurent Destailleur
cf57826a5e Trans 2021-03-31 16:57:58 +02:00
Laurent Destailleur
f2f0e4a6fd css 2021-03-31 16:47:36 +02:00
Laurent Destailleur
d5cc006250 Look and feel v14 2021-03-31 16:45:53 +02:00
Laurent Destailleur
8be7ffb519
Merge pull request #17043 from dolibit-ut/patch-198 
Update card.php
 2021-03-31 13:42:09 +02:00
Laurent Destailleur
7641f7258b
Merge pull request #17044 from aspangaro/14a27 
FIX: Add a sub table to manage accountancy on product/company
 2021-03-31 13:39:17 +02:00
Gauthier PC portable 024
c27c52331a FIX : default value 2021-03-31 10:34:21 +02:00
Gauthier PC portable 024
19265179ca FIX : last uniformizations 2021-03-31 10:11:51 +02:00
Alexandre SPANGARO
38d47c184e FIX: Add a sub table to manage accountancy on product/company 2021-03-30 22:12:57 +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
47e9f7c458
Merge pull request #17032 from atm-gauthier/fix_develop 
FIX : several fix after lists uniformization
 2021-03-30 19:20:15 +02:00
Laurent Destailleur
fb7cfe6c50 Fix sql error 2021-03-30 19:15:20 +02:00
Laurent Destailleur
3744bc6a7a FIX #yogosha5746 - next step (work in progress) 2021-03-30 18:17:13 +02:00
Laurent Destailleur
fae3cca494 FIX #yogosha5746 - next step (work in progress) 2021-03-30 17:45:15 +02:00
Gauthier PC portable 024
3259d70e72 FIX : several fix after lists uniformization 2021-03-30 17:23:05 +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
fb84608586 Clean sql 2021-03-30 03:37:54 +02:00
Laurent Destailleur
32bec56529 Using " for html is better 2021-03-29 23:14:42 +02:00
Laurent Destailleur
b702d2b534 Fix CSRF for more GET 2021-03-29 22:58:44 +02:00
Laurent Destailleur
0740633ec8
Update facture-rec.class.php 2021-03-29 20:42:59 +02:00
Laurent Destailleur
a4987c6e4f
Merge branch 'develop' into 14a22 2021-03-29 20:35:35 +02:00
Laurent Destailleur
5bbfe7ed19
Merge pull request #16930 from aspangaro/14a27 
NEW: Add a sub table to manage accountancy on product/company
 2021-03-29 20:11:02 +02:00
Laurent Destailleur
93627012cd
Merge pull request #16995 from atm-gauthier/fix_list_uniformization 
FIX : display debug if !$conf->banque->enabled
 2021-03-29 18:02:58 +02:00
Laurent Destailleur
f4b0723f30
Update list.php 2021-03-29 17:41:19 +02:00
Laurent Destailleur
b732a82c3d
Update list.php 2021-03-29 17:40:36 +02:00
stickler-ci
e1e3bcbf28 Fixing style errors. 2021-03-29 15:26:24 +00:00
Gauthier PC portable 024
139a1ba70d FIX : if $conf->banque->enabled 2021-03-29 17:22:19 +02:00
Laurent Destailleur
36dfcc0646
Merge pull request #16976 from atm-florianm/NEW_14.0_hooks_on_CA_by_product_report 
WIP: NEW 14.0 - SQL-altering hooks in the turnover by product report
 2021-03-29 17:18:17 +02:00
Gauthier PC portable 024
28620fe8d8 Merge branch 'fix_list_uniformization' of github.com:atm-gauthier/dolibarr into fix_list_uniformization 2021-03-29 16:27:59 +02:00
Gauthier PC portable 024
53ae1f9d5b Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_list_uniformization 2021-03-29 16:27:44 +02:00
stickler-ci
caa56729b3 Fixing style errors. 2021-03-29 14:25:36 +00:00
Gauthier PC portable 024
c8e40727c2 FIX : uniformization 2021-03-29 16:22:22 +02:00
Laurent Destailleur
5c2ee240b2 FIX #yogosha5752 2021-03-29 15:59:37 +02:00
Laurent Destailleur
3a4bb69c05 FIX #yogosha5749 2021-03-29 15:32:09 +02:00
Laurent Destailleur
ce1f8289a4 FIX #yogosha5746 2021-03-29 15:07:23 +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
a5d84200dc Clean code for invoice list 2021-03-28 19:22:04 +02:00
Alexandre SPANGARO
2a1cc04b66 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-03-28 06:16:33 +02:00
Alexandre SPANGARO
22f809c517 Move to _PERENTITY 2021-03-27 05:23:20 +01:00
Alexandre SPANGARO
6422b0a6c0 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-27 05:02:55 +01:00
stickler-ci
895c6efc14 Fixing style errors. 2021-03-26 15:26:05 +00:00
Gauthier PC portable 024
f553ad3fc8 FIX : orders columns 2021-03-26 16:14:00 +01:00
Gauthier PC portable 024
3fe1a05f26 FIX : employee must be after label as well as sociale charges list + social charges payments list must use INNER JOIN instead of LEFT JOIN 2021-03-26 10:23:44 +01:00
Gauthier PC portable 024
f5bf26e5d0 Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_list_uniformization 2021-03-26 09:59:27 +01:00
Laurent Destailleur
d9108362ba War against $_POST 2021-03-25 16:59:47 +01:00
Florian Mortgat
d17256bde5 NEW 14.0 - hook printFieldListTitle for cabyprodserv.php 2021-03-25 16:14:44 +01:00
Florian Mortgat
3c8e15a87c NEW 14.0 - SQL-altering hooks in the turnover by product report 2021-03-25 15:12:25 +01:00
Laurent Destailleur
663138328e
Merge pull request #16962 from atm-gauthier/fix_autofill_amount_payment_salary 
FIX : autofill payment salary amount + several fixes
 2021-03-25 13:03:38 +01:00
Gauthier PC portable 024
014ae0a8da FIX : lists uniformization 2021-03-25 11:59:22 +01:00
Gauthier PC portable 024
368bad1943 FIX : autofill payment salary amount + several fixes 2021-03-25 10:39:12 +01:00
Gauthier PC portable 024
155978f2d2 FIX : Must be a left join here to be able to see vat declarations even if no payments are done 2021-03-25 09:29:53 +01:00
Gauthier PC portable 024
a20bb3d66e Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_special_expense_index 2021-03-25 09:15:42 +01:00
Laurent Destailleur
ce422f514f Fix title of reports 2021-03-25 00:47:05 +01:00
Laurent Destailleur
eeba9e4d50 Code comment 2021-03-24 21:58:06 +01:00
Laurent Destailleur
21a9779fe2 FIX inconsistency in margin recording with option "Force to sale price" 2021-03-24 21:49:45 +01:00
Laurent Destailleur
047471c220 Remove $_POST war 2021-03-24 19:06:44 +01:00
Gauthier PC portable 024
8ffb40035f FIX : old query using tva object for payments list 2021-03-24 17:29:16 +01:00
Laurent Destailleur
2d5fbfc105 Fix php8 2021-03-22 23:43:28 +01:00
Laurent Destailleur
146706bafa Fix label 2021-03-22 19:11:29 +01:00
Laurent Destailleur
ca0a04fb61 Fix missing payment ref 2021-03-22 18:56:02 +01:00
Laurent Destailleur
cce4ebdb8c Clean code 2021-03-22 18:50:47 +01:00
Laurent Destailleur
f405505e0f Do not load each invoice of payment for tooltip 2021-03-22 18:34:01 +01:00
Laurent Destailleur
010b084444 Do not load each invoice of payment for tooltip 2021-03-22 18:32:36 +01:00
Laurent Destailleur
5a8d757a30 Add missing data 2021-03-22 18:23:29 +01:00
Laurent Destailleur
5d6fb0cfea Perf: Enhance performance of VAT report 2021-03-22 18:11:44 +01:00
Laurent Destailleur
897d653144 Debug default date for vat reports 2021-03-22 16:09:18 +01:00
Laurent Destailleur
4ff26bd8c5 Removed deprecated code 2021-03-22 13:39:34 +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
stickler-ci
5af4b4673c Fixing style errors. 2021-03-21 22:12:36 +00:00
Alexandre SPANGARO
0c2ada4299 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-21 23:08:01 +01:00
Laurent Destailleur
1c6585f06b Fix deprecated function 2021-03-21 22:37:24 +01:00
Laurent Destailleur
eeb1c5d884 Replace deprecated code 2021-03-20 21:46:10 +01:00
Laurent Destailleur
f95aa9c6e1
Merge pull request #16612 from atm-adrien/FIX/develop_update_pencil 
FIX : Update pencil
 2021-03-20 19:54:47 +01:00
Laurent Destailleur
e334e83a64
Merge branch 'develop' into 14a22 2021-03-20 13:42:54 +01:00
Laurent Destailleur
d8aa5f5eab Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-20 12:43:07 +01:00
Laurent Destailleur
3d3a7bfd37 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/projet/card.php
	htdocs/projet/contact.php
	htdocs/projet/element.php
	htdocs/projet/tasks.php
	htdocs/projet/tasks/comment.php
	htdocs/projet/tasks/contact.php
	htdocs/projet/tasks/document.php
	htdocs/projet/tasks/note.php
	htdocs/projet/tasks/task.php
	htdocs/projet/tasks/time.php
 2021-03-20 12:42:46 +01:00
Laurent Destailleur
7f6044c52e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/projet/card.php
	htdocs/projet/contact.php
	htdocs/projet/tasks/comment.php
	htdocs/projet/tasks/contact.php
	htdocs/projet/tasks/document.php
	htdocs/projet/tasks/task.php
 2021-03-20 12:18:40 +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
827a952dca
Merge pull request #16839 from dolibit-ut/patch-130 
Update card.php
 2021-03-20 11:49:18 +01:00
Laurent Destailleur
3edeb8b4aa
Merge pull request #16840 from dolibit-ut/patch-131 
Update document.php
 2021-03-20 11:49:06 +01:00
Laurent Destailleur
ba6f97acbc
Merge pull request #16865 from frederic34/uniformisecomment 
uniformise comments to remove nested comments
 2021-03-20 11:24:39 +01:00
Laurent Destailleur
11a7420b59
Merge pull request #16877 from frederic34/patch-27 
fix doxygen
 2021-03-20 11:12:33 +01:00
Frédéric FRANCE
3d3715f55d
fix doxygen 2021-03-20 10:37:51 +01:00
Frédéric FRANCE
81c885dbf1
fix doxygen 2021-03-20 10:36:53 +01:00
Frédéric FRANCE
bae1770176
uniformise comments to remove nested comments 2021-03-20 10:00:24 +01:00
Frédéric FRANCE
2de2f1ce4d
fix nested comments for doxygen 2021-03-20 09:02:29 +01:00
Alexandre SPANGARO
17d3b85ec4 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-20 07:47:54 +01:00
Alexandre SPANGARO
00e21caa42 NEW: Add a sub table to manage accountancy on product/company 2021-03-20 07:42:16 +01:00
Laurent Destailleur
ae7261c0a7 FIX #yogosha5677 2021-03-19 14:12:08 +01:00
Laurent Destailleur
d83d005284 FIX #yogosha5674 2021-03-19 12:44:59 +01:00
Laurent Destailleur
ebf409f831 FIX #yogosha5668 2021-03-19 12:08:40 +01:00
UT from dolibit
46c23807e9
Update document.php 
$helpurl  ->  $help_url
 2021-03-19 09:38:33 +01:00
UT from dolibit
b4e929e57f
Update card.php 
$helpurl  ->  $help_url
 2021-03-19 09:36:49 +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
3522af926a
Merge pull request #16799 from AlexisLaurier/addInvoiceListHook 
invoice list - add new standard hooks
 2021-03-18 22:58:18 +01:00
Laurent Destailleur
43494df56c
Merge pull request #16790 from AlexisLaurier/addGetNomUrlToInvoice 
add invoice getNomUrl hook
 2021-03-18 22:57:37 +01:00
Laurent Destailleur
9ba568eb25 Fix security check 2021-03-18 20:57:50 +01:00
Laurent Destailleur
461d748f97 Fix #yogosha235 2021-03-18 20:27:36 +01:00
Alexandre SPANGARO
18d247026d NEW: Add a sub table to manage product/societe 2021-03-18 17:08:55 +01:00
Alexis LAURIER
5b72193f0d invoice list - ajust hooks 2021-03-18 17:06:49 +01:00
Alexis LAURIER
ada5d728b5 invoice list - ajust hooks 2021-03-18 17:00:57 +01:00
Alexis LAURIER
06bc999614 Add group by and having hooks on invoice list 2021-03-18 16:51:02 +01:00
Alexis LAURIER
c3f8e0e397 invoice list - add new standard hook 2021-03-18 16:21:54 +01:00
Laurent Destailleur
640f5f6051 FIx #yogosha5661 2021-03-18 14:41:48 +01:00
Laurent Destailleur
46972ec669 FIx #5660 2021-03-18 14:34:44 +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
Alexis LAURIER
b416223194 fix 2021-03-18 11:16:49 +01:00
Alexis LAURIER
c33347b461 add invoice getNomUrl hook 2021-03-18 11:10:43 +01:00
Frédéric FRANCE
75cf5e3599
fix php8 warning 2021-03-17 23:55:46 +01:00
Laurent Destailleur
73e55f1b73 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-17 18:44:47 +01:00
Laurent Destailleur
0da5c89973 Look and feel v14 2021-03-17 18:24:37 +01:00
Laurent Destailleur
1f9d4eca3d
Merge pull request #16746 from frederic34/patch-8 
fix php8 warnings
 2021-03-17 17:00:22 +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
Frédéric FRANCE
519b08b782
fix php8 warnings 2021-03-16 18:25:25 +01:00
Laurent Destailleur
e366d2c379 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/admin/tools/export_files.php
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/cron/list.php
	htdocs/filefunc.inc.php
	test/phpunit/FilesLibTest.php
 2021-03-16 14:57:04 +01:00
Laurent Destailleur
f514dec6ab Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/card.php
 2021-03-16 14:50:06 +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
Laurent Destailleur
e00e6cfd9a
Merge pull request #16721 from aspangaro/14a25 
Translation "Generated documents"
 2021-03-16 10:25:31 +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
Alexandre SPANGARO
4fd24c6855 Translation "Generated documents" 2021-03-16 04:04:18 +01:00
Alexandre SPANGARO
6e17a588bb Merge remote-tracking branch 'upstream/develop' into 14a22 2021-03-16 03:26:28 +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
Laurent Destailleur
dfda1bfa0d
Merge pull request #16686 from frederic34/patch-5 
fix php8 warning
 2021-03-15 17:16:52 +01:00
Frédéric FRANCE
99cd866eba
fix php8 warning 2021-03-15 15:12:10 +01:00
Frédéric FRANCE
691b8d5976
fix php8 warning 2021-03-15 14:05:05 +01:00
Laurent Destailleur
3964801d40 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-03-15 13:26:20 +01:00
Laurent Destailleur
85eaec48e1
Merge pull request #16307 from aspangaro/14a15 
NEW: VAT report - Optimisation & collapse by rate
 2021-03-15 11:56:06 +01:00
Laurent Destailleur
a1cfacfa9e
Merge pull request #16652 from frederic34/patch-9 
fix php8 warnings
 2021-03-15 11:09:23 +01:00
Laurent Destailleur
6de5ef286d
Merge pull request #16668 from frederic34/patch-23 
fix php8 warning
 2021-03-15 11:00:07 +01:00
Laurent Destailleur
c2c434ab7f
Update quadri_detail.php 2021-03-15 10:59:41 +01:00
Laurent Destailleur
909653c65e
Update byratecountry.php 2021-03-15 10:56:10 +01:00
Frédéric FRANCE
c15f2ea4dc
fix php8 warning 2021-03-15 00:26:50 +01:00
Laurent Destailleur
382b810ba1 Fix phpcs 2021-03-15 00:18:26 +01:00
Frédéric FRANCE
bfd954b91e
fix php8 warning 2021-03-14 23:51:49 +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
Frédéric FRANCE
f5ae12f4dc
fix php8 warnings 2021-03-14 09:41:53 +01:00
Laurent Destailleur
c75fade649
Fix regression 2021-03-10 17:07:44 +01:00
Adrien Raze
83b06734a2 FIX : Travis return 2021-03-10 15:34:43 +01:00
Laurent Destailleur
c209d9b45e
Update paiement_charge.php 2021-03-10 15:29:05 +01:00
stickler-ci
3a9c1613bf Fixing style errors. 2021-03-10 14:12:29 +00:00
Adrien Raze
0bd4b132a4 FIX : Update pencil should be shoxn only when no payment has been entered 2021-03-10 14:39:04 +01:00
atm-lena
b798535af9 FIX create sociales : keep values error form 2021-03-10 14:15:03 +01:00
Alexandre SPANGARO
b5c84bfc4f Resolve some mistakes 2021-03-09 05:02:37 +01:00
Laurent Destailleur
c3a047ee06 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/class/api_agendaevents.class.php
 2021-03-08 19:31:47 +01:00
Laurent Destailleur
2f0c4038fb Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/action/class/api_agendaevents.class.php
	htdocs/compta/sociales/card.php
	htdocs/societe/consumption.php
 2021-03-08 19:27:34 +01:00
Laurent Destailleur
7cb10eae2e
Merge pull request #16588 from atm-adrien/FIX/add_nowLink_on_socialCharges_card_creation 
FIX : Add "Now" link on social charges creation card
 2021-03-08 16:31:41 +01:00
Laurent Destailleur
20c30bade8
Update card.php 2021-03-08 16:30:32 +01:00
Adrien Raze
67c6577177 FIX : Add "Now" link on social charges card creation 2021-03-08 15:47:02 +01:00
Laurent Destailleur
7bd93aa3ad Fix price format 2021-03-08 14:31:02 +01:00
Laurent Destailleur
8184e34de4
Merge pull request #16587 from ATM-Consulting/NEW/12.0_new_payments_on_vat 
FIX : Rounding amount on VAT card updating
 2021-03-08 14:29:29 +01:00
Adrien Raze
cbb7751a15 FIX : rounding amount on card updating 2021-03-08 11:51:18 +01:00
x
e087c6ffe0 FIX : Rounding amount on card updating 2021-03-08 11:35:59 +01:00
Laurent Destailleur
ab89d85095 Fix for php8 2021-03-08 11:33:07 +01:00
Alexandre SPANGARO
2f86971f84 Merge remote-tracking branch 'upstream/develop' into 14a15 2021-03-08 09:56:57 +01:00
Laurent Destailleur
4d409e23f5 Missing declaration of properties 2021-03-08 09:16:33 +01:00
Laurent Destailleur
a1d97274fb Clean code for php8 2021-03-08 09:14:23 +01:00
Alexandre SPANGARO
339af419bc Fix strftime 2021-03-07 21:59:28 +01:00
Laurent Destailleur
1affaa8c87 fix phpunit 2021-03-07 20:26:36 +01:00
Laurent Destailleur
1ca3e433d2 Fix phpunit 2021-03-07 19:55:09 +01:00
Laurent Destailleur
0f7085154b Fix phpunit 2021-03-07 19:47:55 +01:00
Laurent Destailleur
91245e22d4 Fix phpunit phpv8 2021-03-07 19:16:09 +01:00
Laurent Destailleur
63aa2f4ec2 Fix phpunit 2021-03-06 12:50:38 +01:00
Laurent Destailleur
7959bc99d7 Fix phpcs 2021-03-06 10:39:51 +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
6eafc3b774 Clean code 2021-03-04 17:23:12 +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
31845e1dae Fix phpcs 2021-03-04 00:04:43 +01:00
Laurent Destailleur
6503c81f47 FIX #16530 2021-03-03 23:55:28 +01:00
Laurent Destailleur
30dd4ac6ec FIX #16530 2021-03-03 22:52:02 +01:00
Laurent Destailleur
71370bd558 Fix links in cheque receipt pages 2021-03-03 21:18:14 +01:00
stickler-ci
e1159f422a Fixing style errors. 2021-03-03 13:11:01 +00:00
Alexandre SPANGARO
59a2fb8ed5 Merge remote-tracking branch 'upstream/develop' into 14a15 2021-03-03 14:08:40 +01:00
Laurent Destailleur
f11a85a3e3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/compta/facture/card.php
	htdocs/contrat/card.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/supplier_proposal/card.php
 2021-03-03 11:37:34 +01:00
Laurent Destailleur
7eb3e324c7 FIX #16503 2021-03-02 23:09:55 +01:00
Laurent Destailleur
42329b10c9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	build/generate_filelist_xml.php
	htdocs/comm/propal/card.php
	htdocs/commande/card.php
	htdocs/compta/facture/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/modulebuilder.lib.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/supplier_proposal/card.php
	htdocs/ticket/list.php
 2021-03-02 15:27:20 +01:00
Laurent Destailleur
acb7b30eb0
Merge pull request #16507 from frederic34/add_rule 
Add rule
 2021-03-02 12:52:03 +01:00
stickler-ci
35cb48d649 Fixing style errors. 2021-03-02 11:37:46 +00:00
Laurent Destailleur
1d642f49f7
Update facture.class.php 2021-03-02 12:37:24 +01:00
Florian HENRY
d063533efb Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0 2021-03-02 09:46:05 +01:00
Florian HENRY
d7500b1609 fix php warning 2021-03-02 09:45:49 +01:00
Laurent Destailleur
0670a00b83 Fix phpcs 2021-03-02 02:06:09 +01:00
Laurent Destailleur
cffea1889f FIX #16325 2021-03-02 01:17:28 +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
Alexandre SPANGARO
94a861c1c8 Code enhanced - Standardize field name 2021-03-01 04:07:31 +01:00
Alexandre SPANGARO
706aad3b68 Merge remote-tracking branch 'upstream/develop' into 14a15 2021-02-28 21:33:59 +01:00
Alexandre SPANGARO
7a3dfda8ee Merge remote-tracking branch 'upstream/develop' into 14a22 2021-02-28 21:30:25 +01:00
Laurent Destailleur
886cbc61c8 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/core/boxes/box_factures_fourn.php
	htdocs/core/boxes/box_factures_fourn_imp.php
	htdocs/core/boxes/box_ficheinter.php
	htdocs/core/boxes/box_members.php
	htdocs/core/boxes/box_propales.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/class/fournisseur.facture.class.php
 2021-02-28 13:37:45 +01:00
Laurent Destailleur
2ce76133f4 FIX #16487 2021-02-28 12:59:58 +01:00
Laurent Destailleur
0832c25b5b Look and feel v14 2021-02-28 11:48:35 +01:00
Alexandre SPANGARO
ca7958f273 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-02-28 07:32:23 +01:00
stickler-ci
86c83ff72c Fixing style errors. 2021-02-28 06:14:40 +00:00
Alexandre SPANGARO
ad95caac7e
Merge branch 'develop' into 14a15 2021-02-28 07:12:24 +01:00
Alexandre SPANGARO
6e1d67084d Merge remote-tracking branch 'upstream/develop' into 14a15 2021-02-28 07:09:30 +01:00
Laurent Destailleur
9cf4222d3a Look and feel v14 2021-02-27 17:15:40 +01:00
daraelmin
739cd0466d
Fix Dolibarr#16418 missing title in "iNew cCash Fence" 2021-02-26 17:24:39 +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
e598b49545 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-26 15:33:36 +01:00
Laurent Destailleur
93f0754be9 Fix removed a bugged section (not used, was in develop mode only) 2021-02-26 14:33:27 +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
Laurent Destailleur
ccffa7e2a0
Merge pull request #16412 from frederic34/compta_codesyntax 
code syntax compta directory
 2021-02-26 10:21:22 +01:00
Alexandre SPANGARO
e177ac566c Merge remote-tracking branch 'upstream/develop' into 14a15 2021-02-25 05:02:03 +01:00
Laurent Destailleur
d4a78bf7c6 Removed useless field 2021-02-24 10:24:54 +01:00
Frédéric FRANCE
61600a9e65
code syntax compta directory 2021-02-23 21:09:01 +01:00
Laurent Destailleur
2642e1d1b3 Code syntax 2021-02-23 15:35:16 +01:00
Gauthier PC portable 024
c0160a5f3b Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-23 15:20:15 +01:00
Laurent Destailleur
888c072af0 NEW Can set a percentage when creating an invoice from another object 2021-02-23 14:48:54 +01:00
Laurent Destailleur
8c1902be1b Missing space 2021-02-22 18:40:15 +01:00
Gauthier PC portable 024
10008360e2 Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into NEW/add_real_payments_on_salaries 2021-02-22 09:29:47 +01:00
Gauthier PC portable 024
bc1d06e5cc FIX : wrong payment salary object on accounting-files.php 2021-02-22 09:19:03 +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
Alexandre SPANGARO
d04b04c10f Fix 2021-02-22 06:22:47 +01:00
Alexandre SPANGARO
70dddd9bdf Index & module 2021-02-22 05:58:46 +01:00
Laurent Destailleur
e3419df36e
Merge branch 'develop' into 14a20 2021-02-21 20:28:06 +01:00
Laurent Destailleur
1bb27f8f18 Responsive 2021-02-21 13:12:16 +01:00
Alexandre SPANGARO
3dcfe40e71 Code enhanced - Standardize field name #14697 2021-02-20 08:00:27 +01:00
Laurent Destailleur
71f537e4c1 Responsive 2021-02-19 22:12:03 +01:00
Laurent Destailleur
712c2f20df Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-02-19 22:06:48 +01:00
Laurent Destailleur
b167a4a0c7 FIX date selector when using reduced year (like on smartphone) 2021-02-19 22:00:44 +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
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
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
dc3377f0f0
Merge pull request #16348 from ptibogxiv/patch-416 
Fix multientity in cash fence report
 2021-02-19 13:51:44 +01:00
Laurent Destailleur
556651a3ae
Update report.php 2021-02-19 13:51:15 +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
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
Iván Mestre
57e9277376 Fixed Bank Account filter resets on payment various 
Changed GET search bank account GET parameter from search_amount to search_account
 2021-02-18 16:23:18 -03:00
ptibogxiv
cafc6a3da2
Fix multientity in cash fence report 
it make no sense to merge cash fence in différent entity with same terminal number.
 2021-02-18 20:04:09 +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
Laurent Destailleur
bfe71e8509 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-17 14:28:19 +01:00
Laurent Destailleur
96a213ced7 Fix escaping html 2021-02-17 11:54:34 +01:00
atm-lena
9f9b7554ed FIX error commit : only type user 2021-02-17 11:00:14 +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
4fbf0628a6
Merge pull request #16318 from ATM-Consulting/NEW/14.0_new_payments_on_vat_default_checkbox_value 
New/14.0 new payments on vat default checkbox value
 2021-02-16 19:57:58 +01:00
Laurent Destailleur
6cae96900b
Merge pull request #16317 from atm-lena/develop_FIX_BankEntries_SearchType_Salary 
Fix bank entries search type salary
 2021-02-16 19:45:25 +01:00
Laurent Destailleur
c8824ccea0 Look and feel v14 2021-02-16 17:05:38 +01:00
Florian Mortgat
186dcab1b7 Merge branch 'NEW/12.0_new_payments_on_vat' of github.com:ATM-Consulting/dolibarr into NEW/14.0_new_payments_on_vat_default_checkbox_value 2021-02-16 16:28: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
Florian Mortgat
97052b035e FIX: when form not completely filled, doesn't keep the checked state of checkbox 2021-02-16 16:05:19 +01:00
Florian Mortgat
363fe1f52f NEW 12.0: option to leave the "Automatically create a total payment" checkbox empty on the tax creation page 2021-02-16 15:44:24 +01:00
Laurent Destailleur
d16276ea2c Clean code 2021-02-16 11:15:42 +01:00
Alexandre SPANGARO
ffd60d2138 Merge branch '14a15' of https://github.com/aspangaro/dolibarr into 14a15 2021-02-16 04:53:24 +01:00
Alexandre SPANGARO
8ee1ec7944 NEW: VAT report - Optimisation & collapse by rate 2021-02-16 04:53:09 +01:00
stickler-ci
15c2dd483c Fixing style errors. 2021-02-16 03:38:53 +00:00
Alexandre SPANGARO
8079105aaf NEW: VAT report - Optimisation & collapse by rate 2021-02-16 04:28:55 +01:00
Laurent Destailleur
dabf9d796a FIX Rename title of template invoice 2021-02-15 22:16:01 +01:00
Laurent Destailleur
44b3221aaf FIX Rename title of template invoice 2021-02-15 22:15:14 +01:00
Laurent Destailleur
be3703a05b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-02-15 16:46:55 +01:00
Laurent Destailleur
f0e234c874 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/bank/various_payment/list.php
 2021-02-15 16:45:17 +01:00
Laurent Destailleur
1d6893e928 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-15 16:43:46 +01:00
Laurent Destailleur
6132843586 FIX Filter on date of next generation on template invoices 2021-02-15 16:43:24 +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
a1356718c0 Merge branch 'NEW_BankEntries_TaxSalarySocial_DisplayUser' of github.com:atm-lena/dolibarr into develop_NEW_BankEntries_TaxSalarySocial_DisplayUser 2021-02-11 11:14:24 +01:00
atm-lena
7fbf0b56d5 NEW Bank Entries : add verif fk_user addPaymentToBank Social Contribution 2021-02-11 11:13:12 +01: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
8f8f5058de Add link 'user' in bank_url for payment_sc 2021-02-10 16:04:29 +01:00
Laurent Destailleur
0849ce288c Fix phpcs 2021-02-10 14:04:06 +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
LAURIER Alexis
608a7152cf
Correct missing semi column 2021-02-10 08:15:16 +01:00
LAURIER Alexis
653b0d6090
Add mass action on direct debit request list 
Add mass action on direct debit request list into direct debit voucher create page
 2021-02-10 08:11:28 +01:00
Laurent Destailleur
4c3a96da08 FIX #16150 2021-02-10 02:57:08 +01:00
Laurent Destailleur
92a1235066 Fix summary of report 2021-02-09 23:34:42 +01:00
Laurent Destailleur
6ceaa02abe Fix total in summary section was empty for income. 2021-02-09 23:08:59 +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
Laurent Destailleur
4d4a92b567
Merge pull request #16226 from frederic34/patch-2 
remove deprecated
 2021-02-09 13:31:36 +01:00
Laurent Destailleur
89bda722bf
Merge pull request #16232 from frederic34/paymentvat 
use camelCaps name
 2021-02-09 13:29:40 +01:00
Frédéric FRANCE
e2d2048522
deprecate non camelCaps functions 2021-02-09 13:25:55 +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
Laurent Destailleur
842e112c5b
Merge pull request #16229 from frederic34/patch-3 
doxygen
 2021-02-09 13:22:15 +01:00
Frédéric FRANCE
04c25a01af
deprecate non camelCaps functions 2021-02-09 13:10:11 +01:00
Frédéric FRANCE
f394e55ade
deprecate non camelCaps functions 2021-02-09 10:26:17 +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
Frédéric FRANCE
fe9ee5a398
deprecate non camelCaps functions 2021-02-09 09:49:37 +01:00
Frédéric FRANCE
6d961a1f79
deprecate non camelCaps functions 2021-02-09 09:40:07 +01:00
Frédéric FRANCE
5f8b70b772
use camelCaps name 2021-02-09 09:03:29 +01:00
Laurent Destailleur
c9f34cc0d4 Prepare button to the bank conciliation pages 2021-02-08 22:42:21 +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
bca986d924
Merge branch 'develop' into patch-2 2021-02-08 21:05:05 +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
Frédéric FRANCE
b602a1b4a7
Update paiement_vat.php 2021-02-08 20:29:09 +01:00
Frédéric FRANCE
1a4c627ad8
doxygen 2021-02-08 20:25:51 +01:00
Frédéric FRANCE
898bf55202
Merge remote-tracking branch 'upstream/develop' into facturerec 2021-02-08 20:21:46 +01:00
Laurent Destailleur
d41edfc812 Fix responsive. Clean code 2021-02-08 19:52:29 +01:00
Laurent Destailleur
8f7c35a221 Enhance autofill of amount to pay for VAT 2021-02-08 19:35:04 +01:00
Frédéric FRANCE
f8f3a27b6f
remove deprecated 2021-02-08 19:18:30 +01:00
Frédéric FRANCE
815f3602e3
clean deprecated modelpdf to model_pdf 2021-02-08 18:30:09 +01:00
Laurent Destailleur
c0aa7e7db5
Merge pull request #16020 from atm-gauthier/NEW/add_real_payments_on_vat_objects 
NEW VAT payment request and VAT payment are 2 different steps in workflow on VAT payment recording
 2021-02-08 17:19:40 +01:00
Laurent Destailleur
8041ef641a
Merge branch 'develop' into dev_typent_jax_workcorrectly 2021-02-08 15:29:36 +01:00
Gauthier PC portable 024
41af1a59f4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-08 10:37:01 +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
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
c6badeed57 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/categories/viewcat.php
	htdocs/compta/prelevement/card.php
 2021-02-06 01:14:48 +01:00
Laurent Destailleur
4428e2b18e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/prelevement/card.php
	htdocs/product/price.php
 2021-02-06 01:08:37 +01:00
Laurent Destailleur
87c8d917e9 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/prelevement/card.php
 2021-02-06 01:03:31 +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
f0e1c02caa Look and feel v14 - Use placeholder on combolists 2021-02-06 00:05:24 +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
Laurent Destailleur
c441b54521 NEW If not logo defined, can use squarred logo on login page 2021-02-05 12:07:39 +01:00
Florian Mortgat
3f862bf43e FIX 10.0 - before crediting a withdrawal receipt, check whether it has been credited already 2021-02-05 11:34:39 +01:00
Laurent Destailleur
54be4f282b Fix bad function name 2021-02-05 10:56:33 +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
Laurent Destailleur
48be1f24d7 Reduce size required to store blockedlogs 2021-02-05 00:43:58 +01:00
Laurent Destailleur
59faccbc60 Load note_private 2021-02-05 00:34:15 +01:00
Laurent Destailleur
964fa7a72d Look and feel v14 2021-02-04 20:29:57 +01:00
Gauthier PC portable 024
e188ec6cd7 NEW : add real payments on salaries objects 2021-02-04 17:21:08 +01:00
Laurent Destailleur
445e7a1e0c Clean code 2021-02-04 10:58:07 +01:00
stickler-ci
149d2a1d55 Fixing style errors. 2021-02-04 08:52:16 +00:00
Florian HENRY
ec41bf58e5 always ajax now 2021-02-04 09:48:17 +01:00
Florian HENRY
2d77787bba Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_typent_jax_workcorrectly 2021-02-04 09:06:36 +01:00
Florian HENRY
86e9398b79 no inner join 2021-02-04 09:05:58 +01:00
Laurent Destailleur
3e2b1370dd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-03 21:02:46 +01:00
Laurent Destailleur
f301635681 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
 2021-02-03 21:02:32 +01:00
Laurent Destailleur
9ac2dc1a6e Fix phpcs 2021-02-03 20:42:30 +01:00
Laurent Destailleur
fb75da809b
Merge pull request #16145 from prietojc/patch-15 
FIX generating SEPA file
 2021-02-03 19:58:00 +01:00
Laurent Destailleur
348fd0fcb5 FIX #16160 2021-02-03 19:36:10 +01:00
Laurent Destailleur
29410cac6f Fix phpcs 2021-02-02 16:22:16 +01:00
Laurent Destailleur
2e7de1d137 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	test/phpunit/ExportTest.php
 2021-02-02 16:17:53 +01:00
Laurent Destailleur
c5201b95bb FIX Must not be able to edit vat of all lines if not draft 2021-02-02 16:12:03 +01:00
JC Prieto
f11037c6bf
Update bonprelevement.class.php 
Bad sender ICS_transfer
 2021-02-02 13:40:09 +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
Laurent Destailleur
c94ecb8a42 Limit list of draft element in home sections 2021-02-02 11:34:34 +01:00
Laurent Destailleur
2e9656a5b2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formactions.class.php
	htdocs/filefunc.inc.php
 2021-02-02 03:26:20 +01:00
Laurent Destailleur
daf88944f8 FIX #16118 Timezone problem on some fields 2021-02-02 00:19:41 +01:00
Gauthier PC portable 024
1eb4968a29 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects 2021-02-01 12:00:04 +01:00
Gauthier PC portable 024
a9d4390a47 Merge branch '12.0_new_payments_on_vat' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_vat_objects 2021-02-01 11:52:56 +01:00
Gauthier PC portable 024
509e9d597e FIX : table name for VAT payments must be llx_payment_vat 2021-02-01 11:47:43 +01:00
Laurent Destailleur
dad6778570 Prepare removal of libelle and lib into label 2021-01-31 13:07:41 +01:00
Laurent Destailleur
b349290cd1 Fix test for date in future 2021-01-31 12:57:54 +01:00
Laurent Destailleur
7887d4cc8e Fix price2num on all GETPOST('remise_percent') 2021-01-31 12:48:40 +01:00
Laurent Destailleur
b24aac1e6b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
 2021-01-31 12:03:39 +01:00
Laurent Destailleur
044b4eee48 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/expedition/list.php
 2021-01-31 11:54:45 +01:00
Laurent Destailleur
244ee05a9c FIX #14290 #15900 2021-01-30 18:09:13 +01:00
Laurent Destailleur
58dec39f94 Fix start and end month for turnover report. 2021-01-30 17:07:13 +01:00
Gauthier PC portable 024
b55cb826e7 Merge branch 'NEW_develop/fk_user_on_social_charge' of github.com:atm-gauthier/dolibarr into NEW_develop/fk_user_on_social_charge 2021-01-29 09:33:06 +01:00
Gauthier PC portable 024
2915bf89d9 FIX : stickler feedback on br tag 2021-01-29 09:32:00 +01:00
stickler-ci
b4d0668cea Fixing style errors. 2021-01-28 16:27:55 +00:00
Gauthier PC portable 024
0c43ea1e9b Merge branch 'NEW/fk_user_on_social_charge' of github.com:atm-gauthier/dolibarr into NEW_develop/fk_user_on_social_charge 2021-01-28 17:16:24 +01:00
Gauthier PC portable 024
cce38a9e6d NEW : fk_user on social charge 2021-01-28 16:58:55 +01:00
Laurent Destailleur
9ec5ba46fb Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2021-01-28 14:47:06 +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
Laurent Destailleur
f462e353e9 FIX #16079 2021-01-28 09:59:13 +01:00
Laurent Destailleur
0b393676e6 Fix group by 2021-01-28 09:30:01 +01:00
Gauthier PC portable 024
42e28941d0 FIX : sql db escape missing 2021-01-25 10:22:31 +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
Frédéric FRANCE
5820758968
fix class name Tva 2021-01-23 20:59:23 +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
Gauthier PC portable 024
97d564afb6 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 17:21:49 +01:00
Gauthier PC portable 024
8b0a5d270b FIX : group by 2021-01-19 17:18:22 +01:00
Laurent Destailleur
113ef1a02b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/class/user.class.php
 2021-01-19 16:21:53 +01:00
Gauthier PC portable 024
486102c8d1 Merge branch 'NEW/add_real_payments_on_vat_objects' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_vat_objects 2021-01-19 13:42:50 +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
stickler-ci
694f65082f Fixing style errors. 2021-01-19 11:25:45 +00:00
Gauthier PC portable 024
c1cd13aee3 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 12:12:58 +01:00
Gauthier PC portable 024
c35a13bad0 FIX : set paid button display test 2021-01-19 12:12:05 +01:00
Gauthier PC portable 024
b2eca0a314 FIX : VAT declaration list + migration script 2021-01-19 12:02:05 +01:00
Laurent Destailleur
03d8c6bfd6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/paiement_charge.php
 2021-01-19 10:59:42 +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
Florian HENRY
a8cdecf1b8 better fix 2021-01-18 19:17:23 +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
Laurent Destailleur
87d16c56e7
Merge pull request #15977 from frederic34/TotalAmountOfdirectDebitOrderDiffersFromSumOfLines 
add missing translation
 2021-01-16 17:28:20 +01:00
Laurent Destailleur
62a5c8b6da FIX Bad balance of begin commit 2021-01-15 15:34:24 +01:00
Laurent Destailleur
8e1128ef10 FIX Bad balance of begin commit 2021-01-15 15:33:12 +01:00
Laurent Destailleur
828f1c8314 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
 2021-01-15 14:04:22 +01:00
Laurent Destailleur
cac7fdd058 Look and feel v13 2021-01-15 14:02:18 +01:00
Laurent Destailleur
e5126885fb Fix css 2021-01-15 13:27:45 +01:00
Laurent Destailleur
3e85aec9a5 Fix url 2021-01-15 13:24:37 +01:00
Laurent Destailleur
d7a776ad8a Fix url 2021-01-15 13:23:59 +01:00
Laurent Destailleur
4c50f25c12 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-15 11:41:45 +01:00
Laurent Destailleur
0d704b0714 FIX error managent and db transaction balance 2021-01-14 19:09:57 +01:00
Florian HENRY
0fa7134bd1 better fix 2021-01-14 13:04:02 +01:00
Frédéric FRANCE
271378fb87
add translation 2021-01-13 18:09:57 +01:00
Frédéric FRANCE
a5678147dd
add missing translation 2021-01-13 16:52:32 +01:00
Laurent Destailleur
8d65dff93d Fix missing param 2021-01-13 11:16:48 +01:00
Laurent Destailleur
db8ca42da2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-13 11:15:51 +01:00
Laurent Destailleur
ffc936fff3 Fix missing param 2021-01-13 11:15:30 +01:00
Florian HENRY
7e30812529 fix review 2021-01-12 22:01:53 +01:00
Florian HENRY
d856b0149d Merge branch '13_backport' into develop 2021-01-12 10:08:12 +01:00
Florian HENRY
33d7998a96 fix: date auto fill date paiement tax 2021-01-11 19:47:20 +01:00
Florian HENRY
e5ef455628 fix: date auto fill date paiement tax 2021-01-11 19:46:08 +01:00
Laurent Destailleur
d2c0dd35b0
Merge pull request #15937 from aspangaro/13b5 
Various payment - Add Amount & direction in clone mode
 2021-01-11 15:58:42 +01:00
Laurent Destailleur
d2c86578fa
Update card.php 2021-01-11 15:58:20 +01:00
Laurent Destailleur
e3a1cabd87
Merge pull request #15942 from bb2a/add_alias_on_lists 
NEW Add column "alias" of company in list of proposal, order, invoice
 2021-01-11 15:56:22 +01:00
Laurent Destailleur
e2598f5af3 NEW Add check to avoid invoice date in future 2021-01-11 15:34:25 +01:00
Laurent Destailleur
0c34543145 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-11 15:20:15 +01:00
Laurent Destailleur
d859072202 Fix GETPOST 2021-01-11 15:19:47 +01:00
Laurent Destailleur
4a919a8c6a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-11 15:16:33 +01:00
Laurent Destailleur
25a703526e Fix GETPOST 2021-01-11 15:16:01 +01:00
Laurent Destailleur
5bd59cd6d1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-11 13:37:59 +01:00
Laurent Destailleur
8debb58f7c Fix rounding of currency unit prices 2021-01-11 13:36:53 +01:00
Laurent Destailleur
16253a79ee FIX GETPOST of qty with wrong parameters 
Conflicts:
	htdocs/bom/bom_card.php
 2021-01-11 13:11:40 +01:00
Laurent Destailleur
f3e28c2dd0 FIX GETPOST of qty with wrong parameters 2021-01-11 13:00:29 +01:00
Anthony Berton
59ea907b18 Update list.php 2021-01-10 22:47:30 +01:00
Alexandre SPANGARO
004ee952d9 Various payment - Add Amount & Sens in clone mode 2021-01-10 08:16:19 +01:00
Laurent Destailleur
f411b29b28 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/listbysubaccount.php
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/accountancy.lang
 2021-01-09 02:34:43 +01:00
Laurent Destailleur
26fa8b45ac
Merge pull request #15153 from FHenry/dev_new_add_desc_when_select_product 
NEW: preload product description on selection for customer propal/order/invoice
 2021-01-07 11:19:53 +01:00
Alexandre SPANGARO
1f87bbbd01 Typo 2021-01-07 06:26:24 +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
554fbcb577
Merge remote-tracking branch 'upstream/develop' into api_bank_account 2021-01-05 12:03:20 +01:00
Laurent Destailleur
a93227ac2f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-05 11:30:25 +01:00
Laurent Destailleur
ed25b252b9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-05 11:30:14 +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
7141fa315e Debug v13 2021-01-04 15:32:18 +01:00
Laurent Destailleur
8df5928e9c Fix selection must depends on enabled modules 2021-01-04 13:32:43 +01:00
Florian HENRY
dfaf77b03f merge develop 2021-01-03 15:14:34 +01:00
Laurent Destailleur
150b338764 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-02 17:02:08 +01:00
Laurent Destailleur
7b3ed7301d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2021-01-02 17:01:03 +01:00
Laurent Destailleur
fd4dab495f FIX Bad cleaning of VAT rate when numbers are into code 2021-01-02 16:51:34 +01:00
Laurent Destailleur
1ab459e854 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-02 16:19:08 +01:00
Laurent Destailleur
ce0abd17fe Debug v13 2021-01-02 16:18:16 +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
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
JC Prieto
af82bf2fee
Update create.php 2020-12-31 10:47:30 +01:00
jcp
e187e77acb ICS and ICS_transfer hide if module not enabled 2020-12-31 10:12:03 +01:00
Laurent Destailleur
020caf8809 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-30 23:52:36 +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
Laurent Destailleur
42ca3bcdc7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/salaries/class/paymentsalary.class.php
 2020-12-30 13:23:50 +01:00
Laurent Destailleur
cb4a293020 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/webservices/server_productorservice.php
 2020-12-30 13:22:43 +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
Laurent Destailleur
17b68a30d7
Merge branch 'develop' into dev_add_tag_on_massaction 2020-12-30 13:10:02 +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
806b40662f merge develop 2020-12-28 21:15:25 +01:00
lvessiller
d4a19e5968 NEW add total margin in invoice list 2020-12-28 16:20:59 +01:00
Laurent Destailleur
a6eb14f68b
Merge pull request #15585 from cfoellmann/fckeditor-notes 
NEW Can toggle FCKeditor on public/private notes
 2020-12-27 15:06:35 +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
b66ec5bc64 Fix css 2020-12-23 23:16:27 +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
bac2ae0d5f Fix warnings 2020-12-22 17:33:17 +01:00
Laurent Destailleur
58b4de8bc3 More complete fix for #15712 2020-12-21 19:27:42 +01:00
Laurent Destailleur
8d901d03fd Fix link 2020-12-21 16:01:47 +01:00
Laurent Destailleur
4ed14d4903 Fix title not saved 2020-12-19 18:52:05 +01:00
Laurent Destailleur
832db82fce Fix warnings 2020-12-18 14:40:45 +01:00
Laurent Destailleur
3b8947dadd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/class/html.form.class.php
	htdocs/product/price.php
 2020-12-17 21:50:05 +01:00
Laurent Destailleur
5facd49a6c Fix warnings 2020-12-16 11:33:31 +01:00
Laurent Destailleur
c6f83aaed7 Fix warning 2020-12-16 11:21:48 +01:00
Laurent Destailleur
2c7d872320 Fix warning 2020-12-16 11:07:34 +01:00
Laurent Destailleur
bf01ad8790 Fix warning 2020-12-16 10:55:33 +01:00
atm-lena
cb2c1f3ece FIX Facture Situation Out : status condition 2020-12-16 10:54:32 +01:00
Laurent Destailleur
479e742d0c FIX #15753 2020-12-15 13:46:13 +01:00
Laurent Destailleur
b991badb8c Fix warning 2020-12-14 13:03:43 +01:00
Laurent Destailleur
d4167fb06c Fix link 2020-12-14 11:35:45 +01:00
Laurent Destailleur
e1e8d76eb9 Fix bad filter 2020-12-14 11:30:39 +01:00
Laurent Destailleur
07cf81be17 Fix search and navigation 2020-12-14 11:28:18 +01:00
Laurent Destailleur
b0e3f1678f Debug v13 2020-12-14 10:58:09 +01:00
Laurent Destailleur
cce0b2f31b Fix code 2020-12-14 10:44:51 +01:00
Laurent Destailleur
3d33d3aa3a Fix warning 2020-12-13 14:36:00 +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
51738e7e60 Fix links into translation strings 2020-12-09 17:02:26 +01:00
Laurent Destailleur
d9ba821411
Merge pull request #15669 from frederic34/template 
typo ortho
 2020-12-07 22:35:45 +01:00
Laurent Destailleur
2c094fe847
Merge pull request #15673 from frederic34/compta_stats_index 
fix trans removing html
 2020-12-07 22:32:12 +01:00
Laurent Destailleur
efc3bad7c6
Merge pull request #15678 from frederic34/fk_element 
doxygen
 2020-12-07 22:31:08 +01:00
Laurent Destailleur
a87ef49172 Fix remove warning 2020-12-06 17:59:49 +01:00
Frédéric FRANCE
4e18f46f28
doxygen 2020-12-05 23:53:55 +01:00
Frédéric FRANCE
7099dbbb05
fix trans removeing html 2020-12-05 18:17:04 +01:00
Frédéric FRANCE
d1204e5e9b
typo ortho 2020-12-05 15:35:52 +01:00
Laurent Destailleur
0db72852fb Fix height of graph 2020-12-03 20:18:37 +01:00
Laurent Destailleur
d8d825f615 FIX #15519 2020-12-03 14:40:14 +01:00
Laurent Destailleur
5bd6d6f388 Look and feel v13 2020-12-03 14:34:15 +01:00
Laurent Destailleur
fd56f5fa21
Merge pull request #15621 from Hystepik/develop#1 
Fix a bug in bank's graph with option and mode
 2020-12-02 18:31:16 +01:00
Laurent Destailleur
9e18997e64 FIX #15595 2020-12-02 16:35:43 +01:00
lmarcouiller
8a86593b13 Fix a bug in bank's graph with option and mode 2020-12-02 16:24:01 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-12-01 01:41:19 +00:00
Christian Foellmann
f801dd7d66 PR toggle FCKeditor on public/private notes 2020-11-30 16:39:14 +01:00
Laurent Destailleur
958893228a Fix combo to add contact and status of contact on popup 2020-11-30 15:18:58 +01:00
Laurent Destailleur
00ad6df395 Fight against $_POST 2020-11-30 14:47:07 +01:00
Laurent Destailleur
7634212811 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/phpinfo.php
	htdocs/commande/stats/index.php
	htdocs/compta/facture/stats/index.php
 2020-11-29 21:35:03 +01:00
Laurent Destailleur
d3a2aa664f FIX #15572 2020-11-29 20:27:40 +01:00
Laurent Destailleur
6c65ebef0d Look and feel v13 2020-11-29 15:16:53 +01:00
Laurent Destailleur
85a6a296c8 Fix links 2020-11-28 19:13:17 +01:00
Laurent Destailleur
59b445a103 Clean dead code 2020-11-28 14:47:39 +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
Laurent Destailleur
69b06a25e8 Fix code of deletion of objects 2020-11-26 09:16:16 +01:00
Laurent Destailleur
ac859bc38e
Merge pull request #15531 from FHenry/develop 
Fix bank transfert supplier
 2020-11-25 13:06:10 +01:00
Laurent Destailleur
0ad0035f19
Update list.php 2020-11-25 12:47:10 +01:00
Florian HENRY
73d6266151 continue fix banktransfert supplier 2020-11-25 11:22:31 +01:00
Florian HENRY
12ef03f06d fix banck tranfert supplier 2020-11-25 10:58:34 +01:00
Florian HENRY
4a316f06d5 fix : finish bank transfert fourn from list 2020-11-25 10:24:44 +01:00
Laurent Destailleur
81566289cd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
 2020-11-24 11:07:35 +01:00
Laurent Destailleur
890f7a0602
Merge pull request #15497 from atm-john/12.0_fix_thirdparty_propagate_extrafields_to 
FIX  Dol print error : conf usage thirdparty propagate extrafields to
 2020-11-23 21:43:03 +01:00
ATM john
fbc911aea1 Fix conf usage thirdparty propagate extrafields to 2020-11-23 16:40:31 +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
Laurent Destailleur
f2cd2570b9 Fix link 2020-11-22 12:03:44 +01:00
Laurent Destailleur
3d2da45f84 Remove warning 2020-11-22 11:36:07 +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
Florian HENRY
46326d7659 merge from develop 2020-11-19 13:53:34 +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
Laurent Destailleur
6c42535eb2 Maxi debug v13 2020-11-16 12:20:18 +01:00
Frédéric FRANCE
52b4e2fbc5
doxygen 2020-11-14 22:25:25 +01:00
Laurent Destailleur
3c5ef18b36 FIX #15390 2020-11-14 00:47:28 +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
Laurent Destailleur
90884d8085 Fix compatibility with date_delivery 2020-11-11 18:08:40 +01:00
jcp
7e3ef08b25 ICS update 2020-11-10 19:17:11 +01:00
Laurent Destailleur
6536208a14
Merge pull request #15322 from OPEN-DSI/new-list-include-array-extra-fields-with-langfile 
NEW include tpl for loading lang file for extra fields in list
 2020-11-10 14:42:21 +01:00
Laurent Destailleur
47b3b30aaa Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/fourn/product/list.php
	htdocs/product/fournisseurs.php
	htdocs/societe/card.php
 2020-11-10 11:10:35 +01:00
jcp
eb0fd1674d Update ICS 2020-11-09 18:40:57 +01:00
Florian Mortgat
bf27c56fa7 Following PR#15336: it should not be possible to modify the third party of an invoice 2020-11-09 17:09:06 +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
e103503bb1 Fix warning php8 2020-11-08 12:34:45 +01:00
Laurent Destailleur
d04bbe09b7 Fix syntax error 2020-11-08 00:38:12 +01:00
Laurent Destailleur
a9fbe9dd6c Fix remove warning 2020-11-08 00:18:41 +01:00