 tDidierjean
|
64b14de8d2
|
// Fix AdminController translations not being parsed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13151 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 17:58:35 +00:00 |
|
|
tDidierjean
|
15b4c98b3a
|
// Fix some helper translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13149 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 17:38:14 +00:00 |
|
|
tDidierjean
|
d562138667
|
// Refactor smarty translate function for BO templates
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13148 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 17:28:45 +00:00 |
|
|
rMalie
|
6e56c8f32f
|
// Some memory optimizations in installer
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13147 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 17:25:28 +00:00 |
|
|
aKorczak
|
bb170150c5
|
[-] WS : Fix bug on translated_configurations entity
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13146 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 17:24:05 +00:00 |
|
|
lLefevre
|
78f345fe98
|
// Update list of emails files which are native
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13145 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 17:20:26 +00:00 |
|
|
aKorczak
|
c891bbc049
|
[*] WS : Add entity specific_prices
[*] WS : Add entity specific_price_rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13143 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 16:46:57 +00:00 |
|
|
rMalie
|
40a3a6ec51
|
// Fix shop association in installer with entity with delayed INSERT queries #PSFV-413
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13142 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 16:33:25 +00:00 |
|
|
rMalie
|
f2d8c6c700
|
// Add mail with identifiers in installer + some missing trad
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13140 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 16:07:41 +00:00 |
|
|
aKorczak
|
de544a8be4
|
[-] WS : Fix xlink
[*] WS : Add entity tax_rule_groups
[*] WS : Fix ObjectModel issue
[*] WS : Delete sqlId not used
[*] WS : Fix entity configurations
[*] WS : Fix entity translated_configurations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13138 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 15:42:53 +00:00 |
|
|
fBrignoli
|
f4d3ca50f1
|
// norm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13137 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 15:34:20 +00:00 |
|
|
fBrignoli
|
b8a8eb6e74
|
[-] BO : Removed unused JS
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13136 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 15:25:31 +00:00 |
|
|
rGaillard
|
d16b4bcf1e
|
// Debug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13135 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 14:55:47 +00:00 |
|
|
mDeflotte
|
b13cb58eb4
|
[-] BO : #PSTEST-680 - Fix translations problems with helpers templates
[-] BO : #PSTEST-678 - Fix translations problems with helpers templates
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13134 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 14:46:33 +00:00 |
|
|
rGaillard
|
4a4a4a79e5
|
// Clean code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13133 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 14:38:52 +00:00 |
|
|
rMalie
|
0d20a7a1db
|
// Fix langMultiShop in ObjectModel
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13132 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 14:33:52 +00:00 |
|
|
bMancone
|
f2920c2775
|
// code review
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13131 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 14:27:20 +00:00 |
|
|
rGaillard
|
8a5f37be1b
|
// Fix operator priority bug on class Shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13130 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 14:26:14 +00:00 |
|
|
bMancone
|
732179078e
|
// code review
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13128 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 14:19:52 +00:00 |
|
|
aFolletete
|
9f9d0fcb15
|
// fixed bug #PSTEST-578
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13127 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 14:17:12 +00:00 |
|
|
rMalie
|
f60b412373
|
// Improve definition in WS
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13126 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 14:04:20 +00:00 |
|
|
aFolletete
|
34c23ed3b5
|
[-] BO : fixed bug #PSTEST-640 - fixed bug on two float comparison
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13125 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 14:03:58 +00:00 |
|
|
bMancone
|
4883a94187
|
// Fixed AdminSupplyOrdersController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13124 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 13:44:57 +00:00 |
|
|
bMancone
|
020687d45f
|
// Fixed supply orders chane state form
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13123 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 13:44:19 +00:00 |
|
|
rGaillard
|
91c932f9f9
|
// Improve BackOffice Order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13122 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 13:34:53 +00:00 |
|
|
rGaillard
|
0ae248a2bc
|
// Improve/debug SpecificPriceRule
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13121 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 13:23:04 +00:00 |
|
|
mMarinetti
|
eb8f07d510
|
// upgrader fix module_preference table created during upgrade
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13119 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 12:40:35 +00:00 |
|
|
tDidierjean
|
ea66e0076d
|
// move product combination override tpls to correct folder
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13118 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 10:51:47 +00:00 |
|
|
mDeflotte
|
33f481203b
|
// blocklayered, up version number, fix bug on IE8, plus change filter category ordering
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13114 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 10:29:08 +00:00 |
|
|
aKorczak
|
1f615bcc4b
|
[*] WS : From 1.4 (PHP as CGI management)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13113 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 10:28:14 +00:00 |
|
|
mMarinetti
|
c01de935dc
|
// fix a false positive issue in upgrade process (thanks again to Vincent Grimaud)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13112 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 10:15:12 +00:00 |
|
|
mDeflotte
|
fce0745413
|
// Little fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13107 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 09:44:02 +00:00 |
|
|
mMarinetti
|
88c10c66ed
|
// now upgrade result has result=error when only php errors happens, thanks to Vincent Grimaud
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13105 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 09:35:45 +00:00 |
|
|
mDeflotte
|
a1a1ea14cc
|
// [+] Blocklayered : Add avaibility to set filter category depth
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13103 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 09:20:26 +00:00 |
|
|
aKorczak
|
7ffaa9be49
|
[*] WS : Add Tax rules entity
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13100 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 09:05:28 +00:00 |
|
|
rMalie
|
7e03a9b187
|
// Revert test jenkins
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13099 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 08:43:17 +00:00 |
|
|
rMalie
|
f6d1badcc8
|
// test post commit jenkins
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13098 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 08:42:46 +00:00 |
|
|
rMalie
|
7e26fbaf4d
|
// Improve installer
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13097 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 08:39:14 +00:00 |
|
|
aKorczak
|
b973003e04
|
[*] WS : Fix, Webservice use definitions property instead of fieldsValidate, fieldsRequired, etc..
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13094 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-07 17:29:04 +00:00 |
|
|
fBrignoli
|
ddea6184ef
|
// test 2
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13093 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-07 17:28:35 +00:00 |
|
|
fBrignoli
|
010d4a66f0
|
// test
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13092 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-07 17:27:57 +00:00 |
|
|
aKorczak
|
749b2d2f57
|
[*] WS : Fix, Webservice use definitions property instead of fieldsValidate, fieldsRequired, etc..
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13091 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-07 17:26:39 +00:00 |
|
|
mDeflotte
|
8dc8455e78
|
// fix bug with missing $context->cart and $context->customer durring payment process
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13089 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-07 17:15:44 +00:00 |
|
|
bMancone
|
124eb9c676
|
// Improved Supply Order Form (PDF)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13088 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-07 17:02:34 +00:00 |
|
|
rGaillard
|
76e9fa8aa2
|
// Fix AdminOrders - do not move form.tpl to the helpers directory
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13085 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-07 16:49:13 +00:00 |
|
|
rMalie
|
b5210b376c
|
// Add some translations for english, spanish and italian in installer
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13084 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-07 16:28:34 +00:00 |
|
|
rMalie
|
9b63743dfd
|
// French translation of installer
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13082 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-07 15:48:25 +00:00 |
|
|
aFolletete
|
11a74c652a
|
// clean code && fix norm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13081 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-07 15:31:59 +00:00 |
|
|
mDeflotte
|
29002976ed
|
// Fix bug with new logo working
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13080 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-07 15:30:23 +00:00 |
|
|
bMancone
|
3f6b317c1b
|
// Fixed getLogo()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13079 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-07 15:22:52 +00:00 |
|