lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: for avoid missing the customer discount

Browse Source
This commit is contained in:
Regis Houssin 2013-04-19 12:47:53 +02:00
parent 56a0f70ad3
commit 077698d789
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/core/tpl/objectline_add.tpl.php
View File

@ -80,8 +80,8 @@ if (! empty($conf->margin->enabled)) {
'origin_price_ht_cache' => 'price_ht', 'origin_price_ht_cache' => 'price_ht',
'origin_tva_tx_cache' => 'tva_tx', 'origin_tva_tx_cache' => 'tva_tx',
'origin_price_ttc_cache' => 'price_ttc', 'origin_price_ttc_cache' => 'price_ttc',
'qty' => 'qty' 'qty' => 'qty',
,'remise_percent' => 'discount' 'remise_percent' => 'discount'
), ),
'update_textarea' => array( 'update_textarea' => array(
'product_desc' => 'desc' 'product_desc' => 'desc'
@ -160,7 +160,10 @@ if (! empty($conf->margin->enabled)) {
<input type="hidden" id="origin_price_ttc_cache" name="origin_price_ttc_cache" value="" /> <input type="hidden" id="origin_price_ttc_cache" name="origin_price_ttc_cache" value="" />
</td> </td>
<td align="right"><input type="text" size="3" id="qty" name="qty" value="<?php echo (GETPOST('qty')?GETPOST('qty'):1); ?>"></td> <td align="right"><input type="text" size="3" id="qty" name="qty" value="<?php echo (GETPOST('qty')?GETPOST('qty'):1); ?>"></td>
<td align="right" nowrap="nowrap"><input type="text" size="1" value="<?php echo $buyer->remise_client; ?>" id="remise_percent" name="remise_percent">%</td> <td align="right" nowrap="nowrap">
<input type="text" size="1" value="<?php echo $buyer->remise_client; ?>" id="remise_percent" name="remise_percent">%
<input type="hidden" id="origin_remise_percent" name="origin_remise_percent" value="<?php echo $buyer->remise_client; ?>" />
</td>
<?php <?php
$colspan = 4; $colspan = 4;
if (! empty($conf->margin->enabled)) { if (! empty($conf->margin->enabled)) {
@ -373,6 +376,11 @@ $(document).ready(function() {
$('#price_ttc').attr('disabled','disabled'); $('#price_ttc').attr('disabled','disabled');
} }
$('#remise_percent').bind('change', function() {
if ($(this).val() < $('#origin_remise_percent').val())
$('#remise_percent').val($('#origin_remise_percent').val());
});
$('#tva_tx').change(function() { $('#tva_tx').change(function() {
if ($(this).val() == 0) { if ($(this).val() == 0) {
if ($('#idprod').val() == 0) { if ($('#idprod').val() == 0) {