| . $locale->text('From') . qq| |
$button1
@@ -1410,7 +1467,12 @@ sub search {
| . $locale->text('Include in Report') . qq| |
- $openclosed
+
+
+ |
+
+ |
+
$delivered
@@ -1426,6 +1488,7 @@ sub search {
| $employee |
|
. $locale->text('Ship via') . qq| |
+ $employee |
|
@@ -1434,6 +1497,8 @@ sub search {
. $locale->text('Tax') . qq| |
|
. $locale->text('Total') . qq| |
+ |
+ . $locale->text('Project Number') . qq| |
|
@@ -1452,7 +1517,6 @@ $jsscript
-{path}>
{login}>
{password}>
{vc}>
@@ -1486,7 +1550,7 @@ sub orders {
# construct href
$href =
- "$form->{script}?path=$form->{path}&action=orders&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&transdatefrom=$form->{transdatefrom}&transdateto=$form->{transdateto}&open=$form->{open}&closed=$form->{closed}¬delivered=$form->{notdelivered}&delivered=$form->{delivered}&$ordnumber=$number&$form->{vc}=$name&department=$department";
+ "$form->{script}?action=orders&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&transdatefrom=$form->{transdatefrom}&transdateto=$form->{transdateto}&open=$form->{open}&closed=$form->{closed}¬delivered=$form->{notdelivered}&delivered=$form->{delivered}&$ordnumber=$number&$form->{vc}=$name&department=$department";
# construct callback
$number = $form->escape($form->{$ordnumber}, 1);
@@ -1494,13 +1558,13 @@ sub orders {
$department = $form->escape($form->{department}, 1);
$callback =
- "$form->{script}?path=$form->{path}&action=orders&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&transdatefrom=$form->{transdatefrom}&transdateto=$form->{transdateto}&open=$form->{open}&closed=$form->{closed}¬delivered=$form->{notdelivered}&delivered=$form->{delivered}&$ordnumber=$number&$form->{vc}=$name&department=$department";
+ "$form->{script}?action=orders&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&transdatefrom=$form->{transdatefrom}&transdateto=$form->{transdateto}&open=$form->{open}&closed=$form->{closed}¬delivered=$form->{notdelivered}&delivered=$form->{delivered}&$ordnumber=$number&$form->{vc}=$name&department=$department";
@columns =
$form->sort_columns("transdate", "reqdate", "id", "$ordnumber",
"name", "netamount", "tax", "amount",
- "curr", "employee", "shipvia", "open",
- "closed", "delivered");
+ "curr", "employee", "shipvia", "globalprojectnumber",
+ "open", "closed", "delivered");
$form->{l_open} = $form->{l_closed} = "Y"
if ($form->{open} && $form->{closed});
@@ -1540,11 +1604,10 @@ sub orders {
if ($form->{vc} eq 'customer') {
if ($form->{type} eq 'sales_order') {
$form->{title} = $locale->text('Sales Orders');
- $employee = $locale->text('Salesperson');
} else {
$form->{title} = $locale->text('Quotations');
- $employee = $locale->text('Employee');
}
+ $employee = $locale->text('Employee');
$name = $locale->text('Customer');
}
@@ -1584,6 +1647,8 @@ sub orders {
qq| | |
. $locale->text('Ship via')
. qq| | |;
+ $column_header{globalprojectnumber} =
+ qq|| . $locale->text('Project Number') . qq| | |;
$column_header{open} =
qq|| . $locale->text('O') . qq| | |;
$column_header{closed} =
@@ -1689,17 +1754,18 @@ sub orders {
$subtotalamount += $oe->{amount};
$column_data{ids} =
- qq| | |;
+ qq| | |;
$column_data{id} = "$oe->{id} | ";
$column_data{transdate} = "$oe->{transdate} | ";
$column_data{reqdate} = "$oe->{reqdate} | ";
$column_data{$ordnumber} =
- "{path}&action=$action&type=$form->{type}&id=$oe->{id}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&callback=$callback_escaped>$oe->{$ordnumber} | ";
+ "{type}&id=$oe->{id}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&callback=$callback_escaped>$oe->{$ordnumber} | ";
$column_data{name} = "$oe->{name} | ";
$column_data{employee} = "$oe->{employee} | ";
$column_data{shipvia} = "$oe->{shipvia} | ";
+ $column_data{globalprojectnumber} = "" . H($oe->{globalprojectnumber}) . " | ";
if ($oe->{closed}) {
$column_data{closed} = "X | ";
@@ -1762,7 +1828,6 @@ sub orders {
if ($form->{type} =~ /sales_order/) {
print qq|
-
@@ -1785,7 +1850,6 @@ sub orders {
{type}>
{vc}>
-{path}>
{login}>
{password}>
@@ -1899,10 +1963,18 @@ sub save_and_close {
relink_accounts();
- $form->redirect(
- $form->{label} . " $form->{$ordnumber} " . $locale->text('saved!'))
- if (OE->save(\%myconfig, \%$form));
- $form->error($err);
+ $form->error($err) if (!OE->save(\%myconfig, \%$form));
+
+ # saving the history
+ if(!exists $form->{addition}) {
+ $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
+ $form->{addition} = "SAVED";
+ $form->save_history($form->dbconnect(\%myconfig));
+ }
+ # /saving the history
+
+ $form->redirect($form->{label} . " $form->{$ordnumber} " .
+ $locale->text('saved!'));
$lxdebug->leave_sub();
}
@@ -1974,6 +2046,15 @@ sub save {
relink_accounts();
OE->save(\%myconfig, \%$form);
+
+ # saving the history
+ if(!exists $form->{addition}) {
+ $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
+ $form->{addition} = "SAVED";
+ $form->save_history($form->dbconnect(\%myconfig));
+ }
+ # /saving the history
+
$form->{simple_save} = 1;
if(!$form->{print_and_save}) {
set_headings("edit");
@@ -2036,8 +2117,16 @@ sub yes {
$msg = $locale->text('Quotation deleted!');
$err = $locale->text('Cannot delete quotation!');
}
-
- $form->redirect($msg) if (OE->delete(\%myconfig, \%$form, $spool));
+ if (OE->delete(\%myconfig, \%$form, $spool)){
+ $form->redirect($msg);
+ # saving the history
+ if(!exists $form->{addition}) {
+ $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
+ $form->{addition} = "DELETED";
+ $form->save_history($form->dbconnect(\%myconfig));
+ }
+ # /saving the history
+ }
$form->error($err);
$lxdebug->leave_sub();
@@ -2051,11 +2140,9 @@ sub invoice {
# these checks only apply if the items don't bring their own ordnumbers/transdates.
# The if clause ensures that by searching for empty ordnumber_#/transdate_# fields.
$form->isblank("ordnumber", $locale->text('Order Number missing!'))
- if (+{ map { $form->{"ordnumber_$_"}, 1 } (1 .. $form->{rowcount} - 1) }
- ->{''});
+ if (+{ map { $form->{"ordnumber_$_"}, 1 } (1 .. $form->{rowcount} - 1) }->{''});
$form->isblank("transdate", $locale->text('Order Date missing!'))
- if (+{ map { $form->{"transdate_$_"}, 1 } (1 .. $form->{rowcount} - 1) }
- ->{''});
+ if (+{ map { $form->{"transdate_$_"}, 1 } (1 .. $form->{rowcount} - 1) }->{''});
# also copy deliverydate from the order
$form->{deliverydate} = $form->{reqdate} if $form->{reqdate};
@@ -2148,7 +2235,7 @@ sub invoice {
# locale messages
$locale = new Locale "$myconfig{countrycode}", "$script";
- require "$form->{path}/$form->{script}";
+ require "bin/mozilla/$form->{script}";
map { $form->{"select$_"} = "" } ($form->{vc}, currency);
@@ -2229,7 +2316,6 @@ sub backorder_exchangerate {
print qq|
-{path}>
{login}>
{password}>
@@ -2360,7 +2446,15 @@ sub save_as_new {
$form->{saveasnew} = 1;
$form->{closed} = 0;
- map { delete $form->{$_} } qw(printed emailed queued ordnumber quonumber);
+ map { delete $form->{$_} } qw(printed emailed queued);
+
+ # Let Lx-Office assign a new order number if the user hasn't changed the
+ # previous one. If it has been changed manually then use it as-is.
+ my $idx = $form->{type} =~ /_quotation$/ ? "quonumber" : "ordnumber";
+ if ($form->{saved_xyznumber} &&
+ ($form->{saved_xyznumber} eq $form->{$idx})) {
+ delete($form->{$idx});
+ }
&save;
@@ -2375,6 +2469,10 @@ sub purchase_order {
OE->close_order(\%myconfig, \%$form);
}
+ if ($form->{type} =~ /^sales_/) {
+ delete($form->{ordnumber});
+ }
+
$form->{cp_id} *= 1;
$form->{title} = $locale->text('Add Purchase Order');
@@ -2394,6 +2492,10 @@ sub sales_order {
OE->close_order(\%myconfig, $form);
}
+ if ($form->{type} eq "purchase_order") {
+ delete($form->{ordnumber});
+ }
+
$form->{cp_id} *= 1;
$form->{title} = $locale->text('Add Sales Order');
@@ -2442,3 +2544,26 @@ sub poso {
$lxdebug->leave_sub();
}
+sub e_mail {
+ $lxdebug->enter_sub();
+
+ $form->{print_and_save} = 1;
+
+ if (!$form->{id}) {
+ $print_post = 1;
+
+ my $saved_form = save_form();
+
+ save();
+
+ my %saved_vars;
+ map({ $saved_vars{$_} = $form->{$_}; } qw(id ordnumber quonumber));
+ restore_form($saved_form);
+ map({ $form->{$_} = $saved_vars{$_}; } qw(id ordnumber quonumber));
+ }
+
+ edit_e_mail();
+
+ $lxdebug->leave_sub();
+}
+
|