Kundenstatistik: offene Rechnungen, offene Aufträge, Angebote, Aufträge,

Kunden und Lieferanten
Kunden Angebote, Aufträge, Rechnungen
Lieferanten Preisanfragen, Lieferantenaufträge, Rechnungen

diff --git a/SL/Controller/CustomerVendor.pm b/SL/Controller/CustomerVendor.pm
index 373f713607ab1766e5d3e58ce18ea97991f06830..a380f4373e42aa3a89891dcbd8720d72f5dc62e3 100644 (file)
--- a/SL/Controller/CustomerVendor.pm
+++ b/SL/Controller/CustomerVendor.pm
@@ -28,6 +28,8 @@ use SL::DB::FollowUpLink;
 use SL::DB::History;
 use SL::DB::Currency;
 use SL::DB::Invoice;
 use SL::DB::History;
 use SL::DB::Currency;
 use SL::DB::Invoice;

+use SL::DB::PurchaseInvoice;
+use SL::DB::Order;

 
 use Data::Dumper;
 
 
 use Data::Dumper;
 


@@ -945,14 +947,38 @@ sub _pre_render {
     ],
     with_objects => ['follow_up'],
   );
     ],
     with_objects => ['follow_up'],
   );

-  
-  $self->{open_items} = SL::DB::Manager::Invoice->get_all_count(
-    query => [
-      customer_id => $self->{cv}->id,
-      paid => {lt_sql => 'amount'},      
-    ],
-  );
-  
+
+  if ( $self->is_vendor()) {
+    $self->{open_items} = SL::DB::Manager::PurchaseInvoice->get_all_count(
+      query => [
+        vendor_id => $self->{cv}->id,
+        paid => {lt_sql => 'amount'},
+      ],
+    );
+  } else {
+    $self->{open_items} = SL::DB::Manager::Invoice->get_all_count(
+      query => [
+        customer_id => $self->{cv}->id,
+        paid => {lt_sql => 'amount'},
+      ],
+    );
+  }
+
+  if ( $self->is_vendor() ) {
+    $self->{open_orders} = SL::DB::Manager::Order->get_all_count(
+      query => [
+        vendor_id => $self->{cv}->id,
+        closed => 'F',
+      ],
+    );
+  } else {
+    $self->{open_orders} = SL::DB::Manager::Order->get_all_count(
+      query => [
+        customer_id => $self->{cv}->id,
+        closed => 'F',
+      ],
+    );
+  }

   $self->{template_args} ||= {};
 
   $::request->{layout}->add_javascripts('kivi.CustomerVendor.js');
   $self->{template_args} ||= {};
 
   $::request->{layout}->add_javascripts('kivi.CustomerVendor.js');

diff --git a/SL/Controller/CustomerVendorTurnover.pm b/SL/Controller/CustomerVendorTurnover.pm
index bd327daa44be15863eb3135f28ccbd190716a96c..e705a0868d8c2b1b165baa86ca20940f99212fc1 100644 (file)
--- a/SL/Controller/CustomerVendorTurnover.pm
+++ b/SL/Controller/CustomerVendorTurnover.pm
@@ -4,6 +4,7 @@ use parent qw(SL::Controller::Base);
 use SL::DBUtils;
 use SL::DB::AccTransaction;
 use SL::DB::Invoice;
 use SL::DBUtils;
 use SL::DB::AccTransaction;
 use SL::DB::Invoice;

+use SL::DB::Order;

 use SL::DB;
 
 __PACKAGE__->run_before('check_auth');
 use SL::DB;
 
 __PACKAGE__->run_before('check_auth');


