From cbac58502e3610ddbc0518fcddb068e214a1452c Mon Sep 17 00:00:00 2001
From: Josue Gomez <jgomez@jesrat.com>
Date: Tue, 10 Oct 2023 16:06:27 -0600
Subject: [PATCH] nuevas traducciones

---
 .gitignore               |    3 +-
 es/LC_MESSAGES/django.po | 4729 ++++++++++++++++++++++++++------------
 2 files changed, 3299 insertions(+), 1433 deletions(-)

diff --git a/.gitignore b/.gitignore
index c90071a..b5c2a53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-*.mo
\ No newline at end of file
+*.mo
+.DS_Store
\ No newline at end of file
diff --git a/es/LC_MESSAGES/django.po b/es/LC_MESSAGES/django.po
index ee3eecb..0fa847e 100644
--- a/es/LC_MESSAGES/django.po
+++ b/es/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-02-28 21:48+0000\n"
+"POT-Creation-Date: 2023-10-10 22:05+0000\n"
 "PO-Revision-Date: 2022-12-28 09:39-0600\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -18,6 +18,49 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 3.2.2\n"
 
+#: acc/api/serializers/__init__.py:56
+#, fuzzy
+#| msgid "purchase order does not belongs to the user's tenant"
+msgid "policy type does not belongs to same tenant"
+msgstr "orden de compra no pertenece al usuario de la entidad"
+
+#: acc/api/serializers/__init__.py:67
+#: 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"
+msgstr "periodo para fecha especificada no existe o no se encuentra abierto"
+
+#: acc/api/serializers/__init__.py:85
+#, fuzzy, python-format
+#| msgid "product for given code %(code)s does not exists"
+msgid "account for given code %(code)s does not exists"
+msgstr "el producto para el código dado %(code)s no existe"
+
+#: acc/api/serializers/__init__.py:97
+#, fuzzy, python-format
+#| msgid "product for given code %(code)s does not exists"
+msgid "cost center for given code %(code)s does not exists"
+msgstr "el producto para el código dado %(code)s no existe"
+
+#: acc/api/serializers/__init__.py:145
+#, fuzzy, python-format
+msgid "account %(code)s does not exists"
+msgstr "la sucursal para el código dado %(code)s no existe"
+
+#: acc/api/serializers/__init__.py:155
+#, fuzzy, python-format
+msgid "cost center %(code)s does not exists"
+msgstr "la sucursal para el código dado %(code)s no existe"
+
+#: acc/api/views/policy.py:188
+#, fuzzy
+#| msgid "Policy Record"
+msgid "policy has not records"
+msgstr "Registro de Partida Contable"
+
+#: acc/api/views/policy.py:190
+msgid "debits and credits are not equal"
+msgstr ""
+
 #: acc/apps.py:8
 msgid "Accounting Module"
 msgstr "Módulo de Contabilidad"
@@ -26,128 +69,183 @@ msgstr "Módulo de Contabilidad"
 msgid "Month"
 msgstr "Mes"
 
-#: acc/forms.py:47 acc/forms.py:101 acc/models/account.py:41
-#: acc/templates/acc/balance_sheet.html:35
-#: acc/templates/acc/p_n_l_statement.html:35
+#: acc/forms.py:55 acc/forms.py:119 acc/models/account.py:52
+#: acc/templates/acc/balance_sheet.html:37
+#: acc/templates/acc/balance_sheet.html:59
+#: acc/templates/acc/journal_ledger.html:47
+#: acc/templates/acc/p_n_l_statement.html:27
 #: acc/templates/acc/policy_detail.html:62
-#: acc/templates/acc/policy_form.html:93
-#: acc/templates/acc/policy_form_edit.html:91
-#: acc/templates/acc/policy_form_purchase.html:95
-#: acc/templates/acc/trial_balance.html:35
+#: acc/templates/acc/policy_form.bk.html:93
+#: acc/templates/acc/policy_form_edit.html:125
+#: acc/templates/acc/policy_form_purchase.html:108
+#: acc/templates/acc/policy_form_sale.html:95
+#: acc/templates/acc/trial_balance.html:40 acc/views/journal_ledger.py:136
+#: acc/views/taxpayer_sales.py:68 acc/views/trial_balance.py:58
 #: sync/templates/sync/syncrecord_detail.html:114
 msgid "Account"
 msgstr "Cuenta"
 
-#: acc/forms.py:78 acc/models/period_account.py:13 acc/models/policy.py:41
-msgid "period"
-msgstr "periodo"
-
-#: acc/forms.py:79
-msgid "Level"
-msgstr ""
-
-#: acc/forms.py:98 acc/models/period.py:37
-msgid "Period"
-msgstr "Periodo"
-
-#: acc/forms.py:104 acc/models/cost_center.py:24
-#: acc/templates/acc/policy_list_journal.html:68
-msgid "Cost Center"
-msgstr "Centro de Costo"
-
-#: acc/forms.py:124 banks/forms.py:47 bms/forms.py:76 mm/forms.py:167
-#: rcm/templates/rcm/offer_list.html:36 sync/forms.py:10
+#: acc/forms.py:57 acc/forms.py:142 acc/forms.py:158 banks/forms.py:59
+#: bms/forms.py:100 bms/views/sale/forms.py:96 lm/forms.py:220 mm/forms.py:212
+#: mm/forms.py:226 offer/templates/offer/offer_list.html:67 sync/forms.py:10
 msgid "From"
 msgstr "Desde"
 
-#: acc/forms.py:125 banks/forms.py:48 bms/forms.py:77 mm/forms.py:168
-#: rcm/templates/rcm/offer_list.html:37 sync/forms.py:11
+#: acc/forms.py:58 acc/forms.py:143 acc/forms.py:159 banks/forms.py:60
+#: bms/forms.py:101 bms/views/sale/forms.py:100 lm/forms.py:221 mm/forms.py:213
+#: mm/forms.py:227 offer/templates/offer/offer_list.html:68 sync/forms.py:11
 msgid "To"
 msgstr "Hasta"
 
-#: acc/models/account.py:9
+#: acc/forms.py:90 acc/models/period_account.py:13 acc/models/policy.py:66
+msgid "period"
+msgstr "periodo"
+
+#: acc/forms.py:91
+msgid "Level"
+msgstr ""
+
+#: acc/forms.py:116 acc/models/period.py:45 acc/views/journal_ledger.py:19
+msgid "Period"
+msgstr "Periodo"
+
+#: acc/forms.py:122 acc/models/cost_center.py:24
+#: acc/templates/acc/policy_list_journal.html:78
+msgid "Cost Center"
+msgstr "Centro de Costo"
+
+#: acc/forms.py:155 acc/models/period_account.py:21 acc/models/policy.py:142
+#: banks/models/petty_cash.py:14 banks/models/petty_cash_transaction.py:10
+#: banks/models/pos_terminal.py:18 banks/models/transaction.py:19
+#: banks/models/transaction.py:33 banks/models/transaction.py:149
+#: banks/models/wallet.py:17 banks/models/wallet.py:24
+#: bms/models/common.py:1061 bms/models/discount.py:24 bms/models/tax.py:21
+#: core/models/tax.py:104 crm/models/customer.py:49 lm/models/category.py:22
+#: lm/models/product.py:52 lm/models/warehouse.py:27 mm/forms.py:240
+#: mm/models/payment.py:23 mm/models/provider.py:47 mm/models/purchase.py:53
+#: sync/models.py:53
+msgid "account"
+msgstr "cuenta"
+
+#: acc/models/account.py:8
 msgid "positive"
 msgstr "acreedora"
 
-#: acc/models/account.py:10
+#: acc/models/account.py:9
 msgid "negative"
 msgstr "deudora"
 
-#: acc/models/account.py:12 acc/models/cost_center.py:7
-#: acc/models/revenue.py:56 bms/models/common.py:606 bms/models/discount.py:11
-#: bms/models/tax.py:8 core/models.py:362 crm/models/customer.py:9
-#: hr/models/common.py:7 hr/models/common.py:28 hr/models/common.py:49
-#: lm/models/brand.py:7 lm/models/category.py:8 lm/models/product.py:18
-#: lm/models/shipment_item.py:15 lm/models/transaction.py:56
-#: lm/models/warehouse.py:8 mm/models/provider.py:13 mm/models/tax.py:8
-#: pos/models/fiscal_document.py:7 pos/models/pos.py:9 rcm/models/offer.py:9
+#: acc/models/account.py:12 banks/models/petty_cash.py:10
+#: banks/models/petty_cash_transaction.py:16 banks/models/wallet.py:19
+#: mm/models/provider.py:53 mm/models/purchase.py:174
+msgid "balance"
+msgstr "saldo"
+
+#: acc/models/account.py:13
+msgid "result"
+msgstr ""
+
+#: acc/models/account.py:15 acc/models/cost_center.py:7
+#: acc/models/revenue.py:56 bms/models/common.py:1050 bms/models/discount.py:11
+#: bms/models/tax.py:8 core/models/branch.py:9
+#: core/models/business_partner.py:7 core/models/fiscal_document.py:7
+#: core/models/fiscal_document.py:33 core/models/tax.py:19
+#: core/models/tax.py:88 core/models/tax.py:183 core/models/user.py:77
+#: crm/models/customer.py:20 hr/models/common.py:7 hr/models/common.py:29
+#: hr/models/common.py:51 lm/models/brand.py:7 lm/models/category.py:9
+#: lm/models/product.py:21 lm/models/shipment_item.py:17
+#: lm/models/transaction.py:17 lm/models/warehouse.py:9
+#: mm/models/provider.py:12 offer/models/offer.py:20 pos/models/pos.py:12
+#: pos/models/pos.py:13
 msgid "code"
 msgstr "código"
 
-#: acc/models/account.py:13 acc/models/cost_center.py:8
-#: acc/models/revenue.py:57 banks/models/bank.py:13 banks/models/wallet.py:18
-#: bms/models/discount.py:12 bms/models/tax.py:9 core/models.py:47
-#: core/models.py:95 core/models.py:364 hr/models/common.py:8
-#: hr/models/common.py:29 lm/models/brand.py:8 lm/models/category.py:9
-#: lm/models/transaction.py:19 lm/models/transaction.py:57
-#: lm/models/warehouse.py:9 mm/models/provider.py:15 mm/models/purchase.py:137
-#: mm/models/purchase_order.py:26 mm/models/purchase_requisition.py:24
-#: mm/models/tax.py:9 pos/models/fiscal_document.py:8 pos/models/pos.py:10
-#: rcm/models/attributes.py:7 rcm/models/attributes.py:38
-#: rcm/models/offer_options_group.py:10 sync/models.py:34
+#: acc/models/account.py:16 acc/models/cost_center.py:8 acc/models/policy.py:12
+#: acc/models/revenue.py:57 banks/models/bank.py:13
+#: banks/models/petty_cash.py:7 banks/models/pos_terminal.py:8
+#: banks/models/wallet.py:18 bms/models/discount.py:12 bms/models/tax.py:9
+#: core/models/branch.py:11 core/models/business_partner.py:9
+#: core/models/country.py:7 core/models/fiscal_document.py:9
+#: core/models/fiscal_document.py:35 core/models/tax.py:20
+#: core/models/tax.py:90 core/models/tax.py:184 core/models/tenant.py:9
+#: core/models/tenant_group.py:25 hr/models/common.py:8 hr/models/common.py:30
+#: lm/models/brand.py:8 lm/models/category.py:10 lm/models/transaction.py:18
+#: lm/models/transaction.py:59 lm/models/warehouse.py:10
+#: mm/models/provider.py:14 mm/models/purchase.py:144
+#: mm/models/purchase_order.py:26 mm/models/purchase_requisition.py:32
+#: offer/models/attributes.py:7 offer/models/attributes.py:38
+#: offer/models/offer_options_group.py:10 pos/models/pos.py:14
+#: sync/models.py:34
 msgid "name"
 msgstr "nombre"
 
-#: acc/models/account.py:15
+#: acc/models/account.py:18 core/models/tax.py:26 core/models/tax.py:129
 msgid "affectation"
 msgstr "naturaleza"
 
-#: acc/models/account.py:20 acc/models/cost_center.py:13
-#: acc/models/period.py:23 acc/models/policy.py:54 banks/models/bank.py:19
-#: bms/models/common.py:37 bms/models/common.py:625 bms/models/discount.py:18
-#: bms/models/tax.py:14 core/models.py:99 core/models.py:370
-#: crm/models/customer.py:19 files/models.py:16 hr/models/common.py:12
-#: hr/models/common.py:33 hr/models/common.py:65 lm/models/brand.py:12
-#: lm/models/category.py:21 lm/models/product.py:56 lm/models/stock.py:37
-#: lm/models/transaction.py:45 lm/models/transaction.py:64
-#: mm/models/approver.py:10 mm/models/payment.py:43 mm/models/provider.py:41
-#: mm/models/purchase.py:91 mm/models/purchase_order.py:31
-#: mm/models/purchase_requisition.py:29 mm/models/tax.py:14
-#: pos/models/fiscal_correlative.py:35 pos/models/fiscal_document.py:12
-#: rcm/models/attributes.py:11 rcm/models/offer.py:30
-#: rcm/models/offer_options_group.py:15 sync/models.py:48 sync/models.py:109
+#: acc/models/account.py:23 acc/models/cost_center.py:13
+#: acc/models/period.py:23 acc/models/policy.py:16 acc/models/policy.py:79
+#: banks/models/bank.py:19 bms/models/common.py:47 bms/models/common.py:1069
+#: bms/models/discount.py:18 bms/models/tax.py:14 core/models/branch.py:17
+#: core/models/business_partner.py:25 core/models/conf.py:11
+#: core/models/fiscal_document.py:39 core/models/tax.py:97
+#: core/models/tax.py:188 core/models/tenant_group.py:29
+#: crm/models/customer.py:43 files/models.py:16 hr/models/common.py:12
+#: hr/models/common.py:34 hr/models/common.py:72 lm/models/brand.py:12
+#: lm/models/category.py:30 lm/models/product.py:60 lm/models/stock.py:42
+#: lm/models/transaction.py:25 lm/models/transaction.py:111
+#: lm/models/transaction.py:117 mm/models/approver.py:10
+#: mm/models/payment.py:47 mm/models/provider.py:40 mm/models/purchase.py:85
+#: mm/models/purchase_order.py:31 mm/models/purchase_requisition.py:37
+#: mm/models/transaction.py:49 offer/models/attributes.py:11
+#: offer/models/offer.py:50 offer/models/offer_options_group.py:15
+#: pos/models/fiscal_correlative.py:34 sync/models.py:48 sync/models.py:109
 msgid "tenant"
 msgstr "entidad"
 
-#: acc/models/account.py:28
+#: acc/models/account.py:31
 msgid "parent account"
 msgstr "cuenta padre"
 
-#: acc/models/account.py:33
+#: acc/models/account.py:36
 msgid "level"
 msgstr ""
 
-#: acc/models/account.py:34
+#: acc/models/account.py:37
 msgid "child count"
 msgstr "cantidad de cuentas"
 
+#: acc/models/account.py:39
+#, fuzzy
+#| msgid "Balance Amount"
+msgid "balance or result"
+msgstr "Balance"
+
+#: acc/models/account.py:44
+msgid "major boolean report"
+msgstr ""
+
 #. Translators: Cuentas
-#: acc/models/account.py:42 core/templates/core/base.html:458
+#: acc/models/account.py:53 core/templates/core/base.html:551
+#: core/templates/core/base2.html:499 core/templates/core/patch_base.html:201
 msgid "Accounts"
 msgstr "Cuentas"
 
-#: acc/models/account.py:67
+#: acc/models/account.py:78
 msgid "account type must be detail"
 msgstr "el tipo de cuenta debe ser detalle"
 
-#: acc/models/cost_center.py:9 core/models.py:50 core/models.py:251
-#: core/models.py:366 crm/models/customer.py:12 hr/models/common.py:52
-#: lm/models/product.py:29 lm/models/warehouse.py:10 mm/models/provider.py:37
+#: acc/models/cost_center.py:9 core/models/branch.py:13
+#: core/models/business_partner.py:21 core/models/tenant.py:36
+#: core/models/user.py:57 crm/models/customer.py:26 hr/models/common.py:54
+#: lm/models/product.py:31 lm/models/warehouse.py:11 mm/models/provider.py:36
+#: offer/models/offer.py:59
 msgid "active"
 msgstr "activo"
 
 #. Translators: Centros de Costo
-#: acc/models/cost_center.py:25 core/templates/core/base.html:474
+#: acc/models/cost_center.py:25 core/templates/core/base.html:567
+#: core/templates/core/base2.html:523 core/templates/core/patch_base.html:207
 msgid "Cost Centers"
 msgstr "Centros de Costo"
 
@@ -159,9 +257,10 @@ msgstr "abierto"
 msgid "closed"
 msgstr "cerrado"
 
-#: acc/models/period.py:17 acc/models/policy.py:58 lm/models/shipment.py:43
-#: lm/models/stock.py:54 mnf/models/mo.py:50
-#: pos/models/fiscal_correlative.py:15 sync/models.py:37 sync/models.py:102
+#: acc/models/period.py:17 acc/models/policy.py:83 envoice/models.py:22
+#: lm/models/shipment.py:47 lm/models/stock.py:60 lm/models/supply_order.py:44
+#: mm/models/purchase.py:37 mnf/models/mo.py:50
+#: pos/models/fiscal_correlative.py:14 sync/models.py:37 sync/models.py:102
 msgid "status"
 msgstr "estado"
 
@@ -173,29 +272,26 @@ msgstr "fecha de inicio"
 msgid "end date"
 msgstr "fecha de fin"
 
+#: acc/models/period.py:31
+#, fuzzy
+#| msgid "previous balance"
+msgid "previous"
+msgstr "saldo anterior"
+
 #. Translators: Periodos
-#: acc/models/period.py:38 core/templates/core/base.html:466
+#: acc/models/period.py:46 core/templates/core/base.html:559
+#: core/templates/core/base2.html:515
 msgid "Periods"
 msgstr "Periodos"
 
-#: acc/models/period.py:53
+#: acc/models/period.py:61
 msgid "day of date start must be 1st of month"
 msgstr "día de fecha de inicio debe ser 1° de mes"
 
-#: acc/models/period.py:65
+#: acc/models/period.py:73
 msgid "overlapping date for period"
 msgstr "traslape en rangos para el producto"
 
-#: acc/models/period_account.py:21 acc/models/policy.py:126
-#: banks/models/transaction.py:19 banks/models/transaction.py:33
-#: banks/models/transaction.py:130 banks/models/wallet.py:17
-#: banks/models/wallet.py:24 bms/models/common.py:617 bms/models/discount.py:24
-#: bms/models/tax.py:21 crm/models/customer.py:25 mm/models/payment.py:27
-#: mm/models/provider.py:48 mm/models/purchase.py:59 mm/models/tax.py:21
-#: sync/models.py:53
-msgid "account"
-msgstr "cuenta"
-
 #: acc/models/period_account.py:26
 #, fuzzy
 #| msgid "debit"
@@ -214,155 +310,201 @@ msgid "prev balance"
 msgstr "saldo anterior"
 
 #: acc/models/period_account.py:29 banks/models/transaction.py:45
-#: mm/models/transaction.py:22
+#: mm/models/transaction.py:23
 msgid "post balance"
 msgstr "saldo posterior"
 
-#: acc/models/period_account.py:32
+#: acc/models/period_account.py:33
 msgid "Period Account"
 msgstr "Cuenta de Periodo"
 
-#: acc/models/period_account.py:33
+#: acc/models/period_account.py:34
 msgid "Period Accounts"
 msgstr "Cuentas de Periodos"
 
-#: acc/models/policy.py:13
-msgid "daily"
-msgstr "diario"
+#: acc/models/pnl.py:10
+msgid "pnl config"
+msgstr ""
 
-#: acc/models/policy.py:14
-msgid "income"
-msgstr "ingreso"
+#: acc/models/pnl.py:21
+msgid "Cost of Goods Sold"
+msgstr ""
 
-#: acc/models/policy.py:15
-msgid "outcome"
-msgstr "egreso"
+#: acc/models/pnl.py:29
+msgid "PnL Config"
+msgstr ""
 
-#: acc/models/policy.py:16 banks/models/transaction.py:14
-msgid "transfer"
-msgstr "transferencia"
+#: acc/models/pnl.py:30
+msgid "PnL Configs"
+msgstr ""
 
-#: acc/models/policy.py:17
-msgid "sales"
-msgstr "ventas"
+#: acc/models/policy.py:22
+#, fuzzy
+#| msgid "Policy Item"
+msgid "Policy Type"
+msgstr "Ítem de Partida Contable"
 
-#: acc/models/policy.py:20
+#: acc/models/policy.py:23
+#, fuzzy
+#| msgid "Policy Items"
+msgid "Policy Types"
+msgstr "Ítems de Partida Contable"
+
+#: acc/models/policy.py:36
+msgid "initial"
+msgstr ""
+
+#: acc/models/policy.py:37
 msgid "pending"
 msgstr ""
 
-#: acc/models/policy.py:21 mnf/models/mo.py:14
+#: acc/models/policy.py:38 mm/models/purchase.py:23 mnf/models/mo.py:14
 msgid "in progress"
 msgstr "en progreso"
 
-#: acc/models/policy.py:22 sync/models.py:15
+#: acc/models/policy.py:39 sync/models.py:15
 msgid "ok"
 msgstr "ok"
 
-#: acc/models/policy.py:23 mnf/models/mo.py:16 mnf/models/mo.py:51
-#: sync/models.py:16
+#: acc/models/policy.py:40 envoice/models.py:9 mnf/models/mo.py:16
+#: mnf/models/mo.py:51 sync/models.py:16
 msgid "error"
 msgstr "error"
 
-#: acc/models/policy.py:25 banks/models/transaction.py:39
-#: banks/models/wallet.py:13 mm/models/transaction.py:15
+#: acc/models/policy.py:45 banks/models/transaction.py:39
+#: banks/models/wallet.py:13 mm/models/payment.py:96
+#: mm/models/transaction.py:16
 msgid "type"
 msgstr "tipo"
 
-#: acc/models/policy.py:26 acc/models/revenue.py:8 lm/models/shipment.py:17
-#: lm/models/stock.py:19 lm/models/transaction.py:12
-#: mm/models/transaction.py:14 mnf/models/mo.py:17
+#: acc/models/policy.py:48 acc/models/revenue.py:8 lm/models/shipment.py:18
+#: lm/models/stock.py:24 lm/models/transaction.py:52
+#: mm/models/transaction.py:15 mnf/models/mo.py:17
 msgid "date created"
 msgstr "fecha de creación"
 
-#: acc/models/policy.py:27 acc/models/policy.py:137 lm/models/shipment.py:18
-#: lm/models/stock.py:20 mnf/models/mo.py:18
+#: acc/models/policy.py:49 acc/models/policy.py:153 lm/models/shipment.py:19
+#: lm/models/stock.py:25 mnf/models/mo.py:18
 msgid "date modified"
 msgstr "fecha de modificación"
 
-#: acc/models/policy.py:28 acc/models/revenue.py:9
+#: acc/models/policy.py:50 acc/models/revenue.py:9
 msgid "date record"
 msgstr "fecha de registro"
 
-#: acc/models/policy.py:32 acc/models/revenue.py:13
-#: banks/models/transaction.py:51 lm/models/shipment.py:23
-#: lm/models/stock.py:25 mm/models/payment.py:87 mm/models/purchase.py:97
-#: mm/models/purchase_order.py:37 mm/models/purchase_requisition.py:35
-#: mnf/models/mo.py:24
+#: acc/models/policy.py:54 acc/models/revenue.py:13
+#: banks/models/transaction.py:53 lm/models/shipment.py:27
+#: lm/models/stock.py:30 lm/models/supply_order.py:30 mm/models/payment.py:107
+#: mm/models/purchase.py:91 mm/models/purchase_order.py:37
+#: mm/models/purchase_requisition.py:43 mnf/models/mo.py:24
 msgid "created by"
 msgstr "creado por"
 
-#: acc/models/policy.py:36 mm/models/purchase.py:131
+#: acc/models/policy.py:58 bms/forms.py:208 bms/views/sale/forms.py:94
+#: mm/models/purchase.py:132
 msgid "correlative"
 msgstr "correlativo"
 
-#: acc/models/policy.py:37
+#: acc/models/policy.py:59
 msgid "general memo"
 msgstr "concepto general"
 
-#: acc/models/policy.py:46 acc/models/policy.py:140
-#: banks/models/transaction.py:133
+#: acc/models/policy.py:60
+#, fuzzy
+#| msgid "Difference"
+msgid "reference"
+msgstr "Diferencia"
+
+#: acc/models/policy.py:61
+#, fuzzy
+#| msgid "Difference"
+msgid "reference 2"
+msgstr "Diferencia"
+
+#: acc/models/policy.py:62
+#, fuzzy
+#| msgid "transfer reference"
+msgid "date reference"
+msgstr "referencia de transferencia"
+
+#: acc/models/policy.py:71 acc/models/policy.py:156
+#: banks/models/transaction.py:152
 msgid "debit"
 msgstr "cargo"
 
-#: acc/models/policy.py:49 acc/models/policy.py:143
-#: banks/models/transaction.py:134
+#: acc/models/policy.py:74 acc/models/policy.py:159
+#: banks/models/transaction.py:153
 msgid "credit"
 msgstr "abono"
 
-#: acc/models/policy.py:70
+#: acc/models/policy.py:98 acc/templates/acc/account_activity.html:53
+#: acc/views/account.py:149
 msgid "Policy"
 msgstr "Partida Contable"
 
-#. Translators: Partidas Contables
-#: acc/models/policy.py:71 core/templates/core/base.html:482
+#: acc/models/policy.py:99 core/templates/core/base.html:585
+#: core/templates/core/base2.html:535
 msgid "Policies"
 msgstr "Partidas Contables"
 
-#: acc/models/policy.py:120
+#: acc/models/policy.py:136
 msgid "policy"
 msgstr "partida contable"
 
-#: acc/models/policy.py:132 banks/models/wallet.py:32 pos/models/pos.py:25
+#: acc/models/policy.py:148 banks/models/wallet.py:32 core/models/branch.py:25
+#: pos/models/pos.py:29
 msgid "cost center"
 msgstr "Centro de Costo"
 
-#: acc/models/policy.py:138 banks/models/transaction.py:42
-#: banks/models/transaction.py:132 mm/models/payment.py:83
+#: acc/models/policy.py:154 banks/models/petty_cash_transaction.py:14
+#: banks/models/transaction.py:42 banks/models/transaction.py:151
+#: mm/models/payment.py:94
 msgid "memo"
 msgstr "concepto"
 
-#: acc/models/policy.py:145
+#: acc/models/policy.py:162 banks/models/petty_cash_transaction.py:13
+#: core/models/business_partner.py:14 core/models/tenant.py:18
+#: crm/models/customer.py:28 mm/forms.py:246 mm/models/provider.py:19
+#: mm/models/purchase.py:141 mm/models/purchase_order.py:24
+#: mm/models/purchase_requisition.py:30
+msgid "document"
+msgstr "documento"
+
+#: acc/models/policy.py:164
 #, fuzzy
 #| msgid "for date"
 msgid "flag for delete"
 msgstr "para la fecha"
 
-#: acc/models/policy.py:147 lm/models/transaction.py:15
+#: acc/models/policy.py:166 lm/models/transaction.py:54
 msgid "related object"
 msgstr "objeto relacionado"
 
-#: acc/models/policy.py:158
+#: acc/models/policy.py:179
 msgid "Policy Item"
 msgstr "Ítem de Partida Contable"
 
-#: acc/models/policy.py:159
+#: acc/models/policy.py:180
 msgid "Policy Items"
 msgstr "Ítems de Partida Contable"
 
-#: acc/models/revenue.py:20 bms/models/common.py:43 lm/models/warehouse.py:14
-#: pos/models/pos.py:19
+#: acc/models/revenue.py:20 bms/models/common.py:53
+#: lm/models/supply_order.py:17 lm/models/supply_order.py:23
+#: lm/models/warehouse.py:15 mm/models/purchase_requisition.py:24
+#: pos/models/pos.py:23
 msgid "branch"
 msgstr "sucursal"
 
 #: acc/models/revenue.py:24 acc/models/revenue.py:25 acc/models/revenue.py:59
-#: mm/models/purchase.py:160 mm/models/purchase_order.py:65
-#: mm/models/purchase_requisition.py:53
+#: mm/models/purchase.py:171 mm/models/purchase_order.py:65
+#: mm/models/purchase_requisition.py:61
 msgid "total"
 msgstr "total"
 
 #. Translators: Ingreso
 #: acc/models/revenue.py:34 acc/templates/acc/revenue_list.html:12
-#: core/templates/core/base.html:498
+#: core/templates/core/base.html:575 core/templates/core/base.html:830
+#: core/templates/core/base2.html:531 core/templates/core/base2.html:747
 msgid "Revenue"
 msgstr "Ingreso"
 
@@ -394,46 +536,119 @@ msgstr "Ingreso"
 msgid "Revenue Items"
 msgstr "Ingresos"
 
-#: acc/serializers/__init__.py:55 acc/serializers/policy_from_purchases.py:42
-#: acc/viewsets.py:103
-msgid "period for given date does not exists or is not open"
-msgstr "periodo para fecha especificada no existe o no se encuentra abierto"
+#: acc/templates/acc/account_activity.html:34
+#: acc/templates/acc/policy_form_purchase.html:36
+#: banks/templates/banks/transaction_history.html:60
+#: bms/templates/bms/invoice_list.html:53
+#: bms/templates/bms/sale_associate_revers_obj_form.html:303
+#: bms/templates/bms/sales_reconciliation/dosv.html:52
+#: crm/templates/crm/cxc_list.html:41 lm/templates/lm/transaction_list.html:76
+#: mm/templates/mm/purchase_list.html:57
+#: offer/templates/offer/offer_list.html:47
+msgid "Search"
+msgstr "Buscar"
 
-#: acc/serializers/__init__.py:95
-#, fuzzy, python-format
-msgid "account %(code)s does not exists"
-msgstr "la sucursal para el código dado %(code)s no existe"
+#: acc/templates/acc/account_activity.html:54 acc/views/account.py:150
+#, fuzzy
+#| msgid "Policy Item"
+msgid "Policy Date"
+msgstr "Ítem de Partida Contable"
 
