From 34fb5cf0e2235d4a1e9a2751794aa6738b14510e Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 18 Jan 2016 12:35:00 +0530 Subject: [PATCH] [fix] make setup_wizard.create_bank_account multi-company safe --- .../stock/erpnext.stock.get_item_details.html | 50 +- erpnext/docs/current/index.html | 2 +- .../docs/current/models/accounts/account.html | 23 + .../models/accounts/journal_entry.html | 6 +- .../models/accounts/payment_gateway.html | 101 +++ .../accounts/payment_gateway_account.html | 273 ++++++ .../models/accounts/payment_request.html | 810 ++++++++++++++++++ .../current/models/accounts/pricing_rule.html | 18 +- .../current/models/buying/purchase_order.html | 210 +++-- .../current/models/projects/time_log.html | 300 ++++--- .../current/models/selling/sales_order.html | 16 +- .../models/stock/purchase_receipt.html | 2 +- .../models/stock/purchase_receipt_item.html | 338 ++++---- erpnext/setup/setup_wizard/setup_wizard.py | 6 +- 14 files changed, 1724 insertions(+), 431 deletions(-) create mode 100644 erpnext/docs/current/models/accounts/payment_gateway.html create mode 100644 erpnext/docs/current/models/accounts/payment_gateway_account.html create mode 100644 erpnext/docs/current/models/accounts/payment_request.html diff --git a/erpnext/docs/current/api/stock/erpnext.stock.get_item_details.html b/erpnext/docs/current/api/stock/erpnext.stock.get_item_details.html index 87248086402..bce01a4ee5c 100644 --- a/erpnext/docs/current/api/stock/erpnext.stock.get_item_details.html +++ b/erpnext/docs/current/api/stock/erpnext.stock.get_item_details.html @@ -23,23 +23,34 @@ erpnext.stock.get_item_details.apply_price_list - (args) + (args, as_doc=False)

-

args = { - "itemlist": [{"doctype": "", "name": "", "itemcode": "", "brand": "", "itemgroup": ""}, ...], - "conversionrate": 1.0, - "sellingpricelist": None, - "pricelistcurrency": None, - "plcconversionrate": 1.0, - "parenttype": "", - "parent": "", +

Apply pricelist on a document-like dict object and return as +{'parent': dict, 'children': list}

+ +

Parameters:

+ +
    +
  • args - See below
    • +

  • as_doc - Updates value in the passed dict

    + +

    args = { + "doctype": "", + "name": "", + "items": [{"doctype": "", "name": "", "itemcode": "", "brand": "", "itemgroup": ""}, ...], + "conversionrate": 1.0, + "sellingpricelist": None, + "pricelistcurrency": None, + "plcconversionrate": 1.0, + "doctype": "", + "name": "", "supplier": None, - "transactiondate": None, - "conversionrate": 1.0, - "buyingpricelist": None, - "transactiontype": "selling", + "transactiondate": None, + "conversionrate": 1.0, + "buyingpricelist": None, "ignorepricing_rule": 0/1 -}

    +}

    • +

@@ -251,16 +262,15 @@ "sellingpricelist": None, "pricelistcurrency": None, "plcconversionrate": 1.0, - "parenttype": "", - "parent": "", + "doctype": "", + "name": "", "supplier": None, "transactiondate": None, "conversionrate": 1.0, "buyingpricelist": None, "issubcontracted": "Yes" / "No", - "transactiontype": "selling", - "ignorepricingrule": 0/1 - "project_name": "" + "ignorepricingrule": 0/1 + "projectname": "" }


@@ -373,7 +383,7 @@ erpnext.stock.get_item_details.get_price_list_rate_for - (args, item_code) + (price_list, item_code)

No docs

