Merge branch '12.0' of [email protected]:Dolibarr/dolibarr.git into develop

Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/fiche-stat.php

dev/resources/sepa/sample-credit-transfer.xml

@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Document xmlns="urn:iso:std:iso:20022:tech:xsd:pain.001.001.03">
+ <CstmrCdtTrfInitn>
+ <GrpHdr>
+ <MsgId>message-id-001</MsgId>
+ <CreDtTm>2010-09-28T14:07:00</CreDtTm>
+ <NbOfTxs>1</NbOfTxs>
+ <CtrlSum>10.1</CtrlSum>
+ <InitgPty>
+ <Nm>Bedrijfsnaam</Nm>
+ <Id>
+ <OrgId>
+ <Othr>
+ <Id>123456789123456</Id>
+ </Othr>
+ </OrgId>
+ </Id>
+ </InitgPty>
+ </GrpHdr>
+ <PmtInf>
+ <PmtInfId>minimaal gevuld</PmtInfId>
+ <PmtMtd>TRF</PmtMtd>
+ <NbOfTxs>1</NbOfTxs>
+ <CtrlSum>10.1</CtrlSum>
+ <ReqdExctnDt>2009-11-01</ReqdExctnDt>
+ <Dbtr>
+ <Nm>Naam</Nm>
+ </Dbtr>
+ <DbtrAcct>
+ <Id>
+ <IBAN>NL44RABO0123456789</IBAN>
+ </Id>
+ </DbtrAcct>
+ <DbtrAgt>
+ <FinInstnId>
+ <BIC>RABONL2U</BIC>
+ </FinInstnId>
+ </DbtrAgt>
+ <CdtTrfTxInf>
+ <PmtId>
+ <EndToEndId>non ref</EndToEndId>
+ </PmtId>
+ <Amt>
+ <InstdAmt Ccy="EUR">10.1</InstdAmt>
+ </Amt>
+ <ChrgBr>SLEV</ChrgBr>
+ <CdtrAgt>
+ <FinInstnId>
+ <BIC>ABNANL2A</BIC>
+ </FinInstnId>
+ </CdtrAgt>
+ <Cdtr>
+ <Nm>Naam creditor</Nm>
+ </Cdtr>
+ <CdtrAcct>
+ <Id>
+ <IBAN>NL90ABNA0111111111</IBAN>
+ </Id>
+ </CdtrAcct>
+ <RmtInf>
+ <Ustrd>vrije tekst</Ustrd>
+ </RmtInf>
+ </CdtTrfTxInf>
+ </PmtInf>
+ <PmtInf>
+ <PmtInfId>maximaal gevuld</PmtInfId>
+ <PmtMtd>TRF</PmtMtd>
+ <BtchBookg>true</BtchBookg>
+ <NbOfTxs>1</NbOfTxs>
+ <CtrlSum>20.2</CtrlSum>
+ <PmtTpInf>
+ <InstrPrty>NORM</InstrPrty>
+ <SvcLvl>
+ <Cd>SEPA</Cd>
+ </SvcLvl>
+ <LclInstrm>
+ <Cd>IDEAL</Cd>
+ </LclInstrm>
+ <CtgyPurp>
+ <Cd>SECU</Cd>
+ </CtgyPurp>
+ </PmtTpInf>
+ <ReqdExctnDt>2009-11-01</ReqdExctnDt>
+ <Dbtr>
+ <Nm>Naam</Nm>
+ <PstlAdr>
+ <Ctry>NL</Ctry>
+ <AdrLine>Debtor straat 1</AdrLine>
+ <AdrLine>9999 XX Plaats debtor</AdrLine>
+ </PstlAdr>
+ </Dbtr>
+ <DbtrAcct>
+ <Id>
+ <IBAN>NL44RABO0123456789</IBAN>
+ </Id>
+ </DbtrAcct>
+ <DbtrAgt>
+ <FinInstnId>
+ <BIC>RABONL2U</BIC>
+ </FinInstnId>
+ </DbtrAgt>
+ <UltmtDbtr>
+ <Id>
+ <OrgId>
+ <Othr>
+ <Id>12345678</Id>
+ <SchmeNm>
+ <Prtry>klantnummer</Prtry>
+ </SchmeNm>
+ <Issr>klantnummer uitgifte instantie</Issr>
+ </Othr>
+ </OrgId>
+ </Id>
+ </UltmtDbtr>
+ <ChrgBr>SLEV</ChrgBr>
+ <CdtTrfTxInf>
+ <PmtId>
+ <InstrId>debtor-to-debtor-bank-01</InstrId>
+ <EndToEndId>End-to-end-id-debtor-to-creditor-01</EndToEndId>
+ </PmtId>
+ <Amt>
+ <InstdAmt Ccy="EUR">20.2</InstdAmt>
+ </Amt>
+ <CdtrAgt>
+ <FinInstnId>
+ <BIC>ABNANL2A</BIC>
+ </FinInstnId>
+ </CdtrAgt>
+ <Cdtr>
+ <Nm>Naam creditor</Nm>
+ <PstlAdr>
+ <Ctry>NL</Ctry>
+ <AdrLine>Straat creditor 1</AdrLine>
+ <AdrLine>9999 XX Plaats creditor</AdrLine>
+ </PstlAdr>
+ </Cdtr>
+ <CdtrAcct>
+ <Id>
+ <IBAN>NL90ABNA0111111111</IBAN>
+ </Id>
+ </CdtrAcct>
+ <UltmtCdtr>
+ <Id>
+ <PrvtId>
+ <DtAndPlcOfBirth>
+ <BirthDt>1969-07-03</BirthDt>
+ <CityOfBirth>PLAATS</CityOfBirth>
+ <CtryOfBirth>NL</CtryOfBirth>
+ </DtAndPlcOfBirth>
+ </PrvtId>
+ </Id>
+ </UltmtCdtr>
+ <Purp>
+ <Cd>CHAR</Cd>
+ </Purp>
+ <RmtInf>
+ <Strd>
+ <CdtrRefInf>
+ <Tp>
+ <CdOrPrtry>
+ <Cd>SCOR</Cd>
+ </CdOrPrtry>
+ <Issr>CUR</Issr>
+ </Tp>
+ <Ref>1234567</Ref>
+ </CdtrRefInf>
+ </Strd>
+ </RmtInf>
+ </CdtTrfTxInf>
+ </PmtInf>
+ </CstmrCdtTrfInitn>
+</Document>

