Nabin Hait 719f2803b3 Fixed conflict while merging with develop branch

2014-01-20 17:01:28 +05:30

..

batch

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

bin

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

delivery_note

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

delivery_note_item

Fliend rearrangemet in tables

2014-01-01 10:45:42 +05:30

item

Fixed conflict while merging with develop brnach

2014-01-20 16:48:49 +05:30

item_customer_detail

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

item_price

Fixed conflict while merging with develop brnach

2014-01-20 16:48:49 +05:30

item_quality_inspection_parameter

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

item_reorder

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

item_supplier

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

item_tax

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

item_website_specification

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

landed_cost_item

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

landed_cost_purchase_receipt

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

landed_cost_wizard

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

material_request

Fixed conflict while merging with develop brnach

2014-01-20 16:48:49 +05:30

material_request_item

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

packed_item

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

packing_slip

Fliend rearrangemet in tables

2014-01-01 10:45:42 +05:30

packing_slip_item

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

price_list

Fixed conflict while merging with develop brnach

2014-01-20 16:48:49 +05:30

purchase_receipt

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

purchase_receipt_item

Fixed conflict while merging with develop brnach

2014-01-20 16:48:49 +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

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

stock_entry

Fliend rearrangemet in tables

2014-01-01 10:45:42 +05:30

stock_entry_detail

Fixed conflict while merging with develop brnach

2014-01-20 16:48:49 +05:30

stock_ledger

install, web serving, session booting webnotes/wnframework#351

2013-12-12 19:12:19 +05:30

stock_ledger_entry

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

stock_reconciliation

Fixed conflict while merging with develop branch

2014-01-20 17:01:28 +05:30

stock_settings

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

stock_uom_replace_utility

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

uom_conversion_detail

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

warehouse

Merge fixes: removed patches, removed Warehouse User

2013-12-27 18:00:28 +05:30

warehouse_user

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

__init__.py

moved modules inside erpnext folder

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