X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=peppershop%2FArtikelErpToShop.php;h=087e207cbb0a9cb299849ebd3e722a8b7c790a24;hb=d3a086e3786cb08150b3201f69fde5b7d55b3b03;hp=c8cf075eb315c49c02c00c69bc62d821a9cabaac;hpb=2b44867fc2d4e3c061c126890cc90fcaa84b6baa;p=kivitendo-erp.git
diff --git a/peppershop/ArtikelErpToShop.php b/peppershop/ArtikelErpToShop.php
index c8cf075eb..087e207cb 100644
--- a/peppershop/ArtikelErpToShop.php
+++ b/peppershop/ArtikelErpToShop.php
@@ -1,4 +1,7 @@
\n\n\n\n\n";
@@ -8,41 +11,52 @@ if ( $api != "cli" ) {
$shopnr = $_GET["Shop"];
$nofiles = ( $_GET["nofiles"] == '1' )?true:false;
} else {
+ $p = array('shopnr','nofiles');
if ( $argc > 1 ) {
- $tmp = explode("=",trim($argv[1]));
- if ( count($tmp) != 2 ) {
- echo "Falscher Aufruf: php shop=1\n";
- exit (-1);
- } else {
- $shopnr = $tmp[1];
+ for( $i=1; $ioriginal = false;
//ERP-Instanz
-$erpdb = new mydb($ERPhost,$ERPdbname,$ERPuser,$ERPpass,$ERPport,'pgsql',$err);
+$erpdb = new mydb($ERPhost,$ERPdbname,$ERPuser,$ERPpass,$ERPport,'pgsql',$err,$debug);
if ($erpdb->db->connected_database_name == $ERPdbname) {
- $erp = new erp($erpdb,$err,$divStd,$divVerm,$auftrnr,$kdnum,$preA,$preK,$invbrne,$mwstS,$OEinsPart,$lager);
+ $erp = new erp($erpdb,$err,$divStd,$divVerm,$auftrnr,$kdnum,$preA,$preK,$invbrne,$mwstS,$OEinsPart,$lager,$pricegroup,$ERPusrID);
} else {
$err->out('Keine Verbindung zur ERP',true);
exit();
}
//Shop-Instanz
-$shopdb = new mydb($SHOPhost,$SHOPdbname,$SHOPuser,$SHOPpass,$SHOPport,'mysql',$err);
+$shopdb = new mydb($SHOPhost,$SHOPdbname,$SHOPuser,$SHOPpass,$SHOPport,'mysql',$err,$debug);
+
if ($shopdb->db->connected_database_name == $SHOPdbname) {
$shop = new pepper($shopdb,$err,$SHOPdbname,$divStd,$divVerm,$minder,$nachn,$versandS,$versandV,$paypal,$treuhand,$mwstLX,$mwstS,$variantnr,$pict,$nopic,$nopicerr,$nofiles);
} else {