Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
89,109 Commits 35 Branches 179 Tags 1.7 GiB
9165ea9e67
Commit Graph

262 Commits

Author SHA1 Message Date
Laurent Destailleur
1e7daa29a5 Hide a useless option 2020-07-03 01:46:50 +02:00
Laurent Destailleur
fce81a4bf1 Rename var and fix position of checkbox 2020-07-03 01:30:53 +02:00
Laurent Destailleur
6b3eeebe87
Merge branch 'develop' into dev-replenish 2020-07-03 01:03:35 +02:00
Laurent Destailleur
518c126abf NEW Add a page to list Stock at a given date. 2020-06-28 20:31:07 +02:00
Laurent Destailleur
d22a0f702e WIP Stock at date 2020-06-28 17:34:30 +02:00
Laurent Destailleur
c32151d356 Prepare page for stock at date 2020-06-25 01:07:30 +02:00
Laurent Destailleur
ff9312c96a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/card.php
	htdocs/compta/prelevement/class/ligneprelevement.class.php
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/line.php
 2020-06-08 20:36:54 +02:00
Laurent Destailleur
233c7e53f1 Debug v12 2020-06-08 20:31:09 +02:00
Laurent Destailleur
6f12488e30 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php
 2020-06-07 19:55:48 +02:00
Marc Guenneugues
bd12972d7b replenish : select expedition quantities only from opened orders when using virtual stocks 2020-06-07 14:14:11 +02:00
Laurent Destailleur
da672c8776 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/admin/translation.php
	htdocs/core/class/html.formfile.class.php
	htdocs/societe/card.php
 2020-06-06 11:57:31 +02:00
Laurent Destailleur
b75700cc0b Fix virtualstock activation when MRP module is on 2020-06-05 10:27:34 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
a25ed0e041
add new rule 2020-05-21 01:56:06 +02:00
Marc Guenneugues
bac17d6b95 Merge branch 'dev-replenish' of https://github.com/simicar29/dolibarr into dev-replenish 2020-05-02 09:27:22 +02:00
Marc Guenneugues
b65a4649e7 Correct lint errors 2020-05-02 09:26:58 +02:00
stickler-ci
1e3f31041d Fixing style errors. 2020-05-02 07:23:06 +00:00
Marc Guenneugues
a03739962b Propagate the value of limit 2020-05-02 09:21:51 +02:00
Marc Guenneugues
640730539e NEW: Add option to include products without alert in replenish 2020-05-02 08:50:22 +02:00
Laurent Destailleur
31157931a9 Fix phpcs 2020-04-26 23:52:23 +02:00
Laurent Destailleur
67a7d6b77d Look and feel v12 2020-04-20 15:57:15 +02:00
Laurent Destailleur
5254a94038 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ldap.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/index.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/expedition/list.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/list.php
	htdocs/loan/list.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/list.php
 2020-04-16 15:58:59 +02:00
atm-quentin
18fdf3573f FIX draftordered replenish virtual stock 2020-04-15 16:05:50 +02:00
Laurent Destailleur
ed51ce8734 Look and feel v12 2020-04-12 19:56:50 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Laurent Destailleur
efaea37d61 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2020-03-30 19:42:53 +02:00
atm-quentin
96481c3d52 FIX ordered stock already in $stock 2020-03-27 09:43:59 +01:00
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +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
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
83b5fe3c71 FIX #13077 Replace left join with inner join (left join was useless) 2020-02-12 20:24:58 +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
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +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
Rüdiger Hahn
cc96ad03c1
Update replenish.php 2019-12-11 14:00:27 +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
Maxime Kohlhaas
270f4c2500 Fix #12044 : with replenish function, use product supplier desc in order 2019-12-01 09:26:54 +01:00
Laurent Destailleur
3242835111
Update replenish.php 2019-11-22 14:47:15 +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
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
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01: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
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
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
Marc de Lima Lucio
d79340a632 FIX: stock replenish: fetching and freeing non existing SQL result set 2019-10-17 09:55:02 +02:00