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

98533 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
7db74c81be
Merge pull request #17410 from Hystepik/develop#3 
Fix : Bug facture.class.php
 2021-04-27 17:30:39 +02:00
Laurent Destailleur
11437a8077 css 2021-04-27 17:28:28 +02:00
lmarcouiller
97633e34f2 Fix : Bug facture.class.php 2021-04-27 16:47:27 +02:00
lmarcouiller
a499f8f1f8 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develo#2 2021-04-27 16:26:06 +02:00
lmarcouiller
a2b2a35d5b Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-04-27 16:23:55 +02:00
stickler-ci
3d38301be9 Fixing style errors. 2021-04-27 14:06:10 +00:00
lmarcouiller
52bf0f0359 Close #17271 : Replament of 2 graph in compta/index.php 2021-04-27 16:02:46 +02:00
fr69400
52f3c95429 Update supplier_proposal.class.php 2021-04-27 15:59:13 +02:00
kamel
80be0c32e4 Corrections 2021-04-27 14:13:59 +02:00
kamel
3a673c9210 Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_00007 2021-04-27 12:29:10 +02:00
stickler-ci
109124fdac Fixing style errors. 2021-04-27 10:16:59 +00:00
antonin_tdj
6fd1726093
Fix Bug replenish + Auto Filter 
# Fix Replenish Calculation Bug + Auto Filter

## Environment
* Version: 13
* URL(s): product/stock/replenish.php

## Configuration 
MultiCompany needed with Stock Sharing ON, 2 entities and 1 warehouse per entity

**Entity A**
* Options: don't share stocks with other entities
* Warehouse : only 1 (WAR_A)
* Stock : 1 product (PROD) Qty : 4

**Entity B :**
* Options: don't share stocks with other entities
* Warehouse : only 1 (WAR_B)
* Stock : 1 product --the same-- (PROD) Qty : 17

**Product :**
* Desired Stock : 20
* Alert : 10

**WAR_A :**
* For the product
* Desired Stock : 16
* Alert : 6
 
## Fixed behavior :
* Entity A -> Replenish
* If WAR_A selected should show the product and fill with 12 the qty to order. Physical Stock (All) and Physical Stock (this 
warehouse) should be 4.

* If no Warehouse selected show the product and fill with 12 (because only one warehouse seen by this entity) the qty to order. Physical Stock (All) should be 4.

## Actual behavior :
* Entity A -> Replenish

* The product isn't showed.

* If I intentionally incrementes the Desired Stock value. The product will be shown with the good filter (Warehouse if desired stock has been incremented on the combination ProductDesired <-> Warehouse). The qty for the order are correct and the physical stock shown is correct.

## Conclusion : 
* 1 bug and 1 improvment

**BUG** : The value of the stock taken to whether or not show the product line is wrong. It is considering the stock in warehouses not shared with the entity.

**IMPROVMENT** : If only one Warehouse, take automatically the desired and alert values for this warehouse and not the general ones.
 2021-04-27 12:14:36 +02:00
Laurent Destailleur
ae773ff938 FIX Disabled pages must not appears into sitemap 2021-04-27 12:12:45 +02:00
kamel
c645241327 Corrections 2021-04-27 12:11:28 +02:00
Laurent Destailleur
9941236d76 Fix alternate into sitemap 2021-04-27 11:47:33 +02:00
Laurent Destailleur
071fe087fd Fix replacement of sitemap entry in robot.txt 2021-04-27 11:29:47 +02:00
Laurent Destailleur
0d391ec185 Show name of sitemap file 2021-04-27 11:20:04 +02:00
lmarcouiller
8896e7c0d5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-04-27 11:18:33 +02:00
lmarcouiller
758ba67adc Fix #17219 : new complement of PR 17161 2021-04-27 10:50:45 +02:00
Laurent Destailleur
4b204301a9 Enhance logs 2021-04-27 03:25:49 +02:00
Laurent Destailleur
3e013ebad0 Fix mass action delete of cron jobs 2021-04-27 03:16:11 +02:00
Laurent Destailleur
0c1f8b96ef Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-27 02:55:07 +02:00
Laurent Destailleur
0a0b3f414a Fix phpcs 2021-04-27 02:54:33 +02:00
Laurent Destailleur
5bb2531364 Enhance ticket module 2021-04-27 02:52:24 +02:00
daraelmin
db92de2a22
Draft and resiliated member could (re)validate 2021-04-27 02:36:47 +02:00
Laurent Destailleur
ea08dfff5a Package for v14 2021-04-27 02:21:02 +02:00
Laurent Destailleur
cf90bd75d0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-27 02:17:57 +02:00
Laurent Destailleur
f57b38ae59 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-04-27 02:16:44 +02:00
Laurent Destailleur
ea19747bc6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-04-27 02:16:16 +02:00
Laurent Destailleur
2e9cf8d00b Fix phpcs 2021-04-27 02:15:58 +02:00
Laurent Destailleur
3343b9a2af Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/paiement/card.php
 2021-04-27 02:12:40 +02:00
Laurent Destailleur
407ed9e40a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-04-27 02:11:36 +02:00
Laurent Destailleur
9513f25a36 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-04-27 02:11:11 +02:00
Laurent Destailleur
c7f38c4cf0 Fix bad var 2021-04-27 02:10:52 +02:00
Laurent Destailleur
098582d7a7 Fix bad merge 2021-04-27 02:09:43 +02:00
Laurent Destailleur
27aa7cdb48 Fix bad merge 2021-04-27 02:08:36 +02:00
Laurent Destailleur
d6cdfcdd8c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/paiement/card.php
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/public/members/new.php
 2021-04-27 02:07:48 +02:00
Laurent Destailleur
12a4bc64ad Remove $_REQUEST 2021-04-27 02:01:46 +02:00
Laurent Destailleur
ea040a423f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-04-27 01:58:30 +02:00
Laurent Destailleur
48a50f3b10 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/paiement/card.php
	htdocs/compta/paiement/class/paiement.class.php
 2021-04-27 01:58:19 +02:00
daraelmin
25e3beb3ee
$object::STATUS_RESILIATE 2021-04-27 01:55:51 +02:00
Laurent Destailleur
b3f8a6758e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-04-27 01:46:13 +02:00
Laurent Destailleur
804eac55e9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-04-27 01:46:04 +02:00
Laurent Destailleur
7a6edfd61f
Merge pull request #17295 from atm-gauthier/fix_adv_target_emailing_extrafields_link 
FIX : type link extrafield case for advanced target emailing
 2021-04-27 01:45:26 +02:00
Laurent Destailleur
e9b8e81773
Update advtargetemailing.class.php 2021-04-27 01:45:10 +02:00
Laurent Destailleur
e026b92a99
Merge pull request #17354 from aspangaro/13p9 
FIX Accountancy - Quadra export - wrong data on credit
 2021-04-27 01:32:45 +02:00
Laurent Destailleur
f932da97ae
Merge pull request #17350 from dolibit-ut/patch-300 
Update bom_list.php
 2021-04-27 01:32:15 +02:00
Laurent Destailleur
56177da58c
Merge pull request #17349 from dolibit-ut/patch-299 
Update bom_document.php
 2021-04-27 01:32:05 +02:00
Laurent Destailleur
f83717b54e
Merge pull request #17348 from dolibit-ut/patch-298 
Update bom_card.php
 2021-04-27 01:31:54 +02:00
Laurent Destailleur
5849c01387
Merge pull request #17347 from dolibit-ut/patch-297 
Update bom_agenda.php
 2021-04-27 01:31:39 +02:00