From 31619f0a8391d9c00c3d706d138294b2592331d1 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 3 Feb 2016 15:13:55 +0530 Subject: [PATCH] [docs] --- erpnext/docs/current/api/accounts/index.txt | 4 ++-- erpnext/docs/current/api/config/index.txt | 22 +++++++++---------- .../docs/current/api/controllers/index.txt | 20 ++++++++--------- erpnext/docs/current/api/hr/index.txt | 4 ++-- erpnext/docs/current/api/index.txt | 6 ++--- erpnext/docs/current/api/setup/index.txt | 4 ++-- .../current/api/setup/setup_wizard/index.txt | 8 +++---- .../docs/current/api/shopping_cart/index.txt | 4 ++-- erpnext/docs/current/api/startup/index.txt | 4 ++-- erpnext/docs/current/api/stock/index.txt | 8 +++---- erpnext/docs/current/api/utilities/index.txt | 4 ++-- .../docs/current/models/accounts/account.html | 4 ++++ .../accounts/period_closing_voucher.html | 2 +- .../models/accounts/sales_invoice_item.html | 4 ++-- .../models/accounts/shipping_rule.html | 9 ++++++++ erpnext/docs/current/models/hr/holiday.html | 4 ++-- .../models/selling/sales_order_item.html | 4 ++-- .../models/stock/delivery_note_item.html | 4 ++-- .../docs/current/models/stock/price_list.html | 2 ++ .../stock/stock_reconciliation_item.html | 3 ++- .../docs/current/models/stock/warehouse.html | 2 ++ 21 files changed, 72 insertions(+), 54 deletions(-) diff --git a/erpnext/docs/current/api/accounts/index.txt b/erpnext/docs/current/api/accounts/index.txt index cf92d5a469..33f157c7ac 100644 --- a/erpnext/docs/current/api/accounts/index.txt +++ b/erpnext/docs/current/api/accounts/index.txt @@ -1,4 +1,4 @@ erpnext.accounts.general_ledger -erpnext.accounts.utils +erpnext.accounts erpnext.accounts.party -erpnext.accounts \ No newline at end of file +erpnext.accounts.utils \ No newline at end of file diff --git a/erpnext/docs/current/api/config/index.txt b/erpnext/docs/current/api/config/index.txt index b8e76b568e..7d4ebc5d65 100644 --- a/erpnext/docs/current/api/config/index.txt +++ b/erpnext/docs/current/api/config/index.txt @@ -1,15 +1,15 @@ -erpnext.config.stock -erpnext.config.hr +erpnext.config.accounts erpnext.config.buying -erpnext.config.support -erpnext.config -erpnext.config.learn -erpnext.config.website +erpnext.config.crm erpnext.config.desktop erpnext.config.docs -erpnext.config.selling -erpnext.config.projects -erpnext.config.setup -erpnext.config.accounts +erpnext.config.hr +erpnext.config +erpnext.config.learn erpnext.config.manufacturing -erpnext.config.crm \ No newline at end of file +erpnext.config.projects +erpnext.config.selling +erpnext.config.setup +erpnext.config.stock +erpnext.config.support +erpnext.config.website \ No newline at end of file diff --git a/erpnext/docs/current/api/controllers/index.txt b/erpnext/docs/current/api/controllers/index.txt index ad58d1126c..3965811e80 100644 --- a/erpnext/docs/current/api/controllers/index.txt +++ b/erpnext/docs/current/api/controllers/index.txt @@ -1,14 +1,14 @@ +erpnext.controllers.accounts_controller +erpnext.controllers.buying_controller +erpnext.controllers erpnext.controllers.item_variant erpnext.controllers.print_settings -erpnext.controllers -erpnext.controllers.recurring_document -erpnext.controllers.accounts_controller -erpnext.controllers.sales_and_purchase_return -erpnext.controllers.buying_controller -erpnext.controllers.website_list_for_contact -erpnext.controllers.stock_controller -erpnext.controllers.trends -erpnext.controllers.status_updater erpnext.controllers.queries +erpnext.controllers.recurring_document +erpnext.controllers.sales_and_purchase_return +erpnext.controllers.selling_controller +erpnext.controllers.status_updater +erpnext.controllers.stock_controller erpnext.controllers.taxes_and_totals -erpnext.controllers.selling_controller \ No newline at end of file +erpnext.controllers.trends +erpnext.controllers.website_list_for_contact \ No newline at end of file diff --git a/erpnext/docs/current/api/hr/index.txt b/erpnext/docs/current/api/hr/index.txt index bbd031146f..c515b53205 100644 --- a/erpnext/docs/current/api/hr/index.txt +++ b/erpnext/docs/current/api/hr/index.txt @@ -1,2 +1,2 @@ -erpnext.hr.utils -erpnext.hr \ No newline at end of file +erpnext.hr +erpnext.hr.utils \ No newline at end of file diff --git a/erpnext/docs/current/api/index.txt b/erpnext/docs/current/api/index.txt index 396033d494..f7f8f5e618 100644 --- a/erpnext/docs/current/api/index.txt +++ b/erpnext/docs/current/api/index.txt @@ -1,5 +1,5 @@ +erpnext.__init__ +erpnext.__version__ erpnext.exceptions erpnext.hooks -erpnext.tasks -erpnext.__init__ -erpnext.__version__ \ No newline at end of file +erpnext.tasks \ No newline at end of file diff --git a/erpnext/docs/current/api/setup/index.txt b/erpnext/docs/current/api/setup/index.txt index f00d546c82..63162d85a9 100644 --- a/erpnext/docs/current/api/setup/index.txt +++ b/erpnext/docs/current/api/setup/index.txt @@ -1,3 +1,3 @@ -erpnext.setup.utils +erpnext.setup erpnext.setup.install -erpnext.setup \ No newline at end of file +erpnext.setup.utils \ No newline at end of file diff --git a/erpnext/docs/current/api/setup/setup_wizard/index.txt b/erpnext/docs/current/api/setup/setup_wizard/index.txt index 53da4fe315..6e21162d28 100644 --- a/erpnext/docs/current/api/setup/setup_wizard/index.txt +++ b/erpnext/docs/current/api/setup/setup_wizard/index.txt @@ -1,8 +1,8 @@ -erpnext.setup.setup_wizard.test_setup_wizard +erpnext.setup.setup_wizard.default_website erpnext.setup.setup_wizard -erpnext.setup.setup_wizard.test_setup_data +erpnext.setup.setup_wizard.industry_type erpnext.setup.setup_wizard.install_fixtures erpnext.setup.setup_wizard.sample_data -erpnext.setup.setup_wizard.default_website erpnext.setup.setup_wizard.setup_wizard -erpnext.setup.setup_wizard.industry_type \ No newline at end of file +erpnext.setup.setup_wizard.test_setup_data +erpnext.setup.setup_wizard.test_setup_wizard \ No newline at end of file diff --git a/erpnext/docs/current/api/shopping_cart/index.txt b/erpnext/docs/current/api/shopping_cart/index.txt index cbbce0ac40..c95a01d0e4 100644 --- a/erpnext/docs/current/api/shopping_cart/index.txt +++ b/erpnext/docs/current/api/shopping_cart/index.txt @@ -1,5 +1,5 @@ erpnext.shopping_cart.cart erpnext.shopping_cart erpnext.shopping_cart.product -erpnext.shopping_cart.utils -erpnext.shopping_cart.test_shopping_cart \ No newline at end of file +erpnext.shopping_cart.test_shopping_cart +erpnext.shopping_cart.utils \ No newline at end of file diff --git a/erpnext/docs/current/api/startup/index.txt b/erpnext/docs/current/api/startup/index.txt index 0cf302ed91..40766bcbc3 100644 --- a/erpnext/docs/current/api/startup/index.txt +++ b/erpnext/docs/current/api/startup/index.txt @@ -1,4 +1,4 @@ erpnext.startup.boot -erpnext.startup.report_data_map +erpnext.startup erpnext.startup.notifications -erpnext.startup \ No newline at end of file +erpnext.startup.report_data_map \ No newline at end of file diff --git a/erpnext/docs/current/api/stock/index.txt b/erpnext/docs/current/api/stock/index.txt index 01082a7be2..27cb1482d3 100644 --- a/erpnext/docs/current/api/stock/index.txt +++ b/erpnext/docs/current/api/stock/index.txt @@ -1,6 +1,6 @@ -erpnext.stock.stock_ledger -erpnext.stock -erpnext.stock.utils erpnext.stock.get_item_details +erpnext.stock +erpnext.stock.reorder_item erpnext.stock.stock_balance -erpnext.stock.reorder_item \ No newline at end of file +erpnext.stock.stock_ledger +erpnext.stock.utils \ No newline at end of file diff --git a/erpnext/docs/current/api/utilities/index.txt b/erpnext/docs/current/api/utilities/index.txt index ec810e96e3..86ae38fc1d 100644 --- a/erpnext/docs/current/api/utilities/index.txt +++ b/erpnext/docs/current/api/utilities/index.txt @@ -1,3 +1,3 @@ -erpnext.utilities.transaction_base erpnext.utilities.address_and_contact -erpnext.utilities \ No newline at end of file +erpnext.utilities +erpnext.utilities.transaction_base \ No newline at end of file diff --git a/erpnext/docs/current/models/accounts/account.html b/erpnext/docs/current/models/accounts/account.html index 37c774eb4c..306af7d107 100644 --- a/erpnext/docs/current/models/accounts/account.html +++ b/erpnext/docs/current/models/accounts/account.html @@ -969,6 +969,10 @@ Credit + + + +
  • diff --git a/erpnext/docs/current/models/accounts/period_closing_voucher.html b/erpnext/docs/current/models/accounts/period_closing_voucher.html index 1a3aac1fc8..c14226eed0 100644 --- a/erpnext/docs/current/models/accounts/period_closing_voucher.html +++ b/erpnext/docs/current/models/accounts/period_closing_voucher.html @@ -157,7 +157,7 @@ Closing Account Head

    - The account head under Liability or Equity, in which Profit/Loss will be booked

    + The account head under Liability, in which Profit/Loss will be booked

    diff --git a/erpnext/docs/current/models/accounts/sales_invoice_item.html b/erpnext/docs/current/models/accounts/sales_invoice_item.html index e36089de93..a8db705d05 100644 --- a/erpnext/docs/current/models/accounts/sales_invoice_item.html +++ b/erpnext/docs/current/models/accounts/sales_invoice_item.html @@ -596,8 +596,8 @@ target_warehouse Link - - Target Warehouse + + Customer Warehouse (Optional) diff --git a/erpnext/docs/current/models/accounts/shipping_rule.html b/erpnext/docs/current/models/accounts/shipping_rule.html index beadc90ff4..8f859cbc60 100644 --- a/erpnext/docs/current/models/accounts/shipping_rule.html +++ b/erpnext/docs/current/models/accounts/shipping_rule.html @@ -413,6 +413,15 @@ Net Weight
    • + +
  • + + +Shopping Cart Shipping Rule + +
    • + + diff --git a/erpnext/docs/current/models/hr/holiday.html b/erpnext/docs/current/models/hr/holiday.html index b84eb16cfa..59043c876c 100644 --- a/erpnext/docs/current/models/hr/holiday.html +++ b/erpnext/docs/current/models/hr/holiday.html @@ -40,7 +40,7 @@ 1 - description + description Text Editor @@ -52,7 +52,7 @@ 2 - holiday_date + holiday_date Date diff --git a/erpnext/docs/current/models/selling/sales_order_item.html b/erpnext/docs/current/models/selling/sales_order_item.html index 323da91cfe..c3a745fed0 100644 --- a/erpnext/docs/current/models/selling/sales_order_item.html +++ b/erpnext/docs/current/models/selling/sales_order_item.html @@ -518,8 +518,8 @@ target_warehouse Link - - Target Warehouse + + Customer Warehouse (Optional) diff --git a/erpnext/docs/current/models/stock/delivery_note_item.html b/erpnext/docs/current/models/stock/delivery_note_item.html index 1c48c11e0e..df205c8f54 100644 --- a/erpnext/docs/current/models/stock/delivery_note_item.html +++ b/erpnext/docs/current/models/stock/delivery_note_item.html @@ -485,8 +485,8 @@ target_warehouse Link - - To Warehouse (Optional) + + Customer Warehouse (Optional) diff --git a/erpnext/docs/current/models/stock/price_list.html b/erpnext/docs/current/models/stock/price_list.html index 60d5b2eabe..28e2cec31e 100644 --- a/erpnext/docs/current/models/stock/price_list.html +++ b/erpnext/docs/current/models/stock/price_list.html @@ -391,6 +391,8 @@ Price List Master + +
  • diff --git a/erpnext/docs/current/models/stock/stock_reconciliation_item.html b/erpnext/docs/current/models/stock/stock_reconciliation_item.html index 701bbde26f..c20d7e4f18 100644 --- a/erpnext/docs/current/models/stock/stock_reconciliation_item.html +++ b/erpnext/docs/current/models/stock/stock_reconciliation_item.html @@ -111,7 +111,8 @@ Currency Valuation Rate - +

    + Do not include symbols (ex. $)

    diff --git a/erpnext/docs/current/models/stock/warehouse.html b/erpnext/docs/current/models/stock/warehouse.html index c0fa5d3d6b..2d7108b2b0 100644 --- a/erpnext/docs/current/models/stock/warehouse.html +++ b/erpnext/docs/current/models/stock/warehouse.html @@ -629,6 +629,8 @@ A logical Warehouse against which stock entries are made. + +