[freeside-commits] freeside/conf alerter_template, 1.2, 1.3 invoice_template, 1.2, 1.3 invoice_latexreturnaddress, 1.1, NONE invoice_template_statement, 1.1, 1.2 company_name, NONE, 1.1 company_address, NONE, 1.1 impending_recur_template, 1.1, 1.2 welcome_letter, 1.2, 1.3 invoice_latexfooter, 1.4, 1.5 invoice_latexsmallfooter, 1.1, 1.2 invoice_latexnotes, 1.2, 1.3

Ivan,,, ivan at wavetail.420.am
Wed Nov 7 16:59:37 PST 2007


Update of /home/cvs/cvsroot/freeside/conf
In directory wavetail:/tmp/cvs-serv16758/conf

Modified Files:
	alerter_template invoice_template invoice_template_statement 
	impending_recur_template welcome_letter invoice_latexfooter 
	invoice_latexsmallfooter invoice_latexnotes 
Added Files:
	company_name company_address 
Removed Files:
	invoice_latexreturnaddress 
Log Message:
for new installs, centralize some stuff that was spread around different config files.

--- invoice_latexreturnaddress DELETED ---

Index: invoice_latexfooter
===================================================================
RCS file: /home/cvs/cvsroot/freeside/conf/invoice_latexfooter,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- invoice_latexfooter	4 May 2005 00:40:59 -0000	1.4
+++ invoice_latexfooter	8 Nov 2007 00:59:35 -0000	1.5
@@ -1 +1 @@
-Ivan Kohler~~~Freeside - open-source billing
+[@-- $company_name --@]

Index: invoice_latexsmallfooter
===================================================================
RCS file: /home/cvs/cvsroot/freeside/conf/invoice_latexsmallfooter,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- invoice_latexsmallfooter	21 Jan 2004 22:00:34 -0000	1.1
+++ invoice_latexsmallfooter	8 Nov 2007 00:59:35 -0000	1.2
@@ -1 +1 @@
-Ivan Kohler~~~Freeside - open-source billing
+[@-- $company_name --@]

Index: welcome_letter
===================================================================
RCS file: /home/cvs/cvsroot/freeside/conf/welcome_letter,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- welcome_letter	21 Jun 2007 04:03:14 -0000	1.2
+++ welcome_letter	8 Nov 2007 00:59:35 -0000	1.3
@@ -113,9 +113,9 @@
 %  Your content goes here
 Dear [@-- $first --@] [@-- $last --@]:\\
 \\
-  Thank you for choosing Freeside.  We aim to meet all the billing needs of
-  [@-- $company --@].  Please do not hesitate to contact us for any additional
-  service or features you require.\\
+  Thank you for choosing [@-- $company_name --@].  We aim to meet all of your
+  needs.  Please do not hesitate to contact us for any additional
+  services or assistance.\\
 
 \end{document}
 

Index: alerter_template
===================================================================
RCS file: /home/cvs/cvsroot/freeside/conf/alerter_template,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- alerter_template	23 Oct 2004 11:45:05 -0000	1.2
+++ alerter_template	8 Nov 2007 00:59:35 -0000	1.3
@@ -1,20 +1,18 @@
 
 
-Ivan Kohler
-12345 Test Lane
-Truckee, CA  96161
+{ $company_name; }
+{ $company_address; }
 
 
 { $first; } { $last; }:
 
   We thank you for your continuing patronage.  This notice is to remind you
-that your { $payby } used to pay SISD.COM for Internet
-service will expire on { use Date::Format; time2str("%x", $expdate); }.  Please provide us with new billing
-information so that we may continue your service uninterrupted.
+that your { $payby } used to pay { $company_name; } for Internet
+service will expire on { use Date::Format; time2str("%B %o, %Y", $expdate); }.  Please provide us with new
+billing information so that we may continue your service uninterrupted.
 
 Very Truly Yours,
 
-  SISD Service Team
-
+  { $company_name; } Service Team
 
 

