Rename inventory_report.transdate to report_date

Author: ehuelsmann

UI/inventory/adjustment_entry.html

@@ -7,16 +7,16 @@
     <div class="listtop">[% text('Enter Inventory')%]</div>
         <div class="label" id="date_div">
                 <label for="date_span">[% text('Adjustment Date') %]</label>
-                <span id="date_span">[% transdate %]</span>
+                <span id="date_span">[% reportdate %]</span>
                 [% INCLUDE input element_data = {
                         name  = "source"
                         type  = "hidden"
                         value = source
                 } %]
                 [% INCLUDE input element_data = {
-                        name  = "transdate"
+                        name  = "reportdate"
                         type  = "hidden"
-                        value = transdate
+                        value = reportdate
                 } %]
         </div>
         <table>

UI/inventory/adjustment_setup.html

@@ -7,9 +7,9 @@
     <div class="listtop">[% text('Adjustment Details'); %]</div>
     <div class="two-column-grid" style="width: fit-content">
         [% INCLUDE input element_data = {
-                name  = "transdate"
+                name  = "reportdate"
                 size  = "12"
-                value = transdate
+                value = reportdate
                 type  = "date"
                 label = text('Date')
         } %]

lib/LedgerSMB/Inventory/Adjust.pm

@@ -74,7 +74,7 @@ this date.  Required.
 
 =cut
 
-has transdate => (is => 'ro', isa => 'LedgerSMB::PGDate', required => '1');
+has reportdate => (is => 'ro', isa => 'LedgerSMB::PGDate', required => '1');
 
 =item source text
 
