Nabin Hait f68d563a68 [minor] fixed conflict while merging with master

2013-08-21 17:49:26 +05:30

..

__init__.py

[salary slip] total no. of working days calculation [issue] webnotes/erpnext#285

2013-08-02 19:31:41 +05:30

p01_hr_settings.py

[minor] [fix] bring back onload_post_render in transaction.js - ref: a9b1c091665bc35bdc516d9556e859de3b472bd5

2013-08-06 17:23:44 +05:30

p01_perpetual_accounting_patch.py

[perpetual accounting] [minor] patch for intial setup

2013-08-12 12:24:08 +05:30

p02_rename_price_list.py

[fix] [minor] reload shopping_cart_price_list

2013-08-15 14:39:12 +05:30

p03_pos_setting_replace_customer_account.py

Merge branch 'master' of git://github.com/akhileshdarjee/erpnext into akhileshdarjee-master

2013-08-12 20:00:33 +05:30

p05_employee_birthdays.py

[fix] [minor] reload event on birthday patch

2013-08-15 14:30:46 +05:30

p05_update_serial_no_status.py

[Serial No] Major updates, code cleanup, "In Store" is now "Available". Serial No can only be created via Stock Entry / Purchase Receipt. Serial No can be auto created using Series if mentioned in Item master

2013-08-14 18:39:27 +05:30

p06_deprecate_cancelled_sl_entry.py

[cleanup] [minor] deprecated cancelled stock ledger entry

2013-08-20 12:04:46 +05:30

p06_fix_sle_against_stock_entry.py

[fix] [patch] [minor] sle for deleted stock entry detail

2013-08-20 20:06:14 +05:30