Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

# By Jérôme Nadaud
# Via Jérôme Nadaud
* 'bootstrap' of https://github.com/PrestaShop/PrestaShop:
  [-] BO : Order template misplaced empty form
  [+] BO : Handler invoice date generation button
This commit is contained in:
Kevin Granger
2013-07-26 18:55:18 +02:00
2 changed files with 449 additions and 468 deletions