dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,619 Commits 9 Branches 19 Tags
0d78cfb3d2844b2faaddf9f18c3c2c3fcb88f708
Commit Graph

45 Commits

Author SHA1 Message Date
aFolletete
45cc1929d4 // add delivery slip 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11693 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-22 21:21:41 +00:00
fSerny
560903fefe [-] BO : Credit slips now appear in document section 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11653 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-22 18:02:04 +00:00
bMancone
c197093143 // Fixed getCartProducts() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11615 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-22 15:04:26 +00:00
vChabot
2a5faa0271 // Improvement : target blank on PDF 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11594 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-22 13:38:00 +00:00
rGaillard
739e51ce9a // Add specific_price management for backoffice order && fix installer 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11520 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-21 17:16:46 +00:00
mDeflotte
016e7b268f // Removing red error message when orders total is diferent form the total paid if there are multiple orders with the same reference 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11385 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 17:26:17 +00:00
rMalie
1d2f9e44c4 // Improve collections : where() method reworked (prototype changed) + validation of fields 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11383 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 16:57:28 +00:00
mDeflotte
772147a6ee // Removing some id_warehouse 
// Adding some checks with advanced_stock_management product attribute

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11375 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 16:01:41 +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
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
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
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
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
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
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
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
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
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
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
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
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
rMalie
b56d98b66a // Remove unused $tables property from ObjectModel + improve Cache 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11071 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-09 10:24:48 +00:00
vChabot
af70df72ce // Adding the OrderCarrier class to handle carriers in an order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11051 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-08 15:12:23 +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
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
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
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
d76998340a // Use Collection instead of HydrateCollection in several places 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10860 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-02 15:20:47 +00:00
lLefevre
1123ad3aa1 // fix refactoring templates in AdminCustomerThreadsController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10852 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-02 11:19:03 +00:00
mDeflotte
5f3d417441 // Fix some problems with getPackageShippingCost 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10850 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-02 10:48:26 +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
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
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
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
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
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
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
rMalie
9d10de0848 // Merge -> 10309 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10333 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-21 11:05:10 +00:00
fBrignoli
401722bb0b // missing values for shipping, wrapping, discounts 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10315 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-21 09:07:57 +00:00
rGaillard
e4096bf943 // Constructor of OrderDetail correctly call parent constructor 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10291 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-20 15:51:33 +00:00