Ignore:
Timestamp:
2013/01/09 12:42:43 (11 years ago)
Author:
kim
Message:

#1730 r22197r22215 で差し戻したものを、逆マージ。

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_12-dev/data/class/SC_Fpdf.php

    r22215 r22218  
    178178 
    179179            // 税込金額(単価) 
    180             $data[1] = SC_Helper_DB_Ex::sfCalcIncTax($this->arrDisp['price'][$i]); 
     180            $data[1] = SC_Helper_DB_Ex::sfCalcIncTax($this->arrDisp['price'][$i], $this->arrDisp['tax_rate'][$i], $this->arrDisp['tax_rule'][$i]); 
    181181 
    182182            // 小計(商品毎) 
     
    331331    function lfGetOrderDetail($order_id) { 
    332332        $objQuery =& SC_Query_Ex::getSingletonInstance(); 
    333         $col = 'product_id, product_class_id, product_code, product_name, classcategory_name1, classcategory_name2, price, quantity, point_rate'; 
     333        $col = 'product_id, product_class_id, product_code, product_name, classcategory_name1, classcategory_name2, price, quantity, point_rate, tax_rate, tax_rule'; 
    334334        $where = 'order_id = ?'; 
    335335        $objQuery->setOrder('order_detail_id'); 
Note: See TracChangeset for help on using the changeset viewer.