Nabin Hait 139aa71666 Fixed conflict while merging with master

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

..

account

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

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

accounts_settings

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

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

bank_reconciliation

moved modules inside erpnext folder

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

bank_reconciliation_detail

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

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

budget_detail

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

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

budget_distribution

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

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

budget_distribution_detail

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

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

c_form

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

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

c_form_invoice_detail

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

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

cost_center

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

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

fiscal_year

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

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

gl_entry

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

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

journal_voucher

Validate account with reference voucher if against voucher mentioned

2013-12-31 15:07:58 +05:30

journal_voucher_detail

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

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

mis_control

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

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

mode_of_payment

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

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

payment_to_invoice_matching_tool

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

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

payment_to_invoice_matching_tool_detail

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

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

period_closing_voucher

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

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

pos_setting

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

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

purchase_invoice

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

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

purchase_invoice_advance

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

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

purchase_invoice_item

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

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

purchase_taxes_and_charges

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

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

purchase_taxes_and_charges_master

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

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

sales_invoice

Fixed conflict while merging with master

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

sales_invoice_advance

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

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

sales_invoice_item

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

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

sales_taxes_and_charges

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

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

sales_taxes_and_charges_master

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

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

shipping_rule

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

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

shipping_rule_condition

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

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

__init__.py

moved modules inside erpnext folder

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