Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
143,484 Commits 36 Branches 189 Tags
a90f0863de1a619a67ca19c20ed4484f94ece834
Commit Graph

14986 Commits

Author SHA1 Message Date
Laurent Destailleur
9dc1c6f8f4 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-09-26 03:38:49 +02:00
Laurent Destailleur
b1a235b810 Prepare code to allow ECM access to externale users 2024-09-26 02:36:36 +02:00
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
lvessiller-opendsi
e4a93da82e FIX mysql error during dump for enable sandbox M999999 (#31116) 2024-09-25 22:54:31 +02:00
Regis Houssin
28df02f039 FIX avoid odt errors (#31126) 2024-09-25 22:52:25 +02:00
Laurent Destailleur
b32225283d Merge branch '20.0' of github.com:Dolibarr/dolibarr into develop 2024-09-25 22:32:36 +02:00
Frédéric FRANCE
a94cff63a7 fix phpstan (#31102) 
* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan
 2024-09-25 22:21:31 +02:00
Frédéric FRANCE
4b4d629b71 fix phan for branch 20.0 (#31105) 
* fix phan

* Update card.php

* Update card.php

* Update main.lang

* Update card.php

* Update card.php
 2024-09-25 22:17:40 +02:00
Laurent Destailleur
e0e0b669a9 FIX edit contract of intervention broken by CSRF protection 2024-09-25 19:37:32 +02:00
Laurent Destailleur
336b723ab8 FIX edit contract of intervention broken by CSRF protection 2024-09-25 19:37:01 +02:00
Laurent Destailleur
ae6e35cc84 Look and feel v21 enhancement on smartphone 2024-09-25 02:35:56 +02:00
Laurent Destailleur
cc95331fc6 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-09-23 22:09:24 +02:00
Laurent Destailleur
7b5c4b2e99 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-09-23 21:57:16 +02:00
Laurent Destailleur
c10e968600 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-09-23 21:52:08 +02:00
Laurent Destailleur
2f773e9326 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-09-23 21:45:03 +02:00
Frédéric FRANCE
a82410706c fix phpstan (#31088) 
* fix phpstan

* fix phpstan
 2024-09-23 15:01:02 +02:00
Laurent Destailleur
eee62347af Fix CSS 2024-09-23 14:19:51 +02:00
Laurent Destailleur
dcc8bc9936 Fix CSS 2024-09-23 14:10:24 +02:00
Laurent Destailleur
50fba3e99e Fix log level 2024-09-23 13:54:48 +02:00
Laurent Destailleur
f0824ebeac Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-09-23 13:06:56 +02:00
Laurent Destailleur
6a6b97dc92 Fix CSS 2024-09-23 12:46:29 +02:00
MDW
5e02bec9df Qual: Fix getTooltipContentArray typing hints (#31081) 
* Qual: Fix getTooltipContentArray typing hints

# Qual: Fix getTooltipContentArray typing hints

This defines the aray type for all getTooltipContentArray occurences

* Ignore undeclared property ref_supplier (does not exist on OrderLine)
 2024-09-23 03:24:19 +02:00
Frédéric FRANCE
000173c7b9 fix phpstan (#31075) 
* 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

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-09-23 01:59:14 +02:00
MDW
7b4c4d772c Qual: Fix notices for FormSms, RssParser, ExpenseReportIk and related (#31086) 
* Qual: Fix Array of tabs typing hints

# Qual: Fix Array of tabs typing hints

Fixed same typing hints accross several files

* Qual: Fix pdf.lib.php, project.lib.php and related files

# Qual: Fix pdf.lib.php, project.lib.php and related files

Fix most phan notices for pdf.lib.php and project.lib.php.
And fixed some items in other files in the process

* Qual: Fix notifications commande/card advtarget.tpl fichinter/card societe/card supplier_proposal/card

* Qual: Fix notices for FormSms, RssParser, ExpenseReportIk and related

# Qual: Fix notices for FormSms, RssParser, ExpenseReportIk and related

Fix notices in the files for the classes above and other files to accomodate
these changes/fixes
 2024-09-23 00:37:30 +02:00
HENRY Florian
61c5a61623 fix: better error reporting in CMailFile (#31058) 2024-09-20 17:46:52 +02:00
Laurent Destailleur
55383bbf62 Fix phan 2024-09-20 17:34:48 +02:00
MathildeMar
72cf841677 Check that the method fetch_thirdparty() exists 2024-09-20 11:06:24 +02:00
Laurent Destailleur
84e5f5e7b4 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-09-20 02:51:59 +02:00
Laurent Destailleur
401c9898bb Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-09-20 02:46:03 +02:00
Laurent Destailleur
87adbbb769 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-09-20 02:39:55 +02:00
Frédéric FRANCE
aaa3c8336e fix phpstan (#31006) 
* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-09-20 02:20:33 +02:00
Frédéric FRANCE
32a85608f6 fix phpstan (#31010) 
* fix phpstan

* fix phpstan

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-09-20 02:18:08 +02:00
John BOTELLA
786ae29440 Add hidden conf PRODUCT_SEARCH_AUTO_SELECT_IF_ONLY_ONE (#31032) 2024-09-20 01:51:13 +02:00
Frédéric FRANCE
82f947effe fix phpstan (#31030) 
* fix phpstan

* fix phpstan
 2024-09-20 00:32:44 +02:00
Laurent Destailleur
c340c34aeb FIX Hide a feature that is a security vulnerability. 2024-09-20 00:19:36 +02:00
Laurent Destailleur
ed8560ca07 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-09-19 22:51:52 +02:00
Laurent Destailleur
0ba26aacdd FIX Debug option WORKFLOW_TICKET_LINK_CONTRACT. Bad id stored. Bad 
condition to activate it. Bad position in setup. Bad selection of
catrogy on setup.
 2024-09-19 22:51:33 +02:00
Laurent Destailleur
cf931a8a90 FIX retreiving user specific constant 2024-09-19 14:27:08 +02:00
Laurent Destailleur
f00a07e564 FIX Translation of widget label into combo 2024-09-19 13:29:07 +02:00
MathildeMar
2fd6be2112 Bug fix: substitution variables in notification of a quote signed by customer 
Add fetch_thirdparty before getCommonSubstitutionArray to initialize substitution variables of type __THIRDPARTY_XXX__ in notification mails
 2024-09-19 10:56:42 +02:00
Laurent Destailleur
26b7c59fc6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-09-18 13:29:01 +02:00
Laurent Destailleur
c03cba8748 Clean code 2024-09-18 12:08:51 +02:00
MDW
099dbd9c1e Qual: Fix notices for htdocs/admin/* (#30982) 
* Fix (Possibly)UndeclaredGlobalVariable

* Update phan baseline

* Fix (Possibly)UndeclaredGlobalVariable (2)

* Qual: Fix notices for htdocs/admin/*

# Qual: Fix notices for htdocs/admin/*

Fixes most phan/phpstan noticies for files under htdocs/admin/* and ai.
 2024-09-18 03:27:25 +02:00
Benjamin Falière
dcba3347d8 Retroport: FIX determine multi-currency price on object line create tpl (#28021) (#30535) 
* NEW determine multi-currency price on object line create tpl (#28021)

* Update html.form.class.php

---------

Co-authored-by: lvessiller-opendsi <lvessiller@open-dsi.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-09-18 03:22:38 +02:00
Frédéric FRANCE
d5fe4f998a fix phpstan (#30989) 
* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan
 2024-09-18 02:45:54 +02:00
Frédéric FRANCE
3ecae791e1 fix indexFile on update (#30998) 2024-09-18 00:59:47 +02:00
lamrani abdelwadoud
5fcca27fc4 NEW display when click on NEWS templateDrop down for model (#30332) 
* New update for templateMail by creating files

* New updating for get php content

* Update html.formmail.class.php

* Fix updating content news

* Fix CTI Errors

* edit html file for news

* NEW display for news with option

* replace file in ajax folder

* fix multiselect news

* Fix phan errors and remove part of useless css

* Fix brakets needed in script

* Fix Phan errors

* Fix display multiselect and fix security injection

* cancel removing part of code for classe modelMail

* Fix phstan errors

* Fix space line

* Fix error phpStan

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-09-17 15:37:34 +02:00
Laurent Destailleur
925665196c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-09-17 10:30:21 +02:00
Laurent Destailleur
8007e6ff86 NEW Can set date of transmission in 1 click when validating SEPA 
transfer file
 2024-09-17 10:29:57 +02:00
Frans Bosman
93aa372c22 Update html.form.class.php (#30952) 
* Update html.form.class.php

When using the hook selectProduitsFournisseurListOption and there is no supplier-price found the fk_soc will be empty so in the hook-code you don't know which supplier the order is for

* Update html.form.class.php

* Update html.form.class.php

* Update html.form.class.php

* Update html.form.class.php

* Update html.form.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-09-17 03:08:02 +02:00