diff --git a/ChangeLog b/ChangeLog
index 22b71858b4c..f214ca75010 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -41,18 +41,18 @@ For users:
- New: A more responsive desgin for statistic box of home page.
- Qual: Implement same rule for return value of all command line scripts (0 when success, <>0 if error).
- New: [ task #1005 ] Adapting to Spanish legislation bill numbering
-- New: [ task #1011 ] Now supplier order and invoice deal with payment terms and mode
-- New: [ task #1014 ] Add option to recursivly add parent category
-- New: [ task #1016 ] Can define a specific numbering for deposits
-- New: [ task #918 ] Stock replenishment
-- Fix: [ bug #992 ] Proforma invoices don't have a separated numeric count
-- New : Add pdf link into supplier invoice list and supplier order list
-- New : Genrate auto the PDF for supplier invoice
-- New : Add category into filter webservice thirdparty method getListOfThirdParties
-- New : Allow to define margin or mark rate during quoting, ordering, invoicing
-- New : User permissions on margin module
-- New : Add ref supplier into muscadet model
-- New : Add ability to copy contact address to clipboard
+- New: [ task #1011 ] Now supplier order and invoice deal with payment terms and mode.
+- New: [ task #1014 ] Add option to recursivly add parent category.
+- New: [ task #1016 ] Can define a specific numbering for deposits.
+- New: [ task #918 ] Stock replenishment.
+- Fix: [ bug #992 ] Proforma invoices don't have a separated numeric count.
+- New : Add pdf link into supplier invoice list and supplier order list.
+- New : Genrate auto the PDF for supplier invoice.
+- New : Add category into filter webservice thirdparty method getListOfThirdParties.
+- New : Allow to define margin or mark rate during quoting, ordering, invoicing.
+- New : User permissions on margin module.
+- New : Add ref supplier into muscadet model/
+- New : Add ability to copy contact address to clipboard.
- New: Can use tag {mm} before {yy} even when there is a reset into numbering masks.
- New: [ task #1060 ] Register fields localtax(1|2)_type into details tables.
- New: [ task #923 ] Localtax support for ODT templates.
diff --git a/build/debian/README.howto b/build/debian/README.howto
index 4978b686070..6f06f5ab91b 100644
--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -207,8 +207,11 @@ Note: If there was errors managed manually, you may need to make a git commit bu
> sbuild ...
> dput ...
-* Go into page. You should see new package into unstable.
-http://packages.qa.debian.org/t/tcpdf.html
+* Package arrives into FTPmaster taskboard with status NEW (pending upload). You can view it at:
+http://ftp-master.debian.org/new/
+
+* Once package is validated, you should see it into area unstable at:
+http://packages.qa.debian.org
* Package will be into release when test will be moved as stable.
diff --git a/dev/iso-normes/vat_number_names.txt b/dev/iso-normes/vat_number_names.txt
new file mode 100644
index 00000000000..23fce59ed3b
--- /dev/null
+++ b/dev/iso-normes/vat_number_names.txt
@@ -0,0 +1 @@
+http://en.wikipedia.org/wiki/VAT_identification_number
\ No newline at end of file
diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
index 2648a8ae721..251eb062b15 100644
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -273,6 +273,8 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->adherent->creer)
$object->pass = trim($_POST["pass"]);
$object->societe = trim($_POST["societe"]);
+ $object->company = trim($_POST["societe"]);
+
$object->address = trim($_POST["address"]);
$object->zip = trim($_POST["zipcode"]);
$object->town = trim($_POST["town"]);
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index b0f51e442c6..45e69448f43 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -296,9 +296,6 @@ if ($result)
print '';
print '';
print '
';
- print '
';
- print '';
- print '
';
print '
';
print $langs->trans('Month').': ';
print ' '.$langs->trans('Year').': ';
diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php
index cc3f0cd548d..650733dbb9c 100644
--- a/htdocs/compta/bank/search.php
+++ b/htdocs/compta/bank/search.php
@@ -42,7 +42,7 @@ $debit=GETPOST("debit");
$credit=GETPOST("credit");
$type=GETPOST("type");
$account=GETPOST("account");
-$bid=GETPOST("bid");
+$bid=GETPOST("bid","int");
$param='';
if ($description) $param.='&description='.$description;
@@ -83,7 +83,7 @@ $sql.= " b.fk_account, b.fk_type,";
$sql.= " ba.rowid as bankid, ba.ref as bankref,";
$sql.= " bu.label as labelurl, bu.url_id";
$sql.= " FROM ";
-if (! empty($_REQUEST["bid"])) $sql.= MAIN_DB_PREFIX."bank_class as l,";
+if ($bid) $sql.= MAIN_DB_PREFIX."bank_class as l,";
$sql.= " ".MAIN_DB_PREFIX."bank_account as ba,";
$sql.= " ".MAIN_DB_PREFIX."bank as b";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu ON bu.fk_bank = b.rowid AND type = 'company'";
@@ -92,21 +92,21 @@ $sql.= " WHERE b.fk_account = ba.rowid";
$sql.= " AND ba.entity = ".$conf->entity;
if (GETPOST("req_nb"))
{
- $sql.= " AND b.num_chq like '%".$db->escape(GETPOST("req_nb"))."%'";
+ $sql.= " AND b.num_chq LIKE '%".$db->escape(GETPOST("req_nb"))."%'";
$param.='&req_nb='.urlencode(GETPOST("req_nb"));
}
if (GETPOST("thirdparty"))
{
- $sql.=" AND (COALESCE(s.nom,'') LIKE '%".$db->escape(GETPOST("thirdparty"))."%')";
+ $sql.=" AND s.nom LIKE '%".$db->escape(GETPOST("thirdparty"))."%'";
$param.='&thirdparty='.urlencode(GETPOST("thirdparty"));
}
-if (! empty($_REQUEST["bid"]))
+if ($bid)
{
- $sql.= " AND b.rowid=l.lineid AND l.fk_categ=".$_REQUEST["bid"];
+ $sql.= " AND b.rowid=l.lineid AND l.fk_categ=".$bid;
}
-if(! empty($type))
+if (! empty($type))
{
- $sql .= " AND b.fk_type = '" . $type ."' ";
+ $sql.= " AND b.fk_type = '".$db->escape($type)."' ";
}
// Search criteria amount
$si=0;
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index d8c134c12ef..d28f457fb2b 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -116,7 +116,8 @@ $total_ttc=0;
if ($modecompta=="CREANCES-DETTES")
{
$nom=$langs->trans("AnnualByCompaniesDueDebtMode");
- $nom.=' ('.$langs->trans("SeeReportInInputOutputMode",'','').')';
+ $calcmode=$langs->trans("CalcModeDebt");
+ $calcmode.=' ('.$langs->trans("SeeReportInInputOutputMode",'','').')';
$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
//$periodlink=''.img_previous().''.img_next().'';
$description=$langs->trans("RulesResultDue");
@@ -127,7 +128,8 @@ if ($modecompta=="CREANCES-DETTES")
}
else {
$nom=$langs->trans("AnnualByCompaniesInputOutputMode");
- $nom.=' ('.$langs->trans("SeeReportInDueDebtMode",'','').')';
+ $calcmode=$langs->trans("CalcModeEngagement");
+ $calcmode.=' ('.$langs->trans("SeeReportInDueDebtMode",'','').')';
//$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',1,1,0,'',1,0,1);
$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
//$periodlink=''.img_previous().''.img_next().'';
@@ -135,7 +137,7 @@ else {
$builddate=time();
//$exportlink=$langs->trans("NotYetAvailable");
}
-report_header($nom,$nomlink,$period,$periodlink,$description,$builddate,$exportlink,array('modecompta'=>$modecompta));
+report_header($nom,$nomlink,$period,$periodlink,$description,$builddate,$exportlink,array('modecompta'=>$modecompta),$calcmode);
// Show report array
print '