dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,405 Commits 9 Branches 19 Tags
02cdbcd2cd3f81ca693f205d5f57c401ea5eb708
Commit Graph

1780 Commits

Author SHA1 Message Date
dMetzger 6c7337d2cb // Fixed rounding bug on cart rules 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11245 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-15 10:41:00 +00:00
fBrignoli 7c2f4774d1 [*] PDF : You can now enable diskcache 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11241 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-15 09:05:16 +00:00
bMancone 89213574d0 // Added one field in Product object, so one product can be managed independantly from the stock management (advanced) if necessary 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11239 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-14 18:49:30 +00:00
aFolletete c16aed3424 // you can define invoice on payment addition 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11238 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-14 18:42:50 +00:00
tDidierjean efd4132415 // Fix some XSS 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11236 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-14 18:34:59 +00:00
mMarinetti 3fc8ef3d88 [*] BO : optimization of liveEdit system 
[+] FO : new theme file for front-office layout.tpl, designers have now more possibilities

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11235 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-14 18:18:57 +00:00
rMalie 49129f85dc // Format definitions 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11230 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-14 17:21:18 +00:00
vChabot 3f814a3cf0 // little fix about generating first John Doe invoice 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11229 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-14 17:09:52 +00:00
bMancone 4e8fa347f7 // Updated type in definition for product_supplier_reference (Thanks R.) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11226 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-14 16:57:40 +00:00
bMancone 2a888cbd8a // Reverted modifications on product 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11225 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-14 16:55:12 +00:00
bMancone 1f74b8a56e // Fixed bugs when editing Warehouses & Suppliers for a product 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11224 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-14 16:54:02 +00:00
bMancone 931d79ac7f // Fixed bugs when editing Warehouses & Suppliers for a product 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11222 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-14 16:52:33 +00:00
aKorczak 342f6b58b6 // Merge from 1.4.X 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11221 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-14 16:48:37 +00:00
aKorczak 30b5d4fb82 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11220 b9a71923-0436-4b27-9f14-aed3839534dd 2011-12-14 16:46:30 +00:00
aFolletete d1fae41a4d // fix bug on product line edition 
// put new ressource in getRessources method of Webservice

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11216 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-14 16:24:35 +00:00
mDeflotte b48c20d1d5 // BugFix : Adding warehouse on order edition 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11214 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-14 16:19:05 +00:00
vChabot dc29921f7e [+] BO : You can now have UTF-8 URL Rewriting 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11207 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-14 15:00:47 +00:00
tDidierjean 12386a5b57 // Refactoring AdminProduct postProcess 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11205 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-14 14:29:50 +00:00
lLefevre 940f886fd3 // translation && fixed small bugs in AdminProductsController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11204 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-14 14:01:41 +00:00
mBertholino 0a1e6cf127 // improve config.inc.php code, id_shop is inserted in the cookie name. Debug in Carrier class, max_deep is now max_depth 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11194 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-14 08:59:55 +00:00
fSerny d1baa08bf8 [-] PROJECT : Class Hook cleaned 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11187 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-13 17:28:13 +00:00
rMalie dff66a14cd // Format definitions 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11184 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-13 16:34:09 +00:00
fBrignoli be2c1e4436 [-] PDF : Logo path 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11182 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-13 15:15:28 +00:00
rMalie d30b4bea1b // Format definitions 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11174 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-13 13:43:16 +00:00
rMalie 03bd438c7d // Format definitions 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11173 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-13 13:41:54 +00:00
mBertholino 225c8523e9 // improve multishop code, id_shop has an id different than 0 even if share_customer or share_order is true 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11172 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-13 13:37:59 +00:00
vChabot 659cc9235a // payment module install doesn't need to add entries in module_group table (already done in Module::install()) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11171 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-13 13:31:52 +00:00
mBertholino 5f4972701c // improve multishop code with id_shop = 0 when share_customer or share_order is true 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11169 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-13 11:59:41 +00:00
vKham 199c3c1990 // fix toolbar button IE7, stylesheet edit product Informations Associations 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11166 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-13 10:45:21 +00:00
aFolletete 7d67b9cc6e // revert r11153 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11164 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-13 09:50:21 +00:00
bMancone 9329793e65 // Updated OrderHistory / StockManager. Added feature to StockCover: it is now possible to display the number of sales per product / and highlight products which coverage is less than a given threshold 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11163 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-13 09:48:52 +00:00
fGaillard 91cb67a25d [-] BO : BugFix : Search index re-build 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11160 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-13 09:09:54 +00:00
rMalie b8f5b693b9 // Format definitions 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11157 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-12 21:06:59 +00:00
rMalie fddf4fb89b [*] Classes: Remove $fieldsRequired, $fieldsSize and $fieldsValidate (and lang properties) properties, use $definition instead 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11155 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-12 18:10:38 +00:00
rMalie c97bac9160 // Remove useless code in OrderHistory 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11154 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-12 18:08:09 +00:00
aFolletete ff40a43ac5 // fix bug on setInvoice method 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11153 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-12 17:45:34 +00:00
aFolletete afd73899dd // fix bug on Order class 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11150 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-12 17:06:16 +00:00
aFolletete 0db603d498 // fix bug on Payment addition 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11148 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-12 16:51:47 +00:00
lLefevre b974418c15 // fixxed bug save Product 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11143 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-12 16:01:26 +00:00
aFolletete 6f3972d946 // improve hasInvoice method 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11142 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-12 15:57:11 +00:00
bMancone 0a533f970f // OrderHistory: fixed synchronize/updateQuantity conflits 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11140 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-12 15:39:48 +00:00
bMancone 6f80da5b2b // Updated re-stock 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11139 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-12 15:25:51 +00:00
fBrignoli 415299a7aa [*] PDF : New hook actionPDFInvoiceRender 
[-] PDF : Can't display invoice due to Collection


git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11138 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-12 15:23:39 +00:00
bMancone 85dd573402 // Re-stock (Prices fixed/warehouse fixed) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11136 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-12 13:54:17 +00:00
rMalie dc19003820 // Improve ObjectModel definitions (test on products) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11135 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-12 13:53:51 +00:00
tDidierjean 345ad40e3c // Copy from trunk: #PSCFI-4401 - linebreaks in product return message cause fatal error in BO 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11122 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-12 11:07:46 +00:00
mDeflotte d843b14ac6 // BugFix : Display errors when no carriers available 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11112 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-12 10:21:56 +00:00
aKorczak f75bfca1f4 [-] WS : Fixed norm on WebserviceRequest 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11100 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-09 19:30:35 +00:00
mMarinetti bd402c3514 // cleanning code 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11095 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-09 16:33:32 +00:00
bMancone 0ea53c672f // Stock : product can now be returned 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11091 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-09 16:08:27 +00:00