lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Use correct install files

Browse Source
This commit is contained in:
eldy 2011-09-27 03:57:55 +02:00
commit 0d360a952e
5 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/rpm/dolibarr_fedora.spec
View File

@ -19,7 +19,7 @@ License: GPLv2+
Vendor: Dolibarr dev team Vendor: Dolibarr dev team
URL: http://www.dolibarr.org URL: http://www.dolibarr.org
Source0: http://www.dolibarr.org/files/fedora/%{name}-%{version}.tgz Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_fedora/%{name}-%{version}.tgz
Patch0: %{name}-forrpm.patch Patch0: %{name}-forrpm.patch
BuildArch: noarch BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build

2
build/rpm/dolibarr_generic.spec
View File

@ -19,7 +19,7 @@ License: GPLv2+
Vendor: Dolibarr dev team Vendor: Dolibarr dev team
URL: http://www.dolibarr.org URL: http://www.dolibarr.org
Source0: http://www.dolibarr.org/files/fedora/%{name}-%{version}.tgz Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_generic/%{name}-%{version}.tgz
Patch0: %{name}-forrpm.patch Patch0: %{name}-forrpm.patch
BuildArch: noarch BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build

2
build/rpm/dolibarr_mandriva.spec
View File

@ -19,7 +19,7 @@ License: GPLv2+
Vendor: Dolibarr dev team Vendor: Dolibarr dev team
URL: http://www.dolibarr.org URL: http://www.dolibarr.org
Source0: http://www.dolibarr.org/files/mandriva/%{name}-%{version}.tgz Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_mandriva/%{name}-%{version}.tgz
Patch0: %{name}-forrpm.patch Patch0: %{name}-forrpm.patch
BuildArch: noarch BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build

2
build/rpm/dolibarr_opensuse.spec
View File

@ -19,7 +19,7 @@ License: GPLv2+
Vendor: Dolibarr dev team Vendor: Dolibarr dev team
URL: http://www.dolibarr.org URL: http://www.dolibarr.org
Source0: http://www.dolibarr.org/files/opensuse/%{name}-%{version}.tgz Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_opensuse/%{name}-%{version}.tgz
Patch0: %{name}-forrpm.patch Patch0: %{name}-forrpm.patch
BuildArch: noarch BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build

13
htdocs/admin/dict.php
View File

@ -171,7 +171,7 @@ $tabfield[7] = "code,libelle,pays_id,pays,deductible";
$tabfield[8] = "code,libelle"; $tabfield[8] = "code,libelle";
//$tabfield[9] = "code,code_iso,libelle,symbole"; //$tabfield[9] = "code,code_iso,libelle,symbole";
$tabfield[9] = "code,code_iso,libelle"; $tabfield[9] = "code,code_iso,libelle";
$tabfield[10]= "pays_id,pays,taux,recuperableonly,localtax1,localtax2,note,accountancy_code"; $tabfield[10]= "pays_id,pays,taux,recuperableonly,localtax1,localtax2,accountancy_code,note";
$tabfield[11]= "element,source,code,libelle"; $tabfield[11]= "element,source,code,libelle";
$tabfield[12]= "code,libelle,libelle_facture,nbjour,fdm,decalage"; $tabfield[12]= "code,libelle,libelle_facture,nbjour,fdm,decalage";
$tabfield[13]= "code,libelle,type"; $tabfield[13]= "code,libelle,type";
@ -196,7 +196,7 @@ $tabfieldvalue[7] = "code,libelle,pays,deductible";
$tabfieldvalue[8] = "code,libelle"; $tabfieldvalue[8] = "code,libelle";
//$tabfieldvalue[9] = "code,code_iso,libelle,symbole"; //$tabfieldvalue[9] = "code,code_iso,libelle,symbole";
$tabfieldvalue[9] = "code,code_iso,libelle"; $tabfieldvalue[9] = "code,code_iso,libelle";
$tabfieldvalue[10]= "pays,taux,recuperableonly,localtax1,localtax2,note,accountancy_code"; $tabfieldvalue[10]= "pays,taux,recuperableonly,localtax1,localtax2,accountancy_code,note";
$tabfieldvalue[11]= "element,source,code,libelle"; $tabfieldvalue[11]= "element,source,code,libelle";
$tabfieldvalue[12]= "code,libelle,libelle_facture,nbjour,fdm,decalage"; $tabfieldvalue[12]= "code,libelle,libelle_facture,nbjour,fdm,decalage";
$tabfieldvalue[13]= "code,libelle,type"; $tabfieldvalue[13]= "code,libelle,type";
@ -221,7 +221,7 @@ $tabfieldinsert[7] = "code,libelle,fk_pays,deductible";
$tabfieldinsert[8] = "code,libelle"; $tabfieldinsert[8] = "code,libelle";
//$tabfieldinsert[9] = "code,code_iso,label,symbole"; //$tabfieldinsert[9] = "code,code_iso,label,symbole";
$tabfieldinsert[9] = "code,code_iso,label"; $tabfieldinsert[9] = "code,code_iso,label";
$tabfieldinsert[10]= "fk_pays,taux,recuperableonly,localtax1,localtax2,note,accountancy_code"; $tabfieldinsert[10]= "fk_pays,taux,recuperableonly,localtax1,localtax2,accountancy_code,note";
$tabfieldinsert[11]= "element,source,code,libelle"; $tabfieldinsert[11]= "element,source,code,libelle";
$tabfieldinsert[12]= "code,libelle,libelle_facture,nbjour,fdm,decalage"; $tabfieldinsert[12]= "code,libelle,libelle_facture,nbjour,fdm,decalage";
$tabfieldinsert[13]= "code,libelle,type"; $tabfieldinsert[13]= "code,libelle,type";
@ -568,10 +568,7 @@ if ($_GET['action'] == 'delete')
*/ */
if ($_GET["id"]) if ($_GET["id"])
{ {
if ($msg) dol_htmloutput_mesg($msg);
{
print $msg.'<br>';
}
// Complete requete recherche valeurs avec critere de tri // Complete requete recherche valeurs avec critere de tri
$sql=$tabsql[$_GET["id"]]; $sql=$tabsql[$_GET["id"]];
@ -967,7 +964,7 @@ function fieldList($fieldlist,$obj='')
print $html->selectyesno($fieldlist[$field],$obj->$fieldlist[$field],1); print $html->selectyesno($fieldlist[$field],$obj->$fieldlist[$field],1);
print '</td>'; print '</td>';
} }
elseif ($fieldlist[$field] == 'nbjour' || $fieldlist[$field] == 'decalage' || $fieldlist[$field] == 'taux') { elseif (in_array($fieldlist[$field],array('nbjour','decalage','taux','localtax1','localtax2'))) {
print '<td><input type="text" class="flat" value="'.$obj->$fieldlist[$field].'" size="3" name="'.$fieldlist[$field].'"></td>'; print '<td><input type="text" class="flat" value="'.$obj->$fieldlist[$field].'" size="3" name="'.$fieldlist[$field].'"></td>';
} }
elseif ($fieldlist[$field] == 'libelle_facture') { elseif ($fieldlist[$field] == 'libelle_facture') {