lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
91,219 Commits 43 Branches 150 Tags 886 MiB
scrutinizer-patch-1
Commit Graph

5721 Commits

Author SHA1 Message Date
Regis Houssin
45579b0986 FIX remove unused var, $usercancreate can be change by Multicompany 2020-03-23 07:01:23 +01:00
Laurent Destailleur
ef86311639
Merge pull request #13224 from mapiolca/patch-38 
# Fix Compatibility with NOTMODIFYOTHERENTITYFOURNPRICE const.
 2020-03-22 20:32:15 +01:00
Laurent Destailleur
23e06debb7 Popup is smaller 2020-03-22 11:52:02 +01:00
Bahfir Abbes
c9bdefbbe0
fix: delete redundant test+fix condition test+display units type if products in warehouse of same nature 2020-03-20 19:08:24 +01:00
Laurent Destailleur
222556b464 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/accounting-files.php
	htdocs/core/lib/functions.lib.php
 2020-03-19 22:09:17 +01:00
Laurent Destailleur
c71da5d013 FIX mass action on stock movements 2020-03-19 15:43:06 +01:00
stickler-ci
1bff748c94 Fixing style errors. 2020-03-18 00:24:40 +00:00
Anthony Berton
82058f3a78 add phone 2020-03-18 01:17:54 +01:00
Anthony Berton
9fa4f245cc
Update list.php 2020-03-18 00:03:26 +01:00
Pierre Ardoin
26f6f04486
forgot ";" 2020-03-17 10:08:18 +01:00
Pierre Ardoin
564f412957
correction due to comments @hregis and @eldy 2020-03-17 10:04:43 +01:00
Laurent Destailleur
4f442905b2 A new way to navigate between pages in list is available 2020-03-17 03:31:58 +01:00
stickler-ci
1f83e5ac54 Fixing style errors. 2020-03-15 21:30:46 +00:00
bahfir abbes
0ad68c180d fix:Show units of products in stocks and hide total units if content is of diffents units 2020-03-15 22:26:23 +01:00
Laurent Destailleur
3b72005f93 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/card.php
	htdocs/filefunc.inc.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/errors.lang
	htdocs/langs/fr_FR/products.lang
	htdocs/langs/fr_FR/projects.lang
 2020-03-14 00:22:11 +01:00
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +01:00
Laurent Destailleur
94589158c0 Move class from external project as internal class (project is dead) 2020-03-13 02:32:33 +01:00
Scrutinizer Auto-Fixer
f413ce6aac Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-12 11:45:44 +00:00
Laurent Destailleur
f38134e44d Fix non transversable var 2020-03-12 12:42:34 +01:00
Laurent Destailleur
dfe947885c FIX params of setEventMessage($langs->trans('ErrorProductClone')... 2020-03-12 12:40:28 +01:00
Laurent Destailleur
31865d7ae5 Fix doc 2020-03-12 12:39:21 +01:00
Laurent Destailleur
89a8531140
Merge pull request #13237 from aspangaro/12.0_a18 
NEW: Accountancy - Add mode intra & export for product or service bought
 2020-03-11 17:08:49 +01:00
Laurent Destailleur
47ebc2bbf2 Hide legend 2020-03-06 09:52:51 +01:00
Laurent Destailleur
0bd2740779 NEW Can force position of legend of graph on right (instead of top) 2020-03-05 17:23:19 +01:00
Laurent Destailleur
ddb26d7a8f NEW Add graph type 'piesemicircle' 2020-03-05 16:30:55 +01:00
Laurent Destailleur
fc31680bd0 Several fix for chart.js graphs 2020-03-05 02:55:06 +01:00
Laurent Destailleur
aa1552dbc0 Enhance graphs 2020-03-05 00:17:16 +01:00
Laurent Destailleur
55093f9ff2
Merge pull request #13232 from TobiasSekan/NewCategoriesInStocks 
NEW Category filter for warehouse list
 2020-03-02 22:50:08 +01:00
Laurent Destailleur
46bf65704a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-02 21:59:56 +01:00
Laurent Destailleur
87fe2e691b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/product/stats/facture.php
	htdocs/product/stats/facture_fournisseur.php
 2020-03-02 21:59:34 +01:00
Sekan, Tobias
754058b990 Fix lint errors 2020-03-01 14:50:22 +01:00
Sekan, Tobias
0e55495c3e adress feedback 2020-03-01 14:45:51 +01:00
Alexandre SPANGARO
da99c89c26 FIX: typo on ckeck method 2020-03-01 05:21:51 +01:00
Alexandre SPANGARO
6982997de5 Fix error 2020-03-01 05:09:57 +01:00
Alexandre SPANGARO
d9b9913e8a NEW: Accountancy - Add mode intra & export for product or service bought 2020-03-01 04:52:12 +01:00
Laurent Destailleur
8879672122 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-29 12:52:18 +01:00
VESSILLER
8eff3162a9 FIX undefined function measuringUnitString in product list 2020-02-29 12:47:48 +01:00
Laurent Destailleur
dea8525a6c NEW X-Axis on graph are show vertical when there is a lot of values. 2020-02-29 01:26:24 +01:00
Laurent Destailleur
56704e4029 Add stats of products in MO 2020-02-28 19:26:52 +01:00
Tobias Sekan
0e7e6f44e2
Update list.php 2020-02-28 16:16:05 +01:00
Laurent Destailleur
bfb9739ae8 Fix manufacuring efficiency on bom lines. 2020-02-28 16:12:42 +01:00
Tobias Sekan
bc8c709900
Add category filter for stocks 2020-02-28 16:03:35 +01:00
Pierre Ardoin
8476477137
add const NOTMODIFYOTHERENTITYFOURNPRICE 
if const NOTMODIFYOTHERENTITYFOURNPRICE, can't modify other shared fourn prices.
 2020-02-27 09:19:39 +01:00
Laurent Destailleur
0646b1a7a9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ihm.php
 2020-02-26 17:04:14 +01:00
Laurent Destailleur
ef9fe73d96 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/index.php
 2020-02-26 17:02:23 +01:00
Laurent Destailleur
85a4c4cf17 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-26 16:54:08 +01:00
Laurent Destailleur
25157649e2 Fix missing column 2020-02-26 16:53:58 +01:00
Laurent Destailleur
a17fba8321
Merge pull request #13158 from bb2a/patch-18 
Default warehouse to create order
 2020-02-26 16:45:25 +01:00
Tobias Sekan
0622024f61
Fix column selection on stocklist 2020-02-26 14:37:36 +01:00
atm-josselin
b2a488ef9f FIX : Bad translation for productlot EatBy and SellBy 2020-02-24 11:00:55 +01:00
Laurent Destailleur
f931b92d36 Merge branch 'new-takepos-batch-decrement' of 
https://github.com/OPEN-DSI/dolibarr into develop

# Conflicts:
#	htdocs/langs/en_US/errors.lang
 2020-02-23 22:49:03 +01:00
futurehousestore
16b4e680f7 Add Products/Services by popularity in Orders 2020-02-22 02:45:58 +00:00
Laurent Destailleur
badc4327c2
Merge branch 'develop' into patch-3 2020-02-21 19:45:33 +01:00
Laurent Destailleur
c2677c0231
Update api_products.class.php 2020-02-21 19:44:02 +01:00
Laurent Destailleur
58a57a0411
Merge branch 'develop' into fix-modoristomouv 2020-02-21 18:05:13 +01:00
Scrutinizer Auto-Fixer
e44865d8b5 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-21 16:53:37 +00:00
VESSILLER
71c9b94b22 NEW add const CASHDESK_FORCE_DECREASE_STOCK to force batch decrementation 2020-02-21 11:08:34 +01:00
Anthony Berton
bbb108133f
Update html.formproduct.class.php 2020-02-20 22:45:03 +01:00
Laurent Destailleur
1f4b639ba0 Debug MRP module 2020-02-20 17:44:03 +01:00
DEMAREST Maxime
4630525973 Fix: Mouvementstock::get_origin modulenme whith origintype 2020-02-20 16:19:28 +01:00
Laurent Destailleur
44eda2d4ad Fix doxygen 2020-02-20 13:42:43 +01:00
Laurent Destailleur
f1d16d6961
Merge pull request #13138 from indelog/indelog-dev 
NEW: Allow custom module class origine type in Mouvementstock
 2020-02-19 00:53:04 +01:00
Laurent Destailleur
ce3e977fc3
Merge pull request #13141 from Dolibarr/scrutinizer-patch-5 
Scrutinizer Auto-Fixes
 2020-02-18 23:49:10 +01:00
Laurent Destailleur
9b522d105e
Merge pull request #13112 from josemariagomezroncero/patch-3 
FIX Correction bug dynamic price
 2020-02-18 23:48:53 +01:00
Scrutinizer Auto-Fixer
fd48877dc6 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-18 22:47:25 +00:00
Laurent Destailleur
2ac064059a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/projet/element.php
 2020-02-18 22:40:43 +01:00
Laurent Destailleur
fa16063875 Fix bad accounting code set 2020-02-18 22:39:01 +01:00
Laurent Destailleur
31ae0bc06e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/fourn/commande/index.php
	htdocs/product/card.php
 2020-02-18 22:38:30 +01:00
DEMAREST Maxime
30ef5f54dd Allow custom module class origine type in Mouvementstock 2020-02-18 18:24:54 +01:00
Laurent Destailleur
a6b0fec90b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/exports/class/export.class.php
 2020-02-17 12:35:34 +01:00
Laurent Destailleur
504a67daee FIX duplicate class name into some log lines 2020-02-17 12:34:00 +01:00
Laurent Destailleur
549bf076d7 Fix prefix of log 2020-02-17 12:22:52 +01:00
gauthier
523d09536c FIX : must be == and not = 2020-02-17 12:20:19 +01:00
Laurent Destailleur
f4f3efec62 Fight against $_POST 2020-02-16 19:33:58 +01:00
josemariagomezroncero
601cd3809c
Correction 2020-02-14 20:16:10 +01:00
josemariagomezroncero
27a874a6ba
Correction bug dynamic price 
It 
does not allow to continue when then the product hasnt supplier pirce
 2020-02-14 11:38:51 +01:00
Laurent Destailleur
525219836a
Merge pull request #13097 from josemariagomezroncero/patch-2 
Hook for dynamic price
 2020-02-13 18:54:22 +01:00
josemariagomezroncero
0d49211dea
Correction for Hook for dynamic price 
Correction for Hook for dynamic price
 2020-02-13 12:59:59 +01:00
Laurent Destailleur
9e165a782f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-13 11:58:23 +01:00
Laurent Destailleur
78d4978d31 FIX #13100 2020-02-13 11:26:11 +01:00
Laurent Destailleur
a4f13194c3
Merge pull request #12503 from atm-greg/New_Supplier_Packaging 
NEW Experiment supplier packaging with option PRODUCT_USE_SUPPLIER_PACKAGING: Using price according to the minimum quantity
 2020-02-13 10:50:56 +01:00
Laurent Destailleur
0d366c45e5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-12 21:43:44 +01:00
Laurent Destailleur
6be746e219 Fix replenishment for virtual stock check if module is on or off 2020-02-12 21:42:48 +01:00
josemariagomezroncero
373a5ff508
Hook for dynamic price 
Hook for dynamic price
 2020-02-12 21:31:45 +01:00
Laurent Destailleur
7931734ecb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modUser.class.php
 2020-02-12 20:30:20 +01:00
Laurent Destailleur
83b5fe3c71 FIX #13077 Replace left join with inner join (left join was useless) 2020-02-12 20:24:58 +01:00
Laurent Destailleur
3f4c787c84 Fix physical stock were truncated in product/reassort page 2020-02-12 20:22:53 +01:00
ptibogxiv
558ccdd8b9
Update card.php 2020-02-11 20:20:34 +01:00
ptibogxiv
5459e4b821
Fix netmeasure update and display 
nb: netmeasure is for real weight, volume or piece;

 i'll try to introduce in v12 price by unit using this value ( needed for some business ie fruits, vegetables....)
 2020-02-11 20:11:37 +01:00
Laurent Destailleur
d2bafe3052 Add tab with stock movements 2020-02-11 18:18:04 +01:00
Laurent Destailleur
74d3912763 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
 2020-02-11 16:52:58 +01:00
Laurent Destailleur
ee7aa14247 Fix color of status 2020-02-10 21:28:49 +01:00
Laurent Destailleur
cab228ebbe Fix condition 2020-02-10 15:54:46 +01:00
Laurent Destailleur
bb40dbe1c3 Fix label of field 2020-02-10 15:53:28 +01:00
BENKE Charlene
40ac2d5cbd
Add finished field on list 2020-02-10 14:34:00 +01:00
Laurent Destailleur
2eae9a2fa2 FIX Missing include 2020-02-07 12:15:20 +01:00
Laurent Destailleur
c4204f95d4 FIX Missing include 2020-02-07 12:12:10 +01:00
stickler-ci
102595f6b1 Fixing style errors. 2020-02-06 09:02:15 +00:00
atm-greg
f8ffdea5ae Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_Supplier_Packaging 2020-02-06 09:59:42 +01:00
VESSILLER
c3cf9e62b3 FIX links in products/services index 2020-02-05 11:31:02 +01:00
Laurent Destailleur
ffa847bc8e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-02 19:32:37 +01:00
Laurent Destailleur
d530c7f708 Try fix for #12984 2020-01-31 18:57:07 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-30 00:48:28 +00:00
Laurent Destailleur
80707d6a5e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-28 17:24:26 +01:00
Laurent Destailleur
3a9e238dc6 FIX Missing value of $formconfirm as parameters of hook 2020-01-28 12:00:27 +01:00
Laurent Destailleur
df478dc170 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-27 01:53:49 +01:00
Laurent Destailleur
be29795f7f
Merge pull request #12905 from laudeco/hotfix/qty_negative_stock 
fix minimum quantity on stock movement
 2020-01-26 22:09:43 +01:00
Laurent Destailleur
08d8670bb3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/class/product.class.php
 2020-01-24 20:12:27 +01:00
Laurent Destailleur
17f28189f9 Virtual stock must include Manufacturing Orders 2020-01-24 14:51:45 +01:00
Laurent Destailleur
540713510e Fix load of segment prices not required for virtual stock change 
virtual stock must include production (WIP)
 2020-01-23 21:03:15 +01:00
Laurent Destailleur
12b4909c45 Fix load of segment prices not required for virtual stock change 
virtual stock must include production (WIP)
 2020-01-23 20:59:18 +01:00
Laurent Destailleur
27a0858050 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/class/mouvementstock.class.php
 2020-01-23 17:41:31 +01:00
Laurent Destailleur
646ccc1354 Fix error management 2020-01-23 11:52:00 +01:00
Laurent De Coninck
7ec17f17d5
FIX - API - DLC/DLUO date for stock movement 
Instead of giving a string to the creation of a stock movement, we have
to give an integer.

This PR fixes that.

[see: X]
 2020-01-23 09:41:22 +01:00
Laurent Destailleur
57569604b2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-22 14:11:53 +01:00
Laurent Destailleur
d3411a79ef Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-22 14:11:44 +01:00
Laurent Destailleur
4686be34d2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/product/class/product.class.php
	htdocs/stripe/charge.php
 2020-01-22 14:10:46 +01:00
Laurent Destailleur
839f1b83fd
Merge pull request #12901 from OPEN-DSI/new-product-list-units-columns 
NEW columns units in product list
 2020-01-22 13:55:50 +01:00
Laurent De Coninck
73ee655dde
fix minimum quantity on stock movement 
by fixing another issue on the batch management in the API, I introduced
a bug on the stock quantity decrease.

[see: X]
 2020-01-22 08:13:00 +01:00
Laurent Destailleur
7e08dc17af Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-21 20:51:22 +01:00
Laurent Destailleur
fd02ed4317 Fix label 2020-01-21 20:50:58 +01:00
VESSILLER
c91ab621b8 FIX length, width and height coherence in product table 2020-01-21 17:49:27 +01:00
VESSILLER
8a348d533b NEW only show units columns in product list (not in service list) 2020-01-21 17:29:45 +01:00
VESSILLER
70122411eb FIX label Volume in comment 2020-01-21 11:02:14 +01:00
VESSILLER
0278cef2d7 NEW columns units in product list 2020-01-21 10:33:27 +01:00
Laurent Destailleur
92856788a3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-20 18:39:46 +01:00
Laurent Destailleur
18f2b09fb1 Debug v11 2020-01-20 12:25:25 +01:00
Laurent Destailleur
969da828fa Debug inventory 2020-01-20 02:30:53 +01:00
Laurent Destailleur
206cfcd7fe Clean code for inventory 2020-01-20 02:07:47 +01:00
Laurent Destailleur
24d439845b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/class/mouvementstock.class.php
 2020-01-18 20:20:25 +01:00
Laurent Destailleur
45f322cce8 Fix error management in API 2020-01-18 20:17:21 +01:00
Laurent Destailleur
a1b03e094c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-01-18 19:53:58 +01:00
Laurent Destailleur
df26bab65b FIX #12881 2020-01-18 19:52:59 +01:00
Laurent De Coninck
d2e4b9346b
enhance the doc 2020-01-17 17:49:50 +01:00
Laurent De Coninck
5687d26f95
fixes the creation of a stock movement 
This fixes the creation of a stock movement by supporting the DLC and
DLUO.

[see: #12883]
 2020-01-17 17:21:14 +01:00
Laurent Destailleur
0ebed529e1 FIX #12872 2020-01-17 15:27:43 +01:00
Scrutinizer Auto-Fixer
2386573994 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-16 01:53:00 +00:00
VESSILLER
53ddbc1eb5 FIX remove repeated sql fields in product list 2020-01-15 16:24:04 +01:00
Laurent Destailleur
3f79c00542
Merge branch 'develop' into actioncomm_category 2020-01-15 14:21:06 +01:00
Laurent Destailleur
373420edc0
Merge pull request #12476 from ptibogxiv/patch-280 
NEW add total of value in product stat
 2020-01-15 14:11:01 +01:00
Laurent Destailleur
ad7da80353
Merge pull request #12479 from OPEN-DSI/new-product-list-units 
NEW add units in product list
 2020-01-15 14:09:50 +01:00
Laurent Destailleur
03a1897089 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/stocks.lang
 2020-01-13 13:44:32 +01:00
Laurent Destailleur
2465d5ab47
Merge pull request #12837 from laudeco/hotfix/replenish_product 
replenish product
 2020-01-13 13:18:28 +01:00
Laurent Destailleur
bfa13e16ed Debug MO module 2020-01-13 12:30:48 +01:00
Laurent De Coninck
67d73c5488
Fix the select of the provider for one product 2020-01-12 21:56:35 +01:00
Laurent Destailleur
b47db086cb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/inventory/class/inventory.class.php
	htdocs/product/inventory/list.php
 2020-01-10 14:30:42 +01:00
Laurent Destailleur
d97a59ac4a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	ChangeLog
	htdocs/comm/remise.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
	htdocs/variants/combinations.php
 2020-01-10 14:25:26 +01:00
Laurent Destailleur
c4d62e0ea3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/list.php
 2020-01-10 13:51:29 +01:00
Laurent Destailleur
dd930fe791 Can disable a not expected behaviour on price propagation 2020-01-10 01:07:58 +01:00
Laurent Destailleur
78dcf91f02 Fix bad link 2020-01-09 22:42:31 +01:00
Laurent Destailleur
f48c7d2ecf Fix modulebuilder 2020-01-09 22:31:23 +01:00
Laurent Destailleur
0e58edd896 Fix modulebuilder 2020-01-09 22:27:24 +01:00
Laurent Destailleur
124f41f863 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-09 09:10:11 +01:00
Laurent Destailleur
0802df78b5 Debug MRP 2020-01-08 17:56:02 +01:00
Laurent Destailleur
97f62c68f2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-08 13:38:03 +01:00
Laurent Destailleur
5da952cf8a Comment 2020-01-08 13:37:52 +01:00
Laurent Destailleur
622dc7e8d7 Debug v11 2020-01-07 22:01:55 +01:00
Laurent Destailleur
7ef3ee56bd Fix MRP 2020-01-07 20:28:21 +01:00
Dev2a
2d67c2365f Fix Check right for service for arrayofmassaction 
if product module disable, threre is no action for service
 2020-01-07 18:59:58 +01:00
Laurent Destailleur
0e496d2191 MRP 2020-01-06 02:55:09 +01:00
Laurent Destailleur
eca91af2ca Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-01-04 14:21:56 +01:00
Laurent Destailleur
7853427bb1 FIX product with empty stock were not visible 2020-01-04 14:21:38 +01:00
Laurent Destailleur
38de69f5a9 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/list.php
	htdocs/compta/bank/releve.php
	htdocs/compta/salaries/card.php
	htdocs/core/actions_addupdatedelete.inc.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/boxes.lang
	htdocs/langs/en_US/main.lang
	htdocs/product/class/product.class.php
	htdocs/product/reassort.php
	htdocs/product/stock/product.php
	htdocs/projet/element.php
 2020-01-04 14:20:25 +01:00
Laurent Destailleur
0dafbd194f
Merge pull request #12750 from OPEN-DSI/v10-fix-product-virtual-stock-stats-sending 
FIX add product qty in shipment already sent (fix for option STOCK_CALCULATE_ON_SHIPMENT_CLOSE)
 2020-01-03 20:56:59 +01:00
Laurent Destailleur
37f9307732
Update product.class.php 2020-01-03 20:53:49 +01:00
VESSILLER
6e9bb5d7da FIX sql bad request in product buying price extrafields 2020-01-03 20:49:54 +01:00
Pierre Ardoin
79458ac139
FIX an issue that shows all entities stock 
Before : If products are shared between several entities, the stock of each entity are to add in this page (reassort.php)
 
Now : Each entity see only her stock and not other's stock.
 2020-01-03 18:05:49 +01:00
Laurent Destailleur
2e8fd25299 FIX Local taxes was not correctly supported in TakePOS. 2020-01-01 21:54:47 +01:00
Laurent Destailleur
7d07c198bc FIX Price of purchase order and vendor invoice with multicurrency 
FIX entering predefined product with a forced unit price
 2020-01-01 17:15:26 +01:00
Frédéric FRANCE
90235d0528
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-31 13:57:40 +01:00
Regis Houssin
71a2998118 FIX wrong var name and avoid warning 2019-12-30 15:36:09 +01:00
Regis Houssin
c76edb20d7 FIX avoid php warning 2019-12-27 12:20:38 +01:00
VESSILLER
b0edd46494 FIX add product qty in shipment already sent 2019-12-23 15:07:26 +01:00
Laurent Destailleur
9f86cd8824 Debug v11 2019-12-20 11:14:16 +01:00
Laurent Destailleur
03649ea2c8 Fix pb with svg images 2019-12-19 19:10:23 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer
455178ff73 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-18 14:20:36 +00:00
Laurent Destailleur
f4b7e038f8
Merge pull request #12714 from frederic34/patch-6 
doxygen
 2019-12-16 19:03:47 +01:00
Laurent Destailleur
1af67a4336
Merge pull request #12713 from frederic34/doxygen_warning 
doxygen
 2019-12-16 19:02:10 +01:00
Scrutinizer Auto-Fixer
c8baaa2995 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-16 12:06:25 +00:00
Frédéric FRANCE
e1386faa59
doxygen 2019-12-15 10:53:03 +01:00
Frédéric FRANCE
9e4fb8d4fe
doxygen 2019-12-15 10:02:20 +01:00
Laurent Destailleur
838633d0de Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/api/class/api_setup.class.php
	htdocs/compta/facture/card.php
	htdocs/compta/stats/index.php
	htdocs/core/actions_massactions.inc.php
	htdocs/install/upgrade2.php
	htdocs/loan/card.php
	htdocs/loan/document.php
	htdocs/loan/info.php
	htdocs/loan/note.php
	htdocs/loan/schedule.php
	htdocs/product/list.php
	htdocs/ticket/card.php
	htdocs/user/class/user.class.php
 2019-12-14 14:53:49 +01:00
Laurent Destailleur
835d22f556
Merge branch 'develop' into doxygen_todo 2019-12-14 13:46:40 +01:00
Laurent Destailleur
dea5396029
Merge pull request #12705 from frederic34/patch-21 
doxygen
 2019-12-14 13:42:46 +01:00
Laurent Destailleur
65bf2fa285
Merge pull request #12689 from code-chicken/develop 
Fix: calculation of virtual stock
 2019-12-14 13:40:02 +01:00
Frédéric FRANCE
57055bad03
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-13 14:36:00 +01:00
Frédéric FRANCE
c269229aab
doxygen 2019-12-13 08:12:55 +01:00
Laurent Destailleur
ce47de453e Fix HTML5 2019-12-12 10:31:08 +01:00
Frédéric FRANCE
9357bfd98e
doxygen 2019-12-12 08:17:14 +01:00
Laurent Destailleur
63b9656468 Fix use of currency accuracy 2019-12-11 17:05:42 +01:00
Rüdiger Hahn
cc96ad03c1
Update replenish.php 2019-12-11 14:00:27 +01:00
Laurent Destailleur
24e9d3fdf0
Merge pull request #12631 from atm-florianm/FIX_10.0_backporting_duration_fix_from_develop 
FIX 10.0: do not display single-letter duration values in product list
 2019-12-09 17:43:32 +01:00
Scrutinizer Auto-Fixer
4debd71281 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-06 08:26:49 +00:00
Frédéric FRANCE
d9bfa62367
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-05 21:47:42 +01:00
Florian Mortgat
3f6715a377 FIX: add URL param "restore_last_search_values=1" to all backlinks that point to a list 2019-12-05 15:34:41 +01:00
Florian Mortgat
139419c3e8 FIX 10.0: do not display single-letter values (indicating duration unit without value) in product list 
(this fix exists in develop)
 2019-12-05 10:38:03 +01:00
Laurent Destailleur
b78f310508 Reponsive 2019-12-04 15:49:22 +01:00
Laurent Destailleur
bde917d7fc Fix responsive 2019-12-04 15:09:20 +01:00
Frédéric FRANCE
4c5c6b6ff1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-03 17:56:43 +01:00
Frédéric FRANCE
650c9c2e57
Update product.class.php 2019-12-03 16:46:50 +01:00
Frédéric FRANCE
85d8d2ff58
select_product_fourn_price returns void 2019-12-03 15:19:58 +01:00
Laurent Destailleur
41a176ce72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/remx.php
	htdocs/core/modules/modStripe.class.php
	htdocs/product/stock/replenish.php
	htdocs/stripe/payout.php
 2019-12-03 13:58:15 +01:00
Laurent Destailleur
eb5a2bd1a5 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/expensereport/card.php
	htdocs/user/card.php
 2019-12-03 13:52:42 +01:00
Laurent Destailleur
a00d011f10
Merge pull request #12609 from frederic34/patch-20 
Update product.class.php
 2019-12-03 13:18:29 +01:00
Laurent Destailleur
37cee5840a
Merge pull request #12608 from frederic34/patch-19 
$id parameter was removed long time ago
 2019-12-03 13:17:01 +01:00
Scrutinizer Auto-Fixer
36a74cd160 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-03 10:17:29 +00:00
Frédéric FRANCE
ac674aae6a
Update product.class.php 2019-12-02 20:45:28 +01:00
Frédéric FRANCE
579f570abf
$id parameter was removed long time ago 2019-12-02 20:42:48 +01:00
Laurent Destailleur
92070fa491 Fix name of variable $trigger_name into $triggersendname 2019-12-02 09:38:16 +01:00
Frédéric FRANCE
25ed2b930f
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-01 16:10:37 +01:00
Cédric
7b295bf738
addPurchasePrice Update the price if already exist 2019-12-01 14:56:39 +01:00
Maxime Kohlhaas
270f4c2500 Fix #12044 : with replenish function, use product supplier desc in order 2019-12-01 09:26:54 +01:00
Laurent Destailleur
f549c4fc9c
Merge pull request #12544 from frederic34/select_produits 
Form select_produits returns void
 2019-12-01 00:47:02 +01:00
Laurent Destailleur
d338a054eb Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-12-01 00:41:23 +01:00
Laurent Destailleur
a2a96f8796 # WARNING: head commit changed in the meantime 
Restore file for travis
 2019-12-01 00:41:11 +01:00
Laurent Destailleur
3c328153bb
Merge pull request #12581 from homer8173/patch-12 
add location on combobox
 2019-12-01 00:32:23 +01:00
Norbert Penel
89f57d7d3b
add label to combobox 
useful for BOM, etc
 2019-11-30 23:45:24 +01:00
Norbert Penel
755417e9a9
add location on combobox 
usefull for BOM, etc
 2019-11-30 23:43:22 +01:00
stickler-ci
1bad6f5c9c Fixing style errors. 2019-11-30 22:38:05 +00:00
Cédric
565a17dc47
API New add purchase prices 2019-11-30 23:36:23 +01:00
Norbert Penel
e3fb27e3fc
Default type missing for add links from module builder 
BOM links to add product don't precise the type (from common object)
 2019-11-30 19:34:22 +01:00
Laurent Destailleur
3b9d2abcb2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/product.lib.php
	htdocs/filefunc.inc.php
	htdocs/product/class/product.class.php
	htdocs/product/list.php
 2019-11-29 11:42:08 +01:00
Laurent Destailleur
a4a805f618 Doxygen 2019-11-29 11:32:22 +01:00
Laurent Destailleur
3acd0bc2ff FIX Reduce number of request for list of products 2019-11-29 11:32:09 +01:00
Frédéric FRANCE
c214dd0675
Form select_produits returns void 2019-11-28 21:23:53 +01:00
Laurent Destailleur
d58bb5f66b Fix link to user 2019-11-28 16:16:55 +01:00
Laurent Destailleur
6ee6c5d514 Fix edit of product images 2019-11-28 14:09:41 +01:00
stickler-ci
76c5a08242 Fixing style errors. 2019-11-28 12:13:36 +00:00
Cédric
45bf3e4df9
Merge branch 'develop' into patch-3 2019-11-28 13:11:52 +01:00
Scrutinizer Auto-Fixer
5f99e25c45 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-28 11:36:20 +00:00
Frédéric FRANCE
b2912e688b
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-27 22:54:05 +01:00
Frédéric FRANCE
6ea204bd73
Update entrepot.class.php 2019-11-26 20:20:46 +01:00
Frédéric FRANCE
28b70a5399
remove deprecated 2019-11-26 20:14:46 +01:00
Laurent Destailleur
30ea48a715 Fix api for deletion of attributes 2019-11-26 12:58:41 +01:00
Frédéric FRANCE
4c4ae5b6e1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-26 08:10:40 +01:00
VESSILLER
35f02c5165 NEW add width and height measures in product list 2019-11-25 10:25:09 +01:00
stickler-ci
5d051cc901 Fixing style errors. 2019-11-25 07:08:22 +00:00
Cédric
6484ba10c5
remove unecessary code 
already done by ::createProductCombination
 2019-11-23 16:08:35 +01:00
atm-greg
ce15af0980 manage packaging on supplier prices 2019-11-23 15:52:34 +01:00
Cédric
76fd794559
API New can customize reference when addvariant 2019-11-23 14:04:00 +01:00
ptibogxiv
4d9894e58e
Update card.php 2019-11-22 15:49:06 +01:00
Laurent Destailleur
24bb345ee1 Fix bad name of function 2019-11-22 15:35:19 +01:00
Laurent Destailleur
7cf71f7283
Merge pull request #12477 from code-chicken/develop 
Use virtual stock when it has been configured
 2019-11-22 14:47:32 +01:00
Laurent Destailleur
3242835111
Update replenish.php 2019-11-22 14:47:15 +01:00
Laurent Destailleur
2fc00437d8
Merge pull request #12493 from Dolibarr/scrutinizer-patch-12 
Scrutinizer Auto-Fixes
 2019-11-22 14:35:49 +01:00
Laurent Destailleur
f0e7eaf0cd
Merge pull request #12453 from c3do/patch-3 
API New get / add / remove subproducts, attributes and variants
 2019-11-22 14:34:54 +01:00
Scrutinizer Auto-Fixer
b388c6b7a8 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-22 13:14:59 +00:00
Cédric
e76a112099
Remove unecessary dol_clone in ::putVariant 2019-11-21 23:09:18 +01:00
stickler-ci
821ca724a5 Fixing style errors. 2019-11-21 21:54:51 +00:00
Cédric
1bc8c57d6d
Fix $weight_impact $price_impact 2019-11-21 22:54:13 +01:00
Cédric
5a3f78088e
Fix double deleteAttributeValueByRef 2019-11-21 18:18:11 +01:00
Cédric
351ba58bbe
Fix Superfluous parameter comment 2019-11-21 17:43:40 +01:00
stickler-ci
cfa0860d24 Fixing style errors. 2019-11-21 16:41:45 +00:00
Cédric
416a2f7f1c
FIX putAttributes, ADD putAttributeValue 2019-11-21 17:41:09 +01:00
stickler-ci
0074589b6f Fixing style errors. 2019-11-21 16:24:25 +00:00
Cédric
1068d9a623
FIX deleteAttributeValueByRef / ADD getAttributeValueById, getAttributeValueByRef 2019-11-21 17:23:46 +01:00
stickler-ci
4f747e2eb8 Fixing style errors. 2019-11-21 14:50:47 +00:00
Cédric
d6ba06e271
API New get attribute by ref + security update 2019-11-21 15:50:06 +01:00
Laurent Destailleur
0fffdd891e Sanitize data 2019-11-21 15:37:59 +01:00
VESSILLER
b7517377a7 FIX goup by unit label in product list 2019-11-20 15:00:34 +01:00
VESSILLER
38b083b766 FIX unit translate in product list if null 2019-11-20 14:43:29 +01:00
VESSILLER
0a125f73b5 NEW add units in product list 2019-11-20 14:21:35 +01:00
Rüdiger Hahn
9018ec7eb2
Merge branch 'develop' into develop 2019-11-20 13:09:51 +01:00
Rüdiger Hahn
db0d352af3
Use virtual stock when this has been configured 
When "Use virtual stock by default, instead of physical stock, for replenishment feature" has been set in configuration, this should really be used. Otherwise only physically missing items will be shown in replenishment.
 2019-11-20 12:53:23 +01:00
ptibogxiv
f1a9daf77e
NEW add total of value in product stat 2019-11-20 12:42:56 +01:00
stickler-ci
c33506b4cc Fixing style errors. 2019-11-19 13:41:30 +00:00
Cédric
8fbf853b94
Display attributes infos when get product variants 2019-11-19 14:40:50 +01:00
Frédéric FRANCE
2e5f539b2a
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-18 17:45:52 +01:00
Laurent Destailleur
3300446cbf Fix td colspan 2019-11-18 14:13:51 +01:00
stickler-ci
a17e183da9 Fixing style errors. 2019-11-17 00:18:43 +00:00
Cédric
8c057f1975
API New Product variants 2019-11-17 01:20:15 +01:00
Laurent Destailleur
e15963688a
Merge pull request #12435 from OPEN-DSI/fix-product-virtual-stock-stats-sending 
FIX add product qty in shipment already sent only if reel stock was d…
 2019-11-16 23:34:44 +01:00
Laurent Destailleur
2689f7515c Fix pb with colspan and extrafields. 
Fix remove empty id
 2019-11-16 14:38:05 +01:00
Cédric
256e256f62
Paths and vars: subproducts instead of childs 2019-11-16 12:30:47 +01:00
Cédric
33d4c4b73c
Doc for $child_id 2019-11-16 11:23:50 +01:00
Cédric
04f58f5d32
$includesubproducts and path consistency 2019-11-16 11:17:56 +01:00
Frédéric FRANCE
6784ea9fae
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-16 09:21:57 +01:00
stickler-ci
aa7353d3cf Fixing style errors. 2019-11-15 21:18:40 +00:00
Cédric
f620b165d3
API New get / add / remove product childs 2019-11-15 22:17:53 +01:00
Laurent Destailleur
1f5bea01f5 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/product/fournisseurs.php
	htdocs/user/card.php
 2019-11-14 21:30:16 +01:00
Laurent Destailleur
7e52c70321 FIX Advisory ID: usd20190067 2019-11-14 21:16:18 +01:00
Laurent Destailleur
da3a907075
Merge branch 'develop' into fix-product-virtual-stock-stats-sending 2019-11-14 12:16:28 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-14 11:09:15 +00:00
VESSILLER
851cf4f3f3 FIX add product qty in shipment already sent only if reel stock was decremented 2019-11-14 09:52:13 +01:00
Frédéric FRANCE
a3e092b227
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-14 09:21:26 +01:00
Laurent Destailleur
171b94fc5c
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5 
Scrutinizer Auto-Fixes
 2019-11-14 08:50:24 +01:00
Laurent Destailleur
614faa07c1
Merge pull request #12427 from Dolibarr/scrutinizer-patch-3 
Scrutinizer Auto-Fixes
 2019-11-14 08:49:53 +01:00
Frédéric FRANCE
446c66da62
use class CONST 2019-11-14 08:15:39 +01:00
Scrutinizer Auto-Fixer
b40ecc3933 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer
f4aaa8d9bb Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:34:37 +00:00
Scrutinizer Auto-Fixer
87585c0f2a Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 17:32:11 +00:00
Scrutinizer Auto-Fixer
c85e54b08c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-12 08:46:08 +00:00
Scrutinizer Auto-Fixer
df664e790b Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-11 23:15:34 +00:00
Laurent Destailleur
8976bd7c9b Fix setup of accounting account 2019-11-11 19:05:42 +01:00
stickler-ci
3df87a419c Fixing style errors. 2019-11-10 11:12:42 +00:00
Philippe GRAND
098ffd4827 add some comment 2019-11-10 12:12:14 +01:00
Philippe GRAND
69e1d0480a add some comment 2019-11-10 12:10:13 +01:00
Laurent Destailleur
274ddaa1be Fix mandatory field 2019-11-09 19:01:03 +01:00
Cédric
4dbf151b15
Inject $user in ProductCombination::updateProperties 2019-11-09 13:29:12 +01:00
Scrutinizer Auto-Fixer
2ecfe41810 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-08 09:53:31 +00:00
Laurent Destailleur
f11943126a Fix scrutinizer 2019-11-08 09:42:39 +01:00
Laurent Destailleur
3fcc72f504
Merge pull request #12353 from frederic34/patch-17 
can't have static and $this at same time
 2019-11-07 11:32:55 +01:00
Laurent Destailleur
9dc309d59d
Merge pull request #12351 from frederic34/patch-15 
Update fournisseurs.php
 2019-11-07 11:31:43 +01:00
Laurent Destailleur
1ea8fed9c4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-07 11:16:20 +01:00
Laurent Destailleur
feef992d39 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-07 11:16:09 +01:00
Frédéric FRANCE
90f80d137f
can't have static and $this at same time 2019-11-05 23:19:11 +01:00
Frédéric FRANCE
d1131e6b5a
Update fournisseurs.php 2019-11-05 22:27:30 +01:00
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Laurent Destailleur
d972fa8bcb Fix pb with model_pdf 2019-11-05 20:20:57 +01:00
Laurent Destailleur
94bd0f71d9 Fix pb with permission 2019-11-05 19:41:30 +01:00
Laurent Destailleur
ce1dec253f FIX #11364 2019-11-05 12:47:38 +01:00
Laurent Destailleur
0347d82660
Merge pull request #12303 from frederic34/patch-2 
css
 2019-11-04 20:31:02 +01:00
Laurent Destailleur
5d41268d1e CSS 2019-11-04 19:28:04 +01:00
Laurent Destailleur
11500fb8d9 FIX confusion between permto... and permisstionto... 2019-11-04 15:33:49 +01:00
Frédéric FRANCE
534f8712a3
Update fournisseurs.php 2019-11-02 18:11:18 +01:00
Frédéric FRANCE
4a564cc05d
Update product.class.php 2019-11-02 18:10:01 +01:00
Laurent Destailleur
6f82c212a0 Finished migration to the new architecture of extrafields 2019-11-02 17:38:19 +01:00
Laurent Destailleur
496f93911f
Merge pull request #11821 from Tim-Otte/develop 
NEW Extrafields support in product supplier prices
 2019-11-02 16:19:13 +01:00
Laurent Destailleur
8485747713 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-02 13:37:43 +01:00
Laurent Destailleur
9e69b12847 FIX #12281 2019-11-02 13:37:30 +01:00
Laurent Destailleur
e087ac434d
Merge pull request #12283 from frederic34/socid 
replace deprecated user->societe_id by user->socid
 2019-11-02 13:34:21 +01:00
Laurent Destailleur
80fd5af32b
Merge pull request #12271 from frederic34/patch-3 
css
 2019-11-02 13:30:38 +01:00
Laurent Destailleur
7fae6d60a7
Merge pull request #12270 from frederic34/patch-2 
css
 2019-11-02 13:09:38 +01:00
Laurent Destailleur
d232b7a387
Merge pull request #12286 from grandoc/new_branch_01_11_2019 
add some comment
 2019-11-02 13:00:23 +01:00
Laurent Destailleur
58ffb73627 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-02 12:59:49 +01:00
Laurent Destailleur
45c77b4560 Renaming some libelle into label 2019-11-02 12:59:38 +01:00
Laurent Destailleur
25e64b0610
Merge branch 'develop' into socid 2019-11-02 12:01:06 +01:00
Laurent Destailleur
c12e66e2a2
Merge branch 'develop' into new_branch_01_11_2019 2019-11-02 12:00:04 +01:00
Laurent Destailleur
68691ddd8a
Merge pull request #12265 from grandoc/new_branch_30_10_2019 
add comment
 2019-11-02 11:49:28 +01:00
Laurent Destailleur
41a3861465
Merge pull request #12290 from ptibogxiv/patch-273 
FIX prices by customer API
 2019-11-02 11:47:32 +01:00
Frédéric FRANCE
77d4ca81dc
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-02 09:14:15 +01:00
Laurent Destailleur
cea2c3a9f4 Look and feel v11 2019-11-01 23:58:14 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-01 21:39:20 +01:00
stickler-ci
0e260c859b Fixing style errors. 2019-11-01 19:28:39 +00:00
ptibogxiv
6f77885686
Update api_products.class.php 2019-11-01 20:26:39 +01:00
stickler-ci
bc5e6c867f Fixing style errors. 2019-11-01 14:37:21 +00:00
ptibogxiv
0f80ba5353
FIX prices by customer API 2019-11-01 15:36:48 +01:00
Laurent Destailleur
e3b5be7475 All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed 
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
 2019-11-01 12:52:03 +01:00
Philippe GRAND
07cd656a1c add some comment 2019-11-01 10:56:46 +01:00
Laurent Destailleur
68a4ddceed Look and feel v11 2019-10-31 23:29:17 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
atm-josselin
5550a62afa Fix misspelling on field of productlot 2019-10-31 11:05:45 +01:00
Frédéric FRANCE
3738fb87ed
css 2019-10-30 18:42:33 +01:00
Frédéric FRANCE
bfe683d031
css 2019-10-30 18:40:07 +01:00
Philippe GRAND
b029febff1 add some comment 2019-10-30 10:07:54 +01:00
Laurent Destailleur
19f97fb23b
Merge pull request #12211 from frederic34/patch-2 
doxygen product.class.php
 2019-10-30 03:16:22 +01:00
Laurent Destailleur
4eedf4a113 Merge branch '10.0' of https://github.com/dolibarr/dolibarr into develop 2019-10-29 11:48:36 +01:00
Laurent Destailleur
9483e367ca Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
	htdocs/product/stock/replenishorders.php
 2019-10-29 11:48:11 +01:00
Laurent Destailleur
149d63757f Space 2019-10-29 11:43:56 +01:00
Laurent Destailleur
e58ecaaa64 Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 
Conflicts:
	htdocs/product/stock/replenishorders.php
 2019-10-29 11:43:35 +01:00
Laurent Destailleur
2814a5c07b Fix phpcs 2019-10-24 21:47:31 +02:00
Laurent Destailleur
8d21144521 Beautify select of products in vendor record 2019-10-24 20:33:16 +02:00
Laurent Destailleur
443ca85f43 NEW Beautify the select of warehouses 2019-10-24 19:48:25 +02:00
Laurent Destailleur
31452dad42 NEW Beautify the select of warehouses 2019-10-24 19:34:28 +02:00
Laurent Destailleur
6855f588b5 Use dolGetStatus 2019-10-24 16:38:06 +02:00
Frédéric FRANCE
5999d8a05a
Update product.class.php 2019-10-24 16:11:05 +02:00
Frédéric FRANCE
93a8b1d2a3
Update product.class.php 2019-10-24 16:09:35 +02:00
Laurent Destailleur
1ea3865f0d Look and feel v11 2019-10-24 13:01:03 +02:00
Juanjo Menent
7e9d6dc153 Fix With pagination it is possible that the searched product does not appear if there are many open supplier orders 2019-10-24 10:58:29 +02:00
Laurent Destailleur
da00591bba Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/product.lib.php
	htdocs/expedition/card.php
	htdocs/product/list.php
 2019-10-23 04:04:32 +02:00
Laurent Destailleur
2e573fd794 Fix save of units 
Conflicts:
	htdocs/expedition/card.php
	htdocs/product/card.php
	htdocs/product/class/product.class.php
 2019-10-23 03:03:55 +02:00
Laurent Destailleur
f0355b3057 Debug option PRODUCT_ADD_NET_MEASURE 2019-10-23 02:58:39 +02:00
Laurent Destailleur
2f0b791cfe
Merge pull request #12202 from atm-gauthier/10.0_fix_search_on_product_and_service 
FIX : if we search something with global search, and after with form …
 2019-10-22 20:06:10 +02:00
Laurent Destailleur
c4be61c55c FIX Better compatible fix for the trouble of weight / size units 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/card.php
 2019-10-22 18:42:59 +02:00
Laurent Destailleur
e7e9898e0d FIX Better compatible fix for the trouble of weight / size units 2019-10-22 18:36:36 +02:00
Laurent Destailleur
b88968520b Move code of extrafields to the new architecture 2019-10-22 17:08:37 +02:00
gauthier
44ced0cbeb FIX : if we search something with global search, and after with form fields, we want to stay on Products AND Services list 2019-10-22 16:11:59 +02:00
Laurent Destailleur
6079a4d159 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/langs/en_US/main.lang
 2019-10-22 15:25:31 +02:00
Laurent Destailleur
5ad7ca5620 Code more generic around setting projet on a card 2019-10-22 13:43:24 +02:00
Tim Otte
ceb3482204 Requested changes implemented 2019-10-22 11:36:28 +02:00
Laurent Destailleur
e261d63295 NEW Can add a button "Create" after combo of object with modulebuilder. 2019-10-21 14:44:39 +02:00
Laurent Destailleur
48f5970c7a Debug net measure 2019-10-21 14:43:39 +02:00
Frédéric FRANCE
86f22c4563
do not ignore lines with mix od tabs and spaces 2019-10-20 17:17:22 +02:00
Laurent Destailleur
49c101bb77 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-20 15:16:51 +02:00
Laurent Destailleur
d79114c1f8 Clean code 2019-10-20 15:16:40 +02:00
Laurent Destailleur
05fed5358a
Merge pull request #12179 from c3do/develop 
NEW Add API to get objects by ref, ref_ext, ...
 2019-10-20 13:42:18 +02:00
Laurent Destailleur
24dc7fb667
Merge pull request #12173 from OPEN-DSI/new-product-clone-customer-prices 
NEW add clone customers prices in clone product or service
 2019-10-20 13:27:50 +02:00
Frédéric FRANCE
7581275316
wip 2019-10-20 11:59:21 +02:00
c3do
ae3ce37a57 copyright mentions 2019-10-19 16:45:30 +02:00
c3do
6742700c04 Can get product by ref, ref_ext, barcode through API Rest 2019-10-19 16:36:11 +02:00
VESSILLER
801092d848 NEW add clone customers prices in clone product or service 2019-10-18 15:10:22 +02:00
Laurent Destailleur
ce1b443212 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-18 14:26:09 +02:00
Laurent Destailleur
4d9c285126
Merge pull request #12163 from sadlig/fix-stock-movement-right 
Fix Stock movement user's right (Fixes #11967)
 2019-10-17 17:53:17 +02:00
Gildas
132ea56a59 Fix Stock movement user's right (Fixes #11967) 2019-10-17 17:06:38 +02:00
Marc de Lima Lucio
d79340a632 FIX: stock replenish: fetching and freeing non existing SQL result set 2019-10-17 09:55:02 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
c69e934f9c
Merge pull request #12135 from c3do/patch-1 
NEW Can update product type with update method
 2019-10-16 14:28:21 +02:00
Laurent Destailleur
4ca9fddfcc
Update product.class.php 2019-10-16 14:26:49 +02:00
Laurent Destailleur
b60ddc255c Removed useless html tags 2019-10-16 14:17:53 +02:00
Laurent Destailleur
e07e01580d Replace deprecated code with new one 2019-10-16 03:34:32 +02:00
Laurent Destailleur
fc90916de9 Look and feel v11 2019-10-16 03:17:53 +02:00
Laurent Destailleur
fb3d20107c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/exports/export.php
	htdocs/filefunc.inc.php
 2019-10-15 03:51:57 +02:00
Cédric
3429cb7c1d
New: Update product type with update method 2019-10-14 22:42:38 +02:00
Cédric
2257706a30
New: Update product type with update method 2019-10-14 22:22:20 +02:00
Laurent Destailleur
0d21e61673
Merge pull request #12116 from frederic34/patch-18 
fix travis
 2019-10-14 20:53:42 +02:00
atm-josselin
4f10009113 Add fields definition in product batch class for extrafields compatibility 2019-10-14 15:39:38 +02:00
Laurent Destailleur
0cd451ef1a Fix show duration in list of services 2019-10-14 15:06:21 +02:00
Laurent Destailleur
9922ff39ca Fix show duration in list of services 2019-10-14 15:01:37 +02:00
Frédéric FRANCE
4e52276d1f
fix travis 2019-10-14 13:14:02 +02:00
Laurent Destailleur
67d76787eb Add new hidden conf VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PARENT 2019-10-12 15:29:06 +02:00
Laurent Destailleur
9871dd8770 Debug variants 2019-10-12 15:27:06 +02:00
Laurent Destailleur
9ba992b8b6 Work on inventory module 2019-10-12 12:31:35 +02:00
Laurent Destailleur
dccfdad9dd Work on inventory feature 2019-10-12 11:32:47 +02:00
ptibogxiv
2b9be13a7c
Update card.php 2019-10-09 15:26:55 +02:00
Laurent Destailleur
29384d9a71
Merge branch 'develop' into patch-187 2019-10-09 13:02:47 +02:00
ptibogxiv
10c29887d6
Update product.class.php 2019-10-08 16:15:12 +02:00
ptibogxiv
e2d76f6f24
Update product.class.php 2019-10-08 16:13:59 +02:00
Laurent Destailleur
653958b1a2
Merge pull request #11094 from altatof/prodstats 
NEW Extend option ORDER_ADD_ORDERS_WITH_PARENT_PROD_IF_INCDEC for all virtual product stats (renamed into PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC)
 2019-10-08 15:12:52 +02:00
Laurent Destailleur
71c18b7d65
Merge pull request #12062 from frederic34/patch-13 
remove stock data from getsupplierprice
 2019-10-08 14:50:41 +02:00
Laurent Destailleur
43a70e5548 Clean code to use the new $extrafields->attributes array 2019-10-08 09:28:50 +02:00
Frédéric FRANCE
41cdf0d5a0
remove stock data from getsupplierprice 
stock data can be retrieved with get
 2019-10-08 08:19:27 +02:00
Laurent Destailleur
80cbc09f21
Merge pull request #12046 from frederic34/apisupplierproduct 
api supplier price delete
 2019-10-07 10:22:48 +02:00
Laurent Destailleur
866dcf18fe Look and feel v11 2019-10-06 15:34:22 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
Frédéric FRANCE
b895f8a78f
api supplier get purchase prices 2019-10-05 21:19:55 +02:00
Frédéric FRANCE
10671e3266
api supplier price delete 2019-10-05 21:15:13 +02:00
Laurent Destailleur
b883a8092a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/product.lib.php
	htdocs/core/tpl/extrafields_list_search_input.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/product/class/html.formproduct.class.php
 2019-10-05 19:35:40 +02:00
altairis
85bbf1decb Merge branch 'develop' into prodstats 2019-10-04 11:05:36 +02:00
Laurent Destailleur
1a66e0b05e Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/product/card.php
 2019-10-03 17:53:59 +02:00
Laurent Destailleur
75be637b0b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-03 17:50:57 +02:00
Frédéric FRANCE
c5f729b945
Update list.php 2019-10-02 22:59:13 +02:00
Laurent Destailleur
d8a8c4fbe6 Look and feel v11. Picto are fontawesome. 2019-10-02 18:36:36 +02:00
Laurent Destailleur
24570f7165 Look and feel v11. Picto are fontawesome. 2019-10-02 18:14:41 +02:00
Laurent Destailleur
4928a999a0
Merge pull request #11933 from atm-gauthier/fix_conf_to_allow_changeproducttype 
FIX : change product type must be allowed if we activate hidden conf
 2019-10-01 14:41:52 +02:00
Laurent Destailleur
d448998762
Update card.php 2019-10-01 14:41:25 +02:00
gauthier
2167e7ed98 FIX : hidden conf to prevent from changing product_type 2019-10-01 09:12:51 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Laurent Destailleur
d9e9364ddf Close #11689 Close #11696 2019-09-30 19:00:19 +02:00
Laurent Destailleur
b28cd1bb57
Merge pull request #11972 from aspangaro/11.0_fa_icon 
NEW Add fa_icon on load_fiche_titre
 2019-09-30 15:26:28 +02:00
Alexandre SPANGARO
aec50d3ac9 NEW Add fa_icon on load_fiche_titre 2019-09-30 10:14:55 +02:00
Laurent Destailleur
6966651d51 Standardize code to use dolSqlDateFilter 2019-09-28 13:22:05 +02:00
Alexandre SPANGARO
288aea190b Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon 2019-09-28 06:09:40 +02:00
Alexandre SPANGARO
7f93f046e9 NEW Add fa_icon on load_fiche_titre 2019-09-28 06:02:25 +02:00
Laurent Destailleur
d0d884742f FIX #11861 Not consistent code to manage measuring units 2019-09-27 19:45:33 +02:00
Laurent Destailleur
ea62ea8c70
Merge pull request #11901 from ptibogxiv/patch-263 
NEW: delete purchase price API
 2019-09-27 15:37:21 +02:00
VESSILLER
5f08a649eb FIX empty cache when we want to load specific warehouses in select 
Conflicts:
	htdocs/product/class/html.formproduct.class.php
 2019-09-27 15:10:05 +02:00
Laurent Destailleur
8ef227f24a
Merge pull request #11902 from OPEN-DSI/fix-formproduct-select-warehouses-cache 
FIX empty cache when we want to load specific warehouses in select
 2019-09-27 14:59:14 +02:00
Laurent Destailleur
acfceecda5
Merge pull request #11925 from OPEN-DSI/new-product-fournisseurs-units 
NEW add units fields in buying price tab of product card
 2019-09-27 14:17:52 +02:00
Laurent Destailleur
6858dce344 Rename table for categorie of warehouses 2019-09-27 13:28:28 +02:00
Laurent Destailleur
a79c4608d6
Merge pull request #11934 from atm-quentin/NEW_stock_categories 
NEW Categories/Tags are also available on warehouses
 2019-09-27 12:41:28 +02:00
Laurent Destailleur
41101d3dbe
Merge pull request #11955 from bafbes/abb100078 
fix:forgotten test condition
 2019-09-27 11:30:03 +02:00
Laurent Destailleur
961f2b5165 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/viewcat.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/takepos/invoice.php
 2019-09-24 14:25:02 +02:00
Laurent Destailleur
6431e8e16d FIX SQL injection on qty 2019-09-24 12:43:44 +02:00
Abbes Bahfir
1ca531239e fix:forgotten test condition 2019-09-24 09:40:19 +01:00
Frédéric FRANCE
26cd418320
Update price_parser.class.php 2019-09-24 10:28:27 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
atm-quentin
a46ed62e81 Merge branch 'NEW_stock_categories' of github.com:atm-quentin/dolibarr into NEW_stock_categories 2019-09-19 16:43:49 +02:00
atm-quentin
769ef78d8e FIX missing comment 2019-09-19 16:43:21 +02:00
stickler-ci
774ec5a274 Fixing style errors. 2019-09-19 14:30:23 +00:00
atm-quentin
c09f2d8c4e NEW stock categories 2019-09-19 16:21:03 +02:00
gauthier
d40534e8fa FIX : change product type must be allowed if we activate hidden conf 2019-09-19 15:21:52 +02:00
VESSILLER
ca18448b48 NEW add units fields in buying price tab of product card 2019-09-18 10:36:13 +02:00
VESSILLER
6e806a5aed FIX empty cache when we want to load specific warehouses in select 2019-09-16 10:37:55 +02:00
ptibogxiv
ea1baefe9a
NEW: delete purchase price API 2019-09-15 20:50:18 +02:00
Laurent Destailleur
12d67c5f85 Rename api to get all purchase prices 2019-09-15 17:18:10 +02:00
Laurent Destailleur
68a3c5b41c
Merge pull request #11853 from ptibogxiv/patch-259 
NEW add supplier's product list
 2019-09-15 17:04:17 +02:00
Laurent Destailleur
5d0ba10f34
Update api_products.class.php 2019-09-15 17:04:08 +02:00
Laurent Destailleur
0194f48041
Merge pull request #10795 from altatof/clonecat 
NEW : copy linked categories on product clone process
 2019-09-15 16:34:42 +02:00
Laurent Destailleur
4a815da993
Merge pull request #11854 from OPEN-DSI/new-formproduct-loadWarehouses-stockmin-order 
NEW add minimum stock filter in load warehoues for product form
 2019-09-14 17:09:27 +02:00
VESSILLER
44fa2e4cd1 NEW multiselect with checkbox in categories/tags search for product list 2019-09-13 12:23:34 +02:00
stickler-ci
1e8663b1c8 Fixing style errors. 2019-09-10 18:48:55 +00:00
ptibogxiv
651fbde64d
Merge branch 'develop' into patch-187 2019-09-10 20:46:54 +02:00
Laurent Destailleur
61cf47aa16 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-10 00:14:07 +02:00
VESSILLER
6a734ea828 NEW add minimum stock filter in load warehoues for product form 2019-09-09 16:58:20 +02:00
stickler-ci
be66e1bd20 Fixing style errors. 2019-09-09 14:36:02 +00:00
ptibogxiv
f4a565544f
Update api_products.class.php 2019-09-09 16:33:12 +02:00
Laurent Destailleur
a5f7211730 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/install/repair.php
 2019-09-06 16:10:55 +02:00
Laurent Destailleur
348ab4765c Fix sql injection 2019-09-06 15:20:04 +02:00
Laurent Destailleur
529dd05226 Replace deprecated code 2019-09-06 10:53:05 +02:00
Laurent Destailleur
80daf29d79 Fix conflict between new module reception and old process 
Fix inventory record does not need status at creation

Conflicts:
	htdocs/fourn/commande/card.php
 2019-09-06 01:55:22 +02:00
Laurent Destailleur
04adbd8c80 Fix conflict between new module reception and old process 
Fix inventory record does not need status at creation
 2019-09-06 01:52:51 +02:00
Christophe Battarel
1cfd5615d3 resolv conflict 2019-09-05 16:10:23 +02:00
Laurent Destailleur
f893854986 Fix remove warnings 2019-09-05 14:24:13 +02:00
Tim Otte
0f9b01cd5b Added support for extrafield styling options: 
- visibility now implemented
- fieldrequired now implemented
 2019-09-05 09:47:40 +02:00
Tim Otte
be000b96ee Fixed error that occurred in the travis CI build 2019-09-04 16:42:13 +02:00
Tim Otte
fbafbc3e19 Added myself to the author list 2019-09-04 15:16:29 +02:00
Tim Otte
54d0b94b6d Added extrafield support to the product supplier price lines 2019-09-04 15:13:42 +02:00
Frédéric FRANCE
a5aedacb7e
Update productbatch.class.php 2019-09-03 16:49:41 +02:00
Laurent Destailleur
ffcea3dfd8 Fix phpcs 2019-09-03 14:48:06 +02:00
Laurent Destailleur
71dadc9bd4
Merge pull request #11757 from ptibogxiv/patch-246 
NEW purchase_prices API
 2019-09-03 13:03:31 +02:00
Laurent Destailleur
d4fb1d134d
Merge pull request #11801 from jtraulle/fix-11682-10.0 
Fix #11683 Correct links to create a new product or service from search results
 2019-09-03 13:02:17 +02:00
Abbes Bahfir
f945ec5771 fix: convert posted price formatted values to numeric 2019-09-02 21:24:53 +01:00
Jean Traullé
c84f1baf17
Fix #11683 Correct links to create a new product or service from search results 2019-08-31 00:18:53 +02:00
Laurent Destailleur
321e41ceed Fix graph 2019-08-30 04:17:07 +02:00
Laurent Destailleur
6009601254 Use graph for stats on products/services 2019-08-30 04:15:24 +02:00
Laurent Destailleur
55505604c1
Merge pull request #11397 from atm-josselin/FIX_product_document_and_special_characters 
FIX : filepath of generated documents doesn't handle products with sp…
 2019-08-27 14:12:48 +02:00
Laurent Destailleur
e8bb84e803 NEW Add status of warehouse in tooltip of a warehouse. 2019-08-26 23:54:15 +02:00
Laurent Destailleur
db6b1b6ffb NEW Add status of warehouse in tooltip of a warehouse. 2019-08-26 23:44:20 +02:00
ptibogxiv
d7cc76b94a
NEW purchase_prices API 2019-08-26 20:10:00 +02:00
ptibogxiv
1b4788c6d0
Update product.class.php 2019-08-24 14:21:41 +02:00
Laurent Destailleur
3339f89fc5 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/api/class/api_login.class.php
	htdocs/dav/fileserver.php
 2019-08-22 12:45:23 +02:00
Laurent Destailleur
27cd6cd308 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/product/fournisseurs.php
	htdocs/stripe/payment.php
 2019-08-22 12:39:07 +02:00
Laurent Destailleur
a35f010e55 FIX name and position of hook FIX #11710 2019-08-22 12:30:14 +02:00
Laurent Destailleur
db220d25c2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-16 21:48:53 +02:00
Laurent Destailleur
467ad3ed22 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/files.lib.php
	htdocs/product/stock/card.php
 2019-08-16 21:48:46 +02:00
Laurent Destailleur
9799153171
Merge pull request #11695 from jtraulle/fix-11683 
Fix #11683 Correct links to create a new product or service from search results
 2019-08-16 17:49:55 +02:00
Laurent Destailleur
ee50c41e74 Fix phpcs 2019-08-16 17:34:23 +02:00
Laurent Destailleur
48125fd957 Fix phpcs 2019-08-16 17:32:58 +02:00
Jean Traullé
4bed1b9a3d
Fix #11683 Correct links to create a new product or service from search results 2019-08-15 22:21:31 +02:00
Laurent Destailleur
fa53641221
Merge pull request #11551 from atm-quentin/NEW_global_search_product 
NEW Add hidden option to set fields for the quick search on products
 2019-08-15 20:26:05 +02:00
Laurent Destailleur
8a126800e7
Merge pull request #11650 from ptibogxiv/patch-217 
FIX count negative in stats with credit note
 2019-08-15 19:36:21 +02:00
Laurent Destailleur
b36df2303b
Update movement_list.php 2019-08-15 19:26:46 +02:00
atm-greg
f8ad8d72c0 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_fk_projet_on_stock_movement 2019-08-12 15:16:43 +02:00
atm-greg
acdf13d769 add fk_projet on stock movements 2019-08-12 15:08:15 +02:00
ptibogxiv
0ce22d68ef
Update product.class.php 2019-08-10 09:43:26 +02:00
ptibogxiv
4f69be2c2c
Update product.class.php 2019-08-10 09:12:40 +02:00
ptibogxiv
33cf4d8417
Update product.class.php 2019-08-10 09:12:15 +02:00
Laurent Destailleur
3351a1687c Fix phpcs 2019-08-10 02:17:07 +02:00
Laurent Destailleur
8647a20c18 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/langs/en_US/admin.lang
	htdocs/product/dynamic_price/class/price_parser.class.php
	htdocs/product/stats/facture.php
 2019-08-10 01:57:43 +02:00
Laurent Destailleur
2824dee11a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/product/dynamic_price/class/price_parser.class.php
 2019-08-10 01:20:17 +02:00
Laurent Destailleur
6a8910f109
Merge pull request #11649 from ptibogxiv/patch-216 
FIX qty in invoice list on product's stats
 2019-08-10 00:37:35 +02:00
Je2fb
2dee289fc6 Update price_parser.class.php 
Calculation with supplier_min_price work

Conflicts:
	htdocs/product/dynamic_price/class/price_parser.class.php
 2019-08-10 00:21:13 +02:00
Laurent Destailleur
88c66d24fe
Merge pull request #11662 from ptibogxiv/patch-219 
FIX duration when creating service
 2019-08-09 23:53:55 +02:00
Laurent Destailleur
6d4ba6b36b
Merge branch 'develop' into develop 2019-08-09 23:49:31 +02:00
Regis Houssin
0b831ccdf7 FIX better help message with multicompany 2019-08-09 09:33:14 +02:00
Je2fb
1a592f8f69
Update price_parser.class.php 2019-08-08 09:34:59 +02:00
Je2fb
4008ddc567
Update price_parser.class.php 2019-08-08 09:33:03 +02:00
ptibogxiv
322ec32ff5
FIX duration when creating service 2019-08-07 20:16:53 +02:00
Je2fb
ef285a87a8
Update price_parser.class.php 
Calculation with supplier_min_price work
 2019-08-07 17:16:34 +02:00
ptibogxiv
3e94b3dc59
FIX count negative in stats whithcredit note 2019-08-06 16:54:44 +02:00
ptibogxiv
0fc92b92a2
Update facture.php 2019-08-06 16:47:54 +02:00
ptibogxiv
ee8d99351d
Update facture.php 2019-08-06 16:28:18 +02:00
Frédéric FRANCE
69985339d8
Update price_parser.class.php 2019-08-06 11:47:34 +02:00
ptibogxiv
d22c2960b7
Update product.class.php 2019-08-06 00:14:19 +02:00
ptibogxiv
2d77bfd873
Update product.class.php 2019-08-04 14:50:25 +02:00
ptibogxiv
c9e481d6f7
Update product.class.php 2019-08-04 14:09:59 +02:00
ptibogxiv
f5f6882583
Update product.class.php 2019-08-04 13:42:50 +02:00
atm-quentin
bd2f5ba037 FIX Replace conf by hidden conf editable by user 2019-07-26 14:16:54 +02:00
Laurent Destailleur
0c6499f193
Update product.php 2019-07-25 18:01:47 +02:00
Laurent Destailleur
9a0e0fbdd2
Update product.php 2019-07-25 18:01:16 +02:00
Laurent Destailleur
a46bfc7a29 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/project.lib.php
 2019-07-25 17:54:14 +02:00
Alexandre SPANGARO
323d2df210 Presentation nowrap on amount 2019-07-24 10:42:00 +02:00
atm-quentin
0ff121e7f1 add some new field on global search 2019-07-24 09:42:52 +02:00
atm-quentin
03ed4eb141 modif rowspan 2019-07-24 09:42:39 +02:00
atm-quentin
5a385bf1cc ADD extrafields on global search 2019-07-24 09:41:02 +02:00
Laurent Destailleur
50480bf517 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/index.php
 2019-07-18 18:23:24 +02:00
Laurent Destailleur
fb5af65f4d FIX #11466 2019-07-15 23:56:05 +02:00
Laurent Destailleur
adfbd62f8b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-14 00:44:35 +02:00
Laurent Destailleur
694be619b2 Fix doxygen 2019-07-11 22:16:32 +02:00
Laurent Destailleur
f5cc29417d Translation lignes -> lines 2019-07-05 21:50:35 +02:00
Laurent Destailleur
0a7d70829f Translation of some comments 2019-07-05 21:37:25 +02:00
Laurent Destailleur
2fee41f712 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-04 12:27:00 +02:00
Laurent Destailleur
8e3620fce1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/facture/invoicetemplate_list.php
 2019-07-04 12:26:17 +02:00
Laurent Destailleur
80bbc2577e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-04 12:09:26 +02:00
Laurent Destailleur
b065cbc6f8 FIX #11446 2019-07-04 12:09:04 +02:00
Laurent Destailleur
3d0a5d9f00
Merge pull request #11442 from atm-john/9.0_Fix_column_price_display 
Fix column price display
 2019-07-04 10:50:35 +02:00
John Botella
0288338364 Fix column price display 2019-07-02 14:38:09 +02:00