projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove test material from source.
[fa-stable.git]
/
sales
/
create_recurrent_invoices.php
diff --git
a/sales/create_recurrent_invoices.php
b/sales/create_recurrent_invoices.php
index 3f359f8cd0a0bf5093f51d681cd1a881e0bbe130..b14b30569dc10ec1716fd60999cbcf713d5ec7d7 100644
(file)
--- a/
sales/create_recurrent_invoices.php
+++ b/
sales/create_recurrent_invoices.php
@@
-27,12
+27,15
@@
page(_($help_context = "Create and Print Recurrent Invoices"), false, false, "",
function create_recurrent_invoices($customer_id, $branch_id, $order_no, $tmpl_no, $date, $from, $to, $memo)
{
function create_recurrent_invoices($customer_id, $branch_id, $order_no, $tmpl_no, $date, $from, $to, $memo)
{
- global $Refs;
+ global $Refs
, $SysPrefs
;
update_last_sent_recurrent_invoice($tmpl_no, $to);
$doc = new Cart(ST_SALESORDER, array($order_no));
update_last_sent_recurrent_invoice($tmpl_no, $to);
$doc = new Cart(ST_SALESORDER, array($order_no));
-
+
+ if (!empty($SysPrefs->prefs['dim_on_recurrent_invoice']))
+ $doc->trans_type = ST_SALESINVOICE;
+
get_customer_details_to_order($doc, $customer_id, $branch_id);
$doc->trans_type = ST_SALESORDER;
get_customer_details_to_order($doc, $customer_id, $branch_id);
$doc->trans_type = ST_SALESORDER;
@@
-43,6
+46,8
@@
function create_recurrent_invoices($customer_id, $branch_id, $order_no, $tmpl_no
$doc->reference = $Refs->get_next($doc->trans_type, null, array('customer' => $customer_id, 'branch' => $branch_id,
'date' => $date));
$doc->reference = $Refs->get_next($doc->trans_type, null, array('customer' => $customer_id, 'branch' => $branch_id,
'date' => $date));
+ if (!empty($doc->Comments))
+ $memo .= "\n" . $doc->Comments;
$doc->Comments = $memo;
foreach ($doc->line_items as $line_no=>$item) {
$doc->Comments = $memo;
foreach ($doc->line_items as $line_no=>$item) {