X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fkivi.SalesPurchase.js;h=2b13dd8669d6366c4333fa2e20035964d65c376d;hb=cfb029307ecd356f377952f3190df655cbd447c6;hp=2fcd2132e8b07f52707a4099f71d6eba45bce54f;hpb=6a75dc1c3ddda3e78d77bc95ebdd72dbe5d858b1;p=kivitendo-erp.git
diff --git a/js/kivi.SalesPurchase.js b/js/kivi.SalesPurchase.js
index 2fcd2132e..2b13dd866 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);
@@ -32,8 +32,6 @@ namespace('kivi.SalesPurchase', function(ns) {
$edit.val(params.default_longdescription);
- kivi.init_text_editor($edit);
-
$('#popup_edit_longdescription_runningnumber').html(params.runningnumber);
$('#popup_edit_longdescription_partnumber').html(params.partnumber);
@@ -172,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');
};
@@ -242,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;
@@ -256,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();
};
@@ -268,23 +277,39 @@ namespace('kivi.SalesPurchase', function(ns) {
this.show_email_dialog = function(send_action) {
$('#form').data('send-email-action', send_action || 'send_sales_purchase_email');
+ var vc = $('#vc').val();
+ var data = {
+ 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(),
+ cusordnumber: $('#cusordnumber').val(),
+ rowcount: $('#rowcount').val(),
+ quonumber: $('#quonumber').val(),
+ type: $('#type').val(),
+ vc: vc,
+ vc_id: $('#' + vc + '_id').val(),
+ project_id: $('#globalproject_id').val(),
+ };
+
+ $('[name^=id_],[name^=partnumber_]').each(function(idx, elt) {
+ var val = $(elt).val() || '';
+ if (val !== '')
+ data[ $(elt).attr('name') ] = val;
+ });
+
kivi.popup_dialog({
id: 'send_email_dialog',
url: 'io.pl',
load: kivi.SalesPurchase.setup_send_email_dialog,
- data: {
- action: 'show_sales_purchase_email_dialog',
- type: $('#type').val(),
- formname: $('#formname').val(),
- format: $('#format').val(),
- media: 'email',
- ordnumber: $('#ordnumber').val(),
- donumber: $('#donumber').val(),
- invnumber: $('#invnumber').val(),
- quonumber: $('#quonumber').val(),
- cp_id: $('#cp_id').val(),
- language_id: $('#language_id').val(),
- },
+ data: data,
dialog: {
height: 600,
title: kivi.t8('Send email'),
@@ -295,6 +320,12 @@ namespace('kivi.SalesPurchase', function(ns) {
return true;
};
+ 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 !== 'no_file' ? 'show' : 'hide']();
+ };
+
// Printing records.
this.setup_print_dialog = function() {
kivi.SalesPurchase.show_all_print_options_elements();