Akhilesh Darjee e0a1039756 merge conflict fixed

2014-01-30 14:44:35 +05:30

..

batch

added explicit delete perimssions

2014-01-20 17:52:13 +05:30

bin

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

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

delivery_note

changed fieldname from charge to taxes

2014-01-28 19:16:05 +05:30

delivery_note_item

Fliend rearrangemet in tables

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

item

webnotes/erpnext#1090 set default tax type in customer and supplier

2014-01-29 16:31:38 +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

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

2014-01-24 21:44:36 +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

webnotes/erpnext#1090 set default tax type in customer and supplier

2014-01-29 16:31:38 +05:30

material_request

BugFix: Production Planning Tool - get_raw_materials

2014-01-24 21:47:01 +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

added explicit delete perimssions

2014-01-20 17:52:13 +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

2014-01-30 12:32:47 +05:30

purchase_receipt

webnotes/erpnext#1090 set default tax type in customer and supplier

2014-01-29 16:31:38 +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

Fixed conflict while merging with develop

2014-01-30 12:32:47 +05:30

stock_entry

merge conflict fixed

2014-01-30 14:44:35 +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

Fixed conflict while merging with develop

2014-01-30 12:32:47 +05:30

stock_reconciliation

added explicit delete perimssions

2014-01-20 17:52:13 +05:30

stock_settings

Fixed conflict while merging with develop

2014-01-30 12:32:47 +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 remote-tracking branch 'webnotes/develop' into 4.0.0-wip

2014-01-24 21:44:36 +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