diff --git a/ChangeLog b/ChangeLog index deebc026a70..15c66406cde 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ English Dolibarr ChangeLog ***** ChangeLog for 2.8 compared to 2.7 ***** For users: +- New: task #9935: Can edit accountancy code. - New: Add a default errors-to email for emailing module. - New: Can filter on user on stock movement list. - New: When creating a third party from a member, it is set as a new diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index 8cae18e30a9..5558e83b136 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -173,7 +173,7 @@ if ($socid > 0) print ''; print $langs->trans('CustomerCode').''; print $objsoc->code_client; - if ($objsoc->check_codeclient() <> 0) print ' ('.$langs->trans("WrongCustomerCode").')'; + if ($objsoc->check_codeclient() <> 0) print ' ('.$langs->trans("WrongCustomerCode").')'; print ''; } diff --git a/htdocs/compta/fiche.php b/htdocs/compta/fiche.php index 71d38c504ad..c90cd045a72 100644 --- a/htdocs/compta/fiche.php +++ b/htdocs/compta/fiche.php @@ -68,6 +68,35 @@ if ($mode == 'search') } +if ($_POST['action'] == 'setcustomeraccountancycode') +{ + $societe = new Societe($db); + $result=$societe->fetch($_POST['socid']); + $societe->code_compta=$_POST["customeraccountancycode"]; + $result=$societe->update($societe->id,$user,1,1,0); + if ($result < 0) + { + $mesg=join(',',$societe->errors); + } + $POST["action"]=""; + $socid=$_POST["socid"]; +} + +if ($_POST['action'] == 'setsupplieraccountancycode') +{ + $societe = new Societe($db); + $result=$societe->fetch($_POST['socid']); + $societe->code_compta_fournisseur=$_POST["supplieraccountancycode"]; + $result=$societe->update($societe->id,$user,1,0,1); + if ($result < 0) + { + $mesg=join(',',$societe->errors); + } + $POST["action"]=""; + $socid=$_POST["socid"]; +} + + /* @@ -94,8 +123,9 @@ if ($socid > 0) */ $head = societe_prepare_head($societe); - dol_fiche_head($head, 'compta', $langs->trans("ThirdParty"),0,'company'); + dol_fiche_head($head, 'compta', $langs->trans("ThirdParty"),0,'company'); // Add a div + if ($mesg) print $mesg; print ''; print ''; + print ''; if ($societe->client) { print ''; - print ''; + print ''; print ''; + print ''; - print ''; + // TODO Use a html->editfield function + print ''; + // End editfield print ''; + } if ($societe->fournisseur) { print ''; - print ''; + print ''; print ''; + print ''; - print ''; + // TODO Use a html->editfield function + print ''; + // End editfield print ''; } @@ -147,7 +230,7 @@ if ($socid > 0) print ''; // EMail - print ''; + print ''; // Web print ''; @@ -331,7 +414,9 @@ if ($socid > 0) } print ""; - print "
'; @@ -107,25 +137,78 @@ if ($socid > 0) // Prefix print '
'.$langs->trans("Prefix").''; print ($societe->prefix_comm?$societe->prefix_comm:' '); - print '
'.$langs->trans("CustomerCode"). ''. $societe->code_client . ''.$langs->trans("CustomerCode").''; + print $societe->code_client; + if ($societe->check_codeclient() <> 0) print ' ('.$langs->trans("WrongCustomerCode").')'; + print '
'.$langs->trans("CustomerAccountancyCode").''.$societe->code_compta.''; + if ($_GET['action'] != 'editcustomeraccountancycode' && $user->rights->societe->creer) print ''; + print '
'; + print $langs->trans("CustomerAccountancyCode"); + print 'id.'">'.img_edit($langs->trans('Edit'),1).'
'; + print '		'; + if ($_GET['action'] == 'editcustomeraccountancycode') + { + print "\n".'
'; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print '
'; + print ''; + print '
'."\n"; + } + else print $societe->code_compta; + print '
'.$langs->trans("SupplierCode"). ''. $societe->code_fournisseur . ''.$langs->trans("SupplierCode"). ''; + print $societe->code_fournisseur; + if ($societe->check_codefournisseur() <> 0) print ' ('.$langs->trans("WrongSupplierCode").')'; + print '
'.$langs->trans("SupplierAccountancyCode").''.$societe->code_compta_fournisseur.''; + if ($_GET['action'] != 'editsupplieraccountancycode' && $user->rights->societe->creer) print ''; + print '
'; + print $langs->trans("SupplierAccountancyCode"); + print 'id.'">'.img_edit($langs->trans('Edit'),1).'
'; + print '		'; + if ($_GET['action'] == 'editsupplieraccountancycode') + { + print "\n".'
'; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print '
'; + print ''; + print '
'."\n"; + } + else print $societe->code_compta_fournisseur; + print '
'.$langs->trans("Fax").''.dol_print_phone($societe->fax,$societe->pays_code,0,$societe->id,'AC_FAX').'
'.$langs->trans('EMail').''.dol_print_email($societe->email,0,$societe->id,'AC_EMAIL').'
'.$langs->trans('EMail').''.dol_print_email($societe->email,0,$societe->id,'AC_EMAIL').'
'.$langs->trans("Web").''.dol_print_url($societe->url,'_blank').'
\n"; + print ""; + + print "\n\n"; /* diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php index 5a8943e0201..446151b1529 100644 --- a/htdocs/fourn/fiche.php +++ b/htdocs/fourn/fiche.php @@ -77,7 +77,7 @@ if ( $societe->fetch($socid) ) print ''; print $langs->trans('SupplierCode').''; print $societe->code_fournisseur; - if ($societe->check_codefournisseur() <> 0) print ' '.$langs->trans("WrongSupplierCode"); + if ($societe->check_codefournisseur() <> 0) print ' ('.$langs->trans("WrongSupplierCode").')'; print ''; } diff --git a/htdocs/lib/company.lib.php b/htdocs/lib/company.lib.php index 135297643b1..8b6fbafd89c 100644 --- a/htdocs/lib/company.lib.php +++ b/htdocs/lib/company.lib.php @@ -304,8 +304,9 @@ function show_contacts($conf,$langs,$db,$objsoc) $user->fetch_clicktodial(); // lecture des infos de clicktodial } + print "\n"; print_titre($langs->trans("ContactsForCompany")); - print ''; + print "\n".'
'."\n"; print ''; print ''; @@ -378,7 +379,7 @@ function show_contacts($conf,$langs,$db,$objsoc) //print ''; //print "\n"; } - print "
'.$langs->trans("Name").''.$langs->trans("Poste").''.$langs->trans("Tel").''.$langs->trans("NoContactsYetDefined").'
\n"; + print "\n\n"; print "
\n"; } @@ -403,6 +404,7 @@ function show_actions_todo($conf,$langs,$db,$objsoc,$objcon='') $userstatic=new User($db); $contactstatic = new Contact($db); + print "\n"; if (is_object($objcon) && $objcon->id) print_titre($langs->trans("TasksHistoryForThisContact")); else print_titre($langs->trans("ActionsOnCompany")); @@ -627,6 +629,7 @@ function show_actions_done($conf,$langs,$db,$objsoc,$objcon='') $orderstatic=new Commande($db); $facturestatic=new Facture($db); + print "\n"; print ''; print ''; print ''; @@ -714,12 +717,12 @@ function show_actions_done($conf,$langs,$db,$objsoc,$objcon='') print "\n"; $i++; } + print "
'.$langs->trans("ActionsDoneShort").'
\n"; + print "
\n"; $db->free($result); } - print "\n"; - print "
\n"; } ?> diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php index a1f62ec2c4d..56798912a36 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/lib/functions.lib.php @@ -373,7 +373,7 @@ function dol_fiche_head($links, $active='0', $title='', $notab=0, $picto='') print "\n"; - if (! $notab) print '
'."\n\n"; + if (! $notab) print "\n".'
'."\n"; } diff --git a/htdocs/soc.php b/htdocs/soc.php index 19912748860..cbc52efff9e 100644 --- a/htdocs/soc.php +++ b/htdocs/soc.php @@ -71,6 +71,12 @@ if ((! $_POST["getcustomercode"] && ! $_POST["getsuppliercode"]) require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); $error=0; + if ($_POST["action"] == 'update') + { + // Load properties of company + $soc->fetch($socid); + } + if ($_REQUEST["private"] == 1) { $soc->particulier = $_REQUEST["private"]; @@ -227,6 +233,7 @@ if ((! $_POST["getcustomercode"] && ! $_POST["getsuppliercode"]) // To not set code if third party is not concerned. But if it had values, we keep them. if (empty($soc->client) && empty($oldsoc->code_client)) $soc->code_client=''; if (empty($soc->fournisseur)&& empty($oldsoc->code_fournisseur)) $soc->code_fournisseur=''; + //var_dump($soc);exit; $result = $soc->update($socid,$user,1,$oldsoc->codeclient_modifiable(),$oldsoc->codefournisseur_modifiable()); if ($result >= 0) @@ -343,7 +350,7 @@ $_GET["action"] == 'create' || $_POST["action"] == 'create') $soc->tva_assuj = $_POST["assujtva_value"]; $soc->tva_intra=$_POST["tva_intra"]; - + $soc->commercial_id=$_POST["commercial_id"]; // On positionne pays_id, pays_code et libelle du pays choisi @@ -695,7 +702,7 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit') $soc->tva_assuj = $_POST["assujtva_value"]; $soc->tva_intra=$_POST["tva_intra"]; - + // On positionne pays_id, pays_code et libelle du pays choisi if ($soc->pays_id) { diff --git a/htdocs/societe.class.php b/htdocs/societe.class.php index 8dcfe2b7da0..99d25294374 100644 --- a/htdocs/societe.class.php +++ b/htdocs/societe.class.php @@ -313,8 +313,8 @@ class Societe extends CommonObject * \param id id societe * \param user Utilisateur qui demande la mise a jour * \param call_trigger 0=non, 1=oui - * \param allowmodcodeclient Autorise modif code client - * \param allowmodcodefournisseur Autorise modif code fournisseur + * \param allowmodcodeclient Inclut modif code client et code compta + * \param allowmodcodefournisseur Inclut modif code fournisseur et code compta fournisseur * \return int <0 si ko, >=0 si ok */ function update($id, $user='', $call_trigger=1, $allowmodcodeclient=0, $allowmodcodefournisseur=0) @@ -323,7 +323,7 @@ class Societe extends CommonObject global $langs,$conf; - dol_syslog("Societe::Update id=".$id." call_trigger=".$call_triger." allowmodcodeclient=".$allowmodcodeclient." allowmodcodefournisseur=".$allowmodcodefournisseur); + dol_syslog("Societe::Update id=".$id." call_trigger=".$call_trigger." allowmodcodeclient=".$allowmodcodeclient." allowmodcodefournisseur=".$allowmodcodefournisseur); // Clean parameters $this->id=$id; @@ -361,10 +361,13 @@ class Societe extends CommonObject //Gencod $this->gencod=trim($this->gencod); - // For automatic creation (not used by Dolibarr) + // For automatic creation if ($this->code_client == -1) $this->get_codeclient($this->prefix_comm,0); if ($this->code_fournisseur == -1) $this->get_codefournisseur($this->prefix_comm,1); + $this->code_compta=trim($this->code_compta); + $this->code_compta_fournisseur=trim($this->code_compta_fournisseur); + // Check name is required and codes are ok or unique. // If error, this->errors[] is filled $result = $this->verify(); @@ -419,7 +422,7 @@ class Societe extends CommonObject $sql .= ", code_client = ".($this->code_client?"'".addslashes($this->code_client)."'":"null"); // Attention get_codecompta peut modifier le code suivant le module utilise - $this->get_codecompta('customer'); + if (empty($this->code_compta)) $this->get_codecompta('customer'); $sql .= ", code_compta = ".($this->code_compta?"'".addslashes($this->code_compta)."'":"null"); } @@ -431,7 +434,7 @@ class Societe extends CommonObject $sql .= ", code_fournisseur = ".($this->code_fournisseur?"'".addslashes($this->code_fournisseur)."'":"null"); // Attention get_codecompta peut modifier le code suivant le module utilise - $this->get_codecompta('supplier'); + if (empty($this->code_compta_fournisseur)) $this->get_codecompta('supplier'); $sql .= ", code_compta_fournisseur = ".($this->code_compta_fournisseur?"'".addslashes($this->code_compta_fournisseur)."'":"null"); }