Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into fix_asset_sold_status

Browse Source
This commit is contained in:
Anand Baburajan 2022-09-28 21:36:43 +05:30 committed by GitHub
commit b3c4305fa2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/patches/v13_0/update_old_loans.py
View File

@ -100,6 +100,7 @@ def execute():
"mode_of_payment": loan.mode_of_payment, "mode_of_payment": loan.mode_of_payment,
"loan_account": loan.loan_account, "loan_account": loan.loan_account,
"payment_account": loan.payment_account, "payment_account": loan.payment_account,
"disbursement_account": loan.payment_account,
"interest_income_account": loan.interest_income_account, "interest_income_account": loan.interest_income_account,
"penalty_income_account": loan.penalty_income_account, "penalty_income_account": loan.penalty_income_account,
}, },
@ -190,6 +191,7 @@ def create_loan_type(loan, loan_type_name, penalty_account):
loan_type_doc.company = loan.company loan_type_doc.company = loan.company
loan_type_doc.mode_of_payment = loan.mode_of_payment loan_type_doc.mode_of_payment = loan.mode_of_payment
loan_type_doc.payment_account = loan.payment_account loan_type_doc.payment_account = loan.payment_account
loan_type_doc.disbursement_account = loan.payment_account
loan_type_doc.loan_account = loan.loan_account loan_type_doc.loan_account = loan.loan_account
loan_type_doc.interest_income_account = loan.interest_income_account loan_type_doc.interest_income_account = loan.interest_income_account
loan_type_doc.penalty_income_account = penalty_account loan_type_doc.penalty_income_account = penalty_account

20
erpnext/www/book_appointment/index.html
View File

@ -12,8 +12,8 @@
<!-- title: Book an appointment --> <!-- title: Book an appointment -->
<div id="select-date-time"> <div id="select-date-time">
<div class="text-center mt-5"> <div class="text-center mt-5">
<h3>Book an appointment</h3> <h3>{{ _("Book an appointment") }}</h3>
<p class="lead text-muted" id="lead-text">Select the date and your timezone</p> <p class="lead text-muted" id="lead-text">{{ _("Select the date and your timezone") }}</p>
</div> </div>
<div class="row justify-content-center mt-3"> <div class="row justify-content-center mt-3">
<div class="col-md-6 align-self-center "> <div class="col-md-6 align-self-center ">
@ -31,7 +31,7 @@
</div> </div>
<div class="row justify-content-center mt-3"> <div class="row justify-content-center mt-3">
<div class="col-md-4 mb-3"> <div class="col-md-4 mb-3">
<button class="btn btn-primary form-control" id="next-button">Next</button> <button class="btn btn-primary form-control" id="next-button">{{ _("Next") }}</button>
</div> </div>
</div> </div>
</div> </div>
@ -39,24 +39,24 @@
<!--Enter Details--> <!--Enter Details-->
<div id="enter-details" class="mb-5"> <div id="enter-details" class="mb-5">
<div class="text-center mt-5"> <div class="text-center mt-5">
<h3>Add details</h3> <h3>{{ _("Add details") }}</h3>
<p class="lead text-muted">Selected date is <span class="date-span"></span> at <span class="time-span"> <p class="lead text-muted">{{ _("Selected date is") }} <span class="date-span"></span> {{ _("at") }} <span class="time-span">
</span></p> </span></p>
</div> </div>
<div class="row justify-content-center mt-3"> <div class="row justify-content-center mt-3">
<div class="col-md-4 align-items-center"> <div class="col-md-4 align-items-center">
<form id="customer-form" action='#'> <form id="customer-form" action='#'>
<input class="form-control mt-3" type="text" name="customer_name" id="customer_name" placeholder="Your Name (required)" required> <input class="form-control mt-3" type="text" name="customer_name" id="customer_name" placeholder="{{ _('Your Name (required)') }}" required>
<input class="form-control mt-3" type="tel" name="customer_number" id="customer_number" placeholder="+910000000000"> <input class="form-control mt-3" type="tel" name="customer_number" id="customer_number" placeholder="+910000000000">
<input class="form-control mt-3" type="text" name="customer_skype" id="customer_skype" placeholder="Skype"> <input class="form-control mt-3" type="text" name="customer_skype" id="customer_skype" placeholder="Skype">
<input class="form-control mt-3"type="email" name="customer_email" id="customer_email" placeholder="Email Address (required)" required> <input class="form-control mt-3"type="email" name="customer_email" id="customer_email" placeholder="{{ _('Email Address (required)') }}" required>
<textarea class="form-control mt-3" name="customer_notes" id="customer_notes" cols="30" rows="10" <textarea class="form-control mt-3" name="customer_notes" id="customer_notes" cols="30" rows="10"
placeholder="Notes"></textarea> placeholder="{{ _('Notes') }}"></textarea>
</form> </form>
<div class="row mt-3 " id="submit-button-area"> <div class="row mt-3 " id="submit-button-area">
<div class="col-md mt-3" style="grid-area: back;"><button class="btn btn-dark form-control" onclick="initialise_select_date()">Go back</button></div> <div class="col-md mt-3" style="grid-area: back;"><button class="btn btn-dark form-control" onclick="initialise_select_date()">{{ _("Go back") }}</button></div>
<div class="col-md mt-3" style="grid-area: submit;"><button class="btn btn-primary form-control " onclick="submit()" id="submit-button">Submit</button></div> <div class="col-md mt-3" style="grid-area: submit;"><button class="btn btn-primary form-control " onclick="submit()" id="submit-button">{{ _("Submit") }}</button></div>
</div> </div>
</div> </div>
</div> </div>