-#: acc/serializers/__init__.py:105
-#, fuzzy, python-format
-msgid "cost center %(code)s does not exists"
-msgstr "la sucursal para el código dado %(code)s no existe"
+#: acc/templates/acc/account_activity.html:55
+#: acc/templates/acc/auxiliary_ledger.html:37
+#: acc/templates/acc/policy_detail.html:63
+#: acc/templates/acc/policy_form.bk.html:94
+#: acc/templates/acc/policy_form_edit.html:126
+#: acc/templates/acc/policy_form_purchase.html:109
+#: acc/templates/acc/policy_form_sale.html:96
+#: acc/templates/acc/policy_list.html:48
+#: acc/templates/acc/policy_list_journal.html:77 acc/views/account.py:151
+#: banks/templates/banks/pettycash_detail.html:63
+#: banks/templates/banks/transaction_detail.html:97
+#: banks/templates/banks/transaction_history.html:69
+msgid "Memo"
+msgstr "Concepto"
+
+#: acc/templates/acc/account_activity.html:56
+#: acc/templates/acc/policy_detail.html:65
+#: acc/templates/acc/policy_form.bk.html:79
+#: acc/templates/acc/policy_form.bk.html:96
+#: acc/templates/acc/policy_form_edit.html:111
+#: acc/templates/acc/policy_form_edit.html:128
+#: acc/templates/acc/policy_form_purchase.html:94
+#: acc/templates/acc/policy_form_purchase.html:111
+#: acc/templates/acc/policy_form_sale.html:81
+#: acc/templates/acc/policy_form_sale.html:98
+#: acc/templates/acc/policy_list.html:49
+#: acc/templates/acc/policy_list_journal.html:79 acc/views/account.py:152
+msgid "Debit"
+msgstr "Cargo"
+
+#: acc/templates/acc/account_activity.html:57
+#: acc/templates/acc/policy_detail.html:66
+#: acc/templates/acc/policy_form.bk.html:85
+#: acc/templates/acc/policy_form.bk.html:97
+#: acc/templates/acc/policy_form_edit.html:117
+#: acc/templates/acc/policy_form_edit.html:129
+#: acc/templates/acc/policy_form_purchase.html:100
+#: acc/templates/acc/policy_form_purchase.html:112
+#: acc/templates/acc/policy_form_sale.html:87
+#: acc/templates/acc/policy_form_sale.html:99
+#: acc/templates/acc/policy_list.html:50
+#: acc/templates/acc/policy_list_journal.html:80 acc/views/account.py:153
+#: bms/models/common.py:38
+msgid "Credit"
+msgstr "Abono"
+
+#: acc/templates/acc/account_activity.html:58
+#: acc/templates/acc/auxiliary_ledger.html:45 acc/views/account.py:154
+#: banks/templates/banks/pettycash_list.html:47
+#: banks/templates/banks/transaction_history.html:72
+#: banks/templates/banks/wallet_list.html:47
+#: bms/templates/bms/invoice_list.html:69
+#: bms/templates/bms/sale_associate_revers_obj_form.html:318
+#: crm/templates/crm/cxc_list.html:57
+#: lm/templates/lm/stock_by_warehouse.html:72
+#: mm/templates/mm/provider_list.html:49 mm/templates/mm/purchase_list.html:78
+msgid "Balance"
+msgstr "Saldo"
 
 #: acc/templates/acc/account_list.html:35
 #: acc/templates/acc/costcenter_list.html:35
-#: acc/templates/acc/period_list.html:35 acc/templates/acc/policy_list.html:35
+#: acc/templates/acc/period_list.html:35 acc/templates/acc/policy_form.html:75
+#: acc/templates/acc/policy_list.html:35
 #: banks/templates/banks/bank_list.html:35
+#: banks/templates/banks/pettycash_list.html:35
+#: banks/templates/banks/posterminal_list.html:35
 #: banks/templates/banks/transaction_list.html:35
 #: banks/templates/banks/wallet_list.html:35
 #: bms/templates/bms/discount_list.html:35
 #: bms/templates/bms/paymenttype_list.html:35
-#: bms/templates/bms/tax_list.html:35 core/generic_views.py:262
-#: core/generic_views.py:268 core/templates/core/branch_list.html:35
-#: core/templates/core/group_list.html:35 core/templates/core/user_list.html:35
-#: crm/templates/crm/customer_list.html:35 lm/templates/lm/brand_list.html:35
+#: bms/templates/bms/tax_list.html:35 core/generic_views.py:264
+#: core/generic_views.py:270 core/templates/core/branch_list.html:35
+#: core/templates/core/fiscaldocument_list.html:35
+#: core/templates/core/group_list.html:35 core/templates/core/tax_list.html:35
+#: core/templates/core/user_list.html:35
+#: crm/templates/crm/customer_list.html:35
+#: hr/templates/hr/employee_list.html:35 lm/templates/lm/brand_list.html:35
 #: lm/templates/lm/category_list.html:35 lm/templates/lm/packaging_list.html:35
 #: lm/templates/lm/product_list.html:35
-#: lm/templates/lm/shipment_create_form.html:73
+#: lm/templates/lm/shipment_create_form.html:78
 #: lm/templates/lm/shipment_list.html:35
 #: lm/templates/lm/stock_adjust_form.html:72
+#: lm/templates/lm/supplyorder_form.html:66
+#: lm/templates/lm/supplyorder_list.html:35
 #: lm/templates/lm/typology_list.html:35 lm/templates/lm/warehouse_list.html:35
 #: mm/templates/mm/approver_list.html:35 mm/templates/mm/payment_list.html:35
 #: mm/templates/mm/paymenttype_list.html:35
-#: mm/templates/mm/provider_list.html:35 mm/templates/mm/purchase_list.html:35
+#: mm/templates/mm/provider_list.html:35 mm/templates/mm/purchase_list.html:61
 #: mm/templates/mm/purchaseorder_list.html:43
 #: mm/templates/mm/purchaserequisition_list.html:35
-#: mm/templates/mm/tax_list.html:35 mnf/templates/mnf/bundle_list.html:35
+#: mnf/templates/mnf/bundle_list.html:35
 #: mnf/templates/mnf/manufacturingorder_list.html:35
+#: offer/templates/offer/offer_list.html:56
+#: pos/templates/pos/fiscalcorrelative_list.html:35
+#: pos/templates/pos/fiscaldocument_list.html:35
 #: pos/templates/pos/pos_list.html:35
 msgid "Create"
 msgstr "Crear"
@@ -442,89 +657,293 @@ msgstr "Crear"
 #: acc/templates/acc/costcenter_list.html:43
 #: acc/templates/acc/period_list.html:43 acc/templates/acc/policy_list.html:43
 #: banks/templates/banks/bank_list.html:43
+#: banks/templates/banks/pettycash_list.html:43
+#: banks/templates/banks/posterminal_list.html:43
 #: banks/templates/banks/transaction_list.html:43
 #: banks/templates/banks/wallet_list.html:43
 #: bms/templates/bms/discount_list.html:43
-#: bms/templates/bms/invoice_list.html:55
+#: bms/templates/bms/invoice_list.html:61
 #: bms/templates/bms/paymenttype_list.html:43
 #: bms/templates/bms/tax_list.html:43 core/templates/core/branch_list.html:43
-#: core/templates/core/group_list.html:43 core/templates/core/user_list.html:43
-#: crm/templates/crm/customer_list.html:43 lm/templates/lm/brand_list.html:43
-#: lm/templates/lm/category_list.html:43 lm/templates/lm/packaging_list.html:43
-#: lm/templates/lm/product_list.html:43 lm/templates/lm/shipment_list.html:43
+#: core/templates/core/fiscaldocument_list.html:43
+#: core/templates/core/group_list.html:43 core/templates/core/tax_list.html:43
+#: core/templates/core/user_list.html:43
+#: crm/templates/crm/customer_list.html:43 crm/templates/crm/cxc_list.html:49
+#: hr/templates/hr/employee_list.html:43 insumos/currency.py:45
+#: lm/templates/lm/brand_list.html:43 lm/templates/lm/category_list.html:43
+#: lm/templates/lm/packaging_list.html:43 lm/templates/lm/product_list.html:43
+#: lm/templates/lm/shipment_list.html:43
+#: lm/templates/lm/supplyorder_list.html:43
 #: lm/templates/lm/typology_list.html:43 lm/templates/lm/warehouse_list.html:43
 #: mm/templates/mm/approver_list.html:43 mm/templates/mm/payment_list.html:43
 #: mm/templates/mm/paymenttype_list.html:43
-#: mm/templates/mm/provider_list.html:43 mm/templates/mm/purchase_list.html:43
+#: mm/templates/mm/provider_list.html:43 mm/templates/mm/purchase_list.html:70
 #: mm/templates/mm/purchaseorder_list.html:51
 #: mm/templates/mm/purchaserequisition_list.html:43
-#: mm/templates/mm/tax_list.html:43 mm/templates/mm/transaction_list.html:68
+#: mm/templates/mm/transaction_list.html:68
 #: mnf/templates/mnf/bundle_list.html:43
 #: mnf/templates/mnf/manufacturingorder_list.html:43
+#: offer/templates/offer/attributesgroup_list.html:34
+#: offer/templates/offer/offer_list.html:64
+#: offer/templates/offer/offeroptionsgroup_list.html:34
+#: pos/templates/pos/fiscalcorrelative_list.html:43
+#: pos/templates/pos/fiscaldocument_list.html:43
 #: pos/templates/pos/pos_list.html:43
-#: rcm/templates/rcm/attributesgroup_list.html:34
-#: rcm/templates/rcm/offer_list.html:34
-#: rcm/templates/rcm/offeroptionsgroup_list.html:34
 #: sync/templates/sync/syncrecord_list.html:66
 msgid "Id"
 msgstr "Id"
 
 #: acc/templates/acc/account_list.html:44
-#: acc/templates/acc/costcenter_list.html:44
-#: bms/templates/bms/discount_list.html:44
+#: acc/templates/acc/costcenter_list.html:44 bms/models/common.py:592
+#: bms/models/common.py:737 bms/templates/bms/discount_list.html:44
 #: bms/templates/bms/paymenttype_list.html:44
 #: bms/templates/bms/tax_list.html:44 core/templates/core/branch_list.html:47
-#: crm/templates/crm/customer_list.html:44 lm/templates/lm/brand_list.html:44
+#: core/templates/core/fiscaldocument_list.html:44
+#: core/templates/core/tax_list.html:44 crm/templates/crm/customer_list.html:44
+#: hr/templates/hr/employee_list.html:44 lm/templates/lm/brand_list.html:44
 #: lm/templates/lm/category_list.html:44 lm/templates/lm/product_list.html:44
-#: lm/templates/lm/shipment_create_form.html:57
-#: lm/templates/lm/shipment_detail.html:79 lm/templates/lm/stock_list.html:58
+#: lm/templates/lm/shipment_detail.html:88
+#: lm/templates/lm/stock_by_product.html:55
+#: lm/templates/lm/stock_by_warehouse.html:59
+#: lm/templates/lm/transaction_list.html:86
 #: lm/templates/lm/typology_list.html:44 lm/templates/lm/warehouse_list.html:44
-#: mm/templates/mm/provider_list.html:44 mm/templates/mm/tax_list.html:44
-#: mnf/templates/mnf/bundle_list.html:44 pos/templates/pos/pos_list.html:44
+#: mm/templates/mm/provider_list.html:44 mnf/templates/mnf/bundle_list.html:44
+#: offer/templates/offer/offer_list.html:65
+#: pos/templates/pos/fiscaldocument_list.html:44
+#: pos/templates/pos/pos_list.html:44
 msgid "Code"
 msgstr "Código"
 
 #: acc/templates/acc/account_list.html:45
 #: acc/templates/acc/costcenter_list.html:45
 #: banks/templates/banks/bank_list.html:44
+#: banks/templates/banks/pettycash_list.html:44
+#: banks/templates/banks/posterminal_list.html:44
 #: banks/templates/banks/wallet_list.html:45
 #: bms/templates/bms/discount_list.html:45 bms/templates/bms/tax_list.html:45
 #: core/templates/core/branch_list.html:52
-#: core/templates/core/group_list.html:44 lm/templates/lm/brand_list.html:45
-#: lm/templates/lm/category_list.html:45 lm/templates/lm/warehouse_list.html:45
-#: mm/templates/mm/provider_list.html:45 mm/templates/mm/tax_list.html:45
+#: core/templates/core/fiscaldocument_list.html:45
+#: core/templates/core/group_list.html:44 core/templates/core/tax_list.html:45
+#: lm/templates/lm/brand_list.html:45 lm/templates/lm/category_list.html:45
+#: lm/templates/lm/warehouse_list.html:45 mm/templates/mm/provider_list.html:45
+#: offer/templates/offer/attributesgroup_list.html:35
+#: offer/templates/offer/offeroptionsgroup_list.html:35
+#: pos/templates/pos/fiscaldocument_list.html:45
 #: pos/templates/pos/pos_list.html:45
-#: rcm/templates/rcm/attributesgroup_list.html:35
-#: rcm/templates/rcm/offeroptionsgroup_list.html:35
 msgid "Name"
 msgstr "Nombre"
 
 #. Translators: Catalogo de Cuentas
-#: acc/templates/acc/account_tree.html:68 core/templates/core/base.html:450
+#: acc/templates/acc/account_tree.html:68 core/templates/core/base.html:543
+#: core/templates/core/base2.html:491
 msgid "Accounts Catalog"
 msgstr "Catalogo de Cuentas"
 
-#: acc/templates/acc/balance_sheet.html:34
-#: acc/templates/acc/p_n_l_statement.html:34
-#: acc/templates/acc/policy_list_journal.html:65
-#: acc/templates/acc/trial_balance.html:34
+#: acc/templates/acc/auxiliary_ledger.html:27
+#: acc/templates/acc/end_consumer.html:39
+#: banks/templates/banks/transaction_detail.html:21
+#: bms/templates/bms/invoice_detail.html:166
+#: lm/templates/lm/shipment_detail.html:22
+msgid "Print"
+msgstr "Imprimir"
+
+#: acc/templates/acc/auxiliary_ledger.html:36 sync/models.py:77
+#: sync/models.py:120 sync/templates/sync/syncrecord_detail.html:22
+msgid "Record"
+msgstr "Registro"
+
+#: acc/templates/acc/auxiliary_ledger.html:38
+#, fuzzy
+#| msgid "Departments"
+msgid "Movements"
+msgstr "Departamentos"
+
+#: acc/templates/acc/auxiliary_ledger.html:41
+#: acc/templates/acc/policy_list.html:47
+#: acc/templates/acc/policy_list_journal.html:74 bms/forms.py:135
+#: bms/views/sale/forms.py:30 mm/forms.py:98 mm/forms.py:249
+msgid "Correlative"
+msgstr "Correlativo"
+
+#: acc/templates/acc/auxiliary_ledger.html:42
+#: banks/templates/banks/transaction_detail.html:35
+#: banks/templates/banks/transaction_history.html:68
+#: banks/templates/banks/transaction_list.html:45
+#: bms/templates/bms/invoice_detail.html:109
+#: lm/templates/lm/supplyorder_list.html:44
+#: lm/templates/lm/transaction_list.html:85
+#: mm/templates/mm/payment_list.html:44 mm/templates/mm/purchase_list.html:71
+msgid "Date"
+msgstr "Fecha"
+
+#: acc/templates/acc/auxiliary_ledger.html:43
+#: acc/templates/acc/journal_ledger.html:49
+#: acc/templates/acc/policy_detail.html:95
+#: acc/templates/acc/policy_form.bk.html:128
+#: acc/templates/acc/policy_form_edit.html:176
+#: acc/templates/acc/policy_form_purchase.html:143
+#: acc/templates/acc/policy_form_sale.html:130
+#: acc/templates/acc/trial_balance.html:42 acc/views/journal_ledger.py:138
+#: acc/views/taxpayer_sales.py:70 acc/views/trial_balance.py:60
+#: banks/templates/banks/transaction_history.html:71
+msgid "Debits"
+msgstr "Cargos"
+
+#: acc/templates/acc/auxiliary_ledger.html:44
+#: acc/templates/acc/journal_ledger.html:50
+#: acc/templates/acc/policy_detail.html:89
+#: acc/templates/acc/policy_form.bk.html:122
+#: acc/templates/acc/policy_form_edit.html:170
+#: acc/templates/acc/policy_form_purchase.html:137
+#: acc/templates/acc/policy_form_sale.html:124
+#: acc/templates/acc/trial_balance.html:43 acc/views/journal_ledger.py:139
+#: acc/views/taxpayer_sales.py:71 acc/views/trial_balance.py:61
+#: banks/templates/banks/transaction_history.html:70
+msgid "Credits"
+msgstr "Abonos"
+
+#: acc/templates/acc/auxiliary_ledger.html:55
+msgid "Saldo Anterior"
+msgstr ""
+
+#: acc/templates/acc/balance_sheet.html:36
+#: acc/templates/acc/balance_sheet.html:58
+#: acc/templates/acc/journal_ledger.html:46
+#: acc/templates/acc/p_n_l_statement.html:26
+#: acc/templates/acc/policy_list_journal.html:75
+#: acc/templates/acc/trial_balance.html:39 acc/views/journal_ledger.py:135
+#: acc/views/taxpayer_sales.py:67 acc/views/trial_balance.py:57
 msgid "Account Code"
 msgstr "Codigo de Cuenta"
 
-#: acc/templates/acc/balance_sheet.html:36
-#: acc/templates/acc/p_n_l_statement.html:36
+#: acc/templates/acc/balance_sheet.html:38
+#: acc/templates/acc/balance_sheet.html:60
+#: acc/templates/acc/p_n_l_statement.html:28
 #, fuzzy
 #| msgid "Post Balance"
 msgid "Current Balance"
 msgstr "Saldo Posterior"
 
+#: acc/templates/acc/end_consumer.html:70
+#: acc/templates/acc/taxpayer_sales.html:38
+msgid "No"
+msgstr ""
+
+#: acc/templates/acc/end_consumer.html:71 acc/views/end_consumer.py:85
+msgid "Dia"
+msgstr ""
+
+#: acc/templates/acc/end_consumer.html:72 acc/views/end_consumer.py:87
+#, fuzzy
+#| msgid "Provider Document"
+msgid "Tipo de Documento"
+msgstr "Documento del Proveedor"
+
+#: acc/templates/acc/end_consumer.html:73 acc/views/end_consumer.py:88
+msgid "Del No"
+msgstr ""
+
+#: acc/templates/acc/end_consumer.html:74 acc/views/end_consumer.py:89
+msgid "Al No"
+msgstr ""
+
+#: acc/templates/acc/end_consumer.html:75
+msgid "Ventas por Cuenta Propia"
+msgstr ""
+
+#: acc/templates/acc/end_consumer.html:76
+msgid "Venta por Cuenta de Terceros"
+msgstr ""
+
+#: acc/templates/acc/end_consumer.html:77
+#, python-format
+msgid "1%% IVA retenido"
+msgstr ""
+
+#: acc/templates/acc/end_consumer.html:78
+#, fuzzy
+#| msgid "total"
+msgid "Venta total"
+msgstr "total"
+
+#: acc/templates/acc/end_consumer.html:81
+#: acc/templates/acc/taxpayer_sales.html:44 acc/views/end_consumer.py:90
+#, fuzzy
+#| msgid "Cuentas"
+msgid "Exentas"
+msgstr "Cuentas"
+
+#: acc/templates/acc/end_consumer.html:82 acc/views/end_consumer.py:91
+msgid "Gravadas"
+msgstr ""
+
+#: acc/templates/acc/end_consumer.html:83 acc/views/end_consumer.py:92
+#, fuzzy
+#| msgid "Importacion"
+msgid "Exportaciones"
+msgstr "Importación"
+
+#: acc/templates/acc/end_consumer.html:84
+#: acc/templates/acc/taxpayer_sales.html:52 acc/views/end_consumer.py:93
+#, fuzzy
+#| msgid "total taxes"
+msgid "Total Ventas"
+msgstr "impuestos totales"
+
+#: acc/templates/acc/journal_ledger.html:48
+#: acc/templates/acc/trial_balance.html:41 acc/views/journal_ledger.py:137
+#: acc/views/taxpayer_sales.py:69 acc/views/trial_balance.py:59
+#: banks/templates/banks/transaction_detail.html:63
+#: banks/templates/banks/transaction_form.html:56
+msgid "Previous Balance"
+msgstr "Saldo Anterior"
+
+#: acc/templates/acc/journal_ledger.html:51
+#: acc/templates/acc/trial_balance.html:44 acc/views/journal_ledger.py:140
+#: acc/views/taxpayer_sales.py:72 acc/views/trial_balance.py:62
+#: banks/templates/banks/pettycash_detail.html:65
+#: banks/templates/banks/transaction_detail.html:89
+#: banks/templates/banks/transaction_form.html:84
+#: mm/templates/mm/transaction_list.html:75
+msgid "Post Balance"
+msgstr "Saldo Posterior"
+
+#: acc/templates/acc/p_n_l_statement.html:52
+msgid "Gross Profit"
+msgstr ""
+
+#: acc/templates/acc/p_n_l_statement.html:66
+msgid "Income Before Taxes"
+msgstr ""
+
+#. Translators: Impuestos
+#: acc/templates/acc/p_n_l_statement.html:71 bms/models/common.py:755
+#: bms/models/tax.py:34 core/models/tax.py:142
+#: core/templates/core/base.html:251 core/templates/core/base2.html:237
+msgid "Taxes"
+msgstr "Impuestos"
+
+#: acc/templates/acc/p_n_l_statement.html:76
+#, fuzzy
+#| msgid "Net Price"
+msgid "Net Income"
+msgstr "Precio Neto"
+
+#: acc/templates/acc/p_n_l_statement.html:81
+msgid "EBITDA, Reported"
+msgstr ""
+
 #: acc/templates/acc/period_list.html:45 acc/templates/acc/policy_list.html:45
-#: bms/models/common.py:69 bms/templates/bms/invoice_detail.html:48
-#: bms/templates/bms/invoice_list.html:61 lm/templates/lm/shipment_list.html:46
-#: lm/templates/lm/stock_list.html:64
+#: bms/models/common.py:95 bms/templates/bms/invoice_detail.html:51
+#: bms/templates/bms/invoice_list.html:67
+#: bms/templates/bms/sale_associate_revers_obj_form.html:316
+#: crm/templates/crm/cxc_list.html:55 lm/templates/lm/shipment_list.html:47
+#: lm/templates/lm/stock_by_warehouse.html:66
+#: lm/templates/lm/supplyorder_list.html:46
 #: mnf/templates/mnf/manufacturingorder_detail.html:45
 #: mnf/templates/mnf/manufacturingorder_form.html:75
-#: mnf/templates/mnf/manufacturingorder_list.html:45 sync/forms.py:9
+#: mnf/templates/mnf/manufacturingorder_list.html:45
+#: pos/templates/pos/fiscalcorrelative_list.html:44 sync/forms.py:9
 #: sync/templates/sync/syncrecord_detail.html:157
 #: sync/templates/sync/syncrecord_list.html:71
 msgid "Status"
@@ -535,96 +954,55 @@ msgid "Policy Record Detail"
 msgstr "Detalle de Registro de Partida Contable"
 
 #: acc/templates/acc/policy_detail.html:16
+#: banks/templates/banks/pettycash_detail.html:15
 #, fuzzy
 #| msgid "Modified By"
 msgid "Modify"
 msgstr "Modificado por"
 
 #: acc/templates/acc/policy_detail.html:25
+#: acc/templates/acc/policy_form_edit.html:28
 #: acc/templates/acc/revenue_list.html:20
 msgid "Record Date:"
 msgstr "Fecha de Registro:"
 
 #: acc/templates/acc/policy_detail.html:31
+#: acc/templates/acc/policy_form_edit.html:34
 #: acc/templates/acc/revenue_list.html:26
+#: lm/templates/lm/supplyorder_detail.html:32
 #: mm/templates/mm/purchaseorder_detail.html:27
 msgid "Created by:"
 msgstr "Creado por:"
 
 #: acc/templates/acc/policy_detail.html:39
+#: acc/templates/acc/policy_form_edit.html:42
 msgid "Type:"
 msgstr "Tipo:"
 
 #: acc/templates/acc/policy_detail.html:45
+#: acc/templates/acc/policy_form_edit.html:48
 msgid "Period:"
 msgstr "Periodo:"
 
 #: acc/templates/acc/policy_detail.html:53
+#: acc/templates/acc/policy_form_edit.html:56
 msgid "General Memo:"
 msgstr "Concepto General:"
 
-#: acc/templates/acc/policy_detail.html:63
-#: acc/templates/acc/policy_form.html:94
-#: acc/templates/acc/policy_form_edit.html:92
-#: acc/templates/acc/policy_form_purchase.html:96
-#: acc/templates/acc/policy_list.html:48
-#: acc/templates/acc/policy_list_journal.html:67
-#: banks/templates/banks/transaction_detail.html:86
-#: banks/templates/banks/transaction_history.html:69
-msgid "Memo"
-msgstr "Concepto"
-
 #: acc/templates/acc/policy_detail.html:64
-#: acc/templates/acc/policy_form.html:95
-#: acc/templates/acc/policy_form_edit.html:93
-#: acc/templates/acc/policy_form_purchase.html:97
+#: acc/templates/acc/policy_form.bk.html:95
+#: acc/templates/acc/policy_form_edit.html:127
+#: acc/templates/acc/policy_form_purchase.html:110
+#: acc/templates/acc/policy_form_sale.html:97
 msgid "CECO"
 msgstr "CECO"
 
-#: acc/templates/acc/policy_detail.html:65
-#: acc/templates/acc/policy_form.html:79 acc/templates/acc/policy_form.html:96
-#: acc/templates/acc/policy_form_edit.html:77
-#: acc/templates/acc/policy_form_edit.html:94
-#: acc/templates/acc/policy_form_purchase.html:81
-#: acc/templates/acc/policy_form_purchase.html:98
-#: acc/templates/acc/policy_list.html:49
-#: acc/templates/acc/policy_list_journal.html:69
-msgid "Debit"
-msgstr "Cargo"
-
-#: acc/templates/acc/policy_detail.html:66
-#: acc/templates/acc/policy_form.html:85 acc/templates/acc/policy_form.html:97
-#: acc/templates/acc/policy_form_edit.html:83
-#: acc/templates/acc/policy_form_edit.html:95
-#: acc/templates/acc/policy_form_purchase.html:87
-#: acc/templates/acc/policy_form_purchase.html:99
-#: acc/templates/acc/policy_list.html:50
-#: acc/templates/acc/policy_list_journal.html:70
-msgid "Credit"
-msgstr "Abono"
-
-#: acc/templates/acc/policy_detail.html:89
-#: acc/templates/acc/policy_form.html:122
-#: acc/templates/acc/policy_form_edit.html:129
-#: acc/templates/acc/policy_form_purchase.html:124
-#: acc/templates/acc/trial_balance.html:38
-#: banks/templates/banks/transaction_history.html:70
-msgid "Credits"
-msgstr "Abonos"
-
-#: acc/templates/acc/policy_detail.html:95
-#: acc/templates/acc/policy_form.html:128
-#: acc/templates/acc/policy_form_edit.html:135
-#: acc/templates/acc/policy_form_purchase.html:130
-#: acc/templates/acc/trial_balance.html:37
-#: banks/templates/banks/transaction_history.html:71
-msgid "Debits"
-msgstr "Cargos"
-
 #: acc/templates/acc/policy_detail.html:101
-#: acc/templates/acc/policy_form.html:134
-#: acc/templates/acc/policy_form_edit.html:141
-#: acc/templates/acc/policy_form_purchase.html:136
+#: acc/templates/acc/policy_form.bk.html:134
+#: acc/templates/acc/policy_form_edit.html:182
+#: acc/templates/acc/policy_form_purchase.html:149
+#: acc/templates/acc/policy_form_sale.html:136
+#: lm/views/supply_order_consolidation.py:73
 msgid "Difference"
 msgstr "Diferencia"
 
@@ -632,12 +1010,19 @@ msgstr "Diferencia"
 msgid "Descargar"
 msgstr "Download"
 
+#: acc/templates/acc/policy_detail.html:115
+msgid "Softland"
+msgstr ""
+
+#: acc/templates/acc/policy_form.bk.html:17
 #: acc/templates/acc/policy_form.html:17
 #: acc/templates/acc/policy_form_edit.html:15
 #: acc/templates/acc/policy_form_purchase.html:18
+#: acc/templates/acc/policy_form_sale.html:18
 msgid "Policy Record"
 msgstr "Registro de Partida Contable"
 
+#: acc/templates/acc/policy_form.bk.html:21
 #: acc/templates/acc/policy_form.html:21
 #: acc/templates/acc/policy_form_edit.html:19
 #, fuzzy
@@ -645,50 +1030,70 @@ msgstr "Registro de Partida Contable"
 msgid "Cancel"
 msgstr "cancelada"
 
-#: acc/templates/acc/policy_form.html:72
-#: acc/templates/acc/policy_form_edit.html:70
-#: acc/templates/acc/policy_form_purchase.html:74
-#: banks/templates/banks/transaction_list.html:48 bms/models/common.py:673
+#: acc/templates/acc/policy_form.bk.html:72
+#: acc/templates/acc/policy_form_edit.html:104
+#: acc/templates/acc/policy_form_purchase.html:87
+#: acc/templates/acc/policy_form_sale.html:74
+#: banks/templates/banks/pettycash_detail.html:64
+#: banks/templates/banks/pettycash_list.html:46
+#: banks/templates/banks/transaction_list.html:51 bms/models/common.py:1132
 #: bms/templates/bms/discount_list.html:47
-#: bms/templates/bms/invoice_detail.html:106 mm/models/payment.py:82
-#: mm/templates/mm/payment_list.html:47
+#: bms/templates/bms/invoice_detail.html:111
+#: bms/templates/bms/sale_form1_items.html:187
+#: core/templates/core/tax_list.html:47
+#: lm/templates/lm/transaction_list.html:100 mm/models/payment.py:93
+#: mm/templates/mm/payment_list.html:48
 #: mm/templates/mm/transaction_list.html:74
 msgid "Amount"
 msgstr "Monto"
 
