 dSevere
|
8b618652bb
|
// Stock Available : Improve BackOffice interface + Update all SQL requests relative to StockAvailable + code refactoring on Product Class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10843 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-01 19:09:27 +00:00 |
|
|
mDeflotte
|
bf9a629c94
|
// BugFix in "Cart::isAllProductsInStock()"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10839 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-01 17:16:56 +00:00 |
|
|
mDeflotte
|
77664f1056
|
// Fix some bad php doc
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10838 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-01 16:43:07 +00:00 |
|
|
rMalie
|
10247e8e42
|
[+] Classes: Add Collection class (synthesis of DbQuery + ObjectModel::hydrateCollection) and add support of static $definition property in ObjectModel
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10834 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-01 14:47:28 +00:00 |
|
|
rMalie
|
4e567f3d31
|
// Report fix of PSCFI-4282 from 1.4 to 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10833 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-01 14:45:33 +00:00 |
|
|
mDeflotte
|
394206e9ef
|
// id_warehouse is now on the order details and not on orders table
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10831 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-01 14:31:26 +00:00 |
|
|
fBrignoli
|
b2f33740fe
|
// OrderInvoice PDF compliant
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10830 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-01 14:24:17 +00:00 |
|
|
mDeflotte
|
1e8ed9d47e
|
// Little fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10827 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-01 12:58:35 +00:00 |
|
|
tDidierjean
|
562adfc172
|
// AdminCurrencies refactoring
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10824 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-01 09:44:58 +00:00 |
|
|
bMancone
|
29c75d7798
|
// Added CSV class. Allows to export supply order details as CSV, for instance
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10820 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-30 17:49:51 +00:00 |
|
|
aFolletete
|
8bbd830446
|
// fix little bug on AdminOrdersController
[~] Deprecated: Cart::getOrderShippingCost()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10818 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-30 17:25:27 +00:00 |
|
|
lLefevre
|
c1aee41233
|
// fix bug link "details" in AdminFeaturesController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10815 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-30 16:52:23 +00:00 |
|
|
aFolletete
|
13bdaf6c3f
|
[*] BO : you can now generate manually the invoice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10814 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-30 16:41:24 +00:00 |
|
|
lLefevre
|
003ac6e01b
|
// fix small bugs
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10813 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-30 16:32:51 +00:00 |
|
|
dSevere
|
577aa781bc
|
// Stock Available : Add shared management for group of shops
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10812 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-30 16:28:06 +00:00 |
|
|
lLefevre
|
8671928caf
|
// added toolbar in cart_rules form.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10811 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-30 16:08:30 +00:00 |
|
|
lLefevre
|
a8e8b25194
|
// fix small bugs
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10806 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-30 14:55:49 +00:00 |
|
|
lLefevre
|
02f5a262d9
|
// added list of tables and attributes in AdminRequestSqlController + change export request
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10802 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-30 13:24:43 +00:00 |
|
|
tDidierjean
|
f9c4410e8d
|
// Rename AdminController methods initForm() initList() etc. to renderForm() renderList()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10799 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-30 11:06:38 +00:00 |
|
|
rMalie
|
4188def509
|
// Fix id_shop on meta
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10789 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-30 08:50:16 +00:00 |
|
|
rMalie
|
c2ce21b43d
|
// Fix id_shop on meta
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10788 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-30 08:49:30 +00:00 |
|
|
rMalie
|
eb2fde29b3
|
// Fix id_shop on meta
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10787 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-30 08:47:37 +00:00 |
|
|
tDidierjean
|
5c61feb04b
|
// Changes to controller and AdminCustomers refactoring
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10764 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-29 18:35:17 +00:00 |
|
|
mDeflotte
|
557e05ae01
|
// Now blocklayered work with PS1.5 and 1.4
// Adding some improvement to the blocklayered : Filters are now customizable (checkbox, radio, ...)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10763 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-29 18:03:21 +00:00 |
|
|
bMancone
|
e918d53dfa
|
// AdminSupplyOrdersController: it now possible to create supply order templates, and use them to create actual supply orders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10745 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-29 14:36:15 +00:00 |
|
|
bMancone
|
3cae130e9d
|
// AdminController: added beforeAdd() method
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10744 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-29 14:35:43 +00:00 |
|
|
tDidierjean
|
b3bd8b4345
|
// commit missing file
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10740 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-29 14:29:45 +00:00 |
|
|
tDidierjean
|
51f4b16986
|
// Split AdminController::init() in init() and initProcess()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10739 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-29 14:20:22 +00:00 |
|
|
rMalie
|
cbd566f6e7
|
// Fix country cache
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10736 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-29 10:37:42 +00:00 |
|
|
bMancone
|
5beb66f50a
|
// Supply Order : it is now possible to automatically load products, for a given supplier, which physical quantity is equal or less to a given threshold
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10730 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-29 10:07:51 +00:00 |
|
|
rMalie
|
2cba5f3e1a
|
[+] Classes: add local cache system
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10729 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-29 09:55:21 +00:00 |
|
|
mDeflotte
|
46f9cc5ec5
|
// Removing an elog
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10725 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-29 08:03:53 +00:00 |
|
|
dSevere
|
37d215522a
|
// Product Suppliers : Add wholesale price management for each supplier
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10719 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-28 17:16:39 +00:00 |
|
|
mDeflotte
|
7577e5ff0f
|
// Change sentence "Allow seperated package"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10718 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-28 16:47:50 +00:00 |
|
|
tDidierjean
|
e474dc01b5
|
// AdminControllers cleanup
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10716 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-28 16:32:33 +00:00 |
|
|
rGaillard
|
bc403e3bf7
|
// Fix currentIndex link
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10701 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-28 11:15:00 +00:00 |
|
|
mDeflotte
|
bd9bcc6729
|
// Add "Allow seperated package" checkbox on the cart
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10698 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-28 10:50:54 +00:00 |
|
|
rMalie
|
6b61051a16
|
[*] MO: remove all static call of Module::display() method. Use it as a method on a Module instance.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10695 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-28 10:04:41 +00:00 |
|
|
rGaillard
|
3a5a061717
|
// Change URLs calling for prestashop.com
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10686 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-25 18:45:07 +00:00 |
|
|
rGaillard
|
19749a2102
|
// Fix link in backoffice with multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10685 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-25 17:52:44 +00:00 |
|
|
rMalie
|
fe435bdeea
|
// Log edited, this modification on Module::displayTemplate was reverted in a better one
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10675 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-25 16:09:13 +00:00 |
|
|
rMalie
|
93f4be96b0
|
[*] Classes: modules templates are now executed in a local space
// Remove Gender::getStaticImage()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10673 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-25 16:02:20 +00:00 |
|
|
rMalie
|
900e9e8148
|
// Fix stock for multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10661 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-25 13:12:02 +00:00 |
|
|
fBrignoli
|
0a9889f3af
|
[-] CO : incorrect left join conditions in getTaxRules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10649 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-25 10:22:58 +00:00 |
|
|
aFolletete
|
04a3aab393
|
// WAOW ! Adding change currency feature in AdminOrdersController ! It's amaizing :D Wonderful ;)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10635 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 23:04:33 +00:00 |
|
|
fSerny
|
f5aadafc92
|
[-] BO : Partial refund - part 4
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10626 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 22:42:17 +00:00 |
|
|
tDidierjean
|
722223c2a4
|
// fix generateReference()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10624 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 22:32:16 +00:00 |
|
|
tDidierjean
|
d8fcdf19fe
|
// fix AdminController translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10622 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 22:21:25 +00:00 |
|
|
rGaillard
|
b7c28b8c48
|
// Fix shop import stock available
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10621 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 22:19:48 +00:00 |
|
|
mMarinetti
|
8356cb82cf
|
// strtouper(Tools::passwdGen(12)) replace uniqid, and Alain asked me to add "lol"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10618 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 22:07:08 +00:00 |
|