Commit Graph

9283 Commits

Author SHA1 Message Date
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
Frédéric FRANCE
3785dd2d17 clean code (#35567)
* clean code

* clean code

* clean code
2025-10-01 13:30:02 +02:00
Frédéric FRANCE
e0fd1bdd3e clean code (#35545) 2025-09-29 20:41:32 +02:00
Frédéric FRANCE
33ca6820a2 add doc (#35516)
* add doc

* add doc

* add doc

* fix

* fix

* fix

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-27 22:08:13 +02:00
ldestailleur
e45fe1f988 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-09-27 15:57:27 +02:00
ldestailleur
8b58b215b4 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-27 15:48:40 +02:00
ldestailleur
fe28e36638 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-09-27 15:42:44 +02:00
Frédéric FRANCE
0afc7eed80 clean code (#35515)
* clean code

* add doc

* add doc
2025-09-27 12:28:31 +02:00
Joachim Kueter
16c9d4005f Fix #35208 - Multicurrency fix for discount in invoice (Sponge) (#35506)
* Multicurrency fix for discount

* removed empty line
2025-09-27 12:10:15 +02:00
kkhelifa-opendsi
a9cd1d2bb9 New : Copy support of the deposit percent of the payment mode found in customer proposal, customer order and customer invoice to supplier proposal, order and invoice (#35432)
* New : Copy support of the deposit percent of the payment mode found in customer proposal, customer order and customer invoice to supplier proposal, order and invoice

* Correction pre-commit / travis CI

* Correction pre-commit / travis CI

* Correction pre-commit / travis CI

* Correction pre-commit / travis CI
2025-09-26 23:59:51 +02:00
ldestailleur
a4d9b335ce Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-09-25 11:53:03 +02:00
Dylan Bourdere
0ba4c17e66 Fix some undefined array key warning (#35471)
* fix some undefined array key warning

* fix some undefined array key warning
2025-09-24 18:39:38 +02:00
ldestailleur
4bc5892544 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-09-24 17:00:53 +02:00
Dylan Bourdere
59ec1a2811 fix ui on multi line subtotal & fix text contrast (#35449)
* fix ui on multi line subtotal & fix text contrast

* extract subtotal pdf logic

* phpcs

* lint

* lint

* refactor

* phpcs

* phpcs

* phpcs

* Update pdf.lib.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-23 23:24:37 +02:00
Frédéric FRANCE
8fd4d0332d clean code (#35423)
* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code
2025-09-21 23:22:33 +02:00
ldestailleur
49051ff165 Removed deprecated property ->projet (replace with ->project) 2025-09-21 15:08:56 +02:00
ldestailleur
e45352bd11 Clean code. Replace property with local variable. 2025-09-21 14:21:38 +02:00
Frédéric FRANCE
5c2344cca8 clean code (#35396)
* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* fix

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-21 12:11:36 +02:00
MDW
b3228aa7ce Qual: Fix phan notices (#35406)
* fix CI

* fix

* Qual: Fix newly appeard phan notices

# Qual: Fix newly appeard phan notices

Fix notices that appearce sin a previous phan report - some of these
notices are masked by the current baseline.

---------

Co-authored-by: Frédéric FRANCE <frederic34@users.noreply.github.com>
Co-authored-by: Frédéric FRANCE <frederic.france@free.fr>
2025-09-20 15:59:05 +02:00
Frédéric FRANCE
d1572fc3ea fix CI (#35409)
* fix CI

* fix
2025-09-20 15:57:39 +02:00
ldestailleur
5ac469634e Clean code for PDF invoices 2025-09-20 02:48:27 +02:00
Charlène Benke
ad4f4fb619 Refactor VAT array handling in PDF generation (#35395)
$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] is present on 2 part of the if
2025-09-20 00:01:19 +02:00
ldestailleur
4a363478ae Clean code with rector 2025-09-18 16:26:38 +02:00
Frédéric FRANCE
2505c3755b clean code (#35367)
* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-17 18:18:16 +02:00
ldestailleur
4e83087e28 Fix complete #35368 2025-09-17 15:04:01 +02:00
atm-GregM
c84d4c53e5 New develop import export product customer price (#35349)
* NEW import/export product customer price

* back travis and more

* back travis 2
2025-09-17 14:19:36 +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
ldestailleur
f2ff34d573 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-09-17 12:59:19 +02:00
ldestailleur
ee39ef632a FIX Generation of member cards (file not found and substitution broken) 2025-09-17 12:38:20 +02:00
Frédéric FRANCE
21d50f1a58 clean code expedition class (#35327)
* clean code expedition class

* clean code expedition class

* clean code expedition class

* clean code expedition class

* clean code expedition class

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* clean code
2025-09-15 16:16:22 +02:00
ldestailleur
8456749135 Clean code. Removed octicons directory. 2025-09-15 14:40:34 +02:00
Frédéric FRANCE
1bc100a082 fix missing translation (#35323)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-12 18:56:54 +02:00
Frédéric FRANCE
9f90c9d371 Fix missing translation (#35322)
* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation
2025-09-12 15:17:18 +02:00
ThomasNgr-OpenDSI
acc3a47272 NEW add fields usage_opportunity, usage_task, usage_bill_time for project import (#35301) 2025-09-12 02:29:43 +02:00
ldestailleur
92ffba11ca Remove old lang files that are too small (moved into other lang files) 2025-09-11 13:31:34 +02:00
ldestailleur
b4a2e14fa8 Clean code 2025-09-11 12:32:01 +02:00
ldestailleur
6586feb3ef Clean code 2025-09-11 12:30:19 +02:00
HENRY Florian
6ee966d64d feat: Subtotal module (#35290) 2025-09-11 12:14:32 +02:00
ldestailleur
af74f2c057 Lang file paybox is too small for deprecated moduel. Moved inside
stripe.
2025-09-11 11:20:13 +02:00
Frédéric FRANCE
e81d5378cd clean code contract class (#35245)
* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code

* clean code

* clean code

* clean code

* clean code

* fix typo

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix
2025-09-10 11:13:18 +02:00
Frédéric FRANCE
0f7c375df7 fix CI (#35269)
* fix CI

* Update mod_codeproduct_elephant.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-10 10:53:28 +02:00
ldestailleur
d634d3fc4c Fix ci 2025-09-09 19:33:27 +02:00
ldestailleur
8dc1ac2cdc Fix order of product templates 2025-09-09 02:16:06 +02:00
Frédéric FRANCE
0e1478206a clean code (#35229)
* 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

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-08 01:48:52 +02:00
Frédéric FRANCE
1b83c39cc0 NEW Add sms reminder in reminder of agenda events (#35239)
* add reminder by sms

* fix url dolistore

* add cron task to send sms reminder

* add cron task to send sms reminder

* add cron task to send sms reminder

* add cron task to send sms reminder

* Update sms.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-05 15:38:15 +02:00
ldestailleur
9dd5307c1b Clean code 2025-09-03 12:06:29 +02:00
ldestailleur
62f761ac71 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-09-02 12:07:15 +02:00
ldestailleur
ee38ff0aaf Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-02 12:02:40 +02:00
ldestailleur
6727d0c361 FIX we saw links to object on private not just after a save. 2025-09-02 03:51:08 +02:00
Benjamin Chanudet
53aae1a4b8 FIX #35147 SQL Error on Beluga Export when ExpenseReport is enabled (#35149)
* Fix SQL error when ExpenseReport module is enabled (#35147)

* fix date filtering that prevents data to be displayed

* add date and amount for expense reports

* Update pdf_beluga.modules.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-01 20:33:12 +02:00