Skip to content
Merged

20.0 #20

Changes from 1 commit
Commits
Show all changes
100 commits
Select commit Hold shift + click to select a range
82f65a6
NEW Can choose the zip handler to build ODT
eldy Oct 16, 2024
7166d25
Fix Zip generation of ODT with PHPZip
eldy Oct 16, 2024
111e3fc
Revert "NEW - Add a new hook on order list (#31315)"
eldy Oct 16, 2024
35f3a4f
Merge branch '17.0' of [email protected]:Dolibarr/dolibarr.git into 18.0
eldy Oct 16, 2024
ae09fc7
Merge branch '18.0' of [email protected]:Dolibarr/dolibarr.git into 19.0
eldy Oct 16, 2024
8087268
Merge branch '19.0' of [email protected]:Dolibarr/dolibarr.git into 20.0
eldy Oct 16, 2024
542a4fb
Update list.php (#31430)
ems-co Oct 16, 2024
202263d
fix PDF proposal signature area (#31420)
sonikf Oct 16, 2024
7903a8b
fix typo (#31418)
sonikf Oct 16, 2024
ce414d2
Fix phan
eldy Oct 16, 2024
0c67887
fix typo of hidden parameter in commonobject.class.php (#31417)
frederic34 Oct 16, 2024
84225c9
fix: variable name (#31411)
mc2rcanarslan Oct 16, 2024
6fca870
EPC-QR,Sponge, Translation of INVOICE_ADD_EPC_QR_CodePay, Alignment (…
shasta123 Oct 17, 2024
dacbfec
Move trans into correct lang file
eldy Oct 17, 2024
59fd0db
NEW Can choose the zip handler to build ODT
eldy Oct 16, 2024
4f71729
Fix missing migration on model_pdf
eldy Oct 17, 2024
a7a2517
Minor fix in azur/cyan
eldy Oct 17, 2024
3aedad6
FIX duplicate answers in list when using global search on proposals
eldy Oct 17, 2024
5982948
FIX duplicate answers in list when using global search on proposals
eldy Oct 17, 2024
6c98c52
Merge branch '20.0' of [email protected]:Dolibarr/dolibarr.git into 20.0
eldy Oct 17, 2024
3eebba6
FIX When PDF_ADD_POSITION is on, the number was doing pagebreak before
eldy Oct 17, 2024
edd33fd
FIX Error management on cheque deposit.
eldy Oct 17, 2024
65e750c
FIX Get number of bank deposit wa not using the date.
eldy Oct 17, 2024
8f868ef
Fix text overlapping
eldy Oct 17, 2024
f9eb82d
FIX pagebreak when option PDF_ADD_POSITION is set
eldy Oct 18, 2024
86d3352
Fix delete project when mrp module never enabled
eldy Oct 18, 2024
c9ed9bb
FIX Avoid fatal error when mysqli not available
eldy Oct 18, 2024
e17e9e8
Sanitize JS string fort alert() (#31465)
ymollard Oct 18, 2024
2f1d9cd
FIX : space used by linked elements in PDF notes (#31459)
thersane-john Oct 18, 2024
352bdaf
FIX : Extrafield following between rec invoice and classic invoice (#…
atm-irvine Oct 18, 2024
abefce7
FIX 17.0: supplier invoice template card: buyer and seller swapped in…
atm-florianm Oct 18, 2024
0844ed2
NEW Include a protection into check update to detect malware
eldy Oct 19, 2024
2aa67ba
Trans
eldy Oct 19, 2024
e97c1dc
Better message
eldy Oct 19, 2024
a0b791a
Merge branch '17.0' of [email protected]:Dolibarr/dolibarr.git into 18.0
eldy Oct 19, 2024
402570e
Merge branch '18.0' of [email protected]:Dolibarr/dolibarr.git into 19.0
eldy Oct 19, 2024
85f1338
Fix var_dump
eldy Oct 19, 2024
17c5036
Merge branch '19.0' of [email protected]:Dolibarr/dolibarr.git into 20.0
eldy Oct 19, 2024
a294cad
Merge branch '19.0' of [email protected]:Dolibarr/dolibarr.git into 20.0
eldy Oct 19, 2024
11d0119
Split code to avoid false positive
eldy Oct 19, 2024
c160da9
Change URL for module blacklist feature
eldy Oct 19, 2024
76ec55b
Merge branch '19.0' of [email protected]:Dolibarr/dolibarr.git into 20.0
eldy Oct 19, 2024
88d0636
Fix travis
eldy Oct 19, 2024
4a00350
Fix test on malware
eldy Oct 19, 2024
1d7169d
Merge branch '19.0' of [email protected]:Dolibarr/dolibarr.git into 20.0
eldy Oct 19, 2024
df2211e
Fix phan
eldy Oct 19, 2024
eb3bba0
Merge branch '19.0' of [email protected]:Dolibarr/dolibarr.git into 20.0
priojk Oct 18, 2024
b0c7b87
fix overwritten value (#31470)
frederic34 Oct 19, 2024
1d197e4
fix shippable tooltip value overwritten (#31468)
frederic34 Oct 19, 2024
7109054
fix translation for non latin languages (#31473)
sonikf Oct 19, 2024
58c0b97
FIX for #31237 #31524
eldy Oct 23, 2024
4d047fe
Fix bad sql whe exporting salaries (#31526)
Hystepik Oct 23, 2024
201d7bf
FIX #31452 Predefined supplier invoice - Langage key & link to suppli…
aspangaro Oct 23, 2024
a11e369
FIX Salary - Payment card - Missing date (#31512)
aspangaro Oct 23, 2024
c48b035
FIX issue on action set condition in particular when you set a deposi…
atm-corentin Oct 23, 2024
1778401
FIX---PHP-warning-multiprice-in-liste-product-if-level-is-not-defined…
BB2A-Anthony Oct 23, 2024
b37b2ba
fix: test on const with space.... (#31505)
FHenry Oct 23, 2024
39afafc
FIX: If you have no stock of your product, an error is displayed when…
Thomas905 Oct 23, 2024
e8f7237
Bug fix #31369 date_solde not taken into account when sent through A…
mikygee Oct 23, 2024
23722b3
Fix v20 linked doc note info repeated (#31462)
thersane-john Oct 24, 2024
d9d0618
Fix avoid unexpected deletion on accounting account when using multic…
eldy Oct 24, 2024
aa09644
Merge branch '18.0' of github.com:Dolibarr/dolibarr into 18.0
eldy Oct 24, 2024
399d778
Fix:edition rapide de la date de livraison et propagation vers la com…
ATM-NicolasV Oct 24, 2024
e31adc9
Fix watermark alpha transparency (#31535)
thersane-john Oct 24, 2024
57614cc
FIX #31365 Bank - Card - Ref haven't max length in edit mode (#31533)
aspangaro Oct 24, 2024
58cbfa8
FIX Edit a link
eldy Oct 24, 2024
9bc7244
Merge branch '20.0' of [email protected]:Dolibarr/dolibarr.git into 20.0
eldy Oct 24, 2024
0e62008
Merge branch '17.0' of [email protected]:Dolibarr/dolibarr.git into 18.0
eldy Oct 24, 2024
0ed4c9f
Merge branch '18.0' of [email protected]:Dolibarr/dolibarr.git into 19.0
eldy Oct 24, 2024
a17d266
Merge branch '20.0' of [email protected]:Dolibarr/dolibarr.git into 20.0
eldy Oct 24, 2024
3e9068c
FIX Accountancy - Loan - Error on transfer (#31546)
aspangaro Oct 25, 2024
c42605b
FIX Filter on month of the balance of leaves.
eldy Oct 25, 2024
1a60fd5
Merge branch '20.0' of [email protected]:Dolibarr/dolibarr.git into 20.0
eldy Oct 25, 2024
9746e84
FIX #31538 Addition to EPC-QR values ​​to correct remittance informat…
iLLixM Oct 25, 2024
93edeb4
Fix missing token
eldy Oct 26, 2024
6a5540f
Merge branch '20.0' of [email protected]:Dolibarr/dolibarr.git into 20.0
eldy Oct 26, 2024
eaa31ed
FIX: Fix bug select columns and acces to the public ticket list from …
kkhelifa-opendsi Oct 28, 2024
3caead1
Help debug with button "Refresh token"
eldy Oct 29, 2024
f350529
Fix export salary
eldy Oct 29, 2024
a186e16
Backport fix for mysql 8 export
eldy Oct 29, 2024
8b4dcb1
FIX email templates for expense report not visible
eldy Oct 29, 2024
cf57e7e
Merge
eldy Oct 29, 2024
7cf1a97
Merge branch '12.0' of [email protected]:Dolibarr/dolibarr.git into 13.0
eldy Oct 29, 2024
910f7e8
Merge branch '13.0' of [email protected]:Dolibarr/dolibarr.git into 14.0
eldy Oct 29, 2024
b3a2908
Merge branch '14.0' of [email protected]:Dolibarr/dolibarr.git into 15.0
eldy Oct 29, 2024
6a4ee18
Merge branch '15.0' of [email protected]:Dolibarr/dolibarr.git into 16.0
eldy Oct 29, 2024
1987ea2
Merge branch '16.0' of [email protected]:Dolibarr/dolibarr.git into 17.0
eldy Oct 29, 2024
0981c69
Merge branch '17.0' of [email protected]:Dolibarr/dolibarr.git into 18.0
eldy Oct 29, 2024
d51bf2b
Merge branch '18.0' of [email protected]:Dolibarr/dolibarr.git into 19.0
eldy Oct 29, 2024
6a62245
Merge branch '19.0' of [email protected]:Dolibarr/dolibarr.git into 20.0
eldy Oct 29, 2024
2350d1d
FIX a dictionary CANNOT have zero value in entity field (#31625)
hregis Oct 29, 2024
dc73fe6
Fix add option to restore compatibility
eldy Oct 29, 2024
9e1c640
FIX open redirection
eldy Oct 30, 2024
3c65972
Merge branch '20.0' of [email protected]:Dolibarr/dolibarr.git into 20.0
eldy Oct 30, 2024
7343384
Removed doc
eldy Oct 30, 2024
786e2de
Removed html doc
eldy Oct 30, 2024
26e89a7
FIX this constant break the dictionary admin without Multicompany (#3…
hregis Oct 30, 2024
d42465f
FIX error message in xls import when stream zip is not availabe.
eldy Oct 31, 2024
870a78a
FIX bad test on permission makes agenda event creation on object not
eldy Oct 31, 2024
8e1e980
Merge branch '20.0' of [email protected]:Dolibarr/dolibarr.git into 20.0
eldy Oct 31, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix bad sql whe exporting salaries (Dolibarr#31526)
Co-authored-by: Hystepik <[email protected]>
  • Loading branch information
Hystepik and Hystepik authored Oct 23, 2024
commit 4d047feca7163f83c328838832d8ecc5ec6a3e23
3 changes: 2 additions & 1 deletion htdocs/core/modules/modSalaries.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,8 @@ public function __construct($db)

$this->export_sql_start[$r] = 'SELECT DISTINCT ';
$this->export_sql_end[$r] = ' FROM '.MAIN_DB_PREFIX.'user as u';
$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'payment_salary as p ON p.fk_user = u.rowid';
$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'salary as s ON s.fk_user = u.rowid';
$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'payment_salary as p ON p.fk_salary = s.rowid';
$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as cp ON p.fk_typepayment = cp.id';
$this->export_sql_end[$r] .= ' AND u.entity IN ('.getEntity('user').')';
}
Expand Down