+#: acc/templates/acc/policy_form_edit.html:64
+#, fuzzy
+#| msgid "Difference"
+msgid "Reference:"
+msgstr "Diferencia"
+
+#: acc/templates/acc/policy_form_edit.html:70
+#, fuzzy
+#| msgid "Difference"
+msgid "Reference 2:"
+msgstr "Diferencia"
+
+#: acc/templates/acc/policy_form_edit.html:76
+#, fuzzy
+#| msgid "Record Date:"
+msgid "Reference Date:"
+msgstr "Fecha de Registro:"
+
 #: acc/templates/acc/policy_list.html:44
-#: acc/templates/acc/policy_list_journal.html:62
+#: acc/templates/acc/policy_list_journal.html:72
 msgid "Date Record"
 msgstr "Fecha de Registro"
 
 #: acc/templates/acc/policy_list.html:46
-#: acc/templates/acc/policy_list_journal.html:63
-#: banks/templates/banks/transaction_detail.html:36
+#: acc/templates/acc/policy_list_journal.html:73
+#: banks/templates/banks/transaction_detail.html:43
 #: banks/templates/banks/transaction_list.html:46
-#: banks/templates/banks/wallet_list.html:44 bms/models/common.py:77
+#: banks/templates/banks/wallet_list.html:44
 #: bms/templates/bms/discount_list.html:46
 #: mm/templates/mm/transaction_list.html:70
 msgid "Type"
 msgstr "Tipo"
 
-#: acc/templates/acc/policy_list.html:47
-#: acc/templates/acc/policy_list_journal.html:64 mm/forms.py:82
-msgid "Correlative"
-msgstr "Correlativo"
-
 #. Translators: Libro Diario
-#: acc/templates/acc/policy_list_journal.html:21
-#: core/templates/core/base.html:523
+#: acc/templates/acc/policy_list_journal.html:31
+#: core/templates/core/base.html:653 core/templates/core/base2.html:582
 msgid "Journal Book"
 msgstr ""
 
-#: acc/templates/acc/policy_list_journal.html:66
+#: acc/templates/acc/policy_list_journal.html:76
 #, fuzzy
 #| msgid "Account No"
 msgid "Account Name"
 msgstr "Número de Cuenta"
 
 #: acc/templates/acc/revenue_list.html:34
+#: lm/templates/lm/supplyorder_detail.html:40
 #, fuzzy
 #| msgid "Branch"
 msgid "Branch:"
@@ -704,27 +1109,163 @@ msgstr "Precio Total"
 msgid "Total vs Facturacion:"
 msgstr ""
 
-#: acc/templates/acc/trial_balance.html:36
-#: banks/templates/banks/transaction_detail.html:56
-#: banks/templates/banks/transaction_form.html:56
-msgid "Previous Balance"
-msgstr "Saldo Anterior"
-
-#: acc/templates/acc/trial_balance.html:39
-#: banks/templates/banks/transaction_detail.html:78
-#: banks/templates/banks/transaction_form.html:84
-#: mm/templates/mm/transaction_list.html:75
-msgid "Post Balance"
-msgstr "Saldo Posterior"
-
-#: api/core/serializers.py:40
-msgid "selected tenant is not in available tenants"
+#: acc/templates/acc/taxpayer_sales.html:39
+msgid "Fecha Emision"
 msgstr ""
-"la entidad seleccionada  no se encuentra entre las entidades disponibles"
 
-#: api/core/views.py:64
-msgid "can't switch to tenant because tenant is not active"
-msgstr "No se puede cambiar al tenant porque no se encuentra activo"
+#: acc/templates/acc/taxpayer_sales.html:40
+#, fuzzy
+#| msgid "Series"
+msgid "Serie"
+msgstr "Serie"
+
+#: acc/templates/acc/taxpayer_sales.html:41
+#, fuzzy
+#| msgid "Correlative"
+msgid "Correlativo"
+msgstr "Correlativo"
+
+#: acc/templates/acc/taxpayer_sales.html:42
+msgid "NRC"
+msgstr ""
+
+#: acc/templates/acc/taxpayer_sales.html:43
+#, fuzzy
+#| msgid "gran contribuyente"
+msgid "Contribuyente"
+msgstr "gran contribuyente"
+
+#: acc/templates/acc/taxpayer_sales.html:45
+msgid "No Sujetas"
+msgstr ""
+
+#: acc/templates/acc/taxpayer_sales.html:46
+msgid "Gravadas Locales"
+msgstr ""
+
+#: acc/templates/acc/taxpayer_sales.html:47
+#, fuzzy
+#| msgid "Credito Fiscal"
+msgid "Debito Fiscal"
+msgstr "Crédito Fiscal"
+
+#: acc/templates/acc/taxpayer_sales.html:48
+msgid "Ventas a Cuenta de Terceros"
+msgstr ""
+
+#: acc/templates/acc/taxpayer_sales.html:49
+msgid "Debito F. a Cta. de Terceros"
+msgstr ""
+
+#: acc/templates/acc/taxpayer_sales.html:50
+msgid "IVA Percibido"
+msgstr ""
+
+#: acc/templates/acc/taxpayer_sales.html:51
+msgid "IVA Retenido"
+msgstr ""
+
+#: acc/views/end_consumer.py:44
+msgid "End Consumer Book"
+msgstr ""
+
+#: acc/views/end_consumer.py:86 bms/forms.py:98 bms/forms.py:170
+#: bms/templates/bms/invoice_detail.html:65
+#: bms/templates/bms/invoice_list.html:66 bms/templates/bms/revenue.html:35
+#: bms/templates/bms/sale_associate_revers_obj_form.html:315
+#: core/models/branch.py:48 crm/templates/crm/cxc_list.html:54
+#: lm/templates/lm/supplyorder_list.html:45 mm/forms.py:141 offer/forms.py:95
+msgid "Branch"
+msgstr "Sucursal"
+
+#: acc/views/end_consumer.py:94
+msgid "Venta por cuenta de Terceros"
+msgstr ""
+
+#: acc/views/end_consumer.py:95
+msgid "1% IVA Retenido"
+msgstr ""
+
+#: acc/views/end_consumer.py:96
+#, fuzzy
+#| msgid "Total"
+msgid "Venta Total"
+msgstr "Precio Total"
+
+#: acc/views/journal_ledger.py:32
+#, fuzzy
+#| msgid "Trial Balance"
+msgid "Journal Ledger Balance"
+msgstr "Balance de Comprobacion"
+
+#: acc/views/policy.py:184
+msgid "Asiento"
+msgstr ""
+
+#: acc/views/policy.py:185
+msgid "Consecutivo"
+msgstr ""
+
+#: acc/views/policy.py:186
+msgid "Centro de Costo"
+msgstr ""
+
+#: acc/views/policy.py:187
+msgid "Cuenta Contable"
+msgstr ""
+
+#: acc/views/policy.py:188
+#, fuzzy
+#| msgid "Description"
+msgid "Cta Descrip"
+msgstr "Descripción"
+
+#: acc/views/policy.py:189
+#, fuzzy
+#| msgid "Cuentas"
+msgid "Fuente"
+msgstr "Cuentas"
+
+#: acc/views/policy.py:190
+#, fuzzy
+#| msgid "Difference"
+msgid "Referencia"
+msgstr "Diferencia"
+
+#: acc/views/policy.py:191
+#, fuzzy
+#| msgid "Credito Fiscal"
+msgid "Debito Local"
+msgstr "Crédito Fiscal"
+
+#: acc/views/policy.py:192
+#, fuzzy
+#| msgid "Credito Fiscal"
+msgid "Credito Local"
+msgstr "Crédito Fiscal"
+
+#: acc/views/policy.py:193
+msgid "NIT"
+msgstr ""
+
+#. Translators: Partidas Contables
+#: acc/views/taxpayer_sales.py:16 acc/views/trial_balance.py:14
+#: core/templates/core/base.html:635 core/templates/core/base2.html:564
+#: crm/views.py:41
+msgid "Trial Balance"
+msgstr "Balance de Comprobacion"
+
+#: banks/api/views/transaction.py:56 bms/api/views/__init__.py:103
+#, fuzzy
+#| msgid "purchase order does not belongs to the user's tenant"
+msgid "invoice does not belongs to the user's tenant"
+msgstr "orden de compra no pertenece al usuario de la entidad"
+
+#: banks/api/views/transaction.py:61
+#, fuzzy
+#| msgid "purchase is already reversed"
+msgid "transaction is already reversed"
+msgstr "compra ya está reversada"
 
 #: banks/models/bank.py:8
 msgid "Guatemala"
@@ -742,32 +1283,90 @@ msgstr "Costa Rica"
 msgid "Colombia"
 msgstr "Colombia"
 
-#: banks/models/bank.py:14
+#: banks/models/bank.py:14 core/models/tenant.py:15
 msgid "legal name"
 msgstr "nombre legal"
 
-#: banks/models/bank.py:15
+#: banks/models/bank.py:15 core/models/tenant.py:41
 msgid "country"
 msgstr "país"
 
-#: banks/models/bank.py:29 banks/templates/banks/wallet_list.html:48
+#: banks/models/bank.py:22 core/models/fiscal_document.py:11
+#: core/models/fiscal_document.py:68
+msgid "template"
+msgstr ""
+
+#: banks/models/bank.py:31 banks/templates/banks/wallet_list.html:48
 msgid "Bank"
 msgstr "Banco"
 
 #. Translators: Bancos
-#: banks/models/bank.py:30 core/templates/core/base.html:541
-#: core/templates/core/base.html:550
+#: banks/models/bank.py:32 core/templates/core/base.html:700
+#: core/templates/core/base2.html:617 core/templates/core/patch_base.html:219
 msgid "Banks"
 msgstr "Bancos"
 
+#: banks/models/petty_cash.py:8
+msgid "responsible"
+msgstr ""
+
+#: banks/models/petty_cash.py:9 banks/models/petty_cash_transaction.py:15
+#: banks/models/transaction.py:43 bms/models/common.py:685
+#: bms/models/common.py:975 bms/models/common.py:1025 bms/models/discount.py:14
+#: bms/models/tax.py:10 core/models/tax.py:21 core/models/tax.py:92
+#: mm/models/purchase.py:561 mm/models/purchase.py:616
+#: mm/models/transaction.py:22
+msgid "amount"
+msgstr "monto"
+
+#. Translators: Caja Chica
+#: banks/models/petty_cash.py:25 banks/models/petty_cash.py:26
+#: core/templates/core/base.html:692 core/templates/core/base2.html:609
+#: sync/templates/sync/syncrecord_detail.html:110
+msgid "Petty Cash"
+msgstr "Caja Chica"
+
+#: banks/models/petty_cash_transaction.py:25
+#, fuzzy
+#| msgid "Transaction"
+msgid "Petty Cash Transaction"
+msgstr "Transacción"
+
+#: banks/models/petty_cash_transaction.py:26
+#, fuzzy
+#| msgid "Transactions"
+msgid "Petty Cash Transactions"
+msgstr "Transacciones"
+
+#: banks/models/pos_terminal.py:13 core/models/branch.py:33
+#: mm/models/payment.py:31
+msgid "bank account"
+msgstr "cuenta de banco"
+
+#: banks/models/pos_terminal.py:24
+msgid "fee"
+msgstr ""
+
+#: banks/models/pos_terminal.py:34
+msgid "Pos Terminal"
+msgstr ""
+
+#: banks/models/pos_terminal.py:35
+msgid "Pos Terminals"
+msgstr ""
+
 #. Translators: Translate "check" as "cheque" in spanish
 #: banks/models/transaction.py:13
 msgid "check"
 msgstr "cheque"
 
-#: banks/models/transaction.py:26 mm/models/purchase.py:51
-#: mm/models/purchase_order.py:19 mm/models/purchase_requisition.py:16
-#: mm/models/transaction.py:32
+#: banks/models/transaction.py:14
+msgid "transfer"
+msgstr "transferencia"
+
+#: banks/models/transaction.py:26 mm/forms.py:251 mm/models/purchase.py:45
+#: mm/models/purchase_order.py:19 mm/models/purchase_requisition.py:15
+#: mm/models/transaction.py:33
 msgid "provider"
 msgstr "proveedor"
 
@@ -783,12 +1382,6 @@ msgstr "a proveedor"
 msgid "pay to the order of"
 msgstr "páguese a la orden de"
 
-#: banks/models/transaction.py:43 bms/models/common.py:503
-#: bms/models/discount.py:14 bms/models/tax.py:10 mm/models/purchase.py:445
-#: mm/models/tax.py:10 mm/models/transaction.py:21
-msgid "amount"
-msgstr "monto"
-
 #: banks/models/transaction.py:44
 msgid "previous balance"
 msgstr "saldo anterior"
@@ -797,39 +1390,56 @@ msgstr "saldo anterior"
 msgid "checkbook last"
 msgstr "ultima secuencia de chequera"
 
-#: banks/models/transaction.py:47
+#: banks/models/transaction.py:47 mm/models/payment.py:99
 msgid "transfer reference"
 msgstr "referencia de transferencia"
 
-#: banks/models/transaction.py:64 lm/models/transaction.py:50
-#: mm/models/transaction.py:51
+#: banks/models/transaction.py:49
+#, fuzzy
+#| msgid "date record"
+msgid "date reversed"
+msgstr "fecha de registro"
+
+#: banks/models/transaction.py:60 bms/models/common.py:170
+#: mm/models/purchase.py:107
+msgid "reversed by"
+msgstr "reversada por"
+
+#: banks/models/transaction.py:75 lm/models/transaction.py:124
+#: mm/models/transaction.py:61
 msgid "Transaction"
 msgstr "Transacción"
 
-#: banks/models/transaction.py:65 lm/models/transaction.py:51
-#: mm/models/transaction.py:52
+#: banks/models/transaction.py:76 lm/models/transaction.py:125
+#: mm/models/transaction.py:62
 msgid "Transactions"
 msgstr "Transacciones"
 
-#: banks/models/transaction.py:78
+#: banks/models/transaction.py:79
+#, fuzzy
+#| msgid "Can reverse Purchase"
+msgid "Can reverse Transaction"
+msgstr "Puede reversar Compra"
+
+#: banks/models/transaction.py:92
 msgid "transfer type transaction requires reference"
 msgstr "transacción de tipo transferencia requiere referencia"
 
-#: banks/models/transaction.py:80
+#: banks/models/transaction.py:94
 msgid "transaction tagged as to provider but no provider was selected"
 msgstr ""
 "transacción etiquetada como a proveedor pero no se seleccionó ningún "
 "proveedor"
 
-#: banks/models/transaction.py:124
+#: banks/models/transaction.py:143
 msgid "transaction"
 msgstr "transacción"
 
-#: banks/models/transaction.py:142
+#: banks/models/transaction.py:162
 msgid "Transaction Item"
 msgstr "Artículo de transacción"
 
-#: banks/models/transaction.py:143
+#: banks/models/transaction.py:163
 msgid "Transaction Items"
 msgstr "Artículos de transacción"
 
@@ -841,15 +1451,11 @@ msgstr "cuenta corriente"
 msgid "savings"
 msgstr "cuenta de ahorro"
 
-#: banks/models/wallet.py:15 mm/models/purchase.py:83
-#: mm/models/transaction.py:38
+#: banks/models/wallet.py:15 mm/models/purchase.py:77
+#: mm/models/transaction.py:41
 msgid "currency"
 msgstr "divisa"
 
-#: banks/models/wallet.py:19 mm/models/provider.py:53 mm/models/purchase.py:163
-msgid "balance"
-msgstr "saldo"
-
 #: banks/models/wallet.py:20
 msgid "bank"
 msgstr "banco"
@@ -867,12 +1473,13 @@ msgid "checkbook end"
 msgstr "final de secuencia de chequera"
 
 # bla bla
-#: banks/models/wallet.py:56 banks/templates/banks/transaction_list.html:44
+#: banks/models/wallet.py:57 banks/templates/banks/transaction_list.html:44
 msgid "Wallet"
 msgstr "Cuenta Bancaria"
 
 #. Translators: Cuentas Bancarias
-#: banks/models/wallet.py:57 core/templates/core/base.html:558
+#: banks/models/wallet.py:58 core/templates/core/base.html:708
+#: core/templates/core/base2.html:625 core/templates/core/patch_base.html:225
 msgid "Wallets"
 msgstr "Cuentas Bancarias"
 
@@ -880,58 +1487,105 @@ msgstr "Cuentas Bancarias"
 msgid "Legal Name"
 msgstr "Nombre Legal"
 
-#: banks/templates/banks/bank_list.html:46
+#: banks/templates/banks/bank_list.html:46 core/models/country.py:20
 msgid "Country"
 msgstr "País"
 
-#: banks/templates/banks/transaction_detail.html:22
-msgid "Bank Account"
-msgstr "Cuenta Bancaria"
+#: banks/templates/banks/pettycash_detail.html:12
+#, fuzzy
+#| msgid "Petty Cash"
+msgid "Petty Cash Detail"
+msgstr "Caja Chica"
 
-#: banks/templates/banks/transaction_detail.html:28
-#: banks/templates/banks/transaction_history.html:68
-#: banks/templates/banks/transaction_list.html:45
-#: bms/templates/bms/invoice_detail.html:104
-#: mm/templates/mm/payment_list.html:44
-msgid "Date"
-msgstr "Fecha"
+#: banks/templates/banks/pettycash_detail.html:24
+#, fuzzy
+#| msgid "Name"
+msgid "Name:"
+msgstr "Nombre"
 
-#: banks/templates/banks/transaction_detail.html:42
-#: bms/templates/bms/invoice_list.html:58
-#: crm/templates/crm/customer_list.html:48
+#: banks/templates/banks/pettycash_detail.html:30
+#, fuzzy
+#| msgid "Amount"
+msgid "Amount:"
+msgstr "Monto"
+
+#: banks/templates/banks/pettycash_detail.html:39
+#, fuzzy
+#| msgid "Account"
+msgid "Account:"
+msgstr "Cuenta"
+
+#: banks/templates/banks/pettycash_detail.html:45
+#, fuzzy
+#| msgid "Balance"
+msgid "Balance:"
+msgstr "Saldo"
+
+#: banks/templates/banks/pettycash_detail.html:53
+msgid "Responsible:"
+msgstr ""
+
+#: banks/templates/banks/pettycash_detail.html:62
+#: banks/templates/banks/transaction_detail.html:49
+#: bms/templates/bms/invoice_list.html:64
+#: bms/templates/bms/sale_associate_revers_obj_form.html:313
+#: crm/templates/crm/customer_list.html:49 crm/templates/crm/cxc_list.html:52
 #: mm/templates/mm/provider_list.html:48
 msgid "Document"
 msgstr "Documento"
 
-#: banks/templates/banks/transaction_detail.html:50
+#: banks/templates/banks/pettycash_list.html:45
+msgid "Responsible"
+msgstr ""
+
+#: banks/templates/banks/posterminal_list.html:45
+#: banks/templates/banks/transaction_detail.html:29
+msgid "Bank Account"
+msgstr "Cuenta Bancaria"
+
+#: banks/templates/banks/posterminal_list.html:46
+msgid "Fee"
+msgstr ""
+
+#: banks/templates/banks/transaction_detail.html:57
 msgid "Pay to the order of"
 msgstr "Páguese a la orden de"
 
-#: banks/templates/banks/transaction_detail.html:66
+#: banks/templates/banks/transaction_detail.html:71
+msgid "Monto expresado en letras"
+msgstr ""
+
+#: banks/templates/banks/transaction_detail.html:77
 msgid "Transaction Amount"
 msgstr "Monto de Transacción"
 
-#: banks/templates/banks/transaction_detail.html:119
-msgid "Print"
-msgstr "Imprimir"
+#: banks/templates/banks/transaction_detail.html:129
+#: bms/templates/bms/invoice_detail.html:164
+#: mm/templates/mm/purchase_detail.html:186
+msgid "Reverse"
+msgstr "Reversar"
 
 #: banks/templates/banks/transaction_form.html:42
 msgid "Next Document"
 msgstr "Siguiente Documento"
 
-#: banks/templates/banks/transaction_history.html:60
-#: bms/templates/bms/invoice_list.html:47
-msgid "Search"
-msgstr "Buscar"
+#: banks/templates/banks/transaction_list.html:47 bms/models/common.py:1137
+#, fuzzy
+#| msgid "Difference"
+msgid "Reference"
+msgstr "Diferencia"
 
-#: banks/templates/banks/transaction_history.html:72
-#: banks/templates/banks/wallet_list.html:47
-#: bms/templates/bms/invoice_list.html:63 mm/templates/mm/provider_list.html:49
-#: mm/templates/mm/purchase_list.html:50
-msgid "Balance"
-msgstr "Saldo"
+#: banks/templates/banks/transaction_list.html:48
+#, fuzzy
+#| msgid "check"
+msgid "Check No"
+msgstr "cheque"
 
-#: banks/templates/banks/transaction_list.html:47
+#: banks/templates/banks/transaction_list.html:49
+msgid "Reference or Check No"
+msgstr ""
+
+#: banks/templates/banks/transaction_list.html:50
 msgid "Creditor"
 msgstr "Acreedor"
 
@@ -939,385 +1593,554 @@ msgstr "Acreedor"
 msgid "Account No"
 msgstr "Número de Cuenta"
 
-#: bms/admin.py:75
+#: bms/admin.py:80
 #, python-format
 msgid "%d invoice was successfully reprocessed."
 msgid_plural "%d invoices were successfully reprocessed."
 msgstr[0] "%d factura ha sido reprocesada exitosamente."
 msgstr[1] "%d facturas han sido reprocesadas exitosamente."
 
-#: bms/admin.py:79
+#: bms/admin.py:84
 msgid "reprocess invoice"
 msgstr "reprocesar factura"
 
-#: bms/api_serializers.py:38
+#: bms/api/serializers/sale.py:84 bms/api/serializers/sync.py:92
 #, fuzzy, python-format
-msgid "tax for given code %(code)s does not exists"
+msgid "offer for given code %(code)s does not exists"
 msgstr "la sucursal para el código dado %(code)s no existe"
 
-#: bms/api_serializers.py:63 bms/api_serializers.py:84
-#, python-format
-msgid "product for given code %(code)s does not exists"
-msgstr "el producto para el código dado %(code)s no existe"
-
-#: bms/api_serializers.py:104
-#, fuzzy, python-format
-msgid "payment type for given code %(code)s does not exists"
-msgstr "el producto para el código dado %(code)s no existe"
-
-#: bms/api_serializers.py:127
-msgid "customer vendor and requester user must belong to same tenant"
-msgstr ""
-"el proveedor, el cliente y el usuario actual deben pertenecer a la misma "
-"entidad"
-
-#: bms/api_serializers.py:138
-#, fuzzy, python-format
-msgid "branch for given code %(code)s does not exists"
-msgstr "la sucursal para el código dado %(code)s no existe"
-
-#: bms/apps.py:8
-msgid "Billing Management System"
-msgstr "Sistema de Facturación"
-
-#: bms/forms.py:36 bms/models/common.py:690
+#: bms/api/serializers/sale.py:197 bms/forms.py:51 bms/models/common.py:1155
 #, python-format
 msgid "payment amount %(amount)s is greater than invoice balance %(balance)s"
 msgstr ""
 "el monto del pago %(amount)s es mayor que el balance de la factura "
 "%(balance)s"
 
-#: bms/forms.py:57
+#: bms/api/serializers/sync.py:36
+#, fuzzy, python-format
+msgid "tax for given code %(code)s does not exists"
+msgstr "la sucursal para el código dado %(code)s no existe"
+
+#: bms/api/serializers/sync.py:81 bms/api/serializers/sync.py:113
+#, python-format
+msgid "product for given code %(code)s does not exists"
+msgstr "el producto para el código dado %(code)s no existe"
+
+#: bms/api/serializers/sync.py:133
+#, fuzzy, python-format
+msgid "payment type for given code %(code)s does not exists"
+msgstr "el producto para el código dado %(code)s no existe"
+
+#: bms/api/serializers/sync.py:162
+msgid "customer vendor and requester user must belong to same tenant"
+msgstr ""
+"el proveedor, el cliente y el usuario actual deben pertenecer a la misma "
+"entidad"
+
+#: bms/api/serializers/sync.py:187
+#, fuzzy, python-format
+msgid "branch for given code %(code)s does not exists"
+msgstr "la sucursal para el código dado %(code)s no existe"
+
+#: bms/api/serializers/sync.py:203
+#, fuzzy, python-format
+#| msgid "product for given code %(code)s does not exists"
+msgid "pos for given code %(code)s does not exists"
+msgstr "el producto para el código dado %(code)s no existe"
+
+#: bms/api/views/__init__.py:108 mm/api/views.py:140
+msgid "purchase is already reversed"
+msgstr "compra ya está reversada"
+
+#: bms/apps.py:8
+msgid "Billing Management System"
+msgstr "Sistema de Facturación"
+
+#: bms/forms.py:78
 #, python-format
 msgid "invoice status %(status)s is not valid"
 msgstr "el estado de la factura %(status)s no es valido"
 
-#: bms/forms.py:61 bms/models/common.py:210
+#: bms/forms.py:82 bms/models/common.py:294
 msgid "can not add more than one discount of percentage type"
 msgstr "no se puede agregar mas de un descuento de tipo porcentaje"
 
-#: bms/models/common.py:18
+#: bms/forms.py:126 bms/views/sale/forms.py:14 mm/forms.py:84
+msgid "Date for Record"
+msgstr "Fecha de Registro"
+
+#: bms/forms.py:129 bms/views/sale/forms.py:21 crm/models/customer.py:73
+msgid "Customer"
+msgstr "Cliente"
+
+#: bms/forms.py:132 bms/templates/bms/revenue.html:36
+#: bms/views/sale/forms.py:24 mm/forms.py:95
+msgid "Document Type"
+msgstr "Tipo de Documento"
+
+#: bms/forms.py:134 bms/views/sale/forms.py:27
+#: lm/templates/lm/stock_by_warehouse.html:65 mm/forms.py:97 mm/forms.py:248
+#: mm/templates/mm/purchase_list.html:74
+#: pos/templates/pos/fiscalcorrelative_list.html:45
+msgid "Series"
+msgstr "Serie"
+
+#: bms/forms.py:137 mm/forms.py:100 mm/forms.py:187
+msgid "Purchase Type"
+msgstr "Tipo de Compra"
+
+#: bms/forms.py:139 bms/views/sale/forms.py:35 mm/forms.py:102 mm/forms.py:188
+msgid "Credit Days"
+msgstr "Días de Crédito"
+
+#: bms/forms.py:140 bms/models/common.py:101 bms/views/sale/forms.py:36
+msgid "Customer Document"
+msgstr "Documento del Cliente"
+
+#: bms/forms.py:141 bms/views/sale/forms.py:37 mm/forms.py:104 mm/forms.py:146
+#: mm/forms.py:184
+msgid "Business Activity"
+msgstr "Actividad del Negocio"
+
+#: bms/forms.py:142 bms/views/sale/forms.py:38
+#, fuzzy
+#| msgid "Customer"
+msgid "Customer Name"
+msgstr "Cliente"
+
+#: bms/forms.py:143 bms/views/sale/forms.py:39
+#, fuzzy
+#| msgid "Customers"
+msgid "Customer Address"
+msgstr "Clientes"
+
+#: bms/forms.py:145 bms/views/sale/forms.py:60 lm/models/offer.py:25
+#: offer/models/offer.py:90
+msgid "Offer"
+msgstr "Oferta"
+
+#: bms/forms.py:147 bms/models/common.py:743 bms/models/common.py:940
+#: bms/templates/bms/invoice_detail.html:81 bms/views/sale/forms.py:62
+#: lm/forms.py:26 lm/forms.py:165 lm/forms.py:199
+#: lm/templates/lm/shipment_create_form.html:64
+#: lm/templates/lm/shipment_detail.html:91
+#: lm/templates/lm/stock_adjust_form.html:58
+#: lm/templates/lm/stock_by_warehouse.html:67
+#: lm/templates/lm/supplyorder_detail.html:57
+#: lm/templates/lm/supplyorder_form.html:52
+#: lm/templates/lm/transaction_list.html:97 mm/forms.py:110 mm/forms.py:152
+#: mm/forms.py:192 mm/templates/mm/purchase_form_bk.html:143
+#: mm/templates/mm/purchase_form_items.html:158
+msgid "Quantity"
+msgstr "Cantidad"
+
+#: bms/forms.py:148 bms/views/sale/forms.py:63
+#: lm/templates/lm/stock_by_warehouse.html:69
+#: lm/templates/lm/transaction_list.html:94 mm/forms.py:111 mm/forms.py:153
+#: mm/forms.py:193 mm/templates/mm/purchase_form_items.html:161
+#, fuzzy
+#| msgid "lot"
+msgid "Lot"
+msgstr "Lote"
+
+#: bms/forms.py:149 bms/views/sale/forms.py:64
+#: lm/templates/lm/stock_by_warehouse.html:70
+#: lm/templates/lm/transaction_list.html:95 mm/forms.py:112
+#: mm/templates/mm/purchase_form_items.html:162
+#, fuzzy
+msgid "Due"
+msgstr "Deuda"
+
+#: bms/forms.py:168
+msgid "Fecha de Ventas"
+msgstr ""
+
+#: bms/forms.py:183
+msgid "Daily Summary"
+msgstr ""
+
+#: bms/forms.py:184
+msgid "Comida de Empleado"
+msgstr ""
+
+#: bms/forms.py:185
+msgid "Cortesia"
+msgstr ""
+
+#: bms/forms.py:186
+msgid "Venta Tarjeta Pedido Ya"
+msgstr ""
+
+#: bms/forms.py:187
+msgid "Subsidios pedidos ya"
+msgstr ""
+
+#: bms/forms.py:188
+msgid "Venta Costeada Por Strike"
+msgstr ""
+
+#: bms/forms.py:189
+msgid "Venta Ibex"
+msgstr ""
+
+#: bms/forms.py:206 pos/models/fiscal_correlative.py:65
+msgid "Fiscal Correlative"
+msgstr "Correlativo Fiscal"
+
+#: bms/models/common.py:21 lm/models/stock.py:12
 msgid "unbilled"
 msgstr "sin facturar"
 
-#: bms/models/common.py:19
+#: bms/models/common.py:22 lm/models/stock.py:13
 msgid "billing"
 msgstr "facturando"
 
-#: bms/models/common.py:20
+#: bms/models/common.py:23 lm/models/stock.py:14
 msgid "invoiced"
 msgstr "facturado"
 
