Update always fails

Dear ERPNext team,

we are having this persisting problem everytime we try to update ERPNext: the update crashes, giving us this error:

From git://github.com/webnotes/wnframework
 * branch            master     -> FETCH_HEAD
From git://github.com/webnotes/erpnext
 * branch            master     -> FETCH_HEAD
Traceback (most recent call last):
  File "lib/wnf.py", line 590, in <module>
    if not search: search = esc(txt1)
  File "lib/wnf.py", line 463, in run
    @cmd
  File "lib/wnf.py", line 77, in update_erpnext
    def setup_install(parser):
  File "/var/www/erpnext/lib/webnotes/utils/__init__.py", line 7, in <module>
    from webnotes import conf
ImportError: cannot import name conf

Updating c30a604…b1e1e0c
Fast-forward
README.md | 12 ±
core/page/todo/todo.html => init.py | 0
conf/Framework.sql | 1 +
conf/conf.py | 5 ±
core/doctype/comment/comment.py | 9 ±
core/doctype/communication/communication.js | 45 ±
core/doctype/communication/communication.py | 7 ±
core/doctype/communication/communication.txt | 20 ±
core/doctype/control_panel/control_panel.py | 4 ±
core/doctype/control_panel/control_panel.txt | 4 ±
core/doctype/custom_field/custom_field.py | 22 ±
core/doctype/custom_field/custom_field.txt | 3 ±
core/doctype/custom_script/custom_script.js | 10 -
core/doctype/custom_script/custom_script.py | 35 ±
core/doctype/custom_script/custom_script.txt | 5 ±
core/doctype/customize_form/customize_form.py | 36 ±
core/doctype/customize_form/customize_form.txt | 11 ±
…/customize_form_field/customize_form_field.txt | 4 ±
core/doctype/doctype/doctype.py | 13 ±
core/doctype/doctype/doctype.txt | 218 +±
…/documentation_tool/documentation_tool.py | 13 ±
core/doctype/event/event.py | 14 ±
core/doctype/event/event.txt | 4 ±
core/doctype/file_data/file_data.py | 30 ±
core/doctype/letter_head/letter_head.py | 5 ±
core/doctype/letter_head/letter_head.txt | 4 ±
core/doctype/page/page.py | 4 ±
core/doctype/patch_log/patch_log.txt | 16 ±
core/doctype/print_format/print_format.py | 5 ±
core/doctype/print_format/print_format.txt | 4 ±
core/doctype/profile/profile.js | 15 ±
core/doctype/profile/profile.py | 113 ±
core/doctype/profile/profile.txt | 19 ±
core/doctype/profile/test_profile.py | 25 ±
core/doctype/property_setter/property_setter.py | 14 ±
core/doctype/report/report.py | 18 ±
core/doctype/role/test_role.py | 2 ±
core/doctype/workflow_state/workflow_state.txt | 4 ±
core/page/data_import_tool/data_import_tool.py | 32 ±
core/page/messages/messages.js | 4 ±
core/page/messages/messages.py | 6 ±
core/page/permission_manager/permission_manager.js | 3 ±
core/page/permission_manager/permission_manager.py | 6 ±
core/page/todo/todo.css | 5 ±
core/page/todo/todo.js | 142 ±
core/page/todo/todo.py | 2 ±
core/page/update_manager/README.md | 1 -
core/page/update_manager/init.py | 3 -
core/page/update_manager/update_manager.js | 65 -
core/page/update_manager/update_manager.py | 20 -
core/page/update_manager/update_manager.txt | 37 -
public/build.json | 15 ±
public/css/bootstrap.css | 1716 ++++++++++±--------
public/css/common.css | 291 +±-
public/css/forms.css | 12 -
public/css/nprogress.css | 6 ±
public/css/tag-it.css | 7 ±
public/css/typeahead.css | 45 +
public/html/rss.xml | 44 -
public/html/server.py | 59 -
public/html/sitemap.xml | 37 -
public/html/unsupported.html | 22 -
public/html/web.py | 71 -
public/js/legacy/clientscriptAPI.js | 6 ±
public/js/legacy/datetime.js | 2 ±
public/js/legacy/form.js | 19 ±
public/js/lib/bootstrap-wysiwyg.js | 187 —
…/jquery/bootstrap_theme/jquery-ui.selected.css | 97 –
…uery.event.drag.min.js => jquery.event.drag.js} | 2 ±
public/js/lib/slickgrid/slick-default-theme.css | 12 ±
public/js/lib/tag-it.min.js | 6 ±
public/js/lib/typeahead.js | 1142 +++++++++++++
public/js/wn/app.js | 12 ±
public/js/wn/assets.js | 14 ±
public/js/wn/class.js | 2 ±
public/js/wn/dom.js | 18 +
public/js/wn/form/attachments.js | 15 ±
public/js/wn/form/control.js | 300 ++±
public/js/wn/form/dashboard.js | 5 ±
public/js/wn/form/editors.js | 190 ±-
public/js/wn/form/footer.js | 28 ±
public/js/wn/form/grid.js | 256 ±-
public/js/wn/form/infobar.js | 171 ±
public/js/wn/form/layout.js | 121 ±
public/js/wn/form/link_selector.js | 4 ±
public/js/wn/form/script_manager.js | 1 +
public/js/wn/form/toolbar.js | 42 ±
public/js/wn/misc/number_format.js | 2 ±
public/js/wn/misc/tools.js | 13 ±
public/js/wn/misc/user.js | 5 ±
public/js/wn/misc/utils.js | 46 ±
public/js/wn/model/doclist.js | 2 ±
public/js/wn/model/meta.js | 8 ±
public/js/wn/model/model.js | 12 ±
public/js/wn/model/perm.js | 2 ±
public/js/wn/print/print_table.js | 2 ±
public/js/wn/provide.js | 3 ±
public/js/wn/request.js | 12 ±
public/js/wn/router.js | 2 ±
public/js/wn/translate.js | 9 ±
public/js/wn/ui/appframe.js | 84 ±
public/js/wn/ui/dialog.js | 18 ±
public/js/wn/ui/editor.js | 509 ++++++
public/js/wn/ui/field_group.js | 60 ±
public/js/wn/ui/filters.js | 21 ±
public/js/wn/ui/listing.js | 7 ±
public/js/wn/ui/messages.js | 3 +
public/js/wn/ui/toolbar/toolbar.js | 3 ±
public/js/wn/upload.js | 99 ±
public/js/wn/views/communication.js | 77 ±
public/js/wn/views/container.js | 2 ±
public/js/wn/views/doclistview.js | 96 ±
public/js/wn/views/formview.js | 2 ±
public/js/wn/views/listview.js | 108 ±
public/js/wn/views/moduleview.js | 7 ±
public/js/wn/views/pageview.js | 38 ±
public/js/wn/views/query_report.js | 8 ±
public/js/wn/views/reportview.js | 20 ±
public/js/wn/views/sidebar_stats.js | 33 ±
public/js/wn/website/editable.js | 23 +
requirements.txt | 34 ±
webnotes/init.py | 258 +±
webnotes/app.py | 64 +
webnotes/auth.py | 95 ±
webnotes/boot.py | 18 ±
webnotes/build.py | 14 ±
webnotes/client.py | 28 ±
webnotes/db.py | 38 ±
webnotes/handler.py | 143 ±
webnotes/install_lib/install.py | 229 +±
webnotes/install_lib/setup_public_folder.py | 48 ±
webnotes/memc.py | 7 ±
webnotes/middlewares.py | 32 +
webnotes/model/bean.py | 114 ±
webnotes/model/code.py | 82 ±
webnotes/model/doc.py | 207 +±
webnotes/model/doclist.py | 27 ±
webnotes/model/doctype.py | 46 ±
webnotes/model/mapper.py | 22 ±
webnotes/model/meta.py | 8 ±
webnotes/model/sync.py | 14 ±
webnotes/model/utils.py | 2 ±
webnotes/model/workflow.py | 13 ±
webnotes/modules/init.py | 11 ±
webnotes/modules/export_file.py | 28 ±
webnotes/modules/import_file.py | 4 ±
webnotes/modules/patch_handler.py | 19 ±
webnotes/modules/utils.py | 6 ±
webnotes/plugins.py | 107 ++
webnotes/profile.py | 17 +
webnotes/sessions.py | 49 ±
webnotes/test_runner.py | 36 ±
webnotes/tests/init.py | 3 ±
webnotes/tests/test_db.py | 18 ±
webnotes/tests/test_email.py | 7 ±
webnotes/tests/test_geo_ip.py | 1 -
webnotes/translate.py | 72 ±
webnotes/utils/init.py | 95 ±
webnotes/utils/backups.py | 73 ±
webnotes/utils/datautils.py | 3 ±
webnotes/utils/dateutils.py | 9 ±
webnotes/utils/email_lib/init.py | 3 ±
webnotes/utils/email_lib/bulk.py | 23 ±
webnotes/utils/email_lib/receive.py | 4 ±
webnotes/utils/email_lib/smtp.py | 34 ±
webnotes/utils/file_manager.py | 83 ±
webnotes/utils/minify.py | 8 -
webnotes/utils/scheduler.py | 27 ±
webnotes/webutils.py | 111 ±
webnotes/widgets/event.py | 10 ±
webnotes/widgets/form/assign_to.py | 6 ±
webnotes/widgets/page.py | 2 -
webnotes/widgets/query_builder.py | 40 ±
webnotes/widgets/query_report.py | 60 ±
webnotes/widgets/report_dump.py | 3 ±
webnotes/widgets/reportview.py | 97 ±
webnotes/widgets/search.py | 23 ±
webnotes/widgets/tags.py | 4 ±
website/css/website.css | 6 +
…/about_us_settings/about_us_settings.txt | 8 ±
website/doctype/blog_post/blog_feed.py | 61 -
website/doctype/blog_post/blog_post.js | 16 ±
website/doctype/blog_post/blog_post.py | 84 ±
website/doctype/blog_post/blog_post.txt | 14 ±
…/blog_post/templates/generators/blog_post.html | 51 ±
…/blog_post/templates/includes/init.py | 0
…/doctype/blog_post/templates/includes/blog.js | 3 ±
…/blog_post/templates/includes/blog_post.css | 13 -
…/blog_post/templates/includes/blog_post.js | 65 -
…/blog_post/templates/includes/blogger.html | 2 ±
…/blog_post/templates/includes/comment.html | 17 -
website/doctype/style_settings/style_settings.py | 75 ±
…/pages/wn-web.css} | 5 +
…/style_settings/templates/pages/wn_web.py | 60 +
website/doctype/top_bar_item/top_bar_item.txt | 17 ±
…/web_page/templates/generators/web_page.html | 10 +
website/doctype/web_page/web_page.js | 5 +
website/doctype/web_page/web_page.txt | 42 ±
…/website_script/templates/pages/wn-web.js | 14 +
…/website_script/templates/pages/wn_web.py | 14 +
website/doctype/website_script/website_script.py | 9 ±
…/website_settings/make_web_include_files.py | 58 -
…/doctype/website_settings/website_settings.js | 6 -
…/doctype/website_settings/website_settings.py | 41 ±
website/js/website.js | 35 ±
website/sitemap.py | 27 -
website/templates/base.html | 4 ±
website/templates/includes/comment.html | 9 +
website/templates/includes/comments.html | 86 +
website/templates/includes/comments.py | 58 +
website/templates/includes/footer.html | 2 ±
website/templates/includes/login.js | 36 ±
website/templates/includes/navbar.html | 4 ±
website/templates/pages/login.html | 65 ±
website/templates/pages/message.html | 6 ±
website/templates/pages/print.py | 6 ±
website/templates/pages/rss.py | 38 +
website/templates/pages/rss.xml | 18 +
website/templates/pages/sitemap.py | 22 +
website/templates/pages/sitemap.xml | 5 +
website/templates/pages/update-password.html | 4 +
website/templates/pages/update_password.py | 6 +
wnf.py | 1155 ++++++±-----
223 files changed, 7309 insertions(+), 5024 deletions(-)
rename core/page/todo/todo.html => init.py (100%)
delete mode 100644 core/doctype/custom_script/custom_script.js
delete mode 100644 core/page/update_manager/README.md
delete mode 100644 core/page/update_manager/init.py
delete mode 100644 core/page/update_manager/update_manager.js
delete mode 100644 core/page/update_manager/update_manager.py
delete mode 100644 core/page/update_manager/update_manager.txt
mode change 100755 => 100644 public/css/bootstrap.css
create mode 100644 public/css/typeahead.css
delete mode 100755 public/html/rss.xml
delete mode 100755 public/html/server.py
delete mode 100755 public/html/sitemap.xml
delete mode 100644 public/html/unsupported.html
delete mode 100755 public/html/web.py
delete mode 100644 public/js/lib/bootstrap-wysiwyg.js
rename public/js/lib/slickgrid/{jquery.event.drag.min.js => jquery.event.drag.js} (99%)
mode change 100644 => 100755
create mode 100644 public/js/lib/typeahead.js
create mode 100644 public/js/wn/ui/editor.js
create mode 100644 public/js/wn/website/editable.js
create mode 100644 webnotes/app.py
create mode 100644 webnotes/middlewares.py
create mode 100644 webnotes/plugins.py
delete mode 100644 website/doctype/blog_post/blog_feed.py
rename public/html/blank.html => website/doctype/blog_post/templates/includes/init.py (100%)
delete mode 100644 website/doctype/blog_post/templates/includes/blog_post.css
delete mode 100644 website/doctype/blog_post/templates/includes/blog_post.js
delete mode 100644 website/doctype/blog_post/templates/includes/comment.html
create mode 100644 website/doctype/style_settings/templates/init.py
create mode 100644 website/doctype/style_settings/templates/pages/init.py
rename website/doctype/style_settings/{custom_template.css => templates/pages/wn-web.css} (98%)
create mode 100644 website/doctype/style_settings/templates/pages/wn_web.py
create mode 100644 website/doctype/website_script/templates/init.py
create mode 100644 website/doctype/website_script/templates/pages/init.py
create mode 100644 website/doctype/website_script/templates/pages/wn-web.js
create mode 100644 website/doctype/website_script/templates/pages/wn_web.py
delete mode 100644 website/doctype/website_settings/make_web_include_files.py
delete mode 100644 website/sitemap.py
create mode 100644 website/templates/includes/init.py
create mode 100644 website/templates/includes/comment.html
create mode 100644 website/templates/includes/comments.html
create mode 100644 website/templates/includes/comments.py
create mode 100644 website/templates/pages/rss.py
create mode 100644 website/templates/pages/rss.xml
create mode 100644 website/templates/pages/sitemap.py
create mode 100644 website/templates/pages/sitemap.xml
create mode 100644 website/templates/pages/update_password.py
Updating 865e62d…91db9dc
Fast-forward
accounts/doctype/account/account.js | 55 +±
accounts/doctype/account/account.py | 83 +±-
accounts/doctype/account/account.txt | 39 ±
accounts/doctype/account/test_account.py | 50 ±
…/doctype/accounts_settings/accounts_settings.py | 22 ±
…/accounts_settings/accounts_settings.txt | 19 ±
…/bank_reconciliation/bank_reconciliation.py | 5 ±
…/bank_reconciliation_detail.txt | 3 ±
accounts/doctype/budget_control/README.md | 1 -
accounts/doctype/budget_control/budget_control.py | 97 ----
accounts/doctype/budget_control/budget_control.txt | 19 -
accounts/doctype/budget_detail/budget_detail.txt | 20 ±
…/test_budget_distribution.py | 68 +±
accounts/doctype/c_form/c_form.txt | 4 ±
…/c_form_invoice_detail.txt | 3 ±
accounts/doctype/cost_center/cost_center.js | 12 ±
accounts/doctype/cost_center/cost_center.py | 3 ±
accounts/doctype/cost_center/test_cost_center.py | 9 ±
accounts/doctype/fiscal_year/fiscal_year.js | 4 ±
accounts/doctype/gl_entry/gl_entry.py | 192 +++±—
accounts/doctype/gl_entry/gl_entry.txt | 15 ±
…/doctype/journal_voucher/journal_voucher.js | 75 +±
…/doctype/journal_voucher/journal_voucher.py | 42 ±
…/doctype/journal_voucher/journal_voucher.txt | 8 ±
…/journal_voucher/test_journal_voucher.py | 96 ++++
accounts/doctype/mis_control/mis_control.py | 13 ±
…/payment_to_invoice_matching_tool.js | 6 ±
…/payment_to_invoice_matching_tool.py | 8 ±
…/period_closing_voucher.py | 224 ++±-----
…/test_period_closing_voucher.py | 56 +++
accounts/doctype/pos_setting/pos_setting.py | 4 ±
accounts/doctype/pos_setting/pos_setting.txt | 19 ±
accounts/doctype/pos_setting/test_pos_setting.py | 1 -
…/doctype/purchase_invoice/purchase_invoice.js | 7 ±
…/doctype/purchase_invoice/purchase_invoice.py | 158 +++±–
…/doctype/purchase_invoice/purchase_invoice.txt | 19 ±
…/purchase_invoice/test_purchase_invoice.py | 22 ±
…/purchase_invoice_item.txt | 3 ±
…/purchase_taxes_and_charges_master.js | 38 ±
…/purchase_taxes_and_charges_master.py | 8 ±
accounts/doctype/sales_invoice/pos.js | 260 +++++±—
accounts/doctype/sales_invoice/pos.py | 40 ±
accounts/doctype/sales_invoice/sales_invoice.css | 15 -
accounts/doctype/sales_invoice/sales_invoice.js | 129 +±–
accounts/doctype/sales_invoice/sales_invoice.py | 119 +±–
accounts/doctype/sales_invoice/sales_invoice.txt | 27 ±
…/doctype/sales_invoice/test_sales_invoice.py | 80 +±-
…/sales_invoice_item/sales_invoice_item.txt | 14 ±
…/sales_taxes_and_charges_master.js | 34 ±
…/sales_taxes_and_charges_master.py | 6 ±
…/sales_taxes_and_charges_master.txt | 4 ±
…/test_sales_taxes_and_charges_master.py | 6 ±
accounts/doctype/shipping_rule/shipping_rule.js | 2 ±
accounts/doctype/shipping_rule/shipping_rule.txt | 4 ±
…/doctype/shipping_rule/test_shipping_rule.py | 2 ±
accounts/general_ledger.py | 151 ++±–
accounts/page/accounts_browser/accounts_browser.js | 90 +±-
accounts/page/accounts_browser/accounts_browser.py | 2 ±
accounts/page/accounts_home/accounts_home.js | 10 ±
…/financial_analytics/financial_analytics.js | 26 ±
…/financial_statements/financial_statements.js | 10 ±
accounts/page/general_ledger/general_ledger.js | 46 ±
accounts/page/trial_balance/trial_balance.js | 6 ±
…/voucher_import_tool/voucher_import_tool.js | 45 ±
…/voucher_import_tool/voucher_import_tool.py | 14 ±
…/report/accounts_payable/accounts_payable.js | 8 ±
…/report/accounts_payable/accounts_payable.py | 4 ±
…/accounts_receivable/accounts_receivable.js | 8 ±
…/accounts_receivable/accounts_receivable.py | 276 ++++±-----
…/bank_clearance_summary.js | 6 ±
…/bank_reconciliation_statement.js | 4 ±
…/budget_variance_report.js | 6 ±
…/budget_variance_report.py | 2 ±
accounts/report/gross_profit/gross_profit.js | 6 ±
accounts/report/gross_profit/gross_profit.py | 7 ±
…/item_wise_purchase_register.js | 10 ±
…/item_wise_purchase_register.py | 4 ±
…/item_wise_sales_register.js | 8 ±
…/item_wise_sales_register.py | 14 ±
…/payment_collection_with_ageing.js | 8 ±
…/payment_made_with_ageing.js | 8 ±
…/report/purchase_register/purchase_register.js | 8 ±
accounts/report/sales_register/sales_register.js | 8 ±
accounts/utils.py | 180 ++±—
buying/doctype/buying_settings/buying_settings.py | 5 ±
buying/doctype/purchase_common/purchase_common.js | 17 ±
buying/doctype/purchase_common/purchase_common.py | 60 ±-
buying/doctype/purchase_order/purchase_order.js | 19 ±
buying/doctype/purchase_order/purchase_order.py | 26 ±
buying/doctype/purchase_order/purchase_order.txt | 48 ±
…/doctype/purchase_order/test_purchase_order.py | 55 +±
…/purchase_order_item/purchase_order_item.txt | 18 ±
…/quality_inspection/quality_inspection.txt | 4 ±
buying/doctype/supplier/supplier.js | 9 ±
buying/doctype/supplier/supplier.py | 21 ±
buying/doctype/supplier/supplier.txt | 78 +±
…/supplier_quotation/supplier_quotation.js | 3 ±
…/supplier_quotation/supplier_quotation.py | 4 -
…/supplier_quotation/supplier_quotation.txt | 13 ±
…/supplier_quotation_item.txt | 18 ±
buying/page/buying_home/buying_home.js | 14 ±
…/page/purchase_analytics/purchase_analytics.js | 36 ±
…/supplier_addresses_and_contacts}/init.py | 0
…/supplier_addresses_and_contacts.txt | 22 +
buying/utils.py | 9 ±
controllers/accounts_controller.py | 94 +±-
controllers/buying_controller.py | 29 ±
controllers/queries.py | 59 +±
controllers/selling_controller.py | 195 ++++±–
controllers/status_updater.py | 84 ++++
controllers/stock_controller.py | 253 +++++++±-
docs/docs.user.stock.accounting_for_stock.md | 42 ++
docs/docs.user.stock.perpetual_inventory.md | 313 ++++++++++++
docs/user/accounts/docs.user.accounts.md | 3 +
…/accounts/docs.user.accounts.opening_entry.md | 10 +
…/accounts/docs.user.accounts.opening_stock.md | 44 ++
docs/user/accounts/docs.user.accounts.pos.md | 19 ±
…/docs.user.accounts.purchase_invoice.md | 2 ±
docs/user/buying/docs.user.buying.supplier.md | 8 +
docs/user/buying/docs.user.buying.supplier_type.md | 6 ±
…/docs.user.customer_portal.login.md | 8 +
…/customer_portal/docs.user.customer_portal.md | 16 +
…/docs.user.customer_portal.orders.md | 30 ++
…/docs.user.customer_portal.sign_up.md | 25 +
…/docs.user.customer_portal.tickets.md | 28 ++
…/customize/docs.user.customize.custom_field.md | 8 ±
…/customize/docs.user.customize.custom_form.md | 19 ±
…/docs.user.customize.custom_scripts.md | 6 +
…/customize/docs.user.customize.hide_unhide.md | 10 ±
…/customize/docs.user.customize.print_format.md | 11 ±
docs/user/docs.user.md | 39 ±
…/docs.user.five_day_setup.day_1.md | 81 ++++
…/docs.user.five_day_setup.day_2.md | 54 +++
…/docs.user.five_day_setup.day_3.md | 139 ++++++
…/docs.user.five_day_setup.day_4.md | 86 ++++
…/docs.user.five_day_setup.day_5.md | 32 ++
…/five_day_setup/docs.user.five_day_setup.md | 48 ++
docs/user/hr/docs.user.hr.payroll.md | 2 ±
docs/user/intro/docs.user.implement.concepts.md | 26 ±
docs/user/intro/docs.user.implement.md | 5 +
docs/user/intro/docs.user.implement.strategy.md | 5 ±
…/knowledge/docs.user.knowledge.accounting.md | 110 +++++
…/docs.user.knowledge.accounting_entries.md | 38 ++
…/docs.user.knowledge.attachment_csv.md | 16 +
docs/user/knowledge/docs.user.knowledge.doctype.md | 73 +++
…/docs.user.knowledge.doctype_fields.md | 201 ++++++++
…/knowledge/docs.user.knowledge.fiscal_year.md | 10 +
…/user/knowledge/docs.user.knowledge.markdown.md | 84 ++++
docs/user/knowledge/docs.user.knowledge.md | 16 +
docs/user/mfg/docs.user.mfg.bom.md | 14 ±
docs/user/mfg/docs.user.mfg.md | 14 ±
docs/user/mfg/docs.user.mfg.planning.md | 49 ±
docs/user/mfg/docs.user.mfg.production_order.md | 17 ±
docs/user/selling/docs.user.selling.customer.md | 4 ±
docs/user/selling/docs.user.selling.md | 8 +
docs/user/selling/docs.user.selling.quotation.md | 22 ±
docs/user/selling/docs.user.selling.sales_order.md | 4 ±
…/selling/docs.user.selling.shopping_cart.md | 41 ++
docs/user/setup/docs.user.setup.cost_centers.md | 15 +
docs/user/setup/docs.user.setup.data_import.md | 6 ±
docs/user/setup/docs.user.setup.first.md | 2 ±
docs/user/setup/docs.user.setup.md | 3 ±
docs/user/setup/docs.user.setup.opening.md | 43 ±
docs/user/setup/docs.user.setup.permissions.md | 37 ±
docs/user/setup/docs.user.setup.pos_setting.md | 3 ±
docs/user/setup/docs.user.setup.price_list.md | 13 ±
docs/user/setup/docs.user.setup.taxes.md | 28 ±
docs/user/setup/docs.user.setup.users.md | 2 ±
docs/user/stock/docs.user.stock.item.md | 48 ±
docs/user/stock/docs.user.stock.md | 7 ±
…md => docs.user.stock.migrate_to_perpetual.md} | 4 ±
…/docs.user.stock.product_listing_on_website.md | 61 +++
docs/user/stock/docs.user.stock.sales_return.md | 33 ±
docs/user/stock/docs.user.stock.warehouse.md | 7 ±
…/support/docs.user.support.customer_issue.md | 7 ±
…/docs.user.support.maintenance_schedule.md | 20 +
…/support/docs.user.support.maintenance_visit.md | 4 +
docs/user/support/docs.user.support.md | 7 ±
docs/user/support/docs.user.support.newsletter.md | 14 +
…/support/docs.user.support.support_ticket.md | 17 ±
docs/user/tools/docs.user.tools.assignment.md | 22 +
docs/user/tools/docs.user.tools.form_tools.md | 13 ±
docs/user/tools/docs.user.tools.md | 5 ±
docs/user/tools/docs.user.tools.notes.md | 19 ±
docs/user/tools/docs.user.tools.tags.md | 10 +
docs/user/tools/docs.user.tools.todo.md | 17 ±
…/docs.user.website.add_products_to_website.md | 60 +++
docs/user/website/docs.user.website.blog.md | 13 ±
docs/user/website/docs.user.website.md | 9 ±
docs/user/website/docs.user.website.setup.md | 33 ±
docs/user/website/docs.user.website.web_page.md | 4 +
home/doctype/feed/feed.py | 1 -
home/page/activity/activity.js | 4 ±
home/page/latest_updates/latest_updates.js | 8 ±
home/page/latest_updates/latest_updates.py | 3 ±
hr/doctype/appraisal/appraisal.js | 2 ±
hr/doctype/attendance/attendance.py | 7 ±
hr/doctype/attendance/attendance.txt | 4 ±
hr/doctype/employee/employee.js | 5 ±
hr/doctype/employee/employee.py | 16 ±
hr/doctype/employee/employee.txt | 24 ±
hr/doctype/expense_claim/expense_claim.js | 40 ±
hr/doctype/expense_claim/expense_claim.txt | 5 ±
hr/doctype/holiday_list/holiday_list.py | 1 -
hr/doctype/hr_settings/hr_settings.py | 26 ±
hr/doctype/hr_settings/hr_settings.txt | 21 ±
hr/doctype/job_applicant/get_job_applications.py | 2 ±
hr/doctype/job_applicant/job_applicant.js | 5 ±
hr/doctype/job_applicant/job_applicant.py | 15 ±
hr/doctype/leave_allocation/leave_allocation.py | 11 ±
hr/doctype/leave_application/leave_application.js | 17 ±
…/leave_application/test_leave_application.py | 9 ±
…/leave_block_list/test_leave_block_list.py | 3 +
…/leave_control_panel/leave_control_panel.js | 2 ±
…/leave_control_panel/leave_control_panel.py | 3 ±
hr/doctype/salary_manager/salary_manager.js | 6 ±
hr/doctype/salary_manager/salary_manager.py | 13 ±
hr/doctype/salary_manager/test_salary_manager.py | 14 ±
hr/doctype/salary_slip/salary_slip.py | 15 ±
hr/doctype/salary_structure/salary_structure.js | 2 ±
hr/doctype/salary_structure/salary_structure.py | 9 ±
hr/doctype/upload_attendance/upload_attendance.js | 6 ±
hr/doctype/upload_attendance/upload_attendance.py | 10 ±
hr/report/employee_birthday/employee_birthday.js | 4 ±
…/employee_leave_balance.js | 4 ±
…/monthly_attendance_sheet.js | 8 ±
…/monthly_salary_register.js | 8 ±
install_erpnext.py | 227 +++±----
manufacturing/doctype/bom/bom.js | 4 ±
manufacturing/doctype/bom/bom.py | 76 +±
manufacturing/doctype/bom/bom.txt | 3 ±
manufacturing/doctype/bom/test_bom.py | 85 ++±
…/doctype/production_order/production_order.js | 16 ±
…/doctype/production_order/production_order.py | 55 +±
…/doctype/production_order/production_order.txt | 5 ±
…/production_order/test_production_order.py | 75 +++
…/production_planning_tool.js | 2 ±
…/production_planning_tool.py | 30 ±
manufacturing/doctype/workstation/workstation.py | 5 ±
manufacturing/doctype/workstation/workstation.txt | 22 ±
…/1311}/init.py | 0
patches/1311/p01_cleanup.py | 18 +
patches/april_2013/p05_update_file_data.py | 2 ±
patches/april_2013/p06_update_file_size.py | 4 ±
…/p01_auto_accounting_for_stock_patch.py | 6 +
patches/august_2013/p02_rename_price_list.py | 1 +
patches/august_2013/p06_deprecate_is_cancelled.py | 11 +
…/august_2013/p06_fix_sle_against_stock_entry.py | 18 ±
patches/december_2012/repost_ordered_qty.py | 19 ±
patches/february_2013/repost_reserved_qty.py | 56 ±-
…/june_2013/p03_buying_selling_for_price_list.py | 4 ±
…/p07_taxes_price_list_for_territory.py | 8 ±
patches/june_2013/p08_shopping_cart_settings.py | 2 ±
patches/june_2013/p09_update_global_defaults.py | 1 -
patches/march_2013/p03_update_buying_amount.py | 33 –
…/p06_remove_sales_purchase_return_tool.py | 6 ±
patches/march_2013/p08_create_aii_accounts.py | 33 ±
patches/may_2013/p01_conversion_factor_and_aii.py | 29 –
patches/may_2013/p03_update_support_ticket.py | 2 ±
…/may_2013/p05_update_cancelled_gl_entries.py | 3 ±
…/update_delivered_billed_percentage_for_pos.py | 7 ±
patches/october_2012/fix_cancelled_gl_entries.py | 1 +
patches/october_2013/fix_is_cancelled_in_sle.py | 13 +
patches/october_2013/p01_fix_serial_no_status.py | 21 +
…/p01_update_delivery_note_prevdocs.py | 13 +
…/october_2013/p02_set_communication_status.py | 11 +
…te_price_list_and_item_details_in_item_price.py | 20 +
patches/october_2013/p03_crm_update_status.py | 47 ++
…/p03_remove_sales_and_purchase_return_tool.py | 8 +
…/october_2013/p04_update_report_permission.py | 9 +
patches/october_2013/p04_wsgi_migration.py | 33 ++
…p05_delete_gl_entries_for_cancelled_vouchers.py | 16 +
…/p05_server_custom_script_to_file.py | 40 ++
…/p06_rename_packing_list_doctype.py | 21 +
…p06_update_control_panel_and_global_defaults.py | 21 +
patches/october_2013/p07_rename_for_territory.py | 24 +
…/p08_cleanup_after_item_price_module_change.py | 14 +
…/p09_update_naming_series_settings.py | 10 +
patches/october_2013/p10_plugins_refactor.py | 24 +
…/perpetual_inventory_stock_transfer_utility.py | 86 ++++
patches/october_2013/repost_ordered_qty.py | 6 +
patches/october_2013/repost_planned_qty.py | 11 +
…/october_2013/set_stock_value_diff_in_sle.py | 9 ±
patches/patch_list.py | 40 ±
…/p03_modify_item_price_include_in_price_list.py | 4 ±
…/september_2013/p04_unsubmit_serial_nos.py | 6 ±
patches/september_2013/p05_fix_customer_in_pos.py | 22 +
portal/templates/includes/cart.js | 17 ±
portal/templates/pages/cart.py | 3 ±
portal/templates/pages/profile.py | 3 ±
projects/doctype/project/project.js | 4 ±
projects/doctype/project/project.txt | 22 ±
projects/doctype/task/task.py | 5 ±
projects/doctype/task/task.txt | 3 ±
projects/doctype/task/task_calendar.js | 4 ±
projects/doctype/time_log/time_log.js | 4 ±
projects/doctype/time_log/time_log.txt | 4 ±
…/doctype/time_log_batch/test_time_log_batch.py | 26 ±
projects/doctype/time_log_batch/time_log_batch.js | 2 ±
projects/doctype/time_log_batch/time_log_batch.txt | 4 ±
…/daily_time_log_summary.js | 4 ±
public/js/account_tree_grid.js | 34 ±
public/js/complete_setup.js | 126 -----
public/js/conf.js | 10 ±
public/js/controllers/accounts.js | 18 +
public/js/controllers/stock_controller.js | 18 ±
public/js/feature_setup.js | 2 ±
public/js/purchase_trends_filters.js | 10 ±
public/js/sales_trends_filters.js | 10 ±
public/js/startup.css | 16 +
public/js/startup.js | 33 ±
public/js/stock_analytics.js | 30 ±
public/js/stock_grid_report.js | 9 ±
public/js/transaction.js | 169 ++++±-
public/js/utils.js | 18 ±
selling/doctype/customer/customer.js | 14 ±
selling/doctype/customer/customer.py | 13 ±
selling/doctype/customer/customer.txt | 93 +±-
selling/doctype/customer/test_customer.py | 5 +
…/customer_discount/customer_discount.txt | 5 ±
…/doctype/installation_note/installation_note.py | 7 ±
…/installation_note/installation_note.txt | 6 ±
…/installation_note_item.txt | 14 ±
selling/doctype/lead/get_leads.py | 2 ±
selling/doctype/lead/lead.js | 24 ±
selling/doctype/lead/lead.py | 34 ±
selling/doctype/lead/lead.txt | 52 ±
selling/doctype/opportunity/opportunity.js | 47 ±
selling/doctype/opportunity/opportunity.py | 65 ±-
selling/doctype/opportunity/opportunity.txt | 146 ++±–
…/doctype/opportunity_item/opportunity_item.txt | 3 ±
selling/doctype/quotation/quotation.js | 37 ±
selling/doctype/quotation/quotation.py | 144 ±----
selling/doctype/quotation/quotation.txt | 36 ±
selling/doctype/quotation/test_quotation.py | 10 ±
selling/doctype/quotation_item/quotation_item.txt | 3 ±
selling/doctype/sales_bom/sales_bom.js | 6 ±
selling/doctype/sales_common/README.md | 1 -
selling/doctype/sales_common/sales_common.py | 363 --------------
selling/doctype/sales_common/sales_common.txt | 19 -
selling/doctype/sales_order/sales_order.js | 29 ±
selling/doctype/sales_order/sales_order.py | 109 +±–
selling/doctype/sales_order/sales_order.txt | 42 ±
selling/doctype/sales_order/test_sales_order.py | 12 ±
…/doctype/sales_order_item/sales_order_item.txt | 4 ±
…/doctype/selling_settings/selling_settings.py | 4 +
…/doctype/selling_settings/selling_settings.txt | 6 ±
…/shopping_cart_settings.py | 2 ±
…/shopping_cart_settings.txt | 4 ±
selling/doctype/sms_center/sms_center.py | 11 ±
selling/page/sales_analytics/sales_analytics.js | 34 ±
selling/page/sales_browser/sales_browser.js | 19 ±
selling/page/sales_funnel/sales_funnel.css | 3 +
selling/page/sales_funnel/sales_funnel.js | 189 ++++++++
selling/page/sales_funnel/sales_funnel.py | 33 ++
selling/page/sales_funnel/sales_funnel.txt | 33 ++
selling/page/selling_home/selling_home.js | 18 ±
…/customers_not_buying_since_long_time.js | 2 ±
selling/report/lead_details/lead_details.txt | 22 +
…sales_person_target_variance_item_group_wise.js | 6 ±
…/sales_person_wise_transaction_summary.js | 18 ±
…/territory_target_variance_item_group_wise.js | 6 ±
selling/{doctype/sales_common => }/sales_common.js | 55 ±-
selling/utils/init.py | 28 ±
selling/utils/cart.py | 8 ±
selling/utils/product.py | 5 ±
…/applicable_territory.py} | 0
…/applicable_territory.txt} | 7 ±
…/authorization_control/authorization_control.py | 31 ±
…/authorization_rule/authorization_rule.py | 9 ±
setup/doctype/backup_manager/backup_dropbox.py | 5 ±
setup/doctype/backup_manager/backup_googledrive.py | 7 ±
…/doctype/company/charts/import_from_openerp.py | 2 +
setup/doctype/company/company.js | 68 +±
setup/doctype/company/company.py | 52 ±
setup/doctype/company/company.txt | 35 ±
setup/doctype/contact_control/contact_control.js | 2 ±
setup/doctype/customer_group/customer_group.js | 2 ±
setup/doctype/customer_group/customer_group.py | 7 ±
setup/doctype/customer_group/customer_group.txt | 5 ±
setup/doctype/email_digest/email_digest.js | 14 ±
setup/doctype/email_digest/email_digest.py | 8 ±
setup/doctype/email_settings/email_settings.py | 1 -
setup/doctype/features_setup/features_setup.txt | 3 ±
setup/doctype/global_defaults/global_defaults.js | 50 ±
setup/doctype/global_defaults/global_defaults.py | 13 ±
setup/doctype/global_defaults/global_defaults.txt | 16 ±
setup/doctype/item_group/item_group.js | 10 ±
setup/doctype/item_group/item_group.txt | 4 ±
…/templates/generators/item_group.html | 10 ±
setup/doctype/item_price/init.py | 1 -
setup/doctype/item_price/item_price.txt | 53 —
setup/doctype/naming_series/naming_series.py | 38 ±
…/notification_control/notification_control.py | 3 ±
setup/doctype/price_list/init.py | 1 -
setup/doctype/price_list/price_list.js | 8 -
setup/doctype/print_heading/print_heading.py | 1 -
setup/doctype/sales_partner/sales_partner.js | 4 ±
setup/doctype/sales_partner/sales_partner.py | 7 ±
setup/doctype/sales_partner/sales_partner.txt | 3 ±
setup/doctype/sales_person/sales_person.js | 2 ±
setup/doctype/setup_control/README.md | 1 -
setup/doctype/setup_control/init.py | 1 -
setup/doctype/setup_control/setup_control.py | 254 ----------
setup/doctype/setup_control/setup_control.txt | 24 -
setup/doctype/supplier_type/supplier_type.js | 2 ±
setup/doctype/target_detail/target_detail.txt | 3 ±
setup/doctype/territory/territory.js | 2 ±
setup/doctype/territory/territory.txt | 4 ±
setup/doctype/uom/uom.txt | 18 ±
…/website_item_group/website_item_group.txt | 3 ±
setup/page/setup/setup.js | 16 ±
setup/page/setup/setup.py | 3 ±
setup/page/setup_wizard/setup_wizard.css | 12 +
setup/page/setup_wizard/setup_wizard.js | 498 ++++++++++++++++++++
setup/page/setup_wizard/setup_wizard.py | 354 ++++++++++++++
setup/page/setup_wizard/setup_wizard.txt | 32 ++
setup/page/setup_wizard/test_setup_data.py | 53 +++
setup/page/setup_wizard/test_setup_wizard.py | 14 +
…/item_wise_price_list_rate.txt | 22 +
startup/init.py | 4 ±
startup/boot.py | 6 ±
startup/event_handlers.py | 11 ±
startup/install.py | 5 ±
startup/report_data_map.py | 2 -
stock/doctype/bin/bin.py | 6 ±
stock/doctype/delivery_note/delivery_note.js | 34 ±
stock/doctype/delivery_note/delivery_note.py | 244 ++±------
stock/doctype/delivery_note/delivery_note.txt | 31 ±
stock/doctype/delivery_note/test_delivery_note.py | 151 +++±-
…/delivery_note_item/delivery_note_item.txt | 50 ±
stock/doctype/delivery_note_packing_item/README.md | 1 -
…/doctype/delivery_note_packing_item/init.py | 1 -
stock/doctype/item/item.js | 36 ±
stock/doctype/item/item.py | 9 ±
stock/doctype/item/item.txt | 6 ±
stock/doctype/item/templates/generators/item.html | 8 +
…/item/templates/includes/product_list.js | 2 ±
stock/doctype/item/test_item.py | 67 +±
{setup => stock}/doctype/item_price/README.md | 0
…/doctype/item_price}/init.py | 0
stock/doctype/item_price/item_price.js | 16 +
stock/doctype/item_price/item_price.py | 39 ++
stock/doctype/item_price/item_price.txt | 127 +++++
stock/doctype/item_price/test_item_price.py | 23 +
…/doctype/landed_cost_item/landed_cost_item.txt | 13 ±
…/landed_cost_purchase_receipt.txt | 32 ±
…/landed_cost_wizard/landed_cost_wizard.js | 54 +±
…/landed_cost_wizard/landed_cost_wizard.py | 261 ++±------
…/landed_cost_wizard/landed_cost_wizard.txt | 47 ±
stock/doctype/material_request/material_request.js | 71 +±
stock/doctype/material_request/material_request.py | 41 ±
…/doctype/material_request/material_request.txt | 87 +±-
…/material_request/test_material_request.py | 6 ±
…/material_request_item.txt | 39 ±
stock/doctype/packed_item/packed_item.py | 105 +++++
…/packed_item.txt} | 6 ±
stock/doctype/packing_slip/packing_slip.js | 16 ±
stock/doctype/packing_slip/packing_slip.txt | 4 ±
{setup => stock}/doctype/price_list/README.md | 0
…/doctype/price_list}/init.py | 0
stock/doctype/price_list/price_list.css | 7 +
stock/doctype/price_list/price_list.js | 17 +
{setup => stock}/doctype/price_list/price_list.py | 20 ±
{setup => stock}/doctype/price_list/price_list.txt | 20 ±
…/doctype/price_list/test_price_list.py | 25 ±
stock/doctype/purchase_receipt/purchase_receipt.js | 9 ±
stock/doctype/purchase_receipt/purchase_receipt.py | 299 ++++±------
…/doctype/purchase_receipt/purchase_receipt.txt | 15 ±
…/purchase_receipt/test_purchase_receipt.py | 102 +±-
…/purchase_receipt_item.txt | 20 ±
stock/doctype/serial_no/serial_no.py | 253 ++++++++±
stock/doctype/serial_no/serial_no.txt | 23 ±
stock/doctype/serial_no/test_serial_no.py | 2 ±
stock/doctype/stock_entry/stock_entry.js | 104 +±-
stock/doctype/stock_entry/stock_entry.py | 319 ++++±-------
stock/doctype/stock_entry/stock_entry.txt | 18 ±
stock/doctype/stock_entry/test_stock_entry.py | 300 +++++++±—
…/stock_entry_detail/stock_entry_detail.txt | 78 +±
stock/doctype/stock_ledger/README.md | 1 -
stock/doctype/stock_ledger/init.py | 1 -
stock/doctype/stock_ledger/stock_ledger.py | 1 -
stock/doctype/stock_ledger/stock_ledger.txt | 22 -
…/stock_ledger_entry/stock_ledger_entry.py | 165 +±----
…/stock_ledger_entry/stock_ledger_entry.txt | 22 ±
…/stock_reconciliation/stock_reconciliation.js | 41 ±
…/stock_reconciliation/stock_reconciliation.py | 77 +±
…/stock_reconciliation/stock_reconciliation.txt | 22 ±
…/test_stock_reconciliation.py | 197 +++±—
stock/doctype/stock_settings/stock_settings.py | 6 +
stock/doctype/stock_settings/stock_settings.txt | 4 ±
…/stock_uom_replace_utility.py | 13 ±
stock/doctype/warehouse/test_warehouse.py | 7 ±
stock/doctype/warehouse/warehouse.js | 18 ±
stock/doctype/warehouse/warehouse.py | 207 ++±----
stock/doctype/warehouse/warehouse.txt | 64 +±
stock/page/stock_ageing/stock_ageing.js | 30 ±
stock/page/stock_analytics/stock_analytics.js | 2 ±
stock/page/stock_balance/stock_balance.js | 53 +±
stock/page/stock_home/stock_home.js | 15 ±
stock/page/stock_ledger/stock_ledger.js | 42 ±
stock/page/stock_level/stock_level.js | 56 ±-
…/batch_wise_balance_history.js | 4 ±
…/batch_wise_balance_history.py | 2 ±
stock/report/item_prices/item_prices.py | 7 ±
…/item_wise_price_list/item_wise_price_list.txt | 22 -
…/itemwise_recommended_reorder_level.js | 4 ±
stock/report/stock_ledger/stock_ledger.txt | 4 ±
…/warehouse_wise_stock_balance.js | 4 ±
…/warehouse_wise_stock_balance.py | 2 ±
stock/stock_ledger.py | 84 ++±
stock/utils.py | 81 ++±
support/doctype/customer_issue/customer_issue.js | 2 ±
support/doctype/customer_issue/customer_issue.py | 3 ±
support/doctype/customer_issue/customer_issue.txt | 6 ±
…/maintenance_schedule/maintenance_schedule.js | 4 ±
…/maintenance_schedule/maintenance_schedule.py | 17 ±
…/maintenance_schedule/maintenance_schedule.txt | 4 ±
…/doctype/maintenance_visit/maintenance_visit.py | 11 ±
…/maintenance_visit/maintenance_visit.txt | 4 ±
support/doctype/newsletter/newsletter.js | 2 ±
support/doctype/newsletter/newsletter.py | 33 ±
support/doctype/newsletter/newsletter.txt | 4 ±
support/doctype/newsletter/test_newsletter.py | 9 ±
…/doctype/support_ticket/get_support_mails.py | 4 ±
support/doctype/support_ticket/support_ticket.css | 15 -
support/doctype/support_ticket/support_ticket.js | 9 ±
support/doctype/support_ticket/support_ticket.py | 13 ±
support/doctype/support_ticket/support_ticket.txt | 36 ±
…/page/support_analytics/support_analytics.js | 22 ±
…/maintenance_schedules.txt | 4 ±
translations/ar.csv | 2 ±
translations/de.csv | 2 ±
translations/el.csv | 2 ±
translations/es.csv | 2 ±
translations/fr.csv | 2 ±
translations/hi.csv | 2 ±
translations/hr.csv | 2 ±
translations/it.csv | 2 ±
translations/nl.csv | 2 ±
translations/pt-BR.csv | 2 ±
translations/pt.csv | 2 ±
translations/sr.csv | 2 ±
translations/ta.csv | 2 ±
translations/th.csv | 2 ±
utilities/demo/demo_control_panel.py | 27 ±
utilities/demo/demo_docs/Item_Price.csv | 49 ++
utilities/demo/demo_docs/Lead.csv | 136 ++±–
utilities/demo/demo_docs/Price_List.csv | 49 –
utilities/demo/demo_docs/Profile.csv | 80 +±-
utilities/demo/make_demo.py | 48 ±
utilities/demo/make_erpnext_demo.py | 33 ±
utilities/doctype/contact/contact.py | 24 ±
utilities/doctype/contact/contact.txt | 9 ±
utilities/doctype/sms_control/sms_control.py | 6 ±
utilities/repost_stock.py | 125 +++++
utilities/transaction_base.py | 12 ±
557 files changed, 11142 insertions(+), 7118 deletions(-)
delete mode 100644 accounts/doctype/budget_control/README.md
delete mode 100644 accounts/doctype/budget_control/budget_control.py
delete mode 100644 accounts/doctype/budget_control/budget_control.txt
create mode 100644 accounts/doctype/period_closing_voucher/test_period_closing_voucher.py
delete mode 100644 accounts/doctype/sales_invoice/sales_invoice.css
rename {setup/doctype/for_territory => buying/report/supplier_addresses_and_contacts}/init.py (100%)
create mode 100644 buying/report/supplier_addresses_and_contacts/supplier_addresses_and_contacts.txt
create mode 100644 docs/docs.user.stock.accounting_for_stock.md
create mode 100644 docs/docs.user.stock.perpetual_inventory.md
create mode 100644 docs/user/accounts/docs.user.accounts.opening_entry.md
create mode 100644 docs/user/accounts/docs.user.accounts.opening_stock.md
create mode 100644 docs/user/customer_portal/docs.user.customer_portal.login.md
create mode 100644 docs/user/customer_portal/docs.user.customer_portal.md
create mode 100644 docs/user/customer_portal/docs.user.customer_portal.orders.md
create mode 100644 docs/user/customer_portal/docs.user.customer_portal.sign_up.md
create mode 100644 docs/user/customer_portal/docs.user.customer_portal.tickets.md
create mode 100644 docs/user/five_day_setup/docs.user.five_day_setup.day_1.md
create mode 100644 docs/user/five_day_setup/docs.user.five_day_setup.day_2.md
create mode 100644 docs/user/five_day_setup/docs.user.five_day_setup.day_3.md
create mode 100644 docs/user/five_day_setup/docs.user.five_day_setup.day_4.md
create mode 100644 docs/user/five_day_setup/docs.user.five_day_setup.day_5.md
create mode 100644 docs/user/five_day_setup/docs.user.five_day_setup.md
create mode 100644 docs/user/knowledge/docs.user.knowledge.accounting.md
create mode 100644 docs/user/knowledge/docs.user.knowledge.accounting_entries.md
create mode 100644 docs/user/knowledge/docs.user.knowledge.attachment_csv.md
create mode 100644 docs/user/knowledge/docs.user.knowledge.doctype.md
create mode 100644 docs/user/knowledge/docs.user.knowledge.doctype_fields.md
create mode 100644 docs/user/knowledge/docs.user.knowledge.fiscal_year.md
create mode 100644 docs/user/knowledge/docs.user.knowledge.markdown.md
create mode 100644 docs/user/knowledge/docs.user.knowledge.md
create mode 100644 docs/user/selling/docs.user.selling.shopping_cart.md
rename docs/user/stock/{docs.user.stock.periodic_to_perpetual.md => docs.user.stock.migrate_to_perpetual.md} (80%)
create mode 100644 docs/user/stock/docs.user.stock.product_listing_on_website.md
create mode 100644 docs/user/support/docs.user.support.newsletter.md
create mode 100644 docs/user/tools/docs.user.tools.assignment.md
create mode 100644 docs/user/tools/docs.user.tools.tags.md
create mode 100644 docs/user/website/docs.user.website.add_products_to_website.md
create mode 100644 manufacturing/doctype/production_order/test_production_order.py
rename {stock/report/item_wise_price_list => patches/1311}/init.py (100%)
create mode 100644 patches/1311/p01_cleanup.py
create mode 100644 patches/august_2013/p01_auto_accounting_for_stock_patch.py
create mode 100644 patches/august_2013/p06_deprecate_is_cancelled.py
delete mode 100644 patches/march_2013/p03_update_buying_amount.py
delete mode 100644 patches/may_2013/p01_conversion_factor_and_aii.py
create mode 100644 patches/october_2013/init.py
create mode 100644 patches/october_2013/fix_is_cancelled_in_sle.py
create mode 100644 patches/october_2013/p01_fix_serial_no_status.py
create mode 100644 patches/october_2013/p01_update_delivery_note_prevdocs.py
create mode 100644 patches/october_2013/p02_set_communication_status.py
create mode 100644 patches/october_2013/p02_update_price_list_and_item_details_in_item_price.py
create mode 100644 patches/october_2013/p03_crm_update_status.py
create mode 100644 patches/october_2013/p03_remove_sales_and_purchase_return_tool.py
create mode 100644 patches/october_2013/p04_update_report_permission.py
create mode 100644 patches/october_2013/p04_wsgi_migration.py
create mode 100644 patches/october_2013/p05_delete_gl_entries_for_cancelled_vouchers.py
create mode 100644 patches/october_2013/p05_server_custom_script_to_file.py
create mode 100644 patches/october_2013/p06_rename_packing_list_doctype.py
create mode 100644 patches/october_2013/p06_update_control_panel_and_global_defaults.py
create mode 100644 patches/october_2013/p07_rename_for_territory.py
create mode 100644 patches/october_2013/p08_cleanup_after_item_price_module_change.py
create mode 100644 patches/october_2013/p09_update_naming_series_settings.py
create mode 100644 patches/october_2013/p10_plugins_refactor.py
create mode 100644 patches/october_2013/perpetual_inventory_stock_transfer_utility.py
create mode 100644 patches/october_2013/repost_ordered_qty.py
create mode 100644 patches/october_2013/repost_planned_qty.py
rename setup/doctype/for_territory/for_territory.py => patches/october_2013/set_stock_value_diff_in_sle.py (57%)
rename stock/doctype/delivery_note_packing_item/delivery_note_packing_item.py => patches/september_2013/p04_unsubmit_serial_nos.py (63%)
create mode 100644 patches/september_2013/p05_fix_customer_in_pos.py
delete mode 100644 public/js/complete_setup.js
create mode 100644 public/js/controllers/accounts.js
delete mode 100644 selling/doctype/sales_common/README.md
delete mode 100644 selling/doctype/sales_common/sales_common.py
delete mode 100644 selling/doctype/sales_common/sales_common.txt
create mode 100644 selling/page/sales_funnel/init.py
create mode 100644 selling/page/sales_funnel/sales_funnel.css
create mode 100644 selling/page/sales_funnel/sales_funnel.js
create mode 100644 selling/page/sales_funnel/sales_funnel.py
create mode 100644 selling/page/sales_funnel/sales_funnel.txt
create mode 100644 selling/report/lead_details/init.py
create mode 100644 selling/report/lead_details/lead_details.txt
rename selling/{doctype/sales_common => }/sales_common.js (94%)
create mode 100644 setup/doctype/applicable_territory/init.py
rename setup/doctype/{item_price/item_price.py => applicable_territory/applicable_territory.py} (100%)
rename setup/doctype/{for_territory/for_territory.txt => applicable_territory/applicable_territory.txt} (75%)
delete mode 100644 setup/doctype/item_price/init.py
delete mode 100644 setup/doctype/item_price/item_price.txt
delete mode 100644 setup/doctype/price_list/init.py
delete mode 100644 setup/doctype/price_list/price_list.js
delete mode 100644 setup/doctype/setup_control/README.md
delete mode 100644 setup/doctype/setup_control/init.py
delete mode 100644 setup/doctype/setup_control/setup_control.py
delete mode 100644 setup/doctype/setup_control/setup_control.txt
create mode 100644 setup/page/setup_wizard/init.py
create mode 100644 setup/page/setup_wizard/setup_wizard.css
create mode 100644 setup/page/setup_wizard/setup_wizard.js
create mode 100644 setup/page/setup_wizard/setup_wizard.py
create mode 100644 setup/page/setup_wizard/setup_wizard.txt
create mode 100644 setup/page/setup_wizard/test_setup_data.py
create mode 100644 setup/page/setup_wizard/test_setup_wizard.py
create mode 100644 setup/report/init.py
create mode 100644 setup/report/item_wise_price_list_rate/init.py
create mode 100644 setup/report/item_wise_price_list_rate/item_wise_price_list_rate.txt
delete mode 100644 stock/doctype/delivery_note_packing_item/README.md
delete mode 100644 stock/doctype/delivery_note_packing_item/init.py
rename {setup => stock}/doctype/item_price/README.md (100%)
rename {accounts/doctype/budget_control => stock/doctype/item_price}/init.py (100%)
create mode 100644 stock/doctype/item_price/item_price.js
create mode 100644 stock/doctype/item_price/item_price.py
create mode 100644 stock/doctype/item_price/item_price.txt
create mode 100644 stock/doctype/item_price/test_item_price.py
create mode 100644 stock/doctype/packed_item/init.py
create mode 100644 stock/doctype/packed_item/packed_item.py
rename stock/doctype/{delivery_note_packing_item/delivery_note_packing_item.txt => packed_item/packed_item.txt} (96%)
rename {setup => stock}/doctype/price_list/README.md (100%)
rename {selling/doctype/sales_common => stock/doctype/price_list}/init.py (100%)
create mode 100644 stock/doctype/price_list/price_list.css
create mode 100644 stock/doctype/price_list/price_list.js
rename {setup => stock}/doctype/price_list/price_list.py (79%)
rename {setup => stock}/doctype/price_list/price_list.txt (85%)
rename {setup => stock}/doctype/price_list/test_price_list.py (65%)
delete mode 100644 stock/doctype/stock_ledger/README.md
delete mode 100644 stock/doctype/stock_ledger/init.py
delete mode 100644 stock/doctype/stock_ledger/stock_ledger.txt
delete mode 100644 stock/report/item_wise_price_list/item_wise_price_list.txt
delete mode 100644 support/doctype/support_ticket/support_ticket.css
create mode 100644 utilities/demo/demo_docs/Item_Price.csv
delete mode 100644 utilities/demo/demo_docs/Price_List.csv
create mode 100644 utilities/repost_stock.py

