fix : dyslexia

This commit is contained in:
Grand Philippe 2013-03-11 17:19:03 +01:00
parent 979a36e941
commit dd248e9d58
18 changed files with 22 additions and 20 deletions

2
README
View File

@ -108,7 +108,7 @@ Other modules:
- RSS - RSS
Miscellanous: Miscellanous:
- Mutli-user, with several permissions levels for each feature. - Multi-user, with several permissions levels for each feature.
- Serveral menu managers (can be used by internal users, as a back-office, - Serveral menu managers (can be used by internal users, as a back-office,
with a particular menu, or by external users, as a front-office, with with a particular menu, or by external users, as a front-office, with
another menu and permissions). another menu and permissions).

View File

@ -122,7 +122,7 @@ V - CE QUE DOLIBARR NE PEUT PAS FAIRE (TACHES A FAIRE)
Voici un liste de fonctionnalites pas encore gérées par Dolibarr: Voici un liste de fonctionnalites pas encore gérées par Dolibarr:
- Pas de compta analytique (uniquement gestion de trésorerie). - Pas de compta analytique (uniquement gestion de trésorerie).
- Dolibarr ne gère qu'une seule monnaie à la fois (mono-devise). - Dolibarr ne gère qu'une seule monnaie à la fois (mono-devise).
- Dolibarr ne gère en standard qu'une société/institution/association (mono-société). Pour en gérer plusieurs (comme vos filiales), il faut, soit faire plusieurs installations de Dolibarr, soit installer le module MutliCompany qui permet de gérer n société/institutions/associations dans une seule instance par une isolation logique des données. - Dolibarr ne gère en standard qu'une société/institution/association (mono-société). Pour en gérer plusieurs (comme vos filiales), il faut, soit faire plusieurs installations de Dolibarr, soit installer le module MultiCompany qui permet de gérer n société/institutions/associations dans une seule instance par une isolation logique des données.
- Ne gère pas la double tva (Fédérale / provinciale) du canada. - Ne gère pas la double tva (Fédérale / provinciale) du canada.
- Dolibarr ne contient pas de module de Gestion de la paie. - Dolibarr ne contient pas de module de Gestion de la paie.
- Les taches du module de gestion de projets n'ont pas de dépendance entre elle. - Les taches du module de gestion de projets n'ont pas de dépendance entre elle.

View File

@ -105,7 +105,7 @@ See ChangeLog file found into package.
### Miscellanous: ### Miscellanous:
- Mutli-user, with several permissions levels for each feature. - Multi-user, with several permissions levels for each feature.
- Serveral menu managers (can be used by internal users, as a back-office, with a particular menu, or by external users, as a front-office, with another menu and permissions). - Serveral menu managers (can be used by internal users, as a back-office, with a particular menu, or by external users, as a front-office, with another menu and permissions).
- Very user friendly and easy to use. - Very user friendly and easy to use.
- Optional WYSIWYG forms, optional Ajax forms. - Optional WYSIWYG forms, optional Ajax forms.

View File

@ -925,3 +925,5 @@ UPDATE llx_c_action_trigger SET code='FICHINTER_VALIDATE' WHERE code='FICHEINTER
UPDATE llx_c_departements SET ncc='ALAVA', nom='Álava' WHERE code_departement='01' AND fk_region=419; UPDATE llx_c_departements SET ncc='ALAVA', nom='Álava' WHERE code_departement='01' AND fk_region=419;
ALTER TABLE llx_product_fournisseur_price DROP FOREIGN KEY fk_product_fournisseur; ALTER TABLE llx_product_fournisseur_price DROP FOREIGN KEY fk_product_fournisseur;
UPDATE llx_const set name='PRODUIT_MULTI_PRICES' where name='PRODUIT_MUTLI_PRICES';

View File

@ -213,7 +213,7 @@ ModuleFamilyProducts=إدارة المنتجات
ModuleFamilyHr=إدارة الموارد البشرية ModuleFamilyHr=إدارة الموارد البشرية
ModuleFamilyProjects=مشاريع / العمل التعاوني ModuleFamilyProjects=مشاريع / العمل التعاوني
ModuleFamilyOther=أخرى ModuleFamilyOther=أخرى
ModuleFamilyTechnic=Mutli بين وحدات وأدوات ModuleFamilyTechnic=Multi بين وحدات وأدوات
ModuleFamilyExperimental=نماذج تجريبية ModuleFamilyExperimental=نماذج تجريبية
ModuleFamilyFinancial=الوحدات المالية (المحاسبة / الخزانة) ModuleFamilyFinancial=الوحدات المالية (المحاسبة / الخزانة)
ModuleFamilyECM=إدارة المحتوى في المؤسسة ModuleFamilyECM=إدارة المحتوى في المؤسسة

