Nabin Hait 2377cdfa4e Fixed conflict

2015-09-09 18:45:41 +05:30

..

account

Fixed conflict

2015-09-09 18:45:41 +05:30

accounts_settings

Exported all doctypes

2015-08-27 16:45:52 +05:30

bank_reconciliation

Exported all doctypes

2015-08-27 16:45:52 +05:30

bank_reconciliation_detail

Exported all doctypes

2015-08-27 16:45:52 +05:30

budget_detail

Exported all doctypes

2015-08-27 16:45:52 +05:30

c_form

[minor] Unset Apply User Permissions in default permissions

2015-09-08 19:23:23 +05:30

c_form_invoice_detail

Exported all doctypes

2015-08-27 16:45:52 +05:30

cost_center

[minor] Unset Apply User Permissions in default permissions

2015-09-08 19:23:23 +05:30

fiscal_year

[minor] Unset Apply User Permissions in default permissions

2015-09-08 19:23:23 +05:30

fiscal_year_company

Exported all doctypes

2015-08-27 16:45:52 +05:30

gl_entry

Fixed conflict

2015-09-09 18:45:41 +05:30

journal_entry

Fixed conflict

2015-09-09 18:45:41 +05:30

journal_entry_account

Multi-currency: Exchange Rate in Journal Entry

2015-09-09 18:43:12 +05:30

mode_of_payment

[minor] Unset Apply User Permissions in default permissions

2015-09-08 19:23:23 +05:30

mode_of_payment_account

Exported all doctypes

2015-08-27 16:45:52 +05:30

monthly_distribution

Exported all doctypes

2015-08-27 16:45:52 +05:30

monthly_distribution_percentage

Exported all doctypes

2015-08-27 16:45:52 +05:30

party_account

Checked out json files from upstream

2015-08-27 14:35:17 +05:30

payment_reconciliation

Exported all doctypes

2015-08-27 16:45:52 +05:30

payment_reconciliation_invoice

Exported all doctypes

2015-08-27 16:45:52 +05:30

payment_reconciliation_payment

Exported all doctypes

2015-08-27 16:45:52 +05:30

payment_tool

Payment Tool changes due to multi currency

2015-08-31 19:01:11 +05:30

payment_tool_detail

Payment Tool changes due to multi currency

2015-08-31 19:01:11 +05:30

period_closing_voucher

Fixed conflict

2015-08-31 17:28:05 +05:30

pos_profile

[minor] Unset Apply User Permissions in default permissions

2015-09-08 19:23:23 +05:30

pricing_rule

Exported all doctypes

2015-08-27 16:45:52 +05:30

purchase_invoice

Fixed conflict

2015-09-09 18:45:41 +05:30

purchase_invoice_advance

Fixed conflict

2015-08-31 17:28:05 +05:30

purchase_invoice_item

[layout cleanup] purchase, stock, journal entry

2015-08-26 22:20:38 +05:30

purchase_taxes_and_charges

Exported all doctypes

2015-08-27 16:45:52 +05:30

purchase_taxes_and_charges_template

Exported all doctypes

2015-08-27 16:45:52 +05:30

sales_invoice

Fixed conflict

2015-09-09 18:45:41 +05:30

sales_invoice_advance

Fixed conflict

2015-08-31 17:28:05 +05:30

sales_invoice_item

[layout] cleaned up Sales Invoice

2015-08-26 10:51:44 +05:30

sales_taxes_and_charges

Exported all doctypes

2015-08-27 16:45:52 +05:30

sales_taxes_and_charges_template

[minor] Unset Apply User Permissions in default permissions

2015-09-08 19:23:23 +05:30

shipping_rule

[minor] Unset Apply User Permissions in default permissions

2015-09-08 19:23:23 +05:30

shipping_rule_condition

Exported all doctypes

2015-08-27 16:45:52 +05:30

__init__.py

moved modules inside erpnext folder

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