Commit Graph

880 Commits

Author SHA1 Message Date
gRoussac
1a056d5e33 [-] BO : Fix bug #PSCFV-9310 bad type for input in helper thankx @Piotr Moćko 2013-07-15 14:47:38 +02:00
Gregory Roussac
5083cd6b5e Merge pull request #466 from PrestaEdit/patch-39
[*] BO: hook displayAdminForm / add param fieldset
2013-07-12 08:56:42 -07:00
Gregory Roussac
5b6c6a3ce9 Merge pull request #561 from BigZ/patch-5
[-] PDF : Get correct prefix for invoices
2013-07-12 08:44:24 -07:00
BigZ
f1049c021a get correct prefix for invoices
One must use the shop id when getting invoices prefix
2013-07-12 03:43:03 +02:00
BigZ
bd432641a0 update documents listing to display proper prefix
In order details, generic prefix was displayed in right column instead of shop specific prefix
2013-07-12 02:32:52 +02:00
Rémi Gaillard
12e7e3a44a [-] BO: display vat number field should not depends of the vatnumber module #PSCFV-9672 2013-07-04 17:00:27 +02:00
gRoussac
9dfe65cb17 [-] BO : Fix bug #PSCFV-8666 COD module association no more deleted when restrition on other currency 2013-07-02 14:51:25 +02:00
Damien Metzger
56aab3c676 // Fixed references to a "conversion rate" that was in fact the "exchange rate" 2013-07-01 12:14:50 +02:00
gRoussac
f824b537cf [-] BO : Fix bug #PSCFV-8619 update order weight when modifying products 2013-07-01 11:32:09 +02:00
Vincent Augagneur
38c4ea2775 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-01 10:11:31 +02:00
Vincent Augagneur
d6dcf7058f [-] BO : fixed bug #PSCFV-9622 2013-07-01 10:11:13 +02:00
gRoussac
349a10e2a9 // fix warnings 2013-06-28 17:58:04 +02:00
Damien Metzger
a8d96ed0c0 // Removed useless feature 2013-06-28 16:38:08 +02:00
Vincent Augagneur
dfc7456980 //replace some escape:'html' by addslashes in .tpl with javascript 2013-06-28 11:06:08 +02:00
Damien Metzger
57dd992c28 [-] FO : fixed entities issue in javascript alerts #PSCFV-9001 2013-06-26 16:22:57 +02:00
Damien Metzger
7427efdb6f // Added addlashes for some js messages 2013-06-26 15:52:40 +02:00
Vincent Augagneur
4627768092 [-] BO : fixed bug #PSCFV-7921 - Language selector (with flags) cant be translated 2013-06-25 15:51:24 +02:00
gRoussac
67e7487e3b [*] BO : Reselect current step in AdminOrders 2013-06-20 12:09:19 +02:00
Damien Metzger
cb95bf68a1 // Displaaaay 2013-06-18 15:58:32 +02:00
Damien Metzger
c04d2626f5 // Improved module list view 2013-06-18 15:34:58 +02:00
sLorenzini
39b679e97c [-] BO: fixed bug #PSCFV-7440 2013-06-18 14:20:59 +02:00
gRoussac
aea53e034a [*] BO : Enable current subtab active class 2013-06-17 18:27:07 +02:00
Damien Metzger
aefc22bb10 [-] BO : fixed quote issue with magic quote in customization in adminorders #PSCFV-9311 2013-06-17 11:40:35 +02:00
Damien Metzger
12e13e275f [-] BO : fixed ajax in permissions tab #PSCFV-7442 2013-06-14 11:20:38 +02:00
Vincent Augagneur
ff63e0a28c [-] BO : fixed bug #PSCFV-9405 - Delete file of downloadable product when cancel 2013-06-14 11:17:07 +02:00
Damien Metzger
ecf59957ba [-] FO : fixed pdf template #PSCFV-9430 2013-06-13 11:18:03 +02:00
Damien Metzger
aa41d6b762 // No escape in JS links 2013-06-07 12:33:44 +02:00
Damien Metzger
ca64179950 // W3C 2013-06-06 15:27:29 +02:00
PrestaEdit
f7f6175191 [*] BO: hook displayAdminForm / add param fieldset 2013-05-31 14:58:19 +02:00
gRoussac
ea5405a917 [-] CORE : Report of ec8deb2891 2013-05-27 19:06:59 +02:00
Daniel
c63ca0cdf8 Update _shipping.tpl
Added target="_blank" so when clicking on the tracking link, the user do not risk "loosing" the order by closing the tracking page by misstake.
2013-05-17 11:48:47 +08:00
gRoussac
9b615244b1 [-] BO : Fix "The controller adminnotound is missing or invalid." error when no controller get variable 2013-05-15 11:31:55 +02:00
sLorenzini
dc2b69f699 // BO: Improve product display on supplier page 2013-04-30 11:09:08 +02:00
Damien Metzger
e56ec2f234 // BO : Changed product display on supplier page 2013-04-29 18:34:34 +02:00
Damien Metzger
1921668596 [-] BO : Fixed display when you translate modules without theme selected 2013-04-25 17:47:07 +02:00
Francois Gaillard
8d735b333f // Release branch merged 2013-04-25 17:00:56 +02:00
gRoussac
91ab0362db [-] BO : Fix bug witth shop address and no state in country 2013-04-25 10:12:23 +02:00
Damien Metzger
7a76b8b6a0 // Removed deprecated block for new installs 2013-04-25 09:03:32 +02:00
gRoussac
7081e6d0d0 [-] BO : Fix bug for csv export 2013-04-24 17:29:36 +02:00
Damien Metzger
9eb84825a6 // Fix module translation in the core 2013-04-23 20:25:28 +02:00
Damien Metzger
c191b36fb6 // Fixed Chrome issue with cart rules 2013-04-23 15:30:17 +02:00
Vincent Augagneur
5e9ba185ef Merge pull request #390 from ccauw/patch-7
[*] BO : Add block "override_form_extra" in helper
2013-04-23 05:20:43 -07:00
Damien Metzger
d8313760ec // Remove "core" for the themes translations in the translation tool 2013-04-23 12:37:09 +02:00
Damien Metzger
7ce6502600 // Changed translation tool behavior with dev mode and overrides 2013-04-23 11:21:10 +02:00
vAugagneur
3d6d97af5f [*] BO : added new button on manufacturers view 2013-04-22 14:56:59 +02:00
Damien Metzger
e7b22ad8d4 // Fixed a few UI bugs in the stats 2013-04-22 11:57:36 +02:00
Vincent Augagneur
c643abcfa2 Merge pull request #123 from rynge/admin_category_breadcrumbs
[-] BO : Fixed a problem with the breadcrumbs in the admin category edit...
2013-04-22 01:18:15 -07:00
gRoussac
6e1f99f4b2 [-] BO : Fix bug #PSCFV-8843, no closing span in category-filter helper 2013-04-19 10:34:20 +02:00
ldecoker
a40f61e922 ";" in wrong place
Should be after display but inside quotes
2013-04-16 18:34:20 +03:00
ccauw
205e21ba16 [*] BO : Add block "override_form_extra" in helper
[*] BO : Add block "override_form_extra" in list_header.tpl


{if !$simple_header}

<form method="post" action="{$action}" class="form">



	{block name="override_form_extra"}{/block}




In AdminXxxxController, If we display list which are filtered by "variable" like

index.php?controller=AdminXxxx&variable=val&token=...

When using pagination or columns filters, the controller is called without our variable.

There are two methods to retrieve our variable: cookie or form Post.

To use the second opportunity, we need to put hidden input "variable" in the form.

So we need à block in the form to override.
2013-04-16 16:21:23 +03:00