Revert "Ajout du module pour ajouter des clients à l'espace professionnel"

This reverts commit 77752af3d1.
test
2017-06-19 17:43:00 +02:00 · 2017-06-19 17:41:42 +02:00 · 2017-06-19 17:28:07 +02:00 · 2017-06-19 17:15:30 +02:00 · 2017-06-19 17:14:35 +02:00 · 2017-06-16 12:15:06 +02:00
2044 changed files with 2153 additions and 305 deletions
--- a/cache/purifier/CSS/4.6.0,24166bfe16a0cc6bd18d813b83121ef2eaf16545,1.ser
+++ b/cache/purifier/CSS/4.6.0,24166bfe16a0cc6bd18d813b83121ef2eaf16545,1.ser
--- a/cache/sandbox/16fr.xml
+++ b/cache/sandbox/16fr.xml
--- a/erp/ErpTools.php
+++ b/erp/ErpTools.php
--- a/erp/config.php
+++ b/erp/config.php
--- a/erp/erp_add_customer.php
+++ b/erp/erp_add_customer.php
--- a/erp/erp_add_product.php
+++ b/erp/erp_add_product.php
--- a/erp/erp_get_invoice.php
+++ b/erp/erp_get_invoice.php
--- a/erp/erp_update_address.php
+++ b/erp/erp_update_address.php
--- a/erp/erp_update_customer.php
+++ b/erp/erp_update_customer.php
--- a/erp/erp_update_group.php
+++ b/erp/erp_update_group.php
--- a/erp/erp_update_order.php
+++ b/erp/erp_update_order.php
--- a/erp/erp_update_product.php
+++ b/erp/erp_update_product.php
--- a/erp/erp_update_stock.php
+++ b/erp/erp_update_stock.php
--- a/erp/oneorderUpdate.php
+++ b/erp/oneorderUpdate.php
--- a/erp/ripcord/docs/Ripcord/Ripcord_BadMethodCallException.html
+++ b/erp/ripcord/docs/Ripcord/Ripcord_BadMethodCallException.html
--- a/erp/ripcord/docs/Ripcord/Ripcord_Client.html
+++ b/erp/ripcord/docs/Ripcord/Ripcord_Client.html
--- a/erp/ripcord/docs/Ripcord/Ripcord_Client_Call.html
+++ b/erp/ripcord/docs/Ripcord/Ripcord_Client_Call.html
--- a/erp/ripcord/docs/Ripcord/Ripcord_Client_MultiCall.html
+++ b/erp/ripcord/docs/Ripcord/Ripcord_Client_MultiCall.html
--- a/erp/ripcord/docs/Ripcord/Ripcord_ConfigurationException.html
+++ b/erp/ripcord/docs/Ripcord/Ripcord_ConfigurationException.html
--- a/erp/ripcord/docs/Ripcord/Ripcord_Documentor.html
+++ b/erp/ripcord/docs/Ripcord/Ripcord_Documentor.html
--- a/erp/ripcord/docs/Ripcord/Ripcord_Documentor_Interface.html
+++ b/erp/ripcord/docs/Ripcord/Ripcord_Documentor_Interface.html
--- a/erp/ripcord/docs/Ripcord/Ripcord_Documentor_Parser.html
+++ b/erp/ripcord/docs/Ripcord/Ripcord_Documentor_Parser.html
--- a/erp/ripcord/docs/Ripcord/Ripcord_Documentor_Parser_phpdoc.html
+++ b/erp/ripcord/docs/Ripcord/Ripcord_Documentor_Parser_phpdoc.html
--- a/erp/ripcord/docs/Ripcord/Ripcord_Exception.html
+++ b/erp/ripcord/docs/Ripcord/Ripcord_Exception.html
--- a/erp/ripcord/docs/Ripcord/Ripcord_InvalidArgumentException.html
+++ b/erp/ripcord/docs/Ripcord/Ripcord_InvalidArgumentException.html
--- a/erp/ripcord/docs/Ripcord/Ripcord_RemoteException.html
+++ b/erp/ripcord/docs/Ripcord/Ripcord_RemoteException.html
--- a/erp/ripcord/docs/Ripcord/Ripcord_Server.html
+++ b/erp/ripcord/docs/Ripcord/Ripcord_Server.html
--- a/erp/ripcord/docs/Ripcord/Ripcord_Transport.html
+++ b/erp/ripcord/docs/Ripcord/Ripcord_Transport.html
--- a/erp/ripcord/docs/Ripcord/Ripcord_TransportException.html
+++ b/erp/ripcord/docs/Ripcord/Ripcord_TransportException.html
--- a/erp/ripcord/docs/Ripcord/Ripcord_Transport_CURL.html
+++ b/erp/ripcord/docs/Ripcord/Ripcord_Transport_CURL.html
--- a/erp/ripcord/docs/Ripcord/Ripcord_Transport_Stream.html
+++ b/erp/ripcord/docs/Ripcord/Ripcord_Transport_Stream.html
--- a/erp/ripcord/docs/Ripcord/_ripcord.php.html
+++ b/erp/ripcord/docs/Ripcord/_ripcord.php.html
--- a/erp/ripcord/docs/Ripcord/_ripcord_client.php.html
+++ b/erp/ripcord/docs/Ripcord/_ripcord_client.php.html
--- a/erp/ripcord/docs/Ripcord/_ripcord_documentor.php.html
+++ b/erp/ripcord/docs/Ripcord/_ripcord_documentor.php.html
--- a/erp/ripcord/docs/Ripcord/_ripcord_server.php.html
+++ b/erp/ripcord/docs/Ripcord/_ripcord_server.php.html
--- a/erp/ripcord/docs/Ripcord/ripcord.html
+++ b/erp/ripcord/docs/Ripcord/ripcord.html
--- a/erp/ripcord/docs/blank.html
+++ b/erp/ripcord/docs/blank.html
--- a/erp/ripcord/docs/classtrees_Ripcord.html
+++ b/erp/ripcord/docs/classtrees_Ripcord.html
--- a/erp/ripcord/docs/elementindex.html
+++ b/erp/ripcord/docs/elementindex.html
--- a/erp/ripcord/docs/elementindex_Ripcord.html
+++ b/erp/ripcord/docs/elementindex_Ripcord.html
--- a/erp/ripcord/docs/errors.html
+++ b/erp/ripcord/docs/errors.html
--- a/erp/ripcord/docs/index.html
+++ b/erp/ripcord/docs/index.html
--- a/erp/ripcord/docs/li_Ripcord.html
+++ b/erp/ripcord/docs/li_Ripcord.html
--- a/erp/ripcord/docs/media/banner.css
+++ b/erp/ripcord/docs/media/banner.css
--- a/erp/ripcord/docs/media/images/Constant.png
+++ b/erp/ripcord/docs/media/images/Constant.png
--- a/erp/ripcord/docs/media/images/Variable.png
+++ b/erp/ripcord/docs/media/images/Variable.png
--- a/erp/ripcord/docs/media/stylesheet.css
+++ b/erp/ripcord/docs/media/stylesheet.css
--- a/erp/ripcord/docs/packages.html
+++ b/erp/ripcord/docs/packages.html
--- a/erp/ripcord/readme.txt
+++ b/erp/ripcord/readme.txt
--- a/erp/ripcord/ripcord.php
+++ b/erp/ripcord/ripcord.php
--- a/erp/ripcord/ripcord_client.php
+++ b/erp/ripcord/ripcord_client.php
--- a/erp/ripcord/ripcord_documentor.php
+++ b/erp/ripcord/ripcord_documentor.php
--- a/erp/ripcord/ripcord_server.php
+++ b/erp/ripcord/ripcord_server.php
--- a/log/index.php
+++ b/log/index.php
--- a/mails/fr/account.html
+++ b/mails/fr/account.html
--- a/mails/fr/account.txt
+++ b/mails/fr/account.txt
--- a/mails/fr/backoffice_order.html
+++ b/mails/fr/backoffice_order.html
--- a/mails/fr/backoffice_order.txt
+++ b/mails/fr/backoffice_order.txt
--- a/mails/fr/bankwire.html
+++ b/mails/fr/bankwire.html
--- a/mails/fr/bankwire.txt
+++ b/mails/fr/bankwire.txt
--- a/mails/fr/cheque.html
+++ b/mails/fr/cheque.html
--- a/mails/fr/cheque.txt
+++ b/mails/fr/cheque.txt
--- a/mails/fr/contact.html
+++ b/mails/fr/contact.html
--- a/mails/fr/contact.txt
+++ b/mails/fr/contact.txt
--- a/mails/fr/contact_form.html
+++ b/mails/fr/contact_form.html
--- a/mails/fr/contact_form.txt
+++ b/mails/fr/contact_form.txt
--- a/mails/fr/credit_slip.html
+++ b/mails/fr/credit_slip.html
--- a/mails/fr/credit_slip.txt
+++ b/mails/fr/credit_slip.txt
--- a/mails/fr/download-product.tpl
+++ b/mails/fr/download-product.tpl
--- a/mails/fr/download_product.html
+++ b/mails/fr/download_product.html
--- a/mails/fr/download_product.txt
+++ b/mails/fr/download_product.txt
--- a/mails/fr/employee_password.html
+++ b/mails/fr/employee_password.html
--- a/mails/fr/employee_password.txt
+++ b/mails/fr/employee_password.txt
--- a/mails/fr/forward_msg.html
+++ b/mails/fr/forward_msg.html
--- a/mails/fr/forward_msg.txt
+++ b/mails/fr/forward_msg.txt
--- a/mails/fr/guest_to_customer.html
+++ b/mails/fr/guest_to_customer.html
--- a/mails/fr/guest_to_customer.txt
+++ b/mails/fr/guest_to_customer.txt
--- a/mails/fr/in_transit.html
+++ b/mails/fr/in_transit.html
--- a/mails/fr/in_transit.txt
+++ b/mails/fr/in_transit.txt
--- a/mails/fr/lang.php
+++ b/mails/fr/lang.php
--- a/mails/fr/log_alert.html
+++ b/mails/fr/log_alert.html
--- a/mails/fr/log_alert.txt
+++ b/mails/fr/log_alert.txt
--- a/mails/fr/newsletter.html
+++ b/mails/fr/newsletter.html
--- a/mails/fr/newsletter.txt
+++ b/mails/fr/newsletter.txt
--- a/mails/fr/order_canceled.html
+++ b/mails/fr/order_canceled.html
--- a/mails/fr/order_canceled.txt
+++ b/mails/fr/order_canceled.txt
--- a/mails/fr/order_changed.html
+++ b/mails/fr/order_changed.html
--- a/mails/fr/order_changed.txt
+++ b/mails/fr/order_changed.txt
--- a/mails/fr/order_conf.html
+++ b/mails/fr/order_conf.html
--- a/mails/fr/order_conf.txt
+++ b/mails/fr/order_conf.txt
--- a/mails/fr/order_conf_cart_rules.tpl
+++ b/mails/fr/order_conf_cart_rules.tpl
--- a/mails/fr/order_conf_cart_rules.txt
+++ b/mails/fr/order_conf_cart_rules.txt
--- a/mails/fr/order_conf_product_list.tpl
+++ b/mails/fr/order_conf_product_list.tpl
--- a/mails/fr/order_conf_product_list.txt
+++ b/mails/fr/order_conf_product_list.txt
--- a/mails/fr/order_customer_comment.html
+++ b/mails/fr/order_customer_comment.html
--- a/mails/fr/order_customer_comment.txt
+++ b/mails/fr/order_customer_comment.txt
--- a/mails/fr/order_merchant_comment.html
+++ b/mails/fr/order_merchant_comment.html
--- a/mails/fr/order_merchant_comment.txt
+++ b/mails/fr/order_merchant_comment.txt
--- a/mails/fr/order_return_state.html
+++ b/mails/fr/order_return_state.html
--- a/mails/fr/order_return_state.txt
+++ b/mails/fr/order_return_state.txt
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
root	c50a5c760c	Revert "Ajout du module pour ajouter des clients à l'espace professionnel" This reverts commit `77752af3d1`.	2017-06-19 17:43:00 +02:00
root	72cee7b991	test	2017-06-19 17:41:42 +02:00
root	8c13f2ddba	fix frontcontroller	2017-06-19 17:28:07 +02:00
root	cae2d21ea2	Merge branch 'addCusto' of gitlab.antadis.net:dev-antadis/roykin into addCusto	2017-06-19 17:15:30 +02:00
root	96b2e8d790	Merge branch 'master' of gitlab.antadis.net:dev-antadis/roykin into addCusto	2017-06-19 17:14:35 +02:00
Valentin	77752af3d1	Ajout du module pour ajouter des clients à l'espace professionnel	2017-06-16 12:15:06 +02:00
Valentin	b564cf2ab1	Ajout du site de base	2017-06-14 11:41:31 +02:00
RoykinPROD	6cead6e18d	fix roykin id as default category	2017-06-07 15:21:29 +02:00
Rodney Figaro	967ca30a6f	Merge branch 'levest_merge' into dev	2017-06-07 12:32:05 +02:00
Rodney Figaro	049dd002aa	fix default menu	2017-06-07 12:31:42 +02:00
Rodney Figaro	1a760d8bf0	Merge branch 'levest_merge' into dev	2017-06-07 11:23:33 +02:00
Rodney Figaro	e4d60371af	fix conflicts	2017-06-07 11:06:58 +02:00
Rodney Figaro	f63fb84af8	Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev	2017-06-02 16:42:18 +02:00
root	74f51c4e3f	change bg submenu	2017-06-02 16:37:21 +02:00
Rodney Figaro	179dd86c83	Merge branch 'ticket/r13265-2-fix-label-bottle' into dev	2017-05-30 18:23:55 +02:00
Rodney Figaro	652bcc3c46	Merge branch 'ticket/r13265-2-fix-label-bottle' into dev	2017-05-30 18:19:06 +02:00
Rodney Figaro	07c8d42616	Merge branch 'ticket/r13144-bug-double-orders' into dev	2017-05-29 16:18:02 +02:00
Rodney Figaro	7e51bf6ab2	Merge branch 'ticket/r13144-bug-double-orders' into dev	2017-05-29 12:26:03 +02:00
Rodney Figaro	107558f0aa	Merge branch 'ticket/r13144-bug-double-orders' into dev	2017-05-24 12:07:41 +02:00
Rodney Figaro	290e1070e6	Merge branch 'ticket/r13161-remove-guest-in-emails' into dev	2017-05-19 15:52:23 +02:00
Rodney Figaro	0a310d3eeb	fix conflict	2017-05-19 15:51:46 +02:00
Rodney Figaro	ffd2b0398e	Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev	2017-05-17 11:16:01 +02:00
Rodney Figaro	8dbf4f6ade	13161 - changes pictos/icons (mails, site) and texts	2017-05-17 11:15:52 +02:00
Rodney Figaro	a8c83bf508	fix conflicts	2017-05-16 16:31:36 +02:00
Rodney Figaro	9e506a1a3c	13161 - changes texts	2017-05-16 16:30:33 +02:00
Rodney Figaro	e82e8c4d12	Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev	2017-05-15 11:04:47 +02:00
Rodney Figaro	645bf55797	13161 - rewrite comments in override payment module	2017-05-15 11:04:37 +02:00
Rodney Figaro	ec46216f7f	Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev	2017-05-15 10:59:20 +02:00
Rodney Figaro	7857dd6278	13161 - add id_category_default in payment module to sort by brands in emails	2017-05-15 10:59:04 +02:00
Rodney Figaro	d795a8e236	Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev	2017-05-15 10:55:33 +02:00
Rodney Figaro	db09be33ce	13161 - fix bug in payment module	2017-05-15 10:55:24 +02:00
Rodney Figaro	c97dbd5b54	Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev	2017-05-15 10:53:43 +02:00
Rodney Figaro	621da01bd8	13161 - simplify paymentmodule override	2017-05-15 10:53:35 +02:00
Rodney Figaro	9d614a89ec	Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev	2017-05-15 10:42:03 +02:00
Rodney Figaro	9aae6f7bbf	13161 - sort product by brands in email confirmation order	2017-05-15 10:41:55 +02:00
Rodney Figaro	9712c1dcf1	fix conflicts	2017-05-12 18:29:40 +02:00
Rodney Figaro	fc1fc93528	fix conflicts	2017-05-12 17:54:55 +02:00
Rodney Figaro	766078a8df	Merge branch 'ticket/r13265-hide-product-text' into dev	2017-05-12 17:50:02 +02:00
Rodney Figaro	8edc8294e0	Merge branch 'ticket/r13265-hide-product-text' into dev	2017-05-12 17:46:08 +02:00
Rodney Figaro	f377439f61	Merge branch 'ticket/r13265-hide-product-text' into dev	2017-05-12 17:42:41 +02:00
Rodney Figaro	f13635d3ca	Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev	2017-05-12 17:10:00 +02:00
Rodney Figaro	f46921981d	13161 - increase memory limit during logo/bkg upload	2017-05-12 17:09:53 +02:00
Rodney Figaro	b4d7500699	Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev	2017-05-12 16:59:58 +02:00
Rodney Figaro	2cf07ece99	13161 - add image upload checking and force resize	2017-05-12 16:59:17 +02:00
Rodney Figaro	0c909a97e2	Merge branch 'fix_erp_mailer' into dev	2017-05-12 16:32:40 +02:00
Rodney Figaro	73a82fa8e7	Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev	2017-05-12 16:24:23 +02:00
Rodney Figaro	69c5338121	13161 - fix order confirmation cart summary	2017-05-12 16:24:07 +02:00
Rodney Figaro	b9bf9c018c	Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev	2017-05-12 16:00:13 +02:00
Rodney Figaro	6109c60f9f	13161 - fix unchecked "brands" variable in shopping cart tpl	2017-05-12 15:06:58 +02:00
Rodney Figaro	413de3b3ec	fix conflit in global css	2017-05-12 12:50:42 +02:00
Rodney Figaro	25868a2255	13161 - update history order details with products per brands, fix bugs, refactoring	2017-05-12 12:49:08 +02:00
Rodney Figaro	c68a051cfe	Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev	2017-05-12 11:33:45 +02:00
Rodney Figaro	1289b0903d	13161 - change labels of images in admin category form	2017-05-12 11:33:30 +02:00
root	5b48817a65	Merge branch 'ticket/r13161-Fusion-Levest-Roykin' of gitlab.antadis.net:dev-antadis/roykin into ticket/r13161-Fusion-Levest-Roykin	2017-05-12 09:08:53 +00:00
root	515d278d97	13161 - change background image front css	2017-05-12 09:08:15 +00:00
Rodney Figaro	42149ac043	Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev	2017-05-12 10:42:45 +02:00
Rodney Figaro	4745a769f3	13161 - hide families tab in front menu	2017-05-12 10:42:28 +02:00
Rodney Figaro	9b68479750	Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev	2017-05-12 09:25:43 +02:00
Rodney Figaro	b76115952b	13161 - fix logo/background thumbnail generation in admin category	2017-05-12 09:25:11 +02:00
Rodney Figaro	3163cc8461	13161 - fix menu bug (no brands) in search page	2017-05-11 18:42:41 +02:00
root	8ee820c22b	13161 - Integration	2017-05-11 16:34:43 +00:00
Rodney Figaro	38c4b60cc2	13161 - change cart product per brands sorting	2017-05-11 18:06:29 +02:00
Rodney Figaro	c641b3f04e	13161 - sort products per "brands" category in shopping list	2017-05-11 16:21:54 +02:00
Rodney Figaro	05a506cb26	13161 - generalize the menu building and redirections in categories	2017-05-11 12:55:53 +02:00
Rodney Figaro	7705eea62b	13161 - restore level 3 menu	2017-05-11 11:55:13 +02:00
Rodney Figaro	28ef200c4b	Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev	2017-05-10 18:42:30 +02:00
Rodney Figaro	4b4c5f4e4a	13161 - add first version of logos and background in category	2017-05-10 18:41:57 +02:00
Rodney Figaro	fe8295dd55	Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev	2017-05-10 14:38:09 +02:00
Rodney Figaro	8e7e4f4847	13161 - change id of roykin category	2017-05-10 14:37:48 +02:00
Rodney Figaro	2cf7914a8b	Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev	2017-05-10 14:25:17 +02:00
Rodney Figaro	171fc052e8	Revert "13161 - define only default sub categories of brands and home" This reverts commit `9fb708677f`.	2017-05-10 14:24:53 +02:00
Rodney Figaro	2d3c944003	Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev	2017-05-10 14:18:27 +02:00
Rodney Figaro	9fb708677f	13161 - define only default sub categories of brands and home	2017-05-10 14:17:55 +02:00
Rodney Figaro	bc90864f26	13161 - fix message alert box integration in search page	2017-05-10 12:51:21 +02:00
Rodney Figaro	79c1744cd3	13161 - change menus relationship to categories, change categories constants	2017-05-10 12:40:14 +02:00
Rodney Figaro	4a60da7510	13161 - Category::getCategoriesTree returns array() by default	2017-05-10 10:34:43 +02:00
Rodney Figaro	595a52bee7	13161 - replace CATEGORY_COLLECTION_ALL in all overrided controllers except CategoryController by a calling of a Category default method	2017-05-10 10:15:22 +02:00
Rodney Figaro	7bfbbecd06	Merge branch 'ticket/r13075-erp-fix-update-products' into dev	2017-05-05 11:41:30 +02:00
Rodney Figaro	14b6c35903	Merge branch 'ticket/r13075-erp-fix-update-products' into dev	2017-05-03 17:50:58 +02:00
Rodney Figaro	2b28851bf7	Merge branch 'ticket/r12695-allinonereward' into dev	2017-04-28 12:25:25 +02:00
Rodney Figaro	1e15cc999a	12695 - increase font size of the text displayed in cart summary	2017-04-28 12:25:03 +02:00
Rodney Figaro	be34cd8eb3	Merge branch 'ticket/r12695-allinonereward' into dev	2017-04-27 18:42:45 +02:00
Rodney Figaro	e6d5829a21	12695 - display voucher code input bloc even if voucher has been entered	2017-04-27 18:42:37 +02:00
Rodney Figaro	742285b162	Merge branch 'ticket/r12695-allinonereward' into dev	2017-04-27 18:13:50 +02:00
Rodney Figaro	03a449b4a9	12695 - replace in translation "recompenses" by "avoirs" in rewards account front page	2017-04-27 18:13:39 +02:00
Rodney Figaro	7b93b6fb2b	Merge branch 'ticket/r12695-allinonereward' into dev	2017-04-27 18:09:25 +02:00
Rodney Figaro	3cdd2cf5ea	12695 - change text in shopping cart when no fidelity is possible	2017-04-27 18:09:15 +02:00
Rodney Figaro	25c1eebe36	Merge branch 'ticket/r13064-automatic-tva' into dev	2017-04-27 17:57:20 +02:00
Rodney Figaro	d22dc86e3d	Merge branch 'ticket/r12890-upgrade-give-a-gift-2' into dev	2017-04-27 17:45:28 +02:00
Rodney Figaro	2ec644a69c	Merge branch 'ticket/r13075-erp-fix-update-products' into dev	2017-04-21 12:04:22 +02:00
Rodney Figaro	5af89d532e	Merge branch 'ticket/r13075-erp-fix-update-products' into dev	2017-04-21 11:54:39 +02:00
Rodney Figaro	7ae2ff628b	Merge branch 'ticket/r13075-erp-fix-update-products' into dev	2017-04-21 11:44:09 +02:00
Rodney Figaro	a393c22970	Merge branch 'fix_give_a_gift' into dev	2017-04-21 10:46:02 +02:00
Rodney Figaro	9300802f70	Merge branch 'ticket/r13075-erp-fix-update-products' into dev	2017-04-21 10:39:13 +02:00
Rodney Figaro	6520bdb78d	Merge branch 'ticket/r12695-allinonereward' into dev	2017-04-19 17:34:21 +02:00
Rodney Figaro	d3815878a2	12695 - restore previous text "Add some products..." in shopping cart	2017-04-19 17:34:11 +02:00
Rodney Figaro	db49038494	Merge branch 'ticket/r12695-allinonereward' into dev	2017-04-19 17:24:13 +02:00
Rodney Figaro	23009b7d08	12695 - save translations	2017-04-19 17:24:05 +02:00
Rodney Figaro	9dd40d2d78	Merge branch 'ticket/r12695-allinonereward' into dev	2017-04-19 17:16:53 +02:00
Rodney Figaro	a3192820d0	12695 - add link to rewards in block account, fix give a gift shopping-cart display issue	2017-04-19 17:16:44 +02:00
Rodney Figaro	e7281a7a34	12695 - Fixes all-in-one reward integration in shopping cart	2017-04-19 16:33:47 +02:00
Rodney Figaro	ecb330844f	Merge branch 'master' of gitlab.antadis.net:dev-antadis/roykin into ticket/r12695-allinonereward	2017-04-19 15:45:56 +02:00
Rodney Figaro	965382262f	Merge branch 'ticket/r12890-upgrade-give-a-gift' into dev	2017-04-19 13:01:39 +02:00
Rodney Figaro	8bb6a2cc1b	fix conflicts	2017-04-11 15:18:25 +02:00
Rodney Figaro	d77f4da0af	Merge branch 'master' into dev	2017-03-29 17:40:27 +02:00
root	7b3e160f86	12756 - fix emails filtering in erp	2017-03-29 11:32:53 +00:00
root	2a8ac9dec0	Merge branch 'dev' of gitlab.antadis.net:dev-antadis/roykin into dev	2017-03-29 07:16:34 +00:00
Rodney Figaro	9426808c2e	Merge branch 'fix_preprod_erp' into dev	2017-03-29 09:05:54 +02:00
Rodney Figaro	00bd2d11b3	12756 - add PREPROD MODE, anonymize email erp - presta, except test emails from antadis and roykin	2017-03-29 09:05:19 +02:00
Rodney Figaro	455145cef7	12695 - add link to rewards account in shopping cart + translations	2017-03-24 18:14:55 +01:00
root	33f9aaf2bd	12695 - override allinone_reward to use the theme emails rather than the module emails	2017-03-24 16:08:21 +00:00
Rodney Figaro	e791aa768b	Merge branch 'dev' of gitlab.antadis.net:dev-antadis/roykin into dev	2017-03-24 11:11:29 +01:00
Rodney Figaro	1e1d58d7ea	Merge branch 'ticket/r12695-allinonereward' of gitlab.antadis.net:dev-antadis/roykin into ticket/r12695-allinonereward	2017-03-24 10:55:06 +01:00
root	9c6b53ceeb	skin all in one + mail	2017-03-24 09:52:14 +00:00
Rodney Figaro	16907e9c17	Merge branch 'master' of gitlab.antadis.net:dev-antadis/roykin into ticket/r12695-allinonereward	2017-03-23 12:54:49 +01:00
root	7e64106487	Merge branch 'master' of gitlab.antadis.net:dev-antadis/roykin into dev	2017-03-21 17:39:42 +00:00
Rodney Figaro	84a0001706	Merge branch 'master' into dev	2017-03-20 09:19:51 +01:00
Rodney Figaro	5c41070458	add all-in-one reward module (not modified, original version)	2017-03-16 14:06:13 +01:00