Commit Graph

432 Commits

Author SHA1 Message Date
Laurent Destailleur
7b30d8d37c Debug v21 2024-11-22 10:53:08 +01:00
sonikf
e5ca8437d2 fix: Proper use of products field customcode (#31695)
* fix customcode field comment

* fix translation
2024-11-05 17:32:12 +01:00
lamrani abdelwadoud
cc4f86dac3 New functionality Generate img product (#29731)
* New functionality for generate image for product

* New functionality for generate image for product

* Fix errors CTI

* remove null for second params

* fix CTI errors again

* Fix whitespace

* Fix whitespaces again

* Fix run phan

* Update commonobject.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-10-28 14:51:36 +01:00
Laurent Destailleur
9499292bad Debug hidden feature 2024-10-24 16:21:58 +02:00
Noé Cendrier
a18103187c NEW: Management of extrafields on customer prices, level prices and default prices (#31313)
* ADD: Management of extrafields on customer prices, level prices and default prices

* ADD: sql table for managing extrafields on customer prices, level prices and default prices

* FIX: Add actions to update, add, delete extrafields and display extrafield

* FIX: colspan for customer price table

* ADD: Management of extrafields on customer prices

* FIX: Value and search for price label

* ADD: name in the files

* FIX: *

* FIX: PHP-cs fail

* FIX: comment in english, please

* FIX: variable naming and testing

* FIX: GETPOST array

* FIX: return is an array of strings, object array will be modified as well

* FIX: return array keys for Extrafields::fetch_name_optionals_label are string too

* FIX: do not mess with extrafields code and value

* Update llx_product_customer_price_extrafields.sql

* Update llx_product_price_extrafields.sql

* FIX: whooopsie

* FIX: PHP warnings

---------

Co-authored-by: Mélina JOUM <melina.joum@altairis.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-10-19 09:50:18 +02:00
Frédéric FRANCE
820333b02f fix variants sql init (#31319)
* fix variants sql init

* add setup

* add setup

* add setup

* update class

* update list

* update list

* update list

* update class

* fix typos

* fix translations

* fix html

* fix update

* fix sql

* fix extrafields

* fix extrafields
2024-10-13 21:08:55 +02:00
Noé Cendrier
22729516fe NEW Add mode Customer price + level price (#31091)
* NEW: customer price and level price together

* NEW: translation

* FIX: If a price per customer exist

* FIX: do not use default price if the customer price and level price option is active

* Don't display the price level amount if the customer price is known

* FIX: double check and php cs correction

* FIX: vatrate call

* FIX: get_htmloutput_msg call

---------

Co-authored-by: Mélina JOUM <melina.joum@altairis.fr>
2024-09-25 23:18:16 +02:00
Laurent Destailleur
e0d6d2d7c7 Fix bad tooltip when option SERVICE_STRICT_MANDATORY_PERIOD is on 2024-07-22 11:44:00 +02:00
Laurent Destailleur
14f44052ee Fix translation wrong. Missing empty line. 2024-07-18 18:10:14 +02:00
Laurent Destailleur
773dad7a42 Trans 2024-05-24 17:53:28 +02:00
Laurent Destailleur
bffa8b3fce Trans 2024-05-24 17:32:43 +02:00
Laurent Destailleur
01e15a2564 Simplify code 2024-05-06 18:50:11 +02:00
Laurent Destailleur
bf3ec1a163 Trans 2024-04-19 16:42:47 +02:00
Florian HENRY
09e75b6c90 NEW: Label on Price fix:#28544 2024-03-15 09:24:45 +01:00
lvessiller-opendsi
1e28f72057 NEW warning message when cloning a product whose status is not to sell (#28374) 2024-02-23 17:18:16 +01:00
Laurent Destailleur
0920d6e08f Enhance modulebuilder 2024-02-12 07:10:49 +01:00
DaBootO
870395b69c CLOSE #27048 add form to globally set "VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PARENT" variable (#27049)
This commit adds another option to the variants module to set the global variable "VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PARENT".
This variable allows the variant parent product to be used in stock movements.

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-02-12 05:46:50 +01:00
Laurent Destailleur
c443bd4a3d Fix duplicate key entries 2024-01-22 14:13:31 +01:00
Hystepik
46572116ab change question set to draft 2023-12-22 10:02:08 +01:00
Laurent Destailleur
bd7e5abc5a Trans 2023-12-08 11:16:57 +01:00
sonikf
06874fdd90 fix translation (#26754) 2023-11-20 20:18:59 +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
MDW
9cb872c8d3 Fix spelling in base language (#26671) 2023-11-17 16:20:49 +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
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
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
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
0fbffea663 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-17 14:49:16 +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
ae89f278ef NEW Can include product variants in list of products 2023-08-26 22:18:49 +02:00
Maximilien Rozniecki
734ca94b86 add an entry inside lang file "PuttingDescUpToDate" was missing 2023-04-20 10:29:22 +02:00
Laurent Destailleur
5b0b874535 NEW Add a status on supplier price ref (WIP to close a supplier ref) 2023-03-28 21:30:08 +02:00
Laurent Destailleur
54d8b9baf4 Clean label of option. Fix css 2023-03-18 00:42:21 +01:00
Faustin
71e55ab709 Translation update 2022-10-30 02:37:56 +01:00
Faustin
d15493e50d massacrtion for updating product prices 2022-10-30 02:59:11 +02:00
Laurent Destailleur
06d94c9a97 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-19 17:11:32 +02:00
Laurent Destailleur
ebd7605545 Fix bad recalculation of cost price of production of a product 2022-10-17 17:45:57 +02:00
Laurent Destailleur
2e905b127a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/accountancy/index.php
	htdocs/product/admin/product.php
2022-08-25 14:35:08 +02:00
Laurent Destailleur
06be8dc4bf Trans 2022-08-23 13:39:06 +02:00
lvessiller
d5269cd97b FIX resolve conflicts 2022-06-16 17:08:00 +02:00
Laurent Destailleur
166082d3cb Debug v16 2022-06-03 12:53:55 +02:00
lvessiller
00f321475b NEW replace fk_categories_product with categories_product in inventory 2022-05-09 09:33:44 +02:00
Laurent Destailleur
16fac44e9f Update products.lang 2022-05-08 19:14:32 +02:00
GregM
885324629f commit resolve conflict 2022-05-04 17:10:39 +02:00
GregM
d2bf2fdb98 update massaction langs & script 2022-05-04 16:53:57 +02:00
lvessiller
c3a3fee2d9 NEW label on products categories filter 2022-04-15 09:40:22 +02:00
Laurent Destailleur
1fd004d2a7 Merge pull request #20135 from atm-quentin/NEW_inventory_pmp_hidden_conf
New hidden conf to manage pmp on inventory
2022-04-14 22:42:35 +02:00
Laurent Destailleur
26c3e235cf Merge pull request #19459 from frederic34/productmerge
can merge products
2022-04-07 15:02:03 +02:00
Quentin VIAL-GOUTEYRON
c7e8a2bd8f Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_inventory_pmp_hidden_conf 2022-03-28 16:04:12 +02:00