Nabin Hait 8ae051cb39 fixed conflict

2014-02-14 13:42:41 +05:30

..

accounts_payable

fixed conflict

2014-02-14 13:42:41 +05:30

accounts_receivable

fixed conflict

2014-02-14 13:42:41 +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

Rename fields: replaced in html and txt files

2014-02-12 14:54:15 +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

Rename fields: amount related fields

2014-02-12 14:54:14 +05:30

item_wise_purchase_register

Rename fields: amount related fields

2014-02-12 14:54:14 +05:30

item_wise_sales_register

Rename fields: amount related fields

2014-02-12 14:54:14 +05:30

ordered_items_to_be_billed

Rename fields: replaced in html and txt files

2014-02-12 14:54:15 +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

Rename fields: replaced in html and txt files

2014-02-12 14:54:15 +05:30

purchase_register

Rename fields: amount related fields

2014-02-12 14:54:14 +05:30

received_items_to_be_billed

Rename fields: replaced in html and txt files

2014-02-12 14:54:15 +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

Rename fields: amount related fields

2014-02-12 14:54:14 +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