';
+ if ($node->discountable) {
+ $output .= t('Discountable');
+ }
+ else {
+ $output .= t('Not Discountable');
+ }
+
if (module_exists('erp_stock')) {
$output .= '
';
$output .= l(t('Qty on hand: !qty', array('!qty' => erp_stock_avail($node->nid))),
@@ -948,6 +961,9 @@
if (variable_get('erp_invoice_serial', FALSE) && ($node->type == 'erp_invoice' || $node->type == 'erp_cash_sale')) {
$header[] = t('Serial no.');
}
+ if (variable_get('erp_invoice_line_discount', FALSE) && ($node->type == 'erp_quote' || $node->type == 'erp_invoice' || $node->type == 'erp_cash_sale')) {
+ $header[] = t('Disc %');
+ }
$header[] = t('Price');
$header[] = t('Line total');
@@ -991,12 +1007,39 @@
$row[] = array('data' => $node->entries['serial'][$i]);
}
+ if ((variable_get('erp_invoice_line_discount', FALSE)) && ($node->type == 'erp_quote' || $node->type == 'erp_invoice' || $node->type == 'erp_cash_sale')) {
+ $row[] = array('data' => $node->entries['line_discount'][$i], 'class' => 'item-discount');
+ }
+
$row[] = array('data' => erp_currency($node->entries['price'][$i]), 'class' => 'item-amount');
- $row[] = array('data' => erp_currency($node->entries['price'][$i] * $node->entries['qty'][$i]), 'class' => 'item-subtotal');
+
+ //$row[] = array('data' => erp_currency($node->entries['price'][$i] * $node->entries['qty'][$i]), 'class' => 'item-subtotal');
+ //$row[] = array('data' => erp_currency(($node->entries['price'][$i] * $node->entries['qty'][$i]) / (($node->entries['line_discount'][$i]/100)+1)), 'class' => 'item-subtotal');
+ $row[] = array('data' => erp_currency((($node->entries['price'][$i] - (($node->entries['line_discount'][$i]/100) * $node->entries['price'][$i])) * $node->entries['qty'][$i])), 'class' => 'item-subtotal');
+
$rows[] = $row;
// Build a total price
- $total_price += $node->entries['price'][$i] * $node->entries['qty'][$i];
+ if (variable_get('erp_invoice_line_discount', FALSE)) {
+ //$total_price += ($node->entries['price'][$i] * $node->entries['qty'][$i]) / (($node->entries['line_discount'][$i]/100)+1);
+ $total_price += (($node->entries['price'][$i] - (($node->entries['line_discount'][$i]/100) * $node->entries['price'][$i])) * $node->entries['qty'][$i]);
+ }
+ else {
+ $total_price += ($node->entries['price'][$i] * $node->entries['qty'][$i]);
+ }
+ }
+
+/*
+ if (variable_get('erp_invoice_line_discount', FALSE)) {
+ $total_price += $node->transaction_discount;
+ }
+*/
+
+ if (variable_get('erp_invoice_transaction_discount', FALSE)) {
+ $row = array_fill(0, count($header) - 2, array());
+ $row[] = array('data' => variable_get('erp_invoice_transaction_discount_label', 'Transaction Discount') . ': ', 'class' => 'transaction-discount-text');
+ $row[] = array('data' => erp_currency($node->transaction_discount), 'class' => 'transaction-discount-amount');
+ $rows[] = $row;
}
$row = array_fill(0, count($header) - 2, array());
@@ -1006,7 +1049,7 @@
$row = array_fill(0, count($header) - 2, array());
$row[] = array('data' => "Total: ", 'class' => 'total-text');
- $row[] = array('data' => erp_currency($total_price), 'class' => 'total-amount');
+ $row[] = array('data' => erp_currency($total_price+$node->transaction_discount), 'class' => 'total-amount');
$rows[] = $row;
$output .= theme('table', $header, $rows, array('class' => 'item-list'));
diff -uNr org/erp/erp.module erp/erp.module
--- org/erp/erp.module 2011-02-25 04:06:47.000000000 +0200
+++ erp/erp.module 2011-11-02 18:20:19.000000000 +0200
@@ -443,6 +443,11 @@
$row_data[] = drupal_render($form['serial'][$key]);
}
+ // Invoices etc.
+ if (isset($form['line_discount'][0])) {
+ $row_data[] = drupal_render($form['line_discount'][$key]);
+ }
+
$row_data[] = drupal_render($form['price'][$key]);
if (isset($form['delete'][0])) {
@@ -498,6 +503,9 @@
if (isset($form['serial']['#id'])) {
$row_data[] = drupal_render($form['serial']);
}
+ if (isset($form['line_discount']['#id'])) {
+ $row_data[] = drupal_render($form['line_discount']);
+ }
if (isset($form['price']['#id'])) {
$row_data[] = drupal_render($form['price']);
}
@@ -888,6 +896,7 @@
$node->entries['serial'][] = $newline['serial'];
$node->entries['completed_date'][] = $newline['completed_date'];
$node->entries['price'][] = $newline['price'];
+ $node->entries['line_discount'][] = $newline['line_discount'];
}
$remove_delta = -1;
@@ -949,6 +958,9 @@
}
$new_entry['completed_date'] = $form_state['values']['entries']['newline']['completed_date'];
$new_entry['price'] = $form_state['values']['entries']['newline']['price'];
+ if (variable_get('erp_invoice_line_discount', FALSE)) {
+ $new_entry['line_discount'] = $form_state['values']['entries']['newline']['line_discount'];
+ }
$form_state['newline'] = $new_entry;
}
}
@@ -1073,6 +1085,9 @@
if (isset($form['serial'][$item])) {
$header[] = t('Serial');
}
+ if (isset($form['line_discount'][$item])) {
+ $header[] = t('Disc %');
+ }
if (isset($form['price'][$item])) {
$header[] = t('Price');
}
@@ -1091,9 +1106,13 @@
$total = 0;
if ($node->entries) {
for ($i=0; $i < count($node->entries['qty']); $i++) {
- $total += $node->entries['qty'][$i] * $node->entries['price'][$i];
+ //$total += ($node->entries['qty'][$i] * $node->entries['price'][$i]) / (($node->entries['line_discount'][$i]/100)+1);
+ $total += ((($node->entries['price'][$i] - (($node->entries['line_discount'][$i]/100) * $node->entries['price'][$i])) * $node->entries['qty'][$i]));
}
}
+
+ $total += $node->transaction_discount;
+
return $total;
}
diff -uNr org/erp/erp_quote/erp_quote.install erp/erp_quote/erp_quote.install
--- org/erp/erp_quote/erp_quote.install 2011-02-25 04:06:47.000000000 +0200
+++ erp/erp_quote/erp_quote.install 2011-11-02 18:20:19.000000000 +0200
@@ -5,7 +5,7 @@
// The 6001 updates only need to be done for v4/5 installs,
// so if its a new install, mark it as done.
- db_query("UPDATE {system} set schema_version = 6004 WHERE name = 'erp_quote'");
+ db_query("UPDATE {system} set schema_version = 6005 WHERE name = 'erp_quote'");
}
function erp_quote_schema() {
@@ -16,6 +16,7 @@
'quote_id' => array('type' => 'serial', 'not null' => TRUE, 'disp-width' => '10'),
'customer_nid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0, 'disp-width' => '10'),
'total' => array('type' => 'float', 'not null' => TRUE, 'default' => 0, 'disp-width' => '20'),
+ 'transaction_discount' => array('type' => 'float', 'not null' => TRUE, 'default' => 0, 'disp-width' => '20'),
'extra_notes' => array('type' => 'blob', 'not null' => TRUE),
'quote_status' => array('type' => 'char', 'length' => '1', 'not null' => TRUE, 'default' => '')
),
@@ -34,6 +35,7 @@
'extra' => array('type' => 'text', 'size' => 'medium'),
'price' => array('type' => 'float', 'not null' => TRUE, 'default' => 0, 'disp-width' => '20'),
'qty' => array('type' => 'float', 'not null' => TRUE, 'default' => 0, 'disp-width' => '10'),
+ 'line_discount' => array('type' => 'float', 'not null' => TRUE, 'default' => 0, 'disp-width' => '5'),
'serial' => array('type' => 'varchar', 'length' => '255', 'not null' => FALSE)
),
'primary key' => array('nid', 'line'),
@@ -101,3 +103,12 @@
return $ret;
}
+
+function erp_quote_update_6005() {
+ $ret = array();
+
+ db_add_field($ret, 'erp_quote', 'transaction_discount', array('type' => 'float', 'not null' => TRUE, 'default' => 0));
+ db_add_field($ret, 'erp_quote_data', 'line_discount', array('type' => 'float', 'not null' => TRUE, 'default' => 0));
+
+ return $ret;
+}
diff -uNr org/erp/erp_quote/erp_quote.module erp/erp_quote/erp_quote.module
--- org/erp/erp_quote/erp_quote.module 2011-02-25 04:06:47.000000000 +0200
+++ erp/erp_quote/erp_quote.module 2011-11-02 18:20:19.000000000 +0200
@@ -196,6 +196,20 @@
'#title' => t('How many days quotes are valid for before expiring'),
'#default_value' => variable_get('erp_quote_valid_days', 14));
+ $form['erp_invoice_line_discount'] =
+ array('#type' => 'checkbox',
+ '#title' => t('Enable line item discounts with quotes, invoices & cash sale items? (common settting between all three modules)'),
+ '#default_value' => variable_get('erp_invoice_line_discount', FALSE),
+ '#description' => t('ERP has the ability to give discounts per line item.')
+ );
+
+ $form['erp_invoice_transaction_discount'] =
+ array('#type' => 'checkbox',
+ '#title' => t('Enable discounts per transaction with quotes, invoices & cash sale items? (common settting between all three modules)'),
+ '#default_value' => variable_get('erp_invoice_transaction_discount', FALSE),
+ '#description' => t('ERP has the ability to give discounts per transaction.')
+ );
+
$form += erp_set_next_id_form('erp_quote', 'Quote');
return system_settings_form($form);
@@ -219,12 +233,12 @@
$total_price = 0;
erp_set_customer($node);
-
+
// If this is being created from a quote, load the node data from that now.
$extra_ops = arg(3);
if ($extra_ops == 'erp-cart') {
erp_cart_load($node);
- }
+ }
// Default to the current user.
if (!$node->owner) {
@@ -271,12 +285,23 @@
array('#type' => 'hidden',
'#default_value' => $node->customer_nid);
+ if (variable_get('erp_invoice_transaction_discount', FALSE)) {
+ $form['quote_details']['transaction_discount'] =
+ array('#prefix' => '
',
+ '#type' => 'textfield',
+ '#title' => variable_get('erp_invoice_transaction_discount_label', 'Transaction Discount'),
+ '#default_value' => erp_currency($node->transaction_discount),
+ '#size' => 20,
+ '#suffix' => '
');
+ }
+
$form['quote_details']['quote_status'] =
array('#prefix' => '
',
'#type' => 'checkbox',
'#title' => t('Closed'),
'#default_value' => $node->quote_status);
+
$form['entries'] =
array('#type' => 'fieldset',
'#title' => t('Current Quote Items'),
@@ -338,6 +363,16 @@
'#suffix' => '
');
}
+ if (variable_get('erp_invoice_line_discount', FALSE)) {
+ $form['entries']['line_discount'][$i] =
+ array('#type' => 'textfield',
+ '#size' => 5,
+ '#maxlength' => 5,
+ '#default_value' => $node->entries['line_discount'][$i],
+ '#prefix' => '
');
+ }
+
$form['entries']['price'][$i] =
array('#type' => 'textfield',
'#size' => 12,
@@ -361,9 +396,12 @@
),
);
- $total_price += $node->entries['price'][$i] * $node->entries['qty'][$i];
+ //$total_price += (($node->entries['price'][$i] * $node->entries['qty'][$i]) / (($node->entries['line_discount'][$i]/100)+1));
+ $total_price += ((($node->entries['price'][$i] - (($node->entries['line_discount'][$i]/100) * $node->entries['price'][$i])) * $node->entries['qty'][$i]));
}
+ $total_price += $node->transaction_discount;
+
$form['entries']['total'] =
array('#type' => 'textfield',
'#prefix' => '
');
}
+ if (variable_get('erp_invoice_line_discount', FALSE)) {
+ $form['entries']['newline']['line_discount'] =
+ array('#type' => 'textfield',
+ '#prefix' => '
',
+ '#size' => 5,
+ '#maxlength' => 5,
+ '#default_value' => '0',
+ '#suffix' => '
');
+ }
+
$form['entries']['newline']['price'] =
array('#type' => 'textfield',
'#prefix' => '
',
@@ -508,6 +556,7 @@
'extra' => $node->entries['extra'][$i],
'qty' => $node->entries['qty'][$i],
'price' => $node->entries['price'][$i],
+ 'line_discount' => $node->entries['line_discount'][$i],
'serial' => $node->entries['serial'][$i],
);
@@ -605,6 +654,7 @@
$item = node_load($quote_data['item_nid']);
$quote->entries['item_desc'][] = erp_item_desc_build($item);
+ $quote->entries['line_discount'][] = $quote_data['line_discount'];
$quote->entries['price'][] = $quote_data['price'];
$quote->entries['qty'][] = $quote_data['qty'];
$quote->entries['extra'][] = $quote_data['extra'];