diff --git a/erpnext/docs/current/index.html b/erpnext/docs/current/index.html index 4c021c18b37..01071ee1e07 100644 --- a/erpnext/docs/current/index.html +++ b/erpnext/docs/current/index.html @@ -35,7 +35,7 @@ Version - 6.16.4 + 6.17.0 diff --git a/erpnext/docs/current/models/accounts/account.html b/erpnext/docs/current/models/accounts/account.html index 5b3103d65ca..37c774eb4cc 100644 --- a/erpnext/docs/current/models/accounts/account.html +++ b/erpnext/docs/current/models/accounts/account.html @@ -581,6 +581,20 @@ Credit +

+ + + validate_group_or_ledger + (self) +

+

No docs

+
+
+ + + + +

@@ -847,6 +861,15 @@ Credit +

  • + + +Payment Gateway Account + +
    • + + +
  • diff --git a/erpnext/docs/current/models/accounts/journal_entry.html b/erpnext/docs/current/models/accounts/journal_entry.html index 4aab93c2692..fb29c5cb0f2 100644 --- a/erpnext/docs/current/models/accounts/journal_entry.html +++ b/erpnext/docs/current/models/accounts/journal_entry.html @@ -1215,7 +1215,7 @@ Yes erpnext.accounts.doctype.journal_entry.journal_entry.get_default_bank_cash_account - (company, voucher_type, mode_of_payment=None) + (company, voucher_type, mode_of_payment=None, account=None)

    No docs

    @@ -1321,7 +1321,7 @@ Yes erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_invoice - (dt, dn) + (dt, dn, amount=None, journal_entry=False, bank_account=None)

    No docs

    @@ -1339,7 +1339,7 @@ Yes erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_order - (dt, dn) + (dt, dn, amount=None, journal_entry=False, bank_account=None)

    No docs

    diff --git a/erpnext/docs/current/models/accounts/payment_gateway.html b/erpnext/docs/current/models/accounts/payment_gateway.html new file mode 100644 index 00000000000..9707ba6c797 --- /dev/null +++ b/erpnext/docs/current/models/accounts/payment_gateway.html @@ -0,0 +1,101 @@ + + + + + + +
    + + + Version 6.x.x + + + Source + +
    + + + + + +

    Table Name: tabPayment Gateway

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1gateway + Data + Gateway + +
    + + +
    +

    Controller

    +

    erpnext.accounts.doctype.payment_gateway.payment_gateway

    + + + + + + + +

    Class PaymentGateway

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + +
    +
    + + + + + + +

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/erpnext/docs/current/models/accounts/payment_gateway_account.html b/erpnext/docs/current/models/accounts/payment_gateway_account.html new file mode 100644 index 00000000000..68d369b8c02 --- /dev/null +++ b/erpnext/docs/current/models/accounts/payment_gateway_account.html @@ -0,0 +1,273 @@ + + + + + + +
    + + + Version 6.x.x + + + Source + +
    + + + + + +

    Table Name: tabPayment Gateway Account

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1gateway_acount_details + Section Break + Gateway Acount Details + +
    2is_default + Check + Is Default + +
    3gateway + Link + Gateway + + + + + + +Payment Gateway + + + +
    4payment_account + Link + Payment Account + + + + + + +Account + + + +
    5currency + Read Only + Currency + + + 
    payment_account.account_currency
    +
    6payment_request_message + Section Break + Payment Request Message + +
    7message + Text Editor + + +
    8payment_url_message + Data + Payment URL Message + +
    9payment_success_url + Data + Payment Success URL + +
    + + +
    +

    Controller

    +

    erpnext.accounts.doctype.payment_gateway_account.payment_gateway_account

    + + + + + + + +

    Class PaymentGatewayAccount

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + + + + +

    + + + autoname + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + set_as_default_if_not_set + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + update_default_payment_gateway + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + validate + (self) +

    +

    No docs

    +
    +
    + + +
    +
    + + + + + + +

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/erpnext/docs/current/models/accounts/payment_request.html b/erpnext/docs/current/models/accounts/payment_request.html new file mode 100644 index 00000000000..668fff8fb6a --- /dev/null +++ b/erpnext/docs/current/models/accounts/payment_request.html @@ -0,0 +1,810 @@ + + + + + + +
    + + + Version 6.x.x + + + Source + +
    + + + + + +

    Table Name: tabPayment Request

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1payment_details + Section Break + Payment Details + +
    2amount + Currency + Amount + +
    3currency + Link + Currency + + + + + + +Currency + + + +
    4make_sales_invoice + Check + Make Sales Invoice + +
    5column_break_5 + Column Break + + +
    6status + Select + Status + + + 
    +Draft
+Initiated
+Paid
+Failed
+Cancelled
    +
    7section_break_7 + Section Break + + +
    8payment_gateway + Link + Payment Gateway + + + + + + +Payment Gateway Account + + + +
    9payment_success_url + Data + Payment Success URL + +
    10column_break_9 + Column Break + + +
    11gateway + Read Only + Gateway + + + 
    payment_gateway.gateway
    +
    12payment_account + Read Only + Payment Account + + + 
    payment_gateway.payment_account
    +
    13recipient_and_message + Section Break + Recipient and Message + +
    14print_format + Select + Print Format + +
    15mute_email + Check + Mute Email + +
    16email_to + Data + Email To + +
    17subject + Data + Subject + +
    18message + Text Editor + Message + +
    19payment_url_message + Data + Payment URL Message + +
    20payment_url + Data + payment_url + +
    21reference_details + Section Break + Reference Details + +
    22reference_doctype + Link + Reference Doctype + + + + + + +DocType + + + +
    23reference_name + Dynamic Link + Reference Name + + + 
    reference_doctype
    +
    24amended_from + Link + Amended From + + + + + + +Payment Request + + + +
    + + +
    +

    Controller

    +

    erpnext.accounts.doctype.payment_request.payment_request

    + + + + + + + +

    Class PaymentRequest

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + + + + +

    + + + create_journal_entry + (self) +

    +

    create entry

    +
    +
    + + + + + +

    + + + get_message + (self) +

    +

    return message with payment gateway link

    +
    +
    + + + + + +

    + + + get_payment_success_url + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + get_payment_url + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + make_communication_entry + (self) +

    +

    Make communication entry

    +
    +
    + + + + + +

    + + + make_invoice + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + on_cancel + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + on_submit + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + on_update_after_submit + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + send_email + (self) +

    +

    send email with payment link

    +
    +
    + + + + + +

    + + + send_payment_request + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + set_as_cancelled + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + set_as_paid + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + set_failed + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + set_status + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + validate + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + validate_currency + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + validate_payment_gateway + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + validate_payment_gateway_account + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + validate_payment_request + (self) +

    +

    No docs

    +
    +
    + + +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.accounts.doctype.payment_request.payment_request.generate_payment_request +

    +

    + + + erpnext.accounts.doctype.payment_request.payment_request.generate_payment_request + (name) +

    +

    No docs

    +
    +
    + + + + + + + +

    + + + erpnext.accounts.doctype.payment_request.payment_request.get_amount + (ref_doc, dt) +

    +

    get amount based on doctype

    +
    +
    + + + + + + + +

    + + + erpnext.accounts.doctype.payment_request.payment_request.get_gateway_details + (args) +

    +

    return gateway and payment account of default payment gateway

    +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.accounts.doctype.payment_request.payment_request.get_print_format_list +

    +

    + + + erpnext.accounts.doctype.payment_request.payment_request.get_print_format_list + (ref_doctype) +

    +

    No docs

    +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.accounts.doctype.payment_request.payment_request.make_payment_request +

    +

    + + + erpnext.accounts.doctype.payment_request.payment_request.make_payment_request + () +

    +

    Make payment request

    +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.accounts.doctype.payment_request.payment_request.resend_payment_email +

    +

    + + + erpnext.accounts.doctype.payment_request.payment_request.resend_payment_email + (docname) +

    +

    No docs

    +
    +
    + + + + + + +

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/erpnext/docs/current/models/accounts/pricing_rule.html b/erpnext/docs/current/models/accounts/pricing_rule.html index 67e561f63c8..5539128d954 100644 --- a/erpnext/docs/current/models/accounts/pricing_rule.html +++ b/erpnext/docs/current/models/accounts/pricing_rule.html @@ -814,21 +814,21 @@ Discount Percentage (args)

    args = { - "itemlist": [{"doctype": "", "name": "", "itemcode": "", "brand": "", "itemgroup": ""}, ...], + "items": [{"doctype": "", "name": "", "itemcode": "", "brand": "", "itemgroup": ""}, ...], "customer": "something", - "customergroup": "something", + "customergroup": "something", "territory": "something", "supplier": "something", - "suppliertype": "something", + "suppliertype": "something", "currency": "something", - "conversionrate": "something", - "pricelist": "something", - "plcconversionrate": "something", + "conversionrate": "something", + "pricelist": "something", + "plcconversionrate": "something", "company": "something", - "transactiondate": "something", + "transactiondate": "something", "campaign": "something", - "salespartner": "something", - "ignorepricing_rule": "something" + "salespartner": "something", + "ignorepricingrule": "something" }


    diff --git a/erpnext/docs/current/models/buying/purchase_order.html b/erpnext/docs/current/models/buying/purchase_order.html index bbf1dce06b2..c627191b0a2 100644 --- a/erpnext/docs/current/models/buying/purchase_order.html +++ b/erpnext/docs/current/models/buying/purchase_order.html @@ -101,6 +101,18 @@ 5 + get_items_from_open_material_requests + + Button + + Get Items from Open Material Requests + + + + + + + 6 is_subcontracted Select @@ -115,7 +127,7 @@ Yes - 6 + 7 supplier_name Data @@ -127,7 +139,7 @@ Yes - 7 + 8 address_display Small Text @@ -139,7 +151,7 @@ Yes - 8 + 9 contact_display Small Text @@ -151,7 +163,7 @@ Yes - 9 + 10 contact_mobile Small Text @@ -163,7 +175,7 @@ Yes - 10 + 11 contact_email Small Text @@ -175,7 +187,7 @@ Yes - 11 + 12 column_break1 Column Break @@ -187,7 +199,7 @@ Yes - 12 + 13 transaction_date Date @@ -199,7 +211,7 @@ Yes - 13 + 14 amended_from Link @@ -220,7 +232,7 @@ Yes - 14 + 15 company Link @@ -241,7 +253,7 @@ Yes - 15 + 16 drop_ship Section Break @@ -253,7 +265,7 @@ Yes - 16 + 17 customer Link @@ -274,7 +286,7 @@ Yes - 17 + 18 customer_name Data @@ -286,7 +298,7 @@ Yes - 18 + 19 column_break_19 Column Break @@ -298,7 +310,7 @@ Yes - 19 + 20 customer_address Link @@ -319,7 +331,7 @@ Yes - 20 + 21 customer_contact_person Link @@ -340,7 +352,7 @@ Yes - 21 + 22 customer_address_display Small Text @@ -352,7 +364,7 @@ Yes - 22 + 23 customer_contact_display Small Text @@ -364,7 +376,7 @@ Yes - 23 + 24 customer_contact_mobile Small Text @@ -376,7 +388,7 @@ Yes - 24 + 25 customer_contact_email Small Text @@ -388,7 +400,7 @@ Yes - 25 + 26 currency_and_price_list Section Break @@ -402,7 +414,7 @@ Yes - 26 + 27 currency Link @@ -423,7 +435,7 @@ Yes - 27 + 28 conversion_rate Float @@ -435,7 +447,7 @@ Yes - 28 + 29 cb_price_list Column Break @@ -447,7 +459,7 @@ Yes - 29 + 30 buying_price_list Link @@ -468,7 +480,7 @@ Yes - 30 + 31 price_list_currency Link @@ -489,7 +501,7 @@ Yes - 31 + 32 plc_conversion_rate Float @@ -501,7 +513,7 @@ Yes - 32 + 33 ignore_pricing_rule Check @@ -513,7 +525,7 @@ Yes - 33 + 34 items_section Section Break @@ -527,7 +539,7 @@ Yes - 34 + 35 items Table @@ -547,8 +559,20 @@ Yes + + 36 + get_last_purchase_rate + + Button + + Get last purchase rate + + + + + - 35 + 37 sb_last_purchase Section Break @@ -560,7 +584,7 @@ Yes - 36 + 38 base_total Currency @@ -574,7 +598,7 @@ Yes - 37 + 39 base_net_total Currency @@ -588,7 +612,7 @@ Yes - 38 + 40 column_break_26 Column Break @@ -600,7 +624,7 @@ Yes - 39 + 41 total Currency @@ -614,7 +638,7 @@ Yes - 40 + 42 net_total Currency @@ -628,7 +652,7 @@ Yes - 41 + 43 taxes_section Section Break @@ -642,7 +666,7 @@ Yes - 42 + 44 taxes_and_charges Link @@ -663,7 +687,7 @@ Yes - 43 + 45 taxes Table @@ -684,7 +708,7 @@ Yes - 44 + 46 other_charges_calculation HTML @@ -696,7 +720,7 @@ Yes - 45 + 47 totals Section Break @@ -710,7 +734,7 @@ Yes - 46 + 48 base_taxes_and_charges_added Currency @@ -724,7 +748,7 @@ Yes - 47 + 49 base_taxes_and_charges_deducted Currency @@ -738,7 +762,7 @@ Yes - 48 + 50 base_total_taxes_and_charges Currency @@ -752,7 +776,7 @@ Yes - 49 + 51 column_break_39 Column Break @@ -764,7 +788,7 @@ Yes - 50 + 52 taxes_and_charges_added Currency @@ -778,7 +802,7 @@ Yes - 51 + 53 taxes_and_charges_deducted Currency @@ -792,7 +816,7 @@ Yes - 52 + 54 total_taxes_and_charges Currency @@ -806,7 +830,7 @@ Yes - 53 + 55 discount_section Section Break @@ -818,7 +842,7 @@ Yes - 54 + 56 apply_discount_on Select @@ -834,7 +858,7 @@ Net Total - 55 + 57 base_discount_amount Currency @@ -848,7 +872,7 @@ Net Total - 56 + 58 column_break_45 Column Break @@ -860,7 +884,7 @@ Net Total - 57 + 59 additional_discount_percentage Float @@ -872,7 +896,7 @@ Net Total - 58 + 60 discount_amount Currency @@ -886,7 +910,7 @@ Net Total - 59 + 61 totals_section Section Break @@ -898,7 +922,7 @@ Net Total - 60 + 62 base_grand_total Currency @@ -912,7 +936,7 @@ Net Total - 61 + 63 base_in_words Data @@ -925,7 +949,7 @@ Net Total - 62 + 64 base_rounded_total Currency @@ -939,7 +963,7 @@ Net Total - 63 + 65 advance_paid Currency @@ -951,7 +975,7 @@ Net Total - 64 + 66 column_break4 Column Break @@ -963,7 +987,7 @@ Net Total - 65 + 67 grand_total Currency @@ -977,7 +1001,7 @@ Net Total - 66 + 68 in_words Data @@ -989,7 +1013,7 @@ Net Total - 67 + 69 terms_section_break Section Break @@ -1003,7 +1027,7 @@ Net Total - 68 + 70 tc_name Link @@ -1024,7 +1048,7 @@ Net Total - 69 + 71 terms Text Editor @@ -1036,7 +1060,7 @@ Net Total - 70 + 72 contact_section Section Break @@ -1050,7 +1074,7 @@ Net Total - 71 + 73 supplier_address Link @@ -1071,7 +1095,7 @@ Net Total - 72 + 74 cb_contact Column Break @@ -1083,7 +1107,7 @@ Net Total - 73 + 75 contact_person Link @@ -1104,7 +1128,7 @@ Net Total - 74 + 76 more_info Section Break @@ -1116,7 +1140,7 @@ Net Total - 75 + 77 status Select @@ -1139,7 +1163,7 @@ Delivered - 76 + 78 fiscal_year Link @@ -1160,7 +1184,7 @@ Delivered - 77 + 79 ref_sq Data @@ -1172,7 +1196,7 @@ Delivered - 78 + 80 column_break_74 Column Break @@ -1184,7 +1208,7 @@ Delivered - 79 + 81 per_received Percent @@ -1196,7 +1220,7 @@ Delivered - 80 + 82 per_billed Percent @@ -1208,7 +1232,7 @@ Delivered - 81 + 83 column_break5 Section Break @@ -1220,7 +1244,7 @@ Delivered - 82 + 84 letter_head Link @@ -1241,7 +1265,7 @@ Delivered - 83 + 85 select_print_heading Link @@ -1262,7 +1286,7 @@ Delivered - 84 + 86 raw_material_details Section Break @@ -1276,7 +1300,7 @@ Delivered - 85 + 87 supplied_items Table @@ -1297,7 +1321,7 @@ Delivered - 86 + 88 recurring_order Section Break @@ -1311,7 +1335,7 @@ Delivered - 87 + 89 column_break Column Break @@ -1323,7 +1347,7 @@ Delivered - 88 + 90 is_recurring Check @@ -1335,7 +1359,7 @@ Delivered - 89 + 91 recurring_type Select @@ -1352,7 +1376,7 @@ Yearly - 90 + 92 from_date Date @@ -1365,7 +1389,7 @@ Yearly - 91 + 93 to_date Date @@ -1378,7 +1402,7 @@ Yearly - 92 + 94 repeat_on_day_of_month Int @@ -1391,7 +1415,7 @@ Yearly - 93 + 95 end_date Date @@ -1404,7 +1428,7 @@ Yearly - 94 + 96 column_break83 Column Break @@ -1416,7 +1440,7 @@ Yearly - 95 + 97 next_date Date @@ -1429,7 +1453,7 @@ Yearly - 96 + 98 recurring_id Data @@ -1441,7 +1465,7 @@ Yearly - 97 + 99 notification_email_address Small Text @@ -1454,7 +1478,7 @@ Yearly - 98 + 100 recurring_print_format Link diff --git a/erpnext/docs/current/models/projects/time_log.html b/erpnext/docs/current/models/projects/time_log.html index 227631405bc..b37e0b54cbf 100644 --- a/erpnext/docs/current/models/projects/time_log.html +++ b/erpnext/docs/current/models/projects/time_log.html @@ -40,110 +40,6 @@ Log of Activities performed by users against Tasks that can be used for tracking 1 - naming_series - - Select - - Series - - - - 
    TL-
    - - - - - 2 - column_break_2 - - Column Break - - - - - - - - - 3 - status - - Select - - Status - - - - 
    Draft
