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

Fixed merge conflict

Browse Source
This commit is contained in:
Nabin Hait 2017-02-27 14:40:53 +05:30
commit c642f76a4d
22 changed files with 4591 additions and 4380 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -2,7 +2,7 @@
from __future__ import unicode_literals
import frappe
__version__ = '7.2.23'
__version__ = '7.2.24'
def get_default_company(user=None):
'''Get default company for user'''

8
erpnext/accounts/doctype/payment_request/payment_request.json
View File

@ -374,7 +374,7 @@
"collapsible": 0,
"columns": 0,
"fieldname": "message",
"fieldtype": "Small Text",
"fieldtype": "Text",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@ -414,7 +414,7 @@
"label": "Message Examples",
"length": 0,
"no_copy": 0,
"options": "<pre><h5>Message Example</h5>\n\n&lt;p&gt; Thank You for being a part of {{ doc.company }}! We hope you are enjoying the service.&lt;/p&gt;\n\n&lt;p&gt; Please find enclosed the E Bill statement. The outstanding amount is {{ doc.grand_total }}.&lt;/p&gt;\n\n&lt;p&gt; We don't want you to be spending time running around in order to pay for your Bill.<br>After all, life is beautiful and the time you have in hand should be spent to enjoy it!<br>So here are our little ways to help you get more time for life! &lt;/p&gt;\n\n&lt;a href=\"{{ payment_url }}\"&gt; click here to pay &lt;/a&gt;\n\n</pre>\n",
"options": "<pre><h5>Message Example</h5>\n\n&lt;p&gt;Dear {{ doc.contact_person }},&lt;/p&gt;\n\n&lt;p&gt;Requesting payment for {{ doc.doctype }}, {{ doc.name }} for {{ doc.grand_total }}.&lt;/p&gt;\n\n&lt;a href=\"{{ payment_url }}\"&gt; click here to pay &lt;/a&gt;\n\n</pre>\n",
"permlevel": 0,
"precision": "",
"print_hide": 0,
@ -698,13 +698,13 @@
"hide_toolbar": 0,
"idx": 0,
"image_view": 0,
"in_create": 1,
"in_create": 0,
"in_dialog": 0,
"is_submittable": 1,
"issingle": 0,
"istable": 0,
"max_attachments": 0,
"modified": "2017-02-17 16:31:07.618348",
"modified": "2017-02-23 05:03:37.464863",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Payment Request",

51
erpnext/accounts/doctype/payment_request/payment_request.py
View File

