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

157 Commits

Author SHA1 Message Date
rGaillard
d16dfdab01 [-] BO: Fix PSCFV-3315 bad invoice after deleting a product 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16622 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-31 09:47:09 +00:00
rGaillard
22d4e61e54 // Fix currency storage in backoffice orders 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16611 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-30 15:32:22 +00:00
rGaillard
2ce01cc89e [-] BO: Fix PSCFV-3345 display of prices with a currency different than default on backoffice orders 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16610 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-30 15:24:29 +00:00
fBrignoli
d30f381961 [-] BO : Bug fixed related to #PSCFV-2954 - order slip do not include VAT on carriers 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16569 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-25 13:57:15 +00:00
lLefevre
f2233e08d0 [-] BO : fix #PSCFV-3278 : add a parameter id_shop in a method Mail::send() && normalize 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16549 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-24 14:13:11 +00:00
lLefevre
810692e577 [-] BO : fix #PSCFV-3244 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16467 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-18 09:17:33 +00:00
fBrignoli
b2ba507b03 [-] BO : Bug Fixed ##PSCFV-3128 - part 2 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16455 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-17 14:14:24 +00:00
fBrignoli
26c3e81764 [-] BO : Bug Fixed #PSCFV-3128 - Incorrect voucher value via product return 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16453 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-17 09:31:11 +00:00
fBrignoli
7af140d285 [-] PDF : Canadian taxes 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16386 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-12 16:45:14 +00:00
mDeflotte
dc35aaa83c [-] BO : #PSCFV-3000 - Send an email on changing an order from the BO 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16372 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-12 12:05:19 +00:00
lLefevre
9bc7869e2b [*] TR : update English translations key for Errors 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16371 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-12 10:14:41 +00:00
lLefevre
868eaa32fd // Fix translations 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16307 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-10 13:03:23 +00:00
lLefevre
2f361c3bde [*] BO : #PSCFV-3007 : Now you can create a voucher when you create a partial refund on the BO 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16303 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-10 10:03:35 +00:00
mDeflotte
1dec53057d [-] BO : #PSCFV-3126 - Change mail object. Mail object must be unique for a specific template 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16301 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-10 09:38:20 +00:00
lLefevre
ddbd363946 [-] BO : fix #PSCFV-3087 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16261 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-06 12:55:48 +00:00
lLefevre
991938edad [-] BO : #PSCFV-3036 : fix bug and fix notice and fix deprecated function 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16248 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-05 15:35:13 +00:00
mDeflotte
1997bf6efb [-] BO : #PSCFV-3011 - Add details of refund and returned products on the BO order page. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16222 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-05 07:40:11 +00:00
mDeflotte
3c1c6fb7e0 [-] FO : #PSCFV-2920 - Hidding order number, use order reference instead 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16136 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-26 15:19:35 +00:00
mDeflotte
dbcff517b4 [-] BO : #PSCFV-2739 - Hide button merchandise return if disable 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15952 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-08 08:44:50 +00:00
rGaillard
161f32b9e6 // Fix freeshipping on backoffice Order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15930 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-07 14:56:48 +00:00
rGaillard
2bce691ae8 // Improve performance and bug fixes 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15882 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-06 16:22:48 +00:00
vAugagneur
1e1452468c //remove unused variable 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15846 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-05 09:24:15 +00:00
mDeflotte
f109695cbd // Fix bugs on adding products to an orders on the BO 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15826 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-04 13:25:35 +00:00
dMetzger
a6ca0bb1b2 // Code cleaning 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15770 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-30 16:18:10 +00:00
aFolletete
545abdbc24 [-] BO : fixed bug #PSCFV-2503 - fix issue on stock update when product line edition in order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15566 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 18:04:07 +00:00
rGaillard
2553bc015e [-] BO: Fix PSCFV-2442 product price on backoffice order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15493 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 13:05:16 +00:00
lLefevre
c344ae2385 [-] BO : fix #PSCFV-2381 : now count translations fields are good and translations... 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15443 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-19 13:26:27 +00:00
aFolletete
098e0fbc35 [-] BO : fixed bug #PSCFV-2436 - fix bug on product adding on order page 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15425 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-19 10:52:04 +00:00
aFolletete
6230b51db1 [-] BO : fixed bug #PSCFV-2434 - FIx bug on Product line edition in order page 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15422 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-19 10:41:51 +00:00
mDeflotte
ea7e73ef35 [-] BO : #PSCFV-139 - Improving Retial refund 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15316 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-15 14:58:02 +00:00
rGaillard
30bc1f1de3 // New order message for BackOffice order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15291 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-14 17:31:00 +00:00
lLefevre
d8b5cf93f3 [-] FO : #PSCFV-2150 : Translations of back office are connected width sprintf() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15279 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-14 14:38:07 +00:00
lLefevre
897c6acb82 [-] FO : #PSCFV-2151 : Translations of errors are connected width sprintf() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15265 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-14 11:45:41 +00:00
aFolletete
47cfd2b9f9 [-] BO : fixed bug #PSCFV-1296 - Can't add a product in order (BO) 
// Fix backward compatibility issue with updateQty method

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15152 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-10 09:29:46 +00:00
rGaillard
7df7f7aac4 [+] BO: The customizable products are now usable in the BackOffice order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15109 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-09 14:04:13 +00:00
mDeflotte
55aa82c00c // Little bug fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15061 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-03 15:59:15 +00:00
mDeflotte
5b2e04fc7b // remove undefined function call 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14907 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-26 13:07:19 +00:00
mDeflotte
7f2c9fe45e [-] BO : #PSCFV-139 - Partial refund must not be available when order was not paid 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14892 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-26 08:19:41 +00:00
mDeflotte
b1f1febc88 [-] BO : #PSCFV-139 - Partial refund must not be available when order was not paid 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14890 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-26 08:16:43 +00:00
bMancone
53821dd3ad // When viewing an order, a warning is now displayed if one/some product(s) are out of stock - #PSTEST-821 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14801 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-23 08:26:10 +00:00
bMancone
9ea9bd183c // When viewing an order, the stock_available is now properly displayed. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14800 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-23 08:15:23 +00:00
mDeflotte
37401cd8fa // Removing debug function call 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14759 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-19 09:16:11 +00:00
rGaillard
d07623cbc2 [*] BO: Set defaults payment order state on BackOffice order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14694 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-17 15:56:38 +00:00
rMalie
0c2dd0cd2f // MERGE product_multistore branch : product fields are now editable per shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14682 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-17 13:32:12 +00:00
mDeflotte
d4d1c35cb9 [-] BO : #PSCFI-5378 - Create voucher from the BO after a product return 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14681 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-17 13:19:13 +00:00
mDeflotte
d0809600a0 [-] BO : #PSFV-434 - Bad product total calculation (confusion with wt) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14672 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-17 09:08:54 +00:00
bMancone
285becae29 // Fixed stock_available when ordering products 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14656 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-16 13:39:15 +00:00
rGaillard
aed2458a70 [-] BO: Fix specific prices on BackOffice order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14642 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-13 17:20:17 +00:00
aFolletete
d7777f270e [-] BO : fixed bug #PSFV-504 - Even if the invoices management is disabled, you can create an invoice 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14627 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-13 10:01:21 +00:00
mDeflotte
99beaf6ed0 [-] FO : #PSFV-797 - Fix bug with order detail and customized products 
[-] BO : #PSFV-797 - Fix bug with order editing  and customized products

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14607 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-12 13:02:18 +00:00