s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2024-12-25 06:00:28 +01:00
Code Issues Projects Releases Wiki Activity

Bugfixes presta, support for project specific number ranges

Browse Source
This commit is contained in:
Andreas Palm 2023-01-29 14:34:47 +01:00
parent 1af809954c
commit 100024391d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/lib/class.erpapi.php
View File

@ -29439,7 +29439,7 @@ function Firmendaten($field,$projekt="")
$process_lock = $this->app->erp->ProzessLock("erpapi_getnextnummer");
$eigenernummernkreis = 0;
$eigenernummernkreis = $this->app->DB->Select("SELECT eigenernummernkreis FROM projekt WHERE id='$projekt' LIMIT 1");
$newbelegnr = '';
if($eigenernummernkreis=='1')
{

4
www/pages/shopimporter_presta.php
View File

@ -253,13 +253,13 @@ class Shopimporter_Presta extends ShopimporterBase
if (!empty($cart['lieferadresse_land']) && $this->taxationByDestinationCountry) {
$taxedCountry = $cart['lieferadresse_land'];
}
$lieferschwelle = $this->app->DB->Select("SELECT * FROM lieferschwelle WHERE empfaengerland='$taxedCountry' LIMIT 1");
$lieferschwelle = $this->app->DB->SelectArr("SELECT * FROM lieferschwelle WHERE empfaengerland='$taxedCountry' LIMIT 1");
if ($this->app->erp->IstEU($taxedCountry) || !empty($lieferschwelle['ueberschreitungsdatum'])) {
$cart['ust_befreit'] = 1;
} elseif ($this->app->erp->Export($taxedCountry)) {
$cart['ust_befreit'] = 2;
}
$taxes = [];
$this->app->erp->RunHook('getTaxRatesFromShopOrder', 2, $taxedCountry, $taxes);