projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor fixes in the former files
[fa-stable.git]
/
sales
/
customer_invoice.php
diff --git
a/sales/customer_invoice.php
b/sales/customer_invoice.php
index 51c38d2fad729cebed7a8d8d4addececdfecc8cc..4b40b81de6b59bfeb5743d78548a320de8341f63 100644
(file)
--- a/
sales/customer_invoice.php
+++ b/
sales/customer_invoice.php
@@
-107,12
+107,19
@@
if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) )
$dn->src_docs = $dn->trans_no;
$dn->trans_no = 0;
$dn->reference = references::get_next(10);
$dn->src_docs = $dn->trans_no;
$dn->trans_no = 0;
$dn->reference = references::get_next(10);
+ $dn->due_date = get_invoice_duedate($dn->customer_id, $dn->document_date);
$_SESSION['Items'] = $dn;
copy_from_cart();
} elseif (isset($_GET['ModifyInvoice']) && $_GET['ModifyInvoice'] > 0) {
$_SESSION['Items'] = $dn;
copy_from_cart();
} elseif (isset($_GET['ModifyInvoice']) && $_GET['ModifyInvoice'] > 0) {
+ if ( get_parent_trans(10, $_GET['ModifyInvoice']) == 0) { // 1.xx compatibility hack
+ echo"<center><br><b>" . _("There in no delivery notes for this invoice.<br>
+ Most likely this invoice was created in Front Accounting version prior to 2.0
+ and therefore can not be modified.") . "</b></center>";
+ display_footer_exit();
+ }
processing_start();
$_SESSION['Items'] = new Cart(10, $_GET['ModifyInvoice']);
processing_start();
$_SESSION['Items'] = new Cart(10, $_GET['ModifyInvoice']);
@@
-132,9
+139,9
@@
if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) )
} else {
foreach ($_SESSION['Items']->line_items as $line_no=>$itm) {
if (isset($_POST['Line'.$line_no])) {
} else {
foreach ($_SESSION['Items']->line_items as $line_no=>$itm) {
if (isset($_POST['Line'.$line_no])) {
- $line_qty = $_POST['Line'.$line_no];
- if (is_numeric($line_qty) && $_POST['Line'.$line_no] <= ($itm->quantity - $itm->qty_done)) {
-
$_SESSION['Items']->line_items[$line_no]->qty_dispatched = $line_qty
;
+ if (!check_num('Line'.$line_no, 0, ($itm->quantity - $itm->qty_done))) {
+ $_SESSION['Items']->line_items[$line_no]->qty_dispatched =
+
input_num('Line'.$line_no)
;
}
}
}
}
@@
-152,7
+159,7
@@
function copy_to_cart()
{
$cart = &$_SESSION['Items'];
$cart->ship_via = $_POST['ship_via'];
{
$cart = &$_SESSION['Items'];
$cart->ship_via = $_POST['ship_via'];
- $cart->freight_cost =
$_POST['ChargeFreightCost']
;
+ $cart->freight_cost =
input_num('ChargeFreightCost')
;
$cart->document_date = $_POST['InvoiceDate'];
$cart->due_date = $_POST['due_date'];
$cart->Comments = $_POST['Comments'];
$cart->document_date = $_POST['InvoiceDate'];
$cart->due_date = $_POST['due_date'];
$cart->Comments = $_POST['Comments'];
@@
-163,7
+170,7
@@
function copy_from_cart()
{
$cart = &$_SESSION['Items'];
$_POST['ship_via'] = $cart->ship_via;
{
$cart = &$_SESSION['Items'];
$_POST['ship_via'] = $cart->ship_via;
- $_POST['ChargeFreightCost'] =
$cart->freight_cost
;
+ $_POST['ChargeFreightCost'] =
price_format($cart->freight_cost)
;
$_POST['InvoiceDate']= $cart->document_date;
$_POST['due_date'] = $cart->due_date;
$_POST['Comments']= $cart->Comments;
$_POST['InvoiceDate']= $cart->document_date;
$_POST['due_date'] = $cart->due_date;
$_POST['Comments']= $cart->Comments;
@@
-175,41
+182,47
@@
function check_data()
{
if (!isset($_POST['InvoiceDate']) || !is_date($_POST['InvoiceDate'])) {
display_error(_("The entered invoice date is invalid."));
{
if (!isset($_POST['InvoiceDate']) || !is_date($_POST['InvoiceDate'])) {
display_error(_("The entered invoice date is invalid."));
+ set_focus('InvoiceDate');
return false;
}
if (!is_date_in_fiscalyear($_POST['InvoiceDate'])) {
display_error(_("The entered invoice date is not in fiscal year."));
return false;
}
if (!is_date_in_fiscalyear($_POST['InvoiceDate'])) {
display_error(_("The entered invoice date is not in fiscal year."));
+ set_focus('InvoiceDate');
return false;
}
if (!isset($_POST['due_date']) || !is_date($_POST['due_date'])) {
display_error(_("The entered invoice due date is invalid."));
return false;
}
if (!isset($_POST['due_date']) || !is_date($_POST['due_date'])) {
display_error(_("The entered invoice due date is invalid."));
+ set_focus('due_date');
return false;
}
if ($_SESSION['Items']->trans_no == 0) {
if (!references::is_valid($_POST['ref'])) {
display_error(_("You must enter a reference."));
return false;
}
if ($_SESSION['Items']->trans_no == 0) {
if (!references::is_valid($_POST['ref'])) {
display_error(_("You must enter a reference."));
+ set_focus('ref');
return false;
}
if (!is_new_reference($_POST['ref'], 10)) {
display_error(_("The entered reference is already in use."));
return false;
}
if (!is_new_reference($_POST['ref'], 10)) {
display_error(_("The entered reference is already in use."));
+ set_focus('ref');
return false;
}
}
if ($_POST['ChargeFreightCost'] == "") {
return false;
}
}
if ($_POST['ChargeFreightCost'] == "") {
- $_POST['ChargeFreightCost'] =
0
;
+ $_POST['ChargeFreightCost'] =
price_format(0)
;
}
}
- if (!
is_numeric($_POST['ChargeFreightCost']) || $_POST['ChargeFreightCost'] < 0
) {
+ if (!
check_num('ChargeFreightCost', 0)
) {
display_error(_("The entered shipping value is not numeric."));
display_error(_("The entered shipping value is not numeric."));
+ set_focus('ChargeFreightCost');
return false;
}
return false;
}
- if ($_SESSION['Items']->has_items_dispatch() == 0 &&
$_POST['ChargeFreightCost']
== 0) {
+ if ($_SESSION['Items']->has_items_dispatch() == 0 &&
input_num('ChargeFreightCost')
== 0) {
display_error(_("There are no item quantities on this invoice."));
return false;
}
display_error(_("There are no item quantities on this invoice."));
return false;
}
@@
-277,12
+290,7
@@
if ($_SESSION['Items']->trans_no == 0) {
label_cells(_("Delivery Notes:"),
get_customer_trans_view_str(systypes::cust_dispatch(), array_keys($_SESSION['Items']->src_docs)), "class='tableheader2'");
label_cells(_("Delivery Notes:"),
get_customer_trans_view_str(systypes::cust_dispatch(), array_keys($_SESSION['Items']->src_docs)), "class='tableheader2'");
-if (!isset($_POST['sales_type_id'])) {
- $_POST['sales_type_id'] = $_SESSION['Items']->default_sales_type;
-}
-
-label_cell(_("Sales Type"), "class='tableheader2'");
-sales_types_list_cells(null, 'sales_type_id', $_POST['sales_type_id']);
+label_cells(_("Sales Type"), $_SESSION['Items']->sales_type_name, "class='tableheader2'");
end_row();
start_row();
end_row();
start_row();
@@
-300,13
+308,13
@@
if (!isset($_POST['InvoiceDate']) || !is_date($_POST['InvoiceDate'])) {
}
}
}
}
-date_cells(_("Date"), 'InvoiceDate', $_POST['InvoiceDate'], 0, 0, 0, "class='tableheader'");
+date_cells(_("Date"), 'InvoiceDate', $_POST['InvoiceDate'], 0, 0, 0, "class='tableheader
2
'");
if (!isset($_POST['due_date']) || !is_date($_POST['due_date'])) {
$_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->customer_id, $_POST['InvoiceDate']);
}
if (!isset($_POST['due_date']) || !is_date($_POST['due_date'])) {
$_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->customer_id, $_POST['InvoiceDate']);
}
-date_cells(_("Due Date"), 'due_date', $_POST['due_date'], 0, 0, 0, "class='tableheader'");
+date_cells(_("Due Date"), 'due_date', $_POST['due_date'], 0, 0, 0, "class='tableheader
2
'");
end_row();
end_table();
end_row();
end_table();
@@
-318,12
+326,12
@@
$th = array(_("Item Code"), _("Item Description"), _("Delivered"), _("Units"), _
_("This Invoice"), _("Price"), _("Tax Type"), _("Discount"), _("Total"));
if ($is_batch_invoice) {
_("This Invoice"), _("Price"), _("Tax Type"), _("Discount"), _("Total"));
if ($is_batch_invoice) {
-$th[] = _("DN");
-$th[] = "";
+
$th[] = _("DN");
+
$th[] = "";
}
if ($is_edition) {
}
if ($is_edition) {
-$th[4] = _("Credited");
+
$th[4] = _("Credited");
}
table_header($th);
}
table_header($th);
@@
-349,11
+357,11
@@
foreach ($_SESSION['Items']->line_items as $line=>$ln_itm) {
// for batch invoices we can only remove whole deliveries
echo '<td nowrap align=right>';
hidden('Line' . $line, $ln_itm->qty_dispatched );
// for batch invoices we can only remove whole deliveries
echo '<td nowrap align=right>';
hidden('Line' . $line, $ln_itm->qty_dispatched );
- echo
number_format2($ln_itm->qty_dispatched, user_qty_dec()
).'</td>';
+ echo
qty_format($ln_itm->qty_dispatched
).'</td>';
} else {
} else {
-
text_cells(null, 'Line'.$line, $ln_itm->qty_dispatched, 10, 10
);
+
small_qty_cells(null, 'Line'.$line, qty_format($ln_itm->qty_dispatched)
);
}
}
- $display_discount_percent =
number_format2($ln_itm->discount_percent*100, user_percent_dec()) . "
%";
+ $display_discount_percent =
percent_format($ln_itm->discount_percent*100) . "
%";
$line_total = ($ln_itm->qty_dispatched * $ln_itm->price * (1 - $ln_itm->discount_percent));
$line_total = ($ln_itm->qty_dispatched * $ln_itm->price * (1 - $ln_itm->discount_percent));
@@
-382,13
+390,13
@@
was not fully delivered the first time ?? */
if (!isset($_POST['ChargeFreightCost']) || $_POST['ChargeFreightCost'] == "") {
if ($_SESSION['Items']->any_already_delivered() == 1) {
if (!isset($_POST['ChargeFreightCost']) || $_POST['ChargeFreightCost'] == "") {
if ($_SESSION['Items']->any_already_delivered() == 1) {
- $_POST['ChargeFreightCost'] =
0
;
+ $_POST['ChargeFreightCost'] =
price_format(0)
;
} else {
} else {
- $_POST['ChargeFreightCost'] =
$_SESSION['Items']->freight_cost
;
+ $_POST['ChargeFreightCost'] =
price_format($_SESSION['Items']->freight_cost)
;
}
}
- if (!
is_numeric($_POST['ChargeFreightCost']
)) {
- $_POST['ChargeFreightCost'] =
0
;
+ if (!
check_num('ChargeFreightCost'
)) {
+ $_POST['ChargeFreightCost'] =
price_format(0)
;
}
}
}
}
@@
-402,14
+410,14
@@
label_cell('', 'colspan=2');
end_row();
$inv_items_total = $_SESSION['Items']->get_items_total_dispatch();
end_row();
$inv_items_total = $_SESSION['Items']->get_items_total_dispatch();
-$display_sub_total =
number_format2($inv_items_total + $_POST['ChargeFreightCost'],user_price_dec(
));
+$display_sub_total =
price_format($inv_items_total + input_num('ChargeFreightCost'
));
label_row(_("Sub-total"), $display_sub_total, "colspan=9 align=right","align=right", $is_batch_invoice ? 2 : 0);
label_row(_("Sub-total"), $display_sub_total, "colspan=9 align=right","align=right", $is_batch_invoice ? 2 : 0);
-$taxes = $_SESSION['Items']->get_taxes(
$_POST['ChargeFreightCost']
);
+$taxes = $_SESSION['Items']->get_taxes(
input_num('ChargeFreightCost')
);
$tax_total = display_edit_tax_items($taxes, 9, $_SESSION['Items']->tax_included, $is_batch_invoice ? 2:0);
$tax_total = display_edit_tax_items($taxes, 9, $_SESSION['Items']->tax_included, $is_batch_invoice ? 2:0);
-$display_total =
number_format2(($inv_items_total + $_POST['ChargeFreightCost'] + $tax_total), user_price_dec(
));
+$display_total =
price_format(($inv_items_total + input_num('ChargeFreightCost') + $tax_total
));
label_row(_("Invoice Total"), $display_total, "colspan=9 align=right","align=right", $is_batch_invoice ? 2 : 0);
label_row(_("Invoice Total"), $display_total, "colspan=9 align=right","align=right", $is_batch_invoice ? 2 : 0);