htdocs/admin/boxes.php

@@ -314,7 +314,7 @@
 
 print "<br>\n";
 print "\n\n".'<!-- Boxes Available -->'."\n";
-print load_fiche_titre($langs->trans("BoxesAvailable"));
+print load_fiche_titre($langs->trans("BoxesAvailable"), '', '');
 
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
 print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
@@ -377,7 +377,7 @@
 
 //var_dump($boxactivated);
 print "<br>\n\n";
-print load_fiche_titre($langs->trans("BoxesActivated"));
+print load_fiche_titre($langs->trans("BoxesActivated"), '', '');
 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="tagtable liste">'."\n";
@@ -436,7 +436,7 @@
 // Other parameters
 
 print "\n\n".'<!-- Other Const -->'."\n";
-print load_fiche_titre($langs->trans("Other"));
+print load_fiche_titre($langs->trans("Other"), '', '');
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="addconst">';

htdocs/admin/confexped.php

@@ -92,7 +92,7 @@
 print '<br>';
 $head = expedition_admin_prepare_head();
 
-dol_fiche_head($head, 'general', $langs->trans("Sendings"), -1, 'sending');
+dol_fiche_head($head, 'general', $langs->trans("Sendings"), -1, 'shipment');
 
 // Miscellaneous parameters
 

htdocs/admin/expedition.php

@@ -184,7 +184,7 @@
 print '<br>';
 $head = expedition_admin_prepare_head();
 
-dol_fiche_head($head, 'shipment', $langs->trans("Sendings"), -1, 'sending');
+dol_fiche_head($head, 'shipment', $langs->trans("Sendings"), -1, 'shipment');
 
 // Shipment numbering model
 

htdocs/admin/expedition_extrafields.php

@@ -76,7 +76,7 @@
 
 $head = expedition_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes_shipment', $langs->trans("Sendings"), -1, 'sending');
+dol_fiche_head($head, 'attributes_shipment', $langs->trans("Sendings"), -1, 'shipment');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 

htdocs/admin/expeditiondet_extrafields.php

@@ -77,7 +77,7 @@
 
 $head = expedition_admin_prepare_head();
 
-dol_fiche_head($head, 'attributeslines_shipment', $langs->trans("Sendings"), -1, 'sending');
+dol_fiche_head($head, 'attributeslines_shipment', $langs->trans("Sendings"), -1, 'shipment');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 

