<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>app/models/invoice_search.rb</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -22,6 +22,8 @@ Iniciar el servidor web con el comando 'script/server'
 El nombre de usuario y contrase&#241;a por defecto son 'admin' y '1234' respectivamente.
 La plantilla utilizada para generar los documentos pdf se encuentra en 'app/views/pdf_invoice.rhtml'
 
+Funciona en Rails 2.2
+
 
 
 </diff>
      <filename>README</filename>
    </modified>
    <modified>
      <diff>@@ -12,8 +12,7 @@ class InvoiceLinesController &lt; ApplicationController
   # edit
   #
   def edit
-    update_invoice_line_url
-    
+        
     @invoice_line = InvoiceLine.find(params[:id], :include =&gt; &quot;invoice&quot;)
     @invoice = @invoice_line.invoice
     
@@ -26,7 +25,6 @@ class InvoiceLinesController &lt; ApplicationController
   # create
   #
   def create
-    create_invoice_line_url
     
     @invoice = Invoice.find(params[:invoice_id], :include =&gt; :customer)
     @invoice_line = InvoiceLine.new(params[:invoice_line])
@@ -47,7 +45,6 @@ class InvoiceLinesController &lt; ApplicationController
   # update
   #
   def update
-    create_invoice_line_url
     
     @invoice_line = InvoiceLine.new
     invoice_line = InvoiceLine.find(params[:id])
@@ -66,7 +63,6 @@ class InvoiceLinesController &lt; ApplicationController
   # destroy
   #
   def destroy
-    create_invoice_line_url
     
     invoice_line = InvoiceLine.find(params[:id])
     @invoice = invoice_line.invoice
@@ -79,17 +75,5 @@ class InvoiceLinesController &lt; ApplicationController
     end
   end
   
-  private
-  # create_invoice_line_url
-  def create_invoice_line_url
-    @invoice_line_url = {:url =&gt; invoice_lines_path(params[:invoice_id])}
-  end
   
-  # update_invoice_line_url
-  def update_invoice_line_url
-    @invoice_line_url = {
-      :url =&gt; invoice_line_path(params[:invoice_id], params[:id]),
-      :html =&gt; { :method =&gt; :put }
-    }
-  end
 end</diff>
      <filename>app/controllers/invoice_lines_controller.rb</filename>
    </modified>
    <modified>
      <diff>@@ -40,7 +40,7 @@ class InvoicesController &lt; ApplicationController
   def show
     
     @invoice = Invoice.find(params[:id])
-    html = render_to_string :template =&gt; &quot;pdf_invoice&quot;, :layout =&gt; false
+    html = render_to_string :template =&gt; &quot;./pdf_invoice.html.erb&quot;, :layout =&gt; false
     
     respond_to do |format|
       
@@ -67,7 +67,7 @@ class InvoicesController &lt; ApplicationController
     
     
     if @invoice.save
-      redirect_to :action =&gt; &quot;edit&quot;, :id =&gt; @invoice.id
+      redirect_to edit_invoice_path(@invoice)
     else
       render :action =&gt; &quot;invoice_form&quot;
     end
@@ -76,7 +76,7 @@ class InvoicesController &lt; ApplicationController
   # edit
   #
   def edit
-    @invoice = Invoice.find(params[:id])
+    @invoice = Invoice.find(params[:id], :include =&gt; :customer)
     @customer = @invoice.customer
     @invoice_line = InvoiceLine.new
     
@@ -111,7 +111,7 @@ class InvoicesController &lt; ApplicationController
   def destroy
     Invoice.delete(params[:id])
 
-    redirect_to invoices_url
+    redirect_to invoices_path
   end
   
   
@@ -169,4 +169,5 @@ class InvoicesController &lt; ApplicationController
   def set_section
     @section = &quot;invoices&quot;
   end
+  
 end
\ No newline at end of file</diff>
      <filename>app/controllers/invoices_controller.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,4 @@
-&lt;% remote_form_for :invoice_line, @invoice_line_url do |form| %&gt;
+&lt;% remote_form_for [@invoice, @invoice_line] do |form| %&gt;
 	&lt;fieldset&gt;
 		&lt;legend&gt;L&#237;neas de factura: &lt;/legend&gt;
 		
