springup/cmc-sales
2
0
Fork 0
Code Issues 48 Pull requests Actions Packages Projects Releases Wiki Activity

Fixed JS bug with FCKHelper complaining about existing instances in

Browse source 
Document_Add_Edit closes #39
This commit is contained in:
Karl Cordes 2011-07-15 18:56:10 +10:00
parent ecc0222849
commit 02c06f7dff
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
controllers/jobs_controller.php
View file

@ -228,7 +228,8 @@ class JobsController extends AppController {
$this->set('gst_options', $this->gst_options()); $this->set('gst_options', $this->gst_options());
$this->set('totals', $this->getTotals($jobs)); $this->set('totals', $this->getTotals($jobs));
//print_r($jobs); print_r($totals);
//print_r($jobs);
} }
else { else {
@ -261,7 +262,7 @@ class JobsController extends AppController {
'gross_profit_aud' => 'total', 'gross_profit_aud' => 'total',
'net_export_sales_aud' => 'total', 'net_export_sales_aud' => 'total',
'gross_profit_exports_aud' => 'total', 'gross_profit_exports_aud' => 'total',
'gp_percent' => 'average', 'gp_percent' => 'average_gp',
'gross_australian_sales_foreign_currency' => 'total', 'gross_australian_sales_foreign_currency' => 'total',
'net_australian_sales_foreign_currency' => 'total', 'net_australian_sales_foreign_currency' => 'total',
'gross_profit_value_australian_sales_foreign_currency' => 'total', 'gross_profit_value_australian_sales_foreign_currency' => 'total',

18
webroot/js/document_add_edit.js
View file

@ -29,7 +29,6 @@ $(function() {
$('#LineItemDescription').ckeditor(function() { $('#LineItemDescription').ckeditor(function() {
this.updateElement(); this.updateElement();
this.destroy();
}); });
@ -52,10 +51,12 @@ $(function() {
}, },
Cancel: function() { Cancel: function() {
loadLineItems();
$( this ).dialog( "close" ); $( this ).dialog( "close" );
},
close: function() {
loadLineItems();
} }
} }
}); });
@ -68,7 +69,6 @@ $(function() {
"Edit Line Item": function() { "Edit Line Item": function() {
$('#LineItemDescription').ckeditor(function() { $('#LineItemDescription').ckeditor(function() {
this.updateElement(); this.updateElement();
this.destroy();
}); });
var thisLineItemInputs = $('#LineItemEditForm').find('input,select,textarea'); var thisLineItemInputs = $('#LineItemEditForm').find('input,select,textarea');
@ -90,10 +90,6 @@ $(function() {
} }
}, },
close: function() { close: function() {
$('#LineItemDescription').ckeditor(function() {
this.destroy();
});
loadLineItems(); loadLineItems();
} }
@ -150,13 +146,15 @@ $(function() {
$('#LineItemDescription').ckeditor(function() { $('#LineItemDescription').ckeditor(function() {
this.destroy(); this.destroy();
}); });
$("#editLineItemModal").empty(); $("#editLineItemModal").empty();
var nextItemNo = $(".lineItem").length; var nextItemNo = $(".lineItem").length;
nextItemNo++; nextItemNo++;
@ -168,6 +166,7 @@ $(function() {
$("#productDetails").hide(); $("#productDetails").hide();
$('#LineItemDescription').ckeditor(config); $('#LineItemDescription').ckeditor(config);
$( "#addLineItemModal" ).dialog('open'); $( "#addLineItemModal" ).dialog('open');
@ -483,6 +482,7 @@ function calcNetPrice() {
} }
function checkNaN(value) { function checkNaN(value) {
if( isNaN(value) == true) { if( isNaN(value) == true) {
return 0; return 0;