@@ -162,7 +162,7 @@ sub save {
     my ($ref) = $self->call_dbmethod(funcname => 'save_info');
     $self->id($ref->{id});
     for my $row(@{$self->rows}){
-        $row->check_variance($self->transdate);
+        $row->check_variance($self->reportdate);
         $row->save($self->id);
     }
     return;
@@ -203,9 +203,9 @@ a given date.
 =cut
 
 sub get_part_at_date {
-    my ($self, $transdate, $partnumber) = @_;
+    my ($self, $reportdate, $partnumber) = @_;
     my ($ref) = $self->call_procedure(funcname => 'get_item_at_day',
-                                        args => [$transdate, $partnumber],
+                                        args => [$reportdate, $partnumber],
                                     funcprefix => 'inventory_');
     return $ref;
 }

lib/LedgerSMB/Scripts/inventory.pm

@@ -60,12 +60,12 @@ sub adjustment_next {
     my ($request) = @_;
     my $adjustment = LedgerSMB::Inventory::Adjust->new(
         %$request,
-        transdate => $request->parse_date( $request->{transdate} ),
+        reportdate => $request->parse_date( $request->{reportdate} ),
         );
     for my $i (1 .. $request->{rowcount}){
         if ($request->{"id_$i"} eq 'new' or not $request->{"id_$i"}){
             my $item = $adjustment->get_part_at_date(
-                $request->{transdate}, $request->{"partnumber_$i"});
+                $request->{reportdate}, $request->{"partnumber_$i"});
             $request->{"id_$i"} = $item->{id};
             $request->{"description_$i"} = $item->{description};
             $request->{"onhand_$i"} = $item->{onhand};
@@ -113,7 +113,7 @@ sub adjustment_save {
     my ($request) = @_;
     my $adjustment = LedgerSMB::Inventory::Adjust->new(
         %$request,
-        transdate => $request->parse_date( $request->{transdate} ),
+        reportdate => $request->parse_date( $request->{reportdate} ),
         );
     _lines_from_form($request, $adjustment, $request);
     $adjustment->save;

sql/changes/1.14/inventory_report-report_date.sql

@@ -0,0 +1,3 @@
+
+alter table inventory_report
+  rename column transdate to report_date;

sql/changes/LOADORDER

@@ -187,3 +187,4 @@ mc/delete-migration-validation-data.sql
 1.14/non-gl-transactions.sql
 1.14/centralized-transdate.sql
 1.14/mv-gl_person_id.sql
+1.14/inventory_report-report_date.sql

sql/modules/Goods.sql

@@ -322,11 +322,11 @@ SELECT oe.transdate,
    GROUP BY p.id, p.partnumber;
 $$;
 
-CREATE OR REPLACE FUNCTION inventory_adjust__create(in_transdate date)
+CREATE OR REPLACE FUNCTION inventory_adjust__create(in_report_date date)
 RETURNS inventory_report
 AS
 $$
-        INSERT INTO inventory_report(transdate) values (in_transdate)
+        INSERT INTO inventory_report(report_date) values (in_report_date)
         RETURNING *;
 $$ language sql;
 
@@ -335,15 +335,15 @@ CREATE OR REPLACE FUNCTION inventory_adjust__search
 RETURNS SETOF inventory_report AS
 $$
 
-   SELECT r.id, r.transdate, r.source, r.trans_id
+   SELECT r.id, r.report_date, r.source, r.trans_id
      FROM inventory_report r
   LEFT JOIN inventory_report_line l ON l.adjust_id = r.id
      JOIN parts p ON l.parts_id = p.id
-    WHERE ($1 is null or $1 <= r.transdate) AND
-          ($2 is null OR $2 >= r.transdate) AND
+    WHERE ($1 is null or $1 <= r.report_date) AND
+          ($2 is null OR $2 >= r.report_date) AND
           ($3 IS NULL OR plainto_tsquery($3) @@ tsvector(p.partnumber)) AND
           ($4 IS NULL OR source LIKE $4 || '%')
- GROUP BY r.id, r.transdate, r.source, r.trans_id;
+ GROUP BY r.id, r.report_date, r.source, r.trans_id;
 $$ LANGUAGE SQL;
 
 CREATE OR REPLACE FUNCTION inventory_adjust__save_line
@@ -359,11 +359,11 @@ RETURNING *;
 $$;
 
 CREATE OR REPLACE FUNCTION inventory_adjust__save_info
-(in_transdate date, in_source text)
+(in_report_date date, in_source text)
 RETURNS inventory_report
 LANGUAGE SQL AS
 $$
-INSERT INTO inventory_report(transdate, source)
+INSERT INTO inventory_report(report_date, source)
 VALUES ($1, $2)
 RETURNING *;
 $$;
@@ -394,7 +394,7 @@ END IF;
     trans_type_code, table_name)
   VALUES (nextval('id'),
           'Transaction due to approval of inventory adjustment',
-          inv.transdate, 'invadj-' || in_id, true,
+          inv.report_date, 'invadj-' || in_id, true,
           'ia', 'inventory_report')
     RETURNING id INTO t_trans_id;
 
@@ -468,8 +468,8 @@ CREATE OR REPLACE FUNCTION inventory_adjust__list
 RETURNS SETOF inventory_report language sql as $$
 
 SELECT * FROM inventory_report
- WHERE ($1 is null or transdate >= $1)
-       AND ($2 IS NULL OR transdate <= $2)
+ WHERE ($1 is null or report_date >= $1)
+       AND ($2 IS NULL OR report_date <= $2)
        AND ($3 IS NULL OR $3 = (trans_id IS NOT NULL));
 
 $$;

xt/42-goods.pg

@@ -153,7 +153,7 @@ BEGIN;
     INSERT INTO invoice (id, trans_id, parts_id, qty, allocated, sellprice)
     VALUES (-1103, -1103, -2, -150, 75, 9);
 
-    INSERT INTO inventory_report (transdate) VALUES (now()::date);
+    INSERT INTO inventory_report (report_date) VALUES (now()::date);
 
     -- LedgerSMB::Inventory::Adjust_Line defines variance as:
     --   counted - expected
@@ -234,7 +234,7 @@ BEGIN;
 
     -- Above, we created a report with adjustments both ways.
     -- Create one which only goes one way (leaving out the ar or ap transaction)
-    INSERT INTO inventory_report (transdate) VALUES (now()::date);
+    INSERT INTO inventory_report (report_date) VALUES (now()::date);
     SELECT inventory_adjust__save_line(currval('inventory_report_id_seq')::int,
                                 -1, 100, 90, 10);
     SELECT inventory_adjust__approve(currval('inventory_report_id_seq')::int);