Commits

Mariano Falcón committed dbd65e2

Lost commit

Comments (0)

Files changed (57)

File contents unchanged.
File contents unchanged.

billable/__init__.py

File contents unchanged.

billable/forms.py

File contents unchanged.

billable/tests.py

File contents unchanged.

billable/urls.py

File contents unchanged.

billable/views.py

File contents unchanged.

cashflow/__init__.py

File contents unchanged.

cashflow/forms.py

File contents unchanged.

cashflow/migrations/0002_auto__add_field_transaccion_termina.py

File contents unchanged.

cashflow/migrations/0003_auto__add_field_transaccion_descripcion.py

File contents unchanged.

cashflow/migrations/0004_auto__del_field_transaccion_activo__chg_field_transaccion_categoria__c.py

File contents unchanged.

cashflow/tests.py

File contents unchanged.
File contents unchanged.

media/css/billable_style.css

File contents unchanged.

media/css/grid.css

File contents unchanged.

media/css/print.css

File contents unchanged.

media/css/reset.css

File contents unchanged.

media/images/amarillo.png

Old
Old image
New
New image

media/images/logo.jpg

Old
Old image
New
New image

media/images/rojo.png

Old
Old image
New
New image

media/images/verde.png

Old
Old image
New
New image

media/js/arrow-down.gif

Old
Old image
New
New image

media/js/arrow-none.gif

Old
Old image
New
New image

media/js/arrow-up.gif

Old
Old image
New
New image

media/js/billable.js

File contents unchanged.

media/js/flechas.js

File contents unchanged.

media/js/jquery-1.3.2.min.js

File contents unchanged.

media/js/jquery-1.4.2.js

File contents unchanged.

media/js/liveFilter.js

File contents unchanged.

media/js/script.js

File contents unchanged.

media/js/sortable.js

File contents unchanged.

media/style.css

File contents unchanged.
File contents unchanged.
Binary file modified.
     'django.contrib.messages',
     'django.contrib.admin',
     'cashflow',
+    'new_cashflow',
     'registration', 
     'south',
 )

templates/404.html

File contents unchanged.

templates/500.html

File contents unchanged.

templates/billable/EditableInvoice/images/logo.png

Old
Old image
New
New image

templates/billable/index.html

File contents unchanged.

templates/cashflow/arrows.html.oldrecent

File contents unchanged.

templates/cashflow/cashflow.html

File contents unchanged.

templates/cashflow/cashflow2 (compaq's conflicted copy 2010-09-25).html

File contents unchanged.

templates/cashflow/cashflow2.html

     <div id="transacciones">
         <a class="nav" href={% url cs_ingreso cuenta%}>Agregar Ingreso</a>
         <a class="nav" href={% url cs_gasto cuenta %}>Agregar Gasto</a>
-        <a class="nav" href={% url cs_nueva_cuenta %}>Agregar Cuenta</a>
         <a class="nav" href={% url cs_nueva_categoria %}>Agregar Categoria</a>
     </div>
            
             <li><a class="nav" href={% url cs_cashflow2 c.nombre %}>{{ c.nombre }}</a></li>
         {% endfor %}
         </ul>
+        <a class="nav" href={% url cs_nueva_cuenta %}>Agregar Cuenta</a>
     </div>
     
 </div>

templates/cashflow/cashflow2.html.bkup

File contents unchanged.

templates/cashflow/cashflow2.html.oldjs

File contents unchanged.

templates/cashflow/crear_alumno.html

File contents unchanged.

templates/cashflow/deuda_alumnos.html

File contents unchanged.

templates/cashflow/gasto.html

File contents unchanged.

templates/cashflow/gracias.html

File contents unchanged.

templates/cashflow/index.html

File contents unchanged.

templates/cashflow/info_alumno.html

File contents unchanged.

templates/cashflow/ingreso.html

File contents unchanged.

templates/cashflow/pagar.html

File contents unchanged.

templates/cashflow/reportes.html

                     {
                         width: 620, height: 400,
                         title: 'Ingresos', 
-                        backgroundColor: 'E2F1FF',
+                        backgroundColor: 'C0DEED',
                         legend:'Ingresos',
                         colors:['green', 'blue', 'brown']
                     }                    
                     {
                         width: 620, height: 400,
                         title: 'Gastos',
-                        backgroundColor: 'E2F1FF', 
+                        backgroundColor: 'C0DEED', 
                         legend:'Gastos',
                         colors:['red', 'brown']
                     }                    
                     {
                         width: 800, height: 500, 
                         title: 'Balance Mensual',
-                        backgroundColor: 'E2F1FF', 
+                        backgroundColor: 'C0DEED',
+                        gridlineColor: 'orange',
+                        //hAxis.textStyle: {color: 'white'},
                         colors:['green', 'red', 'blue']
                     }                    
                    );

templates/cashflow/thanks.html

File contents unchanged.

templates/cashflow/welcome.html

         <p>Controla tus finanzas mensuales. Conoce exactamente donde va tu dinero.</p>
         <h3>Reportes</h3>
         <p>De un simple vistazo observa como se distribuyen tus ingresos y gastos</p>
-        <div id="transacciones">
-            <p><a href={% url cs_nueva_cuenta %}>Crear una cuenta nueva</a></p>
-            <p><a href={% url cs_nueva_categoria %}>Crear una categoria</a></p>
-        </div> 
     </div>
 {% endblock %}