Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 041a8bb7

Von Stephan Köhler vor fast 19 Jahren hinzugefügt

  • ID 041a8bb77df72193d039f511707a58eef62e31c3
  • Vorgänger f4f458e9
  • Nachfolger 828ffa42

Merge von 690 aus unstable: Sammelauftraege und DB-Schema
DB-Schema geaendert um in invoice und orderitems die Variablen ordnumber_$i, transdate_$i, cusordnumber_$i zu speichern.
Speichern/Laden von Auftraegen und Buchen/Laden von Rechnungen modifiziert um diese Variablen zu halten.

Unterschiede anzeigen:

SL/IS.pm
561 561
      # save detail record in invoice table
562 562
      $query = qq|INSERT INTO invoice (trans_id, parts_id, description, qty,
563 563
                  sellprice, fxsellprice, discount, allocated, assemblyitem,
564
		  unit, deliverydate, project_id, serialnumber, pricegroup_id)
564
		  unit, deliverydate, project_id, serialnumber, pricegroup_id,
565
		  ordnumber, transdate, cusordnumber)
565 566
		  VALUES ($form->{id}, $form->{"id_$i"},
566 567
		  '$form->{"description_$i"}', $form->{"qty_$i"},
567 568
		  $form->{"sellprice_$i"}, $fxsellprice,
568 569
		  $form->{"discount_$i"}, $allocated, 'f',
569 570
		  '$form->{"unit_$i"}', $deliverydate, (SELECT id from project where projectnumber = '$project_id'),
570
		  '$form->{"serialnumber_$i"}',
571
      '$pricegroup_id')|;
571
		  '$form->{"serialnumber_$i"}', '$pricegroup_id',
572
		  '$form->{"ordnumber_$i"}', '$form->{"transdate_$i"}', '$form->{"cusordnumber_$i"}')|;
572 573
      $dbh->do($query) || $form->dberror($query);
573 574

  
574 575
      if ($form->{lizenzen}) {
......
1221 1222
		i.discount, i.parts_id AS id, i.unit, i.deliverydate,
1222 1223
		i.project_id, pr.projectnumber, i.serialnumber,
1223 1224
		p.partnumber, p.assembly, p.bin, p.notes AS partnotes, i.id AS invoice_pos,
1224
		pg.partsgroup, i.pricegroup_id, (SELECT pricegroup FROM pricegroup WHERE id=i.pricegroup_id) as pricegroup
1225
		pg.partsgroup, i.pricegroup_id, (SELECT pricegroup FROM pricegroup WHERE id=i.pricegroup_id) as pricegroup,
1226
		i.ordnumber, i.transdate, i.cusordnumber
1225 1227
		FROM invoice i
1226 1228
	        JOIN parts p ON (i.parts_id = p.id)
1227 1229
	        LEFT JOIN project pr ON (i.project_id = pr.id)
SL/OE.pm
319 319
      $query = qq|INSERT INTO orderitems (|;
320 320
      $query .= "id, " if $form->{"orderitems_id_$i"};
321 321
      $query .= qq|trans_id, parts_id, description, qty, sellprice, discount,
322
		   unit, reqdate, project_id, serialnumber, ship, pricegroup_id)
322
		   unit, reqdate, project_id, serialnumber, ship, pricegroup_id,
323
		   ordnumber, transdate, cusordnumber)
323 324
                   VALUES (|;
324 325
      $query .= qq|$form->{"orderitems_id_$i"},|
325 326
        if $form->{"orderitems_id_$i"};
......
327 328
		   '$form->{"description_$i"}', $form->{"qty_$i"},
328 329
		   $fxsellprice, $form->{"discount_$i"},
329 330
		   '$form->{"unit_$i"}', $reqdate, (SELECT id from project where projectnumber = '$project_id'),
330
		   '$form->{"serialnumber_$i"}', $form->{"ship_$i"},
331
       '$pricegroup_id')|;
331
		   '$form->{"serialnumber_$i"}', $form->{"ship_$i"}, '$pricegroup_id',
332
		   '$form->{"ordnumber_$i"}', '$form->{"transdate_$i"}', '$form->{"cusordnumber_$i"}')|;
