Commit Graph

98545 Commits

Author SHA1 Message Date
stickler-ci
d0d034672d Fixing style errors. 2021-04-27 19:10:01 +00:00
daraelmin
082423efa0
libstatut 2021-04-27 21:09:37 +02:00
daraelmin
7f3810e703
update $field also 2021-04-27 20:53:14 +02:00
Damien BENOIT
d8ec9de58b
Update delais.php 2021-04-27 20:53:05 +02:00
daraelmin
d3c7ab402d
Fix wrong set of constant 2021-04-27 20:45:04 +02:00
daraelmin
5b74676e54
fix infinite loop 2021-04-27 20:14:03 +02:00
Laurent Destailleur
e6d2bad6e0
Update paymentok.php 2021-04-27 19:46:26 +02:00
Laurent Destailleur
035828ba51 Add missing constants 2021-04-27 19:45:56 +02:00
Laurent Destailleur
3f7f166fb6 Make option label easier to understand. 2021-04-27 19:33:11 +02:00
Laurent Destailleur
be541a2f82
Merge pull request #17400 from OPEN-DSI/fix_00007
FIX Supplier invoices (deposit, multicurrency in lines)
2021-04-27 18:43:41 +02:00
Laurent Destailleur
f6ed63c37d
Merge pull request #17409 from fr69400/develop
Update supplier_proposal.class.php
2021-04-27 18:39:37 +02:00
fr69400
c7c1756703 Update supplier_proposal.class.php 2021-04-27 18:22:31 +02:00
kamel
4b490d434c Corrections 2021-04-27 18:08:05 +02:00
Laurent Destailleur
f5d18a0023
Update replenish.php 2021-04-27 18:00:45 +02:00
Laurent Destailleur
328e70c309
Update replenish.php 2021-04-27 17:52:57 +02:00
Laurent Destailleur
b1d8ca0701 Fix phpcs 2021-04-27 17:45:13 +02:00
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
Dorian Vabre
15e65729f6 put company under email in the form 2021-04-27 17:19:13 +02:00
Dorian Vabre
54b5a43006 wip 2021-04-27 17:06:25 +02:00
lmarcouiller
97633e34f2 Fix : Bug facture.class.php 2021-04-27 16:47:27 +02:00
Dorian Vabre
5203a417fe select array OK for event type 2021-04-27 16:31:14 +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
Dorian Vabre
f2f1eaa95e wip 2021-04-27 16:01:01 +02:00
fr69400
52f3c95429 Update supplier_proposal.class.php 2021-04-27 15:59:13 +02:00
Dorian Vabre
8fc45da56e Merge branch 'dev_EventOrganizer_payment' of github.com:DorianVabre/dolibarr into dev_EventOrganizer_suggest 2021-04-27 15:01:59 +02:00
kamel
80be0c32e4 Corrections 2021-04-27 14:13:59 +02:00
Dorian Vabre
7405725198 added security check at beginning of /project/index page (according to the security I added in the previous commits) 2021-04-27 14:11:46 +02:00
Dorian Vabre
79dce3ad05 typo in comment 2021-04-27 14:06:40 +02:00
Dorian Vabre
fab12bc5e5 removed the indicated id of conf when on the subscription page for security (now showing label instead) 2021-04-27 14:04:08 +02:00
Dorian Vabre
a508cdbf59 every dol_encode for securekey replaced with dol_hash (dol_encode kept for encoding ids 2021-04-27 14:01:44 +02:00
Dorian Vabre
b24b297a40 adaptation of the payment for the booth location case 2021-04-27 12:30:49 +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
Dorian Vabre
151819b7ad added payment redirection to pay a booth, or status update for free booth/conference 2021-04-27 11:22:40 +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
Dorian Vabre
bfadcfc4bb added red star on label and note, that are required 2021-04-27 10:49:10 +02:00
Dorian Vabre
d034446205 not giving the invoiceref anymore in the url from newpayment to paymentok, since it was already in ref= anyway 2021-04-27 10:08:32 +02:00
Dorian Vabre
99589fd693 added fk_project in $facture 2021-04-27 09:57:27 +02:00
Dorian Vabre
cedb8adfe2 removal of vardump 2021-04-27 09:52:11 +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