Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
136,464 Commits 36 Branches 189 Tags
bb2cd79657139632ad51ec40bcadd1a40bfa536e
Commit Graph

1247 Commits

Author SHA1 Message Date
Laurent Destailleur
c03617d5b7 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-08-27 04:46:30 +02:00
Laurent Destailleur
a44d7ff236 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-08-27 04:37:43 +02:00
Laurent Destailleur
70660d778f Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-08-27 04:37:00 +02:00
Shanty
e7e96f650a FIX #30768 allocate the correct invoice_line_id to the element timespent (#30769) 2024-08-27 03:02:43 +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
Regis Houssin
ad74c915b9 FIX missing $object and $action for hook parameters (#30484) 
* FIX missing $object and $action for hook parameters

* FIX same missing and wrong object name

* FIX again the same missing

* FIX uniformize hook parameters
 2024-07-28 16:35:18 +02:00
Florent Poinsaut
23eeabe476 FIX #30362 Fix an user with user->rights->projet->lire can see task 
time from other user on all project (#30363)

Conflicts:
	htdocs/projet/tasks/time.php
 2024-07-13 17:40:55 +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
f64e4b4981 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-06-29 20:53:10 +02:00
Laurent Destailleur
856b23ddcb trans 2024-06-24 13:22:31 +02:00
Eric - CAP-REL
cbba014355 fk_product could be = -1 then line added is not linked to selected pr… (#30013) 
* fk_product could be = -1 then line added is not linked to selected product

* more clear conditions

* idprod could be set if prev dropdown menu was used
 2024-06-15 16:27:54 +02:00
Frédéric FRANCE
eecfb5fb43 fix phpstan (#30032) 2024-06-15 15:07:15 +02:00
Frédéric FRANCE
1ff0e8a821 fix an old error (#29850) 
* fix an old error

* fix OdfException is never thrown in the try block

* fix OdfException is never thrown in the try block

* fix Undefined array key "name"

* fix missing translation

* fix missing translation

* fix Undefined variable $lineid

* fix warnings

* fix upload dir

* fix phpcs
 2024-06-08 16:59:40 +02:00
Laurent Destailleur
cbb458486b Debug v20 2024-06-06 09:27:25 +02:00
Lucas Marcouiller
5b6bbb3479 Fix param after task merge time (#29847) 
Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
 2024-06-05 14:55:24 +02:00
Frédéric FRANCE
6393f9f7c2 fix cti (#29839) 2024-06-04 19:27:00 +02:00
Laurent Destailleur
48c5d9b0bc Debug v20 2024-05-29 12:26:04 +02:00
Laurent Destailleur
e2e96d4d75 Debug v20 2024-05-29 01:10:56 +02:00
Laurent Destailleur
354f59a6b0 Debug v20 2024-05-29 00:56:56 +02:00
Laurent Destailleur
d723abc487 Debug v20 2024-05-28 23:52:33 +02:00
Laurent Destailleur
2256b267d7 Debug v20 2024-05-24 14:11:51 +02:00
Laurent Destailleur
5ece9f288f Debug v20 2024-05-24 13:32:52 +02:00
Laurent Destailleur
66f4562300 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-05-23 14:50:17 +02:00
Laurent Destailleur
a854e58905 FIX Missing $param in hook call for list 2024-05-23 14:41:56 +02:00
lumb2019
60ab439e96 NEW Adds payment terms and procentual discount to the creation of an invoice from time entries in projects (#29694) 
* Update time.php

* Update time.php

* Update time.php

* Update time.php

* Update time.php

* Update time.php
 2024-05-21 20:14:27 +02:00
Laurent Destailleur
27bc1cddad Debug v20 2024-05-08 15:43:46 +02:00
Laurent Destailleur
fa86f753f6 Debug v20 2024-05-05 18:04:46 +02:00
Laurent Destailleur
e3daa23949 Look and feel v20 2024-04-30 09:45:28 +02:00
Laurent Destailleur
1908d6cf98 Look and feel v20 - All combo of categories are using the colored picto 2024-04-24 02:40:53 +02:00
Laurent Destailleur
1e3b2c6a7c Try to fix GETPOSTINT regressions 2024-04-19 13:34:48 +02:00
Lucas Marcouiller
232800d776 NEW feature to merge 2 tasks (#29214) 
* first push select not saved

* add working merge

* ass merge of contact for task

* fix typo

* add of merge timespent

* Fix integration error + use of good SelectTasks

* fix precommit

* Fix CI

* fix CI

* fix bad change

* fix to make merge only an update

* remove useless field update

* fix empty array

* fix CI

* fix unused code

---------

Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
 2024-04-08 20:50:16 +02:00
Laurent Destailleur
2947287e3f Look and feel v20 2024-04-03 16:22:16 +02:00
Laurent Destailleur
ab093510fb Responsive 2024-04-03 15:40:24 +02:00
Charlène Benke
917ab9b454 totalarray must not reinit here 
else we lose the setting on line 980
and have warning at the total list line
 2024-03-31 14:49:43 +02:00
Frédéric France
7a7b1953ed fix phpstan 2024-03-28 20:34:33 +01:00
Frédéric France
3535623ffc fix phpstan 2024-03-28 20:27:56 +01:00
Laurent Destailleur
e73f79ca96 Qual: Remove unnecessary use of $_GET 2024-03-28 20:19:28 +01:00
Laurent Destailleur
7535a884ac Merge pull request #29069 from mdeweerd/fix/price 
Fix arguments to price()
 2024-03-28 13:07:25 +01:00
Laurent Destailleur
a2ec7400eb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2024-03-28 10:55:44 +01:00
Laurent Destailleur
3867f00f90 Debug v20 2024-03-28 09:28:58 +01:00
MDW
7b321f8ae5 Fix arguments to price() 2024-03-27 10:21:27 +01:00
Laurent Destailleur
50aadc43f9 NEW Upgrade jsChantImproved to 2.8.10 2024-03-23 17:18:11 +01:00
Laurent Destailleur
51a3641105 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/bom/tpl/objectline_create.tpl.php
	htdocs/compta/bank/releve.php
	htdocs/core/class/html.formsetup.class.php
	htdocs/takepos/freezone.php
 2024-03-22 02:35:37 +01:00
MDW
aeefca7e7e Fix $arrayfields typing lost by dol_sort_array() by forcing the type 2024-03-20 23:29:48 +01:00
MDW
0969343d15 Fix arg to strcmp with cast 2024-03-20 04:09:56 +01:00
MDW
3c67a1288a Fix PhanPluginMixedKeyNoKey by using explicit keys 2024-03-12 21:35:52 +01:00
MDW
6dbabaa514 Fix: Ensure string type for urlencode() 2024-03-09 16:56:41 +01:00
MDW
6cfd577465 Fix: Ensure string type for urlencode() 2024-03-09 16:56:40 +01:00
MDW
3b57795895 Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0) (#28718) 
* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* New: Fixer for selectDate '' arguments h, m and empty

* Qual: Update codespell exceptions
 2024-03-09 01:04:15 +01:00