Rushabh Mehta d3e00995db [conflicts] [merged]		2013-05-02 16:02:59 +05:30
..
doctype	[conflicts] [merged]	2013-05-02 16:02:59 +05:30
DocType Mapper	fixes in packing slip	2013-04-16 12:29:27 +05:30
locale	Adding German translation	2013-02-27 17:36:23 +01:00
page	[conflicts] [merged]	2013-05-02 16:02:59 +05:30
Print Format	Other charges in currect currency fixes for all classic/modern/spartan print g=format	2013-01-25 17:24:47 +05:30
report	new employee_leave_balance_report	2013-02-22 17:54:50 +05:30
__init__.py	install from txt files, part 1	2013-01-16 17:48:17 +05:30
stock_ledger.py	fixed conflict	2013-03-19 18:29:05 +05:30
utils.py	fixes in gross profit report	2013-03-28 16:40:30 +05:30