don_confiao_backend

OneTeam/don_confiao_backend

Fork 0

Commit Graph

Select branches

Hide Pull Requests

add_external_id_in_api_sale_fields_#17

add_payment_method_to_tryton_sale_on_notes_field_#21

add_self_pick_up_to_sales_in_tryton_#23

export_sales_to_tryton_#9

main

send_sales_to_tryton_in_a_no_bloqueant_way_#16

#1

#12

#13

#15

#18

#19

#2

#24

#25

#4

#6

#8

0.1

0.1.1

0.1.2

0.1.4

0.1.5

0.1.6

0.1.7

f2befda953 view(Purchase): add products to purchase. Mono Mono 2024-09-28 16:20:47 -05:00
98d173bf00 fix(Vuetify): minor fix. Mono Mono 2024-09-28 16:10:59 -05:00
a517c2323f Merge pull request 'Adicionando viuetify y dockers para correr el proyecto completo' (#34) from experiment_sale_with_vuetify_#33 into main mono 2024-09-28 16:03:56 -05:00
9857b90cd4 ci(dev): fix port npm to run on docker. Mono Mono 2024-09-28 16:03:03 -05:00
f14d27e83c ci(Docker): try to run npm on docker. Mono Mono 2024-09-28 15:49:30 -05:00
2c8911fb78 ci(Dev): Using docker to serve django and vue on same host. Mono Mono 2024-09-28 14:04:13 -05:00
a7147d1850 view(Purchase): add client list from requesta as example. Mono Mono 2024-09-28 14:03:46 -05:00
8329f3231d view(Front): seek date on purchase form. Mono Mono 2024-09-21 14:16:22 -05:00
ffbb2e53d8 feat(Front): add purchase vue form. Mono Mono 2024-09-21 13:03:22 -05:00
cf93fecf9f ci(Frontend): create vuetify proyect. Mono Mono 2024-09-12 23:02:35 -05:00
a43891942b Merge pull request 'Implementando api' (#32) from implement_api into main mono 2024-09-08 22:39:15 -05:00
86b231a828 Merge branch 'main' into implement_api Mono Mono 2024-09-08 22:36:36 -05:00
19a618a671 fix(api): remove SaleWithLinesViewSet. Mono Mono 2024-09-08 22:33:41 -05:00
5adf9a9ce7 feat(api): implement endpoints to products, customer and sales. Mono Mono 2024-09-08 21:42:35 -05:00
eaa856e9da feat(api): implemented create sale as api endpoint. Mono Mono 2024-09-07 21:33:49 -05:00
c0329c789a Merge pull request 'ExportTrytonSaleLine' (#31) from ExportTrytonSaleLine into main Rodia 2024-09-07 15:25:45 -05:00
a83cd970e6 Feat: Export Ventas Para Tryton sinergia 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 Rodia 2024-09-07 08:10:57 -05:00
603230beda Fix: Export Sale Line Rodia 2024-09-07 08:07:35 -05:00
02fbf51659 Merge pull request 'Agregando precio del producto al seleccionar el producto #24' (#30) from automatic_product_price_#24 into main mono 2024-08-31 13:01:54 -05:00
74bc963096 Merge branch 'main' into automatic_product_price_#24 Mono Mono 2024-08-31 13:01:14 -05:00
99ae098c1d fix(Purchase): set price based on product in all lines. Mono Mono 2024-08-31 12:38:17 -05:00
1b1a504bf5 feat(view): set price based on product select on first line from purchase. Mono Mono 2024-08-31 12:04:01 -05:00
f1d96467d6 feat(buy): send products list to buy view. Mono Mono 2024-08-31 09:46:03 -05:00
0b5163c680 Merge pull request 'Fix: Se corrijen etiquetas de form' (#25) from BugBotonComprarNoFunciona into main Rodia 2024-08-24 10:46:13 -05:00
9d06a588c8 Fix: Se corrijen etiquetas de form Rodia 2024-08-24 10:46:42 -05:00
23ec2bc298 refactor: move Products list logic to model. Mono Mono 2024-08-24 10:30:58 -05:00
77361c13db Merge pull request 'feature/estilos_don_confiao_comprar' (#23) from feature/estilos_don_confiao_comprar into main Camilo Gonzalez 2024-08-21 16:33:34 -05:00
e9e4e0e38d Fix: Se cambia tono de verde y shadow en botones sinergia 2024-08-19 21:30:09 -05:00
384fd3c7f8 Feat: Estilo botones Resumen de Venta sinergia 2024-08-19 19:44:58 -05:00
d9f54ce12b Feat: Se agrega logo y titulo a sidebar sinergia 2024-08-19 19:25:40 -05:00
157095dede Se agregan estilos a resumen de compra camilogs 2024-08-19 18:52:06 -05:00
027f7d75b6 fix: Scrollear lineas oculta botón de agregar camilogs 2024-08-19 18:34:28 -05:00
b0251b882e Se agregan estilos de lineas de compra camilogs 2024-08-19 18:16:42 -05:00
edaf8f4c77 Fix: Se agrega scroll para desbordamiento de lineas sinergia 2024-08-19 17:39:51 -05:00
939745cd54 Se agregan estilos de sidebar camilogs 2024-08-19 17:05:30 -05:00
e84c45b238 Merge pull request 'Creando plantilla base con menú #21' (#22) from make_menu_and_base_template_#21 into main mono 2024-08-17 19:35:24 -05:00
f250cdada2 view(css): add style to main menu. Mono Mono 2024-08-17 19:07:06 -05:00
0e15192f37 view: using base template. Mono Mono 2024-08-17 18:25:41 -05:00
980deb61f9 feat(View): add base template and menu. Mono Mono 2024-08-17 18:25:05 -05:00
844372d585 Merge pull request 'Registrar pagos completos con compras en efectivo #13' (#20) from make_payment_with_efective_purchase_#13 into main mono 2024-08-17 16:47:02 -05:00
9260230d38 Merge branch 'main' into make_payment_with_efective_purchase_#13 Mono Mono 2024-08-17 16:46:05 -05:00
f847a0e16a migation. Mono Mono 2024-08-17 16:40:13 -05:00
0c95c21666 feat(Payments): Generate cash payment with purchase. Mono Mono 2024-08-17 16:39:29 -05:00
1f37e57e00 feat(Buy): add transaction on buy process. Mono Mono 2024-08-17 15:07:43 -05:00
7eb8f40d7a style(views): minor fix. Mono Mono 2024-08-17 14:57:46 -05:00
a401029082 fix view(Buy): rewrite save process. Mono Mono 2024-08-17 14:50:49 -05:00
2a9a73c430 refactor(Forms): rename varible. Mono Mono 2024-08-17 14:34:10 -05:00
4c0c4737ac migration(Customer): default None. Mono Mono 2024-08-17 14:29:20 -05:00
204bdbcb33 limit to CASH methods type in purchases. Mono Mono 2024-08-17 12:51:38 -05:00
1a54426af6 style(models): minor fix. Mono Mono 2024-08-17 12:49:43 -05:00
45199030a0 Feat: Calculo de subtotal para muchas lineas Rodia 2024-08-17 11:30:24 -05:00
c10aa4b9ca Feat: Se agrega calculo de subtotal para 1 sola linea Rodia 2024-08-17 09:18:48 -05:00
efad80970b Merge pull request 'make customer name required field #17' (#19) from make_customer_name_required_#17 into main mono 2024-08-17 10:30:30 -05:00
8f611a523b make customer name required field. Mono Mono 2024-08-17 09:48:36 -05:00
398f7f2c36 Merge pull request 'fix: purchase summary test.' (#18) from fix_master_customer_test into main mono 2024-08-17 08:45:44 -05:00
de4bb52346 fix: purchase summary test. Mono Mono 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 Cosmos 2024-08-10 13:03:11 -05:00
6decc963f6 Fix(views): Add sub total to purchase summary cosmos 2024-08-10 13:01:04 -05:00
91bb2bce93 Add basic information cosmos 2024-08-10 10:55:03 -05:00
108d983d74 Add Summary View Purchase cosmos 2024-08-03 12:37:21 -05:00
8d29202d3a Fix: Product name unique sinergia 2024-08-03 11:33:11 -05:00
19a1ba29d7 Feat: Se agrega modelo de terceros closed #15 sinergia 2024-08-03 11:23:33 -05:00
e9e64f58db Fix: Campo product a Many2One sinergia 2024-08-03 10:27:47 -05:00
6f4ac50a58 Merge pull request 'Adicionar resumen de compra en el formulario de compra' (#14) from pagar_una_compra_en_efectivo_#13 into main mono 2024-08-03 09:45:26 -05:00
b2ab71e7a4 payment: remove unused test. Mono Mono 2024-08-03 09:42:32 -05:00
a636264e4f view: agregando forma de pago en formulario de compra. Mono Mono 2024-07-27 17:48:09 -05:00
7b74e4d381 fix: typo. Mono Mono 2024-07-27 17:47:04 -05:00
83bab78182 view: Convertidos a solo lecturas los campos de resumen de compra. Mono Mono 2024-07-27 17:30:33 -05:00
c993225daf refactor: string to variable. Mono Mono 2024-07-27 17:29:09 -05:00
b4b6144611 view: calculando resumen de compra. Mono Mono 2024-07-27 17:12:52 -05:00
599b62771c minor fix. Mono Mono 2024-07-27 15:43:29 -05:00
a9ab0f4ee7 test: move to tests folder. Mono Mono 2024-07-27 15:21:04 -05:00
c6ca0feb11 view: add product_list. Mono Mono 2024-07-27 14:58:16 -05:00
9409eeb94a Merge pull request 'Modelar cuadre de caja #10' (#12) from modelar_cuadre_de_caja_#10 into main mono 2024-07-27 13:42:05 -05:00
72bf284dfd fix merge error. Mono Mono 2024-07-27 13:41:01 -05:00
ef281d8ecc Merge branch 'main' into modelar_cuadre_de_caja_#10 Mono Mono 2024-07-27 13:37:48 -05:00
09f734f5cb feat: create a correct reconciliation jar. Mono Mono 2024-07-27 13:32:31 -05:00
675b4f059f feat: implementing form to reconciliation jar. Mono Mono 2024-07-27 13:30:14 -05:00
9edbd1caef Feat(ReplaceNameIdSaleLine) Rodia 2024-07-13 11:25:12 -05:00
b70a0b73c3 Feat(AddSaleLineButton): Sale Line Button Rodia 2024-07-13 11:01:11 -05:00
cb84371f4b Feat(ButtonAddLine): Añadir linea de venta en formulario WIP Rodia 2024-07-12 23:40:43 -05:00
b94c5a0070 feat: Se agrega testform sinergia 2024-07-12 22:38:07 -05:00
02fba454ba Fix: Clean Home, Crear lineas de Venta Mono Mono 2024-07-27 13:19:37 -05:00
5879296132 fix: ReconciliationJar. Mono Mono 2024-07-27 12:37:31 -05:00
a3c8189d8c feat: create a correct reconciliation jar. Mono Mono 2024-07-20 11:44:49 -05:00
ef2f630dba Merge pull request 'AddSaleLineButton' (#11) from AddSaleLineButton into main Rodia 2024-07-20 09:22:22 -05:00
08deb9d4ec view: improve reconciliate_jar. Mono Mono 2024-07-13 17:48:57 -05:00
74d2e0d234 admin: set Payment and reconciliatoJar in admin Mono Mono 2024-07-13 17:38:33 -05:00
f9ee2ad9c2 view: improve reconciliate_jar template. Mono Mono 2024-07-13 17:38:12 -05:00
3570af7b60 refactor: rename column. Mono Mono 2024-07-13 17:17:45 -05:00
a8f8820a55 feat: implementing form to reconciliation jar. Mono Mono 2024-07-13 17:13:17 -05:00
ee38c29ce3 feat: implement reconciliation jar summary. Mono Mono 2024-07-13 11:43:16 -05:00
9ecd949123 Feat(ReplaceNameIdSaleLine) Rodia 2024-07-13 11:25:12 -05:00
3e35807a87 Feat(AddSaleLineButton): Sale Line Button Rodia 2024-07-13 11:01:11 -05:00
a63ae668a2 Feat(ButtonAddLine): Añadir linea de venta en formulario WIP Rodia 2024-07-12 23:40:43 -05:00
6795aa3dcc feat: Se agrega testform sinergia 2024-07-12 22:38:07 -05:00
7223c0c9a9 Fix: Clean Home, Crear lineas de Venta sinergia 2024-07-12 22:00:37 -05:00
7b0bee8313 Merge pull request 'purchase_view_a_formularios_de_django' (#8) from purchase_view_a_formularios_de_django into main mono 2024-07-06 09:42:32 -05:00
2425ecc811 style: agregando descripción a los modelos Mono Mono 2024-07-06 09:30:35 -05:00