-#: bms/models/common.py:24 lm/models/shipment.py:13 mnf/models/mo.py:12
+#: bms/models/common.py:27 envoice/models.py:8 insumos/currency.py:34
+#: lm/models/shipment.py:14 mm/models/purchase.py:21 mnf/models/mo.py:12
 #: sync/models.py:14
 msgid "created"
 msgstr "creada"
 
-#: bms/models/common.py:25
+#: bms/models/common.py:28
 msgid "generated"
 msgstr "generada"
 
-#: bms/models/common.py:26 lm/models/shipment.py:16
+#: bms/models/common.py:29 lm/models/shipment.py:17
 msgid "cancelled"
 msgstr "cancelada"
 
-#: bms/models/common.py:27
+#: bms/models/common.py:30
 msgid "generation error"
 msgstr "error en generación"
 
-#: bms/models/common.py:28
+#: bms/models/common.py:31
 msgid "overdue"
 msgstr "vencida"
 
-#: bms/models/common.py:29
+#: bms/models/common.py:32
 msgid "paid"
 msgstr "pagada"
 
-#: bms/models/common.py:51 pos/models/fiscal_correlative.py:41
-#: rcm/models/offer.py:24
+#: bms/models/common.py:33
+#, fuzzy
+#| msgid "Reversed"
+msgid "reversed"
+msgstr "Reversada"
+
+#: bms/models/common.py:39
+msgid "Cash"
+msgstr ""
+
+#: bms/models/common.py:61 offer/forms.py:67 offer/models/offer.py:44
+#: pos/forms/fiscal_correlative.py:28 pos/models/fiscal_correlative.py:39
 msgid "pos"
 msgstr "pos"
 
-#: bms/models/common.py:59
+#: bms/models/common.py:69 crm/forms.py:26
 msgid "customer"
 msgstr "cliente"
 
-#: bms/models/common.py:65
+#: bms/models/common.py:75
 msgid "vendor"
 msgstr "vendedor"
 
-#: bms/models/common.py:74
-msgid "Customer Document"
-msgstr "Documento del Cliente"
+#: bms/models/common.py:81
+#, fuzzy
+#| msgid "Fiscal Correlative"
+msgid "fiscal correlative"
+msgstr "Correlativo Fiscal"
 
-#: bms/models/common.py:75
+#: bms/models/common.py:89 core/models/tax.py:112
+#: pos/models/fiscal_correlative.py:28
+msgid "fiscal document"
+msgstr "documento fiscal"
+
+#: bms/models/common.py:104
 msgid "Address"
 msgstr "Dirección"
 
-#: bms/models/common.py:76 sync/templates/sync/syncrecord_detail.html:82
+#: bms/models/common.py:107 sync/templates/sync/syncrecord_detail.html:82
 #: sync/templates/sync/syncrecord_detail.html:159
 #: sync/templates/sync/syncrecord_list.html:74
 msgid "Error"
 msgstr "Error"
 
-#: bms/models/common.py:78
+#: bms/models/common.py:110
 msgid "Official Document"
 msgstr "Documento Oficial"
 
-#: bms/models/common.py:79 bms/templates/bms/invoice_detail.html:40
-#: mm/templates/mm/purchaseorder_list.html:52
+#: bms/models/common.py:113 mm/templates/mm/purchaseorder_list.html:52
 #: mnf/templates/mnf/manufacturingorder_form.html:65
 #: mnf/templates/mnf/manufacturingorder_list.html:44
 #: sync/templates/sync/syncrecord_list.html:67
 msgid "Created Date"
 msgstr "Fecha de Creacion"
 
-#: bms/models/common.py:80 bms/templates/bms/invoice_detail.html:54
+#: bms/models/common.py:116 bms/templates/bms/invoice_detail.html:43
 msgid "Generated Date"
 msgstr "Fecha de Generación"
 
-#: bms/models/common.py:81
+#: bms/models/common.py:119
 msgid "Overdue Date"
 msgstr "Fecha de Vencimiento"
 
-#: bms/models/common.py:82 bms/templates/bms/invoice_detail.html:68
+#: bms/models/common.py:122 bms/templates/bms/invoice_detail.html:57
 msgid "Paid Date"
 msgstr "Fecha de Cancelación"
 
-#: bms/models/common.py:83
+#: bms/models/common.py:125
+#, fuzzy
+#| msgid "Started Date"
+msgid "Shift Date"
+msgstr "Fecha de Inicio"
+
+#: bms/models/common.py:128
 msgid "Net Amount"
 msgstr "Monto Neto"
 
-#: bms/models/common.py:84
+#: bms/models/common.py:131
 msgid "Taxes Amount"
 msgstr "Monto de Impuestos"
 
-#: bms/models/common.py:85
+#: bms/models/common.py:134
 msgid "Discounts Amount"
 msgstr "Monto de Descuentos"
 
-#: bms/models/common.py:86
+#: bms/models/common.py:137
 msgid "Total Amount"
 msgstr "Monto Total"
 
-#: bms/models/common.py:87
+#: bms/models/common.py:140
 msgid "Balance Amount"
 msgstr "Balance"
 
-#: bms/models/common.py:105 bms/models/common.py:322 bms/models/common.py:531
-#: bms/models/common.py:661 bms/templates/bms/invoice_detail.html:22
+#: bms/models/common.py:143 bms/models/common.py:761 lm/models/product.py:29
+#: lm/models/shipment_item.py:34 lm/models/stock.py:66 lm/models/stock.py:72
+#: lm/models/transaction.py:67
+msgid "cost"
+msgstr "costo"
+
+#: bms/models/common.py:146
+#, fuzzy
+#| msgid "Provider Name"
+msgid "Order Num"
+msgstr "Nombre del Proveedor"
+
+#: bms/models/common.py:150
+msgid "Delivery Channel"
+msgstr ""
+
+#: bms/models/common.py:154 crm/models/customer.py:34 mm/models/provider.py:26
+msgid "payment conditions"
+msgstr "condiciones de pago"
+
+#: bms/models/common.py:158 crm/models/customer.py:36 mm/models/provider.py:28
+#: mm/models/purchase.py:136
+msgid "credit days"
+msgstr "días crédito"
+
+#: bms/models/common.py:162
+#, fuzzy
+#| msgid "reversed by"
+msgid "reversing to"
+msgstr "reversada por"
+
+#: bms/models/common.py:175
+#, fuzzy
+#| msgid "invoiced"
+msgid "e-nvoice done"
+msgstr "facturado"
+
+#: bms/models/common.py:196 bms/models/common.py:543 bms/models/common.py:579
+#: bms/models/common.py:727 bms/models/common.py:1120
+#: bms/templates/bms/invoice_detail.html:22
 msgid "Invoice"
 msgstr "Factura"
 
 #. Translators: Facturas
-#: bms/models/common.py:106 bms/templates/bms/invoice_list.html:21
-#: core/templates/core/base.html:656
+#: bms/models/common.py:197 bms/templates/bms/invoice_list.html:21
+#: core/templates/core/base.html:822 core/templates/core/base2.html:739
+#: core/templates/core/patch_base.html:255 crm/templates/crm/cxc_list.html:21
 msgid "Invoices"
 msgstr "Facturas"
 
-#: bms/models/common.py:109
+#: bms/models/common.py:200
 msgid "Can generate Invoice"
 msgstr "Puede Generar Facturas"
 
-#: bms/models/common.py:110
+#: bms/models/common.py:201
 msgid "Can cancel Invoice"
 msgstr "Puede Cancelar Facturas"
 
-#: bms/models/common.py:138
-msgid "vendor and customer should belong to same tenant"
-msgstr "vendedor y cliente deben pertenecer a la misma entidad"
+#: bms/models/common.py:202
+#, fuzzy
+#| msgid "Can generate Invoice"
+msgid "Can reverse Invoice"
+msgstr "Puede Generar Facturas"
 
-#: bms/models/common.py:144
-msgid "vendor and pos should belong to same tenant"
-msgstr "vendedor y pos deben pertenecer a la misma entidad"
+#: bms/models/common.py:203
+#, fuzzy
+#| msgid "Correlative"
+msgid "Can assign Correlative"
+msgstr "Correlativo"
 
-#: bms/models/common.py:147
-msgid "user is not assigned to the pos"
-msgstr "el usuario no esta asignado al pos"
-
-#: bms/models/common.py:152
-msgid "user has no correlative available for this pos and document type"
-msgstr "el usuario no tiene correlativo para este pos y tipo de documento"
-
-#: bms/models/common.py:204
+#: bms/models/common.py:287
 #, python-format
 msgid "can not add discount in current invoice status %(status)s"
 msgstr ""
 "no puede agregar descuentos en el estado actual de la factura %(status)s"
 
-#: bms/models/common.py:220
+#: bms/models/common.py:304
 #, python-format
 msgid "can not remove discount in current invoice status %(status)s"
 msgstr ""
 "no puede quitar descuentos en el estado actual de la factura %(status)s"
 
-#: bms/models/common.py:223
+#: bms/models/common.py:307
 msgid "discount object does not belongs to this invoice"
 msgstr "el descuento no pertenece a esta factura"
 
-#: bms/models/common.py:239
+#: bms/models/common.py:323
 #, python-format
 msgid "can not add item in current invoice status %(status)s"
 msgstr "no puede agregar items en el estado actual de la factura %(status)s"
 
-#: bms/models/common.py:249
+#: bms/models/common.py:333
 #, python-format
 msgid "can not remove item in current invoice status %(status)s"
 msgstr ""
 "no puede quitar descuentos en el estado actual de la factura %(status)s"
 
-#: bms/models/common.py:258
+#: bms/models/common.py:342
 #, python-format
 msgid "can not generate official invoice in current invoice status %(status)s"
 msgstr ""
 "no puede generar factura oficial en el estado actual de la factura %(status)s"
 
-#: bms/models/common.py:264
-#, python-format
+#: bms/models/common.py:348
+#, fuzzy, python-format
+#| msgid ""
+#| "can not generate official invoice if total amount or balance is lower or "
+#| "equal to 0 total_amt => %(total_amt)s balance =>%(balance)s"
 msgid ""
-"can not generate official invoice if total amount or balance is lower or "
-"equal to 0 total_amt => %(total_amt)s balance =>%(balance)s"
+"can not generate official invoice if total amount is lower or equal to 0 "
+"total_amt => %(total_amt)s"
 msgstr ""
 "no se puede  generar factura oficial si el monto total o balance es menor o "
 "igual a 0 monto total => %(total_amt)s saldo =>%(balance)s"
 
-#: bms/models/common.py:325 bms/models/common.py:534
-msgid "Item Object Model"
-msgstr "Modelo de Objeto Articulo"
+#: bms/models/common.py:501
+msgid "vendor and customer should belong to same tenant"
+msgstr "vendedor y cliente deben pertenecer a la misma entidad"
 
-#: bms/models/common.py:326 bms/models/common.py:535
-msgid "Item Object Id"
-msgstr "Id de Objeto Articulo"
-
-#: bms/models/common.py:327 bms/models/common.py:536
-#: bms/templates/bms/invoice_detail.html:77
-#: bms/templates/bms/invoice_detail.html:105
-#: bms/templates/bms/paymenttype_list.html:46 core/models.py:15
-#: lm/templates/lm/packaging_list.html:46 lm/templates/lm/product_list.html:46
-#: lm/templates/lm/stock_list.html:60 lm/templates/lm/typology_list.html:45
-#: mm/templates/mm/paymenttype_list.html:45
-#: mm/templates/mm/purchase_form.html:151
-#: mm/templates/mm/transaction_list.html:71
-#: mnf/templates/mnf/bundle_list.html:46 rcm/templates/rcm/offer_list.html:35
-msgid "Description"
-msgstr "Descripción"
-
-#: bms/models/common.py:328 bms/models/common.py:469
-#: bms/templates/bms/invoice_detail.html:78 lm/forms.py:107 lm/forms.py:138
-#: lm/templates/lm/shipment_create_form.html:59
-#: lm/templates/lm/shipment_detail.html:82
-#: lm/templates/lm/stock_adjust_form.html:58 lm/templates/lm/stock_list.html:65
-#: mm/forms.py:90 mm/forms.py:121 mm/forms.py:147
-#: mm/templates/mm/purchase_form.html:149
-msgid "Quantity"
-msgstr "Cantidad"
-
-#: bms/models/common.py:329 bms/templates/bms/invoice_detail.html:79
-msgid "Unit Price"
-msgstr "Precio Unitario"
-
-#: bms/models/common.py:330
-msgid "Net Price"
-msgstr "Precio Neto"
-
-#: bms/models/common.py:331 bms/models/discount.py:36
-msgid "Discount"
-msgstr "Descuento"
-
-#. Translators: Impuestos
-#: bms/models/common.py:332 bms/models/tax.py:34
-#: core/templates/core/base.html:256 core/templates/core/base.html:672
-#: mm/models/tax.py:34
-msgid "Taxes"
-msgstr "Impuestos"
-
-#: bms/models/common.py:333
-msgid "Total Price"
-msgstr "Precio Total"
-
-#: bms/models/common.py:343 bms/models/common.py:464
-msgid "Invoice Item"
-msgstr "Item de Factura"
-
-#: bms/models/common.py:344
-msgid "Invoice Items"
-msgstr "Items de Factura"
-
-#: bms/models/common.py:373
-#, python-format
-msgid "model %(model)s is lot type but not quantity provided"
-msgstr "modelo %(model)s es de tipo lote pero no se especifica cantidad"
-
-#: bms/models/common.py:378
-#, python-format
-msgid "model %(model)s is not in unbilled status"
-msgstr "modelo %(model)s no se encuentra en estado 'no facturado'"
-
-#: bms/models/common.py:467
-msgid "Detail Model"
-msgstr "Modelo Detalle"
-
-#: bms/models/common.py:468
-msgid "Detail Object"
-msgstr "Objeto Detalle"
-
-#: bms/models/common.py:479
-msgid "Invoice Item Detail"
-msgstr "Detalle de Item de Factura"
-
-#: bms/models/common.py:480
-msgid "Invoice Item Details"
-msgstr "Detalles de Item de Factura"
-
-#: bms/models/common.py:489
-#, fuzzy
-#| msgid "Invoice Item"
-msgid "invoice item"
-msgstr "Item de Factura"
-
-#: bms/models/common.py:497
-#, fuzzy
-#| msgid "taxes"
-msgid "tax"
-msgstr "impuestos"
-
-#: bms/models/common.py:512
-#, fuzzy
-#| msgid "Purchase Item"
-msgid "BMS Item Tax"
-msgstr "Ítem de Compra"
+#: bms/models/common.py:510
+msgid "vendor and pos should belong to same tenant"
+msgstr "vendedor y pos deben pertenecer a la misma entidad"
 
 #: bms/models/common.py:513
-#, fuzzy
-#| msgid "Purchase Items"
-msgid "BMS Item Taxes"
-msgstr "Ítems de Compras"
+msgid "user is not assigned to the pos"
+msgstr "el usuario no esta asignado al pos"
 
-#: bms/models/common.py:525
+#: bms/models/common.py:547
+#, fuzzy
+#| msgid "IVA"
+msgid "VAT"
+msgstr "IVA"
+
+#: bms/models/common.py:550
+msgid "Withheld VAT"
+msgstr ""
+
+#: bms/models/common.py:553
+msgid "Collected VAT"
+msgstr ""
+
+#: bms/models/common.py:559
+#, fuzzy
+#| msgid "Invoice Item"
+msgid "Invoice Summary"
+msgstr "Item de Factura"
+
+#: bms/models/common.py:560
+#, fuzzy
+#| msgid "Invoices"
+msgid "Invoices Summary"
+msgstr "Facturas"
+
+#: bms/models/common.py:572
 msgid "Percentage"
 msgstr "Porcentaje"
 
-#: bms/models/common.py:526
+#: bms/models/common.py:573
 msgid "Fixed"
 msgstr "Fijo"
 
-#: bms/models/common.py:537
+#: bms/models/common.py:574
+#, fuzzy
+#| msgid "Overdue Date"
+msgid "Override"
+msgstr "Fecha de Vencimiento"
+
+#: bms/models/common.py:583 bms/models/common.py:731
+msgid "Item Object Model"
+msgstr "Modelo de Objeto Articulo"
+
+#: bms/models/common.py:586 bms/models/common.py:734
+msgid "Item Object Id"
+msgstr "Id de Objeto Articulo"
+
+#: bms/models/common.py:589
+msgid "Instance ID"
+msgstr ""
+
+#: bms/models/common.py:595 bms/models/common.py:740
+#: bms/templates/bms/invoice_detail.html:80
+#: bms/templates/bms/invoice_detail.html:110
+#: bms/templates/bms/paymenttype_list.html:46
+#: bms/templates/bms/sale_form1_items.html:186 core/models/currency.py:6
+#: lm/templates/lm/packaging_list.html:46 lm/templates/lm/product_list.html:46
+#: lm/templates/lm/stock_by_product.html:57
+#: lm/templates/lm/stock_by_warehouse.html:61
+#: lm/templates/lm/transaction_list.html:87
+#: lm/templates/lm/typology_list.html:45 mm/models/payment.py:17
+#: mm/templates/mm/paymenttype_list.html:44
+#: mm/templates/mm/purchase_form_bk.html:145
+#: mm/templates/mm/purchase_form_items.html:160
+#: mm/templates/mm/transaction_list.html:71
+#: mnf/templates/mnf/bundle_list.html:46
+#: offer/templates/offer/offer_list.html:66
+msgid "Description"
+msgstr "Descripción"
+
+#: bms/models/common.py:598
 msgid "Discount Type"
 msgstr "Tipo de Descuento"
 
-#: bms/models/common.py:538
+#: bms/models/common.py:601
 msgid "Discount Percentage"
 msgstr "Descuento de Porcentaje"
 
-#: bms/models/common.py:539
+#: bms/models/common.py:604
 msgid "Discount Fixed "
 msgstr "Descuento Fijo "
 
-#: bms/models/common.py:540
+#: bms/models/common.py:607
 msgid "Discount Amount"
 msgstr "Monto de Descuento"
 
-#: bms/models/common.py:549
+#: bms/models/common.py:613
+msgid "Invoice Discount"
+msgstr "Descuento de Factura"
+
+#: bms/models/common.py:614
+msgid "Invoice Discounts"
+msgstr "Descuentos de Factura"
+
+#: bms/models/common.py:625
 #, python-format
 msgid ""
 "discount object must be provided or provide discount_type and amount instead "
@@ -1328,60 +2151,203 @@ msgstr ""
 "valores actuales: objeto descuento %(discount_obj)s, tipo de descuento "
 "%(discount_type)s monto %(amount)s"
 
-#: bms/models/common.py:556
+#: bms/models/common.py:632
 #, python-format
 msgid "discount_type %(discount_type)s is not in %(type_choices)s"
 msgstr ""
 "tipo de descuento %(discount_type)s no esta listado en %(type_choices)s"
 
-#: bms/models/common.py:593
-msgid "Invoice Discount"
+#: bms/models/common.py:671 envoice/models.py:17 lm/models/stock.py:87
+msgid "invoice"
+msgstr "facturado"
+
+#: bms/models/common.py:679 bms/models/common.py:969 mm/models/purchase.py:557
+#, fuzzy
+#| msgid "taxes"
+msgid "tax"
+msgstr "impuestos"
+
+#: bms/models/common.py:694
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Tax"
+msgstr "Factura"
+
+#: bms/models/common.py:695
+#, fuzzy
+#| msgid "Invoice Items"
+msgid "Invoice Taxes"
+msgstr "Items de Factura"
+
+#: bms/models/common.py:746 bms/templates/bms/invoice_detail.html:83
+#: mm/forms.py:113
+msgid "Unit Price"
+msgstr "Precio Unitario"
+
+#: bms/models/common.py:749
+msgid "Net Price"
+msgstr "Precio Neto"
+
+#: bms/models/common.py:752 bms/models/discount.py:36
+msgid "Discount"
+msgstr "Descuento"
+
+#: bms/models/common.py:758
+msgid "Total Price"
+msgstr "Precio Total"
+
+#: bms/models/common.py:773 bms/models/common.py:930
+msgid "Invoice Item"
+msgstr "Item de Factura"
+
+#: bms/models/common.py:774
+msgid "Invoice Items"
+msgstr "Items de Factura"
+
+#: bms/models/common.py:813
+#, python-format
+msgid "model %(model)s is lot type but not quantity provided"
+msgstr "modelo %(model)s es de tipo lote pero no se especifica cantidad"
+
+#: bms/models/common.py:818
+#, python-format
+msgid "model %(model)s is not in unbilled status"
+msgstr "modelo %(model)s no se encuentra en estado 'no facturado'"
+
+#: bms/models/common.py:934
+msgid "Detail Model"
+msgstr "Modelo Detalle"
+
+#: bms/models/common.py:937
+msgid "Detail Object"
+msgstr "Objeto Detalle"
+
+#: bms/models/common.py:951
+msgid "Invoice Item Detail"
+msgstr "Detalle de Item de Factura"
+
+#: bms/models/common.py:952
+msgid "Invoice Item Details"
+msgstr "Detalles de Item de Factura"
+
+#: bms/models/common.py:961 bms/models/common.py:1013
+#, fuzzy
+#| msgid "Invoice Item"
+msgid "invoice item"
+msgstr "Item de Factura"
+
+#: bms/models/common.py:984
+#, fuzzy
+#| msgid "Invoice Item"
+msgid "Invoice Item Tax"
+msgstr "Item de Factura"
+
+#: bms/models/common.py:985
+#, fuzzy
+#| msgid "Invoice Items"
+msgid "Invoice Item Taxes"
+msgstr "Items de Factura"
+
+#: bms/models/common.py:1019 mm/models/purchase.py:437
+#, fuzzy
+#| msgid "Discount"
+msgid "discount"
+msgstr "Descuento"
+
+#: bms/models/common.py:1034
+#, fuzzy
+#| msgid "Invoice Discount"
+msgid "BMS Item Discount"
 msgstr "Descuento de Factura"
 
-#: bms/models/common.py:594
-msgid "Invoice Discounts"
+#: bms/models/common.py:1035
+#, fuzzy
+#| msgid "Invoice Discounts"
+msgid "BMS Item Discounts"
 msgstr "Descuentos de Factura"
 
-#: bms/models/common.py:601 mm/models/payment.py:15
+#: bms/models/common.py:1045
 msgid "Tag Name"
 msgstr "Etiqueta"
 
-#: bms/models/common.py:603
+#: bms/models/common.py:1047
 msgid "This value will be displayed when selecting payment type"
 msgstr "Este valor se mostrara al seleccionar tipo de descuento"
 
-#: bms/models/common.py:610 bms/models/common.py:642 bms/models/common.py:667
-#: mm/models/payment.py:20 mm/models/payment.py:54 mm/models/payment.py:76
+#: bms/models/common.py:1054 bms/models/common.py:1101
+#: bms/models/common.py:1126 bms/templates/bms/revenue.html:37
+#: bms/views/sale/forms.py:33 mm/models/payment.py:58 mm/models/payment.py:87
 #: mm/templates/mm/payment_list.html:46
 msgid "Payment Type"
 msgstr "Tipo de Pago"
 
-#: bms/models/common.py:612
+#: bms/models/common.py:1056
 msgid "This value will be displayed in invoice item description"
 msgstr "Este valor se mostrara en descripcion de item de factura"
 
+#: bms/models/common.py:1073
+#, fuzzy
+#| msgid "code"
+msgid "e_code"
+msgstr "código"
+
+#: bms/models/common.py:1078
+msgid "ordering"
+msgstr ""
+
+#: bms/models/common.py:1079
+#, fuzzy
+#| msgid "change"
+msgid "allows change"
+msgstr "modificar"
+
+#: bms/models/common.py:1080
+#, fuzzy
+#| msgid "transfer reference"
+msgid "requires reference"
+msgstr "referencia de transferencia"
+
 #. Translators: Tipos de Pago
-#: bms/models/common.py:643 core/templates/core/base.html:296
-#: core/templates/core/base.html:664 mm/models/payment.py:55
+#: bms/models/common.py:1102 core/templates/core/base.html:357
+#: core/templates/core/base.html:838 core/templates/core/base2.html:321
+#: core/templates/core/base2.html:755 mm/models/payment.py:59
 msgid "Payment Types"
 msgstr "Tipos de Pago"
 
-#: bms/models/common.py:654
+#: bms/models/common.py:1113
 msgid "account tenant should be same object tenant"
 msgstr "la entidad de la cuenta debe ser de la misma  entidad del objeto"
 
-#: bms/models/common.py:672 mm/models/payment.py:81
+#: bms/models/common.py:1131 mm/models/payment.py:92
 msgid "Payment Date"
 msgstr "Fecha de Pago"
 
-#: bms/models/common.py:683
+#: bms/models/common.py:1134
+#, fuzzy
+#| msgid "Net Amount"
+msgid "Received Amount"
+msgstr "Monto Neto"
+
+#: bms/models/common.py:1136
+#, fuzzy
+#| msgid "change"
+msgid "Change"
+msgstr "modificar"
+
+#: bms/models/common.py:1147
 msgid "Invoice Payment"
 msgstr "Pago de Factura"
 
-#: bms/models/common.py:684
+#: bms/models/common.py:1148
 msgid "Invoice Payments"
 msgstr "Pagos de Factura"
 
+#: bms/models/common.py:1160
+#, fuzzy
+#| msgid "transfer type transaction requires reference"
+msgid "payment type requires reference"
+msgstr "transacción de tipo transferencia requiere referencia"
+
 #: bms/models/discount.py:9
 #, fuzzy
 #| msgid "Fixed"
@@ -1394,312 +2360,278 @@ msgstr "Fijo"
 msgid "percentage"
 msgstr "Porcentaje"
 
-#: bms/models/discount.py:13 lm/models/transaction.py:13
-#: lm/models/transaction.py:18
+#: bms/models/discount.py:13 lm/models/transaction.py:57
+#: lm/models/transaction.py:58
 msgid "motive"
 msgstr "motivo"
 
-#: bms/models/discount.py:37
+#: bms/models/discount.py:37 bms/templates/bms/invoice_detail.html:82
 #, fuzzy
 #| msgid "Discount"
 msgid "Discounts"
 msgstr "Descuento"
 
-#: bms/models/tax.py:33 mm/models/tax.py:33
+#: bms/models/tax.py:33 core/models/tax.py:141
 #, fuzzy
 #| msgid "Taxes"
 msgid "Tax"
 msgstr "Impuestos"
 
-#: bms/templates/bms/invoice_detail.html:34
-#: bms/templates/bms/invoice_list.html:59
+#: bms/sales_reconciliation/dosv.py:114
+msgid "factura actualizada"
+msgstr ""
+
+#: bms/templates/bms/invoice_detail.html:27
+msgid "Sustituir"
+msgstr ""
+
+#: bms/templates/bms/invoice_detail.html:37
+#: bms/templates/bms/invoice_list.html:65
+#: bms/templates/bms/sale_associate_revers_obj_form.html:314
+#: crm/templates/crm/cxc_list.html:53
 msgid "Vendor"
 msgstr "Vendedor"
 
-#: bms/templates/bms/invoice_detail.html:62
-#: bms/templates/bms/invoice_list.html:60 core/models.py:382
-msgid "Branch"
-msgstr "Sucursal"
+#: bms/templates/bms/invoice_detail.html:71
+#: lm/templates/lm/transaction_list.html:92
+msgid "Cost"
+msgstr ""
 
-#: bms/templates/bms/invoice_detail.html:80
-#: bms/templates/bms/invoice_list.html:62
-#: mm/templates/mm/purchase_form.html:154
-#: mm/templates/mm/purchase_form.html:199 mm/templates/mm/purchase_list.html:49
+#: bms/templates/bms/invoice_detail.html:84
+#: bms/templates/bms/invoice_list.html:68
+#: bms/templates/bms/sale_associate_revers_obj_form.html:317
+#: crm/templates/crm/cxc_list.html:56 mm/templates/mm/purchase_form_bk.html:148
+#: mm/templates/mm/purchase_form_bk.html:183
+#: mm/templates/mm/purchase_form_items.html:165
+#: mm/templates/mm/purchase_list.html:77
 #: mm/templates/mm/purchaseorder_list.html:62
 #: mm/templates/mm/purchaserequisition_list.html:46
 msgid "Total"
 msgstr "Precio Total"
 
-#: bms/templates/bms/invoice_detail.html:99
+#: bms/templates/bms/invoice_detail.html:104
+#: bms/templates/bms/sale_form1_items.html:182
 msgid "Payments:"
 msgstr "Pagos:"
 
-#: bms/templates/bms/invoice_detail.html:103
+#: bms/templates/bms/invoice_detail.html:108
 msgid "ID"
 msgstr "ID"
 
-#: bms/templates/bms/invoice_detail.html:124
+#: bms/templates/bms/invoice_detail.html:129
 msgid "Subtotal"
 msgstr "Sub Total"
 
-#: bms/templates/bms/invoice_list.html:56
-#: mm/templates/mm/transaction_list.html:69
+#: bms/templates/bms/invoice_list.html:62
+#: bms/templates/bms/sale_associate_revers_obj_form.html:311
+#: crm/templates/crm/cxc_list.html:50 mm/templates/mm/transaction_list.html:69
 #: sync/templates/sync/syncrecord_detail.html:40
 #: sync/templates/sync/syncrecord_detail.html:155
 msgid "Date Created"
 msgstr "Fecha de creación"
 
-#: bms/templates/bms/invoice_list.html:57
+#: bms/templates/bms/invoice_list.html:63
+#: bms/templates/bms/sale_associate_revers_obj_form.html:312
+#: crm/templates/crm/cxc_list.html:51
 msgid "Date Generated"
 msgstr "Fecha de Generacion"
 
 #: bms/templates/bms/paymenttype_list.html:45
-#: mm/templates/mm/paymenttype_list.html:44
 msgid "Tag"
 msgstr "Etiqueta"
 
