vChabot
|
02d98b237e
|
// id_category_default is now for multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13624 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-27 13:53:52 +00:00 |
|
rMalie
|
c2cef61a5a
|
// Replace shop->addSqlRestriction() and shop->addSqlRestrictionOnLang() by static versions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13618 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-27 12:15:30 +00:00 |
|
bMancone
|
2caf013a0f
|
// Share quantities : Hint is now displayed as a description
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13617 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-27 10:11:59 +00:00 |
|
rMalie
|
94bbe98433
|
// Fix currencies with multishop #PSTEST-809
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13616 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-27 09:49:43 +00:00 |
|
rMalie
|
1c2f174bdb
|
// Improve multishop_context in AdminController and rename shop->getListOfID() by Shop::getContextListShopID()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13615 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-27 09:49:19 +00:00 |
|
bMancone
|
275ec90ef0
|
// Fixed #PSTEST-870
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13614 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-27 09:41:08 +00:00 |
|
rMalie
|
c9ba6a7214
|
// Commit of file e-e-e-examinator
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13608 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-24 14:56:54 +00:00 |
|
lLefevre
|
963df21883
|
// Translation all modules in mode DEV
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13602 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-24 13:08:51 +00:00 |
|
rMalie
|
129f8e7be0
|
// Fix multishop_context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13599 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-24 10:38:24 +00:00 |
|
rMalie
|
0cf47063bd
|
// Fix duplication of group shop data #PSTEST-850
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13598 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-24 10:28:14 +00:00 |
|
rGaillard
|
81ae741f9e
|
// Add tax rules by shop in product import
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13594 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-24 09:59:27 +00:00 |
|
lLefevre
|
12bc5a990c
|
[-] BO : #PSCFI-4873 : Updated of method for translated modules. Now, you can translate only installed modules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13592 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-24 09:47:58 +00:00 |
|
rGaillard
|
2408b4ac5f
|
[+] Core : products and carriers tax rules are associated to shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13586 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-24 09:26:18 +00:00 |
|
rMalie
|
6d87094802
|
// Fix shop association with groups in BO #PSTEST-820
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13585 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-24 09:14:28 +00:00 |
|
fBrignoli
|
47be39894f
|
[-] BO : Bug Fixed #PSTEST-822 - You can now set datetime to configure specific price boundaries
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13584 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-24 09:13:03 +00:00 |
|
rMalie
|
33edf44ec0
|
// Improve shop associations in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13583 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-24 09:11:18 +00:00 |
|
rMalie
|
69e2cf95d6
|
// Restore shop context in shop list and can filter shop pages per group shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13579 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-24 08:58:21 +00:00 |
|
rMalie
|
7b62fef1ee
|
// Fix shop context call
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13578 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-24 08:51:52 +00:00 |
|
mDeflotte
|
1c7d9a9f26
|
// Change customizable properties form label name
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13576 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 17:07:35 +00:00 |
|
tDidierjean
|
48a4db2acf
|
[-] BO : fix bug #PSTEST-855 - some translations are not parsed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13574 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 17:03:48 +00:00 |
|
rMalie
|
2454cd7863
|
// Welcome 2012²
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13573 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 16:33:10 +00:00 |
|
mMarinetti
|
642f37f873
|
// #PSCFI-4808 warning message when input_max_vars is too low in AdminTranslationsControllers + optimizations
// now translation files array are ordered by key
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13571 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 16:21:12 +00:00 |
|
rMalie
|
53e7fe3230
|
// Improve multishop API
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13568 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 15:54:10 +00:00 |
|
rMalie
|
b24dcffc9c
|
// Improve multishop API
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13566 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 15:39:44 +00:00 |
|
mDeflotte
|
ec8f05c3ca
|
[-] BO : #PSTEST-852 - Rename button "Save and stay" to "Save and add" on admin feature form
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13565 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 15:34:31 +00:00 |
|
lLefevre
|
e0805b1b96
|
[-] BO : #PSTEST-795 : Display date from and date to filters in list
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13563 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 15:19:02 +00:00 |
|
mDeflotte
|
c93a6cc288
|
[-] BO : #PSTEST-400 - Fix bug with button "Save and stay" from AdminAttributesGroups
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13561 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 14:52:50 +00:00 |
|
dMetzger
|
5339d45d07
|
[+] BO : BO width can now be fixed or flexible (you can set it up in your employee account)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13560 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 14:42:23 +00:00 |
|
fBrignoli
|
dbfc56473d
|
[-] BO : Bug Fixed #PSTEST-695 - Are ranges defined Tax Excl or Incl? => Incl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13559 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 14:12:30 +00:00 |
|
aFolletete
|
ac38a0a09b
|
// Clean code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13558 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 14:11:18 +00:00 |
|
lLefevre
|
5f98d701f2
|
[-] BO : #PSTEST-778 : Bug in textures for attributes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13557 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 14:07:19 +00:00 |
|
vSchoener
|
2a760a56b4
|
[+] CORE : Module properly upgraded with message even if no file upgrade file exist, add 'upgrade' button
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13551 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 11:02:35 +00:00 |
|
lLefevre
|
3f36b436d2
|
[-] BO : #PSTEST-777 : Reset form when action is : save and stay
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13548 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 10:06:11 +00:00 |
|
rMalie
|
bf468389e3
|
// Fix shop association in BO categories page #PSTEST-848
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13544 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 09:00:03 +00:00 |
|
fGaillard
|
f4e9c87cc6
|
[-] BO : #PSFV-492 : BugFix CMS pages & categories
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13540 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-22 16:57:51 +00:00 |
|
bMancone
|
eb83936f23
|
// Improved SupplyOrders : states & history of reception
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13539 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-22 16:49:54 +00:00 |
|
bMancone
|
6c57343e32
|
// Fixed #PSTEST-837
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13535 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-22 15:48:46 +00:00 |
|
mDeflotte
|
a53e9c5e60
|
// Removing attribute 'preselect_country' and use 'default_value' instead
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13531 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-22 14:27:32 +00:00 |
|
rMalie
|
4e6628cbfd
|
// Remove $display_multishop_toolbar and add instead $multishop_context to manage shop context per admin controller
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13530 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-22 14:25:28 +00:00 |
|
bMancone
|
12735c9f50
|
// Fixed #PSFV-550
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13529 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-22 14:13:09 +00:00 |
|
mMarinetti
|
10b3e3d8d3
|
// Welcome 2012
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13520 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-22 09:28:22 +00:00 |
|
vAugagneur
|
1e0a422626
|
//remove debug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13513 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-21 16:48:58 +00:00 |
|
bMancone
|
71f2f21630
|
// Fixed Supply orders : bulk action / autoload products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13500 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-21 13:48:49 +00:00 |
|
vAugagneur
|
8b96582280
|
[-] BO : Customer Service options/sync mailbox not working - #PSFV-539
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13491 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-21 10:19:23 +00:00 |
|
mMarinetti
|
66bb55a360
|
[+] classes : New method ->attachProduct($id_product)
// Fix #PSTEST-699
// now new attachment are automatically linked to the current product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13489 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-21 10:03:32 +00:00 |
|
dMetzger
|
5face77ed4
|
// BO : Small optimization on the payment page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13484 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-21 08:51:10 +00:00 |
|
fBrignoli
|
1cb5d03b7f
|
[-] BO : Bug Fixed #PSTEST-546 - Tax Rules Creation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13483 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-21 08:48:52 +00:00 |
|
bMancone
|
8d5ad0cb0b
|
// Fixed #PSTEST-751
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13482 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-20 17:46:11 +00:00 |
|
mMarinetti
|
1b91c7da2a
|
// fix in product page edition after deleting pack and save, some javascript function were not loaded
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13481 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-20 17:32:54 +00:00 |
|
dMetzger
|
609a45f25b
|
[*] BO : you can now choose the combination of the free product of a cart rule
[*] FO : the free product is now removed from the cart along with the cart rule (where applicable)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13479 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-20 17:04:41 +00:00 |
|