@ -26,7 +26,7 @@ class PaymentRequest(Document):
ref_doc = frappe.get_doc(self.reference_doctype, self.reference_name)
if self.payment_account and ref_doc.currency != frappe.db.get_value("Account", self.payment_account, "account_currency"):
frappe.throw(_("Transaction currency must be same as Payment Gateway currency"))
def on_submit(self):
send_mail = True
self.make_communication_entry()
@ -54,20 +54,20 @@ class PaymentRequest(Document):
def set_payment_request_url(self):
if self.payment_account:
self.payment_url = self.get_payment_url()
if self.payment_url:
self.db_set('payment_url', self.payment_url)
if self.payment_url or not self.payment_gateway_account:
self.db_set('status', 'Initiated')
def get_payment_url(self):
data = frappe.db.get_value(self.reference_doctype, self.reference_name,
["company", "customer_name"], as_dict=1)
controller = get_integration_controller(self.payment_gateway)
controller.validate_transaction_currency(self.currency)
return controller.get_payment_url(**{
"amount": self.grand_total,
"title": data.company,
@ -83,7 +83,7 @@ class PaymentRequest(Document):
def set_as_paid(self):
if frappe.session.user == "Guest":
frappe.set_user("Administrator")
payment_entry = self.create_payment_entry()
self.make_invoice()
@ -157,7 +157,7 @@ class PaymentRequest(Document):
def set_as_cancelled(self):
self.db_set("status", "Cancelled")
def check_if_payment_entry_exists(self):
if self.status == "Paid":
payment_entry = frappe.db.sql_list("""select parent from `tabPayment Entry Reference`
@ -179,11 +179,11 @@ class PaymentRequest(Document):
def get_payment_success_url(self):
return self.payment_success_url
def on_payment_authorized(self, status=None):
if not status:
return
shopping_cart_settings = frappe.get_doc("Shopping Cart Settings")
if status in ["Authorized", "Completed"]:
@ -203,9 +203,9 @@ class PaymentRequest(Document):
}).get(success_url, "me")
else:
redirect_to = get_url("/orders/{0}".format(self.reference_name))
return redirect_to
@frappe.whitelist(allow_guest=True)
def make_payment_request(**args):
"""Make payment request"""
@ -234,7 +234,7 @@ def make_payment_request(**args):
"grand_total": grand_total,
"email_to": args.recipient_id or "",
"subject": "Payment Request for %s"%args.dn,
"message": gateway_account.get("message") or get_dummy_message(args.use_dummy_message),
"message": gateway_account.get("message") or get_dummy_message(ref_doc),
"reference_doctype": args.dt,
"reference_name": args.dn
})
@ -319,19 +319,24 @@ def make_status_as_paid(doc, method):
payment_request_name = frappe.db.get_value("Payment Request",
{"reference_doctype": ref.reference_doctype, "reference_name": ref.reference_name,
"docstatus": 1})
if payment_request_name:
doc = frappe.get_doc("Payment Request", payment_request_name)
if doc.status != "Paid":
doc.db_set('status', 'Paid')
frappe.db.commit()
def get_dummy_message(use_dummy_message=True):
return """
<p> Hope you are enjoying a service. Please consider bank details for payment </p>
<p> Bank Details <p><br>
<p> Bank Name : National Bank </p>
<p> Account Number : 123456789000872 </p>
<p> IFSC code : NB000001 </p>
<p> Account Name : Wind Power LLC </p>
"""
def get_dummy_message(doc):
return frappe.render_template("""{% if doc.contact_person -%}
<p>Dear {{ doc.contact_person }},</p>
{%- else %}<p>Hello,</p>{% endif %}
<p>{{ _("Requesting payment against {0} {1} for amount {2}").format(doc.doctype,
doc.name, doc.get_formatted("grand_total")) }}</p>
<a href="{{ payment_url }}">{{ _("Make Payment") }}</a>
<p>{{ _("If you have any questions, please get back to us.") }}</p>
<p>{{ _("Thank you for your business!") }}</p>
""", dict(doc=doc, payment_url = '{{ payment_url }}'))

6
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
View File

@ -324,6 +324,12 @@ cur_frm.cscript.select_print_heading = function(doc,cdt,cdn){
}
frappe.ui.form.on("Purchase Invoice", {
setup: function(frm) {
frm.custom_make_buttons = {
'Purchase Invoice': 'Debit Note',
'Payment Entry': 'Payment'
}
},
onload: function(frm) {
$.each(["warehouse", "rejected_warehouse"], function(i, field) {
frm.set_query(field, "items", function() {

6
erpnext/accounts/doctype/sales_invoice/sales_invoice.js
View File

@ -469,6 +469,12 @@ cur_frm.set_query("asset", "items", function(doc, cdt, cdn) {
frappe.ui.form.on('Sales Invoice', {
setup: function(frm){
frm.custom_make_buttons = {
'Delivery Note': 'Delivery',
'Sales Invoice': 'Sales Return',
'Payment Request': 'Payment Request',
'Payment': 'Payment Entry'
},
frm.fields_dict["timesheets"].grid.get_field("time_sheet").get_query = function(doc, cdt, cdn){
return{
query: "erpnext.projects.doctype.timesheet.timesheet.get_timesheet",

13
erpnext/buying/doctype/purchase_order/purchase_order.js
View File

@ -6,6 +6,13 @@ frappe.provide("erpnext.buying");
{% include 'erpnext/buying/doctype/purchase_common/purchase_common.js' %};
frappe.ui.form.on("Purchase Order", {
setup: function(frm) {
frm.custom_make_buttons = {
'Purchase Receipt': 'Receive',
'Purchase Invoice': 'Invoice',
'Stock Entry': 'Material to Supplier'
}
},
onload: function(frm) {
erpnext.queries.setup_queries(frm, "Warehouse", function() {
return erpnext.queries.warehouse(frm.doc);
@ -28,10 +35,8 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
var item = cur_frm.doc.items[i];
if(item.delivered_by_supplier !== 1) {
allow_receipt = true;
}
else {
is_drop_ship = true
} else {
is_drop_ship = true;
}
if(is_drop_ship && allow_receipt) {

4
erpnext/buying/doctype/request_for_quotation/request_for_quotation.js
View File

@ -8,6 +8,10 @@ cur_frm.add_fetch('contact', 'email_id', 'email_id')
frappe.ui.form.on("Request for Quotation",{
setup: function(frm) {
frm.custom_make_buttons = {
'Supplier Quotation': 'Supplier Quotation'
}
frm.fields_dict["suppliers"].grid.get_field("contact").get_query = function(doc, cdt, cdn){
var d =locals[cdt][cdn];
return {

8
erpnext/buying/doctype/supplier_quotation/supplier_quotation.js
View File

@ -4,6 +4,14 @@
// attach required files
{% include 'erpnext/buying/doctype/purchase_common/purchase_common.js' %};
frappe.ui.form.on('Suppier Quotation', {
setup: function() {
frm.custom_make_buttons = {
'Purchase Order': 'Purchase Order'
}
}
});
erpnext.buying.SupplierQuotationController = erpnext.buying.BuyingController.extend({
refresh: function() {
this._super();

6
erpnext/crm/doctype/opportunity/opportunity.js
View File

@ -5,6 +5,12 @@ frappe.provide("erpnext.crm");
cur_frm.email_field = "contact_email";
frappe.ui.form.on("Opportunity", {
setup: function(frm) {
frm.custom_make_buttons = {
'Quotation': 'Quotation',
'Supplier Quotation': 'Supplier Quotation'
}
},
customer: function(frm) {
frm.trigger('set_contact_link');
erpnext.utils.get_party_details(frm);

1
erpnext/hooks.py
View File

@ -28,6 +28,7 @@ after_install = "erpnext.setup.install.after_install"
boot_session = "erpnext.startup.boot.boot_session"
notification_config = "erpnext.startup.notifications.get_notification_config"
get_help_messages = "erpnext.utilities.activation.get_help_messages"
on_session_creation = "erpnext.shopping_cart.utils.set_cart_count"
on_logout = "erpnext.shopping_cart.utils.clear_cart_count"

4
erpnext/hr/doctype/holiday_list/holiday_list_calendar.js
View File

@ -3,8 +3,8 @@
frappe.views.calendar["Holiday List"] = {
field_map: {
"start": "from_date",
"end": "to_date",
"start": "holiday_date",
"end": "holiday_date",
"id": "name",
"title": "description",
"allDay": "allDay"

4
erpnext/public/js/controllers/transaction.js
View File

@ -781,7 +781,9 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
if(k=="price_list_rate") {
if(flt(v) != flt(d.price_list_rate)) price_list_rate_changed = true;
}
frappe.model.set_value(d.doctype, d.name, k, v);
if(v) {
frappe.model.set_value(d.doctype, d.name, k, v);
}
}
}

1
erpnext/public/js/utils.js
View File

@ -47,6 +47,7 @@ $.extend(erpnext, {
fields: [
{
"fieldtype": "Link",
"fieldname": "serial_no",
"options": "Serial No",
"label": __("Serial No"),
"get_query": function () {

15
erpnext/public/js/utils/party.js
View File

@ -46,11 +46,26 @@ erpnext.utils.get_party_details = function(frm, method, args, callback) {
frm.updating_party_details = false;
if(callback) callback();
frm.refresh();
erpnext.utils.add_item(frm);
}
}
});
}
erpnext.utils.add_item = function(frm) {
if(frm.is_new()) {
var prev_route = frappe.get_prev_route();
if(prev_route[1]==='Item' && !(frm.doc.items && frm.doc.items.length)) {
// add row
item = frm.add_child('items');
frm.refresh_field('items');
// set item
frappe.model.set_value(item.doctype, item.name, 'item_code', prev_route[2]);
}
}
}
erpnext.utils.get_address_display = function(frm, address_field, display_field, is_your_company_address) {
if(frm.updating_party_details) return;

8
erpnext/selling/doctype/quotation/quotation.js
View File

@ -4,6 +4,14 @@
{% include 'erpnext/selling/sales_common.js' %}
frappe.ui.form.on('Quotation', {
setup: function(frm) {
frm.custom_make_buttons = {
'Sales Order': 'Make Sales Order'
}
}
});
erpnext.selling.QuotationController = erpnext.selling.SellingController.extend({
onload: function(doc, dt, dn) {
var me = this;

6
erpnext/selling/doctype/sales_order/sales_order.js
View File

@ -6,6 +6,12 @@
frappe.ui.form.on("Sales Order", {
setup: function(frm) {
$.extend(frm.cscript, new erpnext.selling.SalesOrderController({frm: frm}));
frm.custom_make_buttons = {
'Delivery Note': 'Delivery',
'Sales Invoice': 'Invoice',
'Material Request': 'Material Request',
'Purchase Order': 'Purchase Order'
}
},
onload: function(frm) {
erpnext.queries.setup_queries(frm, "Warehouse", function() {

6
erpnext/stock/doctype/delivery_note/delivery_note.js
View File

@ -8,6 +8,12 @@ frappe.provide("erpnext.stock.delivery_note");
frappe.ui.form.on("Delivery Note", {
setup: function(frm) {
frm.custom_make_buttons = {
'Packing Slip': 'Packing Slip',
'Installation Note': 'Installation Note',
'Sales Invoice': 'Invoice',
'Stock Entry': 'Return',
},
frm.set_indicator_formatter('item_code',
function(doc) {
return (doc.docstatus==1 || doc.qty<=doc.actual_qty) ? "green" : "orange"

22
erpnext/stock/doctype/material_request/material_request.js
View File

@ -4,7 +4,19 @@
{% include 'erpnext/buying/doctype/purchase_common/purchase_common.js' %};
frappe.ui.form.on('Material Request', {
setup: function(frm) {
frm.custom_make_buttons = {
'Stock Entry': 'Issue Material',
'Purchase Order': 'Purchase Order',
'Request for Quotation': 'Request for Quotation',
'Supplier Quotation': 'Supplier Quotation',
'Production Order': 'Production Order'
}
},
onload: function(frm) {
// add item, if previous view was item
erpnext.utils.add_item(frm);
// formatter for material request item
frm.set_indicator_formatter('item_code',
function(doc) { return (doc.qty<=doc.ordered_qty) ? "green" : "orange" }),
@ -71,7 +83,7 @@ erpnext.buying.MaterialRequestController = erpnext.buying.BuyingController.exten
if(doc.material_request_type === "Manufacture" && doc.status === "Submitted")
cur_frm.add_custom_button(__("Production Order"),
this.raise_production_orders, __("Make"));
function() { me.raise_production_orders() }, __("Make"));
cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
@ -202,10 +214,16 @@ erpnext.buying.MaterialRequestController = erpnext.buying.BuyingController.exten
},
raise_production_orders: function() {
var me = this;
frappe.call({
method:"erpnext.stock.doctype.material_request.material_request.raise_production_orders",
args: {
"material_request": cur_frm.doc.name
"material_request": me.frm.doc.name
},
callback: function(r) {
if(r.message.length) {
me.frm.reload_doc();
}
}
});
}

6
erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
View File

@ -6,6 +6,12 @@
frappe.provide("erpnext.stock");
frappe.ui.form.on("Purchase Receipt", {
setup: function(frm) {
frm.custom_make_buttons = {
'Stock Entry': 'Return',
'Purchase Invoice': 'Invoice'
}
},
onload: function(frm) {
$.each(["warehouse", "rejected_warehouse"], function(i, field) {
frm.set_query(field, "items", function() {

2
erpnext/stock/doctype/stock_entry/stock_entry.js
View File

@ -252,6 +252,7 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
this.show_general_ledger();
}
erpnext.hide_company();
erpnext.utils.add_item(this.frm);
},
on_submit: function() {
@ -362,7 +363,6 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
excise.voucher_type = 'Excise Entry';
frappe.set_route('Form', 'Journal Entry', excise.name);
}, __("Make"));
this.frm.page.set_inner_btn_group_as_primary(__("Make"));
},
items_add: function(doc, cdt, cdn) {

8687
erpnext/translations/pt.csv
View File

File diff suppressed because it is too large Load Diff

105
erpnext/utilities/activation.py
View File

@ -1,4 +1,6 @@
import frappe
import frappe, erpnext
from frappe import _
def get_level():
activation_level = 0
@ -20,6 +22,9 @@ def get_level():
if frappe.db.count('Employee') > 3:
activation_level += 1
if frappe.db.count('Lead') > 3:
activation_level += 1
if frappe.db.count('Payment Entry') > 2:
activation_level += 1
@ -29,8 +34,104 @@ def get_level():
if frappe.db.count('User') > 5:
activation_level += 1
if frappe.db.count('Student') > 5:
activation_level += 1
if frappe.db.count('Student Batch') > 5:
activation_level += 1
if frappe.db.count('Instructor') > 5:
activation_level += 1
# recent login
if frappe.db.sql('select name from tabUser where last_login > date_sub(now(), interval 2 day) limit 1'):
activation_level += 1
return activation_level
return activation_level
def get_help_messages():
'''Returns help messages to be shown on Desktop'''
# if get_level() > 6:
# return []
messages = []
domain = frappe.db.get_value('Company', erpnext.get_default_company(), 'domain')
if domain in ('Manufacturing', 'Retail', 'Services', 'Distribution'):
count = frappe.db.count('Lead')
if count < 3:
messages.append(dict(
title=_('Create Leads'),
description=_('Create Leads'),
action=_('Leads help you get business, add all your contacts and more as your leads'),
route='List/Lead',
count=count
))
count = frappe.db.count('Quotation')
if count < 3:
messages.append(dict(
title=_('Create customer quotes'),
description=_('Quotations are proposals, bids you have sent to your customers'),
action=_('Make Quotation'),
route='List/Quotation'
))
count = frappe.db.count('Sales Order')
if count < 3:
messages.append(dict(
title=_('Manage your orders'),
description=_('Make Sales Orders to help you plan your work and deliver on-time'),
action=_('Make Sales Order'),
route='List/Sales Order'
))
count = frappe.db.count('Purchase Order')
if count < 3:
messages.append(dict(
title=_('Create Purchase Orders'),
description=_('Purchase orders help you plan and follow up on your purchases'),
action=_('Make Purchase Order'),
route='List/Purchase Order'
))
count = frappe.db.count('User')
if count < 3:
messages.append(dict(
title=_('Create Users'),
description=_('Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts'),
action=_('Make User'),
route='List/User'
))
elif domain == 'Education':
count = frappe.db.count('Student')
if count < 5:
messages.append(dict(
title=_('Add Students'),
description=_('Students are at the heart of the system, add all your students'),
action=_('Make Student'),
route='List/Student'
))
count = frappe.db.count('Student Batch')
if count < 3:
messages.append(dict(
title=_('Group your students in batches'),
description=_('Student Batches help you track attendance, assessments and fees for students'),
action=_('Make Student Batch'),
route='List/Student Batch'
))
# anyways
count = frappe.db.count('Employee')
if count < 3:
messages.append(dict(
title=_('Create Employee Records'),
description=_('Create Employee records to manage leaves, expense claims and payroll'),
action=_('Make Employee'),
route='List/Employee'
))
return messages