then ERPNext is no longer accessible (403 error). 

It would be great if you could help us to figure out what’s going wrong and fix it once for all, because this is causing our productivity to decrease dramatically.

Many thanks in advance!

Amin from Fritzing



Note:

 

If you are posting an issue,

  1. We should be able to replicate it at our end. So please give us as much information as you can. Please see it from the point of view of the person receiving the communication.
  2. Paste your code at http://pastebin.com or http://gist.github.com and send only the URL via email
  3. For sending images, use http://imgur.com or other similar services. Do not send images as attachments. Links are good. Same goes for any file you are going to send.

     

    End of Note



    You received this message because you are subscribed to the Google Groups “ERPNext Developer Forum” group.

    To unsubscribe from this group and stop receiving emails from it, send an email to erpnext-developer-forum+un...@googlegroups.com.

    For more options, visit https://groups.google.com/groups/opt_out.

Hi Amin,
You have pulled a major change where we moved from CGI to WSGI.

Please follow these links to migrate to WSGI

and

or you can move to the 1310 branch to be on CGI till you are ready.

Thanks,

On Mon, Nov 11, 2013 at 6:56 PM, Amin Zayani za...@gmail.com wrote:

Dear ERPNext team,

we are having this persisting problem everytime we try to update ERPNext:
the update crashes, giving us this error:

