wip: correccion comision vendedores

fproldan · Sep 23, 2024 · de30dd8 · de30dd8
1 parent 5413321
commit de30dd8
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/erpnext/setup/doctype/company/company.js b/erpnext/setup/doctype/company/company.js
@@ -233,7 +233,9 @@ erpnext.company.setup_queries = function(frm) {
 		["expenses_included_in_asset_valuation", {"account_type": "Expenses Included In Asset Valuation"}],
 		["capital_work_in_progress_account", {"account_type": "Capital Work in Progress"}],
 		["asset_received_but_not_billed", {"account_type": "Asset Received But Not Billed"}],
-		["unrealized_profit_loss_account", {"root_type": ["in", ["Liability", "Asset"]]}]
+		["unrealized_profit_loss_account", {"root_type": ["in", ["Liability", "Asset"]]}],
+		["payment_account_sales_commission", {"account_type": "Payable"}],
+		["sales_commission_expense_account", {"account_type": "Expense Account"}],
 	], function(i, v) {
 		erpnext.company.set_custom_query(frm, v);
 	});

diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json
@@ -48,6 +48,7 @@
   "exchange_gain_loss_account",
   "unrealized_exchange_gain_loss_account",
   "unrealized_profit_loss_account",
+  "payment_account_sales_commission",
   "column_break0",
   "allow_account_creation_against_child_company",
   "default_payable_account",
@@ -59,6 +60,7 @@
   "default_payroll_payable_account",
   "default_expense_claim_payable_account",
   "default_discount_account",
+  "sales_commission_expense_account",
   "section_break_22",
   "cost_center",
   "column_break_26",
@@ -735,14 +737,26 @@
    "fieldtype": "Link",
    "label": "Repair and Maintenance Account",
    "options": "Account"
+  },
+  {
+   "fieldname": "payment_account_sales_commission",
+   "fieldtype": "Link",
+   "label": "Cuenta de Pago Comisi\u00f3n Vendedores",
+   "options": "Account"
+  },
+  {
+   "fieldname": "sales_commission_expense_account",
+   "fieldtype": "Link",
+   "label": "Cuenta de Gastos Comisi\u00f3n Vendedores",
+   "options": "Account"
   }
  ],
  "icon": "fa fa-building",
  "idx": 1,
  "image_field": "company_logo",
  "is_tree": 1,
  "links": [],
- "modified": "2021-05-17 17:51:08.187233",
+ "modified": "2024-09-23 13:49:45.617464",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Company",
@@ -807,12 +821,13 @@
    "select": 1
   },
   {
+   "export": 1,
    "read": 1,
    "report": 1,
-   "export": 1,
    "role": "Usuario Contador"
   }
  ],
+ "route": "app/doctype/Company",
  "show_name_in_global_search": 1,
  "sort_field": "modified",
  "sort_order": "ASC",

diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv
@@ -10823,7 +10823,7 @@ Loans,Préstamos,
 Performance,Rendimiento,
 Payment term {0} not used in {1},Término de pago {0} no utilizado en {1},
 Sales Commission,Comisiones de Ventas,
-Process Sales Commission,Procesar Comisiones de Ventas,
+Process Sales Commission,Procesador Masivo de Comisiones,
 Calculate Commission Manually,Calcular comisión manualmente,
 Commission Based on,Comisión basada en,
 Total Commission Amount,Importe total de la Comisión,