Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0
This commit is contained in:
commit
c902b2eeed
7 changed files with 68 additions and 28 deletions
|
|
@ -3547,7 +3547,7 @@ class BookKeeping extends CommonObject
|
|||
*/
|
||||
public function newCloneMass($toselect, $code_journal, $docdate)
|
||||
{
|
||||
global $langs;
|
||||
global $langs, $user;
|
||||
|
||||
$error = 0;
|
||||
$this->db->begin();
|
||||
|
|
@ -3601,22 +3601,55 @@ class BookKeeping extends CommonObject
|
|||
if ($bookKeeping->fetch($toselectid)) {
|
||||
$code_journal = getDolGlobalString('ACCOUNTING_CLONING_ENABLE_INPUT_JOURNAL') ? $code_journal : $bookKeeping->code_journal;
|
||||
$journal_label = getDolGlobalString('ACCOUNTING_CLONING_ENABLE_INPUT_JOURNAL') ? $accountingJournal->label : $bookKeeping->journal_label;
|
||||
$sql = "SELECT piece_num, label_operation, numero_compte, label_compte, doc_type, code_journal, fk_user_author, doc_ref, fk_doc, fk_docdet, debit, credit, journal_label, sens, montant ";
|
||||
$sql .= "FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping WHERE rowid = " . ((int) $toselectid);
|
||||
$sql = "SELECT piece_num, label_operation, numero_compte, label_compte, subledger_account, subledger_label, doc_type, code_journal, fk_user_author, doc_ref, fk_doc, fk_docdet, debit, credit, journal_label, sens, montant";
|
||||
$sql .= " FROM ".$this->db->prefix()."accounting_bookkeeping WHERE rowid = " . ((int) $toselectid);
|
||||
|
||||
$resql = $this->db->query($sql);
|
||||
if ($resql) {
|
||||
while ($obj = $this->db->fetch_object($resql)) {
|
||||
$docRef = $langs->trans("CloneOf", $obj->doc_ref);
|
||||
|
||||
$sql_insert = "INSERT INTO ".$this->db->prefix()."accounting_bookkeeping";
|
||||
$sql_insert .= " (piece_num, label_operation, numero_compte, label_compte, doc_type, code_journal, doc_date,";
|
||||
$sql_insert .= " fk_user_author, doc_ref, fk_doc, fk_docdet, debit, credit, journal_label, sens, montant";
|
||||
$sql_insert = "INSERT INTO ".$this->db->prefix()."accounting_bookkeeping (";
|
||||
$sql_insert .= " piece_num";
|
||||
$sql_insert .= ", label_operation";
|
||||
$sql_insert .= ", numero_compte";
|
||||
$sql_insert .= ", label_compte";
|
||||
$sql_insert .= ", subledger_account";
|
||||
$sql_insert .= ", subledger_label";
|
||||
$sql_insert .= ", doc_type";
|
||||
$sql_insert .= ", code_journal";
|
||||
$sql_insert .= ", doc_date";
|
||||
$sql_insert .= ", date_creation";
|
||||
$sql_insert .= ", fk_user_author";
|
||||
$sql_insert .= ", doc_ref";
|
||||
$sql_insert .= ", fk_doc";
|
||||
$sql_insert .= ", fk_docdet";
|
||||
$sql_insert .= ", debit";
|
||||
$sql_insert .= ", credit";
|
||||
$sql_insert .= ", journal_label";
|
||||
$sql_insert .= ", sens";
|
||||
$sql_insert .= ", montant";
|
||||
$sql_insert .= ")";
|
||||
$sql_insert .= " VALUES (" . ((int) $pieceNumNext) . ", '" . $this->db->escape($obj->label_operation) . "', '" . $this->db->escape($obj->numero_compte) . "',";
|
||||
$sql_insert .= " '" . $this->db->escape($obj->label_compte) . "', '" . $this->db->escape($obj->doc_type) . "', '" . $this->db->escape($code_journal) . "', '" . $this->db->idate($docdate)."',";
|
||||
$sql_insert .= " '" . $this->db->escape($obj->fk_user_author) . "', '" . $this->db->escape($docRef) . "', " . ((int) $obj->fk_doc) . ", " . ((int) $obj->fk_docdet) . ",";
|
||||
$sql_insert .= " " . (float) $obj->debit . ", " . (float) $obj->credit . ", '" . $this->db->escape($journal_label) . "', '" . $this->db->escape($obj->sens) . "', " . (float) $obj->montant;
|
||||
$sql_insert .= " VALUES (";
|
||||
$sql_insert .= $pieceNumNext;
|
||||
$sql_insert .= ", '" . $this->db->escape($obj->label_operation) . "'";
|
||||
$sql_insert .= ", '" . $this->db->escape($obj->numero_compte) . "'";
|
||||
$sql_insert .= ", '" . $this->db->escape($obj->label_compte) . "'";
|
||||
$sql_insert .= ", '" . $this->db->escape($obj->subledger_account) . "'";
|
||||
$sql_insert .= ", '" . $this->db->escape($obj->subledger_label) . "'";
|
||||
$sql_insert .= ", ''";
|
||||
$sql_insert .= ", '" . $this->db->escape($code_journal) . "'";
|
||||
$sql_insert .= ", '" . $this->db->idate($docdate)."'";
|
||||
$sql_insert .= ", '" . $this->db->idate($now)."'";
|
||||
$sql_insert .= ", ".($user->id > 0 ? ((int) $user->id) : "NULL");
|
||||
$sql_insert .= ", '" . $this->db->escape($docRef) . "'";
|
||||
$sql_insert .= ", 0";
|
||||
$sql_insert .= ", 0";
|
||||
$sql_insert .= ", " . (float) $obj->debit;
|
||||
$sql_insert .= ", " . (float) $obj->credit;
|
||||
$sql_insert .= ", '" . $this->db->escape($journal_label) . "'";
|
||||
$sql_insert .= ", '" . $this->db->escape($obj->sens) . "'";
|
||||
$sql_insert .= ", " . (float) $obj->montant;
|
||||
$sql_insert .= ")";
|
||||
|
||||
$resqlInsert = $this->db->query($sql_insert);
|
||||
|
|
|
|||
|
|
@ -996,7 +996,7 @@ class ExternalModules
|
|||
// Check if there is a known ID
|
||||
$reg = array();
|
||||
$id = 0;
|
||||
if (!empty($package['dolistore-download']) && preg_match('/www\.dolistore\.com\/product\.php\?id=(\d+)/', $package['dolistore-download'], $reg)) {
|
||||
if (!empty($package['dolistore-download']) && preg_match('/www\.dolistore\.com\/product\.php\?id=(\d+)/', (string) $package['dolistore-download'], $reg)) {
|
||||
$id = $reg[1];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ class box_last_knowledgerecord extends ModeleBoxes
|
|||
if ($user->hasRight('knowledgemanagement', 'knowledgerecord', 'read')) {
|
||||
$sql = 'SELECT k.rowid as id, k.date_creation, k.ref, k.lang, k.question, k.status as status';
|
||||
$sql .= " FROM ".MAIN_DB_PREFIX."knowledgemanagement_knowledgerecord as k";
|
||||
$sql .= " WHERE k.entity IN (".getEntity('knowledgemanagement').")";
|
||||
$sql .= " WHERE k.entity IN (".getEntity('knowledgerecord').")";
|
||||
|
||||
if ($user->socid) {
|
||||
$sql .= " AND k.fk_soc= ".((int) $user->socid);
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ class box_last_modified_knowledgerecord extends ModeleBoxes
|
|||
if ($user->hasRight('knowledgemanagement', 'knowledgerecord', 'read')) {
|
||||
$sql = 'SELECT k.rowid as id, k.date_creation, k.ref, k.lang, k.question, k.status as status';
|
||||
$sql .= " FROM ".MAIN_DB_PREFIX."knowledgemanagement_knowledgerecord as k";
|
||||
$sql .= " WHERE k.entity IN (".getEntity('knowledgemanagement').")";
|
||||
$sql .= " WHERE k.entity IN (".getEntity('knowledgerecord').")";
|
||||
|
||||
if ($user->socid) {
|
||||
$sql .= " AND k.fk_soc= ".((int) $user->socid);
|
||||
|
|
|
|||
|
|
@ -83,9 +83,9 @@ class box_last_ticket extends ModeleBoxes
|
|||
$sql .= " type.label as type_label, category.label as category_label, severity.label as severity_label,";
|
||||
$sql .= " s.nom as company_name, s.email as socemail, s.client, s.fournisseur";
|
||||
$sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
|
||||
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code=t.type_code";
|
||||
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_category as category ON category.code=t.category_code";
|
||||
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_severity as severity ON severity.code=t.severity_code";
|
||||
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code = t.type_code AND type.entity = t.entity";
|
||||
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_category as category ON category.code = t.category_code AND category.entity = t.entity";
|
||||
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_severity as severity ON severity.code = t.severity_code AND severity.entity = t.entity";
|
||||
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=t.fk_soc";
|
||||
$sql .= " WHERE t.entity IN (".getEntity('ticket').")";
|
||||
// $sql.= " AND e.rowid = er.fk_event";
|
||||
|
|
|
|||
|
|
@ -300,9 +300,9 @@ class modKnowledgeManagement extends DolibarrModules
|
|||
'langs' => 'knowledgemanagement',
|
||||
'position' => 101,
|
||||
// Define condition to show or hide menu entry. Use '$conf->knowledgemanagement->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
|
||||
'enabled' => '$conf->knowledgemanagement->enabled',
|
||||
'enabled' => 'isModEnabled("knowledgemanagement")',
|
||||
// Use 'perms'=>'$user->rights->knowledgemanagement->level1->level2' if you want your menu with a permission rules
|
||||
'perms' => '$user->rights->knowledgemanagement->knowledgerecord->read',
|
||||
'perms' => '$user->hasRight("knowledgemanagement", "knowledgerecord", "read")',
|
||||
'target' => '',
|
||||
// 0=Menu for internal users, 1=external users, 2=both
|
||||
'user' => 2,
|
||||
|
|
@ -320,9 +320,9 @@ class modKnowledgeManagement extends DolibarrModules
|
|||
'langs' => 'knowledgemanagement',
|
||||
'position' => 111,
|
||||
// Define condition to show or hide menu entry. Use '$conf->knowledgemanagement->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
|
||||
'enabled' => '$conf->knowledgemanagement->enabled',
|
||||
'enabled' => 'isModEnabled("knowledgemanagement")',
|
||||
// Use 'perms'=>'$user->rights->knowledgemanagement->level1->level2' if you want your menu with a permission rules
|
||||
'perms' => '$user->rights->knowledgemanagement->knowledgerecord->read',
|
||||
'perms' => '$user->hasRight("knowledgemanagement", "knowledgerecord", "read")',
|
||||
'target' => '',
|
||||
// 0=Menu for internal users, 1=external users, 2=both
|
||||
'user' => 2,
|
||||
|
|
@ -340,7 +340,7 @@ class modKnowledgeManagement extends DolibarrModules
|
|||
'langs' => 'knowledgemanagement',
|
||||
'position' => 110,
|
||||
// Define condition to show or hide menu entry. Use '$conf->knowledgemanagement->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
|
||||
'enabled' => '$conf->knowledgemanagement->enabled',
|
||||
'enabled' => 'isModEnabled("knowledgemanagement")',
|
||||
// Use 'perms'=>'$user->rights->knowledgemanagement->level1->level2' if you want your menu with a permission rules
|
||||
'perms' => '$user->hasRight("knowledgemanagement", "knowledgerecord", "write")',
|
||||
'target' => '',
|
||||
|
|
@ -355,8 +355,8 @@ class modKnowledgeManagement extends DolibarrModules
|
|||
'url' => '/categories/categorie_list.php?type=13',
|
||||
'langs' => 'knowledgemanagement',
|
||||
'position' => 112,
|
||||
'enabled' => '$conf->knowledgemanagement->enabled',
|
||||
'perms' => '$user->rights->knowledgemanagement->knowledgerecord->read',
|
||||
'enabled' => 'isModEnabled("knowledgemanagement") && isModenabled("category")',
|
||||
'perms' => '$user->hasRight("knowledgemanagement", "knowledgerecord", "read")',
|
||||
'target' => '',
|
||||
'user' => 0
|
||||
);
|
||||
|
|
|
|||
|
|
@ -3686,12 +3686,19 @@ class Product extends CommonObject
|
|||
|
||||
// For every order having invoice already validated we need to decrease stock cause it's in physical stock
|
||||
$adeduire = 0;
|
||||
$sql = "SELECT sum(".$this->db->ifsql('f.type=2', '-1', '1')." * fd.qty) as count FROM ".MAIN_DB_PREFIX."facturedet as fd ";
|
||||
$sql .= " JOIN ".MAIN_DB_PREFIX."facture as f ON fd.fk_facture = f.rowid";
|
||||
$sql .= " JOIN ".MAIN_DB_PREFIX."element_element as el ON ((el.fk_target = f.rowid AND el.targettype = 'facture' AND sourcetype = 'commande') OR (el.fk_source = f.rowid AND el.targettype = 'commande' AND sourcetype = 'facture'))";
|
||||
$sql .= " JOIN ".MAIN_DB_PREFIX."commande as c ON el.fk_source = c.rowid";
|
||||
$sql = "SELECT sum(".$this->db->ifsql('f.type=2', '-1', '1')." * fd.qty) as count";
|
||||
$sql .= " FROM " . $this->db->prefix() . "facturedet as fd";
|
||||
$sql .= " JOIN " . $this->db->prefix() . "facture as f ON fd.fk_facture = f.rowid";
|
||||
$sql .= " JOIN " . $this->db->prefix() . "element_element as el ON el.fk_target = f.rowid AND el.targettype = 'facture' AND el.sourcetype = 'commande'";
|
||||
$sql .= " JOIN " . $this->db->prefix() . "commande as c ON el.fk_source = c.rowid";
|
||||
$sql .= " WHERE c.fk_statut IN (".$this->db->sanitize($filtrestatut).") AND f.fk_statut > ".Facture::STATUS_DRAFT." AND fd.fk_product = ".((int) $this->id);
|
||||
|
||||
$sql .= " UNION ALL";
|
||||
$sql .= " SELECT sum(".$this->db->ifsql('f.type=2', '-1', '1')." * fd.qty) as count";
|
||||
$sql .= " FROM " . $this->db->prefix() . "facturedet as fd";
|
||||
$sql .= " JOIN " . $this->db->prefix() . "facture as f ON fd.fk_facture = f.rowid";
|
||||
$sql .= " JOIN " . $this->db->prefix() . "element_element as el ON el.fk_source = f.rowid AND el.targettype = 'commande' AND el.sourcetype = 'facture'";
|
||||
$sql .= " JOIN " . $this->db->prefix() . "commande as c ON el.fk_source = c.rowid";
|
||||
$sql .= " WHERE c.fk_statut IN (".$this->db->sanitize($filtrestatut).") AND f.fk_statut > ".Facture::STATUS_DRAFT." AND fd.fk_product =".((int) $this->id);
|
||||
dol_syslog(__METHOD__.":: sql $sql", LOG_NOTICE);
|
||||
$resql = $this->db->query($sql);
|
||||
if ($resql) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue