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

1591 Commits

Author SHA1 Message Date
Scrutinizer Auto-Fixer
e8083e2a65 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-23 14:54:02 +00: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
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
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +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
Tobias Sekan
0e7e6f44e2
Update list.php 2020-02-28 16:16:05 +01:00
Tobias Sekan
bc8c709900
Add category filter for stocks 2020-02-28 16:03:35 +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
25157649e2 Fix missing column 2020-02-26 16:53:58 +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
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
DEMAREST Maxime
4630525973 Fix: Mouvementstock::get_origin modulenme whith origintype 2020-02-20 16:19:28 +01:00
DEMAREST Maxime
30ef5f54dd Allow custom module class origine type in Mouvementstock 2020-02-18 18:24:54 +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
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
d2bafe3052 Add tab with stock movements 2020-02-11 18:18:04 +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
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
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 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
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
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 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
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
Laurent Destailleur
3f79c00542
Merge branch 'develop' into actioncomm_category 2020-01-15 14:21:06 +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
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
Laurent Destailleur
0e496d2191 MRP 2020-01-06 02:55:09 +01:00
Frédéric FRANCE
90235d0528
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-31 13:57:40 +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
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
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
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
c269229aab
doxygen 2019-12-13 08:12:55 +01:00
Rüdiger Hahn
cc96ad03c1
Update replenish.php 2019-12-11 14:00:27 +01: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
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
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
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
25ed2b930f
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-01 16:10:37 +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
Norbert Penel
755417e9a9
add location on combobox 
usefull for BOM, etc
 2019-11-30 23:43:22 +01:00
Frédéric FRANCE
c214dd0675
Form select_produits returns void 2019-11-28 21:23:53 +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
Frédéric FRANCE
4c4ae5b6e1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-26 08:10:40 +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
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
Laurent Destailleur
0fffdd891e Sanitize data 2019-11-21 15:37:59 +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
Frédéric FRANCE
2e5f539b2a
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-18 17:45:52 +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
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
Frédéric FRANCE
446c66da62
use class CONST 2019-11-14 08:15:39 +01: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
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
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
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
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
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
Laurent Destailleur
6f82c212a0 Finished migration to the new architecture of extrafields 2019-11-02 17:38:19 +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
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
68691ddd8a
Merge pull request #12265 from grandoc/new_branch_30_10_2019 
add comment
 2019-11-02 11:49:28 +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
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
Philippe GRAND
b029febff1 add some comment 2019-10-30 10:07:54 +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
6855f588b5 Use dolGetStatus 2019-10-24 16:38:06 +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
b88968520b Move code of extrafields to the new architecture 2019-10-22 17:08:37 +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
Frédéric FRANCE
7581275316
wip 2019-10-20 11:59:21 +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
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
atm-josselin
4f10009113 Add fields definition in product batch class for extrafields compatibility 2019-10-14 15:39:38 +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
43a70e5548 Clean code to use the new $extrafields->attributes array 2019-10-08 09:28:50 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00