Commit Graph

363 Commits

Author SHA1 Message Date
Marion Muszynski
1694bf54d1 standardization date estimation part 2 2016-07-25 14:31:22 +02:00
Marion Muszynski
f4f144057d modif date calcul method to include we and check if the last day is a business day 2016-07-25 12:05:57 +02:00
Marion Muszynski
2b9fd29308 Merge branch 'ticket-invoiceOrderBy' 2016-07-13 10:59:09 +02:00
Marion Muszynski
4acaacaaa8 other modif 2016-07-12 17:59:18 +02:00
Marion Muszynski
c0117d7819 good modif 2016-07-12 17:35:38 +02:00
Marion Muszynski
fd51d7f449 small update 2016-07-12 16:59:11 +02:00
Marion Muszynski
5303ef1b06 update BDC sale state 2016-07-12 16:23:23 +02:00
Marion Muszynski
df1e423c9c modif order way 2016-07-11 17:06:11 +02:00
Marion Muszynski
ebd46063eb small mod 2016-07-11 16:15:04 +02:00
Marion Muszynski
fce857f676 update order way M2 2016-07-11 16:13:21 +02:00
Marion Muszynski
d1c984cb76 update sort invoice 2016-07-11 14:44:19 +02:00
Marion Muszynski
7faebc96f0 small js update in adminlogisticpending 2016-07-11 12:35:41 +02:00
Marion Muszynski
91fc9ee7dc update order invoice 2016-07-08 16:03:19 +02:00
Srv Bebeboutik
4a93e29747 modif prod, remove log email sending to us 2016-07-08 15:52:31 +02:00
Marion Muszynski
e489a60c90 Merge branch 'ticket-simplemulti_invoice' 2016-07-08 10:52:17 +02:00
Marion Muszynski
d7f6930236 Merge branch 'ticket-simplemulti_bdc' 2016-07-08 10:47:49 +02:00
Srv Bebeboutik
7701a95063 fix from prod 2016-07-06 16:07:22 +02:00
Marion Muszynski
0f05a15e94 Merge branch 'ticket-preheaderRSS' 2016-07-06 15:33:48 +02:00
Marion Muszynski
7f6949043e adding various description blocks in Admin product edit fast 2016-07-06 12:14:28 +02:00
Marion Muszynski
e79421073d adding pending orders to stock report 2016-07-05 15:11:33 +02:00
Marion Muszynski
95b176601a adding preheader rss emarsys 2016-07-04 18:20:03 +02:00
Marion Muszynski
3be779d03b Merge branch 'ticket-simplemulti_logistic' 2016-07-04 16:58:23 +02:00
Srv Bebeboutik
c48e673922 fix prod 2016-06-30 11:31:11 +02:00
Marion Muszynski
699a06db48 fix conflict 2016-06-30 11:15:14 +02:00
Marion Muszynski
760bd50c06 adding sentence according delivery delay 2016-06-29 15:52:03 +02:00
Marion Muszynski
e6585427ee fix 2016-06-28 16:15:41 +02:00
Marion Muszynski
10ad346ad5 modif idcombination 2016-06-28 16:07:29 +02:00
Marion Muszynski
163cc3ac04 adding html bind 2016-06-28 15:03:07 +02:00
Marion Muszynski
8a0b80e15e pop error cart 2016-06-28 14:45:48 +02:00
Marion Muszynski
43646dd4bd modif 2016-06-24 13:54:50 +02:00
Marion Muszynski
985bf52e83 update to add product with attribute to cart from bestsellers 2016-06-24 12:41:46 +02:00
Marion Muszynski
77b9c22014 fix conflicts 2016-06-22 15:03:36 +02:00
Marion Muszynski
ae50025d14 continuing updating 2016-06-22 11:26:51 +02:00
Marion Muszynski
8ebec9fb3e addind admin pending orders 2016-06-21 17:18:24 +02:00
Marion Muszynski
c442173cb8 add nex adminTab 2016-06-20 18:27:54 +02:00
Marion Muszynski
c29d8725ac add status modify button 2016-06-20 15:32:06 +02:00
Marion Muszynski
6265c1b2af begin update adminlogistic 2016-06-20 15:09:13 +02:00
Marion Muszynski
ad30bb51a4 modif in Sale function for M2 2016-06-20 12:56:59 +02:00
Marion Muszynski
3d4d7b16e2 update invoice 2016-06-20 12:49:32 +02:00
Marion Muszynski
56163f32ab update bdc log 2016-06-20 11:01:39 +02:00
Marion Muszynski
40ab87cd45 update request deb expe 2016-06-10 11:55:09 +02:00
Marion Muszynski
182a608e3b little update in request 2016-06-10 10:22:26 +02:00
Marion Muszynski
1615e9a452 adding fields in sale exports 2016-06-08 17:44:21 +02:00
Marion Muszynski
ba706ec6c9 Merge branch 'ticket-fidelite' 2016-06-08 16:33:40 +02:00
Marion Muszynski
d47310bc0a redirect for es version 2016-06-08 16:27:56 +02:00
Marion Muszynski
60996f7bcf Merge branch 'ticket-fidelite' 2016-06-08 12:26:28 +02:00
Marion Muszynski
c0836540bc delete some stuff about categories 2016-06-08 12:25:05 +02:00
Marion Muszynski
5c8e35adf2 Merge branch 'ticket-fidelite' 2016-06-08 12:16:37 +02:00
Marion Muszynski
e7ce0ecb86 opti request suite 2016-06-08 12:14:54 +02:00
Marion Muszynski
e9300ff725 opti request 2 2016-06-08 12:02:16 +02:00