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

Fix: Some fix into the canvas for companies.

Browse Source
This commit is contained in:
Laurent Destailleur 2012-05-30 11:21:42 +02:00
parent ebf77e8c92
commit fb4d62c34a
7 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/societe/canvas/actions_card_common.class.php
View File

@ -384,6 +384,7 @@ abstract class ActionsCardCommon
} }
$this->tpl['error'] = get_htmloutput_errors($this->object->error,$this->object->errors); $this->tpl['error'] = get_htmloutput_errors($this->object->error,$this->object->errors);
if (is_array($GLOBALS['errors'])) $this->tpl['error'] = get_htmloutput_mesg('',$GLOBALS['errors'],'error');
if ($action == 'create') if ($action == 'create')
{ {

4
htdocs/societe/canvas/company/actions_card_company.class.php
View File

@ -105,9 +105,9 @@ class ActionsCardCompany extends ActionsCardCommon
parent::assign_values($action); parent::assign_values($action);
$this->tpl['title'] = $this->getTitle($action); $this->tpl['title'] = load_fiche_titre($this->getTitle($action));
$this->tpl['profid1'] = $this->object->idprof1; $this->tpl['profid1'] = $this->object->idprof1;
$this->tpl['profid2'] = $this->object->idprof2; $this->tpl['profid2'] = $this->object->idprof2;
$this->tpl['profid3'] = $this->object->idprof3; $this->tpl['profid3'] = $this->object->idprof3;
$this->tpl['profid4'] = $this->object->idprof4; $this->tpl['profid4'] = $this->object->idprof4;

7
htdocs/societe/canvas/company/tpl/card_create.tpl.php
View File

@ -1,5 +1,6 @@
<?php <?php
/* Copyright (C) 2010 Regis Houssin <regis@dolibarr.fr> /* Copyright (C) 2010 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2010-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -19,9 +20,9 @@
<!-- BEGIN PHP TEMPLATE CARD_CREATE.TPL.PHP COMPANY --> <!-- BEGIN PHP TEMPLATE CARD_CREATE.TPL.PHP COMPANY -->
<?php print_fiche_titre($this->control->tpl['title']); ?> <?php echo $this->control->tpl['title']; ?>
<?php dol_htmloutput_errors($this->control->tpl['error'],$this->control->tpl['errors']); ?> <?php echo $this->control->tpl['error']; ?>
<?php if ($conf->use_javascript_ajax) { ?> <?php if ($conf->use_javascript_ajax) { ?>
<?php echo $this->control->tpl['ajax_selecttype']; ?> <?php echo $this->control->tpl['ajax_selecttype']; ?>

9
htdocs/societe/canvas/company/tpl/card_edit.tpl.php
View File

@ -1,5 +1,6 @@
<?php <?php
/* Copyright (C) 2010 Regis Houssin <regis@dolibarr.fr> /* Copyright (C) 2010 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2010-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -22,11 +23,9 @@ $contact = $GLOBALS['objcanvas']->control->object;
<!-- BEGIN PHP TEMPLATE CARD_EDIT.TPL.PHP COMPANY --> <!-- BEGIN PHP TEMPLATE CARD_EDIT.TPL.PHP COMPANY -->
<?php <?php echo $this->control->tpl['title']; ?>
print_fiche_titre($this->control->tpl['title']);
dol_htmloutput_errors($this->control->tpl['error'],$this->control->tpl['errors']); <?php echo $this->control->tpl['error']; ?>
?>
<?php echo $this->control->tpl['ajax_selectcountry']; ?> <?php echo $this->control->tpl['ajax_selectcountry']; ?>
<?php if ($this->control->tpl['js_checkVatPopup']) echo $this->control->tpl['js_checkVatPopup']; ?> <?php if ($this->control->tpl['js_checkVatPopup']) echo $this->control->tpl['js_checkVatPopup']; ?>

6
htdocs/societe/canvas/individual/actions_card_individual.class.php
View File

@ -65,8 +65,8 @@ class ActionsCardIndividual extends ActionsCardCommon
$out=''; $out='';
if ($action == 'view') $out.= $langs->trans("Individual"); if ($action == 'view') $out.= $langs->trans("Individual");
if ($action == 'edit') $out.= $langs->trans("EditIndividual"); if ($action == 'edit') $out.= $langs->trans("EditCompany");
if ($action == 'create') $out.= $langs->trans("NewIndividual"); if ($action == 'create') $out.= $langs->trans("NewCompany");
return $out; return $out;
} }
@ -105,7 +105,7 @@ class ActionsCardIndividual extends ActionsCardCommon
parent::assign_values($action); parent::assign_values($action);
$this->tpl['title'] = $this->getTitle($action); $this->tpl['title'] = load_fiche_titre($this->getTitle($action));
if ($action == 'create' || $action == 'edit') if ($action == 'create' || $action == 'edit')
{ {

9
htdocs/societe/canvas/individual/tpl/card_create.tpl.php
View File

@ -1,5 +1,6 @@
<?php <?php
/* Copyright (C) 2010-2011 Regis Houssin <regis@dolibarr.fr> /* Copyright (C) 2010-2011 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2010-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -19,11 +20,9 @@
<!-- BEGIN PHP TEMPLATE CARD_CREATE.TPL.PHP INDIVIDUAL --> <!-- BEGIN PHP TEMPLATE CARD_CREATE.TPL.PHP INDIVIDUAL -->
<?php <?php echo $this->control->tpl['title']; ?>
print_fiche_titre($this->control->tpl['title']);
dol_htmloutput_errors($this->control->tpl['error'],$this->control->tpl['errors']); <?php echo $this->control->tpl['error']; ?>
?>
<?php if ($conf->use_javascript_ajax) { ?> <?php if ($conf->use_javascript_ajax) { ?>
<?php echo $this->control->tpl['ajax_selecttype']; ?> <?php echo $this->control->tpl['ajax_selecttype']; ?>

9
htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
View File

@ -1,5 +1,6 @@
<?php <?php
/* Copyright (C) 2010 Regis Houssin <regis@dolibarr.fr> /* Copyright (C) 2010 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2010-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -19,11 +20,9 @@
<!-- BEGIN PHP TEMPLATE CARD_EDIT.TPL.PHP INDIVIDUAL --> <!-- BEGIN PHP TEMPLATE CARD_EDIT.TPL.PHP INDIVIDUAL -->
<?php <?php echo $this->control->tpl['title']; ?>
print_fiche_titre($this->control->tpl['title']);
dol_htmloutput_errors($this->control->tpl['error'],$this->control->tpl['errors']); <?php echo $this->control->tpl['error']; ?>
?>
<?php echo $this->control->tpl['ajax_selectcountry']; ?> <?php echo $this->control->tpl['ajax_selectcountry']; ?>