Anand Doshi cb39e0878e Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip ... Conflicts: config.json erpnext/accounts/utils.py erpnext/patches/patch_list.py erpnext/stock/doctype/price_list/price_list.txt erpnext/stock/doctype/warehouse/warehouse.py portal/templates/sale.html portal/utils.py selling/doctype/sales_order/templates/pages/order.py selling/utils/cart.py selling/utils/product.py utilities/demo/demo_docs/Fiscal_Year.csv utilities/demo/make_demo.py		2014-01-24 21:44:36 +05:30
..
accounts_payable	Fixed conflict while merging with develop brnach	2014-01-20 16:48:49 +05:30
accounts_receivable	Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip	2014-01-24 21:44:36 +05:30
bank_clearance_summary
bank_reconciliation_statement	Fixed conflict while merging with develop brnach	2014-01-20 16:48:49 +05:30
budget_variance_report
customer_account_head
delivered_items_to_be_billed
general_ledger	Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip	2014-01-24 21:44:36 +05:30
gross_profit
item_wise_purchase_register	Fixed conflict while merging with develop brnach	2014-01-20 16:48:49 +05:30
item_wise_sales_register	Fixed conflict while merging with develop brnach	2014-01-20 16:48:49 +05:30
ordered_items_to_be_billed
payment_period_based_on_invoice_date
purchase_invoice_trends
purchase_order_items_to_be_billed
purchase_register
received_items_to_be_billed
sales_invoice_trends
sales_partners_commission
sales_register
supplier_account_head
__init__.py