-#: bms/templates/bms/tax_list.html:46 mm/templates/mm/tax_list.html:46
+#: bms/templates/bms/revenue.html:34
+msgid "Day"
+msgstr ""
+
+#: bms/templates/bms/revenue.html:38
+#, fuzzy
+#| msgid "Transaction Amount"
+msgid "Transactions Count"
+msgstr "Monto de Transacción"
+
+#: bms/templates/bms/revenue.html:39
+#, fuzzy
+#| msgid "Transactions"
+msgid "Transactions Sum"
+msgstr "Transacciones"
+
+#. Translators: Translate as Cambiar Contraseña
+#: bms/templates/bms/sale_associate_revers_obj_form.html:232
+#: bms/templates/bms/sale_form2_items.html:234 core/generic_views.py:37
+#: core/templates/core/base.html:154 core/templates/core/base2.html:154
+#: core/templates/core/patch_base.html:154
+msgid "Change Password"
+msgstr "Cambiar Contraseña"
+
+#. Translators: Translate as Cerrar Sesion
+#: bms/templates/bms/sale_associate_revers_obj_form.html:234
+#: bms/templates/bms/sale_form2_items.html:236
+#: core/templates/core/base.html:156 core/templates/core/base2.html:156
+#: core/templates/core/patch_base.html:156
+msgid "Logout"
+msgstr "Cerrar Sesión"
+
+#. Translators: Registar Venta
+#: bms/templates/bms/sale_form.html:18
+#: bms/templates/bms/sale_form1_items.html:17 core/templates/core/base.html:814
+#: core/templates/core/base2.html:731 core/templates/core/patch_base.html:243
+#, fuzzy
+#| msgid "Record Date:"
+msgid "Record Sale"
+msgstr "Fecha de Registro:"
+
+#: bms/templates/bms/sale_form.html:108
+#: mm/templates/mm/purchase_form_bk.html:193
+#: mnf/templates/mnf/bundle_form.html:203
+#: mnf/templates/mnf/manufacturingorder_form.html:135
+msgid "Save"
+msgstr "Guardar"
+
+#: bms/templates/bms/sale_form1_items.html:112
+#: bms/templates/bms/sale_form2_items.html:361
+#: lm/templates/lm/shipment_create_form.html:55
+#: lm/templates/lm/stock_adjust_form.html:49
+#: lm/templates/lm/supplyorder_form.html:43
+#: mm/templates/mm/purchase_form_bk.html:135
+#: mm/templates/mm/purchase_form_items.html:150
+#: mm/templates/mm/purchaseorder_form.html:109
+msgid "Add"
+msgstr "Agregar"
+
+#: bms/templates/bms/sale_form1_items.html:199
+#, fuzzy
+#| msgid "Payments"
+msgid "Add Payment"
+msgstr "Pagos"
+
+#: bms/templates/bms/sale_form1_items.html:243
+#, fuzzy
+#| msgid "Generate"
+msgid "Generar"
+msgstr "Generar"
+
+#: bms/templates/bms/sale_form2_items.html:300
+#, fuzzy
+#| msgid "Total"
+msgid "Totalizar"
+msgstr "Precio Total"
+
+#. Translators: Cuentas Bancarias
+#: bms/templates/bms/sales_reconciliation/dosv.html:34
+#: core/templates/core/base.html:582 core/templates/core/patch_base.html:249
+msgid "Cortes de Caja"
+msgstr ""
+
+#: bms/templates/bms/sales_reconciliation/dosv.html:428
+#, fuzzy
+#| msgid "Previous Balance"
+msgid "Previsualizar"
+msgstr "Saldo Anterior"
+
+#: bms/templates/bms/sales_reconciliation/dosv.html:471
+msgid "Guardar Partida"
+msgstr ""
+
+#: bms/templates/bms/sales_reconciliation/dosv_ticket_substitution.html:18
+#, fuzzy
+#| msgid "Requisiciones de Compra"
+msgid "Reasignacion de Correlativo"
+msgstr "Requisiciones de Compra"
+
+#: bms/templates/bms/sales_reconciliation/dosv_ticket_substitution.html:38
+msgid "Asignar"
+msgstr ""
+
+#: bms/templates/bms/tax_list.html:46
 msgid "Percentaje"
 msgstr "Porcentaje"
 
-#: core/forms.py:40
+#: core/forms.py:42
 msgid "Can"
 msgstr "Puede"
 
-#: core/forms.py:40
+#: core/forms.py:42
 msgid "add"
 msgstr "crear"
 
-#: core/forms.py:40
+#: core/forms.py:42
 msgid "change"
 msgstr "modificar"
 
-#: core/forms.py:40
+#: core/forms.py:42
 msgid "delete"
 msgstr "eliminar"
 
-#: core/forms.py:40
+#: core/forms.py:42
 msgid "view"
 msgstr "ver"
 
-#: core/forms.py:104 core/forms.py:152 core/models.py:140
+#: core/forms.py:106 core/forms.py:154 core/models/tenant_permissions.py:24
 msgid "groups"
 msgstr "grupos"
 
-#: core/forms.py:107 core/forms.py:155 core/forms.py:298
+#: core/forms.py:109 core/forms.py:157 core/forms.py:309
 msgid "tenants"
 msgstr "entidades"
 
-#: core/forms.py:194 core/templates/core/branch_list.html:50
+#: core/forms.py:202 core/templates/core/branch_list.html:50
 msgid "Operations Center"
 msgstr "Centro de Operaciones"
 
-#: core/forms.py:201 core/models.py:375 lm/forms.py:68
-#: lm/models/warehouse.py:17 pos/forms.py:32 pos/models/pos.py:13
+#: core/forms.py:209 core/models/branch.py:38 lm/forms.py:118
+#: lm/models/warehouse.py:22 pos/forms/pos.py:37 pos/models/pos.py:17
 msgid "users"
 msgstr "usuarios"
 
-#: core/forms.py:209
+#: core/forms.py:217
 msgid "group permissions"
 msgstr "permisos del grupo"
 
-#. Translators: Translate as Cambiar Contraseña
-#: core/generic_views.py:37 core/templates/core/base.html:142
-msgid "Change Password"
-msgstr "Cambiar Contraseña"
-
 #: core/generic_views.py:41
 msgid "password changed successfully"
 msgstr "cambio de contraseña exitoso"
 
-#: core/generic_views.py:228
+#: core/generic_views.py:230
 msgid "GenEdit"
 msgstr "Editar Genérico"
 
-#: core/generic_views.py:295
+#: core/generic_views.py:301
 msgid "Delete"
 msgstr "Borrar"
 
-#: core/models.py:16
-msgid "Symbol"
-msgstr "Símbolo"
-
-#: core/models.py:17
-msgid "Locale"
-msgstr ""
-
-#: core/models.py:18
-msgid "ISO"
-msgstr "ISO"
-
-#: core/models.py:19
-msgid "Conversion"
-msgstr "Conversión"
-
-#: core/models.py:28
-msgid "Currency"
-msgstr "Divisa"
-
-#: core/models.py:29
-msgid "Currencies"
-msgstr "Divisas"
-
-#: core/models.py:48 core/models.py:365 crm/models/customer.py:15
-#: mm/models/provider.py:17 mm/models/purchase.py:138
-#: mm/models/purchase_order.py:27 mm/models/purchase_requisition.py:25
-msgid "address"
-msgstr "dirección"
-
-#: core/models.py:49
-msgid "logo"
-msgstr "logo"
-
-#: core/models.py:54
-msgid "main currency"
-msgstr "divisa primaria"
-
-#: core/models.py:62
-msgid "secondary currency"
-msgstr "divisa secundaria"
-
-#: core/models.py:72
-msgid "Tenant"
-msgstr "Entidad"
-
-#: core/models.py:73
-msgid "Tenants"
-msgstr "Entidades"
-
-#: core/models.py:104
-msgid "permissions"
-msgstr "permisos"
-
-#: core/models.py:112
-msgid "Group"
-msgstr "Grupo"
-
-#. Translators: Grupos
-#: core/models.py:113 core/templates/core/base.html:196
-msgid "Groups"
-msgstr "Grupos"
-
-#: core/models.py:131
-msgid "superuser status"
-msgstr "estado de superusuario"
-
-#: core/models.py:134
-msgid ""
-"Designates that this user has all permissions without explicitly assigning "
-"them."
-msgstr ""
-"Designa que este usuario tiene todos los permisos sin asignarlos "
-"explícitamente."
-
-#: core/models.py:143
-msgid ""
-"The groups this user belongs to. A user will get all permissions granted to "
-"each of their groups."
-msgstr ""
-"Los grupos a los que pertenece este usuario. Un usuario obtendrá todos los "
-"permisos otorgados a cada uno de sus grupos."
-
-#: core/models.py:239
-msgid "names"
-msgstr "nombre"
-
-#: core/models.py:240
-msgid "last names"
-msgstr "apellidos"
-
-#: core/models.py:241
-msgid "email address"
-msgstr "correo electrónico"
-
-#: core/models.py:242
-msgid "language"
-msgstr "lenguaje"
-
-#: core/models.py:243
-msgid "timezone"
-msgstr "zona horaria"
-
-#: core/models.py:244
-msgid "programmatic user"
-msgstr ""
-
-#: core/models.py:246
-msgid "staff status"
-msgstr "estado de personal"
-
-#: core/models.py:248
-msgid "Designates whether the user can log into this admin site."
-msgstr ""
-"Designa si el usuario puede iniciar sesión en este sitio de administración."
-
-#: core/models.py:254
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Designa si este usuario debe ser tratado como activo. Anule la selección de "
-"esto en lugar de eliminar las cuentas."
-
-#: core/models.py:258
-msgid "date joined"
-msgstr "fecha de modificación"
-
-#: core/models.py:262
-msgid "current tenant"
-msgstr "entidad actual"
-
-#: core/models.py:263
-msgid "The default tenant for filtering the information"
-msgstr "La entidad predeterminada para filtrar la información"
-
-#: core/models.py:268
-msgid "available tenants"
-msgstr "entidades disponibles"
-
-#: core/models.py:269
-msgid ""
-"The tenants this user belongs to. The user can switch the default tenant "
-"between this tenants"
-msgstr ""
-"Entidades a las que pertenece este usuario. El usuario podrá cambiar su "
-"entidad predeterminada entre estas entidades"
-
-#: core/models.py:281
-msgid "User"
-msgstr "Usuario"
-
-#. Translators: Usuarios
-#: core/models.py:282 core/templates/core/base.html:188
-msgid "Users"
-msgstr "Usuarios"
-
-#: core/models.py:363
+#: core/models/branch.py:10
 #, fuzzy
 #| msgid "code"
 msgid "code 2"
 msgstr "código"
 
-#: core/models.py:383
+#: core/models/branch.py:12 core/models/business_partner.py:11
+#: core/models/tenant.py:30 crm/models/customer.py:30 hr/models/common.py:59
+#: mm/models/provider.py:16 mm/models/purchase.py:145
+#: mm/models/purchase_order.py:27 mm/models/purchase_requisition.py:33
+msgid "address"
+msgstr "dirección"
+
+#. Translators: Sucursales
+#: core/models/branch.py:49 core/templates/core/base.html:235
+#: core/templates/core/patch_base.html:195
 msgid "Branches"
 msgstr "Sucursales"
 
-#: core/models.py:397
+#: core/models/branch.py:65
 msgid "the branch can not be deactivated because it has active warehouse(s)"
 msgstr "la sucursal no se puede desactivar porque tiene almacén(es) activo(s)"
 
-#: core/models.py:406
+#: core/models/branch.py:75
 msgid "User Branch"
 msgstr "Usuario de Sucursal"
 
-#: core/models.py:407
+#: core/models/branch.py:76
 msgid "User Branches"
 msgstr "Usuario de Sucursales"
 
-#: core/models.py:413
+#: core/models/branch.py:82
 msgid ""
 "Can not save user with branch association because branch's tenant is not in "
 "user's available tenants"
@@ -1707,7 +2639,7 @@ msgstr ""
 "No se puede guardar el usuario a la sucursal porque la entidad de la "
 "sucursal no está entre las entidades disponibles del usuario"
 
-#: core/models.py:425
+#: core/models/branch.py:93
 msgid ""
 "Can not remove user from branch because user is assigned to a warehouse "
 "which belongs to this branch"
@@ -1715,250 +2647,810 @@ msgstr ""
 "No se puede eliminar al usuario de la sucursal porque el usuario está "
 "asignado a un almacén que pertenece a esta sucursal"
 
-#. Translators: Translate as Cerrar Sesion
-#: core/templates/core/base.html:144
-msgid "Logout"
-msgstr "Cerrar Sesión"
+#: core/models/business_partner.py:8 mm/models/provider.py:13
+msgid "external code"
+msgstr "código externo"
+
+#: core/models/business_partner.py:10 crm/models/customer.py:24
+#: mm/models/provider.py:15
+msgid "company name"
+msgstr "nombre de empresa"
+
+#: core/models/business_partner.py:12 crm/models/customer.py:25
+#: mm/models/provider.py:17
+msgid "phone"
+msgstr "teléfono"
+
+#: core/models/business_partner.py:13 crm/models/customer.py:27
+#: mm/models/provider.py:18
+msgid "email"
+msgstr "email"
+
+#: core/models/business_partner.py:15 core/models/tenant.py:21
+#: crm/models/customer.py:29 mm/models/provider.py:20
+msgid "document2"
+msgstr "documento 2"
+
+#: core/models/business_partner.py:16 crm/models/customer.py:31
+#: mm/models/provider.py:21
+msgid "state"
+msgstr "departamentos"
+
+#: core/models/business_partner.py:17 crm/models/customer.py:32
+#: mm/models/provider.py:22
+msgid "city"
+msgstr "municipio"
+
+#: core/models/business_partner.py:18 core/models/tenant.py:24
+#: crm/models/customer.py:38 mm/models/provider.py:23
+msgid "business activity"
+msgstr "actividad del negocio"
+
+#: core/models/business_partner.py:19
+#, fuzzy
+#| msgid "company name"
+msgid "company"
+msgstr "nombre de empresa"
+
+#: core/models/business_partner.py:20 mm/models/provider.py:24
+msgid "foreign"
+msgstr "extranjero"
+
+#: core/models/business_partner.py:40
+#, fuzzy
+#| msgid "Business Activity"
+msgid "Business Partner"
+msgstr "Actividad del Negocio"
+
+#. Translators: Impuestos
+#: core/models/business_partner.py:41 core/templates/core/base.html:267
+msgid "Business Partners"
+msgstr ""
+
+#: core/models/conf.py:19
+#, fuzzy
+#| msgid "warehouse"
+msgid "central warehouse"
+msgstr "bodega"
+
+#: core/models/conf.py:24 lm/models/shipment.py:22
+#, fuzzy
+#| msgid "Next Document"
+msgid "shipment document"
+msgstr "Siguiente Documento"
+
+#: core/models/conf.py:30 core/models/user.py:49
+msgid "timezone"
+msgstr "zona horaria"
+
+#: core/models/conf.py:35
+#, fuzzy
+#| msgid "parent account"
+msgid "sales account"
+msgstr "cuenta padre"
+
+#: core/models/conf.py:42
+#, fuzzy
+#| msgid "purchase type"
+msgid "ppurchase typology"
+msgstr "tipo de compra"
+
+#: core/models/conf.py:50
+msgid "shipment send typology"
+msgstr ""
+
+#: core/models/conf.py:58
+msgid "shipment accept typology"
+msgstr ""
+
+#: core/models/conf.py:73 core/models/conf.py:74
+#, fuzzy
+#| msgid "Tenant"
+msgid "Tenant Conf"
+msgstr "Entidad"
+
+#: core/models/country.py:8
+#, fuzzy
+#| msgid "error code"
+msgid "iso code"
+msgstr "código de error"
+
+#: core/models/country.py:12 core/models/tenant.py:49
+msgid "main currency"
+msgstr "divisa primaria"
+
+#: core/models/country.py:21
+#, fuzzy
+#| msgid "Country"
+msgid "Countries"
+msgstr "País"
+
+#: core/models/currency.py:7
+msgid "Symbol"
+msgstr "Símbolo"
+
+#: core/models/currency.py:8
+msgid "Locale"
+msgstr ""
+
+#: core/models/currency.py:9
+msgid "ISO"
+msgstr "ISO"
+
+#: core/models/currency.py:10 insumos/currency.py:38 insumos/currency.py:48
+msgid "Conversion"
+msgstr "Conversión"
+
+#: core/models/currency.py:19 insumos/currency.py:47
+#: mm/templates/mm/purchase_list.html:79
+msgid "Currency"
+msgstr "Divisa"
+
+#: core/models/currency.py:20
+msgid "Currencies"
+msgstr "Divisas"
+
+#: core/models/fiscal_document.py:8 core/models/fiscal_document.py:34
+#: core/models/tax.py:89
+#, fuzzy
+#| msgid "code"
+msgid "e-code"
+msgstr "código"
+
+#: core/models/fiscal_document.py:21
+#, fuzzy
+#| msgid "Fiscal Document"
+msgid "Fiscal Document Model"
+msgstr "Documento Fiscal"
+
+#: core/models/fiscal_document.py:22
+#, fuzzy
+#| msgid "Fiscal Documents"
+msgid "Fiscal Document Models"
+msgstr "Documentos Fiscales"
+
+#: core/models/fiscal_document.py:30 core/models/tax.py:16
+#: core/models/tax.py:85 lm/models/transaction.py:12
+#, fuzzy
+#| msgid "price increment"
+msgid "increment"
+msgstr "incremento de precio"
+
+#: core/models/fiscal_document.py:31 core/models/tax.py:17
+#: core/models/tax.py:86 lm/models/transaction.py:13
+#, fuzzy
+#| msgid "department"
+msgid "decrement"
+msgstr "departamento"
+
+#: core/models/fiscal_document.py:43
+#, fuzzy
+#| msgid "provider does not exists"
+msgid "provider balance affectation"
+msgstr "el proveedor no existe"
+
+#: core/models/fiscal_document.py:47
+msgid ""
+"indicates whether a document will increase provider balance, or decrease it"
+msgstr ""
+
+#: core/models/fiscal_document.py:56
+#, fuzzy
+#| msgid "Reverse"
+msgid "reverses"
+msgstr "Reversar"
+
+#: core/models/fiscal_document.py:63 lm/models/category.py:14
+#: lm/models/stock.py:103
+msgid "parent"
+msgstr "padre"
+
+#: core/models/fiscal_document.py:78
+msgid "Fiscal Document"
+msgstr "Documento Fiscal"
+
+#. Translators: Documentos
+#: core/models/fiscal_document.py:79 core/templates/core/base.html:243
+#: core/templates/core/base2.html:229
+msgid "Fiscal Documents"
+msgstr "Documentos Fiscales"
+
+#: core/models/tax.py:10 core/models/tax.py:80
+#, fuzzy
+#| msgid "Net Amount"
+msgid "net amount"
+msgstr "Monto Neto"
+
+#: core/models/tax.py:11 core/models/tax.py:81 lm/models/shipment_item.py:31
+#: lm/models/stock.py:58 lm/models/supply_order.py:95
+#: lm/models/transaction.py:63 mm/models/purchase.py:431
+#: mm/models/purchase.py:432 mm/models/purchase_order.py:156
+#: mm/models/purchase_requisition.py:129 mnf/models/mo.py:140
+#: offer/models/offer_options_group.py:54
+msgid "quantity"
+msgstr "cantidad"
+
+#: core/models/tax.py:12 core/models/tax.py:82
+#, fuzzy
+#| msgid "Invoice Item"
+msgid "invoice net amount"
+msgstr "Item de Factura"
+
+#: core/models/tax.py:13
+msgid "invoice taxable net amount"
+msgstr ""
+
+#: core/models/tax.py:22 core/models/tax.py:93
+#, fuzzy
+#| msgid "overdue"
+msgid "over"
+msgstr "vencida"
+
+#: core/models/tax.py:23
+#, fuzzy
+#| msgid "overdue"
+msgid "over gte"
+msgstr "vencida"
+
+#: core/models/tax.py:37
+#, fuzzy
+#| msgid "Detail Model"
+msgid "Tax Model"
+msgstr "Modelo Detalle"
+
+#: core/models/tax.py:38
+#, fuzzy
+#| msgid "Detail Model"
+msgid "Tax Models"
+msgstr "Modelo Detalle"
+
+#: core/models/tax.py:91
+#, fuzzy
+#| msgid "company name"
+msgid "display name"
+msgstr "nombre de empresa"
+
+#: core/models/tax.py:120
+#, fuzzy
+#| msgid "payment conditions"
+msgid "parent configuration"
+msgstr "condiciones de pago"
+
+#: core/models/tax.py:192 crm/models/customer.py:56 mm/models/purchase.py:434
+#: offer/models/offer.py:55
+msgid "taxes"
+msgstr "impuestos"
+
+#: core/models/tax.py:200
+msgid "Tax Profile"
+msgstr ""
+
+#. Translators: Impuestos
+#: core/models/tax.py:201 core/templates/core/base.html:259
+msgid "Tax Profiles"
+msgstr ""
+
+#: core/models/tenant.py:12 lm/models/product.py:44
+msgid "brand"
+msgstr "marca"
+
+#: core/models/tenant.py:27 crm/models/customer.py:39 mm/models/provider.py:29
+msgid "large taxpayer"
+msgstr "gran contribuyente"
+
+#: core/models/tenant.py:33
+msgid "logo"
+msgstr "logo"
+
+#: core/models/tenant.py:57
+msgid "secondary currency"
+msgstr "divisa secundaria"
+
+#: core/models/tenant.py:62
+#, fuzzy
+#| msgid "Invoice Item"
+msgid "e-nvoice integration"
+msgstr "Item de Factura"
+
+#: core/models/tenant.py:63
+#, fuzzy
+#| msgid "Invoice Item"
+msgid "e-nvoice token"
+msgstr "Item de Factura"
+
+#: core/models/tenant.py:70
+msgid "Tenant"
+msgstr "Entidad"
+
+#: core/models/tenant.py:71
+msgid "Tenants"
+msgstr "Entidades"
+
+#: core/models/tenant_group.py:34
+msgid "permissions"
+msgstr "permisos"
+
+#: core/models/tenant_group.py:43
+msgid "Group"
+msgstr "Grupo"
+
+#. Translators: Grupos
+#: core/models/tenant_group.py:44 core/templates/core/base.html:213
+#: core/templates/core/base2.html:213
+msgid "Groups"
+msgstr "Grupos"
+
+#: core/models/tenant_permissions.py:15
+msgid "superuser status"
+msgstr "estado de superusuario"
+
+#: core/models/tenant_permissions.py:18
+msgid ""
+"Designates that this user has all permissions without explicitly assigning "
+"them."
+msgstr ""
+"Designa que este usuario tiene todos los permisos sin asignarlos "
+"explícitamente."
+
+#: core/models/tenant_permissions.py:27
+msgid ""
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of their groups."
+msgstr ""
+"Los grupos a los que pertenece este usuario. Un usuario obtendrá todos los "
+"permisos otorgados a cada uno de sus grupos."
+
+#: core/models/user.py:43 hr/models/common.py:52
+msgid "names"
+msgstr "nombre"
+
+#: core/models/user.py:44 hr/models/common.py:53
+msgid "last names"
+msgstr "apellidos"
+
+#: core/models/user.py:45
+msgid "email address"
+msgstr "correo electrónico"
+
+#: core/models/user.py:47
+msgid "language"
+msgstr "lenguaje"
+
+#: core/models/user.py:50
+msgid "programmatic user"
+msgstr ""
+
+#: core/models/user.py:52
+msgid "staff status"
+msgstr "estado de personal"
+
+#: core/models/user.py:54
+msgid "Designates whether the user can log into this admin site."
+msgstr ""
+"Designa si el usuario puede iniciar sesión en este sitio de administración."
+
+#: core/models/user.py:60
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Designa si este usuario debe ser tratado como activo. Anule la selección de "
+"esto en lugar de eliminar las cuentas."
+
+#: core/models/user.py:64
+msgid "date joined"
+msgstr "fecha de modificación"
+
+#: core/models/user.py:68
+msgid "current tenant"
+msgstr "entidad actual"
+
+#: core/models/user.py:69
+msgid "The default tenant for filtering the information"
+msgstr "La entidad predeterminada para filtrar la información"
+
+#: core/models/user.py:74
+msgid "available tenants"
+msgstr "entidades disponibles"
+
+#: core/models/user.py:75
+msgid ""
+"The tenants this user belongs to. The user can switch the default tenant "
+"between this tenants"
+msgstr ""
+"Entidades a las que pertenece este usuario. El usuario podrá cambiar su "
+"entidad predeterminada entre estas entidades"
+
+#: core/models/user.py:78
+msgid "pin"
+msgstr ""
+
+#: core/models/user.py:92 lm/templates/lm/transaction_list.html:102
+msgid "User"
+msgstr "Usuario"
+
+#. Translators: Usuarios
+#: core/models/user.py:93 core/templates/core/base.html:205
+#: core/templates/core/base2.html:205 core/templates/core/patch_base.html:189
+msgid "Users"
+msgstr "Usuarios"
+
+#: core/rest/serializers/serializers.py:40
+msgid "selected tenant is not in available tenants"
+msgstr ""
+"la entidad seleccionada  no se encuentra entre las entidades disponibles"
+
+#: core/rest/views/views.py:62
+msgid "can't switch to tenant because tenant is not active"
+msgstr "No se puede cambiar al tenant porque no se encuentra activo"
 
 #. Translators: Transliterate
-#: core/templates/core/base.html:179
+#: core/templates/core/base.html:196 core/templates/core/base2.html:196
 msgid "Admin"
 msgstr "Admin"
 
-#. Translators: Sucursales
-#: core/templates/core/base.html:204
-msgid "Banches"
-msgstr "Sucursales"
+#. Translators: Transliterate
+#: core/templates/core/base.html:226
+#, fuzzy
+#| msgid "Company Name"
+msgid "Company"
+msgstr "Nombre de Empresa"
 
 #. Translators: Transliterate
-#: core/templates/core/base.html:217
+#: core/templates/core/base.html:280 core/templates/core/base2.html:250
 msgid "CRM"
 msgstr "CRM"
 
 #. Translators: Clientes
-#: core/templates/core/base.html:226 crm/models/customer.py:35
+#: core/templates/core/base.html:289 core/templates/core/base2.html:259
+#: crm/models/customer.py:74
 msgid "Customers"
 msgstr "Clientes"
 
+#. Translators: Clientes
+#: core/templates/core/base.html:296
+#, fuzzy
+#| msgid "Payable Accounts"
+msgid "Recivable Accounts"
+msgstr "Cuentas por Pagar"
+
 #. Translators: Compras
-#: core/templates/core/base.html:239 core/templates/core/base.html:272
-#: mm/models/purchase.py:183
+#: core/templates/core/base.html:308 core/templates/core/base.html:333
+#: core/templates/core/base2.html:272 core/templates/core/base2.html:297
+#: mm/models/purchase.py:195
 msgid "Purchases"
 msgstr "Compras"
 
 #. Translators: Aprobadores
-#: core/templates/core/base.html:248 mm/models/approver.py:31
+#: core/templates/core/base.html:317 core/templates/core/base2.html:281
+#: mm/models/approver.py:31
 msgid "Approvers"
 msgstr "Aprobadores"
 
 #. Translators: Proveedores
-#: core/templates/core/base.html:264 mm/models/provider.py:74
+#: core/templates/core/base.html:325 core/templates/core/base2.html:289
+#: mm/models/provider.py:84
 msgid "Providers"
 msgstr "Proveedores"
 
 #. Translators: Ordenes de Compra
-#: core/templates/core/base.html:280
+#: core/templates/core/base.html:341 core/templates/core/base2.html:305
 msgid "Purchase Orders"
 msgstr "Ordenes de Compra"
 
 #. Translators: Requisiciones de Compra
-#: core/templates/core/base.html:288 mm/models/purchase_requisition.py:67
+#: core/templates/core/base.html:349 core/templates/core/base2.html:313
+#: mm/models/purchase_requisition.py:76
 msgid "Purchase Requisitions"
 msgstr "Requisiciones de Compra"
 
 #. Translators: Pagos
-#: core/templates/core/base.html:304
+#: core/templates/core/base.html:365 core/templates/core/base2.html:329
 msgid "Payments"
 msgstr "Pagos"
 
 #. Translators: Cuentas por Pagar
-#: core/templates/core/base.html:312 mm/templates/mm/transaction_list.html:34
+#: core/templates/core/base.html:373 core/templates/core/base2.html:337
+#: mm/templates/mm/transaction_list.html:34
 msgid "Payable Accounts"
 msgstr "Cuentas por Pagar"
 
 #. Translators: Modulo Logistica
-#: core/templates/core/base.html:325
+#: core/templates/core/base.html:386 core/templates/core/base2.html:350
 msgid "Logistics Module"
 msgstr "Módulo Logística"
 
 #. Translators: Bodegas
-#: core/templates/core/base.html:334 lm/models/warehouse.py:25
+#: core/templates/core/base.html:395 core/templates/core/base2.html:359
+#: lm/models/warehouse.py:40
 msgid "Warehouses"
 msgstr "Bodegas"
 
-#. Translators: Transliterate
-#: core/templates/core/base.html:342 lm/models/stock.py:82
-#: lm/models/stock.py:83 lm/templates/lm/stock_list.html:34
-msgid "Stock"
+#. Translators: Stock de Producto
+#: core/templates/core/base.html:403 lm/views/stock.py:21
+#, fuzzy
+#| msgid "Product to Exhaust"
+msgid "Product Stock"
+msgstr "Producto a Agotar"
+
+#. Translators: Stock en Bodega
+#: core/templates/core/base.html:411 lm/views/stock.py:9
+#, fuzzy
+#| msgid "warehouse to"
+msgid "Warehouse Stock"
+msgstr "bodega destino"
+
+#. Translators: Kardex
+#: core/templates/core/base.html:419 lm/views/stock_card.py:9
+#, fuzzy
+#| msgid "Stock"
+msgid "Stock Card"
 msgstr "Existencia"
 
 #. Translators: Productos
-#: core/templates/core/base.html:350 lm/models/product.py:70
-msgid "Products"
-msgstr "Productos"
+#: core/templates/core/base.html:427 core/templates/core/base2.html:375
+msgid "Products, Services & Materials"
+msgstr ""
 
 #. Translators: Presentacion
-#: core/templates/core/base.html:358 lm/models/packaging.py:25
-#: lm/models/packaging.py:26
+#: core/templates/core/base.html:435 core/templates/core/base2.html:383
+#: lm/models/packaging.py:30 lm/models/packaging.py:31
+#: lm/templates/lm/stock_by_warehouse.html:62
+#: lm/templates/lm/transaction_list.html:88
 msgid "Packaging"
 msgstr "Presentación"
 
 #. Translators: Traslados
