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

Merge remote-tracking branch 'origin/3.5' into develop

Browse Source 
Conflicts:
	htdocs/core/tpl/objectline_add.tpl.php
This commit is contained in:
Laurent Destailleur 2013-12-01 16:08:03 +01:00
commit b6386a3dce
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -145,6 +145,7 @@ Fix: wrong buy price update
Fix: [ bug #1142 ] Set paiement on invoice (PGSql)
Fix: [ bug #1145 ] Agenda button list type do not display
Fix: [ bug #1148 ] Product consomation : supplier order bad status
Fix: [ bug #1159 ] Commercial search "other" give p.note do not exists
***** ChangeLog for 3.4.1 compared to 3.4.0 *****
Fix: Display buying price on line edit when no supplier price is defined

6
htdocs/comm/propal/list.php
View File

@ -182,11 +182,7 @@ if ($search_montant_ht)
$sql.= " AND p.total_ht='".$db->escape(price2num(trim($search_montant_ht)))."'";
}
if ($sall) {
/*$scrit = explode(' ', $sall);
foreach ($scrit as $crit) {
$sql.= " AND (s.nom LIKE '%".$db->escape($crit)."%' OR p.note LIKE '%".$db->escape($crit)."%' OR pd.description LIKE '%".$db->escape($crit)."%')";
}*/
$sql .= natural_search(array('s.nom', 'p.note_private', 'pd.description'), $sall);
$sql .= natural_search(array('s.nom', 'p.note_private', 'p.note_public', 'pd.description'), $sall);
}
if ($socid) $sql.= ' AND s.rowid = '.$socid;
if ($viewstatut <> '')

21
htdocs/core/modules/societe/mod_codeclient_elephant.php
View File

@ -3,6 +3,7 @@
* Copyright (C) 2006-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2007-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Philippe Grand <philippe.grand@atoo-net.com>
*
* 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
@ -131,6 +132,16 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
$langs->load("errors");
$examplecust=$langs->trans($examplecust);
}
if($examplecust=="ErrorCantUseRazIfNoYearInMask")
{
$langs->load("errors");
$examplecust=$langs->trans($examplecust);
}
if($examplecust=="ErrorCantUseRazInStartedYearIfNoYearMonthInMask")
{
$langs->load("errors");
$examplecust=$langs->trans($examplecust);
}
}
if ($type == 1 || $type == -1)
{
@ -144,6 +155,16 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
$langs->load("errors");
$examplesup=$langs->trans($examplesup);
}
if($examplesup=="ErrorCantUseRazIfNoYearInMask")
{
$langs->load("errors");
$examplesup=$langs->trans($examplesup);
}
if($examplesup=="ErrorCantUseRazInStartedYearIfNoYearMonthInMask")
{
$langs->load("errors");
$examplesup=$langs->trans($examplesup);
}
}
if ($type == 0) return $examplecust;