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 9.0

Browse Source 
Conflicts:
	htdocs/product/class/product.class.php
This commit is contained in:
Laurent Destailleur 2019-04-11 16:23:56 +02:00
commit 54b3acc997
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/product/class/product.class.php
View File

@ -3759,9 +3759,11 @@ class Product extends CommonObject
if (! empty($conf->accounting->enabled) && $this->status) { if (! empty($conf->accounting->enabled) && $this->status) {
include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
$label.= '<br><b>' . $langs->trans('ProductAccountancySellCode') . ':</b> '. length_accountg($this->accountancy_code_sell); $label.= '<br><b>' . $langs->trans('ProductAccountancySellCode') . ':</b> '. length_accountg($this->accountancy_code_sell);
if(!empty($conf->global->MAIN_FEATURES_LEVEL)) {
$label.= '<br><b>' . $langs->trans('ProductAccountancySellIntraCode') . ':</b> '. length_accountg($this->accountancy_code_sell_export); $label.= '<br><b>' . $langs->trans('ProductAccountancySellIntraCode') . ':</b> '. length_accountg($this->accountancy_code_sell_export);
$label.= '<br><b>' . $langs->trans('ProductAccountancySellExportCode') . ':</b> '. length_accountg($this->accountancy_code_sell_intra); $label.= '<br><b>' . $langs->trans('ProductAccountancySellExportCode') . ':</b> '. length_accountg($this->accountancy_code_sell_intra);
} }
}
if (! empty($conf->accounting->enabled) && $this->status_buy) { if (! empty($conf->accounting->enabled) && $this->status_buy) {
include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
$label.= '<br><b>' . $langs->trans('ProductAccountancyBuyCode') . ':</b> '. length_accountg($this->accountancy_code_buy); $label.= '<br><b>' . $langs->trans('ProductAccountancyBuyCode') . ':</b> '. length_accountg($this->accountancy_code_buy);
@ -4042,8 +4044,8 @@ class Product extends CommonObject
* @param int $movement 0 = add, 1 = remove * @param int $movement 0 = add, 1 = remove
* @param string $label Label of stock movement * @param string $label Label of stock movement
* @param double $price Price to use for stock eval * @param double $price Price to use for stock eval
* @param date $dlc eat-by date * @param integer $dlc eat-by date
* @param date $dluo sell-by date * @param integer $dluo sell-by date
* @param string $lot Lot number * @param string $lot Lot number
* @param string $inventorycode Inventory code * @param string $inventorycode Inventory code
* @param string $origin_element Origin element type * @param string $origin_element Origin element type
@ -4811,7 +4813,7 @@ class Product extends CommonObject
/** /**
* Returns the rights used for this class * Returns the rights used for this class
* *
* @return stdClass * @return Object
*/ */
public function getRights() public function getRights()
{ {