diff --git a/es/LC_MESSAGES/django.po b/es/LC_MESSAGES/django.po
index 429f044..cc62c3d 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-12-08 01:08+0000\n"
+"POT-Creation-Date: 2024-01-23 17:08+0000\n"
 "PO-Revision-Date: 2023-12-08 12:07-0600\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -48,14 +48,6 @@ msgstr "la cuenta %(code)s no existe"
 msgid "cost center %(code)s does not exists"
 msgstr "el centro de costos %(code)s no existe"
 
-#: acc/api/views/policy.py:188
-msgid "policy has not records"
-msgstr "la partida no tiene registros"
-
-#: acc/api/views/policy.py:190
-msgid "debits and credits are not equal"
-msgstr "cargos y abonos no son iguales"
-
 #: acc/apps.py:8
 msgid "Accounting Module"
 msgstr "Módulo de Contabilidad"
@@ -64,14 +56,14 @@ msgstr "Módulo de Contabilidad"
 msgid "Month"
 msgstr "Mes"
 
-#: acc/forms.py:49 acc/forms.py:113 acc/models/account.py:52
+#: acc/forms.py:49 acc/forms.py:113 acc/models/account.py:53
 #: 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_detail.html:59
 #: acc/templates/acc/policy_form.bk.html:93
-#: acc/templates/acc/policy_form_edit.html:125
+#: acc/templates/acc/policy_form_edit.html:118
 #: 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
@@ -81,18 +73,19 @@ msgid "Account"
 msgstr "Cuenta"
 
 #: acc/forms.py:51 acc/forms.py:136 acc/forms.py:152 banks/forms.py:59
-#: bms/forms.py:100 bms/views/sale/forms.py:96 lm/forms.py:243 mm/forms.py:216
+#: bms/forms.py:100 bms/views/sale/forms.py:96 lm/forms.py:263 mm/forms.py:216
 #: offer/templates/offer/offer_list.html:67 sync/forms.py:10
 msgid "From"
 msgstr "Desde"
 
 #: acc/forms.py:52 acc/forms.py:137 acc/forms.py:153 banks/forms.py:60
-#: bms/forms.py:101 bms/views/sale/forms.py:100 lm/forms.py:244 mm/forms.py:217
+#: bms/forms.py:101 bms/views/sale/forms.py:100 lm/forms.py:264 mm/forms.py:217
 #: offer/templates/offer/offer_list.html:68 sync/forms.py:11
 msgid "To"
 msgstr "Hasta"
 
-#: acc/forms.py:84 acc/models/period_account.py:13 acc/models/policy.py:72
+#: acc/forms.py:84 acc/models/period_account.py:13
+#: acc/models/period_cost_center.py:14 acc/models/policy.py:73
 msgid "period"
 msgstr "perÍodo"
 
@@ -104,37 +97,38 @@ msgstr "Nivel"
 msgid "Period"
 msgstr "Período"
 
-#: acc/forms.py:116 acc/models/cost_center.py:24
+#: acc/forms.py:116 acc/models/cost_center.py:32
 #: acc/templates/acc/policy_list_journal.html:78
 msgid "Cost Center"
 msgstr "Centro de Costo"
 
-#: acc/forms.py:149 acc/models/period_account.py:21 acc/models/policy.py:144
+#: acc/forms.py:149 acc/models/period_account.py:21
+#: acc/models/period_cost_center.py:20 acc/models/policy.py:177
 #: 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:162
 #: banks/models/wallet.py:17 banks/models/wallet.py:24
-#: bms/models/common.py:1069 bms/models/discount.py:24 bms/models/tax.py:21
+#: bms/models/common.py:1144 bms/models/discount.py:29 bms/models/tax.py:21
 #: core/models/tax.py:110 crm/models/customer.py:48 lm/models/category.py:22
-#: lm/models/product.py:61 lm/models/transaction.py:26
+#: lm/models/product.py:61 lm/models/transaction.py:27
 #: lm/models/warehouse.py:27 mm/forms.py:244 mm/models/payment.py:23
-#: mm/models/provider.py:46 mm/models/purchase.py:53 sync/models.py:53
+#: mm/models/provider.py:46 mm/models/purchase.py:58 sync/models.py:53
 msgid "account"
 msgstr "cuenta"
 
-#: acc/models/account.py:8 acc/models/policy.py:80 acc/models/policy.py:161
+#: acc/models/account.py:8 acc/models/policy.py:81 acc/models/policy.py:194
 #: banks/models/transaction.py:166
 msgid "credit"
 msgstr "abono"
 
-#: acc/models/account.py:9 acc/models/policy.py:77 acc/models/policy.py:158
+#: acc/models/account.py:9 acc/models/policy.py:78 acc/models/policy.py:191
 #: banks/models/transaction.py:165
 msgid "debit"
 msgstr "cargo"
 
 #: 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:52 mm/models/purchase.py:174
+#: mm/models/provider.py:52 mm/models/purchase.py:179
 msgid "balance"
 msgstr "saldo"
 
@@ -143,35 +137,37 @@ msgid "result"
 msgstr "resultado"
 
 #: acc/models/account.py:15 acc/models/cost_center.py:7 acc/models/policy.py:13
-#: acc/models/revenue.py:56 bms/models/common.py:1058 bms/models/discount.py:11
-#: bms/models/tax.py:8 core/models/branch.py:9
+#: acc/models/revenue.py:56 bms/models/common.py:1133 bms/models/discount.py:15
+#: bms/models/tax.py:8 bp/models/business_partner.py:11
+#: bp/models/business_partner.py:115 bp/models/sv_catalogs.py:5
+#: bp/models/sv_catalogs.py:43 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:204 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:16
-#: lm/models/transaction.py:18 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
+#: core/models/tax.py:88 core/models/tax.py:204 core/models/user.py:80
+#: crm/models/agent.py:7 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:29 lm/models/transaction.py:19
+#: lm/models/warehouse.py:9 mm/models/provider.py:12 offer/models/offer.py:20
+#: pos/models/pos.py:21 pos/models/pos.py:22
 msgid "code"
 msgstr "código"
 
 #: acc/models/account.py:16 acc/models/cost_center.py:8 acc/models/policy.py:18
 #: 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:205 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:19
-#: lm/models/transaction.py:68 lm/models/warehouse.py:10
-#: mm/models/provider.py:14 mm/models/purchase.py:144
+#: banks/models/wallet.py:18 bms/models/discount.py:16 bms/models/tax.py:9
+#: bp/models/business_partner.py:12 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:205
+#: 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:20 lm/models/transaction.py:69
+#: lm/models/warehouse.py:10 mm/models/provider.py:14 mm/models/purchase.py:149
 #: 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
+#: offer/models/offer_options_group.py:10 pos/models/pos.py:23
 #: sync/models.py:34
 msgid "name"
 msgstr "nombre"
@@ -181,21 +177,22 @@ msgid "affectation"
 msgstr "naturaleza"
 
 #: acc/models/account.py:23 acc/models/cost_center.py:13
-#: acc/models/period.py:23 acc/models/policy.py:22 acc/models/policy.py:85
-#: banks/models/bank.py:19 bms/models/common.py:52 bms/models/common.py:1077
-#: 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:15
+#: acc/models/period.py:23 acc/models/policy.py:22 acc/models/policy.py:86
+#: banks/models/bank.py:19 bms/models/common.py:53 bms/models/common.py:1152
+#: bms/models/discount.py:23 bms/models/tax.py:14
+#: bp/models/business_partner.py:61 core/models/branch.py:17
+#: core/models/business_partner.py:25 core/models/conf.py:16
 #: core/models/fiscal_document.py:39 core/models/tax.py:103
-#: core/models/tax.py:209 core/models/tenant_group.py:29
-#: crm/models/customer.py:42 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:69 lm/models/stock.py:42
-#: lm/models/transaction.py:34 lm/models/transaction.py:120
-#: lm/models/transaction.py:126 mm/models/approver.py:10
-#: mm/models/payment.py:47 mm/models/provider.py:39 mm/models/purchase.py:85
-#: mm/models/purchase_order.py:31 mm/models/purchase_requisition.py:37
-#: mm/models/transaction.py:49 mnf/models/mo.py:25
-#: offer/models/attributes.py:11 offer/models/offer.py:50
+#: core/models/tax.py:209 core/models/tenant_group.py:29 crm/models/agent.py:24
+#: crm/models/appointment.py:56 crm/models/customer.py:42 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:69
+#: lm/models/stock.py:46 lm/models/transaction.py:35
+#: lm/models/transaction.py:136 lm/models/transaction.py:142
+#: mm/models/approver.py:10 mm/models/payment.py:47 mm/models/provider.py:39
+#: mm/models/purchase.py:90 mm/models/purchase_order.py:31
+#: mm/models/purchase_requisition.py:37 mm/models/transaction.py:49
+#: mnf/models/mo.py:30 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"
@@ -221,26 +218,38 @@ msgstr "saldo o resultado"
 msgid "major boolean report"
 msgstr "reporte principal booleano"
 
+#: acc/models/account.py:45
+#, fuzzy
+#| msgid "cost center"
+msgid "requires cost center"
+msgstr "centro de costo"
+
 #. Translators: Cuentas
-#: acc/models/account.py:53 core/templates/core/base.html:568
+#: acc/models/account.py:54 core/templates/core/base.html:600
 #: core/templates/core/base2.html:499 core/templates/core/patch_base.html:201
 msgid "Accounts"
 msgstr "Cuentas"
 
-#: acc/models/account.py:78
+#: acc/models/account.py:79
 msgid "account type must be detail"
 msgstr "el tipo de cuenta debe ser detalle"
 
 #: 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:35
-#: offer/models/offer.py:60
+#: core/models/business_partner.py:21 core/models/tenant.py:33
+#: core/models/user.py:60 crm/models/agent.py:10 crm/models/customer.py:26
+#: hr/models/common.py:54 lm/models/product.py:31 lm/models/warehouse.py:11
+#: mm/models/provider.py:35 offer/models/offer.py:60
 msgid "active"
 msgstr "activo"
 
+#: acc/models/cost_center.py:20
+#, fuzzy
+#| msgid "cost center"
+msgid "parent cost center"
+msgstr "centro de costo"
+
 #. Translators: Centros de Costo
-#: acc/models/cost_center.py:25 core/templates/core/base.html:584
+#: acc/models/cost_center.py:33 core/templates/core/base.html:616
 #: core/templates/core/base2.html:523 core/templates/core/patch_base.html:207
 msgid "Cost Centers"
 msgstr "Centros de Costo"
@@ -253,9 +262,9 @@ msgstr "abierto"
 msgid "closed"
 msgstr "cerrado"
 
-#: acc/models/period.py:17 acc/models/policy.py:89 envoice/models.py:22
-#: lm/models/shipment.py:46 lm/models/stock.py:60 lm/models/supply_order.py:44
-#: mm/models/purchase.py:37 mnf/models/mo.py:61
+#: acc/models/period.py:17 acc/models/policy.py:90 crm/models/appointment.py:52
+#: envoice/models.py:22 lm/models/shipment.py:54 lm/models/stock.py:64
+#: lm/models/supply_order.py:45 mm/models/purchase.py:42 mnf/models/mo.py:66
 #: pos/models/fiscal_correlative.py:14 sync/models.py:37 sync/models.py:102
 msgid "status"
 msgstr "estado"
@@ -273,7 +282,7 @@ msgid "previous"
 msgstr "anterior"
 
 #. Translators: Periodos
-#: acc/models/period.py:46 core/templates/core/base.html:576
+#: acc/models/period.py:46 core/templates/core/base.html:608
 #: core/templates/core/base2.html:515
 msgid "Periods"
 msgstr "Períodos"
@@ -286,20 +295,20 @@ msgstr "día de fecha de inicio debe ser 1° de mes"
 msgid "overlapping date for period"
 msgstr "fecha superpuesta para el período"
 
-#: acc/models/period_account.py:26
+#: acc/models/period_account.py:26 acc/models/period_cost_center.py:29
 msgid "debits"
 msgstr "cargos"
 
-#: acc/models/period_account.py:27
+#: acc/models/period_account.py:27 acc/models/period_cost_center.py:30
 msgid "credits"
 msgstr "abonos"
 
-#: acc/models/period_account.py:29
+#: acc/models/period_account.py:29 acc/models/period_cost_center.py:32
 msgid "prev balance"
 msgstr "saldo anterior"
 
-#: acc/models/period_account.py:32 banks/models/transaction.py:53
-#: mm/models/transaction.py:23
+#: acc/models/period_account.py:32 acc/models/period_cost_center.py:35
+#: banks/models/transaction.py:53 mm/models/transaction.py:23
 msgid "post balance"
 msgstr "saldo posterior"
 
@@ -311,6 +320,23 @@ msgstr "Cuenta de Período"
 msgid "Period Accounts"
 msgstr "Cuentas de Períodos"
 
+#: acc/models/period_cost_center.py:26 acc/models/policy.py:183
+#: banks/models/wallet.py:32 core/models/branch.py:25 pos/models/pos.py:38
+msgid "cost center"
+msgstr "centro de costo"
+
+#: acc/models/period_cost_center.py:40
+#, fuzzy
+#| msgid "Cost Center"
+msgid "Period Cost Center"
+msgstr "Centro de Costo"
+
+#: acc/models/period_cost_center.py:41
+#, fuzzy
+#| msgid "Cost Centers"
+msgid "Period Cost Centers"
+msgstr "Centros de Costo"
+
 #: acc/models/pnl.py:10
 msgid "pnl config"
 msgstr "configuración de pnl"
@@ -343,7 +369,8 @@ msgstr "inicial"
 msgid "pending"
 msgstr "pendiente"
 
-#: acc/models/policy.py:44 mm/models/purchase.py:22 mnf/models/mo.py:15
+#: acc/models/policy.py:44 crm/models/appointment.py:13
+#: mm/models/purchase.py:27 mnf/models/mo.py:20
 msgid "in progress"
 msgstr "en progreso"
 
@@ -351,127 +378,150 @@ msgstr "en progreso"
 msgid "ok"
 msgstr "ok"
 
-#: acc/models/policy.py:46 envoice/models.py:9 mnf/models/mo.py:17
-#: mnf/models/mo.py:62 sync/models.py:16
+#: acc/models/policy.py:46 envoice/models.py:9 mnf/models/mo.py:22
+#: mnf/models/mo.py:67 sync/models.py:16
 msgid "error"
 msgstr "error"
 
-#: acc/models/policy.py:51 banks/models/transaction.py:47
-#: banks/models/wallet.py:13 mm/models/payment.py:96
+#: acc/models/policy.py:47 bms/models/common.py:35 mm/models/purchase.py:28
+msgid "reversed"
+msgstr "anulada"
+
+#: acc/models/policy.py:52 banks/models/transaction.py:47
+#: banks/models/wallet.py:13 bms/models/discount.py:17 mm/models/payment.py:96
 #: mm/models/transaction.py:16
 msgid "type"
 msgstr "tipo"
 
-#: acc/models/policy.py:54 acc/models/revenue.py:8 lm/models/shipment.py:17
-#: lm/models/stock.py:24 lm/models/transaction.py:61
-#: mm/models/transaction.py:15 mnf/models/mo.py:18
+#: acc/models/policy.py:55 acc/models/revenue.py:8 crm/models/contact_log.py:21
+#: lm/models/shipment.py:24 lm/models/stock.py:28 lm/models/transaction.py:62
+#: mm/models/transaction.py:15 mnf/models/mo.py:23 pos/models/shift.py:23
+#: pos/models/shift.py:24 pos/models/shift.py:25
 msgid "date created"
 msgstr "fecha de creación"
 
-#: acc/models/policy.py:55 acc/models/policy.py:155 lm/models/shipment.py:18
-#: lm/models/stock.py:25 mnf/models/mo.py:19
+#: acc/models/policy.py:56 acc/models/policy.py:188 lm/models/shipment.py:26
+#: lm/models/stock.py:29 mnf/models/mo.py:24
 msgid "date modified"
 msgstr "fecha de modificación"
 
-#: acc/models/policy.py:56 acc/models/revenue.py:9
+#: acc/models/policy.py:57 acc/models/revenue.py:9
 msgid "date record"
 msgstr "fecha de registro"
 
-#: acc/models/policy.py:60 acc/models/revenue.py:13
-#: banks/models/transaction.py:61 lm/models/shipment.py:26
-#: 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:33
+#: acc/models/policy.py:61 acc/models/revenue.py:13
+#: banks/models/transaction.py:61 lm/models/shipment.py:34
+#: lm/models/stock.py:34 lm/models/supply_order.py:31 mm/models/payment.py:107
+#: mm/models/purchase.py:96 mm/models/purchase_order.py:37
+#: mm/models/purchase_requisition.py:43 mnf/models/mo.py:38
 msgid "created by"
 msgstr "creado por"
 
-#: acc/models/policy.py:64 bms/forms.py:208 bms/views/sale/forms.py:94
-#: mm/models/purchase.py:132
+#: acc/models/policy.py:65 bms/forms.py:208 bms/views/sale/forms.py:94
+#: mm/models/purchase.py:137
 msgid "correlative"
 msgstr "correlativo"
 
-#: acc/models/policy.py:65
+#: acc/models/policy.py:66
 msgid "general memo"
 msgstr "concepto general"
 
-#: acc/models/policy.py:66
+#: acc/models/policy.py:67
 msgid "reference"
 msgstr "referencia"
 
-#: acc/models/policy.py:67
+#: acc/models/policy.py:68
 msgid "reference 2"
 msgstr "referencia 2"
 
-#: acc/models/policy.py:68
+#: acc/models/policy.py:69
 msgid "date reference"
 msgstr "fecha de referencia"
 
-#: acc/models/policy.py:105 acc/templates/acc/account_activity.html:53
+#: acc/models/policy.py:106 acc/templates/acc/account_activity.html:53
 #: acc/views/account.py:149
 msgid "Policy"
 msgstr "Partida Contable"
 
-#: acc/models/policy.py:106 core/templates/core/base.html:602
+#: acc/models/policy.py:107 core/templates/core/base.html:634
 #: core/templates/core/base2.html:535
 msgid "Policies"
 msgstr "Partidas Contables"
 
-#: acc/models/policy.py:138 banks/models/transaction.py:41
+#: acc/models/policy.py:131
+msgid "period is not open"
+msgstr ""
+
+#: acc/models/policy.py:145
+msgid "policy has not records"
+msgstr "la partida no tiene registros"
+
+#: acc/models/policy.py:147
+msgid "debits and credits are not equal"
+msgstr "cargos y abonos no son iguales"
+
+#: acc/models/policy.py:171 banks/models/transaction.py:41
+#: lm/models/shipment.py:82 mnf/models/mo.py:71
 msgid "policy"
 msgstr "partida contable"
 
-#: acc/models/policy.py:150 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:156 banks/models/petty_cash_transaction.py:14
+#: acc/models/policy.py:189 banks/models/petty_cash_transaction.py:14
 #: banks/models/transaction.py:50 banks/models/transaction.py:164
 #: mm/models/payment.py:94
 msgid "memo"
 msgstr "concepto"
 
-#: acc/models/policy.py:164 banks/models/petty_cash_transaction.py:13
+#: acc/models/policy.py:197 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:250 mm/models/provider.py:19
-#: mm/models/purchase.py:141 mm/models/purchase_order.py:24
+#: mm/models/purchase.py:146 mm/models/purchase_order.py:24
 #: mm/models/purchase_requisition.py:30
 msgid "document"
 msgstr "documento"
 
-#: acc/models/policy.py:166
+#: acc/models/policy.py:199
 msgid "flag for delete"
 msgstr "marca para eliminar"
 
-#: acc/models/policy.py:168 lm/models/transaction.py:63
+#: acc/models/policy.py:201 lm/models/transaction.py:64
 msgid "related object"
 msgstr "objeto relacionado"
 
-#: acc/models/policy.py:181
+#: acc/models/policy.py:214
 msgid "Policy Item"
 msgstr "Ítem de Partida Contable"
 
-#: acc/models/policy.py:182
+#: acc/models/policy.py:215
 msgid "Policy Items"
 msgstr "Ítems de Partida Contable"
 
-#: acc/models/revenue.py:20 bms/models/common.py:58
-#: lm/models/supply_order.py:17 lm/models/supply_order.py:23
+#: acc/models/policy.py:227
+#, fuzzy
+#| msgid "can not send a shipment that is not in created status"
+msgid "can not use an account that is not detail"
+msgstr "no se puede enviar un traslado que no está en estado creado"
+
+#: acc/models/policy.py:229
+msgid "Cost Center is required for this account"
+msgstr ""
+
+#: acc/models/revenue.py:20 bms/models/common.py:59
+#: lm/models/supply_order.py:18 lm/models/supply_order.py:24
 #: lm/models/warehouse.py:15 mm/models/purchase_requisition.py:24
-#: pos/models/pos.py:23
+#: pos/models/pos.py:32
 msgid "branch"
 msgstr "sucursal"
 
 #: acc/models/revenue.py:24 acc/models/revenue.py:25 acc/models/revenue.py:59
-#: mm/models/purchase.py:171 mm/models/purchase_order.py:65
+#: mm/models/purchase.py:176 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:592 core/templates/core/base.html:907
-#: core/templates/core/base2.html:531 core/templates/core/base2.html:747
+#: core/templates/core/base.html:624 core/templates/core/base2.html:531
+#: core/templates/core/base2.html:747
 msgid "Revenue"
 msgstr "Ingreso"
 
@@ -500,6 +550,7 @@ msgstr "Ingreso de Ítems"
 #: 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/sale_form3_items.html:377
 #: 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
@@ -513,13 +564,14 @@ msgstr "Fecha de Partida Contable"
 
 #: 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_detail.html:60
 #: acc/templates/acc/policy_form.bk.html:94
-#: acc/templates/acc/policy_form_edit.html:126
+#: acc/templates/acc/policy_form_edit.html:119
 #: 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
+#: acc/templates/acc/policy_list_journal.html:77
+#: acc/templates/acc/policy_pending_list.html:51 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
@@ -527,33 +579,35 @@ msgid "Memo"
 msgstr "Concepto"
 
 #: acc/templates/acc/account_activity.html:56
-#: acc/templates/acc/policy_detail.html:65
+#: acc/templates/acc/policy_detail.html:62
 #: 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_edit.html:107
+#: acc/templates/acc/policy_form_edit.html:121
 #: 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
+#: acc/templates/acc/policy_list_journal.html:79
+#: acc/templates/acc/policy_pending_list.html:52 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_detail.html:63
 #: 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_edit.html:108
+#: acc/templates/acc/policy_form_edit.html:122
 #: 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:39
+#: acc/templates/acc/policy_list_journal.html:80
+#: acc/templates/acc/policy_pending_list.html:53 acc/views/account.py:153
+#: bms/models/common.py:40
 msgid "Credit"
 msgstr "Abono"
 
@@ -564,8 +618,7 @@ msgstr "Abono"
 #: 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 lm/templates/lm/stock_due.html:78
+#: crm/templates/crm/cxc_list.html:57 lm/templates/lm/stock_due.html:79
 #: mm/templates/mm/provider/provider_list.html:49
 #: mm/templates/mm/purchase_list.html:80
 msgid "Balance"
@@ -582,21 +635,22 @@ msgstr "Saldo"
 #: 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:264
-#: core/generic_views.py:270 core/templates/core/branch_list.html:35
+#: bms/templates/bms/tax_list.html:35 core/generic_views.py:266
+#: core/generic_views.py:272 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/taxprofile_list.html:35
-#: core/templates/core/user_list.html:35
+#: core/templates/core/user_list.html:35 crm/templates/crm/agent_list.html:35
+#: crm/templates/crm/contactlog_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:78
 #: lm/templates/lm/shipment_list.html:35
-#: lm/templates/lm/stock_adjust_form.html:72
+#: lm/templates/lm/stock_adjust_form.html:79
 #: lm/templates/lm/supplyorder_form.html:66
-#: lm/templates/lm/supplyorder_list.html:35
+#: lm/templates/lm/supplyorder_list.html:40
 #: 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
@@ -609,13 +663,14 @@ msgstr "Saldo"
 #: 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
+#: pos/templates/pos/pos_list.html:35 pos/templates/pos/shift_list.html:35
 msgid "Create"
 msgstr "Crear"
 
 #: acc/templates/acc/account_list.html:43
 #: acc/templates/acc/costcenter_list.html:43
 #: acc/templates/acc/period_list.html:43 acc/templates/acc/policy_list.html:43
+#: acc/templates/acc/policy_pending_list.html:45
 #: banks/templates/banks/bank_list.html:43
 #: banks/templates/banks/pettycash_list.html:43
 #: banks/templates/banks/posterminal_list.html:43
@@ -628,13 +683,14 @@ msgstr "Crear"
 #: core/templates/core/fiscaldocument_list.html:43
 #: core/templates/core/group_list.html:43 core/templates/core/tax_list.html:43
 #: core/templates/core/taxprofile_list.html:43
-#: core/templates/core/user_list.html:43
+#: core/templates/core/user_list.html:43 crm/templates/crm/agent_list.html:43
+#: crm/templates/crm/contactlog_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/supplyorder_list.html:48
 #: 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
@@ -650,25 +706,28 @@ msgstr "Crear"
 #: 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
+#: pos/templates/pos/pos_list.html:43 pos/templates/pos/shift_list.html:43
 #: 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/models/common.py:603
-#: bms/models/common.py:748 bms/templates/bms/discount_list.html:44
+#: acc/templates/acc/costcenter_list.html:44 bms/models/common.py:677
+#: bms/models/common.py:788 bms/templates/bms/discount_list.html:44
 #: bms/templates/bms/paymenttype_list.html:44
+#: bms/templates/bms/sale_form3_items.html:1227
+#: bms/templates/bms/sale_form3_items.html:1242
+#: bms/templates/bms/sale_form3_items.html:1259
 #: bms/templates/bms/tax_list.html:44 core/templates/core/branch_list.html:47
 #: core/templates/core/fiscaldocument_list.html:44
 #: core/templates/core/tax_list.html:44
 #: core/templates/core/taxprofile_list.html:44
-#: crm/templates/crm/customer_list.html:44
+#: crm/templates/crm/agent_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_detail.html:88
-#: lm/templates/lm/stock_by_product.html:55
-#: lm/templates/lm/stock_by_warehouse.html:59 lm/templates/lm/stock_due.html:65
+#: lm/templates/lm/stock_by_product.html:66
+#: lm/templates/lm/stock_by_warehouse.html:59 lm/templates/lm/stock_due.html:66
 #: 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/provider_list.html:44
@@ -702,7 +761,7 @@ msgid "Name"
 msgstr "Nombre"
 
 #. Translators: Catalogo de Cuentas
-#: acc/templates/acc/account_tree.html:68 core/templates/core/base.html:560
+#: acc/templates/acc/account_tree.html:68 core/templates/core/base.html:592
 #: core/templates/core/base2.html:491
 msgid "Accounts Catalog"
 msgstr "Catalogo de Cuentas"
@@ -726,7 +785,8 @@ msgstr "Movimientos"
 
 #: 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
+#: acc/templates/acc/policy_list_journal.html:74
+#: acc/templates/acc/policy_pending_list.html:50 bms/forms.py:135
 #: bms/views/sale/forms.py:30 mm/forms.py:99 mm/forms.py:253
 msgid "Correlative"
 msgstr "Correlativo"
@@ -736,7 +796,7 @@ msgstr "Correlativo"
 #: 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/supplyorder_list.html:50
 #: lm/templates/lm/transaction_list.html:85
 #: mm/templates/mm/payment_list.html:44
 msgid "Date"
@@ -744,9 +804,9 @@ 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_detail.html:92
 #: acc/templates/acc/policy_form.bk.html:128
-#: acc/templates/acc/policy_form_edit.html:176
+#: acc/templates/acc/policy_form_edit.html:174
 #: 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
@@ -757,9 +817,9 @@ 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_detail.html:86
 #: acc/templates/acc/policy_form.bk.html:122
-#: acc/templates/acc/policy_form_edit.html:170
+#: acc/templates/acc/policy_form_edit.html:168
 #: 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
@@ -871,9 +931,10 @@ msgid "Income Before Taxes"
 msgstr "Ingresos Antes de Impuestos"
 
 #. Translators: Impuestos
-#: acc/templates/acc/p_n_l_statement.html:71 bms/models/common.py:766
+#: acc/templates/acc/p_n_l_statement.html:71 bms/models/common.py:806
 #: bms/models/tax.py:34 core/models/tax.py:151
-#: core/templates/core/base.html:260 core/templates/core/base2.html:237
+#: core/templates/core/base.html:270 core/templates/core/base2.html:237
+#: pos/templates/pos/shift_detail_pill_overview.html:102
 msgid "Taxes"
 msgstr "Impuestos"
 
@@ -886,12 +947,13 @@ msgid "EBITDA, Reported"
 msgstr "EBITDA, Reportado"
 
 #: acc/templates/acc/period_list.html:45 acc/templates/acc/policy_list.html:45
-#: bms/models/common.py:100 bms/templates/bms/invoice_detail.html:51
+#: acc/templates/acc/policy_pending_list.html:48 bms/models/common.py:109
+#: 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/stock_due.html:72
-#: lm/templates/lm/supplyorder_list.html:46
+#: lm/templates/lm/stock_by_warehouse.html:66 lm/templates/lm/stock_due.html:73
+#: lm/templates/lm/supplyorder_list.html:52
 #: mm/templates/mm/purchase_list.html:73
 #: mnf/templates/mnf/manufacturingorder_detail.html:45
 #: mnf/templates/mnf/manufacturingorder_form.html:101
@@ -906,64 +968,69 @@ msgstr "Estado"
 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
-msgid "Modify"
-msgstr "Modificar"
-
-#: acc/templates/acc/policy_detail.html:25
-#: acc/templates/acc/policy_form_edit.html:28
+#: acc/templates/acc/policy_detail.html:22
+#: acc/templates/acc/policy_form_edit.html:25
 #: 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/policy_detail.html:28
+#: acc/templates/acc/policy_form_edit.html:31
 #: 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
+#: acc/templates/acc/policy_detail.html:36
+#: acc/templates/acc/policy_form_edit.html:39
 msgid "Type:"
 msgstr "Tipo:"
 
-#: acc/templates/acc/policy_detail.html:45
-#: acc/templates/acc/policy_form_edit.html:48
+#: acc/templates/acc/policy_detail.html:42
+#: acc/templates/acc/policy_form_edit.html:45
 msgid "Period:"
 msgstr "Período:"
 
-#: acc/templates/acc/policy_detail.html:53
-#: acc/templates/acc/policy_form_edit.html:56
+#: acc/templates/acc/policy_detail.html:50
+#: acc/templates/acc/policy_form_edit.html:53
 msgid "General Memo:"
 msgstr "Concepto General:"
 
-#: acc/templates/acc/policy_detail.html:64
+#: acc/templates/acc/policy_detail.html:61
 #: acc/templates/acc/policy_form.bk.html:95
-#: acc/templates/acc/policy_form_edit.html:127
+#: acc/templates/acc/policy_form_edit.html:120
 #: 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:101
+#: acc/templates/acc/policy_detail.html:98
 #: acc/templates/acc/policy_form.bk.html:134
-#: acc/templates/acc/policy_form_edit.html:182
+#: acc/templates/acc/policy_form_edit.html:180
 #: acc/templates/acc/policy_form_purchase.html:149
 #: acc/templates/acc/policy_form_sale.html:136
-#: lm/views/supply_order_consolidation.py:91
+#: lm/views/supply_order_consolidation.py:119
 msgid "Difference"
 msgstr "Diferencia"
 
-#: acc/templates/acc/policy_detail.html:112
+#: acc/templates/acc/policy_detail.html:109
 msgid "Descargar"
 msgstr ""
 
-#: acc/templates/acc/policy_detail.html:115
-msgid "Softland"
-msgstr "Softland"
+#: acc/templates/acc/policy_detail.html:110
+#: acc/templates/acc/policy_detail.html:113
+#: banks/templates/banks/transaction_detail.html:129
+#: bms/templates/bms/invoice_detail.html:164
+#: mm/templates/mm/purchase_detail.html:186
+#: mm/templates/mm/purchase_form_items.html:277
+msgid "Reverse"
+msgstr "Anular"
+
+#: acc/templates/acc/policy_detail.html:112
+#: banks/templates/banks/pettycash_detail.html:15
+msgid "Modify"
+msgstr "Modificar"
 
 #: acc/templates/acc/policy_form.bk.html:17
 #: acc/templates/acc/policy_form.html:17
@@ -975,17 +1042,18 @@ 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
+#: acc/templates/acc/policy_form_edit.html:110 crm/models/appointment.py:25
+#: crm/models/appointment.py:29
 msgid "Cancel"
 msgstr "Cancelar"
 
 #: acc/templates/acc/policy_form.bk.html:72
-#: acc/templates/acc/policy_form_edit.html:104
+#: acc/templates/acc/policy_form_edit.html:101
 #: 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:1140
+#: banks/templates/banks/transaction_list.html:51 bms/models/common.py:1216
 #: bms/templates/bms/discount_list.html:47
 #: bms/templates/bms/invoice_detail.html:111
 #: bms/templates/bms/sale_form1_items.html:187
@@ -996,25 +1064,39 @@ msgstr "Cancelar"
 msgid "Amount"
 msgstr "Monto"
 
-#: acc/templates/acc/policy_form_edit.html:64
+#: acc/templates/acc/policy_form_edit.html:61
 msgid "Reference:"
 msgstr "Referencia:"
 
-#: acc/templates/acc/policy_form_edit.html:70
+#: acc/templates/acc/policy_form_edit.html:67
 msgid "Reference 2:"
 msgstr "Referencia 2:"
 
-#: acc/templates/acc/policy_form_edit.html:76
+#: acc/templates/acc/policy_form_edit.html:73
 msgid "Reference Date:"
 msgstr "Fecha de Referencia:"
 
+#: acc/templates/acc/policy_form_edit.html:109
+#, fuzzy
+#| msgid "date"
+msgid "Update"
+msgstr "fecha"
+
+#: acc/templates/acc/policy_form_edit.html:191
+#, fuzzy
+#| msgid "from date"
+msgid "Exit from Edit"
+msgstr "desde la fecha"
+
 #: acc/templates/acc/policy_list.html:44
 #: acc/templates/acc/policy_list_journal.html:72
+#: acc/templates/acc/policy_pending_list.html:47
 msgid "Date Record"
 msgstr "Fecha de Registro"
 
 #: acc/templates/acc/policy_list.html:46
 #: acc/templates/acc/policy_list_journal.html:73
+#: acc/templates/acc/policy_pending_list.html:49
 #: banks/templates/banks/transaction_detail.html:43
 #: banks/templates/banks/transaction_list.html:46
 #: banks/templates/banks/wallet_list.html:44
@@ -1025,7 +1107,7 @@ msgstr "Tipo"
 
 #. Translators: Libro Diario
 #: acc/templates/acc/policy_list_journal.html:31
-#: core/templates/core/base.html:670 core/templates/core/base2.html:582
+#: core/templates/core/base.html:710 core/templates/core/base2.html:582
 msgid "Journal Book"
 msgstr "Libro Diario"
 
@@ -1033,6 +1115,23 @@ msgstr "Libro Diario"
 msgid "Account Name"
 msgstr "Nombre de la Cuenta"
 
+#: acc/templates/acc/policy_pending_list.html:36
+msgid "Select Visible"
+msgstr ""
+
+#: acc/templates/acc/policy_pending_list.html:37
+#, fuzzy
+#| msgid "registrate"
+msgid "Registrate Selected"
+msgstr "registrar"
+
+#: acc/templates/acc/policy_pending_list.html:46
+#: lm/templates/lm/supplyorder_list.html:49
+#, fuzzy
+#| msgid "check"
+msgid "Check"
+msgstr "cheque"
+
 #: acc/templates/acc/revenue_list.html:34
 #: lm/templates/lm/supplyorder_detail.html:40
 msgid "Branch:"
@@ -1102,8 +1201,8 @@ msgstr "Libro de Consumidor Final"
 #: 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:145 offer/forms.py:93
+#: core/models/branch.py:53 crm/templates/crm/cxc_list.html:54
+#: lm/templates/lm/supplyorder_list.html:51 mm/forms.py:145 offer/forms.py:94
 msgid "Branch"
 msgstr "Sucursal"
 
@@ -1123,54 +1222,54 @@ msgstr ""
 msgid "Journal Ledger Balance"
 msgstr "Saldo del Libro Diario Mayor"
 
-#: acc/views/policy.py:188
+#: acc/views/policy.py:195
 msgid "Asiento"
 msgstr ""
 
-#: acc/views/policy.py:189
+#: acc/views/policy.py:196
 msgid "Consecutivo"
 msgstr ""
 
-#: acc/views/policy.py:190
+#: acc/views/policy.py:197
 msgid "Centro de Costo"
 msgstr ""
 
-#: acc/views/policy.py:191
+#: acc/views/policy.py:198
 msgid "Cuenta Contable"
 msgstr ""
 
-#: acc/views/policy.py:192
+#: acc/views/policy.py:199
 msgid "Cta Descrip"
 msgstr ""
 
-#: acc/views/policy.py:193
+#: acc/views/policy.py:200
 msgid "Fuente"
 msgstr ""
 
-#: acc/views/policy.py:194
+#: acc/views/policy.py:201
 msgid "Referencia"
 msgstr ""
 
-#: acc/views/policy.py:195
+#: acc/views/policy.py:202
 msgid "Debito Local"
 msgstr ""
 
-#: acc/views/policy.py:196
+#: acc/views/policy.py:203
 msgid "Credito Local"
 msgstr ""
 
-#: acc/views/policy.py:197
+#: acc/views/policy.py:204
 msgid "NIT"
 msgstr "NIT"
 
 #. Translators: Partidas Contables
 #: acc/views/taxpayer_sales.py:16 acc/views/trial_balance.py:14
-#: core/templates/core/base.html:652 core/templates/core/base2.html:564
-#: crm/views.py:46
+#: core/templates/core/base.html:692 core/templates/core/base2.html:564
+#: crm/views/customer.py:46
 msgid "Trial Balance"
 msgstr "Balance de Comprobacion"
 
-#: banks/api/views/transaction.py:56 bms/api/views/__init__.py:103
+#: banks/api/views/transaction.py:56 bms/api/views/__init__.py:107
 msgid "invoice does not belongs to the user's tenant"
 msgstr "la factura no pertenece a la compañía del usuario"
 
@@ -1194,11 +1293,13 @@ msgstr "Costa Rica"
 msgid "Colombia"
 msgstr "Colombia"
 
-#: banks/models/bank.py:14 core/models/tenant.py:15
+#: banks/models/bank.py:14 bp/models/business_partner.py:13
+#: core/models/tenant.py:15
 msgid "legal name"
 msgstr "nombre legal"
 
-#: banks/models/bank.py:15 core/models/tenant.py:41
+#: banks/models/bank.py:15 bp/models/business_partner.py:28
+#: core/models/tenant.py:38
 msgid "country"
 msgstr "país"
 
@@ -1212,7 +1313,7 @@ msgid "Bank"
 msgstr "Banco"
 
 #. Translators: Bancos
-#: banks/models/bank.py:32 core/templates/core/base.html:717
+#: banks/models/bank.py:32 core/templates/core/base.html:757
 #: core/templates/core/base2.html:617 core/templates/core/patch_base.html:219
 msgid "Banks"
 msgstr "Bancos"
@@ -1222,17 +1323,17 @@ msgid "responsible"
 msgstr "responsable"
 
 #: banks/models/petty_cash.py:9 banks/models/petty_cash_transaction.py:15
-#: banks/models/transaction.py:51 bms/models/common.py:696
-#: bms/models/common.py:983 bms/models/common.py:1033 bms/models/discount.py:14
-#: bms/models/tax.py:10 core/models/tax.py:21 core/models/tax.py:92
-#: mm/models/purchase.py:629 mm/models/purchase.py:693
+#: banks/models/transaction.py:51 bms/models/common.py:609
+#: bms/models/common.py:1058 bms/models/common.py:1108
+#: bms/models/discount.py:19 bms/models/tax.py:10 core/models/tax.py:21
+#: core/models/tax.py:92 mm/models/purchase.py:740 mm/models/purchase.py:804
 #: 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:709 core/templates/core/base2.html:609
+#: core/templates/core/base.html:749 core/templates/core/base2.html:609
 #: sync/templates/sync/syncrecord_detail.html:110
 msgid "Petty Cash"
 msgstr "Caja Chica"
@@ -1271,9 +1372,9 @@ msgstr "cheque"
 msgid "transfer"
 msgstr "transferencia"
 
-#: banks/models/transaction.py:26 mm/forms.py:255 mm/models/purchase.py:45
-#: mm/models/purchase_order.py:19 mm/models/purchase_requisition.py:15
-#: mm/models/transaction.py:33
+#: banks/models/transaction.py:26 bp/models/business_partner.py:56
+#: mm/forms.py:255 mm/models/purchase.py:50 mm/models/purchase_order.py:19
+#: mm/models/purchase_requisition.py:15 mm/models/transaction.py:33
 msgid "provider"
 msgstr "proveedor"
 
@@ -1305,17 +1406,17 @@ msgstr "referencia de transferencia"
 msgid "date reversed"
 msgstr "fecha de anulación"
 
-#: banks/models/transaction.py:68 bms/models/common.py:175
-#: mm/models/purchase.py:107
+#: banks/models/transaction.py:68 bms/models/common.py:184
+#: mm/models/purchase.py:112
 msgid "reversed by"
 msgstr "anulada por"
 
-#: banks/models/transaction.py:83 lm/models/transaction.py:133
+#: banks/models/transaction.py:83 lm/models/transaction.py:149
 #: mm/models/transaction.py:61
 msgid "Transaction"
 msgstr "Transacción"
 
-#: banks/models/transaction.py:84 lm/models/transaction.py:134
+#: banks/models/transaction.py:84 lm/models/transaction.py:150
 #: mm/models/transaction.py:62
 msgid "Transactions"
 msgstr "Transacciones"
@@ -1354,7 +1455,7 @@ msgstr "cuenta corriente"
 msgid "savings"
 msgstr "cuenta de ahorro"
 
-#: banks/models/wallet.py:15 mm/models/purchase.py:77
+#: banks/models/wallet.py:15 mm/models/purchase.py:82
 #: mm/models/transaction.py:41
 msgid "currency"
 msgstr "divisa"
@@ -1381,7 +1482,7 @@ msgid "Wallet"
 msgstr "Cuenta Bancaria"
 
 #. Translators: Cuentas Bancarias
-#: banks/models/wallet.py:58 core/templates/core/base.html:725
+#: banks/models/wallet.py:58 core/templates/core/base.html:765
 #: core/templates/core/base2.html:625 core/templates/core/patch_base.html:225
 msgid "Wallets"
 msgstr "Cuentas Bancarias"
@@ -1390,7 +1491,8 @@ msgstr "Cuentas Bancarias"
 msgid "Legal Name"
 msgstr "Nombre Legal"
 
-#: banks/templates/banks/bank_list.html:46 core/models/country.py:20
+#: banks/templates/banks/bank_list.html:46 bp/models/sv_catalogs.py:64
+#: core/models/country.py:20
 msgid "Country"
 msgstr "País"
 
@@ -1452,18 +1554,11 @@ msgstr ""
 msgid "Transaction Amount"
 msgstr "Monto de Transacción"
 
-#: banks/templates/banks/transaction_detail.html:129
-#: bms/templates/bms/invoice_detail.html:164
-#: mm/templates/mm/purchase_detail.html:186
-#: mm/templates/mm/purchase_form_items.html:277
-msgid "Reverse"
-msgstr "Anular"
-
 #: banks/templates/banks/transaction_form.html:42
 msgid "Next Document"
 msgstr "Siguiente Documento"
 
-#: banks/templates/banks/transaction_list.html:47 bms/models/common.py:1145
+#: banks/templates/banks/transaction_list.html:47 bms/models/common.py:1221
 msgid "Reference"
 msgstr "Referencia"
 
@@ -1499,7 +1594,7 @@ msgstr "reprocesar factura"
 msgid "offer for given code %(code)s does not exists"
 msgstr "la oferta para el código proporcionado %(code)s no existe"
 
-#: bms/api/serializers/sale.py:197 bms/forms.py:51 bms/models/common.py:1163
+#: bms/api/serializers/sale.py:199 bms/forms.py:51 bms/models/common.py:1239
 #, python-format
 msgid "payment amount %(amount)s is greater than invoice balance %(balance)s"
 msgstr ""
@@ -1537,10 +1632,32 @@ msgstr "la sucursal para el código proporcionado %(code)s no existe"
 msgid "pos for given code %(code)s does not exists"
 msgstr "el punto de venta para el código proporcionado %(code)s no existe"
 
-#: bms/api/views/__init__.py:108 mm/api/views.py:169
+#: bms/api/views/__init__.py:112 mm/api/views.py:174
 msgid "purchase is already reversed"
 msgstr "la compra ya está anulada"
 
