projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Volltext-Suche: changelog
[kivitendo-erp.git]
/
SL
/
IC.pm
diff --git
a/SL/IC.pm
b/SL/IC.pm
index
f36ca04
..
2a94607
100644
(file)
--- a/
SL/IC.pm
+++ b/
SL/IC.pm
@@
-524,6
+524,8
@@
sub all_parts {
# simple search for assemblies by items used in assemblies
if ($form->{bom} eq '2' && $form->{l_assembly}) {
# simple search for assemblies by items used in assemblies
if ($form->{bom} eq '2' && $form->{l_assembly}) {
+ # assembly_qty is the column name
+ $form->{l_assembly_qty} = 1;
# nuke where clause and bind vars
$where_clause = ' 1=1 AND p.id in (SELECT id from assembly where parts_id IN ' .
' (select id from parts where 1=1';
# nuke where clause and bind vars
$where_clause = ' 1=1 AND p.id in (SELECT id from assembly where parts_id IN ' .
' (select id from parts where 1=1';
@@
-563,7
+565,7
@@
sub all_parts {
my @assemblies;
if ($form->{l_assembly} && $form->{bom}) {
$query =
my @assemblies;
if ($form->{l_assembly} && $form->{bom}) {
$query =
- qq|SELECT p.id, p.partnumber, p.description, a.qty AS
onhand
,
+ qq|SELECT p.id, p.partnumber, p.description, a.qty AS
assembly_qty
,
p.unit, p.notes, p.itime::DATE as insertdate,
p.sellprice, p.listprice, p.lastcost,
p.rop, p.weight,
p.unit, p.notes, p.itime::DATE as insertdate,
p.sellprice, p.listprice, p.lastcost,
p.rop, p.weight,
@@
-734,7
+736,7
@@
sub retrieve_accounts {
# transdate madness.
my $transdate = "";
# transdate madness.
my $transdate = "";
- if (
($form->{type} eq "invoice") or ($form->{type} eq "credit_note") or ($form->{script} eq 'ir.pl')
) {
+ if (
(any {$form->{type} eq $_} qw(invoice credit_note invoice_for_advance_payment final_invoice)) or ($form->{script} eq 'ir.pl')
) {
# use deliverydate for sales and purchase invoice, if it exists
# also use deliverydate for credit notes
$transdate = $form->{tax_point} || $form->{deliverydate} || $form->{invdate};
# use deliverydate for sales and purchase invoice, if it exists
# also use deliverydate for credit notes
$transdate = $form->{tax_point} || $form->{deliverydate} || $form->{invdate};