Saurabh 99400bd958 remove duplicate fields occured due to merge conflicts

2018-05-14 22:11:17 +05:30

..

batch

[ Enhance ] Production to Work Order (#12902)

2018-03-20 12:38:43 +05:30

bin

[enhance] Item Alternative (#13121)

2018-03-28 11:51:44 +05:30

customs_tariff_number

Add Customs Tariff Number

2017-03-24 15:53:03 +01:00

delivery_note

Resolve merge conflicts from enterprise_sprint branch

2018-05-14 21:15:46 +05:30

delivery_note_item

on item, warehouse and batch triggers, fetch serial nos based on batch

2018-04-26 14:39:21 +05:30

delivery_stop

[Fix] UX for delivery trip (#13046)

2018-02-26 12:25:39 +05:30

delivery_trip

[Minor] Show only active driver in Delivery Trip

2018-05-10 10:42:56 +05:30

item

remove duplicate fields occured due to merge conflicts

2018-05-14 22:11:17 +05:30

item_alternative

[enhance] Item Alternative (#13121)

2018-03-28 11:51:44 +05:30

item_attribute

Fixed version conflict

2016-12-23 17:43:42 +05:30

item_attribute_value

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

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

item_barcode

- make barcode mandatory if child row is added

2017-12-10 20:56:48 +01:00

item_customer_detail

[Enhance] Fetch Customer's Item code based on Customer Name or Customer Group (#13198)

2018-03-21 11:17:49 +05:30

item_price

Added brand in item price doctype, item prices report (#13900)

2018-05-03 16:23:57 +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

Added fields in global search

2017-02-20 13:38:31 +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

reinitialize variant attribute table, fixes #11900 (#11921)

2017-12-11 12:22:28 +05:30

item_variant_settings

Allow Item variant Rename (#13161)

2018-03-07 15:31:08 +05:30

item_website_specification

[fix] make grids editable

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

landed_cost_item

[Fix] Getting an error cost center is not defined in the purchase receipt, even if it's defined in the company (#10320)

2017-08-10 11:32:59 +05:30

landed_cost_purchase_receipt

minor fixes

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

landed_cost_taxes_and_charges

convert html into text in the taxes description as it can break the reports (#11603)

2017-11-16 14:11:39 +05:30

landed_cost_voucher

self.assertEqual

2018-02-28 21:13:51 +05:30

manufacturer

[Minor] Country field name should be country

2017-08-03 10:18:43 +05:30

material_request

Merge branch 'master' into develop

2018-05-08 16:31:42 +05:30

material_request_item

Fixed merge conflict

2018-03-05 14:54:44 +05:30

packed_item

set default warehouse instead of product bundle's warehouse for packed_items in delivery note (#13398)

2018-03-27 11:32:10 +05:30

packing_slip

better validation message

2018-01-10 23:14:13 +01:00

packing_slip_item

Added fields in global search

2017-02-20 13:38:31 +05:30

price_list

Checkbox in Price list for Price not UOM dependant (#11836)

2017-12-06 19:17:03 +05:30

price_list_country

[fix] make grids editable

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

purchase_receipt

Resolve merge conflicts from enterprise_sprint branch

2018-05-14 21:15:46 +05:30

purchase_receipt_item

Added account fields in the company, fixes in auto creation of the asset from PR

2018-05-14 19:07:39 +05:30

quality_inspection

[Enhance] Quality Inspection Template (#12988)

2018-02-22 11:03:48 +05:30

quality_inspection_reading

[Fix] Change of module of quality inspection

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

quality_inspection_template

[Enhance] Quality Inspection Template (#12988)

2018-02-22 11:03:48 +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

Resolve merge conflicts from enterprise_sprint branch

2018-05-14 21:15:46 +05:30

stock_entry

[Enhancement] Work Order Material Consumption (#13384)

2018-04-09 10:31:28 +05:30

stock_entry_detail

[enhance] Item Alternative (#13121)

2018-03-28 11:51:44 +05:30

stock_ledger_entry

[fix] add index on voucher type and voucher no in stock ledger entry

2017-06-09 19:05:30 +05:30

stock_reconciliation

Provision to select opening stock in stock reconciliation (#13802)

2018-04-26 16:30:35 +05:30

stock_reconciliation_item

edit Doctypes to use company currency

2017-08-03 00:05:56 +01:00

stock_settings

Fixed merge conflict

2018-05-05 12:19:14 +05:30

uom_conversion_detail

[fix] make grids editable

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

variant_field

[Enahance] Update variants fields defined in the Item Varianst Settings, if template updated

2017-09-21 15:41:57 +05:30

warehouse

Optimisation of warehouse_account_map (#13454)

2018-04-02 10:30:17 +05:30

__init__.py

moved modules inside erpnext folder

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