+#: bms/api/views/__init__.py:154
+msgid "pos is configured to use shift but there is no open shift for pos"
+msgstr ""
+
+#: bms/api/views/__init__.py:157
+#, fuzzy
+#| msgid "user does not belongs to requested branch"
+msgid "user does not belongs to current open shift for this pos"
+msgstr "el usuario no pertenece a la sucursal solicitada"
+
+#: bms/api/views/__init__.py:295
+#, fuzzy
+#| msgid "item does not exists"
+msgid "invoice item does not exists"
+msgstr "ítem no existe"
+
+#: bms/api/views/__init__.py:302
+#, fuzzy
+#| msgid "account %(code)s does not exists"
+msgid "discount model does not exists"
+msgstr "la cuenta %(code)s no existe"
+
 #: bms/apps.py:8
 msgid "Billing Management System"
 msgstr "Sistema de Administración de Facturación"
@@ -1550,7 +1667,7 @@ msgstr "Sistema de Administración de Facturación"
 msgid "invoice status %(status)s is not valid"
 msgstr "el estado de la factura %(status)s no es valido"
 
-#: bms/forms.py:82 bms/models/common.py:299
+#: bms/forms.py:82 bms/models/common.py:308
 msgid "can not add more than one discount of percentage type"
 msgstr "no se puede agregar mas de un descuento de tipo porcentaje"
 
@@ -1559,6 +1676,7 @@ msgid "Date for Record"
 msgstr "Fecha de Registro"
 
 #: bms/forms.py:129 bms/views/sale/forms.py:21 crm/models/customer.py:74
+#: crm/templates/crm/contactlog_list.html:44
 msgid "Customer"
 msgstr "Cliente"
 
@@ -1568,7 +1686,7 @@ 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 lm/templates/lm/stock_due.html:71
+#: lm/templates/lm/stock_by_warehouse.html:65 lm/templates/lm/stock_due.html:72
 #: mm/forms.py:98 mm/forms.py:252 mm/templates/mm/purchase_list.html:76
 #: pos/templates/pos/fiscalcorrelative_list.html:45
 msgid "Series"
@@ -1582,12 +1700,12 @@ msgstr "Tipo de Compra"
 msgid "Credit Days"
 msgstr "Días de Crédito"
 
-#: bms/forms.py:140 bms/models/common.py:106 bms/views/sale/forms.py:36
+#: bms/forms.py:140 bms/models/common.py:115 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:105 mm/forms.py:150
-#: mm/forms.py:188
+#: bms/forms.py:141 bms/views/sale/forms.py:37 bp/models/sv_catalogs.py:31
+#: mm/forms.py:105 mm/forms.py:150 mm/forms.py:188
 msgid "Business Activity"
 msgstr "Actividad del Negocio"
 
@@ -1600,17 +1718,18 @@ msgid "Customer Address"
 msgstr "Dirección del Cliente"
 
 #: bms/forms.py:145 bms/views/sale/forms.py:60 lm/models/offer.py:25
-#: offer/models/offer.py:91
+#: offer/models/offer.py:100
 msgid "Offer"
 msgstr "Oferta"
 
-#: bms/forms.py:147 bms/models/common.py:754 bms/models/common.py:948
-#: bms/templates/bms/invoice_detail.html:81 bms/views/sale/forms.py:62
-#: lm/forms.py:27 lm/forms.py:184 lm/forms.py:222
+#: bms/forms.py:147 bms/models/common.py:794 bms/models/common.py:1023
+#: bms/templates/bms/invoice_detail.html:81
+#: bms/templates/bms/sale_form3_items.html:1285 bms/views/sale/forms.py:62
+#: lm/forms.py:27 lm/forms.py:203 lm/forms.py:241
 #: 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/stock_due.html:73
+#: lm/templates/lm/shipment_detail.html:92
+#: lm/templates/lm/stock_adjust_form.html:64
+#: lm/templates/lm/stock_by_warehouse.html:67 lm/templates/lm/stock_due.html:74
 #: lm/templates/lm/supplyorder_detail.html:57
 #: lm/templates/lm/supplyorder_form.html:52
 #: lm/templates/lm/transaction_list.html:97 mm/forms.py:111 mm/forms.py:156
@@ -1619,19 +1738,21 @@ msgstr "Oferta"
 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/stock_due.html:75
-#: lm/templates/lm/transaction_list.html:94 mm/forms.py:112 mm/forms.py:157
-#: mm/forms.py:197 mm/templates/mm/purchase_form_items.html:191
+#: bms/forms.py:148 bms/templates/bms/sale_form3_items.html:1283
+#: bms/views/sale/forms.py:63 lm/templates/lm/stock_by_warehouse.html:69
+#: lm/templates/lm/stock_due.html:76 lm/templates/lm/transaction_list.html:94
+#: mm/forms.py:112 mm/forms.py:157 mm/forms.py:197
+#: mm/templates/mm/purchase_form_items.html:191
 #: mnf/templates/mnf/manufacturingorder_detail.html:63
 msgid "Lot"
 msgstr "Lote"
 
 #. Translators: Transliterate
-#: bms/forms.py:149 bms/views/sale/forms.py:64
-#: lm/templates/lm/stock_by_warehouse.html:70 lm/templates/lm/stock_due.html:34
-#: lm/templates/lm/stock_due.html:76 lm/templates/lm/transaction_list.html:95
-#: mm/forms.py:113 mm/templates/mm/purchase_form_items.html:192
+#: bms/forms.py:149 bms/templates/bms/sale_form3_items.html:1284
+#: bms/views/sale/forms.py:64 lm/templates/lm/stock_by_warehouse.html:70
+#: lm/templates/lm/stock_due.html:34 lm/templates/lm/stock_due.html:77
+#: lm/templates/lm/transaction_list.html:95 mm/forms.py:113
+#: mm/templates/mm/purchase_form_items.html:192
 #: mnf/templates/mnf/manufacturingorder_detail.html:71
 msgid "Due"
 msgstr "Vencido"
@@ -1672,225 +1793,229 @@ msgstr ""
 msgid "Fiscal Correlative"
 msgstr "Correlativo Fiscal"
 
-#: bms/models/common.py:22 lm/models/stock.py:12
+#: bms/models/common.py:23 lm/models/stock.py:15
 msgid "unbilled"
 msgstr "sin facturar"
 
-#: bms/models/common.py:23 lm/models/stock.py:13
+#: bms/models/common.py:24 lm/models/stock.py:16
 msgid "billing"
 msgstr "facturando"
 
-#: bms/models/common.py:24 lm/models/stock.py:14
+#: bms/models/common.py:25 lm/models/stock.py:17
 msgid "invoiced"
 msgstr "facturado"
 
-#: bms/models/common.py:28 envoice/models.py:8 insumos/currency.py:34
-#: lm/models/shipment.py:13 mm/models/purchase.py:20 mnf/models/mo.py:13
+#: bms/models/common.py:29 envoice/models.py:8 insumos/currency.py:34
+#: lm/models/shipment.py:20 mm/models/purchase.py:25 mnf/models/mo.py:18
 #: sync/models.py:14
 msgid "created"
 msgstr "creada"
 
-#: bms/models/common.py:29
+#: bms/models/common.py:30
 msgid "generated"
 msgstr "generada"
 
-#: bms/models/common.py:30 lm/models/shipment.py:16
+#: bms/models/common.py:31 crm/models/appointment.py:14
+#: lm/models/shipment.py:23
 msgid "cancelled"
 msgstr "cancelada"
 
-#: bms/models/common.py:31
+#: bms/models/common.py:32
 msgid "generation error"
 msgstr "error en generación"
 
-#: bms/models/common.py:32
+#: bms/models/common.py:33
 msgid "overdue"
 msgstr "vencida"
 
-#: bms/models/common.py:33
+#: bms/models/common.py:34
 msgid "paid"
 msgstr "pagada"
 
-#: bms/models/common.py:34 mm/models/purchase.py:23
-msgid "reversed"
-msgstr "anulada"
-
-#: bms/models/common.py:40
+#: bms/models/common.py:41
+#: pos/templates/pos/shift_detail_pill_overview.html:147
 msgid "Cash"
 msgstr "Efectivo"
 
-#: bms/models/common.py:66 offer/forms.py:65 offer/models/offer.py:44
+#: bms/models/common.py:67 offer/forms.py:66 offer/models/offer.py:44
 #: pos/forms/fiscal_correlative.py:28 pos/models/fiscal_correlative.py:39
+#: pos/models/shift.py:14
 msgid "pos"
 msgstr "punto de venta"
 
-#: bms/models/common.py:74 crm/forms.py:28
+#: bms/models/common.py:75
+msgid "shift"
+msgstr ""
+
+#: bms/models/common.py:83 bp/models/business_partner.py:57
+#: crm/forms/customer.py:29 crm/models/contact_log.py:12
 msgid "customer"
 msgstr "cliente"
 
-#: bms/models/common.py:80
+#: bms/models/common.py:89
 msgid "vendor"
 msgstr "vendedor"
 
-#: bms/models/common.py:86
+#: bms/models/common.py:95
 msgid "fiscal correlative"
 msgstr "correlativo Fiscal"
 
-#: bms/models/common.py:94 core/models/tax.py:118
+#: bms/models/common.py:103 core/models/tax.py:118
 #: pos/models/fiscal_correlative.py:28
 msgid "fiscal document"
 msgstr "documento fiscal"
 
-#: bms/models/common.py:109
+#: bms/models/common.py:118
 msgid "Address"
 msgstr "Dirección"
 
-#: bms/models/common.py:112 sync/templates/sync/syncrecord_detail.html:82
+#: bms/models/common.py:121 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:115
+#: bms/models/common.py:124
 msgid "Official Document"
 msgstr "Documento Oficial"
 
-#: bms/models/common.py:118 mm/templates/mm/purchaseorder_list.html:52
+#: bms/models/common.py:127 mm/templates/mm/purchaseorder_list.html:52
 #: mnf/templates/mnf/manufacturingorder_form.html:91
 #: mnf/templates/mnf/manufacturingorder_list.html:44
 #: sync/templates/sync/syncrecord_list.html:67
 msgid "Created Date"
 msgstr "Fecha de Creación"
 
-#: bms/models/common.py:121 bms/templates/bms/invoice_detail.html:43
+#: bms/models/common.py:130 bms/templates/bms/invoice_detail.html:43
 msgid "Generated Date"
 msgstr "Fecha de Generación"
 
-#: bms/models/common.py:124
+#: bms/models/common.py:133
 msgid "Overdue Date"
 msgstr "Fecha de Vencimiento"
 
-#: bms/models/common.py:127 bms/templates/bms/invoice_detail.html:57
+#: bms/models/common.py:136 bms/templates/bms/invoice_detail.html:57
 msgid "Paid Date"
 msgstr "Fecha que se pago"
 
-#: bms/models/common.py:130
+#: bms/models/common.py:139
 msgid "Shift Date"
 msgstr "Fecha de Turno"
 
-#: bms/models/common.py:133
+#: bms/models/common.py:142
 msgid "Net Amount"
 msgstr "Monto Neto"
 
-#: bms/models/common.py:136
+#: bms/models/common.py:145
 msgid "Taxes Amount"
 msgstr "Monto de Impuestos"
 
-#: bms/models/common.py:139
+#: bms/models/common.py:148
 msgid "Discounts Amount"
 msgstr "Monto de Descuentos"
 
-#: bms/models/common.py:142
+#: bms/models/common.py:151
 msgid "Total Amount"
 msgstr "Monto Total"
 
-#: bms/models/common.py:145
+#: bms/models/common.py:154
 msgid "Balance Amount"
 msgstr "Monto de Balance"
 
-#: bms/models/common.py:148 bms/models/common.py:772 lm/models/product.py:29
-#: lm/models/shipment_item.py:33 lm/models/stock.py:66 lm/models/stock.py:72
-#: lm/models/transaction.py:76
+#: bms/models/common.py:157 bms/models/common.py:812 lm/models/product.py:29
+#: lm/models/shipment_item.py:58 lm/models/stock.py:70 lm/models/stock.py:76
+#: lm/models/transaction.py:77
 msgid "cost"
 msgstr "costo"
 
-#: bms/models/common.py:151
+#: bms/models/common.py:160
 msgid "Order Num"
 msgstr "Número de Orden"
 
-#: bms/models/common.py:155
+#: bms/models/common.py:164
 msgid "Delivery Channel"
 msgstr "Canal de Entrega"
 
-#: bms/models/common.py:159 crm/models/customer.py:34 mm/models/provider.py:26
+#: bms/models/common.py:168 crm/models/customer.py:34 mm/models/provider.py:26
 msgid "payment conditions"
 msgstr "condiciones de pago"
 
-#: bms/models/common.py:163 crm/models/customer.py:36 mm/models/provider.py:28
-#: mm/models/purchase.py:136
+#: bms/models/common.py:172 crm/models/customer.py:36 mm/models/provider.py:28
+#: mm/models/purchase.py:141
 msgid "credit days"
 msgstr "días crédito"
 
-#: bms/models/common.py:167
+#: bms/models/common.py:176
 msgid "reversing to"
 msgstr "anulando por"
 
-#: bms/models/common.py:180
+#: bms/models/common.py:189
 msgid "e-nvoice done"
 msgstr "e-nvoice completado"
 
-#: bms/models/common.py:201 bms/models/common.py:554 bms/models/common.py:590
-#: bms/models/common.py:738 bms/models/common.py:1128
+#: bms/models/common.py:210 bms/models/common.py:567 bms/models/common.py:663
+#: bms/models/common.py:778 bms/models/common.py:1204
 #: bms/templates/bms/invoice_detail.html:22
 msgid "Invoice"
 msgstr "Factura"
 
 #. Translators: Facturas
-#: bms/models/common.py:202 bms/templates/bms/invoice_list.html:21
-#: core/templates/core/base.html:899 core/templates/core/base2.html:739
+#: bms/models/common.py:211 bms/templates/bms/invoice_list.html:21
+#: core/templates/core/base.html:933 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:205
+#: bms/models/common.py:214
 msgid "Can generate Invoice"
 msgstr "Puede Generar Facturas"
 
-#: bms/models/common.py:206
+#: bms/models/common.py:215
 msgid "Can cancel Invoice"
 msgstr "Puede Cancelar Facturas"
 
-#: bms/models/common.py:207
+#: bms/models/common.py:216
 msgid "Can reverse Invoice"
 msgstr "Puede anular Facturas"
 
-#: bms/models/common.py:208
+#: bms/models/common.py:217
 msgid "Can assign Correlative"
 msgstr "Puede asignar Correlativo"
 
-#: bms/models/common.py:292
+#: bms/models/common.py:301
 #, 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:309
+#: bms/models/common.py:318
 #, 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:312
+#: bms/models/common.py:321
 msgid "discount object does not belongs to this invoice"
 msgstr "el descuento no pertenece a esta factura"
 
-#: bms/models/common.py:328
+#: bms/models/common.py:337
 #, 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:338
+#: bms/models/common.py:347
 #, 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:347
+#: bms/models/common.py:356
 #, 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:353
+#: bms/models/common.py:362
 #, python-format
 msgid ""
 "can not generate official invoice if total amount is lower or equal to 0 "
@@ -1899,70 +2024,110 @@ msgstr ""
 "no se puede  generar factura oficial si el monto total es menor o igual a 0 "
 "monto_total => %(total_amt)s"
 
-#: bms/models/common.py:511
+#: bms/models/common.py:515
+msgid "balance should not be lower than zero"
+msgstr ""
+
+#: bms/models/common.py:524
 msgid "vendor and customer should belong to same tenant"
 msgstr "vendedor y cliente deben pertenecer a la misma compañia"
 
-#: bms/models/common.py:520
+#: bms/models/common.py:533
 msgid "vendor and pos should belong to same tenant"
 msgstr "vendedor y punto de venta deben pertenecer a la misma compañía"
 
-#: bms/models/common.py:523
+#: bms/models/common.py:536
 msgid "user is not assigned to the pos"
 msgstr "el usuario no esta asignado al punto de venta"
 
-#: bms/models/common.py:558
+#: bms/models/common.py:571
 msgid "VAT"
 msgstr "IVA"
 
-#: bms/models/common.py:561
+#: bms/models/common.py:574
 msgid "Withheld VAT"
 msgstr "IVA Retenido"
 
-#: bms/models/common.py:564
+#: bms/models/common.py:577
 msgid "Collected VAT"
 msgstr "IVA Percibido"
 
-#: bms/models/common.py:570
+#: bms/models/common.py:583
 msgid "Invoice Summary"
 msgstr "Resumen de Factura"
 
-#: bms/models/common.py:571
+#: bms/models/common.py:584
 msgid "Invoices Summary"
 msgstr "Resumen de Facturas"
 
-#: bms/models/common.py:583
+#: bms/models/common.py:595 envoice/models.py:17 lm/models/stock.py:91
+msgid "invoice"
+msgstr "facturado"
+
+#: bms/models/common.py:603 bms/models/common.py:1052 mm/models/purchase.py:736
+msgid "tax"
+msgstr "impuesto"
+
+#: bms/models/common.py:618
+msgid "Invoice Tax"
+msgstr "Impuesto Facturado"
+
+#: bms/models/common.py:619
+msgid "Invoice Taxes"
+msgstr "Impuestos Facturados"
+
+#: bms/models/common.py:649 bms/models/discount.py:9 core/models/tax.py:10
+#: core/models/tax.py:80
+msgid "net amount"
+msgstr "monto neto"
+
+#: bms/models/common.py:650 bms/models/discount.py:10
+#, fuzzy
+#| msgid "Total Amount"
+msgid "total amount"
+msgstr "Monto Total"
+
+#: bms/models/common.py:656
 msgid "Percentage"
 msgstr "Porcentaje"
 
-#: bms/models/common.py:584
+#: bms/models/common.py:657
 msgid "Fixed"
 msgstr "Fijo"
 
-#: bms/models/common.py:585
+#: bms/models/common.py:658
 msgid "Override"
 msgstr "Reemplazar"
 
-#: bms/models/common.py:594 bms/models/common.py:742
+#: bms/models/common.py:666 bms/models/discount.py:18
+#, fuzzy
+#| msgid "applicability"
+msgid "application"
+msgstr "aplicabilidad"
+
+#: bms/models/common.py:668 bms/models/common.py:782
 msgid "Item Object Model"
 msgstr "Modelo de Objeto Articulo"
 
-#: bms/models/common.py:597 bms/models/common.py:745
+#: bms/models/common.py:671 bms/models/common.py:785
 msgid "Item Object Id"
 msgstr "Id de Objeto Articulo"
 
-#: bms/models/common.py:600
+#: bms/models/common.py:674
 msgid "Instance ID"
 msgstr "Identificador de instancia"
 
-#: bms/models/common.py:606 bms/models/common.py:751
+#: bms/models/common.py:680 bms/models/common.py:791
 #: 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
+#: bms/templates/bms/sale_form1_items.html:186
+#: bms/templates/bms/sale_form3_items.html:1228
+#: bms/templates/bms/sale_form3_items.html:1243
+#: bms/templates/bms/sale_form3_items.html:1260 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/stock_due.html:67
+#: lm/templates/lm/stock_by_product.html:74
+#: lm/templates/lm/stock_by_warehouse.html:61 lm/templates/lm/stock_due.html:68
 #: 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
@@ -1974,31 +2139,43 @@ msgstr "Identificador de instancia"
 msgid "Description"
 msgstr "Descripción"
 
-#: bms/models/common.py:609
+#: bms/models/common.py:683
+#, fuzzy
+#| msgid "Instance ID"
+msgid "instance code"
+msgstr "Identificador de instancia"
+
+#: bms/models/common.py:686
 msgid "Discount Type"
 msgstr "Tipo de Descuento"
 
-#: bms/models/common.py:612
+#: bms/models/common.py:689
 msgid "Discount Percentage"
 msgstr "Porcentaje de Descuento"
 
-#: bms/models/common.py:615
+#: bms/models/common.py:692
 msgid "Discount Fixed "
 msgstr "Descuento Fijo "
 
-#: bms/models/common.py:618
+#: bms/models/common.py:695
 msgid "Discount Amount"
 msgstr "Monto de Descuento"
 
-#: bms/models/common.py:624
+#: bms/models/common.py:701
 msgid "Invoice Discount"
 msgstr "Descuento de Factura"
 
-#: bms/models/common.py:625
+#: bms/models/common.py:702
 msgid "Invoice Discounts"
 msgstr "Descuentos de Factura"
 
-#: bms/models/common.py:636
+#: bms/models/common.py:715
+#, fuzzy
+#| msgid "parent conf or over must be provided"
+msgid "invoice or invoice item must be provided"
+msgstr "la configuración principal o la superior debe ser proporcionada"
+
+#: bms/models/common.py:718
 #, python-format
 msgid ""
 "discount object must be provided or provide discount_type and amount instead "
@@ -2009,187 +2186,177 @@ msgstr ""
 "valores actuales: objeto descuento %(discount_obj)s, tipo de descuento "
 "%(discount_type)s monto %(amount)s"
 
-#: bms/models/common.py:643
+#: bms/models/common.py:725
 #, 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:682 envoice/models.py:17 lm/models/stock.py:87
-msgid "invoice"
-msgstr "facturado"
-
-#: bms/models/common.py:690 bms/models/common.py:977 mm/models/purchase.py:625
-msgid "tax"
-msgstr "impuesto"
-
-#: bms/models/common.py:705
-msgid "Invoice Tax"
-msgstr "Impuesto Facturado"
-
-#: bms/models/common.py:706
-msgid "Invoice Taxes"
-msgstr "Impuestos Facturados"
-
-#: bms/models/common.py:757 bms/templates/bms/invoice_detail.html:83
+#: bms/models/common.py:797 bms/templates/bms/invoice_detail.html:83
 #: mm/forms.py:114
 msgid "Unit Price"
 msgstr "Precio Unitario"
 
-#: bms/models/common.py:760
+#: bms/models/common.py:800
 msgid "Net Price"
 msgstr "Precio Neto"
 
-#: bms/models/common.py:763 bms/models/discount.py:36
+#: bms/models/common.py:803 bms/models/discount.py:41
 msgid "Discount"
 msgstr "Descuento"
 
-#: bms/models/common.py:769
+#: bms/models/common.py:809
 msgid "Total Price"
 msgstr "Precio Total"
 
-#: bms/models/common.py:784 bms/models/common.py:938
+#: bms/models/common.py:824 bms/models/common.py:1013
 msgid "Invoice Item"
 msgstr "Item de Factura"
 
-#: bms/models/common.py:785
+#: bms/models/common.py:825
 msgid "Invoice Items"
 msgstr "Items de Factura"
 
-#: bms/models/common.py:824
+#: bms/models/common.py:864
 #, 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:829
+#: bms/models/common.py:869
 #, 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:942
+#: bms/models/common.py:1017
 msgid "Detail Model"
 msgstr "Modelo Detallado"
 
-#: bms/models/common.py:945
+#: bms/models/common.py:1020
 msgid "Detail Object"
 msgstr "Objeto Detallado"
 
-#: bms/models/common.py:959
+#: bms/models/common.py:1034
 msgid "Invoice Item Detail"
 msgstr "Detalle de Item de Factura"
 
