Commit graph

125854 commits

Author SHA1 Message Date
Laurent Destailleur
2368b29d77 Fix trans 2023-10-29 13:55:30 +01:00
Laurent Destailleur
9591f7bff2 Fix trans 2023-10-29 13:52:42 +01:00
Laurent Destailleur
fecd134099 Update doc 2023-10-28 02:27:49 +02:00
Laurent Destailleur
00e706120d Fix warning 2023-10-28 02:17:48 +02:00
Laurent Destailleur
20f4051a4b Clean code 2023-10-28 02:14:47 +02:00
Laurent Destailleur
cca296c3ab Clean code 2023-10-28 02:10:34 +02:00
Laurent Destailleur
6d7d698371 Debug v19 2023-10-28 02:06:07 +02:00
Laurent Destailleur
939cf8b200 FIX Popup on service ref when product module not enabled 2023-10-28 00:59:31 +02:00
Laurent Destailleur
8333410ca1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-10-28 00:07:17 +02:00
Laurent Destailleur
46bfae63a3 Responsive 2023-10-28 00:06:06 +02:00
Alexandre Janniaux
a7619ecc92
Workflow: code quality with early return (#26365)
* workflow: use setErrorsFromObject when suitable

* workflow: shipping: use early return in for loop

* workflow: shipping: combine to previous early return

* workflow: shipping: reindent after last changes

No functional changes.

* workflow: reception: use early return when suitable

* workflow: reception: use early return

* workflow: reception: reindent after last changes

No functional changes.

* workflow: ticket: use early return

* workflow: ticket: combine condition through an early return

* workflow: ticket: reindent after last changes

No functional changes.

* workflow: propal: remove else condition after terminal if

* Update interface_20_modWorkflow_WorkflowManager.class.php

* Update interface_20_modWorkflow_WorkflowManager.class.php

* Update interface_20_modWorkflow_WorkflowManager.class.php

* Update interface_20_modWorkflow_WorkflowManager.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-27 19:17:27 +02:00
Lucas Marcouiller
d8116b8ce4
Fix recruitement candidature cancel pre-action (#26386)
* Fix recruitement candidature cancel pre-action

* fix lang file

---------

Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
2023-10-27 17:40:34 +02:00
Laurent Destailleur
05718dd43e Add performance index 2023-10-27 15:01:11 +02:00
Noé Cendrier
9138486c59
NEW filter on from/to period rather than month/year (#26378) 2023-10-27 12:47:11 +02:00
Laurent Destailleur
e5da68b3bd Debug v19 2023-10-26 21:16:04 +02:00
Laurent Destailleur
e68d5ebc35 Debug v19 2023-10-26 21:11:36 +02:00
Laurent Destailleur
197f0a19ec NEW Add more param on fetch() to prepare perf optimization 2023-10-26 21:05:37 +02:00
Laurent Destailleur
a4218a142c Look and feel v19 2023-10-26 18:11:34 +02:00
Laurent Destailleur
3403f35753 Code comment 2023-10-26 18:00:23 +02:00
andreubisquerra
4761d70cd9
NEW Default customer, category and product when enable TakePOS (#25031)
* Default customer, category and product when enable TakePOS

* Update cashdesk.lang

* Default category and product when enable TakePOS

Easy setup for TakePOS. Create a category and product when TakePOS is enabled. It checks if TakePOS has already been configured to avoid recreating the category and productif it has already been created.

* Update modTakePos.class.php

* Update modTakePos.class.php

* Update cashdesk.lang

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-26 17:58:42 +02:00
Christophe Battarel
11c1094b76
FIX : TakePOS - fix option TAKEPOS_PRODUCT_IN_STOCK must read on the POS warehouse (#24809)
* fix stock displayed

* fix php8

* fix php8

* fix

* php8

* fix group by

* fix empty

---------

Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-10-26 17:49:19 +02:00
Laurent Destailleur
9d25ea418f Clean code to use getDolGlobalInt 2023-10-26 17:45:03 +02:00
lamrani abdelwadoud
40fb7c5fa7
FIX Payement infos for Fournisseur add change company condition for get default infos (#26305)
* add change company condition for get default infos

* fix it for compta/facture also
2023-10-26 17:12:57 +02:00
Alexandre SPANGARO
145cfcbb26
NEW : Allow to have products not managed in stocks - SQL Part (#26190)
* NEW : Allow to have products not managed in stocks - SQL Part

* Update as proposed
2023-10-26 16:34:17 +02:00
Alexandre Janniaux
c3b3840f08
QUAL Refactor merging companies and fix #26272 with Reception objects (#26320)
* societe: add missing model_pdf field

The field is used by the class but wasn't declared.

* societe: expose Societe::mergeCompany

The code is directly copied from societe/card.php with as less changes
as possible.

The original code came from deb91ad7c1.

* societe: remove fields from property copy

$phone_pro and $fk_project are not existing for societe. This was added
from deb91ad7c1.

* SocieteTest: test the merge functionality

This test is a simple smoke test to check that the mergeCompany() will
work correctly on simple case and actually merge the details of the
company.

More complex deduplication pattern with objects referencing the deleted
Societe object, will be written for each of the different object class
in their respective test file.

* societe: card: use the new mergeCompany function

Since the code is almost the same, there should be no differences in
behaviour right now.

* societe: api_thirdparties: use Societe::mergeCompany()

* societe: fix issue when merging companies

When a Societe object is merged against another, its related objects are
supposed to reference the new Societe object so that the databse doesn't
raise foreign key errors.

The list references the objects that need to be transformed, and
Reception objects weren't part of this list.

Fix #26272

* ReceptionTest: check company merge hook

Before a Societe object is destroyed from the database, every object
referencing the FK should be destroyed or should reference another
object.

In the case of two companies being merged, the case arises and Reception
objects need to be moved to the new company. This commit brings a
non-regression test for this case.

Refs #26272

* Update societe.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-26 16:30:38 +02:00
Laurent Destailleur
9fc5accd81 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-10-26 15:58:41 +02:00
atm-lucas
3f75077f5e
NEW - Add edit line on MO (#26122)
* Added the possibility of editing lines

* Review code

* add exit

* Add same action

* check Travis

* Travis

* Update mo_production.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-26 14:11:27 +02:00
Mohamed DAOUD
990f9113fc
FIX - Auto fill the field end of period with end of month when cloning a salary (#26263)
* Auto fill the field end of period

* Auto fill the field end of period without jsDate

* using formatDate function to format displayed date
2023-10-26 14:03:21 +02:00
Laurent Destailleur
74609c90a8 Code comment 2023-10-26 14:03:13 +02:00
Anthony Berton
dc8d6f9ca2
FIX - Search product category on list det order (#26168)
* FIX - Search product category on list det order

* Search for tag/category

* add search Operator

* Clean

---------

Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-26 13:57:40 +02:00
Charlène Benke
091d50e809
NEW : Add custom Text on footer total (#26334)
* NEW : Add custom Text on footer total

This function allows you to add a small text to each invoice below the total.
Just add a miscellaneous parameter to activate it
(to wish the happy new year or an indication of invoicing)

* Update pdf_crabe.modules.php

* Update pdf_crabe.modules.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-26 13:55:10 +02:00
Laurent Destailleur
ca3c7f0a37 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-10-26 13:52:22 +02:00
Laurent Destailleur
6822afac31 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-26 13:48:33 +02:00
Laurent Destailleur
e080261e25 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-10-26 13:46:17 +02:00
Laurent Destailleur
54ead1cc84 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-10-26 13:45:53 +02:00
Laurent Destailleur
1369867db9 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-10-26 13:45:45 +02:00
Laurent Destailleur
96bac68c3e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-10-26 13:45:11 +02:00
Laurent Destailleur
28ed710324 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-26 13:44:17 +02:00
Laurent Destailleur
ceb7827749 Close #26311 2023-10-26 13:43:58 +02:00
Laurent Destailleur
b4da41c8e8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-26 13:40:57 +02:00
Lucas Marcouiller
96146fcb6a
New add note for mailing (#26331)
Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-26 13:40:44 +02:00
HENRY Florian
3fc0b88633
fix: if field is boolean in filedsarray, it bus be boolean as datatype fog PgSQL (#26335) 2023-10-26 13:37:21 +02:00
HENRY Florian
3fa18325c6
fix: On Object refrent tab on item, supplier invoice status is not correct (#26348) 2023-10-26 13:31:48 +02:00
Laurent Destailleur
3e146187ec Doc 2023-10-26 13:31:20 +02:00
daraelmin
2ad04a4446
FIX public subscription page should not display acceptation for public register when it is not enabled (#26354)
* FIX in public subscription page  author to publish in the public register appear even if not enabled

i

* Fix typo
2023-10-26 13:15:15 +02:00
Thibault Fiacre
e79f7706ad
FIX_add_customer_ref_on_linked_shipment (#26349)
Adding missing customer reference for shipment on linked object block
2023-10-26 12:49:55 +02:00
daraelmin
a815c99d53
FIX suggested end for membership can be before subscription start (#26351)
* Fix wrong debug log

* Fix suggested end for membership can be in the past

MEMBER_SUBSCRIPTION_SUGGEST_END_OF_YEAR and MEMBER_SUBSCRIPTION_SUGGEST_END_OF_MONTH should be based on the subscription start date, not on the creation date

* Fix typo
2023-10-26 12:48:40 +02:00
Laurent Destailleur
35906c0af6 Fix bad test 2023-10-26 12:43:29 +02:00
thomas-Ngr
00a936bffa
fix #18654 : orders are partially received even if all products have been received (#26358) 2023-10-26 12:42:07 +02:00
Florent Poinsaut
753430de5f
Fix error return value in the dol_delete_preview (#26360) 2023-10-26 12:40:21 +02:00