Commit graph

461 commits

Author SHA1 Message Date
MDW
3932cd5853
Qual: Update SQL query variables for situation mode in margin reports (#39282)
# Qual: Update SQL query variables for situation mode in margin reports

In the situation mode, the SQL queries for agentMargins, customerMargins, productMargins, and productMargins tab were updated to use new variable names ($sql_delta_pct and $sql_delta_ht) instead of the old ones ($delta_pct and $delta_ht).

This allows correct analysis by SqlInjection
2026-07-27 13:02:34 +02:00
MDW
1df0531b43
Qual: Fix 'SqlInjection' notices (#39222)
# Qual: Fix 'SqlInjection' notices

Batch of 25 files with changes to fix 'SqlInjection' Notices
2026-07-20 02:51:25 +02:00
Zakaria Boushaba
8a246db393
FIX Wrong margin calculation on situation invoices due to cumulative situation_percent (#39090)
* FIX: Margin calculation on situation invoices uses cumulative percent instead of delta, causing inflated amounts across all margin views

* Fix

* use the 'as' between table name and alias name

---------

Co-authored-by: Zakaria Boushaba <z.boushaba@vold.africa>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2026-07-16 11:27:35 +02:00
Laurent Destailleur
f9ae664691 css 2026-05-23 04:14:35 +02:00
Laurent Destailleur
734ffe5265 Fix use of MAIN_CHECKBOX_LEFT_COLUMN on all pages. This close #37987 2026-04-24 11:48:01 +02:00
Laurent Destailleur
561cbbe958 Look and feel v24 - Open margin en account summary of thirdparty in
popup
2026-03-14 17:56:40 +01:00
Laurent Destailleur
d2e1cb18cb Look and feel v24 2026-03-10 19:27:59 +01:00
MDW
1166dd305b
Qual: Update comments from French to English (#37097)
* Qual: Update comments from French to English

# Qual: Update comments from French to English

* Qual: Fix missing initialisations

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2026-02-08 15:29:53 +01:00
Laurent Destailleur
998d8c4b50 Fix warning 2025-12-04 14:53:33 +01:00
Laurent Destailleur
3f0ec8dc78 Fix setup margin 2025-12-03 18:39:34 +01:00
MDW
44acb8eb47
qual: Add type hint for group_list array
Add a type hint for the $group_list array for phpstan.
2025-11-28 02:23:33 +01:00
Laurent Destailleur
81527a9fe9 Clean code 2025-11-18 12:03:23 +01:00
Frédéric FRANCE
29b3880e6c
add dolBuildUrl (#35664)
* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* clean baseline

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-10-17 02:31:07 +02:00
Frédéric FRANCE
90a0d3cc28
clean phpstan baseline (#35798)
* fix missing translation

* fix missing translation

* clean phpstan baseline

* clean phpstan baseline

* clean phpstan baseline

* clean phpstan baseline

* clean phpstan baseline

* clean phpstan baseline

* clean phpstan baseline

* clean phpstan baseline

* clean phpstan baseline

* clean phpstan baseline

* clean phpstan baseline

* clean phpstan baseline

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-10-17 02:01:47 +02:00
ldestailleur
42edd8f22d Clean code 2025-09-18 12:19:29 +02:00
ldestailleur
6ed764bedf Clean code 2025-09-18 11:40:56 +02:00
Frédéric FRANCE
3b3274e15e
Fix asset (#35058)
* fix missing field definition

* fix warnings

* fix warnings

* fix warnings
2025-08-24 20:21:21 +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
boudet jean pascal
3b560cfa4a
New add printFieldListWhere hook in checkmargin.php (#34828)
* add where hook on checkmargin.php

* remove global

* change hookName

* add rector

* clean code

* mend

---------

Co-authored-by: jpb <jean-pascal.boudet@atm-consulting>
2025-07-29 21:09:29 +02:00
ldestailleur
9b7fee42e3 Clean code 2025-06-20 16:45:49 +02:00
Laurent Destailleur
b2f148da50 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-22 17:06:21 +02:00
ptibogxiv
3589c35489
Fix productMargins.php (#34233) 2025-05-22 16:38:05 +02:00
Frédéric FRANCE
de763b4b43
clean code of order (#33880)
* clean code of order

* clean code of order

* clean code of order

* clean code of order
2025-04-16 21:09:45 +02:00
MDW
da81270fb8
Qual Fix phan notices (margin) 2025-02-06 00:03:13 +01:00
Laurent Destailleur
940e42c1e4 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-01-27 01:30:34 +01:00
Regis Houssin
6ae1c60097 FIX sql error with the new sql forge filter 2025-01-25 07:50:24 +01:00
Laurent Destailleur (aka Eldy)
f708d2e184 Debug v21 2024-12-30 03:26:15 +01:00
Laurent Destailleur (aka Eldy)
152050d1a8 Debug v21 2024-12-30 03:14:20 +01:00
Frédéric FRANCE
1adc883b56
add baseline exclude for phpstan (#31632)
* add baseline exclude for phpstan

* update

* update

* update

* update

* update

* merge

* restore one filter

* delete old errors

* fix

* fix

* fix

* $moreforfilter can t be empty

* fix

* enable check

* refresh baseline

* add phpdoc

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-04 23:53:20 +01:00
MDW
e7539f2e19
Qual: Fix notices in .lib.php files (#31672)
* Qual: Fix notices in .lib.php files

* Update wrapper.php

* Update availabilities_card.php

* Update index.php

* Update document.controller.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-04 12:32:13 +01:00
Laurent Destailleur
1739acf715 CSS 2024-10-25 16:37:24 +02:00
Laurent Destailleur
f62c179b06 CSS 2024-10-24 19:27:50 +02:00
MDW
53cfbc35be
Qual: Fix several phan & stan notices (#31308)
* Qual: Fix several phan & stan notices

# Qual: Fix several phan & stan notices

Several fixes in files while fixing UnknownClass notices

* Qual: Update prepare_head PHPDoc return types

# Qual: Update prepare_head PHPDoc return types

Provide detailed array return types for prepare_head functions.

* Fix new phan notice

* Better loadLangs typing and fix call to loadLangs

* Fix new issues (stats)

* Other fixes of new issues

* Qual: update phan baseline
2024-10-14 01:59:44 +02:00
MDW
0c26110636
Qual: Fix notices related to user classes (#31291)
# Qual: Fix notices related to user classes

This fixes several notices related to user classes (and reveals
some actual bugs or inconsistent typing).
2024-10-06 13:52:05 +02:00
MDW
2d0b1de36f
Qual: Add codespell entries to catch some css typos (#31222)
# Qual: Add codespell entries to catch some css typos

Added some codespell entries based on the observed typos in css
tags
2024-10-03 19:36:59 +02:00
atm-lena
545015d27b
NEW llxHeader BodyCss divers (#30723)
Co-authored-by: atm-lena <lena.papazian@atm-consulting.fr>
2024-08-23 15:22:03 +02:00
Laurent Destailleur
140033cd80 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-08-22 14:28:56 +02:00
Laurent Destailleur
fad8cd1159 Fix #yogosha23531 Can modify invoice line margin without permission on
invoice
2024-08-22 14:28:28 +02:00
thibdrev
16681ce7b0
qual: Parameter #6 $year of function dol_mktime expects int, string given. (#30693)
* Update balance.php

* Update export.php

* Update list.php

* Update listbyaccount.php

* Update productMargins.php

* Update thirdpartyMargins.php

* Update productMargins.php
2024-08-21 00:25:00 +02:00
HENRY Florian
d551f200f2
new: when initHook() and restrictedArea() exists always execute first initHook() (#30703) 2024-08-20 23:32:43 +02:00
Laurent Destailleur
1c52869e3b Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-05 16:59:07 +02:00
boudet jean pascal
b11686a71e
correction marge rate (#30193)
Co-authored-by: jpb <jean-pascal.boudet@atm-consulting>
2024-07-04 17:11:08 +02:00
Alexandre SPANGARO
96afcaa476
Better comments (#30200)
* Fix language

* Fix language

* Fix language

* Fix language

* Fix language

* Fix language

* Fix language

* CI Missing language key

* Update eventorganization.lang

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-06-30 21:02:50 +02:00
Laurent Destailleur
675e761297 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/margin/tabs/productMargins.php
	htdocs/margin/tabs/thirdpartyMargins.php
2024-06-30 04:11:04 +02:00
Laurent Destailleur
db61320098 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/product/price.php
	htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
	htdocs/user/list.php
2024-06-30 04:05:46 +02:00
Laurent Destailleur
b2e288f8ec Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/menus/standard/eldy.lib.php
2024-06-30 03:53:16 +02:00
Laurent Destailleur
2e938fe9ef Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-24 12:44:28 +02:00
Laurent Destailleur
ac2beee9b8 Debug v20 2024-06-24 02:19:14 +02:00
lvessiller-opendsi
617cd05603
NEW filter on invoice dates in product margin tab (#29997)
* NEW filter on invoice dates in product margin tab

* NEW pagination in product margin tab

* Fix hook called twice

* fix ci errors
2024-06-19 20:21:16 +02:00