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

Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2018-06-27 01:54:38 +02:00
commit 30c1b20eea
4 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/boxes/box_clients.php
View File

@ -87,7 +87,10 @@ class box_clients extends ModeleBoxes
$sql.= ", s.client";
$sql.= ", s.code_fournisseur";
$sql.= ", s.fournisseur";
$sql.= ", s.code_compta";
$sql.= ", s.code_compta_fournisseur";
$sql.= ", s.logo";
$sql.= ", s.email";
$sql.= ", s.datec, s.tms, s.status";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@ -114,9 +117,12 @@ class box_clients extends ModeleBoxes
$thirdpartystatic->name = $objp->name;
$thirdpartystatic->code_client = $objp->code_client;
$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
$thirdpartystatic->code_compta = $objp->code_compta;
$thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
$thirdpartystatic->client = $objp->client;
$thirdpartystatic->fournisseur = $objp->fournisseur;
$thirdpartystatic->logo = $objp->logo;
$thirdpartystatic->email = $objp->email;
$this->info_box_contents[$line][] = array(
'td' => '',

12
htdocs/install/inc.php
View File

@ -172,6 +172,12 @@ if (! empty($dolibarr_main_document_root_alt))
// Security check (old method, when directory is renamed /install.lock)
if (preg_match('/install\.lock/i',$_SERVER["SCRIPT_FILENAME"]))
{
if (! is_object($langs))
{
$langs = new Translate('..');
$langs->setDefaultLang('auto');
}
$langs->load("install");
print $langs->trans("YouTryInstallDisabledByDirLock");
if (! empty($dolibarr_main_url_root))
{
@ -190,6 +196,12 @@ if (constant('DOL_DATA_ROOT') === null) {
}
if (@file_exists($lockfile))
{
if (! is_object($langs))
{
$langs = new Translate('..');
$langs->setDefaultLang('auto');
}
$langs->load("install");
print $langs->trans("YouTryInstallDisabledByFileLock");
if (! empty($dolibarr_main_url_root))
{

2
htdocs/install/mysql/migration/7.0.0-8.0.0.sql
View File

@ -100,7 +100,7 @@ ALTER TABLE llx_inventory MODIFY COLUMN fk_warehouse integer DEFAULT NULL;
ALTER TABLE llx_c_type_fees DROP COLUMN llx_c_type_fees;
ALTER TABLE llx_c_type_fees ADD COLUMN type integer DEFAULT 0;
ALTER TABLE llx_c_ecotax CHANGE COLUMN libelle label varchar(255);
ALTER TABLE llx_c_ecotaxe CHANGE COLUMN libelle label varchar(255);
ALTER TABLE llx_product_fournisseur_price DROP COLUMN unitcharges;

4
htdocs/langs/en_US/products.lang
View File

@ -251,8 +251,8 @@ PriceNumeric=Number
DefaultPrice=Default price
ComposedProductIncDecStock=Increase/Decrease stock on parent change
ComposedProduct=Sub-product
MinSupplierPrice=Minimum supplier price
MinCustomerPrice=Minimum customer price
MinSupplierPrice=Minimum buying price
MinCustomerPrice=Minimum selling price
DynamicPriceConfiguration=Dynamic price configuration
DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able to use and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
AddVariable=Add Variable