| 
						
					 | 
					
						
						
							
						
						ef281d8ecc
					 | 
					
						
						
							
							Merge branch 'main' into modelar_cuadre_de_caja_#10
						
						
						
						
						
						
					 | 
					
						2024-07-27 13:37:48 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						09f734f5cb
					 | 
					
						
						
							
							feat: create a correct reconciliation jar.
						
						
						
						
						
						
					 | 
					
						2024-07-27 13:32:31 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						675b4f059f
					 | 
					
						
						
							
							feat: implementing form to reconciliation jar.
						
						
						
						
						
						
					 | 
					
						2024-07-27 13:30:14 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9edbd1caef
					 | 
					
						
						
							
							Feat(ReplaceNameIdSaleLine)
						
						
						
						
						
						
					 | 
					
						2024-07-27 13:20:25 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b70a0b73c3
					 | 
					
						
						
							
							Feat(AddSaleLineButton): Sale Line Button
						
						
						
						
						
						
					 | 
					
						2024-07-27 13:20:25 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cb84371f4b
					 | 
					
						
						
							
							Feat(ButtonAddLine): Añadir linea de venta en formulario WIP
						
						
						
						
						
						
					 | 
					
						2024-07-27 13:20:25 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b94c5a0070
					 | 
					
						
						
							
							feat: Se agrega testform
						
						
						
						
						
						
					 | 
					
						2024-07-27 13:20:25 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						02fba454ba
					 | 
					
						
						
							
							Fix: Clean Home, Crear lineas de Venta
						
						
						
						
						
						
					 | 
					
						2024-07-27 13:19:37 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5879296132
					 | 
					
						
						
							
							fix: ReconciliationJar.
						
						
						
						
						
						
					 | 
					
						2024-07-27 12:37:31 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a3c8189d8c
					 | 
					
						
						
							
							feat: create a correct reconciliation jar.
						
						
						
						
						
						
					 | 
					
						2024-07-20 11:44:49 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						08deb9d4ec
					 | 
					
						
						
							
							view: improve reconciliate_jar.
						
						
						
						
						
						
					 | 
					
						2024-07-13 17:48:57 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						74d2e0d234
					 | 
					
						
						
							
							admin: set Payment and reconciliatoJar in admin
						
						
						
						
						
						
					 | 
					
						2024-07-13 17:38:33 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f9ee2ad9c2
					 | 
					
						
						
							
							view: improve reconciliate_jar template.
						
						
						
						
						
						
					 | 
					
						2024-07-13 17:38:12 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3570af7b60
					 | 
					
						
						
							
							refactor: rename column.
						
						
						
						
						
						
					 | 
					
						2024-07-13 17:17:45 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a8f8820a55
					 | 
					
						
						
							
							feat: implementing form to reconciliation jar.
						
						
						
						
						
						
					 | 
					
						2024-07-13 17:13:17 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ee38c29ce3
					 | 
					
						
						
							
							feat: implement reconciliation jar summary.
						
						
						
						
						
						
					 | 
					
						2024-07-13 11:43:16 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9ecd949123
					 | 
					
						
						
							
							Feat(ReplaceNameIdSaleLine)
						
						
						
						
						
						
					 | 
					
						2024-07-13 11:25:12 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3e35807a87
					 | 
					
						
						
							
							Feat(AddSaleLineButton): Sale Line Button
						
						
						
						
						
						
					 | 
					
						2024-07-13 11:01:11 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a63ae668a2
					 | 
					
						
						
							
							Feat(ButtonAddLine): Añadir linea de venta en formulario WIP
						
						
						
						
						
						
					 | 
					
						2024-07-12 23:40:43 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6795aa3dcc
					 | 
					
						
						
							
							feat: Se agrega testform
						
						
						
						
						
						
					 | 
					
						2024-07-12 22:38:07 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7223c0c9a9
					 | 
					
						
						
							
							Fix: Clean Home, Crear lineas de Venta
						
						
						
						
						
						
					 | 
					
						2024-07-12 22:00:37 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2425ecc811
					 | 
					
						
						
							
							style: agregando descripción a los modelos
						
						
						
						
						
						
					 | 
					
						2024-07-06 09:30:35 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						32b5a6ec36
					 | 
					
						
						
							
							feat: remplazando formulario compra manual por formulario django
						
						
						
						
						
						
					 | 
					
						2024-07-06 09:26:26 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						619fa0fcf9
					 | 
					
						
						
							
							feat: guardando ventas desde formulario.
						
						
						
						
						
						
					 | 
					
						2024-06-30 01:33:52 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ad78625351
					 | 
					
						
						
							
							feat: generando vista de compra con formularios de django.
						
						
						
						
						
						
					 | 
					
						2024-06-30 01:16:55 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a466d8b20a
					 | 
					
						
						
							
							Merge branch 'main' of ssh://gitea.onecluster.org:6666/OneTeam/don_confiao
						
						
						
						
						
						
					 | 
					
						2024-06-29 21:01:31 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						90217926df
					 | 
					
						
						
							
							Feat: Purchase View
						
						
						
						
						
						
					 | 
					
						2024-06-29 20:58:29 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8ed13347d4
					 | 
					
						
						
							
							fix: eliminando vista que no se usa.
						
						
						
						
						
						
					 | 
					
						2024-06-29 18:23:32 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						47098c48af
					 | 
					
						
						
							
							fix: actualizacion de categorias en la importacion de productos.
						
						
						
						
						
						
					 | 
					
						2024-06-29 18:12:25 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f807137a8e
					 | 
					
						
						
							
							test: verificando que se preserve el id del producto en importaciones.
						
						
						
						
						
						
					 | 
					
						2024-06-29 17:28:14 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						524626aea3
					 | 
					
						
						
							
							fix: actualizando precios al importar productos.
						
						
						
						
						
						
					 | 
					
						2024-06-29 17:20:01 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						64a9b75ad7
					 | 
					
						
						
							
							fix: evitando duplicado de productos en la importacion.
						
						
						
						
						
						
					 | 
					
						2024-06-29 16:57:50 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						84c295e7de
					 | 
					
						
						
							
							admin: registrando productos y categoria de productos en admin.
						
						
						
						
						
						
					 | 
					
						2024-06-29 16:24:07 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ed5d3f447a
					 | 
					
						
						
							
							fix: creacion repetida de categoria de productos.
						
						
						
						
						
						
					 | 
					
						2024-06-29 16:23:47 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						252720b324
					 | 
					
						
						
							
							Feat: enviando las categorias en la lista de productos.
						
						
						
						
						
						
					 | 
					
						2024-06-29 15:45:05 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ef0c0c52db
					 | 
					
						
						
							
							Feat: importando productos desde csv.
						
						
						
						
						
						
					 | 
					
						2024-06-29 14:29:22 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cosmos
							
						 
					 | 
					
						
						
							
						
						2039a19b16
					 | 
					
						
						
							
							Add products in urls and views
						
						
						
						
						
						
					 | 
					
						2024-06-29 09:42:00 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						730c7b379f
					 | 
					
						
						
							
							views: usando render.
						
						
						
						
						
						
					 | 
					
						2024-06-22 16:13:17 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c2755e1adc
					 | 
					
						
						
							
							views: explorando plantillas.
						
						
						
						
						
						
					 | 
					
						2024-06-22 16:09:38 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						70a70f6620
					 | 
					
						
						
							
							ejercicio: entendiendo las urls y las vistas.
						
						
						
						
						
						
					 | 
					
						2024-06-22 15:24:05 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4bc47ebd79
					 | 
					
						
						
							
							fix: permitiendo vacio en campos opcionales.
						
						
						
						
						
						
					 | 
					
						2024-06-22 14:20:03 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6c0845f7b0
					 | 
					
						
						
							
							migration: migracion de Sale.
						
						
						
						
						
						
					 | 
					
						2024-06-22 14:13:16 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						173e270136
					 | 
					
						
						
							
							Fix(Sale): permitiendo ventas sin descripcion.
						
						
						
						
						
						
					 | 
					
						2024-06-22 14:12:43 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0e2b59a40b
					 | 
					
						
						
							
							admin: registrando Sale y SaleLine en admin.
						
						
						
						
						
						
					 | 
					
						2024-06-22 14:12:16 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1a9f9d4063
					 | 
					
						
						
							
							feat: add fields to SaleLine.
						
						
						
						
						
						
					 | 
					
						2024-06-22 13:57:39 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1fa9b8dc9f
					 | 
					
						
						
							
							test: revisando venta con multiples lineas.
						
						
						
						
						
						
					 | 
					
						2024-06-22 12:29:37 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d2695d5277
					 | 
					
						
						
							
							refactor: eliminando codigo comentado.
						
						
						
						
						
						
					 | 
					
						2024-06-22 11:38:15 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						781f85e60e
					 | 
					
						
						
							
							test: eliminado test bobo.
						
						
						
						
						
						
					 | 
					
						2024-06-22 11:37:24 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bc7e96d64c
					 | 
					
						
						
							
							Feat: SaleLine
						
						
						
						
						
						
					 | 
					
						2024-06-22 11:10:09 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						03b2395074
					 | 
					
						
						
							
							Feat: Se añade modelo Sale
						
						
						
						
						
						
					 | 
					
						2024-06-22 10:38:03 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |