Compare commits

...

7 Commits
Dev ... master

Author SHA1 Message Date
3ea4f57c9e
Manufacturando -> Manufactura
All checks were successful
continuous-integration/drone/push Build is passing
2024-04-24 01:41:30 -06:00
f8b09e6664
embalaje
All checks were successful
continuous-integration/drone/push Build is passing
2024-04-24 01:14:50 -06:00
1ae83ca664
supply orders
All checks were successful
continuous-integration/drone/push Build is passing
2024-04-24 00:58:29 -06:00
169f3cafc9
👷 deploy to all hive nodes
All checks were successful
continuous-integration/drone/push Build is passing
2024-04-24 00:48:00 -06:00
f68f2c72fc
es: perfil tributario -> perfil de impuestos 2024-04-20 09:17:08 -06:00
38d40ca9fc
es: orden de abastecimiento
Some checks failed
continuous-integration/drone/push Build is failing
2024-04-19 19:13:38 -06:00
ce1a26eeb1 Merge pull request 'Dev' (#1) from Dev into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #1
2024-03-29 22:31:39 +00:00
2 changed files with 91 additions and 24 deletions

View File

@ -3,14 +3,14 @@ type: docker
name: default name: default
steps: steps:
- name: clean environment - name: clean environment node1
image: appleboy/drone-ssh image: appleboy/drone-ssh
when: when:
branch: branch:
- master - master
settings: settings:
host: host:
from_secret: host from_secret: host1
user: apphive user: apphive
key: key:
from_secret: git_usr_rsa_key from_secret: git_usr_rsa_key
@ -19,14 +19,82 @@ steps:
- cd /app/locale || exit - cd /app/locale || exit
- echo > dummy.txt || exit - echo > dummy.txt || exit
- rm -rf * - rm -rf *
- name: copy files - name: copy files host1
image: appleboy/drone-scp image: appleboy/drone-scp
depends_on:
- clean environment node1
when: when:
branch: branch:
- master - master
settings: settings:
host: host:
from_secret: host from_secret: host1
user: apphive
key:
from_secret: git_usr_rsa_key
port: 22
command_timeout: 2m
target: /app/locale
source: ./
- name: clean environment node2
image: appleboy/drone-ssh
when:
branch:
- master
settings:
host:
from_secret: host2
user: apphive
key:
from_secret: git_usr_rsa_key
port: 22
script:
- cd /app/locale || exit
- echo > dummy.txt || exit
- rm -rf *
- name: copy files host2
image: appleboy/drone-scp
depends_on:
- clean environment node2
when:
branch:
- master
settings:
host:
from_secret: host2
user: apphive
key:
from_secret: git_usr_rsa_key
port: 22
command_timeout: 2m
target: /app/locale
source: ./
- name: clean environment node3
image: appleboy/drone-ssh
when:
branch:
- master
settings:
host:
from_secret: host3
user: apphive
key:
from_secret: git_usr_rsa_key
port: 22
script:
- cd /app/locale || exit
- echo > dummy.txt || exit
- rm -rf *
- name: copy files host3
image: appleboy/drone-scp
depends_on:
- clean environment node3
when:
branch:
- master
settings:
host:
from_secret: host3
user: apphive user: apphive
key: key:
from_secret: git_usr_rsa_key from_secret: git_usr_rsa_key

View File

@ -25,8 +25,7 @@ msgstr "el tipo de partida no pertenece a la misma compañía"
#: acc/api/serializers/__init__.py:67 #: acc/api/serializers/__init__.py:67
#: acc/api/serializers/policy_from_purchases.py:46 acc/api/views/viewsets.py:98 #: acc/api/serializers/policy_from_purchases.py:46 acc/api/views/viewsets.py:98
msgid "period for given date does not exists or is not open" msgid "period for given date does not exists or is not open"
msgstr "" msgstr "el perÍodo para la fecha proporcionada no existe o no se encuentra abierto"
"el perÍodo para la fecha proporcionada no existe o no se encuentra abierto"
#: acc/api/serializers/__init__.py:85 #: acc/api/serializers/__init__.py:85
#, python-format #, python-format
@ -2420,7 +2419,7 @@ msgstr "modelo %(model)s no se encuentra en estado 'no facturado'"
#. no tiene presentación configurada #. no tiene presentación configurada
#: bms/models/common.py:1120 #: bms/models/common.py:1120
msgid "attempted to sell stock, but offer does not have packaging configured" msgid "attempted to sell stock, but offer does not have packaging configured"
msgstr "intenté vender stock, pero la oferta no tiene el embalaje configurado" msgstr "se esta intentando vender producto inventareado, pero la oferta no tiene el presentación configurada"
#: bms/models/common.py:1199 #: bms/models/common.py:1199
msgid "item total price should not be lower than zero" msgid "item total price should not be lower than zero"
@ -3110,7 +3109,7 @@ msgid ""
"view" "view"
msgstr "" msgstr ""
"este atributo seráusado para ordenar en la vista de consolidación de pedidos " "este atributo seráusado para ordenar en la vista de consolidación de pedidos "
"de suministro" "de abastecimiento"
#. Translators: Sucursales #. Translators: Sucursales
#: core/models/branch.py:54 core/templates/core/base.html:267 #: core/models/branch.py:54 core/templates/core/base.html:267
@ -3451,12 +3450,12 @@ msgstr "aplicabilidad"
#: core/models/tax.py:232 #: core/models/tax.py:232
msgid "Tax Profile" msgid "Tax Profile"
msgstr "Perfil Tributario" msgstr "Perfil de Impuestos"
#. Translators: Impuestos #. Translators: Impuestos
#: core/models/tax.py:233 core/templates/core/base.html:291 #: core/models/tax.py:233 core/templates/core/base.html:291
msgid "Tax Profiles" msgid "Tax Profiles"
msgstr "Perfiles Tributarios" msgstr "Perfiles de Impuestos"
#: core/models/tenant.py:12 lm/models/product.py:77 #: core/models/tenant.py:12 lm/models/product.py:77
msgid "brand" msgid "brand"
@ -3795,17 +3794,17 @@ msgstr "Ajuste de Inventario"
#: core/templates/core/base.html:553 core/templates/core/base2.html:431 #: core/templates/core/base.html:553 core/templates/core/base2.html:431
#: lm/models/supply_order.py:60 #: lm/models/supply_order.py:60
msgid "Supply Orders" msgid "Supply Orders"
msgstr "Órdenes de Suministo" msgstr "Órdenes de Abastecimiento"
#. Translators: Ordenes de Abastecimiento #. Translators: Ordenes de Abastecimiento
#: core/templates/core/base.html:561 core/templates/core/base2.html:439 #: core/templates/core/base.html:561 core/templates/core/base2.html:439
msgid "Supply Orders Consolidation" msgid "Supply Orders Consolidation"
msgstr "Consolidación de Órdenes de Suministro" msgstr "Consolidación de Órdenes de Abastecimiento"
#. Translators: Modulo de Manufactura #. Translators: Modulo de Manufactura
#: core/templates/core/base.html:574 core/templates/core/base2.html:452 #: core/templates/core/base.html:574 core/templates/core/base2.html:452
msgid "Manufacturing" msgid "Manufacturing"
msgstr "Manufacturando" msgstr "Manufactura"
#. Translators: Producto Combo #. Translators: Producto Combo
#: core/templates/core/base.html:583 core/templates/core/base2.html:461 #: core/templates/core/base.html:583 core/templates/core/base2.html:461
@ -4325,7 +4324,7 @@ msgstr "día de cobro"
#: crm/models/customer.py:82 lm/models/product.py:100 mm/models/provider.py:58 #: crm/models/customer.py:82 lm/models/product.py:100 mm/models/provider.py:58
#: offer/models/offer.py:64 #: offer/models/offer.py:64
msgid "tax profile" msgid "tax profile"
msgstr "perfil tributario" msgstr "perfil de impuestos"
#. Translators: ES: Numero de Teléfono #. Translators: ES: Numero de Teléfono
#: crm/templates/crm/agent_list.html:53 #: crm/templates/crm/agent_list.html:53
@ -4513,7 +4512,7 @@ msgstr "el usuario no pertenece a la sucursal solicitada"
#: lm/api/serializers/supply_order.py:80 lm/api/serializers/supply_order.py:100 #: lm/api/serializers/supply_order.py:80 lm/api/serializers/supply_order.py:100
msgid "supply order does not belongs to same user's tenant" msgid "supply order does not belongs to same user's tenant"
msgstr "la orden de suministro no pertenece a la misma compañía del usuario" msgstr "la orden de abastecimiento no pertenece a la misma compañía del usuario"
#: lm/api/serializers/transaction.py:54 #: lm/api/serializers/transaction.py:54
msgid "user and product do not belong to same tenant" msgid "user and product do not belong to same tenant"
@ -4651,7 +4650,7 @@ msgstr "Ajustar"
#: lm/models/adjust.py:97 #: lm/models/adjust.py:97
msgid "Adjusts" msgid "Adjusts"
msgstr "Ajusta" msgstr "Ajustes"
#: lm/models/adjust.py:100 #: lm/models/adjust.py:100
msgid "Can apply Adjust" msgid "Can apply Adjust"
@ -4727,7 +4726,7 @@ msgstr "historial de existencia"
#: lm/models/shipment_item.py:46 lm/models/shipment_item.py:54 #: lm/models/shipment_item.py:46 lm/models/shipment_item.py:54
#: offer/models/offer.py:94 #: offer/models/offer.py:94
msgid "packaging" msgid "packaging"
msgstr "embalaje" msgstr "presentacion"
#: lm/models/adjust_item.py:63 lm/models/shipment_item.py:70 #: lm/models/adjust_item.py:63 lm/models/shipment_item.py:70
msgid "converted quantity" msgid "converted quantity"
@ -4827,7 +4826,7 @@ msgstr "sku"
#: lm/models/packaging.py:19 #: lm/models/packaging.py:19
msgid "is available for supply order" msgid "is available for supply order"
msgstr "está disponible para la orden de suministro" msgstr "está disponible para la orden de abastecimiento"
#: lm/models/packaging.py:46 #: lm/models/packaging.py:46
msgid "this sku already exists" msgid "this sku already exists"
@ -5258,15 +5257,15 @@ msgstr "procesada por"
#: lm/models/supply_order.py:59 lm/templates/lm/supplyorder_detail.html:14 #: lm/models/supply_order.py:59 lm/templates/lm/supplyorder_detail.html:14
msgid "Supply Order" msgid "Supply Order"
msgstr "Orden de Suministro" msgstr "Orden de Abastecimiento"
#: lm/models/supply_order.py:65 #: lm/models/supply_order.py:65
msgid "Can view Supply Order consolidation" msgid "Can view Supply Order consolidation"
msgstr "Puede ver la consolidación de Ordenes de Suministro" msgstr "Puede ver la consolidación de Ordenes de Abastecimiento"
#: lm/models/supply_order.py:85 #: lm/models/supply_order.py:85
msgid "supply order" msgid "supply order"
msgstr "orden de suministro" msgstr "orden de abastecimiento"
#: lm/models/supply_order.py:99 #: lm/models/supply_order.py:99
msgid "shipment_item" msgid "shipment_item"
@ -5278,11 +5277,11 @@ msgstr "cantidad enviada"
#: lm/models/supply_order.py:118 #: lm/models/supply_order.py:118
msgid "Supply Order Item" msgid "Supply Order Item"
msgstr "Ítem de la Orden de Suministro" msgstr "Ítem de la Orden de Abastecimiento"
#: lm/models/supply_order.py:119 #: lm/models/supply_order.py:119
msgid "Supply Order Items" msgid "Supply Order Items"
msgstr "Ítems de la Orden de Suministro" msgstr "Ítems de la Orden de Abastecimiento"
#: lm/models/transaction.py:24 pos/models/adjust_typology.py:18 #: lm/models/transaction.py:24 pos/models/adjust_typology.py:18
msgid "modification" msgid "modification"
@ -5734,7 +5733,7 @@ msgstr "Consolidar"
#: lm/templates/lm/supplyorder_list.html:49 #: lm/templates/lm/supplyorder_list.html:49
msgid "Check" msgid "Check"
msgstr "Cheque" msgstr "Marcar"
#. Translators: ES: Afectación #. Translators: ES: Afectación
#: lm/templates/lm/typology_list.html:46 #: lm/templates/lm/typology_list.html:46