diff --git a/ChangeLog b/ChangeLog
index e0f4159c49e..9b91afd128f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -114,6 +114,7 @@ NEW: Option in workflow module to set a reception billed on validate supplier bi
NEW: Autocompletion on lists should be available on mobile applications.
NEW: Add mass action to close several members.
NEW: Add hidden option ADD_UNSPLASH_LOGIN_BACKGROUND for random background
+NEW: Add hidden option to be ready for BREXIT
For Developers:
NEW: Module "DebugBar" is available as a stable module.
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 5314099db1f..192585ccedd 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -92,9 +92,6 @@ if (! $user->rights->accounting->bind->write)
$hookmanager->initHooks(array('accountancycustomerlist'));
$formaccounting = new FormAccounting($db);
-$accounting = new AccountingAccount($db);
-$aarowid_s = $accounting->fetch('', $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT, 1);
-$aarowid_p = $accounting->fetch('', $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT, 1);
$chartaccountcode = dol_getIdFromCode($db, $conf->global->CHARTOFACCOUNTS, 'accounting_system', 'rowid', 'pcg_version');
@@ -384,11 +381,11 @@ if ($result) {
print '';
print '
';
// Column with checkbox
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index c3b9bcec2cf..1e27cb112d3 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -649,6 +649,8 @@ function getFormeJuridiqueLabel($code)
*/
function getCountriesInEEC()
{
+ global $conf;
+
// List of all country codes that are in europe for european vat rules
// List found on http://ec.europa.eu/taxation_customs/common/faq/faq_1179_en.htm#9
$country_code_in_EEC=array(
@@ -687,6 +689,12 @@ function getCountriesInEEC()
//'CH', // Switzerland - No. Swizerland in not in EEC
);
+ if (! empty($conf->global->MAIN_COUNTRIES_IN_EEC))
+ {
+ // For example MAIN_COUNTRIES_IN_EEC = 'AT,BE,BG,CY,CZ,DE,DK,EE,ES,FI,FR,GB,GR,HR,NL,HU,IE,IM,IT,LT,LU,LV,MC,MT,PL,PT,RO,SE,SK,SI,UK'
+ $country_code_in_EEC = explode(',', $conf->global->MAIN_COUNTRIES_IN_EEC);
+ }
+
return $country_code_in_EEC;
}
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index f2384b13cf2..fc74890f150 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -1009,7 +1009,8 @@ class ProductFournisseur extends Product
/**
- * Return a link to the object card (with optionaly the picto)
+ * Return a link to the object card (with optionaly the picto).
+ * Used getNomUrl of ProductFournisseur if a specific supplier ref is loaded. Otherwise use Product->getNomUrl().
*
* @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
* @param string $option On what the link point to ('nolink', ...)
@@ -1025,11 +1026,10 @@ class ProductFournisseur extends Product
if (! empty($conf->dol_no_mouse_hover)) $notooltip=1; // Force disable tooltips
$result = '';
- $companylink = '';
$label = '' . $langs->trans("SupplierRef") . '';
$label.= ' ';
- $label.= '' . $langs->trans('Ref') . ': ' . $this->fourn_ref;
+ $label.= '' . $langs->trans('Ref') . ': ' . $this->ref_supplier;
$logPrices = $this->listProductFournisseurPriceLog($this->product_fourn_price_id, 'pfpl.datec', 'DESC'); // set sort order here
if (is_array($logPrices) && count($logPrices) > 0) {
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 7797fdef7b1..3a08e422600 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -316,6 +316,9 @@ WithoutValidAccount=Without valid dedicated account
WithValidAccount=With valid dedicated account
ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
## Dictionary
Range=Range of accounting account
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index de0d28cee83..a5491045c16 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -4059,16 +4059,18 @@ class Product extends CommonObject
}
}
- $linkstart = '';
$linkend='';
$result.=$linkstart;
if ($withpicto)
{
- if ($this->type == Product::TYPE_PRODUCT) { $result.=(img_object(($notooltip?'':$label), 'product', ($notooltip?'class="paddingright"':'class="paddingright classfortooltip"'), 0, 0, $notooltip?0:1));
+ if ($this->type == Product::TYPE_PRODUCT) {
+ $result.=(img_object(($notooltip?'':$label), 'product', ($notooltip?'class="paddingright"':'class="paddingright classfortooltip"'), 0, 0, $notooltip?0:1));
}
- if ($this->type == Product::TYPE_SERVICE) { $result.=(img_object(($notooltip?'':$label), 'service', ($notooltip?'class="paddinright"':'class="paddingright classfortooltip"'), 0, 0, $notooltip?0:1));
+ if ($this->type == Product::TYPE_SERVICE) {
+ $result.=(img_object(($notooltip?'':$label), 'service', ($notooltip?'class="paddinright"':'class="paddingright classfortooltip"'), 0, 0, $notooltip?0:1));
}
}
$result.= $newref;
@@ -4078,8 +4080,10 @@ class Product extends CommonObject
$hookmanager->initHooks(array('productdao'));
$parameters=array('id'=>$this->id, 'getnomurl'=>$result);
$reshook=$hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
- if ($reshook > 0) { $result = $hookmanager->resPrint;
- } else { $result .= $hookmanager->resPrint;
+ if ($reshook > 0) {
+ $result = $hookmanager->resPrint;
+ } else {
+ $result .= $hookmanager->resPrint;
}
return $result;