Skip to content

Commit

Permalink
add product minimum recommended price
Browse files Browse the repository at this point in the history
  • Loading branch information
@grandoc
grandoc committed Aug 29, 2014
1 parent e4dbf6a commit a448b7e
Show file tree
Hide file tree
Showing 4 changed files with 109 additions and 17 deletions.
2 changes: 2 additions & 0 deletions htdocs/langs/en_US/products.lang
View file
Expand Up @@ -239,3 +239,5 @@ PricingRule=Pricing Rules
AddCustomerPrice=Add price by customers
ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
PriceByCustomerLog=Price by customer log
MinimumPriceLimit=Minimum price can't be lower that %s
MinimumRecommendedPrice=Minimum recommended price is : %s
2 changes: 2 additions & 0 deletions htdocs/langs/fr_FR/products.lang
View file
Expand Up @@ -239,3 +239,5 @@ PricingRule=Règle de prix
AddCustomerPrice=Ajouter prix par clients
ForceUpdateChildPriceSoc=Définir le même prix sur les filiales des clients
PriceByCustomerLog=Trace des prix par clients
MinimumPriceLimit=Le prix minimum ne peut être inférieur à %s
MinimumRecommendedPrice=Le prix minimum conseillé est de : %s
32 changes: 32 additions & 0 deletions htdocs/product/class/product.class.php
View file
Expand Up @@ -9,6 +9,7 @@
* Copyright (C) 2013 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2011-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
* Copyright (C) 2014 Henry Florian <florian.henry@open-concept.pro>
* Copyright (C) 2014 Philippe Grand <philippe.grand@atoo-net.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -3513,4 +3514,35 @@ function correct_stock_batch($user, $id_entrepot, $nbpiece, $movement, $label=''
}
}
}

/**
* Return minimum product recommended price
*
* @return void
*/
function min_recommended_price()
{
global $conf;
if ( !empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE))
{
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
$product_fourn = new ProductFournisseur($this->db);
$product_fourn_list = $product_fourn->list_product_fournisseur_price($this->id, '', '');
$maxpricesupplier=0;

if (is_array($product_fourn_list) && count($product_fourn_list)>0)
{
foreach($product_fourn_list as $productfourn)
{
if ($productfourn->fourn_unitprice>$maxpricesupplier)
{
$maxpricesupplier = $productfourn->fourn_unitprice;
}
}

$maxpricesupplier*=$conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE;
}
return $maxpricesupplier;
}
}
}
90 changes: 73 additions & 17 deletions htdocs/product/price.php
View file
Expand Up @@ -6,6 +6,7 @@
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
* Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2014 Philippe Grand <philippe.grand@atoo-net.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -52,13 +53,18 @@

$object = new Product($db);

$error=0;

/*
* Actions
*/

if ($action == 'update_price' && ! $_POST ["cancel"] && ($user->rights->produit->creer || $user->rights->service->creer)) {
$result = $object->fetch($id);

$error=0;
$maxpricesupplier = $object->min_recommended_price();

// MultiPrix
if (! empty($conf->global->PRODUIT_MULTIPRICES))
{
Expand Down Expand Up @@ -93,6 +99,13 @@
$newpsq = empty($newpsq) ? 0 : $newpsq;
}

if ($newprice_min<$maxpricesupplier && !empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE))
{
setEventMessage($langs->trans("MinimumPriceLimit",price($maxpricesupplier,0,'',1,-1,-1,'auto')),'errors');
$error++;
$action='edit_price';
}

