Merge branch 'develop' into asset-fix-#3
This commit is contained in:
commit
cecaec2cc6
34
.mergify.yml
34
.mergify.yml
@ -14,9 +14,39 @@ pull_request_rules:
|
|||||||
close:
|
close:
|
||||||
comment:
|
comment:
|
||||||
message: |
|
message: |
|
||||||
@{{author}}, thanks for the contribution, but we do not accept pull requests on a stable branch. Please raise PR on an appropriate hotfix branch.
|
@{{author}}, thanks for the contribution, but we do not accept pull requests on a stable branch. Please raise PR on an appropriate hotfix branch.
|
||||||
https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist#which-branch
|
https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist#which-branch
|
||||||
|
|
||||||
|
- name: backport to develop
|
||||||
|
conditions:
|
||||||
|
- label="backport develop"
|
||||||
|
actions:
|
||||||
|
backport:
|
||||||
|
branches:
|
||||||
|
- develop
|
||||||
|
assignees:
|
||||||
|
- "{{ author }}"
|
||||||
|
|
||||||
|
- name: backport to version-14-hotfix
|
||||||
|
conditions:
|
||||||
|
- label="backport version-14-hotfix"
|
||||||
|
actions:
|
||||||
|
backport:
|
||||||
|
branches:
|
||||||
|
- version-14-hotfix
|
||||||
|
assignees:
|
||||||
|
- "{{ author }}"
|
||||||
|
|
||||||
|
- name: backport to version-14-pre-release
|
||||||
|
conditions:
|
||||||
|
- label="backport version-14-pre-release"
|
||||||
|
actions:
|
||||||
|
backport:
|
||||||
|
branches:
|
||||||
|
- version-14-pre-release
|
||||||
|
assignees:
|
||||||
|
- "{{ author }}"
|
||||||
|
|
||||||
- name: backport to version-13-hotfix
|
- name: backport to version-13-hotfix
|
||||||
conditions:
|
conditions:
|
||||||
- label="backport version-13-hotfix"
|
- label="backport version-13-hotfix"
|
||||||
@ -55,4 +85,4 @@ pull_request_rules:
|
|||||||
branches:
|
branches:
|
||||||
- version-12-pre-release
|
- version-12-pre-release
|
||||||
assignees:
|
assignees:
|
||||||
- "{{ author }}"
|
- "{{ author }}"
|
||||||
|
@ -74,39 +74,6 @@ class LoanInterestAccrual(AccountsController):
|
|||||||
})
|
})
|
||||||
)
|
)
|
||||||
|
|
||||||
if self.payable_principal_amount:
|
|
||||||
gle_map.append(
|
|
||||||
self.get_gl_dict({
|
|
||||||
"account": self.loan_account,
|
|
||||||
"party_type": self.applicant_type,
|
|
||||||
"party": self.applicant,
|
|
||||||
"against": self.interest_income_account,
|
|
||||||
"debit": self.payable_principal_amount,
|
|
||||||
"debit_in_account_currency": self.interest_amount,
|
|
||||||
"against_voucher_type": "Loan",
|
|
||||||
"against_voucher": self.loan,
|
|
||||||
"remarks": _("Interest accrued from {0} to {1} against loan: {2}").format(
|
|
||||||
self.last_accrual_date, self.posting_date, self.loan),
|
|
||||||
"cost_center": erpnext.get_default_cost_center(self.company),
|
|
||||||
"posting_date": self.posting_date
|
|
||||||
})
|
|
||||||
)
|
|
||||||
|
|
||||||
gle_map.append(
|
|
||||||
self.get_gl_dict({
|
|
||||||
"account": self.interest_income_account,
|
|
||||||
"against": self.loan_account,
|
|
||||||
"credit": self.payable_principal_amount,
|
|
||||||
"credit_in_account_currency": self.interest_amount,
|
|
||||||
"against_voucher_type": "Loan",
|
|
||||||
"against_voucher": self.loan,
|
|
||||||
"remarks": ("Interest accrued from {0} to {1} against loan: {2}").format(
|
|
||||||
self.last_accrual_date, self.posting_date, self.loan),
|
|
||||||
"cost_center": erpnext.get_default_cost_center(self.company),
|
|
||||||
"posting_date": self.posting_date
|
|
||||||
})
|
|
||||||
)
|
|
||||||
|
|
||||||
if gle_map:
|
if gle_map:
|
||||||
make_gl_entries(gle_map, cancel=cancel, adv_adj=adv_adj)
|
make_gl_entries(gle_map, cancel=cancel, adv_adj=adv_adj)
|
||||||
|
|
||||||
|
@ -83,8 +83,8 @@
|
|||||||
"planned_qty",
|
"planned_qty",
|
||||||
"column_break_69",
|
"column_break_69",
|
||||||
"work_order_qty",
|
"work_order_qty",
|
||||||
"delivered_qty",
|
|
||||||
"produced_qty",
|
"produced_qty",
|
||||||
|
"delivered_qty",
|
||||||
"returned_qty",
|
"returned_qty",
|
||||||
"shopping_cart_section",
|
"shopping_cart_section",
|
||||||
"additional_notes",
|
"additional_notes",
|
||||||
@ -701,10 +701,8 @@
|
|||||||
"width": "50px"
|
"width": "50px"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"description": "For Production",
|
|
||||||
"fieldname": "produced_qty",
|
"fieldname": "produced_qty",
|
||||||
"fieldtype": "Float",
|
"fieldtype": "Float",
|
||||||
"hidden": 1,
|
|
||||||
"label": "Produced Quantity",
|
"label": "Produced Quantity",
|
||||||
"oldfieldname": "produced_qty",
|
"oldfieldname": "produced_qty",
|
||||||
"oldfieldtype": "Currency",
|
"oldfieldtype": "Currency",
|
||||||
@ -802,7 +800,7 @@
|
|||||||
"idx": 1,
|
"idx": 1,
|
||||||
"istable": 1,
|
"istable": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2021-10-05 12:27:25.014789",
|
"modified": "2022-02-21 13:55:08.883104",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Selling",
|
"module": "Selling",
|
||||||
"name": "Sales Order Item",
|
"name": "Sales Order Item",
|
||||||
@ -811,5 +809,6 @@
|
|||||||
"permissions": [],
|
"permissions": [],
|
||||||
"sort_field": "modified",
|
"sort_field": "modified",
|
||||||
"sort_order": "DESC",
|
"sort_order": "DESC",
|
||||||
|
"states": [],
|
||||||
"track_changes": 1
|
"track_changes": 1
|
||||||
}
|
}
|
@ -180,14 +180,6 @@ erpnext.PointOfSale.Payment = class {
|
|||||||
() => frm.save(),
|
() => frm.save(),
|
||||||
() => this.update_totals_section(frm.doc)
|
() => this.update_totals_section(frm.doc)
|
||||||
]);
|
]);
|
||||||
} else {
|
|
||||||
frappe.run_serially([
|
|
||||||
() => frm.doc.ignore_pricing_rule=1,
|
|
||||||
() => frm.trigger('ignore_pricing_rule'),
|
|
||||||
() => frm.doc.ignore_pricing_rule=0,
|
|
||||||
() => frm.save(),
|
|
||||||
() => this.update_totals_section(frm.doc)
|
|
||||||
]);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user