Commit Graph

13368 Commits

Author SHA1 Message Date
Laurent Destailleur
5e59e8d0e4 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/langs/en_US/stocks.lang
2023-11-17 00:44:30 +01:00
HENRY Florian
7c43aa86c9 fix: mising delete inventory perms with MAIN_USE_ADVANCED_PERMS (#26617)
* fix: mising delete inventory perms

* fix: mising delete inventory perms
2023-11-16 15:31:20 +01:00
thibdrev
11ed276fe3 fix PRODUCT VARIANTS - Missing translation key for "Combination" (#26618)
* Add "Attributes" key to en_US/products.lang

* Add "Attributes" key to fr_FR/products.lang

* Change langs->trans('Combination') to lang-trans->trans('Attributes')
2023-11-16 15:19:51 +01:00
atm-sami
966e26e450 FIX add display of an error when attempting to delete a committed transaction (#26573)
* add display of an error when attempting to delete a committed transaction

* update
2023-11-14 14:53:40 +01:00
sonikf
0fbc5bd423 NEW: Supplier template invoive extrafields (#26570)
* NEW: Supplier template invoive extrafields

* NEW: Supplier template invoive extrafields

* NEW: Supplier template invoive extrafields
2023-11-14 14:46:48 +01:00
Laurent Destailleur
c6c7b6692d Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-13 15:33:32 +01:00
Laurent Destailleur
68ffe0960d Trans 2023-11-13 15:27:42 +01:00
Frédéric FRANCE
400128243b confirm delete extrafield (#26565) 2023-11-13 13:01:14 +01:00
Laurent Destailleur
8fd688bb51 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-11-13 02:59:22 +01:00
Laurent Destailleur
2d6559d74f Fix warning 2023-11-13 02:42:47 +01:00
Klaas Oldenburger
a1c295185d Update main.lang (#26546)
correcting date short format to dutch settings
2023-11-12 21:59:28 +01:00
Laurent Destailleur
b709de584c Debug v19 2023-11-11 15:35:23 +01:00
Laurent Destailleur
b6b63b8655 Typo 2023-11-11 15:02:24 +01:00
lamrani abdelwadoud
07d2d6b861 NEW functionality for get bon prelevement in ligne order (#26540)
* Fix massaction checkbox for display it on right side

* get all order lines request
2023-11-10 18:56:52 +01:00
atm-sami
53b48173f6 NEW add sorting of product price list by customer (#26483)
* added sorting of product price list by customer

* add search and sort in same time

* Update price.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-09 14:55:35 +01:00
Laurent Destailleur
a9f8b1d8bb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-09 11:31:38 +01:00
Laurent Destailleur
4cd4221a52 Debug v19. Remove some TODO. 2023-11-09 10:56:13 +01:00
sonikf
b97413e7f7 fix translation and typos (#26502)
* fix translation

* fix typo

* fix typo

* fix typo

* fix translation
2023-11-08 17:23:26 +01:00
Laurent Destailleur
6288b803ea Debug v19 2023-11-08 17:22:34 +01:00
Laurent Destailleur
85977fa402 Sync transifex 2023-11-07 21:10:28 +01:00
Laurent Destailleur
6ea4c4d732 Sync transifex 2023-11-07 21:06:44 +01:00
Laurent Destailleur
f96e3a6771 Translate 2023-11-07 21:03:05 +01:00
Laurent Destailleur
f92a8fb63f Trans 2023-11-07 20:59:28 +01:00
Laurent Destailleur
1029932e6a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-07 20:42:33 +01:00
Laurent Destailleur
e06ad780aa Clean lang files 2023-11-07 20:42:13 +01:00
sonikf
edac1bb6cc Add missing info for proper use and creation of template invoice (clients and vendors) (#26475)
* Add missing info for proper use and creation of template invoice

* Add missing info for proper use and creation of template invoice

* fix trans of generated invoice
2023-11-07 18:18:06 +01:00
daraelmin
4fc415a287 New option to define the start period of a first subscription (#26484)
* New option to define the start period of a first subscription

add default date of starting (year, month or subscription payment)
add delay for subscription period

* Update member.php

* Fix period for statistique if delay is set
2023-11-07 18:05:36 +01:00
VESSILLER
eb45e9e5c7 Resolve conflicts 2023-11-07 16:08:11 +01:00
Laurent Destailleur
78600b0f61 Trans 2023-11-06 21:01:15 +01:00
Laurent Destailleur
9ef047e75e Doc 2023-11-06 20:02:47 +01:00
Laurent Destailleur
c154a72d88 Debug v19 2023-11-06 19:32:04 +01:00
Laurent Destailleur
6fc0a868f5 Debug v19 2023-11-06 16:51:37 +01:00
lamrani abdelwadoud
23ce23021f NEW functionality for request_transfer (#26078)
* NEW functionality for request_transfer

* fix problem

* fix problem in transferBank

* fix request sql

* ajust functions for salary invoices

* add badges for each onglet invoice and salary

* Fix update in table bon_prelevement for amount

* Fix in section virement_request list of bonPrelevements

* for prelevemts lignes

* for prelevemts lignes

* update sql for get lignes prelevement with correct info

* update sql for get lignes prelevement with correct info

* add function for check if invoice salaries

* adjust bonprelevement for get salaries

* fix incoherences in create function for class BonPrelevement

* fix request sql for insert in prelevement ligne table

* fix problems and incoherences

* remove parametre  from function

* add parenthensises for cast  in sql request

* disable button when make demande virement

* fix condition for type

* fix conflit "

* fix whitespace

* fix condition for sourcetype

* fix page demandes.php for list salaries invoices

* add prefix db

* fix incoherences for conditions

* Update virement_request.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-06 16:09:05 +01:00
Laurent Destailleur
b65d5c8740 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-05 19:52:54 +01:00
Laurent Destailleur
2a2dec2f88 Debug v19 2023-11-04 16:02:24 +01:00
thibdrev
51341524a2 fix missing 2 translation keys used in commande/list.php (#26458)
* modify the translation keys in commande/list.php

* create the error translation key in en_US/errors.lang

* create the error translation key in fr_FR/errors.lang
2023-11-03 22:51:51 +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
atm-jonathan
9d03444298 Fix position with this job (#26455)
* FIX list position in job

* add trad position
2023-11-03 16:21:58 +01:00
Laurent Destailleur
5336a4788f Complete trans 2023-11-01 23:46:56 +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
Francis Appels
ee269b4608 FIX: update product with stock to lot or serial type. (#23002)
* git init

* Fixing style errors.

* Add split of serial defaults

* Fix remaining part

* Fix on  remaining decimal part

* Revert "Fix on  remaining decimal part"

This reverts commit b91f884ddc.

* Revert "Fix remaining part"

This reverts commit 35a6631b29.

* Revert "Add split of serial defaults"

This reverts commit 37009afcbc.

* Remove split for serial numbers and replace by error message.

* Fix stickler CI

* Fix missing product id for lot number fetch

* Allow update for data consistency, but show warning in stock card and stocks by lot/serial list

---------

Co-authored-by: Francis Appels <francis@vps399724.ovh.net.novalocal>
Co-authored-by: stickler-ci <support@stickler-ci.com>
2023-10-31 11:47:38 +01:00
Laurent Destailleur
aab6d9af62 Fix trans 2023-10-30 17:37:18 +01:00
William Mead
3c87423364 Qual cleaner code for InterfaceLogevents (#26347)
* Renamed text variable to label

* Added label variable

* Fixed typos

* Fixed PHPDoc

* Added runTrigger method return type

* Refactored to use super class constructor

* Added contributor details. Cleaned indentation.

* Added user login failed string

* Added label & description localized strings

* Converted event label, description & date variables to class properties. Added class method to initialize event data. Refactored & cleaned code.

* Added user string parameter

* Cleaned code

* Moved langs loading

* Added code comment

* Cleaned code

* Added code comment

* Fixed PHPDoc comments

* Refactored event label & description assignment

* Deleted unneeded empty lines

* Added event action text dictionary. Refactored event data initialization. Added static class method for dynamic localization to check if event text has an event action key n.

* Updated string parameter placement

* Added condition to check if event description has an event action key in order to do dynamic frontend translation

* Updated code comments. Renamed event action array.

* Added user status key

* Cleaned code

* Update interface_20_all_Logevents.class.php

---------

Co-authored-by: William Mead <william.mead@manchenumerique.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-30 04:12:43 +01:00
Mohamed DAOUD
08ef416958 New: Adding the PDF option displaying the product's barcode number (#26345)
* Add a PDF option to show barcode number of product

* Add space before and after IF keyword

* fix error phpcs

* add barcode label before barcode number

* Use outputlangs and not langs

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-30 03:13:12 +01:00
sonikf
26674ba5d1 fix typo (#26389) 2023-10-30 02:24:22 +01:00
Laurent Destailleur
c13d1abd0c Debug v19 2023-10-29 17:55:02 +01:00
Laurent Destailleur
0158c3ff68 Debug v19 2023-10-29 17:36:00 +01: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
a4218a142c Look and feel v19 2023-10-26 18:11:34 +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