2
0
forked from Wavyzz/dolibarr
Commit Graph

104 Commits

Author SHA1 Message Date
MDW
fda0d5b5da Fix arg type to trim() with cast 2024-03-20 04:09:42 +01:00
Laurent Destailleur
c867bc2706 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-03-13 22:36:45 +01:00
Ferran Marcet
6679565638 Fix: Error in the treatment of the date and the name of the variable 2024-03-12 17:01:59 +01:00
Laurent Destailleur
ce010a54c7 Clean code and prepare a more powerfull phpunit check for sql forging. 2024-03-05 00:22:12 +01:00
Frédéric FRANCE
fba15178eb all initAsSpecimen return int (#28577)
* all initAsSpecimen return int

* all initAsSpecimen return int

* all initAsSpecimen return int
2024-03-02 16:38:35 +01:00
thibdrev
f7f9dfd77c qual: phpstan - Property CommonObject::$tms (int) does not accept string. (#28247)
* Update paymentdonation.class.php

* Update paymentexpensereport.class.php

* Update productbatch.class.php

* Update propalmergepdfproduct.class.php

* Update productstockentrepot.class.php

* Update stocktransfer.class.php

* Update dolresource.class.php

* Update paymentsalary.class.php

* Update salary.class.php
2024-02-18 14:56:31 +01:00
Frédéric FRANCE
5f1c679142 fix warning (#28177)
* fix warning

* clean properties

* clean properties
2024-02-15 13:59:19 +01:00
MDW
7b54824d49 Fix #28071 - New branch to fix bad merge (#28083)
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

* Qual: Introduce getDataToShowPhoto to prepare generic code

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Fix missing trans

* Fix langs

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Remove useless files in web templates

* Clean code

* Fix duplicate translation key

* Fix duplicate translation key

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Fix duplicate key

* Fix $object

* Debug v19

* WIP SMSing

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* WIP EMAILINGS_SUPPORT_ALSO_SMS

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* WIP SMSing

* Debug the "validate" feature

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Clean code

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

* Enhance rector to fix empty($user->rights->modulex->perm1)

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

* Fix template to use v19 dev rules

* Fix use v19 dev rules

* Fix phpunit

* Debug v19

* Clean code

* Use rector to convert user->rights into user->hasRight

* Clean code

* Use rector to convert user->rights into user->hasRight

* Use rector to convert user->rights into user->hasRight

* Clean code

* Fix phpcs

* add editorconfig for sql files (#27999)

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* add model_pdf field in llx_ticket-ticket.sql (#27996)

* add model_pdf field in llx_ticket-ticket.sql

* Update 19.0.0-20.0.0.sql

* Update 19.0.0-20.0.0.sql

* Improve wording in README (#27994)

* fix phpstan (#27989)

* fix phpstan

* Update UserRightsToFunction.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* Qual: Fix spelling/working in datapolicy translations (#28006)

# Qual: Fix spelling/wording in datapolicy translations

Fixed some spelling and wording in datapolicy translations.

* qual: phpstan for htdocs/ticket/class/ticketstats.class.php (#27986)

htdocs/ticket/class/ticketstats.class.php	98	Parameter #1 $year (string) of method TicketStats::getNbByMonth() should be compatible with parameter $year (int) of method Stats::getNbByMonth()

* Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop

* Fix user with readonly perm on email template must be able to read.

* Fix doc

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Better message

* Add missing fields in merge of thirdparty

* Debug v19 selection of ticket printer per terminal

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Use constant

* NEW: Adding a recipient on emails sent, change status to sent partialy.

* fix travis (#28052)

* fix travis

* Update partnership.class.php

* fix php doc (#28047)

* fix undefined array key (#28048)

* Add region and departament for Cuba (#28046)

* Update llx_10_c_regions.sql

Add Cuba Regions (id_country=77)

* Update llx_20_c_departements.sql

Add Provinces Cuba (id country=77)

* Find the typo (#28050)

* Find the typo

* clean code

* add last_main_doc field to product (#28045)

* add las_main_doc field to product

* add field fetch

* NEW Add Categorie filter for ActionComm (#28041)

* New Add Categorie filter for ActionComm

New Add Categorie filter for ActionComm

* Fix space errors

Fix space errors

* Fix space errors 2

Fix space errors 2

* Update cunits.class.php (#28056)

FIX: error SQL when creating a Cunit

* Update codespell-lines-ignore.txt to avoid PR merge conflict

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
Co-authored-by: Frédéric FRANCE <frederic34@users.noreply.github.com>
Co-authored-by: thibdrev <thibault.drevet@gmail.com>
Co-authored-by: sonikf <93765174+sonikf@users.noreply.github.com>
Co-authored-by: Ikarus <44511582+LeKarSol@users.noreply.github.com>
Co-authored-by: Anthony Damhet <73399671+EchoLoGeek@users.noreply.github.com>
Co-authored-by: Quentin-Seekness <72733832+Quentin-Seekness@users.noreply.github.com>
2024-02-09 15:58:49 +01:00
Laurent Destailleur
5d3c775b69 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2024-01-18 12:19:08 +01:00
Francis Appels
7fb2d570c3 Fix default lot number not shown in mode SHIPPING_DISPLAY_STOCK_ENTRY_DATE 2024-01-17 10:55:08 +01:00
MDW
39769482b1 Qual: Fix typing hints for DoliDB (#27484)
# Qual: Fix typing hints for DoliDB

This should help the static tools for type and method checking.
2024-01-13 15:50:02 +01:00
Frédéric FRANCE
67b9e453a1 fix phpstan (#27489) 2024-01-13 15:30:07 +01:00
MDW
0395718521 Qual: Spelling htdocs/p[b-z]* (#27436)
# Qual: Fix spelling htdocs/p[b-z]*

Highlight:

Probably fixes a bug:
htdocs/product/stock/replenish.php: empty(->variants->eabled) corrected to ...enabled.
'eabled' could not be found elsewhere in the codebase.
2024-01-12 17:55:52 +01:00
Francis Appels
d36733d79b Fix php warning 2024-01-03 19:54:15 +01:00
Frédéric FRANCE
61b79fda17 avoid phpstan error with phpdoc 2023-12-06 15:46:39 +01:00
Laurent Destailleur
4daacd3371 Fix with php-cs-fixer 2023-12-04 13:49:31 +01:00
Frédéric FRANCE
53c8a3acf8 clean phpdoc for phpstan (#26905) 2023-12-01 19:51:32 +01:00
Laurent Destailleur
e8dc651877 Fix php8.2 warnings 2023-11-27 11:56:32 +01:00
lvessiller-opendsi
5fdfa4b971 NEW order by batch number in product batch find all method (#26486)
* NEW order by batch number in product batch find all method

* Remove const PRODUCTBATCH_ORDER_BY_BATCH_NUMBER
2023-11-14 02:47:12 +01:00
andreubisquerra
0214df1fbd fk_entrepot fix (#26465) 2023-11-06 00:36:49 +01:00
Laurent Destailleur
0562f89347 Can find a stock id from a couple batch-warehouse 2023-11-01 15:35:29 +01:00
Laurent Destailleur
c0f04dc078 Debug v19 2023-10-17 15:51:35 +02:00
Laurent Destailleur
2fdf26731b Fix php8 error 2023-10-16 21:35:00 +02:00
Laurent Destailleur
cdf53e402e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-10-16 20:57:07 +02:00
VIAL-GOUTEYRON Quentin
61afa1c84b NEW : conf to display date entry stock exped and sort in date order (#22625)
* NEW : Date d'entree en stock sur les exped au moment de la création

* add en trad

* Ajout conf pour la date d'entree en stock

* add trad

* trad

* Fixing style errors.

* modif for only full group by

---------

Co-authored-by: stickler-ci <support@stickler-ci.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-16 18:38:37 +02:00
Laurent Destailleur
b1e0b317c9 Debug v18 2023-06-29 13:16:44 +02:00
Laurent Destailleur
7525aea76c Debug v18 2023-04-01 14:38:07 +02:00
FLIO
156922fc51 Fix (qodana) Incompatible return type 2023-02-14 14:09:56 +01:00
Laurent Destailleur
77d6b9510b Clean code 2022-12-28 13:04:11 +01:00
Laurent Destailleur
36e1bfb297 NEW Option PRODUCTBATCH_SHOW_WAREHOUSE_ON_SHIPMENT showing wh on PDF 2022-09-21 00:50:04 +02:00
Laurent Destailleur
cbead0fa5a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/class/productbatch.class.php
2022-06-02 19:39:42 +02:00
Laurent Destailleur
f9f902f7f4 # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-06-02 19:37:47 +02:00
Laurent Destailleur
867168fcf4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-06-02 19:35:58 +02:00
Laurent Destailleur
12f3c016d3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-06-02 19:35:03 +02:00
Laurent Destailleur
6f83c8c6f3 Update productbatch.class.php 2022-05-24 21:22:14 +02:00
atm-greg
8213756c37 fix sql to avoid getting product_stock of another product with same batch 2022-05-24 16:49:55 +02:00
Laurent Destailleur
a08bbd6acd Fix regression 2022-03-01 00:11:30 +01:00
Laurent Destailleur
9cc79de31b Clean code 2022-03-01 00:02:23 +01:00
Regis Houssin
8196134345 FIX not use $this in static function 2022-01-27 14:17:14 +01:00
Regis Houssin
116bcd1bdc FIX convert product class 2022-01-27 10:12:10 +01:00
Laurent Destailleur
80165811e0 Clean code 2021-09-27 15:50:19 +02:00
Laurent Destailleur
23829ae637 Cast numeric into on sql request 2021-08-23 18:56:46 +02:00
Laurent Destailleur
9ceab9b86b Doc 2021-08-03 15:47:00 +02:00
Laurent Destailleur
23c0edf854 Merge pull request #17784 from atm-john/new_expedition_warehouse_auto_picking
NEW/FIX : Allow auto picking for child warehouse and taking into account of the quantities already affected in list
2021-06-20 12:55:30 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
ATM john
f13388122c Add fetch stock order 2021-06-01 21:43:05 +02:00
Laurent Destailleur
cc10106a21 Fix protection on int 2021-03-14 12:20:23 +01:00
Laurent Destailleur
12f50a76d7 Fix yogosha #5627 2021-03-14 11:48:39 +01:00
Frédéric FRANCE
fa7cd70052 code syntax product directory 2021-02-26 14:25:17 +01:00
Laurent Destailleur
371a460905 More PHPUnit for movements 2020-12-16 12:26:01 +01:00