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

Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
fhenry 2013-04-24 15:07:03 +02:00
commit 41c8a9aa6a
12 changed files with 70 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/rpm/dolibarr_fedora.spec
View File

@ -165,7 +165,6 @@ done >>%{name}.lang
%_datadir/dolibarr/htdocs/categories %_datadir/dolibarr/htdocs/categories
%_datadir/dolibarr/htdocs/comm %_datadir/dolibarr/htdocs/comm
%_datadir/dolibarr/htdocs/commande %_datadir/dolibarr/htdocs/commande
%_datadir/dolibarr/htdocs/commissions
%_datadir/dolibarr/htdocs/compta %_datadir/dolibarr/htdocs/compta
%_datadir/dolibarr/htdocs/conf %_datadir/dolibarr/htdocs/conf
%_datadir/dolibarr/htdocs/contact %_datadir/dolibarr/htdocs/contact
@ -187,8 +186,10 @@ done >>%{name}.lang
%_datadir/dolibarr/htdocs/livraison %_datadir/dolibarr/htdocs/livraison
%_datadir/dolibarr/htdocs/mailmanspip %_datadir/dolibarr/htdocs/mailmanspip
%_datadir/dolibarr/htdocs/margin %_datadir/dolibarr/htdocs/margin
%_datadir/dolibarr/htdocs/opensurvey
%_datadir/dolibarr/htdocs/paybox %_datadir/dolibarr/htdocs/paybox
%_datadir/dolibarr/htdocs/paypal %_datadir/dolibarr/htdocs/paypal
%_datadir/dolibarr/htdocs/printipp
%_datadir/dolibarr/htdocs/product %_datadir/dolibarr/htdocs/product
%_datadir/dolibarr/htdocs/projet %_datadir/dolibarr/htdocs/projet
%_datadir/dolibarr/htdocs/public %_datadir/dolibarr/htdocs/public

3
build/rpm/dolibarr_generic.spec
View File

@ -241,7 +241,6 @@ done >>%{name}.lang
%_datadir/dolibarr/htdocs/categories %_datadir/dolibarr/htdocs/categories
%_datadir/dolibarr/htdocs/comm %_datadir/dolibarr/htdocs/comm
%_datadir/dolibarr/htdocs/commande %_datadir/dolibarr/htdocs/commande
%_datadir/dolibarr/htdocs/commissions
%_datadir/dolibarr/htdocs/compta %_datadir/dolibarr/htdocs/compta
%_datadir/dolibarr/htdocs/conf %_datadir/dolibarr/htdocs/conf
%_datadir/dolibarr/htdocs/contact %_datadir/dolibarr/htdocs/contact
@ -263,8 +262,10 @@ done >>%{name}.lang
%_datadir/dolibarr/htdocs/livraison %_datadir/dolibarr/htdocs/livraison
%_datadir/dolibarr/htdocs/mailmanspip %_datadir/dolibarr/htdocs/mailmanspip
%_datadir/dolibarr/htdocs/margin %_datadir/dolibarr/htdocs/margin
%_datadir/dolibarr/htdocs/opensurvey
%_datadir/dolibarr/htdocs/paybox %_datadir/dolibarr/htdocs/paybox
%_datadir/dolibarr/htdocs/paypal %_datadir/dolibarr/htdocs/paypal
%_datadir/dolibarr/htdocs/printipp
%_datadir/dolibarr/htdocs/product %_datadir/dolibarr/htdocs/product
%_datadir/dolibarr/htdocs/projet %_datadir/dolibarr/htdocs/projet
%_datadir/dolibarr/htdocs/public %_datadir/dolibarr/htdocs/public

3
build/rpm/dolibarr_mandriva.spec
View File

