Nabin Hait 1cc55fbbcb Fixed merge conflict

2016-12-08 14:09:23 +05:30

..

account

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

accounts_settings

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

asset

Fixed merge conflict

2016-11-21 19:13:22 +05:30

asset_category

[minor] added default standard filters (#6854)

2016-11-07 17:19:19 +05:30

asset_category_account

set remember last selected value as true for company field

2016-11-03 16:19:34 +05:30

asset_movement

[minor] added default standard filters (#6854)

2016-11-07 17:19:19 +05:30

bank_reconciliation

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

bank_reconciliation_detail

[fix] layout for bank reconciliation

2016-11-17 14:30:47 +08:00

budget

[Fix] Patch for budget_against

2016-12-08 12:16:29 +05:30

budget_account

[fix] make grids editable

2016-07-11 13:01:58 +05:30

c_form

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

c_form_invoice_detail

[fix] make grids editable

2016-07-11 13:01:58 +05:30

cheque_print_template

Party name in Payment Entry and cheque print format

2016-09-02 14:20:01 +05:30

cost_center

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

depreciation_schedule

Manual Depreciation Schedule for Asset

2016-11-18 17:19:45 +05:30

fiscal_year

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

fiscal_year_company

[fix] make grids editable

2016-07-11 13:01:58 +05:30

gl_entry

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

journal_entry

Fixed merge conflict

2016-12-08 14:09:23 +05:30

journal_entry_account

Coded column deleted, column added from UI

2016-08-26 14:32:38 +05:30

mode_of_payment

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

mode_of_payment_account

[fix] make grids editable

2016-07-11 13:01:58 +05:30

monthly_distribution

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

monthly_distribution_percentage

[fix] make grids editable

2016-07-11 13:01:58 +05:30

party_account

[fix] make grids editable

2016-07-11 13:01:58 +05:30

payment_entry

Fixed merge conflict

2016-12-08 14:09:23 +05:30

payment_entry_deduction

[fix] make grids editable

2016-07-11 13:01:58 +05:30

payment_entry_reference

Editable grid columns for payment entry

2016-11-14 12:32:16 +05:30

payment_gateway

[fix] quick entry

2016-07-25 15:03:39 +05:30

payment_gateway_account

Removed Administrator role from Doctypes

2016-07-25 11:39:23 +05:30

payment_reconciliation

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

payment_reconciliation_invoice

[fix] make grids editable

2016-07-11 13:01:58 +05:30

payment_reconciliation_payment

Coded column deleted, column added from UI

2016-08-26 14:32:38 +05:30

payment_request

Fixed merge conflict

2016-12-08 14:09:23 +05:30

period_closing_voucher

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

pos_customer_group

Added item groups, customer groups in the POS profile.

2016-11-18 15:32:48 +05:30

pos_item_group

Added item groups, customer groups in the POS profile.

2016-11-18 15:32:48 +05:30

pos_profile

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

pricing_rule

Merge pull request #6920 from KanchanChauhan/delivery-note-serial-no-fifo

2016-12-05 16:51:42 +05:30

purchase_invoice

Fixed merge conflict

2016-12-06 16:16:58 +05:30

purchase_invoice_advance

Coded column deleted, column added from UI

2016-08-26 14:32:38 +05:30

purchase_invoice_item

Cleanup and fixes in quality inspection feature

2016-11-16 17:22:38 +05:30

purchase_taxes_and_charges

Coded column deleted, column added from UI

2016-08-26 14:32:38 +05:30

purchase_taxes_and_charges_template

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

salary_component_account

[WIP] Process Payroll Changes

2016-09-28 15:14:41 +05:30

sales_invoice

Fixed merge conflict

2016-12-08 14:09:23 +05:30

sales_invoice_advance

Coded column deleted, column added from UI

2016-08-26 14:32:38 +05:30

sales_invoice_item

Cleanup and fixes in quality inspection feature

2016-11-16 17:22:38 +05:30

sales_invoice_payment

[fix] make grids editable

2016-07-11 13:01:58 +05:30

sales_invoice_timesheet

minor changes

2016-09-12 13:27:27 +05:30

sales_taxes_and_charges

Coded column deleted, column added from UI

2016-08-26 14:32:38 +05:30

sales_taxes_and_charges_template

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

shipping_rule

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

shipping_rule_condition

[fix] make grids editable

2016-07-11 13:01:58 +05:30

shipping_rule_country

[fix] make grids editable

2016-07-11 13:01:58 +05:30

tax_rule

[minor] added default standard filters (#6854)

2016-11-07 17:19:19 +05:30

__init__.py

moved modules inside erpnext folder

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