Conflicts:
	htdocs/core/class/conf.class.php
	htdocs/langs/en_US/productbatch.lang

Conflicts:
	build/debian/changelog
	htdocs/core/tpl/objectline_create.tpl.php

Conflicts:
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php

for release.

a limit to avoid problem with very large database.

GPCsolutions-3.7-transifex

Conflicts:
	htdocs/langs/pt_BR/oscommerce.lang

add feature to put box on other pages.

Untranslatable token Calendar in datepicker

Typo

invoice tables.

was wrong because product added was a free product using default value
for accountancy code. Fix is to choose product into member module
page.