Marion Muszynski
|
69731d8590
|
Merge branch 'ticket-criteo'
|
2016-07-27 17:06:02 +02:00 |
|
Marion Muszynski
|
492f14f02c
|
Merge remote-tracking branch 'origin/ticket-blockOrderSummary'
|
2016-07-27 16:35:50 +02:00 |
|
Marion Muszynski
|
fe32da2f12
|
add module criteo_bbb
|
2016-07-25 16:40:22 +02:00 |
|
Marion Muszynski
|
6711926ac3
|
fix conflicts
|
2016-07-25 15:26:26 +02:00 |
|
Marion Muszynski
|
1694bf54d1
|
standardization date estimation part 2
|
2016-07-25 14:31:22 +02:00 |
|
Marion Muszynski
|
bb0cd59d0b
|
adjusting date delivery
|
2016-07-25 12:22:50 +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
|
4734f5dabb
|
Merge branch 'ticket-blockOrderSummary'
|
2016-07-25 11:23:55 +02:00 |
|
Marion Muszynski
|
50ddbe95b3
|
comment date estimation, waiting for good calcul method
|
2016-07-25 11:23:29 +02:00 |
|
Marion Muszynski
|
dd6a758e32
|
modif css
|
2016-07-25 11:17:40 +02:00 |
|
Marion Muszynski
|
b1ecd00e3e
|
modif for delivery delay
|
2016-07-25 10:51:39 +02:00 |
|
Marion Muszynski
|
5881036918
|
fix
|
2016-07-18 12:58:22 +02:00 |
|
Marion Muszynski
|
3eea78480e
|
fixes
|
2016-07-18 12:46:58 +02:00 |
|
Marion Muszynski
|
46581396ce
|
savecb
|
2016-07-18 12:12:26 +02:00 |
|
Marion Muszynski
|
0b5cb21977
|
small fix
|
2016-07-18 11:53:37 +02:00 |
|
Marion Muszynski
|
fb51c877c4
|
suite save paybox info
|
2016-07-18 11:45:18 +02:00 |
|
Marion Muszynski
|
5ae34ea5ab
|
fix
|
2016-07-15 17:56:41 +02:00 |
|
Marion Muszynski
|
5dbd39aadd
|
first commit to save paybox cards
|
2016-07-15 17:49:13 +02:00 |
|
Marion Muszynski
|
5994e715e1
|
fix
|
2016-07-15 12:49:39 +02:00 |
|
Marion Muszynski
|
b8a4934278
|
adding delivery date estimation
|
2016-07-15 12:26:58 +02:00 |
|
Marion Muszynski
|
e33d2da73d
|
adjusting for delivery delay part
|
2016-07-13 15:35:00 +02:00 |
|
Marion Muszynski
|
dee3c2ba2c
|
ajusting css
|
2016-07-13 15:16:48 +02:00 |
|
Marion Muszynski
|
67314cbf25
|
hide bestsellers at payment step
|
2016-07-13 15:09:33 +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
|
489b94cff5
|
suite block order summary
|
2016-07-12 14:50:52 +02:00 |
|
Marion Muszynski
|
b03c5cf0b9
|
add logo
|
2016-07-11 17:43:10 +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
|
d2ec1e1de8
|
adding module blockordersummary
|
2016-07-08 17:51:48 +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
|
7043f4b24a
|
other fix
|
2016-06-22 17:23:34 +02:00 |
|
Marion Muszynski
|
a6c46f9077
|
petit fix before prod
|
2016-06-22 17:08:09 +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
|
7af6d9ccd7
|
adding bg for sale
|
2016-06-10 16:49:43 +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 |
|
Marion Muszynski
|
83c4acc83d
|
opti request
|
2016-06-08 11:44:13 +02:00 |
|
Marion Muszynski
|
30b39b5776
|
fix conflicts
|
2016-06-08 10:53:07 +02:00 |
|
Marion Muszynski
|
577249435f
|
Merge branch 'ticket-10122'
|
2016-06-07 17:00:06 +02:00 |
|
Marion Muszynski
|
5f21c6d3b2
|
update braderie
|
2016-06-07 16:40:19 +02:00 |
|
Srv Bebeboutik
|
3ba607554c
|
modif end sale
|
2016-06-07 16:02:16 +02:00 |
|
Marion Muszynski
|
fb26faeb8e
|
suite update braderie
|
2016-06-07 14:42:40 +02:00 |
|
Marion Muszynski
|
9212b8e84d
|
petit fix sur la braderie
|
2016-06-07 13:02:03 +02:00 |
|
Srv Bebeboutik
|
7025bce024
|
add phrase frais de port popup
|
2016-06-07 12:52:15 +02:00 |
|
Thibault UBUNTU
|
2cf5555949
|
Merge branch 'dylan_9894'
|
2016-06-07 12:16:21 +02:00 |
|
Dylan Travers
|
a542baf9b0
|
Add extrafield and date_end to newsletter. Ticket N°9894
|
2016-06-07 11:48:20 +02:00 |
|
Srv Bebeboutik
|
49e26669a9
|
modif from prod
|
2016-06-07 11:22:35 +02:00 |
|
Marion Muszynski
|
7ad38029da
|
adding filter
|
2016-06-06 17:27:09 +02:00 |
|
Srv Bebeboutik
|
bec4b56f27
|
modif from prod to get real numbers for export
|
2016-06-06 15:32:42 +02:00 |
|
Marion Muszynski
|
72545630a3
|
fix conflicts
|
2016-06-06 11:32:25 +02:00 |
|
Srv Bebeboutik
|
a4a5f4850d
|
petite modif from prod
|
2016-06-06 10:24:06 +02:00 |
|
Srv Bebeboutik
|
e26cefa86a
|
modif prod
|
2016-06-06 10:14:02 +02:00 |
|
Srv Bebeboutik
|
368307c6e2
|
modif from prod
|
2016-06-03 17:04:45 +02:00 |
|
Marion Muszynski
|
2dc90dc0c6
|
update to get Cart loyalty credit value without considering discount in total cart
|
2016-06-03 16:34:30 +02:00 |
|
Srv Bebeboutik
|
b1a0a1b29e
|
small commit from prod
|
2016-06-03 11:18:35 +02:00 |
|
Marion Muszynski
|
e92682d851
|
modif tpl loyalty program
|
2016-05-30 17:04:26 +02:00 |
|
Marion Muszynski
|
02037dda1a
|
fix ratio
|
2016-05-30 16:30:32 +02:00 |
|
Marion Muszynski
|
d63a2d7d5a
|
addind field to config if delivery of sale is enabled only in fr
|
2016-05-30 15:42:20 +02:00 |
|
Marion Muszynski
|
7e74c8b58a
|
modif to take phone number if no mobile phone
|
2016-05-27 17:22:48 +02:00 |
|
Srv Bebeboutik
|
2f6c21e7fb
|
push de la prod
|
2016-05-27 16:59:18 +02:00 |
|
Marion Muszynski
|
cb02563fa9
|
Merge branch 'ticket-updateStats'
|
2016-05-27 15:01:42 +02:00 |
|
Marion Muszynski
|
722713d96c
|
test
|
2016-05-27 15:01:16 +02:00 |
|
Marion Muszynski
|
83e9e484ef
|
Merge branch 'ticket-updateStats'
|
2016-05-27 14:58:30 +02:00 |
|
Marion Muszynski
|
a8bdea5899
|
opti again
|
2016-05-27 14:58:08 +02:00 |
|
Marion Muszynski
|
a2084bd3cf
|
Merge branch 'ticket-updateStats'
|
2016-05-27 12:57:53 +02:00 |
|
Marion Muszynski
|
b59c00ffcd
|
adding another reason
|
2016-05-27 12:57:32 +02:00 |
|
Marion Muszynski
|
b135394369
|
Merge branch 'ticket-updateStats'
|
2016-05-27 12:42:39 +02:00 |
|
Marion Muszynski
|
40680b0020
|
opti export
|
2016-05-27 12:42:09 +02:00 |
|
Marion Muszynski
|
b3956b5592
|
Merge branch 'ticket-updateStats'
|
2016-05-27 12:36:23 +02:00 |
|
Marion Muszynski
|
d3b2f14bc9
|
continuing...
|
2016-05-27 12:35:51 +02:00 |
|
Marion Muszynski
|
5e3f9a31e7
|
Merge branch 'ticket-updateStats'
|
2016-05-27 11:27:53 +02:00 |
|
Marion Muszynski
|
2ce1f5fafe
|
continuing of otpi
|
2016-05-27 11:27:09 +02:00 |
|
Marion Muszynski
|
b63707f242
|
Merge branch 'ticket-updateStats'
|
2016-05-27 10:45:58 +02:00 |
|
Marion Muszynski
|
067eebea21
|
beginning of opti requete export
|
2016-05-27 10:45:22 +02:00 |
|
Marion Muszynski
|
750779f200
|
Merge branch 'ticket-updateStats'
|
2016-05-27 10:23:16 +02:00 |
|
Marion Muszynski
|
3b8156458b
|
adding export remb
|
2016-05-27 10:19:09 +02:00 |
|
Marion Muszynski
|
ab70428dd4
|
update braderie
|
2016-05-26 17:50:44 +02:00 |
|
Marion Muszynski
|
e725fb321c
|
update ref braderie
|
2016-05-26 17:12:24 +02:00 |
|
Marion Muszynski
|
1fa19380d2
|
adding generate all ean for a specific sale
|
2016-05-26 13:01:58 +02:00 |
|
Marion Muszynski
|
84fe835cc1
|
suite export remb
|
2016-05-26 12:35:37 +02:00 |
|
Srv Bebeboutik
|
8994cabc49
|
modif prod webservice laposte
|
2016-05-26 10:19:16 +02:00 |
|
Marion Muszynski
|
6a127d37a2
|
Merge branch 'ticket-updateStats'
|
2016-05-25 16:06:41 +02:00 |
|
Marion Muszynski
|
cb3cca72c9
|
petit fix encore
|
2016-05-25 16:06:25 +02:00 |
|
Marion Muszynski
|
e46d30d574
|
Merge branch 'ticket-updateStats'
|
2016-05-25 16:05:25 +02:00 |
|
Marion Muszynski
|
1c0f7f8608
|
petit fix
|
2016-05-25 16:05:04 +02:00 |
|
Marion Muszynski
|
f95017718e
|
Merge branch 'ticket-updateStats'
|
2016-05-25 16:02:18 +02:00 |
|
Marion Muszynski
|
2f5c7ae81a
|
petit fix
|
2016-05-25 16:01:47 +02:00 |
|
Marion Muszynski
|
1c7e794677
|
Merge branch 'ticket-updateStats'
|
2016-05-25 16:00:43 +02:00 |
|
Marion Muszynski
|
7e2c886394
|
modif getReport
|
2016-05-25 15:59:27 +02:00 |
|
Marion Muszynski
|
860cb7b881
|
Merge branch 'ticket-updateStats'
|
2016-05-24 14:48:49 +02:00 |
|
Marion Muszynski
|
5cfbe18733
|
modif calendar
|
2016-05-24 14:48:22 +02:00 |
|
Marion Muszynski
|
16afc80a8c
|
Merge branch 'ticket-updateStats'
|
2016-05-23 18:05:43 +02:00 |
|
Marion Muszynski
|
1c9c8b7bd1
|
modif date max
|
2016-05-23 18:05:11 +02:00 |
|
Marion Muszynski
|
3c70e6206e
|
Merge branch 'ticket-updateStats'
|
2016-05-23 17:51:38 +02:00 |
|
Marion Muszynski
|
8aa6d416f7
|
opti requete sql
|
2016-05-23 17:51:11 +02:00 |
|
Marion Muszynski
|
e57dbe5cd8
|
Merge branch 'ticket-updateStats'
|
2016-05-23 17:36:20 +02:00 |
|
Marion Muszynski
|
dfe51ea898
|
modif calc date
|
2016-05-23 17:35:57 +02:00 |
|
Marion Muszynski
|
1a4b41ab92
|
Merge branch 'ticket-updateStats'
|
2016-05-23 14:54:10 +02:00 |
|
Marion Muszynski
|
e0b19d0ab1
|
add begin extract remb
|
2016-05-23 14:53:47 +02:00 |
|
Marion Muszynski
|
3a7a70c711
|
some modifs
|
2016-05-23 13:14:55 +02:00 |
|
Marion Muszynski
|
f48aaf8cea
|
fix name in order
|
2016-05-20 17:45:26 +02:00 |
|
Marion Muszynski
|
71cf0ba1cc
|
modif requete
|
2016-05-20 17:39:57 +02:00 |
|
Marion Muszynski
|
a7b09a172b
|
add report stock
|
2016-05-20 17:13:05 +02:00 |
|
Marion Muszynski
|
d23535a4a7
|
other modif
|
2016-05-20 15:45:11 +02:00 |
|
Marion Muszynski
|
3fcf5bbc5c
|
modif table stats logistic
|
2016-05-20 15:42:50 +02:00 |
|
Marion Muszynski
|
6e0dd8141c
|
modif to stay in category
|
2016-05-18 17:07:19 +02:00 |
|
Marion Muszynski
|
12314f4f95
|
add cron to clean csv
|
2016-05-18 16:26:31 +02:00 |
|
Marion Muszynski
|
15ccb40b9e
|
ajout export sale dans BDC
|
2016-05-18 16:14:24 +02:00 |
|
Marion Muszynski
|
a8e7c0c14a
|
update special char replace in ws for label
|
2016-05-18 12:14:17 +02:00 |
|
Marion Muszynski
|
796b0af17c
|
modif for update socol address in BO order
|
2016-05-18 10:30:17 +02:00 |
|
Marion Muszynski
|
cbec52936b
|
modif
|
2016-05-17 17:50:49 +02:00 |
|
Marion Muszynski
|
0b077c192a
|
modif
|
2016-05-17 17:48:55 +02:00 |
|
Marion Muszynski
|
77a757859b
|
modif ip for module cheque
|
2016-05-17 17:43:14 +02:00 |
|
Marion Muszynski
|
30410a5fc8
|
supp des fdp fix pour vente consommable
|
2016-05-17 14:31:41 +02:00 |
|
Marion Muszynski
|
bd6dc8f8cb
|
Merge branch 'ticket-newImport'
|
2016-05-17 14:13:55 +02:00 |
|
Marion Muszynski
|
6580dbc6a2
|
modif restrict ean for alphanum
|
2016-05-13 16:13:39 +02:00 |
|
Marion Muszynski
|
85c5e03a39
|
adapte for prod
|
2016-05-13 15:50:44 +02:00 |
|
Marion Muszynski
|
f542a268e7
|
pre checked carriers sale
|
2016-05-13 15:48:09 +02:00 |
|
Marion Muszynski
|
19ed76d6ba
|
Merge branch 'ticket-flexibilite'
|
2016-05-12 12:06:43 +02:00 |
|
Marion Muszynski
|
d2f0f5e7ad
|
add template
|
2016-05-12 11:50:42 +02:00 |
|
Marion Muszynski
|
51a8fd9437
|
adding of new import for product customs
|
2016-05-11 10:13:20 +02:00 |
|
Marion Muszynski
|
f8e85b7a41
|
hotfix trim email
|
2016-05-10 16:28:32 +02:00 |
|
Marion Muszynski
|
320c6922c8
|
modif of credit format in header
|
2016-05-10 15:44:36 +02:00 |
|
Marion Muszynski
|
ffbb3232b9
|
modif soflex
|
2016-05-09 17:43:57 +02:00 |
|
Marion Muszynski
|
8e8e2793ae
|
modif arroaw slider
|
2016-05-04 16:19:18 +02:00 |
|
Marion Muszynski
|
e85b593e35
|
modif trad
|
2016-05-04 16:00:32 +02:00 |
|
Marion Muszynski
|
402ac44f49
|
slider blockbestsellers in product page
|
2016-05-04 15:31:28 +02:00 |
|
Marion Muszynski
|
63db0cc73c
|
adding in blocuserinfo
|
2016-05-03 15:38:20 +02:00 |
|
Alexandre Simonet
|
cc86b7849d
|
add rss fluxcatalogue
|
2016-05-03 12:20:54 +02:00 |
|
Thibault UBUNTU
|
25bf39f711
|
trad es
|
2016-05-03 12:08:55 +02:00 |
|
Thibault UBUNTU
|
f15662e826
|
paypal suite
|
2016-05-02 15:30:12 +02:00 |
|
Marion Muszynski
|
e82357544c
|
Merge branch 'ticket-newExtract'
|
2016-04-27 18:07:18 +02:00 |
|
Marion Muszynski
|
397a73d037
|
modif product price for DEB exp
|
2016-04-27 18:04:42 +02:00 |
|
Marion Muszynski
|
caa68a4c2f
|
Merge branch 'ticket-newExtract'
|
2016-04-27 12:10:03 +02:00 |
|
Marion Muszynski
|
9e2c4c5c39
|
adding origin product to DEB exp
|
2016-04-27 12:08:22 +02:00 |
|
Marion Muszynski
|
ae1687a105
|
Merge branch 'master' of gitlab.antadis.fr:dev-antadis/bebeboutik
|
2016-04-27 11:35:03 +02:00 |
|
Srv Bebeboutik
|
6a1fd27e32
|
optimize stat
|
2016-04-27 11:31:43 +02:00 |
|
Marion Muszynski
|
5f96303fe9
|
modif for multi generation of csv in same time
|
2016-04-27 11:11:23 +02:00 |
|
Marion Muszynski
|
54bbfd5248
|
modif extract
|
2016-04-25 17:16:29 +02:00 |
|
Marion Muszynski
|
dde198080d
|
modif extract custom
|
2016-04-25 16:50:51 +02:00 |
|
Marion Muszynski
|
be4026ba1a
|
modif tpl
|
2016-04-25 12:45:13 +02:00 |
|
Marion Muszynski
|
48ba0424d8
|
other modif
|
2016-04-25 11:31:26 +02:00 |
|
Marion Muszynski
|
957c7f1db6
|
modif hookOrderReturn
|
2016-04-25 11:13:36 +02:00 |
|
Marion Muszynski
|
72a3792897
|
fix bug double adding
|
2016-04-25 10:43:24 +02:00 |
|
Marion Muszynski
|
4397a50151
|
correction concernant le return et cancel product
|
2016-04-22 18:00:36 +02:00 |
|
Marion Muszynski
|
b7ff14c0a7
|
correction for return
|
2016-04-22 17:00:45 +02:00 |
|
Marion Muszynski
|
364fe5e367
|
corrections
|
2016-04-22 16:43:07 +02:00 |
|
Marion Muszynski
|
3d1fb8a10a
|
other update
|
2016-04-22 16:20:53 +02:00 |
|
Marion Muszynski
|
3b855c3f4a
|
modif BO
|
2016-04-22 15:23:16 +02:00 |
|
Marion Muszynski
|
7edf0ce6b7
|
update for return
|
2016-04-22 15:17:26 +02:00 |
|
Marion Muszynski
|
f303bb4b2d
|
encore un int qui trainait
|
2016-04-22 15:07:18 +02:00 |
|
Marion Muszynski
|
f1f14667a4
|
modif BO loyalty
|
2016-04-22 12:57:31 +02:00 |
|
Marion Muszynski
|
b6e25b87cc
|
modifs
|
2016-04-21 18:37:11 +02:00 |
|
Marion Muszynski
|
e540e9e1cf
|
modifs
|
2016-04-21 18:06:22 +02:00 |
|
Marion Muszynski
|
36af8de7d8
|
correction int float second round
|
2016-04-21 17:56:54 +02:00 |
|
Marion Muszynski
|
aaf2290d28
|
correction int float
|
2016-04-21 17:52:52 +02:00 |
|
Marion Muszynski
|
35ee4a1c68
|
many update of module loyalty
|
2016-04-21 17:41:04 +02:00 |
|
Marion Muszynski
|
a2e21669b0
|
correction bug newOrderHook
|
2016-04-21 12:39:07 +02:00 |
|
Marion Muszynski
|
e505c1e9db
|
other corrctions
|
2016-04-21 12:15:04 +02:00 |
|
Marion Muszynski
|
15f3b6fa20
|
modif tpl
|
2016-04-21 12:01:10 +02:00 |
|
Marion Muszynski
|
5d52bff134
|
corrections
|
2016-04-21 11:39:25 +02:00 |
|
Marion Muszynski
|
ba0e8d29bc
|
modif tpl loyalty
|
2016-04-21 11:31:36 +02:00 |
|
Marion Muszynski
|
c8befd1ede
|
total modification of loyalty module
|
2016-04-21 11:14:33 +02:00 |
|
Marion Muszynski
|
811ba9b3a9
|
Merge branch 'ticket-newExtracts'
|
2016-04-20 16:40:37 +02:00 |
|
Marion Muszynski
|
4b80f9f7a6
|
correction
|
2016-04-20 16:40:12 +02:00 |
|
Marion Muszynski
|
ef33e2cbc7
|
Merge branch 'ticket-newExtracts'
|
2016-04-20 16:05:20 +02:00 |
|
Marion Muszynski
|
753b17fcba
|
petite rectification quantity_sold
|
2016-04-20 15:58:47 +02:00 |
|
Marion Muszynski
|
21f1ada2d1
|
Merge branch 'ticket-landingpage'
|
2016-04-20 15:35:16 +02:00 |
|
Marion Muszynski
|
fd5bccadd7
|
begin loyalty
|
2016-04-20 15:33:56 +02:00 |
|
Marion Muszynski
|
4c4c069588
|
modif width button
|
2016-04-20 12:35:20 +02:00 |
|
Marion Muszynski
|
ecf913626f
|
update extract names
|
2016-04-20 11:59:02 +02:00 |
|
Marion Muszynski
|
c63769824e
|
add 2 new extracts for deb
|
2016-04-20 11:37:50 +02:00 |
|
Marion Muszynski
|
219b6dabb3
|
Merge branch 'ticket-consumable'
|
2016-04-18 16:17:30 +02:00 |
|
Marion Muszynski
|
cbbaf9c8e0
|
modif left_img.tpl
|
2016-04-18 16:14:19 +02:00 |
|
Marion Muszynski
|
1c0d70688c
|
modif categoryimg
|
2016-04-18 16:03:17 +02:00 |
|
Marion Muszynski
|
d7b7e7abc6
|
modif connect button in landing page
|
2016-04-18 15:22:00 +02:00 |
|
Marion Muszynski
|
e2cc8ff3fd
|
Merge branch 'ticket-extract'
|
2016-04-15 16:48:37 +02:00 |
|
Marion Muszynski
|
f0e2a7481a
|
fix to order image by position
|
2016-04-15 12:38:31 +02:00 |
|
Marion Muszynski
|
cdd8b21bfe
|
add nc8 id_country into export sales
|
2016-04-15 12:05:25 +02:00 |
|
Marion Muszynski
|
2d1d12c07e
|
update extract
|
2016-04-13 12:22:55 +02:00 |
|
Marion Muszynski
|
43a24d1c7a
|
update braderie and rack
|
2016-04-12 16:11:08 +02:00 |
|
Marion Muszynski
|
0b0ebcb26f
|
fix conflict consommables
|
2016-04-12 15:17:45 +02:00 |
|
Marion Muszynski
|
19baa665a4
|
update braderie
|
2016-04-11 12:13:41 +02:00 |
|
Marion Muszynski
|
b287dc89de
|
begin ticket export ventes
|
2016-04-11 11:31:57 +02:00 |
|
Marion Muszynski
|
559042b904
|
Merge branch 'ticket-9791'
|
2016-04-08 16:16:13 +02:00 |
|
Marion Muszynski
|
2c371bb94d
|
update width bdc
|
2016-04-08 16:14:46 +02:00 |
|
Marion Muszynski
|
999faa694c
|
Merge branch 'ticket-9791'
|
2016-04-08 16:12:15 +02:00 |
|
Marion Muszynski
|
b0a0abaf03
|
add ref to bdc log
|
2016-04-08 16:09:49 +02:00 |
|
Marion Muszynski
|
786c055787
|
add trad
|
2016-04-08 15:37:53 +02:00 |
|
Marion Muszynski
|
1d26459616
|
update landing page for connect button
|
2016-04-08 15:31:40 +02:00 |
|
Marion Muszynski
|
ace3f99035
|
Merge branch 'ticket-9791'
|
2016-04-08 11:30:43 +02:00 |
|
Marion Muszynski
|
447362a0d7
|
optimisation excel bdc
|
2016-04-08 11:26:48 +02:00 |
|
Marion Muszynski
|
fe03a17200
|
add generate rack in labelgenerate
|
2016-04-08 10:27:46 +02:00 |
|
Marion Muszynski
|
8c7dc01d73
|
suite opti bdc
|
2016-04-08 10:11:11 +02:00 |
|
Marion Muszynski
|
a9ad96ad98
|
opti excel style to all bdc
|
2016-04-07 11:47:02 +02:00 |
|
Marion Muszynski
|
613c58245f
|
optimization excel style bdc
|
2016-04-07 10:53:27 +02:00 |
|
Marion Muszynski
|
d02a74938b
|
opti bdc
|
2016-04-06 18:16:18 +02:00 |
|
Marion Muszynski
|
2c7864cd89
|
Merge branch 'ticket-9791'
|
2016-04-06 17:34:01 +02:00 |
|
Marion Muszynski
|
5ce6d92b75
|
correction bug
|
2016-04-06 17:32:04 +02:00 |
|
Thibault UBUNTU
|
3e3d3a0e58
|
fix paypal order save
|
2016-04-06 16:32:50 +02:00 |
|
Thibault UBUNTU
|
552b46347e
|
v0.1 paypal billing
|
2016-04-06 15:52:14 +02:00 |
|
Marion Muszynski
|
60cf70493a
|
Merge branch 'ticket-9791'
|
2016-04-06 15:08:35 +02:00 |
|
Marion Muszynski
|
91efe4469e
|
fix conflict adminProduct
|
2016-04-06 14:46:47 +02:00 |
|
Marion Muszynski
|
bf619d7173
|
update trad in export bdc
|
2016-04-06 13:21:04 +02:00 |
|
Marion Muszynski
|
42704a03c7
|
creation bdc logistique
|
2016-04-06 13:09:54 +02:00 |
|
Marion Muszynski
|
c35bcc893a
|
avancées dans le bdc log
|
2016-04-05 18:15:35 +02:00 |
|
Marion Muszynski
|
c6887b7b84
|
suite ticket 9791
|
2016-04-05 16:14:32 +02:00 |
|
Marion Muszynski
|
12d18ea080
|
Merge branch 'ticket-9643'
|
2016-04-05 14:43:37 +02:00 |
|
Marion Muszynski
|
c9023ddb9a
|
fix ref problem
|
2016-04-05 14:20:50 +02:00 |
|