Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
148,250 Commits 36 Branches 189 Tags
develop
Commit Graph

570 Commits

Author SHA1 Message Date
ldestailleur
ad830a346e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2025-09-23 16:50:17 +02:00
ldestailleur
6ead2839d0 Fix missing several test on permission on actions 2025-09-23 16:41:53 +02:00
ThomasNgr-OpenDSI
eb64e83563 FIX right to modify a product price by customer (#35256) 
IF the user has the right to create/modify a product, they have the right to add a product price by customer (if parameter is set).
BUT they don't have the right to edit the product price by customer (the 'edit') button is not displayed.

This commit fixes this.
 2025-09-09 19:22:02 +02:00
Laurent Destailleur
d16a66f269 Better management of how we store localtax vat rate for customer price. 2025-08-28 02:11:53 +02:00
Frédéric FRANCE
b7fb3d5136 fix warning (#35045) 2025-08-24 20:19:06 +02:00
Kamel Khelifa
bbfb4e7882 Corrections 2025-02-28 14:39:45 +01:00
Kamel Khelifa
ce1b38e984 Corrections 2025-02-28 09:48:29 +01:00
Kamel Khelifa
aaae4e7bc6 Fix CI-PULL-REQUEST / pre-commit / pre-commit (pull_request) 2025-02-25 15:55:58 +01:00
Kamel Khelifa
7ba21bd23d NEW: Add management of date begin/end and discount for a customer price (Code) 2025-02-25 15:09:05 +01:00
ldestailleur
f199d3fd61 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-21 15:46:33 +01:00
Noé Cendrier
4ba96540aa FIX: we already tested that $price_extrafield is not empty 2025-02-18 10:28:27 +01:00
Noé Cendrier
8b2e95ba27 FIX: ExtraFields::fetch_name_optionls_label() always returns an array 2025-02-18 10:07:58 +01:00
Mélina JOUM
b862380e6f FIX: Count colspan for table different prices for each customer 2025-02-14 16:33:21 +01:00
Mélina JOUM
d423765204 FIX: Update level price extrafields 2025-02-14 16:30:11 +01:00
Mélina JOUM
3417d79a42 FIX: Don't show and action of product extrafields on product price 2025-02-14 16:26:39 +01:00
Anthony V
bc6e3a81da Fix: Prevent invalid foreach() on extrafields label in product/price.php 
- Ensured $extralabels is always an array before looping to prevent warnings.
- Fixes "foreach() argument must be of type array|string given" error.
- Improves stability when handling extrafields.
 2025-02-10 21:21:43 +01:00
Anthony V
2358dc81a6 Fix: Prevent invalid foreach() on extrafields label in product/price.php 
- Ensured $extralabels is always an array before looping to prevent warnings.
- Fixes "foreach() argument must be of type array|string given" error.
- Improves stability when handling extrafields.
 2025-02-10 16:05:25 +01:00
MDW
1a2d4ed6be Qual: Fix phan (product-2) 2025-02-09 20:14:25 +01:00
MDW
fd7fee2e8f Qual: Fix textwithpicto $type argument (0->info,1->help) 2025-02-08 01:49:54 +01:00
Laurent Destailleur (aka Eldy)
0cbedd4ff0 Fix warnings 2025-01-29 19:15:57 +01:00
Laurent Destailleur
1af487b8b2 Merge pull request #32747 from altairisfr/qty_multiple_sale 
NEW: Add the "packaging" feature to round the quantities to some given multiples
 2025-01-29 00:50:35 +01:00
Noé Cendrier
d57de9cc85 FIX: number display format 2025-01-28 15:51:46 +01:00
Noé Cendrier
966d079019 FIX: implement mdeweerd review 2025-01-28 15:31:08 +01:00
Laurent Destailleur
adae4f0fb3 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-27 01:37:52 +01:00
Laurent Destailleur
940e42c1e4 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-01-27 01:30:34 +01:00
Regis Houssin
6ae1c60097 FIX sql error with the new sql forge filter 2025-01-25 07:50:24 +01:00
Noé Cendrier
2589febbae FIX: property type 2025-01-23 10:34:59 +01:00
Noé Cendrier
db97347497 FIX: phan remarks 2025-01-23 10:25:24 +01:00
Mélina JOUM
a14a474a70 ADD: packaging to round the quantities to some given multiples for the sale prices 2025-01-20 12:43:30 +01:00
Frédéric France
b4babd6fcb fix phpstan 2025-01-11 10:46:57 +01:00
Laurent Destailleur
e9c1274356 Debug v21 2024-11-20 23:47:39 +01:00
Frédéric FRANCE
ec91ed2af9 test action (#31815) 
* NEW : Add category feature on Fichinter

category update

* Update viewcat.php

* Update categories.lang

* Update categorie.class.php

* Update categories.lang

* Update viewcat.php

* Update viewcat.php

* test action

* test action

* test action

* test action

* test action

* test action

* test action

* test action

* test action

* test action

* test action

* clean baseline

Debug v21

NEW: use Expedition::$date_shipping property in card and list (#31701)

* NEW: use Expedition::$date_shipping property in card and list

* FIX: translation

* FIX: PHPStan rebutal

* FIX: not a great idea to copy and not edit comment

* FIX: on create, expected delivery date should precede sending date

* Update card.php

* Update list.php

* Update list.php

* Update list.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

clean baseline

clean baseline

clean baseline

* clean baseline

* clean baseline

* merge

* fix

* fix

* fix

* fix

* fix

* fix

* fix translations

* fix translations

* fix translations

* fix translations

* fix

* fix filters

* fix filters

* fix filters

* fix filters

* fix

---------

Co-authored-by: Charlène Benke <1179011+defrance@users.noreply.github.com>
 2024-11-15 14:09:04 +01:00
Frédéric FRANCE
1adc883b56 add baseline exclude for phpstan (#31632) 
* add baseline exclude for phpstan

* update

* update

* update

* update

* update

* merge

* restore one filter

* delete old errors

* fix

* fix

* fix

* $moreforfilter can t be empty

* fix

* enable check

* refresh baseline

* add phpdoc

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-11-04 23:53:20 +01:00
MDW
f4ff437026 Qual: Fix phan/phpstan notices in class files (part 4) (#31598) 
* Qual: Fix phan notices for DolibarrModules.class

* Qual: Fix notices for classes actioncomm..task.class.php

* fixup! Qual: Fix notices for classes actioncomm..task.class.php

* Qual: Fix new notices blocking PR
 2024-10-30 21:33:30 +01:00
Laurent Destailleur
f62c179b06 CSS 2024-10-24 19:27:50 +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
Laurent Destailleur
58cc96cd33 QUAL All $conf->global->module->enabled are replaced with isModEnabled() 2024-10-07 14:40:29 +02:00
Laurent Destailleur
a762d4111d FIX Debug link to user in list of product prices 2024-09-29 05:57:57 +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
Frédéric FRANCE
000173c7b9 fix phpstan (#31075) 
* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-09-23 01:59:14 +02:00
Alexandre SPANGARO
96afcaa476 Better comments (#30200) 
* Fix language

* Fix language

* Fix language

* Fix language

* Fix language

* Fix language

* Fix language

* CI Missing language key

* Update eventorganization.lang

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-06-30 21:02:50 +02:00
Laurent Destailleur
675e761297 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/margin/tabs/productMargins.php
	htdocs/margin/tabs/thirdpartyMargins.php
 2024-06-30 04:11:04 +02:00
Laurent Destailleur
db61320098 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 
Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/product/price.php
	htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
	htdocs/user/list.php
 2024-06-30 04:05:46 +02:00
Laurent Destailleur
b2e288f8ec Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/menus/standard/eldy.lib.php
 2024-06-30 03:53:16 +02:00
Laurent Destailleur
d4b49fac4a Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-06-29 20:49:03 +02:00
Laurent Destailleur
00b58c94c3 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-06-29 20:48:39 +02:00
Laurent Destailleur
65c3e2c40e Fix regression 2024-06-22 19:46:11 +02:00
thibdrev
0acb613674 qual: use getDolGlobalString() for /product/price.php (#30114) 
* qual: use getDolGlobalString() for /product/price.php

* phan fix

* fiw phan warning

Avoid function calls in a FOR loop test part
 2024-06-22 15:47:31 +02:00
Maxime Kohlhaas
956d1b025a Fix : product price by quantity was removing default price (#29899) 2024-06-08 23:35:01 +02:00
Laurent Destailleur
087cc34a6c Rename a page with the english name 2024-05-07 02:11:06 +02:00