-Submitted
-Batched for Billing
-Billed
-Cancelled
    - - - - - 4 - section_break_4 - - Section Break - - - - - - - - - 5 - from_time - - Datetime - - From Time - - - - - - - 6 - hours - - Float - - Hours - - - - - - - 7 - to_time - - Datetime - - To Time - - - - - - - 8 - column_break_8 - - Column Break - - - - - - - - - 9 activity_type Link @@ -164,7 +60,21 @@ Cancelled - 10 + 2 + naming_series + + Select + + Series + + + + 
    TL-
    + + + + + 3 project Link @@ -185,7 +95,7 @@ Cancelled - 11 + 4 task Link @@ -205,8 +115,110 @@ Cancelled + + 5 + status + + Select + + Status + + + + 
    Draft
+Submitted
+Batched for Billing
+Billed
+Cancelled
    + + + + + 6 + column_break_2 + + Column Break + + + + + + + + + 7 + from_time + + Datetime + + From Time + + + + + + + 8 + hours + + Float + + Hours + + + + + + + 9 + to_time + + Datetime + + To Time + + + + + + + 10 + billable + + Check + + Billable + + + + + + 11 + section_break_7 + + Section Break + + + + + + + + 12 + note + + Text Editor + + Note + + + + + + + 13 section_break_12 Section Break @@ -218,7 +230,7 @@ Cancelled - 13 + 14 user Link @@ -239,7 +251,7 @@ Cancelled - 14 + 15 employee Link @@ -260,7 +272,7 @@ Cancelled - 15 + 16 column_break_3 Column Break @@ -272,7 +284,7 @@ Cancelled - 16 + 17 for_manufacturing Check @@ -283,18 +295,6 @@ Cancelled - - 17 - billable - - Check - - Billable - - - - - 18 section_break_11 @@ -409,30 +409,6 @@ Cancelled 25 - section_break_7 - - Section Break - - - - - - - - - 26 - note - - Text Editor - - Note - - - - - - - 27 section_break_24 Section Break @@ -444,7 +420,7 @@ Cancelled - 28 + 26 costing_rate Currency @@ -456,7 +432,7 @@ Cancelled - 29 + 27 costing_amount Currency @@ -468,7 +444,7 @@ Cancelled - 30 + 28 column_break_25 Column Break @@ -480,7 +456,7 @@ Cancelled - 31 + 29 billing_rate Currency @@ -492,7 +468,19 @@ Cancelled - 32 + 30 + additional_cost + + Currency + + Additional Cost + + + + + + + 31 billing_amount Currency @@ -505,7 +493,7 @@ Cancelled - 33 + 32 section_break_29 Section Break @@ -517,7 +505,7 @@ Cancelled - 34 + 33 time_log_batch Link @@ -539,7 +527,7 @@ Cancelled - 35 + 34 sales_invoice Link @@ -561,7 +549,7 @@ Cancelled - 36 + 35 amended_from Link @@ -582,7 +570,7 @@ Cancelled - 37 + 36 title Data diff --git a/erpnext/docs/current/models/selling/sales_order.html b/erpnext/docs/current/models/selling/sales_order.html index d3b0e68cc30..aadc66430f9 100644 --- a/erpnext/docs/current/models/selling/sales_order.html +++ b/erpnext/docs/current/models/selling/sales_order.html @@ -1845,6 +1845,20 @@ Yearly +

    + + + set_indicator + (self) +

    +

    Set indicator for portal

    +
    +
    + + + + +

    @@ -2260,7 +2274,7 @@ Yearly erpnext.selling.doctype.sales_order.sales_order.make_sales_invoice - (source_name, target_doc=None) + (source_name, target_doc=None, ignore_permissions=False)

    No docs

    diff --git a/erpnext/docs/current/models/stock/purchase_receipt.html b/erpnext/docs/current/models/stock/purchase_receipt.html index dda39796f58..3a4ea2ca822 100644 --- a/erpnext/docs/current/models/stock/purchase_receipt.html +++ b/erpnext/docs/current/models/stock/purchase_receipt.html @@ -409,7 +409,7 @@ PREC-RET- Button - Get Current Stock + Get current stock diff --git a/erpnext/docs/current/models/stock/purchase_receipt_item.html b/erpnext/docs/current/models/stock/purchase_receipt_item.html index 1ee6b14086c..2404597bdf3 100644 --- a/erpnext/docs/current/models/stock/purchase_receipt_item.html +++ b/erpnext/docs/current/models/stock/purchase_receipt_item.html @@ -584,48 +584,6 @@ 40 - project_name - - Link - - Project Name - - - - - - - -Project - - - - - - - - 41 - cost_center - - Link - - Cost Center - - - - - - - -Cost Center - - - - - - - - 42 qa_no Link @@ -642,6 +600,39 @@ + + + + + 41 + column_break_40 + + Column Break + + + + + + + + + 42 + prevdoc_docname + + Link + + Purchase Order + + + + + + + +Purchase Order + + + @@ -669,13 +660,13 @@ - + 45 - prevdoc_doctype + section_break_45 - Data - - Prevdoc Doctype + Section Break + + @@ -683,72 +674,6 @@ 46 - prevdoc_docname - - Link - - Purchase Order - - - - - - - -Purchase Order - - - - - - - - 47 - prevdoc_detail_docname - - Data - - Purchase Order Item No - - - - - - - 48 - col_break5 - - Column Break - - - - - - - - - 49 - bom - - Link - - BOM - - - - - - - -BOM - - - - - - - - 50 serial_no Text @@ -760,19 +685,7 @@ - 51 - rejected_serial_no - - Text - - Rejected Serial No - - - - - - - 52 + 47 batch_no Link @@ -789,11 +702,146 @@ + + + + + 48 + column_break_48 + + Column Break + + + + + + + + + 49 + rejected_serial_no + + Text + + Rejected Serial No + + + + + + + 50 + section_break_50 + + Section Break + + + + + + + + + 51 + project_name + + Link + + Project Name + + + + + + + +Project + + + + + + + + 52 + cost_center + + Link + + Cost Center + + + + + + + +Cost Center + + + 53 + prevdoc_doctype + + Data + + Prevdoc Doctype + + + + + + + 54 + prevdoc_detail_docname + + Data + + Purchase Order Item No + + + + + + + 55 + col_break5 + + Column Break + + + + + + + + + 56 + bom + + Link + + BOM + + + + + + + +BOM + + + + + + + + 57 billed_amt Currency @@ -805,7 +853,19 @@ - 54 + 58 + landed_cost_voucher_amount + + Currency + + Landed Cost Voucher Amount + + + + + + + 59 brand Link @@ -826,7 +886,7 @@ - 55 + 60 item_group Link @@ -847,7 +907,7 @@ - 56 + 61 rm_supp_cost Currency @@ -861,7 +921,7 @@ - 57 + 62 item_tax_amount Currency @@ -875,19 +935,7 @@ - 58 - landed_cost_voucher_amount - - Currency - - Landed Cost Voucher Amount - - - - - - - 59 + 63 valuation_rate Currency @@ -901,7 +949,7 @@ - 60 + 64 item_tax_rate Small Text @@ -915,7 +963,7 @@ Used for Taxes and Charges

    - 61 + 65 page_break Check diff --git a/erpnext/setup/setup_wizard/setup_wizard.py b/erpnext/setup/setup_wizard/setup_wizard.py index 081afcc7c39..b92dcf98a7e 100644 --- a/erpnext/setup/setup_wizard/setup_wizard.py +++ b/erpnext/setup/setup_wizard/setup_wizard.py @@ -112,15 +112,17 @@ def create_fiscal_year_and_company(args): def create_bank_account(args): if args.get("bank_account"): + company_name = args.get('company_name').strip() bank_account_group = frappe.db.get_value("Account", - {"account_type": "Bank", "is_group": 1, "root_type": "Asset"}) + {"account_type": "Bank", "is_group": 1, "root_type": "Asset", + "company": company_name}) if bank_account_group: bank_account = frappe.get_doc({ "doctype": "Account", 'account_name': args.get("bank_account"), 'parent_account': bank_account_group, 'is_group':0, - 'company':args.get('company_name').strip(), + 'company': company_name, "account_type": "Bank", }) try: