Compare commits

..

17 Commits

Author SHA1 Message Date
root
6c0a154096 fix pb file exist 2017-06-26 09:52:48 +02:00
root
51442d7287 Merge branch 'tickets/r13536-addpageregister' 2017-06-21 18:01:32 +02:00
RoykinPROD
88a2834870 push prod 2017-06-21 15:44:30 +02:00
Valentin
11b9f278c0 Nom et Prenom passé en required 2017-06-20 21:27:38 +02:00
Valentin
820e080976 Modification affichage erreur du form 2017-06-20 20:46:41 +02:00
Valentin
8f17f76225 Modification du message d'information 2017-06-20 20:38:07 +02:00
Valentin
773b8db153 Petite modification du front 2017-06-20 20:28:35 +02:00
Valentin
5b49ba1fcd Modification du visu du form 2017-06-20 20:16:25 +02:00
Valentin
4f314a1310 Modification de l'affichage du block d'inscription 2017-06-20 20:10:13 +02:00
Valentin
ea946e212c modification du form 2017-06-20 18:41:48 +02:00
Valentin
2969c5b01a Modification du mail 2017-06-20 17:23:38 +02:00
Valentin
c64355eb2a ajout de la traducition 2017-06-20 13:02:23 +02:00
Valentin
9fa6bcaa42 Ajout de la redirection, du dossier mail et modification du form 2017-06-20 12:55:58 +02:00
root
a31bb7105a divers 2017-06-19 18:02:46 +02:00
root
47f206a351 add index file 2017-06-19 17:50:41 +02:00
root
fa56cdd243 replace layout function 2017-06-19 17:47:56 +02:00
Valentin
90cab265de Ajout du module pour ajouter des clients à l'espace professionnel 2017-06-19 17:46:51 +02:00
2060 changed files with 711 additions and 249 deletions

View File

0
cache/sandbox/16fr.xml vendored Executable file → Normal file
View File

0
erp/ErpTools.php Executable file → Normal file
View File

0
erp/config.php Executable file → Normal file
View File

0
erp/erp_add_customer.php Executable file → Normal file
View File

0
erp/erp_add_product.php Executable file → Normal file
View File

0
erp/erp_get_invoice.php Executable file → Normal file
View File

9
erp/erp_update_address.php Executable file → Normal file
View File

@ -91,5 +91,10 @@ foreach ($final as $key => $item) {
$address->id_country = ErpTools::getCountryIdForPresta($item['addr']['country_id'][0]);
$address->is_erp = 1;
$address->id_erp = $item['addr']['id'];
$address->save();
}
if (!empty($address->address1)) {
$address->save();
}
else {
error_log('erp_update_address - customer id #'.$customer->id.' / erp id #'.$item['company_id_erp'].' empty address');
}
}

8
erp/erp_update_customer.php Executable file → Normal file
View File

@ -166,7 +166,13 @@ foreach ($ids_customer_update as $id_customer) {
$address->id_country = ErpTools::getCountryIdForPresta($other_address['country_id'][0]);
$address->is_erp = 1;
$address->id_erp = $other_address['id'];
$address->save();
if (!empty($address->address1)) {
$address->save();
}
else {
error_log('erp_customer_update : customer id #'.$customer->id.' / erp id #'.$record['id'].' empty address');
}
}
}
}

0
erp/erp_update_group.php Executable file → Normal file
View File

0
erp/erp_update_order.php Executable file → Normal file
View File

10
erp/erp_update_product.php Executable file → Normal file
View File