View File

@ -199,7 +199,7 @@ ModuleFamilyProducts=Produkter Management
ModuleFamilyHr=Human Resource Management ModuleFamilyHr=Human Resource Management
ModuleFamilyProjects=Projekter / samarbejde ModuleFamilyProjects=Projekter / samarbejde
ModuleFamilyOther=Anden ModuleFamilyOther=Anden
ModuleFamilyTechnic=Mutli-moduler værktøjer ModuleFamilyTechnic=Multi-moduler værktøjer
ModuleFamilyExperimental=Eksperimentel moduler ModuleFamilyExperimental=Eksperimentel moduler
ModuleFamilyFinancial=Finansielle Modules (Regnskabsmæssig / Treasury) ModuleFamilyFinancial=Finansielle Modules (Regnskabsmæssig / Treasury)
ModuleFamilyECM=ECM ModuleFamilyECM=ECM

View File

@ -261,7 +261,7 @@ ModuleFamilyProducts=Products Management
ModuleFamilyHr=Human Resource Management ModuleFamilyHr=Human Resource Management
ModuleFamilyProjects=Projects/Collaborative work ModuleFamilyProjects=Projects/Collaborative work
ModuleFamilyOther=Other ModuleFamilyOther=Other
ModuleFamilyTechnic=Mutli-modules tools ModuleFamilyTechnic=Multi-modules tools
ModuleFamilyExperimental=Experimental modules ModuleFamilyExperimental=Experimental modules
ModuleFamilyFinancial=Financial Modules (Accounting/Treasury) ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
ModuleFamilyECM=Electronic Content Management (ECM) ModuleFamilyECM=Electronic Content Management (ECM)

View File

@ -259,7 +259,7 @@ ModuleFamilyProducts=Tooted juhtimine
ModuleFamilyHr=Human Resource Management ModuleFamilyHr=Human Resource Management
ModuleFamilyProjects=Projektid / koostööprojektid töö ModuleFamilyProjects=Projektid / koostööprojektid töö
ModuleFamilyOther=Teine ModuleFamilyOther=Teine
ModuleFamilyTechnic=Mutli-moodulid tööriistad ModuleFamilyTechnic=Multi-moodulid tööriistad
ModuleFamilyExperimental=Eksperimentaalse moodulid ModuleFamilyExperimental=Eksperimentaalse moodulid
ModuleFamilyFinancial=Financial Modules (Raamatupidamine / Treasury) ModuleFamilyFinancial=Financial Modules (Raamatupidamine / Treasury)
ModuleFamilyECM=Electronic sisuhaldus (ECM) ModuleFamilyECM=Electronic sisuhaldus (ECM)

View File

@ -221,7 +221,7 @@ ModuleFamilyProducts= سیسیتم کالاها
ModuleFamilyHr= سیستم استخدامی ModuleFamilyHr= سیستم استخدامی
ModuleFamilyProjects= سیستم پروژه ها ModuleFamilyProjects= سیستم پروژه ها
ModuleFamilyOther= دیگر سیستم ها ModuleFamilyOther= دیگر سیستم ها
ModuleFamilyTechnic=Mutli بين وحدات وأدوات ModuleFamilyTechnic=Multi بين وحدات وأدوات
ModuleFamilyExperimental=نماذج تجريبية ModuleFamilyExperimental=نماذج تجريبية
ModuleFamilyFinancial=الوحدات المالية (المحاسبة / الخزانة) ModuleFamilyFinancial=الوحدات المالية (المحاسبة / الخزانة)
ModuleFamilyECM=تولید محتوی الکترونیکی ModuleFamilyECM=تولید محتوی الکترونیکی

View File

@ -197,7 +197,7 @@ ModuleFamilyProducts=Tuotteet Management
ModuleFamilyHr=Human Resource Management ModuleFamilyHr=Human Resource Management
ModuleFamilyProjects=Projektit / Yhteistyöhankkeet työn ModuleFamilyProjects=Projektit / Yhteistyöhankkeet työn
ModuleFamilyOther=Muu ModuleFamilyOther=Muu
ModuleFamilyTechnic=Mutli-modules työkalut ModuleFamilyTechnic=Multi-modules työkalut
ModuleFamilyExperimental=Kokeellinen modules ModuleFamilyExperimental=Kokeellinen modules
ModuleFamilyFinancial=Financial Modules (kirjanpidon / Treasury) ModuleFamilyFinancial=Financial Modules (kirjanpidon / Treasury)
ModuleFamilyECM=ECM ModuleFamilyECM=ECM

