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

Fix: uniformize code

Browse Source
This commit is contained in:
Regis Houssin 2011-03-29 20:40:54 +00:00
parent 4f171c0516
commit 5b44e2c1f8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,10 +170,10 @@ class ActionsCardCommon
} }
// Zip // Zip
$this->tpl['select_zip'] = $formcompany->select_ziptown($this->object->cp,'zipcode',array('town','selectpays_id','departement_id'),6); $this->tpl['select_zip'] = $formcompany->select_ziptown($this->object->zip,'zipcode',array('town','selectpays_id','departement_id'),6);
// Town // Town
$this->tpl['select_town'] = $formcompany->select_ziptown($this->object->ville,'town',array('zipcode','selectpays_id','departement_id')); $this->tpl['select_town'] = $formcompany->select_ziptown($this->object->town,'town',array('zipcode','selectpays_id','departement_id'));
// Country // Country
$this->tpl['select_country'] = $form->select_country($this->object->pays_id,'pays_id'); $this->tpl['select_country'] = $form->select_country($this->object->pays_id,'pays_id');
@ -346,8 +346,8 @@ class ActionsCardCommon
$this->object->code_fournisseur = $_POST["code_fournisseur"]; $this->object->code_fournisseur = $_POST["code_fournisseur"];
$this->object->adresse = $_POST["adresse"]; // TODO obsolete $this->object->adresse = $_POST["adresse"]; // TODO obsolete
$this->object->address = $_POST["adresse"]; $this->object->address = $_POST["adresse"];
$this->object->cp = $_POST["zipcode"]; $this->object->zip = $_POST["zipcode"];
$this->object->ville = $_POST["town"]; $this->object->town = $_POST["town"];
$this->object->pays_id = $_POST["pays_id"]?$_POST["pays_id"]:$mysoc->pays_id; $this->object->pays_id = $_POST["pays_id"]?$_POST["pays_id"]:$mysoc->pays_id;
$this->object->departement_id = $_POST["departement_id"]; $this->object->departement_id = $_POST["departement_id"];
$this->object->tel = $_POST["tel"]; $this->object->tel = $_POST["tel"];

4
htdocs/societe/canvas/default/tpl/card_view.tpl.php
View File

@ -77,9 +77,9 @@
<tr> <tr>
<td width="25%"><?php echo $langs->trans('Zip'); ?></td> <td width="25%"><?php echo $langs->trans('Zip'); ?></td>
<td width="25%"><?php echo $this->control->tpl['cp']; ?></td> <td width="25%"><?php echo $this->control->tpl['zip']; ?></td>
<td width="25%"><?php echo $langs->trans('Town'); ?></td> <td width="25%"><?php echo $langs->trans('Town'); ?></td>
<td width="25%"><?php echo $this->control->tpl['ville']; ?></td> <td width="25%"><?php echo $this->control->tpl['town']; ?></td>
</tr> </tr>
<tr> <tr>