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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2019-08-15 20:07:03 +02:00
commit 0e23c71052
6 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/class/commonobject.class.php
View File

@ -1913,7 +1913,7 @@ abstract class CommonObject
* Change the multicurrency rate * Change the multicurrency rate
* *
* @param double $rate multicurrency rate * @param double $rate multicurrency rate
* @param int $mode mode 1 : amounts in company currency will be recalculated, mode 2 : amounts in foreign currency * @param int $mode mode 1 : amounts in company currency will be recalculated, mode 2 : amounts in foreign currency will be recalculated
* @return int >0 if OK, <0 if KO * @return int >0 if OK, <0 if KO
*/ */
public function setMulticurrencyRate($rate, $mode = 1) public function setMulticurrencyRate($rate, $mode = 1)
@ -1936,10 +1936,16 @@ abstract class CommonObject
{ {
foreach ($this->lines as &$line) foreach ($this->lines as &$line)
{ {
// Amounts in company currency will be recalculated
if($mode == 1) { if($mode == 1) {
$line->subprice = 0; $line->subprice = 0;
} }
// Amounts in foreign currency will be recalculated
if($mode == 2) {
$line->multicurrency_subprice = 0;
}
switch ($this->element) { switch ($this->element) {
case 'propal': case 'propal':
$this->updateline( $this->updateline(

BIN
htdocs/theme/eldy/img/title_bank.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 638 B

After

Width:  |  Height:  |  Size: 501 B

BIN
htdocs/theme/eldy/img/title_commercial.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 650 B

After

Width:  |  Height:  |  Size: 431 B

BIN
htdocs/theme/eldy/img/title_home.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 474 B

After

Width:  |  Height:  |  Size: 750 B

BIN
htdocs/theme/eldy/img/title_products.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 374 B

After

Width:  |  Height:  |  Size: 687 B

4
htdocs/theme/eldy/theme_vars.inc.php
View File

@ -44,9 +44,9 @@ $theme_bgcoloronglet = array(hexdec('DE'),hexdec('E7'),hexdec('EC'));
// Colors // Colors
$colorbackhmenu1='60,70,100'; // topmenu $colorbackhmenu1='60,70,100'; // topmenu
$colorbackvmenu1='248,248,248'; // vmenu $colorbackvmenu1='249,250,252'; // vmenu
$colortopbordertitle1='200,200,200'; // top border of title $colortopbordertitle1='200,200,200'; // top border of title
$colorbacktitle1='220,220,223'; // title of tables,list $colorbacktitle1='233,234,238'; // title of tables,list
$colorbacktabcard1='255,255,255'; // card $colorbacktabcard1='255,255,255'; // card
$colorbacktabactive='234,234,234'; $colorbacktabactive='234,234,234';
$colorbacklineimpair1='255,255,255'; // line impair $colorbacklineimpair1='255,255,255'; // line impair