Skip to content
This repository has been archived by the owner on Oct 4, 2024. It is now read-only.

fix stock decrementation on invoice validation #63

Open
wants to merge 1 commit into
base: 2022.5.1
Choose a base branch
from
Open

fix stock decrementation on invoice validation #63

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 20 additions & 24 deletions class/business/eCommerceSynchro.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1442,9 +1442,11 @@ public function synchFacture($toNb=0)
// Target status is not draft. We validate if current status is still draft to get correct ref.
if ($dBFacture->statut == Facture::STATUS_DRAFT)
{
$idWareHouse = 0;
// We don't change stock here, even if dolibarr option is on because, this should be already done by product sync
//if ($this->eCommerceSite->stock_sync_direction == 'ecommerce2dolibarr') $idWareHouse=$this->eCommerceSite->fk_warehouse;
if ($this->site->stock_sync_direction == 'dolibarr2ecommerce') {
$idWareHouse = $this->eCommerceSite->fk_warehouse > 0 ? $this->eCommerceSite->fk_warehouse : 0;
} else {
$idWareHouse = 0;
}
$dBFacture->validate($this->user, '', $idWareHouse);
}
}
Expand Down Expand Up @@ -1505,9 +1507,11 @@ public function synchFacture($toNb=0)
// If we create invoice, we can force status of order in some cases
if ($refCommandeExists > 0 && $dBCommande->statut == Commande::STATUS_DRAFT)
{
$idWareHouse = 0;
// We don't change stock here, even if dolibarr option is on because, this should be already done by product sync
//if ($this->eCommerceSite->stock_sync_direction == 'ecommerce2dolibarr') $idWareHouse=$this->eCommerceSite->fk_warehouse;
if ($this->site->stock_sync_direction == 'dolibarr2ecommerce') {
$idWareHouse = $this->eCommerceSite->fk_warehouse > 0 ? $this->eCommerceSite->fk_warehouse : 0;
} else {
$idWareHouse = 0;
}
$dBCommande->valid($this->user, $idWareHouse);
}
if ($refCommandeExists > 0 && $dBCommande->statut == Commande::STATUS_VALIDATED)
Expand Down Expand Up @@ -1657,9 +1661,11 @@ public function synchFacture($toNb=0)
// Target status is not draft. We validate if current status is still draft to get correct ref.
if ($dBFacture->statut == Facture::STATUS_DRAFT)
{
$idWareHouse = 0;
// We don't change stock here, even if dolibarr option is on because, this should be already done by product sync
//if ($this->eCommerceSite->stock_sync_direction == 'ecommerce2dolibarr') $idWareHouse=$this->eCommerceSite->fk_warehouse;
if ($this->site->stock_sync_direction == 'dolibarr2ecommerce') {
$idWareHouse = $this->eCommerceSite->fk_warehouse > 0 ? $this->eCommerceSite->fk_warehouse : 0;
} else {
$idWareHouse = 0;
}
$dBFacture->validate($this->user, '', $idWareHouse);
}
}
Expand Down Expand Up @@ -5829,21 +5835,11 @@ public function synchronizeInvoiceFromOrder($order_data, $dont_synchronize_produ
}

// Get warehouse ID
$warehouse_id = 0;
// Todo We don't change stock here, even if dolibarr option is on because, this should be already done by product sync ?
// if (!$error && !empty($conf->global->STOCK_CALCULATE_ON_BILL) && $this->eCommerceSite->stock_sync_direction == 'ecommerce2dolibarr') {
// $warehouse_id = $this->eCommerceSite->fk_warehouse > 0 ? $this->eCommerceSite->fk_warehouse : 0;
// if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
// $qualified_for_stock_change = $invoice->hasProductsOrServices(2);
// } else {
// $qualified_for_stock_change = $invoice->hasProductsOrServices(1);
// }
//
// if ($qualified_for_stock_change && $warehouse_id == 0) {
// $this->errors[] = $this->langs->trans('ECommerceErrorWarehouseNotConfigured');
// $error++;
// }
// }
if ($this->site->stock_sync_direction == 'dolibarr2ecommerce') {
$warehouse_id = $this->eCommerceSite->fk_warehouse > 0 ? $this->eCommerceSite->fk_warehouse : 0;
} else {
$warehouse_id = 0;
}

if ($isDepositType) {
$save_WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER = $conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER;
Expand Down