diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php index 60779d92ab3..4d1a0341b5a 100644 --- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php +++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php @@ -27,7 +27,7 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; echo '
'; print_titre($langs->trans('RelatedCommercialProposals')); ?> - +
diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php index 9823a2b7f53..8b169a90f3b 100644 --- a/htdocs/commande/tpl/linkedobjectblock.tpl.php +++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php @@ -29,7 +29,7 @@ echo '
'; print_titre($langs->trans('RelatedOrders')); ?> -
trans("Ref"); ?> trans('RefCustomer'); ?>
+
diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php index a4cd0a7cf30..eeaf57341a0 100644 --- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php +++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php @@ -29,7 +29,7 @@ echo '
'; if ($num > 1) print_titre($langs->trans("RelatedBills")); else print_titre($langs->trans("RelatedBill")); ?> -
trans("Ref"); ?> trans("Date"); ?>
+
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php index 78565b9f25b..78e03875100 100644 --- a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php +++ b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php @@ -36,7 +36,7 @@ echo $this->control->tpl['ajax_selectcountry']; ?> -
trans("Ref"); ?> trans("Date"); ?>
+
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php index 2ba3716dc6d..cf8ac2d8b3e 100644 --- a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php +++ b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php @@ -44,7 +44,7 @@ echo $this->control->tpl['ajax_selectcountry']; -
trans("Lastname").' / '.$langs->trans("Label"); ?>
+
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php index 53531c72d0e..fe878bf95f0 100644 --- a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php +++ b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php @@ -29,7 +29,7 @@ dol_htmloutput_errors($this->control->tpl['error'],$this->control->tpl['errors'] control->tpl['action_create_user']) echo $this->control->tpl['action_create_user']; ?> control->tpl['action_delete']) echo $this->control->tpl['action_delete']; ?> -
trans("Ref"); ?>
+
diff --git a/htdocs/contrat/tpl/linkedobjectblock.tpl.php b/htdocs/contrat/tpl/linkedobjectblock.tpl.php index c05ad0aeb13..3b19e505783 100644 --- a/htdocs/contrat/tpl/linkedobjectblock.tpl.php +++ b/htdocs/contrat/tpl/linkedobjectblock.tpl.php @@ -28,7 +28,7 @@ $langs->load("contracts"); echo '
'; print_titre($langs->trans('RelatedContracts')); ?> -
trans("Ref"); ?>
+
diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php index 7a19ea1e234..654f8a9aefa 100644 --- a/htdocs/fourn/class/fournisseur.class.php +++ b/htdocs/fourn/class/fournisseur.class.php @@ -89,7 +89,7 @@ class Fournisseur extends Societe function nbOfProductRefs() { global $conf; - + $sql = "SELECT count(pfp.rowid) as nb"; $sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp"; $sql.= " WHERE pfp.entity = ".$conf->entity; @@ -213,18 +213,6 @@ class Fournisseur extends Societe return $arr; } - /** - * Return a link on thirdparty (with picto) - * - * @param int $withpicto Add picto into link (0=No picto, 1=Include picto with link, 2=Picto only) - * @param string $option Target of link ('', 'customer', 'prospect', 'supplier') - * @param int $maxlen Max length of text - * @return string String with URL - */ - function getNomUrl($withpicto=0,$option='supplier',$maxlen=0) - { - return parent::getNomUrl($withpicto,$option,$maxlen); - } } ?> diff --git a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php index eb560b9bb58..029f7e30d3d 100755 --- a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php +++ b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php @@ -28,7 +28,7 @@ $langs->load("orders"); echo '
'; print_titre($langs->trans('RelatedOrders')); ?> -
trans("Ref"); ?> trans("Date"); ?>
+
diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php index 572fc636113..205d75eade1 100755 --- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php +++ b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php @@ -29,7 +29,7 @@ echo '
'; if ($num > 1) print_titre($langs->trans("RelatedBills")); else print_titre($langs->trans("RelatedBill")); ?> -
trans("Ref"); ?> trans("Date"); ?>
+
diff --git a/htdocs/product/canvas/product/tpl/card_create.tpl.php b/htdocs/product/canvas/product/tpl/card_create.tpl.php index 14bbb83e03c..a641d49f01d 100755 --- a/htdocs/product/canvas/product/tpl/card_create.tpl.php +++ b/htdocs/product/canvas/product/tpl/card_create.tpl.php @@ -29,7 +29,7 @@ -
trans("Ref"); ?> trans("Date"); ?>
+
@@ -100,7 +100,7 @@ global->PRODUIT_MULTIPRICES) { ?> -
trans("Ref"); ?>
+
trans("SellingPrice"); ?> diff --git a/htdocs/product/canvas/product/tpl/card_edit.tpl.php b/htdocs/product/canvas/product/tpl/card_edit.tpl.php index c8865a19262..eb4763ee435 100755 --- a/htdocs/product/canvas/product/tpl/card_edit.tpl.php +++ b/htdocs/product/canvas/product/tpl/card_edit.tpl.php @@ -32,7 +32,7 @@ dol_htmloutput_errors($this->control->tpl['error'],$this->control->tpl['errors'] - +
diff --git a/htdocs/product/canvas/product/tpl/card_view.tpl.php b/htdocs/product/canvas/product/tpl/card_view.tpl.php index 8b03e20c66c..f6cb1470bf4 100755 --- a/htdocs/product/canvas/product/tpl/card_view.tpl.php +++ b/htdocs/product/canvas/product/tpl/card_view.tpl.php @@ -22,7 +22,7 @@ control->tpl['error'],$this->control->tpl['errors']); ?> -
trans("Ref"); ?>
+
diff --git a/htdocs/product/canvas/product/tpl/list.tpl.php b/htdocs/product/canvas/product/tpl/list.tpl.php index 7b70635c34c..60688904e62 100755 --- a/htdocs/product/canvas/product/tpl/list.tpl.php +++ b/htdocs/product/canvas/product/tpl/list.tpl.php @@ -19,7 +19,7 @@ -
trans("Ref"); ?>
+
@@ -38,7 +38,7 @@ - +
@@ -59,9 +59,9 @@ - + - + > -
+
@@ -73,7 +73,7 @@ global->PRODUIT_MULTIPRICES) { ?> -
trans("Ref"); ?>
+
trans("SellingPrice"); ?> diff --git a/htdocs/product/canvas/service/tpl/card_edit.tpl.php b/htdocs/product/canvas/service/tpl/card_edit.tpl.php index 7522e49fde7..8087f4faf51 100755 --- a/htdocs/product/canvas/service/tpl/card_edit.tpl.php +++ b/htdocs/product/canvas/service/tpl/card_edit.tpl.php @@ -32,7 +32,7 @@ - +
diff --git a/htdocs/product/canvas/service/tpl/card_view.tpl.php b/htdocs/product/canvas/service/tpl/card_view.tpl.php index bac35c05d10..c6b63d4f547 100755 --- a/htdocs/product/canvas/service/tpl/card_view.tpl.php +++ b/htdocs/product/canvas/service/tpl/card_view.tpl.php @@ -22,7 +22,7 @@ control->tpl['error'],$this->control->tpl['errors']); ?> -
trans("Ref"); ?>
+
diff --git a/htdocs/product/canvas/service/tpl/list.tpl.php b/htdocs/product/canvas/service/tpl/list.tpl.php index 7350e0cd1ba..dc98dac224a 100644 --- a/htdocs/product/canvas/service/tpl/list.tpl.php +++ b/htdocs/product/canvas/service/tpl/list.tpl.php @@ -19,7 +19,7 @@ -
trans("Ref"); ?>
+
@@ -38,7 +38,7 @@ - +
@@ -59,9 +59,9 @@ - + - + > -
+
diff --git a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php index 22ea8a64594..a74bb2e6278 100644 --- a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php +++ b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php @@ -40,7 +40,7 @@ dol_htmloutput_errors($this->control->tpl['error'],$this->control->tpl['errors'] -
trans('ThirdPartyName'); ?>
+
diff --git a/htdocs/societe/canvas/company/tpl/card_view.tpl.php b/htdocs/societe/canvas/company/tpl/card_view.tpl.php index 033bba3a773..a632b9cac7a 100644 --- a/htdocs/societe/canvas/company/tpl/card_view.tpl.php +++ b/htdocs/societe/canvas/company/tpl/card_view.tpl.php @@ -33,7 +33,7 @@ dol_fiche_head($head, 'card', $langs->trans("ThirdParty"),0,'company'); control->tpl['action_delete']) echo $this->control->tpl['action_delete']; ?> control->tpl['js_checkVatPopup']) echo $this->control->tpl['js_checkVatPopup']; ?> -
trans('ThirdPartyName'); ?>
+
@@ -173,7 +173,7 @@ for ($i=1; $i<=4; $i++) {
trans('ThirdPartyName'); ?>
- +
trans('RIB'); ?> @@ -191,7 +191,7 @@ for ($i=1; $i<=4; $i++) {
- +
trans('ParentCompany'); ?> @@ -209,7 +209,7 @@ for ($i=1; $i<=4; $i++) {
- +
trans('SalesRepresentatives'); ?> @@ -256,8 +256,8 @@ for ($i=1; $i<=4; $i++) {
-
- +
+
control->tpl['error'],$this->control->tpl['errors'] - +
diff --git a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php index 38b41e45b37..5f4fdf1edc5 100644 --- a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php +++ b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php @@ -37,7 +37,7 @@ dol_htmloutput_errors($this->control->tpl['error'],$this->control->tpl['errors'] -
trans('LastName'); ?>
+
diff --git a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php index 78396bbc4a4..51c1ae32ae2 100644 --- a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php +++ b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php @@ -32,7 +32,7 @@ dol_fiche_head($head, 'card', $langs->trans("ThirdParty"),0,'company'); control->tpl['error']) echo $this->control->tpl['error']; ?> control->tpl['action_delete']) echo $this->control->tpl['action_delete']; ?> -
trans('Name'); ?>
+
@@ -132,7 +132,7 @@ dol_fiche_head($head, 'card', $langs->trans("ThirdParty"),0,'company');
trans('Name'); ?>
- +
trans('RIB'); ?> @@ -150,7 +150,7 @@ dol_fiche_head($head, 'card', $langs->trans("ThirdParty"),0,'company');
- +
trans('SalesRepresentatives'); ?> @@ -197,9 +197,8 @@ dol_fiche_head($head, 'card', $langs->trans("ThirdParty"),0,'company');
-
- - +
+
"); diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php index e0557e7565e..943584727bd 100644 --- a/htdocs/theme/cameleo/style.css.php +++ b/htdocs/theme/cameleo/style.css.php @@ -1195,6 +1195,10 @@ span.butAction, span.butActionDelete { /* Tables */ /* ============================================================================== */ +.allwidth { + width: 100%; +} + /* #undertopmenu { background-image: url(""); diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 8b63587f697..483353e019d 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1306,6 +1306,9 @@ span.butAction, span.butActionDelete { /* Tables */ /* ============================================================================== */ +.allwidth { + width: 100%; +} #undertopmenu { /* background-image: url(""); */