View File

@ -259,7 +259,7 @@ ModuleFamilyProducts=מוצרי ניהול
ModuleFamilyHr=ניהול משאבי אנוש ModuleFamilyHr=ניהול משאבי אנוש
ModuleFamilyProjects=פרויקטים / עבודה שיתופית ModuleFamilyProjects=פרויקטים / עבודה שיתופית
ModuleFamilyOther=אחר ModuleFamilyOther=אחר
ModuleFamilyTechnic=Mutli מודולים כלים ModuleFamilyTechnic=Multi מודולים כלים
ModuleFamilyExperimental=הניסוי מודולים ModuleFamilyExperimental=הניסוי מודולים
ModuleFamilyFinancial=מודולים פיננסיים (חשבונאות / משרד האוצר) ModuleFamilyFinancial=מודולים פיננסיים (חשבונאות / משרד האוצר)
ModuleFamilyECM=ניהול תוכן אלקטרוני (ECM) ModuleFamilyECM=ניהול תוכן אלקטרוני (ECM)

View File

@ -259,7 +259,7 @@ ModuleFamilyProducts=Termékek kezelése
ModuleFamilyHr=Az emberi erőforrás menedzsment ModuleFamilyHr=Az emberi erőforrás menedzsment
ModuleFamilyProjects=Projektek / kollaboratív munkát ModuleFamilyProjects=Projektek / kollaboratív munkát
ModuleFamilyOther=Más ModuleFamilyOther=Más
ModuleFamilyTechnic=Mutli-modulok eszközök ModuleFamilyTechnic=Multi-modulok eszközök
ModuleFamilyExperimental=Kísérleti modulok ModuleFamilyExperimental=Kísérleti modulok
ModuleFamilyFinancial=Pénzügyi modulok (Számviteli / Kincstár) ModuleFamilyFinancial=Pénzügyi modulok (Számviteli / Kincstár)
ModuleFamilyECM=Elektronikus Content Management (ECM) ModuleFamilyECM=Elektronikus Content Management (ECM)

View File

@ -234,7 +234,7 @@ ModuleFamilyProducts=Vörur Stjórn
ModuleFamilyHr=Mannauðsstjórnun ModuleFamilyHr=Mannauðsstjórnun
ModuleFamilyProjects=Verkefni / samvinna vinna ModuleFamilyProjects=Verkefni / samvinna vinna
ModuleFamilyOther=Önnur ModuleFamilyOther=Önnur
ModuleFamilyTechnic=Mutli-einingar verkfæri ModuleFamilyTechnic=Multi-einingar verkfæri
ModuleFamilyExperimental=Experimental mát ModuleFamilyExperimental=Experimental mát
ModuleFamilyFinancial=Financial einingar (Bókhald / ríkissjóðs) ModuleFamilyFinancial=Financial einingar (Bókhald / ríkissjóðs)
ModuleFamilyECM=ECM ModuleFamilyECM=ECM

View File

@ -259,7 +259,7 @@ ModuleFamilyProducts=製品の管理
ModuleFamilyHr=人的資源管理 ModuleFamilyHr=人的資源管理
ModuleFamilyProjects=プロジェクト/共同作業 ModuleFamilyProjects=プロジェクト/共同作業
ModuleFamilyOther=その他 ModuleFamilyOther=その他
ModuleFamilyTechnic=Mutli-モジュールツール ModuleFamilyTechnic=Multi-モジュールツール
ModuleFamilyExperimental=実験的なモジュール ModuleFamilyExperimental=実験的なモジュール
ModuleFamilyFinancial=金融モジュール(会計/財務) ModuleFamilyFinancial=金融モジュール(会計/財務)
ModuleFamilyECM=電子コンテンツ管理(ECM) ModuleFamilyECM=電子コンテンツ管理(ECM)

View File

@ -200,7 +200,7 @@ ModuleFamilyProducts=Produkty Management
ModuleFamilyHr=Zarządzanie zasobami ludzkimi ModuleFamilyHr=Zarządzanie zasobami ludzkimi
ModuleFamilyProjects=Projekty / współpracy ModuleFamilyProjects=Projekty / współpracy
ModuleFamilyOther=Inny ModuleFamilyOther=Inny
ModuleFamilyTechnic=Mutli-modules narzędzia ModuleFamilyTechnic=Multi-modules narzędzia
ModuleFamilyExperimental=Eksperymentalne modules ModuleFamilyExperimental=Eksperymentalne modules
ModuleFamilyFinancial=Moduły finansowe (Księgowość / Skarbu) ModuleFamilyFinancial=Moduły finansowe (Księgowość / Skarbu)
ModuleFamilyECM=ECM ModuleFamilyECM=ECM

