Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean code to swith to code_compta_client

Browse Source
This commit is contained in:
Laurent Destailleur 2024-08-14 16:51:53 +02:00
parent 467e96e81f
commit 2c86c9b21b
33 changed files with 127 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/accountancy/journal/bankjournal.php
View File

@ -137,10 +137,10 @@ $sql = "SELECT b.rowid, b.dateo as do, b.datev as dv, b.amount, b.amount_main_c
$sql .= " ba.courant, ba.ref as baref, ba.account_number, ba.fk_accountancy_journal,";
$sql .= " soc.rowid as socid, soc.nom as name, soc.email as email, bu1.type as typeop_company,";
if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
$sql .= " spe.accountancy_code_customer as code_compta,";
$sql .= " spe.accountancy_code_customer as code_compta_client,";
$sql .= " spe.accountancy_code_supplier as code_compta_fournisseur,";
} else {
$sql .= " soc.code_compta,";
$sql .= " soc.code_compta as code_compta_client,";
$sql .= " soc.code_compta_fournisseur,";
}
$sql .= " u.accountancy_code, u.rowid as userid, u.lastname as lastname, u.firstname as firstname, u.email as useremail, u.statut as userstatus,";
@ -215,7 +215,7 @@ $tabtype = array();
$tabmoreinfo = array();
'
@phan-var-force array<array{id:mixed,name:mixed,code_compta:string,email:string}> $tabcompany
@phan-var-force array<array{id:mixed,name:mixed,code_compta_client:string,email:string}> $tabcompany
@phan-var-force array<array{id:int,name:string,lastname:string,firstname:string,email:string,accountancy_code:string,status:int> $tabuser
@phan-var-force array<int,array{date:string,type_payment:string,ref:string,fk_bank:int,ban_account_ref:string,fk_bank_account:int,lib:string,type:string}> $tabpay
@phan-var-force array<array{lib:string,date?:int|string,type_payment?:string,ref?:string,fk_bank?:int,ban_account_ref?:string,fk_bank_account?:int,type?:string,bank_account_ref?:string,paymentid?:int,paymentsupplierid?:int,soclib?:string,paymentscid?:int,paymentdonationid?:int,paymentsubscriptionid?:int,paymentvatid?:int,paymentsalid?:int,paymentexpensereport?:int,paymentvariousid?:int,account_various?:string,paymentloanid?:int}> $tabtp
@ -279,7 +279,7 @@ if ($result) {
$compta_soc = (($obj->code_compta_fournisseur != "") ? $obj->code_compta_fournisseur : $account_supplier);
}
if ($lineisasale > 0) {
$compta_soc = (!empty($obj->code_compta) ? $obj->code_compta : $account_customer);
$compta_soc = (!empty($obj->code_compta_client) ? $obj->code_compta_client : $account_customer);
}
$tabcompany[$obj->rowid] = array(

6
htdocs/accountancy/journal/sellsjournal.php
View File

@ -122,10 +122,10 @@ $sql = "SELECT f.rowid, f.ref, f.type, f.situation_cycle_ref, f.datef as df, f.r
$sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.total_tva, fd.total_localtax1, fd.total_localtax2, fd.tva_tx, fd.total_ttc, fd.situation_percent, fd.vat_src_code, fd.info_bits,";
$sql .= " s.rowid as socid, s.nom as name, s.code_client, s.code_fournisseur,";
if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
$sql .= " spe.accountancy_code_customer as code_compta,";
$sql .= " spe.accountancy_code_customer as code_compta_client,";
$sql .= " spe.accountancy_code_supplier as code_compta_fournisseur,";
} else {
$sql .= " s.code_compta as code_compta,";
$sql .= " s.code_compta as code_compta_client,";
$sql .= " s.code_compta_fournisseur,";
}
$sql .= " p.rowid as pid, p.ref as pref, aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte,";
@ -208,7 +208,7 @@ if ($result) {
$obj = $db->fetch_object($result);
// Controls
$compta_soc = (!empty($obj->code_compta)) ? $obj->code_compta : $cptcli;
$compta_soc = (!empty($obj->code_compta_client)) ? $obj->code_compta_client : $cptcli;
$compta_prod = $obj->compte;
if (empty($compta_prod)) {

49
htdocs/comm/index.php
View File

@ -134,7 +134,7 @@ if ($tmp) {
if (isModEnabled("propal") && $user->hasRight("propal", "lire")) {
$sql = "SELECT p.rowid, p.ref, p.ref_client, p.total_ht, p.total_tva, p.total_ttc, p.fk_statut as status";
$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
$sql .= ", s.code_client, s.code_compta, s.client";
$sql .= ", s.code_client, s.code_compta as code_compta_client, s.client";
$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
$sql .= ", s.logo, s.email, s.entity";
$sql .= ", s.canvas";
@ -187,7 +187,8 @@ if (isModEnabled("propal") && $user->hasRight("propal", "lire")) {
$companystatic->name = $obj->name;
$companystatic->name_alias = $obj->name_alias;
$companystatic->code_client = $obj->code_client;
$companystatic->code_compta = $obj->code_compta;
$companystatic->code_compta = $obj->code_compta_client;
$companystatic->code_compta_client = $obj->code_compta_client;
$companystatic->client = $obj->client;
$companystatic->code_fournisseur = $obj->code_fournisseur;
$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
@ -233,7 +234,7 @@ if (isModEnabled("propal") && $user->hasRight("propal", "lire")) {
if (isModEnabled('supplier_proposal') && $user->hasRight("supplier_proposal", "lire")) {
$sql = "SELECT p.rowid, p.ref, p.total_ht, p.total_tva, p.total_ttc, p.fk_statut as status";
$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
$sql .= ", s.code_client, s.code_compta, s.client";
$sql .= ", s.code_client, s.code_compta as code_compta_client, s.client";
$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
$sql .= ", s.logo, s.email, s.entity";
$sql .= ", s.canvas";
@ -285,6 +286,7 @@ if (isModEnabled('supplier_proposal') && $user->hasRight("supplier_proposal", "l
$companystatic->name_alias = $obj->name_alias;
$companystatic->code_client = $obj->code_client;
$companystatic->code_compta = $obj->code_compta;
$companystatic->code_compta_client = $obj->code_compta_client;
$companystatic->client = $obj->client;
$companystatic->code_fournisseur = $obj->code_fournisseur;
$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
@ -330,7 +332,7 @@ if (isModEnabled('supplier_proposal') && $user->hasRight("supplier_proposal", "l
if (isModEnabled('order') && $user->hasRight('commande', 'lire')) {
$sql = "SELECT c.rowid, c.ref, c.ref_client, c.total_ht, c.total_tva, c.total_ttc, c.fk_statut as status";
$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
$sql .= ", s.code_client, s.code_compta, s.client";
$sql .= ", s.code_client, s.code_compta as code_compta_client, s.client";
$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
$sql .= ", s.logo, s.email, s.entity";
$sql .= ", s.canvas";
@ -382,7 +384,8 @@ if (isModEnabled('order') && $user->hasRight('commande', 'lire')) {
$companystatic->name = $obj->name;
$companystatic->name_alias = $obj->name_alias;
$companystatic->code_client = $obj->code_client;
$companystatic->code_compta = $obj->code_compta;
$companystatic->code_compta = $obj->code_compta_client;
$companystatic->code_compta_client = $obj->code_compta_client;
$companystatic->client = $obj->client;
$companystatic->code_fournisseur = $obj->code_fournisseur;
$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
@ -528,7 +531,7 @@ if ((isModEnabled("fournisseur") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMO
if (isModEnabled('intervention')) {
$sql = "SELECT f.rowid, f.ref, s.nom as name, f.fk_statut, f.duree as duration";
$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
$sql .= ", s.code_client, s.code_compta, s.client";
$sql .= ", s.code_client, s.code_compta as code_compta_client, s.client";
$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
$sql .= ", s.logo, s.email, s.entity";
$sql .= ", s.canvas";
@ -570,7 +573,8 @@ if (isModEnabled('intervention')) {
$companystatic->name = $obj->name;
$companystatic->name_alias = $obj->name_alias;
$companystatic->code_client = $obj->code_client;
$companystatic->code_compta = $obj->code_compta;
$companystatic->code_compta = $obj->code_compta_client;
$companystatic->code_compta_client = $obj->code_compta_client;
$companystatic->client = $obj->client;
$companystatic->code_fournisseur = $obj->code_fournisseur;
$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
@ -611,7 +615,7 @@ print '</div><div class="secondcolumn fichehalfright boxhalfright" id="boxhalfri
*/
if (isModEnabled("societe") && $user->hasRight('societe', 'lire')) {
$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
$sql .= ", s.code_client, s.code_compta, s.client";
$sql .= ", s.code_client, s.code_compta as code_compta_client, s.client";
$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
$sql .= ", s.logo, s.email, s.entity";
$sql .= ", s.canvas";
@ -660,7 +664,8 @@ if (isModEnabled("societe") && $user->hasRight('societe', 'lire')) {
$companystatic->name = $objp->name;
$companystatic->name_alias = $objp->name_alias;
$companystatic->code_client = $objp->code_client;
$companystatic->code_compta = $objp->code_compta;
$companystatic->code_compta = $objp->code_compta_client;
$companystatic->code_compta_client = $objp->code_compta_client;
$companystatic->client = $objp->client;
$companystatic->code_fournisseur = $objp->code_fournisseur;
$companystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
@ -718,7 +723,7 @@ if (isModEnabled("societe") && $user->hasRight('societe', 'lire')) {
if (isModEnabled('propal')) {
$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut as status, c.tms as datem,";
$sql .= " s.nom as socname, s.rowid as socid, s.canvas, s.client, s.email, s.code_compta";
$sql .= " s.nom as socname, s.rowid as socid, s.canvas, s.client, s.email, s.code_compta as code_compta_client";
$sql .= " FROM ".MAIN_DB_PREFIX."propal as c,";
$sql .= " ".MAIN_DB_PREFIX."societe as s";
$sql .= " WHERE c.entity IN (".getEntity($propalstatic->element).")";
@ -764,8 +769,8 @@ if (isModEnabled('propal')) {
$companystatic->client = $obj->client;
$companystatic->canvas = $obj->canvas;
$companystatic->email = $obj->email;
$companystatic->code_compta = $obj->code_compta;
$companystatic->code_compta_client = $obj->code_compta;
$companystatic->code_compta = $obj->code_compta_client;
$companystatic->code_compta_client = $obj->code_compta_client;
$filename = dol_sanitizeFileName($obj->ref);
$filedir = $conf->propal->multidir_output[$obj->entity].'/'.dol_sanitizeFileName($obj->ref);
@ -902,7 +907,7 @@ if (isModEnabled('order')) {
*/
if ((isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) && $user->hasRight('societe', 'lire')) {
$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
$sql .= ", s.code_client, s.code_compta, s.client";
$sql .= ", s.code_client, s.code_compta as code_compta_client, s.client";
$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
$sql .= ", s.logo, s.email, s.entity";
$sql .= ", s.canvas";
@ -942,7 +947,8 @@ if ((isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) && $use
$companystatic->name = $objp->name;
$companystatic->name_alias = $objp->name_alias;
$companystatic->code_client = $objp->code_client;
$companystatic->code_compta = $objp->code_compta;
$companystatic->code_compta = $objp->code_compta_client;
$companystatic->code_compta_client = $objp->code_compta_client;
$companystatic->client = $objp->client;
$companystatic->code_fournisseur = $objp->code_fournisseur;
$companystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
@ -1015,7 +1021,7 @@ if (isModEnabled('contract') && $user->hasRight("contrat", "lire") && 0) { // TO
$staticcontrat = new Contrat($db);
$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
$sql .= ", s.code_client, s.code_compta, s.client";
$sql .= ", s.code_client, s.code_compta as code_compta_client, s.client";
$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
$sql .= ", s.logo, s.email, s.entity";
$sql .= ", s.canvas";
@ -1053,7 +1059,8 @@ if (isModEnabled('contract') && $user->hasRight("contrat", "lire") && 0) { // TO
$companystatic->name = $obj->name;
$companystatic->name_alias = $obj->name_alias;
$companystatic->code_client = $obj->code_client;
$companystatic->code_compta = $obj->code_compta;
$companystatic->code_compta = $obj->code_compta_client;
$companystatic->code_compta_client = $obj->code_compta_client;
$companystatic->client = $obj->client;
$companystatic->code_fournisseur = $obj->code_fournisseur;
$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
@ -1092,7 +1099,7 @@ if (isModEnabled('contract') && $user->hasRight("contrat", "lire") && 0) { // TO
if (isModEnabled("propal") && $user->hasRight("propal", "lire")) {
$sql = "SELECT p.rowid as propalid, p.entity, p.total_ttc, p.total_ht, p.total_tva, p.ref, p.ref_client, p.fk_statut, p.datep as dp, p.fin_validite as dfv";
$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
$sql .= ", s.code_client, s.code_compta, s.client";
$sql .= ", s.code_client, s.code_compta as code_compta_client, s.client";
$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
$sql .= ", s.logo, s.email, s.entity";
$sql .= ", s.canvas";
@ -1145,7 +1152,8 @@ if (isModEnabled("propal") && $user->hasRight("propal", "lire")) {
$companystatic->name = $obj->name;
$companystatic->name_alias = $obj->name_alias;
$companystatic->code_client = $obj->code_client;
$companystatic->code_compta = $obj->code_compta;
$companystatic->code_compta = $obj->code_compta_client;
$companystatic->code_compta_client = $obj->code_compta_client;
$companystatic->client = $obj->client;
$companystatic->code_fournisseur = $obj->code_fournisseur;
$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
@ -1211,7 +1219,7 @@ if (isModEnabled("propal") && $user->hasRight("propal", "lire")) {
if (isModEnabled('order') && $user->hasRight('commande', 'lire')) {
$sql = "SELECT c.rowid as commandeid, c.total_ttc, c.total_ht, c.total_tva, c.ref, c.ref_client, c.fk_statut, c.date_valid as dv, c.facture as billed";
$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
$sql .= ", s.code_client, s.code_compta, s.client";
$sql .= ", s.code_client, s.code_compta as code_compta_client, s.client";
$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
$sql .= ", s.logo, s.email, s.entity";
$sql .= ", s.canvas";
@ -1265,7 +1273,8 @@ if (isModEnabled('order') && $user->hasRight('commande', 'lire')) {
$companystatic->name = $obj->name;
$companystatic->name_alias = $obj->name_alias;
$companystatic->code_client = $obj->code_client;
$companystatic->code_compta = $obj->code_compta;
$companystatic->code_compta = $obj->code_compta_client;
$companystatic->code_compta_client = $obj->code_compta_client;
$companystatic->client = $obj->client;
$companystatic->code_fournisseur = $obj->code_fournisseur;
$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;

28
htdocs/comm/propal/index.php
View File

@ -78,10 +78,10 @@ if ($tmp) {
* Draft proposals
*/
if (isModEnabled("propal")) {
$sql = "SELECT p.rowid, p.ref, p.ref_client, p.total_ht, p.total_tva, p.total_ttc";
$sql .= ", s.rowid as socid, s.nom as name, s.client, s.canvas, s.code_client, s.code_fournisseur, s.email, s.entity, s.code_compta";
$sql .= " FROM ".MAIN_DB_PREFIX."propal as p";
$sql .= ", ".MAIN_DB_PREFIX."societe as s";
$sql = "SELECT p.rowid, p.ref, p.ref_client, p.total_ht, p.total_tva, p.total_ttc,";
$sql .= " s.rowid as socid, s.nom as name, s.client, s.canvas, s.code_client, s.code_fournisseur, s.email, s.entity, s.code_compta as code_compta_client";
$sql .= " FROM ".MAIN_DB_PREFIX."propal as p,";
$sql .= " ".MAIN_DB_PREFIX."societe as s";
$sql .= " WHERE p.entity IN (".getEntity($propalstatic->element).")";
$sql .= " AND p.fk_soc = s.rowid";
$sql .= " AND p.fk_statut =".Propal::STATUS_DRAFT;
@ -119,6 +119,7 @@ if (isModEnabled("propal")) {
$propalstatic->id = $obj->rowid;
$propalstatic->ref = $obj->ref;
$propalstatic->ref_client = $obj->ref_client;
$propalstatic->ref_customer = $obj->ref_client;
$propalstatic->total_ht = $obj->total_ht;
$propalstatic->total_tva = $obj->total_tva;
$propalstatic->total_ttc = $obj->total_ttc;
@ -131,7 +132,8 @@ if (isModEnabled("propal")) {
$companystatic->canvas = $obj->canvas;
$companystatic->entity = $obj->entity;
$companystatic->email = $obj->email;
$companystatic->code_compta = $obj->code_compta;
$companystatic->code_compta = $obj->code_compta_client;
$companystatic->code_compta_client = $obj->code_compta_client;
print '<tr class="oddeven">';
print '<td class="nowrap">'.$propalstatic->getNomUrl(1).'</td>';
@ -161,7 +163,7 @@ print '<div class="fichetwothirdright">';
*/
$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut as status, date_cloture as datec, c.tms as datem,";
$sql .= " s.nom as socname, s.rowid as socid, s.canvas, s.client, s.email, s.code_compta";
$sql .= " s.nom as socname, s.rowid as socid, s.canvas, s.client, s.email, s.code_compta as code_compta_client";
$sql .= " FROM ".MAIN_DB_PREFIX."propal as c,";
$sql .= " ".MAIN_DB_PREFIX."societe as s";
$sql .= " WHERE c.entity IN (".getEntity($propalstatic->element).")";
@ -206,7 +208,8 @@ if ($resql) {
$companystatic->client = $obj->client;
$companystatic->canvas = $obj->canvas;
$companystatic->email = $obj->email;
$companystatic->code_compta = $obj->code_compta;
$companystatic->code_compta = $obj->code_compta_client;
$companystatic->code_compta_client = $obj->code_compta_client;
$filename = dol_sanitizeFileName($obj->ref);
$filedir = $conf->propal->multidir_output[$obj->entity].'/'.dol_sanitizeFileName($obj->ref);
@ -250,10 +253,10 @@ if ($resql) {
* Open (validated) proposals
*/
if (isModEnabled("propal") && $user->hasRight('propal', 'lire')) {
$sql = "SELECT s.nom as socname, s.rowid as socid, s.canvas, s.client, s.email, s.code_compta";
$sql .= ", p.rowid as propalid, p.entity, p.total_ttc, p.total_ht, p.ref, p.fk_statut, p.datep as dp, p.fin_validite as dfv";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql .= ", ".MAIN_DB_PREFIX."propal as p";
$sql = "SELECT s.nom as socname, s.rowid as socid, s.canvas, s.client, s.email, s.code_compta as code_compta_client,";
$sql .= " p.rowid as propalid, p.entity, p.total_ttc, p.total_ht, p.ref, p.fk_statut, p.datep as dp, p.fin_validite as dfv";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s,";
$sql .= " ".MAIN_DB_PREFIX."propal as p";
$sql .= " WHERE p.fk_soc = s.rowid";
$sql .= " AND p.entity IN (".getEntity($propalstatic->element).")";
$sql .= " AND p.fk_statut = ".Propal::STATUS_VALIDATED;
@ -296,7 +299,8 @@ if (isModEnabled("propal") && $user->hasRight('propal', 'lire')) {
$companystatic->client = $obj->client;
$companystatic->canvas = $obj->canvas;
$companystatic->email = $obj->email;
$companystatic->code_compta = $obj->code_compta;
$companystatic->code_compta = $obj->code_compta_client;
$companystatic->code_compta_client = $obj->code_compta_client;
$filename = dol_sanitizeFileName($obj->ref);
$filedir = $conf->propal->multidir_output[$obj->entity].'/'.dol_sanitizeFileName($obj->ref);

10
htdocs/commande/customer.php
View File

@ -76,8 +76,8 @@ $thirdpartystatic = new Societe($db);
* Mode List
*/
$sql = "SELECT s.rowid, s.nom as name, s.client, s.town, s.datec, s.datea";
$sql .= ", st.libelle as stcomm, s.prefix_comm, s.code_client, s.code_compta";
$sql = "SELECT s.rowid, s.nom as name, s.client, s.town, s.datec, s.datea,";
$sql .= " st.libelle as stcomm, s.prefix_comm, s.code_client, s.code_compta as code_compta_client";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st, ".MAIN_DB_PREFIX."commande as c";
$sql .= " WHERE s.fk_stcomm = st.id AND c.fk_soc = s.rowid";
$sql .= " AND s.entity IN (".getEntity('societe').")";
@ -186,9 +186,9 @@ if ($resql) {
print $result;
print '</td>';
print '<td>'.$obj->town.'&nbsp;</td>';
print '<td class="left">'.$obj->code_client.'&nbsp;</td>';
print '<td class="left">'.$obj->code_compta.'&nbsp;</td>';
print '<td>'.dolPrintLabel($obj->town).'</td>';
print '<td class="left">'.dolPrintLabel($obj->code_client).'</td>';
print '<td class="left">'.dolPrintLabel($obj->code_compta_client).'</td>';
print '<td class="right">'.dol_print_date($db->jdate($obj->datec)).'</td>';
print "</tr>\n";
$i++;

10
htdocs/compta/clients.php
View File

@ -92,7 +92,7 @@ if ($mode == 'search') {
// Mode List
$sql = "SELECT s.rowid, s.nom as name, s.client, s.town, s.datec, s.datea";
$sql .= ", st.libelle as stcomm, s.prefix_comm, s.code_client, s.code_compta ";
$sql .= ", st.libelle as stcomm, s.prefix_comm, s.code_client as code_client_compta, s.code_compta ";
if (!$user->hasRight('societe', 'client', 'voir')) {
$sql .= ", sc.fk_soc, sc.fk_user ";
}
@ -120,7 +120,7 @@ if (GETPOST("search_code_client")) {
if ($socid) {
$sql .= " AND s.rowid = ".((int) $socid);
}
$sql .= " ORDER BY $sortfield $sortorder";
$sql .= $db->order($sortfield, $sortorder);
$sql .= $db->plimit($conf->liste_limit + 1, $offset);
//print $sql;
@ -176,9 +176,9 @@ if ($resql) {
$thirdpartystatic->client = $obj->client;
print $thirdpartystatic->getNomUrl(1, 'compta');
print '</td>';
print '<td>'.$obj->town.'&nbsp;</td>';
print '<td class="left">'.$obj->code_client.'&nbsp;</td>';
print '<td class="left">'.$obj->code_compta.'&nbsp;</td>';
print '<td>'.dolPrintLabel($obj->town).'</td>';
print '<td class="left">'.dolPrintLabel($obj->code_client).'</td>';
print '<td class="left">'.dolPrintLabel($obj->code_compta_client).'</td>';
print '<td class="right">'.dol_print_date($db->jdate($obj->datec)).'</td>';
print "</tr>\n";
$i++;

2
htdocs/compta/facture/class/facture.class.php
View File

@ -3299,7 +3299,7 @@ class Facture extends CommonInvoice
}
if ($key == 'ACCOUNTANCY_CODE_CUSTOMER') {
// Check for mandatory
if (getDolGlobalString('SOCIETE_ACCOUNTANCY_CODE_CUSTOMER_INVOICE_MANDATORY') && empty($this->thirdparty->code_compta)) {
if (getDolGlobalString('SOCIETE_ACCOUNTANCY_CODE_CUSTOMER_INVOICE_MANDATORY') && empty($this->thirdparty->code_compta_client)) {
$langs->load("errors");
$this->error = $langs->trans("ErrorAccountancyCodeCustomerIsMandatory", $this->thirdparty->name).' ('.$langs->trans("ForbiddenBySetupRules").')';
dol_syslog(__METHOD__.' '.$this->error, LOG_ERR);

8
htdocs/compta/index.php
View File

@ -142,7 +142,7 @@ if (isModEnabled('invoice') && $user->hasRight('facture', 'lire')) {
$sql .= ", f.date_lim_reglement as datelimite";
$sql .= ", s.nom as name";
$sql .= ", s.rowid as socid";
$sql .= ", s.code_client, s.code_compta, s.email";
$sql .= ", s.code_client, s.code_compta as code_compta_client, s.email";
$sql .= ", cc.rowid as country_id, cc.code as country_code";
$sql .= ", (SELECT SUM(pf.amount) FROM ".$db->prefix()."paiement_facture as pf WHERE pf.fk_facture = f.rowid) as am";
$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
@ -216,7 +216,7 @@ if (isModEnabled('invoice') && $user->hasRight('facture', 'lire')) {
$thirdpartystatic->client = 1;
$thirdpartystatic->code_client = $obj->code_client;
//$thirdpartystatic->code_fournisseur = $obj->code_fournisseur;
$thirdpartystatic->code_compta_client = $obj->code_compta;
$thirdpartystatic->code_compta_client = $obj->code_compta_client;
//$thirdpartystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
print '<tr class="oddeven">';
@ -604,7 +604,7 @@ if (isModEnabled('invoice') && isModEnabled('order') && $user->hasRight("command
$sql = "SELECT sum(f.total_ht) as tot_fht, sum(f.total_ttc) as tot_fttc";
$sql .= ", s.nom as name, s.email";
$sql .= ", s.rowid as socid";
$sql .= ", s.code_client, s.code_compta";
$sql .= ", s.code_client, s.code_compta as code_compta_client";
$sql .= ", c.rowid, c.ref, c.facture, c.fk_statut as status, c.total_ht, c.total_tva, c.total_ttc,";
$sql .= " cc.rowid as country_id, cc.code as country_code";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays";
@ -678,7 +678,7 @@ if (isModEnabled('invoice') && isModEnabled('order') && $user->hasRight("command
$societestatic->client = 1;
$societestatic->code_client = $obj->code_client;
//$societestatic->code_fournisseur = $obj->code_fournisseur;
$societestatic->code_compta_client = $obj->code_compta;
$societestatic->code_compta_client = $obj->code_compta_client;
//$societestatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
$commandestatic->id = $obj->rowid;

4
htdocs/compta/journal/sellsjournal.php
View File

@ -113,7 +113,7 @@ $idpays = $p[0];
$sql = "SELECT f.rowid, f.ref, f.type, f.datef, f.ref_client,";
$sql .= " fd.product_type, fd.total_ht, fd.total_tva, fd.tva_tx, fd.total_ttc, fd.localtax1_tx, fd.localtax2_tx, fd.total_localtax1, fd.total_localtax2, fd.rowid as id, fd.situation_percent,";
$sql .= " s.rowid as socid, s.nom as name, s.code_compta, s.client,";
$sql .= " s.rowid as socid, s.nom as name, s.code_compta as code_compta_client, s.client,";
$sql .= " p.rowid as pid, p.ref as pref,";
if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
$sql .= " ppe.accountancy_code_sell,";
@ -167,7 +167,7 @@ if ($result) {
$obj = $db->fetch_object($result);
// les variables
$cptcli = ((getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER') != "") ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef"));
$compta_soc = (!empty($obj->code_compta) ? $obj->code_compta : $cptcli);
$compta_soc = (!empty($obj->code_compta_client) ? $obj->code_compta_client : $cptcli);
$compta_prod = $obj->accountancy_code_sell;
if (empty($compta_prod)) {
if ($obj->product_type == 0) {

26
htdocs/contrat/index.php
View File

@ -250,7 +250,7 @@ print "</table></div><br>";
if (isModEnabled('contract') && $user->hasRight('contrat', 'lire')) {
$sql = "SELECT c.rowid, c.ref,";
$sql .= " s.nom as name, s.name_alias, s.logo, s.rowid as socid, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur";
$sql .= " s.nom as name, s.name_alias, s.logo, s.rowid as socid, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur";
$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe as s";
if (!$user->hasRight('societe', 'client', 'voir')) {
$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@ -289,8 +289,8 @@ if (isModEnabled('contract') && $user->hasRight('contrat', 'lire')) {
$staticcompany->logo = $obj->logo;
$staticcompany->code_client = $obj->code_client;
$staticcompany->code_fournisseur = $obj->code_fournisseur;
$staticcompany->code_compta = $obj->code_compta;
$staticcompany->code_compta_client = $obj->code_compta;
$staticcompany->code_compta = $obj->code_compta_client;
$staticcompany->code_compta_client = $obj->code_compta_client;
$staticcompany->code_compta_fournisseur = $obj->code_compta_fournisseur;
$staticcompany->client = $obj->client;
$staticcompany->fournisseur = $obj->fournisseur;
@ -344,7 +344,7 @@ if ($socid) {
$sql .= " AND s.rowid = ".((int) $socid);
}
$sql .= " GROUP BY c.rowid, c.ref, c.datec, c.tms, c.statut,";
$sql .= " s.nom, s.name_alias, s.logo, s.rowid, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur";
$sql .= " s.nom, s.name_alias, s.logo, s.rowid, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur";
$sql .= " ORDER BY c.tms DESC";
$sql .= $db->plimit($max);
@ -376,7 +376,8 @@ if ($result) {
$staticcompany->photo = 1;
$staticcompany->code_client = $obj->code_client;
$staticcompany->code_fournisseur = $obj->code_fournisseur;
$staticcompany->code_compta = $obj->code_compta;
$staticcompany->code_compta = $obj->code_compta_client;
$staticcompany->code_compta_client = $obj->code_compta_client;
$staticcompany->code_compta_fournisseur = $obj->code_compta_fournisseur;
$staticcompany->client = $obj->client;
$staticcompany->fournisseur = $obj->fournisseur;
@ -415,7 +416,7 @@ print '<br>';
// Last modified services
$sql = "SELECT c.ref, c.fk_soc as socid,";
$sql .= " cd.rowid as cid, cd.statut, cd.label, cd.fk_product, cd.description as note, cd.fk_contrat, cd.date_fin_validite,";
$sql .= " s.nom as name, s.name_alias, s.logo, s.rowid as socid, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
$sql .= " s.nom as name, s.name_alias, s.logo, s.rowid as socid, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur,";
$sql .= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype, p.entity as pentity";
$sql .= " FROM (".MAIN_DB_PREFIX."contrat as c";
$sql .= ", ".MAIN_DB_PREFIX."societe as s";
@ -461,7 +462,8 @@ if ($resql) {
$staticcompany->photo = 1;
$staticcompany->code_client = $obj->code_client;
$staticcompany->code_fournisseur = $obj->code_fournisseur;
$staticcompany->code_compta = $obj->code_compta;
$staticcompany->code_compta = $obj->code_compta_client;
$staticcompany->code_compta_client = $obj->code_compta_client;
$staticcompany->code_compta_fournisseur = $obj->code_compta_fournisseur;
$staticcompany->client = $obj->client;
$staticcompany->fournisseur = $obj->fournisseur;
@ -507,7 +509,7 @@ print '<br>';
// Not activated services
$sql = "SELECT c.ref, c.fk_soc as thirdpartyid, cd.rowid as cid, cd.statut, cd.label, cd.fk_product, cd.description as note, cd.fk_contrat,";
$sql .= " s.nom as name, s.name_alias, s.logo, s.rowid as socid, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
$sql .= " s.nom as name, s.name_alias, s.logo, s.rowid as socid, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur,";
$sql .= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype, p.entity as pentity";
$sql .= " FROM (".MAIN_DB_PREFIX."contrat as c";
$sql .= ", ".MAIN_DB_PREFIX."societe as s";
@ -549,7 +551,8 @@ if ($resql) {
$staticcompany->photo = 1;
$staticcompany->code_client = $obj->code_client;
$staticcompany->code_fournisseur = $obj->code_fournisseur;
$staticcompany->code_compta = $obj->code_compta;
$staticcompany->code_compta = $obj->code_compta_client;
$staticcompany->code_compta_client = $obj->code_compta_client;
$staticcompany->code_compta_fournisseur = $obj->code_compta_fournisseur;
$staticcompany->client = $obj->client;
$staticcompany->fournisseur = $obj->fournisseur;
@ -600,7 +603,7 @@ print '<br>';
// Expired services
$sql = "SELECT c.ref, c.fk_soc as thirdpartyid, cd.rowid as cid, cd.statut, cd.label, cd.fk_product, cd.description as note, cd.fk_contrat,";
$sql .= " s.nom as name, s.name_alias, s.logo, s.rowid as socid, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
$sql .= " s.nom as name, s.name_alias, s.logo, s.rowid as socid, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur,";
$sql .= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype, p.entity as pentity";
$sql .= " FROM (".MAIN_DB_PREFIX."contrat as c";
$sql .= ", ".MAIN_DB_PREFIX."societe as s";
@ -643,7 +646,8 @@ if ($resql) {
$staticcompany->photo = 1;
$staticcompany->code_client = $obj->code_client;
$staticcompany->code_fournisseur = $obj->code_fournisseur;
$staticcompany->code_compta = $obj->code_compta;
$staticcompany->code_compta = $obj->code_compta_client;
$staticcompany->code_compta_client = $obj->code_compta_client;
$staticcompany->code_compta_fournisseur = $obj->code_compta_fournisseur;
$staticcompany->client = $obj->client;
$staticcompany->fournisseur = $obj->fournisseur;

3
htdocs/core/boxes/box_actions.php
View File

@ -80,7 +80,7 @@ class box_actions extends ModeleBoxes
$sql .= ", ta.code";
$sql .= ", ta.libelle as type_label";
$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
$sql .= ", s.code_client, s.code_compta, s.client";
$sql .= ", s.code_client, s.code_compta as code_compta_client, s.client";
$sql .= ", s.logo, s.email, s.entity";
$sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm AS ta, ".MAIN_DB_PREFIX."actioncomm AS a";
if (!$user->hasRight('societe', 'client', 'voir')) {
@ -126,6 +126,7 @@ class box_actions extends ModeleBoxes
//$societestatic->name_alias = $objp->name_alias;
$societestatic->code_client = $objp->code_client;
$societestatic->code_compta = $objp->code_compta;
$societestatic->code_compta_client = $objp->code_compta_client;
$societestatic->client = $objp->client;
$societestatic->logo = $objp->logo;
$societestatic->email = $objp->email;

3
htdocs/core/boxes/box_actions_future.php
View File

@ -82,7 +82,7 @@ class box_actions_future extends ModeleBoxes
$sql .= ", ta.code";
$sql .= ", ta.libelle as type_label";
$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
$sql .= ", s.code_client, s.code_compta, s.client";
$sql .= ", s.code_client, s.code_compta as code_compta_client, s.client";
$sql .= ", s.logo, s.email, s.entity";
$sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm AS ta, ".MAIN_DB_PREFIX."actioncomm AS a";
if (!$user->hasRight('societe', 'client', 'voir')) {
@ -129,6 +129,7 @@ class box_actions_future extends ModeleBoxes
//$societestatic->name_alias = $objp->name_alias;
$societestatic->code_client = $objp->code_client;
$societestatic->code_compta = $objp->code_compta;
$societestatic->code_compta_client = $objp->code_compta_client;
$societestatic->client = $objp->client;
$societestatic->logo = $objp->logo;
$societestatic->email = $objp->email;

5
htdocs/core/boxes/box_clients.php
View File

@ -81,7 +81,7 @@ class box_clients extends ModeleBoxes
if ($user->hasRight('societe', 'lire')) {
$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
$sql .= ", s.code_client, s.code_compta, s.client";
$sql .= ", s.code_client, s.code_compta as code_compta_client, s.client";
$sql .= ", s.logo, s.email, s.entity";
$sql .= ", s.datec, s.tms, s.status";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
@ -120,7 +120,8 @@ class box_clients extends ModeleBoxes
$thirdpartystatic->name = $objp->name;
$thirdpartystatic->name_alias = $objp->name_alias;
$thirdpartystatic->code_client = $objp->code_client;
$thirdpartystatic->code_compta = $objp->code_compta;
$thirdpartystatic->code_compta = $objp->code_compta_client;
$thirdpartystatic->code_compta_client = $objp->code_compta_client;
$thirdpartystatic->client = $objp->client;
$thirdpartystatic->logo = $objp->logo;
$thirdpartystatic->email = $objp->email;

5
htdocs/core/boxes/box_commandes.php
View File

@ -79,7 +79,7 @@ class box_commandes extends ModeleBoxes
if ($user->hasRight('commande', 'lire')) {
$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
$sql .= ", s.code_client, s.code_compta, s.client";
$sql .= ", s.code_client, s.code_compta as code_compta_client, s.client";
$sql .= ", s.logo, s.email, s.entity";
$sql .= ", c.ref, c.tms";
$sql .= ", c.rowid";
@ -137,7 +137,8 @@ class box_commandes extends ModeleBoxes
$societestatic->name = $objp->name;
//$societestatic->name_alias = $objp->name_alias;
$societestatic->code_client = $objp->code_client;
$societestatic->code_compta = $objp->code_compta;
$societestatic->code_compta = $objp->code_compta_client;
$societestatic->code_compta_client = $objp->code_compta_client;
$societestatic->client = $objp->client;
$societestatic->logo = $objp->logo;
$societestatic->email = $objp->email;

7
htdocs/core/boxes/box_contacts.php
View File

@ -84,10 +84,10 @@ class box_contacts extends ModeleBoxes
$sql .= ", s.code_client, s.client";
$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
$sql .= ", spe.accountancy_code_customer as code_compta";
$sql .= ", spe.accountancy_code_customer as code_compta_client";
$sql .= ", spe.accountancy_code_supplier as code_compta_fournisseur";
} else {
$sql .= ", s.code_compta";
$sql .= ", s.code_compta as code_compta_client";
$sql .= ", s.code_compta_fournisseur";
}
$sql .= ", s.logo, s.email, s.entity";
@ -146,7 +146,8 @@ class box_contacts extends ModeleBoxes
$societestatic->name = $objp->name;
//$societestatic->name_alias = $objp->name_alias;
$societestatic->code_client = $objp->code_client;
$societestatic->code_compta = $objp->code_compta;
$societestatic->code_compta = $objp->code_compta_client;
$societestatic->code_compta_client = $objp->code_compta_client;
$societestatic->client = $objp->client;
$societestatic->code_fournisseur = $objp->code_fournisseur;
$societestatic->code_compta_fournisseur = $objp->code_compta_fournisseur;

1
htdocs/core/boxes/box_contracts.php
View File

@ -128,6 +128,7 @@ class box_contracts extends ModeleBoxes
$thirdpartytmp->code_client = $objp->code_client;
$thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
$thirdpartytmp->code_compta = $objp->code_compta;
$thirdpartytmp->code_compta_client = $objp->code_compta;
$thirdpartytmp->code_compta_fournisseur = $objp->code_compta_fournisseur;
// fin_validite is no more on contract but on services

1
htdocs/core/boxes/box_customers_outstanding_bill_reached.php
View File

@ -118,6 +118,7 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes
//$thirdpartystatic->name_alias = $objp->name_alias;
$thirdpartystatic->code_client = $objp->code_client;
$thirdpartystatic->code_compta = $objp->code_compta;
$thirdpartystatic->code_compta_client = $objp->code_compta;
$thirdpartystatic->client = $objp->client;
$thirdpartystatic->logo = $objp->logo;
$thirdpartystatic->email = $objp->email;

1
htdocs/core/boxes/box_ficheinter.php
View File

@ -118,6 +118,7 @@ class box_ficheinter extends ModeleBoxes
//$thirdpartystatic->name_alias = $objp->name_alias;
$thirdpartystatic->code_client = $objp->code_client;
$thirdpartystatic->code_compta = $objp->code_compta;
$thirdpartystatic->code_compta_client = $objp->code_compta;
$thirdpartystatic->client = $objp->client;
$thirdpartystatic->logo = $objp->logo;
$thirdpartystatic->email = $objp->email;

1
htdocs/core/boxes/box_propales.php
View File

@ -128,6 +128,7 @@ class box_propales extends ModeleBoxes
//$societestatic->name_alias = $objp->name_alias;
$societestatic->code_client = $objp->code_client;
$societestatic->code_compta = $objp->code_compta;
$societestatic->code_compta_client = $objp->code_compta;
$societestatic->client = $objp->client;
$societestatic->logo = $objp->logo;
$societestatic->email = $objp->email;

1
htdocs/core/boxes/box_prospect.php
View File

@ -122,6 +122,7 @@ class box_prospect extends ModeleBoxes
$thirdpartystatic->name_alias = $objp->name_alias;
$thirdpartystatic->code_client = $objp->code_client;
$thirdpartystatic->code_compta = $objp->code_compta;
$thirdpartystatic->code_compta_client = $objp->code_compta;
$thirdpartystatic->client = $objp->client;
$thirdpartystatic->logo = $objp->logo;
$thirdpartystatic->email = $objp->email;

1
htdocs/core/boxes/box_services_expired.php
View File

@ -113,6 +113,7 @@ class box_services_expired extends ModeleBoxes
$thirdpartytmp->code_client = $objp->code_client;
$thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
$thirdpartytmp->code_compta = $objp->code_compta;
$thirdpartytmp->code_compta_client = $objp->code_compta;
$thirdpartytmp->code_compta_fournisseur = $objp->code_compta_fournisseur;
$contract->id = $objp->rowid;

1
htdocs/core/boxes/box_shipments.php
View File

@ -130,6 +130,7 @@ class box_shipments extends ModeleBoxes
//$societestatic->name_alias = $objp->name_alias;
$societestatic->code_client = $objp->code_client;
$societestatic->code_compta = $objp->code_compta;
$societestatic->code_compta_client = $objp->code_compta;
$societestatic->client = $objp->client;
$societestatic->logo = $objp->logo;
$societestatic->email = $objp->email;

6
htdocs/core/class/html.formaccounting.class.php
View File

@ -488,7 +488,7 @@ class FormAccounting extends Form
dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
// Auxiliary thirdparties account
$sql = "SELECT code_compta, code_compta_fournisseur, nom as name";
$sql = "SELECT code_compta as code_compta_client, code_compta_fournisseur, nom as name";
$sql .= " FROM ".$this->db->prefix()."societe";
$sql .= " WHERE entity IN (".getEntity('societe').")";
$sql .= " AND (client IN (1,3) OR fournisseur = 1)";
@ -496,8 +496,8 @@ class FormAccounting extends Form
$resql = $this->db->query($sql);
if ($resql) {
while ($obj = $this->db->fetch_object($resql)) {
if (!empty($obj->code_compta)) {
$aux_account[$obj->code_compta] = $obj->code_compta.' <span class="opacitymedium">('.$obj->name.')</span>';
if (!empty($obj->code_compta_client)) {
$aux_account[$obj->code_compta_client] = $obj->code_compta_client.' <span class="opacitymedium">('.$obj->name.')</span>';
}
if (!empty($obj->code_compta_fournisseur)) {
$aux_account[$obj->code_compta_fournisseur] = $obj->code_compta_fournisseur.' <span class="opacitymedium">('.$obj->name.')</span>';

2
htdocs/core/lib/agenda.lib.php
View File

@ -242,6 +242,7 @@ function show_array_actions_to_do($max = 5)
//$customerstatic->name_alias = $obj->name_alias;
$customerstatic->code_client = $obj->code_client;
$customerstatic->code_compta = $obj->code_compta;
$customerstatic->code_compta_client = $obj->code_compta;
$customerstatic->client = $obj->client;
$customerstatic->logo = $obj->logo;
$customerstatic->email = $obj->email;
@ -358,6 +359,7 @@ function show_array_last_actions_done($max = 5)
//$customerstatic->name_alias = $obj->name_alias;
$customerstatic->code_client = $obj->code_client;
$customerstatic->code_compta = $obj->code_compta;
$customerstatic->code_compta_client = $obj->code_compta;
$customerstatic->client = $obj->client;
$customerstatic->logo = $obj->logo;
$customerstatic->email = $obj->email;

1
htdocs/core/lib/company.lib.php
View File

@ -2473,6 +2473,7 @@ function show_subsidiaries($conf, $langs, $db, $object)
$socstatic->code_client = $obj->code_client;
$socstatic->code_fournisseur = $obj->code_fournisseur;
$socstatic->code_compta = $obj->code_compta;
$socstatic->code_compta_client = $obj->code_compta;
$socstatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
$socstatic->email = $obj->email;
$socstatic->canvas = $obj->canvas;

4
htdocs/core/lib/invoice.lib.php
View File

@ -592,6 +592,7 @@ function getCustomerInvoiceDraftTable($maxCount = 500, $socid = 0)
$companystatic->code_client = $obj->code_client;
$companystatic->code_fournisseur = $obj->code_fournisseur;
$companystatic->code_compta = $obj->code_compta;
$companystatic->code_compta_client = $obj->code_compta;
$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
$result .= '<tr class="oddeven">';
@ -726,6 +727,7 @@ function getDraftSupplierTable($maxCount = 500, $socid = 0)
$companystatic->code_client = $obj->code_client;
$companystatic->code_fournisseur = $obj->code_fournisseur;
$companystatic->code_compta = $obj->code_compta;
$companystatic->code_compta_client = $obj->code_compta;
$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
$result .= '<tr class="oddeven">';
@ -1096,6 +1098,7 @@ function getCustomerInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
$societestatic->code_client = $obj->code_client;
$societestatic->code_fournisseur = $obj->code_fournisseur;
$societestatic->code_compta = $obj->code_compta;
$societestatic->code_compta_client = $obj->code_compta;
$societestatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
print '<tr class="oddeven">';
@ -1283,6 +1286,7 @@ function getPurchaseInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
$societestatic->code_client = $obj->code_client;
$societestatic->code_fournisseur = $obj->code_fournisseur;
$societestatic->code_compta = $obj->code_compta;
$societestatic->code_compta_client = $obj->code_compta;
$societestatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
print '<tr class="oddeven">';

1
htdocs/core/lib/project.lib.php
View File

@ -2716,6 +2716,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
//$thirdpartystatic->name_alias = $objp->name_alias;
//$thirdpartystatic->code_client = $objp->code_client;
$thirdpartystatic->code_compta = $objp->code_compta;
$thirdpartystatic->code_compta_client = $objp->code_compta;
$thirdpartystatic->client = $objp->client;
//$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
$thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;

2
htdocs/core/modules/import/import_csv.modules.php
View File

@ -587,7 +587,7 @@ class ImportCsv extends ModeleImports
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto') {
if (strtolower($newval) == 'auto') {
$this->thirdpartyobject->get_codecompta('customer');
$newval = $this->thirdpartyobject->code_compta;
$newval = $this->thirdpartyobject->code_compta_client;
//print 'code_compta='.$newval;
}
if (empty($newval)) {

2
htdocs/core/modules/import/import_xlsx.modules.php
View File

@ -645,7 +645,7 @@ class ImportXlsx extends ModeleImports
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto') {
if (strtolower($newval) == 'auto') {
$this->thirdpartyobject->get_codecompta('customer');
$newval = $this->thirdpartyobject->code_compta;
$newval = $this->thirdpartyobject->code_compta_client;
//print 'code_compta='.$newval;
}
if (empty($newval)) {

2
htdocs/core/modules/societe/mod_codecompta_panicum.php
View File

@ -100,7 +100,7 @@ class mod_codecompta_panicum extends ModeleAccountancyCode
if ($type == 'supplier') {
$this->code = (($societe->code_compta_fournisseur != "") ? $societe->code_compta_fournisseur : '');
} else {
$this->code = (($societe->code_compta != "") ? $societe->code_compta : '');
$this->code = (($societe->code_compta_client != "") ? $societe->code_compta_client : '');
}
}

1
htdocs/projet/index.php
View File

@ -374,6 +374,7 @@ if ($resql) {
$companystatic->name_alias = $obj->name_alias;
$companystatic->code_client = $obj->code_client;
$companystatic->code_compta = $obj->code_compta;
$companystatic->code_compta_client = $obj->code_compta;
$companystatic->client = $obj->client;
$companystatic->code_fournisseur = $obj->code_fournisseur;
$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;

10
htdocs/societe/class/societe.class.php
View File

@ -912,8 +912,6 @@ class Societe extends CommonObject
*/
public function __construct($db)
{
global $conf;
$this->db = $db;
$this->ismultientitymanaged = 1;
@ -966,7 +964,9 @@ class Societe extends CommonObject
}
$this->import_key = trim((string) $this->import_key);
$this->accountancy_code_customer = trim((string) $this->code_compta);
$this->code_compta_client = trim(empty($this->code_compta_client) ? $this->code_compta : $this->code_compta_client);
$this->accountancy_code_customer = trim((string) $this->code_compta_client);
$this->accountancy_code_supplier = trim((string) $this->code_compta_fournisseur);
$this->accountancy_code_buy = trim((string) $this->accountancy_code_buy);
$this->accountancy_code_sell = trim((string) $this->accountancy_code_sell);
@ -1475,7 +1475,7 @@ class Societe extends CommonObject
$this->get_codefournisseur($this, 1);
}
$this->code_compta_client = trim(empty($this->code_compta) ? $this->code_compta_client : $this->code_compta);
$this->code_compta_client = trim(empty($this->code_compta_client) ? $this->code_compta : $this->code_compta_client);
$this->code_compta = $this->code_compta_client; // for backward compatibility
$this->code_compta_fournisseur = (empty($this->code_compta_fournisseur) ? '' : trim($this->code_compta_fournisseur));
@ -3711,7 +3711,7 @@ class Societe extends CommonObject
} else {
if ($type == 'customer') {
$this->code_compta_client = '';
$this->code_compta = '';
$this->code_compta = ''; // For backward compatibility
} elseif ($type == 'supplier') {
$this->code_compta_fournisseur = '';
}

2
htdocs/webservices/server_thirdparty.php
View File

@ -476,6 +476,7 @@ function createThirdParty($authentication, $thirdparty)
$newobject->code_client = $thirdparty['customer_code'];
$newobject->code_fournisseur = $thirdparty['supplier_code'];
$newobject->code_compta = $thirdparty['customer_code_accountancy'];
$newobject->code_compta_client = $thirdparty['customer_code_accountancy'];
$newobject->code_compta_fournisseur = $thirdparty['supplier_code_accountancy'];
$newobject->date_creation = $now;
$newobject->note_private = $thirdparty['note_private'];
@ -614,6 +615,7 @@ function updateThirdParty($authentication, $thirdparty)
$object->code_client = $thirdparty['customer_code'];
$object->code_fournisseur = $thirdparty['supplier_code'];
$object->code_compta = $thirdparty['customer_code_accountancy'];
$object->code_compta_client = $thirdparty['customer_code_accountancy'];
$object->code_compta_fournisseur = $thirdparty['supplier_code_accountancy'];
$object->date_creation = $now;
$object->note_private = $thirdparty['note_private'];