From: Sven Donath Date: Thu, 22 Nov 2012 15:44:00 +0000 (+0100) Subject: Merge remote branch 'origin/master' X-Git-Tag: release-3.0.0beta2~10 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=7321146cf5a08364a9db2ddddbb0b74a5d3fc4c9;hp=980dc53321ae6c2d3e448b6ca2a0c7d11a65ee8c;p=kivitendo-erp.git Merge remote branch 'origin/master' --- diff --git a/SL/Auth.pm b/SL/Auth.pm index d63b6a2f6..0a87ca00e 100644 --- a/SL/Auth.pm +++ b/SL/Auth.pm @@ -493,6 +493,9 @@ sub read_user { my %menustyle_map = ( xml => 'new', v4 => 'v3' ); $user_data{menustyle} = $menustyle_map{lc($user_data{menustyle} || '')} || $user_data{menustyle}; + # The 'Win2000.css' stylesheet has been removed. + $user_data{stylesheet} = 'kivitendo.css' if ($user_data{stylesheet} || '') =~ m/win2000/i; + # Set default language if selected language does not exist (anymore). $user_data{countrycode} = $::lx_office_conf{system}->{language} unless $user_data{countrycode} && -d "locale/$user_data{countrycode}"; diff --git a/SL/Form.pm b/SL/Form.pm index 9cc1065f5..45f37599c 100644 --- a/SL/Form.pm +++ b/SL/Form.pm @@ -1970,7 +1970,7 @@ sub get_duedate { $reference_date = $reference_date ? conv_dateq($reference_date) . '::DATE' : 'current_date'; my $dbh = $self->get_standard_dbh($myconfig); - my $payment_id; + my ($payment_id, $duedate); if($self->{payment_id}) { $payment_id = $self->{payment_id}; @@ -1979,8 +1979,10 @@ sub get_duedate { ($payment_id) = selectrow_query($self, $dbh, $query, $self->{vendor_id}); } - my $query = qq|SELECT ${reference_date} + terms_netto FROM payment_terms WHERE id = ?|; - my ($duedate) = selectrow_query($self, $dbh, $query, $payment_id); + if ($payment_id) { + my $query = qq|SELECT ${reference_date} + terms_netto FROM payment_terms WHERE id = ?|; + ($duedate) = selectrow_query($self, $dbh, $query, $payment_id); + } $main::lxdebug->leave_sub(); diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl index 767669899..7e12b0e05 100755 --- a/bin/mozilla/admin.pl +++ b/bin/mozilla/admin.pl @@ -76,7 +76,7 @@ our $auth; my @valid_dateformats = qw(mm/dd/yy dd/mm/yy dd.mm.yy yyyy-mm-dd); my @valid_numberformats = ('1,000.00', '1000.00', '1.000,00', '1000,00'); -my @all_stylesheets = qw(lx-office-erp.css Win2000.css Mobile.css kivitendo.css); +my @all_stylesheets = qw(lx-office-erp.css Mobile.css kivitendo.css); my @all_menustyles = ( { id => 'old', title => $::locale->text('Old (on the side)') }, { id => 'v3', title => $::locale->text('Top (CSS)') }, diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl index 500547597..9618690b6 100644 --- a/bin/mozilla/am.pl +++ b/bin/mozilla/am.pl @@ -1062,7 +1062,7 @@ sub config { } $form->{STYLESHEETS} = []; - foreach my $item (qw(lx-office-erp.css Win2000.css Mobile.css kivitendo.css)) { + foreach my $item (qw(lx-office-erp.css Mobile.css kivitendo.css)) { push @{ $form->{STYLESHEETS} }, { 'name' => $item, 'value' => $item, diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl index dfac71d2f..3bbe8dcb9 100644 --- a/bin/mozilla/ap.pl +++ b/bin/mozilla/ap.pl @@ -564,7 +564,7 @@ $jsscript NTI($cgi->popup_menu('-name' => "project_id_$i", '-values' => \@project_values, '-labels' => \%project_labels, - '-default' => $form->{"project_id_$i"} )); + '-default' => ($i==$form->{rowcount})? $form->{globalproject_id} : $form->{"project_id_$i"} )); print qq| @@ -1124,7 +1124,7 @@ sub post_as_new { $main::lxdebug->leave_sub(); } -sub use_as_template { +sub use_as_new { $main::lxdebug->enter_sub(); my $form = $main::form; diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl index 80c87f966..6466aa24e 100644 --- a/bin/mozilla/ar.pl +++ b/bin/mozilla/ar.pl @@ -333,7 +333,7 @@ sub form_header { my $transaction = { amount => $form->{"amount_$i"}, tax => $form->{"tax_$i"}, - project_id => $form->{"project_id_$i"}, + project_id => ($i==$form->{rowcount}) ? $form->{globalproject_id} : $form->{"project_id_$i"}, }; my $selected_accno_full; @@ -509,7 +509,7 @@ $follow_ups_block } if ($transdate > $closedto) { print qq| - |; + |; } print qq| @@ -803,7 +803,7 @@ sub post_as_new { $main::lxdebug->leave_sub(); } -sub use_as_template { +sub use_as_new { $main::lxdebug->enter_sub(); $main::auth->assert('general_ledger'); diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl index 554d2fd4f..143696311 100644 --- a/bin/mozilla/ir.pl +++ b/bin/mozilla/ir.pl @@ -609,7 +609,7 @@ sub storno { } -sub use_as_template { +sub use_as_new { $main::lxdebug->enter_sub(); my $form = $main::form; diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl index 47e713167..6184128b1 100644 --- a/bin/mozilla/is.pl +++ b/bin/mozilla/is.pl @@ -799,7 +799,7 @@ sub print_and_post { } -sub use_as_template { +sub use_as_new { $main::lxdebug->enter_sub(); my $form = $main::form; @@ -807,12 +807,13 @@ sub use_as_template { $main::auth->assert('invoice_edit'); - map { delete $form->{$_} } qw(printed emailed queued invnumber invdate deliverydate id datepaid_1 gldate_1 acc_trans_id_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno locked); + delete @{ $form }{qw(printed emailed queued invnumber invdate deliverydate id datepaid_1 gldate_1 acc_trans_id_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno locked)}; $form->{paidaccounts} = 1; $form->{rowcount}--; $form->{invdate} = $form->current_date(\%myconfig); + $form->{duedate} = $form->get_duedate(\%myconfig, $form->{invdate}) || $form->{invdate}; - # remember pricegroups for "use as template" + # remember pricegroups for "use as new" IS->get_pricegroups_for_parts(\%myconfig, \%$form); set_pricegroup($_) for 1 .. $form->{rowcount}; diff --git a/bin/mozilla/vk.pl b/bin/mozilla/vk.pl index 70c048207..c6296e90b 100644 --- a/bin/mozilla/vk.pl +++ b/bin/mozilla/vk.pl @@ -304,8 +304,8 @@ sub invoice_transactions { # discount was already accounted for in db sellprice $ar->{sellprice} = $ar->{sellprice} / $ar->{price_factor} / $basefactor; $ar->{lastcost} = $ar->{lastcost} / $ar->{price_factor} / $basefactor; - $ar->{sellprice_total} = $ar->{qty} * ( $ar->{fxsellprice} * ( 1 - $ar->{discount} ) ) / $ar->{price_factor}; - $ar->{lastcost_total} = $ar->{qty} * $ar->{lastcost} * $basefactor; + $ar->{sellprice_total} = $form->round_amount( $ar->{qty} * ( $ar->{fxsellprice} * ( 1 - $ar->{discount} ) ) / $ar->{price_factor}, $form->{"decimalplaces"}); + $ar->{lastcost_total} = $form->round_amount( $ar->{qty} * $ar->{lastcost} * $basefactor, $form->{"decimalplaces"}); # marge_percent wird neu berechnet, da Wert in invoice leer ist (Bug) $ar->{marge_percent} = $ar->{sellprice_total} ? (($ar->{sellprice_total}-$ar->{lastcost_total}) / $ar->{sellprice_total} * 100) : 0; # marge_total neu berechnen @@ -389,9 +389,9 @@ sub invoice_transactions { # wird laufend bei jeder Position neu berechnet $totals{marge_percent} = $totals{sellprice_total} ? ( ($totals{sellprice_total} - $totals{lastcost_total}) / $totals{sellprice_total} ) * 100 : 0; - map { $ar->{$_} = $form->format_amount(\%myconfig, $ar->{$_}, 2) } qw(marge_total marge_percent qty); + map { $ar->{$_} = $form->format_amount(\%myconfig, $ar->{$_}, 2) } qw(marge_percent qty); map { $ar->{$_} = $form->format_amount(\%myconfig, $ar->{$_}, 3) } qw(weight); - map { $ar->{$_} = $form->format_amount(\%myconfig, $ar->{$_}, $form->{"decimalplaces"} )} qw(lastcost sellprice sellprice_total lastcost_total); + map { $ar->{$_} = $form->format_amount(\%myconfig, $ar->{$_}, $form->{"decimalplaces"} )} qw(lastcost sellprice sellprice_total lastcost_total marge_total); # Einzelzeilen nur zeigen wenn l_parts gesetzt ist, nützlich, wenn man nur # Subtotals und Totals sehen möchte diff --git a/css/Win2000/background_jobs.css b/css/Win2000/background_jobs.css deleted file mode 120000 index 8031c949e..000000000 --- a/css/Win2000/background_jobs.css +++ /dev/null @@ -1 +0,0 @@ -../lx-office-erp/background_jobs.css \ No newline at end of file diff --git a/css/Win2000/csshover.htc b/css/Win2000/csshover.htc deleted file mode 120000 index fcd95c422..000000000 --- a/css/Win2000/csshover.htc +++ /dev/null @@ -1 +0,0 @@ -../lx-office-erp/csshover.htc \ No newline at end of file diff --git a/css/Win2000/dhtmlsuite b/css/Win2000/dhtmlsuite deleted file mode 120000 index 0b8350fb7..000000000 --- a/css/Win2000/dhtmlsuite +++ /dev/null @@ -1 +0,0 @@ -../lx-office-erp/dhtmlsuite/ \ No newline at end of file diff --git a/css/Win2000/frame_header b/css/Win2000/frame_header deleted file mode 120000 index d69ab7feb..000000000 --- a/css/Win2000/frame_header +++ /dev/null @@ -1 +0,0 @@ -../lx-office-erp/frame_header/ \ No newline at end of file diff --git a/css/Win2000/jquery.autocomplete.css b/css/Win2000/jquery.autocomplete.css deleted file mode 120000 index dc1123169..000000000 --- a/css/Win2000/jquery.autocomplete.css +++ /dev/null @@ -1 +0,0 @@ -../lx-office-erp/jquery.autocomplete.css \ No newline at end of file diff --git a/css/Win2000/jquery.multiselect2side.css b/css/Win2000/jquery.multiselect2side.css deleted file mode 120000 index 270f1a248..000000000 --- a/css/Win2000/jquery.multiselect2side.css +++ /dev/null @@ -1 +0,0 @@ -../lx-office-erp/jquery.multiselect2side.css \ No newline at end of file diff --git a/css/Win2000/list_accounts.css b/css/Win2000/list_accounts.css deleted file mode 120000 index 7d530fb1a..000000000 --- a/css/Win2000/list_accounts.css +++ /dev/null @@ -1 +0,0 @@ -../lx-office-erp/list_accounts.css \ No newline at end of file diff --git a/css/Win2000/main.css b/css/Win2000/main.css deleted file mode 100644 index ad33ecdd1..000000000 --- a/css/Win2000/main.css +++ /dev/null @@ -1,177 +0,0 @@ -/* Stylesheet for Lx-Office - * Name: Win2000.css*/ - -/* The look of links */ -A:link { color: black; text-decoration: none; } -A:visited { color: black; text-decoration: none; } -A:active { color: black; text-decoration: underline; } -A.nohover:hover { - color:white; - background-color: #093280; - font-size: 10pt; - text-decoration: none; -} -A:hover { - color:white; - background-color: #093280; - /*font-size: 10pt;*/ - text-decoration: none; -} - -input:focus, textarea:focus, select:focus { - background-color: yellow; -} - -body { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10pt; - background-color: #D4D0C8; - color: black -} -td { - font-family: Verdana, Arial, Helvetica, sans-serif; - color: black; - font-size: 10pt; - font-weight: normal; -} -th { - font-family: Verdana, Arial, Helvetica, sans-serif; - color: black; - font-size: 10pt; - font-weight: normal; -} -/* login and admin */ -.login { - font-family: Verdana, Arial, Helvetica, sans-serif; -} -body.login { - background: #b8d1f3; - color: #D4D0C8; -} -h1.login { - font-size: 18pt; -} -table.login { - background-color: #efedde; - padding: 20px; -} -td.login { - text-align: center; -} -th.login { - text-align: right; -} -body.admin { - background-color:#ffffff; - color: black; -} -body.menu { - background-color: white; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size:10pt; - color: black; -} - -.message_error_login { - color: #000000; - border: 1px solid #8b0000; - background-color: #ffcccc; - padding: 3px; -} -.message_ok { - font-size: 12pt; - padding:5px; - background-color: #ADFFB6; - color: black; - font-weight: bolder; - text-align:center; - border-style:solid; - border-width:thin; -} -.message_error { - font-size: 12pt; - padding:5px; - background-color: #FFAAAA; - color: black; - font-weight: bolder; - text-align:center; - border-style:solid; - border-width:thin; -} -.message_hint { - font-size: 12pt; - padding:5px; - background-color: #FFFE47; - color: black; - font-weight: bolder; - text-align:center; - border-style:solid; - border-width:thin; -} - -.listtop,h1 { - background-color: #b8d1f3; - text-align:left; - padding:5px; - font-size: 10pt; - color: black; - font-weight: bolder; - border-bottom: 2px solid #A5A29C; -} -.listheading { - font-size: 10pt; - padding:3px; - background-color: #b8d1f3; - color: black; - font-weight: bolder; - text-align:left; -} -.subsubheading { - color: black; - font-weight: bolder; - text-decoration: underline; -} -.optionen { - border:dashed; - border-width:1px; - background:#D4D0C8; -} -/* Bei Listen den Farbwechsel zur besseren Lesbarkeit: */ -.listrow1 { background-color: #C8D4C6; color: black; vertical-align: top; } -.listrow0 { background-color: white; color: black; vertical-align: top; } -.listsubtotal { border-top: 1px solid black; font-size: 10pt; background-color: #b8d1f3; color: black; font-weight: bolder;} -.listtotal { border-top: 1px double black; font-size: 10pt; background-color: #b8d1f3; color: black; font-weight: bolder;} -.submit { - font-family: Verdana, Arial, Helvetica, sans-serif; - color: #000000; -} -.checkbox, .radio { - font-family: Verdana, Arial, Helvetica, sans-serif; - color: #778899; -} -.plus0 { /* font color for negative numbers */ - color: red; -} -.plus1 { - color: green; -} -h2.confirm { - color: blue; - font-size: 14pt; -} -h2.error { - color: red; - font-size: 14pt; -} -/* media stuff */ -@media screen { - .noscreen { /* items with this class won't display */ - display: none; - } -} -@media print { - .noprint { /* items with this class won't print */ - display: none; - } -} - diff --git a/css/Win2000/menu.css b/css/Win2000/menu.css deleted file mode 120000 index 5f5d76c93..000000000 --- a/css/Win2000/menu.css +++ /dev/null @@ -1 +0,0 @@ -../lx-office-erp/menu.css \ No newline at end of file diff --git a/css/Win2000/tabcontent.css b/css/Win2000/tabcontent.css deleted file mode 120000 index 487ba3fae..000000000 --- a/css/Win2000/tabcontent.css +++ /dev/null @@ -1 +0,0 @@ -../lx-office-erp/tabcontent.css \ No newline at end of file diff --git a/css/Win2000/ui-lightness b/css/Win2000/ui-lightness deleted file mode 120000 index 9f2cad02e..000000000 --- a/css/Win2000/ui-lightness +++ /dev/null @@ -1 +0,0 @@ -../lx-office-erp/ui-lightness/ \ No newline at end of file diff --git a/css/kivitendo/background_jobs.css b/css/kivitendo/background_jobs.css deleted file mode 120000 index 8031c949e..000000000 --- a/css/kivitendo/background_jobs.css +++ /dev/null @@ -1 +0,0 @@ -../lx-office-erp/background_jobs.css \ No newline at end of file diff --git a/css/kivitendo/background_jobs.css b/css/kivitendo/background_jobs.css new file mode 100644 index 000000000..e390bb5a4 --- /dev/null +++ b/css/kivitendo/background_jobs.css @@ -0,0 +1,14 @@ +/* Jobverwaltung */ +.background_job_list tbody pre, +.background_job_details tbody pre { + margin: 0px; +} + +.background_job_details tbody th { + text-align: right; + vertical-align: top; +} + +.background_job_details tbody td { + vertical-align: top; +} diff --git a/css/kivitendo/dhtmlsuite/menu-bar.css b/css/kivitendo/dhtmlsuite/menu-bar.css index 71fa9b364..9868743d4 100644 --- a/css/kivitendo/dhtmlsuite/menu-bar.css +++ b/css/kivitendo/dhtmlsuite/menu-bar.css @@ -16,6 +16,7 @@ ************************************************************************************************************/ .DHTMLSuite_menuBar_top{ /* The bar that is parent of the menu strip */ + color:#FFF; height:26px; width:100%; background-repeat:repeat-x; @@ -23,12 +24,15 @@ font-size:12px; z-index:100000; padding-left:10px; +/* background-image:url('../../../image/dhtmlsuite/menu_strip_bg.jpg');*/ + background-image:url('../../../image/bg_css_kivi_menu.png'); } .DHTMLSuite_menuBar_sub{ position:absolute; background-color:#FFF; - border:1px solid #D1D1D1; + border:1px solid #000; + background-image:url('../../../image/dhtmlsuite/menu-bar-kivi-gradient.png'); /* Background image for sub menu items */ background-repeat:repeat-y; background-position: left center; display:inline; diff --git a/css/kivitendo/dhtmlsuite/menu-item.css b/css/kivitendo/dhtmlsuite/menu-item.css index 5f753121a..7202b4401 100644 --- a/css/kivitendo/dhtmlsuite/menu-item.css +++ b/css/kivitendo/dhtmlsuite/menu-item.css @@ -2,41 +2,66 @@ .DHTMLSuite_menuItem_top_regular,.DHTMLSuite_menuItem_top_over,.DHTMLSuite_menuItem_top_click,.DHTMLSuite_menuItem_top_disabled,.DHTMLSuite_menuItem_top_active{ height:19px; - line-height:16px; - margin-right:2px; - margin-top:1px; - padding-left:4px; - padding-right:4px; - padding-top:2px; - padding-bottom:2px; } .DHTMLSuite_menuItem_top_regular div,.DHTMLSuite_menuItem_top_over div,.DHTMLSuite_menuItem_top_click div,.DHTMLSuite_menuItem_top_disabled div,.DHTMLSuite_menuItem_top_active div{ padding-top:2px; padding-bottom:2px; } .DHTMLSuite_menuItem_top_regular{ /* Top level menu item - Regular state */ + padding-left:4px; + padding-right:4px; + margin-right:2px; + padding-top:1px; + padding-bottom:1px; cursor:pointer; + line-height:16px; + margin-top:2px; } .DHTMLSuite_menuItem_top_over{ /* Top level menu item - Mouse over state */ - color:#FE5F14; - background-color:#D1D1D1; + padding-left:3px; + padding-right:3px; + margin-right:2px; + border:1px solid #000; + color:#000; + background-color:#bec6a2; cursor:pointer; + line-height:16px; + margin-top:2px; } .DHTMLSuite_menuItem_top_active{ /* Top level menu item - Active state - this is typical the state for menu item 1 when a sub group is expanded and the mouse is located over one of the sub menu items */ + padding-left:3px; + padding-right:3px; + margin-right:2px; + border:1px solid #000; + border-bottom:1px solid #FFF; cursor:pointer; + line-height:16px; + margin-top:2px; } .DHTMLSuite_menuItem_top_click{ /* Top level menu item - Mouse click state */ - color:#FE5F14; - background-color:#D1D1D1; + padding-left:3px; + padding-right:3px; + margin-right:2px; + border:1px solid #000; + background-color:#bec6a2; cursor:pointer; + line-height:16px; + margin-top:2px; z-index:20000; } .DHTMLSuite_menuItem_top_disabled{ /* Disabled menu item */ + padding-left:4px; + padding-right:4px; + margin-right:2px; + padding-top:1px; + padding-bottom:1px; cursor:default; + line-height:16px; + margin-top:2px; } .DHTMLSuite_menuItem_top_disabled img,.DHTMLSuite_menuItem_top_disabled div{ /* Sub divs of disabled top level items. A menu item is a div with some subdivs(one for the icon, one for text etc.). this is the css for these sub divs */ @@ -112,19 +137,21 @@ -khtml-opacity:.4; /* Transparency */ } .DHTMLSuite_menuItem_sub_regular,.DHTMLSuite_menuItem_sub_disabled{ /* Regular menu item */ + margin-left:2px; /* size of margin above + 1 pixel */ + padding-top:3px; /* Size of padding-top above + 1 pixel */ + padding-bottom:3px; /* Size of padding-bottom above + 1 pixel */ } .DHTMLSuite_menuItem_sub_over,.DHTMLSuite_menuItem_sub_click,.DHTMLSuite_menuItem_sub_active{ + border:1px solid #006; /* Border around mouse over items, click items and active items */ } .DHTMLSuite_menuItem_sub_over,.DHTMLSuite_menuItem_sub_active{ /* Mouse over effect */ - color:#FE5F14; - background-color:#D1D1D1; + background-color:#bec6a2; /* Background color of mouse over items and active items(Active item = parent elements of the menu item the mouse is currently over */ } .DHTMLSuite_menuItem_sub_click{ /* Mouse click effect */ - color:#FE5F14; - background-color:#D1D1D1; + background-color:#bec6a2; /* Background color when the mouse button is pressed down on a menu item */ } .DHTMLSuite_menuItem_sub_click div, .DHTMLSuite_menuItem_sub_regular div,.DHTMLSuite_menuItem_sub_over div,.DHTMLSuite_menuItem_sub_active div,.DHTMLSuite_menuItem_sub_disabled div{ /* divs for the text,icon and arrow of a menu item */ @@ -151,13 +178,10 @@ margin-bottom:1px; /* Space below the separator */ margin-left:24px; /* left margin because we don't want the separator to cover the gradient */ padding-right:3px; /* space at the right of the separator */ - color:#FE5F14; - background-color:#D1D1D1; + background-color:#6A8CCB; /* background color for the separator - blue */ } .DHTMLSuite_menuItem_textContent { - border-bottom-style: none !important; - background-color: inherit !important; color: inherit !important; } diff --git a/css/kivitendo/frame_header b/css/kivitendo/frame_header deleted file mode 120000 index d69ab7feb..000000000 --- a/css/kivitendo/frame_header +++ /dev/null @@ -1 +0,0 @@ -../lx-office-erp/frame_header/ \ No newline at end of file diff --git a/css/kivitendo/frame_header/header.css b/css/kivitendo/frame_header/header.css new file mode 100644 index 000000000..4af67bfef --- /dev/null +++ b/css/kivitendo/frame_header/header.css @@ -0,0 +1,38 @@ +#frame-header .frame-header-element a:link, +#frame-header .frame-header-element a:visited, +#frame-header .frame-header-element a:hover, +#frame-header .frame-header-element a:active { + color: white; + background: none; + text-decoration: underline; +} + +#frame-header { + background: url('../../../image/bg_kivi_titel.png') repeat-x; + text-align: center; + margin: 0; + padding: 0; + color: white; + border: 0; + overflow: hidden; + width: 100%; + border-spacing: 0; + font-size: 12px; +} + +#frame-header .frame-header-left { + float: left; +} +#frame-header .frame-header-right { + float: right; +} + +#frame-header .frame-header-left, +#frame-header .frame-header-center, +#frame-header .frame-header-right { + border-spacing: 0; + color: white; + padding: 0; + font-family: verdana,arial,sans-serif; + vertical-align: middle; +} diff --git a/css/kivitendo/jquery.autocomplete.css b/css/kivitendo/jquery.autocomplete.css deleted file mode 120000 index dc1123169..000000000 --- a/css/kivitendo/jquery.autocomplete.css +++ /dev/null @@ -1 +0,0 @@ -../lx-office-erp/jquery.autocomplete.css \ No newline at end of file diff --git a/css/kivitendo/jquery.autocomplete.css b/css/kivitendo/jquery.autocomplete.css new file mode 100644 index 000000000..91b622833 --- /dev/null +++ b/css/kivitendo/jquery.autocomplete.css @@ -0,0 +1,48 @@ +.ac_results { + padding: 0px; + border: 1px solid black; + background-color: white; + overflow: hidden; + z-index: 99999; +} + +.ac_results ul { + width: 100%; + list-style-position: outside; + list-style: none; + padding: 0; + margin: 0; +} + +.ac_results li { + margin: 0px; + padding: 2px 5px; + cursor: default; + display: block; + /* + if width will be 100% horizontal scrollbar will apear + when scroll mode will be used + */ + /*width: 100%;*/ + font: menu; + font-size: 12px; + /* + it is very important, if line-height not setted or setted + in relative units scroll will be broken in firefox + */ + line-height: 16px; + overflow: hidden; +} + +.ac_loading { + background: white url('indicator.gif') right center no-repeat; +} + +.ac_odd { + background-color: #eee; +} + +.ac_over { + background-color: #0A246A; + color: white; +} diff --git a/css/kivitendo/jquery.multiselect2side.css b/css/kivitendo/jquery.multiselect2side.css deleted file mode 120000 index 270f1a248..000000000 --- a/css/kivitendo/jquery.multiselect2side.css +++ /dev/null @@ -1 +0,0 @@ -../lx-office-erp/jquery.multiselect2side.css \ No newline at end of file diff --git a/css/kivitendo/jquery.multiselect2side.css b/css/kivitendo/jquery.multiselect2side.css new file mode 100644 index 000000000..ced4d988b --- /dev/null +++ b/css/kivitendo/jquery.multiselect2side.css @@ -0,0 +1,56 @@ +.ms2side__div { + clear: left; + width: 100%; + padding: 1px; + float: left; + background : url('') repeat-x; /* HACK FOR CHROME */ +} + +.ms2side__select { + float: left; +} + +.ms2side__header { + color: blue; + background-color: #EEEEFF; +} + +.ms2side__options, .ms2side__updown { + float: left; + font-size: 10pt; + margin: 0; + padding: 0 8px; + width: 40px; + color: black; + text-align: center; + overflow: hidden; +} + +.ms2side__updown { + font-size: 9pt; +} + +.ms2side__options p, .ms2side__updown p { + margin: 2px 0; + padding: 0; + cursor: pointer; + border: 1px solid black; +} + +.ms2side__options p.ms2side_hover, .ms2side__updown p.ms2side_hover { + background-color: #F0F0FF; + border-color: #0000FF; + cursor: pointer; +} + +.ms2side__options p.ms2side__hide, .ms2side__updown p.ms2side__hide { + cursor: default; + color: grey; + border: 1px solid grey; + background-color: #F0F0F0; +} + +.ms2side__div select { + width: 220px; + float: left; +} diff --git a/css/kivitendo/list_accounts.css b/css/kivitendo/list_accounts.css new file mode 100644 index 000000000..552a901cf --- /dev/null +++ b/css/kivitendo/list_accounts.css @@ -0,0 +1,92 @@ +/* Kontenliste Styles */ + +.coa_listtop { + background-color:rgb(236,233,216); + text-align:left; + padding:5px; + font-size:12pt; + color:black; + font-weight: bolder; + border-style:dashed; + border-width:thin; +} + +.coa_listheading { + background-color:rgb(236,233,216); + color: black; + background-image:url("../../image/fade.png"); +} + +.coa_listheading_element { + font-size:10pt; + padding:3px; + font-weight:bolder; + text-align:left; + border-style:dotted; + border-width:thin; +} + +.coa_listrow1 { + background-color: rgb(208,207,201); + color: black; + vertical-align: top; +} + +.coa_listrow0 { + background-color: rgb(236,233,216); + color: black; + vertical-align: top; +} + +.coa_amount { + text-align:right; + font-family:monospace; +} + +.coa_account_header { + font-size:10pt; + padding:3px; + font-weight:bolder; + text-align:left; + border-style:none; + border-width:thin; +} + +.coa_account_header_sc { + font-size:10pt; + padding:3px; + font-weight:bolder; + text-align:left; + border-style:none; + border-width:thin; + cursor:s-resize; +} + +.coa_detail { + padding:0px; + border-style:none; +} + +.coa_detail_emph { + font-size:10pt; + font-weight:bold; + color:darkred; +} + +.coa_details_header { + font-size:8pt; + padding:3px; + font-weight:bolder; + text-align:center; + border-style:none; + border-width:thin; +} + +.coa_details_header2 { + font-size:8pt; + padding:3px; + font-weight:normal; + text-align:left; + border-style:none; + border-width:thin; +} diff --git a/css/kivitendo/main.css b/css/kivitendo/main.css index c3c64dc76..e69e0efe2 100644 --- a/css/kivitendo/main.css +++ b/css/kivitendo/main.css @@ -1,363 +1,452 @@ -/* Stylesheet for kivitendo * Name:kivitendo.css*/ -/* Colortable - -Background: #EBEBEB burlywood -Links: #006400 DarkGreen -Link-hover #FE5F14 Orange / #FFFFE0 lightyellow -Titles, BG/VG: #79B61B Mid-green FFFFFF White -Tabcolor: #CAFFA3 -*/ +/* Stylesheet for Lx-Office -body { - font-family: Verdana, Arial, Helvetica; - background-color: #FFFFFF; - color: #000000; - font-size: 9pt; +/* The look of links */ +A:link { color: #597d12; text-decoration: none; } +A:visited { color: #597d12; text-decoration: none; } +A:active { color: black; text-decoration: none; } +A:hover { color: black; + background-color: #bec6a2; + text-decoration: none; + } +a, div { + transition: background-color 0.2s; + -moz-transition: background-color 0.2s; + -webkit-transition: background-color 0.2s; } - -/* The look of links */ -a { - padding: 0 0.2em; - text-decoration: none; - /* border-bottom: thin solid; */ - /* font-weight: bold; */ +input, textarea, select { + border: 1px; + border-color: darkgray lightgray lightgray; + border-style: solid; + padding: 1px; + background-color: white; } -A:link, A:visited, A:active { - color: #000000; - border-bottom: thin solid #FE5F14; +img:hover { + display:block !important; } -a:hover { - color: #FE5F14; - background-color: #D1D1D1; + +select { + padding: 0px; } -a.selected:hover { - color:#EBEBEB; + +input:focus, textarea:focus, select:focus { + background-color: whitesmoke; + border: 1px; + border-color: gray lightgray lightgray; + border-style: solid; } -a.nomobile { - background-color:transparent; - border:none; + +input:hover, textarea:hover, select:hover { + border-color: dimgray darkgray darkgray; } -table { - font-size: 90% !important; - table-layout: auto; - border-spacing: 0.3em; +input[type="button"], +input[type="submit"], +button, +input[type="button"]:focus, +input[type="submit"]:focus, +button:focus { + border: 1px; + border-color: darkgray; + border-style: solid; + padding: 0px 4px; + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + border-radius: 2px; + background-color: whitesmoke; } -/* table a { - color:#FE5F14 !important; - border-bottom:none; -} */ +button:hover, +input[type="button"]:hover, +input[type="submit"]:hover { + border: 1px; + background-color: lightgray; + border-color: gray; + border-style: solid; + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + border-radius: 2px; +} -ul { +html { + height: 100%; } -hr { - background-color: #006400; - border: none; - color: #79B61B; - height: 2px; +body { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 10pt; + background-color: white; + background-image: url("../../image/fade.png"); background-repeat:repeat-x; + color: black; + height: 100%; } -/* I.E. & Chrome können das nicht! */ -/* input[type="radio"], input[type="checkbox"]{ - width:1.15em; - height:1.15em; - border:1px solid; - color: #006400; -} */ -input:focus, textarea:focus, select:focus { - background-color: #FFFFA0; - border: 2px solid #FE5F14; - /* border-bottom: medium solid #FE5F14; */ -} -/* Fängt den "Schrink" beim focus - problem für i.e. und chrome */ -/* input[type="radio"]:focus, input[type="checkbox"]:focus{ - width:1.2em; - height:1.2em; -} */ td { - color: #000000; - font-weight: normal; + font-family: Verdana, Arial, Helvetica, sans-serif; + color: black; + font-size: 8pt; + font-weight: normal; +} +td.hover:hover { + color: black; +/* background-color: #FFFFCC; + font-size: 8pt; + text-decoration: none; + border:none; + borderWidth:0px; + borderColor:2557AD; +*/ } -/* td.hover:hover { - color: #006400; - background-color: #FFFFE0; -} */ + + th { - color: #000000; - font-weight: bold; + font-family: Verdana, Arial, Helvetica, sans-serif; + color: black; + font-size: 8pt; + font-weight: normal; } + /* login and admin */ -.login a, .login a:visited, .login a:hover { - text-decoration: none !important; - background-color:transparent !important; - border:none; +.login { + font-family: Verdana, Arial, Helvetica, sans-serif; } -.login a:hover { - background: none; +div.login { + min-height: 100%; + height: auto !important; + height: 100%; + background: #bec6a2; + color: #A0A0A0; } -body.login { - background-color: #FFFFE0; - color: #000000; +h1.login { + font-size: 18pt; } -.login h1 { - text-align: center; - font-size: 20px; +h3.login { + color:#fe5f14; } table.login { - background-color: #FFFFE0; - padding: 20px; + background-color: #efedde; + padding: 20px; } td.login { - text-align: center; + text-align: center; } th.login { - text-align: right; -} -.admin h1 { - background-color: #fe5f14; - text-color: #ffffff; + text-align: right; } -body.menu { - color: #000000; + +div.admin { + color: black; + margin: 8px; } -/* Warnings */ + .message_error_login { - color: #000000; - border: 1px solid #8b0000; - background-color: #ffcccc; - padding: 3px; + color: #fe5f14; + border: 1px solid #fe5f14; + background-color: #ffffff; + padding: 3px; } .message_ok { - padding: 5px; - background-color: #ADFFB6; - color: black; - font-weight: bolder; - text-align: center; - border-style: solid; - border-width: thin; + font-size: 12pt; + padding:5px; + background-color: #ADFFB6; + color: black; + font-weight: bolder; + text-align:center; + border-style:solid; + border-width:thin; } .message_error { - padding: 5px; - background-color: #CC0000; - color: white; - font-weight: bolder; - text-align: center; - border-style: solid; - border-width: thin; + font-size: 12pt; + padding:5px; + background-color: #FFAAAA; + color: black; + font-weight: bolder; + text-align:center; + border-style:solid; + border-width:thin; } .message_hint { - padding: 0.5em; - background-color: #FFEE66; - color: black; - font-weight: bolder; - text-align: center; - border-style: solid; - border-width: thin; + font-size: 12pt; + padding:5px; + background-color: #FFFE66; + color: black; + font-weight: bolder; + text-align:center; + border-style:solid; + border-width:thin; } .message_error_label { - padding: 0.5em; - background-color: #E00000; - color: white; - font-weight: normal; - text-align: left; - border-style: solid; - border-width: thin; -} -/* Headings */ + font-size: 0.8em; + padding:5px; + background-color: #FEE; + font-weight:normal; + text-align:left; + border-style:solid; + border-width:thin; +} + +/* + Überschriftsbalken +*/ .listtop, h1 { - font-size:125%; - background-color: #006400; - text-align: left; - padding: 0.5em; - color: #FFFFFF; - font-weight: bolder; - border-style: none; - border-width: thin; - -moz-border-radius:0.4em; /* Firefox */ - -webkit-border-radius:0.4em; /* Safari, Chrome */ - -khtml-border-radius:0.4em; /* Konqueror */ - border-radius:0.4em; /* CSS3 */ - behavior:url(border-radius.htc); -} - -/* .listelement { - background-color: #f8ffb3; - color: #000000; + background-color: rgb(236,233,216); + text-align:center; + padding:5px; + font-size: 10pt; + color: black; + font-weight: bolder; + border-style:dashed; + border-width:thin; +} + + +.listelement { + background-image: url("../../image/fade2.png"); + background-repeat:repeat-x; + border-style:dashed; + border-width:thin; } + .listelement2 { - background-color: #8ee085; - color: #000000; -} */ -.listheading { - padding: 0.2em; - background-color: #EBEBEB; - color: #006400; - font-weight: bolder; - text-align: left; - border-style: none; -} - -/* .listheadingcontent { - background-color: #EBEBEB; - color: #006400; - font-weight: bolder; - text-align: left; -} */ + background-image: url("../../image/fade2.png"); + background-repeat:repeat-x; + border-style:dashed; + border-width:thin; +} + +.listheading, .listheading th { + font-size: 9pt; + padding:3px; + background-color: + rgb(236,233,216); + color: black; + font-weight: bolder; + text-align:left; + background-image: url("../../image/fade.png"); + border-style:dotted; + border-width:thin; +} + +.listheadingcontent { + font-size: 9pt; + background-color: + rgb(236,233,216); + color: black; + font-weight: bolder; + text-align:left; +} .accountlistheading { - padding: 0.3em; - color: #006400; - font-weight: bold; - text-align: left; - background-color: #EBEBEB; + font-size: 10pt; + padding:3px; + color: white; + font-weight: bold; + text-align:left; + background-color:rgb(133,132,129); } + .subsubheading { - color: #000000; - font-weight: bolder; - text-decoration: underline; + color: black; + font-weight: bolder; + text-decoration: underline; } + .optionen { - border: dashed; - border-width: 1px; - background: #FFFFE0; -} -.listrow1 { - background-color: #FFFFFF; - color: black; - vertical-align: top; -} -.listrow0 { - background-color: #FFFF99; - color: black; - vertical-align: top; -} -.listrowempty { - background-color: #FFFFFF; - color: black; - vertical-align: top; -} -.listsubtotal { - background-color: rgb(236,233,216); - color: black; - font-weight: bolder; -} -.listtotal, .listtotal td { - background-color: rgb(236,233,216); - color: black; - font-weight: bolder; + border:dashed; +/* padding-top:10px; + padding-bottom:10px; + padding-left:10px; +*/ + border-width:1px; + background:#efedde; } + + +.listrow1 { background-color: rgb(208,207,201); color: black; vertical-align: top; } +.listrow0 { background-color: rgb(236,233,216); color: black; vertical-align: top; } +.listrowempty { background-color: rgb(255,255,255); color: black; vertical-align: top; } + +.redrow1 { background-color: rgb(250,167, 161); color: black; vertical-align: top; } +.redrow0 { background-color: rgb(255,193,176); color: black; vertical-align: top; } + +.greenrow1 { background-color: rgb(0,250,0); color: black; vertical-align: top; } +.greenrow0 { background-color: rgb(0,255,0); color: black; vertical-align: top; } + +.listsubtotal { font-size: 8pt; background-color: rgb(236,233,216); color: black; font-weight: bolder;} + +.listtotal, .listtotal td { font-size: 8pt; background-color: rgb(236,233,216); color: black; font-weight: bolder;} + /* Verkaufsbericht */ -.listmainsortheader { - background-color: rgb(236,233,216); - color: red; - font-weight: bolder; - padding-left: 10px; - padding-top: 0px; -} -.listmainsortsubtotal { - background-color: rgb(236,233,216); - color: red; - font-weight: bolder; - padding-left: 10px; -} -.listsubsortheader { - background-color: rgb(236,233,216); - color: green; - font-weight: bolder; - padding-left: 20px -} -.listsubsortsubtotal { - background-color: rgb(236,233,216); - color: green; - font-weight: bolder; - padding-left: 20px -} -.listsortdescription { - background-color: rgb(236,233,216); - color: black; - font-weight: normal; - padding-left: 30px -} +.listmainsortheader { font-size: 8pt; background-color: rgb(236,233,216); color: red; font-weight: bolder; padding-left: 10px; padding-top: 0px;} +.listmainsortsubtotal { font-size: 8pt; background-color: rgb(236,233,216); color: red; font-weight: bolder; padding-left: 10px;} +.listsubsortheader { font-size: 8pt; background-color: rgb(236,233,216); color: green; font-weight: bolder; padding-left: 20px} +.listsubsortsubtotal { font-size: 8pt; background-color: rgb(236,233,216); color: green; font-weight: bolder; padding-left: 20px} +.listsortdescription { font-size: 8pt; background-color: rgb(236,233,216); color: black; font-weight: normal; padding-left: 30px} + + .submit { - font-family: Verdana, Arial, Helvetica; - color: #000000; + font-family: Verdana, Arial, Helvetica, sans-serif; + color: #000000; } .checkbox, .radio { - font-family: Verdana, Arial, Helvetica; - color: #778899; + font-family: Verdana, Arial, Helvetica, sans-serif; + color: #778899; } -.plus0 { -/* font color for negative numbers */ - color: red; + +.plus0 { /* font color for negative numbers */ + color: red; } + .plus1 { - color: green; + color: green; } + +td.numeric { /* class for numeric columns in tables */ + text-align: right +} + h2.confirm { - color: blue; + color: blue; + font-size: 14pt; } + h2.error { - color: red; + color: red; + font-size: 14pt; } + fieldset { - margin-top: 15px; - color: black; - font-weight: bolder; + margin-top:15px; + color: black; + font-weight: bolder; } + /* media stuff */ + @media screen { -.noscreen { -/* items with this class won't display */ - display: none; -} + .noscreen { /* items with this class won't display */ + display: none; + } } + @media print { -.noprint { -/* items with this class won't print */ - display: none; -} + .noprint { /* items with this class won't print */ + display: none; + } } + .filecontent { - border: 1px solid blue; - padding-left: 2px; - padding-right: 2px; + border: 1px solid blue; + padding-left: 2px; + padding-right: 2px; } + label { - cursor: pointer; - vertical-align: top; + cursor:pointer; } + .unbalanced_ledger { - background-color: #ffa0a0; + background-color: #ffa0a0; } + .clearfix:after { - clear: both; - content: "."; - display: block; - height: 0; - visibility: hidden; + clear:both; + content:"."; + display:block; + font-size:0; + height:0; + visibility:hidden; } + .flash_message_error { - background-color: #FFD6D6; - border: 1px solid #AE0014; - margin-top: 5px; - margin-bottom: 5px; - padding: 5px; + background-color:#FFD6D6; + border: 1px solid #AE0014; + margin-top: 5px; + margin-bottom: 5px; + padding: 5px; } + .flash_message_warning { - background-color: #FFE8C7; - border: 1px solid #FF6600; - margin-top: 5px; - margin-bottom: 5px; - padding: 5px; + background-color:#FFE8C7; + border: 1px solid #FF6600; + margin-top: 5px; + margin-bottom: 5px; + padding: 5px; } + .flash_message_info { - background-color: #DCF2FF; - border: 1px solid #4690FF; - margin-top: 5px; - margin-bottom: 5px; - padding: 5px; + background-color:#DCF2FF; + border: 1px solid #4690FF; + margin-top: 5px; + margin-bottom: 5px; + padding: 5px; +} + +.jqmWindow { + display: none; + + position: fixed; + top: 17%; + left: 40%; + + margin-left: -200px; + width: 700px; + + background-color: #bec6a2; + color: #333; + border: 1px solid black; + padding: 4px; +} + +.jqmContent { + padding: 8px; +} + +.jqmWindow h1 { + border: 0; + padding: 0; + background-color: #bec6a2; +} + +.jqmOverlay { + background-color: #000; +} + +/* Kontenliste Styles */ + +.coa_listrow1 { + background-color: rgb(208,207,201); + color: black; + vertical-align: top; +} + +.coa_listrow0 { + background-color: rgb(236,233,216); + color: black; + vertical-align: top; +} + +.coa_detail_emph { + font-size:10pt; + font-weight:bold; + color:darkred; +} + +.coa_details_header { + font-size:8pt; + padding:3px; + font-weight:bolder; + text-align:center; + border-style:none; + border-width:thin; +} + +.coa_details_header2 { + font-size:8pt; + padding:3px; + font-weight:normal; + text-align:left; + border-style:none; + border-width:thin; } diff --git a/css/kivitendo/menu.css b/css/kivitendo/menu.css index 1b004b797..cbe012cc1 100644 --- a/css/kivitendo/menu.css +++ b/css/kivitendo/menu.css @@ -1,148 +1,156 @@ -/* kivitendo menu Colors: -Menu Background color #FE5F14 -orangemenu color #FFFFFF -whiteMenu Hover background color #FFFFE0 -DarkGreensubenu pointer -*/ -body.menuv3 { - behavior: url("css/csshover.htc"); - /*font-size: 14pt;*/ - line-height: 20pt; - font-family: Verdana, Geneva, Tahoma, sans-serif; - background-color: #FFFFFF; - color: #000000; + +body.menu { + background-image: url("../../image/fade.png");background-repeat:repeat-x; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size:8pt; + color: black; +} + +table.menunew { + border: 0; + width: 100%; + background-image: url("../../image/bg_kivi_titel.png"); + border-spacing: 0; +} + +table.menunew td { + padding: 0; + color:white; + font-family: Verdana, Arial, sans-serif; + font-size: 12px; } + +body.menunew { + padding:0px; + margin:0px; +} + +body { +behavior:url("csshover.htc"); +} + #menuv3 { - /*font-size: 85%;*/ - width: 99.8%; - float: left; - /*border: 3px solid;*/ - background-color: #FFFFFF; - color: #000000; +width:99.8%; +float:left; +background:url(../../image/bg_css_kivi_menu.png) repeat bottom; +border:1px solid; +border-color:#ccc #888 #555 #bbb; } + #menuv3 a, #menuv3 h2, #menuv3 div.x { - font-size: 80%; - line-height: 120%; - display: block; - border: 0; - white-space: nowrap; - margin: 0; - padding: 0.3em 1em; +font:11px/16px arial,helvetica,sans-serif; +display:block; +border:0; +border-right:1px; +border-style:solid; +border-color:#ccc #888 #555 #bbb; +white-space:nowrap; +margin:0; +padding:1px 0 1px 3px; } + #menuv3 h2 { - background-color: #ffffff; - color: #000000; - /*padding: 2px 15px;*/ -/* Firefox */ - -moz-border-radius: 0.4em 0.4em 0; -/* Safari, Chrome */ - -webkit-border-radius: 0.4em 0.4em 0; -/* Konqueror */ - -khtml-border-radius: 0.4em 0.4em 0; -/* CSS3 */ - border-radius: 0.4em 0.4em 0 0; -/* behavior: url(border-radius.htc); */ -} -#menuv3 ul:hover h2 { - background-color:#DCDCDC; +color:#fff; +padding:2px 10px; } + #menuv3 a, #menuv3 a:visited, #menuv3 div.x, #menuv3 div.x:visited { - color: #000000; - text-decoration: none; - padding-right: 10px; +color:#000; +text-decoration:none; +padding-right:10px; } + #menuv3 a { - background: #EBEBEB; +background:#eee; } #menuv3 div.x, #menuv3 div.x:visited { - background-color: #EBEBEB; - border-right: 1em solid #FE5F14; -} -#menuv3 div.x:hover { - border-right: none; +background:#eee url(../../image/right.gif) no-repeat right; } + #menuv3 a:hover, #menuv3 div.x:hover { - color: #FE5F14; - background-color: #EBEBEB; +color:#a00; +background-color:#ddd; } + #menuv3 a:active, #menuv3 div.x:active { - color: #FE5F14; - background-color: #EBEBEB; +color:#060; +background-color:#ccc; } + #menuv3 ul { - list-style: none; - margin: 0; - padding: 0; - float: left; +list-style:none; +margin:0; +padding:0; +float:left; } #menuv3 li { - position: relative; - float: none; - border: 0; -} -li.sub { - position: relativ; - left: 0.2em; - top: 0px; - background-color: #FFFFFF; +position:relative; +float:none; +border:0; } -/* IE6 spacing bug fix,
  • s without a bottom border get spaced to far * correction:the bug will change the height of the parent element! this will also cause the whole menu to grow * so the only method to get this pile of crap going is to add a bottom border to the
  • s, where the enclosing