-#: bms/models/common.py:960
+#: bms/models/common.py:1035
 msgid "Invoice Item Details"
 msgstr "Detalles de Item de Factura"
 
-#: bms/models/common.py:969 bms/models/common.py:1021
+#: bms/models/common.py:1044 bms/models/common.py:1096
 msgid "invoice item"
 msgstr "ítem de factura"
 
-#: bms/models/common.py:992
+#: bms/models/common.py:1067
 msgid "Invoice Item Tax"
 msgstr "Ítem de Impuesto Facturado"
 
-#: bms/models/common.py:993
+#: bms/models/common.py:1068
 msgid "Invoice Item Taxes"
 msgstr "Ítems de Impuestos Facturados"
 
-#: bms/models/common.py:1027 mm/models/purchase.py:461
+#: bms/models/common.py:1102 mm/models/purchase.py:567
 msgid "discount"
 msgstr "descuento"
 
-#: bms/models/common.py:1042
+#: bms/models/common.py:1117
 msgid "BMS Item Discount"
 msgstr "Descuento de Ítem de BMS"
 
-#: bms/models/common.py:1043
+#: bms/models/common.py:1118
 msgid "BMS Item Discounts"
 msgstr "Descuentos de Ítem de BMS"
 
-#: bms/models/common.py:1053
+#: bms/models/common.py:1128
 msgid "Tag Name"
 msgstr "Etiqueta"
 
-#: bms/models/common.py:1055
+#: bms/models/common.py:1130
 msgid "This value will be displayed when selecting payment type"
 msgstr "Este valor se mostrará al seleccionar tipo de descuento"
 
-#: bms/models/common.py:1062 bms/models/common.py:1109
-#: bms/models/common.py:1134 bms/templates/bms/revenue.html:37
+#: bms/models/common.py:1137 bms/models/common.py:1185
+#: bms/models/common.py:1210 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:1064
+#: bms/models/common.py:1139
 msgid "This value will be displayed in invoice item description"
 msgstr "Este valor se mostrará en descripción de ítem de factura"
 
-#: bms/models/common.py:1081
+#: bms/models/common.py:1156
 msgid "e_code"
 msgstr "e-código"
 
-#: bms/models/common.py:1086
+#: bms/models/common.py:1161
+msgid "is cash"
+msgstr ""
+
+#: bms/models/common.py:1162
 msgid "ordering"
 msgstr "ordenando"
 
-#: bms/models/common.py:1087
+#: bms/models/common.py:1163
 msgid "allows change"
 msgstr "permite cambiar"
 
-#: bms/models/common.py:1088
+#: bms/models/common.py:1164
 msgid "requires reference"
 msgstr "referencia es requerida"
 
 #. Translators: Tipos de Pago
-#: bms/models/common.py:1110 core/templates/core/base.html:366
-#: core/templates/core/base.html:915 core/templates/core/base2.html:321
+#: bms/models/common.py:1186 core/templates/core/base.html:398
+#: core/templates/core/base.html:941 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:1121
+#: bms/models/common.py:1197
 msgid "account tenant should be same object tenant"
 msgstr "la compañía de la cuenta debe ser la misma compañía del objeto"
 
-#: bms/models/common.py:1139 mm/models/payment.py:92
+#: bms/models/common.py:1215 mm/models/payment.py:92
 msgid "Payment Date"
 msgstr "Fecha de Pago"
 
-#: bms/models/common.py:1142
+#: bms/models/common.py:1218
 msgid "Received Amount"
 msgstr "Monto Recibido"
 
-#: bms/models/common.py:1144
+#: bms/models/common.py:1220
 msgid "Change"
 msgstr "Cambiar"
 
-#: bms/models/common.py:1155
+#: bms/models/common.py:1231
 msgid "Invoice Payment"
 msgstr "Pago de Factura"
 
-#: bms/models/common.py:1156
+#: bms/models/common.py:1232
 msgid "Invoice Payments"
 msgstr "Pagos de Factura"
 
-#: bms/models/common.py:1168
+#: bms/models/common.py:1244
 msgid "payment type requires reference"
 msgstr "el tipo de pago requiere referencia"
 
-#: bms/models/discount.py:9
+#: bms/models/discount.py:12
 msgid "fixed"
 msgstr "fijo"
 
-#: bms/models/discount.py:10
+#: bms/models/discount.py:13
 msgid "percentage"
 msgstr "porcentaje"
 
-#: bms/models/discount.py:13 lm/models/transaction.py:66
-#: lm/models/transaction.py:67
-msgid "motive"
-msgstr "motivo"
+#: bms/models/discount.py:14
+#, fuzzy
+#| msgid "Override"
+msgid "override"
+msgstr "Reemplazar"
 
-#: bms/models/discount.py:37 bms/templates/bms/invoice_detail.html:82
+#: bms/models/discount.py:42 bms/templates/bms/invoice_detail.html:82
+#: pos/templates/pos/shift_detail_pill_overview.html:117
 msgid "Discounts"
 msgstr "Descuentos"
 
@@ -2209,10 +2376,12 @@ msgstr ""
 #: bms/templates/bms/invoice_list.html:65
 #: bms/templates/bms/sale_associate_revers_obj_form.html:314
 #: crm/templates/crm/cxc_list.html:53
+#: pos/templates/pos/shift_detail_pill_overview.html:30
 msgid "Vendor"
 msgstr "Vendedor"
 
-#: bms/templates/bms/invoice_detail.html:71
+#: bms/templates/bms/invoice_detail.html:71 lm/forms.py:242
+#: lm/templates/lm/stock_adjust_form.html:65
 #: lm/templates/lm/transaction_list.html:92
 msgid "Cost"
 msgstr "Costo"
@@ -2226,6 +2395,7 @@ msgstr "Costo"
 #: mm/templates/mm/purchase_list.html:79
 #: mm/templates/mm/purchaseorder_list.html:62
 #: mm/templates/mm/purchaserequisition_list.html:46
+#: pos/templates/pos/shift_detail_pill_overview.html:93
 msgid "Total"
 msgstr "Total"
 
@@ -2245,6 +2415,7 @@ msgstr "Sub total"
 #: 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
+#: pos/templates/pos/shift_list.html:47
 #: sync/templates/sync/syncrecord_detail.html:40
 #: sync/templates/sync/syncrecord_detail.html:155
 msgid "Date Created"
@@ -2274,8 +2445,9 @@ msgstr "Suma de 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:163 core/templates/core/base2.html:154
+#: bms/templates/bms/sale_form2_items.html:234
+#: bms/templates/bms/sale_form3_items.html:255 core/generic_views.py:38
+#: core/templates/core/base.html:173 core/templates/core/base2.html:154
 #: core/templates/core/patch_base.html:154
 msgid "Change Password"
 msgstr "Cambiar Contraseña"
@@ -2283,29 +2455,33 @@ 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:165 core/templates/core/base2.html:156
+#: bms/templates/bms/sale_form3_items.html:257
+#: core/templates/core/base.html:175 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:891
+#: bms/templates/bms/sale_form1_items.html:17 core/templates/core/base.html:901
 #: core/templates/core/base2.html:731 core/templates/core/patch_base.html:243
 msgid "Record Sale"
 msgstr "Registro de Venta"
 
 #: bms/templates/bms/sale_form.html:108
+#: lm/templates/lm/supplyorder_consolidation_form.html:20
+#: lm/templates/lm/supplyorder_consolidation_form.html:22
 #: mm/templates/mm/purchase_form_bk.html:193
-#: mnf/templates/mnf/bundle_form.html:203
+#: mnf/templates/mnf/bundle_form.html:206
 #: mnf/templates/mnf/manufacturingorder_form.html:161
 msgid "Save"
 msgstr "Guardar"
 
 #: bms/templates/bms/sale_form1_items.html:112
 #: bms/templates/bms/sale_form2_items.html:361
+#: bms/templates/bms/sale_form3_items.html:391
 #: lm/templates/lm/shipment_create_form.html:55
-#: lm/templates/lm/stock_adjust_form.html:49
+#: lm/templates/lm/stock_adjust_form.html:55
 #: lm/templates/lm/supplyorder_form.html:43
 #: mm/templates/mm/purchase_form_bk.html:135
 #: mm/templates/mm/purchase_form_items.html:154
@@ -2322,12 +2498,76 @@ msgid "Generar"
 msgstr ""
 
 #: bms/templates/bms/sale_form2_items.html:300
+#: bms/templates/bms/sale_form3_items.html:322
 msgid "Totalizar"
 msgstr ""
 
+#: bms/templates/bms/sale_form3_items.html:226
+msgid "Ultimas Ventas"
+msgstr ""
+
+#: bms/templates/bms/sale_form3_items.html:918
+msgid "Apply"
+msgstr ""
+
+#: bms/templates/bms/sale_form3_items.html:935
+#, fuzzy
+#| msgid "Discount"
+msgid "Select Discount"
+msgstr "Descuento"
+
+#. Translators: Transliterate
+#: bms/templates/bms/sale_form3_items.html:1198
+#: bms/templates/bms/sale_form3_items.html:1229
+#: bms/templates/bms/sale_form3_items.html:1244
+#: bms/templates/bms/sale_form3_items.html:1278
+#: core/templates/core/base2.html:367 lm/models/stock.py:115
+#: lm/models/stock.py:116 lm/templates/lm/stock_by_product.html:44
+#: lm/templates/lm/stock_by_warehouse.html:34
+#: lm/templates/lm/supplyorder_consolidation.html:42
+#: lm/templates/lm/supplyorder_consolidation_form.html:37
+#: lm/templates/lm/transaction_list.html:34
+#: lm/views/supply_order_consolidation.py:118
+msgid "Stock"
+msgstr "Inventario"
+
+#: bms/templates/bms/sale_form3_items.html:1222
+#, fuzzy
+#| msgid "bundle product"
+msgid "Equivalent Product"
+msgstr "producto en paquete"
+
+#: bms/templates/bms/sale_form3_items.html:1237
+#, fuzzy
+#| msgid "item product"
+msgid "Suggested Product"
+msgstr "artículo del producto"
+
+#. Translators: Ofertas
+#: bms/templates/bms/sale_form3_items.html:1254
+#: core/templates/core/base.html:962 core/templates/core/base.html:971
+#: 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:101 offer/templates/offer/offer_list.html:21
+msgid "Offers"
+msgstr "Ofertas"
+
+#: bms/templates/bms/sale_form3_items.html:1268
+msgid "Formula"
+msgstr ""
+
+#: bms/templates/bms/sale_form3_items.html:1324
+#: lm/templates/lm/product_form.html:86 lm/templates/lm/product_form.html:101
+#: lm/templates/lm/stock_by_product.html:153
+#: mnf/templates/mnf/bundle_form.html:236
+#, fuzzy
+#| msgid "Product"
+msgid "Select Product"
+msgstr "Producto"
+
 #. Translators: Cuentas Bancarias
 #: bms/templates/bms/sales_reconciliation/dosv.html:34
-#: core/templates/core/base.html:599 core/templates/core/patch_base.html:249
+#: core/templates/core/base.html:631 core/templates/core/patch_base.html:249
 msgid "Cortes de Caja"
 msgstr ""
 
@@ -2336,9 +2576,17 @@ msgid "Previsualizar"
 msgstr ""
 
 #: bms/templates/bms/sales_reconciliation/dosv.html:471
+#: bms/templates/bms/sales_reconciliation/dosv.html:473
 msgid "Guardar Partida"
 msgstr ""
 
+#: bms/templates/bms/sales_reconciliation/dosv.html:471
+#: lm/templates/lm/supplyorder_consolidation_form.html:20
+#, fuzzy
+#| msgid "savings"
+msgid "Saving..."
+msgstr "cuenta de ahorro"
+
 #: bms/templates/bms/sales_reconciliation/dosv_ticket_substitution.html:18
 msgid "Reasignacion de Correlativo"
 msgstr ""
@@ -2351,6 +2599,157 @@ msgstr ""
 msgid "Percentaje"
 msgstr "Porcentaje"
 
+#. Translators: Impuestos
+#: bp/apps.py:8 bp/models/business_partner.py:78
+#: core/models/business_partner.py:41 core/templates/core/base.html:286
+msgid "Business Partners"
+msgstr "Asociados del Negocio"
+
+#: bp/models/business_partner.py:14 core/models/business_partner.py:12
+#: crm/models/customer.py:25 mm/models/provider.py:17
+msgid "phone"
+msgstr "teléfono"
+
+#: bp/models/business_partner.py:15 core/models/business_partner.py:13
+#: crm/models/customer.py:27 mm/models/provider.py:18
+msgid "email"
+msgstr "email"
+
+#: bp/models/business_partner.py:16 envoice/models.py:27
+#: lm/models/supply_order.py:14 mm/models/purchase.py:133
+#: 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"
+
+#: bp/models/business_partner.py:20
+#, fuzzy
+#| msgid "payment type"
+msgid "person type"
+msgstr "tipo de pago"
+
+#: bp/models/business_partner.py:34 bp/models/sv_catalogs.py:47
+#: core/models/business_partner.py:16 crm/models/customer.py:31
+#: mm/models/provider.py:21
+msgid "state"
+msgstr "departamentos"
+
+#: bp/models/business_partner.py:42 core/models/business_partner.py:17
+#: crm/models/customer.py:32 mm/models/provider.py:22
+msgid "city"
+msgstr "municipio"
+
+#: bp/models/business_partner.py:47 core/models/branch.py:12
+#: core/models/business_partner.py:11 core/models/tenant.py:27
+#: crm/models/customer.py:30 hr/models/common.py:59 mm/models/provider.py:16
+#: mm/models/purchase.py:150 mm/models/purchase_order.py:27
+#: mm/models/purchase_requisition.py:33
+msgid "address"
+msgstr "dirección"
+
+#: bp/models/business_partner.py:51 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"
+
+#: bp/models/business_partner.py:65
+msgid "is generic"
+msgstr ""
+
+#: bp/models/business_partner.py:77 core/models/business_partner.py:40
+msgid "Business Partner"
+msgstr "Asociado del Negocio"
+
+#: bp/models/business_partner.py:95
+#, fuzzy
+#| msgid "policy type does not belongs to same tenant"
+msgid "assigned city does not belongs to assigned state"
+msgstr "el tipo de partida no pertenece a la misma compañía"
+
+#: bp/models/business_partner.py:106 core/models/tax.py:201
+msgid "business partner"
+msgstr "asociado del negocio"
+
+#: bp/models/business_partner.py:112
+msgid "document type"
+msgstr "tipo de documento"
+
+#: bp/models/business_partner.py:124
+#, fuzzy
+#| msgid "Business Partner"
+msgid "Business Partner document"
+msgstr "Asociado del Negocio"
+
+#: bp/models/business_partner.py:125
+#, fuzzy
+#| msgid "Business Partners"
+msgid "Business Partners documents"
+msgstr "Asociados del Negocio"
+
+#: bp/models/business_partner.py:145
+#, fuzzy
+#| msgid "fiscal document"
+msgid "invalid document"
+msgstr "documento fiscal"
+
+#: bp/models/sv_catalogs.py:6 lm/models/packaging.py:16 lm/models/product.py:23
+#: lm/models/product.py:178 lm/models/shipment_item.py:30
+#: mm/models/purchase.py:550 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"
+
+#: bp/models/sv_catalogs.py:32
+#, fuzzy
+#| msgid "Business Activity"
+msgid "Business Activities"
+msgstr "Actividad del Negocio"
+
+#: bp/models/sv_catalogs.py:38
+#, fuzzy
+#| msgid "state"
+msgid "State"
+msgstr "departamentos"
+
+#: bp/models/sv_catalogs.py:39
+#, fuzzy
+#| msgid "Status"
+msgid "States"
+msgstr "Estado"
+
+#: bp/models/sv_catalogs.py:53
+msgid "City"
+msgstr ""
+
+#: bp/models/sv_catalogs.py:54
+msgid "Cities"
+msgstr ""
+
+#: bp/models/sv_catalogs.py:65 core/models/country.py:21
+msgid "Countries"
+msgstr "Países"
+
+#: bp/models/sv_catalogs.py:71
+#, fuzzy
+#| msgid "Document Type"
+msgid "Identification Document Type"
+msgstr "Tipo de Documento"
+
+#: bp/models/sv_catalogs.py:72
+#, fuzzy
+#| msgid "Document Type"
+msgid "Identification Documents Type"
+msgstr "Tipo de Documento"
+
+#: bp/models/sv_catalogs.py:78
+msgid "Legal Personality"
+msgstr ""
+
+#: bp/models/sv_catalogs.py:79
+msgid "Legal Personsonalities"
+msgstr ""
+
 #: core/forms.py:43
 msgid "Can"
 msgstr "Puede"
@@ -2375,7 +2774,7 @@ msgstr "ver"
 msgid "groups"
 msgstr "grupos"
 
-#: core/forms.py:110 core/forms.py:158 core/forms.py:311
+#: core/forms.py:110 core/forms.py:158 core/forms.py:319
 msgid "tenants"
 msgstr "compañías"
 
@@ -2383,8 +2782,8 @@ msgstr "compañías"
 msgid "Operations Center"
 msgstr "Centro de Operaciones"
 
-#: core/forms.py:210 core/models/branch.py:38 lm/forms.py:137
-#: lm/models/warehouse.py:22 pos/forms/pos.py:37 pos/models/pos.py:17
+#: core/forms.py:210 core/models/branch.py:38 lm/forms.py:159
+#: lm/models/warehouse.py:22 pos/forms/pos.py:42 pos/models/pos.py:26
 msgid "users"
 msgstr "usuarios"
 
@@ -2392,19 +2791,19 @@ msgstr "usuarios"
 msgid "group permissions"
 msgstr "permisos del grupo"
 
-#: core/forms.py:359 core/models/tax.py:219 mm/models/purchase.py:458
+#: core/forms.py:367 core/models/tax.py:219 mm/models/purchase.py:564
 msgid "taxes"
 msgstr "impuestos"
 
-#: core/generic_views.py:41
+#: core/generic_views.py:42
 msgid "password changed successfully"
 msgstr "cambio de contraseña exitoso"
 
-#: core/generic_views.py:230
+#: core/generic_views.py:232
 msgid "GenEdit"
 msgstr "GenEdit"
 
-#: core/generic_views.py:301
+#: core/generic_views.py:303
 msgid "Delete"
 msgstr "Borrar"
 
@@ -2412,32 +2811,31 @@ msgstr "Borrar"
 msgid "code 2"
 msgstr "código 2"
 
-#: 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"
+#: core/models/branch.py:41
+msgid ""
+"this attribute will be used for ordering in the supply order consolidation "
+"view"
+msgstr ""
 
 #. Translators: Sucursales
-#: core/models/branch.py:49 core/templates/core/base.html:244
+#: core/models/branch.py:54 core/templates/core/base.html:254
 #: core/templates/core/patch_base.html:195
 msgid "Branches"
 msgstr "Sucursales"
 
-#: core/models/branch.py:65
+#: core/models/branch.py:70
 msgid "the branch can not be deactivated because it has active warehouse(s)"
 msgstr "la sucursal no se puede desactivar porque tiene bodega(as) activa(s)"
 
-#: core/models/branch.py:75
+#: core/models/branch.py:80
 msgid "User Branch"
 msgstr "Usuario de Sucursal"
 
-#: core/models/branch.py:76
+#: core/models/branch.py:81
 msgid "User Branches"
 msgstr "Usuario de Sucursales"
 
-#: core/models/branch.py:82
+#: core/models/branch.py:87
 msgid ""
 "Can not save user with branch association because branch's tenant is not in "
 "user's available tenants"
@@ -2445,7 +2843,7 @@ msgstr ""
 "No se puede guardar el usuario a la sucursal porque la compañía de la "
 "sucursal no está entre las compañías disponibles del usuario"
 
-#: core/models/branch.py:93
+#: core/models/branch.py:98
 msgid ""
 "Can not remove user from branch because user is assigned to a warehouse "
 "which belongs to this branch"
@@ -2462,36 +2860,11 @@ msgstr "código externo"
 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
 msgid "company"
 msgstr "empresa"
@@ -2500,85 +2873,146 @@ msgstr "empresa"
 msgid "foreign"
 msgstr "extranjero"
 
-#: core/models/business_partner.py:40
-msgid "Business Partner"
-msgstr "Asociado del Negocio"
-
-#. Translators: Impuestos
-#: core/models/business_partner.py:41 core/templates/core/base.html:276
-msgid "Business Partners"
-msgstr "Asociados del Negocio"
-
-#: core/models/conf.py:9
+#: core/models/conf.py:10
 msgid "auto id"
 msgstr "id automático"
 
-#: core/models/conf.py:10
+#: core/models/conf.py:11
 msgid "custom"
 msgstr "cliente"
 
 #: core/models/conf.py:21
+#, fuzzy
+#| msgid "Accounting"
+msgid "Accouting"
+msgstr "Contabilidad"
+
+#: core/models/conf.py:22
+#, fuzzy
+#| msgid "Logistic Module"
+msgid "Logistic"
+msgstr "Módulo de Logística"
+
+#: core/models/conf.py:23
+#, fuzzy
+#| msgid "Accounts Catalog"
+msgid "Accounts Payable"
+msgstr "Catalogo de Cuentas"
+
+#: core/models/conf.py:25
 msgid "customer code"
 msgstr "código de cliente"
 
-#: core/models/conf.py:29
+#: core/models/conf.py:33
 msgid "central warehouse"
 msgstr "bodega central"
 
-#: core/models/conf.py:34 lm/models/shipment.py:21
+#: core/models/conf.py:40 lm/models/shipment.py:29
 msgid "shipment document"
 msgstr "documento de envío"
 
-#: core/models/conf.py:40 core/models/user.py:49
+#: core/models/conf.py:46 core/models/user.py:52
 msgid "timezone"
 msgstr "zona horaria"
 
-#: core/models/conf.py:45
+#: core/models/conf.py:51
 msgid "sales account"
 msgstr "cuenta de ingresos por ventas"
 
-#: core/models/conf.py:52
-msgid "purchase typology"
-msgstr "tipología de compra"
+#: core/models/conf.py:58
+#, fuzzy
+#| msgid "purchase payment policy type"
+msgid "lm shipment policy type"
+msgstr "tipo de partida contable de pago de compras"
 
-#: core/models/conf.py:60
+#: core/models/conf.py:62
+#, fuzzy
+#| msgid ""
+#| "this policy type will be used when creating a policy for a purchase "
+#| "payment"
+msgid "this policy type will be used for shipments"
+msgstr ""
+"ste tipo de partida se utilizará al crear una partida para un pago de compra"
+
+#: core/models/conf.py:67
 msgid "shipment send typology"
 msgstr "tipología de envío de mercancías"
 
-#: core/models/conf.py:68
+#: core/models/conf.py:75
 msgid "shipment accept typology"
 msgstr "tipología de aceptación de envío"
 
