projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Early payment discount option moved from branch to payment terms.
[fa-stable.git]
/
sales
/
includes
/
cart_class.inc
diff --git
a/sales/includes/cart_class.inc
b/sales/includes/cart_class.inc
index 6f1d3a7983b0aa0ebfbf2e9e116edec461013e6a..611194bfd53889aa4ab549463d31d9addd7aca40 100644
(file)
--- a/
sales/includes/cart_class.inc
+++ b/
sales/includes/cart_class.inc
@@
-66,7
+66,6
@@
class Cart
var $pos; // user assigned POS
var $cash_account;
var $account_name;
var $pos; // user assigned POS
var $cash_account;
var $account_name;
- var $cash_discount; // not used as of FA 2.1
var $dimension_id;
var $dimension2_id;
var $payment;
var $dimension_id;
var $dimension2_id;
var $payment;
@@
-344,7
+343,7
@@
class Cart
return $ret;
}
return $ret;
}
- function set_customer($customer_id, $customer_name, $currency, $discount, $payment
, $cdiscount=0
)
+ function set_customer($customer_id, $customer_name, $currency, $discount, $payment)
{
$this->customer_name = $customer_name;
$this->customer_id = $customer_id;
{
$this->customer_name = $customer_name;
$this->customer_id = $customer_id;
@@
-352,7
+351,6
@@
class Cart
$this->customer_currency = $currency;
$this->payment = $payment;
$this->payment_terms = get_payment_terms($payment);
$this->customer_currency = $currency;
$this->payment = $payment;
$this->payment_terms = get_payment_terms($payment);
- $this->cash_discount = $cdiscount;
if ($this->payment_terms['type'] == PTT_CASH) {
$this->Location = $this->pos['pos_location'];
if ($this->payment_terms['type'] == PTT_CASH) {
$this->Location = $this->pos['pos_location'];