X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fkivi.SalesPurchase.js;h=a350e1963d06f3f777bb0cb238e0de74b5812046;hb=f3324b5ad66924333bf2a313974f6d4d21932707;hp=8d54864cb838c479aba132a59f2d9d3a4819a8e6;hpb=d9ff130dc4087394f2fcbe04d0ea99fc31643a3c;p=kivitendo-erp.git
diff --git a/js/kivi.SalesPurchase.js b/js/kivi.SalesPurchase.js
index 8d54864cb..a350e1963 100644
--- a/js/kivi.SalesPurchase.js
+++ b/js/kivi.SalesPurchase.js
@@ -18,7 +18,7 @@ namespace('kivi.SalesPurchase', function(ns) {
this.edit_longdescription_with_params = function(params) {
var $container = $('#popup_edit_longdescription_input_container');
- var $edit = $('');
+ var $edit = $('');
$container.children().remove();
$container.append($edit);
@@ -170,8 +170,9 @@ namespace('kivi.SalesPurchase', function(ns) {
$('#shiptoname').focus();
};
- this.submit_custom_shipto = function() {
- $('#shipto_id').val('');
+ this.submit_custom_shipto = function(id_selector) {
+ id_selector = id_selector || '#shipto_id';
+ $(id_selector).val('');
$('#shipto_dialog').data('confirmed', true);
$('#shipto_dialog').dialog('close');
};
@@ -240,9 +241,17 @@ namespace('kivi.SalesPurchase', function(ns) {
if (!kivi.SalesPurchase.check_required_email_fields())
return false;
+ // ckeditor gets de-initialized when removing the children from
+ // the DOM. Therefore we have to manually preserve its content
+ // over the children's relocation.
+
+ var message = $('#email_form_message').val();
+
$('#send_email_dialog').children().remove().appendTo('#email_inputs');
$('#send_email_dialog').dialog('close');
+ $('#email_form_message').val(message);
+
kivi.submit_form_with_action('#form', $('#form').data('send-email-action'));
return true;
@@ -254,6 +263,8 @@ namespace('kivi.SalesPurchase', function(ns) {
$('#print_options').children().remove().appendTo('#email_form_print_options');
+ kivi.reinit_widgets();
+
var to_focus = $('#email_form_to').val() === '' ? 'to' : 'subject';
$('#email_form_' + to_focus).focus();
};
@@ -263,27 +274,32 @@ namespace('kivi.SalesPurchase', function(ns) {
return true;
};
- this.show_email_dialog = function(send_action) {
+ this.show_email_dialog = function(send_action, vc, vc_id_selector) {
$('#form').data('send-email-action', send_action || 'send_sales_purchase_email');
- var vc = $('#vc').val();
+ vc = vc || $('#vc').val();
+ vc_id_selector = vc_id_selector || '#' + vc + '_id';
+ var vc_id = $(vc_id_selector).val();
+
var data = {
- action: 'show_sales_purchase_email_dialog',
- cp_id: $('#cp_id').val(),
+ action: 'show_sales_purchase_email_dialog',
+ cp_id: $('#cp_id').val(),
direct_debit: $('#direct_debit').prop('checked') ? 1 : 0,
- donumber: $('#donumber').val(),
- format: $('#format').val(),
- formname: $('#formname').val(),
- id: $('#id').val(),
- invnumber: $('#invnumber').val(),
- language_id: $('#language_id').val(),
- media: 'email',
- ordnumber: $('#ordnumber').val(),
- rowcount: $('#rowcount').val(),
- quonumber: $('#quonumber').val(),
- type: $('#type').val(),
- vc: vc,
- vc_id: $('#' + vc + '_id').val(),
+ donumber: $('#donumber').val(),
+ format: $('#format').val(),
+ formname: $('#formname').val(),
+ id: $('#id').val(),
+ invnumber: $('#invnumber').val(),
+ language_id: $('#language_id').val(),
+ media: 'email',
+ ordnumber: $('#ordnumber').val(),
+ cusordnumber: $('#cusordnumber').val(),
+ rowcount: $('#rowcount').val(),
+ quonumber: $('#quonumber').val(),
+ type: $('#type').val(),
+ vc: vc,
+ vc_id: vc_id,
+ project_id: $('#globalproject_id').val(),
};
$('[name^=id_],[name^=partnumber_]').each(function(idx, elt) {
@@ -310,7 +326,7 @@ namespace('kivi.SalesPurchase', function(ns) {
this.activate_send_email_actions_regarding_printout = function() {
var selected = $('#email_form_attachment_policy').val();
$('#email_form_attachment_filename').parents('tr')[selected !== 'no_file' ? 'show' : 'hide']();
- $('#email_form_print_options')[selected === 'normal' ? 'show' : 'hide']();
+ $('#email_form_print_options')[selected !== 'no_file' ? 'show' : 'hide']();
};
// Printing records.