diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
index 95b3fc0f1792acaa4acefaf51a58e7fff1b4e9da..f805e7cf470c4c4786d79cf467b9169c7ef6d994 100755
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -165,7 +165,6 @@ done >>%{name}.lang
%_datadir/dolibarr/htdocs/categories
%_datadir/dolibarr/htdocs/comm
%_datadir/dolibarr/htdocs/commande
-%_datadir/dolibarr/htdocs/commissions
%_datadir/dolibarr/htdocs/compta
%_datadir/dolibarr/htdocs/conf
%_datadir/dolibarr/htdocs/contact
@@ -187,8 +186,10 @@ done >>%{name}.lang
%_datadir/dolibarr/htdocs/livraison
%_datadir/dolibarr/htdocs/mailmanspip
%_datadir/dolibarr/htdocs/margin
+%_datadir/dolibarr/htdocs/opensurvey
%_datadir/dolibarr/htdocs/paybox
%_datadir/dolibarr/htdocs/paypal
+%_datadir/dolibarr/htdocs/printipp
%_datadir/dolibarr/htdocs/product
%_datadir/dolibarr/htdocs/projet
%_datadir/dolibarr/htdocs/public
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index cee4ab9f6ec64d8028bcf319c1909d5dff699cf1..1961ebbf16187b8643073b61746d718ecb4a2b77 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -241,7 +241,6 @@ done >>%{name}.lang
%_datadir/dolibarr/htdocs/categories
%_datadir/dolibarr/htdocs/comm
%_datadir/dolibarr/htdocs/commande
-%_datadir/dolibarr/htdocs/commissions
%_datadir/dolibarr/htdocs/compta
%_datadir/dolibarr/htdocs/conf
%_datadir/dolibarr/htdocs/contact
@@ -263,8 +262,10 @@ done >>%{name}.lang
%_datadir/dolibarr/htdocs/livraison
%_datadir/dolibarr/htdocs/mailmanspip
%_datadir/dolibarr/htdocs/margin
+%_datadir/dolibarr/htdocs/opensurvey
%_datadir/dolibarr/htdocs/paybox
%_datadir/dolibarr/htdocs/paypal
+%_datadir/dolibarr/htdocs/printipp
%_datadir/dolibarr/htdocs/product
%_datadir/dolibarr/htdocs/projet
%_datadir/dolibarr/htdocs/public
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
index 62758af82b48dff7cbe1e078881c66fb22b5a60f..9c36baf79d92cb9412db809d4a1463ee4ed7530d 100755
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -162,7 +162,6 @@ done >>%{name}.lang
%_datadir/dolibarr/htdocs/categories
%_datadir/dolibarr/htdocs/comm
%_datadir/dolibarr/htdocs/commande
-%_datadir/dolibarr/htdocs/commissions
%_datadir/dolibarr/htdocs/compta
%_datadir/dolibarr/htdocs/conf
%_datadir/dolibarr/htdocs/contact
@@ -184,8 +183,10 @@ done >>%{name}.lang
%_datadir/dolibarr/htdocs/livraison
%_datadir/dolibarr/htdocs/mailmanspip
%_datadir/dolibarr/htdocs/margin
+%_datadir/dolibarr/htdocs/opensurvey
%_datadir/dolibarr/htdocs/paybox
%_datadir/dolibarr/htdocs/paypal
+%_datadir/dolibarr/htdocs/printipp
%_datadir/dolibarr/htdocs/product
%_datadir/dolibarr/htdocs/projet
%_datadir/dolibarr/htdocs/public
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
index eb2bbc859f436cd306fe53f3764083e79728e899..99f7c94a9861343737e935d4b8afded6b59e403b 100755
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -173,7 +173,6 @@ done >>%{name}.lang
%_datadir/dolibarr/htdocs/categories
%_datadir/dolibarr/htdocs/comm
%_datadir/dolibarr/htdocs/commande
-%_datadir/dolibarr/htdocs/commissions
%_datadir/dolibarr/htdocs/compta
%_datadir/dolibarr/htdocs/conf
%_datadir/dolibarr/htdocs/contact
@@ -195,8 +194,10 @@ done >>%{name}.lang
%_datadir/dolibarr/htdocs/livraison
%_datadir/dolibarr/htdocs/mailmanspip
%_datadir/dolibarr/htdocs/margin
+%_datadir/dolibarr/htdocs/opensurvey
%_datadir/dolibarr/htdocs/paybox
%_datadir/dolibarr/htdocs/paypal
+%_datadir/dolibarr/htdocs/printipp
%_datadir/dolibarr/htdocs/product
%_datadir/dolibarr/htdocs/projet
%_datadir/dolibarr/htdocs/public
diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php
index a628ee02d3e980de292cf2f9f8cc4f1dafbbd834..e7e2c01372d0c7195c777dfddd030b0011c3e853 100644
--- a/htdocs/core/modules/syslog/mod_syslog_file.php
+++ b/htdocs/core/modules/syslog/mod_syslog_file.php
@@ -96,17 +96,9 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
/**
* Return the parsed logfile path
*
-<<<<<<< HEAD
* @param string $suffixinfilename When output is a file, append this suffix into default log filename.
* @return string
-=======
-<<<<<<< OURS
* @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='')
{
diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
index b922617ef31fe2f7d91d426585786724097758bd..35ef2cfb386d781c612531e8ce1af78a21c12436 100644
--- a/htdocs/langs/en_US/users.lang
+++ b/htdocs/langs/en_US/users.lang
@@ -115,4 +115,5 @@ YourQuotaOfUsersIsReached=Your quota of active users is reached !
NbOfUsers=Nb of users
DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
HierarchicalResponsible=Hierarchical responsible
-HierarchicView=Hierarchical view
\ No newline at end of file
+HierarchicView=Hierarchical view
+UseTypeFieldToChange=Use field Type to change
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang
index 2b6e398d0350d58e30829c44761dfe3dbe20c431..bb5b7fb608b48f45f74dbbc89fe61c7144359aeb 100644
--- a/htdocs/langs/fr_FR/users.lang
+++ b/htdocs/langs/fr_FR/users.lang
@@ -115,4 +115,5 @@ YourQuotaOfUsersIsReached=Votre quota d'utilisateurs actifs est atteint !
NbOfUsers=Nb d'utilisateurs
DontDowngradeSuperAdmin=Seul un superadmin peut rétrograder un superadmin
HierarchicalResponsible=Responsable hierarchique
-HierarchicView=Vue hiérarchique
\ No newline at end of file
+HierarchicView=Vue hiérarchique
+UseTypeFieldToChange=Modifier le champ Type pour changer
\ No newline at end of file
diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php
index 8f190c664e09a2fa376bfaadd866fc3c12663871..deb5485aa396db6447303e7c01266c1dec337a5d 100755
--- a/htdocs/theme/amarok/style.css.php
+++ b/htdocs/theme/amarok/style.css.php
@@ -577,7 +577,7 @@ div.vmenu {
.blockvmenupair .menu_titre, .blockvmenuimpair .menu_titre {
height:22px;
line-height:22px;
- text-align:center;
+ /* text-align:center; */
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:-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(1, rgba(0,0,0,.3))
);
- padding-left:3px;
+ padding-left:5px;
border-top:solid 1px rgba(255,255,255,.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);
border: none;
}
-div.ui-controlgroup-horizontal
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;
}
+
<?php
if (is_object($db)) $db->close();
?>
diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php
index 38129cbb0f80dd6669dae18850d749225890b139..bf9b9c7aeeede4bdc1b80ba1795c22544ae095cf 100644
--- a/htdocs/theme/auguria/style.css.php
+++ b/htdocs/theme/auguria/style.css.php
@@ -2202,6 +2202,17 @@ div.ecmjqft {
box-shadow: 0px 0px 10px #AAA;
}
+
+/* ============================================================================== */
+/* JMobile */
+/* ============================================================================== */
+
+.ui-body-c {
+ border: none;
+ text-shadow: none;
+}
+
+
<?php
if (is_object($db)) $db->close();
?>
diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php
index 0becc3f023422f810b58eac4b4b1e690c1ac8ba1..5bf68effb410c6a7b9d8f1beabccaca7604d27ce 100644
--- a/htdocs/theme/bureau2crea/style.css.php
+++ b/htdocs/theme/bureau2crea/style.css.php
@@ -1107,7 +1107,6 @@ div.tabs a.tab {
color: #FFFFFF;
text-decoration: none;
position: relative;
- float: left;
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
if (is_object($db)) $db->close();
?>
diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php
index fad419cf9228fdf6b41bbcfd16533724fc1b83b1..a1e3e7a44c9344bfb7e2686d3b88d25c85dc46b3 100644
--- a/htdocs/theme/cameleo/style.css.php
+++ b/htdocs/theme/cameleo/style.css.php
@@ -2247,6 +2247,17 @@ div.ecmjqft {
}
+
+/* ============================================================================== */
+/* JMobile */
+/* ============================================================================== */
+
+.ui-body-c {
+ border: none;
+ text-shadow: none;
+}
+
+
<?php
if (is_object($db)) $db->close();
?>
diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 98d3e85d343d37b30767c8f72793386f65cf2db5..275fd83f1a5c1c2cf08ef5941e34cface35bd899 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -1848,6 +1848,7 @@ else
{
print $langs->trans("ThisUserIsNot");
}
+ print ' ('.$langs->trans("UseTypeFieldToChange").')';
print '</td>';
print "</tr>\n";
}