if ($object->updatePrice($newprice, $newpricebase, $user, $newvat, $newprice_min, $level, $newnpr, $newpsq) > 0) {
$action = '';
setEventMessage($langs->trans("RecordSaved"));
Expand Down Expand Up @@ -197,6 +210,9 @@
* ****************************************************
*/
if ($action == 'add_customer_price_confirm' && ! $_POST ["cancel"] && ($user->rights->produit->creer || $user->rights->service->creer)) {

$error=0;
$maxpricesupplier = $object->min_recommended_price();

$update_child_soc = GETPOST('updatechildprice');

Expand All @@ -211,15 +227,24 @@
$prodcustprice->tva_tx = str_replace('*', '', GETPOST("tva_tx"));
$prodcustprice->recuperableonly = (preg_match('/\*/', GETPOST("tva_tx")) ? 1 : 0);

$result = $prodcustprice->create($user, 0, $update_child_soc);
if ($prodcustprice->price_min<$maxpricesupplier && !empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE))
{
setEventMessage($langs->trans("MinimumPriceLimit",price($maxpricesupplier,0,'',1,-1,-1,'auto')),'errors');
$error++;
$action='add_customer_price';
}

if ($result < 0) {
setEventMessage($prodcustprice->error, 'errors');
} else {
setEventMessage($langs->trans('Save'), 'mesgs');
if (empty($error)) {
$result = $prodcustprice->create($user, 0, $update_child_soc);

if ($result < 0) {
setEventMessage($prodcustprice->error, 'errors');
} else {
setEventMessage($langs->trans('Save'), 'mesgs');
}

$action = '';
}

$action = '';
}

if ($action == 'delete_customer_price' && ($user->rights->produit->supprimer || $user->rights->service->supprimer)) {
Expand All @@ -236,6 +261,11 @@
}

if ($action == 'update_customer_price_confirm' && ! $_POST ["cancel"] && ($user->rights->produit->creer || $user->rights->service->creer)) {

$result = $object->fetch($id);

$error=0;
$maxpricesupplier = $object->min_recommended_price();

$update_child_soc = GETPOST('updatechildprice');

Expand All @@ -248,15 +278,23 @@
$prodcustprice->tva_tx = str_replace('*', '', GETPOST("tva_tx"));
$prodcustprice->recuperableonly = (preg_match('/\*/', GETPOST("tva_tx")) ? 1 : 0);

$result = $prodcustprice->update($user, 0, $update_child_soc);

if ($result < 0) {
setEventMessage($prodcustprice->error, 'errors');
} else {
setEventMessage($langs->trans('Save'), 'mesgs');
if ($prodcustprice->price_min<$maxpricesupplier && !empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE))
{
setEventMessage($langs->trans("MinimumPriceLimit",price($maxpricesupplier,0,'',1,-1,-1,'auto')),'errors');
$error++;
$action='update_customer_price';
}
if (empty($error)) {
$result = $prodcustprice->update($user, 0, $update_child_soc);

if ($result < 0) {
setEventMessage($prodcustprice->error, 'errors');
} else {
setEventMessage($langs->trans('Save'), 'mesgs');
}

$action = '';
}

$action = '';
}

/*
Expand Down Expand Up @@ -613,6 +651,10 @@
} else {
print '<td><input name="price_min" size="10" value="' . price($object->price_min) . '">';
}
if ( !empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE))
{
print '<td align="left">'.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier,0,'',1,-1,-1,'auto')).' '.img_warning().'</td>';
}
print '</td></tr>';

print '</table>';
Expand Down Expand Up @@ -660,6 +702,10 @@
} else {
print '<td><input name="price_min_' . $i . '" size="10" value="' . price($object->multiprices_min ["$i"]) . '">';
}
if ( !empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE))
{
print '<td align="left">'.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier,0,'',1,-1,-1,'auto')).' '.img_warning().'</td>';
}
print '</td></tr>';

print '<tr><td colspan="2" align="center"><input type="submit" class="button" value="' . $langs->trans("Save") . '">&nbsp;';
Expand Down Expand Up @@ -806,6 +852,7 @@
if ($action == 'add_customer_price') {

// Create mode
$maxpricesupplier = $object->min_recommended_price();

print_fiche_titre($langs->trans('PriceByCustomer'));

Expand Down Expand Up @@ -856,6 +903,10 @@
} else {
print '<td><input name="price_min" size="10" value="' . price($object->price_min) . '">';
}
if ( !empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE))
{
print '<td align="left">'.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier,0,'',1,-1,-1,'auto')).' '.img_warning().'</td>';
}
print '</td></tr>';

// Update all child soc
Expand All @@ -876,6 +927,7 @@
} elseif ($action == 'edit_customer_price') {

// Edit mode
$maxpricesupplier = $object->min_recommended_price();

print_fiche_titre($langs->trans('PriceByCustomer'));

Expand All @@ -893,11 +945,11 @@
print '<td>' . $langs->trans('ThirdParty') . '</td>';
$staticsoc = new Societe($db);
$staticsoc->fetch($prodcustprice->fk_soc);
print "<td>" . $staticsoc->getNomUrl(1) . "</td>";
print "<td colspan='2'>" . $staticsoc->getNomUrl(1) . "</td>";
print '</tr>';

// VAT
print '<tr><td>' . $langs->trans("VATRate") . '</td><td>';
print '<tr><td>' . $langs->trans("VATRate") . '</td><td colspan="2">';
print $form->load_tva("tva_tx", $prodcustprice->tva_tx, $mysoc, '', $object->id, $prodcustprice->recuperableonly);
print '</td></tr>';

Expand Down Expand Up @@ -931,6 +983,10 @@
} else {
print '<td><input name="price_min" size="10" value="' . price($prodcustprice->price_min) . '">';
}
if ( !empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE))
{
print '<td align="left">'.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier,0,'',1,-1,-1,'auto')).' '.img_warning().'</td>';
}
print '</td></tr>';

// Update all child soc
Expand Down

0 comments on commit a448b7e

Please sign in to comment.