Index: invoice_latexnotes
===================================================================
RCS file: /home/cvs/cvsroot/freeside/conf/invoice_latexnotes,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- invoice_latexnotes	23 Oct 2004 11:34:46 -0000	1.2
+++ invoice_latexnotes	8 Nov 2007 00:59:35 -0000	1.3
@@ -3,6 +3,6 @@
 %%
 \section*{\textsc{Notes}}
 \begin{enumerate}
-\item Please make your check payable to \textbf{Ivan Kohler}.
+\item Please make your check payable to \textbf{[@-- $company_name --@]}.
 \item If you have any questions please email or telephone.
 \end{enumerate}

--- NEW FILE: company_name ---
ExampleCo

--- NEW FILE: company_address ---
1234 Example Lane
Exampleton, CA  54321

Index: invoice_template_statement
===================================================================
RCS file: /home/cvs/cvsroot/freeside/conf/invoice_template_statement,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- invoice_template_statement	9 Feb 2007 01:05:56 -0000	1.1
+++ invoice_template_statement	8 Nov 2007 00:59:35 -0000	1.2
@@ -1,11 +1,10 @@
 
                                  Statement
-                                 { substr("Page $page of $total_pages          ", 0, 19); } { use Date::Format; time2str("%x", $date); }  FS-{ $invnum; }
+                                 { substr("Page $page of $total_pages          ", 0, 19); } { use Date::Format; time2str("%x", $date); }  Invoice #{ $invnum; }
 
 
-Ivan Kohler
-12345 Test Lane
-Truckee, CA  96161
+{ $company_name; }
+{ $company_address; }
 
 
 { $address[0]; }
@@ -24,4 +23,4 @@
   );
 }
 
- -=> Freeside - open-source billing for ISPs - http://www.sisd.com/freeside <=-
+ -=> { $company_name; } <=-

Index: invoice_template
===================================================================
RCS file: /home/cvs/cvsroot/freeside/conf/invoice_template,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- invoice_template	23 Oct 2004 11:45:05 -0000	1.2
+++ invoice_template	8 Nov 2007 00:59:35 -0000	1.3
@@ -1,11 +1,10 @@
 
                                  Invoice
-                                 { substr("Page $page of $total_pages          ", 0, 19); } { use Date::Format; time2str("%x", $date); }  FS-{ $invnum; }
+                                 { substr("Page $page of $total_pages          ", 0, 19); } { use Date::Format; time2str("%x", $date); }  Invoice #{ $invnum; }
 
 
-Ivan Kohler
-12345 Test Lane
-Truckee, CA  96161
+{ $company_name; }
+{ $company_address; }
 
 
 { $address[0]; }
@@ -24,4 +23,4 @@
   );
 }
 
- -=> Freeside - open-source billing for ISPs - http://www.sisd.com/freeside <=-
+ -=> { $company_name; } <=-

Index: impending_recur_template
===================================================================
RCS file: /home/cvs/cvsroot/freeside/conf/impending_recur_template,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- impending_recur_template	23 Jan 2007 23:42:58 -0000	1.1
+++ impending_recur_template	8 Nov 2007 00:59:35 -0000	1.2
@@ -1,20 +1,20 @@
 
 
-Ivan Kohler
-12345 Test Lane
-Truckee, CA  96161
+{ $company_name; }
+{ $company_address; }
 
 
 { $first; } { $last; }:
 
   We thank you for your continuing patronage.  This notice is to remind you
-that your { $packages->[0] } Internet service will expire on { use Date::Format; time2str("%x", $recurdates->[0]); }.
+that your { $packages->[0] } Internet service
+will expire on { use Date::Format; time2str("%B %o, %Y", $recurdates->[0]); }.
 At that time we will begin charging you on a recurring basis so that we may
 continue your service uninterrupted.
 
 Very Truly Yours,
 
-  SISD Service Team
+  { $company_name; } Service Team
 
 
 



More information about the freeside-commits mailing list