From fa4fc8495b6f4ae12ad6c6d939c35354498a45d7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur 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 | 134 +++++++++--------- .../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, 100 insertions(+), 95 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 '   '.$langs->trans("AddProject").''; } print ''; 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 "\n"; -print '
'; +print '
'; print ''; //print '
'; print '
'."\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 ?> + +
"> + + + + global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>>
margin->enabled) && ! empty($object->element) && in_array($ob   -"> - - - - - > - global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>> - > + global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>> + '; 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(); ?> - + - tva_assuj == "0") echo '0'; - else echo $form->load_tva('tva_tx', (isset($_POST["tva_tx"])?$_POST["tva_tx"]:-1), $seller, $buyer); - ?> - - "> - - "> - % - - "> - - global->DISPLAY_MARGIN_RATES)) $colspan++; - if (! empty($conf->global->DISPLAY_MARK_RATES)) $colspan++; - } - ?> - - - - 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++; - } + tva_assuj == "0") echo '0'; + else echo $form->load_tva('tva_tx', (isset($_POST["tva_tx"])?$_POST["tva_tx"]:-1), $seller, $buyer); ?> - > - 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"); - } + + "> + + "> + % + + "> - - + global->DISPLAY_MARGIN_RATES)) $colspan++; + if (! empty($conf->global->DISPLAY_MARK_RATES)) $colspan++; + } + ?> + + + +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++; + } +?> + +> + 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"); + } + ?> + + + \ 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 +
"> + + + + + + + global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="4"' : ' colspan="3"'); ?>> ">  -"> - - - - - - > global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="4"' : ' colspan="3"'); ?>> Create(); ?> - - % + + % global->DISPLAY_MARK_RATES)) $colspan++; ?> - - "> + + "> service->enabled) && $dateSelector) if (! empty($conf->global->DISPLAY_MARK_RATES)) $colspan++; } ?> + > ; text-align: ; } th.liste_titre, td.liste_titre { padding-left: 6px; padding-right: 6px; - /*vertical-align: text-top;*/ + white-space: ; } th.liste_titre_sel, td.liste_titre_sel { background-position: top right; color: #A51B00; font-weight: bold; - white-space: nowrap; + white-space: ; } 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; - padding: 1px 1px 1px 1px; + /*padding: 1px 1px 1px 1px; */ margin: 0px 0px 0px 0px; }