--- erp.module-org	2011-07-02 19:06:34.000000000 +0200
+++ erp.module	2011-07-02 19:40:51.000000000 +0200
@@ -446,6 +446,8 @@
 
     $row_data[] = drupal_render($form['price'][$key]);
 
+    $row_data[] = drupal_render($form['line_total'][$key]);
+
     if (isset($form['delete'][0])) {
       $row_data[] = drupal_render($form['delete'][$key]);
     }
@@ -502,6 +504,12 @@
   if (isset($form['price']['#id'])) {
     $row_data[] = drupal_render($form['price']);
   }
+  if (isset($form['line_total']['#id'])) {
+    $row_data[] = drupal_render($form['line_total']);
+  }
+  if (isset($form['addlineP']['#id'])) {
+    $row_data[] = drupal_render($form['addlineP']);
+  }
 
   $rows[] = $row_data;
 
@@ -1075,10 +1083,16 @@
     $header[] = t('Serial');
   }
   if (isset($form['price'][$item])) {
-    $header[] = t('Price');
+    $header[] = t('Item Price');
+  }
+  if (isset($form['line_total'][$item])) {
+    $header[] = t('Line Total');
   }
   if (isset($form['delete'][$item])) {
-    $header[] = t('Delete');
+    $header[] = t('[X]');
+  }
+  if (isset($form['addlineP'][$item])) {
+    $header[] = t('[+]');
   }
   // Balance table cells to compensate for hidden line number.
   while (count($header) < count(element_children($form['newline']))) {
--- erp_item/erp_item.module-org	2011-07-02 19:06:34.000000000 +0200
+++ erp_item/erp_item.module	2011-07-02 19:21:36.000000000 +0200
@@ -931,7 +931,7 @@
     $header[] = t('Serial no.');
   }
-  $header[] = t('Price');
-  $header[] = t('Line total');
+  $header[] = t('Item Price');
+  $header[] = t('Line Total');
 
   $rows = array();
 
--- erp_invoice/erp_invoice.module-org	2011-07-02 19:06:34.000000000 +0200
+++ erp_invoice/erp_invoice.module	2011-07-02 20:26:00.000000000 +0200
@@ -516,6 +516,15 @@
             '#prefix' => '<div class="price">',
             '#suffix' => '</div>');
 
+    $form['entries']['line_total'][$i] =
+      array('#type' => 'textfield',
+            '#size' => 12,
+            '#maxlength' => 12,
+            '#default_value' => erp_currency($node->entries['price'][$i] * $node->entries['qty'][$i]),
+            '#disabled' => 'TRUE',
+            '#prefix' => '<div class="line_total">',
+            '#suffix' => '</div>');
+
     // Remove button.
     $form['entries']['delete'][$i] = array(
       '#type' => 'submit',
@@ -541,6 +550,7 @@
           '#size' => 12,
           '#maxlength' => 12,
           '#value' => erp_currency($total_price),
+          '#disabled' => 'TRUE',
           '#suffix' => '</div>');
 
   $form['entries']['newline'] =
@@ -604,6 +614,29 @@
           '#default_value' => erp_item_price_from_string(variable_get('erp_invoice_default_item', '')),
           '#suffix' => '</div>');
 
+  $form['entries']['newline']['line_total'] =
+    array('#type' => 'textfield',
+          '#prefix' => '<div class="line_total">',
+          '#size' => 12,
+          '#maxlength' => 12,
+          '#default_value' => '',
+          '#disabled' => 'TRUE',
+          '#suffix' => '</div>');
+
+  $form['entries']['newline']['addlineP'] =
+    array('#type' => 'submit',
+          '#prefix' => '<div class="addlineP">',
+          '#name' => 'addlineP',
+          '#value' => t('+'),
+          '#submit' => array('erp_add_newline_submit'),
+          '#ahah' => array(
+            'path' => 'erp/linejs/0',
+            'wrapper' => 'entries',
+            'method' => 'replace',
+            'effect' => 'none'
+          ),
+          '#suffix' => '</div>');
+
   $form['entries']['newline']['item'] =
     array('#type' => 'hidden',
           '#default_value' => '');
