Anand Doshi 0dc79f4de0 Merge remote-tracking branch 'frappe/v4.x.x' into develop ...

Conflicts:
	.travis.yml
	erpnext/__version__.py
	erpnext/controllers/queries.py
	erpnext/hooks.py
	erpnext/selling/sales_common.js
	erpnext/stock/doctype/bin/bin.py
	erpnext/stock/doctype/stock_entry/stock_entry.js
	erpnext/stock/doctype/stock_entry/stock_entry.py
	erpnext/stock/stock_ledger.py
	setup.py

2015-04-06 13:21:07 +05:30

..

batch

Changed company name from Web Notes to Frappe Technologies

2015-03-03 14:56:43 +05:30

bin

Merge remote-tracking branch 'frappe/v4.x.x' into develop

2015-04-06 13:21:07 +05:30

delivery_note

Exchange rate upto 9 decimals

2015-03-23 14:51:45 +05:30

delivery_note_item

fix

2015-03-23 12:35:39 +05:30

item

Test case cleanup and fixes

2015-03-13 08:14:46 +05:30

item_attribute

Changed company name from Web Notes to Frappe Technologies

2015-03-03 14:56:43 +05:30

item_attribute_value

Changed company name from Web Notes to Frappe Technologies

2015-03-03 14:56:43 +05:30

item_customer_detail

Changed company name from Web Notes to Frappe Technologies

2015-03-03 14:56:43 +05:30

item_price

[subcontract] refactor, make stock entry from PO

2015-03-03 15:50:24 +05:30

item_quality_inspection_parameter

Changed company name from Web Notes to Frappe Technologies

2015-03-03 14:56:43 +05:30

item_reorder

Changed company name from Web Notes to Frappe Technologies

2015-03-03 14:56:43 +05:30

item_supplier

Changed company name from Web Notes to Frappe Technologies

2015-03-03 14:56:43 +05:30

item_tax

Changed company name from Web Notes to Frappe Technologies

2015-03-03 14:56:43 +05:30

item_variant

Changed company name from Web Notes to Frappe Technologies

2015-03-03 14:56:43 +05:30

item_website_specification

Changed company name from Web Notes to Frappe Technologies

2015-03-03 14:56:43 +05:30

landed_cost_item

Changed company name from Web Notes to Frappe Technologies

2015-03-03 14:56:43 +05:30

landed_cost_purchase_receipt

Changed company name from Web Notes to Frappe Technologies

2015-03-03 14:56:43 +05:30

landed_cost_taxes_and_charges

Changed company name from Web Notes to Frappe Technologies

2015-03-03 14:56:43 +05:30

landed_cost_voucher

Merge remote-tracking branch 'frappe/v4.x.x' into develop

2015-04-06 13:21:07 +05:30

material_request

Merge remote-tracking branch 'frappe/v4.x.x' into develop

2015-04-06 13:21:07 +05:30

material_request_item

Changed company name from Web Notes to Frappe Technologies

2015-03-03 14:56:43 +05:30

packed_item

Changed company name from Web Notes to Frappe Technologies

2015-03-03 14:56:43 +05:30

packing_slip

Changed company name from Web Notes to Frappe Technologies

2015-03-03 14:56:43 +05:30

packing_slip_item

Changed company name from Web Notes to Frappe Technologies

2015-03-03 14:56:43 +05:30

price_list

Changed company name from Web Notes to Frappe Technologies

2015-03-03 14:56:43 +05:30

purchase_receipt

Merge remote-tracking branch 'frappe/v4.x.x' into develop

2015-04-06 13:21:07 +05:30

purchase_receipt_item

modified date updated

2015-03-23 14:17:59 +05:30

sales_bom

moved modules inside erpnext folder

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

sales_bom_item

moved modules inside erpnext folder

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

serial_no

Changed company name from Web Notes to Frappe Technologies

2015-03-03 14:56:43 +05:30

stock_entry

Merge remote-tracking branch 'frappe/v4.x.x' into develop

2015-04-06 13:21:07 +05:30

stock_entry_detail

Changed company name from Web Notes to Frappe Technologies

2015-03-03 14:56:43 +05:30

stock_ledger_entry

Merge remote-tracking branch 'frappe/v4.x.x' into develop

2015-04-06 13:21:07 +05:30

stock_reconciliation

[fixes] default_website and stock reco

2015-03-24 17:35:16 +05:30

stock_reconciliation_item

Changed company name from Web Notes to Frappe Technologies

2015-03-03 14:56:43 +05:30

stock_settings

Changed company name from Web Notes to Frappe Technologies

2015-03-03 14:56:43 +05:30

stock_uom_replace_utility

Changed company name from Web Notes to Frappe Technologies

2015-03-03 14:56:43 +05:30

uom_conversion_detail

Changed company name from Web Notes to Frappe Technologies

2015-03-03 14:56:43 +05:30

warehouse

[cleanup] validate_email_add

2015-03-23 14:10:51 +05:30

__init__.py

moved modules inside erpnext folder

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