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 2015-04-22 17:39:33 +02:00
commit 9279a3a349
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/compta/bank/account.php
View File

@ -46,6 +46,7 @@ $langs->load("banks");
$langs->load("categories"); $langs->load("categories");
$langs->load("bills"); $langs->load("bills");
$langs->load("companies"); $langs->load("companies");
$langs->load("salaries");
$langs->load("loan"); $langs->load("loan");
$langs->load("donations"); $langs->load("donations");

1
htdocs/compta/bank/ligne.php
View File

@ -37,6 +37,7 @@ $langs->load("bills");
if (! empty($conf->adherent->enabled)) $langs->load("members"); if (! empty($conf->adherent->enabled)) $langs->load("members");
if (! empty($conf->don->enabled)) $langs->load("donations"); if (! empty($conf->don->enabled)) $langs->load("donations");
if (! empty($conf->loan->enabled)) $langs->load("loan"); if (! empty($conf->loan->enabled)) $langs->load("loan");
if (! empty($conf->salaries->enabled)) $langs->load("salaries");
$id = (GETPOST('id','int') ? GETPOST('id','int') : GETPOST('account','int')); $id = (GETPOST('id','int') ? GETPOST('id','int') : GETPOST('account','int'));

3
htdocs/compta/salaries/class/paymentsalary.class.php
View File

@ -424,7 +424,8 @@ class PaymentSalary extends CommonObject
$bank_line_id, $bank_line_id,
$this->fk_user, $this->fk_user,
DOL_URL_ROOT.'/user/card.php?id=', DOL_URL_ROOT.'/user/card.php?id=',
$langs->trans("SalaryPayment").' '.$fuser->getFullName($langs).' '.dol_print_date($this->datesp,'dayrfc').' '.dol_print_date($this->dateep,'dayrfc'), $fuser->getFullName($langs),
// $langs->trans("SalaryPayment").' '.$fuser->getFullName($langs).' '.dol_print_date($this->datesp,'dayrfc').' '.dol_print_date($this->dateep,'dayrfc'),
'user' 'user'
); );

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

@ -1514,7 +1514,7 @@ class Product extends CommonObject
$sql.= " weight, weight_units, length, length_units, surface, surface_units, volume, volume_units, barcode, fk_barcode_type, finished,"; $sql.= " weight, weight_units, length, length_units, surface, surface_units, volume, volume_units, barcode, fk_barcode_type, finished,";
$sql.= " accountancy_code_buy, accountancy_code_sell, stock, pmp,"; $sql.= " accountancy_code_buy, accountancy_code_sell, stock, pmp,";
$sql.= " datec, tms, import_key, entity, desiredstock, tobatch, fk_unit"; $sql.= " datec, tms, import_key, entity, desiredstock, tobatch, fk_unit";
$sql.= " ,ref_ext, fk_price_expression"; $sql.= " , fk_price_expression";
$sql.= " FROM ".MAIN_DB_PREFIX."product"; $sql.= " FROM ".MAIN_DB_PREFIX."product";
if ($id) $sql.= " WHERE rowid = ".$this->db->escape($id); if ($id) $sql.= " WHERE rowid = ".$this->db->escape($id);
else else