@ -162,7 +162,6 @@ done >>%{name}.lang
%_datadir/dolibarr/htdocs/categories %_datadir/dolibarr/htdocs/categories
%_datadir/dolibarr/htdocs/comm %_datadir/dolibarr/htdocs/comm
%_datadir/dolibarr/htdocs/commande %_datadir/dolibarr/htdocs/commande
%_datadir/dolibarr/htdocs/commissions
%_datadir/dolibarr/htdocs/compta %_datadir/dolibarr/htdocs/compta
%_datadir/dolibarr/htdocs/conf %_datadir/dolibarr/htdocs/conf
%_datadir/dolibarr/htdocs/contact %_datadir/dolibarr/htdocs/contact
@ -184,8 +183,10 @@ done >>%{name}.lang
%_datadir/dolibarr/htdocs/livraison %_datadir/dolibarr/htdocs/livraison
%_datadir/dolibarr/htdocs/mailmanspip %_datadir/dolibarr/htdocs/mailmanspip
%_datadir/dolibarr/htdocs/margin %_datadir/dolibarr/htdocs/margin
%_datadir/dolibarr/htdocs/opensurvey
%_datadir/dolibarr/htdocs/paybox %_datadir/dolibarr/htdocs/paybox
%_datadir/dolibarr/htdocs/paypal %_datadir/dolibarr/htdocs/paypal
%_datadir/dolibarr/htdocs/printipp
%_datadir/dolibarr/htdocs/product %_datadir/dolibarr/htdocs/product
%_datadir/dolibarr/htdocs/projet %_datadir/dolibarr/htdocs/projet
%_datadir/dolibarr/htdocs/public %_datadir/dolibarr/htdocs/public

3
build/rpm/dolibarr_opensuse.spec
View File

@ -173,7 +173,6 @@ done >>%{name}.lang
%_datadir/dolibarr/htdocs/categories %_datadir/dolibarr/htdocs/categories
%_datadir/dolibarr/htdocs/comm %_datadir/dolibarr/htdocs/comm
%_datadir/dolibarr/htdocs/commande %_datadir/dolibarr/htdocs/commande
%_datadir/dolibarr/htdocs/commissions
%_datadir/dolibarr/htdocs/compta %_datadir/dolibarr/htdocs/compta
%_datadir/dolibarr/htdocs/conf %_datadir/dolibarr/htdocs/conf
%_datadir/dolibarr/htdocs/contact %_datadir/dolibarr/htdocs/contact
@ -195,8 +194,10 @@ done >>%{name}.lang
%_datadir/dolibarr/htdocs/livraison %_datadir/dolibarr/htdocs/livraison
%_datadir/dolibarr/htdocs/mailmanspip %_datadir/dolibarr/htdocs/mailmanspip
%_datadir/dolibarr/htdocs/margin %_datadir/dolibarr/htdocs/margin
%_datadir/dolibarr/htdocs/opensurvey
%_datadir/dolibarr/htdocs/paybox %_datadir/dolibarr/htdocs/paybox
%_datadir/dolibarr/htdocs/paypal %_datadir/dolibarr/htdocs/paypal
%_datadir/dolibarr/htdocs/printipp
%_datadir/dolibarr/htdocs/product %_datadir/dolibarr/htdocs/product
%_datadir/dolibarr/htdocs/projet %_datadir/dolibarr/htdocs/projet
%_datadir/dolibarr/htdocs/public %_datadir/dolibarr/htdocs/public

8
htdocs/core/modules/syslog/mod_syslog_file.php
View File