View File

@ -198,7 +198,7 @@ ModuleFamilyProducts=Produse de Management
ModuleFamilyHr=Managementul resurselor umane ModuleFamilyHr=Managementul resurselor umane
ModuleFamilyProjects=Proiecte / Colaborativă munca ModuleFamilyProjects=Proiecte / Colaborativă munca
ModuleFamilyOther=Alt ModuleFamilyOther=Alt
ModuleFamilyTechnic=Mutli-module de unelte ModuleFamilyTechnic=Multi-module de unelte
ModuleFamilyExperimental=Experimentale module ModuleFamilyExperimental=Experimentale module
ModuleFamilyFinancial=Module financiar (Contabilitate / Trezoreriei) ModuleFamilyFinancial=Module financiar (Contabilitate / Trezoreriei)
ModuleFamilyECM=ECM ModuleFamilyECM=ECM

View File

@ -197,7 +197,7 @@ ModuleFamilyProducts=Продукты управления
ModuleFamilyHr=Кадровый менеджмент ModuleFamilyHr=Кадровый менеджмент
ModuleFamilyProjects=Проекты / Совместная работа ModuleFamilyProjects=Проекты / Совместная работа
ModuleFamilyOther=Другой ModuleFamilyOther=Другой
ModuleFamilyTechnic=Mutli-модулей инструменты ModuleFamilyTechnic=Multi-модулей инструменты
ModuleFamilyExperimental=Экспериментальный модуль ModuleFamilyExperimental=Экспериментальный модуль
ModuleFamilyFinancial=Финансовые модули (Бухгалтерия / Казначейство) ModuleFamilyFinancial=Финансовые модули (Бухгалтерия / Казначейство)
ModuleFamilyECM=ECM ModuleFamilyECM=ECM

View File

@ -539,11 +539,11 @@ if ($resql)
print '<td align="right">'.(price2num($obj->pmp)?price(price2num($obj->pmp*$obj->reel,'MT')):'').'</td>'; // Ditto : Show PMP from movement or from product print '<td align="right">'.(price2num($obj->pmp)?price(price2num($obj->pmp*$obj->reel,'MT')):'').'</td>'; // Ditto : Show PMP from movement or from product
// Sell price // Sell price
print '<td align="right">'; print '<td align="right">';
if (empty($conf->global->PRODUIT_MUTLI_PRICES)) print price(price2num($product->price,'MU')); if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($product->price,'MU'));
else print $langs->trans("Variable"); else print $langs->trans("Variable");
print '</td>'; // Ditto : Show PMP from movement or from product print '</td>'; // Ditto : Show PMP from movement or from product
print '<td align="right">'; print '<td align="right">';
if (empty($conf->global->PRODUIT_MUTLI_PRICES)) print price(price2num($product->price*$obj->reel,'MT')).'</td>'; // Ditto : Show PMP from movement or from product if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($product->price*$obj->reel,'MT')).'</td>'; // Ditto : Show PMP from movement or from product
else print $langs->trans("Variable"); else print $langs->trans("Variable");
print '</tr>'; ; print '</tr>'; ;
$total += $obj->reel; $total += $obj->reel;
@ -564,11 +564,11 @@ print '<td class="liste_total" align="right">';
print price(price2num($totalvalue,'MT')); print price(price2num($totalvalue,'MT'));
print '</td>'; print '</td>';
print '<td class="liste_total" align="right">'; print '<td class="liste_total" align="right">';
if (empty($conf->global->PRODUIT_MUTLI_PRICES)) print ($total?price($totalvaluesell/$total):'&nbsp;'); if (empty($conf->global->PRODUIT_MULTI_PRICES)) print ($total?price($totalvaluesell/$total):'&nbsp;');
else print $langs->trans("Variable"); else print $langs->trans("Variable");
print '</td>'; print '</td>';
print '<td class="liste_total" align="right">'; print '<td class="liste_total" align="right">';
if (empty($conf->global->PRODUIT_MUTLI_PRICES)) print price(price2num($totalvaluesell,'MT')); if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($totalvaluesell,'MT'));
else print $langs->trans("Variable"); else print $langs->trans("Variable");
print '</td>'; print '</td>';
print "</tr>"; print "</tr>";