-#: core/templates/core/base.html:366 lm/models/shipment.py:60
+#: core/templates/core/base.html:443 core/templates/core/base2.html:391
+#: lm/models/shipment.py:68
 msgid "Shipments"
 msgstr "Traslados"
 
 #. Translators: Marcas
-#: core/templates/core/base.html:374 lm/models/brand.py:23
+#: core/templates/core/base.html:451 core/templates/core/base2.html:399
+#: lm/models/brand.py:24
 msgid "Brands"
 msgstr "Marcas"
 
 #. Translators: Categorias
-#: core/templates/core/base.html:382 lm/models/category.py:30
+#: core/templates/core/base.html:459 core/templates/core/base2.html:407
+#: lm/models/category.py:40
 msgid "Categories"
 msgstr "Categorías"
 
 #. Translators: Tipologias
-#: core/templates/core/base.html:390 lm/models/transaction.py:76
+#: core/templates/core/base.html:467 core/templates/core/base2.html:415
+#: lm/models/transaction.py:37
 msgid "Typologies"
 msgstr ""
 
 #. Translators: Ajuste de Existencia
-#: core/templates/core/base.html:398 lm/views/stock.py:18
+#: core/templates/core/base.html:475 core/templates/core/base2.html:423
+#: lm/views/stock.py:33
 msgid "Stock Adjust"
 msgstr ""
 
+#. Translators: Ordenes de Abastecimiento
+#: core/templates/core/base.html:483 core/templates/core/base2.html:431
+#: lm/models/supply_order.py:59
+msgid "Supply Orders"
+msgstr ""
+
+#. Translators: Ordenes de Abastecimiento
+#: core/templates/core/base.html:491 core/templates/core/base2.html:439
+msgid "Supply Orders Consolidation"
+msgstr ""
+
 #. Translators: Modulo de Manufactura
-#: core/templates/core/base.html:411
+#: core/templates/core/base.html:504 core/templates/core/base2.html:452
 msgid "Manufacturing"
 msgstr "Modulo de Manufactura"
 
 #. Translators: Producto Combo
-#: core/templates/core/base.html:420 mnf/templates/mnf/bundle_list.html:21
+#: core/templates/core/base.html:513 core/templates/core/base2.html:461
+#: mnf/templates/mnf/bundle_list.html:21
 msgid "Bundles"
 msgstr "Producto Bundle"
 
 #. Translators: Orden de Manufactura
-#: core/templates/core/base.html:428 mnf/models/mo.py:61 mnf/models/mo.py:147
+#: core/templates/core/base.html:521 core/templates/core/base2.html:469
+#: mnf/models/mo.py:61 mnf/models/mo.py:150
 msgid "Manufacturing Orders"
 msgstr "Ordenes de Manufactura"
 
 #. Translators: Contabilidad
-#: core/templates/core/base.html:441
+#: core/templates/core/base.html:534 core/templates/core/base2.html:482
 msgid "Accounting"
 msgstr "Contabilidad"
 
+#. Translators: Partidas Contables
+#: core/templates/core/base.html:590 core/templates/core/base2.html:540
+#: core/templates/core/patch_base.html:213
+#, fuzzy
+#| msgid "Policies"
+msgid "All Policies"
+msgstr "Partidas Contables"
+
 #. Translators: Partida de Compras
-#: core/templates/core/base.html:490
+#: core/templates/core/base.html:598 core/templates/core/base2.html:548
 #, fuzzy
 #| msgid "Purchases"
 msgid "Purchases Policy"
 msgstr "Compras"
 
+#. Translators: Partida de Ventas
+#: core/templates/core/base.html:606 core/templates/core/base2.html:556
+#, fuzzy
+#| msgid "Purchases"
+msgid "Sales Policy"
+msgstr "Compras"
+
+#: core/templates/core/base.html:610
+msgid "Books"
+msgstr ""
+
 #. Translators: Partidas Contables
-#: core/templates/core/base.html:505
-msgid "Trial Balance"
-msgstr "Balance de Comprobacion"
+#: core/templates/core/base.html:614
+msgid "Taxpayer Sales"
+msgstr ""
+
+#. Translators: Partidas Contables
+#: core/templates/core/base.html:620
+msgid "End Consumer Sales"
+msgstr ""
+
+#: core/templates/core/base.html:623 core/templates/core/base2.html:560
+msgid "Financial Reports"
+msgstr ""
+
+#. Translators: Movimiento de Cuenta
+#: core/templates/core/base.html:628 core/templates/core/base2.html:507
+#, fuzzy
+#| msgid "account type must be detail"
+msgid "Account Activity Detail"
+msgstr "el tipo de cuenta debe ser detalle"
 
 #. Translators: Balance General
-#: core/templates/core/base.html:511
+#: core/templates/core/base.html:641 core/templates/core/base2.html:570
 #, fuzzy
 #| msgid "Balance"
 msgid "Balance Sheet"
 msgstr "Saldo"
 
 #. Translators: Estado de Resultados
-#: core/templates/core/base.html:517
+#: core/templates/core/base.html:647 core/templates/core/base2.html:576
 #, fuzzy
 #| msgid "Bank Statement"
 msgid "P&L Statement"
 msgstr "Estado de Cuenta"
 
 #. Translators: Libro Diario
-#: core/templates/core/base.html:529
+#: core/templates/core/base.html:659 core/templates/core/base2.html:588
 msgid "Ledger Book"
 msgstr ""
 
+#. Translators: Libro Diario Mayor
+#: core/templates/core/base.html:665
+msgid "Journal Ledger"
+msgstr ""
+
+#. Translators: Libro Mayor Auxiliar
+#: core/templates/core/base.html:671
+msgid "Auxiliary Ledger"
+msgstr ""
+
+#. Translators: Tesoreria
+#: core/templates/core/base.html:683 core/templates/core/base2.html:600
+msgid "Treasury"
+msgstr ""
+
 #. Translators: Cheque o Transferencia
-#: core/templates/core/base.html:566
+#: core/templates/core/base.html:716 core/templates/core/base2.html:633
 msgid "Check or Transfer"
 msgstr "Cheque o Transferencia"
 
 #. Translators: Estado de Cuenta
-#: core/templates/core/base.html:574
+#: core/templates/core/base.html:724 core/templates/core/base2.html:641
 msgid "Bank Statement"
 msgstr "Estado de Cuenta"
 
 #. Translators: Transliterate
-#: core/templates/core/base.html:587
+#: core/templates/core/base.html:737 core/templates/core/base2.html:654
 msgid "RRHH"
 msgstr "HR"
 
 #. Translators: Empleados
-#: core/templates/core/base.html:596 hr/models/common.py:89
+#: core/templates/core/base.html:746 core/templates/core/base2.html:663
+#: hr/models/common.py:105
 msgid "Employees"
 msgstr "Empleados"
 
 #. Translators: Departamentos
-#: core/templates/core/base.html:604 hr/models/common.py:20
+#: core/templates/core/base.html:754 core/templates/core/base2.html:671
+#: hr/models/common.py:21
 msgid "Departments"
 msgstr "Departamentos"
 
 #. Translators: Cargos
-#: core/templates/core/base.html:612 hr/models/common.py:41
+#: core/templates/core/base.html:762 core/templates/core/base2.html:679
+#: hr/models/common.py:43
 msgid "Job Titles"
 msgstr "Cargos"
 
 #. Translators: PoS
-#: core/templates/core/base.html:625 core/templates/core/base.html:634
+#: core/templates/core/base.html:775 core/templates/core/base.html:784
+#: core/templates/core/base2.html:692 core/templates/core/base2.html:701
+#: core/templates/core/patch_base.html:231
 #, fuzzy
 #| msgid "Pos"
 msgid "PoS"
 msgstr "Pos"
 
+#. Translators: Correlativos
+#: core/templates/core/base.html:792 core/templates/core/base2.html:709
+#: core/templates/core/patch_base.html:237
+#, fuzzy
+#| msgid "Correlative"
+msgid "Correlatives"
+msgstr "Correlativo"
+
 #. Translators: Ventas
-#: core/templates/core/base.html:647
+#: core/templates/core/base.html:805 core/templates/core/base2.html:722
 msgid "Sales"
 msgstr "Ventas"
 
 #. Translators: Descuentos
-#: core/templates/core/base.html:680
+#: core/templates/core/base.html:846 core/templates/core/base2.html:763
 #, fuzzy
 #| msgid "Departamentos"
 msgid "Descuentos"
 msgstr "Departamentos"
 
-#. Translators: Restaurante
-#: core/templates/core/base.html:693
-msgid "Restaurant"
-msgstr "Restaurante"
-
 #. Translators: Ofertas
-#: core/templates/core/base.html:702 lm/models/offer.py:20
-#: rcm/models/offer.py:42 rcm/templates/rcm/offer_list.html:21
+#: core/templates/core/base.html:859 core/templates/core/base.html:868
+#: core/templates/core/base2.html:776 core/templates/core/base2.html:785
+#: core/templates/core/patch_base.html:261 lm/models/offer.py:26
+#: offer/models/offer.py:91 offer/templates/offer/offer_list.html:21
 msgid "Offers"
 msgstr "Ofertas"
 
 #. Translators: Grupo de Opciones
-#: core/templates/core/base.html:710
+#: core/templates/core/base.html:876 core/templates/core/base2.html:793
 msgid "Options Groups"
 msgstr "Opciones de Grupos"
 
 #. Translators: Grupo de Attributos
-#: core/templates/core/base.html:718 rcm/models/attributes.py:23
-#: rcm/templates/rcm/attributesgroup_list.html:21
+#: core/templates/core/base.html:884 core/templates/core/base2.html:801
+#: offer/models/attributes.py:23
+#: offer/templates/offer/attributesgroup_list.html:21
 msgid "Attributes Groups"
 msgstr "Grupos de Atributos"
 
-#: core/templates/core/base.html:730
+#: core/templates/core/base.html:896 core/templates/core/base2.html:813
 msgid "Sync"
 msgstr "Sincronizar"
 
 #. Translators: Registros
-#: core/templates/core/base.html:739 sync/models.py:78 sync/models.py:121
+#: core/templates/core/base.html:905 core/templates/core/base2.html:822
+#: sync/models.py:78 sync/models.py:121
 msgid "Records"
 msgstr "Registros"
 
+#. Translators: Sucursales
+#: core/templates/core/base2.html:221
+msgid "Banches"
+msgstr "Sucursales"
+
+#. Translators: Transliterate
+#: core/templates/core/base2.html:367 lm/models/stock.py:111
+#: lm/models/stock.py:112 lm/templates/lm/stock_by_product.html:34
+#: lm/templates/lm/stock_by_warehouse.html:34
+#: lm/templates/lm/supplyorder_consolidation.html:29
+#: lm/templates/lm/transaction_list.html:34
+#: lm/views/supply_order_consolidation.py:72
+msgid "Stock"
+msgstr "Existencia"
+
 #: core/templates/core/branch_list.html:45
 msgid "BKNumber"
 msgstr "BKNumber"
@@ -1967,21 +3459,27 @@ msgstr "BKNumber"
 msgid "Actions"
 msgstr "Acciones"
 
+#: core/templates/core/tax_list.html:46
+#, fuzzy
+#| msgid "Company Name"
+msgid "Display Name"
+msgstr "Nombre de Empresa"
+
 #: core/templates/core/user_list.html:44
-#: crm/templates/crm/customer_list.html:47
+#: crm/templates/crm/customer_list.html:48
 #: mm/templates/mm/provider_list.html:47
 msgid "Email"
 msgstr "Correo"
 
-#: core/templates/core/user_list.html:45
+#: core/templates/core/user_list.html:45 hr/templates/hr/employee_list.html:45
 msgid "Names"
 msgstr "Nombres"
 
-#: core/templates/core/user_list.html:46
+#: core/templates/core/user_list.html:46 hr/templates/hr/employee_list.html:46
 msgid "Last Names"
 msgstr "Apellidos"
 
-#: core/utils.py:14
+#: core/utils.py:21
 #, python-format
 msgid "model %(model)s has no correct format, should be app_label:ModelName"
 msgstr ""
@@ -1992,40 +3490,85 @@ msgstr ""
 msgid "Customer Relationship Management"
 msgstr "Gestión de la relación con el cliente"
 
-#: crm/models/customer.py:10 hr/models/common.py:50
+#: crm/models/customer.py:13
+msgid "collection day must be equal or lower than 31"
+msgstr ""
+
+#: crm/models/customer.py:18 mm/models/provider.py:9 mm/models/purchase.py:27
+msgid "Credito"
+msgstr "Crédito"
+
+#: crm/models/customer.py:19 mm/models/provider.py:10 mm/models/purchase.py:28
+msgid "Contado"
+msgstr "Contado"
+
+#: crm/models/customer.py:21
 msgid "first name"
 msgstr "nombres"
 
-#: crm/models/customer.py:11 hr/models/common.py:51
+#: crm/models/customer.py:22
 msgid "last name"
 msgstr "apellidos"
 
-#: crm/models/customer.py:13 mm/models/provider.py:19
-msgid "email"
-msgstr "email"
+#: crm/models/customer.py:23
+#, fuzzy
+#| msgid "company name"
+msgid "is company"
+msgstr "nombre de empresa"
 
-#: crm/models/customer.py:14 mm/models/provider.py:20 mm/models/purchase.py:135
-#: mm/models/purchase_order.py:24 mm/models/purchase_requisition.py:22
-msgid "document"
-msgstr "documento"
-
-#: crm/models/customer.py:34
-msgid "Customer"
-msgstr "Cliente"
+#: crm/models/customer.py:37
+#, fuzzy
+#| msgid "resolution date"
+msgid "collection day"
+msgstr "fecha de resolución"
 
 #: crm/templates/crm/customer_list.html:45
+#: mm/templates/mm/provider_list.html:46
+msgid "Company Name"
+msgstr "Nombre de Empresa"
+
+#: crm/templates/crm/customer_list.html:46
 msgid "First Name"
 msgstr "Nombres"
 
-#: crm/templates/crm/customer_list.html:46
+#: crm/templates/crm/customer_list.html:47
 msgid "Last Name"
 msgstr "Apellidos"
 
+#: envoice/models.py:10
+msgid "sync"
+msgstr ""
+
+#: envoice/models.py:11
+#, fuzzy
+#| msgid "reprocess invoice"
+msgid "processed"
+msgstr "reprocesar factura"
+
+#: envoice/models.py:27 lm/models/supply_order.py:13 mm/models/purchase.py:128
+#: mm/models/purchase_order.py:15 mm/models/purchase_requisition.py:11
+#: sync/models.py:29 sync/models.py:100
+msgid "created date"
+msgstr "creado por"
+
+#: envoice/models.py:37
+#, fuzzy
+#| msgid "Next Document"
+msgid "Issued Document"
+msgstr "Siguiente Documento"
+
+#: envoice/models.py:38
+#, fuzzy
+#| msgid "Next Document"
+msgid "Issued Documents"
+msgstr "Siguiente Documento"
+
 #: files/models.py:11
 msgid "path"
 msgstr ""
 
-#: files/models.py:12 mm/models/purchase.py:121 sync/models.py:61
+#: files/models.py:12 mm/models/purchase.py:115 mm/models/purchase.py:123
+#: sync/models.py:61
 msgid "file"
 msgstr ""
 
@@ -2041,34 +3584,64 @@ msgstr ""
 msgid "Human Resources Module"
 msgstr "Módulo de Recursos Humanos"
 
-#: hr/models/common.py:19
+#: hr/models/common.py:20
 msgid "Department"
 msgstr "Departamento"
 
-#: hr/models/common.py:40
+#: hr/models/common.py:42
 msgid "Job Title"
 msgstr "Cargo"
 
-#: hr/models/common.py:53
+#: hr/models/common.py:55
 msgid "salary"
 msgstr "salario"
 
+#: hr/models/common.py:56
+msgid "social security number"
+msgstr ""
+
 #: hr/models/common.py:57
+#, fuzzy
+#| msgid "document"
+msgid "tax_document"
+msgstr "documento"
+
+#: hr/models/common.py:58
+msgid "pension_number"
+msgstr ""
+
+#: hr/models/common.py:60
+msgid "phone_number"
+msgstr ""
+
+#: hr/models/common.py:64
 msgid "system user"
 msgstr "usuario del sistema"
 
-#: hr/models/common.py:73
+#: hr/models/common.py:80
 msgid "department"
 msgstr "departamento"
 
-#: hr/models/common.py:81
+#: hr/models/common.py:88
 msgid "job title"
 msgstr "cargo"
 
-#: hr/models/common.py:88
+#: hr/models/common.py:104
 msgid "Employee"
 msgstr "Empleado"
 
+#: insumos/currency.py:36 insumos/currency.py:58 insumos/currency.py:59
+#, fuzzy
+#| msgid "Conversion"
+msgid "Conversion History"
+msgstr "Conversión"
+
+#: insumos/currency.py:46
+#, fuzzy
+#| msgid "Create"
+msgid "Created"
+msgstr "Crear"
+
 #: lm/admin.py:79
 #, python-format
 msgid "%d shipment was successfully sent."
@@ -2091,25 +3664,35 @@ msgstr[1] "%d embarques han sido aceptados exitosamente."
 msgid "Accept Selected Shipments"
 msgstr "Aceptar Traslados Seleccionados"
 
-#: lm/api_serializers.py:86
+#: lm/api/serializers/serializers.py:99
 msgid "quantity must be greater than zero"
 msgstr ""
 
-#: lm/api_serializers.py:101
+#: lm/api/serializers/serializers.py:101
+#, fuzzy
+#| msgid "purchase order does not belongs to the user's tenant"
+msgid "product does not belongs to user's tenant"
+msgstr "orden de compra no pertenece al usuario de la entidad"
+
+#: lm/api/serializers/serializers.py:115
 #, fuzzy, python-format
 #| msgid "user is not assigned to the pos"
 msgid "user is not assigned to warehouse %(warehouse)s"
 msgstr "el usuario no esta asignado al pos"
 
-#: lm/api_serializers.py:131
+#: lm/api/serializers/serializers.py:124
+msgid "product was specified more than once"
+msgstr ""
+
+#: lm/api/serializers/serializers.py:149
 #, python-format
 msgid ""
-"requested quantity (%(quantity)s) \n"
-"is greater than available stock (%(available)s) \n"
+"requested quantity (%(quantity)s) is greater than available stock "
+"(%(available)s) \n"
 "for product (%(product)s)"
 msgstr ""
 
-#: lm/api_serializers.py:144
+#: lm/api/serializers/serializers.py:160
 #, python-format
 msgid ""
 "product %(code)s \n"
@@ -2118,64 +3701,81 @@ msgid ""
 "%(warehouse)s"
 msgstr ""
 
-#: lm/api_serializers.py:207
+#: lm/api/serializers/serializers.py:230 lm/api/serializers/transaction.py:50
 #, fuzzy
 #| msgid "user is not assigned to the pos"
 msgid "user is not assigned to warehouse"
 msgstr "el usuario no esta asignado al pos"
 
-#: lm/api_serializers.py:210
+#: lm/api/serializers/serializers.py:233
 #, fuzzy
 #| msgid "product's tenant must be same category's tenant"
 msgid "warehouse's tenant is not same typology's tenant"
 msgstr ""
 "entidad del producto debe pertenecer a la misma categoría que la entidad"
 
-#: lm/api_serializers.py:222
+#: lm/api/serializers/serializers.py:245
 #, fuzzy, python-format
 #| msgid "product does not exists"
 msgid "product (%(product)s) does not exists"
 msgstr "el producto no existe"
 
+#: lm/api/serializers/supply_order.py:43
+#, fuzzy
+#| msgid "purchase order does not belongs to the user's tenant"
+msgid "user does not belongs to requested branch"
+msgstr "orden de compra no pertenece al usuario de la entidad"
+
+#: lm/api/serializers/transaction.py:52
+#, fuzzy
+#| msgid "bundle product and item product must belong to same tenant"
+msgid "user and product do not belong to same tenant"
+msgstr "producto del paquete y articulo deben pertenecer a la misma entidad"
+
 #: lm/apps.py:8
 msgid "Logistic Module"
 msgstr "Módulo de Logística"
 
-#: lm/forms.py:95 lm/templates/lm/shipment_list.html:45
+#: lm/forms.py:24 lm/forms.py:163 lm/forms.py:197 lm/forms.py:228
+#: lm/models/product.py:92 lm/templates/lm/packaging_list.html:45
+#: lm/templates/lm/shipment_create_form.html:63
+#: lm/templates/lm/shipment_detail.html:89
+#: lm/templates/lm/stock_adjust_form.html:57
+#: lm/templates/lm/supplyorder_form.html:51 mm/forms.py:108 mm/forms.py:150
+#: mm/forms.py:190 mm/templates/mm/purchase_form_bk.html:144
+#: mm/templates/mm/purchase_form_items.html:159
+#: mnf/templates/mnf/manufacturingorder_detail.html:101
+msgid "Product"
+msgstr "Producto"
+
+#: lm/forms.py:152 lm/templates/lm/shipment_list.html:45
 #, fuzzy
 #| msgid "Warehouse"
 msgid "Destiny Warehouse"
 msgstr "Bodega"
 
-#: lm/forms.py:100 lm/templates/lm/shipment_list.html:44
+#: lm/forms.py:157 lm/templates/lm/shipment_list.html:44
 #, fuzzy
 #| msgid "Warehouse"
 msgid "Origin Warehouse"
 msgstr "Bodega"
 
-#: lm/forms.py:105 lm/forms.py:136 lm/models/product.py:69
-#: lm/templates/lm/packaging_list.html:45
-#: lm/templates/lm/shipment_create_form.html:58
-#: lm/templates/lm/shipment_detail.html:80
-#: lm/templates/lm/stock_adjust_form.html:57 mm/forms.py:89 mm/forms.py:120
-#: mm/forms.py:146 mm/templates/mm/purchase_form.html:150
-#: mnf/templates/mnf/manufacturingorder_detail.html:101
-msgid "Product"
-msgstr "Producto"
-
-#: lm/forms.py:126 lm/models/warehouse.py:24 mm/forms.py:79
+#: lm/forms.py:187 lm/forms.py:223 lm/models/warehouse.py:39
+#: lm/templates/lm/transaction_list.html:89 mm/forms.py:92
 #: mnf/templates/mnf/manufacturingorder_detail.html:27
 #: mnf/templates/mnf/manufacturingorder_form.html:57
 #: mnf/templates/mnf/manufacturingorder_list.html:47
 msgid "Warehouse"
 msgstr "Bodega"
 
-#: lm/forms.py:131 lm/models/transaction.py:75
+#: lm/forms.py:192 lm/models/transaction.py:36
+#: lm/templates/lm/transaction_list.html:90
 msgid "Typology"
 msgstr ""
 
-#: lm/models/brand.py:22 lm/templates/lm/product_list.html:48
-#: lm/templates/lm/stock_list.html:62 mnf/templates/mnf/bundle_list.html:48
+#: lm/models/brand.py:23 lm/templates/lm/product_list.html:49
+#: lm/templates/lm/stock_by_warehouse.html:64
+#: mnf/templates/mnf/bundle_list.html:48
 msgid "Brand"
 msgstr "Marca"
 
@@ -2199,7 +3799,7 @@ msgstr "Elemento del paquete"
 msgid "Bundle Items"
 msgstr "Elementos del paquete"
 
-#: lm/models/bundle_item.py:44 mnf/models/mo.py:159 mnf/utils.py:11
+#: lm/models/bundle_item.py:44 mnf/models/mo.py:162 mnf/utils.py:12
 msgid "product must be bundle type"
 msgstr "producto debe ser tipo paquete"
 
@@ -2211,308 +3811,410 @@ msgstr "producto del paquete y articulo deben pertenecer a la misma entidad"
 msgid "logical type must be same for bundle and product"
 msgstr "el tipo lógico debe ser el mismo para el paquete y producto"
 
-#: lm/models/category.py:13
-msgid "parent"
-msgstr "padre"
-
-#: lm/models/category.py:29 lm/templates/lm/product_list.html:47
-#: lm/templates/lm/stock_list.html:61 mnf/templates/mnf/bundle_list.html:47
+#: lm/models/category.py:39 lm/templates/lm/product_list.html:48
+#: lm/templates/lm/stock_by_warehouse.html:63
+#: mnf/templates/mnf/bundle_list.html:47
 msgid "Category"
 msgstr "Categoría"
 
-#: lm/models/offer.py:11 lm/models/packaging.py:12 lm/models/product.py:11
-#: lm/models/stock.py:49 lm/models/transaction.py:27 mm/models/purchase.py:317
-#: mm/models/purchase_order.py:149 mm/models/purchase_requisition.py:114
-#: mnf/models/mo.py:133 rcm/models/offer_options_group.py:52
+#: lm/models/offer.py:11 lm/models/packaging.py:12 lm/models/product.py:12
+#: lm/models/stock.py:54 lm/models/supply_order.py:92
+#: lm/models/transaction.py:93 mm/models/purchase.py:423
+#: mm/models/purchase_order.py:150 mm/models/purchase_requisition.py:123
+#: mnf/models/mo.py:136 offer/models/offer_options_group.py:52
 msgid "product"
 msgstr "producto"
 
-#: lm/models/offer.py:14
+#: lm/models/offer.py:14 offer/models/offer.py:152
 msgid "start range"
 msgstr "inicio de rango"
 
-#: lm/models/offer.py:15
+#: lm/models/offer.py:15 offer/models/offer.py:155
 msgid "end range"
 msgstr "fin de rango"
 
-#: lm/models/offer.py:16
+#: lm/models/offer.py:16 offer/models/offer.py:158
 msgid "unit price"
 msgstr "precio unitario"
 
-#: lm/models/offer.py:19 rcm/models/offer.py:41
-msgid "Offer"
-msgstr "Oferta"
-
-#: lm/models/offer.py:28
+#: lm/models/offer.py:34 offer/models/offer.py:177
 msgid "start range and end range must be provided"
 msgstr "inicio y final para el rango es obligatorio"
 
-#: lm/models/offer.py:37
+#: lm/models/offer.py:43
 msgid "overlapping range for product"
 msgstr "traslape en rangos para el producto"
 
-#: lm/models/packaging.py:15 lm/models/product.py:19
+#: lm/models/packaging.py:15 lm/models/product.py:22
 msgid "sku"
 msgstr "sku"
 
-#: lm/models/packaging.py:16 lm/models/product.py:20
-#: lm/models/shipment_item.py:16 mm/models/purchase.py:322
-#: mm/models/purchase_order.py:152 mm/models/purchase_requisition.py:117
-#: mm/models/transaction.py:16 rcm/models/offer.py:10
+#: lm/models/packaging.py:16 lm/models/product.py:23
+#: lm/models/shipment_item.py:18 mm/models/purchase.py:428
+#: mm/models/purchase_order.py:153 mm/models/purchase_requisition.py:126
+#: mm/models/transaction.py:17 offer/models/offer.py:21
 msgid "description"
 msgstr "descripción"
 
-#: lm/models/packaging.py:41
+#: lm/models/packaging.py:19
+msgid "is available for supply order"
+msgstr ""
+
+#: lm/models/packaging.py:46
 msgid "this sku already exists"
 msgstr ""
 
-#: lm/models/product.py:12
+#: lm/models/product.py:13
 msgid "service"
 msgstr "servicio"
 
+#: lm/models/product.py:14
+#, fuzzy
+#| msgid "raw data"
+msgid "raw material"
+msgstr "datos originales"
+
 #: lm/models/product.py:15
+msgid "expense"
+msgstr ""
+
+#: lm/models/product.py:18
 msgid "unit"
 msgstr "unidad"
 
-#: lm/models/product.py:16 mm/models/purchase.py:323
-#: mm/models/purchase_order.py:153 mm/models/purchase_requisition.py:118
+#: lm/models/product.py:19 lm/models/stock.py:74 lm/models/transaction.py:79
+#: mm/models/purchase.py:429 mm/models/purchase_order.py:154
+#: mm/models/purchase_requisition.py:127
 msgid "lot"
 msgstr "lote"
 
-#: lm/models/product.py:21
+#: lm/models/product.py:24
 msgid "image"
 msgstr "imagen"
 
-#: lm/models/product.py:22
+#: lm/models/product.py:25
 msgid "commercial type"
 msgstr "tipo comercial"
 
-#: lm/models/product.py:24
+#: lm/models/product.py:27
 msgid "logical type"
 msgstr "tipo lógico"
 
-#: lm/models/product.py:26
-msgid "unit measure"
-msgstr "unidad de medida"
-
-#: lm/models/product.py:27 lm/models/transaction.py:20
-msgid "cost"
-msgstr "costo"
-
-#: lm/models/product.py:28 lm/models/transaction.py:21
+#: lm/models/product.py:30 lm/models/stock.py:69 lm/models/transaction.py:68
 msgid "average cost"
 msgstr "costo promedio"
 
-#: lm/models/product.py:30 lm/models/stock.py:75
+#: lm/models/product.py:32 lm/models/stock.py:95
 msgid "bundle"
 msgstr "paquete"
 
-#: lm/models/product.py:32
-msgid "taxes"
-msgstr "impuestos"
-
-#: lm/models/product.py:35
-msgid "if no taxes provided, it will take the default taxes from the Tenant"
-msgstr ""
-"si no se proporcionan impuestos, tomará los impuestos predeterminados de la "
-"entidad"
-
-#: lm/models/product.py:40
+#: lm/models/product.py:36
 msgid "category"
 msgstr "categoría"
 
-#: lm/models/product.py:48
-msgid "brand"
-msgstr "marca"
+#: lm/models/product.py:67 mm/models/provider.py:58
+#, fuzzy
+#| msgid "to provider"
+msgid "tax profile"
+msgstr "a proveedor"
 
-#: lm/models/product.py:110
+#: lm/models/product.py:74
+msgid "default stock display"
+msgstr ""
+
+#: lm/models/product.py:93
+msgid "Products"
+msgstr "Productos"
+
+#: lm/models/product.py:133 offer/models/offer.py:133
 #, python-format
 msgid ""
 "there is no offer configured for product %(product)s with quantity "
 "%(quantity)s"
 msgstr ""
 
-#: lm/models/shipment.py:14 lm/models/stock.py:17
+#: lm/models/shipment.py:15 lm/models/stock.py:22
 msgid "in transit"
 msgstr "en tránsito"
 
