Commit Graph

4640 Commits

Author SHA1 Message Date
Laurent Destailleur
05db4b9f8e Sync transifex 2023-12-15 13:34:39 +01:00
Laurent Destailleur
ea4b857f28 Clean trans 2023-11-28 20:23:11 +01:00
Mohamed DAOUD
dc4d5111aa New add evaluation report pdf module HRM (#26850)
* add rh evaluation report pdf

* Update modHRM.class.php

* fix phpcs modHRM.class.php
2023-11-26 15:51:00 +01:00
Laurent Destailleur
cb3a86a737 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-11-23 18:56:10 +01:00
Laurent Destailleur
a257dcfa48 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-11-23 18:48:52 +01:00
atm-lucas
73087bee2f FIX - change error message on quantity (#26606)
* Added a new error message on quantity split

* fault correction

* Add loading translation files

* Fault

* Translation key

* Code correction

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-20 20:42:27 +01:00
William Mead
02eadb29fc FIX #25458 intervention localizations (backport v17) (#26757)
* Fix reopen button localization. Added contributor details.

* Added EN done localization

* Added FR done localization

---------

Co-authored-by: William Mead <william.mead@manchenumerique.fr>
2023-11-20 20:19:43 +01:00
Laurent Destailleur
a0bba05b02 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/commande/class/api_orders.class.php
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/project.lib.php
	htdocs/fourn/class/api_supplier_orders.class.php
	htdocs/fourn/class/fournisseur.facture-rec.class.php
	htdocs/langs/en_US/stocks.lang
2023-11-17 18:24:53 +01:00
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
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
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
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
85977fa402 Sync transifex 2023-11-07 21:10: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
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
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
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
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
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
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
atm-gauthier
f46482a72a NEW Can switch product batch management to no management. (#21691)
* NEW : When an user unset the batch management of products, transformation of each batch stock mouvement in global stock mouvement

* FIX : Alert on deserialize product

* FIX : Correction of the trad

* Fixing style errors.

* FIX : PR returns

* FIX : using llx_product_batch table

* FIX : langs

* Fixing style errors.

* FIX : $value must be an absolute value

* FIX : init $inventorycode before while loop

* Fixing style errors.

* FIX : "Yes (unique serial number required)" choice must not be available on product edit if its current status batch is "Yes (lot required)"

* Fixing style errors.

* FIX : Just display a message when we change from batch to serial

* Fixing style errors.

* Update card.php

* Update card.php

* Update product.class.php

* Update product.class.php

---------

Co-authored-by: Adrien Raze <adrien.raze@atm-consulting.fr>
Co-authored-by: stickler-ci <support@stickler-ci.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-23 18:05:21 +02:00
Laurent Destailleur
25ace1d042 Debug v19 2023-10-21 16:23:58 +02:00
kkhelifa-opendsi
91ff39d2e6 NEW: Add option for cancel consumed and produced lines (delete lines and rollback stocks) when delete or cancel an manufacturing order (#26254) 2023-10-20 03:09:58 +02:00
Laurent Destailleur
cd738b1964 Debug v19 2023-10-18 13:50:21 +02:00
Laurent Destailleur
0fbffea663 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-17 14:49:16 +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
9144293f0b Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-16 06:02:17 +02:00
Noé Cendrier
a92458ebbc FIX check tva_tx before comparing price_min_ttc (#25220)
* FIX check tva_tx before comparing price_min_ttc

* better price_ttc comparison for propal, commande, facture lines

* price_ht must be transformed into number before using it for calculating
2023-10-16 04:07:10 +02:00
Laurent Destailleur
9d466793fa Merge pull request #24760 from NextGestion/dolibarr_fixbugs
NEW Can restore product in stock when deleting the supplier invoice
2023-10-08 21:58:55 +02:00
William Mead
721090e8b5 Added missing localization of word Done 2023-10-06 14:31:52 +02:00
William Mead
b9de0e49d8 Added intervention closed confirmation text 2023-10-06 09:34:41 +02:00
William Mead
68b731d9ac Added intervention closed notification email text 2023-10-06 09:16:33 +02:00
William Mead
b3ce1af29d NEW Added notification on closed intervention 2023-10-05 12:11:39 +02:00
Laurent Destailleur
cdfa7c901a Merge pull request #25532 from lamrani002/formAddPropertyMB
NEW Form for add object's property on moduleBuilder
2023-09-27 11:34:07 +02:00
atm-thibaultf
7420d86073 Add help tooltip lang 2023-09-12 13:15:14 +02:00
atm-thibaultf
363ac9f926 NEW CONF allow modify ticket classification even if closed 2023-09-12 13:07:21 +02:00
Laurent Destailleur
1ce4921fb0 Remove duplicate string 2023-09-11 15:30:56 +02:00
Laurent Destailleur
053aa19c34 Merge pull request #25856 from lamrani002/titleOfApi
NEW updating by adding tooltip for api section in Modulebuilder
2023-09-09 21:27:14 +02:00
Lamrani Abdel
f82e3fc27e NEW updating by adding tooltip for api section in Modulebuilder 2023-09-09 12:44:38 +02:00
Laurent Destailleur
c6dbb3d434 Merge branch 'develop' into dev_sign_soeciete_rib 2023-09-09 11:55:30 +02:00
Laurent Destailleur
0a853fe794 Removed files links.lang 2023-09-07 03:30:41 +02:00
Florian HENRY
16f00adb8c Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_sign_soeciete_rib 2023-09-06 08:22:00 +02:00