Subversion Repositories wpShopGermany4

Rev

Rev 8075 | Rev 8083 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 8075 Rev 8082
Line 191... Line 191...
191
191
192 
    $rhead_count = 1;
 192 
    $rhead_count = 1;
193 
    $sum_multi_offset = 0;
 193 
    $sum_multi_offset = 0;
194 
    $orders = $this->view['multi_data']['orders'];
194 
    $orders = $this->view['multi_data']['orders'];
195
195
196 
	// moMwSt
 196 
	// noMwSt
197 
	$bNoTax = false;
 197 
	$bNoTax = false;
198
198
199 
	$bTaxCol = false;
 199 
	$bTaxCol = false;
200 
	if ($this->get_option('wpsg_showMwstAlways') === '1') $bTaxCol = true;
 200 
	if ($this->get_option('wpsg_showMwstAlways') === '1') $bTaxCol = true;
201 
	else {
 201 
	else {
Line 282... Line 282...
282
282
283 
                $pdf->Cell(10, 8, $pnr.".", 0, 0, 'C');
 283 
                $pdf->Cell(10, 8, $pnr.".", 0, 0, 'C');
284
284
285 
            }
 285 
            }
286
286
287 
            /* Wenn Detailname vorhanden, wird der Detailname auf Rechnung verwendet */
 287 
            if ($this->get_option('wpsg_rechnungen_pdetailname' == '1')) {
- 
 
 288 
 
288 
            $produkt_text = $this->getProductName($product_id, true);
 289 
                $produkt_text = $this->getProductName($product_id, true);
- 
 
 290 
 
- 
 
 291 
            } else {
- 
 
 292 
 
- 
 
 293 
                $produkt_text = $this->getProductName($product_id, false);
- 
 
 294 
 
- 
 
 295 
            }
289
296 
 
290 
            $produktBeschreibung = trim(strip_tags($oOrderProduct->getProduct()->getShortDescription()));
 297 
            $produktBeschreibung = trim(strip_tags($oOrderProduct->getProduct()->getShortDescription()));
291
298
292 
            if ($this->isOtherLang()) {
 299 
            if ($this->isOtherLang()) {
293
300
294 
                $trans_db = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($product_id)."' AND `lang_code` = '".wpsg_q($this->getCurrentLanguageCode())."'");
 301 
                $trans_db = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($product_id)."' AND `lang_code` = '".wpsg_q($this->getCurrentLanguageCode())."'");