Nabin Hait 54361e8651 fixed conflict while merging develop into v5

2014-12-31 13:24:36 +05:30

..

__init__.py

updated pos invoice

2014-07-25 13:01:53 +05:30

pos_invoice.json

fixed conflict while merging develop into v5

2014-12-31 13:24:36 +05:30