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

Fix no link to show if id empty

Browse Source
This commit is contained in:
Laurent Destailleur 2015-08-19 18:27:12 +02:00
parent fabd751be4
commit 5f30ad3b63
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/debian/README.howto
View File

@ -117,7 +117,7 @@ http://bugs.debian.org/package
severity 123 xxx severity 123 xxx
##### Update but tracker system ##### Update bug tracker system
To set status of a bug to "pending" To set status of a bug to "pending"
> bts --smtp-host=yoursmtpserver tag 999999 +pending > bts --smtp-host=yoursmtpserver tag 999999 +pending
@ -249,7 +249,7 @@ from git clone dir and make link to git.
* If local branch upstream and pristine-tar does not exists, create it * If local branch upstream and pristine-tar does not exists, create it
from origin/upstream and origin/pristine. from origin/upstream and origin/pristine.
* If new upstream is available onto sourceforge, launch: * When new upstream is available onto sourceforge, launch:
> debian/get-orig-source.sh > debian/get-orig-source.sh
If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VERIFY_HOSTNAME=0" to solve this. If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VERIFY_HOSTNAME=0" to solve this.
@ -273,8 +273,8 @@ Note: If there was errors solved manually after get-orig-sources.sh, you may nee
* Fix debian/* files used to build package. * Fix debian/* files used to build package.
Add an entry into debian/changelog Add an entry into debian/changelog
> dch -v x.y.z+dfsgw-v "My comment" will add entry. > dch -v x.y.z+dfsgw-v "My comment" will add entry.
For example: dch -v x.y.z+dfsgw-1 "New upstream release." for a new version (x.y.z = version, w start from 1 and increaed for each new import) For example: dch -v x.y.z+dfsgw-1 "New upstream release." for a new version (x.y.z = version, w start from 1 and increased for each new import)
Then modify changelog to replace "version" or "unstable" with "UNRELEASED". Then check/modify changelog to replace "version" or "unstable" with "UNRELEASED".
Then check/modify also the user/date signature: Then check/modify also the user/date signature:
- Date must have format reported by "date -R" - Date must have format reported by "date -R"
- Name and email must match value into debian/control file (Entry added here is used by next step). - Name and email must match value into debian/control file (Entry added here is used by next step).
@ -299,7 +299,7 @@ Note: Package is built into directory ../build-area
* If package .deb is ok: * If package .deb is ok:
Note: If there was errors managed manually, you may need to make a git commit but do not use option "amend" previous commit Note: If there was errors managed manually, you may need to make a git commit but do not use option "amend" previous commit
> git push --all ou git push origin --all > git push --all
* If ok, you can tag. * If ok, you can tag.
> Edit debian/changelog to replace "UNRELEASED" into "unstable", then push > Edit debian/changelog to replace "UNRELEASED" into "unstable", then push

2
htdocs/core/boxes/box_contacts.php
View File

@ -105,7 +105,7 @@ class box_contacts extends ModeleBoxes
$this->info_box_contents[$line][] = array( $this->info_box_contents[$line][] = array(
'td' => 'align="left"', 'td' => 'align="left"',
'text' => $societestatic->getNomUrl(1), 'text' => ($objp->fk_soc > 0 ? $societestatic->getNomUrl(1) : ''),
'asis' => 1, 'asis' => 1,
); );