 mDeflotte
|
85b186a956
|
// BugFix : Problem with delivery_option calculation
// @TODO : All the undefined index are now fixed but there is not all the available delivery option
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11007 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 17:35:38 +00:00 |
|
|
rMalie
|
a9fafc5147
|
// Can add / delete element from Collection
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11001 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 15:59:23 +00:00 |
|
|
rMalie
|
f55a9e04b9
|
[*] Classes: Db->execute() now return always a boolean. Use Db->query() instead.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10999 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 15:41:34 +00:00 |
|
|
bMancone
|
bda11e1541
|
// Supply Orders : added supplier address in the order form (PDF)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10998 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 15:27:38 +00:00 |
|
|
rMalie
|
0bf721b108
|
// Fix return of AssociateTo method
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10995 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 14:59:00 +00:00 |
|
|
bMancone
|
65f1c44ae6
|
// Address: added id_warehouse. Supplier: it is now possible to edit the address of a given supplier. Manufacturers: addresses are now correctly displayed. AdminSuppliers: addresses are now editable / when deleting a supplier (if possible <=> no current orders) address is now flaged deleted. AdminWarehouses: when deleting a warehouse, its address is now flagged as deleted.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10988 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 14:28:40 +00:00 |
|
|
vSchoener
|
de36bcb13b
|
// Add getShopProtocol to have the current protocol use by the current shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10984 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 14:22:03 +00:00 |
|
|
rMalie
|
1172e7a8d0
|
// Improve multishop code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10982 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 14:08:48 +00:00 |
|
|
rMalie
|
9e7e47847b
|
// Little fix on CSV
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10979 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 13:24:42 +00:00 |
|
|
mDeflotte
|
b6f25900ee
|
// Removing numerics from order reference
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10978 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 13:18:00 +00:00 |
|
|
rMalie
|
45f0e2227a
|
// Fix fileuploader with autoload
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10977 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 13:12:21 +00:00 |
|
|
bMancone
|
ec6dc108a9
|
// StockManager: fixed. AdminSupplyOrders: fixed price. AdminStockInstantState: added CSV export per warehouse + valuation field is now displayed per warehouse
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10976 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 12:51:10 +00:00 |
|
|
lLefevre
|
efe13abfd0
|
// fix small bugs
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10975 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 12:41:56 +00:00 |
|
|
fBrignoli
|
187aafaf51
|
[*] PDF : Licenses + Hook in templates
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10974 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 10:58:20 +00:00 |
|
|
rMalie
|
6d792ee52b
|
// Collections can be used as arrays
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10971 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 10:12:02 +00:00 |
|
|
bMancone
|
a12255dd1c
|
// Moved csv class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10969 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 10:00:47 +00:00 |
|
|
rMalie
|
11ba092bca
|
// Move helper classes in subdirectory
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10968 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 09:40:27 +00:00 |
|
|
bMancone
|
623303f7ee
|
// Fixed CSV export without pagination. Fixed StockManager, with new Collection object. Fixed StockMvt : id_supply_order was missing.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10967 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 09:37:23 +00:00 |
|
|
rMalie
|
3cf72856ff
|
// Fix a little bug on PDO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10964 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 09:04:40 +00:00 |
|
|
fBrignoli
|
a6779e2057
|
[*] PDF : Display Hook
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10963 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 08:55:01 +00:00 |
|
|
aFolletete
|
0d65bf62b2
|
[-] Classes : fixed notice error on Cart class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10962 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 08:54:07 +00:00 |
|
|
mDeflotte
|
caf0402115
|
// BugFix: Context->language is not re-setted in switchLanguage method
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10956 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 17:40:54 +00:00 |
|
|
rMalie
|
01f0ec6a99
|
// Db::autoExecute() return a boolean
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10955 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 17:29:45 +00:00 |
|
|
lLefevre
|
a73e408196
|
[-] BO & FO & MO : #PSCFI-4237 : adding id_lang in method l() of class Mail()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10954 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 17:22:47 +00:00 |
|
|
fSerny
|
1a74889015
|
[*] PROJECT - Dynamic hooks in ObjectModel retrieve object in param - Dynamic hooks have been added to AdminController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10951 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 17:20:40 +00:00 |
|
|
dSevere
|
a5c44ac8bc
|
// Update and fix some bugs on stock display on orders in backoffice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10949 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 17:17:01 +00:00 |
|
|
mDeflotte
|
31e90d9031
|
// Retrocompatibility : Now old 1.4 template works with new chechout process. Multishipping cannot be enabled.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10948 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 17:11:26 +00:00 |
|
|
rMalie
|
07420a2c0d
|
// Fix comment typo
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10946 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 17:03:07 +00:00 |
|
|
rMalie
|
8d0f1e156d
|
// Test PDO as first choice in Db class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10945 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 17:01:48 +00:00 |
|
|
sThiebaut
|
30de26176b
|
// fixed bug on category count
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10944 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 16:52:27 +00:00 |
|
|
rMalie
|
394aeab269
|
// Fix missing Core suffix for some classes / controllers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10941 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 16:49:05 +00:00 |
|
|
bMancone
|
7576b8f407
|
// SupplyOrders: fixed products loaded under a particular threshold. StockMvt: CSV export
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10940 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 16:46:49 +00:00 |
|
|
vChabot
|
c0ee7a1306
|
// removing group_module_restriction table to set every restrictions in an only table : module_group
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10936 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 16:17:42 +00:00 |
|
|
fBrignoli
|
fc865e4986
|
// merge trunk r10863
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10935 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 16:09:08 +00:00 |
|
|
fSerny
|
ce91cd792c
|
[-] PROJECT : You can now execute hook in the tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10932 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 15:49:56 +00:00 |
|
|
rMalie
|
ca79a68011
|
// Fix table / identifier for Module class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10929 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 15:35:21 +00:00 |
|
|
rGaillard
|
dac14bf3be
|
// Fix bug on processSave
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10928 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 15:33:43 +00:00 |
|
|
mDeflotte
|
db38a475f1
|
// BugFix in Product compare
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10927 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 15:30:01 +00:00 |
|
|
dSevere
|
a75ca6c40a
|
// Update and fix some bugs on front and admin itnerfaces relative to available quantities functionnality
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10925 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 15:11:21 +00:00 |
|
|
bMancone
|
772e739829
|
// Updated comment for object definition
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10923 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 15:06:59 +00:00 |
|
|
rMalie
|
6cefe4465d
|
// Remove $langMultiShop from all classes, and add 'multishop' in $definition instead
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10922 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 15:04:09 +00:00 |
|
|
bMancone
|
01b6c28569
|
// SupplyOrders: CSV
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10920 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 14:50:48 +00:00 |
|
|
rMalie
|
d56cb00d8d
|
// Remove Module->templateAssign() from modules (use $this->smarty->assign() instead)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10914 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 14:04:35 +00:00 |
|
|
rMalie
|
86683a963e
|
// Remove $table and $identifier property from all classes, and add static $definition instead
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10912 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 13:56:03 +00:00 |
|
|
fSerny
|
a50b0af067
|
[-] PROJECT : isHookableOn function is now retrocompatible with old hook
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10905 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 12:56:43 +00:00 |
|
|
aFolletete
|
f7250f76d5
|
// fix bug on Order class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10897 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 10:40:06 +00:00 |
|
|
rMalie
|
1cce2fd6cb
|
// Fix collections
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10893 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 09:05:45 +00:00 |
|
|
lLefevre
|
efc5ff8390
|
// update tab "attributes" in smarty template + update action in list in ajax
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10891 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-04 10:42:05 +00:00 |
|
|
aFolletete
|
911c8ad6c4
|
// Comment useless line in order to clean this
// Add table and identifier to CartRule class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10889 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-03 09:56:38 +00:00 |
|
|
dSevere
|
c105c81b52
|
// Stock Available : Improve BackOffice interfaces with groups of shops management + bugs fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10887 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-02 17:32:51 +00:00 |
|