gRoussac
|
1358c696cd
|
[-] BO : Fix #PSCFV-10678 warning in chrome
|
2013-10-14 11:37:15 +02:00 |
|
Francois Gaillard
|
77b2b4b6ca
|
// Manual merge PS 1.5.6.0
|
2013-10-07 18:22:55 +02:00 |
|
PhpMadman
|
f979cbef57
|
[*] BO: missing align on order for product warehouse
|
2013-10-03 15:26:09 +02:00 |
|
Jerome Nadaud
|
43a60f1b57
|
[-] BO : FixBug #PSCFV-9044 - Missing state in new order, and now you can edit customer addresses
|
2013-10-03 11:06:08 +02:00 |
|
Damien Metzger
|
250a9f17a2
|
[-] BO : managed decimal format in BO orders
|
2013-10-02 15:47:21 +02:00 |
|
Damien Metzger
|
a876b13c1c
|
[-] BO : fixed currency format on order creation
|
2013-10-02 12:10:54 +02:00 |
|
djfm
|
1cce312aaa
|
// orthograph
|
2013-09-30 16:15:53 +00:00 |
|
Rémi Gaillard
|
47c5f400ee
|
// Add gender on order view
|
2013-09-17 16:30:47 +02:00 |
|
gRoussac
|
dfdbe39ee3
|
[-] BO : Small changes when creating vouchers in back office orders
|
2013-09-11 16:28:11 +02:00 |
|
Jerome Nadaud
|
155fd516ba
|
// Misplaced if
|
2013-08-19 14:41:08 +02:00 |
|
Rémi Gaillard
|
24ac8582bf
|
[*] BO: Warehouse name is now displayed on each product line orders
|
2013-08-14 15:02:30 +02:00 |
|
Nils-Helge Garli Hegvik
|
b362c808dc
|
Fixed fieldset issue when customer is a guest
|
2013-07-31 12:25:35 +02:00 |
|
djfm
|
3c59c5e779
|
//replaced all js='1' with js=1 so that the translation regexes don't fail
|
2013-07-22 09:34:18 +00: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 |
|
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 |
|
gRoussac
|
349a10e2a9
|
// fix warnings
|
2013-06-28 17:58:04 +02:00 |
|
Vincent Augagneur
|
dfc7456980
|
//replace some escape:'html' by addslashes in .tpl with javascript
|
2013-06-28 11:06:08 +02:00 |
|
gRoussac
|
67e7487e3b
|
[*] BO : Reselect current step in AdminOrders
|
2013-06-20 12:09:19 +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
|
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 |
|
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
|
01bcb38522
|
[-] BO : Fix bug #PSCFV-8620 returns with customized product
|
2013-04-09 10:37:15 +02:00 |
|
Rémi Gaillard
|
5d324a755d
|
[-] BO: Clear cart when customer is changed in back office orders #PSCFV-8520
|
2013-04-02 16:02:00 +02:00 |
|
Francois Gaillard
|
77871338c6
|
// Release branch merged
|
2013-03-27 10:25:16 +01:00 |
|
Rémi Gaillard
|
0a54da23d8
|
// small fix for value of default refund displayed
|
2013-03-19 13:50:21 +01:00 |
|
Rémi Gaillard
|
f483feb53d
|
[-] Core: Fix #PSCFV-8293 bad sql vars name on Order::getShipping() #PSCFV-8293
|
2013-03-18 11:05:06 +01:00 |
|
Francois Gaillard
|
7f3678a776
|
Merge branch 'release' into development
|
2013-03-14 16:39:47 +01:00 |
|
Rémi Gaillard
|
0da58b215c
|
[-] BO: Fix update of delivery address on backoffice orders
|
2013-03-14 15:25:38 +01:00 |
|
fram
|
77efe4c04e
|
// changed English strings, especially focusing on colons harmonization
|
2013-03-12 19:39:30 +01:00 |
|
gRoussac
|
6f6a58e8f3
|
[*] Bo : Fix #PSCFV-7989 red quantity > 1 on orders again
|
2013-03-04 11:26:19 +01:00 |
|
gRoussac
|
ddcd63b9cc
|
[*] FO : Fix #PSCFV-7989 red quantity > 1 on orders
|
2013-03-04 10:23:03 +01:00 |
|
Rémi Gaillard
|
70b4ca535e
|
[-] BO: Fix #PSCFV-7427 group id used for price computation on order edition
|
2013-02-08 15:02:15 +01:00 |
|
Rémi Gaillard
|
d72ce0d892
|
[-] BO: get the invoice prefix from the right shop
|
2013-02-04 15:11:29 +01:00 |
|
Rémi Gaillard
|
459244002e
|
[-] BO: Fix #PSCFV-7576
|
2013-01-31 16:54:30 +01:00 |
|
gRoussac
|
39d7863eac
|
[-] BO : fix css for iframe of custom products when creating order in BO
|
2013-01-23 18:38:00 +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 |
|
Gregory Roussac
|
dbb8a9f2e0
|
[-] FO : Fix html entities in order messages and threads
|
2012-12-27 12:23:10 +01:00 |
|
vAugagneur
|
bfff958b1f
|
Merge pull request #75 from @sebastienhouzet
|
2012-12-12 11:24:56 +01:00 |
|
Rémi Gaillard
|
8d2f5d6e42
|
[-] BO: don't display stock available if stock management is disabled #PSCFV-6029
|
2012-12-11 16:59:26 +01:00 |
|
vAugagneur
|
8d6433f48f
|
[-] BO : fixed bug #PSCFV-5610 Credit slip reference is too short
[*] BO : added prefix on credit slip reference
|
2012-11-28 10:56:43 +01:00 |
|
vAugagneur
|
be946319be
|
//remove svn keyword @version Release: $
|
2012-11-22 11:57:40 +01:00 |
|
rGaillard
|
604a900239
|
// small fix
|
2012-10-23 09:53:57 +00:00 |
|
rGaillard
|
bd4ba0d2e5
|
// small fix
|
2012-10-23 09:48:41 +00:00 |
|
rGaillard
|
fc19914c85
|
[-] Core: Fix cache issue and order slip pdf generation
|
2012-10-22 12:40:15 +00:00 |
|