From 109cc09e82f6df534d07eb5228b96b3b071782e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 5 Sep 2013 16:37:23 +0200 Subject: [PATCH 01/16] Simplified JS --- htdocs/core/js/lib_head.js | 10 +++------- htdocs/core/js/lib_rare.js | 17 +++++++---------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/htdocs/core/js/lib_head.js b/htdocs/core/js/lib_head.js index 4d088081725..fead5b69d04 100644 --- a/htdocs/core/js/lib_head.js +++ b/htdocs/core/js/lib_head.js @@ -190,9 +190,8 @@ function dpClickDay(year,month,day,format) closeDPBox(); } -function dpHighlightDay(year,month,day,tradMonths){ +function dpHighlightDay(year,month,day,months){ var displayinfo=getObjectFromID("dpExp"); - var months = tradMonths; displayinfo.innerHTML=months[month-1]+" "+day+", "+year; } @@ -478,9 +477,7 @@ function getDateFromFormat(val,format) if (seconde==null||(seconde<0)||(seconde>60)) { return 0; } // alert(year+' '+month+' '+day+' '+hour+' '+minute+' '+seconde); - var newdate=new Date(year,month-1,day,hour,minute,seconde); - - return newdate; + return new Date(year,month-1,day,hour,minute,seconde); } /* @@ -588,8 +585,7 @@ function cleanSerialize(expr) { var reg = new RegExp("(&)", "g"); var reg2 = new RegExp("[^A-Z0-9,]", "g"); var liste1 = expr.replace(reg, ","); - var liste = liste1.replace(reg2, ""); - return liste; + return liste = liste1.replace(reg2, ""); } diff --git a/htdocs/core/js/lib_rare.js b/htdocs/core/js/lib_rare.js index e9cecfe7de6..7a918f09d60 100644 --- a/htdocs/core/js/lib_rare.js +++ b/htdocs/core/js/lib_rare.js @@ -21,14 +21,11 @@ // in [-]HH:MM format... // won't yet work with non-even tzs -function fetchTimezone() -{ - var localclock = new Date(); - // returns negative offset from GMT in minutes - var tzRaw = localclock.getTimezoneOffset(); - var tzHour = Math.floor( Math.abs(tzRaw) / 60); - var tzMin = Math.abs(tzRaw) % 60; - var tzString = ((tzRaw >= 0) ? "-" : "") + ((tzHour < 10) ? "0" : "") + tzHour + - ":" + ((tzMin < 10) ? "0" : "") + tzMin; - return tzString; +function fetchTimezone() { + var localclock = new Date(), + // returns negative offset from GMT in minutes + tzRaw = localclock.getTimezoneOffset(), + tzHour = Math.floor(Math.abs(tzRaw) / 60), + tzMin = Math.abs(tzRaw) % 60; + return ((tzRaw >= 0) ? "-" : "") + ((tzHour < 10) ? "0" : "") + tzHour + ":" + ((tzMin < 10) ? "0" : "") + tzMin; } From 0c0740cac7f66ff143da41fcc1ed0c41614a8ca2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 5 Sep 2013 16:43:22 +0200 Subject: [PATCH 02/16] Don't call non static class statically --- htdocs/core/db/sqlite.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/db/sqlite.class.php b/htdocs/core/db/sqlite.class.php index 4a9a85d7d0b..7613079df68 100644 --- a/htdocs/core/db/sqlite.class.php +++ b/htdocs/core/db/sqlite.class.php @@ -685,7 +685,7 @@ class DoliDBSqlite */ function escape($stringtoencode) { - return PDO::quote($stringtoencode); + return $this->db->quote($stringtoencode); } /** From 4ca5bc3797c0b6fa2ad10f5ccfdd456bab8eda4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 5 Sep 2013 16:43:50 +0200 Subject: [PATCH 03/16] Method should be static --- htdocs/core/modules/export/modules_export.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/export/modules_export.php b/htdocs/core/modules/export/modules_export.php index b42f2a2dfa7..29ef73c03c5 100644 --- a/htdocs/core/modules/export/modules_export.php +++ b/htdocs/core/modules/export/modules_export.php @@ -46,7 +46,7 @@ class ModeleExports extends CommonDocGenerator // This class can't be abstrac * @param string $maxfilenamelength Max length of value to show * @return array List of templates */ - function liste_modeles($db,$maxfilenamelength=0) + static function liste_modeles($db,$maxfilenamelength=0) { dol_syslog(get_class($this)."::liste_modeles"); From 465d59ba8289558fff45832da3eb9830c282c4d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 5 Sep 2013 16:44:57 +0200 Subject: [PATCH 04/16] Don't call non static class statically --- htdocs/core/db/sqlite.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/db/sqlite.class.php b/htdocs/core/db/sqlite.class.php index 7613079df68..631496b3998 100644 --- a/htdocs/core/db/sqlite.class.php +++ b/htdocs/core/db/sqlite.class.php @@ -856,7 +856,7 @@ class DoliDBSqlite */ function last_insert_id($tab,$fieldid='rowid') { - return PDO::lastInsertId(); + return $this->db->lastInsertId(); } /** From 4efe215b0c9df6d7dd9939392bb9167fe47d1a86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 5 Sep 2013 17:00:18 +0200 Subject: [PATCH 05/16] Qual: removed a bunch of duplicated array keys --- htdocs/core/modules/modCategorie.class.php | 1 - htdocs/core/modules/modProduct.class.php | 2 +- htdocs/core/modules/modService.class.php | 2 +- htdocs/core/modules/modStock.class.php | 2 +- htdocs/install/etape1.php | 2 +- htdocs/webservices/server_productorservice.php | 2 -- 6 files changed, 4 insertions(+), 7 deletions(-) diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php index b08364bec79..2eccc4701b3 100644 --- a/htdocs/core/modules/modCategorie.class.php +++ b/htdocs/core/modules/modCategorie.class.php @@ -211,7 +211,6 @@ class modCategorie extends DolibarrModules 'u.label' => "category", 'u.description' => "category", 'p.rowid' => 'contact', - 'p.rowid' => 'contact', 'p.civilite' => 'contact', 'p.lastname' => 'contact', 'p.firstname' => 'contact', diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php index 3d789d52b72..ecca09e136e 100644 --- a/htdocs/core/modules/modProduct.class.php +++ b/htdocs/core/modules/modProduct.class.php @@ -142,7 +142,7 @@ class modProduct extends DolibarrModules $this->export_TypeFields_array[$r]=array('p.ref'=>"Text",'p.label'=>"Text",'p.description'=>"Text",'p.accountancy_code_sell'=>"Text",'p.accountancy_code_buy'=>"Text",'p.note'=>"Text",'p.length'=>"Number",'p.surface'=>"Number",'p.volume'=>"Number",'p.weight'=>"Number",'p.customcode'=>'Text','p.price_base_type'=>"Text",'p.price'=>"Number",'p.price_ttc'=>"Number",'p.tva_tx'=>'Number','p.tosell'=>"Boolean",'p.tobuy'=>"Boolean",'p.datec'=>'Date','p.tms'=>'Date'); if (! empty($conf->stock->enabled)) $this->export_TypeFields_array[$r]=array_merge($this->export_TypeFields_array[$r],array('p.pmp'=>'Number')); if (! empty($conf->barcode->enabled)) $this->export_TypeFields_array[$r]=array_merge($this->export_TypeFields_array[$r],array('p.barcode'=>'Text')); - $this->export_entities_array[$r]=array('p.rowid'=>"product",'p.ref'=>"product",'p.label'=>"product",'p.description'=>"product",'p.accountancy_code_sell'=>'product','p.accountancy_code_sell'=>'product','p.note'=>"product",'p.length'=>"product",'p.surface'=>"product",'p.volume'=>"product",'p.weight'=>"product",'p.customcode'=>'product','p.price_base_type'=>"product",'p.price'=>"product",'p.price_ttc'=>"product",'p.tva_tx'=>"product",'p.tosell'=>"product",'p.tobuy'=>"product",'p.datec'=>"product",'p.tms'=>"product"); + $this->export_entities_array[$r]=array('p.rowid'=>"product",'p.ref'=>"product",'p.label'=>"product",'p.description'=>"product",'p.accountancy_code_sell'=>'product','p.note'=>"product",'p.length'=>"product",'p.surface'=>"product",'p.volume'=>"product",'p.weight'=>"product",'p.customcode'=>'product','p.price_base_type'=>"product",'p.price'=>"product",'p.price_ttc'=>"product",'p.tva_tx'=>"product",'p.tosell'=>"product",'p.tobuy'=>"product",'p.datec'=>"product",'p.tms'=>"product"); if (! empty($conf->stock->enabled)) $this->export_entities_array[$r]=array_merge($this->export_entities_array[$r],array('p.stock'=>'product','p.pmp'=>'product')); if (! empty($conf->barcode->enabled)) $this->export_entities_array[$r]=array_merge($this->export_entities_array[$r],array('p.barcode'=>'product')); // Add extra fields diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php index 211b5d8ba2f..09e8116af41 100644 --- a/htdocs/core/modules/modService.class.php +++ b/htdocs/core/modules/modService.class.php @@ -126,7 +126,7 @@ class modService extends DolibarrModules $this->export_TypeFields_array[$r]=array('p.ref'=>"Text",'p.label'=>"Text",'p.description'=>"Text",'p.accountancy_code_sell'=>"Text",'p.accountancy_code_buy'=>"Text",'p.note'=>"Text",'p.price_base_type'=>"Text",'p.price'=>"Number",'p.price_ttc'=>"Number",'p.tva_tx'=>'Number','p.tosell'=>"Boolean",'p.duration'=>"Duree",'p.datec'=>'Date','p.tms'=>'Date'); if (! empty($conf->stock->enabled)) $this->export_TypeFields_array[$r]=array_merge($this->export_fields_array[$r],array('p.stock'=>'Number')); if (! empty($conf->barcode->enabled)) $this->export_TypeFields_array[$r]=array_merge($this->export_TypeFields_array[$r],array('p.barcode'=>'Text')); - $this->export_entities_array[$r]=array('p.rowid'=>"service",'p.ref'=>"service",'p.label'=>"service",'p.description'=>"service",'p.accountancy_code_sell'=>'service','p.accountancy_code_sell'=>'service','p.note'=>"service",'p.price_base_type'=>"service",'p.price'=>"service",'p.price_ttc'=>"service",'p.tva_tx'=>"service",'p.tosell'=>"service",'p.duration'=>"service",'p.datec'=>"service",'p.tms'=>"service"); + $this->export_entities_array[$r]=array('p.rowid'=>"service",'p.ref'=>"service",'p.label'=>"service",'p.description'=>"service",'p.accountancy_code_sell'=>'service','p.note'=>"service",'p.price_base_type'=>"service",'p.price'=>"service",'p.price_ttc'=>"service",'p.tva_tx'=>"service",'p.tosell'=>"service",'p.duration'=>"service",'p.datec'=>"service",'p.tms'=>"service"); if (! empty($conf->stock->enabled)) $this->export_entities_array[$r]=array_merge($this->export_entities_array[$r],array('p.stock'=>'service')); if (! empty($conf->barcode->enabled)) $this->export_entities_array[$r]=array_merge($this->export_entities_array[$r],array('p.barcode'=>'service')); // Add extra fields diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php index c30e1438795..6527a59d6e6 100644 --- a/htdocs/core/modules/modStock.class.php +++ b/htdocs/core/modules/modStock.class.php @@ -123,7 +123,7 @@ class modStock extends DolibarrModules $this->export_label[$r]="WarehousesAndProducts"; // Translation key (used only if key ExportDataset_xxx_z not found) $this->export_permission[$r]=array(array("stock","lire")); $this->export_fields_array[$r]=array('e.rowid'=>'IdWarehouse','e.label'=>'LocationSummary','e.description'=>'DescWareHouse','e.lieu'=>'LieuWareHouse','e.address'=>'Address','e.zip'=>'Zip','e.town'=>'Town','p.rowid'=>"ProductId",'p.ref'=>"Ref",'p.fk_product_type'=>"Type",'p.label'=>"Label",'p.description'=>"Description",'p.note'=>"Note",'p.price'=>"Price",'p.tva_tx'=>'VAT','p.tosell'=>"OnSell",'p.duration'=>"Duration",'p.datec'=>'DateCreation','p.tms'=>'DateModification','ps.reel'=>'Stock'); - $this->export_TypeFields_array[$r]=array('e.rowid'=>'List:entrepot:LabelWareHouse','e.label'=>'Text','e.label'=>'Text','e.lieu'=>'Text','e.address'=>'Text','e.zip'=>'Text','e.town'=>'Text','p.rowid'=>"List:produit:label",'p.ref'=>"Text",'p.fk_product_type'=>"Text",'p.label'=>"Text",'p.description'=>"Text",'p.note'=>"Text",'p.price'=>"Number",'p.tva_tx'=>'Number','p.tosell'=>"Boolean",'p.duration'=>"Duree",'p.datec'=>'Date','p.tms'=>'Date','ps.reel'=>'Number'); + $this->export_TypeFields_array[$r]=array('e.rowid'=>'List:entrepot:LabelWareHouse','e.label'=>'Text','e.lieu'=>'Text','e.address'=>'Text','e.zip'=>'Text','e.town'=>'Text','p.rowid'=>"List:produit:label",'p.ref'=>"Text",'p.fk_product_type'=>"Text",'p.label'=>"Text",'p.description'=>"Text",'p.note'=>"Text",'p.price'=>"Number",'p.tva_tx'=>'Number','p.tosell'=>"Boolean",'p.duration'=>"Duree",'p.datec'=>'Date','p.tms'=>'Date','ps.reel'=>'Number'); $this->export_entities_array[$r]=array('e.rowid'=>'warehouse','e.label'=>'warehouse','e.description'=>'warehouse','e.lieu'=>'warehouse','e.address'=>'warehouse','e.zip'=>'warehouse','e.town'=>'warehouse','p.rowid'=>"product",'p.ref'=>"product",'p.fk_product_type'=>"product",'p.label'=>"product",'p.description'=>"product",'p.note'=>"product",'p.price'=>"product",'p.tva_tx'=>'product','p.tosell'=>"product",'p.duration'=>"product",'p.datec'=>'product','p.tms'=>'product','ps.reel'=>'stock'); $this->export_aggregate_array[$r]=array('ps.reel'=>'SUM'); // TODO Not used yet $this->export_dependencies_array[$r]=array('stock'=>array('p.rowid','e.rowid')); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index f1aba6f52c2..a932a2fb67f 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -402,7 +402,7 @@ if (! $error && $db->connected && $action == "set") require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $srcroot=$main_dir.'/install/doctemplates'; $destroot=$main_data_dir.'/doctemplates'; - $docs=array('thirdparties' => 'thirdparty', 'proposals' => 'proposal', 'orders' => 'order', 'invoices' => 'invoice', 'projects' => 'project', 'projects' => 'task_summary', 'tasks' => 'task_summary'); + $docs=array('thirdparties' => 'thirdparty', 'proposals' => 'proposal', 'orders' => 'order', 'invoices' => 'invoice', 'projects' => 'project', 'tasks' => 'task_summary'); foreach($docs as $cursordir => $cursorfile) { $src=$srcroot.'/'.$cursordir.'/template_'.$cursorfile.'.odt'; diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php index e51caadb124..d32209262ab 100644 --- a/htdocs/webservices/server_productorservice.php +++ b/htdocs/webservices/server_productorservice.php @@ -358,8 +358,6 @@ function getProductOrService($authentication,$id='',$ref='',$ref_ext='') 'localtax1_tx' => $product->localtax1_tx, 'localtax2_tx' => $product->localtax2_tx, - 'price_base_type' => $product->price_base_type, - 'stock_real' => $product->stock_reel, 'stock_alert' => $product->seuil_stock_alerte, 'pmp' => $product->pmp, From 8e6860ac72d533d6984defc2daac2871599e2e05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 5 Sep 2013 17:00:54 +0200 Subject: [PATCH 06/16] Fixed developer intent --- htdocs/holiday/fiche.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/holiday/fiche.php b/htdocs/holiday/fiche.php index 48d5f591edd..a65df53706d 100644 --- a/htdocs/holiday/fiche.php +++ b/htdocs/holiday/fiche.php @@ -638,7 +638,7 @@ if (empty($id) || $action == 'add' || $action == 'request') case 'nodatedebut' : $errors[] = $langs->trans('NoDateDebut'); break; - case 'nodatedebut' : + case 'nodatefin' : $errors[] = $langs->trans('NoDateFin'); break; case 'DureeHoliday' : @@ -808,7 +808,7 @@ else case 'nodatedebut' : $errors[] = $langs->transnoentitiesnoconv('NoDateDebut'); break; - case 'nodatedebut' : + case 'nodatefin' : $errors[] = $langs->transnoentitiesnoconv('NoDateFin'); break; case 'DureeHoliday' : From 9046d620e10c1f7610c7ba8626f3b797287163a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 5 Sep 2013 17:15:06 +0200 Subject: [PATCH 07/16] Avoid using the same var as outer loop --- htdocs/projet/ganttview.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php index e19571f9518..50a5022a2f0 100644 --- a/htdocs/projet/ganttview.php +++ b/htdocs/projet/ganttview.php @@ -210,7 +210,7 @@ if (count($tasksarray)>0) { $s.=$langs->trans("Internals").': '; $i=0; - foreach($idofusers as $key => $valid) + foreach($idofusers as $valid) { $userstatic->fetch($valid); if ($i) $s.=','; @@ -224,7 +224,7 @@ if (count($tasksarray)>0) if ($s) $s.=' - '; $s.=$langs->trans("Externals").': '; $i=0; - foreach($idofthirdparty as $key => $valid) + foreach($idofthirdparty as $valid) { $companystatic->fetch($valid); if ($i) $s.=','; From fa51e310b8b6ad99a4d40e372721b017007b4418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 5 Sep 2013 17:19:30 +0200 Subject: [PATCH 08/16] Avoid silly assignment --- htdocs/compta/paiement/class/paiement.class.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php index 7ef5f44fb88..f7aff519bb6 100644 --- a/htdocs/compta/paiement/class/paiement.class.php +++ b/htdocs/compta/paiement/class/paiement.class.php @@ -405,10 +405,9 @@ class Paiement extends CommonObject $acc = new Account($this->db); $result=$acc->fetch($this->fk_account); - $totalamount=$this->amount; - if (empty($totalamount)) $totalamount=$this->total; // For backward compatibility - if ($mode == 'payment') $totalamount=$totalamount; - if ($mode == 'payment_supplier') $totalamount=-$totalamount; + if (empty($this->amount)) $totalamount=$this->total; // For backward compatibility + if ($mode == 'payment') $totalamount=$this->amount; + if ($mode == 'payment_supplier') $totalamount=-$this->amount; // Insert payment into llx_bank $bank_line_id = $acc->addline( From 7681c60f6b452a85e998e799f6780edf4a94800a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 5 Sep 2013 17:22:51 +0200 Subject: [PATCH 09/16] Silly assignment was a bug --- htdocs/projet/class/task.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index d7c332aba16..1f5529d688b 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -1036,7 +1036,7 @@ class Task extends CommonObject $clone_task->fk_project = $project_id; $clone_task->fk_task_parent = $parent_task_id; $clone_task->date_c = $datec; - $clone_task->planned_workload = $clone_task->planned_workload; + $clone_task->planned_workload = $origin_task->planned_workload; $clone_task->rang = $origin_task->rang; //Manage Task Date From cd684460ffaa5fe50ad9db1c2db9bf815605becd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 5 Sep 2013 17:25:04 +0200 Subject: [PATCH 10/16] Removed silly code --- htdocs/categories/class/categorie.class.php | 2 +- htdocs/core/class/html.formfile.class.php | 1 - htdocs/societe/canvas/actions_card_common.class.php | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index 77f5ca4df2c..b6d5c622e9c 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -508,7 +508,7 @@ class Categorie include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('CATEGORY_UNLINK',$this,$user,$langs,$conf); - if ($result < 0) { $error++; $this->errors=$interface->errors; $this->error=$this->error; } + if ($result < 0) { $error++; $this->errors=$interface->errors; } // Fin appel triggers if (! $error) return 1; diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index ef1bd8cd051..9f0f9089e76 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -97,7 +97,6 @@ class FormFile $max=$conf->global->MAIN_UPLOAD_DOC; // En Kb $maxphp=@ini_get('upload_max_filesize'); // En inconnu if (preg_match('/m$/i',$maxphp)) $maxphp=$maxphp*1024; - if (preg_match('/k$/i',$maxphp)) $maxphp=$maxphp; // Now $max and $maxphp are in Kb if ($maxphp > 0) $max=min($max,$maxphp); diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php index 6b9f213b6c9..96ce4976665 100644 --- a/htdocs/societe/canvas/actions_card_common.class.php +++ b/htdocs/societe/canvas/actions_card_common.class.php @@ -290,7 +290,6 @@ abstract class ActionsCardCommon } else { - $this->object->id = $this->object->id; $reload = 0; $this->errors = $this->object->errors; $action = "edit"; From 6e64e0e7be57b5831bbdce4e1655316a43c1d6b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 5 Sep 2013 17:56:28 +0200 Subject: [PATCH 11/16] Fixed gd calls for windows bitmap images --- htdocs/core/lib/images.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php index 7dea7357535..4e0a8e86789 100644 --- a/htdocs/core/lib/images.lib.php +++ b/htdocs/core/lib/images.lib.php @@ -274,7 +274,7 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x=0, $s imagepng($imgThumb, $imgThumbName, $newquality); break; case 4: // Bmp - image2wmp($imgThumb, $imgThumbName); + image2wbmp($imgThumb, $imgThumbName); break; } @@ -534,7 +534,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName='_small', $ // Not supported by PHP GD break; case IMAGETYPE_WBMP: // 15 - image2wmp($imgThumb, $imgThumbName); + image2wbmp($imgThumb, $imgThumbName); break; } From e7620428284468995c77abc487c07be87ce559ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 5 Sep 2013 18:06:51 +0200 Subject: [PATCH 12/16] Fixed typos --- htdocs/compta/facture/class/facture.class.php | 2 +- htdocs/compta/localtax/index.php | 2 +- htdocs/compta/tva/index.php | 2 +- htdocs/expedition/fiche.php | 4 ++-- htdocs/fichinter/fiche.php | 2 +- htdocs/fourn/commande/fiche.php | 2 +- htdocs/fourn/facture/fiche.php | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 72441021b3d..d310d7d4c7c 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -2868,7 +2868,7 @@ class Facture extends CommonInvoice $sql.= ' WHERE fk_facture = '.$this->id; $sql.= ' AND traite = 0'; - dol_syslot(get_clas($this)."::demande_prelevement sql=".$sql); + dol_syslog(get_class($this)."::demande_prelevement sql=".$sql); $resql=$this->db->query($sql); if ($resql) { diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php index 8acfe896fed..aaa36a7edd7 100644 --- a/htdocs/compta/localtax/index.php +++ b/htdocs/compta/localtax/index.php @@ -83,7 +83,7 @@ function pt ($db, $sql, $date) $db->free($result); } else { - dolibar_print_error($db); + dol_print_error($db); } } diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php index 9bd05274f0a..afbc346476b 100644 --- a/htdocs/compta/tva/index.php +++ b/htdocs/compta/tva/index.php @@ -88,7 +88,7 @@ function pt ($db, $sql, $date) $db->free($result); } else { - dolibar_print_error($db); + dol_print_error($db); } } diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index e8c2accda94..8f466aa377f 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -1481,7 +1481,7 @@ else $formmail->withfrom=1; $liste=array(); foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value) $liste[$key]=$value; - $formmail->withto=GETPOST("sendto")?GETOST("sendto"):$liste; + $formmail->withto=GETPOST("sendto")?GETPOST("sendto"):$liste; $formmail->withtocc=$liste; $formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC; $formmail->withtopic=$langs->trans('SendShippingRef','__SHIPPINGREF__'); @@ -1558,4 +1558,4 @@ else llxFooter(); $db->close(); -?> \ No newline at end of file +?> diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index e4a86b146ba..d3947958450 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -1712,7 +1712,7 @@ else if ($id > 0 || ! empty($ref)) $formmail->withfrom=1; $liste=array(); foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value) $liste[$key]=$value; - $formmail->withto=GETPOST("sendto")?GETOST("sendto"):$liste; + $formmail->withto=GETPOST("sendto")?GETPOST("sendto"):$liste; $formmail->withtocc=$liste; $formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC; $formmail->withtopic=$langs->trans('SendInterventionRef','__FICHINTERREF__'); diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index 1876d181339..77a7cce4e23 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -1944,7 +1944,7 @@ elseif (! empty($object->id)) $formmail->withfrom=1; $liste=array(); foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value) $liste[$key]=$value; - $formmail->withto=GETPOST("sendto")?GETOST("sendto"):$liste; + $formmail->withto=GETPOST("sendto")?GETPOST("sendto"):$liste; $formmail->withtocc=$liste; $formmail->withtoccc=(! empty($conf->global->MAIN_EMAIL_USECCC)?$conf->global->MAIN_EMAIL_USECCC:false); $formmail->withtopic=$langs->trans('SendOrderRef','__ORDERREF__'); diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index f886a714b92..4772d23d208 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -2276,7 +2276,7 @@ else $formmail->withfrom=1; $liste=array(); foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value) $liste[$key]=$value; - $formmail->withto=GETPOST("sendto")?GETOST("sendto"):$liste; + $formmail->withto=GETPOST("sendto")?GETPOST("sendto"):$liste; $formmail->withtocc=$liste; $formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC; $formmail->withtopic=$langs->trans('SendBillRef','__FACREF__'); From 0e8eddb4700d7dd47d11c0498883161c4bfe4237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 5 Sep 2013 19:00:00 +0200 Subject: [PATCH 13/16] Revert "Method should be static" This reverts commit 4ca5bc3797c0b6fa2ad10f5ccfdd456bab8eda4d. --- htdocs/core/modules/export/modules_export.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/export/modules_export.php b/htdocs/core/modules/export/modules_export.php index 29ef73c03c5..b42f2a2dfa7 100644 --- a/htdocs/core/modules/export/modules_export.php +++ b/htdocs/core/modules/export/modules_export.php @@ -46,7 +46,7 @@ class ModeleExports extends CommonDocGenerator // This class can't be abstrac * @param string $maxfilenamelength Max length of value to show * @return array List of templates */ - static function liste_modeles($db,$maxfilenamelength=0) + function liste_modeles($db,$maxfilenamelength=0) { dol_syslog(get_class($this)."::liste_modeles"); From d39f2d655cfeadd4af8f16ce55fe70bd5380d200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 5 Sep 2013 20:28:24 +0200 Subject: [PATCH 14/16] Typo fix: remove unwanted comma --- htdocs/core/js/lib_head.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/js/lib_head.js b/htdocs/core/js/lib_head.js index fead5b69d04..055b4af5a60 100644 --- a/htdocs/core/js/lib_head.js +++ b/htdocs/core/js/lib_head.js @@ -790,7 +790,7 @@ function confirmConstantAction(action, url, code, input, box, entity, yesButton, (function( $ ) { $.widget( "ui.combobox", { options: { - minLengthToAutocomplete: 0, + minLengthToAutocomplete: 0 }, _create: function() { var savMinLengthToAutocomplete = this.options.minLengthToAutocomplete; From 8010389c08ff158f2cce973849af209e8d2fb582 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 5 Sep 2013 20:29:06 +0200 Subject: [PATCH 15/16] Fixed wrong path in CSS --- htdocs/core/filemanagerdol/browser/default/browser.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/filemanagerdol/browser/default/browser.css b/htdocs/core/filemanagerdol/browser/default/browser.css index 196dd298bd4..3e2a924571c 100755 --- a/htdocs/core/filemanagerdol/browser/default/browser.css +++ b/htdocs/core/filemanagerdol/browser/default/browser.css @@ -68,12 +68,12 @@ body, td, input, select .FolderListCurrentFolder img { - background-image: url(../../../../themes/common/treemenu/folder-expanded.gif); + background-image: url(../../../../theme/common/treemenu/folder-expanded.gif); } .FolderListFolder img { - background-image: url(../../../../themes/common/treemenu/folder.gif); + background-image: url(../../../../theme/common/treemenu/folder.gif); } .fullHeight { From 36a281ce58d036cb2bfd12fc12944276260c24d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 5 Sep 2013 20:54:19 +0200 Subject: [PATCH 16/16] CSS fixes --- htdocs/cashdesk/css/style.css | 41 +++++-------- .../browser/default/browser.css | 2 +- htdocs/install/default.css | 46 ++++++-------- htdocs/opensurvey/css/style.css | 61 +++++++++---------- htdocs/projet/ganttchart.php | 2 +- htdocs/support/default.css | 23 +++---- 6 files changed, 77 insertions(+), 98 deletions(-) diff --git a/htdocs/cashdesk/css/style.css b/htdocs/cashdesk/css/style.css index 9ac041bc811..578d8fed6a2 100644 --- a/htdocs/cashdesk/css/style.css +++ b/htdocs/cashdesk/css/style.css @@ -55,11 +55,8 @@ p { /* ------------------- Menu ------------------- */ .menu_principal { - margin: 0 auto; - margin-left: 15px; - margin-bottom: 20px; - margin-right: 20px; - font-size: 14px; + margin: 0 20px 20px 15px; + font-size: 14px; width: 735px; height: 84px; background: #CCCCCC; @@ -77,9 +74,8 @@ p { .menu { margin: 0; - padding: 0; - list-style-type: none; - padding-top: 10px; + list-style-type: none; + padding: 10px 0 0; } .menu li { @@ -143,9 +139,8 @@ p { } p.titre { - margin: 0; - margin-bottom: 20px; - text-align: center; + margin: 0 0 20px; + text-align: center; font-weight: bold; font-size: 1.4em; color: #5ca64d; @@ -153,11 +148,10 @@ p.titre { } .cadre_article { - margin: 0 auto; - width: 180px; + width: 180px; text-align: center; - margin-bottom: 10px; - padding-bottom: 10px; + margin: 0 auto 10px; + padding-bottom: 10px; border-bottom: 1px solid #eee; } @@ -205,10 +199,9 @@ p.titre { } .formulaire_login table { - margin: 0 auto; - padding-left: 60px; - margin-bottom: 20px; - background: url('../img/login.png') bottom left no-repeat; + padding-left: 60px; + margin: 0 auto 20px; + background: url('../img/login.png') bottom left no-repeat; } .formulaire_login table tr { @@ -430,9 +423,8 @@ background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, /* Titre */ .err_titre { font-weight: bold; - margin: 0; - margin-bottom: 10px; - padding: 0; + margin: 0 0 10px; + padding: 0; } /* Description */ @@ -454,9 +446,8 @@ background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, /* Titre */ .msg_titre { font-weight: bold; - margin: 0; - margin-bottom: 10px; - padding: 0; + margin: 0 0 10px; + padding: 0; } /* Description */ diff --git a/htdocs/core/filemanagerdol/browser/default/browser.css b/htdocs/core/filemanagerdol/browser/default/browser.css index 3e2a924571c..e1b8007fdad 100755 --- a/htdocs/core/filemanagerdol/browser/default/browser.css +++ b/htdocs/core/filemanagerdol/browser/default/browser.css @@ -43,7 +43,7 @@ body.FileArea body, td, input, select { font-size: 11px; - font-family: 'Microsoft Sans Serif' , Arial, Helvetica, Verdana; + font-family: 'Microsoft Sans Serif', Arial, Helvetica, Verdana, sans-serif; } .ActualFolder diff --git a/htdocs/install/default.css b/htdocs/install/default.css index 86865725b3a..0c550cd1119 100644 --- a/htdocs/install/default.css +++ b/htdocs/install/default.css @@ -21,15 +21,12 @@ font-size:13px; font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif; background: #f9f9f9 url(headbg.jpg) 0 0 no-repeat; /* background-color: #F4F4F4; */ -margin-left: 30px; -margin-right: 30px; -margin-top: 15px; -margin-bottom: 10px; +margin: 15px 30px 10px; } div.titre { padding: 5px 5px 5px 5px; -margin: 0em 0em 0em 0em; +margin: 0 0 0 0; } span.titre { @@ -39,26 +36,26 @@ background: #FFFFFF; color: #4965B3; border: 1px solid #8CACBB; padding: 5px 5px 5px 5px; -margin: 0em 0em 0em 0em; +margin: 0 0 0 0; } div.soustitre { font-size: 15px; font-weight: bold; color: #4965B3; -padding: 0em 1.2em 0.5em 2em; +padding: 0 1.2em 0.5em 2em; margin: 1.2em 1.2em 1.2em 1.2em; border-bottom: 1px solid #8CACBB; border-right: 1px solid #8CACBB; text-align: right; } -inputdisabled +input:disabled { background: #FDFDFD; border: 1px solid #ACBCBB; -padding: 0px 0px 0px 0px; -margin: 0px 0px 0px 0px; +padding: 0 0 0 0; +margin: 0 0 0 0; } input[type=text], input[type=password] { @@ -69,9 +66,8 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus, select:focus box-shadow: 0 0 5px #C091AF; } input:-webkit-autofill { - background-color: #FBFFEA !important; - background-image: none !important; - -webkit-box-shadow: 0 0 0 50px #FBFFEA inset; + background: #FBFFEA none !important; + -webkit-box-shadow: 0 0 0 50px #FBFFEA inset; } table.main { @@ -91,11 +87,8 @@ color: #000000; table.listofchoices, tr.listofchoices, td.listofchoices { border-collapse: collapse; -padding-top: 4px; -padding-bottom: 4px; -padding-left: 4px; -padding-right: 4px; -color: #000000; + padding: 4px; + color: #000000; border: 1px solid #888888 !important; } @@ -137,7 +130,7 @@ div.error { color: #550000; font-weight: bold; padding: 0.2em 0.2em 0.2em 0.2em; -margin: 0.5em 0em 0.5em 0em; +margin: 0.5em 0 0.5em 0; border: 1px solid #6C7C8B; } font.error { @@ -199,7 +192,7 @@ background-color: #B5C5C5; td.label { color: #5945A3; padding: 5px 5px 5px 5px; -margin: 0em 0em 0em 0em; +margin: 0 0 0 0; border-bottom: 1px solid #CCCCDB; } @@ -207,7 +200,7 @@ border-bottom: 1px solid #CCCCDB; td.comment { color: black; padding: 5px 5px 5px 5px; -margin: 0em 0em 0em 0em; +margin: 0 0 0 0; text-decoration:none; font-size: 11px; border-bottom: 1px solid #CCCCDB; @@ -239,14 +232,13 @@ ul { .button { - background-color: #FFFFFF; - background-position: bottom; + background: #FFFFFF bottom; border: 1px solid #C0C0C0; padding: 0.3em 0.7em; - margin: 0em 0.5em; - -moz-border-radius:0px 5px 0px 5px; - -webkit-border-radius:0px 5px 0px 5px; - border-radius:0px 5px 0px 5px; + margin: 0 0.5em; + -moz-border-radius:0 5px 0 5px; + -webkit-border-radius:0 5px 0 5px; + border-radius:0 5px 0 5px; -moz-box-shadow: 2px 2px 3px #CCC; -webkit-box-shadow: 2px 2px 3px #CCC; box-shadow: 2px 2px 3px #CCC; diff --git a/htdocs/opensurvey/css/style.css b/htdocs/opensurvey/css/style.css index be8e05df4c1..7d7ef088c7e 100644 --- a/htdocs/opensurvey/css/style.css +++ b/htdocs/opensurvey/css/style.css @@ -20,7 +20,7 @@ .survey_invitation { - font-color: #445566; + color: #445566; font-weight: bold; } @@ -141,7 +141,7 @@ div.bandeau{ color:white; vertical-align:middle; font-size:35px; - font-family:arial; + font-family:arial, sans-serif; padding:8px; height:35px; position:static; @@ -166,7 +166,7 @@ div.bandeautitre{ font-weight:bold; text-align:center; vertical-align:middle; - font-family:arial; + font-family:arial, sans-serif; padding:3px; position:static; top:57px; @@ -179,7 +179,7 @@ div.sousbandeau{ font-size:11px; color:black; vertical-align:middle; - font-family:arial; + font-family:arial, sans-serif; padding:3px; position:static; top:80px; @@ -200,7 +200,7 @@ div.bandeaupied{ background-color: #0b419b; color:white; font-size:11px; - font-family:arial; + font-family:arial, sans-serif; padding:6px; position:fixed; bottom:6px; @@ -221,7 +221,7 @@ div.bandeaupiedmobile{ background-color: #0b419b; color:white; font-size:11px; - font-family:arial; + font-family:arial, sans-serif; padding:6px; position:static; } @@ -234,7 +234,7 @@ div.sousbandeau a, div.sousbandeau span.sousbandeaulangue a { text-align:center; margin-left:10px; margin-right:10px; - font-family:arial; + font-family:arial, sans-serif; color:white; font-size:10px; text-decoration:none; @@ -247,18 +247,18 @@ span.sousbandeaulangue { /*corps de la page index.php*/ div.corps{ font-size:12px; - font-family:arial; + font-family:arial, sans-serif; position:static; padding:15px; } div.corps table{ - font-family:arial; + font-family:arial, sans-serif; font-size:12px; font-weight:bold; } div.corpscentre{ font-size:12px; - font-family:arial; + font-family:arial, sans-serif; text-align:center; position:absolute; top:150px; @@ -280,7 +280,7 @@ div.jourschoisis { /*presenation des pages*/ div.bodydate { padding:10px; - font-family:arial; + font-family:arial, sans-serif; font-size:12px; text-align:center; position:static; @@ -289,14 +289,14 @@ div.bodydate { right:20px; } div.bodydate table{ - font-family:arial; + font-family:arial, sans-serif; font-size:12px; font-weight:bold; } /*cadre de commentaires*/ div.presentationdate { width:100%; - font-family:arial; + font-family:arial, sans-serif; text-align:center; font-size:12px; border-top:1px solid; @@ -311,12 +311,11 @@ div.presentationdate { div.presentationdatefin { width:40%; padding:10px; - font-family:arial; + font-family:arial, sans-serif; text-align:center; - font-size:12px; - border-width:1px; - border-style:solid; - margin-top: 10px; + font-size:12px; + border: 1px solid; + margin-top: 10px; margin-left: 30%; margin-right: 30%; position:static; @@ -324,7 +323,7 @@ div.presentationdatefin { /*cadre principal de studs.php*/ div.cadre { padding:10px; - font-family:arial; + font-family:arial, sans-serif; font-size:12px; position:static; top:235px; @@ -406,7 +405,7 @@ div.calendrier { background-color: #AAA; width:490px; font-size:12px; - font-family:arial; + font-family:arial, sans-serif; margin-left: 30%; margin-right: 30%; position:static; @@ -415,7 +414,7 @@ div.calendrier { div.calendrier td.joursemaine { width:65px; text-align: center; - font-family:arial; + font-family:arial, sans-serif; font-size:14px; border: 2px; background-color: white; @@ -423,7 +422,7 @@ div.calendrier td.joursemaine { div.calendrier td.jourwe { width:65px; text-align: center; - font-family:arial; + font-family:arial, sans-serif; font-size:14px; border: 2px; background-color: #C0C0C0; @@ -433,7 +432,7 @@ div.calendrier td.avant { width:65px; text-align: center; border: 2px; - font-family:arial; + font-family:arial, sans-serif; font-size:13px; background-color: #DDDDDD; } @@ -454,7 +453,7 @@ div.calendrier td.choisi { /* Le paragraphe de fin */ p.affichageresultats{ text-align: center; - font-family:arial; + font-family:arial, sans-serif; font-size:13px; } @@ -468,7 +467,7 @@ div.comment span.usercomment{ a.affichageexport{ text-align: center; - font-family:arial; + font-family:arial, sans-serif; font-size:10px; margin-left:10px; text-decoration: none; @@ -483,11 +482,11 @@ div.titregestionadmin{ .bouton { width: 65px; - border:0px; - padding:0px 0 0 0; - margin:0px; + border:0; + padding:0 0 0 0; + margin:0; cursor:pointer; - font-family:arial; + font-family:arial, sans-serif; font-size:13px; } /*les boutons pour choisir un jour non selectionné*/ @@ -505,7 +504,7 @@ div.nouveau_sondage a { } div.nouveau_sondage span img { vertical-align: middle; - border: 0px; + border: 0; } div.nouveau_sondage span { margin-left: 20px; @@ -514,7 +513,7 @@ div.nouveau_sondage span { div.error, div.addcomment { text-align:center; border: 1px; - font-family: arial; + font-family: arial, sans-serif; font-size: 13px; } ul.exports { diff --git a/htdocs/projet/ganttchart.php b/htdocs/projet/ganttchart.php index 1100289f75d..c0254a4b1f8 100644 --- a/htdocs/projet/ganttchart.php +++ b/htdocs/projet/ganttchart.php @@ -23,7 +23,7 @@ ?> -
+
diff --git a/htdocs/support/default.css b/htdocs/support/default.css index 07ca0f8ebd0..1d540096f10 100644 --- a/htdocs/support/default.css +++ b/htdocs/support/default.css @@ -20,15 +20,12 @@ font-size:12px; font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif; background: #f9f9f9 url(headbg.jpg) 0 0 no-repeat; /* background-color: #F4F4F4; */ -margin-left: 10px; -margin-right: 10px; -margin-top: 5px; -margin-bottom: 5px; +margin: 5px 10px; } div.titre { padding: 5px 5px 5px 5px; -margin: 0em 0em 0em 0em; +margin: 0 0 0 0; } span.titre { @@ -37,7 +34,7 @@ font-weight: bold; background: #FFFFFF; color: #4965B3; padding: 5px 5px 5px 5px; -margin: 0em 0em 0em 0em; +margin: 0 0 0 0; border: 1px solid #AAAAAA; } @@ -45,19 +42,19 @@ div.soustitre { font-size: 15px; font-weight: bold; color: #4965B3; -padding: 0em 1.2em 0.5em 2em; +padding: 0 1.2em 0.5em 2em; margin: 1.2em 1.2em 1.2em 1.2em; border-bottom: 1px solid #8CACBB; border-right: 1px solid #8CACBB; text-align: right; } -inputdisabled +input:disabled { background: #FDFDFD; border: 1px solid #ACBCBB; -padding: 0px 0px 0px 0px; -margin: 0px 0px 0px 0px; +padding: 0 0 0 0; +margin: 0 0 0 0; } table.main { @@ -77,7 +74,7 @@ color: #777711; div.error { color: #550000; font-weight: bold; padding: 0.2em 0.2em 0.2em 0.2em; -margin: 0.5em 0em 0.5em 0em; +margin: 0.5em 0 0.5em 0; border: 1px solid #6C7C8B; } @@ -124,7 +121,7 @@ td.label { background: #dcdcd3; color: #5945A3; padding: 5px 5px 5px 5px; -margin: 0em 0em 0em 0em; +margin: 0 0 0 0; border-bottom: 1px solid #8CACBB; } @@ -132,7 +129,7 @@ td.comment { background: #dcdcd3; color: black; padding: 5px 5px 5px 5px; -margin: 0em 0em 0em 0em; +margin: 0 0 0 0; text-decoration:none; font-size: 13px; border-bottom: 1px solid #8CACBB;