Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
cb39e0878e
brotherton-erpnext/erpnext/accounts/report
History
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 moved modules inside erpnext folder 2013-12-11 10:43:52 +05:30
bank_reconciliation_statement Fixed conflict while merging with develop brnach 2014-01-20 16:48:49 +05:30
budget_variance_report install, web serving, session booting webnotes/wnframework#351 2013-12-12 19:12:19 +05:30
customer_account_head moved modules inside erpnext folder 2013-12-11 10:43:52 +05:30
delivered_items_to_be_billed moved modules inside erpnext folder 2013-12-11 10:43:52 +05:30
general_ledger Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip 2014-01-24 21:44:36 +05:30
gross_profit install, web serving, session booting webnotes/wnframework#351 2013-12-12 19:12:19 +05:30
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 moved modules inside erpnext folder 2013-12-11 10:43:52 +05:30
payment_period_based_on_invoice_date install, web serving, session booting webnotes/wnframework#351 2013-12-12 19:12:19 +05:30
purchase_invoice_trends added manifest, hooks and fixed requires webnotes/wnframework#351 2013-12-13 14:10:14 +05:30
purchase_order_items_to_be_billed moved modules inside erpnext folder 2013-12-11 10:43:52 +05:30
purchase_register moved modules inside erpnext folder 2013-12-11 10:43:52 +05:30
received_items_to_be_billed moved modules inside erpnext folder 2013-12-11 10:43:52 +05:30
sales_invoice_trends added manifest, hooks and fixed requires webnotes/wnframework#351 2013-12-13 14:10:14 +05:30
sales_partners_commission moved modules inside erpnext folder 2013-12-11 10:43:52 +05:30
sales_register flat discount replaced to discount amount 2014-01-03 18:15:07 +05:30
supplier_account_head moved modules inside erpnext folder 2013-12-11 10:43:52 +05:30
__init__.py moved modules inside erpnext folder 2013-12-11 10:43:52 +05:30