[Office-commits] r9905 - trunk/program-assistant

[sysadmin]

Author: jrasata
Date: Thu Oct  1 14:53:40 2009
New Revision: 9905

Log:
reformatted Austin-San Antonio trip

Modified:
   trunk/program-assistant/rmssales.mdwn

Modified: trunk/program-assistant/rmssales.mdwn
==============================================================================
--- trunk/program-assistant/rmssales.mdwn       Thu Oct  1 14:48:43 2009        
(r9904)
+++ trunk/program-assistant/rmssales.mdwn       Thu Oct  1 14:53:40 2009        
(r9905)
@@ -18,10 +18,13 @@
 <LI>Total sent, shipping cost included:
 <LI>Total received: $2932.15 (breakdown follows)
 <UL>
+<LI>Cash:
+<OL>
 <LI> EUR 1560 (~ $1924.04)
 <LI> $163.23
 <LI> NOK 2300 (~ $317.70) NOK 650 (~ $111.62) (Second amount delivered by RMS 
following March/April trip.)
 <LI> HUG 103700 (~ $415.56)
+</OL>
 </UL>
 </UL>
  
@@ -48,8 +51,6 @@
 </UL>
 </UL>
 
-
-
 <H4>2009-04-01 - 2009-04-02 - Marseille</H4>
 
 merchandise, 243 USD; shipping, 51.26 USD; **total, 294.26 USD**<br>
@@ -61,36 +62,29 @@
 </UL>
 
 <H3>April: US (San Antonio (Rackspace, Trinity University), Austin) - $97.63 
over</H3>
-<H4>2009-04-20 - 2009-04-21 - San Antonio</H4>
-merchandise, 2390 USD; shipping, 77 USD; **total, 2467 USD**< /br>
 <UL>
-<LI>**Retail price of merchandise sent to Rackspace: 2390 USD**
-<LI>**Retail price of merchandise sent to Saurabh (Austin): 435 USD**<br>
-<LI>**Sales proceeds given to RMS by host: 2171 USD**
-<LI>**Proceeds from large gnu auction and sales at Trinity: 471.50 USD**
-<LI>**TOTAL RECEIVED FROM RMS: 2692.50 USD (check 885 USD; CC, 1501.50; cash 
306 USD)**
-</UL>
-
-<OL>
-<LI>San Antonio (Rackspace) - received:
-If RMS hadn't added his merchandise to what Tom Weeks had been shipped, the 
result would have been about 1800 USD in sales and 423 USD in remaining 
inventory.  Since RMS added to the inventory, total proceeds were 2171 USD and 
an unknown amount in remaining inventory which RMS took to Austin with him.
+<LI>San Antonio (Rackspace) - **merchandise, $2390.00;** shipping, $77.00; 
total, $2467.00 - **proceeds, $2171.00** (If RMS hadn't added his merchandise 
to what Tom Weeks had been shipped, the result would have been about $1800.00 
in sales and $423.00 in remaining inventory.  Since RMS added to the inventory, 
total proceeds were $2171.00 and an unknown amount in remaining inventory which 
RMS took to Austin with him.  $423.00's worth of inventory ($203.00 too much, 
attributable to what RMS added to the inventory) are being returned from 
Rackspace: 7 FSFS, 34 Emacs cards, 8 shirts.)
 <UL>
-<LI>(proceeds) 2221.00 USD (CC, 1336 USD; cash, 798.50 USD (converted into a 
check for 799 USD from Tom Weeks); checks, 86 USD)
-<LI>total sales: 
-<LI>auction (large gnu): 
-<LI>total Rackspace return: 2171.00 USD
-<LI>inventory being returned from Rackspace: 423 USD (203 USD too much, 
attributable to what RMS added to the inventory) - 7 FSFS, 34 Emacs cards, 8 
shirts.  Tom's cell: 210-264-1185
+<LI>Total sent: $2390.00
+<LI>Total sent, including shipping: $2467.00
+<LI>Total received: $2221.00 (breakdown follows)
+<OL>
+<LI>Checks: $885 (of which $799 from Tom Weeks)
+<LI>Credit card: $1336.00
+</OL>
 </UL>
-<LI>San Antonio (Trinity University) - received:
+<LI>San Antonio (Trinity University) - **merchandise, $0** (sales were not 
allowed) - **proceeds, $471.50** (of which, $40 from large-gnu auction)
 <UL>
-<LI>total sales (even though sales were not allowed): 431.50 USD (CC, 165.50 
USD; cash, 266)
-<LI>auction (large gnu): 40 USD
-<LI>total proceeds: 471.50
-</UL>
+<LI>Total sent: $0
+<LI>Total received: $471.50 (breakdown follows)
+<OL>
+<LI>Credit card: $165.50 
+<LI>Cash: $306.00
 </OL>
-
-<H4>2009-04-23 - Austin (EFF)</H4>
-merchandise, 435 USD; shipping, 20.63 USD; **total, 455.63 USD**
+</UL>
+<LI>Austin (EFF) - **merchandise, $435.00;**
+ shipping, $20.63; total, $455.63 - **proceeds, **
+</UL>
 
 <H3>2009-05 - Spain, Poland - $506.00 short</H3>
 <OL>