Nabin Hait cd9c45f816 Fixed merge conflict

2016-10-07 16:53:07 +05:30

..

batch

[enhancement] Int, Currency, Float, Percent as not null and default to 0

2015-11-19 13:23:36 +05:30

bin

[fixes] validate trash condition for warehouse and related account, move existing warehouses under all warehouse group, set account parent and is group for warehouse account

2016-06-25 11:06:14 +05:30

delivery_note

Fixed version conflict

2016-09-26 18:11:56 +05:30

delivery_note_item

[fix] make grids editable

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

item

[Fix] Issue in merging duplicate item

2016-10-07 13:40:45 +05:30

item_attribute

[fix] item attribute validation and tests

2016-07-15 15:12:06 +05:30

item_attribute_value

[fix] make grids editable

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

item_customer_detail

[fix] make grids editable

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

item_price

[enhancement] Int, Currency, Float, Percent as not null and default to 0

2015-11-19 13:23:36 +05:30

item_quality_inspection_parameter

[fix] make grids editable

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

item_reorder

PPT looks at default MR type in Item to set MR type.

2016-08-02 16:59:03 +05:30

item_supplier

[fix] make grids editable

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

item_tax

[fix] make grids editable

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

item_variant

[fix] make grids editable

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

item_variant_attribute

[fix] make grids editable

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

item_website_specification

[fix] make grids editable

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

landed_cost_item

[fix] make grids editable

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

landed_cost_purchase_receipt

minor fixes

2016-07-20 11:28:50 +05:30

landed_cost_taxes_and_charges

[fix] make grids editable

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

landed_cost_voucher

[fix] #6254

2016-09-06 18:28:41 +05:30

manufacturer

Changes modified date

2016-01-21 18:52:25 +05:30

material_request

Fixed version conflict

2016-10-03 14:13:50 +05:30

material_request_item

Actual Qty added to Material Request Item

2016-09-19 00:22:37 +05:30

packed_item

[fix] make grids editable

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

packing_slip

[cleanup] assets and made items mandatory in transactions

2016-03-31 15:37:51 +05:30

packing_slip_item

[fix] make grids editable

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

price_list

[enhancement] Int, Currency, Float, Percent as not null and default to 0

2015-11-19 13:23:36 +05:30

price_list_country

[fix] make grids editable

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

purchase_receipt

Fixed version conflict

2016-09-26 18:11:56 +05:30

purchase_receipt_item

Coded column deleted, column added from UI

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

sales_bom

moved modules inside erpnext folder

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

sales_bom_item

Sales BOM renamed to Product Bundle

2015-07-13 12:41:27 +05:30

serial_no

[fix] Rejected serial nos in purchase invoice

2016-04-18 17:46:36 +05:30

stock_entry

Fixed version conflict

2016-10-04 17:27:02 +05:30

stock_entry_detail

Coded column deleted, column added from UI

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

stock_ledger_entry

[fixes] validate trash condition for warehouse and related account, move existing warehouses under all warehouse group, set account parent and is group for warehouse account

2016-06-25 11:06:14 +05:30

stock_reconciliation

Minor fixes

2016-10-05 13:11:19 +05:30

stock_reconciliation_item

Total and difference added for amount and qty

2016-10-05 13:11:19 +05:30

stock_settings

[cleanup] homepage

2016-05-12 15:23:17 +05:30

uom_conversion_detail

[fix] make grids editable

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

warehouse

[fix] warehouse account rename fix #6526

2016-10-06 18:20:53 +05:30

__init__.py

moved modules inside erpnext folder

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