This commit is contained in:
parent
2887497730
commit
a130163617
|
@ -1,4 +1,4 @@
|
|||
hedera-web (1.408.6) stable; urgency=low
|
||||
hedera-web (1.408.7) stable; urgency=low
|
||||
|
||||
* Initial Release.
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "hedera-web",
|
||||
"version": "1.408.6",
|
||||
"version": "1.408.7",
|
||||
"description": "Verdnatura web page",
|
||||
"license": "GPL-3.0",
|
||||
"repository": {
|
||||
|
|
|
@ -188,7 +188,10 @@ class Load extends Edi\Method {
|
|||
if (isset($this->columns[$code]) && !empty($value))
|
||||
$insertValues[$code] = $value;
|
||||
|
||||
$year = $ediValues['fec']->format('Y');
|
||||
$deliveryNumber = nullIf($ediValues, 'deliveryNumber');
|
||||
$fec = nullIf($ediValues, 'fec');
|
||||
$year = isset($fec) ? $fec->format('Y') : null;
|
||||
|
||||
$insertValues['entryYear'] = $year;
|
||||
|
||||
$isNew = false;
|
||||
|
@ -205,15 +208,14 @@ class Load extends Edi\Method {
|
|||
throw $e;
|
||||
}
|
||||
|
||||
if ($update) {
|
||||
if ($update && isset($year) && isset($deliveryNumber)) {
|
||||
$ektFk = $db->getValue(
|
||||
"SELECT id
|
||||
FROM ekt
|
||||
WHERE deliveryNumber = #deliveryNumber
|
||||
AND entryYear = YEAR(#fec)",
|
||||
$ediValues
|
||||
WHERE deliveryNumber = #
|
||||
AND entryYear = #",
|
||||
[$deliveryNumber, $year]
|
||||
);
|
||||
|
||||
$canUpdate = $ektFk && $db->getValue(
|
||||
"SELECT COUNT(*) = 0
|
||||
FROM ekt t
|
||||
|
@ -221,7 +223,7 @@ class Load extends Edi\Method {
|
|||
JOIN exchangeConfig c
|
||||
WHERE t.id = #
|
||||
AND b.typeFk != c.presaleFk",
|
||||
$ektFk
|
||||
[$ektFk]
|
||||
);
|
||||
|
||||
if ($canUpdate) {
|
||||
|
|
Loading…
Reference in New Issue