-#: core/models/conf.py:76
+#: core/models/conf.py:83
+#, fuzzy
+#| msgid "purchase payment policy type"
+msgid "mnf process policy type"
+msgstr "tipo de partida contable de pago de compras"
+
+#: core/models/conf.py:87
+#, fuzzy
+#| msgid ""
+#| "this policy type will be used when creating a policy for a purchase "
+#| "payment"
+msgid "this policy type will be as deault when executing a MNF process"
+msgstr ""
+"ste tipo de partida se utilizará al crear una partida para un pago de compra"
+
+#: core/models/conf.py:92
 msgid "manufacturing exahust typology"
 msgstr "tipología de agotamiento en la manufactura"
 
-#: core/models/conf.py:84
+#: core/models/conf.py:100
 msgid "manufacturing increment typology"
 msgstr "tipología de incremento en la manufactura"
 
-#: core/models/conf.py:92
+#: core/models/conf.py:108
 msgid "purchase payment policy type"
 msgstr "tipo de partida contable de pago de compras"
 
-#: core/models/conf.py:96
+#: core/models/conf.py:112
 msgid ""
 "this policy type will be used when creating a policy for a purchase payment"
 msgstr ""
 "ste tipo de partida se utilizará al crear una partida para un pago de compra"
 
-#: core/models/conf.py:101
+#: core/models/conf.py:117
+msgid "purchase typology"
+msgstr "tipología de compra"
+
+#: core/models/conf.py:125
+#, fuzzy
+#| msgid "purchase typology"
+msgid "reverse purchase typology"
+msgstr "tipología de compra"
+
+#: core/models/conf.py:133
+#, fuzzy
+#| msgid "purchase payment policy type"
+msgid "purchase policy type"
+msgstr "tipo de partida contable de pago de compras"
+
+#: core/models/conf.py:137
+#, fuzzy
+#| msgid ""
+#| "this policy type will be used when creating a policy for a purchase "
+#| "payment"
+msgid ""
+"this policy type will be as deault when creating a policy for a purchase"
+msgstr ""
+"ste tipo de partida se utilizará al crear una partida para un pago de compra"
+
+#: core/models/conf.py:142
 msgid "treasury bank policy type"
 msgstr "tipo de partida contable de tesorería bancaria"
 
-#: core/models/conf.py:105
+#: core/models/conf.py:146
 msgid ""
 "this policy type will be used when creating a policy for a bank transaction"
 msgstr ""
 "este tipo de partida se utilizará al crear una partida para una transacción "
 "bancaria"
 
-#: core/models/conf.py:117 core/models/conf.py:118
+#: core/models/conf.py:158 core/models/conf.py:159
 msgid "Tenant Conf"
 msgstr "Configuración de Compañía"
 
@@ -2586,14 +3020,10 @@ msgstr "Configuración de Compañía"
 msgid "iso code"
 msgstr "código iso"
 
-#: core/models/country.py:12 core/models/tenant.py:49
+#: core/models/country.py:12 core/models/tenant.py:46
 msgid "main currency"
 msgstr "divisa primaria"
 
-#: core/models/country.py:21
-msgid "Countries"
-msgstr "Países"
-
 #: core/models/currency.py:7
 msgid "Symbol"
 msgstr "Símbolo"
@@ -2633,12 +3063,12 @@ msgid "Fiscal Document Models"
 msgstr "Modelos de Documentos Fiscales"
 
 #: core/models/fiscal_document.py:30 core/models/tax.py:16
-#: core/models/tax.py:85 lm/models/transaction.py:13
+#: core/models/tax.py:85 lm/models/transaction.py:14
 msgid "increment"
 msgstr "incremento"
 
 #: core/models/fiscal_document.py:31 core/models/tax.py:17
-#: core/models/tax.py:86 lm/models/transaction.py:14
+#: core/models/tax.py:86 lm/models/transaction.py:15
 msgid "decrement"
 msgstr "disminución"
 
@@ -2657,7 +3087,7 @@ msgid "reverses"
 msgstr "anulaciones"
 
 #: core/models/fiscal_document.py:63 lm/models/category.py:14
-#: lm/models/stock.py:103
+#: lm/models/stock.py:107
 msgid "parent"
 msgstr "padre"
 
@@ -2666,20 +3096,16 @@ msgid "Fiscal Document"
 msgstr "Documento Fiscal"
 
 #. Translators: Documentos
-#: core/models/fiscal_document.py:79 core/templates/core/base.html:252
+#: core/models/fiscal_document.py:79 core/templates/core/base.html:262
 #: core/templates/core/base2.html:229
 msgid "Fiscal Documents"
 msgstr "Documentos Fiscales"
 
-#: core/models/tax.py:10 core/models/tax.py:80
-msgid "net amount"
-msgstr "monto neto"
-
-#: core/models/tax.py:11 core/models/tax.py:81 lm/models/shipment_item.py:30
-#: lm/models/stock.py:58 lm/models/supply_order.py:95
-#: lm/models/transaction.py:72 mm/models/purchase.py:447
-#: mm/models/purchase.py:448 mm/models/purchase_order.py:156
-#: mm/models/purchase_requisition.py:129 mnf/models/mo.py:159
+#: core/models/tax.py:11 core/models/tax.py:81 lm/models/shipment_item.py:55
+#: lm/models/stock.py:62 lm/models/supply_order.py:104
+#: lm/models/transaction.py:74 mm/models/purchase.py:553
+#: mm/models/purchase.py:554 mm/models/purchase_order.py:156
+#: mm/models/purchase_requisition.py:129 mnf/models/mo.py:189
 #: offer/models/offer_options_group.py:54
 msgid "quantity"
 msgstr "cantidad"
@@ -2720,10 +3146,6 @@ msgstr "configuración del modelo de impuestos"
 msgid "parent conf or over must be provided"
 msgstr "la configuración principal o la superior debe ser proporcionada"
 
-#: core/models/tax.py:201
-msgid "business partner"
-msgstr "asociado del negocio"
-
 #: core/models/tax.py:202
 msgid "goods or services"
 msgstr "bienes o servicios"
@@ -2737,7 +3159,7 @@ msgid "Tax Profile"
 msgstr "Perfil Tributario"
 
 #. Translators: Impuestos
-#: core/models/tax.py:228 core/templates/core/base.html:268
+#: core/models/tax.py:228 core/templates/core/base.html:278
 msgid "Tax Profiles"
 msgstr "Perfiles Tributarios"
 
@@ -2745,31 +3167,27 @@ msgstr "Perfiles Tributarios"
 msgid "brand"
 msgstr "marca"
 
-#: core/models/tenant.py:27
-msgid "large taxpayer"
-msgstr "gran contribuyente"
-
-#: core/models/tenant.py:33
+#: core/models/tenant.py:30
 msgid "logo"
 msgstr "logo"
 
-#: core/models/tenant.py:57
+#: core/models/tenant.py:54
 msgid "secondary currency"
 msgstr "divisa secundaria"
 
-#: core/models/tenant.py:62
+#: core/models/tenant.py:59
 msgid "e-nvoice integration"
 msgstr "integración de facturación"
 
-#: core/models/tenant.py:63
+#: core/models/tenant.py:60
 msgid "e-nvoice token"
 msgstr "token de facturación"
 
-#: core/models/tenant.py:70
+#: core/models/tenant.py:67
 msgid "Tenant"
 msgstr "Compañía"
 
-#: core/models/tenant.py:71
+#: core/models/tenant.py:68
 msgid "Tenants"
 msgstr "Compañías"
 
@@ -2782,7 +3200,7 @@ msgid "Group"
 msgstr "Grupo"
 
 #. Translators: Grupos
-#: core/models/tenant_group.py:44 core/templates/core/base.html:222
+#: core/models/tenant_group.py:44 core/templates/core/base.html:232
 #: core/templates/core/base2.html:213
 msgid "Groups"
 msgstr "Grupos"
@@ -2807,36 +3225,36 @@ 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
+#: core/models/user.py:46 crm/models/agent.py:8 hr/models/common.py:52
 msgid "names"
 msgstr "nombre"
 
-#: core/models/user.py:44 hr/models/common.py:53
+#: core/models/user.py:47 crm/models/agent.py:9 hr/models/common.py:53
 msgid "last names"
 msgstr "apellidos"
 
-#: core/models/user.py:45
+#: core/models/user.py:48 crm/models/agent.py:12
 msgid "email address"
 msgstr "correo electrónico"
 
-#: core/models/user.py:47
+#: core/models/user.py:50
 msgid "language"
 msgstr "idioma"
 
-#: core/models/user.py:50
+#: core/models/user.py:53
 msgid "programmatic user"
 msgstr "usuario automatizado"
 
-#: core/models/user.py:52
+#: core/models/user.py:55
 msgid "staff status"
 msgstr "estado de personal"
 
-#: core/models/user.py:54
+#: core/models/user.py:57
 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
+#: core/models/user.py:63
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -2844,23 +3262,23 @@ 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
+#: core/models/user.py:67
 msgid "date joined"
 msgstr "fecha de incorporación"
 
-#: core/models/user.py:68
+#: core/models/user.py:71
 msgid "current tenant"
 msgstr "compañía actual"
 
-#: core/models/user.py:69
+#: core/models/user.py:72
 msgid "The default tenant for filtering the information"
 msgstr "La compañía predeterminada para filtrar la información"
 
-#: core/models/user.py:74
+#: core/models/user.py:77
 msgid "available tenants"
 msgstr "compañías disponibles"
 
-#: core/models/user.py:75
+#: core/models/user.py:78
 msgid ""
 "The tenants this user belongs to. The user can switch the default tenant "
 "between this tenants"
@@ -2868,16 +3286,17 @@ msgstr ""
 "Las compañías a las que pertenece este usuario. El usuario podrá cambiar su "
 "compañía predeterminada entre estas compañías"
 
-#: core/models/user.py:78
+#: core/models/user.py:81
 msgid "pin"
 msgstr "pin"
 
-#: core/models/user.py:92 lm/templates/lm/transaction_list.html:102
+#: core/models/user.py:95 lm/templates/lm/transaction_list.html:102
+#: pos/templates/pos/shift_list.html:45
 msgid "User"
 msgstr "Usuario"
 
 #. Translators: Usuarios
-#: core/models/user.py:93 core/templates/core/base.html:214
+#: core/models/user.py:96 core/templates/core/base.html:224
 #: core/templates/core/base2.html:205 core/templates/core/patch_base.html:189
 msgid "Users"
 msgstr "Usuarios"
@@ -2892,380 +3311,400 @@ msgid "can't switch to tenant because tenant is not active"
 msgstr "no se puede cambiar a la compañía porque la compañía no está activa"
 
 #. Translators: Transliterate
-#: core/templates/core/base.html:205 core/templates/core/base2.html:196
+#: core/templates/core/base.html:215 core/templates/core/base2.html:196
 msgid "Admin"
 msgstr "Administración"
 
 #. Translators: Transliterate
-#: core/templates/core/base.html:235
+#: core/templates/core/base.html:245
 msgid "Company"
 msgstr "Empresa"
 
 #. Translators: Transliterate
-#: core/templates/core/base.html:289 core/templates/core/base2.html:250
+#: core/templates/core/base.html:299 core/templates/core/base2.html:250
 msgid "CRM"
 msgstr "CRM"
 
 #. Translators: Clientes
-#: core/templates/core/base.html:298 core/templates/core/base2.html:259
+#: core/templates/core/base.html:308 crm/models/agent.py:52
+msgid "Agents"
+msgstr ""
+
+#. Translators: Clientes
+#: core/templates/core/base.html:316 core/templates/core/base2.html:259
 #: crm/models/customer.py:75
 msgid "Customers"
 msgstr "Clientes"
 
 #. Translators: Clientes
-#: core/templates/core/base.html:305
+#: core/templates/core/base.html:322
+#, fuzzy
+#| msgid "Customer Document"
+msgid "Customers Contact Logs"
+msgstr "Documento del Cliente"
+
+#. Translators: Clientes
+#: core/templates/core/base.html:330
+msgid "Appointments Calendar"
+msgstr ""
+
+#. Translators: Clientes
+#: core/templates/core/base.html:337
 msgid "Recivable Accounts"
 msgstr "Cuentas por cobrar"
 
 #. Translators: Compras
-#: core/templates/core/base.html:317 core/templates/core/base.html:342
+#: core/templates/core/base.html:349 core/templates/core/base.html:374
 #: core/templates/core/base2.html:272 core/templates/core/base2.html:297
-#: mm/models/purchase.py:195
+#: mm/models/purchase.py:200
 msgid "Purchases"
 msgstr "Compras"
 
 #. Translators: Aprobadores
-#: core/templates/core/base.html:326 core/templates/core/base2.html:281
+#: core/templates/core/base.html:358 core/templates/core/base2.html:281
 #: mm/models/approver.py:31
 msgid "Approvers"
 msgstr "Aprobadores"
 
 #. Translators: Proveedores
-#: core/templates/core/base.html:334 core/templates/core/base2.html:289
+#: core/templates/core/base.html:366 core/templates/core/base2.html:289
 #: mm/models/provider.py:83
 msgid "Providers"
 msgstr "Proveedores"
 
 #. Translators: Ordenes de Compra
-#: core/templates/core/base.html:350 core/templates/core/base2.html:305
+#: core/templates/core/base.html:382 core/templates/core/base2.html:305
 msgid "Purchase Orders"
 msgstr "Ordenes de Compra"
 
 #. Translators: Requisiciones de Compra
-#: core/templates/core/base.html:358 core/templates/core/base2.html:313
+#: core/templates/core/base.html:390 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:374 core/templates/core/base2.html:329
+#: core/templates/core/base.html:406 core/templates/core/base2.html:329
+#: pos/templates/pos/shift_detail_pill_overview.html:132
 msgid "Payments"
 msgstr "Pagos"
 
 #. Translators: Cuentas por Pagar
-#: core/templates/core/base.html:382 core/templates/core/base2.html:337
+#: core/templates/core/base.html:414 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:395 core/templates/core/base2.html:350
+#: core/templates/core/base.html:427 core/templates/core/base2.html:350
 msgid "Logistics Module"
 msgstr "Módulo de Logística"
 
 #. Translators: Bodegas
-#: core/templates/core/base.html:404 core/templates/core/base2.html:359
+#: core/templates/core/base.html:436 core/templates/core/base2.html:359
 #: lm/models/warehouse.py:40
 msgid "Warehouses"
 msgstr "Bodegas"
 
 #. Translators: Stock de Producto
-#: core/templates/core/base.html:412 lm/views/stock.py:21
+#: core/templates/core/base.html:444 lm/views/stock.py:21
 msgid "Product Stock"
 msgstr "Existencia de Productos"
 
 #. Translators: Stock en Bodega
-#: core/templates/core/base.html:420 lm/views/stock.py:9
+#: core/templates/core/base.html:452 lm/views/stock.py:9
 msgid "Warehouse Stock"
 msgstr "Inventario de Bodega"
 
 #. Translators: Stock en Bodega
-#: core/templates/core/base.html:428 lm/views/stock.py:33
+#: core/templates/core/base.html:460 lm/views/stock.py:33
 msgid "Stock Due"
 msgstr "Vencimiento de Inventario"
 
 #. Translators: Kardex
-#: core/templates/core/base.html:436 lm/views/stock_card.py:9
+#: core/templates/core/base.html:468 lm/views/stock_card.py:9
 msgid "Stock Card"
 msgstr "Kárdex"
 
 #. Translators: Productos
-#: core/templates/core/base.html:444 core/templates/core/base2.html:375
+#: core/templates/core/base.html:476 core/templates/core/base2.html:375
 msgid "Products, Services & Materials"
 msgstr "Productos, Servicios y Materiales"
 
 #. Translators: Presentacion
-#: core/templates/core/base.html:452 core/templates/core/base2.html:383
+#: core/templates/core/base.html:484 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/stock_due.html:68
+#: lm/templates/lm/shipment_detail.html:90
+#: lm/templates/lm/stock_by_warehouse.html:62 lm/templates/lm/stock_due.html:69
 #: lm/templates/lm/transaction_list.html:88
 msgid "Packaging"
 msgstr "Presentación"
 
 #. Translators: Traslados
-#: core/templates/core/base.html:460 core/templates/core/base2.html:391
-#: lm/models/shipment.py:67
+#: core/templates/core/base.html:492 core/templates/core/base2.html:391
+#: lm/models/shipment.py:91
 msgid "Shipments"
 msgstr "Traslados"
 
 #. Translators: Marcas
-#: core/templates/core/base.html:468 core/templates/core/base2.html:399
+#: core/templates/core/base.html:500 core/templates/core/base2.html:399
 #: lm/models/brand.py:24
 msgid "Brands"
 msgstr "Marcas"
 
 #. Translators: Categorias
-#: core/templates/core/base.html:476 core/templates/core/base2.html:407
+#: core/templates/core/base.html:508 core/templates/core/base2.html:407
 #: lm/models/category.py:40
 msgid "Categories"
 msgstr "Categorías"
 
 #. Translators: Tipologias
-#: core/templates/core/base.html:484 core/templates/core/base2.html:415
-#: lm/models/transaction.py:46
+#: core/templates/core/base.html:516 core/templates/core/base2.html:415
+#: lm/models/transaction.py:47
 msgid "Typologies"
 msgstr "Tipologías"
 
 #. Translators: Ajuste de Existencia
-#: core/templates/core/base.html:492 core/templates/core/base2.html:423
+#: core/templates/core/base.html:524 core/templates/core/base2.html:423
 #: lm/views/stock.py:41
 msgid "Stock Adjust"
 msgstr "Ajuste de Inventario"
 
 #. Translators: Ordenes de Abastecimiento
-#: core/templates/core/base.html:500 core/templates/core/base2.html:431
-#: lm/models/supply_order.py:59
+#: core/templates/core/base.html:532 core/templates/core/base2.html:431
+#: lm/models/supply_order.py:60
 msgid "Supply Orders"
 msgstr "Órdenes de Suministo"
 
 #. Translators: Ordenes de Abastecimiento
-#: core/templates/core/base.html:508 core/templates/core/base2.html:439
+#: core/templates/core/base.html:540 core/templates/core/base2.html:439
 msgid "Supply Orders Consolidation"
 msgstr "Consolidación de Órdenes de Suministro"
 
 #. Translators: Modulo de Manufactura
-#: core/templates/core/base.html:521 core/templates/core/base2.html:452
+#: core/templates/core/base.html:553 core/templates/core/base2.html:452
 msgid "Manufacturing"
 msgstr "Manufacturando"
 
 #. Translators: Producto Combo
-#: core/templates/core/base.html:530 core/templates/core/base2.html:461
+#: core/templates/core/base.html:562 core/templates/core/base2.html:461
 #: mnf/templates/mnf/bundle_list.html:21
 msgid "Bundles"
 msgstr "Productos Bundles"
 
 #. Translators: Orden de Manufactura
-#: core/templates/core/base.html:538 core/templates/core/base2.html:469
-#: mnf/models/mo.py:75 mnf/models/mo.py:169
+#: core/templates/core/base.html:570 core/templates/core/base2.html:469
+#: mnf/models/mo.py:88 mnf/models/mo.py:201
 msgid "Manufacturing Orders"
 msgstr "Ordenes de Manufactura"
 
 #. Translators: Contabilidad
-#: core/templates/core/base.html:551 core/templates/core/base2.html:482
+#: core/templates/core/base.html:583 core/templates/core/base2.html:482
 msgid "Accounting"
 msgstr "Contabilidad"
 
 #. Translators: Partidas Contables
-#: core/templates/core/base.html:607 core/templates/core/base2.html:540
+#: core/templates/core/base.html:639 core/templates/core/base2.html:540
 #: core/templates/core/patch_base.html:213
 msgid "All Policies"
 msgstr "Todas las Partidas Contables"
 
+#. Translators: Partidas Pendientes
+#: core/templates/core/base.html:647
+#, fuzzy
+#| msgid "Policies"
+msgid "Pending Policies"
+msgstr "Partidas Contables"
+
 #. Translators: Partida de Compras
-#: core/templates/core/base.html:615 core/templates/core/base2.html:548
+#: core/templates/core/base.html:655 core/templates/core/base2.html:548
 msgid "Purchases Policy"
 msgstr "Partidas de Compras"
 
 #. Translators: Partida de Ventas
-#: core/templates/core/base.html:623 core/templates/core/base2.html:556
+#: core/templates/core/base.html:663 core/templates/core/base2.html:556
 msgid "Sales Policy"
 msgstr "Partidas de Ventas"
 
-#: core/templates/core/base.html:627
+#: core/templates/core/base.html:667
 msgid "Books"
 msgstr "Libros"
 
 #. Translators: Partidas Contables
-#: core/templates/core/base.html:631
+#: core/templates/core/base.html:671
 msgid "Taxpayer Sales"
 msgstr "Ventas del Contribuyente"
 
 #. Translators: Partidas Contables
-#: core/templates/core/base.html:637
+#: core/templates/core/base.html:677
 msgid "End Consumer Sales"
 msgstr "Ventas a Consumidor Final"
 
-#: core/templates/core/base.html:640 core/templates/core/base2.html:560
+#: core/templates/core/base.html:680 core/templates/core/base2.html:560
 msgid "Financial Reports"
 msgstr "Reportes Financieros"
 
 #. Translators: Movimiento de Cuenta
-#: core/templates/core/base.html:645 core/templates/core/base2.html:507
+#: core/templates/core/base.html:685 core/templates/core/base2.html:507
 msgid "Account Activity Detail"
 msgstr "Detalle de la Actividad de la Cuenta"
 
 #. Translators: Balance General
-#: core/templates/core/base.html:658 core/templates/core/base2.html:570
+#: core/templates/core/base.html:698 core/templates/core/base2.html:570
 msgid "Balance Sheet"
 msgstr "Balance General"
 
 #. Translators: Estado de Resultados
-#: core/templates/core/base.html:664 core/templates/core/base2.html:576
+#: core/templates/core/base.html:704 core/templates/core/base2.html:576
 msgid "P&L Statement"
 msgstr "Estado de Resultados (Pérdidas y Ganancias)"
 
 #. Translators: Libro Diario
-#: core/templates/core/base.html:676 core/templates/core/base2.html:588
+#: core/templates/core/base.html:716 core/templates/core/base2.html:588
 msgid "Ledger Book"
 msgstr "Libro Mayor"
 
 #. Translators: Libro Diario Mayor
-#: core/templates/core/base.html:682
+#: core/templates/core/base.html:722
 msgid "Journal Ledger"
 msgstr "Libro Diario Mayor"
 
 #. Translators: Libro Mayor Auxiliar
-#: core/templates/core/base.html:688
+#: core/templates/core/base.html:728
 msgid "Auxiliary Ledger"
 msgstr "Libro Auxiliar"
 
 #. Translators: Tesoreria
