[fixes][merge conflict]

This commit is contained in:
Nabin Hait
2013-06-05 12:53:53 +05:30
14 changed files with 397 additions and 133 deletions

View File

@@ -254,6 +254,7 @@ patch_list = [
"patches.may_2013.p04_reorder_level",
"patches.may_2013.p05_update_cancelled_gl_entries",
"patches.may_2013.p06_make_notes",
"patches.may_2013.p06_update_billed_amt_po_pr",
"patches.may_2013.p07_move_update_stock_to_pos",
"patches.may_2013.p08_change_item_wise_tax",
"patches.june_2013.p01_update_bom_exploded_items",