 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 |
|
|
tDidierjean
|
a69d737ad8
|
// Fix bug with product quantity update
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10612 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 21:45:11 +00:00 |
|
|
fSerny
|
3c7d9ba53b
|
[*] BO : Partial refund - part 3
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10611 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 21:42:27 +00:00 |
|
|
vAugagneur
|
66b1f844e4
|
[+] BO : login and lost password is now in ajax and convert in AdminController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10608 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 21:32:11 +00:00 |
|
|
mMarinetti
|
acc401e3e8
|
// removed looong looong code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10604 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 21:18:11 +00:00 |
|
|
dMetzger
|
7648f8ece0
|
// Order processing bugs fixed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10603 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 21:02:51 +00:00 |
|
|
mMarinetti
|
e5d25eea83
|
// fix save and stay in product page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10602 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 20:52:52 +00:00 |
|
|
rGaillard
|
0b3c094698
|
// Fix PHP notice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10600 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 20:47:50 +00:00 |
|
|
lLefevre
|
c4732a431a
|
// fix bug "apply priority management" in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10596 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 20:01:33 +00:00 |
|
|
mDeflotte
|
f21b8defa1
|
// BugFix with id_address_delivery
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10595 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 19:27:57 +00:00 |
|
|
dMetzger
|
c604df470d
|
// Cart rules fixed in admin customers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10594 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 19:22:23 +00:00 |
|
|
dSevere
|
ddcede4ef5
|
// Product Suppliers : Debug and optimizations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10589 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 18:48:09 +00:00 |
|
|
mMarinetti
|
fdd72b47fa
|
// admincontroller fix when json
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10586 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 18:36:59 +00:00 |
|
|
dMetzger
|
f670f7573f
|
[+] BO : add new feature, Order edition
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10579 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 17:45:52 +00:00 |
|
|
fBrignoli
|
ba7ec2dd9d
|
[-] FO : Undefined method getOutOfStock
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10571 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 17:18:09 +00:00 |
|
|
tDidierjean
|
d84b5b2749
|
// BO menu now uses the new icons
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10569 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 17:12:18 +00:00 |
|
|
rMalie
|
69feff1ee1
|
// Fix stock for multishop on search
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10568 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 17:07:46 +00:00 |
|
|
fBrignoli
|
9c01024080
|
[-] CO : option "fields" is not required
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10565 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 17:01:52 +00:00 |
|
|
rMalie
|
e4654570e9
|
// Some fix on multishop + stock
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10564 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 17:00:20 +00:00 |
|
|
tDidierjean
|
2d3db2e15d
|
// Add actions to product list and fix product duplication
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10560 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 16:45:14 +00:00 |
|
|
rGaillard
|
1207b5bf40
|
// Small fixes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10558 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 16:31:53 +00:00 |
|
|
mDeflotte
|
7ac2f24ff3
|
// BugFix : use current($array instead of $array[0]
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10557 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 16:22:08 +00:00 |
|
|
dSevere
|
2d238bbac7
|
// Stock Management : Show stock interfaces only if the option is active in the configuration + debug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10554 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 16:07:57 +00:00 |
|
|
mMarinetti
|
67ba2e5df5
|
// phpdoc fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10550 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 15:37:50 +00:00 |
|
|
tDidierjean
|
5dbd54ff5f
|
// Fix helper translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10548 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 15:28:05 +00:00 |
|