Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 435a5be5

Von Philip Reetz vor fast 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
1253 1253
##LINET
1254 1254
  my $shipto;
1255 1255
  foreach
1256
    my $item (qw(name street zipcode city country contact phone fax email)) {
1256
    my $item (qw(name department_1 department_2 street zipcode city country contact phone fax email)) {
1257 1257
    if ($self->{"shipto$item"}) {
1258 1258
      $shipto = 1 if ($self->{$item} ne $self->{"shipto$item"});
1259 1259
    }
......
1261 1261
  }
1262 1262

  
1263 1263
  if ($shipto) {
1264
    my $query = qq|INSERT INTO shipto (trans_id, shiptoname, shiptostreet,
1264
    my $query = qq|INSERT INTO shipto (trans_id, shiptoname, shiptodepartment_1, shiptodepartment_2, shiptostreet,
1265 1265
                   shiptozipcode, shiptocity, shiptocountry, shiptocontact,
1266 1266
		   shiptophone, shiptofax, shiptoemail) VALUES ($id,
1267
		   '$self->{shiptoname}', '$self->{shiptostreet}',
1267
		   '$self->{shiptoname}', '$self->{shiptodepartment_1}', '$self->{shiptodepartment_2}', '$self->{shiptostreet}',
1268 1268
		   '$self->{shiptozipcode}', '$self->{shiptocity}',
1269 1269
		   '$self->{shiptocountry}', '$self->{shiptocontact}',
1270 1270
		   '$self->{shiptophone}', '$self->{shiptofax}',
SL/IS.pm
1357 1357
  # get shipto if we did not converted an order or invoice
1358 1358
  if (!$form->{shipto}) {
1359 1359
    map { delete $form->{$_} }
1360
      qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact shiptophone shiptofax shiptoemail);
1360
      qw(shiptoname shiptodepartment_1 shiptodepartment_2 shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact shiptophone shiptofax shiptoemail);
1361 1361

  
1362 1362
    $query = qq|SELECT s.* FROM shipto s
1363 1363
                WHERE s.trans_id = $form->{customer_id}|;
sql/Pg-upgrade-2.1.1-2.1.2.sql
128 128
alter table customer add column salesman_id integer;
129 129
alter table vendor add column salesman_id integer;
130 130

  
131
-- Shipto
132
alter table shipto add column shiptodepartment_1 varchar(75);
133
alter table shipto add column shiptodepartment_2 varchar(75);
134

  
131 135
-- Addon for business
132 136
alter table business add column salesman boolean;
133 137
alter table business alter column salesman set default 'false';
sql/lx-office.sql
417 417
CREATE TABLE "shipto" (
418 418
	"trans_id" integer,
419 419
	"shiptoname" character varying(75),
420
        "shiptodepartment_1" character varying(75),
421
        "shiptodepartment_2" character varying(75),
420 422
	"shiptostreet" character varying(75),
421 423
	"shiptozipcode" character varying(75),
422 424
	"shiptocity" character varying(75),

Auch abrufbar als: Unified diff