diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php index f09a8960933..4d1d71f48b9 100644 --- a/htdocs/accountancy/journal/bankjournal.php +++ b/htdocs/accountancy/journal/bankjournal.php @@ -52,8 +52,9 @@ require_once DOL_DOCUMENT_ROOT . '/societe/class/client.class.php'; $langs->load("companies"); $langs->load("other"); $langs->load("compta"); -$langs->load("bank"); +$langs->load("banks"); $langs->load('bills'); +$langs->load('donations'); $langs->load("accountancy"); $id_bank_account = GETPOST('id_account', 'int'); @@ -130,11 +131,12 @@ if ($result) { $num = $db->num_rows($result); // Variables - $cptfour = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : $langs->trans("CodeNotDef")); - $cptcli = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef")); - $accountancy_account_salary = (! empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT) ? $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT : $langs->trans("CodeNotDef")); - $accountancy_account_pay_vat = (! empty($conf->global->ACCOUNTING_VAT_PAY_ACCOUNT) ? $conf->global->ACCOUNTING_VAT_PAY_ACCOUNT : $langs->trans("CodeNotDef")); - $accountancy_account_pay_donation = (! empty($conf->global->DONATION_ACCOUNTINGACCOUNT) ? $conf->global->DONATION_ACCOUNTINGACCOUNT : $langs->trans("CodeNotDef")); + $account_supplier = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : $langs->trans("CodeNotDef")); + $account_customer = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef")); + $account_employee = (! empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT) ? $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT : $langs->trans("CodeNotDef")); + $account_pay_vat = (! empty($conf->global->ACCOUNTING_VAT_PAY_ACCOUNT) ? $conf->global->ACCOUNTING_VAT_PAY_ACCOUNT : $langs->trans("CodeNotDef")); + $account_pay_donation = (! empty($conf->global->DONATION_ACCOUNTINGACCOUNT) ? $conf->global->DONATION_ACCOUNTINGACCOUNT : $langs->trans("CodeNotDef")); + $account_transfer = (! empty($conf->global->ACCOUNTING_ACCOUNT_TRANSFER_CASH) ? $conf->global->ACCOUNTING_ACCOUNT_TRANSFER_CASH : $langs->trans("CodeNotDef")); $tabpay = array (); $tabbq = array (); @@ -154,11 +156,9 @@ if ($result) { // Controls $compta_bank = $obj->account_number; if ($obj->label == '(SupplierInvoicePayment)') - $compta_soc = (! empty($obj->code_compta_fournisseur) ? $obj->code_compta_fournisseur : $cptfour); + $compta_soc = (! empty($obj->code_compta_fournisseur) ? $obj->code_compta_fournisseur : $account_supplier); if ($obj->label == '(CustomerInvoicePayment)') - $compta_soc = (! empty($obj->code_compta) ? $obj->code_compta : $cptcli); - if ($obj->typeop == '(BankTransfert)') - $compta_soc = $conf->global->ACCOUNTING_ACCOUNT_TRANSFER_CASH; + $compta_soc = (! empty($obj->code_compta) ? $obj->code_compta : $account_customer); // Variable bookkeeping $tabpay[$obj->rowid]["date"] = $obj->do; @@ -226,25 +226,23 @@ if ($result) { $paymentdonstatic->id = $links[$key]['url_id']; $paymentdonstatic->fk_donation = $links[$key]['url_id']; $tabpay[$obj->rowid]["lib"] .= ' ' . $langs->trans("PaymentDonation"); - $tabtp[$obj->rowid][$accountancy_account_pay_donation] += $obj->amount; + $tabtp[$obj->rowid][$account_pay_donation] += $obj->amount; } else if ($links[$key]['type'] == 'payment_vat') { $paymentvatstatic->id = $links[$key]['url_id']; $paymentvatstatic->ref = $links[$key]['url_id']; + $paymentvatstatic->label = $links[$key]['label']; $tabpay[$obj->rowid]["lib"] .= ' ' . $langs->trans("PaymentVat"); - $tabtp[$obj->rowid][$accountancy_account_pay_vat] += $obj->amount; + $tabtp[$obj->rowid][$account_pay_vat] += $obj->amount; } else if ($links[$key]['type'] == 'payment_salary') { $paymentsalstatic->id = $links[$key]['url_id']; $paymentsalstatic->ref = $links[$key]['url_id']; $paymentsalstatic->label = $links[$key]['label']; $tabpay[$obj->rowid]["lib"] .= ' ' . $paymentsalstatic->getNomUrl(2); - $tabtp[$obj->rowid][$accountancy_account_salary] += $obj->amount; + $tabtp[$obj->rowid][$account_employee ] += $obj->amount; } else if ($links[$key]['type'] == 'banktransfert') { - $tabpay[$obj->rowid]["lib"] .= ' ' . $paymentvatstatic->getNomUrl(2); - $tabtp[$obj->rowid][$cpttva] += $obj->amount; + $tabpay[$obj->rowid]["lib"] .= ' ' . $langs->trans("BankTransfer"); + $tabtp[$obj->rowid][$account_transfer] += $obj->amount; } - /*else { - $tabtp [$obj->rowid] [$accountancy_account_salary] += $obj->amount; - }*/ } } @@ -588,24 +586,30 @@ else { foreach ( $tabpay as $key => $val ) { $date = dol_print_date($db->jdate($val["date"]), 'day'); - if ($val["lib"] == '(SupplierInvoicePayment)') { - $reflabel = $langs->trans('SupplierInvoicePayment'); + $reflabel = $val["ref"]; + if ($reflabel == '(SupplierInvoicePayment)') { + $reflabel = $langs->trans('Supplier'); } - if ($val["lib"] == '(CustomerInvoicePayment)') { - $reflabel = $langs->trans('CustomerInvoicePayment'); + if ($reflabel == '(CustomerInvoicePayment)') { + $reflabel = $langs->trans('Customer'); + } + if ($reflabel == '(SocialContributionPayment)') { + $reflabel = $langs->trans('SocialContribution'); + } + if ($reflabel == '(DonationPayment)') { + $reflabel = $langs->trans('Donation'); } // Bank foreach ( $tabbq[$key] as $k => $mt ) { print ""; print "" . $date . ""; - print "" . $reflabel . ""; + print "" . $ref . ""; print "" . length_accountg($k) . ""; - // print "" . $langs->trans('Bank') . ""; if ($val['soclib'] == '') { - print "" . $langs->trans('Bank') . " - " . $val["ref"] . ""; + print "" . $bank_code_journal->label . " - " . $val["ref"] . ""; } else { - print "" . $langs->trans("Bank") . " - " . $val['soclib'] . ""; + print "" . $bank_code_journal->label . " - " . $val['soclib'] . ""; } print "" . $val["type_payment"] . ""; print "" . ($mt >= 0 ? price($mt) : '') . ""; @@ -619,19 +623,9 @@ else { if ($k != 'type') { print ""; print "" . $date . ""; - print "" . $val["soclib"] . ""; - // print "" . length_accounta($k) . ""; - if (length_accounta($k) == '') { - print "" . length_accounta($conf->global->ACCOUNTING_ACCOUNT_TRANSFER_CASH) . ""; - } else { + print "" . $ref . ""; print "" . length_accounta($k) . ""; - } - // print "" . $langs->trans('ThirdParty') . " (" . $val['soclib'] . ")"; - if ($val['soclib'] == '') { - print "" . $langs->trans('ThirdParty') . " - " . $val["ref"] . ""; - } else { - print "" . $langs->trans("ThirdParty") . ' - ' . $val['soclib'] . ""; - } + print "" . $reflabel . ' ' . $val['soclib'] . ""; print "" . $val["type_payment"] . ""; print "" . ($mt < 0 ? price(- $mt) : '') . ""; print "" . ($mt >= 0 ? price($mt) : '') . ""; @@ -642,14 +636,9 @@ else { foreach ( $tabbq[$key] as $k => $mt ) { print ""; print "" . $date . ""; - print "" . $reflabel . ""; + print "" . $ref . ""; print "" . length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) . ""; - // print "" . $langs->trans('ThirdParty') . ""; - if ($val['soclib'] == '') { - print "" . $langs->trans('ThirdParty') . " - " . $val["ref"] . ""; - } else { - print "" . $langs->trans("ThirdParty") . ' - ' . $val['soclib'] . ""; - } + print "" . $reflabel . ""; print " "; print "" . ($mt < 0 ? price(- $mt) : '') . ""; print "" . ($mt >= 0 ? price($mt) : '') . ""; diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index bee98d607a3..c973d11550f 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -8,7 +8,7 @@ * Copyright (C) 2011 Remy Younes * Copyright (C) 2012-2015 Marcos García * Copyright (C) 2012 Christophe Battarel - * Copyright (C) 2011-2015 Alexandre Spangaro + * Copyright (C) 2011-2016 Alexandre Spangaro * Copyright (C) 2015 Ferran Marcet * Copyright (C) 2016 Raphaël Doursenaud * @@ -78,7 +78,7 @@ $hookmanager->initHooks(array('admin')); // Put here declaration of dictionaries properties // Sort order to show dictionary (0 is space). All other dictionaries (added by modules) will be at end of this. -$taborder=array(9,0,4,3,2,0,1,8,19,16,27,0,5,11,0,6,0,29,0,7,17,24,28,0,10,23,12,13,0,14,0,22,20,18,21,0,15,30,0,25,0,26); +$taborder=array(9,0,4,3,2,0,1,8,19,16,27,0,5,11,0,6,0,29,0,7,17,24,28,0,10,23,12,13,0,14,0,22,20,18,21,0,15,30,0,25,0,26,0,31,32,0); // Name of SQL tables of dictionaries $tabname=array(); @@ -112,6 +112,8 @@ $tabname[27]= MAIN_DB_PREFIX."c_stcomm"; $tabname[28]= MAIN_DB_PREFIX."c_holiday_types"; $tabname[29]= MAIN_DB_PREFIX."c_lead_status"; $tabname[30]= MAIN_DB_PREFIX."c_format_cards"; +$tabname[31]= MAIN_DB_PREFIX."accounting_system"; +$tabname[32]= MAIN_DB_PREFIX."c_accountancy_category"; // Dictionary labels $tablib=array(); @@ -145,6 +147,8 @@ $tablib[27]= "DictionaryProspectStatus"; $tablib[28]= "DictionaryHolidayTypes"; $tablib[29]= "DictionaryOpportunityStatus"; $tablib[30]= "DictionaryFormatCards"; +$tablib[31]= "DictionaryAccountancysystem"; +$tablib[32]= "DictionaryAccountancyCategory"; // Requests to extract data $tabsql=array(); @@ -178,6 +182,8 @@ $tabsql[27]= "SELECT id as rowid, code, libelle, active FROM ".MAIN_DB_PREF $tabsql[28]= "SELECT h.rowid as rowid, h.code, h.label, h.affect, h.delay, h.newByMonth, h.fk_country as country_id, c.code as country_code, c.label as country, h.active FROM ".MAIN_DB_PREFIX."c_holiday_types as h LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON h.fk_country=c.rowid"; $tabsql[29]= "SELECT rowid as rowid, code, label, percent, position, active FROM ".MAIN_DB_PREFIX."c_lead_status"; $tabsql[30]= "SELECT rowid, code, name, paper_size, orientation, metric, leftmargin, topmargin, nx, ny, spacex, spacey, width, height, font_size, custom_x, custom_y, active FROM ".MAIN_DB_PREFIX."c_format_cards"; +$tabsql[31]= "SELECT s.rowid as rowid, pcg_version, s.fk_pays as country_id, c.code as country_code, c.label as country, s.label, s.active FROM ".MAIN_DB_PREFIX."accounting_system as s, ".MAIN_DB_PREFIX."c_country as c WHERE s.fk_pays=c.rowid and c.active=1"; +$tabsql[32]= "SELECT a.rowid as rowid, a.code as code, a.label, a.range, a.position, a.fk_country as country_id, c.code as country_code, c.label as country, a.active FROM ".MAIN_DB_PREFIX."c_accountancy_category as a, ".MAIN_DB_PREFIX."c_country as c WHERE a.fk_country=c.rowid and c.active=1"; // Criteria to sort dictionaries $tabsqlsort=array(); @@ -211,6 +217,8 @@ $tabsqlsort[27]="code ASC"; $tabsqlsort[28]="country ASC, code ASC"; $tabsqlsort[29]="position ASC"; $tabsqlsort[30]="code ASC"; +$tabsqlsort[31]="pcg_version ASC"; +$tabsqlsort[32]="code ASC, label ASC"; // Nom des champs en resultat de select pour affichage du dictionnaire $tabfield=array(); @@ -244,6 +252,8 @@ $tabfield[27]= "code,libelle"; $tabfield[28]= "code,label,affect,delay,newByMonth,country_id,country"; $tabfield[29]= "code,label,percent,position"; $tabfield[30]= "code,name,paper_size,orientation,metric,leftmargin,topmargin,nx,ny,spacex,spacey,width,height,font_size,custom_x,custom_y"; +$tabfield[31]= "pcg_version,country_id,country,label"; +$tabfield[32]= "code,label,range,position,country_id,country"; // Nom des champs d'edition pour modification d'un enregistrement $tabfieldvalue=array(); @@ -277,6 +287,8 @@ $tabfieldvalue[27]= "code,libelle"; $tabfieldvalue[28]= "code,label,affect,delay,newByMonth,country"; $tabfieldvalue[29]= "code,label,percent,position"; $tabfieldvalue[30]= "code,name,paper_size,orientation,metric,leftmargin,topmargin,nx,ny,spacex,spacey,width,height,font_size,custom_x,custom_y"; +$tabfieldvalue[31]= "pcg_version,country,label"; +$tabfieldvalue[32]= "code,label,range,position,country"; // Nom des champs dans la table pour insertion d'un enregistrement $tabfieldinsert=array(); @@ -310,6 +322,8 @@ $tabfieldinsert[27]= "code,libelle"; $tabfieldinsert[28]= "code,label,affect,delay,newByMonth,fk_country"; $tabfieldinsert[29]= "code,label,percent,position"; $tabfieldinsert[30]= "code,name,paper_size,orientation,metric,leftmargin,topmargin,nx,ny,spacex,spacey,width,height,font_size,custom_x,custom_y"; +$tabfieldinsert[31]= "pcg_version,fk_pays,label"; +$tabfieldinsert[32]= "code,label,range,position,fk_country"; // Nom du rowid si le champ n'est pas de type autoincrement // Example: "" if id field is "rowid" and has autoincrement on @@ -345,6 +359,8 @@ $tabrowid[27]= "id"; $tabrowid[28]= ""; $tabrowid[29]= ""; $tabrowid[30]= ""; +$tabrowid[31]= ""; +$tabrowid[32]= ""; // Condition to show dictionary in setup page $tabcond=array(); @@ -378,6 +394,8 @@ $tabcond[27]= ! empty($conf->societe->enabled); $tabcond[28]= ! empty($conf->holiday->enabled); $tabcond[29]= ! empty($conf->projet->enabled); $tabcond[30]= ! empty($conf->label->enabled); +$tabcond[31]= ! empty($conf->accounting->enabled); +$tabcond[32]= ! empty($conf->accounting->enabled); // List of help for fields $tabhelp=array(); @@ -411,6 +429,8 @@ $tabhelp[27] = array('code'=>$langs->trans("EnterAnyCode")); $tabhelp[28] = array('affect'=>$langs->trans("FollowedByACounter"),'delay'=>$langs->trans("MinimumNoticePeriod"), 'newByMonth'=>$langs->trans("NbAddedAutomatically")); $tabhelp[29] = array('code'=>$langs->trans("EnterAnyCode"), 'percent'=>$langs->trans("OpportunityPercent"), 'position'=>$langs->trans("PositionIntoComboList")); $tabhelp[30] = array('code'=>$langs->trans("EnterAnyCode"), 'name'=>$langs->trans("LabelName"), 'paper_size'=>$langs->trans("LabelPaperSize")); +$tabhelp[31] = array('pcg_version'=>$langs->trans("EnterAnyCode")); +$tabhelp[32] = array('code'=>$langs->trans("EnterAnyCode")); // List of check for fields (NOT USED YET) $tabfieldcheck=array(); @@ -444,6 +464,8 @@ $tabfieldcheck[27] = array(); $tabfieldcheck[28] = array(); $tabfieldcheck[29] = array(); $tabfieldcheck[30] = array(); +$tabfieldcheck[31] = array(); +$tabfieldcheck[32] = array(); // Complete all arrays with entries found into modules complete_dictionary_with_modules($taborder,$tabname,$tablib,$tabsql,$tabsqlsort,$tabfield,$tabfieldvalue,$tabfieldinsert,$tabrowid,$tabcond,$tabhelp,$tabfieldcheck); @@ -460,6 +482,7 @@ if ($id == 11) $langs->load("propal"); $langs->load("bills"); $langs->load("interventions"); + $langs->load("accountancy"); $elementList = array( '' => '', 'societe' => $langs->trans('ThirdParty'), @@ -534,7 +557,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) $ok=1; foreach ($listfield as $f => $value) { - if ($value == 'country_id' && in_array($tablib[$id],array('DictionaryVAT','DictionaryRegion','DictionaryCompanyType','DictionaryHolidayTypes','DictionaryRevenueStamp'))) continue; // For some pages, country is not mandatory + if ($value == 'country_id' && in_array($tablib[$id],array('DictionaryVAT','DictionaryRegion','DictionaryCompanyType','DictionaryHolidayTypes','DictionaryRevenueStamp','DictionaryAccountancysystem','DictionaryAccountancyCategory'))) continue; // For some pages, country is not mandatory if ($value == 'country' && in_array($tablib[$id],array('DictionaryCanton','DictionaryCompanyType','DictionaryRevenueStamp'))) continue; // For some pages, country is not mandatory if ($value == 'localtax1' && empty($_POST['localtax1_type'])) continue; if ($value == 'localtax2' && empty($_POST['localtax2_type'])) continue; @@ -952,6 +975,7 @@ if ($id) if ($fieldlist[$field]=='sortorder') { $valuetoshow=$langs->trans("SortOrder"); } if ($fieldlist[$field]=='short_label') { $valuetoshow=$langs->trans("ShortLabel"); } if ($fieldlist[$field]=='type_template') { $valuetoshow=$langs->trans("TypeOfTemplate"); } + if ($fieldlist[$field]=='range') { $valuetoshow=$langs->trans("Range"); } if ($id == 2) // Special cas for state page { @@ -1119,6 +1143,7 @@ if ($id) if ($fieldlist[$field]=='sortorder') { $valuetoshow=$langs->trans("SortOrder"); } if ($fieldlist[$field]=='short_label') { $valuetoshow=$langs->trans("ShortLabel"); } if ($fieldlist[$field]=='type_template') { $valuetoshow=$langs->trans("TypeOfTemplate"); } + if ($fieldlist[$field]=='range') { $valuetoshow=$langs->trans("Range"); } // Affiche nom du champ if ($showfield) diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php index e70993bcaed..bad8b58cd5f 100644 --- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php +++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php @@ -502,7 +502,7 @@ class RemiseCheque extends CommonObject dol_syslog("RemiseCheque::generatePdf model=".$model." id=".$this->id, LOG_DEBUG); - $dir=DOL_DOCUMENT_ROOT ."/core/modules/cheque/pdf/"; + $dir=DOL_DOCUMENT_ROOT ."/core/modules/cheque/doc/"; // Charge le modele $file = "pdf_".$model.".class.php"; diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index a70c6f3f40c..8e883ff1b4c 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -1,7 +1,7 @@ * Copyright (C) 2010-2014 Regis Houssin - * Copyright (C) 2010 Juanjo Menent + * Copyright (C) 2010-2016 Juanjo Menent * Copyright (C) 2013 Charles-Fr BENKE * Copyright (C) 2013 Cédric Salvador * Copyright (C) 2014 Marcos García @@ -445,7 +445,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/pdf/modules_chequereceipts.php'; + include_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/modules_chequereceipts.php'; $modellist=ModeleChequeReceipts::liste_modeles($this->db); } } diff --git a/htdocs/core/modules/cheque/pdf/index.html b/htdocs/core/modules/cheque/doc/index.html similarity index 100% rename from htdocs/core/modules/cheque/pdf/index.html rename to htdocs/core/modules/cheque/doc/index.html diff --git a/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php b/htdocs/core/modules/cheque/doc/pdf_blochet.class.php similarity index 98% rename from htdocs/core/modules/cheque/pdf/pdf_blochet.class.php rename to htdocs/core/modules/cheque/doc/pdf_blochet.class.php index 85e69a23cf1..0abf3c89767 100644 --- a/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php +++ b/htdocs/core/modules/cheque/doc/pdf_blochet.class.php @@ -1,6 +1,7 @@ * Copyright (C) 2009-2015 Laurent Destailleur + * Copyright (C) 2016 Juanjo Menent * * 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 @@ -18,14 +19,14 @@ */ /** - * \file htdocs/core/modules/cheque/pdf/pdf_blochet.class.php + * \file htdocs/core/modules/cheque/doc/pdf_blochet.class.php * \ingroup banque * \brief File to build cheque deposit receipts */ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/pdf/modules_chequereceipts.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/modules_chequereceipts.php'; /** diff --git a/htdocs/core/modules/cheque/pdf/modules_chequereceipts.php b/htdocs/core/modules/cheque/modules_chequereceipts.php similarity index 95% rename from htdocs/core/modules/cheque/pdf/modules_chequereceipts.php rename to htdocs/core/modules/cheque/modules_chequereceipts.php index e4d68c525fa..041a7daf7e6 100644 --- a/htdocs/core/modules/cheque/pdf/modules_chequereceipts.php +++ b/htdocs/core/modules/cheque/modules_chequereceipts.php @@ -3,6 +3,7 @@ * Copyright (C) 2004-2009 Laurent Destailleur * Copyright (C) 2004 Eric Seigne * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2016 Juanjo Menent * * 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 +21,7 @@ */ /** - * \file htdocs/core/modules/cheque/pdf/modules_chequereceipts.php + * \file htdocs/core/modules/cheque/modules_chequereceipts.php * \ingroup facture * \brief File with parent class of check receipt document generators */ @@ -78,7 +79,7 @@ function chequereceipt_pdf_create($db, $id, $message, $modele, $outputlangs) global $conf,$langs; $langs->load("bills"); - $dir = DOL_DOCUMENT_ROOT . "/core/modules/cheque/pdf/"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/cheque/doc/"; // Positionne modele sur le nom du modele a utiliser if (! dol_strlen($modele)) diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql index c30a3da50f0..3fa7d67c7ec 100644 --- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql +++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql @@ -322,4 +322,18 @@ ALTER TABLE llx_expensereport_det ADD COLUMN multicurrency_total_ttc double(24,8 ALTER TABLE llx_product_lang ADD COLUMN import_key varchar(14) DEFAULT NULL; -ALTER TABLE llx_actioncomm MODIFY COLUMN elementtype varchar(255) DEFAULT NULL; \ No newline at end of file +ALTER TABLE llx_actioncomm MODIFY COLUMN elementtype varchar(255) DEFAULT NULL; + +DELETE FROM llx_menu where module='expensereport'; + +CREATE TABLE llx_c_accountancy_category ( + rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, + code varchar(16) NOT NULL, + label varchar(255) NOT NULL, + range varchar(255) NOT NULL, + position integer DEFAULT 0, + fk_country integer DEFAULT NULL, -- This category is dedicated to a country + active integer DEFAULT 1 +) ENGINE=innodb; + +ALTER TABLE llx_c_accountancy_category ADD UNIQUE INDEX uk_c_accountancy_category(code); \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_c_accountancy_category.key.sql b/htdocs/install/mysql/tables/llx_c_accountancy_category.key.sql new file mode 100644 index 00000000000..3a3a0fe4294 --- /dev/null +++ b/htdocs/install/mysql/tables/llx_c_accountancy_category.key.sql @@ -0,0 +1,19 @@ +-- =================================================================== +-- Copyright (C) 2015-2016 Alexandre Spangaro +-- +-- 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 +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- =================================================================== + +ALTER TABLE llx_c_accountancy_category ADD UNIQUE INDEX uk_c_accountancy_category(code); diff --git a/htdocs/install/mysql/tables/llx_c_accountancy_category.sql b/htdocs/install/mysql/tables/llx_c_accountancy_category.sql new file mode 100644 index 00000000000..4a8d5714819 --- /dev/null +++ b/htdocs/install/mysql/tables/llx_c_accountancy_category.sql @@ -0,0 +1,27 @@ +-- =================================================================== +-- Copyright (C) 2015-2016 Alexandre Spangaro +-- +-- 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 +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- =================================================================== + +CREATE TABLE llx_c_accountancy_category ( + rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, + code varchar(16) NOT NULL, + label varchar(255) NOT NULL, + range varchar(255) NOT NULL, + position integer DEFAULT 0, + fk_country integer DEFAULT NULL, -- This category is dedicated to a country + active integer DEFAULT 1 +) ENGINE=innodb; diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang index d0d13aa35fc..cb3e19dbf79 100644 --- a/htdocs/langs/en_US/accountancy.lang +++ b/htdocs/langs/en_US/accountancy.lang @@ -176,4 +176,7 @@ Options=Options OptionModeProductSell=Mode sales OptionModeProductBuy=Mode purchases OptionModeProductSellDesc=Show all products with no accounting account defined for sales. -OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases. \ No newline at end of file +OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases. + +## Dictionary +Range=Range of accounting account \ No newline at end of file diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 9860b3506da..b9808115485 100755 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -831,7 +831,7 @@ DictionaryStaff=Staff DictionaryAvailability=Delivery delay DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders -DictionaryAccountancyplan=Chart of accounts +DictionaryAccountancyCategory=Accounting categories DictionaryAccountancysystem=Models for chart of accounts DictionaryEMailTemplates=Emails templates DictionaryUnits=Units