htdocs/admin/livraison.php

@@ -179,7 +179,7 @@
 print '<br>';
 $head = expedition_admin_prepare_head();
 
-dol_fiche_head($head, 'receivings', $langs->trans("Receivings"), -1, 'sending');
+dol_fiche_head($head, 'receivings', $langs->trans("Receivings"), -1, 'shipment');
 
 
 // Delivery numbering model

htdocs/admin/livraison_extrafields.php

@@ -76,7 +76,7 @@
 
 $head = expedition_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes_receivings', $langs->trans("Receivings"), -1, 'sending');
+dol_fiche_head($head, 'attributes_receivings', $langs->trans("Receivings"), -1, 'shipment');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 

htdocs/admin/livraisondet_extrafields.php

@@ -77,7 +77,7 @@
 
 $head = expedition_admin_prepare_head();
 
-dol_fiche_head($head, 'attributeslines_receivings', $langs->trans("Receivings"), -1, 'sending');
+dol_fiche_head($head, 'attributeslines_receivings', $langs->trans("Receivings"), -1, 'shipment');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 

htdocs/admin/menus.php

@@ -151,7 +151,7 @@
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="update">';
 
-dol_fiche_head($head, 'handler', $langs->trans("Menus"), -1);
+dol_fiche_head($head, 'handler', '', -1);
 
 print '<span class="opacitymedium">'.$langs->trans("MenusDesc")."</span><br>\n";
 print "<br>\n";

htdocs/admin/menus/index.php

@@ -229,7 +229,7 @@
 $head[$h][2] = 'misc';
 $h++;
 
-dol_fiche_head($head, 'editor', $langs->trans("Menus"), -1);
+dol_fiche_head($head, 'editor', '', -1);
 
 print '<span class="opacitymedium">'.$langs->trans("MenusEditorDesc")."</span><br>\n";
 print "<br>\n";

htdocs/admin/menus/other.php

@@ -75,7 +75,7 @@
 $head[$h][2] = 'misc';
 $h++;
 
-dol_fiche_head($head, 'misc', $langs->trans("Menus"), -1);
+dol_fiche_head($head, 'misc', '', -1);
 
 
 // Other Options

htdocs/compta/facture/class/facture.class.php

@@ -423,7 +423,7 @@ public function create(User $user, $notrigger = 0, $forceduedate = 0)
  $this->brouillon = 1;
 
  // Multicurrency (test on $this->multicurrency_tx because we should take the default rate only if not using origin rate)
- if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
+ if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $this->date);
  else $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
  if (empty($this->fk_multicurrency))
  {

htdocs/compta/facture/invoicetemplate_list.php

@@ -53,6 +53,8 @@
 
 $socid = GETPOST('socid', 'int');
 
+$socid = GETPOST('socid', 'int');
+
 // Security check
 $id = (GETPOST('facid', 'int') ?GETPOST('facid', 'int') : GETPOST('id', 'int'));
 $lineid = GETPOST('lineid', 'int');
@@ -151,6 +153,11 @@
 }
 
 
+if ($socid > 0) {
+ $tmpthirdparty = new Societe($db);
+ $res = $tmpthirdparty->fetch($socid);
+ if ($res > 0) $search_societe = $tmpthirdparty->name;
+}
 
 /*
  * Actions

htdocs/compta/paymentbybanktransfer/index.php

@@ -94,7 +94,7 @@
  */
 $sql = "SELECT f.ref, f.rowid, f.total_ttc, f.fk_statut, f.paye, f.type,";
 $sql .= " pfd.date_demande, pfd.amount,";
-$sql .= " s.nom as name, s.email, s.rowid as socid";
+$sql .= " s.nom as name, s.email, s.rowid as socid, s.tva_intra";
 $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f,";
 $sql .= " ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -138,13 +138,14 @@
  $thirdpartystatic->id = $obj->socid;
  $thirdpartystatic->name = $obj->name;
  $thirdpartystatic->email = $obj->email;
+ $thirdpartystatic->tva_intra = $obj->tva_intra;
 
  print '<tr class="oddeven"><td>';
  print $invoicestatic->getNomUrl(1, 'withdraw');
  print '</td>';
 
  print '<td>';
- print $thirdpartystatic->getNomUrl(1, 'customer');
+ print $thirdpartystatic->getNomUrl(1, 'supplier');
  print '</td>';
 
  print '<td class="right">';