Commit Graph

749 Commits

Author SHA1 Message Date
Noé Cendrier
22729516fe NEW Add mode Customer price + level price (#31091)
* NEW: customer price and level price together

* NEW: translation

* FIX: If a price per customer exist

* FIX: do not use default price if the customer price and level price option is active

* Don't display the price level amount if the customer price is known

* FIX: double check and php cs correction

* FIX: vatrate call

* FIX: get_htmloutput_msg call

---------

Co-authored-by: Mélina JOUM <melina.joum@altairis.fr>
2024-09-25 23:18:16 +02:00
Laurent Destailleur
0222221a10 Look and feel v21 2024-09-25 12:13:55 +02:00
Laurent Destailleur
ae6e35cc84 Look and feel v21 enhancement on smartphone 2024-09-25 02:35:56 +02:00
Laurent Destailleur
bf697f83eb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2024-09-12 21:50:31 +02:00
John BOTELLA
aaa65ddf6b Fix v20 php8 patch001 (#30932)
* Fix PHP 8 notices, warninngs, fatal

* precommit
2024-09-12 21:10:01 +02:00
Laurent Destailleur
62f7e219d1 Debug css v20 2024-09-10 10:55:47 +02:00
Laurent Destailleur
43f42d08ad Fix warning 2024-09-06 14:01:55 +02:00
Frédéric FRANCE
eb04c5c427 fix phpstan (#30860)
* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan
2024-09-06 13:44:29 +02:00
Frédéric FRANCE
80d1f47d4d fix ignored phpstan (most of expects string, int given) (#30649)
* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

fix ignored phpstan

fix ignored phpstan

fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

fix ignored phpstan

fix ignored phpstan

fix ignored phpstan

fix ignored phpstan

fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* fix ignored phpstan

* more ignore

* more ignore

* more ignore

* more ignore

* more ignore

* more ignore

* more ignore

* more ignore

* more ignore

* more ignore

* more ignore

* more ignore

* more ignore

* more ignore

* more ignore

* more ignore

* more ignore

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan
2024-09-05 16:05:37 +02:00
Laurent Destailleur
bee59df23c Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-09-05 15:02:30 +02:00
Laurent Destailleur
d862b40f3d Fix warning 2024-09-05 14:25:14 +02:00
MDW
ca414de526 Qual: Fix $fields related notices with Phan (#30704)
* Qual: Typing hints/ignore directives for phan notices

* Update field typing
2024-08-21 13:23:35 +02:00
MDW
b0087aaf61 Qual: Enable phan on modulebuilder (#30652)
* Allow null for buyer, and force '' for  in printObjectLine(s)

* Allow null for Contact in show_actions_done

* Qual: Enable phan on modulebuilder

# Qual: Enable phan on modulebuilder

Most files of the modulebuilder template can be checked as regular files.
It will help improve the template

* Update baseline (enable modulebuilder notices)

* Add properties that are expected to exist on modules_boxes

* Qual: Ignore false positive (phan)

* Set phpdoc type to include null on formAddObjectLine

* Qual: Fixes for modulebuilder (phan, phpstan, bugs, format)

* Fix phpcs for intracom

* Make ModeleBoxes:showBox() signature match child class's

* Fix *box::showBox() phpdoc types

* Update index.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-08-18 18:16:08 +02:00
Laurent Destailleur
2c86c9b21b Clean code to swith to code_compta_client 2024-08-14 16:51:53 +02:00
Laurent Destailleur
79f1cc95bb Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/company.lib.php
2024-08-13 04:47:12 +02:00
Laurent Destailleur
5c36a834d1 Debug v20 - Fix sql distinct 2024-08-13 04:12:09 +02:00
MDW
45ed4caeb2 Qual: Enable Phan Simplify rule and fix notices (#30537)
* Qual: Phan - Enable Simplyfy expression

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Qual: Simplify expression (phan notice)

* Update functions2.lib.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-08-07 03:05:02 +02:00
MDW
46eb5f83c2 Qual: Updates for phpstan notices (#30509)
* Fix int<0> typing to int<0,0> for phpstan

* Fix phpdoc for phpstan

* Fix phpdoc for phpstan

* Qual: Several phpstan notice fixes

* Fix phpdoc

* Qual: totalpaid is never null, remove null test

* improve phpdoc typing

* Also return null to statisfy phpstan

* Allow null value for $var

* object->Object to make it meaningful

* Type EvalMathStack properties

* Comment out unused private methods (phpstan)

* Changes for phpstan (return values, phpdoc, code)

* Change order of tests for phpstan

* phpdoc object to Object for correct typing

* Typing hing for phpstan

* UPdate test for phpstan

* Change phpdoc position for phpstan

* Update phpdoc for phpstan

This needs further improvement

* Change $op to $ope to fix phpstan

* Update sqlite3.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-08-01 12:59:45 +02:00
atm-jonathan
f6194ba3e5 New col showuserlogin contact (#30223)
* hook retour completeListOfReferent

* add showuserlogin in burger contact.php

* space pre-commit
2024-07-01 12:57:27 +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
769240d5bb Debug v20 2024-06-27 03:26:35 +02:00
Laurent Destailleur
34aea4b5bc Debug v20 2024-06-27 00:49:50 +02:00
Laurent Destailleur
70d28f514e css 2024-06-19 03:34:06 +02:00
Laurent Destailleur
82614d7fca Debug v20 2024-06-15 18:55:17 +02:00
Laurent Destailleur
82908a30eb Clean phan warnings 2024-05-30 13:37:17 +02:00
Laurent Destailleur
386a40b4a6 Debug look and feel v20 - Fix groupby in kanban 2024-05-29 23:23:20 +02:00
Laurent Destailleur
92f6539744 Use dolPrintHTML() 2024-05-15 18:21:50 +02:00
Laurent Destailleur
4a2db9698d NEW Can show the legal form in address of recipient in PDF 2024-05-09 14:55:50 +02:00
Laurent Destailleur
934a849463 Debug v20 2024-05-08 16:01:00 +02:00
Laurent Destailleur
283f16234f Debug v20 2024-05-03 01:02:40 +02:00
MDW
2115980560 Qual: Fix Phan notices in CommonObject (#29354)
* Fix PhanPluginSimplifyExpressionBool in commonobject

* Fix commonobject for phan notices

* Allow null for $usedolidb argument

* Allow null for $outputlangs argument of \dol_format_address()

* Fix multiple phan notices

* Ignore PhanTypeArraySuspiciousNullable

* Fix PhanTypeMismatchArgumentProbablyReal

* Update baseline

* Improve typings

* Update type specification getCountry/withCode

* Fix CommonObject Phan notices & update baseline

* Fix phan notices

* Correct typing for showInputField to be the same as parent class

* Fix PhanPluginSimplifyExpressionBool in commonobject

* Fix commonobject for phan notices

* Allow null for $usedolidb argument

* Allow null for $outputlangs argument of \dol_format_address()

* Fix multiple phan notices

* Ignore PhanTypeArraySuspiciousNullable

* Fix PhanTypeMismatchArgumentProbablyReal

* Update baseline

* Improve typings

* Update type specification getCountry/withCode

* Fix CommonObject Phan notices & update baseline

* Fix phan notices

* fixup! Correct typing for showInputField to be the same as parent class
2024-05-02 19:33:51 +02:00
Laurent Destailleur
e3daa23949 Look and feel v20 2024-04-30 09:45:28 +02:00
Laurent Destailleur
74c3b58a33 Debug v20 2024-04-29 18:50:54 +02:00
Laurent Destailleur
6917b7ce4d Debug v20 2024-04-29 17:50:58 +02:00
Laurent Destailleur
b8b964169a Merge 2024-04-27 03:32:22 +02:00
atm-irvine
0bcce7171b FIX : Row size of role contact in thirdparty (#29456) 2024-04-24 21:18:36 +02:00
Laurent Destailleur
1e3b2c6a7c Try to fix GETPOSTINT regressions 2024-04-19 13:34:48 +02:00
Laurent Destailleur
612e41a8ca Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/commondocgenerator.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/commande/card.php
	htdocs/install/mysql/migration/19.0.0-20.0.0.sql
	htdocs/product/stock/replenish.php
	htdocs/takepos/invoice.php
2024-04-18 02:48:52 +02:00
Laurent Destailleur
22bd31e4fa Doc 2024-04-17 13:10:09 +02:00
boudet jean pascal
3076b6ad40 fix 500 error count array (#29337)
* fix error 500  on array count

* fix pre-commit error

* Update html.form.class.php

---------

Co-authored-by: jpb <jean-pascal.boudet@atm-consulting>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-04-12 14:44:54 +02:00
Charlène Benke
e4657c6b03 MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES error (#29010)
* MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES error

if we enable MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES we disable the native contact tabs

* Update companies.lang

* Update companies.lang

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-04-08 12:13:38 +02:00
Laurent Destailleur
363a083c54 Look and feel v20 2024-03-19 15:34:47 +01:00
Laurent Destailleur
aebbb97627 Update company.lib.php 2024-03-19 14:05:40 +01:00
Jon Bendtsen
779aeee323 Merge branch 'develop' into fix_notification_count 2024-03-19 08:16:01 +01:00
MDW
d30b2d0362 Fix default in $fields init 2024-03-19 00:32:03 +01:00
Jon Bendtsen
fce674e347 precommit check failed 2024-03-18 22:42:57 +01:00
Jon Bendtsen
1a35b20cb7 only counts notifications for existing contacts. SQL code copy from htdocs/societe/notify/card.php 2024-03-18 22:28:10 +01:00
MDW
9eed23c6d0 Fix return type by cast or typing update
# Fix return type by cast or typing update

Fix most PhanTypeMismatchReturn notifications.

The remaining ones are likely real bugs or need more Dolibarr
knowledge to fix them efficiently
2024-03-16 13:52:12 +01:00
Laurent Destailleur
e6a6142b8b Merge pull request #28831 from lamrani002/addDeleteForContact
NEW function for removing company contacts
2024-03-15 15:25:24 +01:00
MDW
e36dccff59 Qual: better typing for getCountry() 2024-03-15 10:12:48 +01:00