From 72895fa4b79c79711591f400046f29d0038a3324 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Sat, 18 Aug 2012 21:31:12 +0200 Subject: [PATCH 1/4] for module ultimatepdf --- htdocs/theme/auguria/style.css.php | 2 +- htdocs/theme/bureau2crea/style.css.php | 2 +- htdocs/theme/cameleo/style.css.php | 2 +- htdocs/theme/eldy/style.css.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index b7340ef3e2b..9feedb5777f 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -517,7 +517,7 @@ div.login a:hover { text-decoration:underline; } -img.login, img.printer, img.entity { +img.login, img.printer, img.entity, img.model { padding: browser->phone?'0':'8')?>px 0px 0px 0px; margin: 0px 0px 0px 8px; text-decoration: none; diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index d8ab2f33920..d8c6eef0442 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -576,7 +576,7 @@ div.login a:hover { text-decoration:underline; } -img.login, img.printer, img.entity { +img.login, img.printer, img.entity, img.model { padding: browser->phone?'0':'8')?>px 0px 0px 0px; margin: 0px 0px 0px 8px; text-decoration: none; diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php index 78121b403c0..b6715014ac9 100644 --- a/htdocs/theme/cameleo/style.css.php +++ b/htdocs/theme/cameleo/style.css.php @@ -590,7 +590,7 @@ div.login a:hover { text-decoration:underline; } -img.login, img.printer, img.entity { +img.login, img.printer, img.entity, img.model { padding: browser->phone?'0':'8')?>px 0px 0px 0px; margin: 0px 0px 0px 8px; text-decoration: none; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index b8470e3c090..4b88d931024 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -758,7 +758,7 @@ div.login a:hover { text-decoration:underline; } -img.login, img.printer, img.entity { +img.login, img.printer, img.entity, img.model { padding: browser->phone?'0':'8')?>px 0px 0px 0px; margin: 0px 0px 0px 8px; text-decoration: none; From dcba31a4db467ee3f0f4bcec9eab0d62f89923f5 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Mon, 20 Aug 2012 15:51:16 +0200 Subject: [PATCH 2/4] translation enhancement --- dev/skeletons/README | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dev/skeletons/README b/dev/skeletons/README index 32924a36ac6..02a760a53dc 100644 --- a/dev/skeletons/README +++ b/dev/skeletons/README @@ -9,7 +9,7 @@ skeleton_*.php to build its generated code. modMyModule.class.php: -Is a sample of module descriptor you can use if you want to build a new module/plugin for +Is a sample of module descriptor that you can use if you want to build a new module/plugin for Dolibarr. @@ -20,11 +20,7 @@ skeleton_page.php: Is a sample you can use as an example if you need to build an HTML page to include in Dolibarr GUI. skeleton_class.class.php: -Is a sample you can use as an example if you need to build a class file to access a new table -required by a Dolibarr development. -However it is better to run the script build_class_from_table.php that accept a table name as a -parameter and will used table description in database and the skeleton_class.class.php file to -generate full code for your class file. -After running this script, the class to access your table (insert a record, update, delete and select) -is directly finished and can be used by your business code. No more coding for accesser on table -is needed with this script as the file is completely generated once. +Is a sample you can use as an example if you need to build a class file to access a new table required by a Dolibarr development. +However it is better to run the build_class_from_table.php script that accepts a table name as a parameter and will uses the description table within database and the skeleton_class.class.php file to generate full code for your class file. +After running this script, the class to access your table (insert a record, update, delete and select) is directly finished and can be used by your module's code. +No more coding is needed to get access to table with this script because the file is completely generated once. From 0cc8ee9b8d53b17e59e4a2ac2f8858e2c088e9c2 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Mon, 20 Aug 2012 16:18:42 +0200 Subject: [PATCH 3/4] translation enhancement --- dev/skeletons/skeleton_class.class.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dev/skeletons/skeleton_class.class.php b/dev/skeletons/skeleton_class.class.php index f5de8e82f8c..7dd68e91f7f 100644 --- a/dev/skeletons/skeleton_class.class.php +++ b/dev/skeletons/skeleton_class.class.php @@ -61,7 +61,7 @@ class Skeleton_Class // extends CommonObject /** * Create object into database * - * @param User $user User that create + * @param User $user User that creates * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, Id of created object if OK */ @@ -102,7 +102,7 @@ class Skeleton_Class // extends CommonObject if (! $notrigger) { // Uncomment this and change MYOBJECT to your own tag if you - // want this action call a trigger. + // want this action calls a trigger. //// Call triggers //include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); @@ -133,7 +133,7 @@ class Skeleton_Class // extends CommonObject /** - * Load object in memory from database + * Load object in memory from the database * * @param int $id Id object * @return int <0 if KO, >0 if OK @@ -178,7 +178,7 @@ class Skeleton_Class // extends CommonObject /** * Update object into database * - * @param User $user User that modify + * @param User $user User that modifies * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ @@ -193,7 +193,7 @@ class Skeleton_Class // extends CommonObject //... // Check parameters - // Put here code to add control on parameters values + // Put here code to add a control on parameters values // Update request $sql = "UPDATE ".MAIN_DB_PREFIX."mytable SET"; @@ -213,7 +213,7 @@ class Skeleton_Class // extends CommonObject if (! $notrigger) { // Uncomment this and change MYOBJECT to your own tag if you - // want this action call a trigger. + // want this action calls a trigger. //// Call triggers //include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); @@ -246,7 +246,7 @@ class Skeleton_Class // extends CommonObject /** * Delete object in database * - * @param User $user User that delete + * @param User $user User that deletes * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ @@ -262,7 +262,7 @@ class Skeleton_Class // extends CommonObject if (! $notrigger) { // Uncomment this and change MYOBJECT to your own tag if you - // want this action call a trigger. + // want this action calls a trigger. //// Call triggers //include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); From 6cfe58f083dcbca6a8ff282e707b415b50ea6262 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Tue, 21 Aug 2012 09:39:07 +0200 Subject: [PATCH 4/4] fix some english translation --- htdocs/core/lib/ws.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/lib/ws.lib.php b/htdocs/core/lib/ws.lib.php index 9e1d0fd1292..521ebf5d268 100755 --- a/htdocs/core/lib/ws.lib.php +++ b/htdocs/core/lib/ws.lib.php @@ -48,7 +48,7 @@ function check_authentication($authentication,&$error,&$errorcode,&$errorlabel) if (! $error && ! empty($authentication['entity']) && ! is_numeric($authentication['entity'])) { $error++; - $errorcode='BAD_PARAMETERS'; $errorlabel="Parameter entity must be empty (or filled with numeric id of instance if multicompany module is used)."; + $errorcode='BAD_PARAMETERS'; $errorlabel="The entity parameter must be empty (or filled with numeric id of instance if multicompany module is used)."; } if (! $error) @@ -57,7 +57,7 @@ function check_authentication($authentication,&$error,&$errorcode,&$errorlabel) if ($result < 0) { $error++; - $errorcode='ERROR_FETCH_USER'; $errorlabel='A technical error occurs during fetch of user'; + $errorcode='ERROR_FETCH_USER'; $errorlabel='A technical error occurred during fetch of user'; } else if ($result == 0) {