Nabin Hait fa06ee80e9 Fixed merge conflict

2018-07-27 12:54:00 +05:30

..

__init__.py

…

accounts.py

…

education.py

Fixed merge conflict

2018-07-27 12:54:00 +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

minor fix

2018-04-26 16:32:17 +05:30

manufacturing.py

Minor fixes (#13609)

2018-04-12 13:21:16 +05:30

projects.py

…

purchase.py

Pass buying or selling as filter parameters

2018-05-15 17:22:06 +05:30

sales.py

Pass buying or selling as filter parameters

2018-05-15 17:22:06 +05:30

stock.py

[minor] Added batch item in the demo data

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