Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision bb7e2e85

Von Moritz Bunkus vor mehr als 10 Jahren hinzugefügt

  • ID bb7e2e85d50544c6b72eb40d57f513eeacf578d5
  • Vorgänger fff57e55
  • Nachfolger 6ee486a5

Lieferscheine -> Rechnungen wandeln: Lieferscheinnummer in jeder Rechnungsposition speichern

Dies geschieht analog zu invoice.ordnumber als invoice.donumber. In
Druckvorlagen steht sie als Variable donumber_do zur Verfügung (auch
dies angelehnt an invoice.ordnumber, die als ordnumber_oe zur
Verfügung steht).

Unterschiede anzeigen:

SL/IS.pm
149 149

  
150 150
  my @arrays =
151 151
    qw(runningnumber number description longdescription qty ship unit bin
152
       deliverydate_oe ordnumber_oe transdate_oe validuntil
152
       deliverydate_oe ordnumber_oe donumber_do transdate_oe validuntil
153 153
       partnotes serialnumber reqdate sellprice listprice netprice
154 154
       discount p_discount discount_sub nodiscount_sub
155 155
       linetotal  nodiscount_linetotal tax_rate projectnumber projectdescription
......
210 210
      push @{ $form->{TEMPLATE_ARRAYS}->{sellprice} },         $form->{"sellprice_$i"};
211 211
      push @{ $form->{TEMPLATE_ARRAYS}->{sellprice_nofmt} },   $form->parse_amount($myconfig, $form->{"sellprice_$i"});
212 212
      push @{ $form->{TEMPLATE_ARRAYS}->{ordnumber_oe} },      $form->{"ordnumber_$i"};
213
      push @{ $form->{TEMPLATE_ARRAYS}->{donumber_do} },       $form->{"donumber_$i"};
213 214
      push @{ $form->{TEMPLATE_ARRAYS}->{transdate_oe} },      $form->{"transdate_$i"};
214 215
      push @{ $form->{TEMPLATE_ARRAYS}->{invnumber} },         $form->{"invnumber"};
215 216
      push @{ $form->{TEMPLATE_ARRAYS}->{invdate} },           $form->{"invdate"};
......
741 742
        qq|INSERT INTO invoice (id, trans_id, parts_id, description, longdescription, qty,
742 743
                                sellprice, fxsellprice, discount, allocated, assemblyitem,
743 744
                                unit, deliverydate, project_id, serialnumber, pricegroup_id,
744
                                ordnumber, transdate, cusordnumber, base_qty, subtotal,
745
                                ordnumber, donumber, transdate, cusordnumber, base_qty, subtotal,
745 746
                                marge_percent, marge_total, lastcost,
746 747
                                price_factor_id, price_factor, marge_price_factor)
747
           VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
748
           VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
748 749
                   (SELECT factor FROM price_factors WHERE id = ?), ?)|;
749 750

  
750 751
      @values = ($invoice_id, conv_i($form->{id}), conv_i($form->{"id_$i"}),
......
753 754
                 $form->{"discount_$i"}, $allocated, 'f',
754 755
                 $form->{"unit_$i"}, conv_date($form->{"reqdate_$i"}), conv_i($form->{"project_id_$i"}),
755 756
                 $form->{"serialnumber_$i"}, $pricegroup_id,
756
                 $form->{"ordnumber_$i"}, conv_date($form->{"transdate_$i"}),
757
                 $form->{"ordnumber_$i"}, $form->{"donumber_$i"}, conv_date($form->{"transdate_$i"}),
757 758
                 $form->{"cusordnumber_$i"}, $baseqty, $form->{"subtotal_$i"} ? 't' : 'f',
758 759
                 $form->{"marge_percent_$i"}, $form->{"marge_absolut_$i"},
759 760
                 $form->{"lastcost_$i"},
......
1652 1653

  
1653 1654
           i.id AS invoice_id,
1654 1655
           i.description, i.longdescription, i.qty, i.fxsellprice AS sellprice, i.discount, i.parts_id AS id, i.unit, i.deliverydate AS reqdate,
1655
           i.project_id, i.serialnumber, i.id AS invoice_pos, i.pricegroup_id, i.ordnumber, i.transdate, i.cusordnumber, i.subtotal, i.lastcost,
1656
           i.project_id, i.serialnumber, i.id AS invoice_pos, i.pricegroup_id, i.ordnumber, i.donumber, i.transdate, i.cusordnumber, i.subtotal, i.lastcost,
1656 1657
           i.price_factor_id, i.price_factor, i.marge_price_factor,
1657 1658
           p.partnumber, p.assembly, p.notes AS partnotes, p.inventory_accno_id AS part_inventory_accno_id, p.formel, p.listprice,
1658 1659
           pr.projectnumber, pg.partsgroup, prg.pricegroup

Auch abrufbar als: Unified diff