dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,271 Commits 9 Branches 19 Tags
f0a1fc667b4e38e7697c4086949f5033a4f12aca
Commit Graph
2271 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
tDidierjean 31f3a71b9d // Fix product attributes 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11308 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-16 15:06:53 +00:00
aFolletete 5a4bc80867 // improve invoice and order payment 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11306 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-16 15:00:43 +00:00
rMalie eb14c43722 // Norm + improve ObjectModel 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11305 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-16 14:55:05 +00:00
lLefevre a45921e1ea [-] BO : #PSTEST-15 : translations 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11304 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-16 14:44:57 +00:00
lLefevre 8dbd57dd20 // small corrections 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11303 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-16 14:13:50 +00:00
mDeflotte 3a3684a3ed // BugFix : AdminSearch dont generate urls with good token 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11302 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-16 14:01:00 +00:00
lLefevre 00b878d868 // added pack.tpl in AdminProductsController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11301 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-16 13:57:27 +00:00
fSerny e390031c83 // Adding an error message in class Module 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11300 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-16 10:57:50 +00:00
fSerny 2ab9ff175d [-] PROJECT : Cleaning Class Module 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11299 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-16 10:52:45 +00:00
rGaillard c5c699548a // Fix submit button 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11298 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-16 10:47:31 +00:00
mDeflotte 14f931f6d5 // BugFix : AdminSearch dont find features 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11297 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-16 10:36:06 +00:00
aFolletete 6f03353f96 [*] BO : no payment is registered on order creation for check and bankwire payment 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11296 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-16 10:10:48 +00:00
mDeflotte d6c85b63d5 // BugFix : summary-cart + Change a translation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11295 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-16 10:08:17 +00:00
mDeflotte 1d393f8e97 // BugFix : Adding some backquote to protect SQL reserved word 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11294 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-16 09:57:03 +00:00
mDeflotte 879186f936 // BugFix : summary-cart 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11293 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-16 09:42:23 +00:00
jBreux 2db96b625d // Fix scroll and add missing image 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11292 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-16 09:33:36 +00:00
jBreux 8a73986a76 [*] BO : Improvement invoices management 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11291 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-16 09:14:11 +00:00
lLefevre b14b35d67f // update virtual_product.tpl in AdminProductsController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11290 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-16 09:12:12 +00:00
fSerny 5f639b3319 [-] PROJECT : Modules now handle PrestaShop version compliancy and dependencies check 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11289 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-15 20:11:43 +00:00
lLefevre 2ede4caa48 // added pack.tpl and virtualproduct.tpl 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11288 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-15 17:54:59 +00:00
mMarinetti 1346ca3e46 // when upgrade process (INSTALL_VERSION defined), initialize return now an empty shop object (+ die2Exception) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11287 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-15 17:42:24 +00:00
dSevere 9a58359cb6 // bug fix with suppliers and warehouses on product save action in back-office 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11286 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-15 17:36:54 +00:00
lBrieu db959d2334 // Fix potential SQL injection 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11285 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-15 17:34:38 +00:00
rMalie 3381a99a0e // Fix bug on collections when an item was deleted in iteration 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11284 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-15 17:27:37 +00:00
rMalie 52df492c25 // Remove retrocompatibility stripslashes in ObjectModel 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11282 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-15 17:02:55 +00:00
tDidierjean 382bcb986b // Changes to product prices tab 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11280 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-15 16:58:28 +00:00
mMarinetti 4053ce9df6 // retrompatibility 1.4 theme 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11279 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-15 16:52:22 +00:00
rMalie 30ae6fc8e2 // Browse collections as associative arrays and not as iterative arrays anymore 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11278 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-15 16:48:20 +00:00
sThiebaut d5f3da5550 // maj 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11277 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-15 16:44:44 +00:00
vChabot 7d0942bcc2 [*] BO : Required fields improved (with a white list) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11276 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-15 16:37:08 +00:00
tDidierjean 79bf1d6d5c // Changes to the product associations page 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11275 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-15 16:36:39 +00:00
mDeflotte b53b621808 // BugFix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11274 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-15 16:23:04 +00:00
rMalie deb4932850 [*] Classes: refactoring of ObjectModel::validateFields() && ObjectModel::validateFieldsLang() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11273 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-15 16:19:55 +00:00
tDidierjean 7fcbd00819 // Changes to manufacturers and accessories in BO product page 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11272 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-15 15:57:50 +00:00