-#: core/templates/core/base.html:700 core/templates/core/base2.html:600
+#: core/templates/core/base.html:740 core/templates/core/base2.html:600
 msgid "Treasury"
 msgstr "Tesorería"
 
 #. Translators: Cheque o Transferencia
-#: core/templates/core/base.html:733 core/templates/core/base2.html:633
+#: core/templates/core/base.html:773 core/templates/core/base2.html:633
 msgid "Check or Transfer"
 msgstr "Cheque o Transferencia"
 
 #. Translators: Estado de Cuenta
-#: core/templates/core/base.html:741 core/templates/core/base2.html:641
+#: core/templates/core/base.html:781 core/templates/core/base2.html:641
 msgid "Bank Statement"
 msgstr "Estado de Cuenta"
 
 #. Translators: Transliterate
-#: core/templates/core/base.html:754 core/templates/core/base2.html:654
+#: core/templates/core/base.html:794 core/templates/core/base2.html:654
 msgid "RRHH"
 msgstr "HR"
 
-#: core/templates/core/base.html:760
+#: core/templates/core/base.html:800
 msgid "Administracion"
 msgstr ""
 
 #. Translators: Departamentos
-#: core/templates/core/base.html:764
+#: core/templates/core/base.html:804
 msgid "Accion de Personal"
 msgstr ""
 
 #. Translators: Departamentos
-#: core/templates/core/base.html:770
+#: core/templates/core/base.html:810
 msgid "Plazas"
 msgstr ""
 
 #. Translators: Departamentos
-#: core/templates/core/base.html:776
+#: core/templates/core/base.html:816
 msgid "Aspirantes"
 msgstr ""
 
 #. Translators: Departamentos
-#: core/templates/core/base.html:782
+#: core/templates/core/base.html:822
 msgid "Preseleccion"
 msgstr ""
 
 #. Translators: Departamentos
-#: core/templates/core/base.html:788
+#: core/templates/core/base.html:828
 msgid "Seleccion"
 msgstr ""
 
 #. Translators: Departamentos
-#: core/templates/core/base.html:794
+#: core/templates/core/base.html:834
 msgid "Contrataciones"
 msgstr ""
 
-#: core/templates/core/base.html:797
+#: core/templates/core/base.html:837
 msgid "Operacion"
 msgstr ""
 
 #. Translators: Empleados
-#: core/templates/core/base.html:801 core/templates/core/base2.html:663
+#: core/templates/core/base.html:841 core/templates/core/base2.html:663
 #: hr/models/common.py:113
 msgid "Employees"
 msgstr "Empleados"
 
 #. Translators: Departamentos
-#: core/templates/core/base.html:809 core/templates/core/base2.html:671
+#: core/templates/core/base.html:849 core/templates/core/base2.html:671
 #: hr/models/common.py:21
 msgid "Departments"
 msgstr "Departamentos"
 
 #. Translators: Cargos
-#: core/templates/core/base.html:817 core/templates/core/base2.html:679
+#: core/templates/core/base.html:857 core/templates/core/base2.html:679
 #: hr/models/common.py:43
 msgid "Job Titles"
 msgstr "Cargos"
 
 #. Translators: Cargos
 #. Translators: Descuentos
-#: core/templates/core/base.html:825 core/templates/core/base.html:923
+#: core/templates/core/base.html:865 core/templates/core/base.html:949
 #: core/templates/core/base2.html:763
 msgid "Descuentos"
 msgstr ""
 
 #. Translators: Cargos
-#: core/templates/core/base.html:833
+#: core/templates/core/base.html:873
 msgid "Planillas"
 msgstr ""
 
 #. Translators: Cargos
-#: core/templates/core/base.html:839
+#: core/templates/core/base.html:879
 msgid "Organigrama"
 msgstr ""
 
 #. Translators: PoS
-#: core/templates/core/base.html:852 core/templates/core/base.html:861
+#: core/templates/core/base.html:892 core/templates/core/base.html:909
 #: core/templates/core/base2.html:692 core/templates/core/base2.html:701
 #: core/templates/core/patch_base.html:231
 msgid "PoS"
 msgstr "Punto de Venta"
 
 #. Translators: Correlativos
-#: core/templates/core/base.html:869 core/templates/core/base2.html:709
+#: core/templates/core/base.html:917 core/templates/core/base2.html:709
 #: core/templates/core/patch_base.html:237
 msgid "Correlatives"
 msgstr "Correlativos"
 
-#. Translators: Ventas
-#: core/templates/core/base.html:882 core/templates/core/base2.html:722
-msgid "Sales"
-msgstr "Ventas"
-
-#. Translators: Ofertas
-#: core/templates/core/base.html:936 core/templates/core/base.html:945
-#: 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:92 offer/templates/offer/offer_list.html:21
-msgid "Offers"
-msgstr "Ofertas"
+#. Translators: Correlativos
+#: core/templates/core/base.html:925 pos/models/shift.py:43
+#, fuzzy
+#| msgid "Shift Date"
+msgid "Shifts"
+msgstr "Fecha de Turno"
 
 #. Translators: Grupo de Opciones
-#: core/templates/core/base.html:953 core/templates/core/base2.html:793
+#: core/templates/core/base.html:979 core/templates/core/base2.html:793
 msgid "Options Groups"
 msgstr "Opciones de Grupos"
 
 #. Translators: Grupo de Attributos
-#: core/templates/core/base.html:961 core/templates/core/base2.html:801
+#: core/templates/core/base.html:987 core/templates/core/base2.html:801
 #: offer/models/attributes.py:23
 #: offer/templates/offer/attributesgroup_list.html:21
 msgid "Attributes Groups"
 msgstr "Atributos de Grupos"
 
-#: core/templates/core/base.html:973 core/templates/core/base2.html:813
+#: core/templates/core/base.html:999 core/templates/core/base2.html:813
 msgid "Sync"
 msgstr "Sincronizar"
 
 #. Translators: Registros
-#: core/templates/core/base.html:982 core/templates/core/base2.html:822
+#: core/templates/core/base.html:1008 core/templates/core/base2.html:822
 #: sync/models.py:78 sync/models.py:121
 msgid "Records"
 msgstr "Registros"
@@ -3275,16 +3714,10 @@ msgstr "Registros"
 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:32
-#: lm/templates/lm/supplyorder_consolidation_form.html:29
-#: lm/templates/lm/transaction_list.html:34
-#: lm/views/supply_order_consolidation.py:90
-msgid "Stock"
-msgstr "Inventario"
+#. Translators: Ventas
+#: core/templates/core/base2.html:722
+msgid "Sales"
+msgstr "Ventas"
 
 #: core/templates/core/branch_list.html:45
 msgid "BKNumber"
@@ -3298,17 +3731,20 @@ msgstr "Acciones"
 msgid "Display Name"
 msgstr "Nombre de Visualización"
 
-#: core/templates/core/user_list.html:44
+#: core/templates/core/user_list.html:44 crm/templates/crm/agent_list.html:48
+#: crm/templates/crm/contactlog_list.html:50
 #: crm/templates/crm/customer_list.html:48
 #: mm/templates/mm/provider/provider_list.html:47
 msgid "Email"
 msgstr "Correo Electrónico"
 
-#: core/templates/core/user_list.html:45 hr/templates/hr/employee_list.html:45
+#: core/templates/core/user_list.html:45 crm/templates/crm/agent_list.html:45
+#: hr/templates/hr/employee_list.html:45
 msgid "Names"
 msgstr "Nombres"
 
-#: core/templates/core/user_list.html:46 hr/templates/hr/employee_list.html:46
+#: core/templates/core/user_list.html:46 crm/templates/crm/agent_list.html:46
+#: hr/templates/hr/employee_list.html:46
 msgid "Last Names"
 msgstr "Apellidos"
 
@@ -3323,15 +3759,196 @@ msgstr ""
 msgid "Customer Relationship Management"
 msgstr "Administración de la Relación con el Cliente"
 
+#: crm/models/agent.py:11
+#, fuzzy
+#| msgid "phone_number"
+msgid "phone number"
+msgstr "número de telefono"
+
+#: crm/models/agent.py:16 hr/models/common.py:64
+msgid "system user"
+msgstr "usuario del sistema"
+
+#: crm/models/agent.py:32 hr/models/common.py:96
+msgid "manager"
+msgstr ""
+
+#: crm/models/agent.py:51 crm/templates/crm/contactlog_list.html:45
+msgid "Agent"
+msgstr ""
+
+#: crm/models/appointment.py:11 lm/models/supply_order.py:10
+msgid "requested"
+msgstr "solicitado"
+
+#: crm/models/appointment.py:12
+msgid "planned"
+msgstr ""
+
+#: crm/models/appointment.py:15
+msgid "finalized"
+msgstr ""
+
+#: crm/models/appointment.py:21
+msgid "Reject"
+msgstr ""
+
+#: crm/models/appointment.py:22
+msgid "Accept"
+msgstr "Aceptar"
+
+#: crm/models/appointment.py:26
+msgid "Begin"
+msgstr ""
+
+#: crm/models/appointment.py:30
+msgid "Complete"
+msgstr "Completar"
+
+#: crm/models/appointment.py:39
+msgid "Doctor"
+msgstr ""
+
+#: crm/models/appointment.py:45
+msgid "Patient"
+msgstr ""
+
+#: crm/models/appointment.py:48
+#, fuzzy
+#| msgid "end date"
+msgid "booked date"
+msgstr "fecha de fin"
+
+#: crm/models/appointment.py:49
+#, fuzzy
+#| msgid "created date"
+msgid "estimated end date"
+msgstr "creado por"
+
+#: crm/models/appointment.py:50
+#, fuzzy
+#| msgid "start date"
+msgid "started date"
+msgstr "fecha de inicio"
+
+#: crm/models/appointment.py:51
+#, fuzzy
+#| msgid "end date"
+msgid "ended date"
+msgstr "fecha de fin"
+
+#: crm/models/appointment.py:112
+#, fuzzy
+#| msgid "increment"
+msgid "Appointment"
+msgstr "incremento"
+
+#: crm/models/appointment.py:113
+#, fuzzy
+#| msgid "Departments"
+msgid "Appointments"
+msgstr "Departamentos"
+
+#: crm/models/appointment.py:116
+#, fuzzy
+#| msgid "Can accept Shipment"
+msgid "Can accept Appointment"
+msgstr "Puede aceptar Traslado"
+
+#: crm/models/appointment.py:117
+msgid "Can reject Appointment"
+msgstr ""
+
+#: crm/models/appointment.py:118
+#, fuzzy
+#| msgid "Can cancel Invoice"
+msgid "Can cancel Appointment"
+msgstr "Puede Cancelar Facturas"
+
+#: crm/models/appointment.py:119
+#, fuzzy
+#| msgid "Can accept Shipment"
+msgid "Can start Appointment"
+msgstr "Puede aceptar Traslado"
+
+#: crm/models/appointment.py:120
+#, fuzzy
+#| msgid "Can accept Shipment"
+msgid "Can complete Appointment"
+msgstr "Puede aceptar Traslado"
+
+#: crm/models/appointment.py:121
+msgid "Can view all Appointments"
+msgstr ""
+
+#: crm/models/contact_log.py:18
+msgid "agent"
+msgstr ""
+
+#: crm/models/contact_log.py:22
+#, fuzzy
+#| msgid "date started"
+msgid "date visited"
+msgstr "fecha de inicio"
+
+#: crm/models/contact_log.py:23
+msgid "date next visit"
+msgstr ""
+
+#: crm/models/contact_log.py:24
+#, fuzzy
+#| msgid "last name"
+msgid "contact name"
+msgstr "apellido"
+
+#: crm/models/contact_log.py:25
+msgid "contact phone"
+msgstr ""
+
+#: crm/models/contact_log.py:26
+msgid "contact email"
+msgstr ""
+
+#: crm/models/contact_log.py:30 lm/models/offer.py:11 lm/models/packaging.py:12
+#: lm/models/product.py:12 lm/models/product.py:175 lm/models/stock.py:58
+#: lm/models/supply_order.py:93 lm/models/transaction.py:118
+#: mm/models/purchase.py:545 mm/models/purchase_order.py:150
+#: mm/models/purchase_requisition.py:123 mnf/models/mo.py:185
+#: offer/models/offer_options_group.py:52
+msgid "product"
+msgstr "producto"
+
+#: crm/models/contact_log.py:33
+#, fuzzy
+#| msgid "Fiscal Documents"
+msgid "visit comments"
+msgstr "Documentos Fiscales"
+
+#: crm/models/contact_log.py:35
+msgid "comments for next visit"
+msgstr ""
+
+#: crm/models/contact_log.py:49
+#, fuzzy
+#| msgid "Customer"
+msgid "Customer Log"
+msgstr "Cliente"
+
+#: crm/models/contact_log.py:50
+#, fuzzy
+#| msgid "Customers"
+msgid "Customer Logs"
+msgstr "Clientes"
+
 #: crm/models/customer.py:13
 msgid "collection day must be equal or lower than 31"
 msgstr "el día de cobro debe ser igual o menor a 31"
 
-#: crm/models/customer.py:18 mm/models/provider.py:9 mm/models/purchase.py:27
+#: crm/models/customer.py:18 mm/models/provider.py:9 mm/models/purchase.py:32
 msgid "Credito"
 msgstr ""
 
-#: crm/models/customer.py:19 mm/models/provider.py:10 mm/models/purchase.py:28
+#: crm/models/customer.py:19 mm/models/provider.py:10 mm/models/purchase.py:33
 msgid "Contado"
 msgstr ""
 
@@ -3356,6 +3973,48 @@ msgstr "día de cobro"
 msgid "tax profile"
 msgstr "perfil tributario"
 
+#: crm/templates/crm/agent_list.html:47
+#, fuzzy
+#| msgid "phone_number"
+msgid "Phone Number"
+msgstr "número de telefono"
+
+#: crm/templates/crm/appointment_calendar.html:33
+msgid "Select Agent"
+msgstr ""
+
+#: crm/templates/crm/contactlog_list.html:46
+#, fuzzy
+#| msgid "Shift Date"
+msgid "Visit Date"
+msgstr "Fecha de Turno"
+
+#: crm/templates/crm/contactlog_list.html:47
+msgid "Next Visit Date"
+msgstr ""
+
+#: crm/templates/crm/contactlog_list.html:48
+msgid "Contact"
+msgstr ""
+
+#: crm/templates/crm/contactlog_list.html:49
+#, fuzzy
+#| msgid "phone"
+msgid "Phone"
+msgstr "teléfono"
+
+#: crm/templates/crm/contactlog_list.html:51 lm/forms.py:25 lm/forms.py:201
+#: lm/forms.py:239 lm/forms.py:271 lm/models/product.py:112
+#: 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:63
+#: lm/templates/lm/supplyorder_form.html:51 mm/forms.py:109 mm/forms.py:154
+#: mm/forms.py:194 mm/templates/mm/purchase_form_bk.html:144
+#: mnf/templates/mnf/manufacturingorder_detail.html:131
+msgid "Product"
+msgstr "Producto"
+
 #: crm/templates/crm/customer_list.html:45
 #: mm/templates/mm/provider/provider_list.html:46
 msgid "Company Name"
@@ -3377,12 +4036,6 @@ msgstr "sincronizar"
 msgid "processed"
 msgstr "procesada"
 
-#: 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
 msgid "Issued Document"
 msgstr "Documento Emitido"
@@ -3395,7 +4048,7 @@ msgstr "Documentos Emitidos"
 msgid "path"
 msgstr "ruta"
 
-#: files/models.py:12 mm/models/purchase.py:115 mm/models/purchase.py:123
+#: files/models.py:12 mm/models/purchase.py:120 mm/models/purchase.py:128
 #: sync/models.py:61
 msgid "file"
 msgstr "archivo"
@@ -3440,10 +4093,6 @@ msgstr "número de afiliación AFP"
 msgid "phone_number"
 msgstr "número de telefono"
 
-#: hr/models/common.py:64
-msgid "system user"
-msgstr "usuario del sistema"
-
 #: hr/models/common.py:80
 msgid "department"
 msgstr "departamento"
@@ -3452,10 +4101,6 @@ msgstr "departamento"
 msgid "job title"
 msgstr "cargo"
 
-#: hr/models/common.py:96
-msgid "manager"
-msgstr ""
-
 #: hr/models/common.py:112
 msgid "Employee"
 msgstr "Empleado"
@@ -3468,46 +4113,46 @@ msgstr "Historial de Conversión"
 msgid "Created"
 msgstr "Creado"
 
-#: lm/admin.py:80
+#: lm/admin.py:85
 #, python-format
 msgid "%d shipment was successfully sent."
 msgid_plural "%d shipments were successfully sent."
 msgstr[0] "%d traslado ha sido enviado con éxito."
 msgstr[1] "%d embarques ha sido enviados exitosamente."
 
-#: lm/admin.py:85
+#: lm/admin.py:90
 msgid "Send Selected Shipments"
 msgstr "Enviar Traslado Seleccionado"
 
-#: lm/admin.py:91
+#: lm/admin.py:96
 #, python-format
 msgid "%d shipment was successfully accepted."
 msgid_plural "%d shipments were successfully accepted."
 msgstr[0] "%d traslado ha sido aceptado con éxito."
 msgstr[1] "%d embarques han sido aceptados exitosamente."
 
-#: lm/admin.py:96
+#: lm/admin.py:101
 msgid "Accept Selected Shipments"
 msgstr "Aceptar Traslados Seleccionados"
 
-#: lm/api/serializers/serializers.py:104
+#: lm/api/serializers/serializers.py:106
 msgid "quantity must be greater than zero"
 msgstr "la cantidad debe ser mayor que cero"
 
-#: lm/api/serializers/serializers.py:106
+#: lm/api/serializers/serializers.py:108
 msgid "product does not belongs to user's tenant"
 msgstr "el producto no pertenece al usuario de la compañía"
 
-#: lm/api/serializers/serializers.py:120
+#: lm/api/serializers/serializers.py:122
 #, python-format
 msgid "user is not assigned to warehouse %(warehouse)s"
 msgstr "el usuario no esta asignado a la bodega %(warehouse)s"
 
-#: lm/api/serializers/serializers.py:129
+#: lm/api/serializers/serializers.py:131
 msgid "product was specified more than once"
 msgstr "el producto fue especificado mas de una vez"
 
-#: lm/api/serializers/serializers.py:154
+#: lm/api/serializers/serializers.py:158
 #, python-format
 msgid ""
 "requested quantity (%(quantity)s) is greater than available stock "
@@ -3518,7 +4163,7 @@ msgstr ""
 "(%(available)s)\n"
 "por producto (%(product)s)"
 
-#: lm/api/serializers/serializers.py:165
+#: lm/api/serializers/serializers.py:171
 #, python-format
 msgid ""
 "product %(code)s \n"
@@ -3529,24 +4174,30 @@ msgstr ""
 "el producto %(code)s no esta disponible en el inventario para la bodega\n"
 "%(warehouse)s"
 
-#: lm/api/serializers/serializers.py:235 lm/api/serializers/transaction.py:50
+#: lm/api/serializers/serializers.py:245 lm/api/serializers/transaction.py:50
 msgid "user is not assigned to warehouse"
 msgstr "el usuario no esta asignado a la bodega"
 
-#: lm/api/serializers/serializers.py:238
+#: lm/api/serializers/serializers.py:248
 msgid "warehouse's tenant is not same typology's tenant"
 msgstr ""
 "la compañía de la bodega no es la misma que la compañía de la tipología"
 
-#: lm/api/serializers/serializers.py:250
+#: lm/api/serializers/serializers.py:260
 #, python-format
 msgid "product (%(product)s) does not exists"
 msgstr "el producto (%(product)s) no existe"
 
-#: lm/api/serializers/supply_order.py:43
+#: lm/api/serializers/supply_order.py:45
 msgid "user does not belongs to requested branch"
 msgstr "el usuario no pertenece a la sucursal solicitada"
 
+#: lm/api/serializers/supply_order.py:80 lm/api/serializers/supply_order.py:100
+#, fuzzy
+#| msgid "purchase order does not belongs to the user's tenant"
+msgid "supply order does not belongs to same user's tenant"
+msgstr "orden de compra no pertenece a la compañía del usuario"
+
 #: lm/api/serializers/transaction.py:52
 msgid "user and product do not belong to same tenant"
 msgstr "el usuario y producto no pertenecen a la misma compañía"
@@ -3555,27 +4206,16 @@ msgstr "el usuario y producto no pertenecen a la misma compañía"
 msgid "Logistic Module"
 msgstr "Módulo de Logística"
 
-#: lm/forms.py:25 lm/forms.py:182 lm/forms.py:220 lm/forms.py:251
-#: lm/models/product.py:101 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:109 mm/forms.py:154
-#: mm/forms.py:194 mm/templates/mm/purchase_form_bk.html:144
-#: mnf/templates/mnf/manufacturingorder_detail.html:119
-msgid "Product"
-msgstr "Producto"
-
-#: lm/forms.py:171 lm/templates/lm/shipment_list.html:45
+#: lm/forms.py:190 lm/templates/lm/shipment_list.html:45
 msgid "Destiny Warehouse"
 msgstr "Bodega de Destino"
 
-#: lm/forms.py:176 lm/templates/lm/shipment_list.html:44
+#: lm/forms.py:195 lm/templates/lm/shipment_list.html:44
 msgid "Origin Warehouse"
 msgstr "Bodega de Origen"
 
-#: lm/forms.py:210 lm/forms.py:246 lm/models/warehouse.py:39
-#: lm/templates/lm/transaction_list.html:89 mm/forms.py:93
+#: lm/forms.py:229 lm/forms.py:266 lm/models/warehouse.py:39
+#: lm/templates/lm/transaction_list.html:89
 #: mm/templates/mm/purchase_form_items.html:193
 #: mnf/templates/mnf/manufacturingorder_detail.html:27
 #: mnf/templates/mnf/manufacturingorder_form.html:83
@@ -3583,13 +4223,13 @@ msgstr "Bodega de Origen"
 msgid "Warehouse"
 msgstr "Bodega"
 
-#: lm/forms.py:215 lm/models/transaction.py:45
+#: lm/forms.py:234 lm/models/transaction.py:46
 #: lm/templates/lm/transaction_list.html:90
 msgid "Typology"
 msgstr "Tipología"
 
 #: lm/models/brand.py:23 lm/templates/lm/product_list.html:49
-#: lm/templates/lm/stock_by_warehouse.html:64 lm/templates/lm/stock_due.html:70
+#: lm/templates/lm/stock_by_warehouse.html:64 lm/templates/lm/stock_due.html:71
 #: mnf/templates/mnf/bundle_list.html:48
 msgid "Brand"
 msgstr "Marca"
@@ -3614,7 +4254,7 @@ msgstr "Elemento del paquete"
 msgid "Bundle Items"
 msgstr "Elementos del paquete"
 
