Pman.Dialog.XtupleCreditMemo.bjs

Pman.Dialog.XtupleCreditMemo.js

diff --git a/Pman.Dialog.XtupleCreditMemo.bjs b/Pman.Dialog.XtupleCreditMemo.bjs
index 4b5f8b7..7c3fad1 100644 (file)
--- a/Pman.Dialog.XtupleCreditMemo.bjs
+++ b/Pman.Dialog.XtupleCreditMemo.bjs
@@ -478,7 +478,7 @@
                                                                     "readOnly": true,
                                                                     "width": 100,
                                                                     "xtype": "NumberField",
-                                                                    "|recalc": "function() {\n    var vals = _this.form.getValues();\n    this.setValue(\n        (1*vals.cmhead_value) + (1*vals.cmhead_freight) + (1*vals.cmhead_tax_value) + (1*vals.cmhead_misc)\n    );\n}\n",
+                                                                    "|recalc": "function() {\n    var vals = _this.form.getValues();\n    this.setValue(\n        (1*vals.cmhead_taxable_value) + (1*vals.cmhead_taxfree_value) + (1*vals.cmhead_freight) + (1*vals.cmhead_tax_value) + (1*vals.cmhead_misc)\n    );\n}\n",
                                                                     "|xns": "Roo.form"
                                                                 }
                                                             ]

diff --git a/Pman.Dialog.XtupleCreditMemo.js b/Pman.Dialog.XtupleCreditMemo.js
index 40b9d43..29240e1 100644 (file)
--- a/Pman.Dialog.XtupleCreditMemo.js
+++ b/Pman.Dialog.XtupleCreditMemo.js
@@ -638,7 +638,7 @@ Pman.Dialog.XtupleCreditMemo = {
                                                                     recalc : function() {
                                                                         var vals = _this.form.getValues();
                                                                         this.setValue(
-                                                                            (1*vals.cmhead_value) + (1*vals.cmhead_freight) + (1*vals.cmhead_tax_value) + (1*vals.cmhead_misc)
+                                                                            (1*vals.cmhead_taxable_value) + (1*vals.cmhead_taxfree_value) + (1*vals.cmhead_freight) + (1*vals.cmhead_tax_value) + (1*vals.cmhead_misc)
                                                                         );
                                                                     }
                                                                 }