 mDeflotte
|
12dfd76711
|
// Blocklayered : Copy translation from branche 1.4
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15816 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-04 09:45:13 +00:00 |
|
|
vChabot
|
e3722a71e0
|
// little fix Shop class condition
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15815 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-04 09:43:25 +00:00 |
|
|
mDeflotte
|
eb475b1a78
|
[-] MO : #PSCFV-2640 - Fix bug with blocklayered and multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15813 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-04 09:41:18 +00:00 |
|
|
lLefevre
|
3431b10465
|
[-] BO : #PSCFV-2661 : Fix translation when use parent::displayError() in modules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15811 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-04 09:17:33 +00:00 |
|
|
mDeflotte
|
0cf1fc870c
|
// Fix bug with bad SQL request on changing state of an order paid by check
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15810 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-04 09:09:51 +00:00 |
|
|
vAugagneur
|
c5662b742c
|
[-] BO : fixed bug #PSCFV-2665
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15809 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-04 09:08:37 +00:00 |
|
|
mDeflotte
|
ea601eb639
|
[-] BO : #PSCFV-2542 - Fix bug : Unable to translate PaymentModule : some email terms are still in english
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15808 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-04 09:07:30 +00:00 |
|
|
rMalie
|
e01aa221ff
|
// Fix SSL with multishop #PSCFV-2646
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15806 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-04 08:59:10 +00:00 |
|
|
rMalie
|
4f4ac2f26c
|
// Fix SSL with multishop #PSCFV-2646
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15805 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-04 08:52:42 +00:00 |
|
|
fBrignoli
|
00047b3bea
|
// toolbar one more time
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15804 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-04 08:41:31 +00:00 |
|
|
dMetzger
|
564903dfdf
|
// Fixed #PSCFV-2605
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15803 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-04 08:23:28 +00:00 |
|
|
lLefevre
|
ae2da2fc11
|
[-] BO : #PSCFV-2626 : fix bug in localization pack for the currency format
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15802 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-04 08:08:32 +00:00 |
|
|
rMalie
|
b6f84715b6
|
// Hide checkbox in configuration multishop when employee manage only 1 shop #PSCFV-2649
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15800 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-04 07:49:20 +00:00 |
|
|
lLefevre
|
dd8abfe708
|
[-] BO : #PSCFV-2660 : Fix bug in regex for parse translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15799 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-04 07:41:01 +00:00 |
|
|
lLefevre
|
c0806524fe
|
[-] BO : #PSCFV-2661 : Fix translation when use parent::displayError() in modules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15798 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-04 07:22:02 +00:00 |
|
|
mDeflotte
|
d02787dc97
|
[-] Project : #PSCFV-2633 #PSCFV-2622 - Fix problems with multishipping and order payment & invoice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15797 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-01 15:40:32 +00:00 |
|
|
vAugagneur
|
54fd1c0dcb
|
[-] BO : fixed bug #PSCFV-2652
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15795 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-01 15:13:04 +00:00 |
|
|
lLefevre
|
fa93f8f025
|
// Update translations key
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15793 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-01 14:58:25 +00:00 |
|
|
vAugagneur
|
951c4b535d
|
//module reinsurance is now multi-shop and multi-lang
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15792 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-01 14:26:26 +00:00 |
|
|
rGaillard
|
1334a89e95
|
[-] BO: Hide birthday date on BackOffice order when empty
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15791 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-01 14:23:33 +00:00 |
|
|
vAugagneur
|
c7705ea34e
|
[-] BO : fixed bug #PSCFV-2624 - Error after deleting supplier associated with a product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15789 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-01 09:16:40 +00:00 |
|
|
fBrignoli
|
40acfbd9d9
|
[-] BO : Unable to save admin preferences
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15788 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-01 08:39:38 +00:00 |
|
|
vAugagneur
|
0dc07f3b1e
|
[-] BO : fixed bug #PSCFV-2641
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15787 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-01 08:08:22 +00:00 |
|
|
rMalie
|
72c2781406
|
// The capacity of enable / disable shops and shop groups is temporary disabled
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15786 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-01 07:46:01 +00:00 |
|
|
rMalie
|
f6059f0a67
|
// Webservice getters are now multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15785 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-01 07:45:41 +00:00 |
|
|
fBrignoli
|
4ba9796c92
|
// toolbar
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15784 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-01 07:32:03 +00:00 |
|
|
fSerny
|
4b7e7c4925
|
// Recommit english config xml file :)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15783 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-31 16:28:40 +00:00 |
|
|
dMetzger
|
bc64125ae0
|
// Fixed typo
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15778 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-31 14:29:06 +00:00 |
|
|
fBrignoli
|
f5ce714fd3
|
// perf
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15776 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-31 13:48:40 +00:00 |
|
|
fSerny
|
bc7db4c4b7
|
[+] MO : Adding CashOnDelivery Module :)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15773 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-31 08:52:59 +00:00 |
|
|
mMarinetti
|
e83d4d675e
|
// move_translations_module_file will now display an error message more verbose
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15772 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-31 07:45:13 +00:00 |
|
|
mMarinetti
|
9ff8670bca
|
// fix error on table/column name in script p15012_add_missing_columns.php
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15771 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-30 16:55:39 +00:00 |
|
|
dMetzger
|
a6ca0bb1b2
|
// Code cleaning
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15770 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-30 16:18:10 +00:00 |
|
|
fBrignoli
|
aac8038dae
|
[-] Installer : Notice some constants are already defined
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15769 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-30 15:30:26 +00:00 |
|
|
vChabot
|
852567f5ee
|
[-] FO : BugFix : #PSCFV-2628 : Combination is not selected from the URL (at least on firefox)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15767 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-30 14:26:35 +00:00 |
|
|
rMalie
|
d9e8899473
|
// Fix out of stock on combinations with no quantity (thank you Brice <3)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15766 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-30 13:48:23 +00:00 |
|
|
mMarinetti
|
f44bbf0d5f
|
// added compatibility (upgrade from version <1.5 and >1.5 works properly)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15765 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-30 13:09:48 +00:00 |
|
|
fBrignoli
|
f0d3ad6b60
|
[-] PDF : After an upgrade, the Invoice's tax tab doesn't use the discounts
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15764 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-30 13:02:35 +00:00 |
|
|
mDeflotte
|
2c781997d1
|
// Fixed warning display on p15012_add_missing_columns
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15763 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-30 12:59:33 +00:00 |
|
|
dMetzger
|
4876b37dd9
|
// Fixing differences between install and update
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15761 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-30 12:31:50 +00:00 |
|
|
rMalie
|
c9484e29b2
|
// The capacity of enable / disable shops and shop groups is temporary disabled
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15760 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-30 12:30:08 +00:00 |
|
|
dMetzger
|
4b6d00b659
|
// Removed the "discount" tables in the upgrader
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15759 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-30 10:22:46 +00:00 |
|
|
dMetzger
|
1ef0c12dd5
|
// Removed the "discount" table in the upgrader
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15758 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-30 10:03:03 +00:00 |
|
|
dMetzger
|
5ea6aca2ca
|
// Added a link to Addons instead of a simple text
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15757 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-30 09:54:39 +00:00 |
|
|
rMalie
|
0857f92f7a
|
// Norm and doc for Shop class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15756 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-30 09:50:10 +00:00 |
|
|
dMetzger
|
04985181e3
|
// Cart rule display in cart summary
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15755 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-30 09:29:55 +00:00 |
|
|
dMetzger
|
a2326a1dde
|
// Removed the SQL views created for retro compatibility (create more problems than it solves)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15754 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-30 09:25:55 +00:00 |
|
|
vChabot
|
ed802fe90a
|
[-] BO : BugFix : #PSCFV-2620 : Wrong client age when the age is not filled
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15752 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-30 09:00:38 +00:00 |
|
|
rMalie
|
01e43be9b8
|
// Fix Maxence's text
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15751 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-30 08:35:42 +00:00 |
|
|
lLefevre
|
cfceee10aa
|
// Add italian translations of tabs
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15750 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-30 08:26:38 +00:00 |
|