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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2011-10-30 23:46:58 +01:00
commit 410efe0427
189 changed files with 3239 additions and 999 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.cvsignore
View File

@ -1,14 +0,0 @@
index.php
*.htaccess
*.settings
*.buildpath
*.project
*.cache
*.log
*.DS_Store
document
documents
DEBIAN
install.lock
*.patch
default.properties

19
build/.cvsignore
View File

@ -1,19 +0,0 @@
dolibarr-*.exe
dolibarr-*.tgz
dolibarr-*.zip
dolibarr-*.rpm
dolibarr-*.deb
makepack-google.conf
module_google-*.tgz
module_pibarcode-1.0.tgz
*.exe
*.tgz
*.torrent
*.zip
version-phpsane.txt
makepack-phpsane.conf
html
*.deb
*.dsc
*.tar.gz
*.changes

391
build/doxygen/doxygen_warnings.log Normal file
View File

@ -0,0 +1,391 @@
/home/ldestail/git/dolibarr/htdocs/societe/admin/societe.php:23: warning: the name `htdocs/admin/societe.php' supplied as the second argument in the \file statement is not an input file
/home/ldestail/git/dolibarr/htdocs/societe/admin/societe_extrafields.php:21: warning: the name `htdocs/admin/societe_extrafields.php' supplied as the second argument in the \file statement is not an input file
/home/ldestail/git/dolibarr/htdocs/admin/agenda_extsites.php:178: warning: documented function `while' was not declared or defined.
/home/ldestail/git/dolibarr/htdocs/compta/bank/admin/bank.php:182: warning: documented function `while' was not declared or defined.
/home/ldestail/git/dolibarr/htdocs/societe/admin/societe.php:556: warning: documented function `while' was not declared or defined.
/home/ldestail/git/dolibarr/htdocs/core/class/smtps.class.php:24: warning: Found unknown command `\license'
/home/ldestail/git/dolibarr/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php:139: warning: argument 'modele' of command @param is not found in the argument list of supplier_order_pdf_create($db,$object,$model,$outputlangs,$hidedetails=0,$hidedesc=0,$hideref=0)
/home/ldestail/git/dolibarr/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php:139: warning: The following parameters of supplier_order_pdf_create($db,$object,$model,$outputlangs,$hidedetails=0,$hidedesc=0,$hideref=0) are not documented:
parameter 'model'
/home/ldestail/git/dolibarr/htdocs/lib/functions.lib.php:1676: warning: Found unknown command `\mymodule'
/home/ldestail/git/dolibarr/htdocs/lib/functions.lib.php:1716: warning: Found unknown command `\mymodule'
/home/ldestail/git/dolibarr/htdocs/main.inc.php:90: warning: argument 'head' of command @param is not found in the argument list of analyse_sql_and_script(&$var,$get)
/home/ldestail/git/dolibarr/htdocs/main.inc.php:90: warning: argument 'title' of command @param is not found in the argument list of analyse_sql_and_script(&$var,$get)
/home/ldestail/git/dolibarr/htdocs/main.inc.php:90: warning: argument 'help_url' of command @param is not found in the argument list of analyse_sql_and_script(&$var,$get)
/home/ldestail/git/dolibarr/htdocs/main.inc.php:90: warning: argument 'target' of command @param is not found in the argument list of analyse_sql_and_script(&$var,$get)
/home/ldestail/git/dolibarr/htdocs/main.inc.php:90: warning: argument 'disablejs' of command @param is not found in the argument list of analyse_sql_and_script(&$var,$get)
/home/ldestail/git/dolibarr/htdocs/main.inc.php:90: warning: argument 'disablehead' of command @param is not found in the argument list of analyse_sql_and_script(&$var,$get)
/home/ldestail/git/dolibarr/htdocs/main.inc.php:90: warning: argument 'arrayofjs' of command @param is not found in the argument list of analyse_sql_and_script(&$var,$get)
/home/ldestail/git/dolibarr/htdocs/main.inc.php:90: warning: argument 'arrayofcss' of command @param is not found in the argument list of analyse_sql_and_script(&$var,$get)
/home/ldestail/git/dolibarr/htdocs/main.inc.php:90: warning: argument 'morequerystring' of command @param is not found in the argument list of analyse_sql_and_script(&$var,$get)
/home/ldestail/git/dolibarr/htdocs/main.inc.php:90: warning: The following parameters of analyse_sql_and_script(&$var,$get) are not documented:
parameter 'var'
parameter 'get'
/home/ldestail/git/dolibarr/htdocs/main.inc.php:1547: warning: argument 'foot' of command @param is not found in the argument list of printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch,$htmlinputname)
/home/ldestail/git/dolibarr/htdocs/main.inc.php:1547: warning: The following parameters of printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch,$htmlinputname) are not documented:
parameter 'urlaction'
parameter 'urlobject'
parameter 'title'
parameter 'htmlmodesearch'
parameter 'htmlinputname'
/home/ldestail/git/dolibarr/htdocs/webservices/server_invoice.php:246: warning: The following parameters of getInvoice($authentication,$id='',$ref='',$ref_ext='') are not documented:
parameter 'id'
parameter 'ref'
parameter 'ref_ext'
/home/ldestail/git/dolibarr/htdocs/webservices/server_invoice.php:353: warning: The following parameters of getInvoicesForThirdParty($authentication,$idthirdparty) are not documented:
parameter 'idthirdparty'
/home/ldestail/git/dolibarr/htdocs/webservices/server_productorservice.php:159: warning: The following parameters of getProductOrService($authentication,$id='',$ref='',$ref_ext='') are not documented:
parameter 'id'
parameter 'ref'
parameter 'ref_ext'
/home/ldestail/git/dolibarr/htdocs/societe/canvas/actions_card_common.class.php:96: warning: argument 'socid' of command @param is not found in the argument list of ActionsCardCommon::doActions(&$action)
/home/ldestail/git/dolibarr/htdocs/societe/canvas/actions_card_common.class.php:96: warning: The following parameters of ActionsCardCommon::doActions(&$action) are not documented:
parameter 'action'
/home/ldestail/git/dolibarr/htdocs/societe/canvas/actions_card_common.class.php:72: warning: argument 'int' of command @param is not found in the argument list of ActionsCardCommon::getObject($id,$ref='')
/home/ldestail/git/dolibarr/htdocs/societe/canvas/actions_card_common.class.php:72: warning: The following parameters of ActionsCardCommon::getObject($id,$ref='') are not documented:
parameter 'id'
/home/ldestail/git/dolibarr/htdocs/societe/canvas/company/actions_card_company.class.php:75: warning: argument 'socid' of command @param is not found in the argument list of ActionsCardCompany::doActions(&$action,$id)
/home/ldestail/git/dolibarr/htdocs/societe/canvas/company/actions_card_company.class.php:75: warning: The following parameters of ActionsCardCompany::doActions(&$action,$id) are not documented:
parameter 'action'
parameter 'id'
/home/ldestail/git/dolibarr/htdocs/societe/canvas/individual/actions_card_individual.class.php:75: warning: The following parameters of ActionsCardIndividual::doActions(&$action,$id) are not documented:
parameter 'action'
/home/ldestail/git/dolibarr/htdocs/contact/canvas/actions_contactcard_common.class.php:92: warning: argument 'id' of command @param is not found in the argument list of ActionsContactCardCommon::doActions(&$action)
/home/ldestail/git/dolibarr/htdocs/contact/canvas/actions_contactcard_common.class.php:92: warning: The following parameters of ActionsContactCardCommon::doActions(&$action) are not documented:
parameter 'action'
/home/ldestail/git/dolibarr/htdocs/contact/canvas/actions_contactcard_common.class.php:70: warning: argument 'int' of command @param is not found in the argument list of ActionsContactCardCommon::getObject($id)
/home/ldestail/git/dolibarr/htdocs/contact/canvas/actions_contactcard_common.class.php:70: warning: The following parameters of ActionsContactCardCommon::getObject($id) are not documented:
parameter 'id'
/home/ldestail/git/dolibarr/htdocs/contact/canvas/default/actions_contactcard_default.class.php:72: warning: The following parameters of ActionsContactCardDefault::assign_values(&$action,$id) are not documented:
parameter 'id'
/home/ldestail/git/dolibarr/htdocs/core/class/canvas.class.php:65: warning: Found unknown command `\myexternalmodule'
/home/ldestail/git/dolibarr/htdocs/lib/CMailFile.class.php:938: warning: Found unknown command `\doe'
/home/ldestail/git/dolibarr/htdocs/lib/CMailFile.class.php:942: warning: Found unknown command `\doe'
/home/ldestail/git/dolibarr/htdocs/commande/class/commande.class.php:948: warning: The following parameters of Commande::addline($commandeid,$desc,$pu_ht,$qty,$txtva,$txlocaltax1=0,$txlocaltax2=0,$fk_product=0,$remise_percent=0,$info_bits=0,$fk_remise_except=0,$price_base_type='HT',$pu_ttc=0,$date_start='',$date_end='',$type=0,$rang=-1,$special_code=0,$fk_parent_line=0) are not documented:
parameter 'special_code'
parameter 'fk_parent_line'
/home/ldestail/git/dolibarr/htdocs/commande/class/commande.class.php:2057: warning: argument 'mode' of command @param is not found in the argument list of Commande::demand_reason($demand_reason_id)
/home/ldestail/git/dolibarr/htdocs/commande/class/commande.class.php:2057: warning: The following parameters of Commande::demand_reason($demand_reason_id) are not documented:
parameter 'demand_reason_id'
/home/ldestail/git/dolibarr/htdocs/commande/class/commande.class.php:1990: warning: argument 'mode' of command @param is not found in the argument list of Commande::mode_reglement($mode_reglement_id)
/home/ldestail/git/dolibarr/htdocs/commande/class/commande.class.php:1990: warning: The following parameters of Commande::mode_reglement($mode_reglement_id) are not documented:
parameter 'mode_reglement_id'
/home/ldestail/git/dolibarr/htdocs/commande/class/commande.class.php:2153: warning: argument 'tva_tx' of command @param is not found in the argument list of Commande::updateline($rowid,$desc,$pu,$qty,$remise_percent=0,$txtva,$txlocaltax1=0,$txlocaltax2=0,$price_base_type='HT',$info_bits=0,$date_start='',$date_end='',$type=0,$fk_parent_line=0,$skip_update_total=0)
/home/ldestail/git/dolibarr/htdocs/commande/class/commande.class.php:2153: warning: The following parameters of Commande::updateline($rowid,$desc,$pu,$qty,$remise_percent=0,$txtva,$txlocaltax1=0,$txlocaltax2=0,$price_base_type='HT',$info_bits=0,$date_start='',$date_end='',$type=0,$fk_parent_line=0,$skip_update_total=0) are not documented:
parameter 'txtva'
parameter 'fk_parent_line'
parameter 'skip_update_total'
/home/ldestail/git/dolibarr/htdocs/fourn/class/fournisseur.commande.class.php:1549: warning: argument 'tva_tx' of command @param is not found in the argument list of CommandeFournisseur::updateline($rowid,$desc,$pu,$qty,$remise_percent=0,$txtva,$txlocaltax1=0,$txlocaltax2=0,$price_base_type='HT',$info_bits=0,$type=0)
/home/ldestail/git/dolibarr/htdocs/fourn/class/fournisseur.commande.class.php:1549: warning: argument 'localtax1' of command @param is not found in the argument list of CommandeFournisseur::updateline($rowid,$desc,$pu,$qty,$remise_percent=0,$txtva,$txlocaltax1=0,$txlocaltax2=0,$price_base_type='HT',$info_bits=0,$type=0)
/home/ldestail/git/dolibarr/htdocs/fourn/class/fournisseur.commande.class.php:1549: warning: argument 'localtax2' of command @param is not found in the argument list of CommandeFournisseur::updateline($rowid,$desc,$pu,$qty,$remise_percent=0,$txtva,$txlocaltax1=0,$txlocaltax2=0,$price_base_type='HT',$info_bits=0,$type=0)
/home/ldestail/git/dolibarr/htdocs/fourn/class/fournisseur.commande.class.php:1549: warning: The following parameters of CommandeFournisseur::updateline($rowid,$desc,$pu,$qty,$remise_percent=0,$txtva,$txlocaltax1=0,$txlocaltax2=0,$price_base_type='HT',$info_bits=0,$type=0) are not documented:
parameter 'txtva'
parameter 'txlocaltax1'
parameter 'txlocaltax2'
/home/ldestail/git/dolibarr/htdocs/core/class/commonobject.class.php:1843: warning: The following parameters of CommonObject::printLine($action='viewline',1843,$var=true,$num=0,$i=0,$dateSelector=0,$seller,$buyer,$selected=0,$hookmanager=false) are not documented:
parameter 'hookmanager'
/home/ldestail/git/dolibarr/htdocs/core/class/commonobject.class.php:1769: warning: The following parameters of CommonObject::printObjectLines($action='viewline',$seller,$buyer,$selected=0,$dateSelector=0,$hookmanager=false) are not documented:
parameter 'hookmanager'
/home/ldestail/git/dolibarr/htdocs/contrat/class/contrat.class.php:310: warning: The following parameters of Contrat::fetch($id,$ref='') are not documented:
parameter 'ref'
/home/ldestail/git/dolibarr/htdocs/contrat/class/contrat.class.php:1627: warning: The following parameters of ContratLigne::getNomUrl($withpicto=0,$maxlength=0) are not documented:
parameter 'maxlength'
/home/ldestail/git/dolibarr/htdocs/adherents/class/cotisation.class.php:187: warning: argument 'rowid' of command @param is not found in the argument list of Cotisation::delete($user)
/home/ldestail/git/dolibarr/htdocs/adherents/class/cotisation.class.php:187: warning: The following parameters of Cotisation::delete($user) are not documented:
parameter 'user'
/home/ldestail/git/dolibarr/htdocs/adherents/class/cotisation.class.php:146: warning: argument 'int' of command @param is not found in the argument list of Cotisation::update($user,$notrigger=0)
/home/ldestail/git/dolibarr/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php:45: warning: argument 'DB' of command @param is not found in the argument list of doc_generic_invoice_odt::doc_generic_invoice_odt($db)
/home/ldestail/git/dolibarr/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php:45: warning: The following parameters of doc_generic_invoice_odt::doc_generic_invoice_odt($db) are not documented:
parameter 'db'
/home/ldestail/git/dolibarr/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php:43: warning: argument 'DB' of command @param is not found in the argument list of doc_generic_odt::doc_generic_odt($db)
/home/ldestail/git/dolibarr/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php:43: warning: The following parameters of doc_generic_odt::doc_generic_odt($db) are not documented:
parameter 'db'
/home/ldestail/git/dolibarr/htdocs/core/class/cookie.class.php:105: warning: argument 'domaine' of command @param is not found in the argument list of DolCookie::_setCookie($cookie,$value,$expire=0,$path="/",$domain="",$secure=0)
/home/ldestail/git/dolibarr/htdocs/core/class/cookie.class.php:105: warning: The following parameters of DolCookie::_setCookie($cookie,$value,$expire=0,$path="/",$domain="",$secure=0) are not documented:
parameter 'domain'
/home/ldestail/git/dolibarr/htdocs/lib/databases/mysql.class.php:1207: warning: The following parameters of DoliDBMysql::getServerStatusValues($key,$filter='') are not documented:
parameter 'key'
/home/ldestail/git/dolibarr/htdocs/lib/databases/mysqli.class.php:1198: warning: The following parameters of DoliDBMysqli::getServerParametersValues($key,$filter='') are not documented:
parameter 'key'
/home/ldestail/git/dolibarr/htdocs/lib/databases/pgsql.class.php:948: warning: The following parameters of DoliDBPgsql::DDLListTables($database,$table='') are not documented:
parameter 'table'
/home/ldestail/git/dolibarr/htdocs/lib/databases/pgsql.class.php:849: warning: The following parameters of DoliDBPgsql::last_insert_id($tab,$fieldid='rowid') are not documented:
parameter 'fieldid'
/home/ldestail/git/dolibarr/htdocs/compta/dons/class/don.class.php:524: warning: argument 'modepaiementd' of command @param is not found in the argument list of Don::set_paye($rowid,$modepaiement='')
/home/ldestail/git/dolibarr/htdocs/compta/dons/class/don.class.php:524: warning: The following parameters of Don::set_paye($rowid,$modepaiement='') are not documented:
parameter 'modepaiement'
/home/ldestail/git/dolibarr/htdocs/ecm/class/ecmdirectory.class.php:393: warning: The following parameters of EcmDirectory::getNomUrl($withpicto=0,$option='',$max=0) are not documented:
parameter 'max'
/home/ldestail/git/dolibarr/htdocs/ecm/class/ecmdirectory.class.php:637: warning: argument 'directory' of command @param is not found in the argument list of EcmDirectory::refreshcachenboffile($all=0)
/home/ldestail/git/dolibarr/htdocs/product/stock/class/entrepot.class.php:65: warning: argument 'Objet' of command @param is not found in the argument list of Entrepot::create($user)
/home/ldestail/git/dolibarr/htdocs/product/stock/class/entrepot.class.php:65: warning: The following parameters of Entrepot::create($user) are not documented:
parameter 'user'
/home/ldestail/git/dolibarr/htdocs/product/stock/class/entrepot.class.php:379: warning: argument 'type' of command @param is not found in the argument list of Entrepot::getLibStatut($mode=0)
/home/ldestail/git/dolibarr/htdocs/product/stock/class/entrepot.class.php:390: warning: argument 'status' of command @param is not found in the argument list of Entrepot::LibStatut($statut,$mode=0)
/home/ldestail/git/dolibarr/htdocs/product/stock/class/entrepot.class.php:390: warning: argument 'type' of command @param is not found in the argument list of Entrepot::LibStatut($statut,$mode=0)
/home/ldestail/git/dolibarr/htdocs/product/stock/class/entrepot.class.php:390: warning: The following parameters of Entrepot::LibStatut($statut,$mode=0) are not documented:
parameter 'statut'
/home/ldestail/git/dolibarr/htdocs/expedition/class/expedition.class.php:911: warning: The following parameters of Expedition::getNomUrl($withpicto=0,$option=0,$max=0,$short=0) are not documented:
parameter 'option'
parameter 'max'
parameter 'short'
/home/ldestail/git/dolibarr/htdocs/core/class/extrafields.class.php:447: warning: The following parameters of ExtraFields::showOutputField($key,$value,$moreparam='') are not documented:
parameter 'moreparam'
/home/ldestail/git/dolibarr/htdocs/core/class/extrafields.class.php:289: warning: argument 'length' of command @param is not found in the argument list of ExtraFields::update_label($attrname,$label,$type,$size,$elementtype='member')
/home/ldestail/git/dolibarr/htdocs/core/class/extrafields.class.php:289: warning: The following parameters of ExtraFields::update_label($attrname,$label,$type,$size,$elementtype='member') are not documented:
parameter 'size'
/home/ldestail/git/dolibarr/htdocs/compta/facture/class/facture.class.php:1783: warning: The following parameters of Facture::addline($facid,$desc,$pu_ht,$qty,$txtva,$txlocaltax1=0,$txlocaltax2=0,$fk_product=0,$remise_percent=0,$date_start='',$date_end='',$ventil=0,$info_bits=0,$fk_remise_except='',$price_base_type='HT',$pu_ttc=0,$type=0,$rang=-1,$special_code=0,$origin='',$origin_id=0,$fk_parent_line=0) are not documented:
parameter 'special_code'
parameter 'origin'
parameter 'origin_id'
parameter 'fk_parent_line'
/home/ldestail/git/dolibarr/htdocs/compta/facture/class/facture.class.php:680: warning: The following parameters of Facture::getNomUrl($withpicto=0,$option='',$max=0,$short=0) are not documented:
parameter 'short'
/home/ldestail/git/dolibarr/htdocs/compta/facture/class/facture.class.php:2747: warning: argument 'user' of command @param is not found in the argument list of Facture::getVentilExportCompta()
/home/ldestail/git/dolibarr/htdocs/compta/facture/class/facture.class.php:3174: warning: argument 'user' of command @param is not found in the argument list of Facture::load_state_board()
/home/ldestail/git/dolibarr/htdocs/compta/facture/class/facture.class.php:2713: warning: argument 'mode' of command @param is not found in the argument list of Facture::mode_reglement($mode_reglement_id)
/home/ldestail/git/dolibarr/htdocs/compta/facture/class/facture.class.php:2713: warning: The following parameters of Facture::mode_reglement($mode_reglement_id) are not documented:
parameter 'mode_reglement_id'
/home/ldestail/git/dolibarr/htdocs/compta/facture/class/facture.class.php:1718: warning: argument 'int' of command @param is not found in the argument list of Facture::set_draft($user)
/home/ldestail/git/dolibarr/htdocs/compta/facture/class/facture.class.php:1951: warning: argument 'tva_tx' of command @param is not found in the argument list of Facture::updateline($rowid,$desc,$pu,$qty,$remise_percent=0,$date_start,$date_end,$txtva,$txlocaltax1=0,$txlocaltax2=0,$price_base_type='HT',$info_bits=0,$type=0,$fk_parent_line=0,$skip_update_total=0)
/home/ldestail/git/dolibarr/htdocs/compta/facture/class/facture.class.php:1951: warning: The following parameters of Facture::updateline($rowid,$desc,$pu,$qty,$remise_percent=0,$date_start,$date_end,$txtva,$txlocaltax1=0,$txlocaltax2=0,$price_base_type='HT',$info_bits=0,$type=0,$fk_parent_line=0,$skip_update_total=0) are not documented:
parameter 'txtva'
parameter 'fk_parent_line'
parameter 'skip_update_total'
/home/ldestail/git/dolibarr/htdocs/fourn/class/fournisseur.facture.class.php:840: warning: argument 'int' of command @param is not found in the argument list of FactureFournisseur::set_draft($user)
/home/ldestail/git/dolibarr/htdocs/core/class/html.form.class.php:92: warning: The following parameters of Form::editfieldval($text,$htmlname,$preselected,$paramkey,$paramvalue,$perm,$typeofdata='string',$editvalue='') are not documented:
parameter 'paramvalue'
/home/ldestail/git/dolibarr/htdocs/core/class/html.form.class.php:2654: warning: The following parameters of Form::form_address($page,$selected='',$socid,$htmlname='address_id',$origin='',$originid='') are not documented:
parameter 'socid'
/home/ldestail/git/dolibarr/htdocs/core/class/html.form.class.php:2016: warning: The following parameters of Form::form_confirm($page,$title,$question,$action,$formquestion='',$selectedchoice="",$useajax=0,$height=170,$width=500) are not documented:
parameter 'width'
/home/ldestail/git/dolibarr/htdocs/core/class/html.form.class.php:2571: warning: The following parameters of Form::form_contacts($page,$societe,$selected='',$htmlname='contactidp') are not documented:
parameter 'societe'
/home/ldestail/git/dolibarr/htdocs/core/class/html.form.class.php:2034: warning: The following parameters of Form::formconfirm($page,$title,$question,$action,$formquestion='',$selectedchoice="",$useajax=0,$height=170,$width=500) are not documented:
parameter 'width'
/home/ldestail/git/dolibarr/htdocs/core/class/html.form.class.php:681: warning: argument 'show_empty' of command @param is not found in the argument list of Form::select_contacts($socid,$selected='',$htmlname='contactid',$showempty=0,$exclude='',$limitto='',$showfunction=0,$moreclass='')
/home/ldestail/git/dolibarr/htdocs/core/class/html.form.class.php:681: warning: The following parameters of Form::select_contacts($socid,$selected='',$htmlname='contactid',$showempty=0,$exclude='',$limitto='',$showfunction=0,$moreclass='') are not documented:
parameter 'showempty'
/home/ldestail/git/dolibarr/htdocs/core/class/html.form.class.php:907: warning: The following parameters of Form::select_produits($selected='',$htmlname='productid',$filtertype='',$limit=20,$price_level=0,$status=1,$finished=2,$selected_input_value='',$hidelabel=0) are not documented:
parameter 'hidelabel'
/home/ldestail/git/dolibarr/htdocs/core/class/html.form.class.php:1190: warning: argument 'status' of command @param is not found in the argument list of Form::select_produits_fournisseurs_do($socid,$selected='',$htmlname='productid',$filtertype='',$filtre='',$filterkey='',$statut=-1,$disableout=0)
/home/ldestail/git/dolibarr/htdocs/core/class/html.form.class.php:1190: warning: The following parameters of Form::select_produits_fournisseurs_do($socid,$selected='',$htmlname='productid',$filtertype='',$filtre='',$filterkey='',$statut=-1,$disableout=0) are not documented:
parameter 'statut'
/home/ldestail/git/dolibarr/htdocs/core/class/html.form.class.php:615: warning: The following parameters of Form::select_remises($selected='',$htmlname='remise_id',$filter='',$socid,$maxvalue=0) are not documented:
parameter 'socid'
/home/ldestail/git/dolibarr/htdocs/core/class/html.form.class.php:3339: warning: argument 'name' of command @param is not found in the argument list of Form::selectyesno($htmlname,$value='',$option=0)
/home/ldestail/git/dolibarr/htdocs/core/class/html.form.class.php:3339: warning: The following parameters of Form::selectyesno($htmlname,$value='',$option=0) are not documented:
parameter 'htmlname'
/home/ldestail/git/dolibarr/htdocs/core/class/html.form.class.php:205: warning: argument 'htmltooltip' of command @param is not found in the argument list of Form::textwithpicto($text,$htmltext,$direction=1,$type='help',$extracss='',$noencodehtmltext=0)
/home/ldestail/git/dolibarr/htdocs/core/class/html.form.class.php:205: warning: The following parameters of Form::textwithpicto($text,$htmltext,$direction=1,$type='help',$extracss='',$noencodehtmltext=0) are not documented:
parameter 'htmltext'
/home/ldestail/git/dolibarr/htdocs/core/class/html.formcompany.class.php:177: warning: argument 'departement_id' of command @param is not found in the argument list of FormCompany::select_departement($selected='',$pays_code=0,$htmlname='departement_id')
/home/ldestail/git/dolibarr/htdocs/core/class/html.formcompany.class.php:177: warning: The following parameters of FormCompany::select_departement($selected='',$pays_code=0,$htmlname='departement_id') are not documented:
parameter 'htmlname'
/home/ldestail/git/dolibarr/htdocs/core/class/html.formcompany.class.php:192: warning: argument 'departement_id' of command @param is not found in the argument list of FormCompany::select_state($selected='',$pays_code=0,$htmlname='departement_id')
/home/ldestail/git/dolibarr/htdocs/core/class/html.formcompany.class.php:192: warning: The following parameters of FormCompany::select_state($selected='',$pays_code=0,$htmlname='departement_id') are not documented:
parameter 'htmlname'
/home/ldestail/git/dolibarr/htdocs/core/class/html.formother.class.php:203: warning: The following parameters of FormOther::select_percent($selected=0,$htmlname='percent',$disabled=0,$increment=5,$start=0,$end=100) are not documented:
parameter 'disabled'
/home/ldestail/git/dolibarr/htdocs/core/class/html.formother.class.php:588: warning: The following parameters of FormOther::select_year($selected='',$htmlname='yearid',$useempty=0,$min_year=10,$max_year=5,$offset=0,$invert=0,$option='') are not documented:
parameter 'offset'
parameter 'invert'
parameter 'option'
/home/ldestail/git/dolibarr/htdocs/core/class/html.formother.class.php:601: warning: The following parameters of FormOther::selectyear($selected='',$htmlname='yearid',$useempty=0,$min_year=10,$max_year=5,$offset=0,$invert=0,$option='') are not documented:
parameter 'offset'
parameter 'invert'
parameter 'option'
/home/ldestail/git/dolibarr/htdocs/fourn/class/fournisseur.class.php:38: warning: The following parameters of Fournisseur::Fournisseur($DB,$id=0,$user=0) are not documented:
parameter 'user'
/home/ldestail/git/dolibarr/htdocs/fourn/class/fournisseur.class.php:102: warning: The following parameters of Fournisseur::updateFromCommandeClient($user,$idc,$comclientid) are not documented:
parameter 'idc'
parameter 'comclientid'
/home/ldestail/git/dolibarr/htdocs/core/class/genericobject.class.php:35: warning: argument 'DB' of command @param is not found in the argument list of GenericObject::GenericObject($db)
/home/ldestail/git/dolibarr/htdocs/core/class/genericobject.class.php:35: warning: The following parameters of GenericObject::GenericObject($db) are not documented:
parameter 'db'
/home/ldestail/git/dolibarr/htdocs/includes/modules/import/import_csv.modules.php:264: warning: The following parameters of ImportCsv::import_insert($arrayrecord,$array_match_file_to_database,$objimport,$maxfields,$importid) are not documented:
parameter 'importid'
/home/ldestail/git/dolibarr/htdocs/includes/modules/import/import_csv.modules.php:135: warning: The following parameters of ImportCsv::write_record_example($outputlangs,$contentlinevalues) are not documented:
parameter 'contentlinevalues'
/home/ldestail/git/dolibarr/htdocs/includes/modules/import/import_csv.modules.php:125: warning: The following parameters of ImportCsv::write_title_example($outputlangs,$headerlinefields) are not documented:
parameter 'headerlinefields'
/home/ldestail/git/dolibarr/htdocs/includes/triggers/interface_modPaypal_PaypalWorkflow.class.php:83: warning: argument 'lang' of command @param is not found in the argument list of InterfacePaypalWorkflow::run_trigger($action,$object,$user,$langs,$conf)
/home/ldestail/git/dolibarr/htdocs/includes/triggers/interface_modPaypal_PaypalWorkflow.class.php:83: warning: The following parameters of InterfacePaypalWorkflow::run_trigger($action,$object,$user,$langs,$conf) are not documented:
parameter 'langs'
/home/ldestail/git/dolibarr/htdocs/core/class/interfaces.class.php:47: warning: argument 'lang' of command @param is not found in the argument list of Interfaces::run_triggers($action,$object,$user,$langs,$conf)
/home/ldestail/git/dolibarr/htdocs/core/class/interfaces.class.php:47: warning: The following parameters of Interfaces::run_triggers($action,$object,$user,$langs,$conf) are not documented:
parameter 'langs'
/home/ldestail/git/dolibarr/htdocs/lib/ldap.class.php:1277: warning: argument 'string' of command @param is not found in the argument list of Ldap::convert_time($value)
/home/ldestail/git/dolibarr/htdocs/lib/ldap.class.php:1277: warning: The following parameters of Ldap::convert_time($value) are not documented:
parameter 'value'
/home/ldestail/git/dolibarr/htdocs/lib/ldap.class.php:357: warning: argument 'ds' of command @param is not found in the argument list of Ldap::getVersion()
/home/ldestail/git/dolibarr/htdocs/lib/ldap.class.php:341: warning: argument 'ds' of command @param is not found in the argument list of Ldap::unbind()
/home/ldestail/git/dolibarr/htdocs/comm/mailing/class/mailing.class.php:228: warning: The following parameters of Mailing::createFromClone($fromid,$option1,$option2) are not documented:
parameter 'option1'
parameter 'option2'
/home/ldestail/git/dolibarr/htdocs/includes/modules/mailings/contacts1.modules.php:151: warning: argument 'filterarray' of command @param is not found in the argument list of mailing_contacts1::add_to_target($mailing_id,$filtersarray=array())
/home/ldestail/git/dolibarr/htdocs/includes/modules/mailings/contacts1.modules.php:151: warning: The following parameters of mailing_contacts1::add_to_target($mailing_id,$filtersarray=array()) are not documented:
parameter 'filtersarray'
/home/ldestail/git/dolibarr/htdocs/includes/modules/mailings/contacts2.modules.php:59: warning: argument 'filterarray' of command @param is not found in the argument list of mailing_contacts2::add_to_target($mailing_id,$filtersarray=array())
/home/ldestail/git/dolibarr/htdocs/includes/modules/mailings/contacts2.modules.php:59: warning: The following parameters of mailing_contacts2::add_to_target($mailing_id,$filtersarray=array()) are not documented:
parameter 'filtersarray'
/home/ldestail/git/dolibarr/htdocs/includes/modules/mailings/contacts3.modules.php:59: warning: argument 'filterarray' of command @param is not found in the argument list of mailing_contacts3::add_to_target($mailing_id,$filtersarray=array())
/home/ldestail/git/dolibarr/htdocs/includes/modules/mailings/contacts3.modules.php:59: warning: The following parameters of mailing_contacts3::add_to_target($mailing_id,$filtersarray=array()) are not documented:
parameter 'filtersarray'
/home/ldestail/git/dolibarr/htdocs/includes/modules/mailings/example.modules.php:53: warning: argument 'filterarray' of command @param is not found in the argument list of mailing_example::add_to_target($mailing_id,$filtersarray=array())
/home/ldestail/git/dolibarr/htdocs/includes/modules/mailings/example.modules.php:53: warning: The following parameters of mailing_example::add_to_target($mailing_id,$filtersarray=array()) are not documented:
parameter 'filtersarray'
/home/ldestail/git/dolibarr/htdocs/includes/modules/mailings/fraise.modules.php:131: warning: argument 'filterarray' of command @param is not found in the argument list of mailing_fraise::add_to_target($mailing_id,$filtersarray=array())
/home/ldestail/git/dolibarr/htdocs/includes/modules/mailings/fraise.modules.php:131: warning: The following parameters of mailing_fraise::add_to_target($mailing_id,$filtersarray=array()) are not documented:
parameter 'filtersarray'
/home/ldestail/git/dolibarr/htdocs/includes/modules/mailings/framboise.modules.php:51: warning: argument 'filterarray' of command @param is not found in the argument list of mailing_framboise::add_to_target($mailing_id,$filtersarray=array())
/home/ldestail/git/dolibarr/htdocs/includes/modules/mailings/framboise.modules.php:51: warning: The following parameters of mailing_framboise::add_to_target($mailing_id,$filtersarray=array()) are not documented:
parameter 'filtersarray'
/home/ldestail/git/dolibarr/htdocs/includes/modules/mailings/peche.modules.php:97: warning: argument 'filterarray' of command @param is not found in the argument list of mailing_peche::add_to_target($mailing_id,$filtersarray=array())
/home/ldestail/git/dolibarr/htdocs/includes/modules/mailings/peche.modules.php:97: warning: The following parameters of mailing_peche::add_to_target($mailing_id,$filtersarray=array()) are not documented:
parameter 'filtersarray'
/home/ldestail/git/dolibarr/htdocs/includes/modules/mailings/pomme.modules.php:119: warning: argument 'filterarray' of command @param is not found in the argument list of mailing_pomme::add_to_target($mailing_id,$filtersarray=array())
/home/ldestail/git/dolibarr/htdocs/includes/modules/mailings/pomme.modules.php:119: warning: The following parameters of mailing_pomme::add_to_target($mailing_id,$filtersarray=array()) are not documented:
parameter 'filtersarray'
/home/ldestail/git/dolibarr/htdocs/includes/modules/mailings/thirdparties.modules.php:46: warning: argument 'filterarray' of command @param is not found in the argument list of mailing_thirdparties::add_to_target($mailing_id,$filtersarray=array())
/home/ldestail/git/dolibarr/htdocs/includes/modules/mailings/thirdparties.modules.php:46: warning: The following parameters of mailing_thirdparties::add_to_target($mailing_id,$filtersarray=array()) are not documented:
parameter 'filtersarray'
/home/ldestail/git/dolibarr/htdocs/includes/modules/mailings/thirdparties_services_expired.modules.php:74: warning: argument 'filterarray' of command @param is not found in the argument list of mailing_thirdparties_services_expired::add_to_target($mailing_id,$filtersarray=array())
/home/ldestail/git/dolibarr/htdocs/includes/modules/mailings/thirdparties_services_expired.modules.php:74: warning: The following parameters of mailing_thirdparties_services_expired::add_to_target($mailing_id,$filtersarray=array()) are not documented:
parameter 'filtersarray'
/home/ldestail/git/dolibarr/htdocs/includes/menus/standard/auguria_backoffice.php:78: warning: argument 'DB' of command @param is not found in the argument list of MenuLeft::MenuLeft($db,&$menu_array,&$menu_array_after)
/home/ldestail/git/dolibarr/htdocs/includes/menus/standard/auguria_backoffice.php:78: warning: The following parameters of MenuLeft::MenuLeft($db,&$menu_array,&$menu_array_after) are not documented:
parameter 'db'
/home/ldestail/git/dolibarr/htdocs/includes/menus/smartphone/smartphone_frontoffice.php:36: warning: argument 'DB' of command @param is not found in the argument list of MenuSmart::MenuSmart($db)
/home/ldestail/git/dolibarr/htdocs/includes/menus/smartphone/smartphone_frontoffice.php:36: warning: The following parameters of MenuSmart::MenuSmart($db) are not documented:
parameter 'db'
/home/ldestail/git/dolibarr/htdocs/includes/menus/standard/empty.php:35: warning: argument 'DB' of command @param is not found in the argument list of MenuTop::MenuTop($db)
/home/ldestail/git/dolibarr/htdocs/includes/menus/standard/empty.php:35: warning: The following parameters of MenuTop::MenuTop($db) are not documented:
parameter 'db'
/home/ldestail/git/dolibarr/htdocs/includes/modules/fichinter/mod_arctic.php:103: warning: argument 'ficheinter' of command @param is not found in the argument list of mod_arctic::getNextValue($objsoc=0,$object='')
/home/ldestail/git/dolibarr/htdocs/includes/modules/fichinter/mod_arctic.php:103: warning: The following parameters of mod_arctic::getNextValue($objsoc=0,$object='') are not documented:
parameter 'object'
/home/ldestail/git/dolibarr/htdocs/includes/modules/societe/mod_codeclient_elephant.php:194: warning: argument 'int' of command @param is not found in the argument list of mod_codeclient_elephant::verif_prefixIsUsed()
/home/ldestail/git/dolibarr/htdocs/includes/modules/societe/mod_codeclient_leopard.php:75: warning: argument 'langs' of command @param is not found in the argument list of mod_codeclient_leopard::getNextValue($objsoc=0,$type=-1)
/home/ldestail/git/dolibarr/htdocs/includes/modules/fichinter/mod_pacific.php:92: warning: argument 'ficheinter' of command @param is not found in the argument list of mod_pacific::getNextValue($objsoc=0,$object='')
/home/ldestail/git/dolibarr/htdocs/includes/modules/fichinter/mod_pacific.php:92: warning: The following parameters of mod_pacific::getNextValue($objsoc=0,$object='') are not documented:
parameter 'object'
/home/ldestail/git/dolibarr/htdocs/includes/modules/societe/modules_societe.class.php:228: warning: argument 'int' of command @param is not found in the argument list of ModeleThirdPartyCode::verif_prefixIsUsed()
/home/ldestail/git/dolibarr/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php:42: warning: argument 'DB' of command @param is not found in the argument list of pdf_baleine::pdf_baleine($db)
/home/ldestail/git/dolibarr/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php:42: warning: The following parameters of pdf_baleine::pdf_baleine($db) are not documented:
parameter 'db'
/home/ldestail/git/dolibarr/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php:869: warning: argument 'outputlang' of command @param is not found in the argument list of pdf_canelle::_pagefoot(&$pdf,$object,$outputlangs)
/home/ldestail/git/dolibarr/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php:869: warning: The following parameters of pdf_canelle::_pagefoot(&$pdf,$object,$outputlangs) are not documented:
parameter 'outputlangs'
/home/ldestail/git/dolibarr/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php:577: warning: The following parameters of pdf_canelle::_tableau(&$pdf,$tab_top,$tab_height,$nexY,$outputlangs) are not documented:
parameter 'tab_top'
parameter 'tab_height'
parameter 'nexY'
parameter 'outputlangs'
/home/ldestail/git/dolibarr/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php:390: warning: The following parameters of pdf_canelle::_tableau_tot(&$pdf,$object,$deja_regle,$posy,$outputlangs) are not documented:
parameter 'posy'
parameter 'outputlangs'
/home/ldestail/git/dolibarr/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php:58: warning: argument 'DB' of command @param is not found in the argument list of pdf_canelle::pdf_canelle($db,$object)
/home/ldestail/git/dolibarr/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php:58: warning: The following parameters of pdf_canelle::pdf_canelle($db,$object) are not documented:
parameter 'db'
parameter 'object'
/home/ldestail/git/dolibarr/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php:910: warning: The following parameters of pdf_crabe::_tableau(&$pdf,$tab_top,$tab_height,$nexY,$outputlangs) are not documented:
parameter 'tab_top'
parameter 'tab_height'
parameter 'nexY'
parameter 'outputlangs'
/home/ldestail/git/dolibarr/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php:62: warning: argument 'DB' of command @param is not found in the argument list of pdf_crabe::pdf_crabe($db)
/home/ldestail/git/dolibarr/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php:62: warning: The following parameters of pdf_crabe::pdf_crabe($db) are not documented:
parameter 'db'
/home/ldestail/git/dolibarr/htdocs/includes/modules/commande/pdf_einstein.modules.php:765: warning: The following parameters of pdf_einstein::_tableau(&$pdf,$tab_top,$tab_height,$nexY,$outputlangs) are not documented:
parameter 'tab_top'
parameter 'tab_height'
parameter 'nexY'
parameter 'outputlangs'
/home/ldestail/git/dolibarr/htdocs/includes/modules/commande/pdf_einstein.modules.php:61: warning: argument 'DB' of command @param is not found in the argument list of pdf_einstein::pdf_einstein($db)
/home/ldestail/git/dolibarr/htdocs/includes/modules/commande/pdf_einstein.modules.php:61: warning: The following parameters of pdf_einstein::pdf_einstein($db) are not documented:
parameter 'db'
/home/ldestail/git/dolibarr/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php:800: warning: argument 'outputlang' of command @param is not found in the argument list of pdf_muscadet::_pagefoot(&$pdf,$object,$outputlangs)
/home/ldestail/git/dolibarr/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php:800: warning: The following parameters of pdf_muscadet::_pagefoot(&$pdf,$object,$outputlangs) are not documented:
parameter 'outputlangs'
/home/ldestail/git/dolibarr/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php:581: warning: The following parameters of pdf_muscadet::_tableau(&$pdf,$tab_top,$tab_height,$nexY,$outputlangs) are not documented:
parameter 'tab_top'
parameter 'tab_height'
parameter 'nexY'
parameter 'outputlangs'
/home/ldestail/git/dolibarr/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php:391: warning: The following parameters of pdf_muscadet::_tableau_tot(&$pdf,$object,$deja_regle,$posy,$outputlangs) are not documented:
parameter 'posy'
parameter 'outputlangs'
/home/ldestail/git/dolibarr/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php:60: warning: argument 'DB' of command @param is not found in the argument list of pdf_muscadet::pdf_muscadet($db)
/home/ldestail/git/dolibarr/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php:60: warning: The following parameters of pdf_muscadet::pdf_muscadet($db) are not documented:
parameter 'db'
/home/ldestail/git/dolibarr/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php:1008: warning: argument 'outputlang' of command @param is not found in the argument list of pdf_oursin::_pagefoot(&$pdf,$object,$outputlangs)
/home/ldestail/git/dolibarr/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php:1008: warning: The following parameters of pdf_oursin::_pagefoot(&$pdf,$object,$outputlangs) are not documented:
parameter 'outputlangs'
/home/ldestail/git/dolibarr/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php:314: warning: argument 'fac' of command @param is not found in the argument list of pdf_oursin::_tableau_versements(&$pdf,$object,$posy,$outputlangs)
/home/ldestail/git/dolibarr/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php:314: warning: The following parameters of pdf_oursin::_tableau_versements(&$pdf,$object,$posy,$outputlangs) are not documented:
parameter 'object'
/home/ldestail/git/dolibarr/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php:50: warning: argument 'DB' of command @param is not found in the argument list of pdf_oursin::pdf_oursin($db)
/home/ldestail/git/dolibarr/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php:50: warning: The following parameters of pdf_oursin::pdf_oursin($db) are not documented:
parameter 'db'
/home/ldestail/git/dolibarr/htdocs/includes/modules/rapport/pdf_paiement.class.php:207: warning: argument 'object' of command @param is not found in the argument list of pdf_paiement::_pagehead(&$pdf,$page,$showaddress=1,$outputlangs)
/home/ldestail/git/dolibarr/htdocs/includes/modules/rapport/pdf_paiement.class.php:207: warning: The following parameters of pdf_paiement::_pagehead(&$pdf,$page,$showaddress=1,$outputlangs) are not documented:
parameter 'page'
/home/ldestail/git/dolibarr/htdocs/includes/modules/propale/pdf_propale_azur.modules.php:792: warning: The following parameters of pdf_propale_azur::_tableau(&$pdf,$tab_top,$tab_height,$nexY,$outputlangs) are not documented:
parameter 'tab_top'
parameter 'tab_height'
parameter 'nexY'
parameter 'outputlangs'
/home/ldestail/git/dolibarr/htdocs/includes/modules/propale/pdf_propale_azur.modules.php:44: warning: argument 'DB' of command @param is not found in the argument list of pdf_propale_azur::pdf_propale_azur($db)
/home/ldestail/git/dolibarr/htdocs/includes/modules/propale/pdf_propale_azur.modules.php:44: warning: The following parameters of pdf_propale_azur::pdf_propale_azur($db) are not documented:
parameter 'db'
/home/ldestail/git/dolibarr/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php:792: warning: The following parameters of pdf_propale_jaune::_tableau(&$pdf,$tab_top,$tab_height,$nexY,$outputlangs) are not documented:
parameter 'tab_top'
parameter 'tab_height'
parameter 'nexY'
parameter 'outputlangs'
/home/ldestail/git/dolibarr/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php:44: warning: argument 'DB' of command @param is not found in the argument list of pdf_propale_jaune::pdf_propale_jaune($db)
/home/ldestail/git/dolibarr/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php:44: warning: The following parameters of pdf_propale_jaune::pdf_propale_jaune($db) are not documented:
parameter 'db'
/home/ldestail/git/dolibarr/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php:296: warning: The following parameters of pdf_sirocco::_tableau(&$pdf,$tab_top,$tab_height,$nexY,$outputlangs) are not documented:
parameter 'tab_top'
parameter 'tab_height'
parameter 'nexY'
parameter 'outputlangs'
/home/ldestail/git/dolibarr/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php:40: warning: argument 'DB' of command @param is not found in the argument list of pdf_sirocco::pdf_sirocco($db)
/home/ldestail/git/dolibarr/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php:40: warning: The following parameters of pdf_sirocco::pdf_sirocco($db) are not documented:
parameter 'db'
/home/ldestail/git/dolibarr/htdocs/includes/modules/member/cards/pdf_standard.class.php:98: warning: argument 'DB' of command @param is not found in the argument list of pdf_standard::pdf_standard($db)
/home/ldestail/git/dolibarr/htdocs/includes/modules/member/cards/pdf_standard.class.php:98: warning: The following parameters of pdf_standard::pdf_standard($db) are not documented:
parameter 'db'
/home/ldestail/git/dolibarr/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php:99: warning: argument 'DB' of command @param is not found in the argument list of pdf_standardlabel::pdf_standard($db)
/home/ldestail/git/dolibarr/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php:99: warning: The following parameters of pdf_standardlabel::pdf_standard($db) are not documented:
parameter 'db'
/home/ldestail/git/dolibarr/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php:44: warning: argument 'DB' of command @param is not found in the argument list of pdf_typhon::pdf_typhon($db)
/home/ldestail/git/dolibarr/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php:44: warning: The following parameters of pdf_typhon::pdf_typhon($db) are not documented:
parameter 'db'
/home/ldestail/git/dolibarr/htdocs/product/class/product.class.php:749: warning: argument 'int' of command @param is not found in the argument list of Product::_log_price($user,$level=0)
/home/ldestail/git/dolibarr/htdocs/product/class/product.class.php:749: warning: The following parameters of Product::_log_price($user,$level=0) are not documented:
parameter 'level'
/home/ldestail/git/dolibarr/htdocs/product/class/product.class.php:2503: warning: argument 'files' of command @param is not found in the argument list of Product::add_photo_web($sdir,$file)
/home/ldestail/git/dolibarr/htdocs/product/class/product.class.php:2503: warning: The following parameters of Product::add_photo_web($sdir,$file) are not documented:
parameter 'file'
/home/ldestail/git/dolibarr/htdocs/product/class/product.class.php:1647: warning: The following parameters of Product::add_sousproduit($id_pere,$id_fils,$qty) are not documented:
parameter 'qty'
/home/ldestail/git/dolibarr/htdocs/product/class/product.class.php:2484: warning: argument 'sdir' of command @param is not found in the argument list of Product::add_thumb($file,$maxWidth=160,$maxHeight=120)
/home/ldestail/git/dolibarr/htdocs/product/class/product.class.php:1992: warning: The following parameters of Product::fetch_prod_arbo($prod,$compl_path="",$multiply=1,$level=1) are not documented:
parameter 'prod'
parameter 'compl_path'
parameter 'level'
/home/ldestail/git/dolibarr/htdocs/product/class/product.class.php:706: warning: argument 'int' of command @param is not found in the argument list of Product::getMultiLangs()
/home/ldestail/git/dolibarr/htdocs/product/class/product.class.php:639: warning: argument 'int' of command @param is not found in the argument list of Product::setMultiLangs()
/home/ldestail/git/dolibarr/htdocs/fourn/class/fournisseur.product.class.php:273: warning: argument 'fournid' of command @param is not found in the argument list of ProductFournisseur::fetch_product_fournisseur_price($rowid)
/home/ldestail/git/dolibarr/htdocs/comm/propal/class/propal.class.php:1730: warning: The following parameters of Propal::delete($user,$notrigger=0) are not documented:
parameter 'notrigger'
/home/ldestail/git/dolibarr/htdocs/comm/propal/class/propal.class.php:1141: warning: The following parameters of Propal::valid($user,$notrigger=0) are not documented:
parameter 'notrigger'
/home/ldestail/git/dolibarr/htdocs/core/class/smtps.class.php:1348: warning: argument 'string' of command @param is not found in the argument list of SMTPs::getSensitivity()
/home/ldestail/git/dolibarr/htdocs/core/class/smtps.class.php:1111: warning: argument '_msgContent' of command @param is not found in the argument list of SMTPs::setBodyContent($strContent,$strType='plain')
/home/ldestail/git/dolibarr/htdocs/core/class/smtps.class.php:1111: warning: The following parameters of SMTPs::setBodyContent($strContent,$strType='plain') are not documented:
parameter 'strContent'
parameter 'strType'

3
build/exe/doliwamp/.cvsignore
View File

@ -1,3 +0,0 @@
*.db
ca_dolibarr.key
doliwamptest.iss

1
dev/.cvsignore
View File

@ -1 +0,0 @@
spec

1
dev/phpunit/.cvsignore
View File

@ -1 +0,0 @@
Thumbs.db

2
dev/skeletons/.cvsignore
View File

@ -1,2 +0,0 @@
out.*
socpeople*

1
dev/test/.cvsignore
View File

@ -1 +0,0 @@
example*.pdf

1
dev/xdebug/.cvsignore
View File

@ -1 +0,0 @@
Thumbs.db

1
doc/images/.cvsignore
View File

@ -1 +0,0 @@
*.db

10
htdocs/.cvsignore
View File

@ -1,10 +0,0 @@
google
.htaccess
.DS_Store
.documents
dolibarr_mail
demo_pwc
phpsane
test.php
custom
custom2

1
htdocs/admin/.cvsignore
View File

@ -1 +0,0 @@
google.php

2
htdocs/admin/dict.php
View File

@ -32,7 +32,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
$langs->load("other");
$langs->load("errors");
$langs->load("admin");
$langs->load("companies");

7
htdocs/admin/tools/export.php
View File

@ -1,5 +1,6 @@
<?php
/* Copyright (C) 2006-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
*
* 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
@ -207,7 +208,11 @@ if ($what == 'mysql')
@dol_delete_file($outputerror,1);
@rename($outputfile,$outputerror);
// Si safe_mode on et command hors du parametre exec, on a un fichier out vide donc errormsg vide
if (! $errormsg) $errormsg=$langs->trans("ErrorFailedToRunExternalCommand");
if (! $errormsg)
{
$langs->load("errors");
$errormsg=$langs->trans("ErrorFailedToRunExternalCommand");
}
}
}
// Fin execution commande

2
htdocs/comm/propal.php
View File

@ -569,7 +569,7 @@ if ($_POST['action'] == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile']
}
else
{
$langs->load("other");
$langs->load("errors");
$mesg='<div class="error">'.$langs->trans('ErrorCantReadFile',$file).'</div>';
dol_syslog('Failed to read file: '.$file);
}

3
htdocs/comm/propal/apercu.php
View File

@ -3,6 +3,7 @@
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
*
* 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
@ -159,7 +160,7 @@ if ($id > 0 || ! empty($ref))
}
else
{
$langs->load("other");
$langs->load("errors");
print '<font class="error">'.$langs->trans("ErrorNoImagickReadimage").'</font>';
}
}

5
htdocs/commande/apercu.php
View File

@ -3,7 +3,8 @@
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
*
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
*
* 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 2 of the License, or
@ -155,7 +156,7 @@ if ($id > 0 || ! empty($ref))
}
else
{
$langs->load("other");
$langs->load("errors");
print '<font class="error">'.$langs->trans("ErrorNoImagickReadimage").'</font>';
}
}

4
htdocs/commande/fiche.php
View File

@ -4,7 +4,7 @@
* Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com>
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
* Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2011 Philippe Grand <philippe.grand@atoo-net.com>
*
* This program is free software; you can redistribute it and/or modify
@ -1075,7 +1075,7 @@ if ($action == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile'] && ! $_P
}
else
{
$langs->load("other");
$langs->load("errors");
$mesg='<div class="error">'.$langs->trans('ErrorCantReadFile',$file).'</div>';
dol_syslog('Failed to read file: '.$file);
}

9
htdocs/compta/deplacement/class/deplacement.class.php
View File

@ -361,7 +361,7 @@ class Deplacement extends CommonObject
$sql.= " FROM ".MAIN_DB_PREFIX."c_type_fees";
$sql.= " WHERE active = ".$active;
dol_syslog("Deplacement::listOfTypes sql=".$sql, LOG_DEBUG);
dol_syslog(get_class($this)."::listOfTypes sql=".$sql, LOG_DEBUG);
$result = $this->db->query($sql);
if ( $result )
{
@ -370,11 +370,14 @@ class Deplacement extends CommonObject
while ($i < $num)
{
$obj = $this->db->fetch_object($result);
$ret[$obj->id]=array('code'=>$obj->code, 'label'=>(($langs->trans($obj->code)!=$obj->code)?$langs->trans($obj->code):$obj->label));
$ret[$obj->code]=(($langs->trans($obj->code)!=$obj->code)?$langs->trans($obj->code):$obj->label);
$i++;
}
}
else dol_print_error($this->db);
else
{
dol_print_error($this->db);
}
return $ret;
}

20
htdocs/compta/deplacement/fiche.php
View File

@ -339,13 +339,15 @@ else if ($id)
print '<table class="border" width="100%">';
// Ref
print "<tr>";
print '<td width="20%">'.$langs->trans("Ref").'</td><td>';
print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td>';
print $form->showrefnav($object,'id','',1,'rowid','ref','');
print '</td></tr>';
// Type
print '<tr><td>'.$langs->trans("Type").'</td><td>'.$langs->trans($object->type).'</td></tr>';
print '<tr><td>'.$langs->trans("Type").'</td><td>';
print $form->editInPlace($langs->trans($object->type), 'type', $user->rights->deplacement->creer, 'select');
//print $langs->trans($object->type);
print '</td></tr>';
// Who
print '<tr><td>'.$langs->trans("Person").'</td><td>';
@ -356,12 +358,12 @@ else if ($id)
// Date
print '<tr><td>'.$langs->trans("Date").'</td><td>';
print dol_print_date($object->date,'day');
print $form->editInPlace($object->date, 'dated', $user->rights->deplacement->creer, 'datepicker');
print '</td></tr>';
// Km/Price
print '<tr><td>'.$langs->trans("FeesKilometersOrAmout").'</td>';
print '<td>'.$form->editInPlace(price($object->km), 'km', $user->rights->deplacement->creer, 'numeric').'</td></tr>';
print '<td>'.$form->editInPlace($object->km, 'km', $user->rights->deplacement->creer, 'numeric').'</td></tr>';
// Where
print '<tr><td>'.$langs->trans("CompanyVisited").'</td>';
@ -405,9 +407,7 @@ else if ($id)
// Public note
print '<tr><td valign="top">'.$langs->trans("NotePublic").'</td>';
print '<td valign="top" colspan="3">';
// FIXME parameter note_private must not be denatured with a format function to be propagated. dol_nl2br must be used
// by editInPlace if necessary according to type (4rd parameter)
print $form->editInPlace(dol_nl2br($object->note_public), 'note_public', $user->rights->deplacement->creer, 'area');
print $form->editInPlace($object->note_public, 'note_public', $user->rights->deplacement->creer, 'textarea');
print "</td></tr>";
// Private note
@ -415,9 +415,7 @@ else if ($id)
{
print '<tr><td valign="top">'.$langs->trans("NotePrivate").'</td>';
print '<td valign="top" colspan="3">';
// FIXME parameter note_private must not be denatured with a format function to be propagated. dol_nl2br must be used
// by editInPlace if necessary according to type (4rd parameter)
print $form->editInPlace(dol_nl2br($object->note_private), 'note', $user->rights->deplacement->creer, 'area');
print $form->editInPlace($object->note_private, 'note', $user->rights->deplacement->creer, 'textarea');
print "</td></tr>";
}

4
htdocs/compta/deplacement/index.php
View File

@ -102,9 +102,9 @@ print '<td colspan="4">'.$langs->trans("Statistics").'</td>';
print "</tr>\n";
$listoftype=$tripandexpense_static->listOfTypes();
foreach ($listoftype as $typefee)
foreach ($listoftype as $code => $label)
{
$dataseries[]=array('label'=>$typefee['label'],'values'=>array(0=>(isset($nb[$typefee['code']])?$nb[$typefee['code']]:0)));
$dataseries[]=array('label'=>$label,'values'=>array(0=>(isset($nb[$code])?$nb[$code]:0)));
}
if ($conf->use_javascript_ajax)

4
htdocs/compta/facture.php
View File

@ -5,7 +5,7 @@
* Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com>
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
* Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es>
*
* 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
@ -1361,7 +1361,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
}
else
{
$langs->load("other");
$langs->load("errors");
$mesg='<div class="error">'.$langs->trans('ErrorCantReadFile',$file).'</div>';
dol_syslog('Failed to read file: '.$file);
}

3
htdocs/compta/facture/apercu.php
View File

@ -3,6 +3,7 @@
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
*
* 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
@ -334,7 +335,7 @@ if ($id > 0 || ! empty($ref))
}
else
{
$langs->load("other");
$langs->load("errors");
print '<font class="error">'.$langs->trans("ErrorNoImagickReadimage").'</font>';
}
}

595
htdocs/compta/localtax/class/localtax.class.php Normal file
View File

@ -0,0 +1,595 @@
<?php
/* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
*
* 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 2 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 <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/compta/localtax/class/localtax.class.php
* \ingroup tax
* \author Laurent Destailleur
*/
require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
/**
* \class Localtax
* \brief Put here description of your class
*/
class localtax extends CommonObject
{
var $id;
var $ref;
var $tms;
var $datep;
var $datev;
var $amount;
var $label;
var $note;
var $fk_bank;
var $fk_user_creat;
var $fk_user_modif;
/**
* Constructor
*
* @param DoliDB $DB Database handler
*/
function __construct($DB)
{
$this->db = $DB;
}
/**
* Create in database
*
* @param User $user User that create
* @return int <0 if KO, >0 if OK
*/
function create($user)
{
global $conf, $langs;
// Clean parameters
$this->amount=trim($this->amount);
$this->label=trim($this->label);
$this->note=trim($this->note);
$this->fk_bank=trim($this->fk_bank);
$this->fk_user_creat=trim($this->fk_user_creat);
$this->fk_user_modif=trim($this->fk_user_modif);
// Insert request
$sql = "INSERT INTO ".MAIN_DB_PREFIX."localtax(";
$sql.= "tms,";
$sql.= "datep,";
$sql.= "datev,";
$sql.= "amount,";
$sql.= "label,";
$sql.= "note,";
$sql.= "fk_bank,";
$sql.= "fk_user_creat,";
$sql.= "fk_user_modif";
$sql.= ") VALUES (";
$sql.= " ".$this->db->idate($this->tms).",";
$sql.= " ".$this->db->idate($this->datep).",";
$sql.= " ".$this->db->idate($this->datev).",";
$sql.= " '".$this->amount."',";
$sql.= " '".$this->label."',";
$sql.= " '".$this->note."',";
$sql.= " ".($this->fk_bank <= 0 ? "NULL" : "'".$this->fk_bank."'").",";
$sql.= " '".$this->fk_user_creat."',";
$sql.= " '".$this->fk_user_modif."'";
$sql.= ")";
dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."localtax");
// Appel des triggers
include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
$interface=new Interfaces($this->db);
$result=$interface->run_triggers('LOCALTAX_CREATE',$this,$user,$langs,$conf);
if ($result < 0) { $error++; $this->errors=$interface->errors; }
// Fin appel triggers
return $this->id;
}
else
{
$this->error="Error ".$this->db->lasterror();
dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
return -1;
}
}
/**
* Update database
*
* @param User $user User that modify
* @param int $notrigger 0=no, 1=yes (no update trigger)
* @return int <0 if KO, >0 if OK
*/
function update($user=0, $notrigger=0)
{
global $conf, $langs;
// Clean parameters
$this->amount=trim($this->amount);
$this->label=trim($this->label);
$this->note=trim($this->note);
$this->fk_bank=trim($this->fk_bank);
$this->fk_user_creat=trim($this->fk_user_creat);
$this->fk_user_modif=trim($this->fk_user_modif);
// Update request
$sql = "UPDATE ".MAIN_DB_PREFIX."localtax SET";
$sql.= " tms=".$this->db->idate($this->tms).",";
$sql.= " datep=".$this->db->idate($this->datep).",";
$sql.= " datev=".$this->db->idate($this->datev).",";
$sql.= " amount='".$this->amount."',";
$sql.= " label='".$this->db->escape($this->label)."',";
$sql.= " note='".$this->db->escape($this->note)."',";
$sql.= " fk_bank='".$this->fk_bank."',";
$sql.= " fk_user_creat='".$this->fk_user_creat."',";
$sql.= " fk_user_modif='".$this->fk_user_modif."'";
$sql.= " WHERE rowid=".$this->id;
dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
$resql = $this->db->query($sql);
if (! $resql)
{
$this->error="Error ".$this->db->lasterror();
dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
return -1;
}
if (! $notrigger)
{
// Appel des triggers
include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
$interface=new Interfaces($this->db);
$result=$interface->run_triggers('LOCALTAX_MODIFY',$this,$user,$langs,$conf);
if ($result < 0) { $error++; $this->errors=$interface->errors; }
// Fin appel triggers
}
return 1;
}
/**
* Load object in memory from database
*
* @param int $id Object id
* @return int <0 if KO, >0 if OK
*/
function fetch($id)
{
global $langs;
$sql = "SELECT";
$sql.= " t.rowid,";
$sql.= " t.tms,";
$sql.= " t.datep,";
$sql.= " t.datev,";
$sql.= " t.amount,";
$sql.= " t.label,";
$sql.= " t.note,";
$sql.= " t.fk_bank,";
$sql.= " t.fk_user_creat,";
$sql.= " t.fk_user_modif,";
$sql.= " b.fk_account,";
$sql.= " b.fk_type,";
$sql.= " b.rappro";
$sql.= " FROM ".MAIN_DB_PREFIX."localtax as t";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON t.fk_bank = b.rowid";
$sql.= " WHERE t.rowid = ".$id;
dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
if ($this->db->num_rows($resql))
{
$obj = $this->db->fetch_object($resql);
$this->id = $obj->rowid;
$this->ref = $obj->rowid;
$this->tms = $this->db->jdate($obj->tms);
$this->datep = $this->db->jdate($obj->datep);
$this->datev = $this->db->jdate($obj->datev);
$this->amount = $obj->amount;
$this->label = $obj->label;
$this->note = $obj->note;
$this->fk_bank = $obj->fk_bank;
$this->fk_user_creat = $obj->fk_user_creat;
$this->fk_user_modif = $obj->fk_user_modif;
$this->fk_account = $obj->fk_account;
$this->fk_type = $obj->fk_type;
$this->rappro = $obj->rappro;
}
$this->db->free($resql);
return 1;
}
else
{
$this->error="Error ".$this->db->lasterror();
dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
return -1;
}
}
/**
* Delete object in database
*
* @param User $user User that delete
* @return int <0 if KO, >0 if OK
*/
function delete($user)
{
global $conf, $langs;
$sql = "DELETE FROM ".MAIN_DB_PREFIX."localtax";
$sql.= " WHERE rowid=".$this->id;
dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG);
$resql = $this->db->query($sql);
if (! $resql)
{
$this->error="Error ".$this->db->lasterror();
dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
return -1;
}
// Appel des triggers
include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
$interface=new Interfaces($this->db);
$result=$interface->run_triggers('LOCALTAX_DELETE',$this,$user,$langs,$conf);
if ($result < 0) { $error++; $this->errors=$interface->errors; }
// Fin appel triggers
return 1;
}
/**
* Initialise an instance with random values.
* Used to build previews or test instances.
* id must be 0 if object instance is a specimen.
*
* @return void
*/
function initAsSpecimen()
{
$this->id=0;
$this->tms='';
$this->datep='';
$this->datev='';
$this->amount='';
$this->label='';
$this->note='';
$this->fk_bank='';
$this->fk_user_creat='';
$this->fk_user_modif='';
}
/**
* Hum la fonction s'appelle 'Solde' elle doit a mon avis calcluer le solde de localtax, non ?
*
*/
function solde($year = 0)
{
$reglee = $this->localtax_sum_reglee($year);
$payee = $this->localtax_sum_payee($year);
$collectee = $this->localtax_sum_collectee($year);
$solde = $reglee - ($collectee - $payee);
return $solde;
}
/**
* Total de la localtax des factures emises par la societe.
*
*/
function localtax_sum_collectee($year = 0)
{
$sql = "SELECT sum(f.localtax) as amount";
$sql .= " FROM ".MAIN_DB_PREFIX."facture as f WHERE f.paye = 1";
if ($year)
{
$sql .= " AND f.datef >= '$year-01-01' AND f.datef <= '$year-12-31' ";
}
$result = $this->db->query($sql);
if ($result)
{
if ($this->db->num_rows($result))
{
$obj = $this->db->fetch_object($result);
return $obj->amount;
}
else
{
return 0;
}
$this->db->free($result);
}
else
{
print $this->db->error();
return -1;
}
}
/**
* localtax payed
*
*/
function localtax_sum_payee($year = 0)
{
$sql = "SELECT sum(f.total_localtax) as total_localtax";
$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
if ($year)
{
$sql .= " WHERE f.datef >= '$year-01-01' AND f.datef <= '$year-12-31' ";
}
$result = $this->db->query($sql);
if ($result)
{
if ($this->db->num_rows($result))
{
$obj = $this->db->fetch_object($result);
return $obj->total_localtax;
}
else
{
return 0;
}
$this->db->free();
}
else
{
print $this->db->error();
return -1;
}
}
/**
* localtax payed
* Total de la localtax payed
*
*/
function localtax_sum_reglee($year = 0)
{
$sql = "SELECT sum(f.amount) as amount";
$sql .= " FROM ".MAIN_DB_PREFIX."localtax as f";
if ($year)
{
$sql .= " WHERE f.datev >= '$year-01-01' AND f.datev <= '$year-12-31' ";
}
$result = $this->db->query($sql);
if ($result)
{
if ($this->db->num_rows($result))
{
$obj = $this->db->fetch_object($result);
return $obj->amount;
}
else
{
return 0;
}
$this->db->free();
}
else
{
print $this->db->error();
return -1;
}
}
/**
* Add a payment of localtax
*
* @param User $user Object user that insert
* @return int <0 if KO, rowid in localtax table if OK
*/
function addPayment($user)
{
global $conf,$langs;
$this->db->begin();
// Check parameters
$this->amount=price2num($this->amount);
if (! $this->label)
{
$this->error=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Label"));
return -3;
}
if ($this->amount <= 0)
{
$this->error=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Amount"));
return -4;
}
if ($conf->banque->enabled && (empty($this->accountid) || $this->accountid <= 0))
{
$this->error=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Account"));
return -5;
}
if ($conf->banque->enabled && (empty($this->paymenttype) || $this->paymenttype <= 0))
{
$this->error=$langs->trans("ErrorFieldRequired",$langs->transnoentities("PaymentMode"));
return -5;
}
// Insertion dans table des paiement localtax
$sql = "INSERT INTO ".MAIN_DB_PREFIX."localtax (datep, datev, amount";
if ($this->note) $sql.=", note";
if ($this->label) $sql.=", label";
$sql.= ", fk_user_creat, fk_bank";
$sql.= ") ";
$sql.= " VALUES ('".$this->db->idate($this->datep)."',";
$sql.= "'".$this->db->idate($this->datev)."'," . $this->amount;
if ($this->note) $sql.=", '".$this->db->escape($this->note)."'";
if ($this->label) $sql.=", '".$this->db->escape($this->label)."'";
$sql.=", '".$user->id."', NULL";
$sql.= ")";
dol_syslog(get_class($this)."::addPayment sql=".$sql);
$result = $this->db->query($sql);
if ($result)
{
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."localtax"); // TODO devrait s'appeler paiementlocaltax
if ($this->id > 0)
{
$ok=1;
if ($conf->banque->enabled)
{
// Insertion dans llx_bank
require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php');
$acc = new Account($this->db);
$result=$acc->fetch($this->accountid);
if ($result <= 0) dol_print_error($db);
$bank_line_id = $acc->addline($this->datep, $this->paymenttype, $this->label, -abs($this->amount), '', '', $user);
// Mise a jour fk_bank dans llx_localtax. On connait ainsi la ligne de localtax qui a g<>n<EFBFBD>r<EFBFBD> l'<27>criture bancaire
if ($bank_line_id > 0)
{
$this->update_fk_bank($bank_line_id);
}
else
{
$this->error=$acc->error;
$ok=0;
}
// Mise a jour liens
$result=$acc->add_url_line($bank_line_id, $this->id, DOL_URL_ROOT.'/compta/localtax/fiche.php?id=', "(VATPayment)", "payment_vat");
if ($result < 0)
{
$this->error=$acc->error;
$ok=0;
}
}
if ($ok)
{
$this->db->commit();
return $this->id;
}
else
{
$this->db->rollback();
return -3;
}
}
else
{
$this->error=$this->db->error();
$this->db->rollback();
return -2;
}
}
else
{
$this->error=$this->db->error();
$this->db->rollback();
return -1;
}
}
/**
* Update the link betwen localtax payment and the line into llx_bank
*
* @param int $id Id bank account
* @return int <0 if KO, >0 if OK
*/
function update_fk_bank($id)
{
$sql = 'UPDATE llx_localtax set fk_bank = '.$id;
$sql.= ' WHERE rowid = '.$this->id;
$result = $this->db->query($sql);
if ($result)
{
return 1;
}
else
{
dol_print_error($this->db);
return -1;
}
}
/**
* Returns clickable name
*
* @param int $withpicto 0=Link, 1=Picto into link, 2=Picto
* @param string $option Sur quoi pointe le lien
* @return string Chaine avec URL
*/
function getNomUrl($withpicto=0, $option='')
{
global $langs;
$result='';
$lien = '<a href="'.DOL_URL_ROOT.'/compta/localtax/fiche.php?id='.$this->id.'">';
$lienfin='</a>';
$picto='payment';
$label=$langs->trans("ShowVatPayment").': '.$this->ref;
if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
if ($withpicto && $withpicto != 2) $result.=' ';
if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin;
return $result;
}
}
?>

299
htdocs/compta/localtax/clients.php Normal file
View File

@ -0,0 +1,299 @@
<?php
/* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
*
* 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 2 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 <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/compta/localtax/clients.php
* \ingroup tax
* \brief Third parties localtax report
*/
require('../../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
require_once(DOL_DOCUMENT_ROOT."/compta/localtax/class/localtax.class.php");
$langs->load("bills");
$langs->load("compta");
$langs->load("companies");
$langs->load("products");
// Date range
$year=GETPOST("year");
if (empty($year))
{
$year_current = strftime("%Y",dol_now());
$year_start = $year_current;
} else {
$year_current = $year;
$year_start = $year;
}
$date_start=dol_mktime(0,0,0,$_REQUEST["date_startmonth"],$_REQUEST["date_startday"],$_REQUEST["date_startyear"]);
$date_end=dol_mktime(23,59,59,$_REQUEST["date_endmonth"],$_REQUEST["date_endday"],$_REQUEST["date_endyear"]);
// Quarter
if (empty($date_start) || empty($date_end)) // We define date_start and date_end
{
$q=GETPOST("q");
if (empty($q))
{
if (isset($_REQUEST["month"])) { $date_start=dol_get_first_day($year_start,$_REQUEST["month"],false); $date_end=dol_get_last_day($year_start,$_REQUEST["month"],false); }
else
{
$month_current = strftime("%m",dol_now());
if ($month_current >= 10) $q=4;
elseif ($month_current >= 7) $q=3;
elseif ($month_current >= 4) $q=2;
else $q=1;
}
}
if ($q==1) { $date_start=dol_get_first_day($year_start,1,false); $date_end=dol_get_last_day($year_start,3,false); }
if ($q==2) { $date_start=dol_get_first_day($year_start,4,false); $date_end=dol_get_last_day($year_start,6,false); }
if ($q==3) { $date_start=dol_get_first_day($year_start,7,false); $date_end=dol_get_last_day($year_start,9,false); }
if ($q==4) { $date_start=dol_get_first_day($year_start,10,false); $date_end=dol_get_last_day($year_start,12,false); }
}
$min = GETPOST("min");
if (empty($min)) $min = 0;
// Define modetax (0 or 1)
// 0=normal, 1=option vat for services is on debit
$modetax = $conf->global->TAX_MODE;
if (isset($_REQUEST["modetax"])) $modetax=$_REQUEST["modetax"];
// Security check
$socid = GETPOST("socid");
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'tax', '', '', 'charges');
/*
* View
*/
$html=new Form($db);
$company_static=new Societe($db);
$morequerystring='';
$listofparams=array('date_startmonth','date_startyear','date_startday','date_endmonth','date_endyear','date_endday');
foreach($listofparams as $param)
{
if (GETPOST($param)!='') $morequerystring.=($morequerystring?'&':'').$param.'='.GETPOST($param);
}
llxHeader('','','','',0,0,'','',$morequerystring);
$fsearch.='<br>';
$fsearch.=' <input type="hidden" name="year" value="'.$year.'">';
$fsearch.=' <input type="hidden" name="modetax" value="'.$modetax.'">';
$fsearch.=' '.$langs->trans("SalesTurnover").' '.$langs->trans("Minimum").': ';
$fsearch.=' <input type="text" name="min" id="min" value="'.$min.'" size="6">';
// Affiche en-tete du rapport
if ($modetax==1) // Calculate on invoice for goods and services
{
$nom=$langs->transcountry("LT2ReportByCustomersInInputOutputMode",$mysoc->pays_code);
$period=$html->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,0,'',1,0,1);
$description=$langs->trans("RulesVATDue");
if ($conf->global->MAIN_MODULE_COMPTABILITE) $description.='<br>'.$langs->trans("WarningDepositsNotIncluded");
$description.=$fsearch;
$description.='<br>('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')';
$builddate=time();
$elementcust=$langs->trans("CustomersInvoices");
$productcust=$langs->trans("Description");
$amountcust=$langs->trans("AmountHT");
$elementsup=$langs->trans("SuppliersInvoices");
$productsup=$langs->trans("Description");
$amountsup=$langs->trans("AmountHT");
}
if ($modetax==0) // Invoice for goods, payment for services
{
$nom=$langs->transcountry("LT2ReportByCustomersInInputOutputMode",$mysoc->pays_code);
$period=$html->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,0,'',1,0,1);
$description=$langs->trans("RulesVATIn");
if ($conf->global->MAIN_MODULE_COMPTABILITE) $description.='<br>'.$langs->trans("WarningDepositsNotIncluded");
$description.=$fsearch;
$description.='<br>('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')';
$builddate=time();
$elementcust=$langs->trans("CustomersInvoices");
$productcust=$langs->trans("Description");
$amountcust=$langs->trans("AmountHT");
$elementsup=$langs->trans("SuppliersInvoices");
$productsup=$langs->trans("Description");
$amountsup=$langs->trans("AmountHT");
}
report_header($nom,$nomlink,$period,$periodlink,$description,$builddate,$exportlink);
$vatcust=$langs->transcountry("LT2",$mysoc->pays_code);
$vatsup=$langs->transcountry("LT2",$mysoc->pays_code);
// IRPF that the customer has retained me
print "<table class=\"noborder\" width=\"100%\">";
print "<tr class=\"liste_titre\">";
print '<td align="left">'.$langs->trans("Num")."</td>";
print '<td align="left">'.$langs->trans("Customer")."</td>";
print "<td>".$langs->transcountry("ProfId1",$mysoc->pays_code)."</td>";
print "<td align=\"right\">".$langs->trans("TotalHT")."</td>";
print "<td align=\"right\">".$vatcust."</td>";
print "</tr>\n";
$coll_list = vat_by_thirdparty($db,0,$date_start,$date_end,$modetax,'sell');
if (is_array($coll_list))
{
$var=true;
$total = 0; $totalamount = 0;
$i = 1;
foreach($coll_list as $coll)
{
if(($min == 0 or ($min > 0 && $coll->amount > $min)) && $coll->localtax2>0)
{
$var=!$var;
$intra = str_replace($find,$replace,$coll->tva_intra);
if(empty($intra))
{
if($coll->assuj == '1')
{
$intra = $langs->trans('Unknown');
}
else
{
$intra = '';
}
}
print "<tr ".$bc[$var].">";
print "<td nowrap>".$i."</td>";
$company_static->id=$coll->socid;
$company_static->nom=$coll->nom;
print '<td nowrap>'.$company_static->getNomUrl(1).'</td>';
$find = array(' ','.');
$replace = array('','');
print "<td nowrap>".$intra."</td>";
print "<td nowrap align=\"right\">".price($coll->amount)."</td>";
print "<td nowrap align=\"right\">".price($coll->localtax2)."</td>";
$totalamount = $totalamount + $coll->amount;
$total = $total + $coll->localtax2;
print "</tr>\n";
$i++;
}
}
$x_coll_sum = $total;
print '<tr class="liste_total"><td align="right" colspan="3">'.$langs->trans("Total").':</td>';
print '<td nowrap align="right">'.price($totalamount).'</td>';
print '<td nowrap align="right">'.price($total).'</td>';
print '</tr>';
}
else
{
$langs->load("errors");
if ($coll_list == -1)
print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
else if ($coll_list == -2)
print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
else
print '<tr><td colspan="5">'.$langs->trans("Error").'</td></tr>';
}
// IRPF I retained my supplier
print "<tr class=\"liste_titre\">";
print '<td align="left">'.$langs->trans("Num")."</td>";
print '<td align="left">'.$langs->trans("Supplier")."</td>";
print "<td>".$langs->transcountry("ProfId1",$mysoc->pays_code)."</td>";
print "<td align=\"right\">".$langs->trans("TotalHT")."</td>";
print "<td align=\"right\">".$vatsup."</td>";
print "</tr>\n";
$company_static=new Societe($db);
$coll_list = vat_by_thirdparty($db,0,$date_start,$date_end,$modetax,'buy');
if (is_array($coll_list))
{
$var=true;
$total = 0; $totalamount = 0;
$i = 1;
foreach($coll_list as $coll)
{
if(($min == 0 or ($min > 0 && $coll->amount > $min)) && $coll->localtax2>0)
{
$var=!$var;
$intra = str_replace($find,$replace,$coll->tva_intra);
if(empty($intra))
{
if($coll->assuj == '1')
{
$intra = $langs->trans('Unknown');
}
else
{
$intra = '';
}
}
print "<tr $bc[$var]>";
print "<td nowrap>".$i."</td>";
$company_static->id=$coll->socid;
$company_static->nom=$coll->nom;
print '<td nowrap>'.$company_static->getNomUrl(1).'</td>';
$find = array(' ','.');
$replace = array('','');
print "<td nowrap>".$intra."</td>";
print "<td nowrap align=\"right\">".price($coll->amount)."</td>";
print "<td nowrap align=\"right\">".price($coll->localtax2)."</td>";
$totalamount = $totalamount + $coll->amount;
$total = $total + $coll->localtax2;
print "</tr>\n";
$i++;
}
}
$x_paye_sum = $total;
print '<tr class="liste_total"><td align="right" colspan="3">'.$langs->trans("Total").':</td>';
print '<td nowrap align="right">'.price($totalamount).'</td>';
print '<td nowrap align="right">'.price($total).'</td>';
print '</tr>';
print '</table>';
// Total to pay
print '<br><br>';
print '<table class="noborder" width="100%">';
$diff = $x_paye_sum;
print '<tr class="liste_total">';
print '<td class="liste_total" colspan="4">'.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').'</td>';
print '<td class="liste_total" nowrap="nowrap" align="right"><b>'.price(price2num($diff,'MT'))."</b></td>\n";
print "</tr>\n";
}
else
{
$langs->load("errors");
if ($coll_list == -1)
print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
else if ($coll_list == -2)
print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
else
print '<tr><td colspan="5">'.$langs->trans("Error").'</td></tr>';
}
print '</table>';
$db->close();
llxFooter();
?>

266
htdocs/compta/localtax/fiche.php Normal file
View File

@ -0,0 +1,266 @@
<?php
/* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
*
* 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 2 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 <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/compta/localtax/fiche.php
* \ingroup tax
* \brief Page of IRPF payments
*/
require('../../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/compta/localtax/class/localtax.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php");
$langs->load("compta");
$langs->load("banks");
$langs->load("bills");
$id=$_REQUEST["id"];
$mesg = '';
// Security check
$socid = isset($_GET["socid"])?$_GET["socid"]:'';
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'tax', '', '', 'charges');
/*
* Actions
*/
//add payment of localtax
if ($_POST["action"] == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
{
$localtax = new localtax($db);
$db->begin();
$datev=dol_mktime(12,0,0, $_POST["datevmonth"], $_POST["datevday"], $_POST["datevyear"]);
$datep=dol_mktime(12,0,0, $_POST["datepmonth"], $_POST["datepday"], $_POST["datepyear"]);
$localtax->accountid=$_POST["accountid"];
$localtax->paymenttype=$_POST["paiementtype"];
$localtax->datev=$datev;
$localtax->datep=$datep;
$localtax->amount=$_POST["amount"];
$localtax->label=$_POST["label"];
$ret=$localtax->addPayment($user);
if ($ret > 0)
{
$db->commit();
Header("Location: reglement.php");
exit;
}
else
{
$db->rollback();
$mesg='<div class="error">'.$localtax->error.'</div>';
$_GET["action"]="create";
}
}
//delete payment of localtax
if ($_GET["action"] == 'delete')
{
$localtax = new localtax($db);
$result=$localtax->fetch($_GET['id']);
if ($localtax->rappro == 0)
{
$db->begin();
$ret=$localtax->delete($user);
if ($ret > 0)
{
if ($localtax->fk_bank)
{
$accountline=new AccountLine($db);
$result=$accountline->fetch($localtax->fk_bank);
$result=$accountline->delete($user);
}
if ($result > 0)
{
$db->commit();
header("Location: ".DOL_URL_ROOT.'/compta/localtax/reglement.php');
exit;
}
else
{
$localtax->error=$accountline->error;
$db->rollback();
$mesg='<div class="error">'.$localtax->error.'</div>';
}
}
else
{
$db->rollback();
$mesg='<div class="error">'.$localtax->error.'</div>';
}
}
else
{
$mesg='<div class="error">Error try do delete a line linked to a conciliated bank transaction</div>';
}
}
/*
* View
*/
llxHeader();
$html = new Form($db);
if ($id)
{
$vatpayment = new localtax($db);
$result = $vatpayment->fetch($id);
if ($result <= 0)
{
dol_print_error($db);
exit;
}
}
if ($_GET["action"] == 'create')
{
print "<form name='add' action=\"fiche.php\" method=\"post\">\n";
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="add">';
print_fiche_titre($langs->transcountry("newLT2Payment",$mysoc->pays_code));
if ($mesg) print $mesg;
print '<table class="border" width="100%">';
print "<tr>";
print '<td class="fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
print $html->select_date($datep,"datep",'','','','add');
print '</td></tr>';
print '<tr><td class="fieldrequired">'.$langs->trans("DateValue").'</td><td>';
print $html->select_date($datev,"datev",'','','','add');
print '</td></tr>';
// Label
print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input name="label" size="40" value="'.($_POST["label"]?$_POST["label"]:$langs->transcountry("LT2Payment",$mysoc->pays_code)).'"></td></tr>';
// Amount
print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.$_POST["amount"].'"></td></tr>';
if ($conf->banque->enabled)
{
print '<tr><td class="fieldrequired">'.$langs->trans("Account").'</td><td>';
$html->select_comptes($_POST["accountid"],"accountid",0,"courant=1",1); // Affiche liste des comptes courant
print '</td></tr>';
print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
$html->select_types_paiements($_POST["paiementtype"], "paiementtype");
print "</td>\n";
print "</tr>";
}
print '</table>';
print "<br>";
print '<center><input type="submit" class="button" value="'.$langs->trans("Save").'"> &nbsp; ';
print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></center>';
print '</form>';
}
/* ************************************************************************** */
/* */
/* Barre d'action */
/* */
/* ************************************************************************** */
if ($id)
{
if ($mesg) print $mesg;
$h = 0;
$head[$h][0] = DOL_URL_ROOT.'/compta/localtax/fiche.php?id='.$vatpayment->id;
$head[$h][1] = $langs->trans('Card');
$head[$h][2] = 'card';
$h++;
dol_fiche_head($head, 'card', $langs->trans("VATPayment"), 0, 'payment');
print '<table class="border" width="100%">';
print "<tr>";
print '<td width="25%">'.$langs->trans("Ref").'</td><td colspan="3">';
print $vatpayment->ref;
print '</td></tr>';
print "<tr>";
print '<td>'.$langs->trans("DatePayment").'</td><td colspan="3">';
print dol_print_date($vatpayment->datep,'day');
print '</td></tr>';
print '<tr><td>'.$langs->trans("DateValue").'</td><td colspan="3">';
print dol_print_date($vatpayment->datev,'day');
print '</td></tr>';
print '<tr><td>'.$langs->trans("Amount").'</td><td colspan="3">'.price($vatpayment->amount).'</td></tr>';
if ($conf->banque->enabled)
{
if ($vatpayment->fk_account > 0)
{
$bankline=new AccountLine($db);
$bankline->fetch($vatpayment->fk_bank);
print '<tr>';
print '<td>'.$langs->trans('BankTransactionLine').'</td>';
print '<td colspan="3">';
print $bankline->getNomUrl(1,0,'showall');
print '</td>';
print '</tr>';
}
}
print '</table>';
print '</div>';
/*
* Boutons d'actions
*/
print "<div class=\"tabsAction\">\n";
if ($vatpayment->rappro == 0)
print '<a class="butActionDelete" href="fiche.php?id='.$vatpayment->id.'&action=delete">'.$langs->trans("Delete").'</a>';
else
print '<a class="butActionRefused" href="#" title="'.$langs->trans("LinkedToAConcialitedTransaction").'">'.$langs->trans("Delete").'</a>';
print "</div>";
}
$db->close();
llxFooter();
?>

219
htdocs/compta/localtax/index.php Normal file
View File

@ -0,0 +1,219 @@
<?php
/* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
*
* 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 2 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 <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/compta/localtax/index.php
* \ingroup tax
* \brief Index page of IRPF reports
*/
require('../../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php");
require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
$langs->load("other");
$year=$_GET["year"];
if ($year == 0 )
{
$year_current = strftime("%Y",time());
$year_start = $year_current;
} else {
$year_current = $year;
$year_start = $year;
}
// Security check
$socid = isset($_GET["socid"])?$_GET["socid"]:'';
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'tax', '', '', 'charges');
// Define modetax (0 or 1)
// 0=normal, 1=option vat for services is on debit
$modetax = $conf->global->TAX_MODE;
if (isset($_GET["modetax"])) $modetax=$_GET["modetax"];
function pt ($db, $sql, $date)
{
global $conf, $bc,$langs;
$result = $db->query($sql);
if ($result)
{
$num = $db->num_rows($result);
$i = 0;
$total = 0;
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td nowrap="nowrap" width="60%">'.$date.'</td>';
print '<td align="right">'.$langs->trans("Amount").'</td>';
print '<td>&nbsp;</td>'."\n";
print "</tr>\n";
$var=True;
while ($i < $num)
{
$obj = $db->fetch_object($result);
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td nowrap="nowrap">'.$obj->dm."</td>\n";
$total = $total + $obj->mm;
print '<td nowrap="nowrap" align="right">'.price($obj->mm)."</td><td >&nbsp;</td>\n";
print "</tr>\n";
$i++;
}
print '<tr class="liste_total"><td align="right">'.$langs->trans("Total")." :</td><td nowrap=\"nowrap\" align=\"right\"><b>".price($total)."</b></td><td>&nbsp;</td></tr>";
print "</table>";
$db->free($result);
}
else {
dolibar_print_error($db);
}
}
/*
* View
*/
llxHeader();
$tva = new Tva($db);
$textprevyear="<a href=\"index.php?year=" . ($year_current-1) . "\">".img_previous()."</a>";
$textnextyear=" <a href=\"index.php?year=" . ($year_current+1) . "\">".img_next()."</a>";
print_fiche_titre($langs->transcountry("LT2",$mysoc->pays_code),"$textprevyear ".$langs->trans("Year")." $year_start $textnextyear");
print $langs->trans("VATReportBuildWithOptionDefinedInModule").'<br>';
print '('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')<br>';
print '<br>';
print '<table width="100%" class="nobordernopadding">';
print '<tr><td>';
print_titre($langs->transcountry("LT2Summary",$mysoc->pays_code));
print '</td><td width="5">&nbsp;</td><td>';
print_titre($langs->transcountry("LT2Paid",$mysoc->pays_code));
print '</td></tr>';
print '<tr><td width="50%" valign="top">';
print "<table class=\"noborder\" width=\"100%\">";
print "<tr class=\"liste_titre\">";
print "<td width=\"30%\">".$langs->trans("Year")." $y</td>";
print "<td align=\"right\">".$langs->transcountry("LT2Customer",$mysoc->pays_code)."</td>";
print "<td align=\"right\">".$langs->transcountry("LT2Supplier",$mysoc->pays_code)."</td>";
print "<td align=\"right\">".$langs->trans("TotalToPay")."</td>";
print "<td>&nbsp;</td>\n";
print "</tr>\n";
$y = $year_current ;
$var=True;
$total=0; $subtotalcoll=0; $subtotalpaye=0; $subtotal=0;
$i=0;
for ($m = 1 ; $m < 13 ; $m++ )
{
$coll_listsell = vat_by_date($db, $y, 0, 0, 0, $modetax, 'sell', $m);
$coll_listbuy = vat_by_date($db, $y, 0, 0, 0, $modetax, 'buy', $m);
if (! is_array($coll_listbuy) && $coll_listbuy == -1)
{
$langs->load("errors");
print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
break;
}
if (! is_array($coll_listbuy) && $coll_listbuy == -2)
{
print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
break;
}
$var=!$var;
print "<tr $bc[$var]>";
print '<td nowrap>'.dol_print_date(dol_mktime(0,0,0,$m,1,$y),"%b %Y").'</td>';
$x_coll = 0;
foreach($coll_listsell as $vatrate=>$val)
{
$x_coll+=$val['localtax2'];
}
$subtotalcoll = $subtotalcoll + $x_coll;
print "<td nowrap align=\"right\">".price($x_coll)."</td>";
$x_paye = 0;
foreach($coll_listbuy as $vatrate=>$val)
{
$x_paye+=$val['localtax2'];
}
$subtotalpaye = $subtotalpaye + $x_paye;
print "<td nowrap align=\"right\">".price($x_paye)."</td>";
$diff = $x_coll - $x_paye;
$total = $total + $diff;
$subtotal = $subtotal + $diff;
print "<td nowrap align=\"right\">".price($diff)."</td>\n";
print "<td>&nbsp;</td>\n";
print "</tr>\n";
$i++;
if ($i > 2) {
print '<tr class="liste_total">';
print '<td align="right">'.$langs->trans("SubTotal").':</td>';
print '<td nowrap="nowrap" align="right">'.price($subtotalcoll).'</td>';
print '<td nowrap="nowrap" align="right">'.price($subtotalpaye).'</td>';
print '<td nowrap="nowrap" align="right">'.price($subtotalpaye).'</td>';
print '<td>&nbsp;</td></tr>';
$i = 0;
$subtotalcoll=0; $subtotalpaye=0; $subtotal=0;
}
}
print '<tr class="liste_total"><td align="right" colspan="3">'.$langs->trans("TotalToPay").':</td><td nowrap align="right">'.price($total).'</td>';
print "<td>&nbsp;</td>\n";
print '</tr>';
print '</table>';
print '</td><td>&nbsp;</td><td valign="top" width="50%">';
/*
* Payed
*/
$sql = "SELECT SUM(amount) as mm, date_format(f.datev,'%Y-%m') as dm";
$sql.= " FROM ".MAIN_DB_PREFIX."localtax as f";
$sql.= " WHERE f.entity = ".$conf->entity;
$sql.= " AND f.datev >= '".$db->idate(dol_get_first_day($y,1,false))."'";
$sql.= " AND f.datev <= '".$db->idate(dol_get_last_day($y,12,false))."'";
$sql.= " GROUP BY dm ASC";
pt($db, $sql,$langs->trans("Year")." $y");
print "</td></tr></table>";
print '</td></tr>';
print '</table>';
$db->close();
llxFooter();
?>

97
htdocs/compta/localtax/reglement.php Normal file
View File

@ -0,0 +1,97 @@
<?php
/* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
*
* 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 2 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 <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/compta/localtax/reglement.php
* \ingroup tax
* \brief List of IRPF payments
*/
require('../../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/compta/localtax/class/localtax.class.php");
$langs->load("compta");
$langs->load("compta");
// Security check
$socid = isset($_GET["socid"])?$_GET["socid"]:'';
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'tax', '', '', 'charges');
/*
* View
*/
llxHeader();
$localtax_static = new localtax($db);
print_fiche_titre($langs->transcountry("LT2Payments",$mysoc->pays_code));
$sql = "SELECT rowid, amount, label, f.datev as dm";
$sql.= " FROM ".MAIN_DB_PREFIX."localtax as f ";
$sql.= " WHERE f.entity = ".$conf->entity;
$sql.= " ORDER BY dm DESC";
$result = $db->query($sql);
if ($result)
{
$num = $db->num_rows($result);
$i = 0;
$total = 0 ;
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td nowrap align="left">'.$langs->trans("Ref").'</td>';
print "<td>".$langs->trans("Label")."</td>";
print '<td nowrap align="left">'.$langs->trans("DatePayment").'</td>';
print "<td align=\"right\">".$langs->trans("PayedByThisPayment")."</td>";
print "</tr>\n";
$var=1;
while ($i < $num)
{
$obj = $db->fetch_object($result);
$var=!$var;
print "<tr $bc[$var]>";
$localtax_static->id=$obj->rowid;
$localtax_static->ref=$obj->rowid;
print "<td>".$localtax_static->getNomUrl(1)."</td>\n";
print "<td>".dol_trunc($obj->label,40)."</td>\n";
print '<td align="left">'.dol_print_date($db->jdate($obj->dm),'day')."</td>\n";
$total = $total + $obj->amount;
print "<td align=\"right\">".price($obj->amount)."</td>";
print "</tr>\n";
$i++;
}
print '<tr class="liste_total"><td colspan="3">'.$langs->trans("Total").'</td>';
print "<td align=\"right\"><b>".price($total)."</b></td></tr>";
print "</table>";
$db->free($result);
}
else
{
dol_print_error($db);
}
$db->close();
llxFooter();
?>

8
htdocs/compta/prelevement/bon.php
View File

@ -1,7 +1,7 @@
<?PHP
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es>
*
* 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
@ -78,7 +78,7 @@ if ($id > 0 || ! empty($ref))
}
else
{
$langs->load("other");
$langs->load("errors");
print '<font class="error">'.$langs->trans("ErrorNoImagickReadimage").'</font>';
}
}

2
htdocs/compta/resultat/clientfourn.php
View File

@ -87,7 +87,7 @@ else
}
// Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES')
$modecompta = $conf->compta->mode;
$modecompta = $conf->global->COMPTA_MODE;
if ($_GET["modecompta"]) $modecompta=$_GET["modecompta"];

2
htdocs/compta/resultat/index.php
View File

@ -44,7 +44,7 @@ if (!$user->rights->compta->resultat->lire && !$user->rights->accounting->compta
accessforbidden();
// Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES')
$modecompta = $conf->compta->mode;
$modecompta = $conf->global->COMPTA_MODE;
if ($_GET["modecompta"]) $modecompta=$_GET["modecompta"];

2
htdocs/compta/stats/cabyuser.php
View File

@ -34,7 +34,7 @@ if (!$user->rights->compta->resultat->lire && !$user->rights->accounting->compta
accessforbidden();
// Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES')
$modecompta = $conf->compta->mode;
$modecompta = $conf->global->COMPTA_MODE;
if ($_GET["modecompta"]) $modecompta=$_GET["modecompta"];
$sortorder=isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"];

2
htdocs/compta/stats/casoc.php
View File

@ -31,7 +31,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
$langs->load("companies");
// Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES')
$modecompta = $conf->compta->mode;
$modecompta = $conf->global->COMPTA_MODE;
if ($_GET["modecompta"]) $modecompta=$_GET["modecompta"];
$sortorder=isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"];

2
htdocs/compta/stats/index.php
View File

@ -45,7 +45,7 @@ if (!$user->rights->compta->resultat->lire && !$user->rights->accounting->compta
accessforbidden();
// Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES')
$modecompta = $conf->compta->mode;
$modecompta = $conf->global->COMPTA_MODE;
if ($_GET["modecompta"]) $modecompta=$_GET["modecompta"];

15
htdocs/compta/tva/quadri.php
View File

@ -49,7 +49,8 @@ $result = restrictedArea($user, 'tax', '', '', 'charges');
* Gets VAT to collect for the given month of the given year
* The function gets the VAT in split results, as the VAT declaration asks
* to report the amounts for different VAT rates as different lines.
* This function also accounts recurrent invoices
* This function also accounts recurrent invoices.
*
* @param db Database handler
* @param y Year
* @param q Year quarter (1-4)
@ -57,7 +58,8 @@ $result = restrictedArea($user, 'tax', '', '', 'charges');
function tva_coll($db,$y,$q)
{
global $conf;
if ($conf->compta->mode == "CREANCES-DETTES")
if ($conf->global->COMPTA_MODE == "CREANCES-DETTES")
{
// if vat paid on due invoices
$sql = "SELECT d.fk_facture as facid, f.facnumber as facnum, d.tva_tx as rate, d.total_ht as totalht, d.total_tva as amount";
@ -124,7 +126,7 @@ function tva_paye($db, $y,$q)
{
global $conf;
if ($conf->compta->mode == "CREANCES-DETTES")
if ($conf->global->COMPTA_MODE == "CREANCES-DETTES")
{
// Si on paye la tva sur les factures dues (non brouillon)
$sql = "SELECT d.fk_facture_fourn as facid, f.facnumber as facnum, d.tva_tx as rate, d.total_ht as totalht, d.tva as amount";
@ -208,10 +210,9 @@ print "<td align=\"right\">".$langs->trans("Invoices")."</td>";
print "<td align=\"right\">".$langs->trans("TotalToPay")."</td>";
print "</tr>\n";
if ($conf->compta->mode == "CREANCES-DETTES")
if ($conf->global->COMPTA_MODE == "CREANCES-DETTES")
{
$y = $year_current ;
$y = $year_current;
$total = 0; $subtotal = 0;
$i=0;
@ -219,7 +220,7 @@ if ($conf->compta->mode == "CREANCES-DETTES")
$subtot_coll_vat = 0;
$subtot_paye_total = 0;
$subtot_paye_vat = 0;
for ($q = 1 ; $q <= 4 ; $q++ )
for ($q = 1 ; $q <= 4 ; $q++)
{
print "<tr class=\"liste_titre\"><td colspan=\"8\">".$langs->trans("Quadri")." $q (".dol_print_date(dol_mktime(0,0,0,(($q-1)*3)+1,1,$y),"%b %Y").' - '.dol_print_date(dol_mktime(0,0,0,($q*3),1,$y),"%b %Y").")</td></tr>";
$var=true;

4
htdocs/conf/.cvsignore
View File

@ -1,4 +0,0 @@
conf.php*.sav
*.php
conf.php.mysql
conf.php.postgres

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

@ -944,35 +944,35 @@ class Contact extends CommonObject
if ($statut==4) return $langs->trans('StatusContactValidated');
if ($statut==5) return $langs->trans('StatusContactValidated');
}
if ($mode == 1)
elseif ($mode == 1)
{
if ($statut==0) return $langs->trans('StatusContactDraftShort');
if ($statut==1) return $langs->trans('StatusContactValidatedShort');
if ($statut==4) return $langs->trans('StatusContactValidatedShort');
if ($statut==5) return $langs->trans('StatusContactValidatedShort');
}
if ($mode == 2)
elseif ($mode == 2)
{
if ($statut==0) return img_picto($langs->trans('StatusContactDraftShort'),'statut0').' '.$langs->trans('StatusContactDraft');
if ($statut==1) return img_picto($langs->trans('StatusContactValidatedShort'),'statut1').' '.$langs->trans('StatusContactValidated');
if ($statut==4) return img_picto($langs->trans('StatusContactValidatedShort'),'statut4').' '.$langs->trans('StatusContactValidated');
if ($statut==5) return img_picto($langs->trans('StatusContactValidatedShort'),'statut5').' '.$langs->trans('StatusContactValidated');
}
if ($mode == 3)
elseif ($mode == 3)
{
if ($statut==0) return img_picto($langs->trans('StatusContactDraft'),'statut0');
if ($statut==1) return img_picto($langs->trans('StatusContactValidated'),'statut1');
if ($statut==4) return img_picto($langs->trans('StatusContactValidated'),'statut4');
if ($statut==5) return img_picto($langs->trans('StatusContactValidated'),'statut5');
}
if ($mode == 4)
elseif ($mode == 4)
{
if ($statut==0) return img_picto($langs->trans('StatusContactDraft'),'statut0').' '.$langs->trans('StatusContactDraft');
if ($statut==1) return img_picto($langs->trans('StatusContactValidated'),'statut1').' '.$langs->trans('StatusContactValidated');
if ($statut==4) return img_picto($langs->trans('StatusContactValidated'),'statut4').' '.$langs->trans('StatusContactValidated');
if ($statut==5) return img_picto($langs->trans('StatusContactValidated'),'statut5').' '.$langs->trans('StatusContactValidated');
}
if ($mode == 5)
elseif ($mode == 5)
{
if ($statut==0) return $langs->trans('StatusContactDraftShort').' '.img_picto($langs->trans('StatusContactDraftShort'),'statut0');
if ($statut==1) return $langs->trans('StatusContactValidatedShort').' '.img_picto($langs->trans('StatusContactValidatedShort'),'statut1');

13
htdocs/core/ajax/loadinplace.php
View File

@ -54,9 +54,16 @@ if((isset($_GET['field']) && ! empty($_GET['field']))
if ($user->rights->$element->lire || $user->rights->$element->read)
{
$object = new GenericObject($db);
$value=$object->getValueFrom($table_element, $fk_element, $field);
echo $value;
if ($type == 'select')
{
echo json_encode(array("Aberdeen", "Ada", "Adamsville", "Addyston", "Adelphi", "Adena", "Adrian", "Akron"));
}
else
{
$object = new GenericObject($db);
$value=$object->getValueFrom($table_element, $fk_element, $field);
echo $value;
}
}
else
{

33
htdocs/core/ajax/saveinplace.php
View File

@ -37,7 +37,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/genericobject.class.php");
top_httphead();
//print '<!-- Ajax page called with url '.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].' -->'."\n";
//var_dump($_POST);
//print_r($_POST);
// Load original field value
if((isset($_POST['field']) && ! empty($_POST['field']))
@ -51,7 +51,10 @@ if((isset($_POST['field']) && ! empty($_POST['field']))
$fk_element = GETPOST('fk_element');
$value = GETPOST('value');
$type = GETPOST('type');
$timestamp = GETPOST('timestamp');
$format='text';
$return=array();
$error=0;
if ($element == 'fichinter') $element = 'ficheinter';
@ -61,29 +64,41 @@ if((isset($_POST['field']) && ! empty($_POST['field']))
$object = new GenericObject($db);
// Clean parameters
$value = trim($value);
$newvalue = trim($value);
if ($type == 'numeric')
{
$value = price2num($value);
$newvalue = price2num($newvalue);
// Check parameters
if (! is_numeric($value))
if (! is_numeric($newvalue))
{
$error++;
$return['error'] = $langs->trans('ErrorBadValue');
}
}
else if ($type == 'datepicker')
{
$format = 'date';
$newvalue = ($timestamp / 1000);
}
if (! $error)
{
$ret=$object->setValueFrom($table_element, $fk_element, $field, $value);
$ret=$object->setValueFrom($table_element, $fk_element, $field, $newvalue, $format);
if ($ret > 0)
{
if ($type == 'numeric') $value = price($value);
else $value = (! empty($value) ? dol_nl2br($value) : '&nbsp;');
echo $value;
if ($type == 'numeric') $value = price($newvalue);
else if ($type == 'textarea') $value = dol_nl2br($newvalue);
$return['value'] = $value;
}
else
{
$return['error'] = $object->error;
}
}
echo json_encode($return);
}
else
{

12
htdocs/core/class/commonobject.class.php
View File

@ -622,25 +622,31 @@ abstract class CommonObject
* @param int $id Object id
* @param string $field Field to update
* @param mixte $value New value
* @param string $format Data format
* @return int <0 if KO, >0 if OK
*/
function setValueFrom($table, $id, $field, $value)
function setValueFrom($table, $id, $field, $value, $format='text')
{
global $conf;
$this->db->begin();
$sql = "UPDATE ".MAIN_DB_PREFIX.$table." SET ";
$sql.= $field." = '".$this->db->escape($value)."'";
if ($format == 'text') $sql.= $field." = '".$this->db->escape($value)."'";
else if ($format == 'date') $sql.= $field." = '".$this->db->idate($value)."'";
$sql.= " WHERE rowid = ".$id;
dol_syslog(get_class($this)."::setValueFrom sql=".$sql, LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
$this->db->commit();
return 1;
}
else
{
dol_print_error($this->db);
$this->error=$this->db->lasterror();
$this->db->rollback();
return -1;
}
}

29
htdocs/core/class/conf.class.php
View File

@ -38,6 +38,9 @@ class Conf
var $db;
//! To store properties found in conf file
var $file;
//! To store properties found into database
var $global;
//! To store if javascript/ajax is enabked
var $use_javascript_ajax;
@ -73,10 +76,15 @@ class Conf
*/
function Conf()
{
//! Charset for HTML output and for storing data in memory
$this->file->character_set_client='UTF-8'; // UTF-8, ISO-8859-1
// $this->agendas_modules['comm/action'][]= 'ActionAgenda';
// Avoid warnings when filling this->xxx
$this->file=(object) array();
$this->db=(object) array();
$this->global=(object) array();
$this->mycompany=(object) array();
$this->admin=(object) array();
$this->user=(object) array();
//! Charset for HTML output and for storing data in memory
$this->file->character_set_client='UTF-8'; // UTF-8, ISO-8859-1
}
@ -172,6 +180,7 @@ class Conf
{
$module=strtolower($reg[1]);
//print "Module ".$module." is enabled<br>\n";
$this->$module=(object) array();
$this->$module->enabled=true;
// Add this module in list of enabled modules
$this->modules[]=$module;
@ -231,7 +240,6 @@ class Conf
// For backward compatibility
// TODO Replace this->xxx->enabled by this->modulename->enabled to remove this code
if (isset($this->comptabilite->enabled)) $this->compta->enabled=$this->comptabilite->enabled;
if (isset($this->propale->enabled)) $this->propal->enabled=$this->propale->enabled;
// Define default dir_output and dir_temp for directories of modules
@ -313,10 +321,8 @@ class Conf
$this->monnaie=$this->global->MAIN_MONNAIE; // TODO deprecated
$this->currency=$this->global->MAIN_MONNAIE;
// $this->compta->mode = Option du module Comptabilite (simple ou expert):
// Defini le mode de calcul des etats comptables (CA,...)
$this->compta->mode = 'RECETTES-DEPENSES'; // By default
if (isset($this->global->COMPTA_MODE)) $this->compta->mode = $this->global->COMPTA_MODE; // Can be 'RECETTES-DEPENSES' ou 'CREANCES-DETTES'
// $this->global->COMPTA_MODE = Option des modules Comptabilites (simple ou expert). Defini le mode de calcul des etats comptables (CA,...)
if (empty($this->global->COMPTA_MODE)) $this->global->COMPTA_MODE='RECETTES-DEPENSES'; // By default. Can be 'RECETTES-DEPENSES' ou 'CREANCES-DETTES'
// $this->liste_limit = constante de taille maximale des listes
if (empty($this->global->MAIN_SIZE_LISTE_LIMIT)) $this->global->MAIN_SIZE_LISTE_LIMIT=25;
@ -374,11 +380,6 @@ class Conf
if (empty($this->global->TAX_MODE_SELL_SERVICE)) $this->global->TAX_MODE_SELL_SERVICE='payment';
if (empty($this->global->TAX_MODE_BUY_SERVICE)) $this->global->TAX_MODE_BUY_SERVICE='payment';
/* We always show vat menus if module tax is enabled.
* Because even when vat option is 'franchise' and vat rate is 0, we have to pay vat.
*/
$this->compta->tva=1; // This option means "Show vat menus"
// Delay before warnings
$this->actions->warning_delay=(isset($this->global->MAIN_DELAY_ACTIONS_TODO)?$this->global->MAIN_DELAY_ACTIONS_TODO:7)*24*60*60;
$this->commande->client->warning_delay=(isset($this->global->MAIN_DELAY_ORDERS_TO_PROCESS)?$this->global->MAIN_DELAY_ORDERS_TO_PROCESS:2)*24*60*60;

13
htdocs/core/class/html.form.class.php
View File

@ -151,15 +151,22 @@ class Form
* @param string $area Type of edit
* @return string HTML edit in place
*/
function editInPlace($value, $htmlname, $condition, $type='area')
function editInPlace($value, $htmlname, $condition, $type='textarea')
{
global $conf,$user;
global $conf;
$out='';
$value = ($value ? $value : "&nbsp;");
// Check parameters
if ($type == 'textarea') $value = dol_nl2br($value);
else if ($type == 'numeric') $value = price($value);
else if ($type == 'datepicker') $value = dol_print_date($value, 'day');
if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && $condition)
{
// Use for timestamp format
if ($type == 'datepicker') $out.= '<input id="timeStamp" type="hidden"/>';
$out.= '<div class="edit_'.$type.'" id="'.$htmlname.'">';
$out.= $value;
$out.= '</div>';

141
htdocs/core/js/datepicker.js.php Normal file
View File

@ -0,0 +1,141 @@
<?php
/* Copyright (C) 2011 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2011 Laurent Destailleur <eldy@users.sourceforge.net>
*
* 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 2 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 <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/core/js/datepicker.js.php
* \brief File that include javascript functions for datepickers
*/
//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language
//if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1');
if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1');
//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); // Not disabled cause need to do translations
if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK',1);
if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1);
if (! defined('NOLOGIN')) define('NOLOGIN',1);
if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU',1);
if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1);
if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
session_cache_limiter(FALSE);
require_once("../../main.inc.php");
// Define javascript type
header('Content-type: text/javascript');
header("Content-type: text/html; charset=UTF-8");
// Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
else header('Cache-Control: no-cache');
// Define tradMonths javascript array (we define this in datepicker AND in parent page to avoid errors with IE8)
$tradMonths=array(
dol_escape_js($langs->transnoentitiesnoconv("January")),
dol_escape_js($langs->transnoentitiesnoconv("February")),
dol_escape_js($langs->transnoentitiesnoconv("March")),
dol_escape_js($langs->transnoentitiesnoconv("April")),
dol_escape_js($langs->transnoentitiesnoconv("May")),
dol_escape_js($langs->transnoentitiesnoconv("June")),
dol_escape_js($langs->transnoentitiesnoconv("July")),
dol_escape_js($langs->transnoentitiesnoconv("August")),
dol_escape_js($langs->transnoentitiesnoconv("September")),
dol_escape_js($langs->transnoentitiesnoconv("October")),
dol_escape_js($langs->transnoentitiesnoconv("November")),
dol_escape_js($langs->transnoentitiesnoconv("December"))
);
?>
// For eldy date picker
var tradMonths = <?php echo json_encode($tradMonths) ?>;
// For JQuery date picker
$(document).ready(function() {
$.datepicker.setDefaults({
altField: '#timeStamp',
altFormat: '@' // Gives a timestamp dateformat
});
});
jQuery(function($){
$.datepicker.regional['<?php echo $langs->defaultlang ?>'] = {
closeText: '<?php echo $langs->trans("Close") ?>',
prevText: '<?php echo $langs->trans("Previous") ?>',
nextText: '<?php echo $langs->trans("Next") ?>',
currentText: '<?php echo $langs->trans("Now") ?>',
monthNames: [<?php echo "'".$langs->trans("January")."',".
"'".$langs->trans("February")."',".
"'".$langs->trans("March")."',".
"'".$langs->trans("April")."',".
"'".$langs->trans("May")."',".
"'".$langs->trans("June")."',".
"'".$langs->trans("July")."',".
"'".$langs->trans("August")."',".
"'".$langs->trans("September")."',".
"'".$langs->trans("October")."',".
"'".$langs->trans("November")."',".
"'".$langs->trans("December")."'" ?>],
monthNamesShort: [<?php echo "'".$langs->trans("JanuaryMin")."',".
"'".$langs->trans("FebruaryMin")."',".
"'".$langs->trans("MarchMin")."',".
"'".$langs->trans("AprilMin")."',".
"'".$langs->trans("MayMin")."',".
"'".$langs->trans("JuneMin")."',".
"'".$langs->trans("JulyMin")."',".
"'".$langs->trans("AugustMin")."',".
"'".$langs->trans("SeptemberMin")."',".
"'".$langs->trans("OctoberMin")."',".
"'".$langs->trans("NovemberMin")."',".
"'".$langs->trans("DecemberMin")."'" ?>],
dayNames: [<?php echo "'".$langs->trans("Sunday")."',".
"'".$langs->trans("Monday")."',".
"'".$langs->trans("Tuesday")."',".
"'".$langs->trans("Wednesday")."',".
"'".$langs->trans("Thursday")."',".
"'".$langs->trans("Friday")."',".
"'".$langs->trans("Saturday")."'" ?>],
dayNamesShort: [<?php echo "'".$langs->trans("SundayMin")."',".
"'".$langs->trans("MondayMin")."',".
"'".$langs->trans("TuesdayMin")."',".
"'".$langs->trans("WednesdayMin")."',".
"'".$langs->trans("ThursdayMin")."',".
"'".$langs->trans("FridayMin")."',".
"'".$langs->trans("SaturdayMin")."'" ?>],
dayNamesMin: [<?php echo "'".$langs->trans("ShortSunday")."',".
"'".$langs->trans("ShortMonday")."',".
"'".$langs->trans("ShortTuesday")."',".
"'".$langs->trans("ShortWednesday")."',".
"'".$langs->trans("ShortThursday")."',".
"'".$langs->trans("ShortFriday")."',".
"'".$langs->trans("ShortSaturday")."'" ?>],
weekHeader: '<?php echo $langs->trans("Week"); ?>',
dateFormat: '<?php echo $langs->trans("FormatDateShortJQuery"); ?>',
firstDay: <?php echo $conf->global->MAIN_START_WEEK; ?>,
isRTL: <?php echo ($langs->trans("DIRECTION")=='rtl'?'true':'false'); ?>,
showMonthAfterYear: false,
yearSuffix: '' // TODO add specific to country
};
$.datepicker.setDefaults($.datepicker.regional['<?php echo $langs->defaultlang ?>']);
});
<?php
if (is_object($db)) $db->close();
?>

208
htdocs/core/js/editinplace.js
View File

@ -7,62 +7,166 @@
$(document).ready(function() {
$(document).ready(function() {
var element = $('#element').html();
var table_element = $('#table_element').html();
var fk_element = $('#fk_element').html();
$('.edit_area').editable(urlSaveInPlace, {
type : 'textarea',
rows : 4,
id : 'field',
tooltip : tooltipInPlace,
cancel : cancelInPlace,
submit : submitInPlace,
indicator : indicatorInPlace,
loadurl : urlLoadInPlace,
loaddata : {
type: 'textarea',
element: element,
table_element: table_element,
fk_element: fk_element
},
submitdata : {
type: 'textarea',
element: element,
table_element: table_element,
fk_element: fk_element
var element = $('#element').html();
var table_element = $('#table_element').html();
var fk_element = $('#fk_element').html();
$('.edit_textarea').editable(urlSaveInPlace, {
type : 'textarea',
rows : 4,
id : 'field',
tooltip : tooltipInPlace,
placeholder : placeholderInPlace,
cancel : cancelInPlace,
submit : submitInPlace,
indicator : indicatorInPlace,
loadurl : urlLoadInPlace,
loaddata : {
type: 'textarea',
element: element,
table_element: table_element,
fk_element: fk_element
},
submitdata : {
type: 'textarea',
element: element,
table_element: table_element,
fk_element: fk_element
},
callback : function(result, settings) {
var obj = $.parseJSON(result);
if (obj.error) {
$(this).html(this.revert);
$.jnotify(obj.error, "error", true);
} else {
$(this).html(obj.value);
}
});
$('.edit_text').editable(urlSaveInPlace, {
type : 'text',
id : 'field',
width : 300,
tooltip : tooltipInPlace,
cancel : cancelInPlace,
submit : submitInPlace,
indicator : indicatorInPlace,
submitdata : {
type: 'text',
}
});
$('.edit_text').editable(urlSaveInPlace, {
type : 'text',
id : 'field',
width : 300,
tooltip : tooltipInPlace,
placeholder : placeholderInPlace,
cancel : cancelInPlace,
submit : submitInPlace,
indicator : indicatorInPlace,
submitdata : {
type: 'text',
element: element,
table_element: table_element,
fk_element: fk_element
},
callback : function(result, settings) {
var obj = $.parseJSON(result);
if (obj.error) {
$(this).html(this.revert);
$.jnotify(obj.error, "error", true);
} else {
$(this).html(obj.value);
}
}
});
$('.edit_numeric').editable(urlSaveInPlace, {
type : 'text',
id : 'field',
width : 100,
tooltip : tooltipInPlace,
placeholder : placeholderInPlace,
cancel : cancelInPlace,
submit : submitInPlace,
indicator : indicatorInPlace,
submitdata : {
type: 'numeric',
element: element,
table_element: table_element,
fk_element: fk_element
},
callback : function(result, settings) {
var obj = $.parseJSON(result);
if (obj.error) {
$(this).html(this.revert);
$.jnotify(obj.error, "error", true);
} else {
$(this).html(obj.value);
}
}
});
$('.edit_datepicker').editable(urlSaveInPlace, {
type : 'datepicker',
id : 'field',
onblur : 'ignore',
tooltip : tooltipInPlace,
placeholder : placeholderInPlace,
cancel : cancelInPlace,
submit : submitInPlace,
indicator : indicatorInPlace,
submitdata : function(value, settings) {
return {
type: 'datepicker',
element: element,
table_element: table_element,
fk_element: fk_element
fk_element: fk_element,
timestamp: $('#timeStamp').val()
};
},
callback : function(result, settings) {
var obj = $.parseJSON(result);
if (obj.error) {
$(this).html(this.revert);
$.jnotify(obj.error, "error", true);
} else {
$(this).html(obj.value);
}
});
$('.edit_numeric').editable(urlSaveInPlace, {
type : 'text',
id : 'field',
width : 100,
tooltip : tooltipInPlace,
cancel : cancelInPlace,
submit : submitInPlace,
indicator : indicatorInPlace,
submitdata : {
type: 'numeric',
element: element,
table_element: table_element,
fk_element: fk_element
}
});
$('.edit_select').editable(urlSaveInPlace, {
type : 'select',
id : 'field',
onblur : 'ignore',
cssclass : 'flat',
tooltip : tooltipInPlace,
placeholder : placeholderInPlace,
cancel : cancelInPlace,
submit : submitInPlace,
indicator : indicatorInPlace,
loadurl : urlLoadInPlace,
loaddata : {
type: 'select',
element: element,
table_element: table_element,
fk_element: fk_element
},
submitdata : {
type: 'select',
element: element,
table_element: table_element,
fk_element: fk_element
},
callback : function(result, settings) {
var obj = $.parseJSON(result);
if (obj.error) {
$(this).html(this.revert);
$.jnotify(obj.error, "error", true);
} else {
$(this).html(obj.value);
}
});
}
});
$('.edit_autocomplete').editable(urlSaveInPlace, {
type : 'autocomplete',
id : 'field',
onblur : 'submit',
tooltip : tooltipInPlace,
indicator : indicatorInPlace,
autocomplete : {
data : ["Aberdeen", "Ada", "Adamsville", "Addyston", "Adelphi", "Adena", "Adrian", "Akron"]
}
});
});

26
htdocs/core/js/jnotify.js Normal file
View File

@ -0,0 +1,26 @@
// Copyright (C) 2011 Regis Houssin <regis@dolibarr.fr>
//
// Script javascript that contains functions for jnotify default options
//
// \file htdocs/core/js/jnotify.js
// \brief File that include javascript functions for jnotify default options
$(document).ready(function() {
$.jnotify.setup({
delay: 3000 // the default time to show each notification (in milliseconds)
, sticky: false // determines if the message should be considered "sticky" (user must manually close notification)
, closeLabel: "&times;" // the HTML to use for the "Close" link
, showClose: true // determines if the "Close" link should be shown if notification is also sticky
, fadeSpeed: 1000 // the speed to fade messages out (in milliseconds)
, slideSpeed: 250 // the speed used to slide messages out (in milliseconds)
, classContainer: "jnotify-container"
, classNotification: "jnotify-notification"
, classBackground: "jnotify-background"
, classClose: "jnotify-close"
, classMessage: "jnotify-message"
, init: null // callback that occurs when the main jnotify container is created
, create: null // callback that occurs when when the note is created (occurs just before appearing in DOM)
, beforeRemove: null // callback that occurs when before the notification starts to fade away
});
});

5
htdocs/core/lib/accountancy.lib.php
View File

@ -50,10 +50,11 @@ function get_ca_propal ($db, $year, $socid)
function get_ca ($db, $year, $socid)
{
global $conf;
$sql = "SELECT sum(f.amount) as sum FROM ".MAIN_DB_PREFIX."facture as f";
$sql .= " WHERE f.fk_statut in (1,2)";
if ($conf->compta->mode != 'CREANCES-DETTES') {
if ($conf->global->COMPTA_MODE != 'CREANCES-DETTES')
{
$sql .= " AND f.paye = 1";
}
$sql .= " AND date_format(f.datef , '%Y') = '".$year."'";

39
htdocs/core/lib/functions.lib.php
View File

@ -7,7 +7,7 @@
* Copyright (C) 2004 Christophe Combelles <ccomb@free.fr>
* Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2008 Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
* Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es>
*
* 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
@ -585,7 +585,7 @@ function dol_get_fiche_head($links=array(), $active='0', $title='', $notab=0, $p
$out.="</div>\n";
if (! $notab) $out.="\n".'<div class="tabBar">'."\n";
// Parameters for edit in place
if (! empty($GLOBALS['object']))
{
@ -2494,7 +2494,7 @@ function accessforbidden($message='',$printheader=1,$printfooter=1,$showonlymess
$langs=new Translate('',$conf);
}
$langs->load("other");
$langs->load("errors");
if ($printheader)
{
@ -3848,10 +3848,10 @@ function complete_substitutions_array(&$substitutionarray,$outputlangs,$object='
/**
* Format output for start and end date
*
* @param date_start Start date
* @param date_end End date
* @param format Output format
* @param outputlangs Output language
* @param timestamp $date_start Start date
* @param timestamp $date_end End date
* @param string $format Output format
* @param Translate $outputlangs Output language
* @return void
*/
function print_date_range($date_start,$date_end,$format = '',$outputlangs='')
@ -3862,11 +3862,11 @@ function print_date_range($date_start,$date_end,$format = '',$outputlangs='')
/**
* Format output for start and end date
*
* @param date_start Start date
* @param date_end End date
* @param format Output format
* @param outputlangs Output language
* @return string String
* @param timestamp $date_start Start date
* @param timestamp $date_end End date
* @param string $format Output format
* @param Translate $outputlangs Output language
* @return string String
*/
function get_date_range($date_start,$date_end,$format = '',$outputlangs='')
{
@ -3963,21 +3963,6 @@ function get_htmloutput_mesg($mesgstring='',$mesgarray='', $style='ok', $keepemb
jQuery.jnotify("'.dol_escape_js($out).'",
"'.($style=="ok" ? 3000 : $style).'",
'.($style=="ok" ? "false" : "true").',
{
closeLabel: "&times;" // the HTML to use for the "Close" link
, showClose: true // determines if the "Close" link should be shown if notification is also sticky
, fadeSpeed: 1000 // the speed to fade messages out (in milliseconds)
, slideSpeed: 250 // the speed used to slide messages out (in milliseconds)
, classContainer: "jnotify-container"
, classNotification: "jnotify-notification"
, classBackground: "jnotify-background"
, classClose: "jnotify-close"
, classMessage: "jnotify-message"
, init: null // callback that occurs when the main jnotify container is created
, create: null // callback that occurs when when the note is created (occurs just before
// appearing in DOM)
, beforeRemove: null // callback that occurs when before the notification starts to fade away
},
{ remove: function (){} } );
});
</script>';

30
htdocs/core/lib/tax.lib.php
View File

@ -49,6 +49,8 @@ function vat_by_thirdparty($db, $y, $date_start, $date_end, $modetax, $direction
$invoicedettable='facturedet';
$fk_facture='fk_facture';
$total_tva='total_tva';
$total_localtax1='total_localtax1';
$total_localtax2='total_localtax2';
}
if ($direction == 'buy')
{
@ -56,6 +58,8 @@ function vat_by_thirdparty($db, $y, $date_start, $date_end, $modetax, $direction
$invoicedettable='facture_fourn_det';
$fk_facture='fk_facture_fourn';
$total_tva='tva';
$total_localtax1='total_localtax1';
$total_localtax2='total_localtax2';
}
// Define sql request
@ -74,8 +78,10 @@ function vat_by_thirdparty($db, $y, $date_start, $date_end, $modetax, $direction
}
if ($conf->global->MAIN_MODULE_COMPTABILITE)
{
$sql = "SELECT s.rowid as socid, s.nom as nom, s.tva_intra as tva_intra, s.tva_assuj as assuj,";
$sql.= " sum(fd.total_ht) as amount, sum(fd.".$total_tva.") as tva";
$sql = "SELECT s.rowid as socid, s.nom as nom, s.siren as tva_intra, s.tva_assuj as assuj,";
$sql.= " sum(fd.total_ht) as amount, sum(fd.".$total_tva.") as tva,";
$sql.= " sum(fd.".$total_localtax1.") as localtax1,";
$sql.= " sum(fd.".$total_localtax2.") as localtax2";
$sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
$sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as fd,";
$sql.= " ".MAIN_DB_PREFIX."societe as s";
@ -195,6 +201,8 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
$fk_facture2='fk_facture';
$fk_payment='fk_paiement';
$total_tva='total_tva';
$total_localtax1='total_localtax1';
$total_localtax2='total_localtax2';
$paymenttable='paiement';
$paymentfacturetable='paiement_facture';
}
@ -206,6 +214,8 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
$fk_facture2='fk_facturefourn';
$fk_payment='fk_paiementfourn';
$total_tva='tva';
$total_localtax1='total_localtax1';
$total_localtax2='total_localtax2';
$paymenttable='paiementfourn';
$paymentfacturetable='paiementfourn_facturefourn';
}
@ -229,6 +239,7 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
{
// Count on delivery date (use invoice date as delivery is unknown)
$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_tx as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
$sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
$sql.= " d.date_start as date_start, d.date_end as date_end,";
$sql.= " f.facnumber as facnum, f.type, f.total_ttc as ftotal_ttc,";
$sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
@ -275,6 +286,7 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
{
// Count on delivery date (use invoice date as delivery is unknown)
$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_tx as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
$sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
$sql.= " d.date_start as date_start, d.date_end as date_end,";
$sql.= " f.facnumber as facnum, f.type, f.total_ttc as ftotal_ttc,";
$sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
@ -331,12 +343,16 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
{
if (! isset($list[$assoc['rate']]['totalht'])) $list[$assoc['rate']]['totalht']=0;
if (! isset($list[$assoc['rate']]['vat'])) $list[$assoc['rate']]['vat']=0;
if (! isset($list[$assoc['rate']]['locatax1'])) $list[$assoc['rate']]['localtax1']=0;
if (! isset($list[$assoc['rate']]['locatax2'])) $list[$assoc['rate']]['localtax2']=0;
if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid
{
$oldrowid=$assoc['rowid'];
$list[$assoc['rate']]['totalht'] += $assoc['total_ht'];
$list[$assoc['rate']]['vat'] += $assoc['total_vat'];
$list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1'];
$list[$assoc['rate']]['localtax2'] += $assoc['total_localtax2'];
}
$list[$assoc['rate']]['dtotal_ttc'][] = $assoc['total_ttc'];
$list[$assoc['rate']]['dtype'][] = $assoc['dtype'];
@ -351,6 +367,8 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
$list[$assoc['rate']]['totalht_list'][] = $assoc['total_ht'];
$list[$assoc['rate']]['vat_list'][] = $assoc['total_vat'];
$list[$assoc['rate']]['localtax1_list'][] = $assoc['total_localtax1'];
$list[$assoc['rate']]['localtax2_list'][] = $assoc['total_localtax2'];
$list[$assoc['rate']]['pid'][] = $assoc['pid'];
$list[$assoc['rate']]['pref'][] = $assoc['pref'];
@ -390,6 +408,7 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
{
// Count on invoice date
$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_tx as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
$sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
$sql.= " d.date_start as date_start, d.date_end as date_end,";
$sql.= " f.facnumber as facnum, f.type, f.total_ttc as ftotal_ttc,";
$sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
@ -437,6 +456,7 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
{
// Count on payments date
$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.tva_tx as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
$sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
$sql.= " d.date_start as date_start, d.date_end as date_end,";
$sql.= " f.facnumber as facnum, f.type, f.total_ttc as ftotal_ttc,";
$sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
@ -491,12 +511,16 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
{
if (! isset($list[$assoc['rate']]['totalht'])) $list[$assoc['rate']]['totalht']=0;
if (! isset($list[$assoc['rate']]['vat'])) $list[$assoc['rate']]['vat']=0;
if (! isset($list[$assoc['rate']]['locatax1'])) $list[$assoc['rate']]['localtax1']=0;
if (! isset($list[$assoc['rate']]['locatax2'])) $list[$assoc['rate']]['localtax2']=0;
if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid
{
$oldrowid=$assoc['rowid'];
$list[$assoc['rate']]['totalht'] += $assoc['total_ht'];
$list[$assoc['rate']]['vat'] += $assoc['total_vat'];
$list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1'];
$list[$assoc['rate']]['localtax2'] += $assoc['total_localtax2'];
}
$list[$assoc['rate']]['dtotal_ttc'][] = $assoc['total_ttc'];
$list[$assoc['rate']]['dtype'][] = $assoc['dtype'];
@ -511,6 +535,8 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
$list[$assoc['rate']]['totalht_list'][] = $assoc['total_ht'];
$list[$assoc['rate']]['vat_list'][] = $assoc['total_vat'];
$list[$assoc['rate']]['localtax1_list'][] = $assoc['total_localtax1'];
$list[$assoc['rate']]['localtax2_list'][] = $assoc['total_localtax2'];
$list[$assoc['rate']]['pid'][] = $assoc['pid'];
$list[$assoc['rate']]['pref'][] = $assoc['pref'];

5
htdocs/core/login/functions_dolibarr.php
View File

@ -1,6 +1,7 @@
<?php
/* Copyright (C) 2007-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2007-2009 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es>
*
* 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
@ -101,7 +102,7 @@ function check_user_password_dolibarr($usertotest,$passwordtotest,$entitytotest=
dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko bad password pour '".$usertotest."'");
sleep(1);
$langs->load('main');
$langs->load('other');
$langs->load('errors');
$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
}
}
@ -110,7 +111,7 @@ function check_user_password_dolibarr($usertotest,$passwordtotest,$entitytotest=
dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko user not found for '".$usertotest."'");
sleep(1);
$langs->load('main');
$langs->load('other');
$langs->load('errors');
$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
}
}

10
htdocs/core/menus/init_menu_auguria.sql
View File

@ -178,11 +178,11 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->tax->enabled', __HANDLER__, 'left', 2201__+MAX_llx_menu__, 'accountancy', '', 2200__+MAX_llx_menu__, '/compta/sociales/index.php?leftmenu=tax_social', 'SocialContributions', 1, '', '$user->rights->tax->charges->lire', '', 0, 1, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->tax->enabled && $leftmenu=="tax_social"', __HANDLER__, 'left', 2202__+MAX_llx_menu__, 'accountancy', '', 2201__+MAX_llx_menu__, '/compta/sociales/charges.php?leftmenu=tax_social&amp;action=create', 'MenuNewSocialContribution', 2, '', '$user->rights->tax->charges->creer', '', 0, 2, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->tax->enabled && $leftmenu=="tax_social"', __HANDLER__, 'left', 2203__+MAX_llx_menu__, 'accountancy', '', 2201__+MAX_llx_menu__, '/compta/charges/index.php?leftmenu=tax_social&amp;mainmenu=accountancy&amp;mode=sconly', 'Payments', 2, '', '$user->rights->tax->charges->lire', '', 0, 3, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->tax->enabled && $conf->compta->tva', __HANDLER__, 'left', 2300__+MAX_llx_menu__, 'accountancy', '', 2200__+MAX_llx_menu__, '/compta/tva/index.php?leftmenu=tax_vat&amp;mainmenu=accountancy', 'VAT', 1, 'companies', '$user->rights->tax->charges->lire', '', 0, 7, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->tax->enabled && $conf->compta->tva && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2301__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/fiche.php?leftmenu=tax_vat&amp;action=create', 'NewPayment', 2, 'companies', '$user->rights->tax->charges->creer', '', 0, 0, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->tax->enabled && $conf->compta->tva && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2302__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/reglement.php?leftmenu=tax_vat', 'Payments', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 1, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->tax->enabled && $conf->compta->tva && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2303__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/clients.php?leftmenu=tax_vat', 'ReportByCustomers', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 2, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->tax->enabled && $conf->compta->tva && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2304__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/quadri_detail.php?leftmenu=tax_vat', 'ReportByQuarter', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 3, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS)', __HANDLER__, 'left', 2300__+MAX_llx_menu__, 'accountancy', '', 2200__+MAX_llx_menu__, '/compta/tva/index.php?leftmenu=tax_vat&amp;mainmenu=accountancy', 'VAT', 1, 'companies', '$user->rights->tax->charges->lire', '', 0, 7, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2301__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/fiche.php?leftmenu=tax_vat&amp;action=create', 'NewPayment', 2, 'companies', '$user->rights->tax->charges->creer', '', 0, 0, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2302__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/reglement.php?leftmenu=tax_vat', 'Payments', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 1, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2303__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/clients.php?leftmenu=tax_vat', 'ReportByCustomers', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 2, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2304__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/quadri_detail.php?leftmenu=tax_vat', 'ReportByQuarter', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 3, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2400__+MAX_llx_menu__, 'accountancy', '', 6__+MAX_llx_menu__, '/compta/ventilation/index.php?leftmenu=ventil', 'Ventilation', 0, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 8, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2401__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '/compta/ventilation/liste.php', 'ToDispatch', 1, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 0, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2402__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '/compta/ventilation/lignes.php', 'Dispatched', 1, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 1, __ENTITY__);

10
htdocs/core/menus/init_menu_smartphone.sql
View File

@ -196,11 +196,11 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->tax->enabled', __HANDLER__, 'left', 2201__+MAX_llx_menu__, 'accountancy', '', 2200__+MAX_llx_menu__, '/compta/sociales/index.php?leftmenu=tax_social', 'SocialContributions', 1, '', '$user->rights->tax->charges->lire', '', 0, 1, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->tax->enabled && $leftmenu=="tax_social"', __HANDLER__, 'left', 2202__+MAX_llx_menu__, 'accountancy', '', 2201__+MAX_llx_menu__, '/compta/sociales/charges.php?leftmenu=tax_social&amp;action=create', 'MenuNewSocialContribution', 2, '', '$user->rights->tax->charges->creer', '', 0, 2, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->tax->enabled && $leftmenu=="tax_social"', __HANDLER__, 'left', 2203__+MAX_llx_menu__, 'accountancy', '', 2201__+MAX_llx_menu__, '/compta/charges/index.php?leftmenu=tax_social&amp;mainmenu=accountancy&amp;mode=sconly', 'Payments', 2, '', '$user->rights->tax->charges->lire', '', 0, 3, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->tax->enabled && $conf->compta->tva', __HANDLER__, 'left', 2300__+MAX_llx_menu__, 'accountancy', '', 2200__+MAX_llx_menu__, '/compta/tva/index.php?leftmenu=tax_vat&amp;mainmenu=accountancy', 'VAT', 1, 'companies', '$user->rights->tax->charges->lire', '', 0, 7, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->tax->enabled && $conf->compta->tva && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2301__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/fiche.php?leftmenu=tax_vat&amp;action=create', 'NewPayment', 2, 'companies', '$user->rights->tax->charges->creer', '', 0, 0, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->tax->enabled && $conf->compta->tva && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2302__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/reglement.php?leftmenu=tax_vat', 'Payments', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 1, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->tax->enabled && $conf->compta->tva && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2303__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/clients.php?leftmenu=tax_vat', 'ReportByCustomers', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 2, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->tax->enabled && $conf->compta->tva && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2304__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/quadri_detail.php?leftmenu=tax_vat', 'ReportByQuarter', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 3, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS)', __HANDLER__, 'left', 2300__+MAX_llx_menu__, 'accountancy', '', 2200__+MAX_llx_menu__, '/compta/tva/index.php?leftmenu=tax_vat&amp;mainmenu=accountancy', 'VAT', 1, 'companies', '$user->rights->tax->charges->lire', '', 0, 7, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2301__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/fiche.php?leftmenu=tax_vat&amp;action=create', 'NewPayment', 2, 'companies', '$user->rights->tax->charges->creer', '', 0, 0, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2302__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/reglement.php?leftmenu=tax_vat', 'Payments', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 1, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2303__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/clients.php?leftmenu=tax_vat', 'ReportByCustomers', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 2, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2304__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/quadri_detail.php?leftmenu=tax_vat', 'ReportByQuarter', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 3, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2400__+MAX_llx_menu__, 'accountancy', '', 6__+MAX_llx_menu__, '/compta/ventilation/index.php?leftmenu=ventil', 'Ventilation', 0, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 8, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2401__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '/compta/ventilation/liste.php', 'ToDispatch', 1, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 0, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2402__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '/compta/ventilation/lignes.php', 'Dispatched', 1, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 1, __ENTITY__);

17
htdocs/core/menus/standard/eldy.lib.php
View File

@ -441,7 +441,7 @@ function print_eldy_menu($db,$atarget,$type_user)
$menuArbo = new Menubase($db,'eldy','top');
$newTabMenu = $menuArbo->menuTopCharger($_SESSION['mainmenu'],'',$type_user,'eldy');
$num = count($newTabMenu);
for($i = 0; $i < $num; $i++)
{
@ -934,14 +934,27 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after)
if (preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/sociales/charges.php?leftmenu=tax_social&action=create",$langs->trans("MenuNewSocialContribution"), 2, $user->rights->tax->charges->creer);
if (preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/charges/index.php?leftmenu=tax_social&amp;mainmenu=accountancy&amp;mode=sconly",$langs->trans("Payments"), 2, $user->rights->tax->charges->lire);
// VAT
if ($conf->compta->tva)
if (empty($conf->global->TAX_DISABLE_VAT_MENUS))
{
if (preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/tva/index.php?leftmenu=tax_vat&amp;mainmenu=accountancy",$langs->trans("VAT"),1,$user->rights->tax->charges->lire);
if (preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/tva/fiche.php?leftmenu=tax_vat&action=create",$langs->trans("NewPayment"),2,$user->rights->tax->charges->creer);
if (preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/tva/reglement.php?leftmenu=tax_vat",$langs->trans("Payments"),2,$user->rights->tax->charges->lire);
if (preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/tva/clients.php?leftmenu=tax_vat", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);
if (preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/tva/quadri_detail.php?leftmenu=tax_vat", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);
global $mysoc;
//Local Taxes
if($mysoc->pays_code=='ES' && $mysoc->localtax2_assuj=="1")
{
if (preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/localtax/index.php?leftmenu=tax_vat&amp;mainmenu=accountancy",$langs->transcountry("LT2",$mysoc->pays_code),1,$user->rights->tax->charges->lire);
if (preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/localtax/fiche.php?leftmenu=tax_vat&action=create",$langs->trans("NewPayment"),2,$user->rights->tax->charges->creer);
if (preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/localtax/reglement.php?leftmenu=tax_vat",$langs->trans("Payments"),2,$user->rights->tax->charges->lire);
if (preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/localtax/clients.php?leftmenu=tax_vat", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);
//if (preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_vat", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);
}
}
}
// Compta simple

2
htdocs/core/modules/.cvsignore
View File

@ -1,2 +0,0 @@
modGoogle.class.php
modPHPSane.class.php

17
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
View File

@ -362,15 +362,13 @@ class doc_generic_invoice_odt extends ModelePDFFactures
// Make substitutions into odt of freetext
if ($newfreetext)
{
try {
$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
}
catch(OdfException $e)
{
}
try {
$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
}
catch(OdfException $e)
{
}
// Make substitutions into odt of user info
$tmparray=$this->get_substitutionarray_user($user,$outputlangs);
//var_dump($tmparray); exit;
@ -432,8 +430,9 @@ class doc_generic_invoice_odt extends ModelePDFFactures
{
}
}
// Replace tags of object
// Replace tags of object + external modules
$tmparray=$this->get_substitutionarray_object($object,$outputlangs);
complete_substitutions_array($tmparray, $outputlangs, $object);
foreach($tmparray as $key=>$value)
{
try {

2
htdocs/core/modules/mailings/.cvsignore
View File

@ -1,2 +0,0 @@
mailinglist_chatsderace.modules.php
mailinglist_chiensderace.modules.php

10
htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
View File

@ -43,7 +43,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
/**
* Constructor
*
* @param DoliDB $DB Database handler
* @param DoliDB $db Database handler
*/
function doc_generic_odt($db)
{
@ -226,7 +226,8 @@ class doc_generic_odt extends ModeleThirdPartyDoc
// Open and load template
require_once(ODTPHP_PATH.'odf.php');
$odfHandler = new odf($srctemplatepath, array(
$odfHandler = new odf($srctemplatepath, array
(
'PATH_TO_TMP' => $conf->societe->dir_temp,
'ZIP_PROXY' => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
'DELIMITER_LEFT' => '{',
@ -255,6 +256,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
}
catch(OdfException $e)
{
// setVars failed, probably because key not found
}
}
// Make substitutions into odt of mysoc info
@ -276,11 +278,12 @@ class doc_generic_odt extends ModeleThirdPartyDoc
}
catch(OdfException $e)
{
// setVars failed, probably because key not found
}
}
// Make substitutions into odt of thirdparty + external modules
$tmparray=$this->get_substitutionarray_thirdparty($object,$outputlangs);
complete_substitutions_array($tmparray, $langs, $object);
complete_substitutions_array($tmparray, $outputlangs, $object);
//var_dump($object->id); exit;
foreach($tmparray as $key=>$value)
{
@ -297,6 +300,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
}
catch(OdfException $e)
{
// setVars failed, probably because key not found
}
}

12
htdocs/core/modules/societe/modules_societe.class.php
View File

@ -352,12 +352,12 @@ abstract class ModeleAccountancyCode
/**
* Create a document for third party
*
* @param db Database handler
* @param id Id of third party to use
* @param message Message
* @param modele Force model to use ('' to not force). model can be a model name or a template file.
* @param outputlangs Objet lang to use for translation
* @return int <0 if KO, >0 if OK
* @param DoliDB $db Database handler
* @param int $id Id of third party to use
* @param string $message Message
* @param string $modele Force model to use ('' to not force). model can be a model name or a template file.
* @param Translate $outputlangs Object lang to use for translation
* @return int <0 if KO, >0 if OK
*/
function thirdparty_doc_create($db, $id, $message, $modele, $outputlangs)
{

24
htdocs/core/tpl/login.tpl.php
View File

@ -49,7 +49,7 @@ header("Content-type: text/html; charset=".$conf->file->character_set_client);
}
-->
</style>
<?php echo $conf->global->MAIN_HTML_HEADER ?>
<?php if (! empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER; ?>
<!-- HTTP_USER_AGENT = <?php echo $_SERVER['HTTP_USER_AGENT']; ?> -->
</head>
@ -173,18 +173,26 @@ jQuery(document).ready(function () {
</form>
<?php if ($_SESSION['dol_loginmesg']) { ?>
<?php if (! empty($_SESSION['dol_loginmesg']))
{
?>
<center><table width="60%"><tr><td align="center"><div class="error">
<?php echo $_SESSION['dol_loginmesg']; ?>
</div></td></tr></table></center>
<?php } ?>
<?php
}
?>
<?php if ($main_home) { ?>
<?php if ($main_home)
{
?>
<center><table summary="info" cellpadding="0" cellspacing="0" border="0" align="center" width="750">
<tr><td align="center">
<?php echo $main_home; ?>
</td></tr></table></center><br>
<?php } ?>
<?php
}
?>
<?php
if (! empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && ! empty($conf->global->MAIN_GOOGLE_AD_SLOT))
@ -202,13 +210,15 @@ jQuery(document).ready(function () {
src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
</script>
</div>
<?php } ?>
<?php
}
?>
<!-- authentication mode = <?php echo $main_authentication ?> -->
<!-- cookie name used for this session = <?php echo $session_name ?> -->
<!-- urlfrom in this session = <?php echo $_SESSION["urlfrom"] ?> -->
<?php echo $conf->global->MAIN_HTML_FOOTER; ?>
<?php if (! empty($conf->global->MAIN_HTML_FOOTER)) print $conf->global->MAIN_HTML_FOOTER; ?>
</body>
</html>

1
htdocs/custom Symbolic link
View File

@ -0,0 +1 @@
/home/ldestail/git/nltechno/htdocs

2
htdocs/expedition/fiche.php
View File

@ -456,7 +456,7 @@ if ($action == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile'] && ! $_P
}
else
{
$langs->load("other");
$langs->load("errors");
$mesg='<div class="error">'.$langs->trans('ErrorCantReadFile',$file).'</div>';
dol_syslog('Failed to read file: '.$file);
}

3
htdocs/fichinter/apercu.php
View File

@ -2,6 +2,7 @@
/* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
*
* 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
@ -126,7 +127,7 @@ if ($id > 0 || ! empty($ref))
}
else
{
$langs->load("other");
$langs->load("errors");
print '<font class="error">'.$langs->trans("ErrorNoImagickReadimage").'</font>';
}
}

12
htdocs/fichinter/fiche.php
View File

@ -599,7 +599,7 @@ if ($action == 'send' && ! $_POST['cancel'] && (empty($conf->global->MAIN_USE_AD
}
else
{
$langs->load("other");
$langs->load("errors");
$mesg='<div class="error">'.$langs->trans('ErrorCantReadFile',$file).'</div>';
dol_syslog('Failed to read file: '.$file);
}
@ -807,9 +807,7 @@ else if ($id > 0 || ! empty($ref))
{
print $langs->trans('Description');
print '</td><td colspan="3">';
// FIXME parameter note_private must not be denatured with a format function to be propagated. dol_nl2br must be used
// by editInPlace if necessary according to type (4rd parameter)
print $form->editInPlace(dol_nl2br($object->description), 'description', $user->rights->ficheinter->creer && $object->statut == 0, 'area');
print $form->editInPlace($object->description, 'description', $user->rights->ficheinter->creer && $object->statut == 0, 'textarea');
}
else
{
@ -872,9 +870,7 @@ else if ($id > 0 || ! empty($ref))
// Public note
print '<tr><td valign="top">'.$langs->trans("NotePublic").'</td>';
print '<td valign="top" colspan="3">';
// FIXME parameter note_public must not be denatured with a format function to be propagated. dol_nl2br must be used
// by editInPlace if necessary according to type (4rd parameter)
print $form->editInPlace(dol_nl2br($object->note_public), 'note_public', $user->rights->ficheinter->creer, 'area');
print $form->editInPlace($object->note_public, 'note_public', $user->rights->ficheinter->creer, 'textarea');
print "</td></tr>";
// Private note
@ -882,7 +878,7 @@ else if ($id > 0 || ! empty($ref))
{
print '<tr><td valign="top">'.$langs->trans("NotePrivate").'</td>';
print '<td valign="top" colspan="3">';
print $form->editInPlace(dol_nl2br($object->note_private), 'note_private', $user->rights->ficheinter->creer);
print $form->editInPlace($object->note_private, 'note_private', $user->rights->ficheinter->creer, 'textarea');
print "</td></tr>";
}

37
htdocs/filefunc.inc.php
View File

@ -33,30 +33,29 @@ if (! defined('DOL_VERSION')) define('DOL_VERSION','3.2.0-alpha'); // Also defin
if (! defined('EURO')) define('EURO',chr(128));
// Definition des constantes syslog
if (function_exists("define_syslog_variables"))
if (! defined('LOG_DEBUG'))
{
if (version_compare(PHP_VERSION, '5.3.0', '<'))
{
define_syslog_variables(); // Deprecated since php 5.3.0, syslog variables no longer need to be initialized
}
if (function_exists("define_syslog_variables"))
{
define_syslog_variables(); // Deprecated since php 5.3.0, syslog variables no longer need to be initialized
}
else
{
// Pour PHP sans syslog (comme sous Windows)
define('LOG_EMERG',0);
define('LOG_ALERT',1);
define('LOG_CRIT',2);
define('LOG_ERR',3);
define('LOG_WARNING',4);
define('LOG_NOTICE',5);
define('LOG_INFO',6);
define('LOG_DEBUG',7);
}
}
else
{
// Pour PHP sans syslog (comme sous Windows)
define('LOG_EMERG',0);
define('LOG_ALERT',1);
define('LOG_CRIT',2);
define('LOG_ERR',3);
define('LOG_WARNING',4);
define('LOG_NOTICE',5);
define('LOG_INFO',6);
define('LOG_DEBUG',7);
}
// Forcage du parametrage PHP error_reporting (Dolibarr non utilisable en mode error E_ALL)
error_reporting(E_ALL ^ E_NOTICE);
//error_reporting(E_ALL);
//error_reporting(E_ALL | E_STRICT);
// Define vars

4
htdocs/fourn/commande/fiche.php
View File

@ -3,7 +3,7 @@
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2011 Philippe Grand <philippe.grand@atoo-net.com>
*
* This program is free software; you can redistribute it and/or modify
@ -743,7 +743,7 @@ if ($action == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile'] && ! $_P
}
else
{
$langs->load("other");
$langs->load("errors");
$mesg='<div class="error">'.$langs->trans('ErrorCantReadFile',$file).'</div>';
dol_syslog('Failed to read file: '.$file);
}

2
htdocs/fourn/facture/fiche.php
View File

@ -788,7 +788,7 @@ if ($action == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile'] && ! $_P
}
else
{
$langs->load("other");
$langs->load("errors");
$mesg='<div class="error">'.$langs->trans('ErrorCantReadFile',$file).'</div>';
dol_syslog('Failed to read file: '.$file);
}

5
htdocs/includes/.cvsignore
View File

@ -1,5 +0,0 @@
jpgraph2
phpsane
php_excelreader
.DS_Store
ckfinder

1
htdocs/includes/jquery/plugins/flot/.cvsignore
View File

@ -1 +0,0 @@
examples

2
htdocs/includes/jquery/plugins/jcrop/.cvsignore
View File

@ -1,2 +0,0 @@
aaa.txt
demos

9
htdocs/includes/jquery/plugins/jeditable/jquery.jeditable.ui-autocomplete.js Normal file
View File

@ -0,0 +1,9 @@
/* Create an inline datepicker which leverages the
jQuery UI autocomplete
*/
$.editable.addInputType('autocomplete', {
element : $.editable.types.text.element,
plugin : function(settings, original) {
$('input', this).autocomplete(settings.autocomplete.data);
}
});

17
htdocs/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js Normal file
View File

@ -0,0 +1,17 @@
/* Create an inline datepicker which leverages the
jQuery UI datepicker
*/
$.editable.addInputType('datepicker', {
element: function(settings, original) {
var input = $('<input />');
input.datepicker({
onSelect: function(dateText, inst) {
$(this).parents("form").submit();
}
});
$(this).append(input);
return (input);
}
});

1
htdocs/includes/nusoap/.cvsignore
View File

@ -1 +0,0 @@
samples

5
htdocs/index.php
View File

@ -2,6 +2,7 @@
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
*
* 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
@ -539,7 +540,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING))
$lockfile=DOL_DATA_ROOT.'/install.lock';
if (! empty($lockfile) && ! file_exists($lockfile) && is_dir(DOL_DOCUMENT_ROOT."/install"))
{
$langs->load("other");
$langs->load("errors");
//if (! empty($message)) $message.='<br>';
$message.=info_admin($langs->trans("WarningInstallDirExists",DOL_DOCUMENT_ROOT."/install").' '.$langs->trans("WarningUntilDirRemoved",DOL_DOCUMENT_ROOT."/install"));
}
@ -548,7 +549,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING))
if (is_writable($conffile))
{
$langs->load("errors");
$langs->load("other");
//$langs->load("other");
//if (! empty($message)) $message.='<br>';
$message.=info_admin($langs->transnoentities("WarningConfFileMustBeReadOnly").' '.$langs->trans("WarningUntilDirRemoved",DOL_DOCUMENT_ROOT."/install"));
}

1
htdocs/install/.cvsignore
View File

@ -1 +0,0 @@
install.forced.php

2
htdocs/install/mysql/migration/2.1.0-2.2.0.sql
View File

@ -509,7 +509,7 @@ insert into `llx_menu_constraint` (`rowid`, `action`) values (14, '! $conf->glob
insert into `llx_menu_constraint` (`rowid`, `action`) values (15, '$conf->don->enabled');
insert into `llx_menu_constraint` (`rowid`, `action`) values (16, '$conf->deplacement->enabled');
insert into `llx_menu_constraint` (`rowid`, `action`) values (17, '$conf->tax->enabled');
insert into `llx_menu_constraint` (`rowid`, `action`) values (18, '($conf->compta->enabled || $conf->comptaexpert->enabled) && $conf->compta->tva && $user->societe_id == 0');
insert into `llx_menu_constraint` (`rowid`, `action`) values (18, '($conf->compta->enabled || $conf->comptaexpert->enabled) && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $user->societe_id == 0');
insert into `llx_menu_constraint` (`rowid`, `action`) values (19, '$conf->compta-enabled');
insert into `llx_menu_constraint` (`rowid`, `action`) values (20, '$conf->prelevement->enabled');
insert into `llx_menu_constraint` (`rowid`, `action`) values (21, '$conf->banque->enabled');

14
htdocs/install/mysql/migration/3.1.0-3.2.0.sql
View File

@ -69,3 +69,17 @@ DROP TABLE IF EXISTS llx_pos_tmp;
ALTER TABLE llx_deplacement ADD COLUMN fk_user_modif integer AFTER fk_user_author;
CREATE TABLE IF NOT EXISTS `llx_localtax` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
`datep` date DEFAULT NULL,
`datev` date DEFAULT NULL,
`amount` double NOT NULL DEFAULT '0',
`label` varchar(255) DEFAULT NULL,
`entity` int(11) NOT NULL DEFAULT '1',
`note` text,
`fk_bank` int(11) DEFAULT NULL,
`fk_user_creat` int(11) DEFAULT NULL,
`fk_user_modif` int(11) DEFAULT NULL,
PRIMARY KEY (`rowid`)
) ENGINE=InnoDB;

42
htdocs/install/mysql/tables/llx_localtax.sql Normal file
View File

@ -0,0 +1,42 @@
-- ===================================================================
-- Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
-- Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
--
-- 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 2 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 <http://www.gnu.org/licenses/>.
--
-- ===================================================================
create table llx_localtax
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
tms timestamp,
datep date, -- date of payment
datev date, -- date of value
amount real NOT NULL DEFAULT 0,
label varchar(255),
entity integer DEFAULT 1 NOT NULL,
note text,
fk_bank integer,
fk_user_creat integer,
fk_user_modif integer
)ENGINE=innodb;
--
-- List of codes for the field entity
--
-- 1 : first company vat
-- 2 : second company vat
-- 3 : etc...
--

5
htdocs/langs/.htaccess
View File

@ -1,2 +1,7 @@
Order deny,allow
Deny from all
<FilesMatch "\.(js)$">
Order deny,allow
Allow from all
</FilesMatch>

1
htdocs/langs/ca_ES/.cvsignore
View File

@ -1 +0,0 @@
google.lang

9
htdocs/langs/ca_ES/bills.lang
View File

@ -234,7 +234,10 @@ GlobalDiscount=Descompte fixe
CreditNote=Abonament
CreditNotes=Abonaments
AddDiscount=Crear descompte fix
AddRelativeDiscount=Crear descompte relatiu
EditRelativeDiscount=Editar descompte relatiu
AddGlobalDiscount=Crear descompte fixe
EditGlobalDiscounts=Editar descompte fixe
AddCreditNote=Crear factura de pagament
Deposit=Bestreta
Deposits=Bestretes
@ -277,7 +280,7 @@ TotalOfTwoDiscountMustEqualsOriginal=La suma de l'import dels 2 nous descomptes
ConfirmRemoveDiscount=Esteu segur de voler eliminar aquest descompte?
RelatedBill=Factura associada
RelatedBills=Factures associades
# PaymentConditions==
# PaymentConditions
PaymentConditionShortRECEP=A la recepció
PaymentConditionRECEP=A la recepció de la factura
PaymentConditionShort30D=30 dies
@ -288,7 +291,7 @@ PaymentConditionShort60D=60 dies
PaymentCondition60D=Pagament als 60 dies
PaymentConditionShort60DENDMONTH=60 dies a fi de mes
PaymentCondition60DENDMONTH=Pagament als 60 dies a fi de mes
# PaymentType==
# PaymentType
PaymentTypeVIR=Transferència bancària
PaymentTypeShortVIR=Transferència
PaymentTypePRE=Domiciliació bancària
@ -379,4 +382,4 @@ PDFCrabeDescription=Model de factura complet (model recomanat per defecte)
# oursin PDF Model
PDFOursinDescription=Model de factura complet (model alternatiu)
# NumRef Modules
TerreNumRefModelDesc1=Retorna el nombre sota el format %syymm-nnnn per a les factures i %syymm-nnnn per als abonaments on yy és l'any, mm. el mes i nnnn un comptador seqüencial sense ruptura i sense permanència a 0
TerreNumRefModelDesc1=Retorna el nombre sota el format %syymm-nnnn per a les factures i %syymm-nnnn per als abonaments on yy és l'any, mm. el mes i nnnn un comptador seqüencial sense ruptura i sense permanència a 0

40
htdocs/langs/ca_ES/errors.lang
View File

@ -1,6 +1,8 @@
# Dolibarr language file - ca_ES - errors
CHARSET=UTF-8
MenuManager=Gestor de menú
# Errors
Error=Error
Errors=Errors
ErrorBadEMail=e-mail %s incorrecte
@ -51,11 +53,6 @@ ErrorNoTmpDir=Directori temporal de recepció %s inexistent
ErrorUploadBlockedByAddon=Pujada bloquejada per un plugin PHP/Apache.
ErrorFileSizeTooLarge=La mida del fitxer és massa gran.
ErrorFieldCanNotContainSpecialCharacters=El camp <b>%s</b> no ha de contenir caràcters especials
WarningSafeModeOnCheckExecDir=Atenció, està activada l'opció PHP <b>safe_mode</b>, la comanda ha d'estar dins d'un directori declarat dins del paràmetre php <b>safe_mode_exec_dir</b>.
WarningAllowUrlFopenMustBeOn=El paràmetre <b>allow_url_fopen</b> ha de ser especificat a <b>on</b> a l'arxiu <b>php.ini</b> per disposar d'aquest mòdul completament actiu. Ha de modificar aquest arxiu manualment
WarningBuildScriptNotRunned=L'script <b>%s</b> encara no ha executat la construcció de gràfics.
WarningBookmarkAlreadyExists=Ja existeix un marcador amb aquest títol o aquest URL.
WarningPassIsEmpty=Atenció: La contrasenya de la base de dades està buida. Això és un forat de seguretat. Cal afegir una contrasenya a la seva base de dades i canviar el seu arxiu conf.php per reflectir això.
ErrorNoAccountancyModuleLoaded=Mòdul de comptabilitat no activat
ErrorExportDuplicateProfil=El nom del perfil ja existeix per a aquest lot d'exportació
ErrorLDAPSetupNotComplete=La configuració Dolibarr-LDAP és incompleta.
@ -64,17 +61,14 @@ ErrorCantSaveADoneUserWithZeroPercentage=No es pot canviar una acció al estat n
ErrorRefAlreadyExists=La referència utilitzada per a la creació ja existeix
ErrorPleaseTypeBankTransactionReportName=Introduïu el nom del registre bancari sobre el qual l'escrit està constatat (format AAAAMM o AAAMMJJ)
ErrorRecordHasChildren=No es pot esborrar el registre perquè té registrses fills.
WarningConfFileMustBeReadOnly=Atenció, el seu fitxer (<b>htdocs/conf/conf.php</b>) és accessible en escriptura al servidor web. Això representa un error seriós de seguretat. Modifiqueu els permisos per ser llegit únicament pel compte que executa el servidor Web.Si està executant Windows en undisco amb format FAT, sigui conscient que aquest sistema d'arxius no protegeix els arxius i no ofereix cap solució per reduir els riscos de manipulació d'aquest fitxer.
ErrorModuleRequireJavascript=Javascript ha d'estar activat per a que aquesta opció pugui utilitzar-se. Per activar/desactivar JavaScript, aneu al menú Inici->Configuració->Entorn.
ErrorPasswordsMustMatch=Les 2 contrasenyes indicades s'han de correspondre
ErrorContactEMail=S'ha produït un error tècnic. Contacti amb l'administrador al e-mail <b>%s</b>, indicant el codi d'error <b>%s</b> en el seu missatge, o pot també adjuntar una còpia de pantalla d'aquesta pàgina.
ErrorWrongValueForField=Valor incorrecte per al camp número <b>%s</b> (el valor '<b>%s</b>' no compleix amb la regla <b>%s</b>)
ErrorFieldValueNotIn=Valor incorrecte per al camp nombre <b>%s</b> (el valor '<b>%s</b>' no es un valor en el camp <b>%s</b> de la taula <b>%s</b>)
ErrorsOnXLines=Errors a <b>%s</b> línies font
WarningsOnXLines=Alertes a <b>%s</b> línies font
ErrorFileIsInfectedWithAVirus=L'antivirus no ha pogut validar aquest arxiu (és probable que estigui infectat per un virus)!
ErrorSpecialCharNotAllowedForField=Els caràcters especials no són admesos pel camp "%s"
WarningNoDocumentModelActivated=No hi ha cap model per a la generació del document activat. Es prendrà un model per defecte fins que es configuri el mòdul.
ErrorDatabaseParameterWrong=El paràmetre de configuració de la base de dades '<b>%s</b>' té un valor no compatible per una instal lació de Dolibarr (ha de tenir el valor '<b>%s</b>').
ErrorNumRefModel=Hi ha una referència a la base de dades (%s) i és incompatible amb aquesta numeració. Elimineu la línia o renomeneu la referència per activar aquest mòdul.
ErrorQtyTooLowForThisSupplier= Quantitat insuficient per aquest proveïdor
@ -87,4 +81,32 @@ ErrorProductWithRefNotExist=La referència de producte '<i>%s</i>' no existeix
ErrorDeleteNotPossibleLineIsConsolidated=Eliminació impossible ja que el registre està enllaçat a una transacció bancària conciliada
ErrorProdIdAlreadyExist=%s es troba assignat a altre tercer
ErrorFailedToSendPassword=Error en l'enviament de la contrasenya
ErrorFailedToLoadRSSFile=Error en la recuperació del flux RSS. Afegiu la constant MAIN_SIMPLEXMLLOAD_DEBUG si el missatge d'error no és molt explícit.
ErrorFailedToLoadRSSFile=Error en la recuperació del flux RSS. Afegiu la constant MAIN_SIMPLEXMLLOAD_DEBUG si el missatge d'error no és molt explícit.
ErrorPasswordDiffers=Les contrasenyes no són identiques, torni a introduir-les
ErrorForbidden=Accés no autoritzat.<br>Intenta accedir a una pàgina, zona o funció sense estar en una sessió autentificada o que no s'autoritza per al seu compte d'usuari.
ErrorForbidden2=Els permisos per a aquest usuari poden ser assignats per l'administrador Dolibarr mitjançant el menú %s-> %s.
ErrorForbidden3=Dolibarr no sembla funcionar en una sessió autentificada. Consulteu la documentació d'instal lació de Dolibarr per saber com administrar les autenticacions (htacces, mod_auth o altre ...).
ErrorNoImagickReadimage=La classe imagick_readimage no està present en aquesta instal lació de PHP. La ressenya no està doncs disponible. Els administradors poden desactivar aquesta pestanya en el menú Configuració->Visualització.
ErrorRecordAlreadyExists=Registre ja existent
ErrorCantReadFile=Error de lectura del fitxer '%s'
ErrorCantReadDir=Error de lectura de la carpeta '%s'
ErrorFailedToFindEntity=Error de lectura del entorn '%s'
ErrorBadLoginPassword=Identificadors d'usuari o contrasenya incorrectes
ErrorLoginDisabled=El seu compte està desactivat
ErrorFailedToRunExternalCommand=Error d'execució de la comanda extern. Comproveu que està disponible i executable per el seu servidor PHP. Si l'PHP <b>Safe Mode </b> està activat, comproveu que la comanda es troba en una carpeta definida en el paràmetre <b>safe_mode_exec_dir</b>.
ErrorFailedToChangePassword=Error en la modificació de la contrasenya
ErrorLoginDoesNotExists=El compte d'usuari de <b>%s</b> no s'ha trobat.
ErrorLoginHasNoEmail=Aquest usuari no té e-mail. Impossible continuar.
ErrorBadValueForCode=Valor no vàlid per al codi. Torneu a intentar-ho amb un nou valor ...
# Warnings
WarningNoDocumentModelActivated=No hi ha cap model per a la generació del document activat. Es prendrà un model per defecte fins que es configuri el mòdul.
WarningsOnXLines=Alertes a <b>%s</b> línies font
WarningConfFileMustBeReadOnly=Atenció, el seu fitxer (<b>htdocs/conf/conf.php</b>) és accessible en escriptura al servidor web. Això representa un error seriós de seguretat. Modifiqueu els permisos per ser llegit únicament pel compte que executa el servidor Web.Si està executant Windows en undisco amb format FAT, sigui conscient que aquest sistema d'arxius no protegeix els arxius i no ofereix cap solució per reduir els riscos de manipulació d'aquest fitxer.
WarningSafeModeOnCheckExecDir=Atenció, està activada l'opció PHP <b>safe_mode</b>, la comanda ha d'estar dins d'un directori declarat dins del paràmetre php <b>safe_mode_exec_dir</b>.
WarningAllowUrlFopenMustBeOn=El paràmetre <b>allow_url_fopen</b> ha de ser especificat a <b>on</b> a l'arxiu <b>php.ini</b> per disposar d'aquest mòdul completament actiu. Ha de modificar aquest arxiu manualment
WarningBuildScriptNotRunned=L'script <b>%s</b> encara no ha executat la construcció de gràfics.
WarningBookmarkAlreadyExists=Ja existeix un marcador amb aquest títol o aquest URL.
WarningPassIsEmpty=Atenció: La contrasenya de la base de dades està buida. Això és un forat de seguretat. Cal afegir una contrasenya a la seva base de dades i canviar el seu arxiu conf.php per reflectir això.
WarningInstallDirExists=Atenció: La carpeta install (<b>htdocs/install</b>) encara existeix. Una vegada finalitzada la instal·lació la seva presència no és necessària, i representa un error seriós de seguretat. Hauríeu eliminar-la el més aviat possible.
WarningUntilDirRemoved=Aquesta alerta seguirà activa mentre la carpeta existeixi (alerta visible per als usuaris admin solament).

3
htdocs/langs/ca_ES/main.lang
View File

@ -296,6 +296,8 @@ IncludedVAT=IVA inclòs
HT=Sense IVA
TTC=IVA inclòs
VAT=IVA
LT1ES=RE
LT2ES=IRPF
VATRate=Taxa IVA
Average=Mitja
Sum=Suma
@ -598,6 +600,7 @@ NewAttribute=Nou atribut
AttributeCode=Codi atribut
OptionalFieldsSetup=Configuració dels atributs opcionals
CreateDraft=Crea esborrany
ClickToEdit=Clic per a editar
# Week day
Monday=Dilluns

18
htdocs/langs/ca_ES/other.lang
View File

@ -1,21 +1,5 @@
# Dolibarr language file - ca_ES - other
CHARSET=UTF-8
ErrorPasswordDiffers=Les contrasenyes no són identiques, torni a introduir-les
ErrorForbidden=Accés no autoritzat.<br>Intenta accedir a una pàgina, zona o funció sense estar en una sessió autentificada o que no s'autoritza per al seu compte d'usuari.
ErrorForbidden2=Els permisos per a aquest usuari poden ser assignats per l'administrador Dolibarr mitjançant el menú %s-> %s.
ErrorForbidden3=Dolibarr no sembla funcionar en una sessió autentificada. Consulteu la documentació d'instal lació de Dolibarr per saber com administrar les autenticacions (htacces, mod_auth o altre ...).
ErrorNoImagickReadimage=La classe imagick_readimage no està present en aquesta instal lació de PHP. La ressenya no està doncs disponible. Els administradors poden desactivar aquesta pestanya en el menú Configuració->Visualització.
ErrorRecordAlreadyExists=Registre ja existent
ErrorCantReadFile=Error de lectura del fitxer '%s'
ErrorCantReadDir=Error de lectura de la carpeta '%s'
ErrorFailedToFindEntity=Error de lectura del entorn '%s'
ErrorBadLoginPassword=Identificadors d'usuari o contrasenya incorrectes
ErrorLoginDisabled=El seu compte està desactivat
ErrorFailedToRunExternalCommand=Error d'execució de la comanda extern. Comproveu que està disponible i executable per el seu servidor PHP. Si l'PHP <b>Safe Mode </b> està activat, comproveu que la comanda es troba en una carpeta definida en el paràmetre <b>safe_mode_exec_dir</b>.
ErrorFailedToChangePassword=Error en la modificació de la contrasenya
ErrorLoginDoesNotExists=El compte d'usuari de <b>%s</b> no s'ha trobat.
ErrorLoginHasNoEmail=Aquest usuari no té e-mail. Impossible continuar.
ErrorBadValueForCode=Valor no vàlid per al codi. Torneu a intentar-ho amb un nou valor ...
SecurityCode=Codi de seguretat
Calendar=Calendari
AddTrip=Crear honorari
@ -61,8 +45,6 @@ AttachANewFile=Adjuntar nou arxiu/document
LinkedObject=Objecte adjuntat
Miscellanous=Diversos
NbOfActiveNotifications=Número notificacions
WarningInstallDirExists=Atenció: La carpeta install (<b>htdocs/install</b>) encara existeix. Una vegada finalitzada la instal·lació la seva presència no és necessària, i representa un error seriós de seguretat. Hauríeu eliminar-la el més aviat possible.
WarningUntilDirRemoved=Aquesta alerta seguirà activa mentre la carpeta existeixi (alerta visible per als usuaris admin solament).
PredefinedMailTest=Això és un correu de prova.\nLes 2 línies estan separades per un retorn de carro a la línia.
PredefinedMailTestHtml=Això és un e-mail de <b>prova</b> (la paraula prova ha d'estar en negreta).<br>Les 2 línies estan separades per un retorn de carro en la línia
PredefinedMailContentSendInvoice=Us adjuntem la factura __FACREF__\n\nCordialment\n\n

19
htdocs/langs/da_DK/errors.lang
View File

@ -94,3 +94,22 @@ ErrorDatabaseParameterWrong=Database setup parameter <b>'%s'</b> har en værdi i
ErrorNumRefModel=En henvisning findes i databasen (%s) og er ikke kompatible med denne nummerering regel. Fjern optage eller omdøbt henvisning til aktivere dette modul.
ErrorQtyTooLowForThisSupplier=Mængde for lav for denne leverandør eller nogen pris fastlagt på denne vare for denne leverandør
ErrorFailedToSendPassword=Det lykkedes ikke at sende password
ErrorPasswordDiffers=Passwords er forskellig, skal du skrive dem igen.
ErrorForbidden=Adgang forbudt. <br> Du forsøger at få adgang til en side, et område eller funktion uden at være i en authenticated samling, eller som ikke er tilladt til din brugerkonto.
ErrorForbidden2=Tilladelse til dette login kan defineres af din Dolibarr administrator fra menuen %s-> %s.
ErrorForbidden3=Det lader til, at Dolibarr ikke anvendes gennem en authenticated session. Tag et kig på Dolibarr setup dokumentation for at vide, hvordan man forvalter authentications (htaccess, mod_auth eller andre ...).
ErrorNoImagickReadimage=Funktion imagick_readimage er ikke fundet i denne PHP. Intet eksempel kan være til rådighed. Administratorer kan deaktivere denne fane fra menuen Setup - Display.
ErrorRecordAlreadyExists=Optag allerede findes
ErrorCantReadFile=Kunne ikke læse filen ' %s'
ErrorCantReadDir=Kunne ikke læse directory ' %s'
ErrorFailedToFindEntity=Kunne ikke læse enhed ' %s'
ErrorBadLoginPassword=Bad værdi for brugernavn eller password
ErrorLoginDisabled=Din konto er blevet deaktiveret
ErrorFailedToRunExternalCommand=Det lykkedes ikke at køre eksterne kommando. Check den er tilgængelig og runnable af din PHP server. Hvis PHP <b>Safe Mode</b> er aktiveret, skal du kontrollere, at kommandoen er inde i en mappe defineret ved parameter <b>safe_mode_exec_dir.</b>
ErrorFailedToChangePassword=Det lykkedes ikke at ændre password
ErrorLoginDoesNotExists=Bruger med <b>login %s</b> kunne ikke findes.
ErrorLoginHasNoEmail=Denne bruger har ingen e-mail-adresse. Processen afbrydes.
ErrorBadValueForCode=Bad værdi former for kode. Prøv igen med en ny værdi ...
ErrorFileIsInfectedWith=Denne fil er inficeret med %s
WarningInstallDirExists=Advarsel, installere directory ( %s) eksisterer stadig. Dette er en alvorlig sikkerheds-hul. Du bør fjernes så hurtigt som muligt.
WarningUntilDirRemoved=Denne advarsel vil forblive aktiv, så længe denne mappe er til stede (vises kun til admin-brugere).

19
htdocs/langs/da_DK/other.lang
View File

@ -11,23 +11,6 @@
// START - Lines generated via autotranslator.php tool.
// Reference language: en_US
CHARSET=UTF-8
ErrorPasswordDiffers=Passwords er forskellig, skal du skrive dem igen.
ErrorForbidden=Adgang forbudt. <br> Du forsøger at få adgang til en side, et område eller funktion uden at være i en authenticated samling, eller som ikke er tilladt til din brugerkonto.
ErrorForbidden2=Tilladelse til dette login kan defineres af din Dolibarr administrator fra menuen %s-> %s.
ErrorForbidden3=Det lader til, at Dolibarr ikke anvendes gennem en authenticated session. Tag et kig på Dolibarr setup dokumentation for at vide, hvordan man forvalter authentications (htaccess, mod_auth eller andre ...).
ErrorNoImagickReadimage=Funktion imagick_readimage er ikke fundet i denne PHP. Intet eksempel kan være til rådighed. Administratorer kan deaktivere denne fane fra menuen Setup - Display.
ErrorRecordAlreadyExists=Optag allerede findes
ErrorCantReadFile=Kunne ikke læse filen ' %s'
ErrorCantReadDir=Kunne ikke læse directory ' %s'
ErrorFailedToFindEntity=Kunne ikke læse enhed ' %s'
ErrorBadLoginPassword=Bad værdi for brugernavn eller password
ErrorLoginDisabled=Din konto er blevet deaktiveret
ErrorFailedToRunExternalCommand=Det lykkedes ikke at køre eksterne kommando. Check den er tilgængelig og runnable af din PHP server. Hvis PHP <b>Safe Mode</b> er aktiveret, skal du kontrollere, at kommandoen er inde i en mappe defineret ved parameter <b>safe_mode_exec_dir.</b>
ErrorFailedToChangePassword=Det lykkedes ikke at ændre password
ErrorLoginDoesNotExists=Bruger med <b>login %s</b> kunne ikke findes.
ErrorLoginHasNoEmail=Denne bruger har ingen e-mail-adresse. Processen afbrydes.
ErrorBadValueForCode=Bad værdi former for kode. Prøv igen med en ny værdi ...
ErrorFileIsInfectedWith=Denne fil er inficeret med %s
SecurityCode=Sikkerhedskode
Calendar=Kalender
AddTrip=Tilføj tur
@ -44,8 +27,6 @@ AttachANewFile=Vedhæfte en ny fil / dokument
LinkedObject=Forbundet objekt
Miscellanous=Miscellaneous
NbOfActiveNotifications=Antal anmeldelser
WarningInstallDirExists=Advarsel, installere directory ( %s) eksisterer stadig. Dette er en alvorlig sikkerheds-hul. Du bør fjernes så hurtigt som muligt.
WarningUntilDirRemoved=Denne advarsel vil forblive aktiv, så længe denne mappe er til stede (vises kun til admin-brugere).
ChooseYourDemoProfil=Vælg den demo profil, der passer til din virksomhed ...
DemoCompanyShopWithCashDesk=Administrer en butik med et kontant desk
DemoCompanyProductAndStocks=Administrer en lille eller mellemstor virksomhed, der sælger produkter

19
htdocs/langs/de_AT/errors.lang
View File

@ -80,3 +80,22 @@ ErrorDatabaseParameterWrong=Der Datenbankeinstellungs-Parameter '<b>%s</b>' weis
ErrorNumRefModel=Es besteht ein Bezug zur Datenbank (%s) der mit dieser Numerierungsfolge nicht kompatibel ist. Entfernen Sie den Eintrag oder benennen Sie den Verweis um, um dieses Modul zu aktivieren.
ErrorQtyTooLowForThisSupplier=Die gewählte Menge liegt unterhalb der Mindestbestellmenge für diesen Lieferanten oder es wurde kein Lieferantenpreis zu diesem Anbieter eingetragen.
ErrorFailedToSendPassword=Fehler beim Zusenden des Passworts
ErrorPasswordDiffers=Passwörter stimmen nicht überein, bitte erneut eingeben.
ErrorForbidden=Kein Zugriff. <br>Für einen Zugriff zu diese Seite oder Funktion müssen Sie über eine Sitzung authentifiziert zu sein und über die entsprechenden Benutzerberechtigungen verfügen.
ErrorForbidden2=Die Zugriffsberechtigungen für diese Anmeldung kann Ihr Administrator unter %s->%s einstellen.
ErrorForbidden3=Es scheint keine ordnungsgemäße Authentifizierung für das System vorzuliegen. Bitte werfen Sie einen Blick auf die Systemdokumentation um die entsprechenden Authentifizierungsoptionen zu verwalten (htaccess, mod_auth oder andere...)
ErrorNoImagickReadimage=Imagick_readimage Funktion in dieser PHP-Version nicht vorhanden. Vorschaubilder sind nicht möglich. Administratoren können diese Registerkarte unter Einstellungen-Display ausblenden.
ErrorRecordAlreadyExists=Datensatz bereits vorhanden
ErrorCantReadFile=Fehler beim Lesen der Datei '%s'
ErrorCantReadDir=Fehler beim Lesen des Verzeichnisses '%s'
ErrorFailedToFindEntity=Fehler beim Lesen der Entität '%s'
ErrorBadLoginPassword=Benutzername oder Passwort falsch
ErrorLoginDisabled=Ihr Konto wurde deaktiviert
ErrorFailedToRunExternalCommand=Fehler beim Ausführen des externen Befehls. Überprüfen Sie dessen Verfügbarkeit und Ausführbarkeit durch den PHP-Server. Sollte der <b>PHP Safe Mode</b> aktiviert sein, stellen Sie sicher dass der Befehl in einem der <b>safe_mode_exec_dir</b>-Verzeichnisse ausgeführt wird.
ErrorFailedToChangePassword=Passwortänderung fehlgeschlagen
ErrorLoginDoesNotExists=Benutzer mit Anmeldung <b>%s</b> konnte nicht gefunden werden.
ErrorLoginHasNoEmail=Dieser Benutzer hat keine E-Mail-Adresse. Prozess abgebrochen.
ErrorBadValueForCode=Unzulässiger Code-Wert. Versuchen Sie es mit einem anderen Wert erneut...
ErrorFileIsInfectedWith=Diese Datei ist mit %s infiziert
WarningInstallDirExists=Achtung: Das Installationsverzeichnis (%s) existiert noch. Dies ist eine ernsthafte Sicherheitslücke und sie sollten das Verzeichnis so rasch als möglich entfernen.
WarningUntilDirRemoved=Diese Warnung bleibt so lange aktiv, wie dieses Verzeichnis existiert (nur für Administratoren).

19
htdocs/langs/de_AT/other.lang
View File

@ -6,23 +6,6 @@
CHARSET=UTF-8
ErrorPasswordDiffers=Passwörter stimmen nicht überein, bitte erneut eingeben.
ErrorForbidden=Kein Zugriff. <br>Für einen Zugriff zu diese Seite oder Funktion müssen Sie über eine Sitzung authentifiziert zu sein und über die entsprechenden Benutzerberechtigungen verfügen.
ErrorForbidden2=Die Zugriffsberechtigungen für diese Anmeldung kann Ihr Administrator unter %s->%s einstellen.
ErrorForbidden3=Es scheint keine ordnungsgemäße Authentifizierung für das System vorzuliegen. Bitte werfen Sie einen Blick auf die Systemdokumentation um die entsprechenden Authentifizierungsoptionen zu verwalten (htaccess, mod_auth oder andere...)
ErrorNoImagickReadimage=Imagick_readimage Funktion in dieser PHP-Version nicht vorhanden. Vorschaubilder sind nicht möglich. Administratoren können diese Registerkarte unter Einstellungen-Display ausblenden.
ErrorRecordAlreadyExists=Datensatz bereits vorhanden
ErrorCantReadFile=Fehler beim Lesen der Datei '%s'
ErrorCantReadDir=Fehler beim Lesen des Verzeichnisses '%s'
ErrorFailedToFindEntity=Fehler beim Lesen der Entität '%s'
ErrorBadLoginPassword=Benutzername oder Passwort falsch
ErrorLoginDisabled=Ihr Konto wurde deaktiviert
ErrorFailedToRunExternalCommand=Fehler beim Ausführen des externen Befehls. Überprüfen Sie dessen Verfügbarkeit und Ausführbarkeit durch den PHP-Server. Sollte der <b>PHP Safe Mode</b> aktiviert sein, stellen Sie sicher dass der Befehl in einem der <b>safe_mode_exec_dir</b>-Verzeichnisse ausgeführt wird.
ErrorFailedToChangePassword=Passwortänderung fehlgeschlagen
ErrorLoginDoesNotExists=Benutzer mit Anmeldung <b>%s</b> konnte nicht gefunden werden.
ErrorLoginHasNoEmail=Dieser Benutzer hat keine E-Mail-Adresse. Prozess abgebrochen.
ErrorBadValueForCode=Unzulässiger Code-Wert. Versuchen Sie es mit einem anderen Wert erneut...
ErrorFileIsInfectedWith=Diese Datei ist mit %s infiziert
SecurityCode=Sicherheitsschlüssel
Calendar=Kalender
AddTrip=Reise hinzufügen
@ -39,8 +22,6 @@ AttachANewFile=Neue Datei/Dokument anhängen
LinkedObject=Verknüpftes Objekt
Miscellanous=Verschiedenes
NbOfActiveNotifications=Anzahl aktiver Benachrichtigungen
WarningInstallDirExists=Achtung: Das Installationsverzeichnis (%s) existiert noch. Dies ist eine ernsthafte Sicherheitslücke und sie sollten das Verzeichnis so rasch als möglich entfernen.
WarningUntilDirRemoved=Diese Warnung bleibt so lange aktiv, wie dieses Verzeichnis existiert (nur für Administratoren).
PredefinedMailContentSendInvoice=Bitte entnehmen Sie dem Anhang die Rechnung __FACREF__\n\nMit freundlichen Grüßen\n\n
PredefinedMailContentSendInvoiceReminder=Bedauerlicherweise scheint die Rechnung __FACREF__ bislang unbeglichen. Als Erinnerung übersenden wir Ihnen diese nochmals im Anhang\n\nMit freundlichen Grüßen\n\n
PredefinedMailContentSendProposal=Bitte entnehmen Sie dem Anhang unser Angebot __PROPREF__ \n\nMit freundlichen Grüßen\n\n

19
htdocs/langs/de_DE/errors.lang
View File

@ -81,3 +81,22 @@ ErrorDatabaseParameterWrong=Der Datenbankeinstellungs-Parameter '<b>%s</b>' weis
ErrorNumRefModel=Es besteht ein Bezug zur Datenbank (%s) der mit dieser Numerierungsfolge nicht kompatibel ist. Entfernen Sie den Eintrag oder benennen Sie den Verweis um, um dieses Modul zu aktivieren.
ErrorQtyTooLowForThisSupplier=Die gewählte Menge liegt unterhalb der Mindestbestellmenge für diesen Lieferanten oder es wurde kein Lieferantenpreis zu diesem Anbieter eingetragen.
ErrorFailedToSendPassword=Fehler beim Zusenden des Passworts
ErrorPasswordDiffers=Passwörter stimmen nicht überein, bitte erneut eingeben.
ErrorForbidden=Kein Zugriff. <br>Für einen Zugriff zu diese Seite oder Funktion müssen Sie über eine Sitzung authentifiziert zu sein und über die entsprechenden Benutzerberechtigungen verfügen.
ErrorForbidden2=Die Zugriffsberechtigungen für diese Anmeldung kann Ihr Administrator unter %s->%s einstellen.
ErrorForbidden3=Es scheint keine ordnungsgemäße Authentifizierung für das System vorzuliegen. Bitte werfen Sie einen Blick auf die Systemdokumentation um die entsprechenden Authentifizierungsoptionen zu verwalten (htaccess, mod_auth oder andere...)
ErrorNoImagickReadimage=Imagick_readimage Funktion in dieser PHP-Version nicht vorhanden. Vorschaubilder sind nicht möglich. Administratoren können diese Registerkarte unter Einstellungen-Display ausblenden.
ErrorRecordAlreadyExists=Datensatz bereits vorhanden
ErrorCantReadFile=Fehler beim Lesen der Datei '%s'
ErrorCantReadDir=Fehler beim Lesen des Verzeichnisses '%s'
ErrorFailedToFindEntity=Fehler beim Lesen der Entität '%s'
ErrorBadLoginPassword=Benutzername oder Passwort falsch
ErrorLoginDisabled=Ihr Konto wurde deaktiviert
ErrorFailedToRunExternalCommand=Fehler beim Ausführen des externen Befehls. Überprüfen Sie dessen Verfügbarkeit und Ausführbarkeit durch den PHP-Server. Sollte der <b>PHP Safe Mode</b> aktiviert sein, stellen Sie sicher dass der Befehl in einem der <b>safe_mode_exec_dir</b>-Verzeichnisse ausgeführt wird.
ErrorFailedToChangePassword=Passwortänderung fehlgeschlagen
ErrorLoginDoesNotExists=Benutzer mit Anmeldung <b>%s</b> konnte nicht gefunden werden.
ErrorLoginHasNoEmail=Dieser Benutzer hat keine E-Mail-Adresse. Prozess abgebrochen.
ErrorBadValueForCode=Unzulässiger Code-Wert. Versuchen Sie es mit einem anderen Wert erneut...
ErrorFileIsInfectedWith=Diese Datei ist mit %s infiziert
WarningInstallDirExists=Achtung: Das Installationsverzeichnis (%s) existiert noch. Dies ist eine ernsthafte Sicherheitslücke und sie sollten das Verzeichnis so rasch als möglich entfernen.
WarningUntilDirRemoved=Diese Warnung bleibt so lange aktiv, wie dieses Verzeichnis existiert (nur für Administratoren).

19
htdocs/langs/de_DE/other.lang
View File

@ -6,23 +6,6 @@
CHARSET=UTF-8
ErrorPasswordDiffers=Passwörter stimmen nicht überein, bitte erneut eingeben.
ErrorForbidden=Kein Zugriff. <br>Für einen Zugriff zu diese Seite oder Funktion müssen Sie über eine Sitzung authentifiziert zu sein und über die entsprechenden Benutzerberechtigungen verfügen.
ErrorForbidden2=Die Zugriffsberechtigungen für diese Anmeldung kann Ihr Administrator unter %s->%s einstellen.
ErrorForbidden3=Es scheint keine ordnungsgemäße Authentifizierung für das System vorzuliegen. Bitte werfen Sie einen Blick auf die Systemdokumentation um die entsprechenden Authentifizierungsoptionen zu verwalten (htaccess, mod_auth oder andere...)
ErrorNoImagickReadimage=Imagick_readimage Funktion in dieser PHP-Version nicht vorhanden. Vorschaubilder sind nicht möglich. Administratoren können diese Registerkarte unter Einstellungen-Display ausblenden.
ErrorRecordAlreadyExists=Datensatz bereits vorhanden
ErrorCantReadFile=Fehler beim Lesen der Datei '%s'
ErrorCantReadDir=Fehler beim Lesen des Verzeichnisses '%s'
ErrorFailedToFindEntity=Fehler beim Lesen der Entität '%s'
ErrorBadLoginPassword=Benutzername oder Passwort falsch
ErrorLoginDisabled=Ihr Konto wurde deaktiviert
ErrorFailedToRunExternalCommand=Fehler beim Ausführen des externen Befehls. Überprüfen Sie dessen Verfügbarkeit und Ausführbarkeit durch den PHP-Server. Sollte der <b>PHP Safe Mode</b> aktiviert sein, stellen Sie sicher dass der Befehl in einem der <b>safe_mode_exec_dir</b>-Verzeichnisse ausgeführt wird.
ErrorFailedToChangePassword=Passwortänderung fehlgeschlagen
ErrorLoginDoesNotExists=Benutzer mit Anmeldung <b>%s</b> konnte nicht gefunden werden.
ErrorLoginHasNoEmail=Dieser Benutzer hat keine E-Mail-Adresse. Prozess abgebrochen.
ErrorBadValueForCode=Unzulässiger Code-Wert. Versuchen Sie es mit einem anderen Wert erneut...
ErrorFileIsInfectedWith=Diese Datei ist mit %s infiziert
SecurityCode=Sicherheitsschlüssel
Calendar=Kalender
AddTrip=Reise hinzufügen
@ -39,8 +22,6 @@ AttachANewFile=Neue Datei/Dokument anhängen
LinkedObject=Verknüpftes Objekt
Miscellanous=Verschiedenes
NbOfActiveNotifications=Anzahl aktiver Benachrichtigungen
WarningInstallDirExists=Achtung: Das Installationsverzeichnis (%s) existiert noch. Dies ist eine ernsthafte Sicherheitslücke und sie sollten das Verzeichnis so rasch als möglich entfernen.
WarningUntilDirRemoved=Diese Warnung bleibt so lange aktiv, wie dieses Verzeichnis existiert (nur für Administratoren).
PredefinedMailContentSendInvoice=Bitte entnehmen Sie dem Anhang die Rechnung __FACREF__\n\nMit freundlichen Grüßen\n\n
PredefinedMailContentSendInvoiceReminder=Bedauerlicherweise scheint die Rechnung __FACREF__ bislang unbeglichen. Als Erinnerung übersenden wir Ihnen diese nochmals im Anhang\n\nMit freundlichen Grüßen\n\n
PredefinedMailContentSendProposal=Bitte entnehmen Sie dem Anhang unser Angebot __PROPREF__ \n\nMit freundlichen Grüßen\n\n

4
htdocs/langs/el_GR/compta.lang
View File

@ -93,9 +93,9 @@ DeleteSocialContribution=Διαγραφή κοινωνικής εισφοράς
ConfirmDeleteSocialContribution=Είστε σίγουροι ότι θέλετε να διαγράψετε την κοινωνική εισφορά;
ExportDataset_tax_1=Social contributions and payments
AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary, mode <b>%sRevenues-Expensens%s</b> said <b>cash accounting</b>.
AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary, mode <b>%sIncomes-Expensens%s</b> said <b>cash accounting</b>.
AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by third parties, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by third parties, mode <b>%sRevenues-Expenses%s</b> said <b>cash accounting</b>.
AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by third parties, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
SeeReportInInputOutputMode=See report <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b> for a calculation on actual payments made
SeeReportInDueDebtMode=See report <b>%sClaims-Debts%s</b> said <b>commitment accounting</b> for a calculation on issued invoices
RulesResultDue=- Amounts shown are with all taxes included<br>- It includes outstanding invoices, expenses and VAT whether they are paid or not. <br>- It is based on the validation date of invoices and VAT and on the due date for expenses.

12
htdocs/langs/el_GR/errors.lang
View File

@ -91,3 +91,15 @@ ErrorBadMaskBadRazMonth=Σφάλμα, κακή αξία επαναφορά
ErrorSelectAtLeastOne=Σφάλμα. Επιλέξτε τουλάχιστον μία είσοδο.
ErrorProductWithRefNotExist=Προϊόν με <i>%s</i> αναφοράς δεν υπάρχουν
ErrorFailedToSendPassword=Αποτυχία αποστολής κωδικού
ErrorForbidden3=Φαίνεται ότι Dolibarr δεν χρησιμοποιείται μέσω επικυρωμένο συνεδρία. Ρίξτε μια ματιά στην τεκμηρίωση της εγκατάστασης Dolibarr να ξέρει πώς να διαχειριστεί authentications (htaccess, mod_auth ή άλλα ...).
ErrorNoImagickReadimage=Κατηγορία imagick δεν βρίσκεται σε αυτό το PHP. Δεν προεπισκόπηση μπορεί να είναι διαθέσιμες. Οι διαχειριστές μπορούν να απενεργοποιήσουν αυτή την καρτέλα από το πρόγραμμα Εγκατάστασης μενού - Οθόνη.
ErrorRecordAlreadyExists=Εγγραφή υπάρχει ήδη
ErrorCantReadFile=Αποτυχία ανάγνωσης αρχείου &quot;%s»
ErrorCantReadDir=Αποτυχία ανάγνωσης »%s» κατάλογο
ErrorFailedToFindEntity=Αποτυχία ανάγνωσης »%s» περιβάλλον
ErrorBadLoginPassword=Bad αξία για σύνδεση ή τον κωδικό πρόσβασης
ErrorLoginDisabled=Ο λογαριασμός σας έχει απενεργοποιηθεί
ErrorFailedToRunExternalCommand=Απέτυχε να τρέξει εξωτερική εντολή. Ελέγξτε ότι είναι διαθέσιμο και εκτελέσιμη από PHP server σας. Αν η PHP <b>Safe Mode</b> είναι ενεργοποιημένη, βεβαιωθείτε ότι η εντολή είναι μέσα σε έναν κατάλογο που ορίζεται από <b>safe_mode_exec_dir</b> παράμετρο.
ErrorLoginDoesNotExists=Χρήστης με <b>%s</b> login δεν θα μπορούσε να βρεθεί.
WarningInstallDirExists=Προειδοποίηση, κατάλογο εγκατάστασης <b>(htdocs / εγκατάσταση)</b> εξακολουθεί να υφίσταται. Αυτό είναι ένα σοβαρό κενό ασφαλείας. Θα πρέπει να καταργηθεί το συντομότερο δυνατό.
WarningUntilDirRemoved=Όλες οι προειδοποιήσεις ασφαλείας (ορατό από το admin χρήστες μόνο) θα παραμείνει ενεργό για όσο διάστημα η ευπάθεια είναι παρούσα (ή ότι η συνεχής MAIN_REMOVE_INSTALL_WARNING προστίθεται στο Setup-&gt; Άλλες setup).

12
htdocs/langs/el_GR/other.lang
View File

@ -151,16 +151,6 @@ Export=Εξαγωγή
// START - Lines generated via autotranslator.php tool (2011-10-10 02:45:33).
// Reference language: en_US -> el_GR
ErrorForbidden3=Φαίνεται ότι Dolibarr δεν χρησιμοποιείται μέσω επικυρωμένο συνεδρία. Ρίξτε μια ματιά στην τεκμηρίωση της εγκατάστασης Dolibarr να ξέρει πώς να διαχειριστεί authentications (htaccess, mod_auth ή άλλα ...).
ErrorNoImagickReadimage=Κατηγορία imagick δεν βρίσκεται σε αυτό το PHP. Δεν προεπισκόπηση μπορεί να είναι διαθέσιμες. Οι διαχειριστές μπορούν να απενεργοποιήσουν αυτή την καρτέλα από το πρόγραμμα Εγκατάστασης μενού - Οθόνη.
ErrorRecordAlreadyExists=Εγγραφή υπάρχει ήδη
ErrorCantReadFile=Αποτυχία ανάγνωσης αρχείου &quot;%s»
ErrorCantReadDir=Αποτυχία ανάγνωσης »%s» κατάλογο
ErrorFailedToFindEntity=Αποτυχία ανάγνωσης »%s» περιβάλλον
ErrorBadLoginPassword=Bad αξία για σύνδεση ή τον κωδικό πρόσβασης
ErrorLoginDisabled=Ο λογαριασμός σας έχει απενεργοποιηθεί
ErrorFailedToRunExternalCommand=Απέτυχε να τρέξει εξωτερική εντολή. Ελέγξτε ότι είναι διαθέσιμο και εκτελέσιμη από PHP server σας. Αν η PHP <b>Safe Mode</b> είναι ενεργοποιημένη, βεβαιωθείτε ότι η εντολή είναι μέσα σε έναν κατάλογο που ορίζεται από <b>safe_mode_exec_dir</b> παράμετρο.
ErrorLoginDoesNotExists=Χρήστης με <b>%s</b> login δεν θα μπορούσε να βρεθεί.
Notify_BILL_PAYED=Τιμολογίου Πελατών payed
Notify_BILL_CANCEL=Τιμολογίου Πελατών ακυρώσεις
Notify_BILL_SENTBYMAIL=Τιμολογίου Πελατών σταλούν ταχυδρομικώς
@ -171,8 +161,6 @@ Notify_BILL_SUPPLIER_PAYED=Τιμολόγιο Προμηθευτή payed
Notify_BILL_SUPPLIER_SENTBYMAIL=Τιμολόγιο Προμηθευτή σταλούν ταχυδρομικώς
Notify_CONTRACT_VALIDATE=Επικυρωμένη σύμβαση
Notify_FICHEINTER_VALIDATE=Επικυρωθεί Παρέμβαση
WarningInstallDirExists=Προειδοποίηση, κατάλογο εγκατάστασης <b>(htdocs / εγκατάσταση)</b> εξακολουθεί να υφίσταται. Αυτό είναι ένα σοβαρό κενό ασφαλείας. Θα πρέπει να καταργηθεί το συντομότερο δυνατό.
WarningUntilDirRemoved=Όλες οι προειδοποιήσεις ασφαλείας (ορατό από το admin χρήστες μόνο) θα παραμείνει ενεργό για όσο διάστημα η ευπάθεια είναι παρούσα (ή ότι η συνεχής MAIN_REMOVE_INSTALL_WARNING προστίθεται στο Setup-&gt; Άλλες setup).
PredefinedMailTestHtml=Αυτό είναι ένα μήνυμα <b>δοκιμής</b> (η δοκιμή λέξη πρέπει να είναι με έντονα γράμματα). <br> Οι δύο γραμμές που χωρίζονται με ένα χαρακτήρα επαναφοράς.
DemoCompanyProductAndStocks=Διαχειριστείτε μια μικρή ή μεσαία επιχείρηση πώλησης προϊόντων
DemoCompanyAll=Διαχειριστείτε μια μικρή ή μεσαία εταιρεία με πολλαπλές δραστηριότητες (όλες οι κύριες ενότητες)

1
htdocs/langs/en_AU/.cvsignore
View File

@ -1 +0,0 @@
google.lang

1
htdocs/langs/en_IN/.cvsignore
View File

@ -1 +0,0 @@
google.lang

1
htdocs/langs/en_NZ/.cvsignore
View File

@ -1 +0,0 @@
google.lang

1
htdocs/langs/en_US/.cvsignore
View File

@ -1 +0,0 @@
google.lang

16
htdocs/langs/en_US/compta.lang
View File

@ -6,8 +6,8 @@ Treasury=Treasury
MenuFinancial=Financial
TaxModuleSetupToModifyRules=Go to <a href="%s">module setup</a> to modify rules for calculation
OptionMode=Option for accountancy
OptionModeTrue=Option Input-Output
OptionModeVirtual=Option Credits-Debits
OptionModeTrue=Option Incomes-Expenses
OptionModeVirtual=Option Claims-Debts
OptionModeTrueDesc=In this context, the turnover is calculated over payments (date of payments). \nThe validity of the figures is assured only if the book-keeping is scrutinized through the input/output on the accounts via invoices.
OptionModeVirtualDesc=In this context, the turnover is calculated over invoices (date of validation). When these invoices are due, whether they have been paid or not, they are listed in the turnover output.
FeatureIsSupportedInInOutModeOnly=Feature only available in CREDITS-DEBTS accountancy mode (See Accountancy module configuration)
@ -37,7 +37,11 @@ VATToPay=VAT sells
VATReceived=VAT received
VATToCollect=VAT purchases
VATSummary=VAT Balance
LT2SummaryES=IRPF Balance
VATPaid=VAT paid
LT2PaidES=IRPF Paid
LT2CustomerES=IRPF sales
LT2SupplierES=IRPF purchases
VATCollected=VAT collected
ToPay=To pay
ToGet=To get back
@ -63,6 +67,9 @@ ListOfCustomerPayments=List of customer payments
ListOfSupplierPayments=List of supplier payments
DatePayment=Payment date
NewVATPayment=New VAT payment
newLT2PaymentES=New IRPF payment
LT2PaymentES=IRPF Payment
LT2PaymentsES=IRPF Payments
VATPayment=VAT Payment
VATPayments=VAT Payments
SocialContributionsPayments=Social contributions payments
@ -95,15 +102,16 @@ DeleteSocialContribution=Delete a social contribution
ConfirmDeleteSocialContribution=Are you sure you want to delete this social contribution?
ExportDataset_tax_1=Social contributions and payments
AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary, mode <b>%sRevenues-Expenses%s</b> said <b>cash accounting</b>.
AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by third parties, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by third parties, mode <b>%sRevenues-Expenses%s</b> said <b>cash accounting</b>.
AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by third parties, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
SeeReportInInputOutputMode=See report <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b> for a calculation on actual payments made
SeeReportInDueDebtMode=See report <b>%sClaims-Debts%s</b> said <b>commitment accounting</b> for a calculation on issued invoices
RulesResultDue=- Amounts shown are with all taxes included<br>- It includes outstanding invoices, expenses and VAT whether they are paid or not. <br>- It is based on the validation date of invoices and VAT and on the due date for expenses.
RulesResultInOut=- Amounts shown are with all taxes included<br>- It includes the real payments made on invoices, expenses and VAT. <br>- It is based on the payment dates of the invoices, expenses anf VAT.<br>
RulesCADue=- It includes the client's due invoices (except deposit invoices) whether they are paid or not. <br>- It is based on the validation date of these invoices. <br>
RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid (VAT receipt)
VATReportByCustomersInDueDebtMode=Report by the customer VAT collected and paid (VAT rate)
VATReportByQuartersInInputOutputMode=Report by rate of the VAT collected and paid (VAT receipt)

40
htdocs/langs/en_US/errors.lang
View File

@ -1,6 +1,8 @@
# Dolibarr language file - en_US - errors
CHARSET=UTF-8
MenuManager=Menu manager
# Errors
Error=Error
Errors=Errors
ErrorBadEMail=EMail %s is wrong
@ -50,11 +52,6 @@ ErrorNoTmpDir=Temporary directy %s does not exists.
ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
ErrorFileSizeTooLarge=File size is too large.
ErrorFieldCanNotContainSpecialCharacters=Field <b>%s</b> must not contains special characters.
WarningSafeModeOnCheckExecDir=Warning, PHP option <b>safe_mode</b> is on so command must be stored inside a directory declared by php parameter <b>safe_mode_exec_dir</b>.
WarningAllowUrlFopenMustBeOn=Parameter <b>allow_url_fopen</b> must be set to <b>on</b> in filer <b>php.ini</b> for having this module working completely. You must modify this file manually.
WarningBuildScriptNotRunned=Script <b>%s</b> was not yet ran to build graphics, or there is no data to show.
WarningBookmarkAlreadyExists=A bookmark with this title or this target (URL) already exists.
WarningPassIsEmpty=Warning, database password is empty. This is a security hole. You should add a password to your database and change your conf.php file to reflect this.
ErrorNoAccountancyModuleLoaded=No accountancy module activated
ErrorExportDuplicateProfil=This profil name already exists for this export set.
ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
@ -63,17 +60,14 @@ ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "statut not s
ErrorRefAlreadyExists=Ref used for creation already exists.
ErrorPleaseTypeBankTransactionReportName=Please type bank receipt name where transaction is reported (Format YYYYMM or YYYYMMDD)
ErrorRecordHasChildren=Failed to delete records since it has some childs.
WarningConfFileMustBeReadOnly=Warning, your config file (<b>htdocs/conf/conf.php</b>) can be overwritten by the web server. This is a serious security hole. Modify permissions on file to be in read only mode for operating system user used by Web server. If you use Windows and FAT format for your disk, you must know that this file system does not allow to add permissions on file, so can't be completely safe.
ErrorModuleRequireJavascript=Javascript must not be disabled to have this feature working. To enable/disable Javascript, go to menu Home->Setup->Display.
ErrorPasswordsMustMatch=Both typed passwords must match each other
ErrorContactEMail=A technical error occured. Please, contact administrator to following email <b>%s</b> en provide the error code <b>%s</b> in your message, or even better by adding a screen copy of this page.
ErrorWrongValueForField=Wrong value for field number <b>%s</b> (value '<b>%s</b>' does not match regex rule <b>%s</b>)
ErrorFieldValueNotIn=Wrong value for field number<b>%s</b> (value '<b>%s</b>' is not a value available into field <b>%s</b> of table <b>%s</b>)
ErrorsOnXLines=Errors on <b>%s</b> source lines
WarningsOnXLines=Warnings on <b>%s</b> source lines
ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be choosed by default until you check your module setup.
ErrorDatabaseParameterWrong=Database setup parameter '<b>%s</b>' has a value not compatible to use Dolibarr (must have value '<b>%s</b>').
ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
@ -86,4 +80,32 @@ ErrorProductWithRefNotExist=Product with reference '<i>%s</i>' don't exist
ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transation that is conciliated
ErrorProdIdAlreadyExist=%s is assigned to another third
ErrorFailedToSendPassword=Failed to send password
ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEXMLLOAD_DEBUG if error messages does not provide enough information.
ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEXMLLOAD_DEBUG if error messages does not provide enough information.
ErrorPasswordDiffers=Passwords differs, please type them again.
ErrorForbidden=Access denied.<br>You try to access to a page, area or feature without being in an authenticated session or that is not allowed to your user.
ErrorForbidden2=Permission for this login can be defined by your Dolibarr administrator from menu %s->%s.
ErrorForbidden3=It seems that Dolibarr is not used through an authenticated session. Take a look at Dolibarr setup documentation to know how to manage authentications (htaccess, mod_auth or other...).
ErrorNoImagickReadimage=Class Imagick is not found in this PHP. No preview can be available. Administrators can disable this tab from menu Setup - Display.
ErrorRecordAlreadyExists=Record already exists
ErrorCantReadFile=Failed to read file '%s'
ErrorCantReadDir=Failed to read directory '%s'
ErrorFailedToFindEntity=Failed to read environment '%s'
ErrorBadLoginPassword=Bad value for login or password
ErrorLoginDisabled=Your account has been disabled
ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
ErrorFailedToChangePassword=Failed to change password
ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
ErrorLoginHasNoEmail=This user has no email address. Process aborted.
ErrorBadValueForCode=Bad value for security code. Try again with new value...
# Warnings
WarningSafeModeOnCheckExecDir=Warning, PHP option <b>safe_mode</b> is on so command must be stored inside a directory declared by php parameter <b>safe_mode_exec_dir</b>.
WarningAllowUrlFopenMustBeOn=Parameter <b>allow_url_fopen</b> must be set to <b>on</b> in filer <b>php.ini</b> for having this module working completely. You must modify this file manually.
WarningBuildScriptNotRunned=Script <b>%s</b> was not yet ran to build graphics, or there is no data to show.
WarningBookmarkAlreadyExists=A bookmark with this title or this target (URL) already exists.
WarningPassIsEmpty=Warning, database password is empty. This is a security hole. You should add a password to your database and change your conf.php file to reflect this.
WarningConfFileMustBeReadOnly=Warning, your config file (<b>htdocs/conf/conf.php</b>) can be overwritten by the web server. This is a serious security hole. Modify permissions on file to be in read only mode for operating system user used by Web server. If you use Windows and FAT format for your disk, you must know that this file system does not allow to add permissions on file, so can't be completely safe.
WarningsOnXLines=Warnings on <b>%s</b> source lines
WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be choosed by default until you check your module setup.
WarningInstallDirExists=Warning, install directory (<b>htdocs/install</b>) still exists. This is a serious security hole. You should removed it as soon as possible.
WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other setup).

1
htdocs/langs/en_US/js/jquery.ui.datepicker.js vendored Normal file
View File

@ -0,0 +1 @@
/* US initialisation for the jQuery UI date picker plugin. */

3
htdocs/langs/en_US/main.lang
View File

@ -298,6 +298,8 @@ IncludedVAT=Included tax
HT=Net of tax
TTC=Inc. tax
VAT=Sales tax
LT1ES=RE
LT2ES=IRPF
VATRate=Tax Rate
Average=Average
Sum=Sum
@ -601,6 +603,7 @@ AttributeCode=Attribute code
OptionalFieldsSetup=Extra attributes setup
URLPhoto=Url of photo/logo
CreateDraft=Create draft
ClickToEdit=Click to edit
# Week day
Monday=Monday

18
htdocs/langs/en_US/other.lang
View File

@ -1,21 +1,5 @@
# Dolibarr language file - en_US - other
CHARSET=UTF-8
ErrorPasswordDiffers=Passwords differs, please type them again.
ErrorForbidden=Access denied.<br>You try to access to a page, area or feature without being in an authenticated session or that is not allowed to your user.
ErrorForbidden2=Permission for this login can be defined by your Dolibarr administrator from menu %s->%s.
ErrorForbidden3=It seems that Dolibarr is not used through an authenticated session. Take a look at Dolibarr setup documentation to know how to manage authentications (htaccess, mod_auth or other...).
ErrorNoImagickReadimage=Class Imagick is not found in this PHP. No preview can be available. Administrators can disable this tab from menu Setup - Display.
ErrorRecordAlreadyExists=Record already exists
ErrorCantReadFile=Failed to read file '%s'
ErrorCantReadDir=Failed to read directory '%s'
ErrorFailedToFindEntity=Failed to read environment '%s'
ErrorBadLoginPassword=Bad value for login or password
ErrorLoginDisabled=Your account has been disabled
ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
ErrorFailedToChangePassword=Failed to change password
ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
ErrorLoginHasNoEmail=This user has no email address. Process aborted.
ErrorBadValueForCode=Bad value for security code. Try again with new value...
SecurityCode=Security code
Calendar=Calendar
AddTrip=Add trip
@ -62,8 +46,6 @@ AttachANewFile=Attach a new file/document
LinkedObject=Linked object
Miscellanous=Miscellaneous
NbOfActiveNotifications=Number of notifications
WarningInstallDirExists=Warning, install directory (<b>htdocs/install</b>) still exists. This is a serious security hole. You should removed it as soon as possible.
WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other setup).
PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.
PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.
PredefinedMailContentSendInvoice=You will find here the invoice __FACREF__\n\nSincerely\n\n

Some files were not shown because too many files have changed in this diff Show More