@@ -612,7 +645,7 @@
     array('#type' => 'submit',
           '#prefix' => '<div class="addline">',
           '#name' => 'addline',
-          '#value' => t('Add line/Recalc'),
+          '#value' => t('Add line/Recalc [+]'),
           '#submit' => array('erp_add_newline_submit'),
           '#ahah' => array(
             'path' => 'erp/linejs/0',
@@ -622,6 +655,15 @@
           ),
           '#suffix' => '</div>');
 
+  $form['entries']['newline']['total'] =
+    array('#type' => 'textfield',
+          '#prefix' => '<div class="total">',
+          '#size' => 12,
+          '#maxlength' => 12,
+          '#default_value' => erp_currency($total_price),
+          '#disabled' => 'TRUE',
+          '#suffix' => '</div>');
+
   $form['#validate'][] = 'erp_invoice_custom_validate';
 
   $form['#action'] = erp_fix_ahah_action($node);
--- erp_quote/erp_quote.module-org	2011-07-02 19:06:34.000000000 +0200
+++ erp_quote/erp_quote.module	2011-07-02 19:52:48.000000000 +0200
@@ -347,6 +347,15 @@
             '#prefix' => '<div class="price">',
             '#suffix' => '</div>');
 
+    $form['entries']['line_total'][$i] =
+      array('#type' => 'textfield',
+            '#size' => 12,
+            '#maxlength' => 12,
+            '#default_value' => erp_currency($node->entries['price'][$i] * $node->entries['qty'][$i]),
+            '#disabled' => 'TRUE',
+            '#prefix' => '<div class="line_total">',
+            '#suffix' => '</div>');
+
     // Remove button.
     $form['entries']['delete'][$i] = array(
       '#type' => 'submit',
@@ -372,6 +381,7 @@
           '#size' => 12,
           '#maxlength' => 12,
           '#value' => erp_currency($total_price),
+          '#disabled' => 'TRUE',
           '#suffix' => '</div>');
 
   $form['entries']['newline'] =
@@ -426,6 +436,29 @@
           '#default_value' => '',
           '#suffix' => '</div>');
 
+  $form['entries']['newline']['line_total'] =
+    array('#type' => 'textfield',
+          '#prefix' => '<div class="line_total">',
+          '#size' => 12,
+          '#maxlength' => 12,
+          '#default_value' => '',
+          '#disabled' => 'TRUE',
+          '#suffix' => '</div>');
+
+  $form['entries']['newline']['addlineP'] =
+    array('#type' => 'submit',
+          '#prefix' => '<div class="addlineP">',
+          '#name' => 'addlineP',
+          '#value' => t('+'),
+          '#submit' => array('erp_add_newline_submit'),
+          '#ahah' => array(
+            'path' => 'erp/linejs/0',
+            'wrapper' => 'entries',
+            'method' => 'replace',
+            'effect' => 'none'
+          ),
+          '#suffix' => '</div>');
+
   $form['entries']['newline']['item'] =
     array('#type' => 'hidden',
           '#value' => '');
@@ -434,7 +467,7 @@
     array('#type' => 'submit',
           '#prefix' => '<div class="addline">',
           '#name' => 'addline',
-          '#value' => t('Add line/Recalc'),
+          '#value' => t('Add line/Recalc [+]'),
           '#submit' => array('erp_add_newline_submit'),
           '#ahah' => array(
             'path' => 'erp/linejs/0',
@@ -444,6 +477,15 @@
           ),
           '#suffix' => '</div>');
 
+  $form['entries']['newline']['total'] =
+    array('#type' => 'textfield',
+          '#prefix' => '<div class="total">',
+          '#size' => 12,
+          '#maxlength' => 12,
+          '#disabled' => 'TRUE',
+          '#default_value' => erp_currency($total_price),
+          '#suffix' => '</div>');
+
   $form['extra_notes'] =
     array('#type' => 'fieldset',
           '#collapsible' => TRUE,