From git://github.com/webnotes/wnframework

  • branch master → FETCH_HEAD
    From git://github.com/webnotes/erpnext
  • branch master → FETCH_HEAD
    Traceback (most recent call last):
    File “lib/wnf.py”, line 590, in
    if not search: search = esc(txt1)
    File “lib/wnf.py”, line 463, in run
    @cmd
    File “lib/wnf.py”, line 77, in update_erpnext
    def setup_install(parser):
    File “/var/www/erpnext/lib/webnotes/utils/init.py”, line 7, in

    from webnotes import conf
    ImportError: cannot import name conf

Updating c30a604…b1e1e0c
Fast-forward
README.md | 12 ±
core/page/todo/todo.html => init.py | 0
conf/Framework.sql | 1 +
conf/conf.py | 5 ±
core/doctype/comment/comment.py | 9 ±
core/doctype/communication/communication.js | 45 ±
core/doctype/communication/communication.py | 7 ±
core/doctype/communication/communication.txt | 20 ±
core/doctype/control_panel/control_panel.py | 4 ±
core/doctype/control_panel/control_panel.txt | 4 ±
core/doctype/custom_field/custom_field.py | 22 ±
core/doctype/custom_field/custom_field.txt | 3 ±
core/doctype/custom_script/custom_script.js | 10 -
core/doctype/custom_script/custom_script.py | 35 ±
core/doctype/custom_script/custom_script.txt | 5 ±
core/doctype/customize_form/customize_form.py | 36 ±
core/doctype/customize_form/customize_form.txt | 11 ±
…/customize_form_field/customize_form_field.txt | 4 ±
core/doctype/doctype/doctype.py | 13 ±
core/doctype/doctype/doctype.txt | 218 +±
…/documentation_tool/documentation_tool.py | 13 ±
core/doctype/event/event.py | 14 ±
core/doctype/event/event.txt | 4 ±
core/doctype/file_data/file_data.py | 30 ±
core/doctype/letter_head/letter_head.py | 5 ±
core/doctype/letter_head/letter_head.txt | 4 ±
core/doctype/page/page.py | 4 ±
core/doctype/patch_log/patch_log.txt | 16 ±
core/doctype/print_format/print_format.py | 5 ±
core/doctype/print_format/print_format.txt | 4 ±
core/doctype/profile/profile.js | 15 ±
core/doctype/profile/profile.py | 113 ±
core/doctype/profile/profile.txt | 19 ±
core/doctype/profile/test_profile.py | 25 ±
core/doctype/property_setter/property_setter.py | 14 ±
core/doctype/report/report.py | 18 ±
core/doctype/role/test_role.py | 2 ±
core/doctype/workflow_state/workflow_state.txt | 4 ±
core/page/data_import_tool/data_import_tool.py | 32 ±
core/page/messages/messages.js | 4 ±
core/page/messages/messages.py | 6 ±
core/page/permission_manager/permission_manager.js | 3 ±
core/page/permission_manager/permission_manager.py | 6 ±
core/page/todo/todo.css | 5 ±
core/page/todo/todo.js | 142 ±
core/page/todo/todo.py | 2 ±
core/page/update_manager/README.md | 1 -
core/page/update_manager/init.py | 3 -
core/page/update_manager/update_manager.js | 65 -
core/page/update_manager/update_manager.py | 20 -
core/page/update_manager/update_manager.txt | 37 -
public/build.json | 15 ±
public/css/bootstrap.css | 1716
++++++++++±--------
public/css/common.css | 291 +±-
public/css/forms.css | 12 -
public/css/nprogress.css | 6 ±
public/css/tag-it.css | 7 ±
public/css/typeahead.css | 45 +
public/html/rss.xml | 44 -
public/html/server.py | 59 -
public/html/sitemap.xml | 37 -
public/html/unsupported.html | 22 -
public/html/web.py | 71 -
public/js/legacy/clientscriptAPI.js | 6 ±
public/js/legacy/datetime.js | 2 ±
public/js/legacy/form.js | 19 ±
public/js/lib/bootstrap-wysiwyg.js | 187 —
…/jquery/bootstrap_theme/jquery-ui.selected.css | 97 –
…uery.event.drag.min.js => jquery.event.drag.js} | 2 ±
public/js/lib/slickgrid/slick-default-theme.css | 12 ±
public/js/lib/tag-it.min.js | 6 ±
public/js/lib/typeahead.js | 1142 +++++++++++++
public/js/wn/app.js | 12 ±
public/js/wn/assets.js | 14 ±
public/js/wn/class.js | 2 ±
public/js/wn/dom.js | 18 +
public/js/wn/form/attachments.js | 15 ±
public/js/wn/form/control.js | 300 ++±
public/js/wn/form/dashboard.js | 5 ±
public/js/wn/form/editors.js | 190 ±-
public/js/wn/form/footer.js | 28 ±
public/js/wn/form/grid.js | 256 ±-
public/js/wn/form/infobar.js | 171 ±
public/js/wn/form/layout.js | 121 ±
public/js/wn/form/link_selector.js | 4 ±
public/js/wn/form/script_manager.js | 1 +
public/js/wn/form/toolbar.js | 42 ±
public/js/wn/misc/number_format.js | 2 ±
public/js/wn/misc/tools.js | 13 ±
public/js/wn/misc/user.js | 5 ±
public/js/wn/misc/utils.js | 46 ±
public/js/wn/model/doclist.js | 2 ±
public/js/wn/model/meta.js | 8 ±
public/js/wn/model/model.js | 12 ±
public/js/wn/model/perm.js | 2 ±
public/js/wn/print/print_table.js | 2 ±
public/js/wn/provide.js | 3 ±
public/js/wn/request.js | 12 ±
public/js/wn/router.js | 2 ±
public/js/wn/translate.js | 9 ±
public/js/wn/ui/appframe.js | 84 ±
public/js/wn/ui/dialog.js | 18 ±
public/js/wn/ui/editor.js | 509 ++++++
public/js/wn/ui/field_group.js | 60 ±
public/js/wn/ui/filters.js | 21 ±
public/js/wn/ui/listing.js | 7 ±
public/js/wn/ui/messages.js | 3 +
public/js/wn/ui/toolbar/toolbar.js | 3 ±
public/js/wn/upload.js | 99 ±
public/js/wn/views/communication.js | 77 ±
public/js/wn/views/container.js | 2 ±
public/js/wn/views/doclistview.js | 96 ±
public/js/wn/views/formview.js | 2 ±
public/js/wn/views/listview.js | 108 ±
public/js/wn/views/moduleview.js | 7 ±
public/js/wn/views/pageview.js | 38 ±
public/js/wn/views/query_report.js | 8 ±
public/js/wn/views/reportview.js | 20 ±
public/js/wn/views/sidebar_stats.js | 33 ±
public/js/wn/website/editable.js | 23 +
requirements.txt | 34 ±
webnotes/init.py | 258 +±
webnotes/app.py | 64 +
webnotes/auth.py | 95 ±
webnotes/boot.py | 18 ±
webnotes/build.py | 14 ±
webnotes/client.py | 28 ±
webnotes/db.py | 38 ±
webnotes/handler.py | 143 ±
webnotes/install_lib/install.py | 229 +±
webnotes/install_lib/setup_public_folder.py | 48 ±
webnotes/memc.py | 7 ±
webnotes/middlewares.py | 32 +
webnotes/model/bean.py | 114 ±
webnotes/model/code.py | 82 ±
webnotes/model/doc.py | 207 +±
webnotes/model/doclist.py | 27 ±
webnotes/model/doctype.py | 46 ±
webnotes/model/mapper.py | 22 ±
webnotes/model/meta.py | 8 ±
webnotes/model/sync.py | 14 ±
webnotes/model/utils.py | 2 ±
webnotes/model/workflow.py | 13 ±
webnotes/modules/init.py | 11 ±
webnotes/modules/export_file.py | 28 ±
webnotes/modules/import_file.py | 4 ±
webnotes/modules/patch_handler.py | 19 ±
webnotes/modules/utils.py | 6 ±
webnotes/plugins.py | 107 ++
webnotes/profile.py | 17 +
webnotes/sessions.py | 49 ±
webnotes/test_runner.py | 36 ±
webnotes/tests/init.py | 3 ±
webnotes/tests/test_db.py | 18 ±
webnotes/tests/test_email.py | 7 ±
webnotes/tests/test_geo_ip.py | 1 -
webnotes/translate.py | 72 ±
webnotes/utils/init.py | 95 ±
webnotes/utils/backups.py | 73 ±
webnotes/utils/datautils.py | 3 ±
webnotes/utils/dateutils.py | 9 ±
webnotes/utils/email_lib/init.py | 3 ±
webnotes/utils/email_lib/bulk.py | 23 ±
webnotes/utils/email_lib/receive.py | 4 ±
webnotes/utils/email_lib/smtp.py | 34 ±
webnotes/utils/file_manager.py | 83 ±
webnotes/utils/minify.py | 8 -
webnotes/utils/scheduler.py | 27 ±
webnotes/webutils.py | 111 ±
webnotes/widgets/event.py | 10 ±
webnotes/widgets/form/assign_to.py | 6 ±
webnotes/widgets/page.py | 2 -
webnotes/widgets/query_builder.py | 40 ±
webnotes/widgets/query_report.py | 60 ±
webnotes/widgets/report_dump.py | 3 ±
webnotes/widgets/reportview.py | 97 ±
webnotes/widgets/search.py | 23 ±
webnotes/widgets/tags.py | 4 ±
website/css/website.css | 6 +
…/about_us_settings/about_us_settings.txt | 8 ±
website/doctype/blog_post/blog_feed.py | 61 -
website/doctype/blog_post/blog_post.js | 16 ±
website/doctype/blog_post/blog_post.py | 84 ±
website/doctype/blog_post/blog_post.txt | 14 ±
…/blog_post/templates/generators/blog_post.html | 51 ±
…/blog_post/templates/includes/init.py | 0
…/doctype/blog_post/templates/includes/blog.js | 3 ±
…/blog_post/templates/includes/blog_post.css | 13 -
…/blog_post/templates/includes/blog_post.js | 65 -
…/blog_post/templates/includes/blogger.html | 2 ±
…/blog_post/templates/includes/comment.html | 17 -
website/doctype/style_settings/style_settings.py | 75 ±
…/pages/wn-web.css} | 5 +
…/style_settings/templates/pages/wn_web.py | 60 +
website/doctype/top_bar_item/top_bar_item.txt | 17 ±
…/web_page/templates/generators/web_page.html | 10 +
website/doctype/web_page/web_page.js | 5 +
website/doctype/web_page/web_page.txt | 42 ±
…/website_script/templates/pages/wn-web.js | 14 +
…/website_script/templates/pages/wn_web.py | 14 +
website/doctype/website_script/website_script.py | 9 ±
…/website_settings/make_web_include_files.py | 58 -
…/doctype/website_settings/website_settings.js | 6 -
…/doctype/website_settings/website_settings.py | 41 ±
website/js/website.js | 35 ±
website/sitemap.py | 27 -
website/templates/base.html | 4 ±
website/templates/includes/comment.html | 9 +
website/templates/includes/comments.html | 86 +
website/templates/includes/comments.py | 58 +
website/templates/includes/footer.html | 2 ±
website/templates/includes/login.js | 36 ±
website/templates/includes/navbar.html | 4 ±
website/templates/pages/login.html | 65 ±
website/templates/pages/message.html | 6 ±
website/templates/pages/print.py | 6 ±
website/templates/pages/rss.py | 38 +
website/templates/pages/rss.xml | 18 +
website/templates/pages/sitemap.py | 22 +
website/templates/pages/sitemap.xml | 5 +
website/templates/pages/update-password.html | 4 +
website/templates/pages/update_password.py | 6 +
wnf.py | 1155 ++++++±-----
223 files changed, 7309 insertions(+), 5024 deletions(-)
rename core/page/todo/todo.html => init.py (100%)
delete mode 100644 core/doctype/custom_script/custom_script.js
delete mode 100644 core/page/update_manager/README.md
delete mode 100644 core/page/update_manager/init.py
delete mode 100644 core/page/update_manager/update_manager.js
delete mode 100644 core/page/update_manager/update_manager.py
delete mode 100644 core/page/update_manager/update_manager.txt
mode change 100755 => 100644 public/css/bootstrap.css
create mode 100644 public/css/typeahead.css
delete mode 100755 public/html/rss.xml
delete mode 100755 public/html/server.py
delete mode 100755 public/html/sitemap.xml
delete mode 100644 public/html/unsupported.html
delete mode 100755 public/html/web.py
delete mode 100644 public/js/lib/bootstrap-wysiwyg.js
rename public/js/lib/slickgrid/{jquery.event.drag.min.js =>
jquery.event.drag.js} (99%)
mode change 100644 => 100755
create mode 100644 public/js/lib/typeahead.js
create mode 100644 public/js/wn/ui/editor.js
create mode 100644 public/js/wn/website/editable.js
create mode 100644 webnotes/app.py
create mode 100644 webnotes/middlewares.py
create mode 100644 webnotes/plugins.py
delete mode 100644 website/doctype/blog_post/blog_feed.py
rename public/html/blank.html =>
website/doctype/blog_post/templates/includes/init.py (100%)
delete mode 100644
website/doctype/blog_post/templates/includes/blog_post.css
delete mode 100644
website/doctype/blog_post/templates/includes/blog_post.js
delete mode 100644
website/doctype/blog_post/templates/includes/comment.html
create mode 100644 website/doctype/style_settings/templates/init.py
create mode 100644
website/doctype/style_settings/templates/pages/init.py
rename website/doctype/style_settings/{custom_template.css =>
templates/pages/wn-web.css} (98%)
create mode 100644 website/doctype/style_settings/templates/pages/wn_web.py
create mode 100644 website/doctype/website_script/templates/init.py
create mode 100644
website/doctype/website_script/templates/pages/init.py
create mode 100644 website/doctype/website_script/templates/pages/wn-web.js
create mode 100644 website/doctype/website_script/templates/pages/wn_web.py
delete mode 100644
website/doctype/website_settings/make_web_include_files.py
delete mode 100644 website/sitemap.py
create mode 100644 website/templates/includes/init.py
create mode 100644 website/templates/includes/comment.html
create mode 100644 website/templates/includes/comments.html
create mode 100644 website/templates/includes/comments.py
create mode 100644 website/templates/pages/rss.py
create mode 100644 website/templates/pages/rss.xml
create mode 100644 website/templates/pages/sitemap.py
create mode 100644 website/templates/pages/sitemap.xml
create mode 100644 website/templates/pages/update_password.py
Updating 865e62d…91db9dc
Fast-forward
accounts/doctype/account/account.js | 55 +±
accounts/doctype/account/account.py | 83 +±-
accounts/doctype/account/account.txt | 39 ±
accounts/doctype/account/test_account.py | 50 ±
…/doctype/accounts_settings/accounts_settings.py | 22 ±
…/accounts_settings/accounts_settings.txt | 19 ±
…/bank_reconciliation/bank_reconciliation.py | 5 ±
…/bank_reconciliation_detail.txt | 3 ±
accounts/doctype/budget_control/README.md | 1 -
accounts/doctype/budget_control/budget_control.py | 97 ----
accounts/doctype/budget_control/budget_control.txt | 19 -
accounts/doctype/budget_detail/budget_detail.txt | 20 ±
…/test_budget_distribution.py | 68 +±
accounts/doctype/c_form/c_form.txt | 4 ±
…/c_form_invoice_detail.txt | 3 ±
accounts/doctype/cost_center/cost_center.js | 12 ±
accounts/doctype/cost_center/cost_center.py | 3 ±
accounts/doctype/cost_center/test_cost_center.py | 9 ±
accounts/doctype/fiscal_year/fiscal_year.js | 4 ±
accounts/doctype/gl_entry/gl_entry.py | 192 +++±—
accounts/doctype/gl_entry/gl_entry.txt | 15 ±
…/doctype/journal_voucher/journal_voucher.js | 75 +±
…/doctype/journal_voucher/journal_voucher.py | 42 ±
…/doctype/journal_voucher/journal_voucher.txt | 8 ±
…/journal_voucher/test_journal_voucher.py | 96 ++++
accounts/doctype/mis_control/mis_control.py | 13 ±
…/payment_to_invoice_matching_tool.js | 6 ±
…/payment_to_invoice_matching_tool.py | 8 ±
…/period_closing_voucher.py | 224 ++±-----
…/test_period_closing_voucher.py | 56 +++
accounts/doctype/pos_setting/pos_setting.py | 4 ±
accounts/doctype/pos_setting/pos_setting.txt | 19 ±
accounts/doctype/pos_setting/test_pos_setting.py | 1 -
…/doctype/purchase_invoice/purchase_invoice.js | 7 ±
…/doctype/purchase_invoice/purchase_invoice.py | 158 +++±–
…/doctype/purchase_invoice/purchase_invoice.txt | 19 ±
…/purchase_invoice/test_purchase_invoice.py | 22 ±
…/purchase_invoice_item.txt | 3 ±
…/purchase_taxes_and_charges_master.js | 38 ±
…/purchase_taxes_and_charges_master.py | 8 ±
accounts/doctype/sales_invoice/pos.js | 260 +++++±—
accounts/doctype/sales_invoice/pos.py | 40 ±
accounts/doctype/sales_invoice/sales_invoice.css | 15 -
accounts/doctype/sales_invoice/sales_invoice.js | 129 +±–
accounts/doctype/sales_invoice/sales_invoice.py | 119 +±–
accounts/doctype/sales_invoice/sales_invoice.txt | 27 ±
…/doctype/sales_invoice/test_sales_invoice.py | 80 +±-
…/sales_invoice_item/sales_invoice_item.txt | 14 ±
…/sales_taxes_and_charges_master.js | 34 ±
…/sales_taxes_and_charges_master.py | 6 ±
…/sales_taxes_and_charges_master.txt | 4 ±
…/test_sales_taxes_and_charges_master.py | 6 ±
accounts/doctype/shipping_rule/shipping_rule.js | 2 ±
accounts/doctype/shipping_rule/shipping_rule.txt | 4 ±
…/doctype/shipping_rule/test_shipping_rule.py | 2 ±
accounts/general_ledger.py | 151 ++±–
accounts/page/accounts_browser/accounts_browser.js | 90 +±-
accounts/page/accounts_browser/accounts_browser.py | 2 ±
accounts/page/accounts_home/accounts_home.js | 10 ±
…/financial_analytics/financial_analytics.js | 26 ±
…/financial_statements/financial_statements.js | 10 ±
accounts/page/general_ledger/general_ledger.js | 46 ±
accounts/page/trial_balance/trial_balance.js | 6 ±
…/voucher_import_tool/voucher_import_tool.js | 45 ±
…/voucher_import_tool/voucher_import_tool.py | 14 ±
…/report/accounts_payable/accounts_payable.js | 8 ±
…/report/accounts_payable/accounts_payable.py | 4 ±
…/accounts_receivable/accounts_receivable.js | 8 ±
…/accounts_receivable/accounts_receivable.py | 276 ++++±-----
…/bank_clearance_summary.js | 6 ±
…/bank_reconciliation_statement.js | 4 ±
…/budget_variance_report.js | 6 ±
…/budget_variance_report.py | 2 ±
accounts/report/gross_profit/gross_profit.js | 6 ±
accounts/report/gross_profit/gross_profit.py | 7 ±
…/item_wise_purchase_register.js | 10 ±
…/item_wise_purchase_register.py | 4 ±
…/item_wise_sales_register.js | 8 ±
…/item_wise_sales_register.py | 14 ±
…/payment_collection_with_ageing.js | 8 ±
…/payment_made_with_ageing.js | 8 ±
…/report/purchase_register/purchase_register.js | 8 ±
accounts/report/sales_register/sales_register.js | 8 ±
accounts/utils.py | 180 ++±—
buying/doctype/buying_settings/buying_settings.py | 5 ±
buying/doctype/purchase_common/purchase_common.js | 17 ±
buying/doctype/purchase_common/purchase_common.py | 60 ±-
buying/doctype/purchase_order/purchase_order.js | 19 ±
buying/doctype/purchase_order/purchase_order.py | 26 ±
buying/doctype/purchase_order/purchase_order.txt | 48 ±
…/doctype/purchase_order/test_purchase_order.py | 55 +±
…/purchase_order_item/purchase_order_item.txt | 18 ±
…/quality_inspection/quality_inspection.txt | 4 ±
buying/doctype/supplier/supplier.js | 9 ±
buying/doctype/supplier/supplier.py | 21 ±
buying/doctype/supplier/supplier.txt | 78 +±
…/supplier_quotation/supplier_quotation.js | 3 ±
…/supplier_quotation/supplier_quotation.py | 4 -
…/supplier_quotation/supplier_quotation.txt | 13 ±
…/supplier_quotation_item.txt | 18 ±
buying/page/buying_home/buying_home.js | 14 ±
…/page/purchase_analytics/purchase_analytics.js | 36 ±
…/supplier_addresses_and_contacts}/init.py | 0
…/supplier_addresses_and_contacts.txt | 22 +
buying/utils.py | 9 ±
controllers/accounts_controller.py | 94 +±-
controllers/buying_controller.py | 29 ±
controllers/queries.py | 59 +±
controllers/selling_controller.py | 195 ++++±–
controllers/status_updater.py | 84 ++++
controllers/stock_controller.py | 253 +++++++±-
docs/docs.user.stock.accounting_for_stock.md | 42 ++
docs/docs.user.stock.perpetual_inventory.md | 313 ++++++++++++
docs/user/accounts/docs.user.accounts.md | 3 +
…/accounts/docs.user.accounts.opening_entry.md | 10 +
…/accounts/docs.user.accounts.opening_stock.md | 44 ++
docs/user/accounts/docs.user.accounts.pos.md | 19 ±
…/docs.user.accounts.purchase_invoice.md | 2 ±
docs/user/buying/docs.user.buying.supplier.md | 8 +
docs/user/buying/docs.user.buying.supplier_type.md | 6 ±
…/docs.user.customer_portal.login.md | 8 +
…/customer_portal/docs.user.customer_portal.md | 16 +
…/docs.user.customer_portal.orders.md | 30 ++
…/docs.user.customer_portal.sign_up.md | 25 +
…/docs.user.customer_portal.tickets.md | 28 ++
…/customize/docs.user.customize.custom_field.md | 8 ±
…/customize/docs.user.customize.custom_form.md | 19 ±
…/docs.user.customize.custom_scripts.md | 6 +
…/customize/docs.user.customize.hide_unhide.md | 10 ±
…/customize/docs.user.customize.print_format.md | 11 ±
docs/user/docs.user.md | 39 ±
…/docs.user.five_day_setup.day_1.md | 81 ++++
…/docs.user.five_day_setup.day_2.md | 54 +++
…/docs.user.five_day_setup.day_3.md | 139 ++++++
…/docs.user.five_day_setup.day_4.md | 86 ++++
…/docs.user.five_day_setup.day_5.md | 32 ++
…/five_day_setup/docs.user.five_day_setup.md | 48 ++
docs/user/hr/docs.user.hr.payroll.md | 2 ±
docs/user/intro/docs.user.implement.concepts.md | 26 ±
docs/user/intro/docs.user.implement.md | 5 +
docs/user/intro/docs.user.implement.strategy.md | 5 ±
…/knowledge/docs.user.knowledge.accounting.md | 110 +++++
…/docs.user.knowledge.accounting_entries.md | 38 ++
…/docs.user.knowledge.attachment_csv.md | 16 +
docs/user/knowledge/docs.user.knowledge.doctype.md | 73 +++
…/docs.user.knowledge.doctype_fields.md | 201 ++++++++
…/knowledge/docs.user.knowledge.fiscal_year.md | 10 +
…/user/knowledge/docs.user.knowledge.markdown.md | 84 ++++
docs/user/knowledge/docs.user.knowledge.md | 16 +
docs/user/mfg/docs.user.mfg.bom.md | 14 ±
docs/user/mfg/docs.user.mfg.md | 14 ±
docs/user/mfg/docs.user.mfg.planning.md | 49 ±
docs/user/mfg/docs.user.mfg.production_order.md | 17 ±
docs/user/selling/docs.user.selling.customer.md | 4 ±
docs/user/selling/docs.user.selling.md | 8 +
docs/user/selling/docs.user.selling.quotation.md | 22 ±
docs/user/selling/docs.user.selling.sales_order.md | 4 ±
…/selling/docs.user.selling.shopping_cart.md | 41 ++
docs/user/setup/docs.user.setup.cost_centers.md | 15 +
docs/user/setup/docs.user.setup.data_import.md | 6 ±
docs/user/setup/docs.user.setup.first.md | 2 ±
docs/user/setup/docs.user.setup.md | 3 ±
docs/user/setup/docs.user.setup.opening.md | 43 ±
docs/user/setup/docs.user.setup.permissions.md | 37 ±
docs/user/setup/docs.user.setup.pos_setting.md | 3 ±
docs/user/setup/docs.user.setup.price_list.md | 13 ±
docs/user/setup/docs.user.setup.taxes.md | 28 ±
docs/user/setup/docs.user.setup.users.md | 2 ±
docs/user/stock/docs.user.stock.item.md | 48 ±
docs/user/stock/docs.user.stock.md | 7 ±
…md => docs.user.stock.migrate_to_perpetual.md} | 4 ±
…/docs.user.stock.product_listing_on_website.md | 61 +++
docs/user/stock/docs.user.stock.sales_return.md | 33 ±
docs/user/stock/docs.user.stock.warehouse.md | 7 ±
…/support/docs.user.support.customer_issue.md | 7 ±
…/docs.user.support.maintenance_schedule.md | 20 +
…/support/docs.user.support.maintenance_visit.md | 4 +
docs/user/support/docs.user.support.md | 7 ±
docs/user/support/docs.user.support.newsletter.md | 14 +
…/support/docs.user.support.support_ticket.md | 17 ±
docs/user/tools/docs.user.tools.assignment.md | 22 +
docs/user/tools/docs.user.tools.form_tools.md | 13 ±
docs/user/tools/docs.user.tools.md | 5 ±
docs/user/tools/docs.user.tools.notes.md | 19 ±
docs/user/tools/docs.user.tools.tags.md | 10 +
docs/user/tools/docs.user.tools.todo.md | 17 ±
…/docs.user.website.add_products_to_website.md | 60 +++
docs/user/website/docs.user.website.blog.md | 13 ±
docs/user/website/docs.user.website.md | 9 ±
docs/user/website/docs.user.website.setup.md | 33 ±
docs/user/website/docs.user.website.web_page.md | 4 +
home/doctype/feed/feed.py | 1 -
home/page/activity/activity.js | 4 ±
home/page/latest_updates/latest_updates.js | 8 ±
home/page/latest_updates/latest_updates.py | 3 ±
hr/doctype/appraisal/appraisal.js | 2 ±
hr/doctype/attendance/attendance.py | 7 ±
hr/doctype/attendance/attendance.txt | 4 ±
hr/doctype/employee/employee.js | 5 ±
hr/doctype/employee/employee.py | 16 ±
hr/doctype/employee/employee.txt | 24 ±
hr/doctype/expense_claim/expense_claim.js | 40 ±
hr/doctype/expense_claim/expense_claim.txt | 5 ±
hr/doctype/holiday_list/holiday_list.py | 1 -
hr/doctype/hr_settings/hr_settings.py | 26 ±
hr/doctype/hr_settings/hr_settings.txt | 21 ±
hr/doctype/job_applicant/get_job_applications.py | 2 ±
hr/doctype/job_applicant/job_applicant.js | 5 ±
hr/doctype/job_applicant/job_applicant.py | 15 ±
hr/doctype/leave_allocation/leave_allocation.py | 11 ±
hr/doctype/leave_application/leave_application.js | 17 ±
…/leave_application/test_leave_application.py | 9 ±
…/leave_block_list/test_leave_block_list.py | 3 +
…/leave_control_panel/leave_control_panel.js | 2 ±
…/leave_control_panel/leave_control_panel.py | 3 ±
hr/doctype/salary_manager/salary_manager.js | 6 ±
hr/doctype/salary_manager/salary_manager.py | 13 ±
hr/doctype/salary_manager/test_salary_manager.py | 14 ±
hr/doctype/salary_slip/salary_slip.py | 15 ±
hr/doctype/salary_structure/salary_structure.js | 2 ±
hr/doctype/salary_structure/salary_structure.py | 9 ±
hr/doctype/upload_attendance/upload_attendance.js | 6 ±
hr/doctype/upload_attendance/upload_attendance.py | 10 ±
hr/report/employee_birthday/employee_birthday.js | 4 ±
…/employee_leave_balance.js | 4 ±
…/monthly_attendance_sheet.js | 8 ±
…/monthly_salary_register.js | 8 ±
install_erpnext.py | 227 +++±----
manufacturing/doctype/bom/bom.js | 4 ±
manufacturing/doctype/bom/bom.py | 76 +±
manufacturing/doctype/bom/bom.txt | 3 ±
manufacturing/doctype/bom/test_bom.py | 85 ++±
…/doctype/production_order/production_order.js | 16 ±
…/doctype/production_order/production_order.py | 55 +±
…/doctype/production_order/production_order.txt | 5 ±
…/production_order/test_production_order.py | 75 +++
…/production_planning_tool.js | 2 ±
…/production_planning_tool.py | 30 ±
manufacturing/doctype/workstation/workstation.py | 5 ±
manufacturing/doctype/workstation/workstation.txt | 22 ±
…/1311}/init.py | 0
patches/1311/p01_cleanup.py | 18 +
patches/april_2013/p05_update_file_data.py | 2 ±
patches/april_2013/p06_update_file_size.py | 4 ±
…/p01_auto_accounting_for_stock_patch.py | 6 +
patches/august_2013/p02_rename_price_list.py | 1 +
patches/august_2013/p06_deprecate_is_cancelled.py | 11 +
…/august_2013/p06_fix_sle_against_stock_entry.py | 18 ±
patches/december_2012/repost_ordered_qty.py | 19 ±
patches/february_2013/repost_reserved_qty.py | 56 ±-
…/june_2013/p03_buying_selling_for_price_list.py | 4 ±
…/p07_taxes_price_list_for_territory.py | 8 ±
patches/june_2013/p08_shopping_cart_settings.py | 2 ±
patches/june_2013/p09_update_global_defaults.py | 1 -
patches/march_2013/p03_update_buying_amount.py | 33 –
…/p06_remove_sales_purchase_return_tool.py | 6 ±
patches/march_2013/p08_create_aii_accounts.py | 33 ±
patches/may_2013/p01_conversion_factor_and_aii.py | 29 –
patches/may_2013/p03_update_support_ticket.py | 2 ±
…/may_2013/p05_update_cancelled_gl_entries.py | 3 ±
…/update_delivered_billed_percentage_for_pos.py | 7 ±
patches/october_2012/fix_cancelled_gl_entries.py | 1 +
patches/october_2013/fix_is_cancelled_in_sle.py | 13 +
patches/october_2013/p01_fix_serial_no_status.py | 21 +
…/p01_update_delivery_note_prevdocs.py | 13 +
…/october_2013/p02_set_communication_status.py | 11 +
…te_price_list_and_item_details_in_item_price.py | 20 +
patches/october_2013/p03_crm_update_status.py | 47 ++
…/p03_remove_sales_and_purchase_return_tool.py | 8 +
…/october_2013/p04_update_report_permission.py | 9 +
patches/october_2013/p04_wsgi_migration.py | 33 ++
…p05_delete_gl_entries_for_cancelled_vouchers.py | 16 +
…/p05_server_custom_script_to_file.py | 40 ++
…/p06_rename_packing_list_doctype.py | 21 +
…p06_update_control_panel_and_global_defaults.py | 21 +
patches/october_2013/p07_rename_for_territory.py | 24 +
…/p08_cleanup_after_item_price_module_change.py | 14 +
…/p09_update_naming_series_settings.py | 10 +
patches/october_2013/p10_plugins_refactor.py | 24 +
…/perpetual_inventory_stock_transfer_utility.py | 86 ++++
patches/october_2013/repost_ordered_qty.py | 6 +
patches/october_2013/repost_planned_qty.py | 11 +
…/october_2013/set_stock_value_diff_in_sle.py | 9 ±
patches/patch_list.py | 40 ±
…/p03_modify_item_price_include_in_price_list.py | 4 ±
…/september_2013/p04_unsubmit_serial_nos.py | 6 ±
patches/september_2013/p05_fix_customer_in_pos.py | 22 +
portal/templates/includes/cart.js | 17 ±
portal/templates/pages/cart.py | 3 ±
portal/templates/pages/profile.py | 3 ±
projects/doctype/project/project.js | 4 ±
projects/doctype/project/project.txt | 22 ±
projects/doctype/task/task.py | 5 ±
projects/doctype/task/task.txt | 3 ±
projects/doctype/task/task_calendar.js | 4 ±
projects/doctype/time_log/time_log.js | 4 ±
projects/doctype/time_log/time_log.txt | 4 ±
…/doctype/time_log_batch/test_time_log_batch.py | 26 ±
projects/doctype/time_log_batch/time_log_batch.js | 2 ±
projects/doctype/time_log_batch/time_log_batch.txt | 4 ±
…/daily_time_log_summary.js | 4 ±
public/js/account_tree_grid.js | 34 ±
public/js/complete_setup.js | 126 -----
public/js/conf.js | 10 ±
public/js/controllers/accounts.js | 18 +
public/js/controllers/stock_controller.js | 18 ±
public/js/feature_setup.js | 2 ±
public/js/purchase_trends_filters.js | 10 ±
public/js/sales_trends_filters.js | 10 ±
public/js/startup.css | 16 +
public/js/startup.js | 33 ±
public/js/stock_analytics.js | 30 ±
public/js/stock_grid_report.js | 9 ±
public/js/transaction.js | 169 ++++±-
public/js/utils.js | 18 ±
selling/doctype/customer/customer.js | 14 ±
selling/doctype/customer/customer.py | 13 ±
selling/doctype/customer/customer.txt | 93 +±-
selling/doctype/customer/test_customer.py | 5 +
…/customer_discount/customer_discount.txt | 5 ±
…/doctype/installation_note/installation_note.py | 7 ±
…/installation_note/installation_note.txt | 6 ±
…/installation_note_item.txt | 14 ±
selling/doctype/lead/get_leads.py | 2 ±
selling/doctype/lead/lead.js | 24 ±
selling/doctype/lead/lead.py | 34 ±
selling/doctype/lead/lead.txt | 52 ±
selling/doctype/opportunity/opportunity.js | 47 ±
selling/doctype/opportunity/opportunity.py | 65 ±-
selling/doctype/opportunity/opportunity.txt | 146 ++±–
…/doctype/opportunity_item/opportunity_item.txt | 3 ±
selling/doctype/quotation/quotation.js | 37 ±
selling/doctype/quotation/quotation.py | 144 ±----
selling/doctype/quotation/quotation.txt | 36 ±
selling/doctype/quotation/test_quotation.py | 10 ±
selling/doctype/quotation_item/quotation_item.txt | 3 ±
selling/doctype/sales_bom/sales_bom.js | 6 ±
selling/doctype/sales_common/README.md | 1 -
selling/doctype/sales_common/sales_common.py | 363 --------------
selling/doctype/sales_common/sales_common.txt | 19 -
selling/doctype/sales_order/sales_order.js | 29 ±
selling/doctype/sales_order/sales_order.py | 109 +±–
selling/doctype/sales_order/sales_order.txt | 42 ±
selling/doctype/sales_order/test_sales_order.py | 12 ±
…/doctype/sales_order_item/sales_order_item.txt | 4 ±
…/doctype/selling_settings/selling_settings.py | 4 +
…/doctype/selling_settings/selling_settings.txt | 6 ±
…/shopping_cart_settings.py | 2 ±
…/shopping_cart_settings.txt | 4 ±
selling/doctype/sms_center/sms_center.py | 11 ±
selling/page/sales_analytics/sales_analytics.js | 34 ±
selling/page/sales_browser/sales_browser.js | 19 ±
selling/page/sales_funnel/sales_funnel.css | 3 +
selling/page/sales_funnel/sales_funnel.js | 189 ++++++++
selling/page/sales_funnel/sales_funnel.py | 33 ++
selling/page/sales_funnel/sales_funnel.txt | 33 ++
selling/page/selling_home/selling_home.js | 18 ±
…/customers_not_buying_since_long_time.js | 2 ±
selling/report/lead_details/lead_details.txt | 22 +
…sales_person_target_variance_item_group_wise.js | 6 ±
…/sales_person_wise_transaction_summary.js | 18 ±
…/territory_target_variance_item_group_wise.js | 6 ±
selling/{doctype/sales_common => }/sales_common.js | 55 ±-
selling/utils/init.py | 28 ±
selling/utils/cart.py | 8 ±
selling/utils/product.py | 5 ±
…/applicable_territory.py} | 0
…/applicable_territory.txt} | 7 ±
…/authorization_control/authorization_control.py | 31 ±
…/authorization_rule/authorization_rule.py | 9 ±
setup/doctype/backup_manager/backup_dropbox.py | 5 ±
setup/doctype/backup_manager/backup_googledrive.py | 7 ±
…/doctype/company/charts/import_from_openerp.py | 2 +
setup/doctype/company/company.js | 68 +±
setup/doctype/company/company.py | 52 ±
setup/doctype/company/company.txt | 35 ±
setup/doctype/contact_control/contact_control.js | 2 ±
setup/doctype/customer_group/customer_group.js | 2 ±
setup/doctype/customer_group/customer_group.py | 7 ±
setup/doctype/customer_group/customer_group.txt | 5 ±
setup/doctype/email_digest/email_digest.js | 14 ±
setup/doctype/email_digest/email_digest.py | 8 ±
setup/doctype/email_settings/email_settings.py | 1 -
setup/doctype/features_setup/features_setup.txt | 3 ±
setup/doctype/global_defaults/global_defaults.js | 50 ±
setup/doctype/global_defaults/global_defaults.py | 13 ±
setup/doctype/global_defaults/global_defaults.txt | 16 ±
setup/doctype/item_group/item_group.js | 10 ±
setup/doctype/item_group/item_group.txt | 4 ±
…/templates/generators/item_group.html | 10 ±
setup/doctype/item_price/init.py | 1 -
setup/doctype/item_price/item_price.txt | 53 —
setup/doctype/naming_series/naming_series.py | 38 ±
…/notification_control/notification_control.py | 3 ±
setup/doctype/price_list/init.py | 1 -
setup/doctype/price_list/price_list.js | 8 -
setup/doctype/print_heading/print_heading.py | 1 -
setup/doctype/sales_partner/sales_partner.js | 4 ±
setup/doctype/sales_partner/sales_partner.py | 7 ±
setup/doctype/sales_partner/sales_partner.txt | 3 ±
setup/doctype/sales_person/sales_person.js | 2 ±
setup/doctype/setup_control/README.md | 1 -
setup/doctype/setup_control/init.py | 1 -
setup/doctype/setup_control/setup_control.py | 254 ----------
setup/doctype/setup_control/setup_control.txt | 24 -
setup/doctype/supplier_type/supplier_type.js | 2 ±
setup/doctype/target_detail/target_detail.txt | 3 ±
setup/doctype/territory/territory.js | 2 ±
setup/doctype/territory/territory.txt | 4 ±
setup/doctype/uom/uom.txt | 18 ±
…/website_item_group/website_item_group.txt | 3 ±
setup/page/setup/setup.js | 16 ±
setup/page/setup/setup.py | 3 ±
setup/page/setup_wizard/setup_wizard.css | 12 +
setup/page/setup_wizard/setup_wizard.js | 498
++++++++++++++++++++
setup/page/setup_wizard/setup_wizard.py | 354 ++++++++++++++
setup/page/setup_wizard/setup_wizard.txt | 32 ++
setup/page/setup_wizard/test_setup_data.py | 53 +++
setup/page/setup_wizard/test_setup_wizard.py | 14 +
…/item_wise_price_list_rate.txt | 22 +
startup/init.py | 4 ±
startup/boot.py | 6 ±
startup/event_handlers.py | 11 ±
startup/install.py | 5 ±
startup/report_data_map.py | 2 -
stock/doctype/bin/bin.py | 6 ±
stock/doctype/delivery_note/delivery_note.js | 34 ±
stock/doctype/delivery_note/delivery_note.py | 244 ++±------
stock/doctype/delivery_note/delivery_note.txt | 31 ±
stock/doctype/delivery_note/test_delivery_note.py | 151 +++±-
…/delivery_note_item/delivery_note_item.txt | 50 ±
stock/doctype/delivery_note_packing_item/README.md | 1 -
…/doctype/delivery_note_packing_item/init.py | 1 -
stock/doctype/item/item.js | 36 ±
stock/doctype/item/item.py | 9 ±
stock/doctype/item/item.txt | 6 ±
stock/doctype/item/templates/generators/item.html | 8 +
…/item/templates/includes/product_list.js | 2 ±
stock/doctype/item/test_item.py | 67 +±
{setup => stock}/doctype/item_price/README.md | 0
…/doctype/item_price}/init.py | 0
stock/doctype/item_price/item_price.js | 16 +
stock/doctype/item_price/item_price.py | 39 ++
stock/doctype/item_price/item_price.txt | 127 +++++
stock/doctype/item_price/test_item_price.py | 23 +
…/doctype/landed_cost_item/landed_cost_item.txt | 13 ±
…/landed_cost_purchase_receipt.txt | 32 ±
…/landed_cost_wizard/landed_cost_wizard.js | 54 +±
…/landed_cost_wizard/landed_cost_wizard.py | 261 ++±------
…/landed_cost_wizard/landed_cost_wizard.txt | 47 ±
stock/doctype/material_request/material_request.js | 71 +±
stock/doctype/material_request/material_request.py | 41 ±
…/doctype/material_request/material_request.txt | 87 +±-
…/material_request/test_material_request.py | 6 ±
…/material_request_item.txt | 39 ±
stock/doctype/packed_item/packed_item.py | 105 +++++
…/packed_item.txt} | 6 ±
stock/doctype/packing_slip/packing_slip.js | 16 ±
stock/doctype/packing_slip/packing_slip.txt | 4 ±
{setup => stock}/doctype/price_list/README.md | 0
…/doctype/price_list}/init.py | 0
stock/doctype/price_list/price_list.css | 7 +
stock/doctype/price_list/price_list.js | 17 +
{setup => stock}/doctype/price_list/price_list.py | 20 ±
{setup => stock}/doctype/price_list/price_list.txt | 20 ±
…/doctype/price_list/test_price_list.py | 25 ±
stock/doctype/purchase_receipt/purchase_receipt.js | 9 ±
stock/doctype/purchase_receipt/purchase_receipt.py | 299 ++++±------
…/doctype/purchase_receipt/purchase_receipt.txt | 15 ±
…/purchase_receipt/test_purchase_receipt.py | 102 +±-
…/purchase_receipt_item.txt | 20 ±
stock/doctype/serial_no/serial_no.py | 253 ++++++++±
stock/doctype/serial_no/serial_no.txt | 23 ±
stock/doctype/serial_no/test_serial_no.py | 2 ±
stock/doctype/stock_entry/stock_entry.js | 104 +±-
stock/doctype/stock_entry/stock_entry.py | 319 ++++±-------
stock/doctype/stock_entry/stock_entry.txt | 18 ±
stock/doctype/stock_entry/test_stock_entry.py | 300 +++++++±—
…/stock_entry_detail/stock_entry_detail.txt | 78 +±
stock/doctype/stock_ledger/README.md | 1 -
stock/doctype/stock_ledger/init.py | 1 -
stock/doctype/stock_ledger/stock_ledger.py | 1 -
stock/doctype/stock_ledger/stock_ledger.txt | 22 -
…/stock_ledger_entry/stock_ledger_entry.py | 165 +±----
…/stock_ledger_entry/stock_ledger_entry.txt | 22 ±
…/stock_reconciliation/stock_reconciliation.js | 41 ±
…/stock_reconciliation/stock_reconciliation.py | 77 +±
…/stock_reconciliation/stock_reconciliation.txt | 22 ±
…/test_stock_reconciliation.py | 197 +++±—
stock/doctype/stock_settings/stock_settings.py | 6 +
stock/doctype/stock_settings/stock_settings.txt | 4 ±
…/stock_uom_replace_utility.py | 13 ±
stock/doctype/warehouse/test_warehouse.py | 7 ±
stock/doctype/warehouse/warehouse.js | 18 ±
stock/doctype/warehouse/warehouse.py | 207 ++±----
stock/doctype/warehouse/warehouse.txt | 64 +±
stock/page/stock_ageing/stock_ageing.js | 30 ±
stock/page/stock_analytics/stock_analytics.js | 2 ±
stock/page/stock_balance/stock_balance.js | 53 +±
stock/page/stock_home/stock_home.js | 15 ±
stock/page/stock_ledger/stock_ledger.js | 42 ±
stock/page/stock_level/stock_level.js | 56 ±-
…/batch_wise_balance_history.js | 4 ±
…/batch_wise_balance_history.py | 2 ±
stock/report/item_prices/item_prices.py | 7 ±
…/item_wise_price_list/item_wise_price_list.txt | 22 -
…/itemwise_recommended_reorder_level.js | 4 ±
stock/report/stock_ledger/stock_ledger.txt | 4 ±
…/warehouse_wise_stock_balance.js | 4 ±
…/warehouse_wise_stock_balance.py | 2 ±
stock/stock_ledger.py | 84 ++±
stock/utils.py | 81 ++±
support/doctype/customer_issue/customer_issue.js | 2 ±
support/doctype/customer_issue/customer_issue.py | 3 ±
support/doctype/customer_issue/customer_issue.txt | 6 ±
…/maintenance_schedule/maintenance_schedule.js | 4 ±
…/maintenance_schedule/maintenance_schedule.py | 17 ±
…/maintenance_schedule/maintenance_schedule.txt | 4 ±
…/doctype/maintenance_visit/maintenance_visit.py | 11 ±
…/maintenance_visit/maintenance_visit.txt | 4 ±
support/doctype/newsletter/newsletter.js | 2 ±
support/doctype/newsletter/newsletter.py | 33 ±
support/doctype/newsletter/newsletter.txt | 4 ±
support/doctype/newsletter/test_newsletter.py | 9 ±
…/doctype/support_ticket/get_support_mails.py | 4 ±
support/doctype/support_ticket/support_ticket.css | 15 -
support/doctype/support_ticket/support_ticket.js | 9 ±
support/doctype/support_ticket/support_ticket.py | 13 ±
support/doctype/support_ticket/support_ticket.txt | 36 ±
…/page/support_analytics/support_analytics.js | 22 ±
…/maintenance_schedules.txt | 4 ±
translations/ar.csv | 2 ±
translations/de.csv | 2 ±
translations/el.csv | 2 ±
translations/es.csv | 2 ±
translations/fr.csv | 2 ±
translations/hi.csv | 2 ±
translations/hr.csv | 2 ±
translations/it.csv | 2 ±
translations/nl.csv | 2 ±
translations/pt-BR.csv | 2 ±
translations/pt.csv | 2 ±
translations/sr.csv | 2 ±
translations/ta.csv | 2 ±
translations/th.csv | 2 ±
utilities/demo/demo_control_panel.py | 27 ±
utilities/demo/demo_docs/Item_Price.csv | 49 ++
utilities/demo/demo_docs/Lead.csv | 136 ++±–
utilities/demo/demo_docs/Price_List.csv | 49 –
utilities/demo/demo_docs/Profile.csv | 80 +±-
utilities/demo/make_demo.py | 48 ±
utilities/demo/make_erpnext_demo.py | 33 ±
utilities/doctype/contact/contact.py | 24 ±
utilities/doctype/contact/contact.txt | 9 ±
utilities/doctype/sms_control/sms_control.py | 6 ±
utilities/repost_stock.py | 125 +++++
utilities/transaction_base.py | 12 ±
557 files changed, 11142 insertions(+), 7118 deletions(-)
delete mode 100644 accounts/doctype/budget_control/README.md
delete mode 100644 accounts/doctype/budget_control/budget_control.py
delete mode 100644 accounts/doctype/budget_control/budget_control.txt
create mode 100644
accounts/doctype/period_closing_voucher/test_period_closing_voucher.py
delete mode 100644 accounts/doctype/sales_invoice/sales_invoice.css
rename {setup/doctype/for_territory =>
buying/report/supplier_addresses_and_contacts}/init.py (100%)
create mode 100644
buying/report/supplier_addresses_and_contacts/supplier_addresses_and_contacts.txt
create mode 100644 docs/docs.user.stock.accounting_for_stock.md
create mode 100644 docs/docs.user.stock.perpetual_inventory.md
create mode 100644 docs/user/accounts/docs.user.accounts.opening_entry.md
create mode 100644 docs/user/accounts/docs.user.accounts.opening_stock.md
create mode 100644
docs/user/customer_portal/docs.user.customer_portal.login.md
create mode 100644 docs/user/customer_portal/docs.user.customer_portal.md
create mode 100644
docs/user/customer_portal/docs.user.customer_portal.orders.md
create mode 100644
docs/user/customer_portal/docs.user.customer_portal.sign_up.md
create mode 100644
docs/user/customer_portal/docs.user.customer_portal.tickets.md
create mode 100644
docs/user/five_day_setup/docs.user.five_day_setup.day_1.md
create mode 100644
docs/user/five_day_setup/docs.user.five_day_setup.day_2.md
create mode 100644
docs/user/five_day_setup/docs.user.five_day_setup.day_3.md
create mode 100644
docs/user/five_day_setup/docs.user.five_day_setup.day_4.md
create mode 100644
docs/user/five_day_setup/docs.user.five_day_setup.day_5.md
create mode 100644 docs/user/five_day_setup/docs.user.five_day_setup.md
create mode 100644 docs/user/knowledge/docs.user.knowledge.accounting.md
create mode 100644
docs/user/knowledge/docs.user.knowledge.accounting_entries.md
create mode 100644
docs/user/knowledge/docs.user.knowledge.attachment_csv.md
create mode 100644 docs/user/knowledge/docs.user.knowledge.doctype.md
create mode 100644
docs/user/knowledge/docs.user.knowledge.doctype_fields.md
create mode 100644 docs/user/knowledge/docs.user.knowledge.fiscal_year.md
create mode 100644 docs/user/knowledge/docs.user.knowledge.markdown.md
create mode 100644 docs/user/knowledge/docs.user.knowledge.md
create mode 100644 docs/user/selling/docs.user.selling.shopping_cart.md
rename docs/user/stock/{docs.user.stock.periodic_to_perpetual.md =>
docs.user.stock.migrate_to_perpetual.md} (80%)
create mode 100644
docs/user/stock/docs.user.stock.product_listing_on_website.md
create mode 100644 docs/user/support/docs.user.support.newsletter.md
create mode 100644 docs/user/tools/docs.user.tools.assignment.md
create mode 100644 docs/user/tools/docs.user.tools.tags.md
create mode 100644
docs/user/website/docs.user.website.add_products_to_website.md
create mode 100644
manufacturing/doctype/production_order/test_production_order.py
rename {stock/report/item_wise_price_list => patches/1311}/init.py
(100%)
create mode 100644 patches/1311/p01_cleanup.py
create mode 100644
patches/august_2013/p01_auto_accounting_for_stock_patch.py
create mode 100644 patches/august_2013/p06_deprecate_is_cancelled.py
delete mode 100644 patches/march_2013/p03_update_buying_amount.py
delete mode 100644 patches/may_2013/p01_conversion_factor_and_aii.py
create mode 100644 patches/october_2013/init.py
create mode 100644 patches/october_2013/fix_is_cancelled_in_sle.py
create mode 100644 patches/october_2013/p01_fix_serial_no_status.py
create mode 100644
patches/october_2013/p01_update_delivery_note_prevdocs.py
create mode 100644 patches/october_2013/p02_set_communication_status.py
create mode 100644
patches/october_2013/p02_update_price_list_and_item_details_in_item_price.py
create mode 100644 patches/october_2013/p03_crm_update_status.py
create mode 100644
patches/october_2013/p03_remove_sales_and_purchase_return_tool.py
create mode 100644 patches/october_2013/p04_update_report_permission.py
create mode 100644 patches/october_2013/p04_wsgi_migration.py
create mode 100644
patches/october_2013/p05_delete_gl_entries_for_cancelled_vouchers.py
create mode 100644 patches/october_2013/p05_server_custom_script_to_file.py
create mode 100644 patches/october_2013/p06_rename_packing_list_doctype.py
create mode 100644
patches/october_2013/p06_update_control_panel_and_global_defaults.py
create mode 100644 patches/october_2013/p07_rename_for_territory.py
create mode 100644
patches/october_2013/p08_cleanup_after_item_price_module_change.py
create mode 100644
patches/october_2013/p09_update_naming_series_settings.py
create mode 100644 patches/october_2013/p10_plugins_refactor.py
create mode 100644
patches/october_2013/perpetual_inventory_stock_transfer_utility.py
create mode 100644 patches/october_2013/repost_ordered_qty.py
create mode 100644 patches/october_2013/repost_planned_qty.py
rename setup/doctype/for_territory/for_territory.py =>
patches/october_2013/set_stock_value_diff_in_sle.py (57%)
rename
stock/doctype/delivery_note_packing_item/delivery_note_packing_item.py =>
patches/september_2013/p04_unsubmit_serial_nos.py (63%)
create mode 100644 patches/september_2013/p05_fix_customer_in_pos.py
delete mode 100644 public/js/complete_setup.js
create mode 100644 public/js/controllers/accounts.js
delete mode 100644 selling/doctype/sales_common/README.md
delete mode 100644 selling/doctype/sales_common/sales_common.py
delete mode 100644 selling/doctype/sales_common/sales_common.txt
create mode 100644 selling/page/sales_funnel/init.py
create mode 100644 selling/page/sales_funnel/sales_funnel.css
create mode 100644 selling/page/sales_funnel/sales_funnel.js
create mode 100644 selling/page/sales_funnel/sales_funnel.py
create mode 100644 selling/page/sales_funnel/sales_funnel.txt
create mode 100644 selling/report/lead_details/init.py
create mode 100644 selling/report/lead_details/lead_details.txt
rename selling/{doctype/sales_common => }/sales_common.js (94%)
create mode 100644 setup/doctype/applicable_territory/init.py
rename setup/doctype/{item_price/item_price.py =>
applicable_territory/applicable_territory.py} (100%)
rename setup/doctype/{for_territory/for_territory.txt =>
applicable_territory/applicable_territory.txt} (75%)
delete mode 100644 setup/doctype/item_price/init.py
delete mode 100644 setup/doctype/item_price/item_price.txt
delete mode 100644 setup/doctype/price_list/init.py
delete mode 100644 setup/doctype/price_list/price_list.js
delete mode 100644 setup/doctype/setup_control/README.md
delete mode 100644 setup/doctype/setup_control/init.py
delete mode 100644 setup/doctype/setup_control/setup_control.py
delete mode 100644 setup/doctype/setup_control/setup_control.txt
create mode 100644 setup/page/setup_wizard/init.py
create mode 100644 setup/page/setup_wizard/setup_wizard.css
create mode 100644 setup/page/setup_wizard/setup_wizard.js
create mode 100644 setup/page/setup_wizard/setup_wizard.py
create mode 100644 setup/page/setup_wizard/setup_wizard.txt
create mode 100644 setup/page/setup_wizard/test_setup_data.py
create mode 100644 setup/page/setup_wizard/test_setup_wizard.py
create mode 100644 setup/report/init.py
create mode 100644 setup/report/item_wise_price_list_rate/init.py
create mode 100644
setup/report/item_wise_price_list_rate/item_wise_price_list_rate.txt
delete mode 100644 stock/doctype/delivery_note_packing_item/README.md
delete mode 100644 stock/doctype/delivery_note_packing_item/init.py
rename {setup => stock}/doctype/item_price/README.md (100%)
rename {accounts/doctype/budget_control =>
stock/doctype/item_price}/init.py (100%)
create mode 100644 stock/doctype/item_price/item_price.js
create mode 100644 stock/doctype/item_price/item_price.py
create mode 100644 stock/doctype/item_price/item_price.txt
create mode 100644 stock/doctype/item_price/test_item_price.py
create mode 100644 stock/doctype/packed_item/init.py
create mode 100644 stock/doctype/packed_item/packed_item.py
rename
stock/doctype/{delivery_note_packing_item/delivery_note_packing_item.txt =>
packed_item/packed_item.txt} (96%)
rename {setup => stock}/doctype/price_list/README.md (100%)
rename {selling/doctype/sales_common =>
stock/doctype/price_list}/init.py (100%)
create mode 100644 stock/doctype/price_list/price_list.css
create mode 100644 stock/doctype/price_list/price_list.js
rename {setup => stock}/doctype/price_list/price_list.py (79%)
rename {setup => stock}/doctype/price_list/price_list.txt (85%)
rename {setup => stock}/doctype/price_list/test_price_list.py (65%)
delete mode 100644 stock/doctype/stock_ledger/README.md
delete mode 100644 stock/doctype/stock_ledger/init.py
delete mode 100644 stock/doctype/stock_ledger/stock_ledger.txt
delete mode 100644
stock/report/item_wise_price_list/item_wise_price_list.txt
delete mode 100644 support/doctype/support_ticket/support_ticket.css
create mode 100644 utilities/demo/demo_docs/Item_Price.csv
delete mode 100644 utilities/demo/demo_docs/Price_List.csv
create mode 100644 utilities/repost_stock.py

then ERPNext is no longer accessible (403 error).

It would be great if you could help us to figure out what’s going wrong and
fix it once for all, because this is causing our productivity to decrease
dramatically.

Many thanks in advance!

Amin from Fritzing


Note:

If you are posting an issue,

  1. We should be able to replicate it at our end. So please give us as much
    information as you can. Please see it from the point of view of the person
    receiving the communication.
  2. Paste your code at http://pastebin.com or http://gist.github.com and send
    only the URL via email
  3. For sending images, use http://imgur.com or other similar services. Do
    not send images as attachments. Links are good. Same goes for any file you
    are going to send.

End of Note

You received this message because you are subscribed to the Google Groups
“ERPNext Developer Forum” group.
To unsubscribe from this group and stop receiving emails from it, send an
email to erpnext-developer-forum+un...@googlegroups.com.
For more options, visit Inloggen - Google Accounts.


Pratik
ERPNext