Commit Graph

37 Commits

Author SHA1 Message Date
Kevin Granger
94de4d3d2f 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
2013-07-26 18:55:18 +02:00
Kevin Granger
9f9c0ef416 [+] BO Orders 2013-07-26 18:54:28 +02:00
Jérôme Nadaud
f3ca8ec15b [+] BO : Handler invoice date generation button 2013-07-26 17:23:15 +02:00
Kevin Granger
1a2b78b00f [+] BO Invoices 2013-07-26 15:34:11 +02:00
sLorenzini
66f64c1baa // update order tab 2013-07-15 17:58:23 +02:00
fram
77efe4c04e // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
djfm
714a5e08cc //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
Rémi Gaillard
1900700f1b [-] BO: Fix #PSCFV-6415 php notice 2013-01-02 16:21:54 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
lLefevre
6588f9514c // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
398d345362 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
tDidierjean
e0664df6f8 // Renaming options to fields_options 2012-03-29 16:14:14 +00:00
fBrignoli
49f72de495 // PDF override 2012-03-28 15:28:29 +00:00
rMalie
6cf9ef197d // Fix problems with display of PDF with multishop #PSFV-643 admin/pdf.php is now deprecated 2012-03-26 16:00:05 +00:00
lLefevre
74cd81a66c // Fix replace //" by " in english keys and change french keys 2012-03-14 17:25:41 +00:00
lLefevre
05c2b696ce // revert to revision 14160 2012-03-14 15:05:13 +00:00
lLefevre
6608328a2a // Fix replace \\" by " in english keys 2012-03-14 14:58:48 +00:00
lLefevre
c21bef2acf // Fix update english key of translations in all files 2012-03-14 12:25:51 +00:00
rMalie
67b5b28880 // Remove AdminPdf controller and move its configuration in AdminInvoices controller 2012-02-29 12:41:05 +00:00
rMalie
394c493efc // Improve multishop_context in AdminController and rename shop->getListOfID() by Shop::getContextListShopID() 2012-02-27 09:49:19 +00:00
rMalie
1dc629a949 // Welcome 2012² 2012-02-23 16:33:10 +00:00
mMarinetti
677a4e485c // Welcome 2012 2012-02-22 09:28:22 +00:00
tDidierjean
88b3c8f9e7 // Refactor AdminController::_errors to errors 2012-01-11 08:58:12 +00:00
lLefevre
4029364b05 [-] BO : fix small bug for translations 2012-01-05 08:45:23 +00:00
aFolletete
5e70aadeb7 // change error message in AdminInvoices 2012-01-03 09:45:57 +00:00
aFolletete
4cd3d5699f [-] BO : fixed bug on Delivery slip generation in AdminDeliverySlip 2012-01-02 18:16:09 +00:00
aFolletete
92977632db [-] BO : fixed bug on Invoice generation in AdminInvoices 2012-01-02 17:30:11 +00:00
jBreux
9740cfeb92 [+] Project : B2B Features 2011-12-22 15:30:21 +00:00
vKham
f88e5df23f // fix bug page commande facture 2011-12-08 16:50:34 +00:00
fBrignoli
7e336331d9 // OrderInvoice PDF compliant 2011-12-01 14:24:17 +00:00
tDidierjean
885701b27a // Rename AdminController methods initForm() initList() etc. to renderForm() renderList() 2011-11-30 11:06:38 +00:00
lLefevre
13ad8ed11c // fix bug added pluging datepicker 2011-11-28 17:19:07 +00:00
tDidierjean
c4a0a95af9 // HelperForm : 'p' replaced by 'desc' 2011-11-18 18:27:48 +00:00
lLefevre
2837f230ab //fix added toolbar in AdminInvoicesController and change initForm() method 2011-11-18 10:28:21 +00:00
tDidierjean
2b086696a8 [*] BO : #PSFV-94 - added AdminSlipController 2011-10-28 16:07:40 +00:00
tDidierjean
b9cf3b3afb [*] BO : #PSFV-94 - added AdminInvoicesController and missing geolocation template 2011-10-21 12:20:37 +00:00