Nabin Hait 6f0a3ed8d4 fixed conflict

2015-02-17 11:12:04 +05:30

..

account

[design] Setup Wizard

2015-02-12 20:02:17 +05:30

accounts_settings

[share] add share permission

2015-02-05 15:52:58 +05:30

bank_reconciliation

[share] add share permission

2015-02-05 15:52:58 +05:30

bank_reconciliation_detail

Code replacement for journal voucher renaming

2014-12-25 17:14:18 +05:30

budget_detail

Deprecate Select fields with options as link:

2014-05-09 13:36:13 +05:30

c_form

Replaced renamed total fields in code files

2015-02-12 16:09:11 +05:30

c_form_invoice_detail

[ux] fixed creation via tree views for Item Group etc

2015-01-01 15:59:34 +05:30

cost_center

[share] add share permission

2015-02-05 15:52:58 +05:30

fiscal_year

[share] add share permission

2015-02-05 15:52:58 +05:30

fiscal_year_company

Fiscal year autofetch added

2014-10-09 15:01:12 +05:30

gl_entry

Code replacement for journal voucher renaming

2014-12-25 17:14:18 +05:30

journal_entry

Replaced renamed total fields in code files

2015-02-12 16:09:11 +05:30

journal_entry_account

Code replacement for journal voucher renaming

2014-12-25 17:14:18 +05:30

mode_of_payment

Replaced renamed total fields in code files

2015-02-12 16:09:11 +05:30

mode_of_payment_account

mode of payment - company wise default account added

2015-01-14 12:00:17 +05:30

monthly_distribution

[share] add share permission

2015-02-05 15:52:58 +05:30

monthly_distribution_percentage

Table Field Renaming: code replace, JV and budget distribution renamed

2014-12-25 16:01:55 +05:30

party_account

Created new doctype Party Account to maintain default party account, it is a child table for Customer, Supplier, Customer Group, Supplier type

2014-10-06 13:12:05 +05:30

payment_reconciliation

[share] add share permission

2015-02-05 15:52:58 +05:30

payment_reconciliation_invoice

Code replacement for journal voucher renaming

2014-12-25 17:14:18 +05:30

payment_reconciliation_payment

Code replacement for journal voucher renaming

2014-12-25 17:14:18 +05:30

payment_tool

Replaced renamed total fields in code files

2015-02-12 16:09:11 +05:30

payment_tool_detail

[minor] ui/ux fixes in Payment Tool

2014-09-12 15:42:16 +05:30

period_closing_voucher

[share] add share permission

2015-02-05 15:52:58 +05:30

pos_setting

[share] add share permission

2015-02-05 15:52:58 +05:30

pricing_rule

[share] add share permission

2015-02-05 15:52:58 +05:30

purchase_invoice

Replaced renamed total fields in code files

2015-02-12 16:09:11 +05:30

purchase_invoice_advance

Code replacement for journal voucher renaming

2014-12-25 17:14:18 +05:30

purchase_invoice_item

[print] item tables - override description and uom

2015-02-04 17:02:24 +05:30

purchase_taxes_and_charges

Fixes in user permissions patches

2014-06-04 17:48:56 +05:30

purchase_taxes_and_charges_master

Replaced renamed total fields in code files

2015-02-12 16:09:11 +05:30

sales_invoice

Replaced renamed total fields in code files

2015-02-12 16:09:11 +05:30

sales_invoice_advance

Code replacement for journal voucher renaming

2014-12-25 17:14:18 +05:30

sales_invoice_item

[print] item tables - override description and uom

2015-02-04 17:02:24 +05:30

sales_taxes_and_charges

Display tax amount after discount, if there is any discount amount

2014-12-10 12:28:25 +05:30

sales_taxes_and_charges_master

Replaced renamed total fields in code files

2015-02-12 16:09:11 +05:30

shipping_rule

[share] add share permission

2015-02-05 15:52:58 +05:30

shipping_rule_condition

frappe/frappe#478, frappe tests pass, .txt renamed to .json

2014-03-31 17:27:06 +05:30

__init__.py

moved modules inside erpnext folder

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