Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 92daa1a6

Von Moritz Bunkus vor mehr als 18 Jahren hinzugefügt

  • ID 92daa1a66a9ff737c92df86da3c28d663c421032
  • Vorgänger 9c51e3d4
  • Nachfolger da1893cd

Alu-Funktion aus Kundenprojekt entfernt.

Unterschiede anzeigen:

SL/IC.pm
$form->{onhand} *= 1;
$form->{ve} *= 1;
$form->{ge} *= 1;
$form->{alu} *= 1;
$form->{buchungsgruppen_id} *= 1;
$form->{not_discountable} *= 1;
$form->{payment_id} *= 1;
......
shop = '$form->{shop}',
ve = '$form->{ve}',
gv = '$form->{gv}',
alu = '$form->{alu}',
not_discountable = '$form->{not_discountable}',
microfiche = '$form->{microfiche}',
partsgroup_id = $partsgroup_id
SL/IR.pm
c2.accno AS income_accno, c2.new_chart_id AS income_new_chart, date($transdate) - c2.valid_from as income_valid,
c3.accno AS expense_accno, c3.new_chart_id AS expense_new_chart, date($transdate) - c3.valid_from as expense_valid,
p.unit, p.assembly, p.bin, p.onhand, p.notes AS partnotes, p.notes AS longdescription, p.not_discountable,
pg.partsgroup, p.formel, p.alu
pg.partsgroup, p.formel
FROM parts p
LEFT JOIN chart c1 ON ((select inventory_accno_id from buchungsgruppen where id=p.buchungsgruppen_id) = c1.id)
LEFT JOIN chart c2 ON ((select income_accno_id_$form->{taxzone_id} from buchungsgruppen where id=p.buchungsgruppen_id) = c2.id)
SL/IS.pm
i.project_id, pr.projectnumber, i.serialnumber,
p.partnumber, p.assembly, p.bin, p.notes AS partnotes, p.inventory_accno_id AS part_inventory_accno_id, i.id AS invoice_pos,
pg.partsgroup, i.pricegroup_id, (SELECT pricegroup FROM pricegroup WHERE id=i.pricegroup_id) as pricegroup,
i.ordnumber, i.transdate, i.cusordnumber, p.alu, p.formel, i.subtotal
i.ordnumber, i.transdate, i.cusordnumber, p.formel, i.subtotal
FROM invoice i
JOIN parts p ON (i.parts_id = p.id)
LEFT JOIN project pr ON (i.project_id = pr.id)
......
c2.accno AS income_accno, c2.new_chart_id AS income_new_chart, date($transdate) - c2.valid_from as income_valid,
c3.accno AS expense_accno, c3.new_chart_id AS expense_new_chart, date($transdate) - c3.valid_from as expense_valid,
p.unit, p.assembly, p.bin, p.onhand, p.notes AS partnotes, p.notes AS longdescription, p.not_discountable,
pg.partsgroup, p.formel, p.alu, p.payment_id AS part_payment_id
pg.partsgroup, p.formel, p.payment_id AS part_payment_id
FROM parts p
LEFT JOIN chart c1 ON ((select inventory_accno_id from buchungsgruppen where id=p.buchungsgruppen_id) = c1.id)
LEFT JOIN chart c2 ON ((select income_accno_id_$form->{taxzone_id} from buchungsgruppen where id=p.buchungsgruppen_id) = c2.id)
SL/OE.pm
o.sellprice, o.parts_id AS id, o.unit, o.discount, p.bin, p.notes AS partnotes, p.inventory_accno_id AS part_inventory_accno_id,
o.reqdate, o.project_id, o.serialnumber, o.ship,
o.ordnumber, o.transdate, o.cusordnumber, o.subtotal, o.longdescription,
pr.projectnumber, p.alu, p.formel,
pr.projectnumber, p.formel,
pg.partsgroup, o.pricegroup_id, (SELECT pricegroup FROM pricegroup WHERE id=o.pricegroup_id) as pricegroup
FROM orderitems o
JOIN parts p ON (o.parts_id = p.id)
bin/mozilla/common.pl
$lxdebug->leave_sub();
}
sub calculate_alu {
$lxdebug->enter_sub();
my ($length, $weight) = split /\r\n/,$form->{formel};
map({ $form->{$_} = "" } (qw(qty_alu price_alu total_alu qty_eloxal price_eloxal total_eloxal total)));
if ($form->{description} =~ /.*Alupreisberechnung.*/) {
$form->{description} =~ /.*Alupreisberechnung:\n(.*)kg Aluminiumprofil Einzelpreis: (.*) Gesamt: (.*)\n(.*)m Eloxal Einzelpreis: (.*) Gesamt: (.*)/;
$form->{qty_alu} = $1;
$form->{price_alu} = $2;
$form->{total_alu} = $3;
$form->{qty_eloxal} = $4;
$form->{price_eloxal} = $5;
$form->{total_eloxal} = $6;
$form->{total} = $form->format_amount(\%myconfig, ($form->parse_amount(\%myconfig, $form->{total_alu}) + $form->parse_amount(\%myconfig, $form->{total_eloxal})));
}
($form->{description}, $null) = split /\nAlupreisberechnung/, $form->{description};
my $callback = "$form->{script}?action=vendor_selection&";
map({ $callback .= "$_=" . $form->escape($form->{$_}) . "&" }
(qw(login path password name input_name input_id), grep({ /^[fl]_/ } keys %$form)));
my @header_sort = qw(name customernumber address);
my %header_title = ( "name" => $locale->text("Name"),
"customernumber" => $locale->text("Customer Number"),
"address" => $locale->text("Address"),
);
($null, $form->{weight}) = split / /, $weight;
($null, $form->{length}) = split / /, $length;
$form->{calc_weight} = $form->parse_amount(\%myconfig, $form->{weight});
$form->{calc_length} = $form->parse_amount(\%myconfig, $form->{length});
my @header =
map(+{ "column_title" => $header_title{$_},
"column" => $_,
},
@header_sort);
$form->{"title"} = $locale->text("Enter values for aluminium calculation");
$form->header();
print($form->parse_html_template("generic/calculate_alu"));
$lxdebug->leave_sub();
}
sub set_longdescription {
$lxdebug->enter_sub();
bin/mozilla/ic.pl
<td><input name=gv size=10 value=$form->{gv}></td>
</tr>
|;
$aluok = $form->{alu} == 1 ? "checked" : "";
$alu .= qq|
<tr>
<th align=right nowrap>|
. $locale->text('Aluartikel') . qq|</th>
<td><input class=checkbox type=checkbox name=alu value=1 $aluok></td>
</tr>|;
$notdiscountableok = ($form->{not_discountable}) == 1 ? "checked" : "";
$notdiscountable .= qq|
<tr>
......
|;
$formel =
qq|<ilayer><layer onmouseover="this.T_STICKY=true;this.T_STATIC=true;return escape('| . $locale->text('The formula needs the following syntax:<br>For regular article:<br>Variablename= Variable Unit;<br>Variablename2= Variable2 Unit2;<br>...<br>###<br>Variable + ( Variable2 / Variable )<br><b>Please be beware of the spaces in the formula</b><br><br>For alu article:<br>Length:<br>Weight/m:<br>Length ist total length of article and weight/m ist the weight pro meter') . qq|')"><textarea name=formel rows=4 cols=40 wrap=soft>$form->{formel}</textarea></layer><ilayer>|;
qq|<ilayer><layer onmouseover="this.T_STICKY=true;this.T_STATIC=true;return escape('| . $locale->text('The formula needs the following syntax:<br>For regular article:<br>Variablename= Variable Unit;<br>Variablename2= Variable2 Unit2;<br>...<br>###<br>Variable + ( Variable2 / Variable )<br><b>Please be beware of the spaces in the formula</b><br>') . qq|')"><textarea name=formel rows=4 cols=40 wrap=soft>$form->{formel}</textarea></layer><ilayer>|;
$imagelinks = qq|
<tr>
<td>
......
$notdiscountable
$vegv
$shop
$alu
$obsolete
</table>
</td>
bin/mozilla/io.pl
<input name="new_taxaccounts_$i" type=hidden value="$ref->{taxaccounts}">
<input name="new_partsgroup_$i" type=hidden value="$ref->{partsgroup}">
<input name="new_formel_$i" type=hidden value="$ref->{formel}">
<input name="new_alu_$i" type=hidden value="$ref->{alu}">
<input name="new_longdescription_$i" type=hidden value="$ref->{longdescription}">
<input name="new_not_discountable_$i" type=hidden value="$ref->{not_discountable}">
<input name="new_part_payment_id_$i" type=hidden value="$ref->{part_payment_id}">
......
$sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"});
map { $form->{"${_}_$i"} = $form->{"new_${_}_$j"} }
qw(id partnumber description sellprice listprice inventory_accno income_accno expense_accno bin unit weight assembly taxaccounts partsgroup formel alu longdescription not_discountable);
qw(id partnumber description sellprice listprice inventory_accno income_accno expense_accno bin unit weight assembly taxaccounts partsgroup formel longdescription not_discountable);
if ($form->{"part_payment_id_$i"} ne "") {
$form->{payment_id} = $form->{"part_payment_id_$i"};
}
locale/de/all
'All Accounts' => 'Alle Konten',
'All Datasets up to date!' => 'Alle Datenbanken sind auf aktuellem Stand.',
'All changes in that file have been reverted.' => 'Alle &Auml;nderungen in dieser Datei wurden r&uuml;ckg&auml;ngig gemacht.',
'Aluartikel' => 'Aluartikel',
'Amount' => 'Betrag',
'Amount Due' => 'Betrag f?llig',
'Angaben zum Finanzamt' => 'Angaben zum Finanzamt',
......
'Enforce transaction reversal for all dates' => 'Gegenbuchungen f?r jeden Zeitraum aktualisieren',
'Enter longdescription' => 'Langtext eingeben',
'Enter up to 3 letters separated by a colon (i.e CAD:USD:EUR) for your native and foreign currencies' => 'Geben Sie Ihre und weitere W?hrungen mit bis zu drei Buchstaben pro W?hrung und W?hrungen durch Doppelpunkte getrennt ein (z.B. EUR:USD:CAD)',
'Enter values for aluminium calculation' => 'Werte f&uuml;r Preisberechnung eingeben',
'Equity' => 'Passiva',
'Erl?se Ausland' => 'Erl&ouml;se Ausland',
'Erl?se EU m. UStId' => 'Erl&ouml;se EU m. UStId',
......
'Individual Items' => 'Einzelteile',
'Information' => 'Information',
'Input Number Format' => 'Zahlenformat (Eingabe)',
'Insert quantity and prices below.' => 'Menge und Preise unten eingeben',
'Interest Rate' => 'Zinssatz',
'Internal Notes' => 'interne Bemerkungen',
'Internet' => 'Internet',
......
'Prepayment' => 'Vorauszahlung',
'Preview' => 'Druckvorschau',
'Price' => 'Preis',
'Price Alu:' => 'Preis Alu:',
'Price Eloxal:' => 'Preis Eloxal:',
'Pricegroup' => 'Preisgruppe',
'Pricegroup deleted!' => 'Preisgruppe gel?scht!',
'Pricegroup missing!' => 'Preisgruppe fehlt!',
......
'Purchase Orders' => 'Lieferantenauftr?ge',
'Qty' => 'Menge',
'Quantity' => 'Menge',
'Quantity Alu:' => 'Menge Alu:',
'Quantity Article:' => 'Menge Artikel:',
'Quartal' => 'Quartal',
'Quarter' => 'Quartal',
'Quarterly' => 'quartalsweise',
......
'The following Datasets need to be updated' => 'Folgende Datenbanken m?ssen aktualisiert werden',
'The following units are unknown.' => 'Die folgenden Einheiten sind unbekannt.',
'The following units exist already:' => 'Die folgenden Einheiten existieren bereits:',
'The formula needs the following syntax:<br>For regular article:<br>Variablename= Variable Unit;<br>Variablename2= Variable2 Unit2;<br>...<br>###<br>Variable + ( Variable2 / Variable )<br><b>Please be beware of the spaces in the formula</b><br><br>For alu article:<br>Length:<br>Weight/m:<br>Length ist total length of article and weight/m ist the weight pro meter' => 'Die Formeln m&uuml;ssen in der folgenden Syntax eingegeben werden:<br>Bei normalen Artikeln:<br>Variablenname= Variable Einheit;<br>Variablenname2= Variable2 Einheit2;<br>...<br>###<br>Variable + Variable2 * ( Variable - Variable2 )<br>Bitte achten Sie auf die Leerzeichen in der Formel<br><br>Bei Aluminiumartikeln:<br>L&auml;nge: x<br>Gewicht/m: y<br>x ist die Gesamtl&auml;nge des Artikels in Meter und y das Gewicht pro Meter. Es muss jeweils die Gesamtezeile eingegeben werden',
'The formula needs the following syntax:<br>For regular article:<br>Variablename= Variable Unit;<br>Variablename2= Variable2 Unit2;<br>...<br>###<br>Variable + ( Variable2 / Variable )<br><b>Please be beware of the spaces in the formula</b><br>' => 'Die Formeln m&uuml;ssen in der folgenden Syntax eingegeben werden:<br>Bei normalen Artikeln:<br>Variablenname= Variable Einheit;<br>Variablenname2= Variable2 Einheit2;<br>...<br>###<br>Variable + Variable2 * ( Variable - Variable2 )<br>Bitte achten Sie auf die Leerzeichen in der Formel<br>Es muss jeweils die Gesamte Zeile eingegeben werden',
'The licensing module has been deactivated in lx-erp.conf.' => 'Das Lizenzverwaltungsmodul wurde in lx-erp.conf deaktiviert.',
'The name in row %d has already been used before.' => 'Der Name in Zeile %d wurde vorher bereits benutzt.',
'The name is missing in row %d.' => 'Der Name fehlt in Zeile %d.',
......
'Top 100 hinzufuegen' => 'Top 100 hinzuf?gen',
'Top Level' => 'Hauptartikelbezeichnung',
'Total' => 'Summe',
'Total Alu:' => 'Gesamtpreis Alu:',
'Total Eloxal:' => 'Gesamtpreis Eloxal:',
'Total Fees' => 'Kumulierte Geb?hren',
'Total Interest' => 'Kumulierte Zinsen',
'Total length' => 'Gesamtl&auml;nge des Artikels',
'Total:' => 'Gesamtpreis:',
'Trade Discount' => 'Rabatt',
'Transaction Date missing!' => 'Buchungsdatum fehlt!',
'Transaction deleted!' => 'Buchung gel?scht!',
......
'Warengruppensatz' => '',
'Weight' => 'Gewicht',
'Weight Unit' => 'Gewichtseinheit',
'Weight/m' => 'Gewicht pro Meter',
'What type of item is this?' => 'Was ist dieser Artikel?',
'Workflow purchase_order' => 'Workflow Lieferantenauftrag',
'Workflow request_quotation' => 'Workflow Preisanfrage',
locale/de/common
'Address' => 'Adresse',
'Customer Number' => 'Kundennummer',
'Enter longdescription' => 'Langtext eingeben',
'Enter values for aluminium calculation' => 'Werte f&uuml;r Preisberechnung eingeben',
'Name' => 'Name',
'No Customer was found matching the search parameters.' => 'Zu dem Suchbegriff wurde kein Endkunde gefunden',
'No Vendor was found matching the search parameters.' => 'Zu dem Suchbegriff wurde kein H?ndler gefunden',
......
};
$self{subs} = {
'calculate_alu' => 'calculate_alu',
'calculate_qty' => 'calculate_qty',
'delivery_customer_selection' => 'delivery_customer_selection',
'employee_selection_internal' => 'employee_selection_internal',
locale/de/ic
'Add Request for Quotation' => 'Anfrage erfassen',
'Add Sales Order' => 'Auftrag erfassen',
'Add Service' => 'Dienstleistung erfassen',
'Aluartikel' => 'Aluartikel',
'Apr' => 'Apr',
'April' => 'April',
'Are you sure you want to update the prices' => 'Sind Sie sicher, dass Sie die Preise
......
'Subject' => 'Betreff',
'Subtotal' => 'Zwischensumme',
'TOP100' => 'Top 100',
'The formula needs the following syntax:<br>For regular article:<br>Variablename= Variable Unit;<br>Variablename2= Variable2 Unit2;<br>...<br>###<br>Variable + ( Variable2 / Variable )<br><b>Please be beware of the spaces in the formula</b><br><br>For alu article:<br>Length:<br>Weight/m:<br>Length ist total length of article and weight/m ist the weight pro meter' => 'Die Formeln m&uuml;ssen in der folgenden Syntax eingegeben werden:<br>Bei normalen Artikeln:<br>Variablenname= Variable Einheit;<br>Variablenname2= Variable2 Einheit2;<br>...<br>###<br>Variable + Variable2 * ( Variable - Variable2 )<br>Bitte achten Sie auf die Leerzeichen in der Formel<br><br>Bei Aluminiumartikeln:<br>L&auml;nge: x<br>Gewicht/m: y<br>x ist die Gesamtl&auml;nge des Artikels in Meter und y das Gewicht pro Meter. Es muss jeweils die Gesamtezeile eingegeben werden',
'The formula needs the following syntax:<br>For regular article:<br>Variablename= Variable Unit;<br>Variablename2= Variable2 Unit2;<br>...<br>###<br>Variable + ( Variable2 / Variable )<br><b>Please be beware of the spaces in the formula</b><br>' => 'Die Formeln m&uuml;ssen in der folgenden Syntax eingegeben werden:<br>Bei normalen Artikeln:<br>Variablenname= Variable Einheit;<br>Variablenname2= Variable2 Einheit2;<br>...<br>###<br>Variable + Variable2 * ( Variable - Variable2 )<br>Bitte achten Sie auf die Leerzeichen in der Formel<br>Es muss jeweils die Gesamte Zeile eingegeben werden',
'To' => 'An',
'Top 100' => 'Top 100',
'Top 100 hinzufuegen' => 'Top 100 hinzuf?gen',
sql/Pg-upgrade/Pg-upgrade-2.2.0.26-2.2.0.27.sql
ALTER TABLE parts DROP COLUMN alu;

Auch abrufbar als: Unified diff