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

57 Commits

Author SHA1 Message Date
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
538cb58556 // clean code 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11323 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-17 16:26:59 +00:00
aFolletete
9038c4ea68 // fix calculation issue on product addition 
// all elements are correctly updated when we adding, editing or deleting a product

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11322 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-17 16:20:03 +00:00
aFolletete
8415b8136d // fixed bug on automatic payment addition when put the order to a paid status 
// fix "Free shipping" when create a new invoice

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11321 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-16 17:17:13 +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
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
jBreux
cb984199fc [+] BO : Add a note on invoice 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11253 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-15 11:38:01 +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
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
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
bMancone
c1dd6f2a98 // When shipping products: warehouses are now correctly loaded 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11145 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-12 16:18:02 +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
bMancone
9dcb132625 // StockInstantState: fixed bug on names. AdminOrders: fixed bug on return 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11118 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-12 10:54:59 +00:00
bMancone
41585414aa // Fixed AdminOrdersController when returning.. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11094 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-09 16:14:02 +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
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
vChabot
c6fb7aa4f7 // little fix about advanced stock management 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11034 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-08 09:22:02 +00:00
aFolletete
a96fb0d2e2 [-] BO : fixed calculation error on Product addition 
[-] BO : fixed notice error on message addition

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10973 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-06 10:50:00 +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
aFolletete
2e8abff9a9 // add restriction on addition and edition of an order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10904 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-05 11:27:26 +00:00
lLefevre
8a62346471 // Adding a button to top 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10857 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-02 14:31:08 +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
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
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
mDeflotte
506773b46c // Adding reference in admin order details 
// Adding reference in payment return of cheque and bankwire module

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10669 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-25 15:45:38 +00:00
rGaillard
2ed3aeb821 // Fix bug on add shipping number 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10665 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-25 14:00:17 +00:00
rGaillard
0eccf98592 // Fix change currency on editing order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10664 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-25 13:43:40 +00:00
fBrignoli
9aaa7fc7c3 // die die 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10651 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-25 10:36:39 +00:00
fBrignoli
39ee88bdf2 [-] BO : Incorrect CartRule value 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10650 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-25 10:34:43 +00:00
tDidierjean
62422904f3 // change to orders list display 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10648 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-25 10:13:49 +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
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
fSerny
ac24d5ddd8 [-] BO : Load customer and cart in AdminOrderController init to fix a bug with CancelProduct 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10601 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 20:52:37 +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
rGaillard
06ab93a8f6 // ajax process off adminaccess is now in the controller 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10503 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 10:01:22 +00:00
bMancone
276f493dd7 // StockAvailable: updated synchronize() and updated its usage within the different stock controllers when necessary 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10331 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-21 11:01:33 +00:00
tDidierjean
5b908a0844 // fix tpl folder detection in BO 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10327 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-21 10:11:49 +00:00
mDeflotte
5e6ab08a00 // Merging multishipping branche on 1.5 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10259 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-18 11:13:31 +00:00
mMarinetti
257ff5c380 // fixed AdminOrders display view 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10166 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-16 10:49:30 +00:00
bMancone
fdab7ebc70 // Warehouse: getWarehouseList is now getWarehouses. Employee: it is not possible to delete an employee if he manages warehouses, anymore. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10103 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-14 14:28:30 +00:00
rGaillard
07ced238d1 // Fix order view 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10078 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-14 09:16:37 +00:00
mMarinetti
afe8a4cc52 // die2Exception 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10073 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-13 19:44:49 +00:00
rGaillard
e2026d1cc3 // Replacement of getDiscounts method 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9900 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-04 16:52:39 +00:00
dSevere
250546f245 // #PSFV-94 : add product management on suppliers order + Submit button integrated to the toolbar on add/edit form view + adaptations after form and list helper update + bugs fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9864 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-03 17:54:55 +00:00
tDidierjean
e00763b927 // change to price parameter in list 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9863 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-03 17:49:30 +00:00
tDidierjean
a6367738ca // AdminController refactoring 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9825 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-03 11:12:18 +00:00
rGaillard
33ecd84fb1 // little fix on backoffice order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9792 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-02 12:32:57 +00:00
fSerny
0ba4fe9c7e [*] PROJECT : New Module API (part 1) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9790 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-02 10:49:01 +00:00