Nabin Hait 2b682c82e8 Fixed merge conflict

2018-04-04 11:40:16 +05:30

..

__init__.py

[demo] new cleaner, more-flexible demo

2016-07-04 11:39:25 +05:30

accounts.py

[fix] demo and process payroll for demo (#7224)

2016-12-15 11:27:35 +05:30

education.py

Use range instead xrange (#13128)

2018-02-28 16:12:51 +05:30

fixed_asset.py

Added maintenance to Asset and enhanced maintenance for Asset Maintenance

2017-11-28 15:14:56 +05:30

hr.py

Fixed merge conflict

2018-04-04 11:40:16 +05:30

manufacturing.py

[ Enhance ] Production to Work Order (#12902)

2018-03-20 12:38:43 +05:30

projects.py

rename total_billing_amount to total_billable_amount in timesheet doctype

2016-09-12 19:06:41 +05:30

purchase.py

Use range instead xrange (#13128)

2018-02-28 16:12:51 +05:30

sales.py

Use range instead xrange (#13128)

2018-02-28 16:12:51 +05:30

stock.py

[minor] Added batch item in the demo data

2017-09-28 15:19:26 +05:30