2
0
forked from Wavyzz/dolibarr
Commit Graph

125944 Commits

Author SHA1 Message Date
Christophe Battarel
bd2fe307cd add hook tabContentCreateSupplierProposal (#26433)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-11-03 20:58:15 +01:00
Christophe Battarel
5c3069e51a add hook tabContentCreateProduct (#26434)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-11-03 20:58:04 +01:00
Christophe Battarel
20b99b6a98 add hook tabContentViewProduct (#26435)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-11-03 19:59:23 +01:00
Christophe Battarel
fccc2c1824 add hook tabContentEditProduct (#26436)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-11-03 19:58:42 +01:00
thibdrev
3b30a94e43 fix error message ErrorThisBankReceiptIsAlreadyUsed is not translated (#26448)
* fix missing translation for ErrorThisBankReceiptIsAlreadyUsed

* add translation key to fr_FR

* modify error message key in releve.php
2023-11-03 16:30:29 +01:00
Lenin Rivas
1e6788aec6 NEW Manage rate indirect. (#26449)
* Indirect exchange rate

* Indirect exchange rate

* Indirect exchange rate

* Indirect exchange rate
2023-11-03 16:29:40 +01:00
HENRY Florian
a3437c7207 fix: display details quantity in Kit in PDF #26359 (#26454)
* add detail qty in kit displayed in PDF line

* fix: #26359
2023-11-03 16:27:02 +01:00
Laurent Destailleur
99f50e5fa1 Fix comment 2023-11-02 14:12:57 +01:00
Laurent Destailleur
440baec6e7 Debug v19 2023-11-02 02:04:09 +01:00
Laurent Destailleur
534f545ace Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-02 02:00:17 +01:00
Laurent Destailleur
b92d685940 Debug v19 2023-11-02 01:59:51 +01:00
daraelmin
63ccf17402 FIX #24367 - membership duration is the default duration adhtype (#26428)
* FIX #24367 - membership duration is the default duration adhtype

* avoid error for old database

* avoid error for old database

* Update paymentok.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-02 01:33:46 +01:00
Laurent Destailleur
d0d937f2e7 Tool to calculate nb of commits and developers for each version branch 2023-11-01 20:08:01 +01:00
Laurent Destailleur
2e863d7bf2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-01 16:34:37 +01:00
Laurent Destailleur
a1f4c0c635 NEW Enhance github_commits_perversion to get more stats on git commits 2023-11-01 16:34:20 +01:00
ptibogxiv
b3a08fc0c7 Fix v19 look on shipment.php (#26427) 2023-11-01 15:56:51 +01:00
Laurent Destailleur
f9c29489d6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-01 15:52:32 +01:00
Laurent Destailleur
0708f0c53f Add fields to allow batch management into POS module 2023-11-01 15:52:02 +01:00
Laurent Destailleur
0562f89347 Can find a stock id from a couple batch-warehouse 2023-11-01 15:35:29 +01:00
ptibogxiv
2adb0b5213 NEW shipment can include service (for information and invoicing) (#26407)
* NEW shipment can include service (for information and invoicing)

add an optionnal option for include service on shipment because some business need invoicing only from shipment so actually dont get services on invoice autmatically.

this is a first PR for validation of this secret option before upload other PR

* Update shipment.php

* Update card.php
2023-11-01 15:02:40 +01:00
Alexandre SPANGARO
ba458ddfd6 Review of ledger display (#26423)
* Review of ledger display

* typo

* Update listbyaccount.php

* Update listbyaccount.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-01 15:00:48 +01:00
Christophe Battarel
23c944a104 NEW : customize position in complete_head_from_modules (#26406)
* NEW : customize position in complete_head_from_modules

* fix parenthesis search

* fix position search

---------

Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-11-01 15:00:29 +01:00
manavb2214
80734cc945 Update CONTRIBUTING.md (#26412)
Fixed a Typographical Error.
2023-11-01 14:25:48 +01:00
Christophe Battarel
9580f5bc11 add hook tabContentCreateProposal (#26411)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-11-01 14:25:33 +01:00
Christophe Battarel
b3e7457cd3 NEW : add new hook tabContentCreateOrder (#26408)
* NEW : add new hook tabContentCreateOrder

* update comment

---------

Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-11-01 14:25:26 +01:00
Christophe Battarel
3afaa266c3 add hook tabContentCreateInvoice (#26413)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-11-01 14:25:14 +01:00
manavb2214
de0fe8ee85 Update CONTRIBUTING.md (#26415)
Fixed Typo Error.
2023-11-01 14:24:56 +01:00
Christophe Battarel
13072a1df2 add hook tabContentViewSupplierOrder (#26417)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-11-01 14:24:31 +01:00
Christophe Battarel
002f10a9aa NEW : add hook tabContentCreateSupplierOrder (#26418)
* add hook tabContentViewSupplierOrder

* wrong hook name

---------

Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-11-01 14:24:10 +01:00
manavb2214
af4638657e Update CONTRIBUTING.md (#26420)
Fixed typo error.
2023-11-01 14:23:42 +01:00
Alexandre SPANGARO
e2debe7cd8 FIX Accountancy - Journal - problem with displaying label in getNomUrl (#26424) 2023-11-01 14:23:24 +01:00
Laurent Destailleur
f18e7dd8b2 Look and feel v19 2023-11-01 12:55:31 +01:00
Laurent Destailleur
74e1ec4099 FIX On object validation, ecm index are not updated for uploaded files 2023-10-31 19:28:11 +01:00
Laurent Destailleur
a0c5dffacb Fix must update facture_fourn_rec when merging thirdparties 2023-10-31 18:18:15 +01:00
Laurent Destailleur
774cfce57b Fix must update facture_fourn_rec when merging thirdparties 2023-10-31 18:15:15 +01:00
Laurent Destailleur
494908f1d2 Fix when using non standard action and canvas 2023-10-31 17:53:35 +01:00
Laurent Destailleur
edaab57f2e Endpoint for API /partnershipapi and /recruitment has been renamed into
/partnerships and /recruitments to follow name conventions.
2023-10-31 13:37:15 +01:00
Laurent Destailleur
ca145ef912 QUAL: Endpoint for API /partnershipapi has been renamed into
/partnerships to follow conventions
2023-10-31 13:31:02 +01:00
Laurent Destailleur
ecd4c7bbc7 Comment 2023-10-31 13:05:27 +01:00
Laurent Destailleur
f8a773591c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-31 13:03:11 +01:00
Laurent Destailleur
fb65ad919e Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-31 13:03:04 +01:00
Laurent Destailleur
70640428dd Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-31 13:02:23 +01:00
atm-sami
cfdc3d1af3 NEW add recursive deletion option for child m os (#26102)
* added recursive deletion option for child MOs + added recursive recovery method for child MOs

* add number of MOs in form_confirm

* update to delete number of mo childs if is null

* added checking of an infinity loop

* review PR
2023-10-31 12:25:59 +01:00
atm-adrien
eeca89c75b FIX : HTML in ODT templates (#26181)
* FIX : HTML does not work on ODT template

* FIX : add replace

* FIX : Backport V18

* FIX : Modif regexp

* FIX : Add encode parameter

* FIX : PR returns
2023-10-31 12:20:43 +01:00
Florent Poinsaut
caf691d706 FIX #25793 V18.0.1 : Cannot add time spent (#26405) 2023-10-31 12:00:55 +01:00
Laurent Destailleur
e308e0046f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-10-31 12:00:29 +01:00
Laurent Destailleur
571520717d Redo forgotten migration instruction in v18 2023-10-31 11:59:57 +01:00
Florent Poinsaut
7bcd6c2a3a FIX #25793 V18.0.1 : Cannot add time spent (#26405) 2023-10-31 11:59:07 +01:00
Christophe Battarel
1a32455e70 update comment and credentials (#26401)
* update comment

* update credentials

* remove bad commit

* update credentials

---------

Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-10-31 11:57:53 +01:00
jyhere
d2355e91e9 NEW: add a $notrigger param to Product::updatePrice() method (#26404)
* NEW: add a $notrigger param to Product::updatePrice() method

* Update product.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-31 11:57:25 +01:00