fix: typo's and parameter changes
(cherry picked from commit 0ec17590ae)
This commit is contained in:
@@ -147,7 +147,7 @@ class PaymentReconciliation(Document):
|
|||||||
conditions.append(jea[dimension] == self.get(dimension))
|
conditions.append(jea[dimension] == self.get(dimension))
|
||||||
|
|
||||||
if self.payment_name:
|
if self.payment_name:
|
||||||
conditions.append(je.name.like(f"%%{self.payent_name}%%"))
|
conditions.append(je.name.like(f"%%{self.payment_name}%%"))
|
||||||
|
|
||||||
if self.get("cost_center"):
|
if self.get("cost_center"):
|
||||||
conditions.append(jea.cost_center == self.cost_center)
|
conditions.append(jea.cost_center == self.cost_center)
|
||||||
@@ -659,7 +659,7 @@ class PaymentReconciliation(Document):
|
|||||||
conditions.append(je.total_debit.gte(self.minimum_payment_amount))
|
conditions.append(je.total_debit.gte(self.minimum_payment_amount))
|
||||||
|
|
||||||
if self.maximum_payment_amount:
|
if self.maximum_payment_amount:
|
||||||
conditions.append(je.total_debit.lte(self.maximumb_payment_amount))
|
conditions.append(je.total_debit.lte(self.maximum_payment_amount))
|
||||||
|
|
||||||
return conditions
|
return conditions
|
||||||
|
|
||||||
@@ -747,6 +747,7 @@ def reconcile_dr_cr_note(dr_cr_notes, company):
|
|||||||
inv.against_voucher,
|
inv.against_voucher,
|
||||||
None,
|
None,
|
||||||
inv.cost_center,
|
inv.cost_center,
|
||||||
|
frappe._dict(),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1998,6 +1998,8 @@ def create_gain_loss_journal(
|
|||||||
cost_center,
|
cost_center,
|
||||||
dimensions,
|
dimensions,
|
||||||
) -> str:
|
) -> str:
|
||||||
|
# TODO: pass dimensions to Journal
|
||||||
|
|
||||||
journal_entry = frappe.new_doc("Journal Entry")
|
journal_entry = frappe.new_doc("Journal Entry")
|
||||||
journal_entry.voucher_type = "Exchange Gain Or Loss"
|
journal_entry.voucher_type = "Exchange Gain Or Loss"
|
||||||
journal_entry.company = company
|
journal_entry.company = company
|
||||||
|
|||||||
Reference in New Issue
Block a user