Commit Graph

2767 Commits

Author SHA1 Message Date
bMancone ef87beed40 // Set the reference of a supply order as unique
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11866 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 16:13:51 +00:00
bMancone d3b850558f // removed some buttons in the view of the supply order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11865 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 16:10:09 +00:00
rMalie 97037f5939 // Fix CCC cache for CSS files with @import lines
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11864 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 16:04:07 +00:00
vKham 372b068f77 // add new stylesheet view customer
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11863 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 15:58:13 +00:00
aFolletete 25a6289a60 [-] BO : add a validation on name of discount in order page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11862 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 15:49:51 +00:00
bMancone 5fb6bcc040 // fixed supply orders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11861 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 15:49:35 +00:00
aFolletete 2baf269661 // add french translations for AdminOrders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11860 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 15:42:39 +00:00
aFolletete 5a8ad9cb1d // change image for partial and standard refund
[-] BO : fixed bug on updating of document table when adding a product

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11859 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 15:40:03 +00:00
vChabot 8e36d7d247 // translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11858 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 15:38:05 +00:00
vChabot 97722fd0d4 // BugFix : Adding an error when you try to update a shop_url already existing in another shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11857 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 15:24:47 +00:00
bMancone 76533c40bd // Updated Supply Order + import CSV
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11856 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 15:08:07 +00:00
fGaillard 13ec8072ff [-] BO : #PSTEST-214 : BugFix : Canceled, problem without multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11855 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 15:01:50 +00:00
bMancone d8422f1896 // SupplyOrder reference is now unique
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11854 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 14:58:55 +00:00
mBertholino 72b7fa3801 [-] BO : #PSTEST-230 : missing translation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11853 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 14:53:17 +00:00
lLefevre 8116af4917 [-] BO : #PSFV-173 : indexing when adding a product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11852 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 14:47:57 +00:00
rMalie 85ff9109ae // Remove useless parameters in rewrited urls
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11851 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 14:45:44 +00:00
mBertholino 3517cf88db [-] BO : #PSTEST-230 : bug fixed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11850 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 14:45:25 +00:00
mBertholino 675ee2152c [-] BO : #PSTEST-230 : bug fixed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11849 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 14:44:55 +00:00
fGaillard 2171d7ee72 [-] BO : #PSTEST-214 : BugFix : Get content using context shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11848 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 14:39:55 +00:00
vChabot 2e8597a9ed // remove htaccess generation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11847 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 14:36:14 +00:00
vKham 2e4b4ed7cb // add new stylesheet view customer and fix table extensible
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11846 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 14:32:35 +00:00
rMalie 38086c5dc6 [+] BO: Add Jquery alerts for nice alert box
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11845 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 14:18:20 +00:00
vChabot b5e6f2cb75 // adding order_carrier to new installer
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11844 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 14:17:47 +00:00
bMancone 09c59581da // Updated CSV Import
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11843 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 14:16:43 +00:00
bMancone d96a1f8fb5 // Updated CSV Import
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11842 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 14:07:18 +00:00
mBertholino 7e77ec7258 [-] BO : #PSTEST-202 : bug fixed, the translation was missing
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11841 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 14:02:16 +00:00
aFolletete 3da78b569d [-] Classes : fixed little bug on getShipping method on Order class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11840 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 13:59:12 +00:00
mBertholino 42c7b35ef1 [-] BO : #PSTEST-225 : bug fixed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11839 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 13:52:30 +00:00
aFolletete d010933362 [-] BO : fixed bug on product addition
// clean code

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11838 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 13:46:42 +00:00
mMarinetti 4756b73b70 // fix syntax error
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11837 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 13:15:37 +00:00
lLefevre 1cd96146b2 [-] SQL : #PSFV-267 : fix bug upgrade profile employee
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11836 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 12:55:35 +00:00
rMalie 39127bbc3f // Fix #PSFV-264 (typo in new installer)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11835 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 12:50:50 +00:00
mMarinetti 60185f7e03 // fix in AdminThemesController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11834 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 12:29:42 +00:00
mBertholino 21aaa26b52 [-] BO : #PSTEST-220 : bug fixed, the fields number that has to be traduct is now correct
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11833 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 11:44:03 +00:00
mMarinetti 6591928844 // set new install version to 1.5.0.3
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11832 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 11:42:22 +00:00
mMarinetti 0051788824 // add theme add/remove function
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11831 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 11:39:14 +00:00
bMancone 313e67d433 // CSV Import: began adding Supply Orders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11830 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 11:36:45 +00:00
rMalie 7f25509976 // Fix pub@prestashop.com default account password
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11829 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 10:49:34 +00:00
mMarinetti 7cdf8b2753 // svn propset svn:ignore for img dir (for fixtures images)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11828 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 10:39:22 +00:00
mBertholino 6da93d9b45 [*] BO : fields name traduction in french in SpecificPriceRule table
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11827 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 10:37:25 +00:00
mBertholino 7c133b80ba [-] BO : #PSTEST-202 : fixed , the problem was from the adminTranslationController, all the fields were not listed in the fields traduction page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11826 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 10:31:07 +00:00
fSerny 99295113e2 [-] BO : AdminModule now sort modules by alphabetical order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11825 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 10:19:36 +00:00
vChabot ec55488fae // BugFix : Report PSCFI-4307 from 1.4.x
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11824 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 10:08:43 +00:00
rMalie 939615b3ef // Improve ajax request in new installer
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11822 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 09:57:53 +00:00
fGaillard a28b092c88 [-] BO : Translation updated in products quantities tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11821 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 09:56:39 +00:00
lLefevre 76f1c9485a [-] BO : #PSTEST-181 : change title in AdminAttributesGroupsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11820 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 09:42:01 +00:00
vKham f35fded601 // fix admin return and min-height new installer
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11819 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 09:27:56 +00:00
lLefevre bc3261e0b7 [-] BO : #PSTEST-165 : calculate price without or with tax
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11818 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 09:24:47 +00:00
aFolletete 9605d8c12f [-] BO : fixed bug on change currency feature in order page when we have only one currency
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11817 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 09:11:31 +00:00
rMalie 3ef352a73c // Fix default lang in installer and admin tabs
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11815 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-27 17:48:22 +00:00