projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged changes from main branch up to 2.1.3.
[fa-stable.git]
/
sales
/
customer_invoice.php
diff --git
a/sales/customer_invoice.php
b/sales/customer_invoice.php
index d5c39a3c945aa41ce126c2486ba9091e77901206..bd0e2d2bd9bfa6429fe827f2e917ea655a480de6 100644
(file)
--- a/
sales/customer_invoice.php
+++ b/
sales/customer_invoice.php
@@
-1,13
+1,13
@@
<?php
/**********************************************************************
Copyright (C) FrontAccounting, LLC.
<?php
/**********************************************************************
Copyright (C) FrontAccounting, LLC.
- Released under the terms of the GNU
Affero General Public License,
- AGPL, as published by the Free Software Foundation, either version
-
3
of the License, or (at your option) any later version.
+ Released under the terms of the GNU
General Public License, GPL,
+ as published by the Free Software Foundation, either version 3
+ of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- See the License here <http://www.gnu.org/licenses/
a
gpl-3.0.html>.
+ See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
//---------------------------------------------------------------------------
//
***********************************************************************/
//---------------------------------------------------------------------------
//
@@
-298,6
+298,7
@@
if (isset($_POST['process_invoice']) && check_data()) {
$newinvoice= $_SESSION['Items']->trans_no == 0;
copy_to_cart();
$newinvoice= $_SESSION['Items']->trans_no == 0;
copy_to_cart();
+ if ($newinvoice) new_doc_date($_SESSION['Items']->document_date);
$invoice_no = $_SESSION['Items']->write();
processing_end();
$invoice_no = $_SESSION['Items']->write();
processing_end();
@@
-334,7
+335,7
@@
$dspans[] = $spanlen;
$is_batch_invoice = count($_SESSION['Items']->src_docs) > 1;
$is_edition = $_SESSION['Items']->trans_type == 10 && $_SESSION['Items']->trans_no != 0;
$is_batch_invoice = count($_SESSION['Items']->src_docs) > 1;
$is_edition = $_SESSION['Items']->trans_type == 10 && $_SESSION['Items']->trans_no != 0;
-start_form(
false, true
);
+start_form();
hidden('cart_id');
start_table("$table_style2 width=80%", 5);
hidden('cart_id');
start_table("$table_style2 width=80%", 5);
@@
-367,19
+368,20
@@
label_cell(_("Shipping Company"), "class='tableheader2'");
shippers_list_cells(null, 'ship_via', $_POST['ship_via']);
if (!isset($_POST['InvoiceDate']) || !is_date($_POST['InvoiceDate'])) {
shippers_list_cells(null, 'ship_via', $_POST['ship_via']);
if (!isset($_POST['InvoiceDate']) || !is_date($_POST['InvoiceDate'])) {
- $_POST['InvoiceDate'] =
Today
();
+ $_POST['InvoiceDate'] =
new_doc_date
();
if (!is_date_in_fiscalyear($_POST['InvoiceDate'])) {
$_POST['InvoiceDate'] = end_fiscalyear();
}
}
if (!is_date_in_fiscalyear($_POST['InvoiceDate'])) {
$_POST['InvoiceDate'] = end_fiscalyear();
}
}
-date_cells(_("Date"), 'InvoiceDate', '', $_POST['InvoiceDate'], 0, 0, 0, "class='tableheader2'", true);
+date_cells(_("Date"), 'InvoiceDate', '', $_SESSION['Items']->trans_no == 0,
+ 0, 0, 0, "class='tableheader2'", true);
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='tableheader2'");
+date_cells(_("Due Date"), 'due_date', '',
null
, 0, 0, 0, "class='tableheader2'");
end_row();
end_table();
end_row();
end_table();
@@
-512,7
+514,7
@@
end_table(1);
submit_center_first('Update', _("Update"),
_('Refresh document page'), true);
submit_center_last('process_invoice', _("Process Invoice"),
submit_center_first('Update', _("Update"),
_('Refresh document page'), true);
submit_center_last('process_invoice', _("Process Invoice"),
- _('Check entered data and save document'),
true
);
+ _('Check entered data and save document'),
'default'
);
end_form();
end_form();