12
erpnext/www/book_appointment/index.js
View File

@ -69,7 +69,7 @@ function on_date_or_timezone_select() {
window.selected_timezone = timezone.value; window.selected_timezone = timezone.value;
update_time_slots(date_picker.value, timezone.value); update_time_slots(date_picker.value, timezone.value);
let lead_text = document.getElementById('lead-text'); let lead_text = document.getElementById('lead-text');
lead_text.innerHTML = "Select Time" lead_text.innerHTML = __("Select Time")
} }
async function get_time_slots(date, timezone) { async function get_time_slots(date, timezone) {
@ -89,7 +89,7 @@ async function update_time_slots(selected_date, selected_timezone) {
clear_time_slots(); clear_time_slots();
if (window.slots.length <= 0) { if (window.slots.length <= 0) {
let message_div = document.createElement('p'); let message_div = document.createElement('p');
message_div.innerHTML = "There are no slots available on this date"; message_div.innerHTML = __("There are no slots available on this date");
timeslot_container.appendChild(message_div); timeslot_container.appendChild(message_div);
return return
} }
@ -128,7 +128,7 @@ function get_slot_layout(time) {
let start_time_string = moment(time).tz(timezone).format("LT"); let start_time_string = moment(time).tz(timezone).format("LT");
let end_time = moment(time).tz(timezone).add(window.appointment_settings.appointment_duration, 'minutes'); let end_time = moment(time).tz(timezone).add(window.appointment_settings.appointment_duration, 'minutes');
let end_time_string = end_time.format("LT"); let end_time_string = end_time.format("LT");
return `<span style="font-size: 1.2em;">${start_time_string}</span><br><span class="text-muted small">to ${end_time_string}</span>`; return `<span style="font-size: 1.2em;">${start_time_string}</span><br><span class="text-muted small">${__("to") } ${end_time_string}</span>`;
} }
function select_time() { function select_time() {
@ -227,9 +227,9 @@ async function submit() {
}, },
callback: (response)=>{ callback: (response)=>{
if (response.message.status == "Unverified") { if (response.message.status == "Unverified") {
frappe.show_alert("Please check your email to confirm the appointment") frappe.show_alert(__("Please check your email to confirm the appointment"))
} else { } else {
frappe.show_alert("Appointment Created Successfully"); frappe.show_alert(__("Appointment Created Successfully"));
} }
setTimeout(()=>{ setTimeout(()=>{
let redirect_url = "/"; let redirect_url = "/";
@ -239,7 +239,7 @@ async function submit() {
window.location.href = redirect_url;},5000) window.location.href = redirect_url;},5000)
}, },
error: (err)=>{ error: (err)=>{
frappe.show_alert("Something went wrong please try again"); frappe.show_alert(__("Something went wrong please try again"));
button.disabled = false; button.disabled = false;
} }
}); });

4
erpnext/www/book_appointment/verify/index.html
View File

@ -8,11 +8,11 @@
{% if success==True %} {% if success==True %}
<div class="alert alert-success"> <div class="alert alert-success">
Your email has been verified and your appointment has been scheduled {{ _("Your email has been verified and your appointment has been scheduled") }}
</div> </div>
{% else %} {% else %}
<div class="alert alert-danger"> <div class="alert alert-danger">
Verification failed please check the link {{ _("Verification failed please check the link") }}
</div> </div>
{% endif %} {% endif %}
{% endblock%} {% endblock%}