Akhilesh Darjee e27717261d merge conflict fixed

2014-01-03 18:18:31 +05:30

..

accounts_payable

Fixed conflict while merging with master

2013-12-31 16:09:22 +05:30

accounts_receivable

Merge with 3.3.8

2013-12-26 11:07:46 +05:30

bank_clearance_summary

moved modules inside erpnext folder

2013-12-11 10:43:52 +05:30

bank_reconciliation_statement

install, web serving, session booting webnotes/wnframework#351

2013-12-12 19:12:19 +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

Fixed conflict while merging with master

2013-12-31 16:09:22 +05:30

gross_profit

install, web serving, session booting webnotes/wnframework#351

2013-12-12 19:12:19 +05:30

item_wise_purchase_register

moved modules inside erpnext folder

2013-12-11 10:43:52 +05:30

item_wise_sales_register

moved modules inside erpnext folder

2013-12-11 10:43:52 +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