@@ -21,7 +21,7 @@
 					&lt;td class=&quot;right&quot;&gt;&lt;%= invoice_line.quantity %&gt;&lt;/td&gt;
 					&lt;td&gt;
 						&lt;%= link_to_remote invoice_line.description, 
-								:url =&gt; edit_invoice_line_path(@invoice, invoice_line),
+								:url =&gt; edit_invoice_invoice_line_path(@invoice, invoice_line),
 								:method =&gt; :get
 						%&gt;
 					&lt;/td&gt;
@@ -29,7 +29,7 @@
 					&lt;td class=&quot;right&quot;&gt;&lt;%= format_price(invoice_line.total) %&gt;&lt;/td&gt;
 					&lt;td class=&quot;center&quot;&gt;
 						&lt;%= link_to_remote &quot;Borrar&quot;, 
-									:url =&gt; invoice_line_path(@invoice, invoice_line), 
+									:url =&gt; invoice_invoice_line_path(@invoice, invoice_line), 
 									:method =&gt; :delete,
 									:confirm =&gt; &quot;&#191;Seguro?&quot;
 					  %&gt;</diff>
      <filename>app/views/invoice_lines/_invoice_lines.html.erb</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,4 @@
-&lt;% form_for :invoice_search, :url =&gt; search_invoices_path do |form| %&gt;
+&lt;% form_for :search, :url =&gt; search_invoices_path do |form| %&gt;
 	&lt;div class=&quot;&lt;%= cycle('even', 'odd') %&gt;&quot;&gt;
 		&lt;label for=&quot;init_date&quot;&gt;Fecha b&#250;squeda:&lt;/label&gt;
 		&lt;%= calendar_date_select_tag &quot;init_date&quot; %&gt;</diff>
      <filename>app/views/invoices/invoices_list.html.erb</filename>
    </modified>
    <modified>
      <diff>@@ -39,7 +39,7 @@ Mime::Type.register &quot;application/pdf&quot;, :pdf
 TMP_DIR = File.expand_path(File.join(RAILS_ROOT, &quot;tmp&quot;))
 
 JAVA_OPTIONS = {
-  :bin =&gt; &quot;/usr/local/java/bin/java&quot;, 
+  :bin =&gt; &quot;java&quot;, 
   :cp_separator =&gt; &quot;:&quot;                                       
 }
 </diff>
      <filename>config/environment.rb</filename>
    </modified>
    <modified>
      <diff>@@ -5,7 +5,7 @@ ActionController::Routing::Routes.draw do |map|
   map.connect 'invoices/page/:page', :controller =&gt; 'invoices', :action =&gt; 'index'
   
   map.resources :invoices, :collection =&gt; { :search =&gt; :post } do |invoices|
-    invoices.resources :invoice_lines
+    invoices.resources :invoice_lines, :as =&gt; 'lines'
   end
 
   </diff>
      <filename>config/routes.rb</filename>
    </modified>
    <modified>
      <diff>@@ -10,6 +10,5 @@ def xhtml2pdf(input_file, output_file)
   end
   
   command = &quot;#{JAVA_OPTIONS[:bin]} -cp #{class_path} Xhtml2Pdf \&quot;#{input_file}\&quot; \&quot;#{output_file}\&quot;&quot;
-  puts command
   system(command)
 end
\ No newline at end of file</diff>
      <filename>lib/xhtml2pdf.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>243eecb59591af393b3b3677f38358c8d0f7b66d</id>
    </parent>
  </parents>
  <author>
    <name>dagi3d</name>
    <email>borjam@dagi3d.net</email>
  </author>
  <url>http://github.com/dagi3d/facturails/commit/f81829b243de31b40ca75f1435cf1cc94d958634</url>
  <id>f81829b243de31b40ca75f1435cf1cc94d958634</id>
  <committed-date>2008-11-29T16:36:16-08:00</committed-date>
  <authored-date>2008-11-29T16:36:16-08:00</authored-date>
  <message>ajustando las rutas de los formularios</message>
  <tree>b39b7312b5aa591f341c56071699a064a05c32e7</tree>
  <committer>
    <name>dagi3d</name>
    <email>borjam@dagi3d.net</email>
  </committer>
</commit>