@@ -15,18 +16,34 @@ sub action_list_turnover {
 
   my $cv = $::form->{id} || {};
   my $open_invoices;
 
   my $cv = $::form->{id} || {};
   my $open_invoices;

+  if ( $::form->{db} eq 'customer' ) {

   $open_invoices = SL::DB::Manager::Invoice->get_all(
     query => [customer_id => $cv,
   $open_invoices = SL::DB::Manager::Invoice->get_all(
     query => [customer_id => $cv,

-              paid => {lt_sql => 'amount'},
+                or => [
+                      amount => { gt => \'paid'},
+                      amount => { lt => \'paid'},
+                    ],

     ],
     with_objects => ['dunnings'],
   );
     ],
     with_objects => ['dunnings'],
   );

+  } else {
+    $open_invoices = SL::DB::Manager::PurchaseInvoice->get_all(
+      query   => [ vendor_id => $cv,
+                or => [
+                      amount => { gt => \'paid'},
+                      amount => { lt => \'paid'},
+                    ],
+               ],
+      sort_by => 'invnumber DESC',
+    );
+  }

   my $open_items;
   if (@{$open_invoices}) {
     return $self->render(\'', { type => 'json' }) unless scalar @{$open_invoices};
     $open_items = $self->_list_open_items($open_invoices);
   }
   my $open_items;
   if (@{$open_invoices}) {
     return $self->render(\'', { type => 'json' }) unless scalar @{$open_invoices};
     $open_items = $self->_list_open_items($open_invoices);
   }

-  return $self->render('customer_vendor_turnover/turnover', { header => 0 }, open_items => $open_items, id => $cv);
+  my $open_orders = $self->_get_open_orders();
+  return $self->render('customer_vendor_turnover/turnover', { header => 0 }, open_orders => $open_orders, open_items => $open_items, id => $cv);

 }
 
 sub _list_open_items {
 }
 
 sub _list_open_items {


@@ -39,7 +56,7 @@ sub action_count_open_items_by_year {
   my ($self) = @_;
 
   return $self->render('generic/error', { layout => 0 }, label_error => "list_transactions needs a trans_id") unless $::form->{id};
   my ($self) = @_;
 
   return $self->render('generic/error', { layout => 0 }, label_error => "list_transactions needs a trans_id") unless $::form->{id};

-  my $dbh = SL::DB->client->dbh()
+  my $dbh = SL::DB->client->dbh;

 
   my $cv = $::form->{id} || {};
 
 
   my $cv = $::form->{id} || {};
 


@@ -63,7 +80,7 @@ sub action_count_open_items_by_month {
   my ($self) = @_;
 
   return $self->render('generic/error', { layout => 0 }, label_error => "list_transactions needs a trans_id") unless $::form->{id};
   my ($self) = @_;
 
   return $self->render('generic/error', { layout => 0 }, label_error => "list_transactions needs a trans_id") unless $::form->{id};

-  my $dbh = SL::DB->client->dbh()
+  my $dbh = SL::DB->client->dbh;

 
   my $cv = $::form->{id} || {};
 
 
   my $cv = $::form->{id} || {};
 


@@ -88,52 +105,134 @@ sub action_turnover_by_month {
 
   return $self->render('generic/error', { layout => 0 }, label_error => "list_transactions needs a trans_id") unless $::form->{id};
 
 
   return $self->render('generic/error', { layout => 0 }, label_error => "list_transactions needs a trans_id") unless $::form->{id};
 

-  my $dbh = SL::DB->client->dbh()
+  my $dbh = SL::DB->client->dbh;

   my $cv = $::form->{id} || {};
   my $cv = $::form->{id} || {};

-  my $query = "SELECT CONCAT(EXTRACT (MONTH FROM transdate),'/',EXTRACT (YEAR FROM transdate)) AS date_part,
+  my ($db, $cv_type);
+  if ($::form->{db} eq 'customer') {
+    $db      = "ar";
+    $cv_type = "customer_id";
+  } else {
+    $db      = "ap";
+    $cv_type = "vendor_id";
+  }
+  my $query = <<SQL;
+SELECT CONCAT(EXTRACT (MONTH FROM transdate),'/',EXTRACT (YEAR FROM transdate)) AS date_part,

     count(id) as count,
     sum(amount) as amount,
     sum(netamount) as netamount,
     sum(paid) as paid
     count(id) as count,
     sum(amount) as amount,
     sum(netamount) as netamount,
     sum(paid) as paid

-    FROM ar WHERE customer_id = $cv
+    FROM $db WHERE $cv_type = $cv

     GROUP BY EXTRACT (YEAR FROM transdate), EXTRACT (MONTH FROM transdate)
     GROUP BY EXTRACT (YEAR FROM transdate), EXTRACT (MONTH FROM transdate)

-    ORDER BY EXTRACT (YEAR FROM transdate) DESC, EXTRACT (MONTH FROM transdate) DESC";
-
+    ORDER BY EXTRACT (YEAR FROM transdate) DESC, EXTRACT (MONTH FROM transdate) DESC
+SQL

    $self->{turnover_statistic} = selectall_hashref_query($::form, $dbh, $query);
    $self->render('customer_vendor_turnover/count_turnover', { layout => 0 });
 }
 sub action_turnover_by_year {
    $self->{turnover_statistic} = selectall_hashref_query($::form, $dbh, $query);
    $self->render('customer_vendor_turnover/count_turnover', { layout => 0 });
 }
 sub action_turnover_by_year {

-

   my ($self) = @_;
 
   return $self->render('generic/error', { layout => 0 }, label_error => "list_transactions needs a trans_id") unless $::form->{id};
 
   my ($self) = @_;
 
   return $self->render('generic/error', { layout => 0 }, label_error => "list_transactions needs a trans_id") unless $::form->{id};
 

-  my $dbh = SL::DB->client->dbh()
+  my $dbh = SL::DB->client->dbh;

   my $cv = $::form->{id} || {};
   my $cv = $::form->{id} || {};

-  my $query = "SELECT EXTRACT (YEAR FROM transdate) as date_part,
+  my ($db, $cv_type);
+  if ($::form->{db} eq 'customer') {
+    $db      = "ar";
+    $cv_type = "customer_id";
+  } else {
+    $db      = "ap";
+    $cv_type = "vendor_id";
+  }
+  my $query = <<SQL;
+SELECT EXTRACT (YEAR FROM transdate) as date_part,

     count(id) as count,
     sum(amount) as amount,
     sum(netamount) as netamount,
     sum(paid) as paid
     count(id) as count,
     sum(amount) as amount,
     sum(netamount) as netamount,
     sum(paid) as paid

-    FROM ar WHERE customer_id = $cv
+    FROM $db WHERE $cv_type = $cv

     GROUP BY date_part
     GROUP BY date_part

-    ORDER BY date_part DESC";
-
+    ORDER BY date_part DESC
+SQL

    $self->{turnover_statistic} = selectall_hashref_query($::form, $dbh, $query);
    $self->render('customer_vendor_turnover/count_turnover', { layout => 0 });
 }
    $self->{turnover_statistic} = selectall_hashref_query($::form, $dbh, $query);
    $self->render('customer_vendor_turnover/count_turnover', { layout => 0 });
 }

+

 sub action_get_invoices {
   my ($self) = @_;
 
   return $self->render('generic/error', { layout => 0 }, label_error => "list_transactions needs a trans_id") unless $::form->{id};
 
   my $cv = $::form->{id} || {};
 sub action_get_invoices {
   my ($self) = @_;
 
   return $self->render('generic/error', { layout => 0 }, label_error => "list_transactions needs a trans_id") unless $::form->{id};
 
   my $cv = $::form->{id} || {};

-  my $invoices = SL::DB::Manager::Invoice->get_all(
-    query => [ customer_id => $cv, ],
-    sort_by => 'invnumber DESC',
-  );
+  my $invoices;
+  if ( $::form->{db} eq 'customer' ) {
+    $invoices = SL::DB::Manager::Invoice->get_all(
+      query => [ customer_id => $cv, ],
+      sort_by => 'invnumber DESC',
+    );
+  } else {
+    $invoices = SL::DB::Manager::PurchaseInvoice->get_all(
+      query => [ vendor_id => $cv, ],
+      sort_by => 'invnumber DESC',
+    );
+  }

   $self->render('customer_vendor_turnover/invoices_statistic', { layout => 0 }, invoices => $invoices);
 }
   $self->render('customer_vendor_turnover/invoices_statistic', { layout => 0 }, invoices => $invoices);
 }

+
+sub action_get_orders {
+  my ($self) = @_;
+
+  return $self->render('generic/error', { layout => 0 }, label_error => "list_transactions needs a trans_id") unless $::form->{id};
+
+  my $cv = $::form->{id} || {};
+  my $orders;
+  my $type = $::form->{type};
+  if ( $::form->{db} eq 'customer' ) {
+    $orders = SL::DB::Manager::Order->get_all(
+      query => [ customer_id => $cv,
+                 quotation   => ($type eq 'quotation' ? 'T' : 'F') ],
+      sort_by => ( $type eq 'order' ? 'ordnumber DESC' : 'quonumber DESC'),
+    );
+  } else {
+    $orders = SL::DB::Manager::Order->get_all(
+      query => [ vendor_id => $cv,
+                 quotation   => ($type eq 'quotation' ? 'T' : 'F') ],
+      sort_by => ( $type eq 'order' ? 'ordnumber DESC' : 'quonumber DESC'),
+    );
+  }
+  if ( $type eq 'order') {
+    $self->render('customer_vendor_turnover/order_statistic', { layout => 0 }, orders => $orders);
+  } else {
+    $self->render('customer_vendor_turnover/quotation_statistic', { layout => 0 }, orders => $orders);
+  }
+}
+
+sub _get_open_orders {
+  my ( $self ) = @_;
+
+  return $self->render('generic/error', { layout => 0 }, label_error => "list_transactions needs a trans_id") unless $::form->{id};
+  my $open_orders;
+  my $cv = $::form->{id} || {};
+
+  if ( $::form->{db} eq 'customer' ) {
+    $open_orders = SL::DB::Manager::Order->get_all(
+      query => [ customer_id => $cv,
+                   closed => 'F',
+               ],
+               sort_by => 'ordnumber DESC',
+               );
+  } else {
+    $open_orders = SL::DB::Manager::Order->get_all(
+      query => [ vendor_id => $cv,
+                   closed => 'F',
+               ],
+               sort_by => 'ordnumber DESC',
+               );
+  }
+
+  return 0 unless scalar @{$open_orders};
+  return $self->render('customer_vendor_turnover/_list_open_orders', { output => 0 }, orders => $open_orders, title => $::locale->text('Open Orders') );
+}
+

 sub _list_articles_by_invoice {
 }
 sub _list_count_articles_by_year {
 sub _list_articles_by_invoice {
 }
 sub _list_count_articles_by_year {

diff --git a/templates/webpages/customer_vendor/form.html b/templates/webpages/customer_vendor/form.html
index ae05d85c29a7a4dac81ca155d6cff1b57479b458..fc709430e9a6814aa211a3ffed455e9f6be877f5 100644 (file)
--- a/templates/webpages/customer_vendor/form.html
+++ b/templates/webpages/customer_vendor/form.html
@@ -2,8 +2,8 @@
 [%- USE HTML %]
 [%- USE LxERP %]
 [%- USE L %]
 [%- USE HTML %]
 [%- USE LxERP %]
 [%- USE L %]

+[%- USE Dumper %]

 <h1>[% FORM.title %] [% IF SELF.cv.id %] - [% HTML.escape(SELF.cv.displayable_name) %][% END %]</h1>
 <h1>[% FORM.title %] [% IF SELF.cv.id %] - [% HTML.escape(SELF.cv.displayable_name) %][% END %]</h1>

-

 [% L.hidden_tag('_cti_enabled', !!LXCONFIG.cti.dial_command) %]
 
 [% cv_cvars = SELF.cv.cvars_by_config %]
 [% L.hidden_tag('_cti_enabled', !!LXCONFIG.cti.dial_command) %]
 
 [% cv_cvars = SELF.cv.cvars_by_config %]


@@ -36,7 +36,7 @@
       [% IF SELF.cv.id %]
         <li><a href="#price_rules">[% 'Price Rules' | $T8 %]</a></li>
       [% END %]
       [% IF SELF.cv.id %]
         <li><a href="#price_rules">[% 'Price Rules' | $T8 %]</a></li>
       [% END %]

-      <li><a href="[% 'controller.pl?action=CustomerVendorTurnover/list_turnover&id=' _ SELF.cv.id | html %]">[% LxERP.t8('Turnovers') %] [%- IF SELF.open_items > 0 %] <span style="background-color:red;color:black;">&nbsp; $&nbsp; </span>[% END %]</a></li>
+      <li><a href="[% 'controller.pl?action=CustomerVendorTurnover/list_turnover&id=' _ SELF.cv.id _ '&db=' _ FORM.db %]">[% LxERP.t8('Records') %] [%- IF SELF.open_items > 0 %] <span style="color:red;">&nbsp;$</span>[% END %] [%- IF SELF.open_orders > 0 %] <span style="color:red;">&nbsp;!</span>[% END %]</a></li>

     </ul>
 
     [% PROCESS "customer_vendor/tabs/billing.html" %]
     </ul>
 
     [% PROCESS "customer_vendor/tabs/billing.html" %]

diff --git a/templates/webpages/customer_vendor_turnover/_list_open_items.html b/templates/webpages/customer_vendor_turnover/_list_open_items.html
index 51eb721668f227dcda0b5b16d673fe5d1f844b77..0f62e6eaa516a582b0b5e2ca5872853a14ff882b 100644 (file)
--- a/templates/webpages/customer_vendor_turnover/_list_open_items.html
+++ b/templates/webpages/customer_vendor_turnover/_list_open_items.html
@@ -2,10 +2,10 @@
 [%- USE LxERP %]
 [%- USE L %]
 [%- USE HTML %]
 [%- USE LxERP %]
 [%- USE L %]
 [%- USE HTML %]

-<div class="listtop">[%- HTML.escape(title) %]</div>

 
 <div id="sales_report">
   <table width="100%">
 
 <div id="sales_report">
   <table width="100%">

+    <caption class="listtop">[%- HTML.escape(title) %]</caption>

     <tbody>
       <tr>
         <td class="listheading">[% 'Invoice Number' | $T8 %]</td>
     <tbody>
       <tr>
         <td class="listheading">[% 'Invoice Number' | $T8 %]</td>


@@ -36,4 +36,4 @@
       [% END %]
     </tbody>
   </table>
       [% END %]
     </tbody>
   </table>

-</div> 
+</div>

diff --git a/templates/webpages/customer_vendor_turnover/_list_open_orders.html b/templates/webpages/customer_vendor_turnover/_list_open_orders.html
new file mode 100644 (file)
index 0000000..cbde174
--- /dev/null
+++ b/templates/webpages/customer_vendor_turnover/_list_open_orders.html
@@ -0,0 +1,44 @@
+[%- USE T8 %]
+[%- USE LxERP %]
+[%- USE L %]
+[%- USE HTML %]
+
+<div id="orders_report">
+  <table width="100%">
+    <caption class="listtop">[%- HTML.escape(title) %]</caption>
+    <tbody>
+      <tr>
+        <td class="listheading">[% 'Type' | $T8 %]</td>
+        <td class="listheading">[% 'Order/RFQ Number' | $T8 %]</td>
+        <td class="listheading">[% 'Date' | $T8 %]</td>
+        <td class="listheading">[% 'Amount' | $T8 %]</td>
+        <td class="listheading">[% 'Saleman' | $T8 %]</td>
+        <td class="listheading">[% 'Transaction description' | $T8 %]</td>
+      </tr>
+
+      [%- FOREACH row = orders %]
+      <tr class="listrow[% loop.count % 2 %]">
+        <td>[% IF row.quotation %]
+          [% IF FORM.db == 'customer' %][% 'Sales quotation' | $T8 %][% ELSE %][% 'RFQ' | $T8 %][% END %]</td>
+              [%- IF INSTANCE_CONF.get_feature_experimental -%]
+                <td>[% IF row.id %]<a href='controller.pl?action=Order/edit&type=[% IF SELF.is_customer %]sales_quotation[% ELSE %]request_quotation[% END %]&id=[% HTML.escape(row.id) %]'>[% END %][% HTML.escape(row.quonumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
+              [%- ELSE -%]
+                <td>[% IF row.id %]<a href='oe.pl?action=edit&type=[% IF SELF.is_customer %]sales_quotation[% ELSE %]request_quotation[% END %]&vc=customer&id=[% HTML.escape(row.oe_id) %]'>[% END %][% HTML.escape(row.quonumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
+              [%- END -%]
+            [% ELSE %]
+            [% IF FORM.db == 'customer' %][% 'Sales Order' | $T8 %][% ELSE %][% 'Purchase Order' | $T8 %][% END %]</td>
+              [%- IF INSTANCE_CONF.get_feature_experimental -%]
+                <td>[% IF row.id %]<a href='controller.pl?action=Order/edit&type=[% IF SELF.is_customer %]sales_order[% ELSE %]purchase_order[% END %]&id=[% HTML.escape(row.id) %]'>[% END %][% HTML.escape(row.ordnumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
+              [%- ELSE -%]
+                <td>[% IF row.id %]<a href='oe.pl?action=edit&type=[% IF SELF.is_customer %]sales_order[% ELSE %]purchase_order[% END %]&vc=customer&id=[% HTML.escape(row.oe_id) %]'>[% END %][% HTML.escape(row.ordnumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
+              [%- END -%]
+            [% END %]
+        <td>[% row.transdate.to_kivitendo | html %]</td>
+        <td>[%- LxERP.format_amount(row.amount, 2) %]</td>
+        <td>[% row.employee.name | html %]</td>
+        <td>[% row.transaction_description | html %]</td>
+      </tr>
+      [% END %]
+    </tbody>
+  </table>
+</div>

diff --git a/templates/webpages/customer_vendor_turnover/_statistic_tabs.html b/templates/webpages/customer_vendor_turnover/_statistic_tabs.html
index 06bcb8c7825620a5268ece4f00c476a74cf37512..32bb9f559b6767c06418165292e87fd54ec52f16 100644 (file)
--- a/templates/webpages/customer_vendor_turnover/_statistic_tabs.html
+++ b/templates/webpages/customer_vendor_turnover/_statistic_tabs.html
@@ -7,17 +7,41 @@
     $ ( "#statistic_tabs" ).tabs();
   });
   function get_invoices() {
     $ ( "#statistic_tabs" ).tabs();
   });
   function get_invoices() {

-    var url = 'controller.pl?action=CustomerVendorTurnover/get_invoices&id=' + $('#cv_id').val();
+    var url = 'controller.pl?action=CustomerVendorTurnover/get_invoices&id=' + $('#cv_id').val() + '&db=' + $('#db').val();

     $('#invoices').load(url);
   }
     $('#invoices').load(url);
   }

+  function get_sales_quotations() {
+    var url = 'controller.pl?action=CustomerVendorTurnover/get_orders&id=' + $('#cv_id').val() + '&db=' + $('#db').val() + '&type=quotation';
+    $('#quotations').load(url);
+  }
+  function get_orders() {
+    var url = 'controller.pl?action=CustomerVendorTurnover/get_orders&id=' + $('#cv_id').val() + '&db=' + $('#db').val() + '&type=order';
+    $('#orders').load(url);
+  }
+  function get_letters() {
+    var url = 'controller.pl?action=CustomerVendorTurnover/get_letters&id=' + $('#cv_id').val() + '&db=' + $('#db').val();;
+    $('#letters').load(url);
+  }
+  function get_mails() {
+    var url = 'controller.pl?action=CustomerVendorTurnover/get_mails&id=' + $('#cv_id').val() + '&db=' + $('#db').val();;
+    $('#mails').load(url);
+  }

 </script>
 <div class="tabwidget" id="statistic_tabs">
   <ul>
     <li><a href="#turnover_stat">[% 'Turnoverstatistic' | $T8 %]</a></li>
 </script>
 <div class="tabwidget" id="statistic_tabs">
   <ul>
     <li><a href="#turnover_stat">[% 'Turnoverstatistic' | $T8 %]</a></li>

-    <li><a href="#dun_stat">[% 'Dunningstatistic' | $T8 %]</a></li>
+    [% IF FORM.db == "customer" %]<li><a href="#dun_stat">[% 'Dunningstatistic' | $T8 %]</a></li>[% END %]
+    <li><a href="#quotations" onclick="get_sales_quotations();">[% IF FORM.db == "customer" %][% 'Sales Quotations' | $T8 %][% ELSE %][% 'Request Quotations' | $T8 %][% END %]</a></li>
+    <li><a href="#orders" onclick="get_orders();">[% 'Orders' | $T8 %]</a></li>

     <li><a href="#invoices" onclick="get_invoices();">[% 'Invoices' | $T8 %]</a></li>
     <li><a href="#invoices" onclick="get_invoices();">[% 'Invoices' | $T8 %]</a></li>

+    <li><a href="#mails" onclick="get_mails();">[% 'Mails' | $T8 %]</a></li>
+    <li><a href="#letters" onclick="get_letters();">[% 'Letters' | $T8 %]</a></li>

   </ul>
   <div id="turnover_stat">[% PROCESS "customer_vendor_turnover/turnover_statistic.html" %]</div>
   <div id="dun_stat">[% PROCESS "customer_vendor_turnover/dun_statistic.html" %]</div>
   </ul>
   <div id="turnover_stat">[% PROCESS "customer_vendor_turnover/turnover_statistic.html" %]</div>
   <div id="dun_stat">[% PROCESS "customer_vendor_turnover/dun_statistic.html" %]</div>

+  <div id="quotations"></div>
+  <div id="orders"></div>

   <div id="invoices"></div>
   <div id="invoices"></div>

+  <div id="mails"></div>
+  <div id="letters"></div>

 </div>
 </div>

diff --git a/templates/webpages/customer_vendor_turnover/order_statistic.html b/templates/webpages/customer_vendor_turnover/order_statistic.html
new file mode 100644 (file)
index 0000000..2d52392
--- /dev/null
+++ b/templates/webpages/customer_vendor_turnover/order_statistic.html
@@ -0,0 +1,35 @@
+[%- USE T8 %]
+[%- USE LxERP %]
+[%- USE L %]
+[%- USE HTML %]
+<div id="invoice_statistic">
+  <table width="100%">
+    <tbody>
+      <tr>
+        <td class="listheading">[% 'Order Number' | $T8 %]</td>
+        <td class="listheading">[% 'Order Date' | $T8 %]</td>
+        <td class="listheading">[% 'Amount' | $T8 %]</td>
+        <td class="listheading">[% 'Delivery Date' | $T8 %]</td>
+        <td class="listheading">[% 'Transaction description' | $T8 %]</td>
+      </tr>
+
+      [%- FOREACH row = orders %]
+      <tr class="listrow[% loop.count % 2 %]">
+        [%- IF INSTANCE_CONF.get_feature_experimental -%]
+          <td>[% IF row.id %]<a href='controller.pl?action=Order/edit&type=[% IF SELF.is_customer %]sales_order[% ELSE %]purchase_order[% END %]&id=[% HTML.escape(row.id) %]'>[% END %][% HTML.escape(row.ordnumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
+        [%- ELSE -%]
+          <td>[% IF row.id %]<a href='oe.pl?action=edit&type=[% IF SELF.is_customer %]sales_order[% ELSE %]purchase_order[% END %]&vc=customer&id=[% HTML.escape(row.oe_id) %]'>[% END %][% HTML.escape(row.ordnumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
+        [%- END -%]
+        <td>[% row.transdate.to_kivitendo | html %]</td>
+        <td>[%- LxERP.format_amount(row.amount, 2) %]</td>
+        <td>[% row.reqdate.to_kivitendo | html %]</td>
+        <td>[% row.transaction_description %]</td>
+      </tr>
+      [% END %]
+    </tbody>
+  </table>
+
+
+    </tbody>
+  </table>
+</div>

diff --git a/templates/webpages/customer_vendor_turnover/quotation_statistic.html b/templates/webpages/customer_vendor_turnover/quotation_statistic.html
new file mode 100644 (file)
index 0000000..03c595a
--- /dev/null
+++ b/templates/webpages/customer_vendor_turnover/quotation_statistic.html
@@ -0,0 +1,35 @@
+[%- USE T8 %]
+[%- USE LxERP %]
+[%- USE L %]
+[%- USE HTML %]
+<div id="invoice_statistic">
+  <table width="100%">
+    <tbody>
+      <tr>
+        <td class="listheading">[% IF FORM.db == 'customer' %][% 'Quotation Number' | $T8 %][% ELSE %][% 'RFQ Number' | $T8 %][% END %]</td>
+        <td class="listheading">[% IF FORM.db == 'customer' %][% 'Quotation Date' | $T8 %][% ELSE %][% 'RFQ Date' | $T8 %][% END %]</td>
+        <td class="listheading">[% 'Amount' | $T8 %]</td>
+        <td class="listheading">[% 'Delivery Date' | $T8 %]</td>
+        <td class="listheading">[% 'Transaction description' | $T8 %]</td>
+      </tr>
+
+      [%- FOREACH row = orders %]
+      <tr class="listrow[% loop.count % 2 %]">
+        [%- IF INSTANCE_CONF.get_feature_experimental -%]
+          <td>[% IF row.id %]<a href='controller.pl?action=Order/edit&type=[% IF SELF.is_customer %]sales_quotation[% ELSE %]request_quotation[% END %]&id=[% HTML.escape(row.id) %]'>[% END %][% HTML.escape(row.quonumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
+        [%- ELSE -%]
+          <td>[% IF row.id %]<a href='oe.pl?action=edit&type=[% IF SELF.is_customer %]sales_quotation[% ELSE %]request_quotation[% END %]&vc=customer&id=[% HTML.escape(row.oe_id) %]'>[% END %][% HTML.escape(row.quonumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
+        [%- END -%]
+        <td>[% row.transdate.to_kivitendo | html %]</td>
+        <td>[%- LxERP.format_amount(row.amount, 2) %]</td>
+        <td>[% row.reqdate.to_kivitendo | html %]</td>
+        <td>[% row.transaction_description %]</td>
+      </tr>
+      [% END %]
+    </tbody>
+  </table>
+
+
+    </tbody>
+  </table>
+</div>

diff --git a/templates/webpages/customer_vendor_turnover/turnover.html b/templates/webpages/customer_vendor_turnover/turnover.html
index 310355d484103fdbf298df01401d30a760074354..28c8264e4efca5695e0dbfd316a754e6800918e8 100644 (file)
--- a/templates/webpages/customer_vendor_turnover/turnover.html
+++ b/templates/webpages/customer_vendor_turnover/turnover.html
@@ -8,4 +8,8 @@
 [% open_items %]
 [% END %]
 
 [% open_items %]
 [% END %]
 

+[%- IF open_orders %]
+[% open_orders %]
+[% END %]
+

 [% PROCESS "customer_vendor_turnover/_statistic_tabs.html" %]
 [% PROCESS "customer_vendor_turnover/_statistic_tabs.html" %]

diff --git a/templates/webpages/customer_vendor_turnover/turnover_statistic.html b/templates/webpages/customer_vendor_turnover/turnover_statistic.html
index c2ea10ec57d068285e4f106cb10f9a21633a82fe..0ee39bf5733ee5bcfc0b101d1a8b3574754f6255 100644 (file)
--- a/templates/webpages/customer_vendor_turnover/turnover_statistic.html
+++ b/templates/webpages/customer_vendor_turnover/turnover_statistic.html
@@ -2,7 +2,7 @@
 [%- USE LxERP %]
 [%- USE L %]
 [%- USE HTML %]
 [%- USE LxERP %]
 [%- USE L %]
 [%- USE HTML %]

-<p> 
+<p>

 [% L.radio_button_tag('period', value='year', label= LxERP.t8('Year'), onclick='show_turnover_stat("y");') %]
 
 [% L.radio_button_tag('period', value='month', label= LxERP.t8('Month'), onclick='show_turnover_stat("m");') %]
 [% L.radio_button_tag('period', value='year', label= LxERP.t8('Year'), onclick='show_turnover_stat("y");') %]
 
 [% L.radio_button_tag('period', value='month', label= LxERP.t8('Month'), onclick='show_turnover_stat("m");') %]


@@ -10,10 +10,10 @@
 <script type="text/javascript">
   function show_turnover_stat(period) {
     if (period === 'y') {
 <script type="text/javascript">
   function show_turnover_stat(period) {
     if (period === 'y') {

-      var url = 'controller.pl?action=CustomerVendorTurnover/turnover_by_year&id=' + $('#cv_id').val();
+      var url = 'controller.pl?action=CustomerVendorTurnover/turnover_by_year&id=' + $('#cv_id').val() + '&db=' + $('#db').val();

       $('#turnovers').load(url);
     } else {
       $('#turnovers').load(url);
     } else {

-      var url = 'controller.pl?action=CustomerVendorTurnover/turnover_by_month&id=' + $('#cv_id').val();
+      var url = 'controller.pl?action=CustomerVendorTurnover/turnover_by_month&id=' + $('#cv_id').val() + '&db=' + $('#db').val();

       $('#turnovers').load(url);
     }
   }
       $('#turnovers').load(url);
     }
   }