diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php index 468c2181349..1b60e197126 100644 --- a/htdocs/comm/addpropal.php +++ b/htdocs/comm/addpropal.php @@ -201,19 +201,6 @@ if ($action == 'create') } print ''; - // Delivery address - if ($conf->global->PROPALE_ADD_DELIVERY_ADDRESS) - { - print ''.$langs->trans('DeliveryAddress').''; - print ''; - $numaddress = $form->select_address($soc->fk_delivery_address, $_GET['socid'],'fk_address',1); - if ($numaddress==0) - { - print '   id.'&action=create>'.$langs->trans("AddAddress").''; - } - print ''; - } - // Model print ''; print ''.$langs->trans("DefaultModel").''; diff --git a/htdocs/comm/address.php b/htdocs/comm/address.php index 72abc9da7d1..b85da09d0ed 100644 --- a/htdocs/comm/address.php +++ b/htdocs/comm/address.php @@ -1,7 +1,7 @@ * Copyright (C) 2004-2006 Laurent Destailleur - * Copyright (C) 2005-2010 Regis Houssin + * Copyright (C) 2005-2012 Regis Houssin * * 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 @@ -20,7 +20,7 @@ /** * \file htdocs/comm/address.php * \ingroup societe - * \brief Tab address of customer + * \brief Tab address of thirdparty */ require("../main.inc.php"); @@ -31,58 +31,63 @@ require_once(DOL_DOCUMENT_ROOT."/societe/class/address.class.php"); $langs->load("companies"); $langs->load("commercial"); -$id = isset($_GET["id"])?$_GET["id"]:''; -$origin = isset($_GET["origin"])?$_GET["origin"]:''; -$originid = isset($_GET["originid"])?$_GET["originid"]:''; -$socid = isset($_REQUEST["socid"])?$_REQUEST["socid"]:''; -if (! $socid && ($_REQUEST["action"] != 'create' && $_REQUEST["action"] != 'add' && $_REQUEST["action"] != 'update')) accessforbidden(); +$id = GETPOST('id','int'); +$action = GETPOST('action','alpha'); +$confirm = GETPOST('confirm','alpha'); +$origin = GETPOST('origin','alpha'); +$originid = GETPOST('originid','int'); +$socid = GETPOST('socid','int'); +if (! $socid && ($action != 'create' && $action != 'add' && $action != 'update')) accessforbidden(); // Security check if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'societe', $socid); +$object = new Address($db); + /* * Actions */ -if ($_POST["action"] == 'add' || $_POST["action"] == 'update') +if ($action == 'add' || $action == 'update') { - $address = new Address($db); - - $address->socid = $_POST["socid"]; - $address->label = ($_POST["label"]!=$langs->trans('RequiredField')?$_POST["label"]:''); - $address->name = ($_POST["name"]!=$langs->trans('RequiredField')?$_POST["name"]:''); - $address->address = $_POST["address"]; - $address->cp = $_POST["zipcode"]; - $address->ville = $_POST["town"]; - $address->zip = $_POST["zipcode"]; - $address->town = $_POST["town"]; - $address->pays_id = $_POST["country_id"]; - $address->country_id= $_POST["country_id"]; - $address->tel = $_POST["tel"]; - $address->fax = $_POST["fax"]; - $address->note = $_POST["note"]; - - if ($_POST["action"] == 'add') + $object->socid = $socid; + $object->label = ($_POST["label"]!=$langs->trans('RequiredField')?$_POST["label"]:''); + $object->name = ($_POST["name"]!=$langs->trans('RequiredField')?$_POST["name"]:''); + $object->address = $_POST["address"]; + $object->cp = $_POST["zipcode"]; + $object->ville = $_POST["town"]; + $object->zip = $_POST["zipcode"]; + $object->town = $_POST["town"]; + $object->pays_id = $_POST["country_id"]; + $object->country_id= $_POST["country_id"]; + $object->tel = $_POST["tel"]; + $object->fax = $_POST["fax"]; + $object->note = $_POST["note"]; + + // Add new address + if ($action == 'add') { - $socid = $_POST["socid"]; - $origin = $_POST["origin"]; - $originid = $_POST["originid"]; - $result = $address->create($socid, $user); + $result = $object->create($socid, $user); if ($result >= 0) { if ($origin == 'commande') { - Header("Location: ../commande/fiche.php?action=editdelivery_adress&socid=".$socid."&id=".$originid); + Header("Location: ../commande/contact.php?action=editdelivery_adress&socid=".$socid."&id=".$originid); exit; } elseif ($origin == 'propal') { - Header("Location: ../comm/propal.php?action=editdelivery_adress&socid=".$socid."&id=".$originid); + Header("Location: ../comm/propal/contact.php?action=editdelivery_adress&socid=".$socid."&id=".$originid); exit; } + elseif ($origin == 'shipment') + { + Header("Location: ../expedition/fiche.php?id=".$originid); + exit; + } else { Header("Location: ".$_SERVER['PHP_SELF']."?socid=".$socid); @@ -91,28 +96,26 @@ if ($_POST["action"] == 'add' || $_POST["action"] == 'update') } else { - $mesg = $address->error; - $_GET["action"]='create'; + $mesg = $object->error; + $action='create'; } } - - if ($_POST["action"] == 'update') + + // Update address + else if ($action == 'update') { - $socid = $_POST["socid"]; - $origin = $_POST["origin"]; - $originid = $_POST["originid"]; - $result = $address->update($_POST["id"], $socid, $user); + $result = $object->update($_POST["id"], $socid, $user); if ($result >= 0) { if ($origin == 'commande') { - Header("Location: ../commande/fiche.php?id=".$originid); + Header("Location: ../commande/contact.php?id=".$originid); exit; } elseif ($origin == 'propal') { - Header("Location: ../comm/propal.php?id=".$originid); + Header("Location: ../comm/propal/contact.php?id=".$originid); exit; } elseif ($origin == 'shipment') @@ -129,17 +132,16 @@ if ($_POST["action"] == 'add' || $_POST["action"] == 'update') else { $reload = 0; - $mesg = $address->error; - $_GET["action"]= "edit"; + $mesg = $object->error; + $actino= "edit"; } } } -if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes' && $user->rights->societe->supprimer) +else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->societe->supprimer) { - $address = new Address($db); - $result = $address->delete($_GET["id"], $socid); + $result = $object->delete($id, $socid); if ($result == 0) { @@ -149,7 +151,7 @@ if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes' && $user- else { $reload = 0; - $_GET["action"]=''; + $action=''; } } @@ -167,7 +169,7 @@ $countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("Se dol_htmloutput_errors($mesg); -if ($_GET["action"] == 'create' || $_POST["action"] == 'create') +if ($action == 'create') { if ($user->rights->societe->creer) { @@ -175,8 +177,6 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'create') * Creation */ - $address = new Address($db); - $societe=new Societe($db); $societe->fetch($socid); $head = societe_prepare_head($societe); @@ -185,35 +185,35 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'create') if ($_POST["label"] && $_POST["name"]) { - $address->socid = $_POST["socid"]; - $address->label = $_POST["label"]; - $address->name = $_POST["name"]; - $address->address = $_POST["address"]; - $address->cp = $_POST["zipcode"]; - $address->ville = $_POST["town"]; - $address->tel = $_POST["tel"]; - $address->fax = $_POST["fax"]; - $address->note = $_POST["note"]; + $object->socid = $socid; + $object->label = $_POST["label"]; + $object->name = $_POST["name"]; + $object->address = $_POST["address"]; + $object->cp = $_POST["zipcode"]; + $object->ville = $_POST["town"]; + $object->tel = $_POST["tel"]; + $object->fax = $_POST["fax"]; + $object->note = $_POST["note"]; } // On positionne pays_id, pays_code et libelle du pays choisi - $address->country_id=$_POST["country_id"]?$_POST["country_id"]:$mysoc->country_id; - if ($address->country_id) + $object->country_id=$_POST["country_id"]?$_POST["country_id"]:$mysoc->country_id; + if ($object->country_id) { - $tmparray=getCountry($address->country_id,'all'); - $address->pays_code = $tmparray['code']; - $address->pays = $tmparray['label']; - $address->country_code = $tmparray['code']; - $address->country = $tmparray['label']; + $tmparray=getCountry($object->country_id,'all'); + $object->pays_code = $tmparray['code']; + $object->pays = $tmparray['label']; + $object->country_code = $tmparray['code']; + $object->country = $tmparray['label']; } print_titre($langs->trans("AddAddress")); print "
\n"; - if ($address->error) + if ($object->error) { print '
'; - print nl2br($address->error); + print nl2br($object->error); print '
'; } @@ -221,23 +221,23 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'create') if ($conf->use_javascript_ajax) { print "\n".''."\n"; } @@ -251,33 +251,33 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'create') print ''; - print ''; - print ''; + print ''; + print ''; print ''; // Zip print ''; // Town print ''; print ''; - print ''; + print ''; - print ''; + print ''; print ''; print '
'.$langs->trans('Label').'
'.$langs->trans('Name').'
'.$langs->trans('Label').'
'.$langs->trans('Name').'
'.$langs->trans('Address').'
'.$langs->trans('Zip').''; - print $formcompany->select_ziptown($address->cp,'zipcode',array('town','selectcountry_id'),6); + print $formcompany->select_ziptown($object->cp,'zipcode',array('town','selectcountry_id'),6); print '
'.$langs->trans('Town').''; - print $formcompany->select_ziptown($address->ville,'town',array('zipcode','selectcountry_id')); + print $formcompany->select_ziptown($object->ville,'town',array('zipcode','selectcountry_id')); print '
'.$langs->trans('Country').''; - print $form->select_country($address->country_id,'selectcountry_id'); + print $form->select_country($object->country_id,'selectcountry_id'); print '
'.$langs->trans('Phone').'
'.$langs->trans('Phone').'
'.$langs->trans('Fax').'
'.$langs->trans('Fax').'
'.$langs->trans('Note').'
'."\n"; @@ -289,15 +289,14 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'create') } } -elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit') +elseif ($action == 'edit') { /* * Fiche societe en mode edition */ - $address = new Address($db); $societe=new Societe($db); - $societe->fetch($_GET["socid"]); + $societe->fetch($socid); $head = societe_prepare_head($societe); dol_fiche_head($head, 'customer', $societe->nom); @@ -309,78 +308,78 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit') { if ($reload || ! $_POST["name"]) { - $address->socid = $socid; - $address->fetch_address($id); + $object->socid = $socid; + $object->fetch_address($id); } else { - $address->id = $_POST["id"]; - $address->socid = $_POST["socid"]; - $address->label = $_POST["label"]; - $address->name = $_POST["name"]; - $address->address = $_POST["address"]; - $address->cp = $_POST["zipcode"]; - $address->ville = $_POST["town"]; - $address->country_id = $_POST["country_id"]?$_POST["country_id"]:$mysoc->country_id; - $address->tel = $_POST["tel"]; - $address->fax = $_POST["fax"]; - $address->note = $_POST["note"]; + $object->id = $id; + $object->socid = $socid; + $object->label = $_POST["label"]; + $object->name = $_POST["name"]; + $object->address = $_POST["address"]; + $object->cp = $_POST["zipcode"]; + $object->ville = $_POST["town"]; + $object->country_id = $_POST["country_id"]?$_POST["country_id"]:$mysoc->country_id; + $object->tel = $_POST["tel"]; + $object->fax = $_POST["fax"]; + $object->note = $_POST["note"]; // On positionne country_id, pays_code et libelle du pays choisi - if ($address->country_id) + if ($object->country_id) { - $tmparray=getCountry($address->country_id,'all'); - $address->pays_code = $tmparray['code']; - $address->pays = $tmparray['label']; - $address->country_code = $tmparray['code']; - $address->country = $tmparray['label']; + $tmparray=getCountry($object->country_id,'all'); + $object->pays_code = $tmparray['code']; + $object->pays = $tmparray['label']; + $object->country_code = $tmparray['code']; + $object->country = $tmparray['label']; } } - if ($address->error) + if ($object->error) { print '
'; - print $address->error; + print $object->error; print '
'; } - print '
'; + print ''; print ''; print ''; - print ''; + print ''; print ''; print ''; - print ''; + print ''; print ''; - print ''; - print ''; + print ''; + print ''; print ''; // Zip print ''; // Town print ''; print ''; - print ''; + print ''; - print ''; + print ''; print ''; print ''; @@ -394,16 +393,16 @@ else /* * Fiche societe en mode visu */ - $address = new Address($db); - $result=$address->fetch_lines($socid); + + $result=$object->fetch_lines($socid); if ($result < 0) { - dol_print_error($db,$address->error); + dol_print_error($db,$object->error); exit; } $societe=new Societe($db); - $societe->fetch($address->socid); + $societe->fetch($object->socid); $head = societe_prepare_head($societe); dol_fiche_head($head, 'customer', $societe->nom); @@ -413,18 +412,18 @@ else if ($_GET["action"] == 'delete') { $form = new Form($db); - $ret=$form->form_confirm($_SERVER['PHP_SELF']."?socid=".$address->socid."&id=".$_GET["id"],$langs->trans("DeleteAddress"),$langs->trans("ConfirmDeleteAddress"),"confirm_delete"); + $ret=$form->form_confirm($_SERVER['PHP_SELF']."?socid=".$object->socid."&id=".$id,$langs->trans("DeleteAddress"),$langs->trans("ConfirmDeleteAddress"),"confirm_delete"); if ($ret == 'html') print '
'; } - if ($address->error) + if ($object->error) { print '
'; - print $address->error; + print $object->error; print '
'; } - $nblines = count($address->lines); + $nblines = count($object->lines); if ($nblines) { for ($i = 0 ; $i < $nblines ; $i++) @@ -432,20 +431,20 @@ else print '
'.$langs->trans('AddressLabel').'
'.$langs->trans('Name').'
'.$langs->trans('AddressLabel').'
'.$langs->trans('Name').'
'.$langs->trans('Address').'
'.$langs->trans('Zip').''; - print $formcompany->select_ziptown($address->cp,'zipcode',array('town','selectcountry_id'),6); + print $formcompany->select_ziptown($object->cp,'zipcode',array('town','selectcountry_id'),6); print '
'.$langs->trans('Town').''; - print $formcompany->select_ziptown($address->ville,'town',array('zipcode','selectcountry_id')); + print $formcompany->select_ziptown($object->ville,'town',array('zipcode','selectcountry_id')); print '
'.$langs->trans('Country').''; - print $form->select_country($address->country_id,'country_id'); + print $form->select_country($object->country_id,'country_id'); print '
'.$langs->trans('Phone').'
'.$langs->trans('Phone').'
'.$langs->trans('Fax').'
'.$langs->trans('Fax').'
'.$langs->trans('Note').'
'; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; - print ""; + print ""; - print '"; - print '"; + print '"; + print '"; - print ''; + print ''; - print ''; + print ''; - print ''; + print ''; print ''; @@ -460,12 +459,12 @@ else if ($user->rights->societe->creer) { - print ''.$langs->trans("Modify").''; + print ''.$langs->trans("Modify").''; } if ($user->rights->societe->supprimer) { - print ''.$langs->trans("Delete").''; + print ''.$langs->trans("Delete").''; } @@ -484,21 +483,20 @@ else * Bouton actions */ - if ($_GET["action"] == '') + if ($action == '') { print '
'; if ($user->rights->societe->creer) { - print ''.$langs->trans("Add").''; + print ''.$langs->trans("Add").''; } print '
'; } } + $db->close(); - - llxFooter(); ?> diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index 43cc72d58d9..13b401da34d 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -37,7 +37,6 @@ if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/class/co if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); if ($conf->adherent->enabled) require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); if ($conf->ficheinter->enabled) require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php"); -if (!empty($conf->global->MAIN_MODULE_CHRONODOCS)) require_once(DOL_DOCUMENT_ROOT."/chronodocs/chronodocs_entries.class.php"); $langs->load("companies"); if ($conf->contrat->enabled) $langs->load("contracts"); @@ -46,7 +45,6 @@ if ($conf->facture->enabled) $langs->load("bills"); if ($conf->projet->enabled) $langs->load("projects"); if ($conf->ficheinter->enabled) $langs->load("interventions"); if ($conf->notification->enabled) $langs->load("mails"); -if (!empty($conf->global->MAIN_MODULE_CHRONODOCS)) $langs->load("chronodocs"); // Security check $id = (GETPOST('socid','int') ? GETPOST('socid','int') : GETPOST('id','int')); diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 7ac7cec3de5..0a33c822392 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -246,13 +246,6 @@ else if ($action == 'setdate_livraison') if ($result < 0) dol_print_error($db,$object->error); } -else if ($action == 'setaddress' && $user->rights->propale->creer) -{ - $object->fetch($id); - $result=$object->set_adresse_livraison($user,$_POST['fk_address']); - if ($result < 0) dol_print_error($db,$object->error); -} - // Positionne ref client else if ($action == 'set_ref_client' && $user->rights->propale->creer) { @@ -1340,29 +1333,6 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; - // Delivery address (deprecated) - if ($conf->global->PROPALE_ADD_DELIVERY_ADDRESS) - { - print ''; - } - // Delivery delay print ''; print ''; // Customer - if ( is_null($propal->client) ) - $propal->fetch_thirdparty(); + if (is_null($object->client)) $object->fetch_thirdparty(); print ""; - print ''; + print ''; + + // Delivery address + if ($conf->global->PROPALE_ADD_DELIVERY_ADDRESS) + { + print ''; + } print "
'.$langs->trans('AddressLabel').''.$address->lines[$i]->label.''.$langs->trans('Note').' :
'.nl2br($address->lines[$i]->note).'
'.$langs->trans('Name').''.$address->lines[$i]->name.'
'.$langs->trans('AddressLabel').''.$object->lines[$i]->label.''.$langs->trans('Note').' :
'.nl2br($object->lines[$i]->note).'
'.$langs->trans('Name').''.$object->lines[$i]->name.'
".$langs->trans('Address')."".nl2br($address->lines[$i]->address)."
".$langs->trans('Address')."".nl2br($object->lines[$i]->address)."
'.$langs->trans('Zip').''.$address->lines[$i]->cp."
'.$langs->trans('Town').''.$address->lines[$i]->ville."
'.$langs->trans('Zip').''.$object->lines[$i]->cp."
'.$langs->trans('Town').''.$object->lines[$i]->ville."
'.$langs->trans('Country').''.$address->lines[$i]->pays.'
'.$langs->trans('Country').''.$object->lines[$i]->pays.'
'.$langs->trans('Phone').''.dol_print_phone($address->lines[$i]->tel,$address->lines[$i]->country_code,0,$address->socid,'AC_TEL').'
'.$langs->trans('Phone').''.dol_print_phone($object->lines[$i]->tel,$object->lines[$i]->country_code,0,$object->socid,'AC_TEL').'
'.$langs->trans('Fax').''.dol_print_phone($address->lines[$i]->fax,$address->lines[$i]->country_code,0,$address->socid,'AC_FAX').'
'.$langs->trans('Fax').''.dol_print_phone($object->lines[$i]->fax,$object->lines[$i]->country_code,0,$object->socid,'AC_FAX').'
'; - print ''; - - if ($action != 'editdelivery_address' && $object->brouillon) print ''; - print '
'; - print $langs->trans('DeliveryAddress'); - print 'socid.'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetDeliveryAddress'),1).'
'; - print '		'; - - if ($action == 'editdelivery_address') - { - $formother->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,GETPOST('socid','int'),'fk_address','propal',$object->id); - } - else - { - $formother->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,GETPOST('socid','int'),'none','propal',$object->id); - } - print '
'; print ''; // Ref client @@ -161,15 +166,37 @@ if ($id > 0 || ! empty($ref)) print ''; print '
'; diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 97bc0493f4b..676bbd5bfa5 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -1282,34 +1282,6 @@ class Propal extends CommonObject } } - /** - * Define delivery address - * - * @param User $user Object user that modify - * @param int $fk_address Delivery address id - * @return int <0 si ko, >0 si ok - */ - function set_adresse_livraison($user, $fk_address) - { - if ($user->rights->propale->creer) - { - $sql = "UPDATE ".MAIN_DB_PREFIX."propal SET fk_adresse_livraison = '".$fk_address."'"; - $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0"; - - if ($this->db->query($sql) ) - { - $this->fk_delivery_address = $fk_address; - return 1; - } - else - { - $this->error=$this->db->error(); - dol_syslog("Propal::set_adresse_livraison Erreur SQL"); - return -1; - } - } - } - /** * Set delivery * @@ -1880,78 +1852,6 @@ class Propal extends CommonObject } } - - /** - * Change the payments conditions of the invoice - * - * @param int $cond_reglement_id Id of new payment condition - * @return int >0 if OK, <0 if KO - * TODO deprecated - */ - function cond_reglement($cond_reglement_id) - { - dol_syslog('Propale::cond_reglement('.$cond_reglement_id.')'); - if ($this->statut >= 0) - { - $sql = 'UPDATE '.MAIN_DB_PREFIX.'propal'; - $sql .= ' SET fk_cond_reglement = '.$cond_reglement_id; - $sql .= ' WHERE rowid='.$this->id; - if ( $this->db->query($sql) ) - { - $this->cond_reglement_id = $cond_reglement_id; - return 1; - } - else - { - dol_syslog('Propale::cond_reglement Erreur '.$sql.' - '.$this->db->error()); - $this->error=$this->db->error(); - return -1; - } - } - else - { - dol_syslog('Propale::cond_reglement, etat propale incompatible'); - $this->error='Etat propale incompatible '.$this->statut; - return -2; - } - } - - - /** - * Change the payment mode - * - * @param int $mode_reglement_id Id of new payment mode - * @return int >0 if OK, <0 if KO - * TODO deprecated - */ - function mode_reglement($mode_reglement_id) - { - dol_syslog('Propale::mode_reglement('.$mode_reglement_id.')'); - if ($this->statut >= 0) - { - $sql = 'UPDATE '.MAIN_DB_PREFIX.'propal'; - $sql .= ' SET fk_mode_reglement = '.$mode_reglement_id; - $sql .= ' WHERE rowid='.$this->id; - if ( $this->db->query($sql) ) - { - $this->mode_reglement_id = $mode_reglement_id; - return 1; - } - else - { - dol_syslog('Propale::mode_reglement Erreur '.$sql.' - '.$this->db->error()); - $this->error=$this->db->error(); - return -1; - } - } - else - { - dol_syslog('Propale::mode_reglement, etat propale incompatible'); - $this->error='Etat facture incompatible '.$this->statut; - return -2; - } - } - /** * Change the delivery time * diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php index 809a5e3a76a..3123709b0a5 100644 --- a/htdocs/comm/propal/contact.php +++ b/htdocs/comm/propal/contact.php @@ -27,6 +27,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/propal.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); $langs->load("facture"); @@ -43,6 +44,8 @@ $action=GETPOST('action', 'alpha'); if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'propale', $id, 'propal'); +$object = new Propal($db); + /* * Ajout d'un nouveau contact @@ -50,42 +53,38 @@ $result = restrictedArea($user, 'propale', $id, 'propal'); if ($action == 'addcontact' && $user->rights->propale->creer) { - - $result = 0; - $propal = new Propal($db); - $result = $propal->fetch($id); + $result = $object->fetch($id); if ($result > 0 && $id > 0) { - $result = $propal->add_contact($_POST["contactid"], $_POST["type"], $_POST["source"]); + $result = $object->add_contact($_POST["contactid"], $_POST["type"], $_POST["source"]); } if ($result >= 0) { - Header("Location: ".$_SERVER['PHP_SELF']."?id=".$propal->id); + Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); exit; } else { - if ($propal->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') + if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') { $langs->load("errors"); $mesg = '
'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'
'; } else { - $mesg = '
'.$propal->error.'
'; + $mesg = '
'.$object->error.'
'; } } } // Bascule du statut d'un contact -if ($action == 'swapstatut' && $user->rights->propale->creer) +else if ($action == 'swapstatut' && $user->rights->propale->creer) { - $propal = new Propal($db); - if ($propal->fetch($id) > 0) + if ($object->fetch($id) > 0) { - $result=$propal->swapContactStatus(GETPOST('ligne')); + $result=$object->swapContactStatus(GETPOST('ligne')); } else { @@ -94,15 +93,14 @@ if ($action == 'swapstatut' && $user->rights->propale->creer) } // Efface un contact -if ($action == 'deleteline' && $user->rights->propale->creer) +else if ($action == 'deleteline' && $user->rights->propale->creer) { - $propal = new Propal($db); - $propal->fetch($id); - $result = $propal->delete_contact($lineid); + $object->fetch($id); + $result = $object->delete_contact($lineid); if ($result >= 0) { - Header("Location: ".$_SERVER['PHP_SELF']."?id=".$propal->id); + Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); exit; } else @@ -111,6 +109,13 @@ if ($action == 'deleteline' && $user->rights->propale->creer) } } +else if ($action == 'setaddress' && $user->rights->propale->creer) +{ + $object->fetch($id); + $result=$object->setDeliveryAddress($_POST['fk_address']); + if ($result < 0) dol_print_error($db,$object->error); +} + /* * View @@ -120,6 +125,7 @@ llxHeader('', $langs->trans("Proposal"), "Propal"); $form = new Form($db); $formcompany= new FormCompany($db); +$formother = new FormOther($db); $contactstatic=new Contact($db); $userstatic=new User($db); @@ -133,13 +139,12 @@ dol_htmloutput_mesg($mesg); if ($id > 0 || ! empty($ref)) { - $propal = New Propal($db); - if ($propal->fetch($id,$ref) > 0) + if ($object->fetch($id,$ref) > 0) { $soc = new Societe($db); - $soc->fetch($propal->socid); + $soc->fetch($object->socid); - $head = propal_prepare_head($propal); + $head = propal_prepare_head($object); dol_fiche_head($head, 'contact', $langs->trans("Proposal"), 0, 'propal'); /* @@ -151,7 +156,7 @@ if ($id > 0 || ! empty($ref)) // Ref print '
'.$langs->trans('Ref').''; - print $form->showrefnav($propal,'ref',$linkback,1,'ref','ref',''); + print $form->showrefnav($object,'ref',$linkback,1,'ref','ref',''); print '
'; print '		'; - print $propal->ref_client; + print $object->ref_client; print '
".$langs->trans("Company")."'.$propal->client->getNomUrl(1).'
'.$object->client->getNomUrl(1).'
'; + print ''; + + if ($action != 'editdelivery_address' && $object->brouillon) print ''; + print '
'; + print $langs->trans('DeliveryAddress'); + print 'socid.'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetDeliveryAddress'),1).'
'; + print '		'; + + if ($action == 'editdelivery_address') + { + $formother->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,GETPOST('socid','int'),'fk_address','propal',$object->id); + } + else + { + $formother->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,GETPOST('socid','int'),'none','propal',$object->id); + } + print '
"; @@ -215,11 +242,11 @@ if ($id > 0 || ! empty($ref)) print ''; // On recupere les id des users deja selectionnes - //$userAlreadySelected = $propal->getListContactId('internal'); // On ne doit pas desactiver un contact deja selectionne car on doit pouvoir le selectionner une deuxieme fois pour un autre type + //$userAlreadySelected = $object->getListContactId('internal'); // On ne doit pas desactiver un contact deja selectionne car on doit pouvoir le selectionner une deuxieme fois pour un autre type $form->select_users($user->id,'contactid',0,$userAlreadySelected); print ''; print ''; - $formcompany->selectTypeContact($propal, '', 'type','internal'); + $formcompany->selectTypeContact($object, '', 'type','internal'); print ''; print ''; print ''; @@ -241,8 +268,8 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; - $selectedCompany = isset($_GET["newcompany"])?$_GET["newcompany"]:$propal->client->id; - $selectedCompany = $formcompany->selectCompaniesForNewContact($propal, 'id', $selectedCompany, 'newcompany'); + $selectedCompany = isset($_GET["newcompany"])?$_GET["newcompany"]:$object->client->id; + $selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany'); print ''; print ''; @@ -250,7 +277,7 @@ if ($id > 0 || ! empty($ref)) if ($nbofcontacts == 0) print $langs->trans("NoContactDefined"); print ''; print ''; - $formcompany->selectTypeContact($propal, '', 'type','external'); + $formcompany->selectTypeContact($object, '', 'type','external'); print ''; print ' 0 || ! empty($ref)) foreach(array('internal','external') as $source) { - $tab = $propal->liste_contact(-1,$source); + $tab = $object->liste_contact(-1,$source); $num=count($tab); $i = 0; @@ -335,9 +362,9 @@ if ($id > 0 || ! empty($ref)) // Statut print ''; // Activation desativation du contact - if ($propal->statut >= 0) print ''; + if ($object->statut >= 0) print ''; print $contactstatic->LibStatut($tab[$i]['status'],3); - if ($propal->statut >= 0) print ''; + if ($object->statut >= 0) print ''; print ''; // Icon update et delete @@ -345,7 +372,7 @@ if ($id > 0 || ! empty($ref)) if ($user->rights->propale->creer) { print ' '; - print ''; + print ''; print img_delete(); print ''; } @@ -364,8 +391,6 @@ if ($id > 0 || ! empty($ref)) } } -llxFooter(); - $db->close(); - +llxFooter(); ?> \ No newline at end of file diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index c67fc51de3f..d11ab2b1ceb 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -1844,34 +1844,6 @@ class Commande extends CommonObject } } - /** - * Set address - * - * @param User $user Object user making change - * @param int $fk_address Adress of delivery - * @return int <0 ig KO, >0 if Ok - */ - function set_adresse_livraison($user, $fk_address) - { - if ($user->rights->commande->creer) - { - $sql = "UPDATE ".MAIN_DB_PREFIX."commande SET fk_adresse_livraison = '".$fk_address."'"; - $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0"; - - if ($this->db->query($sql) ) - { - $this->fk_delivery_address = $fk_address; - return 1; - } - else - { - $this->error=$this->db->error(); - dol_syslog("Commande::set_adresse_livraison Erreur SQL"); - return -1; - } - } - } - /** * Set availability * @@ -1975,77 +1947,6 @@ class Commande extends CommonObject } } - /** - * Change les conditions de reglement de la commande - * - * @param int $cond_reglement_id Id de la nouvelle condition de reglement - * @return int >0 if OK, <0 if KO - * TODO deprecated - */ - function cond_reglement($cond_reglement_id) - { - dol_syslog('Commande::cond_reglement('.$cond_reglement_id.')'); - if ($this->statut >= 0) - { - $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande'; - $sql .= ' SET fk_cond_reglement = '.$cond_reglement_id; - $sql .= ' WHERE rowid='.$this->id; - if ( $this->db->query($sql) ) - { - $this->cond_reglement_id = $cond_reglement_id; - return 1; - } - else - { - dol_syslog('Commande::cond_reglement Erreur '.$sql.' - '.$this->db->error(), LOG_ERR); - $this->error=$this->db->lasterror(); - return -1; - } - } - else - { - dol_syslog('Commande::cond_reglement, etat commande incompatible', LOG_ERR); - $this->error='Etat commande incompatible '.$this->statut; - return -2; - } - } - - - /** - * Change le mode de reglement - * - * @param int $mode Id du nouveau mode - * @return int >0 si ok, <0 si ko - * TODO deprecated - */ - function mode_reglement($mode_reglement_id) - { - dol_syslog('Commande::mode_reglement('.$mode_reglement_id.')'); - if ($this->statut >= 0) - { - $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande'; - $sql .= ' SET fk_mode_reglement = '.$mode_reglement_id; - $sql .= ' WHERE rowid='.$this->id; - if ( $this->db->query($sql) ) - { - $this->mode_reglement_id = $mode_reglement_id; - return 1; - } - else - { - dol_syslog('Commande::mode_reglement Erreur '.$sql.' - '.$this->db->error(), LOG_ERR); - $this->error=$this->db->lasterror(); - return -1; - } - } - else - { - dol_syslog('Commande::mode_reglement, etat facture incompatible', LOG_ERR); - $this->error='Etat commande incompatible '.$this->statut; - return -2; - } - } - /** * Change le delai de livraison * diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php index 828dc7c0a26..e455e6ce54c 100644 --- a/htdocs/commande/contact.php +++ b/htdocs/commande/contact.php @@ -1,7 +1,7 @@ * Copyright (C) 2005-2011 Laurent Destailleur - * Copyright (C) 2005-2011 Regis Houssin + * Copyright (C) 2005-2012 Regis Houssin * * 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 @@ -27,61 +27,61 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/order.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); $langs->load("orders"); $langs->load("sendings"); $langs->load("companies"); -$comid = isset($_GET["id"])?$_GET["id"]:''; +$id=GETPOST('id','int'); +$ref=GETPOST('ref','alpha'); +$action=GETPOST('action','alpha'); // Security check if ($user->societe_id) $socid=$user->societe_id; -$result = restrictedArea($user, 'commande', $comid,''); +$result = restrictedArea($user, 'commande', $id,''); +$object = new Commande($db); /* * Ajout d'un nouveau contact */ -if ($_POST["action"] == 'addcontact' && $user->rights->commande->creer) +if ($action == 'addcontact' && $user->rights->commande->creer) { + $result = $object->fetch($id); - $result = 0; - $commande = new Commande($db); - $result = $commande->fetch($_GET["id"]); - - if ($result > 0 && $_GET["id"] > 0) + if ($result > 0 && $id > 0) { - $result = $commande->add_contact($_POST["contactid"], $_POST["type"], $_POST["source"]); + $result = $object->add_contact($_POST["contactid"], $_POST["type"], $_POST["source"]); } if ($result >= 0) { - Header("Location: contact.php?id=".$commande->id); + Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); exit; } else { - if ($commande->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') + if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') { $langs->load("errors"); $mesg = '
'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'
'; } else { - $mesg = '
'.$commande->error.'
'; + $mesg = '
'.$object->error.'
'; } } } // bascule du statut d'un contact -if ($_GET["action"] == 'swapstatut' && $user->rights->commande->creer) +else if ($action == 'swapstatut' && $user->rights->commande->creer) { - $commande = new Commande($db); - if ($commande->fetch(GETPOST('id','int'))) + if ($object->fetch($id)) { - $result=$commande->swapContactStatus(GETPOST('ligne')); + $result=$object->swapContactStatus(GETPOST('ligne')); } else { @@ -90,15 +90,14 @@ if ($_GET["action"] == 'swapstatut' && $user->rights->commande->creer) } // Efface un contact -if ($_GET["action"] == 'deleteline' && $user->rights->commande->creer) +else if ($action == 'deleteline' && $user->rights->commande->creer) { - $commande = new Commande($db); - $commande->fetch($_GET["id"]); - $result = $commande->delete_contact($_GET["lineid"]); + $object->fetch($id); + $result = $object->delete_contact($_GET["lineid"]); if ($result >= 0) { - Header("Location: contact.php?id=".$commande->id); + Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); exit; } else { @@ -106,6 +105,11 @@ if ($_GET["action"] == 'deleteline' && $user->rights->commande->creer) } } +else if ($action == 'setaddress' && $user->rights->commande->creer) +{ + $object->fetch($id); + $object->setDeliveryAddress($_POST['fk_address']); +} /* * View @@ -115,6 +119,7 @@ llxHeader('',$langs->trans('Order'),'EN:Customers_Orders|FR:Commandes_Clients|ES $form = new Form($db); $formcompany = new FormCompany($db); +$formother = new FormOther($db); $contactstatic=new Contact($db); $userstatic=new User($db); @@ -126,19 +131,17 @@ $userstatic=new User($db); /* *************************************************************************** */ dol_htmloutput_mesg($mesg); -$id = $_GET['id']; -$ref= $_GET['ref']; if ($id > 0 || ! empty($ref)) { $langs->trans("OrderCard"); - $commande = new Commande($db); - if ( $commande->fetch($_GET['id'],$_GET['ref']) > 0) + + if ($object->fetch($id, $ref) > 0) { $soc = new Societe($db); - $soc->fetch($commande->socid); + $soc->fetch($object->socid); - $head = commande_prepare_head($commande); + $head = commande_prepare_head($object); dol_fiche_head($head, 'contact', $langs->trans("CustomerOrder"), 0, 'order'); @@ -149,7 +152,7 @@ if ($id > 0 || ! empty($ref)) // Ref print ''.$langs->trans("Ref").''; - print $form->showrefnav($commande,'ref','',1,'ref','ref'); + print $form->showrefnav($object,'ref','',1,'ref','ref'); print ""; // Ref commande client @@ -159,16 +162,39 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; print ''; - print $commande->ref_client; + print $object->ref_client; print ''; print ''; // Customer - if ( is_null($commande->client) ) - $commande->fetch_thirdparty(); + if (is_null($object->client)) $object->fetch_thirdparty(); print "".$langs->trans("Company").""; - print ''.$commande->client->getNomUrl(1).''; + print ''.$object->client->getNomUrl(1).''; + + // Delivery address + if ($conf->global->COMMANDE_ADD_DELIVERY_ADDRESS) + { + print ''; + print ''; + + if ($action != 'editdelivery_address' && $object->brouillon) print ''; + print '
'; + print $langs->trans('DeliveryAddress'); + print 'socid.'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetDeliveryAddress'),1).'
'; + print ''; + + if ($action == 'editdelivery_address') + { + $formother->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,GETPOST('socid','int'),'fk_address','commande',$object->id); + } + else + { + $formother->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,GETPOST('socid','int'),'none','commande',$object->id); + } + print ''; + } + print ""; print ''; @@ -182,7 +208,7 @@ if ($id > 0 || ! empty($ref)) * Ajouter une ligne de contact * Non affiche en mode modification de ligne */ - if ($_GET["action"] != 'editline' && $user->rights->commande->creer) + if ($action != 'editline' && $user->rights->commande->creer) { print ''; print ''.$langs->trans("Source").''; @@ -195,7 +221,7 @@ if ($id > 0 || ! empty($ref)) $var = false; - print ''; + print ''; print ''; print ''; print ''; @@ -213,18 +239,18 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; - //$userAlreadySelected = $commande->getListContactId('internal'); // On ne doit pas desactiver un contact deja selectionne car on doit pouvoir le selectionner une deuxieme fois pour un autre type + //$userAlreadySelected = $object->getListContactId('internal'); // On ne doit pas desactiver un contact deja selectionne car on doit pouvoir le selectionner une deuxieme fois pour un autre type $form->select_users($user->id,'contactid',0,$userAlreadySelected); print ''; print ''; - $formcompany->selectTypeContact($commande, '', 'type','internal'); + $formcompany->selectTypeContact($object, '', 'type','internal'); print ''; print ''; print ''; print ''; - print '
'; + print ''; print ''; print ''; print ''; @@ -239,8 +265,8 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; - $selectedCompany = isset($_GET["newcompany"])?$_GET["newcompany"]:$commande->client->id; - $selectedCompany = $formcompany->selectCompaniesForNewContact($commande, 'id', $selectedCompany, 'newcompany'); + $selectedCompany = isset($_GET["newcompany"])?$_GET["newcompany"]:$object->client->id; + $selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany'); print ''; print ''; @@ -248,7 +274,7 @@ if ($id > 0 || ! empty($ref)) if ($nbofcontacts == 0) print $langs->trans("NoContactDefined"); print ''; print ''; - $formcompany->selectTypeContact($commande, '', 'type','external'); + $formcompany->selectTypeContact($object, '', 'type','external'); print ''; print ' 0 || ! empty($ref)) foreach(array('internal','external') as $source) { - $tab = $commande->liste_contact(-1,$source); + $tab = $object->liste_contact(-1,$source); $num=count($tab); $i = 0; @@ -332,17 +358,17 @@ if ($id > 0 || ! empty($ref)) // Statut print ''; // Activation desativation du contact - if ($commande->statut >= 0) print ''; + if ($object->statut >= 0) print ''; print $contactstatic->LibStatut($tab[$i]['status'],3); - if ($commande->statut >= 0) print ''; + if ($object->statut >= 0) print ''; print ''; // Icon update et delete print ''; - if ($commande->statut < 5 && $user->rights->commande->creer) + if ($object->statut < 5 && $user->rights->commande->creer) { print ' '; - print ''; + print ''; print img_delete(); print ''; } @@ -362,7 +388,7 @@ if ($id > 0 || ! empty($ref)) } } -$db->close(); +$db->close(); llxFooter(); ?> \ No newline at end of file diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 0cdaf1ce491..e26f0c3390b 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -29,7 +29,6 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formorder.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/modules/commande/modules_commande.php"); @@ -440,12 +439,6 @@ if ($action == 'setdate_livraison' && $user->rights->commande->creer) } } -if ($action == 'setaddress' && $user->rights->commande->creer) -{ - $object->fetch($id); - $object->set_adresse_livraison($user,$_POST['fk_address']); -} - if ($action == 'setmode' && $user->rights->commande->creer) { $object->fetch($id); @@ -1193,7 +1186,6 @@ llxHeader('',$langs->trans('Order'),'EN:Customers_Orders|FR:Commandes_Clients|ES $form = new Form($db); $formfile = new FormFile($db); -$formother = new FormOther($db); $formorder = new FormOrder($db); @@ -1330,15 +1322,6 @@ if ($action == 'create' && $user->rights->commande->creer) $form->select_date($datedelivery,'liv_','','','',"crea_commande",1,1); print ""; - // Delivery address - if ($conf->global->COMMANDE_ADD_DELIVERY_ADDRESS) - { - print ''.$langs->trans('DeliveryAddress').''; - $numaddress = $formother->select_address($soc->fk_delivery_address, $socid,'fk_address',1); - print '   '.$langs->trans("AddAddress").''; - print ''; - } - // Conditions de reglement print ''.$langs->trans('PaymentConditionsShort').''; $form->select_conditions_paiements($soc->cond_reglement,'cond_reglement_id',-1,1); @@ -1802,29 +1785,6 @@ else print ''; print ''; - // Delivery address - if ($conf->global->COMMANDE_ADD_DELIVERY_ADDRESS) - { - print ''; - print ''; - - if ($action != 'editdelivery_adress' && $object->brouillon) print ''; - print '
'; - print $langs->trans('DeliveryAddress'); - print 'socid.'&id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryAddress'),1).'
'; - print ''; - - if ($action == 'editdelivery_adress') - { - $formother->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,$socid,'fk_address','commande',$object->id); - } - else - { - $formother->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,$socid,'none','commande',$object->id); - } - print ''; - } - // Terms of payment print ''; print '
'; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index de4db61574c..950a25496f9 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -121,7 +121,7 @@ if ($action == 'confirm_clone' && $confirm == 'yes') } // Change status of invoice -if ($action == 'reopen' && $user->rights->facture->creer) +else if ($action == 'reopen' && $user->rights->facture->creer) { $result = $object->fetch($id); if ($object->statut == 2 @@ -141,7 +141,7 @@ if ($action == 'reopen' && $user->rights->facture->creer) } // Delete invoice -if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->facture->supprimer) +else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->facture->supprimer) { if ($user->rights->facture->supprimer) { @@ -160,7 +160,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->facture-> } // Delete line -if ($action == 'confirm_deleteline' && $confirm == 'yes') +else if ($action == 'confirm_deleteline' && $confirm == 'yes') { if ($user->rights->facture->creer) { @@ -200,7 +200,7 @@ if ($action == 'confirm_deleteline' && $confirm == 'yes') } // Delete link of credit note to invoice -if ($action == 'unlinkdiscount') +else if ($action == 'unlinkdiscount') { if ($user->rights->facture->creer) { @@ -211,7 +211,7 @@ if ($action == 'unlinkdiscount') } // Validation -if ($action == 'valid') +else if ($action == 'valid') { $object->fetch($id); @@ -236,7 +236,7 @@ if ($action == 'valid') } } -if ($action == 'set_thirdparty') +else if ($action == 'set_thirdparty') { $object->fetch($id); $object->setValueFrom('fk_soc',$socid); @@ -245,20 +245,20 @@ if ($action == 'set_thirdparty') exit; } -if ($action == 'classin') +else if ($action == 'classin') { $object->fetch($id); $object->setProject($_POST['projectid']); } -if ($action == 'setmode') +else if ($action == 'setmode') { $object->fetch($id); $result = $object->setPaymentMethods(GETPOST('mode_reglement_id','int')); if ($result < 0) dol_print_error($db,$object->error); } -if ($action == 'setinvoicedate') +else if ($action == 'setinvoicedate') { $object->fetch($id); $object->date=dol_mktime(12,0,0,$_POST['invoicedatemonth'],$_POST['invoicedateday'],$_POST['invoicedateyear']); @@ -267,16 +267,7 @@ if ($action == 'setinvoicedate') if ($result < 0) dol_print_error($db,$object->error); } -// TODO obsolete ? not used -if ($action == 'setpaymentterm') -{ - $object->fetch($id); - $date_lim_reglement=dol_mktime(12,0,0,$_POST['paymenttermmonth'],$_POST['paymenttermday'],$_POST['paymenttermyear']); - $result=$object->cond_reglement($object->cond_reglement_id,$date_lim_reglement); - if ($result < 0) dol_print_error($db,$object->error); -} - -if ($action == 'setconditions') +else if ($action == 'setconditions') { $object->fetch($id); $result=$object->setPaymentTerms(GETPOST('cond_reglement_id','int')); @@ -289,7 +280,7 @@ if ($action == 'setremisepercent' && $user->rights->facture->creer) $result = $object->set_remise($user, $_POST['remise_percent']); } -if ($action == "setabsolutediscount" && $user->rights->facture->creer) +else if ($action == "setabsolutediscount" && $user->rights->facture->creer) { // POST[remise_id] ou POST[remise_id_for_payment] if (! empty($_POST["remise_id"])) @@ -322,14 +313,14 @@ if ($action == "setabsolutediscount" && $user->rights->facture->creer) } } -if ($action == 'set_ref_client') +else if ($action == 'set_ref_client') { $object->fetch($id); $object->set_ref_client($_POST['ref_client']); } // Classify to validated -if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->facture->valider) +else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->facture->valider) { $idwarehouse=GETPOST('idwarehouse'); @@ -376,7 +367,7 @@ if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->facture->v } // Go back to draft status (unvalidate) -if ($action == 'confirm_modif' && ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->facture->valider) || $user->rights->facture->invoice_advance->unvalidate)) +else if ($action == 'confirm_modif' && ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->facture->valider) || $user->rights->facture->invoice_advance->unvalidate)) { $idwarehouse=GETPOST('idwarehouse'); @@ -449,13 +440,13 @@ if ($action == 'confirm_modif' && ((empty($conf->global->MAIN_USE_ADVANCED_PERMS } // Classify "paid" -if ($action == 'confirm_paid' && $confirm == 'yes' && $user->rights->facture->paiement) +else if ($action == 'confirm_paid' && $confirm == 'yes' && $user->rights->facture->paiement) { $object->fetch($id); $result = $object->set_paid($user); } // Classif "paid partialy" -if ($action == 'confirm_paid_partially' && $confirm == 'yes' && $user->rights->facture->paiement) +else if ($action == 'confirm_paid_partially' && $confirm == 'yes' && $user->rights->facture->paiement) { $object->fetch($id); $close_code=$_POST["close_code"]; @@ -470,7 +461,7 @@ if ($action == 'confirm_paid_partially' && $confirm == 'yes' && $user->rights->f } } // Classify "abandoned" -if ($action == 'confirm_canceled' && $confirm == 'yes') +else if ($action == 'confirm_canceled' && $confirm == 'yes') { $object->fetch($id); $close_code=$_POST["close_code"]; @@ -486,7 +477,7 @@ if ($action == 'confirm_canceled' && $confirm == 'yes') } // Convertir en reduc -if ($action == 'confirm_converttoreduc' && $confirm == 'yes' && $user->rights->facture->creer) +else if ($action == 'confirm_converttoreduc' && $confirm == 'yes' && $user->rights->facture->creer) { $db->begin(); @@ -561,7 +552,7 @@ if ($action == 'confirm_converttoreduc' && $confirm == 'yes' && $user->rights->f /* * Insert new invoice in database */ -if ($action == 'add' && $user->rights->facture->creer) +else if ($action == 'add' && $user->rights->facture->creer) { $object->socid=GETPOST('socid','int'); @@ -922,7 +913,7 @@ if ($action == 'add' && $user->rights->facture->creer) } // Add a new line -if (($action == 'addline' || $action == 'addline_predef') && $user->rights->facture->creer) +else if (($action == 'addline' || $action == 'addline_predef') && $user->rights->facture->creer) { $result=0; @@ -1130,7 +1121,7 @@ if (($action == 'addline' || $action == 'addline_predef') && $user->rights->fact $action=''; } -if ($action == 'updateligne' && $user->rights->facture->creer && $_POST['save'] == $langs->trans('Save')) +else if ($action == 'updateligne' && $user->rights->facture->creer && $_POST['save'] == $langs->trans('Save')) { if (! $object->fetch($id) > 0) dol_print_error($db); $object->fetch_thirdparty(); @@ -1218,15 +1209,14 @@ if ($action == 'updateligne' && $user->rights->facture->creer && $_POST['save'] } } -if ($action == 'updateligne' && $user->rights->facture->creer && $_POST['cancel'] == $langs->trans('Cancel')) +else if ($action == 'updateligne' && $user->rights->facture->creer && $_POST['cancel'] == $langs->trans('Cancel')) { Header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id); // Pour reaffichage de la fiche en cours d'edition exit; } - // Modify line position (up) -if ($action == 'up' && $user->rights->facture->creer) +else if ($action == 'up' && $user->rights->facture->creer) { $object->fetch($id); $object->fetch_thirdparty(); @@ -1248,7 +1238,7 @@ if ($action == 'up' && $user->rights->facture->creer) exit; } // Modify line position (down) -if ($action == 'down' && $user->rights->facture->creer) +else if ($action == 'down' && $user->rights->facture->creer) { $object->fetch($id); $object->fetch_thirdparty(); @@ -1478,7 +1468,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO /* * Generate document */ -if (GETPOST('action') == 'builddoc') // En get ou en post +else if ($action == 'builddoc') // En get ou en post { $object->fetch($id); $object->fetch_thirdparty(); diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index d5247846507..dad4757f61d 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -2686,93 +2686,6 @@ class Facture extends CommonObject } } - /** - * Change les conditions de reglement de la facture - * - * @param int $cond_reglement_id Id de la nouvelle condition de reglement - * @param date $date Date to force payment term - * @return int >0 si ok, <0 si ko - * TODO deprecated, not used - */ - function cond_reglement($cond_reglement_id,$date='') - { - if ($this->statut >= 0 && $this->paye == 0) - { - // Define cond_reglement_id and datelim - if (strval($date) != '') - { - $datelim=$date; - $cond_reglement_id=0; - } - else - { - $datelim=$this->calculate_date_lim_reglement($cond_reglement_id); - $cond_reglement_id=$cond_reglement_id; - } - - $sql = 'UPDATE '.MAIN_DB_PREFIX.'facture'; - $sql.= ' SET fk_cond_reglement = '.$cond_reglement_id.','; - $sql.= ' date_lim_reglement='.$this->db->idate($datelim); - $sql.= ' WHERE rowid='.$this->id; - - dol_syslog(get_class($this)."::cond_reglement sql=".$sql, LOG_DEBUG); - if ( $this->db->query($sql) ) - { - $this->cond_reglement_id = $cond_reglement_id; - return 1; - } - else - { - dol_syslog(get_class($this)."::cond_reglement Erreur ".$sql.' - '.$this->db->error()); - $this->error=$this->db->error(); - return -1; - } - } - else - { - dol_syslog(get_class($this)."::cond_reglement, etat facture incompatible"); - $this->error='Entity status not compatible '.$this->statut.' '.$this->paye; - return -2; - } - } - - - /** - * Change le mode de reglement - * - * @param int $mode_reglement_id Id du nouveau mode - * @return int >0 if OK, <0 if KO - * TODO deprecated - */ - function mode_reglement($mode_reglement_id) - { - dol_syslog(get_class($this).'::mode_reglement('.$mode_reglement_id.')', LOG_DEBUG); - if ($this->statut >= 0 && $this->paye == 0) - { - $sql = 'UPDATE '.MAIN_DB_PREFIX.'facture'; - $sql .= ' SET fk_mode_reglement = '.$mode_reglement_id; - $sql .= ' WHERE rowid='.$this->id; - if ( $this->db->query($sql) ) - { - $this->mode_reglement_id = $mode_reglement_id; - return 1; - } - else - { - dol_syslog(get_class($this).'::mode_reglement Erreur '.$sql.' - '.$this->db->error()); - $this->error=$this->db->error(); - return -1; - } - } - else - { - dol_syslog(get_class($this).'::mode_reglement, etat facture incompatible'); - $this->error='Etat facture incompatible '.$this->statut.' '.$this->paye; - return -2; - } - } - - /** * Renvoi si les lignes de facture sont ventilees et/ou exportees en compta * diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 8df1964c1de..497607988e8 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -942,6 +942,33 @@ abstract class CommonObject } } + /** + * Define delivery address + * + * @param int $id Address id + * @return int <0 si ko, >0 si ok + */ + function setDeliveryAddress($id) + { + $fieldname = 'fk_adresse_livraison'; + if ($this->element == 'delivery' || $this->element == 'shipping') $fieldname = 'fk_address'; + + $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ".$fieldname." = ".$id; + $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0"; + + if ($this->db->query($sql)) + { + $this->fk_delivery_address = $id; + return 1; + } + else + { + $this->error=$this->db->error(); + dol_syslog(get_class($this).'::setDeliveryAddress Erreur '.$sql.' - '.$this->error); + return -1; + } + } + /** * Set last model used by doc generator * diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php index c1640110553..1c70695994c 100644 --- a/htdocs/core/class/html.formother.class.php +++ b/htdocs/core/class/html.formother.class.php @@ -733,6 +733,8 @@ class FormOther function form_address($page, $selected, $socid, $htmlname='address_id', $origin='', $originid='') { global $langs,$conf; + global $form; + if ($htmlname != "none") { print ''; @@ -740,7 +742,7 @@ class FormOther print ''; print ''; print ''; print ''; // Delivery address - if (($origin == 'commande' && $conf->global->COMMANDE_ADD_DELIVERY_ADDRESS) - || ($origin == 'propal' && $conf->global->PROPAL_ADD_DELIVERY_ADDRESS)) + if ($conf->global->COMMANDE_ADD_DELIVERY_ADDRESS || $conf->global->PROPAL_ADD_DELIVERY_ADDRESS) { - print ''; - print ''."\n"; + print ''; } // Weight diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php index a7d9837eccb..5937cfba590 100644 --- a/htdocs/expedition/shipment.php +++ b/htdocs/expedition/shipment.php @@ -18,15 +18,12 @@ * along with this program. If not, see . */ -// Code identique a /expedition/fiche.php - /** * \file htdocs/expedition/shipment.php * \ingroup expedition */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php"); @@ -100,7 +97,7 @@ if ($action == 'setdeliveryaddress' && $user->rights->commande->creer) { $commande = new Commande($db); $commande->fetch($id); - $commande->set_adresse_livraison($user,GETPOST('delivery_address_id','int')); + $commande->setDeliveryAddress(GETPOST('delivery_address_id','int')); } if ($action == 'setmode' && $user->rights->commande->creer) @@ -127,7 +124,6 @@ if ($action == 'setconditions' && $user->rights->commande->creer) $form = new Form($db); $formfile = new FormFile($db); -$formother = new FormOther($db); $formproduct = new FormProduct($db); llxHeader('',$langs->trans('OrderCard'),''); @@ -274,29 +270,6 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; - // Delivery address - if ($conf->global->COMMANDE_ADD_DELIVERY_ADDRESS) - { - print ''; - } - // Terms of payment print '
'; - $this->select_address($selected, $socid, $htmlname, 1); + $form->select_address($selected, $socid, $htmlname, 1); print ''; $langs->load("companies"); diff --git a/htdocs/core/lib/contract.lib.php b/htdocs/core/lib/contract.lib.php index 3935101916a..32530b5878d 100644 --- a/htdocs/core/lib/contract.lib.php +++ b/htdocs/core/lib/contract.lib.php @@ -40,7 +40,7 @@ function contract_prepare_head($object) $h++; $head[$h][0] = DOL_URL_ROOT.'/contrat/contact.php?id='.$object->id; - $head[$h][1] = $langs->trans("ContractContacts"); + $head[$h][1] = $langs->trans("ContactsAddresses"); $head[$h][2] = 'contact'; $h++; diff --git a/htdocs/core/lib/fourn.lib.php b/htdocs/core/lib/fourn.lib.php index 3ceea772fdf..257d9b34e3d 100644 --- a/htdocs/core/lib/fourn.lib.php +++ b/htdocs/core/lib/fourn.lib.php @@ -41,7 +41,7 @@ function facturefourn_prepare_head($object) $h++; $head[$h][0] = DOL_URL_ROOT.'/fourn/facture/contact.php?facid='.$object->id; - $head[$h][1] = $langs->trans('BillContacts'); + $head[$h][1] = $langs->trans('ContactsAddresses'); $head[$h][2] = 'contact'; $h++; @@ -101,7 +101,7 @@ function ordersupplier_prepare_head($object) } $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/contact.php?id='.$object->id; - $head[$h][1] = $langs->trans('OrderContact'); + $head[$h][1] = $langs->trans('ContactsAddresses'); $head[$h][2] = 'contact'; $h++; diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php index 7dbd628e82d..82987aa7547 100644 --- a/htdocs/core/lib/invoice.lib.php +++ b/htdocs/core/lib/invoice.lib.php @@ -40,7 +40,7 @@ function facture_prepare_head($object) $h++; $head[$h][0] = DOL_URL_ROOT.'/compta/facture/contact.php?facid='.$object->id; - $head[$h][1] = $langs->trans('BillContacts'); + $head[$h][1] = $langs->trans('ContactsAddresses'); $head[$h][2] = 'contact'; $h++; diff --git a/htdocs/core/lib/order.lib.php b/htdocs/core/lib/order.lib.php index 2f8cfe7fd36..a15016e370d 100644 --- a/htdocs/core/lib/order.lib.php +++ b/htdocs/core/lib/order.lib.php @@ -69,7 +69,7 @@ function commande_prepare_head($object) } $head[$h][0] = DOL_URL_ROOT.'/commande/contact.php?id='.$object->id; - $head[$h][1] = $langs->trans('OrderContact'); + $head[$h][1] = $langs->trans('ContactsAddresses'); $head[$h][2] = 'contact'; $h++; diff --git a/htdocs/core/lib/propal.lib.php b/htdocs/core/lib/propal.lib.php index f2a76f7b542..9b86b373925 100644 --- a/htdocs/core/lib/propal.lib.php +++ b/htdocs/core/lib/propal.lib.php @@ -64,7 +64,7 @@ function propal_prepare_head($object) } $head[$h][0] = DOL_URL_ROOT.'/comm/propal/contact.php?id='.$object->id; - $head[$h][1] = $langs->trans('ProposalContact'); + $head[$h][1] = $langs->trans('ContactsAddresses'); $head[$h][2] = 'contact'; $h++; diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index 8ce041038dd..e275178d8ae 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -2,7 +2,7 @@ /* Copyright (C) 2003-2008 Rodolphe Quiedeville * Copyright (C) 2005-2010 Laurent Destailleur * Copyright (C) 2005 Simon TOSSER - * Copyright (C) 2005-2011 Regis Houssin + * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2011-2012 Juanjo Menent * * This program is free software; you can redistribute it and/or modify @@ -19,8 +19,6 @@ * along with this program. If not, see . */ -// Code identique a /expedition/shipment.php - /** * \file htdocs/expedition/fiche.php * \ingroup expedition @@ -164,7 +162,7 @@ if ($action == 'add') /* * Build a receiving receipt */ -if ($action == 'create_delivery' && $conf->livraison_bon->enabled && $user->rights->expedition->livraison->creer) +else if ($action == 'create_delivery' && $conf->livraison_bon->enabled && $user->rights->expedition->livraison->creer) { $object->fetch($id); $result = $object->create_delivery($user); @@ -179,7 +177,7 @@ if ($action == 'create_delivery' && $conf->livraison_bon->enabled && $user->righ } } -if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->expedition->valider) +else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->expedition->valider) { $object->fetch($id); $object->fetch_thirdparty(); @@ -208,7 +206,7 @@ if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->expedition } } -if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expedition->supprimer) +else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expedition->supprimer) { $object->fetch($id); $result = $object->delete(); @@ -223,7 +221,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expeditio } } -if ($action == 'reopen' && $user->rights->expedition->valider) +else if ($action == 'reopen' && $user->rights->expedition->valider) { $object->fetch($id); $result = $object->setStatut(0); @@ -233,7 +231,7 @@ if ($action == 'reopen' && $user->rights->expedition->valider) } } -if ($action == 'setdate_livraison' && $user->rights->expedition->creer) +else if ($action == 'setdate_livraison' && $user->rights->expedition->creer) { //print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year']; $datedelivery=dol_mktime(GETPOST('liv_hour','int'), GETPOST('liv_min','int'), 0, GETPOST('liv_month','int'), GETPOST('liv_day','int'), GETPOST('liv_year','int')); @@ -247,7 +245,7 @@ if ($action == 'setdate_livraison' && $user->rights->expedition->creer) } // Action update description of emailing -if ($action == 'settrackingnumber' || $action == 'settrackingurl' +else if ($action == 'settrackingnumber' || $action == 'settrackingurl' || $action == 'settrueWeight' || $action == 'settrueWidth' || $action == 'settrueHeight' @@ -286,7 +284,7 @@ if ($action == 'settrackingnumber' || $action == 'settrackingurl' /* * Build doc */ -if ($action == 'builddoc') // En get ou en post +else if ($action == 'builddoc') // En get ou en post { // Sauvegarde le dernier modele choisi pour generer un document @@ -505,12 +503,20 @@ if ($action == 'send' && ! GETPOST('addfile','alpha') && ! GETPOST('removedfile' } } -if ($action == 'classifybilled') +else if ($action == 'classifybilled') { $object->fetch($id); $object->set_billed(); } +else if ($action == 'setaddress' && $user->rights->expedition->creer) +{ + $object->fetch($id); + $result=$object->setDeliveryAddress($_POST['fk_address']); + if ($result < 0) dol_print_error($db,$object->error); +} + + /* * View */ @@ -1036,16 +1042,26 @@ else print '
'.$langs->trans('DeliveryAddress').''; - if (!empty($object->fk_delivery_address)) - { - $formother->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,$object->deliveryaddress->socid,'none','shipment',$object->id); - } - print '
'; + print ''; + + if ($action != 'editdelivery_address' && $object->brouillon) print ''; + print '
'; + print $langs->trans('DeliveryAddress'); + print 'socid.'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetDeliveryAddress'),1).'
'; + print '		'; + + if ($action == 'editdelivery_address') + { + $formother->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,$object->socid,'fk_address','shipment',$object->id); + } + else + { + $formother->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,$object->socid,'none','shipment',$object->id); + } + print '
'; - print ''; - - if ($action != 'editdelivery_adress' && $commande->brouillon) print ''; - print '
'; - print $langs->trans('DeliveryAddress'); - print 'socid.'&id='.$commande->id.'">'.img_edit($langs->trans('SetDeliveryAddress'),1).'
'; - print '		'; - - if ($action == 'editdelivery_adress') - { - $formother->form_address($_SERVER['PHP_SELF'].'?id='.$commande->id,$commande->fk_delivery_address,GETPOST('socid','int'),'delivery_address_id','commande',$commande->id); - } - else - { - $formother->form_address($_SERVER['PHP_SELF'].'?id='.$commande->id,$commande->fk_delivery_address,GETPOST('socid','int'),'none','commande',$commande->id); - } - print '
'; print '
'; diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index acde026bdee..a3493d142f4 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -1300,76 +1300,6 @@ class CommandeFournisseur extends Commande } } - /** - * Change les conditions de reglement de la commande - * - * @param int $cond_reglement_id Id de la nouvelle condition de reglement - * @return int >0 si ok, <0 si ko - * TODO deprecated - */ - function cond_reglement($cond_reglement_id) - { - dol_syslog('CommandeFournisseur::cond_reglement('.$cond_reglement_id.')'); - if ($this->statut >= 0) - { - $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande_fournisseur'; - $sql .= ' SET fk_cond_reglement = '.$cond_reglement_id; - $sql .= ' WHERE rowid='.$this->id; - if ( $this->db->query($sql) ) - { - $this->cond_reglement_id = $cond_reglement_id; - return 1; - } - else - { - dol_syslog('CommandeFournisseur::cond_reglement Erreur '.$sql.' - '.$this->db->error(), LOG_ERR); - $this->error=$this->db->lasterror(); - return -1; - } - } - else - { - dol_syslog('CommandeFournisseur::cond_reglement, etat commande incompatible', LOG_ERR); - $this->error='Etat commande incompatible '.$this->statut; - return -2; - } - } - - /** - * Change le mode de reglement - * - * @param int $mode_reglement_id Id du nouveau mode - * @return int >0 if OK, <0 if KO - * TODO deprecated - */ - function mode_reglement($mode_reglement_id) - { - dol_syslog('CommandeFournisseur::mode_reglement('.$mode_reglement_id.')'); - if ($this->statut >= 0) - { - $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande_fournisseur'; - $sql .= ' SET fk_mode_reglement = '.$mode_reglement_id; - $sql .= ' WHERE rowid='.$this->id; - if ( $this->db->query($sql) ) - { - $this->mode_reglement_id = $mode_reglement_id; - return 1; - } - else - { - dol_syslog('CommandeFournisseur::mode_reglement Erreur '.$sql.' - '.$this->db->error(), LOG_ERR); - $this->error=$this->db->lasterror(); - return -1; - } - } - else - { - dol_syslog('CommandeFournisseur::mode_reglement, etat commande incompatible', LOG_ERR); - $this->error='Etat commande incompatible '.$this->statut; - return -2; - } - } - /** * Set a delivery in database for this supplier order * diff --git a/htdocs/langs/ar_SA/bills.lang b/htdocs/langs/ar_SA/bills.lang index f584f0f18da..f7f424ffc82 100644 --- a/htdocs/langs/ar_SA/bills.lang +++ b/htdocs/langs/ar_SA/bills.lang @@ -51,8 +51,7 @@ CustomersInvoices=العملاء والفواتير SupplierInvoice=فاتورة المورد SuppliersInvoices=الموردين SupplierBill=فاتورة المورد -SupplierBills=فواتير الموردين -BillContacts=فاتورة الاتصالات +SupplierBills=فاتورة الاتصالات Payment=الدفع PaymentBack=دفع العودة Payments=المدفوعات diff --git a/htdocs/langs/ar_SA/contracts.lang b/htdocs/langs/ar_SA/contracts.lang index d06b306daae..ffbb28a3470 100644 --- a/htdocs/langs/ar_SA/contracts.lang +++ b/htdocs/langs/ar_SA/contracts.lang @@ -30,7 +30,6 @@ ServiceStatusClosed=مغلقة ServicesLegend=خدمات أسطورة Contracts=عقود Contract=العقد -ContractContacts=عقد اتصالات NoContracts=أي عقود MenuServices=الخدمات MenuInactiveServices=الخدمات غير الفعالة diff --git a/htdocs/langs/ar_SA/orders.lang b/htdocs/langs/ar_SA/orders.lang index 728d24bd2cc..24ddf0043ca 100644 --- a/htdocs/langs/ar_SA/orders.lang +++ b/htdocs/langs/ar_SA/orders.lang @@ -16,7 +16,6 @@ Order=ترتيب Orders=أوامر OrderLine=من أجل خط OrderFollow=متابعة -OrderContact=من أجل الاتصال OrderDate=من أجل التاريخ NewOrder=النظام الجديد ToOrder=ومن أجل جعل diff --git a/htdocs/langs/ar_SA/propal.lang b/htdocs/langs/ar_SA/propal.lang index 964f76e12ba..7b66a9c6c1b 100644 --- a/htdocs/langs/ar_SA/propal.lang +++ b/htdocs/langs/ar_SA/propal.lang @@ -18,7 +18,6 @@ ProposalsOpened=افتتح مقترحات تجارية Prop=مقترحات تجارية CommercialProposal=اقتراح التجارية CommercialProposals=مقترحات تجارية -ProposalContact=اقتراح الاتصال NewProp=التجاري الجديد المقترح NewProposal=التجاري الجديد المقترح NewPropal=اقتراح جديد diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang index 0c2333182d3..b2ffc80b8d7 100644 --- a/htdocs/langs/ca_ES/bills.lang +++ b/htdocs/langs/ca_ES/bills.lang @@ -50,7 +50,6 @@ SupplierInvoice=Factura de proveïdor SuppliersInvoices=Factures de proveïdors SupplierBill=Factura de proveïdor SupplierBills=Factures de proveïdors -BillContacts=Contactes factura Payment=Pagament PaymentBack=Reembossament Payments=Pagaments diff --git a/htdocs/langs/ca_ES/contracts.lang b/htdocs/langs/ca_ES/contracts.lang index fdfb72003a4..36a951891cb 100644 --- a/htdocs/langs/ca_ES/contracts.lang +++ b/htdocs/langs/ca_ES/contracts.lang @@ -21,7 +21,6 @@ ServiceStatusClosed=Tancat ServicesLegend=Llegenda per als serveis Contracts=Contractes Contract=Contracte -ContractContacts=Contactes contracte NoContracts=Sense contractes MenuServices=Serveis MenuInactiveServices=Serveis inactius diff --git a/htdocs/langs/ca_ES/orders.lang b/htdocs/langs/ca_ES/orders.lang index 51a50b1b1be..8f0a392f6c8 100644 --- a/htdocs/langs/ca_ES/orders.lang +++ b/htdocs/langs/ca_ES/orders.lang @@ -7,7 +7,6 @@ Order=Comanda Orders=Comandes OrderLine=Línia de comanda OrderFollow=Seguiment -OrderContact=Contactes comanda OrderDate=Data comanda OrderToProcess=Comanda a processar NewOrder=Nova comanda diff --git a/htdocs/langs/ca_ES/propal.lang b/htdocs/langs/ca_ES/propal.lang index 6c7668c2cf3..16c641102a9 100644 --- a/htdocs/langs/ca_ES/propal.lang +++ b/htdocs/langs/ca_ES/propal.lang @@ -10,7 +10,6 @@ CommercialProposal=Pressupost CommercialProposals=Pressupostos ProposalsOpened=Pressupostos oberts ProposalCard=Fitxa pressupost -ProposalContact=Contacte pressupost NewProp=Nou pressupost NewProposal=Nou pressupost NewPropal=Nou pressupost diff --git a/htdocs/langs/da_DK/bills.lang b/htdocs/langs/da_DK/bills.lang index 2dec28a77b7..84fb4131547 100644 --- a/htdocs/langs/da_DK/bills.lang +++ b/htdocs/langs/da_DK/bills.lang @@ -47,7 +47,6 @@ SupplierInvoice=Leverandør faktura SuppliersInvoices=Leverandørernes fakturaer SupplierBill=Leverandør faktura SupplierBills=leverandører fakturaer -BillContacts=Faktura kontakter Payment=Betaling PaymentBack=Betaling tilbage Payments=Betalinger diff --git a/htdocs/langs/da_DK/contracts.lang b/htdocs/langs/da_DK/contracts.lang index 82a295cb25d..77f50091ad8 100644 --- a/htdocs/langs/da_DK/contracts.lang +++ b/htdocs/langs/da_DK/contracts.lang @@ -29,7 +29,6 @@ ServiceStatusClosed=Lukket ServicesLegend=Services legend Contracts=Kontrakter Contract=Kontrakt -ContractContacts=Kontrakt kontakter NoContracts=Nr. kontrakter MenuServices=Services MenuInactiveServices=Tjenester, der ikke er aktive diff --git a/htdocs/langs/da_DK/orders.lang b/htdocs/langs/da_DK/orders.lang index 35cd08c7158..215b31a4ef2 100644 --- a/htdocs/langs/da_DK/orders.lang +++ b/htdocs/langs/da_DK/orders.lang @@ -17,7 +17,6 @@ OrderCard=Bestil kort Order=Rækkefølge Orders=Ordrer OrderFollow=Opfølgning -OrderContact=Bestil kontakt OrderDate=Bestil dato NewOrder=Ny ordre ToOrder=Foretag orden diff --git a/htdocs/langs/da_DK/propal.lang b/htdocs/langs/da_DK/propal.lang index 107e73a4be4..bd3dad467da 100644 --- a/htdocs/langs/da_DK/propal.lang +++ b/htdocs/langs/da_DK/propal.lang @@ -19,7 +19,6 @@ ProposalsOpened=Åbnet kommercielle forslag Prop=Kommerciel forslag CommercialProposal=Kommerciel forslag CommercialProposals=Kommerciel forslag -ProposalContact=Forslag kontakt NewProp=Nye kommercielle forslag NewProposal=Nye kommercielle forslag NewPropal=Nyt forslag diff --git a/htdocs/langs/de_AT/bills.lang b/htdocs/langs/de_AT/bills.lang index 4ae1d7e3e95..d5bb8e05518 100644 --- a/htdocs/langs/de_AT/bills.lang +++ b/htdocs/langs/de_AT/bills.lang @@ -42,7 +42,6 @@ SupplierInvoice=Lieferantenrechnung SuppliersInvoices=Lieferantenrechnungen SupplierBill=Lieferantenrechnung SupplierBills=Lieferantenrechnungen -BillContacts=Rechnungskontakte Payment=Zahlung PaymentBack=Rückzahlung Payments=Zahlungen diff --git a/htdocs/langs/de_AT/contracts.lang b/htdocs/langs/de_AT/contracts.lang index 9d90a2315e8..3cc0a34faf1 100644 --- a/htdocs/langs/de_AT/contracts.lang +++ b/htdocs/langs/de_AT/contracts.lang @@ -24,7 +24,6 @@ ServiceStatusClosed=Geschlossen ServicesLegend=Services Legende Contracts=Verträge Contract=Vertrag -ContractContacts=Vertragskontakt NoContracts=Keine Verträge MenuServices=Services MenuInactiveServices=Inaktive Services diff --git a/htdocs/langs/de_AT/orders.lang b/htdocs/langs/de_AT/orders.lang index 9612030c25c..ab07f1cd6f3 100644 --- a/htdocs/langs/de_AT/orders.lang +++ b/htdocs/langs/de_AT/orders.lang @@ -12,7 +12,6 @@ OrderCard=Bestell-Karte Order=Bestellung Orders=Bestellungen OrderFollow=Follow-up -OrderContact=Bestellkontakt OrderDate=Bestelldatum NewOrder=Neue Bestellung ToOrder=Erzeuge Bestellung diff --git a/htdocs/langs/de_AT/propal.lang b/htdocs/langs/de_AT/propal.lang index 4e7b42327b1..1f9223b00d6 100644 --- a/htdocs/langs/de_AT/propal.lang +++ b/htdocs/langs/de_AT/propal.lang @@ -14,7 +14,6 @@ ProposalsOpened=Offene Angebote Prop=Angebot CommercialProposal=Angebot CommercialProposals=Angebote -ProposalContact=Angebotskontakt NewProp=Neues Angebot NewProposal=Neues Angebot NewPropal=Neues Angebot diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang index 22169ac4b48..393aeb97989 100644 --- a/htdocs/langs/de_DE/bills.lang +++ b/htdocs/langs/de_DE/bills.lang @@ -42,7 +42,6 @@ SupplierInvoice=Lieferantenrechnung SuppliersInvoices=Lieferantenrechnungen SupplierBill=Lieferantenrechnung SupplierBills=Lieferantenrechnungen -BillContacts=Rechnungskontakte Payment=Zahlung PaymentBack=Rückzahlung Payments=Zahlungen diff --git a/htdocs/langs/de_DE/contracts.lang b/htdocs/langs/de_DE/contracts.lang index dc93f355b07..30a5ba30f7c 100644 --- a/htdocs/langs/de_DE/contracts.lang +++ b/htdocs/langs/de_DE/contracts.lang @@ -24,7 +24,6 @@ ServiceStatusClosed=Geschlossen ServicesLegend=Services Legende Contracts=Verträge Contract=Vertrag -ContractContacts=Vertragskontakt NoContracts=Keine Verträge MenuServices=Services MenuInactiveServices=Inaktive Services diff --git a/htdocs/langs/de_DE/orders.lang b/htdocs/langs/de_DE/orders.lang index 59df24ba1db..6ee2a3da2e4 100644 --- a/htdocs/langs/de_DE/orders.lang +++ b/htdocs/langs/de_DE/orders.lang @@ -12,7 +12,6 @@ OrderCard=Bestell-Karte Order=Bestellung Orders=Bestellungen OrderFollow=Follow-up -OrderContact=Bestellkontakt OrderDate=Bestelldatum NewOrder=Neue Bestellung ToOrder=Erzeuge Bestellung diff --git a/htdocs/langs/de_DE/propal.lang b/htdocs/langs/de_DE/propal.lang index 234439168d3..c4a770ba356 100644 --- a/htdocs/langs/de_DE/propal.lang +++ b/htdocs/langs/de_DE/propal.lang @@ -14,7 +14,6 @@ ProposalsOpened=Offene Angebote Prop=Angebot CommercialProposal=Angebot CommercialProposals=Angebote -ProposalContact=Angebotskontakt NewProp=Neues Angebot NewProposal=Neues Angebot NewPropal=Neues Angebot diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang index 1e2b576c6f2..6916832a169 100644 --- a/htdocs/langs/el_GR/bills.lang +++ b/htdocs/langs/el_GR/bills.lang @@ -50,7 +50,6 @@ SupplierInvoice=Τιμολόγιο Προμηθευτή SuppliersInvoices=Τιμολόγια Προμηθευτή SupplierBill=Τιμολόγιο Προμηθευτή SupplierBills=Τιμολόγια Προμηθευτή -BillContacts=Πρόσωπο Επικοινωνίας Payment=Πληρωμή PaymentBack=Payment back Payments=Πληρωμές diff --git a/htdocs/langs/el_GR/contracts.lang b/htdocs/langs/el_GR/contracts.lang index 3c96716c7a6..510db206d07 100644 --- a/htdocs/langs/el_GR/contracts.lang +++ b/htdocs/langs/el_GR/contracts.lang @@ -21,7 +21,6 @@ ServiceStatusClosed=Τερματισμένη ServicesLegend=Services legend Contracts=Συμβόλαια Contract=Συμβόλαιο -ContractContacts=Contract contacts NoContracts=Κανένα Συμβόλαιο MenuServices=Υπηρεσίες MenuInactiveServices=Ανενεργές Υπηρεσίες diff --git a/htdocs/langs/el_GR/orders.lang b/htdocs/langs/el_GR/orders.lang index 89cfc73fc4a..7255a4c309a 100644 --- a/htdocs/langs/el_GR/orders.lang +++ b/htdocs/langs/el_GR/orders.lang @@ -7,7 +7,6 @@ Order=Παραγγελία Orders=Παραγγελίες OrderLine=Γραμμή Παραγγελίας OrderFollow=Follow up -OrderContact=Πρόσωπο Επικοιν. παραγγελίας OrderDate=Ημερομηνία παραγγελίας OrderToProcess=Παραγγελία προς επεξεργασία NewOrder=Νέα παραγγελία diff --git a/htdocs/langs/el_GR/propal.lang b/htdocs/langs/el_GR/propal.lang index 91846c0cb33..51c3c96020c 100644 --- a/htdocs/langs/el_GR/propal.lang +++ b/htdocs/langs/el_GR/propal.lang @@ -10,7 +10,6 @@ Prop=Εμπορικές προτάσεις CommercialProposal=Εμπορική πρόταση CommercialProposals=Εμπορικές προτάσεις ProposalCard=Καρτέλα πρότασης -ProposalContact=Αντιπρόσωπος πρότασης NewProp=Νέα εμπορική πρόταση NewProposal=Νέα εμπορική πρόταση NewPropal=Νέα πρόταση diff --git a/htdocs/langs/en_IN/propal.lang b/htdocs/langs/en_IN/propal.lang index 30a57daa8d4..c78b2735fef 100644 --- a/htdocs/langs/en_IN/propal.lang +++ b/htdocs/langs/en_IN/propal.lang @@ -10,7 +10,6 @@ Prop=Quotations CommercialProposal=Quotation CommercialProposals=Quotations ProposalCard=Quotation card -ProposalContact=Quotation contact NewProp=New quotation NewProposal=New quotation NewPropal=New quotation diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 30474978c8e..3b758e008ce 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -54,7 +54,6 @@ SupplierInvoice=Supplier invoice SuppliersInvoices=Supplier's invoices SupplierBill=Supplier invoice SupplierBills=suppliers invoices -BillContacts=Invoice contacts Payment=Payment PaymentBack=Payment back Payments=Payments diff --git a/htdocs/langs/en_US/contracts.lang b/htdocs/langs/en_US/contracts.lang index c15fd25536d..0412c3887ff 100644 --- a/htdocs/langs/en_US/contracts.lang +++ b/htdocs/langs/en_US/contracts.lang @@ -21,7 +21,6 @@ ServiceStatusClosed=Closed ServicesLegend=Services legend Contracts=Contracts Contract=Contract -ContractContacts=Contract contacts NoContracts=No contracts MenuServices=Services MenuInactiveServices=Services not active diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang index 0ce6f1462f6..57a47022b94 100644 --- a/htdocs/langs/en_US/orders.lang +++ b/htdocs/langs/en_US/orders.lang @@ -7,7 +7,6 @@ Order=Order Orders=Orders OrderLine=Order line OrderFollow=Follow up -OrderContact=Order contact OrderDate=Order date OrderToProcess=Order to process NewOrder=New order diff --git a/htdocs/langs/en_US/propal.lang b/htdocs/langs/en_US/propal.lang index ac4e125eeb5..78119f38ebb 100644 --- a/htdocs/langs/en_US/propal.lang +++ b/htdocs/langs/en_US/propal.lang @@ -10,7 +10,6 @@ Prop=Commercial proposals CommercialProposal=Commercial proposal CommercialProposals=Commercial proposals ProposalCard=Proposal card -ProposalContact=Proposal contact NewProp=New commercial proposal NewProposal=New commercial proposal NewPropal=New proposal diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang index e51b916dc7b..f9ec10c826f 100644 --- a/htdocs/langs/es_ES/bills.lang +++ b/htdocs/langs/es_ES/bills.lang @@ -50,7 +50,6 @@ SupplierInvoice=Factura de proveedor SuppliersInvoices=Facturas de proveedores SupplierBill=Factura de proveedor SupplierBills=Facturas de proveedores -BillContacts=Contactos factura Payment=Pago PaymentBack=Reembolso Payments=Pagos diff --git a/htdocs/langs/es_ES/contracts.lang b/htdocs/langs/es_ES/contracts.lang index 12298ce4ca6..0509a2951ae 100644 --- a/htdocs/langs/es_ES/contracts.lang +++ b/htdocs/langs/es_ES/contracts.lang @@ -21,7 +21,6 @@ ServiceStatusClosed=Cerrado ServicesLegend=Leyenda para los servicios Contracts=Contratos Contract=Contrato -ContractContacts=Contactos contrato NoContracts=Sin contratos MenuServices=Servicios MenuInactiveServices=Servicios inactivos diff --git a/htdocs/langs/es_ES/orders.lang b/htdocs/langs/es_ES/orders.lang index c9375a4ce03..2cc068560d2 100644 --- a/htdocs/langs/es_ES/orders.lang +++ b/htdocs/langs/es_ES/orders.lang @@ -7,7 +7,6 @@ Order=Pedido Orders=Pedidos OrderLine=Línea de pedido OrderFollow=Seguimiento -OrderContact=Contactos pedido OrderDate=Fecha pedido OrderToProcess=Pedido a procesar NewOrder=Nuevo pedido diff --git a/htdocs/langs/es_ES/propal.lang b/htdocs/langs/es_ES/propal.lang index b958f1c0f76..ef62cfe2ef3 100644 --- a/htdocs/langs/es_ES/propal.lang +++ b/htdocs/langs/es_ES/propal.lang @@ -10,7 +10,6 @@ CommercialProposal=Presupuesto CommercialProposals=Presupuestos ProposalsOpened=Presupuestos abiertos ProposalCard=Ficha presupuesto -ProposalContact=Contacto presupuesto NewProp=Nuevo presupuesto NewProposal=Nuevo presupuesto NewPropal=Nuevo presupuesto diff --git a/htdocs/langs/et_EE/bills.lang b/htdocs/langs/et_EE/bills.lang index 50a6c9037de..a07d59f1110 100644 --- a/htdocs/langs/et_EE/bills.lang +++ b/htdocs/langs/et_EE/bills.lang @@ -62,7 +62,6 @@ SupplierInvoice=Tarnija arve SuppliersInvoices=Tarnija arved SupplierBill=Tarnija arve SupplierBills=tarnijate arvete -BillContacts=Arve kontaktid Payment=Makse PaymentBack=Makse tagasi Payments=Maksed diff --git a/htdocs/langs/et_EE/contracts.lang b/htdocs/langs/et_EE/contracts.lang index 25837441cea..c185fa0a52e 100644 --- a/htdocs/langs/et_EE/contracts.lang +++ b/htdocs/langs/et_EE/contracts.lang @@ -29,7 +29,6 @@ ServiceStatusClosed=Suletud ServicesLegend=Teenused legend Contracts=Lepingud Contract=Leping -ContractContacts=Leping kontaktid NoContracts=Lepinguid MenuServices=Teenused MenuInactiveServices=Teenused ole aktiivne diff --git a/htdocs/langs/et_EE/orders.lang b/htdocs/langs/et_EE/orders.lang index fc35b030933..81b8d33dd58 100644 --- a/htdocs/langs/et_EE/orders.lang +++ b/htdocs/langs/et_EE/orders.lang @@ -15,7 +15,6 @@ Order=Et Orders=Tellimused OrderLine=Et liini OrderFollow=Järelmeetmed -OrderContact=Selleks kontakt OrderDate=Selleks kuupäevaks OrderToProcess=Selleks, et protsess NewOrder=New et diff --git a/htdocs/langs/et_EE/propal.lang b/htdocs/langs/et_EE/propal.lang index fb8e4eafb58..f2bd9432724 100644 --- a/htdocs/langs/et_EE/propal.lang +++ b/htdocs/langs/et_EE/propal.lang @@ -18,7 +18,6 @@ Prop=Commercial ettepanekuid CommercialProposal=Commercial ettepanek CommercialProposals=Commercial ettepanekuid ProposalCard=Ettepanek kaart -ProposalContact=Ettepanek kontakt NewProp=Uus äri-ettepanekut NewProposal=Uus äri-ettepanekut NewPropal=Uus ettepanek diff --git a/htdocs/langs/fa_IR/bills.lang b/htdocs/langs/fa_IR/bills.lang index f2cee2ac35b..5005a675614 100644 --- a/htdocs/langs/fa_IR/bills.lang +++ b/htdocs/langs/fa_IR/bills.lang @@ -51,8 +51,7 @@ CustomersInvoices=العملاء والفواتير SupplierInvoice=فاتورة المورد SuppliersInvoices=الموردين SupplierBill=فاتورة المورد -SupplierBills=فواتير الموردين -BillContacts=فاتورة الاتصالات +SupplierBills=فاتورة الاتصالات Payment=الدفع PaymentBack=دفع العودة Payments=المدفوعات diff --git a/htdocs/langs/fa_IR/contracts.lang b/htdocs/langs/fa_IR/contracts.lang index 3e5c664505c..f3e96500e1d 100644 --- a/htdocs/langs/fa_IR/contracts.lang +++ b/htdocs/langs/fa_IR/contracts.lang @@ -30,7 +30,6 @@ ServiceStatusClosed=مغلقة ServicesLegend=خدمات أسطورة Contracts=عقود Contract=العقد -ContractContacts=عقد اتصالات NoContracts=أي عقود MenuServices=الخدمات MenuInactiveServices=الخدمات غير الفعالة diff --git a/htdocs/langs/fa_IR/orders.lang b/htdocs/langs/fa_IR/orders.lang index 184b59b4046..ed6d6c420c3 100644 --- a/htdocs/langs/fa_IR/orders.lang +++ b/htdocs/langs/fa_IR/orders.lang @@ -16,7 +16,6 @@ Order=ترتيب Orders=أوامر OrderLine=من أجل خط OrderFollow=متابعة -OrderContact=من أجل الاتصال OrderDate=من أجل التاريخ NewOrder=النظام الجديد ToOrder=ومن أجل جعل diff --git a/htdocs/langs/fa_IR/propal.lang b/htdocs/langs/fa_IR/propal.lang index 3c4aec2e780..f9c9b4d9a4c 100644 --- a/htdocs/langs/fa_IR/propal.lang +++ b/htdocs/langs/fa_IR/propal.lang @@ -18,7 +18,6 @@ ProposalsOpened=افتتح مقترحات تجارية Prop=مقترحات تجارية CommercialProposal=اقتراح التجارية CommercialProposals=مقترحات تجارية -ProposalContact=اقتراح الاتصال NewProp=التجاري الجديد المقترح NewProposal=التجاري الجديد المقترح NewPropal=اقتراح جديد diff --git a/htdocs/langs/fi_FI/bills.lang b/htdocs/langs/fi_FI/bills.lang index 265c8162ab5..a4fa767173f 100644 --- a/htdocs/langs/fi_FI/bills.lang +++ b/htdocs/langs/fi_FI/bills.lang @@ -45,7 +45,6 @@ SupplierInvoice=Toimittajan laskun SuppliersInvoices=Tavarantoimittajat laskujen SupplierBill=Toimittajan laskun SupplierBills=tavarantoimittajien laskut -BillContacts=Laskun yhteystiedot Payment=Maksu PaymentBack=Maksun Payments=Maksut diff --git a/htdocs/langs/fi_FI/contracts.lang b/htdocs/langs/fi_FI/contracts.lang index a4e13031f5c..0d47e1cc9f2 100644 --- a/htdocs/langs/fi_FI/contracts.lang +++ b/htdocs/langs/fi_FI/contracts.lang @@ -27,7 +27,6 @@ ServiceStatusClosed=Suljettu ServicesLegend=Palvelut legenda Contracts=Sopimukset Contract=Sopimus -ContractContacts=Sopimus yhteystiedot NoContracts=Sopimuksia ei MenuServices=Palvelut MenuInactiveServices=Palvelut, joita ei aktiivinen diff --git a/htdocs/langs/fi_FI/orders.lang b/htdocs/langs/fi_FI/orders.lang index 90d5243b3be..ec8a3e68236 100644 --- a/htdocs/langs/fi_FI/orders.lang +++ b/htdocs/langs/fi_FI/orders.lang @@ -15,7 +15,6 @@ OrderCard=Tilaa kortti Order=Tilata Orders=Tilaukset OrderFollow=Seuranta -OrderContact=Tilaa yhteyttä OrderDate=Tilaa päivämäärä NewOrder=Uusi järjestys ToOrder=Tee jotta diff --git a/htdocs/langs/fi_FI/propal.lang b/htdocs/langs/fi_FI/propal.lang index e6a53273cf2..ead43fdec00 100644 --- a/htdocs/langs/fi_FI/propal.lang +++ b/htdocs/langs/fi_FI/propal.lang @@ -17,7 +17,6 @@ ProposalsOpened=Avoinna kaupallinen ehdotuksia Prop=Kaupalliset ehdotuksia CommercialProposal=Kaupalliset ehdotus CommercialProposals=Kaupalliset ehdotuksia -ProposalContact=Ehdotus yhteyttä NewProp=Uusia kaupallisia ehdotus NewProposal=Uusia kaupallisia ehdotus NewPropal=Uusi ehdotus diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index 8edeb2b690e..02c7561fac4 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -50,7 +50,6 @@ SupplierInvoice=Facture fournisseur SuppliersInvoices=Factures fournisseurs SupplierBill=Facture fournisseur SupplierBills=Factures fournisseurs -BillContacts=Contacts facture Payment=Règlement PaymentBack=Remboursement Payments=Règlements diff --git a/htdocs/langs/fr_FR/contracts.lang b/htdocs/langs/fr_FR/contracts.lang index 39eb49e2c2a..fb138439023 100644 --- a/htdocs/langs/fr_FR/contracts.lang +++ b/htdocs/langs/fr_FR/contracts.lang @@ -21,7 +21,6 @@ ServiceStatusClosed=Fermé ServicesLegend=Légende pour les services Contracts=Contrats Contract=Contrat -ContractContacts=Contacts contrat NoContracts=Pas de contrats MenuServices=Services MenuInactiveServices=Services inactifs diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang index b98e1099e87..3d0532f02e7 100644 --- a/htdocs/langs/fr_FR/orders.lang +++ b/htdocs/langs/fr_FR/orders.lang @@ -7,7 +7,6 @@ Order=Commande Orders=Commandes OrderLine=Ligne de commande OrderFollow=Suivi -OrderContact=Contacts commande OrderDate=Date commande OrderToProcess=Commande à traiter NewOrder=Nouvelle commande diff --git a/htdocs/langs/fr_FR/propal.lang b/htdocs/langs/fr_FR/propal.lang index 69376b73407..124910b907e 100644 --- a/htdocs/langs/fr_FR/propal.lang +++ b/htdocs/langs/fr_FR/propal.lang @@ -10,7 +10,6 @@ CommercialProposal=Proposition commerciale CommercialProposals=Propositions commerciales ProposalsOpened=Propositions commerciales ouvertes ProposalCard=Fiche proposition -ProposalContact=Contact proposition NewProp=Nouvelle proposition commerciale NewProposal=Nouvelle proposition commerciale NewPropal=Nouvelle proposition diff --git a/htdocs/langs/he_IL/bills.lang b/htdocs/langs/he_IL/bills.lang index 47d4d54a0f1..374a7a7988e 100644 --- a/htdocs/langs/he_IL/bills.lang +++ b/htdocs/langs/he_IL/bills.lang @@ -61,8 +61,7 @@ CustomersInvoices=לקוחות של חשבוניות SupplierInvoice=חשבונית הספק SuppliersInvoices=הספק של חשבוניות SupplierBill=חשבונית הספק -SupplierBills=חשבוניות ספקים -BillContacts=חשבונית אנשי קשר +SupplierBills=חשבונית אנשי קשר Payment=תשלום PaymentBack=תשלום בחזרה Payments=תשלומים diff --git a/htdocs/langs/he_IL/contracts.lang b/htdocs/langs/he_IL/contracts.lang index b2adce4fe22..784a9726729 100644 --- a/htdocs/langs/he_IL/contracts.lang +++ b/htdocs/langs/he_IL/contracts.lang @@ -29,7 +29,6 @@ ServiceStatusClosed=סגור ServicesLegend=שירותי אגדה Contracts=חוזים Contract=חוזה -ContractContacts=חוזה אנשי קשר NoContracts=אין חוזים MenuServices=שירותים MenuInactiveServices=לא פעילים שירותים diff --git a/htdocs/langs/he_IL/orders.lang b/htdocs/langs/he_IL/orders.lang index f09da6fe014..85b33c38439 100644 --- a/htdocs/langs/he_IL/orders.lang +++ b/htdocs/langs/he_IL/orders.lang @@ -15,7 +15,6 @@ Order=סדר Orders=הזמנות OrderLine=צו קו OrderFollow=מעקב -OrderContact=סדר קשר OrderDate=סדר מועד OrderToProcess=כדי לעבד NewOrder=חדש הסדר diff --git a/htdocs/langs/he_IL/propal.lang b/htdocs/langs/he_IL/propal.lang index a9fa5c4c22f..d483e2ef2e7 100644 --- a/htdocs/langs/he_IL/propal.lang +++ b/htdocs/langs/he_IL/propal.lang @@ -18,7 +18,6 @@ Prop=הצעות מסחריות CommercialProposal=מסחרי ההצעה CommercialProposals=הצעות מסחריות ProposalCard=הצעת כרטיס -ProposalContact=ההצעה קשר NewProp=ההצעה מסחריים חדשים NewProposal=ההצעה מסחריים חדשים NewPropal=הצעה חדשה diff --git a/htdocs/langs/hu_HU/bills.lang b/htdocs/langs/hu_HU/bills.lang index 89003f76756..4a1a2ae430d 100644 --- a/htdocs/langs/hu_HU/bills.lang +++ b/htdocs/langs/hu_HU/bills.lang @@ -62,7 +62,6 @@ SupplierInvoice=Szállító számlát SuppliersInvoices=Szállító számlák SupplierBill=Szállító számlát SupplierBills=beszállítói számlák -BillContacts=Számla kapcsolatok Payment=Fizetés PaymentBack=Fizetési vissza Payments=Kifizetések diff --git a/htdocs/langs/hu_HU/contracts.lang b/htdocs/langs/hu_HU/contracts.lang index 7a991ea30d3..eb395ef7042 100644 --- a/htdocs/langs/hu_HU/contracts.lang +++ b/htdocs/langs/hu_HU/contracts.lang @@ -21,7 +21,6 @@ ServiceStatusClosed=Lezárva ServicesLegend=Szolgáltatások magyarázat Contracts=Szerződések Contract=Szerződés -ContractContacts=Szerződés kapcsolattartói NoContracts=Nincs szerződés MenuServices=Szolgáltatás MenuInactiveServices=Nincs aktív szolgáltatás diff --git a/htdocs/langs/hu_HU/orders.lang b/htdocs/langs/hu_HU/orders.lang index 6f6e62ee1b0..8010f91020f 100644 --- a/htdocs/langs/hu_HU/orders.lang +++ b/htdocs/langs/hu_HU/orders.lang @@ -15,7 +15,6 @@ Order=Megrendelés Orders=Megrendelés OrderLine=Rendelés vonal OrderFollow=Nyomon követés -OrderContact=Megrendelés Kapcsolat OrderDate=Rendezés dátum OrderToProcess=Feldolgozása érdekében NewOrder=Új megbízás diff --git a/htdocs/langs/hu_HU/propal.lang b/htdocs/langs/hu_HU/propal.lang index 358eaecdf3d..1d552ba4126 100644 --- a/htdocs/langs/hu_HU/propal.lang +++ b/htdocs/langs/hu_HU/propal.lang @@ -18,7 +18,6 @@ Prop=Üzleti ajánlatok CommercialProposal=Üzleti ajánlat CommercialProposals=Üzleti ajánlatok ProposalCard=Javaslat kártya -ProposalContact=Javaslat Kapcsolat NewProp=Új kereskedelmi javaslat NewProposal=Új kereskedelmi javaslat NewPropal=Új javaslat diff --git a/htdocs/langs/is_IS/bills.lang b/htdocs/langs/is_IS/bills.lang index dcaa7afa533..584f29a7927 100644 --- a/htdocs/langs/is_IS/bills.lang +++ b/htdocs/langs/is_IS/bills.lang @@ -58,7 +58,6 @@ SupplierInvoice=Birgir Reikningar SuppliersInvoices=reikningum birgis SupplierBill=Birgir Reikningar SupplierBills=birgjum reikninga -BillContacts=Invoice tengiliðir Payment=Greiðsla PaymentBack=Greiðsla til baka Payments=Greiðslur diff --git a/htdocs/langs/is_IS/contracts.lang b/htdocs/langs/is_IS/contracts.lang index 4f5fd0b9d22..931e8173f22 100644 --- a/htdocs/langs/is_IS/contracts.lang +++ b/htdocs/langs/is_IS/contracts.lang @@ -29,7 +29,6 @@ ServiceStatusClosed=Loka ServicesLegend=Þjónusta þjóðsaga Contracts=Samningar Contract=Samningur -ContractContacts=Samningur tengiliðir NoContracts=Engir samningar MenuServices=Þjónusta MenuInactiveServices=Þjónusta ekki virk diff --git a/htdocs/langs/is_IS/orders.lang b/htdocs/langs/is_IS/orders.lang index df5e38f906c..bd1a633a33d 100644 --- a/htdocs/langs/is_IS/orders.lang +++ b/htdocs/langs/is_IS/orders.lang @@ -15,7 +15,6 @@ Order=Panta Orders=Pantanir OrderLine=Pöntunarlína OrderFollow=Eftirfylgni -OrderContact=Panta samband OrderDate=Panta dagsetningu OrderToProcess=Til að framkvæma NewOrder=New Order diff --git a/htdocs/langs/is_IS/propal.lang b/htdocs/langs/is_IS/propal.lang index 0e0c6f0dab0..e8f8fbd8f4d 100644 --- a/htdocs/langs/is_IS/propal.lang +++ b/htdocs/langs/is_IS/propal.lang @@ -17,7 +17,6 @@ ProposalsOpened=Opnaður auglýsing tillögur Prop=Auglýsing tillögur CommercialProposal=Auglýsing tillögu CommercialProposals=Auglýsing tillögur -ProposalContact=Tillaga samband NewProp=Ný auglýsing tillögu NewProposal=Ný auglýsing tillögu NewPropal=Ný tillaga diff --git a/htdocs/langs/it_IT/bills.lang b/htdocs/langs/it_IT/bills.lang index f5ef6c89ad1..ae31a55faf5 100644 --- a/htdocs/langs/it_IT/bills.lang +++ b/htdocs/langs/it_IT/bills.lang @@ -40,7 +40,6 @@ SupplierInvoice =Fattura del fornitore SuppliersInvoices =Fatture dei fornitori SupplierBill =Fattura del fornitore SupplierBills =Fatture dei fornitori -BillContacts =Contatti fattura Payment =Pagamento PaymentBack =Rimborso Payments =Pagamenti diff --git a/htdocs/langs/it_IT/contracts.lang b/htdocs/langs/it_IT/contracts.lang index a4f000b5441..7510e23dd72 100644 --- a/htdocs/langs/it_IT/contracts.lang +++ b/htdocs/langs/it_IT/contracts.lang @@ -18,7 +18,6 @@ ServiceStatusClosed =Chiuso ServicesLegend =Servizi leggenda Contracts =Contratti per servizi Contract =Contratto per servizi -ContractContacts =Contatti del contratto per servizi MenuServices =Servizi MenuInactiveServices =Servizi non attivi MenuRunningServices =Servizi in esecuzione diff --git a/htdocs/langs/it_IT/orders.lang b/htdocs/langs/it_IT/orders.lang index a0556672099..5d0c86b7561 100644 --- a/htdocs/langs/it_IT/orders.lang +++ b/htdocs/langs/it_IT/orders.lang @@ -5,8 +5,7 @@ SuppliersOrdersArea =Sezione ordini fornitori OrderCard =Scheda ordine Order =Ordine Orders =Ordini -OrderFollow =Follow-up -OrderContact =Contatto ordine +OrderFollow =Follow-up OrderDate =Data ordine NewOrder =Nuovo ordine ToOrder =Richiedere ordine diff --git a/htdocs/langs/it_IT/propal.lang b/htdocs/langs/it_IT/propal.lang index a55e8e05c8d..6cd152cd55e 100644 --- a/htdocs/langs/it_IT/propal.lang +++ b/htdocs/langs/it_IT/propal.lang @@ -8,7 +8,6 @@ ProposalsOpened =Proposte commerciali aperte Prop =Preventivi/Prop. commerciali CommercialProposal =Preventivo/Proposta commerciale CommercialProposals =Preventivi/Proposte commerciali -ProposalContact =Contatto della proposta NewProp =Nuova proposta commerciale NewProposal =Nuova proposta commerciale NewPropal =Nuova proposta diff --git a/htdocs/langs/ja_JP/bills.lang b/htdocs/langs/ja_JP/bills.lang index eea2d4f13a3..73e67e54990 100644 --- a/htdocs/langs/ja_JP/bills.lang +++ b/htdocs/langs/ja_JP/bills.lang @@ -62,7 +62,6 @@ SupplierInvoice=サプライヤーの請求書 SuppliersInvoices=仕入先の請求書 SupplierBill=サプライヤーの請求書 SupplierBills=仕入先の請求書 -BillContacts=請求書の連絡先 Payment=支払い PaymentBack=戻って支払い Payments=支払い diff --git a/htdocs/langs/ja_JP/contracts.lang b/htdocs/langs/ja_JP/contracts.lang index 3ddea40f715..782c4340771 100644 --- a/htdocs/langs/ja_JP/contracts.lang +++ b/htdocs/langs/ja_JP/contracts.lang @@ -23,7 +23,6 @@ ServiceStatusClosed=閉じ ServicesLegend=サービス伝説 Contracts=契約 Contract=契約 -ContractContacts=契約担当者 NoContracts=いいえ契約なし MenuServices=サービス MenuInactiveServices=アクティブでないサービス diff --git a/htdocs/langs/ja_JP/orders.lang b/htdocs/langs/ja_JP/orders.lang index 6255c61e1db..0dab91b046a 100644 --- a/htdocs/langs/ja_JP/orders.lang +++ b/htdocs/langs/ja_JP/orders.lang @@ -15,7 +15,6 @@ Order=オーダー Orders=受注 OrderLine=注文明細行 OrderFollow=フォローアップ -OrderContact=ご注文お問い合わせ OrderDate=注文日 OrderToProcess=プロセスの順序 NewOrder=新規注文 diff --git a/htdocs/langs/ja_JP/propal.lang b/htdocs/langs/ja_JP/propal.lang index 80b02473267..bd0cf4b2b7b 100644 --- a/htdocs/langs/ja_JP/propal.lang +++ b/htdocs/langs/ja_JP/propal.lang @@ -18,7 +18,6 @@ Prop=商用の提案 CommercialProposal=商業的提案 CommercialProposals=商用の提案 ProposalCard=提案カード -ProposalContact=提案の連絡先 NewProp=新しい商業提案 NewProposal=新しい商業提案 NewPropal=新たな提案 diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang index 457acb3e363..c84cbf4576b 100644 --- a/htdocs/langs/nb_NO/bills.lang +++ b/htdocs/langs/nb_NO/bills.lang @@ -41,7 +41,6 @@ SupplierInvoice=Leverandørfaktura SuppliersInvoices=Leverandørfakturaer SupplierBill=Leverandørfaktura SupplierBills=Leverandørfakturaer -BillContacts=Fakturakontakter Payment=Betaling PaymentBack=Betaling tilbake Payments=Betalinger diff --git a/htdocs/langs/nb_NO/contracts.lang b/htdocs/langs/nb_NO/contracts.lang index 6b168989e62..6fbee32390c 100644 --- a/htdocs/langs/nb_NO/contracts.lang +++ b/htdocs/langs/nb_NO/contracts.lang @@ -17,7 +17,6 @@ ServiceStatusClosed=Lukket ServicesLegend=Tjeneste legend Contracts=Kontrakter Contract=Kontrakt -ContractContacts=Kontaktperson for kontrakten NoContracts=Ingen kontrakter MenuServices=Tjenester MenuInactiveServices=Ikke aktive tjenester diff --git a/htdocs/langs/nb_NO/orders.lang b/htdocs/langs/nb_NO/orders.lang index 11d9f713eea..b387823f934 100644 --- a/htdocs/langs/nb_NO/orders.lang +++ b/htdocs/langs/nb_NO/orders.lang @@ -6,7 +6,6 @@ OrderCard=Ordrekort Order=Ordre Orders=Ordre OrderFollow=Oppfølging -OrderContact=Kontaktperson OrderDate=Ordredato NewOrder=Ny ordre ToOrder=Lag ordre diff --git a/htdocs/langs/nb_NO/propal.lang b/htdocs/langs/nb_NO/propal.lang index b357a308160..cac52669fe3 100644 --- a/htdocs/langs/nb_NO/propal.lang +++ b/htdocs/langs/nb_NO/propal.lang @@ -8,7 +8,6 @@ ProposalsOpened=Åpnede tilbud Prop=Tilbud CommercialProposal=Tilbud CommercialProposals=Tilbud -ProposalContact=Tilbudskontakt NewProp=Nytt tilbud NewProposal=Nytt tilbud NewPropal=Nytt tilbud diff --git a/htdocs/langs/nl_BE/bills.lang b/htdocs/langs/nl_BE/bills.lang index 4a840ae1d24..27d70def657 100644 --- a/htdocs/langs/nl_BE/bills.lang +++ b/htdocs/langs/nl_BE/bills.lang @@ -34,7 +34,6 @@ SupplierInvoice=Leveranciers factuur SuppliersInvoices=Leveranciers facturen SupplierBill=Factuur leverancier SupplierBills=Facturen leveranciers -BillContacts=Factuur contacten Payment=Betaling Payments=Betalingen ReceivedPayments=Ontvangen betalingen diff --git a/htdocs/langs/nl_BE/contracts.lang b/htdocs/langs/nl_BE/contracts.lang index 230f9ff7d57..5f43e22933c 100644 --- a/htdocs/langs/nl_BE/contracts.lang +++ b/htdocs/langs/nl_BE/contracts.lang @@ -19,7 +19,6 @@ ServiceStatusClosed=Gesloten ServicesLegend=Legende diensten Contracts=Contracten Contract=Contract -ContractContacts=Contract contacten NoContracts=Geen contracten MenuServices=Diensten MenuInactiveServices=Diensten niet actief diff --git a/htdocs/langs/nl_BE/orders.lang b/htdocs/langs/nl_BE/orders.lang index 598627a6edd..b772b186f46 100644 --- a/htdocs/langs/nl_BE/orders.lang +++ b/htdocs/langs/nl_BE/orders.lang @@ -5,7 +5,6 @@ OrderCard=Bestellingskaart Order=Bestelling Orders=Bestellingen OrderFollow=Opvolging -OrderContact=Bestellings contact OrderDate=Bestellingsdatum NewOrder=Nieuwe bestelling ToOrder=Naar bestelling diff --git a/htdocs/langs/nl_BE/propal.lang b/htdocs/langs/nl_BE/propal.lang index 2745138b0f3..d1e531b305d 100644 --- a/htdocs/langs/nl_BE/propal.lang +++ b/htdocs/langs/nl_BE/propal.lang @@ -8,7 +8,6 @@ ProposalsOpened=Geopende offertes Prop=Offertes CommercialProposal=Offerte CommercialProposals=Offertes -ProposalContact=Voorstel contact NewProp=Nieuwe offerte NewProposal=Nieuwe offerte NewPropal=Nieuwe offerte diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang index f46180f41cb..0949684e5f3 100644 --- a/htdocs/langs/nl_NL/bills.lang +++ b/htdocs/langs/nl_NL/bills.lang @@ -50,7 +50,6 @@ SupplierInvoice = Leveranciersfactuur SuppliersInvoices = Leveranciersfacturen SupplierBill = Leveranciersfactuur SupplierBills = leveranciersfacturen -BillContacts = Factuurcontacten Payment = Betaling PaymentBack = Terugbetaling Payments = Betalingen diff --git a/htdocs/langs/nl_NL/contracts.lang b/htdocs/langs/nl_NL/contracts.lang index 7b885c965e1..e3fcb5e7fdf 100644 --- a/htdocs/langs/nl_NL/contracts.lang +++ b/htdocs/langs/nl_NL/contracts.lang @@ -21,7 +21,6 @@ ServiceStatusClosed = Gesloten ServicesLegend = Dienstenlegenda Contracts = Contracten Contract = Contract -ContractContacts = Contractcontactpersonen NoContracts = Geen contracten MenuServices = Diensten MenuInactiveServices = Inactieve diensten diff --git a/htdocs/langs/nl_NL/orders.lang b/htdocs/langs/nl_NL/orders.lang index d21a93edfec..22d1157ab6b 100644 --- a/htdocs/langs/nl_NL/orders.lang +++ b/htdocs/langs/nl_NL/orders.lang @@ -7,7 +7,6 @@ Order = Opdracht Orders = Opdrachten OrderLine = Opdrachtregel OrderFollow = Opvolging -OrderContact = Opdrachtcontactpersoon OrderDate = Opdrachtdatum OrderToProcess = Te verwerken opdracht NewOrder = Nieuwe opdracht diff --git a/htdocs/langs/nl_NL/propal.lang b/htdocs/langs/nl_NL/propal.lang index 9d6633ee172..932677dff5a 100644 --- a/htdocs/langs/nl_NL/propal.lang +++ b/htdocs/langs/nl_NL/propal.lang @@ -10,7 +10,6 @@ Prop = Offertes CommercialProposal = Offerte CommercialProposals = Offertes ProposalCard = Offertedetailkaart -ProposalContact = Offertecontactpersoon NewProp = Nieuwe offerte NewProposal = Nieuwe offerte NewPropal = Nieuwe offerte diff --git a/htdocs/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang index 3a44dddf418..c814b5de219 100644 --- a/htdocs/langs/pl_PL/bills.lang +++ b/htdocs/langs/pl_PL/bills.lang @@ -47,7 +47,6 @@ SupplierInvoice=Dostawca faktury SuppliersInvoices=Dostawców faktur SupplierBill=Dostawca faktury SupplierBills=dostawców faktur -BillContacts=Faktura kontaktów Payment=Płatność PaymentBack=Płatność powrót Payments=Płatności diff --git a/htdocs/langs/pl_PL/contracts.lang b/htdocs/langs/pl_PL/contracts.lang index 8ad802341ed..3d715cbdb56 100644 --- a/htdocs/langs/pl_PL/contracts.lang +++ b/htdocs/langs/pl_PL/contracts.lang @@ -29,7 +29,6 @@ ServiceStatusClosed=Zamknięte ServicesLegend=Usługi legendy Contracts=Kontrakty Contract=Kontrakt -ContractContacts=Kontrakt kontaktów NoContracts=Nr umowy MenuServices=Usługi MenuInactiveServices=Usługi, które nie są aktywne diff --git a/htdocs/langs/pl_PL/orders.lang b/htdocs/langs/pl_PL/orders.lang index 4a10977b939..e9b1f42c2f0 100644 --- a/htdocs/langs/pl_PL/orders.lang +++ b/htdocs/langs/pl_PL/orders.lang @@ -17,7 +17,6 @@ OrderCard=Zamów kartę Order=Porządek Orders=Zamówienia OrderFollow=Kontynuacja -OrderContact=Zamówienie kontakt OrderDate=Kolejność Data NewOrder=New Order ToOrder=Zamów diff --git a/htdocs/langs/pl_PL/propal.lang b/htdocs/langs/pl_PL/propal.lang index ec44488af4e..1ca91d462d9 100644 --- a/htdocs/langs/pl_PL/propal.lang +++ b/htdocs/langs/pl_PL/propal.lang @@ -19,7 +19,6 @@ ProposalsOpened=Czynny propozycji Prop=Commercial propozycje CommercialProposal=Commercial wniosku CommercialProposals=Commercial propozycje -ProposalContact=Wniosek o kontakt NewProp=Nowy wniosek handlowych NewProposal=Nowy wniosek handlowych NewPropal=Nowa propozycja diff --git a/htdocs/langs/pt_BR/bills.lang b/htdocs/langs/pt_BR/bills.lang index 4cf8abb6042..9603063da48 100644 --- a/htdocs/langs/pt_BR/bills.lang +++ b/htdocs/langs/pt_BR/bills.lang @@ -51,7 +51,6 @@ SupplierInvoice=Fatura de Fornecedor SuppliersInvoices=Faturas de Fornecedores SupplierBill=Fatura de Fornecedor SupplierBills=Faturas de Fornecedores -BillContacts=Contatos da Fatura Payment=Pagamento PaymentBack=Reembolso Payments=Pagamentos diff --git a/htdocs/langs/pt_BR/contracts.lang b/htdocs/langs/pt_BR/contracts.lang index e79383596b3..bdc06c62afc 100644 --- a/htdocs/langs/pt_BR/contracts.lang +++ b/htdocs/langs/pt_BR/contracts.lang @@ -19,7 +19,6 @@ ServiceStatusClosed=Encerrado ServicesLegend=Legenda para os Serviços Contracts=Contratos Contract=Contrato -ContractContacts=Contatos do Contrato NoContracts=Sem Contratos MenuServices=Serviços MenuInactiveServices=Serviços Inativos diff --git a/htdocs/langs/pt_BR/orders.lang b/htdocs/langs/pt_BR/orders.lang index fe3c3fe286b..8b4b14c79da 100644 --- a/htdocs/langs/pt_BR/orders.lang +++ b/htdocs/langs/pt_BR/orders.lang @@ -7,7 +7,6 @@ Order=Pedido Orders=Pedidos OrderLine=Linha de Comando OrderFollow=Seguimento -OrderContact=Contato do Pedido OrderDate=Data Pedido NewOrder=Novo Pedido ToOrder=Realizar Pedido @@ -25,8 +24,8 @@ OrdersInProcess=Pedidos em Processo OrdersToProcess=Pedidos a Processar -## Fazer a programao da NFE dentro do mdulo de Pedidos. o jeito indo pelos status. Ir pesquisando no src code pelo status Processado (StatusOrderProcessedShort) -## Incluir o src code da NFE como os pedidos e propostasanexas na negociao. +## Fazer a programa��o da NFE dentro do m�dulo de Pedidos. � o jeito indo pelos status. Ir pesquisando no src code pelo status Processado (StatusOrderProcessedShort) +## Incluir o src code da NFE como os pedidos e propostasanexas na negocia��o. StatusOrderNFEProcessed=Nota Fiscal Emitida StatusOrderCanceledShort=Anulado diff --git a/htdocs/langs/pt_BR/propal.lang b/htdocs/langs/pt_BR/propal.lang index 88ce4267eb6..09660809c97 100644 --- a/htdocs/langs/pt_BR/propal.lang +++ b/htdocs/langs/pt_BR/propal.lang @@ -8,7 +8,6 @@ Prop=Orçamentos CommercialProposal=Orçamento CommercialProposals=Orçamentos ProposalsOpened=Orçamentos Abertos -ProposalContact=Contato Orçamento NewProp=Novo Orçamento NewProposal=Novo Orçamento NewPropal=Novo Orçamento diff --git a/htdocs/langs/pt_PT/bills.lang b/htdocs/langs/pt_PT/bills.lang index 1c6a8825b87..1af50005e49 100644 --- a/htdocs/langs/pt_PT/bills.lang +++ b/htdocs/langs/pt_PT/bills.lang @@ -46,7 +46,6 @@ SupplierInvoice=Factura de fornecedor SuppliersInvoices=Facturas de Fornecedores SupplierBill=Factura de fornecedor SupplierBills=Facturas de Fornecedores -BillContacts=Contactos factura Payment=pagamento PaymentBack=Reembolso Payments=pagamentos diff --git a/htdocs/langs/pt_PT/contracts.lang b/htdocs/langs/pt_PT/contracts.lang index 13e73dd3a38..9a34cd9cfc5 100644 --- a/htdocs/langs/pt_PT/contracts.lang +++ b/htdocs/langs/pt_PT/contracts.lang @@ -19,7 +19,6 @@ ServiceStatusClosed=Fechado ServicesLegend=Legenda para os serviços Contracts=Contratos Contract=Contrato -ContractContacts=Contactos do Contrato NoContracts=Sem Contratos MenuServices=Serviços MenuInactiveServices=Serviços Inactivos diff --git a/htdocs/langs/pt_PT/orders.lang b/htdocs/langs/pt_PT/orders.lang index f2149ce9042..fb7714859ce 100644 --- a/htdocs/langs/pt_PT/orders.lang +++ b/htdocs/langs/pt_PT/orders.lang @@ -6,7 +6,6 @@ OrderCard=Ficha Pedido Order=Pedido Orders=Pedidos OrderFollow=Seguimento -OrderContact=Contacto do Pedido OrderDate=Data Pedido NewOrder=Novo Pedido ToOrder=Realizar Pedido diff --git a/htdocs/langs/pt_PT/propal.lang b/htdocs/langs/pt_PT/propal.lang index 0969aaac99d..1603d22d5b5 100644 --- a/htdocs/langs/pt_PT/propal.lang +++ b/htdocs/langs/pt_PT/propal.lang @@ -8,7 +8,6 @@ ProposalsOpened=Orçamentos Abertos Prop=Orçamentos CommercialProposal=Orçamento CommercialProposals=Orçamentos -ProposalContact=Contacto Orçamento NewProp=Novo Orçamento NewProposal=Novo Orçamento NewPropal=Novo Orçamento diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang index 29633e1440e..1185d0f9739 100644 --- a/htdocs/langs/ro_RO/bills.lang +++ b/htdocs/langs/ro_RO/bills.lang @@ -45,7 +45,6 @@ SupplierInvoice=Furnizor factură SuppliersInvoices=Furnizori-facturi SupplierBill=Furnizor factură SupplierBills=furnizori de facturi -BillContacts=Factura de contact Payment=Plata PaymentBack=Plata înapoi Payments=Plăţi diff --git a/htdocs/langs/ro_RO/contracts.lang b/htdocs/langs/ro_RO/contracts.lang index ce0fd3f5e14..69e1d319ee9 100644 --- a/htdocs/langs/ro_RO/contracts.lang +++ b/htdocs/langs/ro_RO/contracts.lang @@ -27,7 +27,6 @@ ServiceStatusClosed=Închis ServicesLegend=Servicii de legenda Contracts=Contracte Contract=Contract -ContractContacts=Contractul de contact NoContracts=Nu contractelor MenuServices=Servicii MenuInactiveServices=Servicii care nu sunt active diff --git a/htdocs/langs/ro_RO/orders.lang b/htdocs/langs/ro_RO/orders.lang index b93b2395ca1..0d4f8cbe7bd 100644 --- a/htdocs/langs/ro_RO/orders.lang +++ b/htdocs/langs/ro_RO/orders.lang @@ -15,7 +15,6 @@ OrderCard=Comanda carte Order=Comanda Orders=Comenzi OrderFollow=Urmări -OrderContact=Ordinul de contact OrderDate=Ordinul data NewOrder=Noua ordine ToOrder=Asiguraţi pentru diff --git a/htdocs/langs/ro_RO/propal.lang b/htdocs/langs/ro_RO/propal.lang index ebbac41e5f1..520c2adbfc8 100644 --- a/htdocs/langs/ro_RO/propal.lang +++ b/htdocs/langs/ro_RO/propal.lang @@ -17,7 +17,6 @@ ProposalsOpened=Deschis comerciale propuneri Prop=Comerciale propuneri CommercialProposal=Comerciale propunerea CommercialProposals=Comerciale propuneri -ProposalContact=Propunere de contact NewProp=Noua propunere comerciale NewProposal=Noua propunere comerciale NewPropal=Noua propunere diff --git a/htdocs/langs/ru_RU/bills.lang b/htdocs/langs/ru_RU/bills.lang index b5ade948052..098271fc7d5 100644 --- a/htdocs/langs/ru_RU/bills.lang +++ b/htdocs/langs/ru_RU/bills.lang @@ -45,7 +45,6 @@ SupplierInvoice=Счет-фактура Поставщика SuppliersInvoices=Счета-фактуры Поставщиков SupplierBill=Счет-фактура Поставщика SupplierBills=счета-фактуры Поставщиков -BillContacts=Контакты Счета-фактуры Payment=Платеж PaymentBack=Возврат платежа Payments=Платежи diff --git a/htdocs/langs/ru_RU/contracts.lang b/htdocs/langs/ru_RU/contracts.lang index 68fc6f6b075..63dd5a5b364 100644 --- a/htdocs/langs/ru_RU/contracts.lang +++ b/htdocs/langs/ru_RU/contracts.lang @@ -27,7 +27,6 @@ ServiceStatusClosed=Закрытые ServicesLegend=Услуги легенда Contracts=Договоры Contract=Контракт -ContractContacts=Контракт контакты NoContracts=Нет контрактов MenuServices=Услуги MenuInactiveServices=Услуга не активна diff --git a/htdocs/langs/ru_RU/orders.lang b/htdocs/langs/ru_RU/orders.lang index 8020d116070..d158ce9359b 100644 --- a/htdocs/langs/ru_RU/orders.lang +++ b/htdocs/langs/ru_RU/orders.lang @@ -15,7 +15,6 @@ OrderCard=Заказать карту Order=Заказ Orders=Приказы OrderFollow=Последующие меры -OrderContact=Заказ контакт OrderDate=Дата заказа NewOrder=Новый порядок ToOrder=Сделать заказ diff --git a/htdocs/langs/ru_RU/propal.lang b/htdocs/langs/ru_RU/propal.lang index cf04162a878..eb639a45447 100644 --- a/htdocs/langs/ru_RU/propal.lang +++ b/htdocs/langs/ru_RU/propal.lang @@ -17,7 +17,6 @@ ProposalsOpened=Открытие коммерческих предложений Prop=Коммерческие предложения CommercialProposal=Коммерческое предложение CommercialProposals=Коммерческие предложения -ProposalContact=Предложение, контакт NewProp=Новое коммерческое предложение NewProposal=Новое коммерческое предложение NewPropal=Новое предложение diff --git a/htdocs/langs/ru_UA/contracts.lang b/htdocs/langs/ru_UA/contracts.lang index 506104bbbf7..44fc1c90f7c 100644 --- a/htdocs/langs/ru_UA/contracts.lang +++ b/htdocs/langs/ru_UA/contracts.lang @@ -23,7 +23,6 @@ ServiceStatusClosed=Закрыто ServicesLegend=Услуги легенда Contracts=Контракты Contract=Контракт -ContractContacts=Договор контакты NoContracts=Нет контрактов MenuServices=Услуги MenuInactiveServices=Услуги, не активный diff --git a/htdocs/langs/sl_SI/bills.lang b/htdocs/langs/sl_SI/bills.lang index 65cc55b1192..52fe7b2f7c1 100644 --- a/htdocs/langs/sl_SI/bills.lang +++ b/htdocs/langs/sl_SI/bills.lang @@ -53,7 +53,6 @@ SupplierInvoice = Račun dobavitelja SuppliersInvoices = Računi dobaviteljev SupplierBill = Račun dobavitelja SupplierBills = Računi dobaviteljev -BillContacts = Kontakt za račun Payment = Plačilo PaymentBack = Vrnitev plačila Payments = Plačila diff --git a/htdocs/langs/sl_SI/contracts.lang b/htdocs/langs/sl_SI/contracts.lang index ff98ff4159c..83d46ccf77d 100644 --- a/htdocs/langs/sl_SI/contracts.lang +++ b/htdocs/langs/sl_SI/contracts.lang @@ -21,7 +21,6 @@ ServiceStatusClosed = Zaključena ServicesLegend = Legenda storitev Contracts = Pogodbe Contract = Pogodba -ContractContacts = Kontakti za pogodbo NoContracts = Ni pogodb MenuServices = Storitve MenuInactiveServices = Storitve niso aktivne diff --git a/htdocs/langs/sl_SI/orders.lang b/htdocs/langs/sl_SI/orders.lang index c7522542e03..1b5f099b6c0 100644 --- a/htdocs/langs/sl_SI/orders.lang +++ b/htdocs/langs/sl_SI/orders.lang @@ -7,7 +7,6 @@ Order = Naročilo Orders = Naročila OrderLine = Vrstica naročila OrderFollow = Sledenje naročilu -OrderContact = Kontakt za naročilo OrderDate = Datum naročila OrderToProcess = Naročilo za obdelavo NewOrder = Novo naročilo diff --git a/htdocs/langs/sl_SI/propal.lang b/htdocs/langs/sl_SI/propal.lang index a92db805f81..edcf505d1f6 100644 --- a/htdocs/langs/sl_SI/propal.lang +++ b/htdocs/langs/sl_SI/propal.lang @@ -10,7 +10,6 @@ Prop = Komercialne ponudbe CommercialProposal = Komercialna ponudba CommercialProposals = Komercialne ponudbe ProposalCard = Kartica ponudbe -ProposalContact = Kontakt za ponudbo NewProp = Nova komercialna ponudba NewProposal = Nova komercialna ponudba NewPropal = Nova ponudba diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang index 04a12e75e24..42b89de9cfa 100644 --- a/htdocs/langs/sv_SE/bills.lang +++ b/htdocs/langs/sv_SE/bills.lang @@ -58,7 +58,6 @@ SupplierInvoice=Leverantörsfaktura SuppliersInvoices=Leverantörens fakturor SupplierBill=Leverantörsfaktura SupplierBills=leverantörer fakturor -BillContacts=Faktura kontakter Payment=Betalning PaymentBack=Betalning tillbaka Payments=Betalningar diff --git a/htdocs/langs/sv_SE/contracts.lang b/htdocs/langs/sv_SE/contracts.lang index cc0548bd339..c0db7e4c0df 100644 --- a/htdocs/langs/sv_SE/contracts.lang +++ b/htdocs/langs/sv_SE/contracts.lang @@ -29,7 +29,6 @@ ServiceStatusClosed=Stängt ServicesLegend=Tjänster legend Contracts=Kontrakt Contract=Kontrakt -ContractContacts=Kontrakt kontakter NoContracts=Inga kontrakt MenuServices=Tjänster MenuInactiveServices=Tjänster inte aktiv diff --git a/htdocs/langs/sv_SE/orders.lang b/htdocs/langs/sv_SE/orders.lang index e1c010b7aa1..d2fef1116d8 100644 --- a/htdocs/langs/sv_SE/orders.lang +++ b/htdocs/langs/sv_SE/orders.lang @@ -15,7 +15,6 @@ Order=Beställ Orders=Beställningar OrderLine=Orderrad OrderFollow=Uppföljning -OrderContact=Beställ kontakt OrderDate=Beställ datum OrderToProcess=Att kunna bearbeta NewOrder=Ny ordning diff --git a/htdocs/langs/sv_SE/propal.lang b/htdocs/langs/sv_SE/propal.lang index e05c7b4b5e7..f1bfc392715 100644 --- a/htdocs/langs/sv_SE/propal.lang +++ b/htdocs/langs/sv_SE/propal.lang @@ -17,7 +17,6 @@ ProposalsOpened=Öppnade kommersiella förslag Prop=Kommersiella förslag CommercialProposal=Kommersiella förslag CommercialProposals=Kommersiella förslag -ProposalContact=Förslag kontakt NewProp=Nya kommersiella förslag NewProposal=Nya kommersiella förslag NewPropal=Nytt förslag diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang index f2fc4e5ba9e..3a08bfe191c 100644 --- a/htdocs/langs/tr_TR/bills.lang +++ b/htdocs/langs/tr_TR/bills.lang @@ -58,7 +58,6 @@ SupplierInvoice=Tedarikçi fatura SuppliersInvoices=Tedarikçilerin faturalarının SupplierBill=Tedarikçi fatura SupplierBills=tedarikçiler faturalar -BillContacts=Fatura rehber Payment=Ödeme PaymentBack=Geri ödeme Payments=Ödemeler diff --git a/htdocs/langs/tr_TR/contracts.lang b/htdocs/langs/tr_TR/contracts.lang index 155319ed248..9494a28e3b5 100644 --- a/htdocs/langs/tr_TR/contracts.lang +++ b/htdocs/langs/tr_TR/contracts.lang @@ -29,7 +29,6 @@ ServiceStatusClosed=Kapalı ServicesLegend=Hizmetler efsanesi Contracts=Sözleşmeler Contract=Sözleşme -ContractContacts=Sözleşme rehber NoContracts=No sözleşmeleri MenuServices=Hizmetler MenuInactiveServices=Hizmetleri etkin değil diff --git a/htdocs/langs/tr_TR/orders.lang b/htdocs/langs/tr_TR/orders.lang index b4d967e6bba..6747c3204c4 100644 --- a/htdocs/langs/tr_TR/orders.lang +++ b/htdocs/langs/tr_TR/orders.lang @@ -15,7 +15,6 @@ Order=Sipariş Orders=Siparişler OrderLine=Sipariş Hattı OrderFollow=Takip -OrderContact=Sipariş İletişim OrderDate=Sipariş Tarihi NewOrder=New order ToOrder=Yapmak amacıyla diff --git a/htdocs/langs/tr_TR/propal.lang b/htdocs/langs/tr_TR/propal.lang index bd82efc755b..91d9d125ee3 100644 --- a/htdocs/langs/tr_TR/propal.lang +++ b/htdocs/langs/tr_TR/propal.lang @@ -17,7 +17,6 @@ ProposalsOpened=Açılış ticari öneriler Prop=Ticari öneriler CommercialProposal=Ticari önerisi CommercialProposals=Ticari öneriler -ProposalContact=Öneri iletişim NewProp=Yeni ticari önerisi NewProposal=Yeni ticari önerisi NewPropal=Yeni öneri diff --git a/htdocs/langs/zh_CN/bills.lang b/htdocs/langs/zh_CN/bills.lang index a2f33c2dc31..a9da9f585a1 100644 --- a/htdocs/langs/zh_CN/bills.lang +++ b/htdocs/langs/zh_CN/bills.lang @@ -57,7 +57,6 @@ SupplierInvoice=供应商发票 SuppliersInvoices=供应商的发票 SupplierBill=供应商发票 SupplierBills=供应商发票 -BillContacts=发票接触 Payment=付款 PaymentBack=付款回 Payments=付款 diff --git a/htdocs/langs/zh_CN/contracts.lang b/htdocs/langs/zh_CN/contracts.lang index c5db5a87424..5e4a5eb287b 100644 --- a/htdocs/langs/zh_CN/contracts.lang +++ b/htdocs/langs/zh_CN/contracts.lang @@ -29,7 +29,6 @@ ServiceStatusClosed=关闭 ServicesLegend=服务的传说 Contracts=合同 Contract=合同 -ContractContacts=合同接触 NoContracts=没有合同 MenuServices=服务 MenuInactiveServices=服务不活跃 diff --git a/htdocs/langs/zh_CN/orders.lang b/htdocs/langs/zh_CN/orders.lang index 3052afd07bf..9252e3cd1d3 100644 --- a/htdocs/langs/zh_CN/orders.lang +++ b/htdocs/langs/zh_CN/orders.lang @@ -15,7 +15,6 @@ Order=订单 Orders=订单 OrderLine=在线订单 OrderFollow=跟进 -OrderContact=订购联系 OrderDate=订购日期 OrderToProcess=为了处理 NewOrder=新秩序 diff --git a/htdocs/langs/zh_CN/propal.lang b/htdocs/langs/zh_CN/propal.lang index 17343a230f0..50c851be815 100644 --- a/htdocs/langs/zh_CN/propal.lang +++ b/htdocs/langs/zh_CN/propal.lang @@ -17,7 +17,6 @@ ProposalsOpened=新开张的商业建议 Prop=商业建议 CommercialProposal=商业建议 CommercialProposals=商业建议 -ProposalContact=建议接触 NewProp=新的商业建议 NewProposal=新的商业建议 NewPropal=新建议