Commit Graph

632 Commits

Author SHA1 Message Date
Laurent Destailleur
14f63d1ca2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-10-15 18:58:24 +02:00
Laurent Destailleur
fc7f9058af Fix ci 2025-10-15 18:58:12 +02:00
Frédéric FRANCE
82010e7a60 fix CI payment_salary.php (#35767)
* fix CI payment_salary.php

* Update baseline.txt

* Update phpstan-baseline.neon
2025-10-15 18:56:13 +02:00
Laurent Destailleur
9a99139d85 Fix status of salary 2025-10-15 11:31:28 +02:00
Laurent Destailleur
7853a33560 No need of token for action=create 2025-10-15 11:22:11 +02:00
Laurent Destailleur
dbc0905e79 Renamed salaries/paiement_salary.php into salaries/payment_salary.php 2025-10-15 11:19:00 +02:00
Laurent Destailleur
580d0d4fa8 Replace function img_pdf with img_picto 2025-10-13 11:12:30 +02:00
Pierre Ardoin
30d66bcdd8 UIUX adds a new permission that restricts the user to seeing their salaries and only those. (#35293)
* Update admin.lang

Add translate "Permission511=Lire les salaires et leur paiement (les vôtres et ceux de vos subordonnées)" and move old 511->512 and 512->513.

* Update modSalaries.class.php

Add the new permission 'Read employee salaries and payments (yours only)'

* Update list.php

add the new permission filter "read child"

* Update payments.php

Add the new permission "readchild"

* Update index.php

Add support off new permission

* Update index.php

* Update index.php

* Update index.php

* Update list.php

* Update list.php

* Update list.php

* Update payments.php
2025-10-01 17:49:35 +02:00
Anthony Damhet
c17f13316a UIUX - More intuitive select table (#35485)
* More intuitive select table

Added for objects:
- Members
- ActionComm
- Mailing
- Bank Accounts
- Various Payments
- Cash Control
- Paiement
- Contacts
- VAT
- Contracts
- Cron
- Gifts (Dons)
- Expedition
- Expense Reports
- FichInter
- Supplier Proposals
- Supplier Orders
- Supplier Invoices
- Supplier Paiements
- Products and supplier products
- Holidays
- Knowledge record
- Partnership
- Inventory
- Stock
- Projects
- Tasks
- Tickets
- Societes
- Salaries
- Resource
- Users

* Add Status message on documentation

* Remove intuitive select experimetns

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-28 01:21:40 +02:00
Frédéric FRANCE
680f4b6c31 fix CI (#35481)
* fix CI

* Update paymentsalary.class.php

* clean phpstan baseline

* clean code

* clean code
2025-09-26 20:47:34 +02:00
ldestailleur
023e3081a4 Fix link to ref of salary payment 2025-09-25 11:09:00 +02:00
ldestailleur
6ed764bedf Clean code 2025-09-18 11:40:56 +02:00
Frédéric FRANCE
078da229c8 clean code (#35352)
* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* Clean code

* Clean code

* clean code

* clean code

* clean code

* clean code

* clean code
2025-09-17 14:11:32 +02:00
Frédéric FRANCE
f03f54d406 clean code (#35350)
* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code
2025-09-16 00:54:59 +02:00
ldestailleur
2427553211 The property $sumpayed (duplicate of $totalpaid), $sumdeposit
(duplicate of $totaldeposits) and $sumcreditnote (duplicate of
$totalcreditnotes) has been removed (there are replaced with the
property that was a duplication of (same for $sumpayed_multicurrency,
$sumdeposit_multicurrency, $sumcreditnote_multicurrency).
2025-08-12 04:08:38 +02:00
ldestailleur
ddbe0427b7 Doc 2025-08-11 19:36:44 +02:00
ldestailleur
aca71e1573 Standardize code 2025-08-10 03:22:19 +02:00
Laurent Destailleur
82098594a6 Fix warning 2025-07-31 22:13:45 +02:00
ldestailleur
63c4acca94 Debug v22 2025-07-30 12:25:32 +02:00
ldestailleur
d1ddf4314e Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-28 13:18:15 +02:00
ldestailleur
51f246b4ac Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-06-28 13:17:30 +02:00
Marc
57a256791f FIX #34618 (#34621)
Update api_salaries.class.php
Replace POST with PUT
2025-06-25 19:21:54 +02:00
Florent Poinsaut
a93e892bd2 Fix extrafield in Salary (#34370) 2025-06-08 14:27:45 +02:00
Laurent Destailleur
619107da8e Debug v22 2025-06-04 22:54:30 +02:00
ldestailleur
fdd1f3e713 Move position of button 2025-05-05 02:51:23 +02:00
ldestailleur
49d6a9370a Avoid option that break interface alignement and not used in a lot of
case.
2025-05-05 02:48:08 +02:00
ldestailleur
4fd81b79be Fix CI 2025-04-04 18:22:47 +02:00
ldestailleur
f5a61d9dc4 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-01 19:26:49 +02:00
ldestailleur
16c76a6505 FIX The payment mode for salary on credit transfer must be credit
transfer
2025-04-01 18:50:12 +02:00
ldestailleur
17dfec8ee4 FIX Edit of payment mode from the bank transfer tab of salary 2025-04-01 18:44:45 +02:00
Frédéric FRANCE
745b140869 fix CI (#33624)
* fix typo

* Update card.php

* Update card.php

* Update card.php

* Update interface_95_modWebhook_WebhookTriggers.class.php

* Update interface_95_modWebhook_WebhookTriggers.class.php
2025-03-26 19:51:02 +01:00
ldestailleur
ae59c409f6 Modulebuilderization 2025-03-26 00:56:24 +01:00
MDW
f625f8de60 Qual: Fix api phan notices 2025-03-05 13:22:08 +01:00
MDW
eac44b164a Qual: Fix phpdoc index(), FIELDS 2025-03-05 13:21:05 +01:00
MDW
035ede5874 Qual: Fix phan notices in API classes 2025-03-02 20:49:46 +01:00
MDW
c02293a880 Qual: Add phpdoc for request_data param 2025-03-02 20:49:45 +01:00
Laurent Destailleur
fbf072e95a Merge pull request #31960 from sonikf/sonikf-patch-salary-clone
NEW: Add also start date fill buttons for salary clone
2025-02-28 04:30:09 +01:00
ldestailleur
ca56418efb CSS v22 2025-02-21 19:26:25 +01:00
MDW
78f5938485 Qual: Fix phan notices (resource+salary) 2025-02-14 01:42:25 +01:00
sonikf
89045e1fab Merge branch 'develop' into sonikf-patch-salary-clone 2025-02-12 09:19:07 +02:00
MDW
288aca6423 Qual: Fix phan (project-2) 2025-02-11 22:08:21 +01:00
MDW
24fa28dfe2 Qual: Fix getKanban phpdoc
# Qual: Fix getKanban phpdoc

Array phpdoc for getKanban corrections.
2025-02-05 01:43:37 +01:00
Laurent Destailleur (aka Eldy)
732f97d73c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-02-05 00:40:06 +01:00
sonikf
e6160cc7ff Merge branch 'develop' into sonikf-patch-salary-clone 2025-01-30 20:32:54 +02:00
MDW
7150af31dc Fix Phan notices introduced since 30/12/2024 2025-01-27 13:24:29 +01:00
Frédéric FRANCE
618f733d25 fix doc 2025-01-22 09:03:45 +01:00
Laurent Destailleur (aka Eldy)
3ab49cf061 Debug v21 - Standardize code and translation of RefExt 2025-01-12 18:08:25 +01:00
Laurent Destailleur (aka Eldy)
b024b95948 Fix typo 2025-01-09 19:35:01 +01:00
Laurent Destailleur (aka Eldy)
56710ce9b7 FIX CVE-2024-55227 and CVE-2024-55228 CSRF when
MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY is
on (hidden option not on by default)
2025-01-09 19:35:01 +01:00
sonikf
4373c7dd88 Merge branch 'develop' into sonikf-patch-salary-clone 2025-01-05 19:24:25 +02:00