lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
102,820 Commits 43 Branches 150 Tags 886 MiB
14.0
Commit Graph

1132 Commits

Author SHA1 Message Date
Laurent Destailleur
0426be5059 FIX Update of sale price (log not correctly updated) 
Conflicts:
	htdocs/product/class/product.class.php
	htdocs/product/price.php
 2022-05-06 12:42:45 +02:00
Laurent Destailleur
32f2499c36 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/langs/en_US/projects.lang
	htdocs/langs/en_US/propal.lang
	htdocs/product/price.php
	htdocs/projet/card.php
	htdocs/reception/class/reception.class.php
 2022-03-23 17:04:31 +01:00
Laurent Destailleur
6167d8a02c
Merge pull request #20302 from marc-dll/13.0_FIX_product_price_update_error_management 
FIX: better error management at product selling price update
 2022-03-23 16:48:15 +01:00
Laurent Destailleur
32a68995d6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/class/product.class.php
 2022-03-10 14:08:19 +01:00
Laurent Destailleur
cc57d3dbc1 Fix phpcs 2022-03-09 22:25:29 +01:00
Marc de Lima Lucio
e989371651 FIX: better error management at product selling price update 2022-03-08 14:49:26 +01:00
Laurent Destailleur
c0088191f1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/product/admin/product.php
	htdocs/product/class/product.class.php
 2022-03-07 15:19:51 +01:00
Laurent Destailleur
d13ae9f721 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
	htdocs/product/admin/product.php
	htdocs/product/class/product.class.php
 2022-03-07 15:13:25 +01:00
Laurent Destailleur
e13038dc30
Update product.class.php 2022-03-07 14:06:54 +01:00
Eric Seigne
744b84cb09 fix #20270 : use product_id in sql only if product_id is defined 2022-03-04 15:20:50 +01:00
Laurent Destailleur
63d35ecffd Fix phpcs 2022-02-04 19:05:11 +01:00
Laurent Destailleur
e57bc01466 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/product/class/product.class.php
 2022-02-04 13:02:45 +01:00
Laurent Destailleur
3f87db08d4
Update product.class.php 2022-02-04 12:55:31 +01:00
El-dge
d09303d27c
Issue on stock virtuel : fix Dolibarr/dolibarr#18634 2022-02-04 12:31:40 +01:00
Laurent Destailleur
1c07385aba
Update product.class.php 2021-10-16 21:22:53 +02:00
Benjamin Chantalat
3438a4a9f6 Add the module reception to the calcul of virtual stock 2021-10-14 09:33:26 +02:00
Benjamin Chantalat
91164951de Remove not complete order from virtual stock 2021-10-11 15:24:56 +02:00
Laurent Destailleur
76ee014b52 Fix add a hidden solution to fix a corrupted value for AWP. 2021-09-21 16:32:32 +02:00
Laurent Destailleur
23829ae637 Cast numeric into on sql request 2021-08-23 18:56:46 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Francis Appels
d6c327ed85 Remove duplicate code 2021-07-08 13:17:07 +02:00
Laurent Destailleur
d43e043b48 Fix regression when adding a product with multicompany 2021-07-05 12:49:10 +02:00
Laurent Destailleur
2c4fd9e409 Debug ENTREPOT_EXTRA_STATUS 2021-06-24 11:51:10 +02:00
Laurent Destailleur
3bc1f90589 Fix rounding 2021-06-23 02:51:31 +02:00
Laurent Destailleur
23c0edf854
Merge pull request #17784 from atm-john/new_expedition_warehouse_auto_picking 
NEW/FIX : Allow auto picking for child warehouse and taking into account of the quantities already affected in list
 2021-06-20 12:55:30 +02:00
Laurent Destailleur
ac1e6c9966 FIX sql error on strict mysql 2021-06-16 20:17:21 +02:00
Laurent Destailleur
5cc86d2319 Fix #yogosha6370 2021-06-14 13:51:09 +02:00
Laurent Destailleur
026d919a03
Merge pull request #17900 from frederic34/patch-7 
fix warnings
 2021-06-13 16:15:58 +02:00
Laurent Destailleur
abfc87c1de Fix separator extrafields must not appear as selected fields 2021-06-13 13:32:41 +02:00
Frédéric FRANCE
56afefd6ad
fix warnings 2021-06-12 07:12:45 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
1e657b8621 Fix value of showoncombobox 2021-06-05 15:14:10 +02:00
Laurent Destailleur
2586fcd1a3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commandestats.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/holiday/month_report.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/societe/list.php
 2021-06-04 11:20:38 +02:00
ATM john
f13388122c Add fetch stock order 2021-06-01 21:43:05 +02:00
Laurent Destailleur
81a94f5642 FIX option MAIN_GENERATE_SUPPLIER_PROPOSAL_WITH_PICTURE 2021-05-28 18:04:45 +02:00
Laurent Destailleur
9aee8a2a0b FIX #17406 2021-05-25 21:53:44 +02:00
Laurent Destailleur
625aab34d6 Fix phpcs 2021-05-20 15:30:33 +02:00
Laurent Destailleur
dc3b5846fb Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-20 09:24:09 +02:00
Frédéric FRANCE
c8b1eb180a
doxygen 2021-05-20 08:50:15 +02:00
ATM john
3bf71d456d fix doc 2021-05-19 12:01:47 +02:00
ATM john
1512abf96a Remove hpcs:disable 2021-05-19 12:00:27 +02:00
ATM john
9219dcfecb Fix price log spam 2021-05-19 11:52:34 +02:00
Laurent Destailleur
a9ddf2a5ad Fix phpcs 2021-05-13 19:07:47 +02:00
Laurent Destailleur
ce8c606132 Clean APIs 2021-05-12 11:04:22 +02:00
Laurent Destailleur
e2ccacd4a9
Merge pull request #17512 from altairisfr/productcard_traceability_fields 
Stock product card traceability fields
 2021-05-11 21:40:50 +02:00
antonin_tdj
35c8bb6b29
fix bug PMP per entity 
wrong alias in SQL query
 2021-05-07 18:28:30 +02:00
Noé Cendrier
5e57a7173d
Merge branch 'develop' into productcard_traceability_fields 2021-05-06 15:21:48 +02:00
Laurent Destailleur
d6617f82ca
Merge branch 'develop' into develop 2021-05-04 00:23:28 +02:00
altairis-noe
82ae633617 lifetime and qc_frequency now treated in add and update 2021-04-28 17:08:17 +02:00
Antonin MARCHAL
00ef5b94bf lint(stickler) 2021-04-27 09:59:33 +02:00