Nabin Hait 223897f145 fixes merge conflict

2013-01-21 17:30:35 +05:30

..

batch

fixes merge conflict

2013-01-21 17:30:35 +05:30

bin

added report permissions to txt files

2013-01-21 14:22:07 +05:30

delivery_note

added report permissions to txt files

2013-01-21 14:22:07 +05:30

delivery_note_item

bootstrapped language and added 'hi'

2013-01-07 15:39:54 +05:30

delivery_note_packing_item

bootstrapped language and added 'hi'

2013-01-07 15:39:54 +05:30

featured_item

bootstrapped language and added 'hi'

2013-01-07 15:39:54 +05:30

item

merge

2013-01-21 10:23:21 +05:30

item_customer_detail

bootstrapped language and added 'hi'

2013-01-07 15:39:54 +05:30

item_price

updates in purchase cycle's price list

2013-01-17 20:20:56 +05:30

item_quality_inspection_parameter

bootstrapped language and added 'hi'

2013-01-07 15:39:54 +05:30

item_supplier

bootstrapped language and added 'hi'

2013-01-07 15:39:54 +05:30

item_tax

bootstrapped language and added 'hi'

2013-01-07 15:39:54 +05:30

item_website_specification

bootstrapped language and added 'hi'

2013-01-07 15:39:54 +05:30

landed_cost_item

bootstrapped language and added 'hi'

2013-01-07 15:39:54 +05:30

landed_cost_master

added report permissions to txt files

2013-01-21 14:22:07 +05:30

landed_cost_master_detail

bootstrapped language and added 'hi'

2013-01-07 15:39:54 +05:30

landed_cost_purchase_receipt

bootstrapped language and added 'hi'

2013-01-07 15:39:54 +05:30

landed_cost_wizard

Merge branch 'master' of github.com:webnotes/erpnext into stock_reco

2013-01-09 11:25:34 +05:30

packing_slip

added report permissions to txt files

2013-01-21 14:22:07 +05:30

packing_slip_item

bootstrapped language and added 'hi'

2013-01-07 15:39:54 +05:30

purchase_receipt

added report permissions to txt files

2013-01-21 14:22:07 +05:30

purchase_receipt_item

bootstrapped language and added 'hi'

2013-01-07 15:39:54 +05:30

sales_and_purchase_return_tool

started fresh install and added country_info

2013-01-17 18:22:22 +05:30

sales_bom

added report permissions to txt files

2013-01-21 14:22:07 +05:30

sales_bom_item

bootstrapped language and added 'hi'

2013-01-07 15:39:54 +05:30

serial_no

added report permissions to txt files

2013-01-21 14:22:07 +05:30

stock_entry

added report permissions to txt files

2013-01-21 14:22:07 +05:30

stock_entry_detail

stock reco fixes with testcases

2013-01-11 19:25:46 +05:30

stock_ledger

-m

2013-01-14 15:46:17 +05:30

stock_ledger_entry

added report permissions to txt files

2013-01-21 14:22:07 +05:30

stock_reconciliation

Merge branch 'master' into purchase_price_list

2013-01-17 10:58:41 +05:30

stock_uom_replace_utility

Merge branch 'master' of github.com:webnotes/erpnext into stock_reco

2013-01-14 13:28:31 +05:30

uom_conversion_detail

bootstrapped language and added 'hi'

2013-01-07 15:39:54 +05:30

valuation_control/locale

Merge branch 'master' of github.com:webnotes/erpnext into stock_reco

2013-01-09 11:25:34 +05:30

warehouse

added report permissions to txt files

2013-01-21 14:22:07 +05:30

__init__.py

moved directory structure

2012-09-24 19:13:42 +05:30