332 333
      $dbh->do($query) || $form->dberror($query);
333 334

  
334 335
      $form->{"sellprice_$i"} = $fxsellprice;
......
577 578
  # connect to database
578 579
  my $dbh = $form->dbconnect_noauto($myconfig);
579 580

  
580
  my $query;
581
  my $query, @ids;
581 582

  
582 583
  # translate the ids (given by id_# and trans_id_#) into one array of ids, so we can join them later
583 584
  map { push @ids, $form->{"trans_id_$_"} if ($form->{"id_$_"}) } (1 .. $form->{"rowcount"});
......
703 704
                c1.accno AS inventory_accno,
704 705
                c2.accno AS income_accno,
705 706
		c3.accno AS expense_accno,
706
		oe.ordnumber, oe.transdate, oe.cusordnumber, 
707
		oe.ordnumber AS ordnumber_oe, oe.transdate AS transdate_oe, oe.cusordnumber AS cusordnumber_oe, 
707 708
                p.partnumber, p.assembly, o.description, o.qty,
708 709
		o.sellprice, o.parts_id AS id, o.unit, o.discount, p.bin, p.notes AS partnotes,
709 710
                o.reqdate, o.project_id, o.serialnumber, o.ship,
711
		o.ordnumber, o.transdate, o.cusordnumber,
710 712
		pr.projectnumber,
711 713
		pg.partsgroup, o.pricegroup_id, (SELECT pricegroup FROM pricegroup WHERE id=o.pricegroup_id) as pricegroup
712 714
		FROM orderitems o
......
727 729
    $sth->execute || $form->dberror($query);
728 730

  
729 731
    while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
732
     
733
      # in collective order, copy global ordnumber, transdate, cusordnumber into item scope
734
      #   unless already present there 
735
      # remove _oe entries afterwards
736
      map { $ref->{$_} = $ref->{"${_}_oe"} if ($ref->{$_} eq '') }
737
        qw|ordnumber transdate cusordnumber| if (@ids);
738
      map{ delete $ref->{$_} } 
739
        qw|ordnumber_oe transdate_oe cusordnumber_oe|;
730 740

  
731 741
      #set expense_accno=inventory_accno if they are different => bilanz
732 742
      $vendor_accno =
sql/Pg-upgrade-2.1.1-2.1.2.sql
67 67
update invoice set fxsellprice=fxsellpriceold;
68 68
alter table invoice drop column fxsellpriceold;
69 69
--
70
alter table invoice add column ordnumber text;
71
alter table invoice add column transdate text;
72
alter table invoice add column cusordnumber text;
73
--
70 74
--TABLE oe
71 75
alter table oe rename column amount to amountold;
72 76
alter table oe add column amount numeric(15,5);
......
84 88
update orderitems set sellprice=sellpriceold;
85 89
alter table orderitems drop column sellpriceold;
86 90
--
91
alter table orderitems add column ordnumber text;
92
alter table orderitems add column transdate text;
93
alter table orderitems add column cusordnumber text;
94
--
87 95
--TABLE parts
88 96
alter table parts rename column listprice to listpriceold;
89 97
alter table parts add column listprice numeric(15,5);
sql/lx-office.sql
161 161
	"serialnumber" text,
162 162
        "itime" timestamp DEFAULT now(),
163 163
        "mtime" timestamp,
164
        "pricegroup_id" integer
164
        "pricegroup_id" integer,
165
        "ordnumber" text,
166
        "transdate" text,
167
        "cusordnumber" text
165 168
);
166 169

  
167 170
CREATE TABLE "vendor" (
......
397 400
	"id" integer DEFAULT nextval('orderitemsid'::text) PRIMARY KEY,
398 401
        "itime" timestamp DEFAULT now(),
399 402
        "mtime" timestamp,
400
        "pricegroup_id" integer
403
        "pricegroup_id" integer,
404
        "ordnumber" text,
405
        "transdate" text,
406
        "cusordnumber" text
401 407
);
402 408

  
403 409
CREATE TABLE "exchangerate" (

Auch abrufbar als: Unified diff