Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 435a5be5

Von Philip Reetz vor mehr als 19 Jahren hinzugefügt

  • ID 435a5be586488ee4700b0a4fed0c91b5a5e1abfb
  • Vorgänger a8641442
  • Nachfolger 398a270c

Bug Nr 190 geloest. Abteilung1 und 2 wurden bei der Lieferadresse nicht beruecksichtigt

Unterschiede anzeigen:

SL/Form.pm
##LINET
my $shipto;
foreach
my $item (qw(name street zipcode city country contact phone fax email)) {
my $item (qw(name department_1 department_2 street zipcode city country contact phone fax email)) {
if ($self->{"shipto$item"}) {
$shipto = 1 if ($self->{$item} ne $self->{"shipto$item"});
}
......
}
if ($shipto) {
my $query = qq|INSERT INTO shipto (trans_id, shiptoname, shiptostreet,
my $query = qq|INSERT INTO shipto (trans_id, shiptoname, shiptodepartment_1, shiptodepartment_2, shiptostreet,
shiptozipcode, shiptocity, shiptocountry, shiptocontact,
shiptophone, shiptofax, shiptoemail) VALUES ($id,
'$self->{shiptoname}', '$self->{shiptostreet}',
'$self->{shiptoname}', '$self->{shiptodepartment_1}', '$self->{shiptodepartment_2}', '$self->{shiptostreet}',
'$self->{shiptozipcode}', '$self->{shiptocity}',
'$self->{shiptocountry}', '$self->{shiptocontact}',
'$self->{shiptophone}', '$self->{shiptofax}',
SL/IS.pm
# get shipto if we did not converted an order or invoice
if (!$form->{shipto}) {
map { delete $form->{$_} }
qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact shiptophone shiptofax shiptoemail);
qw(shiptoname shiptodepartment_1 shiptodepartment_2 shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact shiptophone shiptofax shiptoemail);
$query = qq|SELECT s.* FROM shipto s
WHERE s.trans_id = $form->{customer_id}|;
sql/Pg-upgrade-2.1.1-2.1.2.sql
alter table customer add column salesman_id integer;
alter table vendor add column salesman_id integer;
-- Shipto
alter table shipto add column shiptodepartment_1 varchar(75);
alter table shipto add column shiptodepartment_2 varchar(75);
-- Addon for business
alter table business add column salesman boolean;
alter table business alter column salesman set default 'false';
sql/lx-office.sql
CREATE TABLE "shipto" (
"trans_id" integer,
"shiptoname" character varying(75),
"shiptodepartment_1" character varying(75),
"shiptodepartment_2" character varying(75),
"shiptostreet" character varying(75),
"shiptozipcode" character varying(75),
"shiptocity" character varying(75),

Auch abrufbar als: Unified diff