@ -96,17 +96,9 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
/** /**
* Return the parsed logfile path * Return the parsed logfile path
* *
<<<<<<< HEAD
* @param string $suffixinfilename When output is a file, append this suffix into default log filename. * @param string $suffixinfilename When output is a file, append this suffix into default log filename.
* @return string * @return string
=======
<<<<<<< OURS
* @return string * @return string
=======
* @param string $suffixinfilename When output is a file, append this suffix into default log filename.
* @return string
>>>>>>> THEIRS
>>>>>>> refs/remotes/origin/3.3
*/ */
private function getFilename($suffixinfilename='') private function getFilename($suffixinfilename='')
{ {

1
htdocs/langs/en_US/users.lang
View File

@ -116,3 +116,4 @@ NbOfUsers=Nb of users
DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
HierarchicalResponsible=Hierarchical responsible HierarchicalResponsible=Hierarchical responsible
HierarchicView=Hierarchical view HierarchicView=Hierarchical view
UseTypeFieldToChange=Use field Type to change

1
htdocs/langs/fr_FR/users.lang
View File

@ -116,3 +116,4 @@ NbOfUsers=Nb d'utilisateurs
DontDowngradeSuperAdmin=Seul un superadmin peut rétrograder un superadmin DontDowngradeSuperAdmin=Seul un superadmin peut rétrograder un superadmin
HierarchicalResponsible=Responsable hierarchique HierarchicalResponsible=Responsable hierarchique
HierarchicView=Vue hiérarchique HierarchicView=Vue hiérarchique
UseTypeFieldToChange=Modifier le champ Type pour changer

6
htdocs/theme/amarok/style.css.php
View File

@ -577,7 +577,7 @@ div.vmenu {
.blockvmenupair .menu_titre, .blockvmenuimpair .menu_titre { .blockvmenupair .menu_titre, .blockvmenuimpair .menu_titre {
height:22px; height:22px;
line-height:22px; line-height:22px;
text-align:center; /* text-align:center; */
background-color:rgba(0,0,0,.08); background-color:rgba(0,0,0,.08);
background-image:linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); background-image:linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
background-image:-o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); background-image:-o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
@ -591,7 +591,7 @@ div.vmenu {
color-stop(0, rgba(255,255,255,.3)), color-stop(0, rgba(255,255,255,.3)),
color-stop(1, rgba(0,0,0,.3)) color-stop(1, rgba(0,0,0,.3))
); );
padding-left:3px; padding-left:5px;
border-top:solid 1px rgba(255,255,255,.5); border-top:solid 1px rgba(255,255,255,.5);
border-bottom:solid 1px rgba(0,0,0,.5); border-bottom:solid 1px rgba(0,0,0,.5);
} }
@ -2047,7 +2047,6 @@ div.ui-controlgroup-controls div.tabsElem a
box-shadow: 0 -3px 6px rgba(0,0,0,.2); box-shadow: 0 -3px 6px rgba(0,0,0,.2);
border: none; border: none;
} }
div.ui-controlgroup-horizontal
a.tab span.ui-btn-inner, a.tab span.ui-btn-inner span.ui-btn-text a.tab span.ui-btn-inner, a.tab span.ui-btn-inner span.ui-btn-text
{ {
@ -2072,6 +2071,7 @@ div.tabsElem a.ui-btn-corner-all {
border-bottom-right-radius: 0px; border-bottom-right-radius: 0px;
} }
<?php <?php
if (is_object($db)) $db->close(); if (is_object($db)) $db->close();
?> ?>

11
htdocs/theme/auguria/style.css.php
View File

@ -2202,6 +2202,17 @@ div.ecmjqft {
box-shadow: 0px 0px 10px #AAA; box-shadow: 0px 0px 10px #AAA;
} }
/* ============================================================================== */
/* JMobile */
/* ============================================================================== */
.ui-body-c {
border: none;
text-shadow: none;
}
<?php <?php
if (is_object($db)) $db->close(); if (is_object($db)) $db->close();
?> ?>

33
htdocs/theme/bureau2crea/style.css.php
View File

@ -1107,7 +1107,6 @@ div.tabs a.tab {
color: #FFFFFF; color: #FFFFFF;
text-decoration: none; text-decoration: none;
position: relative; position: relative;
float: left;
padding: 0px 10px 0px 10px; padding: 0px 10px 0px 10px;
} }
@ -2421,6 +2420,38 @@ div.ecmjqft {
} }
/* ============================================================================== */
/* JMobile */
/* ============================================================================== */
.ui-btn-inner {
padding-left: 10px;
padding-right: 10px;
white-space: normal;
}
div.ui-controlgroup-controls div.tabsElem, div.ui-controlgroup-controls div.tabsElem a.tab
{
height: 22px;
}
a.tab span.ui-btn-inner
{
border: none;
padding: 0;
}
div.tabs a.tab#active span.ui-btn-inner, div.tabs a.tab#active span.ui-btn-text, div.tabs a.tab span.ui-btn-inner, div.tabs a.tab span.ui-btn-text {
background-image: none;
color: #D45416;
height: 22px
}
.ui-body-c {
border: none;
text-shadow: none;
}
<?php <?php
if (is_object($db)) $db->close(); if (is_object($db)) $db->close();
?> ?>

11
htdocs/theme/cameleo/style.css.php
View File

@ -2247,6 +2247,17 @@ div.ecmjqft {
} }
/* ============================================================================== */
/* JMobile */
/* ============================================================================== */
.ui-body-c {
border: none;
text-shadow: none;
}
<?php <?php
if (is_object($db)) $db->close(); if (is_object($db)) $db->close();
?> ?>

1
htdocs/user/fiche.php
View File

@ -1848,6 +1848,7 @@ else
{ {
print $langs->trans("ThisUserIsNot"); print $langs->trans("ThisUserIsNot");
} }
print ' ('.$langs->trans("UseTypeFieldToChange").')';
print '</td>'; print '</td>';
print "</tr>\n"; print "</tr>\n";
} }