mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts: ChangeLog htdocs/filefunc.inc.php
This commit is contained in:
Laurent Destailleur
commit
532e05c42e
88
ChangeLog
88
ChangeLog
|
|
@ -260,6 +260,68 @@ Following changes may create regressions for some external modules, but were nec
|
|||
where {TYPE} is contact type code (BILLING, SHIPPING, CUSTOMER, ... see contact type dictionnary).
|
||||
|
||||
|
||||
|
||||
***** ChangeLog for 7.0.4 compared to 7.0.3 *****
|
||||
FIX: #8984 button create expense report
|
||||
FIX: #9032
|
||||
FIX: #9161
|
||||
FIX: #9328
|
||||
FIX: According to french law, if seller is in France and buyer isn't in UE and isn't a company, TVA used = TVA product
|
||||
FIX: Add calls to fetchComments function
|
||||
FIX: better compatibility with multicompany
|
||||
FIX: case when we valid form with keyboard
|
||||
FIX: character making error on bill list
|
||||
FIX: check !empty exclude select element
|
||||
FIX: combo into popup become crazy with IE10
|
||||
FIX: combo of stock in popup are crazy in IE
|
||||
FIX: Deletion of files in migration
|
||||
FIX: exclude element of the select
|
||||
FIX: extrafieldkey
|
||||
FIX: Fetch function will fetch comments
|
||||
FIX: Fetch task will now fetch comments
|
||||
FIX: filter supplier invoice list by societe name.
|
||||
FIX: $fk_account is always empty, must be $soc->fk_account
|
||||
FIX: Force stripe api version to avoid trouble if we update stripe api
|
||||
FIX: getEntity project and not projet
|
||||
FIX: Get templates in a forced language
|
||||
FIX: global $mysoc missing (to avoid php notice on lines 279, 280 & 281)
|
||||
FIX: Injection
|
||||
FIX: invoice stats: situation invoices were not counted
|
||||
FIX: keep context filter on contact list on change column displayed
|
||||
FIX: Keep same project when creating shipping from order
|
||||
FIX: langs fr
|
||||
FIX: Lose filter on payment type or category after a sort on invoice list
|
||||
FIX: Missing behavior
|
||||
FIX: missing hook to edit sql
|
||||
FIX: multicompany compatibility !
|
||||
FIX: need to filter on current entity on replenish
|
||||
FIX: Option MAIN_DISABLE_NOTES_TAB #9611
|
||||
FIX: page must always be 0 when we search (to avoid case : when we're on page 3 and we're looking for a precise thirdparty, we stay on page 3 and nothing's displaied)
|
||||
FIX: Pagination on related item pages
|
||||
FIX: Pagination on withdraw request list
|
||||
FIX: PDF address: handle when contact thirdparty different from document thirdparty
|
||||
FIX: PHP warning, undefined index notnull
|
||||
FIX: Product marge tabs on product card
|
||||
FIX: Product margin tab and credit note
|
||||
FIX: propal: correctly preset project when creating with origin/originid
|
||||
FIX: remain to pay for credit note was wrong on invoice list
|
||||
FIX: remove debug
|
||||
FIX: Remove fetchComments from project and task fetch function
|
||||
FIX: remove rowid for multicompany compatibility
|
||||
FIX: Search on Ref project on order list
|
||||
FIX: search on ref project on propal list
|
||||
FIX: showOptionals: column mismatches
|
||||
FIX: SQL Injections reported by mu shcor (ADLab of Venustech)
|
||||
FIX: stock replenish with multientity
|
||||
FIX: table llx_chargessociales doesn't exists
|
||||
FIX: we must see number of all shared projects
|
||||
FIX: when stock is empty for current entity but > 0 in other entity, until this commit product wasn't displaied on replenishment, it must depends on multientity stock sharing
|
||||
FIX: when we're just admin and not super admin, if we create new user with transverse mode, we don't see it then we can't add him in usergroup
|
||||
FIX: wrong function name
|
||||
FIX: Wrong position of firstname lastname
|
||||
FIX: wrong value for module part and return access denied
|
||||
FIX: Wrong variable and trigger name
|
||||
|
||||
***** ChangeLog for 7.0.3 compared to 7.0.2 *****
|
||||
FIX: 7.0 task contact card without withproject parameters
|
||||
FIX: #8722
|
||||
|
|
@ -742,6 +804,32 @@ Following changes may create regressions for some external modules, but were nec
|
|||
multicompany module to a version that support Dolibarr v7, everything should work as expected.
|
||||
|
||||
|
||||
***** ChangeLog for 6.0.8 compared to 6.0.7 *****
|
||||
FIX: #8762
|
||||
FIX: #9032
|
||||
FIX: case when we valid form with keyboard
|
||||
FIX: clause must not be there
|
||||
FIX: dol_delete_file must work in a context without db handler loaded
|
||||
FIX: entity test must be on product_fourn_price table and not product table
|
||||
FIX: Fetch shipping will now fetch project id
|
||||
FIX: $fk_account is always empty, must be $soc->fk_account
|
||||
FIX: getEntity project and not projet
|
||||
FIX: If we enable 3 steps for supplier order approbation, we must not delete all fourn rights def.
|
||||
FIX: Keep supplier proposal price for supplier order
|
||||
FIX: langs fr
|
||||
FIX: missing filters during reordering
|
||||
FIX: need to filter on aa.entity for same accounting accounts available in several entities
|
||||
FIX: page must always be 0 when we search (to avoid case : when we're on page 3 and we're looking for a precise thirdparty, we stay on page 3 and nothing's displaied)
|
||||
FIX: PDF address: handle when contact thirdparty different from document thirdparty
|
||||
FIX: propal: correctly preset project when creating with origin/originid
|
||||
FIX: pu_ht_devise was not converted to numeric so decimals were lost when calculating total_ht_devise
|
||||
FIX: remain to pay for credit note was wrong on invoice list
|
||||
FIX: shipment: fk_proje(c)t not handled in fetch() and update() methods
|
||||
FIX: showOptionals: column mismatches
|
||||
FIX: sometimes amounts are identical but php find them different.
|
||||
FIX: test is_erasable() must be done before call function delete() too to avoid delete invoice with &action=delete in url
|
||||
FIX: we must see number of all shared projects
|
||||
FIX: wrong var name
|
||||
|
||||
***** ChangeLog for 6.0.7 compared to 6.0.6 *****
|
||||
FIX: #8023
|
||||
|
|
|
|||
|
|
@ -964,6 +964,7 @@ if (empty($reshook))
|
|||
// Add custom code and origin country into description
|
||||
if (empty($conf->global->MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE) && (! empty($prod->customcode) || ! empty($prod->country_code)))
|
||||
{
|
||||
$tmptxt = '(';
|
||||
// Define output language
|
||||
if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
|
||||
$outputlangs = $langs;
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ if (! empty($extrafieldsobjectkey)) // $extrafieldsobject is the $object->table_
|
|||
if ($align) print ' align="'.$align.'"';
|
||||
print '>';
|
||||
$tmpkey='options_'.$key;
|
||||
if (in_array($extrafields->attributes[$extrafieldsobjectkey]['type'][$key], array('date', 'datetime', 'timestamp')))
|
||||
if (in_array($extrafields->attributes[$extrafieldsobjectkey]['type'][$key], array('date', 'datetime', 'timestamp')) && !is_numeric($obj->$tmpkey))
|
||||
{
|
||||
$datenotinstring = $obj->$tmpkey;
|
||||
if (! is_numeric($obj->$tmpkey)) // For backward compatibility
|
||||
|
|
|
|||
|
|
@ -345,7 +345,7 @@ if ($resql)
|
|||
// Real stock
|
||||
print '<td align="right">';
|
||||
if ($objp->seuil_stock_alerte != '' && ($objp->stock_physique < $objp->seuil_stock_alerte)) print img_warning($langs->trans("StockTooLow")).' ';
|
||||
print $objp->stock_physique;
|
||||
print $objp->stock_physique|0;
|
||||
print '</td>';
|
||||
|
||||
// Details per warehouse
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ class Societe extends CommonObject
|
|||
* Thirdparty name
|
||||
* @var string
|
||||
* @deprecated Use $name instead
|
||||
* @see name
|
||||
* @see $name
|
||||
*/
|
||||
public $nom;
|
||||
|
||||
|
|
@ -128,21 +128,21 @@ class Societe extends CommonObject
|
|||
* State code
|
||||
* @var string
|
||||
* @deprecated Use state_code instead
|
||||
* @see state_code
|
||||
* @see $state_code
|
||||
*/
|
||||
public $departement_code;
|
||||
|
||||
/**
|
||||
* @var string
|
||||
* @deprecated Use state instead
|
||||
* @see state
|
||||
* @see $state
|
||||
*/
|
||||
public $departement;
|
||||
|
||||
/**
|
||||
* @var string
|
||||
* @deprecated Use country instead
|
||||
* @see country
|
||||
* @see $country
|
||||
*/
|
||||
public $pays;
|
||||
|
||||
|
|
@ -317,7 +317,7 @@ class Societe extends CommonObject
|
|||
/**
|
||||
* @var string
|
||||
* @deprecated Note is split in public and private notes
|
||||
* @see note_public, note_private
|
||||
* @see $note_public, $note_private
|
||||
*/
|
||||
public $note;
|
||||
|
||||
|
|
@ -1979,24 +1979,33 @@ class Societe extends CommonObject
|
|||
|
||||
if (! empty($conf->global->SOCIETE_ADD_REF_IN_LIST) && (!empty($withpicto)))
|
||||
{
|
||||
$code = '';
|
||||
if (($this->client) && (! empty ( $this->code_client ))
|
||||
&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
|
||||
|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 2
|
||||
)
|
||||
)
|
||||
$code = $this->code_client . ' - ';
|
||||
{
|
||||
$code = $this->code_client . ' - ';
|
||||
}
|
||||
|
||||
if (($this->fournisseur) && (! empty ( $this->code_fournisseur ))
|
||||
&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
|
||||
|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 3
|
||||
)
|
||||
)
|
||||
$code .= $this->code_fournisseur . ' - ';
|
||||
{
|
||||
$code .= $this->code_fournisseur . ' - ';
|
||||
}
|
||||
|
||||
if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1)
|
||||
{
|
||||
$name =$code.' '.$name;
|
||||
}
|
||||
else
|
||||
{
|
||||
$name =$code;
|
||||
}
|
||||
}
|
||||
|
||||
if (!empty($this->name_alias)) $name .= ' ('.$this->name_alias.')';
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user