mbauskar 5d0c4361ab resolved merged conflicts		2017-08-28 11:58:44 +05:30
..
emails	Remove inline styling, add css classes (#10077)	2017-07-26 18:46:13 +05:30
form_grid	[minor] fix ellipsis style	2016-11-02 07:34:17 +05:30
generators	Merge branch 'master' into develop	2017-05-23 12:04:06 +05:30
includes	resolved merged conflicts	2017-08-28 11:58:44 +05:30
pages	Fixes in Order / Quotation (#10361)	2017-08-10 21:06:09 +05:30
print_formats/includes	Set company address while making invoice from SO, don't show taxes in print if amount is zero, fixed state code	2017-07-12 19:21:05 +05:30
__init__.py	Redesigned templates. Now all templates must be inside templates/pages templates/generators	2013-12-25 15:19:22 +05:30
utils.py	Fix contact form if email is both customer and lead (#9075)	2017-06-01 19:08:04 +05:30