-#: lm/models/shipment.py:15
+#: lm/models/shipment.py:16
 msgid "accepted"
 msgstr "aceptado"
 
-#: lm/models/shipment.py:19
+#: lm/models/shipment.py:20
 msgid "date accepted"
 msgstr "fecha de aceptación"
 
-#: lm/models/shipment.py:29 lm/models/stock.py:31 mm/models/purchase.py:105
+#: lm/models/shipment.py:33 lm/models/stock.py:36 mm/models/purchase.py:99
 #: mnf/models/mo.py:31
 msgid "modified by"
 msgstr "modificado por"
 
-#: lm/models/shipment.py:37
+#: lm/models/shipment.py:41
 msgid "accepted by"
 msgstr "aceptado por"
 
-#: lm/models/shipment.py:48
+#: lm/models/shipment.py:52
 msgid "warehouse from"
 msgstr "bodega origen"
 
-#: lm/models/shipment.py:54
+#: lm/models/shipment.py:58
 msgid "warehouse to"
 msgstr "bodega destino"
 
-#: lm/models/shipment.py:59
+#: lm/models/shipment.py:62 lm/models/shipment_item.py:37
+#, fuzzy
+#| msgid "total taxes"
+msgid "total cost"
+msgstr "impuestos totales"
+
+#: lm/models/shipment.py:67
 msgid "Shipment"
 msgstr "Traslado"
 
-#: lm/models/shipment.py:62
+#: lm/models/shipment.py:70
 msgid "Can send Shipment"
 msgstr "Puede enviar Traslados"
 
-#: lm/models/shipment.py:63
+#: lm/models/shipment.py:71
 msgid "Can accept Shipment"
 msgstr "Puede aceptar Traslados"
 
-#: lm/models/shipment.py:69
+#: lm/models/shipment.py:77
 msgid "origin warehouse is same destiny warehouse"
 msgstr "el almacén de origen es el mismo almacén de destino"
 
-#: lm/models/shipment.py:77
+#: lm/models/shipment.py:79
+#, fuzzy
+#| msgid "start range and end range must be provided"
+msgid "shipment document must be provided"
+msgstr "inicio y final para el rango es obligatorio"
+
+#: lm/models/shipment.py:87
 msgid "can not send a shipment that is not in created status"
 msgstr "no se puede enviar un traslado que no está en estado creado"
 
-#: lm/models/shipment.py:88
+#: lm/models/shipment.py:98
 msgid "can not accept a shipment that is not in transit status"
 msgstr "no puede aceptar un traslado que no está en estado de tránsito"
 
-#: lm/models/shipment_item.py:12 lm/models/stock.py:59
+#: lm/models/shipment_item.py:14 lm/models/stock.py:79
 msgid "shipment"
 msgstr "traslado"
 
-#: lm/models/shipment_item.py:20 lm/models/transaction.py:23
+#: lm/models/shipment_item.py:22 lm/models/transaction.py:85
 msgid "stock"
 msgstr "existencia"
 
-#: lm/models/shipment_item.py:23 lm/models/stock.py:53
-#: mm/models/purchase.py:325 mm/models/purchase_order.py:155
-#: mm/models/purchase_requisition.py:120 mnf/models/mo.py:137
-#: rcm/models/offer_options_group.py:54
-msgid "quantity"
-msgstr "cantidad"
-
 #: lm/models/shipment_item.py:28
+#, fuzzy
+#| msgid "Packaging"
+msgid "packaging"
+msgstr "Presentación"
+
+#: lm/models/shipment_item.py:32
+#, fuzzy
+#| msgid "Required Quantity"
+msgid "converted quantity"
+msgstr "Cantidad Requerida"
+
+#: lm/models/shipment_item.py:44
 msgid "Shipment Item"
 msgstr "Ítem de Traslado"
 
-#: lm/models/shipment_item.py:29
+#: lm/models/shipment_item.py:45
 msgid "Shipment Items"
 msgstr "Ítems de Traslado"
 
-#: lm/models/shipment_item.py:35
+#: lm/models/shipment_item.py:51
 msgid "can not create an item for an already processed shipment"
 msgstr "no se puede crear un ítem para un traslado ya procesado"
 
-#: lm/models/stock.py:14 pos/models/fiscal_correlative.py:11
+#: lm/models/stock.py:19 pos/models/fiscal_correlative.py:10
 msgid "available"
 msgstr "disponible"
 
-#: lm/models/stock.py:15
+#: lm/models/stock.py:20
 msgid "reserved"
 msgstr "reservado"
 
-#: lm/models/stock.py:16
+#: lm/models/stock.py:21
 msgid "sold"
 msgstr "vendido"
 
-#: lm/models/stock.py:21
+#: lm/models/stock.py:26
 msgid "date sold"
 msgstr "fecha de venta"
 
-#: lm/models/stock.py:43 lm/models/transaction.py:33 mm/models/purchase.py:67
+#: lm/models/stock.py:48 lm/models/transaction.py:99 mm/models/purchase.py:61
 #: mnf/models/mo.py:46
 msgid "warehouse"
 msgstr "bodega"
 
-#: lm/models/stock.py:52 mm/models/purchase.py:130
-#: pos/models/fiscal_correlative.py:20
+#: lm/models/stock.py:57 lm/models/transaction.py:81 mm/models/purchase.py:131
+#: pos/models/fiscal_correlative.py:19
 msgid "series"
 msgstr "serie"
 
-#: lm/models/stock.py:55
+#: lm/models/stock.py:63
 msgid "billing status"
 msgstr "estado de factura"
 
-#: lm/models/stock.py:67
-msgid "invoice"
-msgstr "facturado"
+#: lm/models/stock.py:75 lm/models/transaction.py:80 mm/models/purchase.py:430
+#: mm/models/purchase_order.py:155 mm/models/purchase_requisition.py:128
+msgid "due"
+msgstr "vencida"
 
-#: lm/models/stock.py:93
+#: lm/models/stock.py:117
+msgid "Can view Stock By Product"
+msgstr ""
+
+#: lm/models/stock.py:121
+msgid "Can view Stock By Warehouse"
+msgstr ""
+
+#: lm/models/stock.py:132
 msgid "unit logical type must have series"
 msgstr "unidad tipo lógico debe tener serie"
 
-#: lm/models/stock.py:95
+#: lm/models/stock.py:134
 msgid "unit logical type quantity must not have quantity greater than 1"
 msgstr ""
 "cantidad de tipo lógico de unidad no debe tener una cantidad superior a 1"
 
-#: lm/models/stock.py:100
+#: lm/models/stock.py:139
 msgid "stock warehouse is different that shipment origin warehouse"
 msgstr ""
 "el stock se encuentra en una bodega diferente de la bodega origen del "
 "traslado"
 
-#: lm/models/stock.py:102
+#: lm/models/stock.py:141
 msgid "shipment between tenants is not allowed"
 msgstr "no esta permitido traslados entre entidad"
 
-#: lm/models/stock.py:105
+#: lm/models/stock.py:144
 msgid "stock is not in available status"
 msgstr "el stock no se encuentra en estado disponible"
 
-#: lm/models/stock.py:107
+#: lm/models/stock.py:146
 msgid "available quantity is less than requested quantity"
 msgstr "cantidad disponible es menor que la cantidad solicitada"
 
-#: lm/models/transaction.py:10
+#: lm/models/supply_order.py:9
 #, fuzzy
-#| msgid "price increment"
-msgid "increment"
-msgstr "incremento de precio"
+msgid "requested"
+msgstr "solicitud de api"
 
-#: lm/models/transaction.py:11
+#: lm/models/supply_order.py:10
 #, fuzzy
-#| msgid "department"
-msgid "decrement"
-msgstr "departamento"
+#| msgid "view"
+msgid "in review"
+msgstr "ver"
 
-#: lm/models/transaction.py:22
-msgid "observations"
-msgstr "observaciones"
+#: lm/models/supply_order.py:11
+msgid "dispatched"
+msgstr ""
 
-#: lm/models/transaction.py:39 mm/models/transaction.py:26
-#: pos/models/fiscal_correlative.py:47
-msgid "user"
-msgstr "usuario"
+#: lm/models/supply_order.py:38
+#, fuzzy
+#| msgid "reversed by"
+msgid "processed by"
+msgstr "reversada por"
 
-#: lm/models/transaction.py:59
+#: lm/models/supply_order.py:58 lm/templates/lm/supplyorder_detail.html:14
+msgid "Supply Order"
+msgstr ""
+
+#: lm/models/supply_order.py:64
+msgid "Can view Supply Order consolidation"
+msgstr ""
+
+#: lm/models/supply_order.py:84
+msgid "supply order"
+msgstr ""
+
+#: lm/models/supply_order.py:106
+#, fuzzy
+#| msgid "Purchase Order Item"
+msgid "Supply Order Item"
+msgstr "Artículo de Orden de Compra"
+
+#: lm/models/supply_order.py:107
+#, fuzzy
+#| msgid "Purchase Order Items"
+msgid "Supply Order Items"
+msgstr "Artículos de Orden de Compra"
+
+#: lm/models/transaction.py:20
 #, fuzzy
 #| msgid "modified by"
 msgid "modification"
 msgstr "modificado por"
 
-#: lm/models/warehouse.py:39
+#: lm/models/transaction.py:62
+#, fuzzy
+#| msgid "previous balance"
+msgid "previous quantity"
+msgstr "saldo anterior"
+
+#: lm/models/transaction.py:64
+#, fuzzy
+#| msgid "quantity"
+msgid "post quantity"
+msgstr "cantidad"
+
+#: lm/models/transaction.py:71
+#, fuzzy
+#| msgid "previous balance"
+msgid "previous stock balance"
+msgstr "saldo anterior"
+
+#: lm/models/transaction.py:74
+#, fuzzy
+#| msgid "transaction"
+msgid "transaction cost"
+msgstr "transacción"
+
+#: lm/models/transaction.py:76
+#, fuzzy
+#| msgid "post balance"
+msgid "post stock balance"
+msgstr "saldo posterior"
+
+#: lm/models/transaction.py:78
+msgid "observations"
+msgstr "observaciones"
+
+#: lm/models/transaction.py:105 mm/models/transaction.py:27
+#: pos/models/fiscal_correlative.py:46
+msgid "user"
+msgstr "usuario"
+
+#: lm/models/transaction.py:120
+#, fuzzy
+#| msgid "is approved"
+msgid "is applied"
+msgstr "esta aprobado"
+
+#: lm/models/transaction.py:136
+#, fuzzy
+#| msgid "Transaction Items"
+msgid "Transaction needs Typology"
+msgstr "Artículos de transacción"
+
+#: lm/models/warehouse.py:54
 msgid "the warehouse can not be deactivated because it has available stock"
 msgstr "el almacén no se puede desactivar porque tiene stock disponible"
 
-#: lm/models/warehouse.py:48
+#: lm/models/warehouse.py:64
 msgid "Warehouse User"
 msgstr "Usuario de Bodega"
 
-#: lm/models/warehouse.py:49
+#: lm/models/warehouse.py:65
 msgid "Warehouse Users"
 msgstr "Usuarios de Bodegas"
 
-#: lm/models/warehouse.py:54
+#: lm/models/warehouse.py:70
 msgid ""
 "Can not save user with warehouse association because warehouse's branch is "
 "not in user's branches"
@@ -2532,189 +4234,304 @@ msgstr "Sku"
 msgid "Units"
 msgstr "Unidades"
 
-#: lm/templates/lm/product_list.html:45 lm/templates/lm/stock_list.html:59
+#: lm/templates/lm/product_list.html:21
+msgid "Products, Services, Materials & Expenses"
+msgstr ""
+
+#: lm/templates/lm/product_list.html:45
+#: lm/templates/lm/stock_by_product.html:56
+#: lm/templates/lm/stock_by_warehouse.html:60
 #: mnf/templates/mnf/bundle_list.html:45
 msgid "SKU"
 msgstr "SKU"
 
-#: lm/templates/lm/product_list.html:49
-msgid "Unit Measure"
-msgstr "Unidad de Medida"
+#: lm/templates/lm/product_list.html:47
+msgid "Tipo"
+msgstr ""
 
-#: lm/templates/lm/shipment_create_form.html:49
-#: lm/templates/lm/stock_adjust_form.html:49
-#: mm/templates/mm/purchase_form.html:141
-#: mm/templates/mm/purchaseorder_form.html:91
-msgid "Add"
-msgstr "Agregar"
-
-#: lm/templates/lm/shipment_detail.html:22
+#: lm/templates/lm/shipment_detail.html:31
+#: lm/templates/lm/supplyorder_detail.html:26
 #, fuzzy
 #| msgid "Created Date"
 msgid "Created Date:"
 msgstr "Fecha de Creacion"
 
-#: lm/templates/lm/shipment_detail.html:28
+#: lm/templates/lm/shipment_detail.html:37
 #, fuzzy
 #| msgid "modified by"
 msgid "Modified Date:"
 msgstr "modificado por"
 
-#: lm/templates/lm/shipment_detail.html:36
+#: lm/templates/lm/shipment_detail.html:45
 #, fuzzy
 #| msgid "Created By"
 msgid "Created By:"
 msgstr "Creado Por"
 
-#: lm/templates/lm/shipment_detail.html:42
+#: lm/templates/lm/shipment_detail.html:51
 #, fuzzy
 #| msgid "Modified By"
 msgid "Modified By:"
 msgstr "Modificado por"
 
-#: lm/templates/lm/shipment_detail.html:50
+#: lm/templates/lm/shipment_detail.html:59
 #, fuzzy
 #| msgid "accepted by"
 msgid "Accepted By:"
 msgstr "aceptado por"
 
-#: lm/templates/lm/shipment_detail.html:56
+#: lm/templates/lm/shipment_detail.html:65
+#: lm/templates/lm/supplyorder_detail.html:46
 #, fuzzy
 #| msgid "Status"
 msgid "Status:"
 msgstr "Estado"
 
-#: lm/templates/lm/shipment_detail.html:64
+#: lm/templates/lm/shipment_detail.html:73
 #, fuzzy
 #| msgid "Warehouse"
 msgid "From Warehouse:"
 msgstr "Bodega"
 
-#: lm/templates/lm/shipment_detail.html:70
+#: lm/templates/lm/shipment_detail.html:79
 #, fuzzy
 #| msgid "Warehouse"
 msgid "To Warehouse:"
 msgstr "Bodega"
 
-#: lm/templates/lm/shipment_detail.html:81
+#: lm/templates/lm/shipment_detail.html:90
 #, fuzzy
 #| msgid "Product to Exhaust"
 msgid "Product Status"
 msgstr "Producto a Agotar"
 
-#: lm/templates/lm/shipment_detail.html:104
+#: lm/templates/lm/shipment_detail.html:113
 msgid "Send"
 msgstr ""
 
-#: lm/templates/lm/shipment_detail.html:106
+#: lm/templates/lm/shipment_detail.html:115
 #, fuzzy
 #| msgid "accepted"
 msgid "Accept"
 msgstr "aceptado"
 
-#: lm/templates/lm/stock_list.html:63 mm/forms.py:81
-#: mm/templates/mm/purchase_list.html:46
-msgid "Series"
-msgstr "Serie"
+#: lm/templates/lm/shipment_list.html:46
+#, fuzzy
+#| msgid "Shipment"
+msgid "Shipment Doc"
+msgstr "Traslado"
 
-#: lm/templates/lm/stock_list.html:66
+#: lm/templates/lm/stock_by_product.html:58
+#, fuzzy
+#| msgid "Packaging"
+msgid "Packagings"
+msgstr "Presentación"
+
+#: lm/templates/lm/stock_by_product.html:59
+msgid "TOTAL"
+msgstr ""
+
+#: lm/templates/lm/stock_by_product.html:67
+#, fuzzy
+#| msgid "Warehouse"
+msgid "By Warehouse"
+msgstr "Bodega"
+
+#: lm/templates/lm/stock_by_product.html:82
+#, fuzzy
+#| msgid "Status"
+msgid "By Status"
+msgstr "Estado"
+
+#: lm/templates/lm/stock_by_warehouse.html:58
+#, fuzzy
+#| msgid "Stock"
+msgid "Stock ID"
+msgstr "Existencia"
+
+#: lm/templates/lm/stock_by_warehouse.html:68
 msgid "Billing Status"
 msgstr "Estado de facturación"
 
+#: lm/templates/lm/stock_by_warehouse.html:71
+#: lm/templates/lm/transaction_list.html:93
+msgid "Avg Cost"
+msgstr ""
+
+#: lm/templates/lm/supplyorder_consolidation.html:23
+#: lm/templates/lm/supplyorder_detail.html:55
+#: lm/views/supply_order_consolidation.py:66
+#, fuzzy
+#| msgid "Product"
+msgid "Product Code"
+msgstr "Producto"
+
+#: lm/templates/lm/supplyorder_consolidation.html:24
+#: lm/templates/lm/supplyorder_detail.html:56
+#: lm/views/supply_order_consolidation.py:67
+#, fuzzy
+#| msgid "Warehouse Description"
+msgid "Product Description"
+msgstr "Descripción de Bodega"
+
+#: lm/templates/lm/supplyorder_consolidation.html:28
+#: lm/views/supply_order_consolidation.py:71
+#, fuzzy
+msgid "Total Requested"
+msgstr "solicitud de api"
+
+#: lm/templates/lm/supplyorder_consolidation.html:30
+msgid "Diff"
+msgstr ""
+
+#: lm/templates/lm/transaction_list.html:91
+#, fuzzy
+#| msgid "motive"
+msgid "Motive"
+msgstr "motivo"
+
+#: lm/templates/lm/transaction_list.html:96
+#, fuzzy
+#| msgid "Quantity"
+msgid "Prev Quantity"
+msgstr "Cantidad"
+
+#: lm/templates/lm/transaction_list.html:98
+#, fuzzy
+#| msgid "Quantity"
+msgid "Post Quantity"
+msgstr "Cantidad"
+
+#: lm/templates/lm/transaction_list.html:99
+#, fuzzy
+#| msgid "Net Amount"
+msgid "Prev Amount"
+msgstr "Monto Neto"
+
+#: lm/templates/lm/transaction_list.html:101
+#, fuzzy
+#| msgid "Total Amount"
+msgid "Post Amount"
+msgstr "Monto Total"
+
 #: lm/templates/lm/typology_list.html:46
 #, fuzzy
 #| msgid "affectation"
 msgid "Affectation"
 msgstr "naturaleza"
 
-#: lm/views/shipment.py:18
+#: lm/views/shipment.py:19
 #, fuzzy
 #| msgid "Can send Shipment"
 msgid "Create Shipment"
 msgstr "Puede enviar Traslados"
 
+#: mm/api/serializers.py:56 sync/drivers/errors.py:11
+msgid "product does not exists"
+msgstr "el producto no existe"
+
+#: mm/api/serializers.py:119
+#, fuzzy, python-format
+msgid "purchase order %(code)s does not exists"
+msgstr "la sucursal para el código dado %(code)s no existe"
+
+#: mm/api/serializers.py:125
+#, fuzzy, python-format
+#| msgid "provider does not exists"
+msgid "provider %(code)s does not exists"
+msgstr "el proveedor no existe"
+
+#: mm/api/views.py:135
+#, fuzzy
+#| msgid "purchase order does not belongs to the user's tenant"
+msgid "purchase does not belongs to the user's tenant"
+msgstr "orden de compra no pertenece al usuario de la entidad"
+
+#: mm/api/views.py:156
+msgid "purchase is not in valid status for adding items"
+msgstr ""
+
+#: mm/api/views.py:183
+msgid "purchase is not in valid status for removing items"
+msgstr ""
+
+#: mm/api/views.py:189
+#, fuzzy
+#| msgid "tax does not exists"
+msgid "item does not exists"
+msgstr "impuesto no existe"
+
+#: mm/api/views.py:296
+msgid "purchase order does not belongs to the user's tenant"
+msgstr "orden de compra no pertenece al usuario de la entidad"
+
+#: mm/api/views.py:301
+msgid "purchase order is already approved"
+msgstr "orden de compra ya está aprobada"
+
+#: mm/api/views.py:306
+msgid ""
+"user's authorized approval amount is lower than purchase order's total amount"
+msgstr ""
+"monto de aprobación autorizado es menor que el monto total de orden de compra"
+
 #: mm/apps.py:8
 msgid "Materials Management"
 msgstr "Administración de materiales"
 
-#: mm/forms.py:76
-msgid "Date for Record"
-msgstr "Fecha de Registro"
-
-#: mm/forms.py:77 mm/forms.py:115 mm/forms.py:141 mm/models/provider.py:73
+#: mm/forms.py:86 mm/forms.py:143 mm/forms.py:181 mm/models/provider.py:83
 #: mm/templates/mm/transaction_list.html:72
 msgid "Provider"
 msgstr "Proveedor"
 
-#: mm/forms.py:78 mm/models/purchase_order.py:81
+#: mm/forms.py:89 mm/models/purchase_order.py:82
 #: mm/templates/mm/purchaseorder_detail.html:17
 #: mm/templates/mm/purchaseorder_form.html:16
 msgid "Purchase Order"
 msgstr "Orden de Compra"
 
-#: mm/forms.py:80
-msgid "Document Type"
-msgstr "Tipo de Documento"
-
-#: mm/forms.py:83
-msgid "Purchase Type"
-msgstr "Tipo de Compra"
-
-#: mm/forms.py:84
-msgid "Credit Days"
-msgstr "Días de Crédito"
-
-#: mm/forms.py:85 mm/forms.py:142 mm/templates/mm/purchase_list.html:44
+#: mm/forms.py:103 mm/forms.py:183 mm/templates/mm/purchase_list.html:72
 #: mm/templates/mm/purchaseorder_list.html:54
 #: mm/templates/mm/purchaserequisition_list.html:44
 msgid "Provider Document"
 msgstr "Documento del Proveedor"
 
-#: mm/forms.py:86 mm/forms.py:117 mm/forms.py:143
-msgid "Business Activity"
-msgstr "Actividad del Negocio"
-
-#: mm/forms.py:87 mm/forms.py:118 mm/forms.py:144
-#: mm/templates/mm/purchase_list.html:45
+#: mm/forms.py:105 mm/forms.py:147 mm/forms.py:185
+#: mm/templates/mm/purchase_list.html:73
 #: mm/templates/mm/purchaseorder_list.html:55
 #: mm/templates/mm/purchaserequisition_list.html:45
 #: sync/templates/sync/syncrecord_list.html:73
 msgid "Provider Name"
 msgstr "Nombre del Proveedor"
 
-#: mm/forms.py:88 mm/forms.py:119 mm/forms.py:145
+#: mm/forms.py:106 mm/forms.py:148 mm/forms.py:186
 msgid "Provider Address"
 msgstr "Dirección de Proveedor"
 
-#: mm/forms.py:91 mm/forms.py:122 mm/forms.py:148
-#, fuzzy
-#| msgid "lot"
-msgid "Lot"
-msgstr "Lote"
-
-#: mm/forms.py:92
-#, fuzzy
-msgid "Due"
-msgstr "Deuda"
-
-#: mm/forms.py:93 mm/forms.py:123 mm/forms.py:149
-#: mm/templates/mm/purchase_form.html:152
-msgid "Taxed Unit Price"
-msgstr "Precio Unitario Gravado"
-
-#: mm/forms.py:94 mm/forms.py:124 mm/forms.py:150
-#: mm/templates/mm/purchase_form.html:153
-msgid "Non Taxed Unit Price"
-msgstr "Precio Unitario no Gravado"
-
-#: mm/forms.py:116
+#: mm/forms.py:145
 msgid "Porvider Document"
 msgstr "Documento del Proveedor"
 
-#: mm/forms.py:140
+#: mm/forms.py:154 mm/forms.py:194 mm/templates/mm/purchase_form_bk.html:146
+#: mm/templates/mm/purchase_form_items.html:163
+msgid "Taxed Unit Price"
+msgstr "Precio Unitario Gravado"
+
+#: mm/forms.py:155 mm/forms.py:195 mm/templates/mm/purchase_form_bk.html:147
+#: mm/templates/mm/purchase_form_items.html:164
+msgid "Non Taxed Unit Price"
+msgstr "Precio Unitario no Gravado"
+
+#: mm/forms.py:178
 msgid "Requisitions"
 msgstr "Requisiciones"
 
+#: mm/forms.py:243
+#, fuzzy
+#| msgid "account"
+msgid "account2"
+msgstr "cuenta"
+
 #: mm/models/approver.py:16
 msgid "approver"
 msgstr "aprobador"
@@ -2727,34 +4544,48 @@ msgstr "monto máximo"
 msgid "Approver"
 msgstr "Aprobador"
 
-#: mm/models/payment.py:17
-msgid ""
-"This value will be displayed when selecting payment type from available "
-"payment types"
-msgstr "Este valor se mostrara al seleccionar tipo de descuento disponible"
+#: mm/models/payment.py:39
+#, fuzzy
+#| msgid "Petty Cash"
+msgid "petty cash"
+msgstr "Caja Chica"
 
-#: mm/models/payment.py:22
-msgid "This value will be displayed in purchase payment description"
-msgstr "Este valor se mostrara en la descripción del ítem de factura"
+#: mm/models/payment.py:72
+msgid "one option is required"
+msgstr ""
 
-#: mm/models/payment.py:35
-msgid "bank account"
-msgstr "cuenta de banco"
+#: mm/models/payment.py:74
+msgid "only one option is allowed"
+msgstr ""
 
-#: mm/models/payment.py:70 mm/models/purchase.py:182
+#: mm/models/payment.py:81 mm/models/purchase.py:194
 #: mm/templates/mm/payment_list.html:45
 msgid "Purchase"
 msgstr "Compra"
 
-#: mm/models/payment.py:99
+#: mm/models/payment.py:102
+#, fuzzy
+#| msgid "transaction"
+msgid "bank transaction"
+msgstr "transacción"
+
+#: mm/models/payment.py:125
 msgid "Purchase Payment"
 msgstr "Pago de Compra"
 
-#: mm/models/payment.py:100
+#: mm/models/payment.py:126
 msgid "Purchase Payments"
 msgstr "Pagos de Compra"
 
-#: mm/models/payment.py:109
+#: mm/models/payment.py:136
+msgid "type is required when bank account payment type is selected"
+msgstr ""
+
+#: mm/models/payment.py:140
+msgid "transfer reference is required when transfer payment type is selected"
+msgstr ""
+
+#: mm/models/payment.py:145
 #, fuzzy, python-format
 #| msgid ""
 #| "payment amount %(amount)s is greater than invoice balance %(balance)s"
@@ -2764,63 +4595,11 @@ msgstr ""
 "el monto del pago %(amount)s es mayor que el balance de la factura "
 "%(balance)s"
 
-#: mm/models/provider.py:10 mm/models/purchase.py:28
-msgid "Credito"
-msgstr "Crédito"
-
-#: mm/models/provider.py:11 mm/models/purchase.py:29
-msgid "Contado"
-msgstr "Contado"
-
-#: mm/models/provider.py:14
-msgid "external code"
-msgstr "código externo"
-
-#: mm/models/provider.py:16
-msgid "company name"
-msgstr "nombre de empresa"
-
-#: mm/models/provider.py:18
-msgid "phone"
-msgstr "teléfono"
-
-#: mm/models/provider.py:21
-msgid "document2"
-msgstr "documento 2"
-
-#: mm/models/provider.py:22
-msgid "state"
-msgstr "departamentos"
-
-#: mm/models/provider.py:23
-msgid "city"
-msgstr "municipio"
-
-#: mm/models/provider.py:24
-msgid "business activity"
-msgstr "actividad del negocio"
-
-#: mm/models/provider.py:25
-msgid "foreign"
-msgstr "extranjero"
-
-#: mm/models/provider.py:27
-msgid "payment conditions"
-msgstr "condiciones de pago"
-
-#: mm/models/provider.py:29 mm/models/purchase.py:133
-msgid "credit days"
-msgstr "días crédito"
-
-#: mm/models/provider.py:30
-msgid "large taxpayer"
-msgstr "gran contribuyente"
-
-#: mm/models/provider.py:32
+#: mm/models/provider.py:31
 msgid "only services provider"
 msgstr "proveedor unicamente de servicios"
 
-#: mm/models/provider.py:34
+#: mm/models/provider.py:33
 msgid ""
 "when activated, all automatic sync incoming purchases will be treated as non "
 "inventory purchases"
@@ -2828,30 +4607,8 @@ msgstr ""
 "al activar esta opción, todas las facturas de sincronización entrantes seran "
 "tratadas como faturas de servicios"
 
-#: mm/models/purchase.py:20
-msgid "Credito Fiscal"
-msgstr "Crédito Fiscal"
-
-#: mm/models/purchase.py:21
-msgid "Importacion"
-msgstr "Importación"
-
 #: mm/models/purchase.py:22
-msgid "Factura Consumidor Final"
-msgstr "Factura Consumidor Final"
-
-#: mm/models/purchase.py:23
-msgid "Recibo"
-msgstr "Recibo"
-
-#: mm/models/purchase.py:24
-#, fuzzy
-#| msgid "Inventory Purchase"
-msgid "Electronic Purchase"
-msgstr "Compra de Inventario"
-
-#: mm/models/purchase.py:25
-msgid "Electronic Credit Note"
+msgid "registrate"
 msgstr ""
 
 #: mm/models/purchase.py:32
@@ -2866,147 +4623,152 @@ msgstr "cuenta por pagar"
 msgid "cheque"
 msgstr "cheque"
 
-#: mm/models/purchase.py:75 mm/models/purchase_order.py:141
+#: mm/models/purchase.py:69 mm/models/purchase_order.py:142
 msgid "purchase order"
 msgstr "orden de compra"
 
-#: mm/models/purchase.py:113
-msgid "reversed by"
-msgstr "reversada por"
-
-#: mm/models/purchase.py:126 mm/models/purchase_order.py:15
-#: mm/models/purchase_requisition.py:12 sync/models.py:29 sync/models.py:100
-msgid "created date"
-msgstr "creado por"
-
-#: mm/models/purchase.py:127
+#: mm/models/purchase.py:129
 #, fuzzy
 #| msgid "modified by"
 msgid "modified date"
 msgstr "modificado por"
 
-#: mm/models/purchase.py:128
+#: mm/models/purchase.py:130
 msgid "for date"
 msgstr "para la fecha"
 
