hi anand,
done everything. below is output of what i did. nothing happend. sorry to bother you.
[ro…
@erp app]# git reset --hard origin/master
HEAD is now at 9deda0e clear project from locals once task is saved
[ro...@erp app]# git pull origin master
remote: Counting objects: 569, done.
remote: Compressing objects: 100% (155/155), done.
remote: Total 406 (delta 316), reused 333 (delta 248)
Receiving objects: 100% (406/406), 48.84 KiB | 61 KiB/s, done.
Resolving deltas: 100% (316/316), completed with 119 local objects.
* branch master -> FETCH_HEAD
Updating 9deda0e..44c9def
Fast-forward
.../Project-Sales Invoice.txt | 49 ----
.../Form 16A Print Format.txt | 20 --
.../doctype/purchase_invoice/purchase_invoice.py | 6 +-
accounts/doctype/sales_invoice/sales_invoice.js | 7 -
accounts/doctype/sales_invoice/sales_invoice.py | 7 -
accounts/page/accounts_home/accounts_home.html | 27 +--
buying/doctype/purchase_common/purchase_common.js | 13 -
buying/doctype/purchase_common/purchase_common.py | 9 +-
buying/doctype/purchase_order/purchase_order.py | 7 +-
.../doctype/purchase_request/purchase_request.js | 7 +-
.../doctype/purchase_request/purchase_request.py | 3 +
buying/doctype/supplier/supplier.js | 114 +-------
buying/doctype/supplier/supplier.txt | 40 +---
.../supplier_quotation/supplier_quotation.py | 3 +
home/__init__.py | 4 +-
home/page/attributions/attributions.css | 3 -
home/page/attributions/attributions.html | 11 +-
home/page/latest_updates/latest_updates.js | 4 +
hr/doctype/employee/employee.txt | 99 ++++----
patches/december_2012/address_title.py | 13 +
.../december_2012/delete_form16_print_format.py | 3 +
patches/december_2012/rebuild_item_group_tree.py | 5 +
patches/december_2012/remove_project_mapper.py | 6 +
patches/november_2012/production_order_patch.py | 2 +-
patches/patch_list.py | 16 ++
public/js/stock_analytics.js | 196 ++++++++++++++
public/js/stock_grid_report.js | 6 +-
.../Project-Sales Order/Project-Sales Order.txt | 49 ----
selling/doctype/customer/customer.js | 108 +-------
selling/doctype/customer/customer.txt | 60 +----
selling/doctype/lead/lead_list.js | 12 +-
selling/doctype/sales_order/sales_order.js | 14 +-
selling/doctype/sales_order/sales_order.py | 75 +------
setup/doctype/brand/brand.txt | 107 ++------
setup/doctype/contact_control/contact_control.js | 50 ----
setup/doctype/item_group/item_group.py | 21 ++-
setup/doctype/item_group/item_group.txt | 11 +-
setup/doctype/sales_partner/sales_partner.js | 27 +--
setup/doctype/sales_partner/sales_partner.txt | 204 +++++++--------
setup/page/modules_setup/modules_setup.html | 2 +-
setup/page/modules_setup/modules_setup.js | 4 +-
startup/event_handlers.py | 6 +-
startup/observers.py | 20 ++
startup/report_data_map.py | 11 +
.../Project-Delivery Note.txt | 49 ----
stock/doctype/delivery_note/delivery_note.py | 7 -
stock/doctype/item/item.js | 5 +-
stock/doctype/item/item.py | 28 ++-
stock/doctype/item/item.txt | 23 ++-
stock/doctype/purchase_receipt/purchase_receipt.py | 8 +-
stock/page/stock_ageing/stock_ageing.js | 30 ++-
stock/page/stock_analytics/stock_analytics.js | 185 +-------------
stock/page/stock_balance/stock_balance.js | 162 ++++++++++++
stock/page/stock_balance/stock_balance.txt | 21 ++
stock/page/stock_home/stock_home.html | 5 +
stock/page/stock_ledger/stock_ledger.js | 37 +++-
support/doctype/support_ticket/__init__.py | 2 +-
support/doctype/support_ticket/support_ticket.js | 1 +
utilities/doctype/address/address.js | 22 --
utilities/doctype/address/address.py | 3 +-
utilities/doctype/address/address.txt | 274 ++++++++++----------
utilities/doctype/sms_control/sms_control.py | 2 +-
website/css/website.css | 9 -
.../doctype/about_us_settings/about_us_settings.py | 18 ++
.../about_us_settings/about_us_settings.txt | 98 +++++++
.../about_us_team_member/about_us_team_member.py | 8 +
.../about_us_team_member/about_us_team_member.txt | 35 +++
website/doctype/company_history/company_history.py | 8 +
.../doctype/company_history/company_history.txt | 40 +++
website/doctype/web_page/web_page.py | 5 +-
website/doctype/web_page/web_page.txt | 57 +---
.../website_item_group/website_item_group.py | 8 +
.../website_item_group/website_item_group.txt | 36 +++
website/doctype/website_script/website_script.py | 8 +
website/doctype/website_script/website_script.txt | 51 ++++
.../doctype/website_settings/website_settings.txt | 30 +--
.../doctype/website_slideshow/website_slideshow.js | 9 +
.../doctype/website_slideshow/website_slideshow.py | 8 +
.../website_slideshow/website_slideshow.txt | 85 ++++++
.../website_slideshow_item.py | 8 +
.../website_slideshow_item.txt | 59 +++++
website/helpers/product.py | 90 +++++--
website/helpers/slideshow.py | 26 ++
website/page/website_home/website_home.html | 38 ++--
website/templates/html/outer.html | 12 +-
website/templates/html/product_breadcrumbs.html | 8 +
website/templates/html/product_group.html | 44 ++--
website/templates/html/product_in_list.html | 14 +
website/templates/html/product_missing_image.html | 1 +
website/templates/html/product_page.html | 32 ++-
website/templates/html/slideshow.html | 21 ++
website/templates/html/web_page.html | 15 +-
website/templates/js/product_list.js | 22 +--
website/templates/pages/about.html | 40 +++
website/templates/pages/attributions.html | 112 ++++++++
website/utils.py | 44 +++-
96 files changed, 1902 insertions(+), 1522 deletions(-)
delete mode 100644 accounts/DocType Mapper/Project-Sales Invoice/Project-Sales Invoice.txt
delete mode 100644 accounts/Print Format/Form 16A Print Format/Form 16A Print Format.txt
create mode 100644 patches/december_2012/address_title.py
create mode 100644 patches/december_2012/delete_form16_print_format.py
create mode 100644 patches/december_2012/rebuild_item_group_tree.py
create mode 100644 patches/december_2012/remove_project_mapper.py
create mode 100644 public/js/stock_analytics.js
delete mode 100644 selling/DocType Mapper/Project-Sales Order/Project-Sales Order.txt
create mode 100644 startup/observers.py
delete mode 100644 stock/DocType Mapper/Project-Delivery Note/Project-Delivery Note.txt
create mode 100644 stock/page/stock_balance/__init__.py
create mode 100644 stock/page/stock_balance/stock_balance.js
create mode 100644 stock/page/stock_balance/stock_balance.txt
create mode 100644 website/doctype/about_us_settings/__init__.py
create mode 100644 website/doctype/about_us_settings/about_us_settings.py
create mode 100644 website/doctype/about_us_settings/about_us_settings.txt
create mode 100644 website/doctype/about_us_team_member/__init__.py
create mode 100644 website/doctype/about_us_team_member/about_us_team_member.py
create mode 100644 website/doctype/about_us_team_member/about_us_team_member.txt
create mode 100644 website/doctype/company_history/__init__.py
create mode 100644 website/doctype/company_history/company_history.py
create mode 100644 website/doctype/company_history/company_history.txt
create mode 100644 website/doctype/website_item_group/__init__.py
create mode 100644 website/doctype/website_item_group/website_item_group.py
create mode 100644 website/doctype/website_item_group/website_item_group.txt
create mode 100644 website/doctype/website_script/__init__.py
create mode 100644 website/doctype/website_script/website_script.py
create mode 100644 website/doctype/website_script/website_script.txt
create mode 100644 website/doctype/website_slideshow/__init__.py
create mode 100644 website/doctype/website_slideshow/website_slideshow.js
create mode 100644 website/doctype/website_slideshow/website_slideshow.py
create mode 100644 website/doctype/website_slideshow/website_slideshow.txt
create mode 100644 website/doctype/website_slideshow_item/__init__.py
create mode 100644 website/doctype/website_slideshow_item/website_slideshow_item.py
create mode 100644 website/doctype/website_slideshow_item/website_slideshow_item.txt
create mode 100644 website/helpers/slideshow.py
create mode 100644 website/templates/html/product_breadcrumbs.html
create mode 100644 website/templates/html/product_in_list.html
create mode 100644 website/templates/html/product_missing_image.html
create mode 100644 website/templates/html/slideshow.html
create mode 100644 website/templates/pages/about.html
create mode 100644 website/templates/pages/attributions.html
[ro...@erp app]# cd ..
[ro...@erp erpnext]# lib/wnf.py --patch_sync
Executing patches.november_2012.production_order_patch in erpnext
Traceback (innermost last):
File "/var/www/erpnext/lib/webnotes/modules/patch_handler.py", line 71, in execute_patch
webnotes.get_method(patchmodule + ".execute")()
File "./patches/november_2012/production_order_patch.py", line 12, in execute
where use_multi_level_bom is null""")
File "/var/www/erpnext/lib/webnotes/db.py", line 153, in sql
raise e
OperationalError: (1054, "Unknown column 'consider_sa_items_as_raw_materials' in 'field list'")
patches.november_2012.production_order_patch: failed: STOPPED
[ro...@erp erpnext]# git status
# On branch master
# Changed but not updated:
# (use "git add/rm <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# deleted: public/build.json
# deleted: public/images/erpnext-fade.png
# deleted: public/images/erpnext1.png
# deleted: public/images/favicon.ico
# deleted: public/images/feed.png
# deleted: public/js/account_tree_grid.js
# deleted: public/js/complete_setup.js
# deleted: public/js/conf.js
# deleted: public/js/feature_setup.js
# deleted: public/js/gantt_task.js
# deleted: public/js/kb_common.js
# deleted: public/js/modules.js
# deleted: public/js/startup.css
# deleted: public/js/startup.js
# deleted: public/js/stock_grid_report.js
# deleted: public/js/toolbar.js
# deleted: public/js/utils.js
# deleted: public/js/website_utils.js
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# FETCH_HEAD
# app/
# install_erpnext.py
# pub/
# public/app
# public/app.html
# public/blank.html
# public/css/
# public/js/all-app.min.js
# public/js/all-web.min.js
# public/js/report-legacy.min.js
# public/rss.xml
# public/server.py
# public/sitemap.xml
# public/unsupported.html
# public/web.py
no changes added to commit (use "git add" and/or "git commit -a")
[ro...@erp erpnext]#
--
Madhan
–
You received this message because you are subscribed to the Google Groups "ERPNext Developer Forum" group.
To post to this group, send email to er...@googlegroups.com.
To unsubscribe from this group, send email to erpnext-developer-forum+un...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.