f1049c021a
get correct prefix for invoices
...
One must use the shop id when getting invoices prefix
2013-07-12 03:43:03 +02:00
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
68d135b4cf
Payment currency restriction incorret type of input for radio
...
When payment module has currencies restrictions set to radio it still displays as checkbox because in TPL file type of input is not being changed
2013-07-11 18:56:50 +02:00
12e7e3a44a
[-] BO: display vat number field should not depends of the vatnumber module #PSCFV-9672
2013-07-04 17:00:27 +02:00
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
006e8718f2
// Improved label of IETF language tag
2013-07-01 12:35:32 +02:00
56aab3c676
// Fixed references to a "conversion rate" that was in fact the "exchange rate"
2013-07-01 12:14:50 +02:00
f824b537cf
[-] BO : Fix bug #PSCFV-8619 update order weight when modifying products
2013-07-01 11:32:09 +02:00
38c4ea2775
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-01 10:11:31 +02:00
d6dcf7058f
[-] BO : fixed bug #PSCFV-9622
2013-07-01 10:11:13 +02:00
349a10e2a9
// fix warnings
2013-06-28 17:58:04 +02:00
a8d96ed0c0
// Removed useless feature
2013-06-28 16:38:08 +02:00
dfc7456980
//replace some escape:'html' by addslashes in .tpl with javascript
2013-06-28 11:06:08 +02:00
57dd992c28
[-] FO : fixed entities issue in javascript alerts #PSCFV-9001
2013-06-26 16:22:57 +02:00
7427efdb6f
// Added addlashes for some js messages
2013-06-26 15:52:40 +02:00
4627768092
[-] BO : fixed bug #PSCFV-7921 - Language selector (with flags) cant be translated
2013-06-25 15:51:24 +02:00
f4a5dd1409
[*] BO: more than one image in HelperForm
2013-06-21 23:02:51 +03:00
67e7487e3b
[*] BO : Reselect current step in AdminOrders
2013-06-20 12:09:19 +02:00
cb95bf68a1
// Displaaaay
2013-06-18 15:58:32 +02:00
fd0bc675e5
// Fixed display
2013-06-18 15:54:29 +02:00
c62dc3dc7a
[-] BO: fixed bug button on module list
2013-06-18 15:39:48 +02:00
48db491c2e
[-] BO: fixed bug #PSCFV-9463 + improve some css on BO menu
2013-06-18 15:39:46 +02:00
c04d2626f5
// Improved module list view
2013-06-18 15:34:58 +02:00
3daf4cdb99
[-] BO: fixed bug #PSCFV-9461
2013-06-18 14:46:09 +02:00
39b679e97c
[-] BO: fixed bug #PSCFV-7440
2013-06-18 14:20:59 +02:00
aea53e034a
[*] BO : Enable current subtab active class
2013-06-17 18:27:07 +02:00
aefc22bb10
[-] BO : fixed quote issue with magic quote in customization in adminorders #PSCFV-9311
2013-06-17 11:40:35 +02:00
3a5a9dea14
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-06-15 01:57:46 +02:00
ce9f262feb
[-] BO : Upload image name with trailing slash in name
2013-06-15 01:55:02 +02:00
12e13e275f
[-] BO : fixed ajax in permissions tab #PSCFV-7442
2013-06-14 11:20:38 +02:00
ff63e0a28c
[-] BO : fixed bug #PSCFV-9405 - Delete file of downloadable product when cancel
2013-06-14 11:17:07 +02:00
6a2eddd81f
[-] BO : fix require path to config.inc.php
2013-06-13 17:59:01 +02:00
ecf59957ba
[-] FO : fixed pdf template #PSCFV-9430
2013-06-13 11:18:03 +02:00
aa41d6b762
// No escape in JS links
2013-06-07 12:33:44 +02:00
ca64179950
// W3C
2013-06-06 15:27:29 +02:00
66522c4a2c
// Add translate() as deprecated
2013-06-03 22:46:52 +02:00
6ae0dbb4ca
[*] BO: use Translate::getAdminTranslation instead of translate()
2013-06-01 00:21:28 +02:00
f7f6175191
[*] BO: hook displayAdminForm / add param fieldset
2013-05-31 14:58:19 +02:00
ea5405a917
[-] CORE : Report of https://github.com/PrestaShop/PrestaShop-1.4/commit/ec8deb289185daa03cd11d239797bbe5bdbaecd0
2013-05-27 19:06:59 +02:00
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
9b615244b1
[-] BO : Fix "The controller adminnotound is missing or invalid." error when no controller get variable
2013-05-15 11:31:55 +02:00
00bd78e843
// BO: Improve product display on supplier page
2013-04-30 11:09:08 +02:00
dc2b69f699
// BO: Improve product display on supplier page
2013-04-30 11:09:08 +02:00
548ef7691a
// BO : Changed product display on supplier page
2013-04-29 18:34:34 +02:00
e56ec2f234
// BO : Changed product display on supplier page
2013-04-29 18:34:34 +02:00
8331ab0c1a
[-]BO : bug color parameter in List
...
[-]BO : bug color parameter in List
In field list, if there is another field with 'color' => 'color_field', (and color_field column in the select), the background color is always the value of field list column 'color', never 'color_field'
the lines:
{block name="td_content"}
...
{if isset($params.color) && isset($tr[$params.color])}
<span class="color_field" style="background-color:{$tr.color};...
{/if}
must be:
{block name="td_content"}
...
{if isset($params.color) && isset($tr[$params.color])}
<span class="color_field" style="background-color:{$tr[$params.color])};...
{/if}
In the fields list, for display list, there is :
'osname' => array(
'title' => $this->l('Status'),
'color' => 'color',
...
),
'color parameter gives the name of column in _List to be used as color background.
Currently, it is the same 'color' parameter which is used for one field and the row: (ex:osname)
<span class="color_field" style="background-color:{$tr.color};...
But if there is another field with 'color' => 'color_field', (and color_field in the select), the background color is always 'color', never 'color_field'
That can be fixed with :
<span class="color_field" style="background-color:{$tr[$params.color])};...
So the background color of the row (if colorOnBackground = true) and one row's field will be the value of the column given by 'color'=>'color', and The background color of others fields will be the value of the column given by their parameter 'color'=>'<color_field>'
$this->_select = '..color ..., ... color_field2 ...';
$this->fields_list = array(
'field1' => array(
'title' => $this->l('Status'),
'color' => 'color', // will also be the bg color of the row
...
),
'field2' => array(
'title' => $this->l('Status'),
'color' => 'color_field2',
...
),
'field2' => array(
'title' => $this->l('Status'),
'color' => 'color_field3',
...
),
2013-04-28 16:01:55 +03:00
6251815c37
[-] BO : Fixed display when you translate modules without theme selected
2013-04-25 17:47:07 +02:00
1921668596
[-] BO : Fixed display when you translate modules without theme selected
2013-04-25 17:47:07 +02:00
6106066ef1
// Release branch merged
2013-04-25 17:00:56 +02:00
8d735b333f
// Release branch merged
2013-04-25 17:00:56 +02:00
BigZ