Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
139,032 Commits 36 Branches 189 Tags
21f9d417cdeb43af1caf2c8b51a6a0908ebe2fbe
Commit Graph

8726 Commits

Author SHA1 Message Date
Laurent Destailleur
feee2e13e7 CSS 2024-07-28 20:05:10 +02:00
Laurent Destailleur
9e01c45df6 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-28 16:56:07 +02:00
Laurent Destailleur
e5e1f385b5 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-07-28 16:49:12 +02:00
Laurent Destailleur
75d1fbc49f Debug v20 - fix cond to show dict, several fix in public ticket gui 2024-07-28 15:02:08 +02:00
Laurent Destailleur
7d1aa1e7f6 Debug v20 - fix cond to show dict, several fix in public ticket gui 2024-07-28 14:54:06 +02:00
sonikf
4ffb024369 fix #30456 add Not Validated warning when in draft, remove pointless info (#30475) 
* fix #30456 add Not Validated warning when in draft, remove pointless info

* fix Dolibarr#30456 add Not Validated warning when in draft, remove pointless info

* remove whitspace
 2024-07-26 12:12:06 +02:00
Laurent Destailleur
c9b92bb32d Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-25 18:21:47 +02:00
Laurent Destailleur
6b076821e3 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-07-25 18:20:01 +02:00
Laurent Destailleur
f4611fcec9 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-07-25 18:06:37 +02:00
Thibault Fiacre
7c9e6b1fb9 FIX lang output for sales representative on PDF (#30469) 2024-07-25 17:56:13 +02:00
Laurent Destailleur
b494d26f95 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-25 14:51:48 +02:00
Regis Houssin
a1ed02fa6d Fix 20 missing entity filter (#30466) 
* FIX missing entity filter for holiday types dict

* FIX wrong table name for field name

* FIX wrong table name (travis error)
 2024-07-25 14:30:07 +02:00
Laurent Destailleur
74cbae2579 Code comment 2024-07-25 14:28:18 +02:00
atm-adrien
862befbed5 FIX : Bom tables were not created when we activate the module (#30464) 2024-07-25 14:25:22 +02:00
Regis Houssin
df932f7fea FIX to avoid error during upgrade with pgsql (#30443) 2024-07-24 20:32:32 +02:00
Laurent Destailleur
5eb0e0785a Fix phan 2024-07-24 18:03:53 +02:00
Laurent Destailleur
f1cfbb68c6 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-22 11:23:41 +02:00
Laurent Destailleur
53bca480a1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2024-07-21 14:56:20 +02:00
Laurent Destailleur
1bb6be158b CSS 2024-07-21 02:45:42 +02:00
Eric - CAP-REL
799f9f5e08 new option for elephant (#30273) 
* new option for elephant

* fix typo in comment for codespell check

* Update mod_codeclient_elephant.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-07-21 02:29:03 +02:00
MaximilienR-easya
66d8bc4f01 NEW Module to setup OpenID Connect module (#30317) 
* import openid connect custom module phase 1

* indent fix

* fix ci

* Fix ci

* Fix

* add missing lang file

* lang file

* Multiple fix: callback url overwriten by a js.php from a module, admin page path fix, add a field to set MAIN_AUTHENTICATION_OIDC_LOGIN_CLAIM

* windows-ci friendly modification

* windows-ci friendly modification

* comment

* Fix precommit

* Fix precommit

* Fix precommit

* Fix precommit

* Update lang file and conditions

* Update functions_openid_connect.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-07-21 02:12:03 +02:00
Laurent Destailleur
0dbc872af7 Debug v20 2024-07-20 16:24:21 +02:00
Laurent Destailleur
1496043967 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-18 19:17:46 +02:00
Laurent Destailleur
9e45367826 Code comment 2024-07-18 17:26:18 +02:00
Laurent Destailleur
6213c167fd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-18 02:44:55 +02:00
Laurent Destailleur
a39d55474f Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-18 02:44:35 +02:00
Laurent Destailleur
b303be54fd Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-07-18 02:41:28 +02:00
lamrani abdelwadoud
56667da139 New Export stock inventory (#30401) 
* New Export stock with correction

* Fix Travis CI errors
 2024-07-18 00:45:23 +02:00
Laurent Destailleur
7a57b704cc Fix phan 2024-07-17 14:53:14 +02:00
Laurent Destailleur
948fecb9b5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2024-07-17 14:01:44 +02:00
Alexandre SPANGARO
26eb9b4948 Situation invoice - Fix column title (#30406) 2024-07-17 13:45:51 +02:00
Sami Filali
22def4f35a Fix #30298 - billing contact in supplier proposal (#30404) 
* add external contact with billing code in supplier_proposal pdf

* update with pr returns

* Update pdf_other.php

* fix inversing condition

* Update pdf_other.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-07-16 22:35:09 +02:00
Sami Filali
4aa5e4578a NEW : add option to add external billing contact on the supplier_proposal pdf (#30298) 
* add external contact with billing code in supplier_proposal pdf

* update with pr returns

* Update pdf_other.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-07-16 22:09:39 +02:00
Laurent Destailleur
d9962e22ee FIX Import of date with type field from excel files does not work. 2024-07-16 21:38:40 +02:00
Laurent Destailleur
150e162022 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-13 18:22:59 +02:00
Alexandre SPANGARO
388ac640f6 Situation invoice - Missing Category of operations in Octopus head (#30356) 2024-07-13 18:14:36 +02:00
Laurent Destailleur
5661a381ee Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/projet/tasks/time.php
 2024-07-13 17:47:55 +02:00
Laurent Destailleur
305406d802 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2024-07-13 17:45:13 +02:00
Laurent Destailleur
88ee5ec89a Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-07-13 17:41:37 +02:00
lvessiller-opendsi
09fdb887bb FIX expedition PDF models using units labels (#30358) 2024-07-13 17:18:05 +02:00
Laurent Destailleur
ba08148ffa Clean code 2024-07-13 01:38:02 +02:00
Frédéric FRANCE
2707475a12 fix phpstan (#30319) 
* fix phpstan

* fix phpstan expects int, false given ...

* fix phpstan expects int, true given ...
 2024-07-08 21:45:35 +02:00
Frédéric FRANCE
ea416aac93 replace old syntax, rename pdf models with same class name (#30271) 
* replace old syntax

* replace old syntax

* replace old syntax

* replace old syntax

* rename files with same class name

* rename files with same class name

* rename files with same class name

* rename files with same class name

* rename files with same class name

* rename files with same class name

* rename files with same class name

* rename files with same class name

* rename files with same class name

* rename files with same class name

* rename files with same class name

* fix class with same name

* fix class with same name

* clean code
 2024-07-06 02:59:40 +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
Frédéric FRANCE
29f223fd3c fix checkFunctionArgumentTypes (#30249) 
* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes
 2024-07-04 17:47:31 +02:00
Laurent Destailleur
9af159cdd8 Replace "! empty($conf->global->$" with "getDolGlobalString($" 2024-07-03 20:05:29 +02:00
Laurent Destailleur
8b6ef4dfe0 Fix PDF_LOCALTAXx_LABEL_IS_CODE_OR_RATE 2024-07-03 15:25:19 +02:00
Laurent Destailleur
89d102c2b1 Quick hack to allow to hide vat rate 2024-07-03 14:27:57 +02:00
Vincent de Grandpré
b0cd32bf68 NEW Implementing Billable tasks on projects using new attribute "billable" (#30092) 
* Implementing Billable task function on projects using new attribute in #30014

* added billable to Task->initAsSpecimen()

* default billable to 1 in initAsSpecimen

* set billable to 1 in ProjectTest::testTaskCreate

* Moving attribut usage in usage_bill_time condition of project

* PPDoc

* fusion

* pre-commit + typo

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-07-03 03:29:05 +02:00
Frédéric FRANCE
2f5647e4e3 fix checkFunctionArgumentTypes (#30234) 
* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* add ignore

* add ignore

add ignore

add ignore

add ignore

add ignore

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes
 2024-07-03 02:30:53 +02:00