Commit Graph

214 Commits

Author SHA1 Message Date
98d173bf00 fix(Vuetify): minor fix. 2024-09-28 16:10:59 -05:00
9857b90cd4 ci(dev): fix port npm to run on docker. 2024-09-28 16:03:03 -05:00
2c8911fb78 ci(Dev): Using docker to serve django and vue on same host. 2024-09-28 14:04:13 -05:00
a7147d1850 view(Purchase): add client list from requesta as example. 2024-09-28 14:03:46 -05:00
8329f3231d view(Front): seek date on purchase form. 2024-09-21 14:16:22 -05:00
ffbb2e53d8 feat(Front): add purchase vue form. 2024-09-21 13:03:22 -05:00
cf93fecf9f ci(Frontend): create vuetify proyect. 2024-09-12 23:02:35 -05:00
86b231a828 Merge branch 'main' into implement_api 2024-09-08 22:36:36 -05:00
19a618a671 fix(api): remove SaleWithLinesViewSet. 2024-09-08 22:33:41 -05:00
5adf9a9ce7 feat(api): implement endpoints to products, customer and sales. 2024-09-08 21:42:35 -05:00
eaa856e9da feat(api): implemented create sale as api endpoint. 2024-09-07 21:33:49 -05:00
a83cd970e6 Feat: Export Ventas Para Tryton 2024-09-07 14:58:11 -05:00
b81d95a9ba B
C
iMerge branch 'main' of ssh://gitea.onecluster.org:6666/OneTeam/don_confiao into ExportTrytonSaleLine
2024-09-07 08:10:57 -05:00
603230beda Fix: Export Sale Line 2024-09-07 08:07:35 -05:00
99ae098c1d fix(Purchase): set price based on product in all lines. 2024-08-31 12:38:17 -05:00
1b1a504bf5 feat(view): set price based on product select on first line from purchase. 2024-08-31 12:04:01 -05:00
f1d96467d6 feat(buy): send products list to buy view. 2024-08-31 09:46:03 -05:00
9d06a588c8 Fix: Se corrijen etiquetas de form 2024-08-24 10:46:42 -05:00
23ec2bc298 refactor: move Products list logic to model. 2024-08-24 10:30:58 -05:00
e9e4e0e38d Fix: Se cambia tono de verde y shadow en botones 2024-08-19 21:30:09 -05:00
384fd3c7f8 Feat: Estilo botones Resumen de Venta 2024-08-19 19:44:58 -05:00
d9f54ce12b Feat: Se agrega logo y titulo a sidebar 2024-08-19 19:25:40 -05:00
157095dede Se agregan estilos a resumen de compra 2024-08-19 18:52:06 -05:00
027f7d75b6 fix: Scrollear lineas oculta botón de agregar 2024-08-19 18:34:28 -05:00
b0251b882e Se agregan estilos de lineas de compra 2024-08-19 18:16:42 -05:00
edaf8f4c77 Fix: Se agrega scroll para desbordamiento de lineas 2024-08-19 17:39:51 -05:00
939745cd54 Se agregan estilos de sidebar 2024-08-19 17:05:30 -05:00
f250cdada2 view(css): add style to main menu. 2024-08-17 19:07:06 -05:00
0e15192f37 view: using base template. 2024-08-17 18:25:41 -05:00
980deb61f9 feat(View): add base template and menu. 2024-08-17 18:25:05 -05:00
9260230d38 Merge branch 'main' into make_payment_with_efective_purchase_#13 2024-08-17 16:46:05 -05:00
f847a0e16a migation. 2024-08-17 16:40:13 -05:00
0c95c21666 feat(Payments): Generate cash payment with purchase. 2024-08-17 16:39:29 -05:00
1f37e57e00 feat(Buy): add transaction on buy process. 2024-08-17 15:07:43 -05:00
7eb8f40d7a style(views): minor fix. 2024-08-17 14:57:46 -05:00
a401029082 fix view(Buy): rewrite save process. 2024-08-17 14:50:49 -05:00
2a9a73c430 refactor(Forms): rename varible. 2024-08-17 14:34:10 -05:00
4c0c4737ac migration(Customer): default None. 2024-08-17 14:29:20 -05:00
204bdbcb33 limit to CASH methods type in purchases. 2024-08-17 12:51:38 -05:00
1a54426af6 style(models): minor fix. 2024-08-17 12:49:43 -05:00
45199030a0 Feat: Calculo de subtotal para muchas lineas 2024-08-17 11:31:02 -05:00
c10aa4b9ca Feat: Se agrega calculo de subtotal para 1 sola linea 2024-08-17 11:31:02 -05:00
8f611a523b make customer name required field. 2024-08-17 09:48:36 -05:00
de4bb52346 fix: purchase summary test. 2024-08-17 08:44:06 -05:00
521d3b63fa Merge pull request 'Añadida vista resumen de compra' (#16) from summary_view_purchase into main
Reviewed-on: OneTeam/don_confiao#16
2024-08-10 13:03:11 -05:00
cosmos
6decc963f6 Fix(views): Add sub total to purchase summary 2024-08-10 13:01:04 -05:00
cosmos
91bb2bce93 Add basic information 2024-08-10 10:55:03 -05:00
cosmos
108d983d74 Add Summary View Purchase 2024-08-03 12:37:21 -05:00
8d29202d3a Fix: Product name unique 2024-08-03 11:33:11 -05:00
19a1ba29d7 Feat: Se agrega modelo de terceros closed #15 2024-08-03 11:23:33 -05:00
e9e64f58db Fix: Campo product a Many2One 2024-08-03 10:27:47 -05:00
b2ab71e7a4 payment: remove unused test. 2024-08-03 09:42:32 -05:00
a636264e4f view: agregando forma de pago en formulario de compra. 2024-07-27 17:48:09 -05:00
7b74e4d381 fix: typo. 2024-07-27 17:47:04 -05:00
83bab78182 view: Convertidos a solo lecturas los campos de resumen de compra. 2024-07-27 17:30:33 -05:00
c993225daf refactor: string to variable. 2024-07-27 17:29:09 -05:00
b4b6144611 view: calculando resumen de compra. 2024-07-27 17:12:52 -05:00
599b62771c minor fix. 2024-07-27 15:43:29 -05:00
a9ab0f4ee7 test: move to tests folder. 2024-07-27 15:21:04 -05:00
c6ca0feb11 view: add product_list. 2024-07-27 14:58:16 -05:00
72bf284dfd fix merge error. 2024-07-27 13:41:01 -05:00
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
4b9983b0db fet: Se añaden migraciones 2024-06-22 10:37:34 -05:00
1152b7e2bd FEAT: Se añade TestBobo 2024-06-22 09:57:23 -05:00
e77b426044 ENV: Creación aplicacin Django 2024-06-22 09:52:44 -05:00