-#: lm/models/bundle_item.py:45 mnf/models/mo.py:181
+#: lm/models/bundle_item.py:45 mnf/models/mo.py:217
 msgid "product must be bundle type"
 msgstr "el producto debe ser tipo paquete"
 
@@ -3628,32 +4268,24 @@ 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:39 lm/templates/lm/product_list.html:48
-#: lm/templates/lm/stock_by_warehouse.html:63 lm/templates/lm/stock_due.html:69
+#: lm/templates/lm/stock_by_warehouse.html:63 lm/templates/lm/stock_due.html:70
 #: 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:12
-#: lm/models/stock.py:54 lm/models/supply_order.py:92
-#: lm/models/transaction.py:102 mm/models/purchase.py:439
-#: mm/models/purchase_order.py:150 mm/models/purchase_requisition.py:123
-#: mnf/models/mo.py:155 offer/models/offer_options_group.py:52
-msgid "product"
-msgstr "producto"
-
-#: lm/models/offer.py:14 offer/models/offer.py:153
+#: lm/models/offer.py:14 offer/models/offer.py:172
 msgid "start range"
 msgstr "inicio de rango"
 
-#: lm/models/offer.py:15 offer/models/offer.py:156
+#: lm/models/offer.py:15 offer/models/offer.py:175
 msgid "end range"
 msgstr "fin de rango"
 
-#: lm/models/offer.py:16 offer/models/offer.py:159
+#: lm/models/offer.py:16 offer/models/offer.py:178
 msgid "unit price"
 msgstr "precio unitario"
 
-#: lm/models/offer.py:34 offer/models/offer.py:178
+#: lm/models/offer.py:34 offer/models/offer.py:197
 msgid "start range and end range must be provided"
 msgstr "inicio y final para el rango es obligatorio"
 
@@ -3665,13 +4297,6 @@ msgstr "reemplazar rangos para el producto"
 msgid "sku"
 msgstr "sku"
 
-#: lm/models/packaging.py:16 lm/models/product.py:23
-#: lm/models/shipment_item.py:17 mm/models/purchase.py:444
-#: 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:19
 msgid "is available for supply order"
 msgstr "está disponible para la orden de suministro"
@@ -3696,9 +4321,9 @@ msgstr "gasto"
 msgid "unit"
 msgstr "unidad"
 
-#: lm/models/product.py:19 lm/models/stock.py:74 lm/models/transaction.py:88
-#: mm/models/purchase.py:445 mm/models/purchase_order.py:154
-#: mm/models/purchase_requisition.py:127 mnf/models/mo.py:59
+#: lm/models/product.py:19 lm/models/stock.py:78 lm/models/transaction.py:104
+#: mm/models/purchase.py:551 mm/models/purchase_order.py:154
+#: mm/models/purchase_requisition.py:127 mnf/models/mo.py:64
 msgid "lot"
 msgstr "lote"
 
@@ -3714,11 +4339,11 @@ msgstr "tipo comercial"
 msgid "logical type"
 msgstr "tipo lógico"
 
-#: lm/models/product.py:30 lm/models/stock.py:69 lm/models/transaction.py:77
+#: lm/models/product.py:30 lm/models/stock.py:73 lm/models/transaction.py:78
 msgid "average cost"
 msgstr "costo promedio"
 
-#: lm/models/product.py:32 lm/models/stock.py:95
+#: lm/models/product.py:32 lm/models/stock.py:99
 msgid "bundle"
 msgstr "paquete"
 
@@ -3746,11 +4371,23 @@ msgstr "categoría"
 msgid "default stock display"
 msgstr "visualización predeterminada del inventario"
 
-#: lm/models/product.py:102
+#: lm/models/product.py:90
+#, fuzzy
+#| msgid "item product"
+msgid "similar products"
+msgstr "artículo del producto"
+
+#: lm/models/product.py:95
+#, fuzzy
+#| msgid "related object"
+msgid "related products"
+msgstr "objeto relacionado"
+
+#: lm/models/product.py:113
 msgid "Products"
 msgstr "Productos"
 
-#: lm/models/product.py:137 offer/models/offer.py:134
+#: lm/models/product.py:148 offer/models/offer.py:142
 #, python-format
 msgid ""
 "there is no offer configured for product %(product)s with quantity "
@@ -3759,221 +4396,257 @@ msgstr ""
 "no hay oferta configurada para el producto %(product)s con cantidad "
 "%(quantity)s"
 
-#: lm/models/shipment.py:14 lm/models/stock.py:22
+#: lm/models/product.py:184
+msgid "Product Formula Component"
+msgstr ""
+
+#: lm/models/product.py:185
+msgid "Product Formula Components"
+msgstr ""
+
+#: lm/models/shipment.py:21 lm/models/stock.py:26
 msgid "in transit"
 msgstr "en tránsito"
 
-#: lm/models/shipment.py:15
+#: lm/models/shipment.py:22
 msgid "accepted"
 msgstr "aceptado"
 
-#: lm/models/shipment.py:19
+#: lm/models/shipment.py:25 mm/models/purchase.py:135
+msgid "for date"
+msgstr "para la fecha"
+
+#: lm/models/shipment.py:27
 msgid "date accepted"
 msgstr "fecha de aceptación"
 
-#: lm/models/shipment.py:32 lm/models/stock.py:36 mm/models/purchase.py:99
-#: mnf/models/mo.py:40
+#: lm/models/shipment.py:40 lm/models/stock.py:40 mm/models/purchase.py:104
+#: mnf/models/mo.py:45
 msgid "modified by"
 msgstr "modificado por"
 
-#: lm/models/shipment.py:40
+#: lm/models/shipment.py:48
 msgid "accepted by"
 msgstr "aceptado por"
 
-#: lm/models/shipment.py:51
+#: lm/models/shipment.py:59 lm/models/shipment.py:74
 msgid "warehouse from"
 msgstr "bodega de origen"
 
-#: lm/models/shipment.py:57
+#: lm/models/shipment.py:65
 msgid "warehouse to"
 msgstr "bodega de destino"
 
-#: lm/models/shipment.py:61 lm/models/shipment_item.py:36
+#: lm/models/shipment.py:69 lm/models/shipment_item.py:61
 msgid "total cost"
 msgstr "costo total"
 
-#: lm/models/shipment.py:66
+#: lm/models/shipment.py:90
 msgid "Shipment"
 msgstr "Traslado"
 
-#: lm/models/shipment.py:69
+#: lm/models/shipment.py:93
 msgid "Can send Shipment"
 msgstr "Puede enviar Traslado"
 
-#: lm/models/shipment.py:70
+#: lm/models/shipment.py:94
 msgid "Can accept Shipment"
 msgstr "Puede aceptar Traslado"
 
-#: lm/models/shipment.py:76
+#: lm/models/shipment.py:100
 msgid "origin warehouse is same destiny warehouse"
 msgstr "la bodega de origen es la misma que la bodega de destino"
 
-#: lm/models/shipment.py:78
+#: lm/models/shipment.py:102
 msgid "shipment document must be provided"
 msgstr "el documento de traslado es obligatorio"
 
-#: lm/models/shipment.py:86
+#: lm/models/shipment.py:110
 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:97
+#: lm/models/shipment.py:118
 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:13 lm/models/stock.py:79
+#: lm/models/shipment_item.py:26 lm/models/stock.py:83
 msgid "shipment"
 msgstr "traslado"
 
-#: lm/models/shipment_item.py:21 lm/models/transaction.py:94
+#: lm/models/shipment_item.py:34 lm/models/transaction.py:110
 msgid "stock"
 msgstr "existencia"
 
-#: lm/models/shipment_item.py:27
+#: lm/models/shipment_item.py:42 lm/models/shipment_item.py:50
 msgid "packaging"
 msgstr "embalaje"
 
-#: lm/models/shipment_item.py:31
+#: lm/models/shipment_item.py:56
 msgid "converted quantity"
 msgstr "cantidad convertida"
 
-#: lm/models/shipment_item.py:43
+#: lm/models/shipment_item.py:69
 msgid "Shipment Item"
 msgstr "Ítem de Traslado"
 
-#: lm/models/shipment_item.py:44
+#: lm/models/shipment_item.py:70
 msgid "Shipment Items"
 msgstr "Ítems de Traslado"
 
-#: lm/models/shipment_item.py:50
+#: lm/models/shipment_item.py:77
 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:19 pos/models/fiscal_correlative.py:10
+#: lm/models/shipment_item.py:91
+#, fuzzy, python-format
+#| msgid "available quantity is less than requested quantity"
+msgid ""
+"product %(product)s available quantity (%(available)s) is less than "
+"requested quantity (%(requested)s)"
+msgstr "cantidad disponible es menor que la cantidad solicitada"
+
+#: lm/models/shipment_item.py:125
+#, fuzzy, python-format
+#| msgid "there is no available stock for product with given code %(code)s"
+msgid "there is no available stock for %(product)s in this %(warehouse)s"
+msgstr "no hay existencia disponible para el producto con codigo %(code)s"
+
+#: lm/models/stock.py:22 pos/models/fiscal_correlative.py:10
 msgid "available"
 msgstr "disponible"
 
-#: lm/models/stock.py:20
+#: lm/models/stock.py:23 pos/models/fiscal_correlative.py:11
+msgid "exhausted"
+msgstr "agotado"
+
+#: lm/models/stock.py:24
 msgid "reserved"
 msgstr "reservado"
 
-#: lm/models/stock.py:21
+#: lm/models/stock.py:25
 msgid "sold"
 msgstr "vendido"
 
-#: lm/models/stock.py:26
+#: lm/models/stock.py:30
 msgid "date sold"
 msgstr "fecha de venta"
 
-#: lm/models/stock.py:48 lm/models/transaction.py:108 mm/models/purchase.py:61
-#: mm/models/purchase.py:452 mnf/models/mo.py:55
+#: lm/models/stock.py:52 lm/models/transaction.py:124 mm/models/purchase.py:66
+#: mm/models/purchase.py:558 mnf/models/mo.py:60 pos/models/pos.py:62
 msgid "warehouse"
 msgstr "bodega"
 
-#: lm/models/stock.py:57 lm/models/transaction.py:90 mm/models/purchase.py:131
+#: lm/models/stock.py:61 lm/models/transaction.py:106 mm/models/purchase.py:136
 #: pos/models/fiscal_correlative.py:19
 msgid "series"
 msgstr "serie"
 
-#: lm/models/stock.py:63
+#: lm/models/stock.py:67
 msgid "billing status"
 msgstr "estado de factura"
 
-#: lm/models/stock.py:75 lm/models/transaction.py:89 mm/models/purchase.py:446
+#: lm/models/stock.py:79 lm/models/transaction.py:105 mm/models/purchase.py:552
 #: mm/models/purchase_order.py:155 mm/models/purchase_requisition.py:128
-#: mnf/forms.py:28 mnf/models/mo.py:60
+#: mnf/forms.py:30 mnf/models/mo.py:65
 msgid "due"
 msgstr "vencida"
 
-#: lm/models/stock.py:117
+#: lm/models/stock.py:121
 msgid "Can view Stock By Product"
 msgstr "Puede ver el Inventario por Producto"
 
-#: lm/models/stock.py:121
+#: lm/models/stock.py:125
 msgid "Can view Stock By Warehouse"
 msgstr "Puede ver el Inventario por bodega"
 
-#: lm/models/stock.py:125
+#: lm/models/stock.py:129
 msgid "Can view Stock by Due"
 msgstr "Puede ver el Inventario y Vencimiento"
 
-#: lm/models/stock.py:136
+#: lm/models/stock.py:140
 msgid "unit logical type must have series"
 msgstr "unidad tipo lógico debe tener serie"
 
-#: lm/models/stock.py:138
+#: lm/models/stock.py:142
 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:143
+#: lm/models/stock.py:147
 msgid "stock warehouse is different that shipment origin warehouse"
 msgstr "la bodega de inventario es diferente a la bodega de origen del envío"
 
-#: lm/models/stock.py:145
+#: lm/models/stock.py:149
 msgid "shipment between tenants is not allowed"
 msgstr "el traslado entre compañías no es permitido"
 
-#: lm/models/stock.py:148
+#: lm/models/stock.py:152
 msgid "stock is not in available status"
 msgstr "el inventario no se encuentra en estado disponible"
 
-#: lm/models/stock.py:150
+#: lm/models/stock.py:154 lm/models/stock.py:201
 msgid "available quantity is less than requested quantity"
 msgstr "cantidad disponible es menor que la cantidad solicitada"
 
-#: lm/models/supply_order.py:9
-msgid "requested"
-msgstr "solicitado"
-
-#: lm/models/supply_order.py:10
+#: lm/models/supply_order.py:11
 msgid "in review"
 msgstr "en revisión"
 
-#: lm/models/supply_order.py:11
+#: lm/models/supply_order.py:12
 msgid "dispatched"
 msgstr "despachado"
 
-#: lm/models/supply_order.py:38
+#: lm/models/supply_order.py:39
 msgid "processed by"
 msgstr "procesada por"
 
-#: lm/models/supply_order.py:58 lm/templates/lm/supplyorder_detail.html:14
+#: lm/models/supply_order.py:59 lm/templates/lm/supplyorder_detail.html:14
 msgid "Supply Order"
 msgstr "Orden de Suministro"
 
-#: lm/models/supply_order.py:64
+#: lm/models/supply_order.py:65
 msgid "Can view Supply Order consolidation"
 msgstr "Puede ver la consolidación de Ordenes de Suministro"
 
-#: lm/models/supply_order.py:84
+#: lm/models/supply_order.py:85
 msgid "supply order"
 msgstr "orden de suministro"
 
-#: lm/models/supply_order.py:97
+#: lm/models/supply_order.py:99
+#, fuzzy
+#| msgid "Shipment Item"
+msgid "shipment_item"
+msgstr "Ítem de Traslado"
+
+#: lm/models/supply_order.py:106
 msgid "sent quantity"
 msgstr "cantidad enviada"
 
-#: lm/models/supply_order.py:109
+#: lm/models/supply_order.py:118
 msgid "Supply Order Item"
 msgstr "Ítem de la Orden de Suministro"
 
-#: lm/models/supply_order.py:110
+#: lm/models/supply_order.py:119
 msgid "Supply Order Items"
 msgstr "Ítems de la Orden de Suministro"
 
-#: lm/models/transaction.py:21
+#: lm/models/transaction.py:22
 msgid "modification"
 msgstr "modificación"
 
-#: lm/models/transaction.py:71
+#: lm/models/transaction.py:67 lm/models/transaction.py:68
+msgid "motive"
+msgstr "motivo"
+
+#: lm/models/transaction.py:73 lm/models/transaction.py:92
 msgid "previous quantity"
 msgstr "cantidad anterior"
 
-#: lm/models/transaction.py:73
+#: lm/models/transaction.py:75 lm/models/transaction.py:93
 msgid "post quantity"
 msgstr "cantidad posterior"
 
-#: lm/models/transaction.py:80
+#: lm/models/transaction.py:80 lm/models/transaction.py:96
 msgid "previous stock balance"
 msgstr "saldo del inventario anterior"
 
@@ -3981,24 +4654,24 @@ msgstr "saldo del inventario anterior"
 msgid "transaction cost"
 msgstr "costo de transacción"
 
-#: lm/models/transaction.py:85
+#: lm/models/transaction.py:86 lm/models/transaction.py:99
 msgid "post stock balance"
 msgstr "saldo posterior de inventario"
 
-#: lm/models/transaction.py:87
+#: lm/models/transaction.py:103
 msgid "observations"
 msgstr "observaciones"
 
-#: lm/models/transaction.py:114 mm/models/transaction.py:27
-#: pos/models/fiscal_correlative.py:46
+#: lm/models/transaction.py:130 mm/models/transaction.py:27
+#: pos/models/fiscal_correlative.py:46 pos/models/shift.py:20
 msgid "user"
 msgstr "usuario"
 
-#: lm/models/transaction.py:129
+#: lm/models/transaction.py:145
 msgid "is applied"
 msgstr "esta aplicado"
 
-#: lm/models/transaction.py:145
+#: lm/models/transaction.py:161
 msgid "Transaction needs Typology"
 msgstr "Transacción necesita Tipología"
 
@@ -4039,8 +4712,8 @@ msgid "Products, Services, Materials & Expenses"
 msgstr "Productos, Servicios, Materiales y Gastos"
 
 #: lm/templates/lm/product_list.html:45
-#: lm/templates/lm/stock_by_product.html:56
-#: lm/templates/lm/stock_by_warehouse.html:60 lm/templates/lm/stock_due.html:66
+#: lm/templates/lm/stock_by_product.html:70
+#: lm/templates/lm/stock_by_warehouse.html:60 lm/templates/lm/stock_due.html:67
 #: mnf/templates/mnf/bundle_list.html:45
 msgid "SKU"
 msgstr "SKU"
@@ -4083,87 +4756,104 @@ msgstr "Desde Bodega:"
 msgid "To Warehouse:"
 msgstr "Hacia Bodega:"
 
-#: lm/templates/lm/shipment_detail.html:90
+#: lm/templates/lm/shipment_detail.html:91
 msgid "Product Status"
 msgstr "Estado de Producto"
 
-#: lm/templates/lm/shipment_detail.html:113
-msgid "Send"
-msgstr "Enviar"
-
-#: lm/templates/lm/shipment_detail.html:115
-msgid "Accept"
-msgstr "Aceptar"
-
 #: lm/templates/lm/shipment_list.html:46
 msgid "Shipment Doc"
 msgstr "Documento de Traslado"
 
-#: lm/templates/lm/stock_by_product.html:58
+#: lm/templates/lm/stock_by_product.html:78
 msgid "Packagings"
 msgstr "Presentaciones"
 
-#: lm/templates/lm/stock_by_product.html:59
+#: lm/templates/lm/stock_by_product.html:84
 msgid "TOTAL"
 msgstr "TOTAL"
 
-#: lm/templates/lm/stock_by_product.html:67
+#: lm/templates/lm/stock_by_product.html:94
 msgid "By Warehouse"
 msgstr "Por Bodega"
 
-#: lm/templates/lm/stock_by_product.html:82
+#: lm/templates/lm/stock_by_product.html:108
 msgid "By Status"
 msgstr "Por Estado"
 
-#: lm/templates/lm/stock_by_product.html:97
+#: lm/templates/lm/stock_by_product.html:122
 msgid "By LOT"
 msgstr "Por LOTE"
 
-#: lm/templates/lm/stock_by_warehouse.html:58 lm/templates/lm/stock_due.html:64
+#: lm/templates/lm/stock_by_warehouse.html:58 lm/templates/lm/stock_due.html:65
 msgid "Stock ID"
 msgstr "ID de Inventario"
 
-#: lm/templates/lm/stock_by_warehouse.html:68 lm/templates/lm/stock_due.html:74
+#: lm/templates/lm/stock_by_warehouse.html:68 lm/templates/lm/stock_due.html:75
 msgid "Billing Status"
 msgstr "Estado de Facturación"
 
-#: lm/templates/lm/stock_by_warehouse.html:71 lm/templates/lm/stock_due.html:77
+#: lm/templates/lm/stock_by_warehouse.html:71 lm/templates/lm/stock_due.html:78
 #: lm/templates/lm/transaction_list.html:93
 msgid "Avg Cost"
 msgstr "Costo Promedio"
 
-#: lm/templates/lm/supplyorder_consolidation.html:26
-#: lm/templates/lm/supplyorder_consolidation_form.html:23
+#: lm/templates/lm/supplyorder_consolidation.html:15
+#: mnf/templates/mnf/manufacturingorder_detail.html:165
+msgid "Edit"
+msgstr "Editar"
+
+#: lm/templates/lm/supplyorder_consolidation.html:23
+#, fuzzy
+#| msgid "User Branches"
+msgid "Hide/Show Branches"
+msgstr "Usuario de Sucursales"
+
+#: lm/templates/lm/supplyorder_consolidation.html:27
+#, fuzzy
+#| msgid "Create Shipment"
+msgid "Generate Shipments"
+msgstr "Crear Traslado"
+
+#: lm/templates/lm/supplyorder_consolidation.html:36
+#: lm/templates/lm/supplyorder_consolidation_form.html:31
 #: lm/templates/lm/supplyorder_detail.html:55
-#: lm/views/supply_order_consolidation.py:84
+#: lm/views/supply_order_consolidation.py:112
 msgid "Product Code"
 msgstr "Código de Producto"
 
-#: lm/templates/lm/supplyorder_consolidation.html:27
-#: lm/templates/lm/supplyorder_consolidation_form.html:24
+#: lm/templates/lm/supplyorder_consolidation.html:37
+#: lm/templates/lm/supplyorder_consolidation_form.html:32
 #: lm/templates/lm/supplyorder_detail.html:56
-#: lm/views/supply_order_consolidation.py:85
+#: lm/views/supply_order_consolidation.py:113
 msgid "Product Description"
 msgstr "Descripción de Producto"
 
-#: lm/templates/lm/supplyorder_consolidation.html:31
-#: lm/views/supply_order_consolidation.py:89
+#: lm/templates/lm/supplyorder_consolidation.html:41
+#: lm/views/supply_order_consolidation.py:117
 msgid "Total Requested"
 msgstr "Total Solicitado"
 
-#: lm/templates/lm/supplyorder_consolidation.html:33
-#: lm/templates/lm/supplyorder_consolidation_form.html:30
+#: lm/templates/lm/supplyorder_consolidation.html:43
+#: lm/templates/lm/supplyorder_consolidation_form.html:38
 msgid "Diff"
 msgstr "Diferencia"
 
-#: lm/templates/lm/supplyorder_consolidation_form.html:14
-msgid "Complete"
-msgstr "Completar"
-
-#: lm/templates/lm/supplyorder_consolidation_form.html:28
+#: lm/templates/lm/supplyorder_consolidation_form.html:36
 msgid "Total to Send"
 msgstr "Total a Enviar"
 
+#: lm/templates/lm/supplyorder_consolidation_form.html:63
+#, fuzzy
+#| msgid "Total Requested"
+msgid "Original Requested"
+msgstr "Total Solicitado"
+
+#: lm/templates/lm/supplyorder_list.html:38
+#, fuzzy
+#| msgid "resolution date"
+msgid "Consolidate"
+msgstr "fecha de resolución"
+
 #: lm/templates/lm/transaction_list.html:91
 msgid "Motive"
 msgstr "Motivo"
@@ -4210,43 +4900,43 @@ msgstr "la orden de compra %(code)s no existe"
 msgid "provider %(code)s does not exists"
 msgstr "el proveedor %(code)s no existe"
 
-#: mm/api/views.py:138 sync/drivers/errors.py:17
+#: mm/api/views.py:143 sync/drivers/errors.py:17
 msgid "provider does not exists"
 msgstr "el proveedor no existe"
 
-#: mm/api/views.py:164
+#: mm/api/views.py:169
 msgid "purchase does not belongs to the user's tenant"
 msgstr "la compra no pertenece a la compañía del usuario"
 
