From: Joe Hunt Date: Sat, 4 Jun 2011 15:15:12 +0000 (+0200) Subject: Improved Creation and ability to edit Last Sent date in Recurrent Invoice X-Git-Tag: 2.3-final~633 X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=d3a403292485062b56c5bfd9daeadd5185ecc7ed;p=fa-stable.git Improved Creation and ability to edit Last Sent date in Recurrent Invoice --- diff --git a/sales/create_recurrent_invoices.php b/sales/create_recurrent_invoices.php index 20bba79b..ee92d03b 100644 --- a/sales/create_recurrent_invoices.php +++ b/sales/create_recurrent_invoices.php @@ -23,7 +23,7 @@ if ($use_popup_windows) page(_($help_context = "Create and Print Recurrent Invoices"), false, false, "", $js); -function create_recurrent_invoices($customer_id, $branch_id, $order_no, $tmpl_no) +function create_recurrent_invoices($customer_id, $branch_id, $order_no, $tmpl_no, $date, $from, $to) { global $Refs; @@ -33,11 +33,11 @@ function create_recurrent_invoices($customer_id, $branch_id, $order_no, $tmpl_no $doc->trans_type = ST_SALESORDER; $doc->trans_no = 0; - $doc->document_date = Today(); // 2006-06-15. Added so Invoices and Deliveries get current day + $doc->document_date = $date; $doc->due_date = get_invoice_duedate($doc->payment, $doc->document_date); $doc->reference = $Refs->get_next($doc->trans_type); - //$doc->Comments=''; + $doc->Comments = sprintf(_("Recurrent Invoice covers period %s - %s."), $from, add_days($to, -1)); foreach ($doc->line_items as $line_no=>$item) { $line = &$doc->line_items[$line_no]; @@ -48,10 +48,19 @@ function create_recurrent_invoices($customer_id, $branch_id, $order_no, $tmpl_no $cart->trans_type = ST_SALESINVOICE; $cart->reference = $Refs->get_next($cart->trans_type); $invno = $cart->write(1); - update_last_sent_recurrent_invoice($tmpl_no, $cart->document_date); + update_last_sent_recurrent_invoice($tmpl_no, $to); return $invno; } +function calculate_from($myrow) +{ + if ($myrow["last_sent"] == '0000-00-00') + $from = sql2date($myrow["begin"]); + else + $from = sql2date($myrow["last_sent"]); + return $from; +} + $id = find_submit("create"); if ($id != -1) { @@ -61,17 +70,22 @@ if ($id != -1) { $invs = array(); $myrow = get_recurrent_invoice($id); + $from = calculate_from($myrow); + $to = add_months($from, $myrow['monthly']); + $to = add_days($to, $myrow['days']); if ($myrow['debtor_no'] == 0) { $cust = get_cust_branches_from_group($myrow['group_no']); while ($row = db_fetch($cust)) { - $invs[] = create_recurrent_invoices($row['debtor_no'], $row['branch_code'], $myrow['order_no'], $myrow['id']); + $invs[] = create_recurrent_invoices($row['debtor_no'], $row['branch_code'], $myrow['order_no'], $myrow['id'], + $date, $from, $to); } } else { - $invs[] = create_recurrent_invoices($myrow['debtor_no'], $myrow['group_no'], $myrow['order_no'], $myrow['id']); + $invs[] = create_recurrent_invoices($myrow['debtor_no'], $myrow['group_no'], $myrow['order_no'], $myrow['id'], + $date, $from, $to); } if (count($invs) > 0) { @@ -107,20 +121,10 @@ while ($myrow = db_fetch($result)) { $begin = sql2date($myrow["begin"]); $end = sql2date($myrow["end"]); - - if ($myrow["last_sent"] == '0000-00-00') - { - $last_sent = ''; - $due_date = $myrow["begin"]; - } else { - $last_sent = sql2date($myrow["last_sent"]); - if ($myrow['monthly'] > 0) - $due_date = begin_month($last_sent); - else - $due_date = $last_sent; - } - $due_date = add_months($due_date, $myrow['monthly']); + $last_sent = calculate_from($myrow); + $due_date = add_months($last_sent, $myrow['monthly']); $due_date = add_days($due_date, $myrow['days']); + $overdue = date1_greater_date2($today, $due_date) && date1_greater_date2($today, $begin) && date1_greater_date2($end, $today); if ($overdue) @@ -147,7 +151,7 @@ while ($myrow = db_fetch($result)) label_cell($myrow['monthly']); label_cell($begin); label_cell($end); - label_cell($last_sent); + label_cell(($myrow['last_sent']=="0000-00-00")?"":$last_sent); if ($overdue) button_cell("create".$myrow["id"], _("Create Invoices"), "", ICON_DOC); else diff --git a/sales/manage/recurrent_invoices.php b/sales/manage/recurrent_invoices.php index 836fcab0..f5f18f62 100644 --- a/sales/manage/recurrent_invoices.php +++ b/sales/manage/recurrent_invoices.php @@ -36,6 +36,21 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') display_error(_("The area description cannot be empty.")); set_focus('description'); } + if (!is_date($_POST['begin'])) { + $input_error = 1; + display_error(_("The entered date is invalid.")); + set_focus('begin'); + } + if (!is_date($_POST['end'])) { + $input_error = 1; + display_error(_("The entered date is invalid.")); + set_focus('end'); + } + if (isset($_POST['last_sent']) && !is_date($_POST['last_sent'])) { + $input_error = 1; + display_error(_("The entered date is invalid.")); + set_focus('last_sent'); + } if ($input_error != 1) { @@ -43,6 +58,8 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') { update_recurrent_invoice($selected_id, $_POST['description'], $_POST['order_no'], input_num('debtor_no'), input_num('group_no'), input_num('days', 0), input_num('monthly', 0), $_POST['begin'], $_POST['end']); + if (isset($_POST['last_sent'])) + update_last_sent_recurrent_invoice($selected_id, $_POST['last_sent']); $note = _('Selected recurrent invoice has been updated'); } else @@ -139,6 +156,7 @@ if ($selected_id != -1) $_POST['monthly'] = $myrow["monthly"]; $_POST['begin'] = sql2date($myrow["begin"]); $_POST['end'] = sql2date($myrow["end"]); + $_POST['last_sent'] = ($myrow['last_sent']=="0000-00-00"?"":sql2date($myrow["last_sent"])); } hidden("selected_id", $selected_id); } @@ -163,6 +181,9 @@ date_row(_("Begin:"), 'begin'); date_row(_("End:"), 'end', null, null, 0, 0, 5); +if ($selected_id != -1 && $_POST['last_sent'] != "") + date_row(_("Last Created"), 'last_sent'); + end_table(1); submit_add_or_update_center($selected_id == -1, '', 'both');