From fa4fc8495b6f4ae12ad6c6d939c35354498a45d7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 11 May 2013 02:12:34 +0200
Subject: [PATCH] Fix: Missing translation key Fix: Minor css style missing
Fix: Create draft proposal return error if no contact defined. Fix: W3C
---
htdocs/comm/propal.php | 3 +-
htdocs/comm/propal/class/propal.class.php | 5 +-
htdocs/core/search_page.php | 2 +-
.../core/tpl/freeproductline_create.tpl.php | 128 +++++++++---------
.../tpl/predefinedproductline_create.tpl.php | 38 +++---
htdocs/langs/en_US/errors.lang | 1 +
htdocs/langs/fr_FR/errors.lang | 1 +
htdocs/theme/cameleo/style.css.php | 9 +-
htdocs/theme/eldy/style.css.php | 2 +-
9 files changed, 97 insertions(+), 92 deletions(-)
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 9cde868a97a..b41311c3458 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -351,7 +351,7 @@ else if ($action == 'add' && $user->rights->propal->creer)
if ($id > 0)
{
// Insertion contact par defaut si defini
- if (GETPOST('contactidp'))
+ if (GETPOST('contactidp') > 0)
{
$result=$object->add_contact(GETPOST('contactidp'),'CUSTOMER','external');
if ($result < 0)
@@ -1347,6 +1347,7 @@ if ($action == 'create')
$numprojet=select_projects($soc->id,$projectid);
if ($numprojet==0)
{
+ $langs->load("projects");
print ' <a href="../projet/fiche.php?socid='.$soc->id.'&action=create">'.$langs->trans("AddProject").'</a>';
}
print '</td>';
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index dc2c708cbec..7dc63fdace9 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -648,8 +648,7 @@ class Propal extends CommonObject
dol_syslog(get_class($this)."::create");
// Check parameters
- $soc = new Societe($this->db);
- $result=$soc->fetch($this->socid);
+ $result=$this->fetch_thirdparty();
if ($result < 0)
{
$this->error="Failed to fetch company";
@@ -670,8 +669,6 @@ class Propal extends CommonObject
$this->db->begin();
- $this->fetch_thirdparty();
-
// Insert into database
$sql = "INSERT INTO ".MAIN_DB_PREFIX."propal (";
$sql.= "fk_soc";
diff --git a/htdocs/core/search_page.php b/htdocs/core/search_page.php
index cf44cccce2b..1ea6138873e 100644
--- a/htdocs/core/search_page.php
+++ b/htdocs/core/search_page.php
@@ -102,7 +102,7 @@ else $searchform=$hookmanager->resPrint;
print "\n";
print "<!-- Begin SearchForm -->\n";
-print '<div class="center" data-role="page">';
+print '<div class="center" data-role="page" style="padding-left: 2px;">';
print '<style>.menu_titre { padding-top: 6px; }</style>';
//print '<div id="distance"></div><div id="container" class="center">';
print '<div id="blockvmenusearch">'."\n";
diff --git a/htdocs/core/tpl/freeproductline_create.tpl.php b/htdocs/core/tpl/freeproductline_create.tpl.php
index ad0b0eeb426..328b8d9a69b 100644
--- a/htdocs/core/tpl/freeproductline_create.tpl.php
+++ b/htdocs/core/tpl/freeproductline_create.tpl.php
@@ -30,6 +30,13 @@ if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($ob
?>
<!-- BEGIN PHP TEMPLATE freeproductline_create.tpl.php -->
+
+<form name="addproduct" id="addproduct" action="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id; ?>#add" method="POST">
+<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
+<input type="hidden" name="action" value="addline">
+<input type="hidden" name="mode" value="libre">
+<input type="hidden" name="id" value="<?php echo $this->id; ?>">
+
<tr class="liste_titre nodrag nodrop">
<td
<?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>><div
@@ -60,15 +67,9 @@ if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($ob
<td colspan="<?php echo $colspan; ?>"> </td>
</tr>
-<form name="addproduct" id="addproduct" action="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id; ?>#add" method="POST">
-<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
-<input type="hidden" name="action" value="addline">
-<input type="hidden" name="mode" value="libre">
-<input type="hidden" name="id" value="<?php echo $this->id; ?>">
-
- <tr <?php echo $bcnd[$var]; ?>>
- <td<?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>>
- <?php
+<tr <?php echo $bcnd[$var]; ?>>
+ <td<?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>>
+ <?php
echo '<span>';
echo $form->select_type_of_lines(isset($_POST["type"])?$_POST["type"]:-1,'type',1);
@@ -90,66 +91,69 @@ if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($ob
$doleditor=new DolEditor('dp_desc',GETPOST('dp_desc'),'',100,'dolibarr_details','',false,true,$enabled,$nbrows,70);
$doleditor->Create();
?>
- </td>
+ </td>
- <td align="right"><?php
- if ($seller->tva_assuj == "0") echo '<input type="hidden" name="np_tva_tx" value="0">0';
- else echo $form->load_tva('tva_tx', (isset($_POST["tva_tx"])?$_POST["tva_tx"]:-1), $seller, $buyer);
+ <td align="right"><?php
+ if ($seller->tva_assuj == "0") echo '<input type="hidden" name="np_tva_tx" value="0">0';
+ else echo $form->load_tva('tva_tx', (isset($_POST["tva_tx"])?$_POST["tva_tx"]:-1), $seller, $buyer);
+ ?>
+ </td>
+ <td align="right"><input type="text" size="5" name="price_ht" class="flat" value="<?php echo (isset($_POST["price_ht"])?$_POST["price_ht"]:''); ?>">
+ </td>
+ <td align="right"><input type="text" size="2" name="qty" class="flat" value="<?php echo (isset($_POST["qty"])?$_POST["qty"]:1); ?>"></td>
+ <td align="right" class="nowrap"><input type="text" size="1" class="flat" value="<?php echo $buyer->remise_client; ?>" name="remise_percent"><span class="hideonsmartphone">%</span></td>
+ <?php
+ $colspan = 4;
+ if (! empty($usemargins))
+ {
?>
+ <td align="right"><input type="text" size="5" name="buying_price" class="flat"
+ value="<?php echo (isset($_POST["buying_price"])?$_POST["buying_price"]:''); ?>">
</td>
- <td align="right"><input type="text" size="5" name="price_ht" value="<?php echo (isset($_POST["price_ht"])?$_POST["price_ht"]:''); ?>">
- </td>
- <td align="right"><input type="text" size="2" name="qty" value="<?php echo (isset($_POST["qty"])?$_POST["qty"]:1); ?>"></td>
- <td align="right" class="nowrap"><input type="text" size="1" value="<?php echo $buyer->remise_client; ?>" name="remise_percent"><span class="hideonsmartphone">%</span></td>
<?php
- $colspan = 4;
- if (! empty($usemargins))
- {
- ?>
- <td align="right"><input type="text" size="5" name="buying_price"
- value="<?php echo (isset($_POST["buying_price"])?$_POST["buying_price"]:''); ?>">
- </td>
- <?php
- if (! empty($conf->global->DISPLAY_MARGIN_RATES)) $colspan++;
- if (! empty($conf->global->DISPLAY_MARK_RATES)) $colspan++;
- }
- ?>
- <td align="center" valign="middle" colspan="<?php echo $colspan; ?>"><input type="submit" class="button" value="<?php echo $langs->trans('Add'); ?>" name="addline"></td>
- </tr>
+ if (! empty($conf->global->DISPLAY_MARGIN_RATES)) $colspan++;
+ if (! empty($conf->global->DISPLAY_MARK_RATES)) $colspan++;
+ }
+ ?>
+ <td align="center" valign="middle" colspan="<?php echo $colspan; ?>"><input type="submit" class="button" value="<?php echo $langs->trans('Add'); ?>" name="addline"></td>
+</tr>
+
+<?php
+if (! empty($conf->service->enabled) && $dateSelector)
+{
+ if(! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) $colspan = 10;
+ else $colspan = 9;
+
+ if (! empty($usemargins))
+ {
+ $colspan++; // For the buying price
+ if($conf->global->DISPLAY_MARGIN_RATES) $colspan++;
+ if($conf->global->DISPLAY_MARK_RATES) $colspan++;
+ }
+?>
- <?php
- if (! empty($conf->service->enabled) && $dateSelector)
+<tr <?php echo $bcnd[$var]; ?>>
+ <td colspan="<?php echo $colspan; ?>"><?php
+ if (! empty($object->element) && $object->element == 'contrat')
{
- if(! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) $colspan = 10;
- else $colspan = 9;
-
- if (! empty($usemargins))
- {
- $colspan++; // For the buying price
- if($conf->global->DISPLAY_MARGIN_RATES) $colspan++;
- if($conf->global->DISPLAY_MARK_RATES) $colspan++;
- }
+ print $langs->trans("DateStartPlanned").' ';
+ $form->select_date('',"date_start_sl",$usehm,$usehm,1,"addline_sl");
+ print ' '.$langs->trans("DateEndPlanned").' ';
+ $form->select_date('',"date_end_sl",$usehm,$usehm,1,"addline_sl");
+ }
+ else
+ {
+ echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' ';
+ echo $form->select_date('','date_start',empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1,empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1,1,"addproduct");
+ echo ' '.$langs->trans('to').' ';
+ echo $form->select_date('','date_end',empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1,empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1,1,"addproduct");
+ }
?>
- <tr <?php echo $bcnd[$var]; ?>>
- <td colspan="<?php echo $colspan; ?>"><?php
- if (! empty($object->element) && $object->element == 'contrat')
- {
- print $langs->trans("DateStartPlanned").' ';
- $form->select_date('',"date_start_sl",$usehm,$usehm,1,"addline_sl");
- print ' '.$langs->trans("DateEndPlanned").' ';
- $form->select_date('',"date_end_sl",$usehm,$usehm,1,"addline_sl");
- }
- else
- {
- echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' ';
- echo $form->select_date('','date_start',empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1,empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1,1,"addproduct");
- echo ' '.$langs->trans('to').' ';
- echo $form->select_date('','date_end',empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1,empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1,1,"addproduct");
- }
- ?>
- </td>
- </tr>
- <?php } ?>
+ </td>
+</tr>
+<?php
+}
+?>
</form>
<!-- END PHP TEMPLATE freeproductline_create.tpl.php -->
\ No newline at end of file
diff --git a/htdocs/core/tpl/predefinedproductline_create.tpl.php b/htdocs/core/tpl/predefinedproductline_create.tpl.php
index ae8491784e6..b435d40be64 100644
--- a/htdocs/core/tpl/predefinedproductline_create.tpl.php
+++ b/htdocs/core/tpl/predefinedproductline_create.tpl.php
@@ -32,6 +32,21 @@ if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($ob
<!-- BEGIN PHP TEMPLATE predefinedproductline_create.tpl.php -->
+<form name="addpredefinedproduct" id="addpredefinedproduct" action="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id; ?>#add" method="POST">
+<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
+<input type="hidden" name="action" value="addline">
+<input type="hidden" name="mode" value="predefined">
+<input type="hidden" name="id" value="<?php echo $this->id; ?>">
+
+<script type="text/javascript">
+jQuery(document).ready(function() {
+ jQuery('#idprod').change(function() {
+ if (jQuery('#idprod').val() > 0) jQuery('#np_desc').focus();
+ });
+});
+</script>
+
+
<tr class="liste_titre nodrag nodrop">
<td<?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="4"' : ' colspan="3"'); ?>>
<?php
@@ -64,20 +79,6 @@ if (! empty($usemargins))
<td colspan="<?php echo $colspan; ?>"> </td>
</tr>
-<form name="addpredefinedproduct" id="addpredefinedproduct" action="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id; ?>#add" method="POST">
-<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
-<input type="hidden" name="action" value="addline">
-<input type="hidden" name="mode" value="predefined">
-<input type="hidden" name="id" value="<?php echo $this->id; ?>">
-
-<script type="text/javascript">
-jQuery(document).ready(function() {
- jQuery('#idprod').change(function() {
- if (jQuery('#idprod').val() > 0) jQuery('#np_desc').focus();
- });
-});
-</script>
-
<tr <?php echo $bcnd[$var]; ?>>
<td<?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="4"' : ' colspan="3"'); ?>>
<?php
@@ -105,8 +106,8 @@ jQuery(document).ready(function() {
$doleditor->Create();
?>
</td>
- <td align="right"><input type="text" size="2" name="qty" value="1"></td>
- <td align="right" nowrap><input type="text" size="1" name="remise_percent" value="<?php echo $buyer->remise_client; ?>"><span class="hideonsmartphone">%</span></td>
+ <td align="right"><input type="text" size="2" name="qty" class="flat" value="1"></td>
+ <td align="right" nowrap><input type="text" size="1" class="flat" name="remise_percent" value="<?php echo $buyer->remise_client; ?>"><span class="hideonsmartphone">%</span></td>
<?php
$colspan = 4;
if (! empty($usemargins))
@@ -115,8 +116,8 @@ jQuery(document).ready(function() {
if (! empty($conf->global->DISPLAY_MARK_RATES)) $colspan++;
?>
<td align="right">
- <select id="fournprice" name="fournprice" style="display: none;"></select>
- <input type="text" size="5" id="buying_price" name="buying_price" value="<?php echo (isset($_POST["buying_price"])?$_POST["buying_price"]:''); ?>">
+ <select id="fournprice" name="fournprice" class="flat" style="display: none;"></select>
+ <input type="text" size="5" id="buying_price" name="buying_price" class="flat" value="<?php echo (isset($_POST["buying_price"])?$_POST["buying_price"]:''); ?>">
</td>
<?php
}
@@ -138,6 +139,7 @@ if (! empty($conf->service->enabled) && $dateSelector)
if (! empty($conf->global->DISPLAY_MARK_RATES)) $colspan++;
}
?>
+
<tr <?php echo $bcnd[$var]; ?>>
<td colspan="<?php echo $colspan; ?>">
<?php
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 3677392d64c..1f02fc11f5f 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -122,6 +122,7 @@ ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s o
ErrorNewValueCantMatchOldValue=New value can't be equal to old one
ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check Mysql server is running (in most cases, you can launch it from command line with 'sudo /etc/init.d/mysql start').
+ErrorFailedToAddContact=Failed to add contact
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 2c06d31126b..28be39d651f 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -123,6 +123,7 @@ ErrorFailedToRemoveToMailmanList=Echec de la suppression de %s de la liste Mailm
ErrorNewValueCantMatchOldValue=La nouvelle valeur ne peut être égale à l'ancienne
ErrorFailedToValidatePasswordReset=Echec de la réinitialisation du mot de passe. Il est possible que ce lien ait déjà été utilisé (l'utilisation de ce lien ne fonctionne qu'une fois). Si ce n'est pas le cas, essayer de recommencer le processus de réinit de mot de passe depuis le début.
ErrorToConnectToMysqlCheckInstance=Echec de la connection au serveur de base de donnée. Vérifier que Mysql est bien lancé (dans la plupart des cas, vous pouvez le lancer depuis la ligne de commande par la commande 'sudo /etc/init.d/mysql start').
+ErrorFailedToAddContact=Echec à l'ajout du contact
# Warnings
WarningMandatorySetupNotComplete=Les informations de configuration obligatoire doivent être renseignées
diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php
index 3203e556e82..568e81f13f2 100644
--- a/htdocs/theme/cameleo/style.css.php
+++ b/htdocs/theme/cameleo/style.css.php
@@ -1432,7 +1432,7 @@ table.liste td {
tr.liste_titre, tr.liste_titre_sel
{
- height: 20px;
+ height: 20px !important;
}
div.liste_titre, tr.liste_titre {
color: #842F00;
@@ -1440,24 +1440,23 @@ div.liste_titre, tr.liste_titre {
font-family: "Trebuchet MS",Arial,Helvetica,sans-serif;
/*border-bottom: 1px solid #FDFFFF;*/
border-radius: 8px;
- line-height: 18px;
padding-left: 10px;
padding-right: 10px;
- white-space: nowrap;
+ white-space: <?php echo $dol_optimize_smallscreen?'normal':'nowrap'; ?>;
text-align: <?php echo $left; ?>;
}
th.liste_titre, td.liste_titre
{
padding-left: 6px;
padding-right: 6px;
- /*vertical-align: text-top;*/
+ white-space: <?php echo $dol_optimize_smallscreen?'normal':'nowrap'; ?>;
}
th.liste_titre_sel, td.liste_titre_sel
{
background-position: top right;
color: #A51B00;
font-weight: bold;
- white-space: nowrap;
+ white-space: <?php echo $dol_optimize_smallscreen?'normal':'nowrap'; ?>;
}
input.liste_titre {
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index b5b380f5158..1fbca3e51a0 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -238,7 +238,7 @@ input, input.flat, textarea, textarea.flat, form.flat select, select.flat {
background: #FDFDFD;
border: 1px solid #C0C0C0;
<?php if (empty($dol_use_jmobile)) { ?>
- padding: 1px 1px 1px 1px;
+ /*padding: 1px 1px 1px 1px; */
margin: 0px 0px 0px 0px;
<?php } ?>
}
--
GitLab