-#: mm/api/views.py:183
+#: mm/api/views.py:188
 msgid "purchase is not in valid status for adding items"
 msgstr "la compra no está en estado válido para agregar ítems"
 
-#: mm/api/views.py:213
+#: mm/api/views.py:218
 msgid "purchase is not in valid status for removing items"
 msgstr "la compra no está en estado válido para quitar ítems"
 
-#: mm/api/views.py:219
+#: mm/api/views.py:224
 msgid "item does not exists"
 msgstr "ítem no existe"
 
-#: mm/api/views.py:240
+#: mm/api/views.py:245
 msgid "purchase is not in valid status for editing taxes"
 msgstr "la compra no está en estado válido para editar impuestos"
 
-#: mm/api/views.py:246 sync/drivers/errors.py:29
+#: mm/api/views.py:251 sync/drivers/errors.py:29
 msgid "tax does not exists"
 msgstr "impuesto no existe"
 
-#: mm/api/views.py:354
+#: mm/api/views.py:364
 msgid "purchase order does not belongs to the user's tenant"
 msgstr "orden de compra no pertenece a la compañía del usuario"
 
-#: mm/api/views.py:359
+#: mm/api/views.py:369
 msgid "purchase order is already approved"
 msgstr "orden de compra ya está aprobada"
 
-#: mm/api/views.py:364
+#: mm/api/views.py:374
 msgid ""
 "user's authorized approval amount is lower than purchase order's total amount"
 msgstr ""
@@ -4268,6 +4958,12 @@ msgstr "Proveedor"
 msgid "Purchase Order"
 msgstr "Orden de Compra"
 
+#: mm/forms.py:93
+#, fuzzy
+#| msgid "Cost Center"
+msgid "Warehouse/Cost Center"
+msgstr "Centro de Costo"
+
 #: mm/forms.py:104 mm/forms.py:187 mm/templates/mm/purchase_list.html:74
 #: mm/templates/mm/purchaseorder_list.html:54
 #: mm/templates/mm/purchaserequisition_list.html:44
@@ -4340,7 +5036,7 @@ msgstr "una opción es requerida"
 msgid "only one option is allowed"
 msgstr "solo una opción es permitida"
 
-#: mm/models/payment.py:81 mm/models/purchase.py:194
+#: mm/models/payment.py:81 mm/models/purchase.py:199
 #: mm/templates/mm/payment_list.html:45
 msgid "Purchase"
 msgstr "Compra"
@@ -4388,155 +5084,151 @@ msgstr ""
 "cuando se activa, todas las compras entrantes de sincronización automática "
 "se tratarán como compras no inventariadas"
 
-#: mm/models/purchase.py:21
+#: mm/models/purchase.py:26
 msgid "registrate"
 msgstr "registrar"
 
-#: mm/models/purchase.py:32
+#: mm/models/purchase.py:37
 msgid "caja chica"
 msgstr "caja chica"
 
-#: mm/models/purchase.py:33
+#: mm/models/purchase.py:38
 msgid "cuenta por pagar"
 msgstr "cuenta por pagar"
 
-#: mm/models/purchase.py:34
+#: mm/models/purchase.py:39
 msgid "cheque"
 msgstr "cheque"
 
-#: mm/models/purchase.py:69 mm/models/purchase_order.py:142
+#: mm/models/purchase.py:74 mm/models/purchase_order.py:142
 msgid "purchase order"
 msgstr "orden de compra"
 
-#: mm/models/purchase.py:129
+#: mm/models/purchase.py:134
 msgid "modified date"
 msgstr "fecha de modificación"
 
-#: mm/models/purchase.py:130
-msgid "for date"
-msgstr "para la fecha"
-
-#: mm/models/purchase.py:134
+#: mm/models/purchase.py:139
 msgid "purchase type"
 msgstr "tipo de compra"
 
-#: mm/models/purchase.py:138
+#: mm/models/purchase.py:143
 msgid "payment type"
 msgstr "tipo de pago"
 
-#: mm/models/purchase.py:143 mm/models/purchase_order.py:25
+#: mm/models/purchase.py:148 mm/models/purchase_order.py:25
 #: mm/models/purchase_requisition.py:31
 msgid "giro"
 msgstr ""
 
-#: mm/models/purchase.py:152 mm/models/purchase_requisition.py:49
+#: mm/models/purchase.py:157 mm/models/purchase_requisition.py:49
 msgid "total taxed unit price"
 msgstr "precio unitario total gravado"
 
-#: mm/models/purchase.py:155 mm/models/purchase_order.py:56
+#: mm/models/purchase.py:160 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:158 mm/models/purchase_order.py:59
+#: mm/models/purchase.py:163 mm/models/purchase_order.py:59
 #: mm/models/purchase_requisition.py:55
 msgid "total taxes"
 msgstr "impuestos totales"
 
-#: mm/models/purchase.py:165 mm/models/purchase_order.py:62
+#: mm/models/purchase.py:170 mm/models/purchase_order.py:62
 #: mm/models/purchase_requisition.py:58
 msgid "rent taxes"
 msgstr "impuestos de renta"
 
-#: mm/models/purchase.py:168
+#: mm/models/purchase.py:173
 msgid "discounts"
 msgstr "descuento"
 
-#: mm/models/purchase.py:176 mm/models/transaction.py:21
+#: mm/models/purchase.py:181 mm/models/transaction.py:21
 msgid "conversion rate"
 msgstr "tipo de cambio"
 
-#: mm/models/purchase.py:198
+#: mm/models/purchase.py:203
 msgid "Can reverse Purchase"
 msgstr "Puede anular Compra"
 
-#: mm/models/purchase.py:243
+#: mm/models/purchase.py:260
 msgid "provider or purchase order is mandatory when purchase it not petty cash"
 msgstr ""
 "proveedor u orden de compra es obligatorio cuando la compra no es de caja "
 "chica"
 
-#: mm/models/purchase.py:246
+#: mm/models/purchase.py:263
 msgid "credit days are required for credit type purchase"
 msgstr "los días de crédito son requeridos para la compra de tipo de crédito"
 
-#: mm/models/purchase.py:250
+#: mm/models/purchase.py:267
 msgid "document type has not mapping to MM transaction"
 msgstr "el tipo de documento no tiene asignación a la transacción MM"
 
-#: mm/models/purchase.py:266
+#: mm/models/purchase.py:284
 msgid "purchase needs an accounting account"
 msgstr "la compra necesita una cuenta contable"
 
-#: mm/models/purchase.py:431 mm/models/purchase.py:619
+#: mm/models/purchase.py:537 mm/models/purchase.py:730
 #: mm/models/purchase_requisition.py:115 mm/models/transaction.py:10
 #: sync/models.py:11
 msgid "purchase"
 msgstr "compra"
 
-#: mm/models/purchase.py:464 mm/models/purchase_order.py:158
+#: mm/models/purchase.py:570 mm/models/purchase_order.py:158
 #: mm/models/purchase_requisition.py:131
 msgid "taxed unit price"
 msgstr "precio unitario gravado"
 
-#: mm/models/purchase.py:467 mm/models/purchase_order.py:161
+#: mm/models/purchase.py:573 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:474
+#: mm/models/purchase.py:580
 msgid "net price"
 msgstr "precio neto"
 
-#: mm/models/purchase.py:488
+#: mm/models/purchase.py:594
 msgid "Purchase Item"
 msgstr "Ítem de Compra"
 
-#: mm/models/purchase.py:489
+#: mm/models/purchase.py:595
 msgid "Purchase Items"
 msgstr "Ítems de Compras"
 
-#: mm/models/purchase.py:600
+#: mm/models/purchase.py:711
 msgid "inventory purchase must include product on item"
 msgstr "la compra de inventario debe incluir un producto en el ítem"
 
-#: mm/models/purchase.py:632
+#: mm/models/purchase.py:743
 msgid "fixed amount"
 msgstr "monto fijo"
 
-#: mm/models/purchase.py:637
+#: mm/models/purchase.py:748
 msgid "this value is seted by the user manually and overrides the amount value"
 msgstr ""
 "este valor es establecido manualmente por el usuario y reemplaza el valor "
 "del monto"
 
-#: mm/models/purchase.py:646
+#: mm/models/purchase.py:757
 msgid "Purchase Tax"
 msgstr "Impuesto de Compra"
 
-#: mm/models/purchase.py:647
+#: mm/models/purchase.py:758
 msgid "Purchase Taxes"
 msgstr "Impuestos de Compras"
 
-#: mm/models/purchase.py:680 mm/models/purchase.py:688
+#: mm/models/purchase.py:791 mm/models/purchase.py:799
 msgid "purchase item"
 msgstr "ítem de compra"
 
-#: mm/models/purchase.py:701
+#: mm/models/purchase.py:812
 msgid "Purchase Item Tax"
 msgstr "Impuesto de Ítem de Compra"
 
-#: mm/models/purchase.py:702
+#: mm/models/purchase.py:813
 msgid "Purchase Item Taxes"
 msgstr "Impuesto de Ítems de Compras"
 
@@ -4726,43 +5418,53 @@ msgstr "Ver Ítem de Compra"
 msgid "Manufacturing Module"
 msgstr "Módulo de Manufactura"
 
-#: mnf/models/mo.py:14
+#: mnf/models/mo.py:19
 msgid "start requested"
 msgstr "inicio solicitado"
 
-#: mnf/models/mo.py:16
+#: mnf/models/mo.py:21
 msgid "finished"
 msgstr "finalizado"
 
-#: mnf/models/mo.py:20
+#: mnf/models/mo.py:25
 msgid "date started"
 msgstr "fecha de inicio"
 
-#: mnf/models/mo.py:21
+#: mnf/models/mo.py:26
 msgid "date finished"
 msgstr "fecha de finalizada"
 
-#: mnf/models/mo.py:47
+#: mnf/models/mo.py:52
 msgid "executed by"
 msgstr "ejecutado por"
 
-#: mnf/models/mo.py:74 mnf/models/mo.py:168 mnf/views/mo.py:18
+#: mnf/models/mo.py:87 mnf/models/mo.py:200 mnf/views/mo.py:18
 msgid "Manufacturing Order"
 msgstr "Orden de Manufactura"
 
-#: mnf/models/mo.py:79
+#: mnf/models/mo.py:92
 msgid "Can execute Manufacturing Order"
 msgstr "Puede ejecutar Orden de Manufactura"
 
-#: mnf/models/mo.py:148
+#: mnf/models/mo.py:108
+msgid "MNO status must be start requested for bein processed"
+msgstr ""
+
+#: mnf/models/mo.py:178
 msgid "manufacturing order"
 msgstr "orden de manufactura"
 
-#: mnf/models/mo.py:184
+#: mnf/models/mo.py:190
+#, fuzzy
+#| msgid "total cost"
+msgid "real cost"
+msgstr "costo total"
+
+#: mnf/models/mo.py:220
 msgid "product and warehouse must belong to same tenant"
 msgstr "producto y bodega deben pertenecer a misma compañía"
 
-#: mnf/templates/mnf/bundle_form.html:20
+#: mnf/templates/mnf/bundle_form.html:21
 msgid "Bundle Configuration"
 msgstr "Configuración de Paquete"
 
@@ -4787,30 +5489,26 @@ msgstr "Fecha de Finalizada"
 msgid "Product to Manufacture"
 msgstr "Producto a Manufacturar"
 
-#: mnf/templates/mnf/manufacturingorder_detail.html:115
+#: mnf/templates/mnf/manufacturingorder_detail.html:127
 msgid "Product to Exhaust"
 msgstr "Producto a Agotar"
 
-#: mnf/templates/mnf/manufacturingorder_detail.html:120
+#: mnf/templates/mnf/manufacturingorder_detail.html:132
 msgid "Required Quantity"
 msgstr "Cantidad Requerida"
 
-#: mnf/templates/mnf/manufacturingorder_detail.html:121
+#: mnf/templates/mnf/manufacturingorder_detail.html:133
 msgid "Available Quantity"
 msgstr "Cantidad Disponible"
 
-#: mnf/templates/mnf/manufacturingorder_detail.html:122
+#: mnf/templates/mnf/manufacturingorder_detail.html:134
 msgid "Remaining Quantity"
 msgstr "Cantidad Restante"
 
-#: mnf/templates/mnf/manufacturingorder_detail.html:147
+#: mnf/templates/mnf/manufacturingorder_detail.html:159
 msgid "Generate"
 msgstr "Generar"
 
-#: mnf/templates/mnf/manufacturingorder_detail.html:153
-msgid "Edit"
-msgstr "Editar"
-
 #: mnf/templates/mnf/manufacturingorder_list.html:48
 msgid "Warehouse Code"
 msgstr "Codigo de Bodega"
@@ -4830,15 +5528,16 @@ msgstr ""
 msgid "Offers Module"
 msgstr "Módulo de ofertas"
 
-#: offer/forms.py:55 offer/models/offer.py:32
+#: offer/forms.py:56 offer/models/offer.py:32
 msgid "products"
 msgstr "productos"
 
-#: offer/forms.py:60
+#: offer/forms.py:61
 msgid "options"
 msgstr "opciones"
 
-#: offer/forms.py:96 pos/models/pos.py:66 pos/models/pos.py:67
+#: offer/forms.py:97 pos/models/pos.py:86 pos/models/pos.py:87
+#: pos/templates/pos/shift_list.html:44
 msgid "Pos"
 msgstr "Punto de venta"
 
@@ -4891,26 +5590,38 @@ msgid "unit price editable in pos"
 msgstr "precio unitario editable en punto de venta"
 
 #: offer/models/offer.py:70
+#, fuzzy
+#| msgid "default document"
+msgid "default discount"
+msgstr "documento por defecto"
+
+#: offer/models/offer.py:78
 msgid "income account"
 msgstr "cuenta de ingresos"
 
-#: offer/models/offer.py:105
+#: offer/models/offer.py:83
+#, fuzzy
+#| msgid "e-nvoice integration"
+msgid "service duration"
+msgstr "integración de facturación"
+
+#: offer/models/offer.py:114
 msgid "date from must be lower or equal to date to"
 msgstr "a fecha de inicio debe ser menor o igual a la fecha de finalización"
 
-#: offer/models/offer.py:149
+#: offer/models/offer.py:168
 msgid "offer"
 msgstr "oferta"
 
-#: offer/models/offer.py:169
+#: offer/models/offer.py:188
 msgid "Offer Price"
 msgstr "Precio de Oferta"
 
-#: offer/models/offer.py:170
+#: offer/models/offer.py:189
 msgid "Offers Price List"
 msgstr "Lista de Precios de Oferta"
 
-#: offer/models/offer.py:198 offer/models/offer.py:200
+#: offer/models/offer.py:217 offer/models/offer.py:219
 msgid "overlapping range for offer"
 msgstr "reemplazos en rangos para oferta"
 
@@ -4968,10 +5679,6 @@ msgstr "Punto de Venta"
 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"
@@ -5002,30 +5709,86 @@ msgstr ""
 msgid "overlapping range for series %(series)s"
 msgstr "reemplazo en rangos %(series)s para la serie"
 
-#: pos/models/pos.py:9
+#: pos/models/pos.py:15
 msgid "layout1"
 msgstr "diseño1"
 
-#: pos/models/pos.py:10
+#: pos/models/pos.py:16
 msgid "layout2"
 msgstr "diseño2"
 
-#: pos/models/pos.py:37
+#: pos/models/pos.py:17
+#, fuzzy
+#| msgid "layout"
+msgid "layout3"
+msgstr "diseño"
+
+#: pos/models/pos.py:18
+#, fuzzy
+#| msgid "layout"
+msgid "layout4"
+msgstr "diseño"
+
+#: pos/models/pos.py:19
+#, fuzzy
+#| msgid "layout"
+msgid "layout5"
+msgstr "diseño"
+
+#: pos/models/pos.py:46
 msgid "default document"
 msgstr "documento por defecto"
 
-#: pos/models/pos.py:45
+#: pos/models/pos.py:54
 msgid "default customer"
 msgstr "cliente por defecto"
 
-#: pos/models/pos.py:50
+#: pos/models/pos.py:67
+msgid "use shifts"
+msgstr ""
+
+#: pos/models/pos.py:68
 msgid "use text input"
 msgstr "usar entrada de texto"
 
-#: pos/models/pos.py:53
+#: pos/models/pos.py:71
 msgid "layout"
 msgstr "diseño"
 
+#: pos/models/shift.py:42 pos/templates/pos/shift_detail_pill_overview.html:34
+#, fuzzy
+#| msgid "Shift Date"
+msgid "Shift"
+msgstr "Fecha de Turno"
+
+#: pos/models/shift.py:45
+#, fuzzy
+#| msgid "Can send Shipment"
+msgid "Can open Shift"
+msgstr "Puede enviar Traslado"
+
+#: pos/models/shift.py:46
+#, fuzzy
+#| msgid "Can send Shipment"
+msgid "Can close Shift"
+msgstr "Puede enviar Traslado"
+
+#: pos/models/shift.py:59
+msgid "opening detail is required for opening a shift"
+msgstr ""
+
+#: pos/models/shift.py:61
+msgid "'denomination' key not found in opening detail"
+msgstr ""
+
+#: pos/models/shift.py:63
+msgid "'total' key not found in opening detail"
+msgstr ""
+
+#: pos/models/shift.py:69
+msgid "there is already an open shift for this pos"
+msgstr ""
+
 #: pos/templates/pos/fiscalcorrelative_list.html:46
 msgid "Start"
 msgstr "Inicio"
@@ -5042,11 +5805,147 @@ msgstr "Último Usado"
 msgid "Resolution"
 msgstr "Resolución"
 
-#: sicweb/settings/base.py:131
+#: pos/templates/pos/shift_close.html:16 pos/templates/pos/shift_close.html:127
+#: pos/templates/pos/shift_detail_pill_overview.html:212
+#: pos/templates/pos/shift_list.html:101
+msgid "Close Shift"
+msgstr ""
+
+#: pos/templates/pos/shift_detail.html:21
+#, fuzzy
+#| msgid "Override"
+msgid "Overview"
+msgstr "Reemplazar"
+
+#: pos/templates/pos/shift_detail.html:24
+#, fuzzy
+#| msgid "Petty Cash Detail"
+msgid "Initial Cash Detail"
+msgstr "Detalles de Caja Chica"
+
+#: pos/templates/pos/shift_detail.html:27
+#, fuzzy
+#| msgid "Petty Cash Detail"
+msgid "Closeout Cash Detail"
+msgstr "Detalles de Caja Chica"
+
+#: pos/templates/pos/shift_detail_pill_overview.html:6
+msgid "Date & Time"
+msgstr ""
+
+#: pos/templates/pos/shift_detail_pill_overview.html:12
+#, fuzzy
+#| msgid "date created"
+msgid "Date created"
+msgstr "fecha de creación"
+
+#: pos/templates/pos/shift_detail_pill_overview.html:16
+#, fuzzy
+#| msgid "date joined"
+msgid "Date opened"
+msgstr "fecha de incorporación"
+
+#: pos/templates/pos/shift_detail_pill_overview.html:20
+#, fuzzy
+#| msgid "Date Record"
+msgid "Date closed"
+msgstr "Fecha de Registro"
+
+#: pos/templates/pos/shift_detail_pill_overview.html:26
+#, fuzzy
+#| msgid "PoS"
+msgid "POS"
+msgstr "Punto de Venta"
+
+#: pos/templates/pos/shift_detail_pill_overview.html:40
+#, fuzzy
+#| msgid "fiscal document"
+msgid "Sales by document"
+msgstr "documento fiscal"
+
+#: pos/templates/pos/shift_detail_pill_overview.html:65
+#, fuzzy
+#| msgid "Total"
+msgid "Totals"
+msgstr "Total"
+
+#: pos/templates/pos/shift_detail_pill_overview.html:69
+#, fuzzy
+#| msgid "sales account"
+msgid "Sales Count"
+msgstr "cuenta de ingresos por ventas"
+
+#: pos/templates/pos/shift_detail_pill_overview.html:77
+#, fuzzy
+#| msgid "Sales"
+msgid "Net Sales"
+msgstr "Ventas"
+
+#: pos/templates/pos/shift_detail_pill_overview.html:85
+#, fuzzy
+#| msgid "Total Taxed"
+msgid "Total Taxes"
+msgstr "Total Impuestos"
+
+#: pos/templates/pos/shift_detail_pill_overview.html:151
+msgid "Opening Cash"
+msgstr ""
+
+#: pos/templates/pos/shift_detail_pill_overview.html:159
+#, fuzzy
+#| msgid "Collected VAT"
+msgid "Collected Cash"
+msgstr "IVA Percibido"
+
+#: pos/templates/pos/shift_detail_pill_overview.html:167
+msgid "Returning Change"
+msgstr ""
+
+#: pos/templates/pos/shift_detail_pill_overview.html:175
+msgid "Real Collected (collected - change)"
+msgstr ""
+
+#: pos/templates/pos/shift_detail_pill_overview.html:183
+msgid "Expected Closeout (real collected + opening cash)"
+msgstr ""
+
+#: pos/templates/pos/shift_detail_pill_overview.html:191
+msgid "Actual Closeout"
+msgstr ""
+
+#: pos/templates/pos/shift_detail_pill_overview.html:199
+#, fuzzy
+#| msgid "Override"
+msgid "Over/Under"
+msgstr "Reemplazar"
+
+#: pos/templates/pos/shift_list.html:46
+msgid "Opened"
+msgstr ""
+
+#: pos/templates/pos/shift_list.html:48
+#, fuzzy
+#| msgid "Date Generated"
+msgid "Date Opened"
+msgstr "Fecha de Generacion"
+
+#: pos/templates/pos/shift_list.html:49
+#, fuzzy
+#| msgid "Date Created"
+msgid "Date Closed"
+msgstr "Fecha de Creación"
+
+#: pos/templates/pos/shift_list.html:51
+#, fuzzy
+#| msgid "Actions"
+msgid "Action"
+msgstr "Acciones"
+
+#: sicweb/settings/base.py:138
 msgid "English"
 msgstr "Inglés"
 
-#: sicweb/settings/base.py:132
+#: sicweb/settings/base.py:139
 msgid "Spanish"
 msgstr "Español"
 
@@ -5242,6 +6141,15 @@ msgstr "Sitio Administrativo Django"
 msgid "Django administration"
 msgstr "Administracion Django"
 
+#~ msgid "Softland"
+#~ msgstr "Softland"
+
+#~ msgid "large taxpayer"
+#~ msgstr "gran contribuyente"
+
+#~ msgid "Send"
+#~ msgstr "Enviar"
+
 #~ msgid "positive"
 #~ msgstr "acreedora"
 
@@ -5304,25 +6212,15 @@ msgstr "Administracion Django"
 #~ 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"
-
 #~ msgid "Other"
 #~ msgstr "Otros"