X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=js%2Fkivi.SalesPurchase.js;h=4dc390b168a1740b7054406dc5e9b1edeb60dc9a;hb=f8fff60be1abb9986486cc7367747ee16d829116;hp=98a538c194d97896430c9417cb5d4b95e7ee2ad3;hpb=5202b3e71b817c6a78845cd4c27773760ff408b6;p=kivitendo-erp.git
diff --git a/js/kivi.SalesPurchase.js b/js/kivi.SalesPurchase.js
index 98a538c19..4dc390b16 100644
--- a/js/kivi.SalesPurchase.js
+++ b/js/kivi.SalesPurchase.js
@@ -1,4 +1,6 @@
namespace('kivi.SalesPurchase', function(ns) {
+ this.longdescription_dialog_size_percentage = 0;
+
this.edit_longdescription = function(row) {
var $element = $('#longdescription_' + row);
@@ -17,8 +19,20 @@ namespace('kivi.SalesPurchase', function(ns) {
};
this.edit_longdescription_with_params = function(params) {
+ var dialog_width = 800;
+ var dialog_height = 500;
+ var textarea_width = 750;
+ var textarea_height = 220;
+ if (this.longdescription_dialog_size_percentage != 0) {
+ dialog_width = Math.ceil(window.innerWidth * this.longdescription_dialog_size_percentage/100);
+ dialog_height = Math.ceil(window.innerHeight * this.longdescription_dialog_size_percentage/100);
+ textarea_width = Math.ceil(dialog_width * 95/100);
+ textarea_height = dialog_height - 220;
+ if (textarea_height <= 0) textarea_height = 220;
+ }
+
var $container = $('#popup_edit_longdescription_input_container');
- var $edit = $('');
+ var $edit = $('');
$container.children().remove();
$container.append($edit);
@@ -44,6 +58,8 @@ namespace('kivi.SalesPurchase', function(ns) {
id: 'edit_longdescription_dialog',
dialog: {
title: kivi.t8('Enter longdescription'),
+ width: dialog_width,
+ height: dialog_height,
open: function() { kivi.focus_ckeditor_when_ready('#popup_edit_longdescription_input'); },
close: function() { $('#popup_edit_longdescription_input_container').children().remove(); }
}
@@ -241,9 +257,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;
@@ -255,6 +279,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();
};
@@ -264,10 +290,13 @@ 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(),
@@ -285,7 +314,7 @@ namespace('kivi.SalesPurchase', function(ns) {
quonumber: $('#quonumber').val(),
type: $('#type').val(),
vc: vc,
- vc_id: $('#' + vc + '_id').val(),
+ vc_id: vc_id,
project_id: $('#globalproject_id').val(),
};
@@ -313,7 +342,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.