dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,305 Commits 9 Branches 19 Tags
772147a6eee4fb688aa7bfce8061de336871a7e2
Commit Graph
2305 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
mDeflotte 772147a6ee // Removing some id_warehouse 
// Adding some checks with advanced_stock_management product attribute

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11375 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 16:01:41 +00:00
lBrieu f1af46cfa6 [*] Update messages notifications to display customer threads 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11374 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 16:00:50 +00:00
mDeflotte 9a97abf0e9 // BugFix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11373 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 15:58:40 +00:00
fGaillard 72db8c8f42 [-] BO : Reinitialized H.T prices precision (decimals) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11372 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 15:58:03 +00:00
lBrieu 7e82f7a9cc git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11370 b9a71923-0436-4b27-9f14-aed3839534dd 2011-12-19 15:49:10 +00:00
lBrieu af51b8aa87 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11369 b9a71923-0436-4b27-9f14-aed3839534dd 2011-12-19 15:46:47 +00:00
mBertholino 91d3e6f391 // improve authController code, in processSubmitAccount, the method checks if the email address already exists and if it's a valid one. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11368 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 15:40:57 +00:00
lBrieu 041b1a9f17 [*] Update messages notifications to display customer threads 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11367 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 15:38:59 +00:00
lBrieu 85916455a6 [*] Update messages notifications to display customer threads 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11366 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 15:37:09 +00:00
lBrieu 74b6c9c628 [*] Update messages notifications to display customer threads 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11365 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 15:35:13 +00:00
jBreux 4e810c850c [+] Project : Add specific prices to a specific customer 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11364 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 15:31:18 +00:00
lLefevre 42bad872d7 [-] BO : #PSTEST-31 : update in AdminProductsController : available_date 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11363 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 14:42:58 +00:00
fGaillard 8dff8f9969 [-] BO : #PSTEST-8 : Javascript - Rounded prices (2 digits only) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11362 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 14:42:23 +00:00
mBertholino 4d8db42292 // improve adminShopController adminShopUrlController and adminGroupShopController code, in order to have a default Status value activated. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11361 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 14:36:29 +00:00
jmCollin 5720e0190f // Fix bug in preg_match 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11359 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 14:23:08 +00:00
tDidierjean dac7c7795c // Fix bug with specific prices creation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11358 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 13:53:56 +00:00
lLefevre 800b9f164d [-] BO : #PSTEST-56 : fixed incorrect request in shop filters 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11357 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 13:35:58 +00:00
lLefevre 373232aa93 // small bugs in combinaitions of virtual products 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11356 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 13:20:30 +00:00
mBertholino d66074cdfc // improve config.inc.php code, add in cookie id_cart if there's a current order in a different shop that shares orders 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11355 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 13:20:15 +00:00
rMalie 5e60b5eada // Protect $table and $alias in DbQuery 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11354 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 13:15:53 +00:00
fGaillard d601a74b8b [-] BO : #PSTEST-24 : BugFix date picker for combinations products (display & date format) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11353 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 13:03:22 +00:00
rMalie b7ae37f6d7 // Change prototype of methods from(), leftJoin(), innerJoin(), leftOuterJoin() and naturalJoin() for DbQuery class 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11351 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 11:13:13 +00:00
fGaillard 09d15124b0 [-] BO : #PSTEST-8 : Changed prices.tpl digits precision //last commit omit modification 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11350 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 10:40:13 +00:00
fGaillard 6d6f46ad4d [-] BO : #PSTEST-8 : H.T prices precision changed (2 digits instead of 6) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11349 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 10:34:46 +00:00
tDidierjean 26f835a0ac // Small fixes to BO 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11348 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 10:33:13 +00:00
mDeflotte 39ee8e03ae // $required_fields must not be static 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11347 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 10:28:53 +00:00
fBrignoli 2139d3983d [*] CO : Additional Shipping Cost / Purchase Price / Reduction Amount texc in OrderDetails 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11345 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 10:16:04 +00:00
mDeflotte d33fcc2da6 // DisplayDate don't have to 'die' if date == '0000-00-00' 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11344 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 10:14:42 +00:00
mDeflotte 9688e7741f // Fixing bugs in admin cart 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11343 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 09:51:59 +00:00
jmCollin b432570f9d // 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11342 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 09:51:26 +00:00
jmCollin 8bca38ad20 Fix memory bug with Prestafraud configuration 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11340 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 09:41:39 +00:00
fGaillard 82419c80aa [-] Classes : #PSCFI-4477 : BugFix GSiteMap priority - Decimals no longer take care about local numeric separator 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11338 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 09:37:38 +00:00
mDeflotte 21d4c051bd // Traductions files 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11336 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 09:25:37 +00:00
lLefevre 03c143b316 [-] BO : #PSTEST-52 : update display of pack.tpl 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11335 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 09:21:36 +00:00
bMancone f0a1fc667b // StockMvt : added id_warehouse as part of the params of getNegativeStockMvts() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11334 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 09:10:21 +00:00
vAugagneur 1d545efe66 //move jquery plugin in the good folder 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11333 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-18 21:17:06 +00:00
aFolletete 92805dc869 [+] BO : on order edition, you can add a discount 
[+] BO : on order edition, you can delete a discount
// Adding two new columns in order_cart_rule table: id_order_invoice, value_tax_excl

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11330 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-18 17:18:54 +00:00
aFolletete d446d77261 // fix bug on Cart rule update in validateOrder 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11326 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-17 17:13:48 +00:00
aFolletete 073e0fbbc4 // clean code 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11325 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-17 16:53:50 +00:00
aFolletete 4b4a4bbfce // fix notice error on payment validation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11324 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-17 16:44:48 +00:00
aFolletete 538cb58556 // clean code 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11323 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-17 16:26:59 +00:00
aFolletete 9038c4ea68 // fix calculation issue on product addition 
// all elements are correctly updated when we adding, editing or deleting a product

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11322 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-17 16:20:03 +00:00
aFolletete 8415b8136d // fixed bug on automatic payment addition when put the order to a paid status 
// fix "Free shipping" when create a new invoice

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11321 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-16 17:17:13 +00:00
fSerny ccc51353ce [-] BO : Warnings are now displayed on Modules Tab 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11319 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-16 16:16:30 +00:00
lLefevre a15214a04e [-] BO : #PSTEST-18 : smalls improvements 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11316 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-16 16:03:44 +00:00
lLefevre 26032dc8bd [-] BO : #PSTEST-14 : translations 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11315 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-16 15:46:08 +00:00
aFolletete 41f7ae4d3a // add message when no payment is present 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11314 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-16 15:31:14 +00:00
aFolletete 896b62978f // fix bug on tracking number value 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11311 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-16 15:22:38 +00:00
mDeflotte 3391591fd2 // BugFix : Change footer link 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11310 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-16 15:18:48 +00:00
jBreux 3c7de270c5 // Fix orders view icons 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11309 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-16 15:18:01 +00:00