@ -31,8 +31,9 @@ $ids_product = $models->execute_kw($db, $uid, $password,
$d = Db::getInstance();
foreach ($ids_product as $key => $id) {
$date = date('Y-m-d H:i:s');
foreach ($ids_product as $key => $id) {
// get product's information
$record = $models->execute_kw($db, $uid, $password,
'product.template', 'read', array($id)
@ -80,7 +81,8 @@ foreach ($ids_product as $key => $id) {
p.`reference` = "'.$record['default_code'].'",
p.`weight` = '.(float)$record['weight'].',
p.`out_of_stock` = 2,
pl.`name` = "'.pSQL(trim(utf8_encode($name_product))).'"
pl.`name` = "'.pSQL(trim(utf8_encode($name_product))).'",
p.`date_upd` = "' . $date .'"
WHERE
`id_erp` = '.(int)$id.'
AND p.`id_product` = pl.id_product
@ -97,6 +99,8 @@ foreach ($ids_product as $key => $id) {
$sql = 'SELECT `id_image` FROM '._DB_PREFIX_.'image WHERE `id_product` = '.(int)$product_id;
$id_image = $d->getValue($sql);
if ($id_image) {
$image = new Image($id_image);
$imagesTypes = ImageType::getImagesTypes('products');
@ -104,7 +108,7 @@ foreach ($ids_product as $key => $id) {
$image_exists = true;
foreach ($imagesTypes as $imageType) {
$image_exists = file_exists($existing_path.'-'.stripslashes($imageType['name']).'.'.$image->image_format);
$image_exists = file_exists('../img/p/'.$existing_path.'-'.stripslashes($imageType['name']).'.'.$image->image_format);
if (!$image_exists) {
break;
}

0
erp/erp_update_stock.php Executable file → Normal file
View File

0
erp/oneorderUpdate.php Executable file → Normal file
View File

View File

0
erp/ripcord/docs/Ripcord/Ripcord_Client.html Executable file → Normal file
View File

0
erp/ripcord/docs/Ripcord/Ripcord_Client_Call.html Executable file → Normal file
View File

0
erp/ripcord/docs/Ripcord/Ripcord_Client_MultiCall.html Executable file → Normal file
View File

View File

0
erp/ripcord/docs/Ripcord/Ripcord_Documentor.html Executable file → Normal file
View File

View File

View File

View File

0
erp/ripcord/docs/Ripcord/Ripcord_Exception.html Executable file → Normal file
View File

View File

0
erp/ripcord/docs/Ripcord/Ripcord_RemoteException.html Executable file → Normal file
View File

0
erp/ripcord/docs/Ripcord/Ripcord_Server.html Executable file → Normal file
View File

0
erp/ripcord/docs/Ripcord/Ripcord_Transport.html Executable file → Normal file
View File

View File

0
erp/ripcord/docs/Ripcord/Ripcord_Transport_CURL.html Executable file → Normal file
View File

0
erp/ripcord/docs/Ripcord/Ripcord_Transport_Stream.html Executable file → Normal file
View File

0
erp/ripcord/docs/Ripcord/_ripcord.php.html Executable file → Normal file
View File

0
erp/ripcord/docs/Ripcord/_ripcord_client.php.html Executable file → Normal file
View File

0
erp/ripcord/docs/Ripcord/_ripcord_documentor.php.html Executable file → Normal file
View File

0
erp/ripcord/docs/Ripcord/_ripcord_server.php.html Executable file → Normal file
View File

0
erp/ripcord/docs/Ripcord/ripcord.html Executable file → Normal file
View File

0
erp/ripcord/docs/blank.html Executable file → Normal file
View File

0
erp/ripcord/docs/classtrees_Ripcord.html Executable file → Normal file
View File

0
erp/ripcord/docs/elementindex.html Executable file → Normal file
View File

0
erp/ripcord/docs/elementindex_Ripcord.html Executable file → Normal file
View File

0
erp/ripcord/docs/errors.html Executable file → Normal file
View File

0
erp/ripcord/docs/index.html Executable file → Normal file
View File

0
erp/ripcord/docs/li_Ripcord.html Executable file → Normal file
View File

0
erp/ripcord/docs/media/banner.css Executable file → Normal file
View File

0
erp/ripcord/docs/media/images/Constant.png Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 752 B

After

Width:  |  Height:  |  Size: 752 B

0
erp/ripcord/docs/media/images/Variable.png Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 688 B

After

Width:  |  Height:  |  Size: 688 B

0
erp/ripcord/docs/media/stylesheet.css Executable file → Normal file
View File

0
erp/ripcord/docs/packages.html Executable file → Normal file
View File

0
erp/ripcord/readme.txt Executable file → Normal file
View File

0
erp/ripcord/ripcord.php Executable file → Normal file
View File

0
erp/ripcord/ripcord_client.php Executable file → Normal file
View File

0
erp/ripcord/ripcord_documentor.php Executable file → Normal file
View File

0
erp/ripcord/ripcord_server.php Executable file → Normal file
View File

0
log/index.php Executable file → Normal file
View File

0
mails/fr/account.html Executable file → Normal file
View File

0
mails/fr/account.txt Executable file → Normal file
View File

0
mails/fr/backoffice_order.html Executable file → Normal file
View File

0
mails/fr/backoffice_order.txt Executable file → Normal file
View File

0
mails/fr/bankwire.html Executable file → Normal file
View File

0
mails/fr/bankwire.txt Executable file → Normal file
View File

0
mails/fr/cheque.html Executable file → Normal file
View File

0
mails/fr/cheque.txt Executable file → Normal file
View File

0
mails/fr/contact.html Executable file → Normal file
View File

0
mails/fr/contact.txt Executable file → Normal file
View File

0
mails/fr/contact_form.html Executable file → Normal file
View File

0
mails/fr/contact_form.txt Executable file → Normal file
View File

0
mails/fr/credit_slip.html Executable file → Normal file
View File

0
mails/fr/credit_slip.txt Executable file → Normal file
View File

0
mails/fr/download-product.tpl Executable file → Normal file
View File

0
mails/fr/download_product.html Executable file → Normal file
View File

0
mails/fr/download_product.txt Executable file → Normal file
View File

0
mails/fr/employee_password.html Executable file → Normal file
View File

0
mails/fr/employee_password.txt Executable file → Normal file
View File

0
mails/fr/forward_msg.html Executable file → Normal file
View File

0
mails/fr/forward_msg.txt Executable file → Normal file
View File

0
mails/fr/guest_to_customer.html Executable file → Normal file
View File

0
mails/fr/guest_to_customer.txt Executable file → Normal file
View File

0
mails/fr/in_transit.html Executable file → Normal file
View File

0
mails/fr/in_transit.txt Executable file → Normal file
View File

0
mails/fr/lang.php Executable file → Normal file
View File

0
mails/fr/log_alert.html Executable file → Normal file
View File

0
mails/fr/log_alert.txt Executable file → Normal file
View File

0
mails/fr/newsletter.html Executable file → Normal file
View File

0
mails/fr/newsletter.txt Executable file → Normal file
View File

0
mails/fr/order_canceled.html Executable file → Normal file
View File

0
mails/fr/order_canceled.txt Executable file → Normal file
View File

0
mails/fr/order_changed.html Executable file → Normal file
View File

0
mails/fr/order_changed.txt Executable file → Normal file
View File

0
mails/fr/order_conf.html Executable file → Normal file
View File

0
mails/fr/order_conf.txt Executable file → Normal file
View File

0
mails/fr/order_conf_cart_rules.tpl Executable file → Normal file
View File

0
mails/fr/order_conf_cart_rules.txt Executable file → Normal file
View File

0
mails/fr/order_conf_product_list.tpl Executable file → Normal file
View File

0
mails/fr/order_conf_product_list.txt Executable file → Normal file
View File

0
mails/fr/order_customer_comment.html Executable file → Normal file
View File

0
mails/fr/order_customer_comment.txt Executable file → Normal file
View File

0
mails/fr/order_merchant_comment.html Executable file → Normal file
View File

0
mails/fr/order_merchant_comment.txt Executable file → Normal file
View File

0
mails/fr/order_return_state.html Executable file → Normal file
View File

0
mails/fr/order_return_state.txt Executable file → Normal file
View File

Some files were not shown because too many files have changed in this diff Show More