-#: mm/models/purchase.py:129
-msgid "document type"
-msgstr "tipo de documento"
-
-#: mm/models/purchase.py:132
+#: mm/models/purchase.py:134
 msgid "purchase type"
 msgstr "tipo de compra"
 
-#: mm/models/purchase.py:134
+#: mm/models/purchase.py:138
 msgid "payment type"
 msgstr "tipo de pago"
 
-#: mm/models/purchase.py:136 mm/models/purchase_order.py:25
-#: mm/models/purchase_requisition.py:23
+#: mm/models/purchase.py:143 mm/models/purchase_order.py:25
+#: mm/models/purchase_requisition.py:31
 msgid "giro"
 msgstr "giro"
 
-#: mm/models/purchase.py:145 mm/models/purchase_requisition.py:41
+#: mm/models/purchase.py:152 mm/models/purchase_requisition.py:49
 msgid "total taxed unit price"
 msgstr "precio unitario"
 
-#: mm/models/purchase.py:148 mm/models/purchase_order.py:56
-#: mm/models/purchase_requisition.py:44
+#: mm/models/purchase.py:155 mm/models/purchase_order.py:56
+#: mm/models/purchase_requisition.py:52
 msgid "total non taxed unit price"
 msgstr "precio unitario total no gravado"
 
-#: mm/models/purchase.py:151 mm/models/purchase_order.py:59
-#: mm/models/purchase_requisition.py:47
+#: mm/models/purchase.py:158 mm/models/purchase_order.py:59
+#: mm/models/purchase_requisition.py:55
 msgid "total taxes"
 msgstr "impuestos totales"
 
-#: mm/models/purchase.py:154 mm/models/purchase_order.py:62
-#: mm/models/purchase_requisition.py:50
+#: mm/models/purchase.py:165 mm/models/purchase_order.py:62
+#: mm/models/purchase_requisition.py:58
 msgid "rent taxes"
 msgstr "impuestos de renta"
 
-#: mm/models/purchase.py:157 mm/models/purchase.py:327
+#: mm/models/purchase.py:168
 #, fuzzy
 #| msgid "Discount"
 msgid "discounts"
 msgstr "Descuento"
 
-#: mm/models/purchase.py:165 mm/models/transaction.py:20
+#: mm/models/purchase.py:176 mm/models/transaction.py:21
 #, fuzzy
 #| msgid "Conversion"
 msgid "conversion rate"
 msgstr "Conversión"
 
-#: mm/models/purchase.py:186
+#: mm/models/purchase.py:198
 msgid "Can reverse Purchase"
 msgstr "Puede reversar Compra"
 
-#: mm/models/purchase.py:211
+#: mm/models/purchase.py:229
 #, fuzzy
 #| msgid "provider or purchase order is mandatory"
 msgid "provider or purchase order is mandatory when purchase it not petty cash"
 msgstr ""
 "proveedor u orden de compra es obligatorio cuando no es compra de caja chica"
 
-#: mm/models/purchase.py:213
+#: mm/models/purchase.py:232
 msgid "credit days are required for credit type purchase"
 msgstr "se requieren días  para la compra de tipo de crédito"
 
-#: mm/models/purchase.py:216
+#: mm/models/purchase.py:236
 msgid "document type has not mapping to MM transaction"
 msgstr ""
 
-#: mm/models/purchase.py:309 mm/models/purchase_requisition.py:106
-#: mm/models/transaction.py:10 sync/models.py:11
+#: mm/models/purchase.py:252
+msgid "purchase needs an accounting account"
+msgstr ""
+
+#: mm/models/purchase.py:415 mm/models/purchase.py:551
+#: mm/models/purchase_requisition.py:115 mm/models/transaction.py:10
+#: sync/models.py:11
 msgid "purchase"
 msgstr "compra"
 
-#: mm/models/purchase.py:324 mm/models/purchase_order.py:154
-#: mm/models/purchase_requisition.py:119
-msgid "due"
-msgstr "vencida"
-
-#: mm/models/purchase.py:330 mm/models/purchase_order.py:157
-#: mm/models/purchase_requisition.py:122
+#: mm/models/purchase.py:440 mm/models/purchase_order.py:158
+#: mm/models/purchase_requisition.py:131
 msgid "taxed unit price"
 msgstr "precio unitario gravado"
 
-#: mm/models/purchase.py:333 mm/models/purchase_order.py:160
-#: mm/models/purchase_requisition.py:125
+#: mm/models/purchase.py:443 mm/models/purchase_order.py:161
+#: mm/models/purchase_requisition.py:134
 msgid "non taxed unit price"
 msgstr "precio unitario no gravado"
 
-#: mm/models/purchase.py:345
+#: mm/models/purchase.py:450
+#, fuzzy
+#| msgid "unit price"
+msgid "net price"
+msgstr "precio unitario"
+
+#: mm/models/purchase.py:463
 msgid "Purchase Item"
 msgstr "Ítem de Compra"
 
-#: mm/models/purchase.py:346
+#: mm/models/purchase.py:464
 msgid "Purchase Items"
 msgstr "Ítems de Compras"
 
-#: mm/models/purchase.py:418
+#: mm/models/purchase.py:532
 msgid "inventory purchase must include product on item"
 msgstr ""
 
-#: mm/models/purchase.py:432 mm/models/purchase.py:440
+#: mm/models/purchase.py:570
+#, fuzzy
+#| msgid "Purchase Item"
+msgid "Purchase Tax"
+msgstr "Ítem de Compra"
+
+#: mm/models/purchase.py:571
+#, fuzzy
+#| msgid "Purchase Items"
+msgid "Purchase Taxes"
+msgstr "Ítems de Compras"
+
+#: mm/models/purchase.py:603 mm/models/purchase.py:611
 #, fuzzy
 #| msgid "purchase type"
 msgid "purchase item"
 msgstr "tipo de compra"
 
-#: mm/models/purchase.py:452
+#: mm/models/purchase.py:624
 #, fuzzy
 #| msgid "Purchase Item"
 msgid "Purchase Item Tax"
 msgstr "Ítem de Compra"
 
-#: mm/models/purchase.py:453
+#: mm/models/purchase.py:625
 #, fuzzy
 #| msgid "Purchase Items"
 msgid "Purchase Item Taxes"
 msgstr "Ítems de Compras"
 
-#: mm/models/purchase_order.py:14 mm/models/purchase_requisition.py:11
+#: mm/models/purchase_order.py:14 mm/models/purchase_requisition.py:10
 msgid "purchase id"
 msgstr "id de compra"
 
@@ -3026,32 +4788,29 @@ msgstr "fecha de aprobación"
 msgid "total taxed"
 msgstr "impuestos totales"
 
-#: mm/models/purchase_order.py:82
+#: mm/models/purchase_order.py:83
 msgid "Purchases Orders"
 msgstr "Ordenes de Compra"
 
-#: mm/models/purchase_order.py:167
+#: mm/models/purchase_order.py:169
 msgid "Purchase Order Item"
 msgstr "Artículo de Orden de Compra"
 
-#: mm/models/purchase_order.py:168
+#: mm/models/purchase_order.py:170
 msgid "Purchase Order Items"
 msgstr "Artículos de Orden de Compra"
 
-#: mm/models/purchase_requisition.py:66
+#: mm/models/purchase_requisition.py:75
 #: mm/templates/mm/purchaserequisition_detail.html:17
+#: mm/templates/mm/purchaserequisition_form.html:17
 msgid "Purchase Requisition"
 msgstr "Requisición de Compra"
 
-#: mm/models/purchase_requisition.py:84
-msgid "provider is mandatory"
-msgstr "el proveedor es obligatorio"
-
-#: mm/models/purchase_requisition.py:137
+#: mm/models/purchase_requisition.py:147
 msgid "Purchase Requisition Item"
 msgstr "Ítem de Requisición de Compra"
 
-#: mm/models/purchase_requisition.py:138
+#: mm/models/purchase_requisition.py:148
 msgid "Purchase Requisition Items"
 msgstr "Ítems de Requisición de Compra"
 
@@ -3069,15 +4828,15 @@ msgstr "abono"
 msgid "purchase reverse"
 msgstr "reversion de compra"
 
-#: mm/models/transaction.py:17
+#: mm/models/transaction.py:18
 msgid "related object model"
 msgstr "modelo objeto relacionado"
 
-#: mm/models/transaction.py:18
+#: mm/models/transaction.py:19
 msgid "related object id"
 msgstr "id de objeto relacionado"
 
-#: mm/models/transaction.py:19
+#: mm/models/transaction.py:20
 #, fuzzy
 #| msgid "Total Amount"
 msgid "original amount"
@@ -3087,43 +4846,46 @@ msgstr "Monto Total"
 msgid "Max Amount"
 msgstr "Monto Máximo"
 
-#: mm/templates/mm/provider_list.html:46
-msgid "Company Name"
-msgstr "Nombre de Empresa"
+#: mm/templates/mm/payment_list.html:47
+#, fuzzy
+#| msgid "Transaction"
+msgid "Bank Transaction"
+msgstr "Transacción"
+
+#: mm/templates/mm/paymenttype_form.html:38
+msgid "Choose only one of the following options:"
+msgstr ""
 
 #: mm/templates/mm/purchase_detail.html:33
+#: mm/templates/mm/purchase_form_items.html:33
 #: mm/templates/mm/purchaserequisition_detail.html:33
 msgid "Creada por:"
 msgstr "Creada por:"
 
-#: mm/templates/mm/purchase_detail.html:194
-msgid "Reverse"
-msgstr "Reversar"
+#: mm/templates/mm/purchase_detail.html:183
+msgid "Continue Editing"
+msgstr ""
 
-#: mm/templates/mm/purchase_form.html:19
+#: mm/templates/mm/purchase_form.html:18
+#: mm/templates/mm/purchase_form_bk.html:19
 msgid "Stock & Materials Purchase"
 msgstr "Stock & Materiales de Compra"
 
-#: mm/templates/mm/purchase_form.html:169
-#: mm/templates/mm/purchaseorder_list.html:60
-msgid "Total Non Taxed"
-msgstr "Impuestos Totales"
+#: mm/templates/mm/purchase_form.html:118
+#, fuzzy
+#| msgid "Contado"
+msgid "Continuar"
+msgstr "Contado"
 
-#: mm/templates/mm/purchase_form.html:193
-msgid "Total Taxed"
-msgstr "Total Impuestos"
+#: mm/templates/mm/purchase_form_items.html:240
+msgid "Registrar"
+msgstr ""
 
-#: mm/templates/mm/purchase_form.html:209
-#: mnf/templates/mnf/bundle_form.html:203
-#: mnf/templates/mnf/manufacturingorder_form.html:135
-msgid "Save"
-msgstr "Guardar"
-
-#: mm/templates/mm/purchase_list.html:47
+#: mm/templates/mm/purchase_list.html:75
 msgid "Document No"
 msgstr "Documento No"
 
-#: mm/templates/mm/purchase_list.html:48
+#: mm/templates/mm/purchase_list.html:76
 msgid "Reversed"
 msgstr "Reversada"
 
@@ -3172,38 +4934,18 @@ msgstr "Aprobado por"
 msgid "Total IVA"
 msgstr "Total IVA"
 
+#: mm/templates/mm/purchaseorder_list.html:60
+msgid "Total Non Taxed"
+msgstr "Impuestos Totales"
+
 #: mm/templates/mm/purchaseorder_list.html:61
 msgid "Rent Taxes"
 msgstr "Impuestos de Renta"
 
-#: mm/templates/mm/purchaserequisition_detail.html:159
+#: mm/templates/mm/purchaserequisition_detail.html:140
 msgid "View Purchase Order"
 msgstr "Ver Ítem de Compra"
 
-#: mm/viewsets.py:97
-#, fuzzy
-#| msgid "purchase order does not belongs to the user's tenant"
-msgid "purchase does not belongs to the user's tenant"
-msgstr "orden de compra no pertenece al usuario de la entidad"
-
-#: mm/viewsets.py:102
-msgid "purchase is already reversed"
-msgstr "compra ya está reversada"
-
-#: mm/viewsets.py:191
-msgid "purchase order does not belongs to the user's tenant"
-msgstr "orden de compra no pertenece al usuario de la entidad"
-
-#: mm/viewsets.py:196
-msgid "purchase order is already approved"
-msgstr "orden de compra ya está aprobada"
-
-#: mm/viewsets.py:201
-msgid ""
-"user's authorized approval amount is lower than purchase order's total amount"
-msgstr ""
-"monto de aprobación autorizado es menor que el monto total de orden de compra"
-
 #: mnf/apps.py:8
 msgid "Manufacturing Module"
 msgstr "Módulo de Manufactura"
@@ -3229,7 +4971,7 @@ msgstr "fecha finalizada"
 msgid "executed by"
 msgstr "ejecutado por"
 
-#: mnf/models/mo.py:60 mnf/models/mo.py:146 mnf/views/mo.py:18
+#: mnf/models/mo.py:60 mnf/models/mo.py:149 mnf/views/mo.py:18
 msgid "Manufacturing Order"
 msgstr "Orden de Manufactura"
 
@@ -3237,11 +4979,11 @@ msgstr "Orden de Manufactura"
 msgid "Can execute Manufacturing Order"
 msgstr "Puede ejecutar Orden de Manufactura"
 
-#: mnf/models/mo.py:126
+#: mnf/models/mo.py:129
 msgid "manufacturing order"
 msgstr "orden de manufactura"
 
-#: mnf/models/mo.py:162
+#: mnf/models/mo.py:165
 msgid "product and warehouse must belong to same tenant"
 msgstr "producto y almacén deben pertenecer a misma entidad"
 
@@ -3302,7 +5044,7 @@ msgstr "Codigo de Bodega"
 msgid "Warehouse Description"
 msgstr "Descripción de Bodega"
 
-#: mnf/utils.py:14
+#: mnf/utils.py:15
 msgid "product warehouse and user must belong to same tenant"
 msgstr "almacén de productos y usuario deben pertenecer a la misma entidad"
 
@@ -3313,165 +5055,253 @@ msgstr ""
 "no se puede generar proceso de manufactura porqué no hay suficiente "
 "materiales"
 
-#: pos/apps.py:8
-msgid "Point Of Sale"
-msgstr "Punto de Venta"
+#: offer/apps.py:8
+#, fuzzy
+#| msgid "Offers"
+msgid "Offers Module"
+msgstr "Ofertas"
 
-#: pos/models/fiscal_correlative.py:12
-msgid "exhausted"
-msgstr "agotado"
+#: offer/forms.py:57 offer/models/offer.py:32
+#, fuzzy
+#| msgid "product"
+msgid "products"
+msgstr "producto"
 
-#: pos/models/fiscal_correlative.py:21
-msgid "range start"
-msgstr "inicio de rango"
+#: offer/forms.py:62
+#, fuzzy
+#| msgid "Actions"
+msgid "options"
+msgstr "Acciones"
 
-#: pos/models/fiscal_correlative.py:22
-msgid "range end"
-msgstr "final de rango"
-
-#: pos/models/fiscal_correlative.py:23
-msgid "last used"
-msgstr "ultimo usado"
-
-#: pos/models/fiscal_correlative.py:24
-msgid "resolution date"
-msgstr "fecha de resolución"
-
-#: pos/models/fiscal_correlative.py:25
-msgid "resolution"
-msgstr "resolución"
-
-#: pos/models/fiscal_correlative.py:29
-msgid "fiscal document"
-msgstr "documento fiscal"
-
-#: pos/models/fiscal_correlative.py:52
-msgid "Fiscal Correlative"
-msgstr "Correlativo Fiscal"
-
-#: pos/models/fiscal_correlative.py:53
-msgid "Fiscal Correlatives"
-msgstr "Correlativos Fiscales"
-
-#: pos/models/fiscal_correlative.py:67
-msgid "tenant should be the same for correlative branch and user"
-msgstr ""
-"la entidad debe ser la misma para el correlativo la sucursal y el usuario"
-
-#: pos/models/fiscal_correlative.py:77
-#, python-format
-msgid "overlapping range for series %(series)s"
-msgstr "traslape en rangos %(series)s para la serie"
-
-#: pos/models/fiscal_document.py:17
-msgid "Fiscal Document"
-msgstr "Documento Fiscal"
-
-#: pos/models/fiscal_document.py:18
-msgid "Fiscal Documents"
-msgstr "Documentos Fiscales"
-
-#: pos/models/pos.py:36 pos/models/pos.py:37
+#: offer/forms.py:98 pos/models/pos.py:66 pos/models/pos.py:67
 msgid "Pos"
 msgstr "Pos"
 
-#: rcm/apps.py:7
-msgid "Restaurant Configuration Module"
-msgstr "Módulo de Configuración de Restaurante"
-
-#: rcm/models/attributes.py:22
+#: offer/models/attributes.py:22
 msgid "Attributes Group"
 msgstr "Grupo de Atributos"
 
-#: rcm/models/attributes.py:42 rcm/models/offer_options_group.py:46
+#: offer/models/attributes.py:42 offer/models/offer_options_group.py:46
 msgid "group"
 msgstr "grupo"
 
-#: rcm/models/attributes.py:53
+#: offer/models/attributes.py:53
 msgid "Attributes Group Item"
 msgstr "Elemento de Grupo de Atributos"
 
-#: rcm/models/attributes.py:54
+#: offer/models/attributes.py:54
 msgid "Attributes Group Items"
 msgstr "Elemento de Grupo de Atributos"
 
-#: rcm/models/offer.py:11
+#: offer/models/offer.py:16
+msgid "hour must be between 0 and 23"
+msgstr ""
+
+#: offer/models/offer.py:22
 msgid "from date"
 msgstr "desde la fecha"
 
-#: rcm/models/offer.py:12
+#: offer/models/offer.py:23
 msgid "to date"
 msgstr "hasta la fecha"
 
-#: rcm/models/offer.py:13
+#: offer/models/offer.py:25
 #, fuzzy
 msgid "from hour"
 msgstr "desde la hora"
 
-#: rcm/models/offer.py:14
+#: offer/models/offer.py:28
 #, fuzzy
 msgid "to hour"
 msgstr "hasta la hora"
 
-#: rcm/models/offer.py:15
-msgid "price"
-msgstr "precio"
-
-#: rcm/models/offer.py:19
+#: offer/models/offer.py:38
 msgid "options groups"
 msgstr "opciones de grupos"
 
-#: rcm/models/offer_options_group.py:11
+#: offer/models/offer.py:61
+msgid "description editable in pos"
+msgstr ""
+
+#: offer/models/offer.py:64
+msgid "unit price editable in pos"
+msgstr ""
+
+#: offer/models/offer.py:69
+#, fuzzy
+#| msgid "bank account"
+msgid "income account"
+msgstr "cuenta de banco"
+
+#: offer/models/offer.py:104
+msgid "date from must be lower or equal to date to"
+msgstr ""
+
+#: offer/models/offer.py:148
+#, fuzzy
+#| msgid "Offer"
+msgid "offer"
+msgstr "Oferta"
+
+#: offer/models/offer.py:168
+#, fuzzy
+#| msgid "Net Price"
+msgid "Offer Price"
+msgstr "Precio Neto"
+
+#: offer/models/offer.py:169
+msgid "Offers Price List"
+msgstr ""
+
+#: offer/models/offer.py:197 offer/models/offer.py:199
+#, fuzzy
+#| msgid "overlapping range for product"
+msgid "overlapping range for offer"
+msgstr "traslape en rangos para el producto"
+
+#: offer/models/offer_options_group.py:11
 msgid "max select"
 msgstr "selección máxima"
 
-#: rcm/models/offer_options_group.py:27
-#: rcm/templates/rcm/offeroptionsgroup_list.html:21
+#: offer/models/offer_options_group.py:27
+#: offer/templates/offer/offeroptionsgroup_list.html:21
 msgid "Offer Options Group"
 msgstr "Grupo de opciones para oferta"
 
-#: rcm/models/offer_options_group.py:28
+#: offer/models/offer_options_group.py:28
 msgid "Offer Options Groups"
 msgstr "Grupos de opciones para oferta"
 
-#: rcm/models/offer_options_group.py:56
+#: offer/models/offer_options_group.py:56
 msgid "price increment"
 msgstr "incremento de precio"
 
-#: rcm/models/offer_options_group.py:59
+#: offer/models/offer_options_group.py:59
 msgid "this price will increment to the offer price"
 msgstr "este precio se incrementará el precio de oferta"
 
-#: rcm/models/offer_options_group.py:65
+#: offer/models/offer_options_group.py:65
 msgid "attribute"
 msgstr "atributo"
 
-#: rcm/models/offer_options_group.py:77
+#: offer/models/offer_options_group.py:77
 msgid "Offer Group Item"
 msgstr "Elemento de Grupo de Oferta"
 
-#: rcm/models/offer_options_group.py:78
+#: offer/models/offer_options_group.py:78
 msgid "Offer Group Items"
 msgstr "Offer Group Items"
 
-#: rcm/templates/rcm/attributesgroup_list.html:36
-#: rcm/templates/rcm/offeroptionsgroup_list.html:37
+#: offer/templates/offer/attributesgroup_list.html:36
+#: offer/templates/offer/offeroptionsgroup_list.html:37
 msgid "Items"
 msgstr "Elementos"
 
-#: rcm/templates/rcm/offer_list.html:38
-msgid "Price"
+#: offer/templates/offer/offer_form.html:48
+#, fuzzy
+#| msgid "Price"
+msgid "Price List"
 msgstr "Precio"
 
-#: rcm/templates/rcm/offeroptionsgroup_list.html:36
+#: offer/templates/offer/offeroptionsgroup_list.html:36
 msgid "Max Select"
 msgstr "Selección Máxima"
 
-#: sicweb/settings/base.py:121
+#: pos/apps.py:8
+msgid "Point Of Sale"
+msgstr "Punto de Venta"
+
+#: pos/forms/fiscal_correlative.py:9 pos/models/fiscal_correlative.py:23
+msgid "resolution date"
+msgstr "fecha de resolución"
+
+#: pos/models/fiscal_correlative.py:11
+msgid "exhausted"
+msgstr "agotado"
+
+#: pos/models/fiscal_correlative.py:20
+msgid "range start"
+msgstr "inicio de rango"
+
+#: pos/models/fiscal_correlative.py:21
+msgid "range end"
+msgstr "final de rango"
+
+#: pos/models/fiscal_correlative.py:22
+msgid "last used"
+msgstr "ultimo usado"
+
+#: pos/models/fiscal_correlative.py:24
+msgid "resolution"
+msgstr "resolución"
+
+#: pos/models/fiscal_correlative.py:66
+msgid "Fiscal Correlatives"
+msgstr "Correlativos Fiscales"
+
+#: pos/models/fiscal_correlative.py:81
+msgid "tenant should be the same for correlative branch and user"
+msgstr ""
+"la entidad debe ser la misma para el correlativo la sucursal y el usuario"
+
+#: pos/models/fiscal_correlative.py:94
+#, python-format
+msgid "overlapping range for series %(series)s"
+msgstr "traslape en rangos %(series)s para la serie"
+
+#: pos/models/pos.py:9
+msgid "layout1"
+msgstr ""
+
+#: pos/models/pos.py:10
+msgid "layout2"
+msgstr ""
+
+#: pos/models/pos.py:37
+#, fuzzy
+#| msgid "fiscal document"
+msgid "default document"
+msgstr "documento fiscal"
+
+#: pos/models/pos.py:45
+#, fuzzy
+#| msgid "customer"
+msgid "default customer"
+msgstr "cliente"
+
+#: pos/models/pos.py:50
+msgid "use text input"
+msgstr ""
+
+#: pos/models/pos.py:53
+msgid "layout"
+msgstr ""
+
+#: pos/templates/pos/fiscalcorrelative_list.html:46
+msgid "Start"
+msgstr ""
+
+#: pos/templates/pos/fiscalcorrelative_list.html:47
+msgid "End"
+msgstr ""
+
+#: pos/templates/pos/fiscalcorrelative_list.html:48
+#, fuzzy
+#| msgid "last used"
+msgid "Last Used"
+msgstr "ultimo usado"
+
+#: pos/templates/pos/fiscalcorrelative_list.html:49
+#, fuzzy
+#| msgid "resolution"
+msgid "Resolution"
+msgstr "resolución"
+
+#: sicweb/settings/base.py:127
 msgid "English"
 msgstr "Ingles"
 
-#: sicweb/settings/base.py:122
+#: sicweb/settings/base.py:128
 msgid "Spanish"
 msgstr "Español"
 
@@ -3483,10 +5313,6 @@ msgstr "SIC Consola de Administración"
 msgid "validation error"
 msgstr "error en validacion"
 
-#: sync/drivers/errors.py:11
-msgid "product does not exists"
-msgstr "el producto no existe"
-
 #: sync/drivers/errors.py:17
 msgid "provider does not exists"
 msgstr "el proveedor no existe"
@@ -3594,11 +5420,6 @@ msgstr "codigo del proveedor"
 msgid "provider name"
 msgstr "nombre del proveedor"
 
-#: sync/models.py:77 sync/models.py:120
-#: sync/templates/sync/syncrecord_detail.html:22
-msgid "Record"
-msgstr "Registro"
-
 #: sync/models.py:82
 msgid "Can retry Record"
 msgstr "Puede reintentar Registro"
@@ -3644,10 +5465,6 @@ msgstr "Detalle del Error"
 msgid "Inventory Purchase"
 msgstr "Compra de Inventario"
 
-#: sync/templates/sync/syncrecord_detail.html:110
-msgid "Petty Cash"
-msgstr "Caja Chica"
-
 #: sync/templates/sync/syncrecord_detail.html:146
 msgid "Raw Data"
 msgstr "Datos Originales"
@@ -3691,7 +5508,9 @@ msgstr "Error del Sistema"
 msgid ""
 "There has been an error and didn't knew how to handle it, but don't worry "
 "error has been already reported"
-msgstr "Hubo un error y el sistema no pudo manejarlo, pero no te preocupes el error ya fue reportado"
+msgstr ""
+"Hubo un error y el sistema no pudo manejarlo, pero no te preocupes el error "
+"ya fue reportado"
 
 #: templates/admin/base_site.html:4
 msgid "Django site admin"
@@ -3701,26 +5520,86 @@ msgstr "Sitio Administrativo Django"
 msgid "Django administration"
 msgstr "Administracion Django"
 
+#~ msgid "daily"
+#~ msgstr "diario"
+
+#~ msgid "income"
+#~ msgstr "ingreso"
+
+#~ msgid "outcome"
+#~ msgstr "egreso"
+
+#~ msgid "sales"
+#~ msgstr "ventas"
+
+#~ msgid "user has no correlative available for this pos and document type"
+#~ msgstr "el usuario no tiene correlativo para este pos y tipo de documento"
+
+#, fuzzy
+#~| msgid "Purchase Item"
+#~ msgid "BMS Item Tax"
+#~ msgstr "Ítem de Compra"
+
+#, fuzzy
+#~| msgid "Purchase Items"
+#~ msgid "BMS Item Taxes"
+#~ msgstr "Ítems de Compras"
+
+#~ msgid "Restaurant"
+#~ msgstr "Restaurante"
+
+#~ msgid "unit measure"
+#~ msgstr "unidad de medida"
+
+#~ msgid "if no taxes provided, it will take the default taxes from the Tenant"
+#~ msgstr ""
+#~ "si no se proporcionan impuestos, tomará los impuestos predeterminados de "
+#~ "la entidad"
+
+#~ msgid "Unit Measure"
+#~ msgstr "Unidad de Medida"
+
+#~ msgid ""
+#~ "This value will be displayed when selecting payment type from available "
+#~ "payment types"
+#~ msgstr "Este valor se mostrara al seleccionar tipo de descuento disponible"
+
+#~ msgid "This value will be displayed in purchase payment description"
+#~ msgstr "Este valor se mostrara en la descripción del ítem de factura"
+
+#~ msgid "Factura Consumidor Final"
+#~ msgstr "Factura Consumidor Final"
+
+#~ msgid "Recibo"
+#~ msgstr "Recibo"
+
+#, fuzzy
+#~| msgid "Inventory Purchase"
+#~ msgid "Electronic Purchase"
+#~ msgstr "Compra de Inventario"
+
+#~ msgid "document type"
+#~ msgstr "tipo de documento"
+
+#~ msgid "provider is mandatory"
+#~ msgstr "el proveedor es obligatorio"
+
+#~ msgid "Total Taxed"
+#~ msgstr "Total Impuestos"
+
+#~ msgid "Restaurant Configuration Module"
+#~ msgstr "Módulo de Configuración de Restaurante"
+
+#~ msgid "price"
+#~ msgstr "precio"
+
 #, python-format
 #~ msgid "there is no available stock for product with given code %(code)s"
 #~ msgstr "no hay existencia disponible para el producto con codigo %(code)s"
 
-#, fuzzy
-#~| msgid "Conversion"
-#~ msgid "Conversion History"
-#~ msgstr "Conversión"
-
-#, fuzzy
-#~| msgid "Create"
-#~ msgid "Created"
-#~ msgstr "Crear"
-
 #~ msgid "Other"
 #~ msgstr "Otros"
 
-#~ msgid "IVA"
-#~ msgstr "IVA"
-
 #, fuzzy
 #~| msgid "Error Code"
 #~ msgid "External Code"
@@ -3735,15 +5614,9 @@ msgstr "Administracion Django"
 #~ msgid "type de pago"
 #~ msgstr "tipo de pago"
 
-#~ msgid "gran contribuyente"
-#~ msgstr "gran contribuyente"
-
 #~ msgid "Compras"
 #~ msgstr "Compras"
 
-#~ msgid "Requisiciones de Compra"
-#~ msgstr "Requisiciones de Compra"
-
 #~ msgid "Modulo Logistica"
 #~ msgstr "Módulo de Logística"
 
@@ -3768,20 +5641,12 @@ msgstr "Administracion Django"
 #~ msgid "Arbol de Cuentas"
 #~ msgstr "Árbol de Cuentas"
 
-#~ msgid "Cuentas"
-#~ msgstr "Cuentas"
-
 #~ msgid "Empleados"
 #~ msgstr "Empleados"
 
 #~ msgid "Cargos"
 #~ msgstr "Cargos"
 
-#, fuzzy
-#~| msgid "start range and end range must be provided"
-#~ msgid "start date and end date must be provided"
-#~ msgstr "inicio y final para el rango es obligatorio"
-
 #~ msgid "Bancos"
 #~ msgstr "Sucursales"