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

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

Browse Source 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/reception/card.php
This commit is contained in:
Laurent Destailleur 2021-03-31 13:59:21 +02:00
commit 14c7ce7492
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/class/html.form.class.php
View File

@ -16,7 +16,7 @@
* Copyright (C) 2012 Cedric Salvador <csalvador@gpcsolutions.fr> * Copyright (C) 2012 Cedric Salvador <csalvador@gpcsolutions.fr>
* Copyright (C) 2012-2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr> * Copyright (C) 2012-2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
* Copyright (C) 2014-2020 Alexandre Spangaro <aspangaro@open-dsi.fr> * Copyright (C) 2014-2020 Alexandre Spangaro <aspangaro@open-dsi.fr>
* Copyright (C) 2018 Ferran Marcet <fmarcet@2byte.es> * Copyright (C) 2018-2021 Ferran Marcet <fmarcet@2byte.es>
* Copyright (C) 2018-2021 Frédéric France <frederic.france@netlogic.fr> * Copyright (C) 2018-2021 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2018 Nicolas ZABOURI <info@inovea-conseil.com> * Copyright (C) 2018 Nicolas ZABOURI <info@inovea-conseil.com>
* Copyright (C) 2018 Christophe Battarel <christophe@altairis.fr> * Copyright (C) 2018 Christophe Battarel <christophe@altairis.fr>
@ -7739,7 +7739,7 @@ class Form
print '<input type="radio" name="idtolinkto" id="'.$key.'_'.$objp->rowid.'" value="'.$objp->rowid.'">'; print '<input type="radio" name="idtolinkto" id="'.$key.'_'.$objp->rowid.'" value="'.$objp->rowid.'">';
print '</td>'; print '</td>';
print '<td class="center"><label for="'.$key.'_'.$objp->rowid.'">'.$objp->ref.'</label></td>'; print '<td class="center"><label for="'.$key.'_'.$objp->rowid.'">'.$objp->ref.'</label></td>';
print '<td>'.$objp->ref_client.'</td>'; print '<td>'.(!empty($objp->ref_client) ? $objp->ref_client : $objp->ref_supplier).'</td>';
print '<td class="right">'; print '<td class="right">';
if ($possiblelink['label'] == 'LinkToContract') { if ($possiblelink['label'] == 'LinkToContract') {
$form = new Form($this->db); $form = new Form($this->db);

10
htdocs/core/modules/modAccounting.class.php
View File

@ -285,15 +285,15 @@ class modAccounting extends DolibarrModules
//'b.doc_type'=>'Doctype', //'b.doc_type'=>'Doctype',
'b.doc_ref'=>'Piece', 'b.doc_ref'=>'Piece',
'b.code_journal'=>'Codejournal', 'b.code_journal'=>'Codejournal',
//'b.journal_label'=>'JournalLabel', 'b.journal_label'=>'JournalLabel',
'b.numero_compte'=>'AccountAccounting', 'b.numero_compte'=>'AccountAccounting',
//'b.label_compte'=>'LabelAccount', 'b.label_compte'=>'LabelAccount',
'b.subledger_account'=>'SubledgerAccount', 'b.subledger_account'=>'SubledgerAccount',
'b.subledger_label'=>'SubledgerAccountLabel', 'b.subledger_label'=>'SubledgerAccountLabel',
'b.label_operation'=>'LabelOperation', 'b.label_operation'=>'LabelOperation',
'b.debit'=>"Debit", 'b.debit'=>"Debit",
'b.credit'=>"Credit", 'b.credit'=>"Credit",
'b.sens'=>'Direction' // This field is still used by accounting export. We can remove it once it has been replace into accountancyexport.class.php by a detection using ->debit and ->credit 'b.sens'=>'Direction' // This field is still used by accounting export. We can remove it once it has been replaced into accountancyexport.class.php by a detection using ->debit and ->credit
); );
$this->import_fieldshidden_array[$r] = array('b.doc_type'=>'const-import_from_external', 'b.fk_doc'=>'const-0', 'b.fk_docdet'=>'const-0', 'b.fk_user_author'=>'user->id', 'b.date_creation'=>'const-'.dol_print_date(dol_now(), 'standard')); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent) $this->import_fieldshidden_array[$r] = array('b.doc_type'=>'const-import_from_external', 'b.fk_doc'=>'const-0', 'b.fk_docdet'=>'const-0', 'b.fk_user_author'=>'user->id', 'b.date_creation'=>'const-'.dol_print_date(dol_now(), 'standard')); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
$this->import_regex_array[$r] = array('b.doc_date'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$'); $this->import_regex_array[$r] = array('b.doc_date'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
@ -303,9 +303,9 @@ class modAccounting extends DolibarrModules
//'b.doc_type'=>'import', //'b.doc_type'=>'import',
'b.doc_ref'=>'My document ABC', 'b.doc_ref'=>'My document ABC',
'b.code_journal'=>"VTE", 'b.code_journal'=>"VTE",
//'b.journal_label'=>"Sale journal", 'b.journal_label'=>"Sale journal",
'b.numero_compte'=>"707", 'b.numero_compte'=>"707",
//'b.label_compte'=>'Product account 707', 'b.label_compte'=>'Product account 707',
'b.subledger_account'=>'', 'b.subledger_account'=>'',
'b.subledger_label'=>'', 'b.subledger_label'=>'',
'b.label_operation'=>"Sale of ABC", 'b.label_operation'=>"Sale of ABC",

21
htdocs/reception/card.php
View File

@ -259,8 +259,6 @@ if (empty($reshook)) {
$objectsrc = new $classname($db); $objectsrc = new $classname($db);
$objectsrc->fetch($object->origin_id); $objectsrc->fetch($object->origin_id);
$object->socid = $objectsrc->socid; $object->socid = $objectsrc->socid;
$object->ref_supplier = GETPOST('ref_supplier', 'alpha'); $object->ref_supplier = GETPOST('ref_supplier', 'alpha');
$object->model_pdf = GETPOST('model'); $object->model_pdf = GETPOST('model');
@ -299,15 +297,12 @@ if (empty($reshook)) {
$stockLocation = "ent1".$i."_0"; $stockLocation = "ent1".$i."_0";
$qty = "qtyl".$i; $qty = "qtyl".$i;
//var_dump(GETPOST($qty,'int')); var_dump($_POST); var_dump($batch);exit;
//reception line for product with no batch management and no multiple stock location
//var_dump(GETPOST($qty,'int')); var_dump($_POST); var_dump($batch);exit; if (GETPOST($qty, 'alpha') > 0) {
//reception line for product with no batch management and no multiple stock location $totalqty += price2num(GETPOST($qty, 'alpha'), 'MS');
if (GETPOST($qty, 'int') > 0) {
$totalqty += GETPOST($qty, 'int');
} }
// Extrafields // Extrafields
$array_options[$i] = $extrafields->getOptionalsFromPost($object->table_element_line, $i); $array_options[$i] = $extrafields->getOptionalsFromPost($object->table_element_line, $i);
} }
@ -342,10 +337,16 @@ if (empty($reshook)) {
$entrepot_id = is_numeric(GETPOST($ent, 'int')) ? GETPOST($ent, 'int') : GETPOST('entrepot_id', 'int'); $entrepot_id = is_numeric(GETPOST($ent, 'int')) ? GETPOST($ent, 'int') : GETPOST('entrepot_id', 'int');
if (!empty($lineToTest)) {
$fk_product = $lineToTest->fk_product;
} else {
$fk_product = $linesrc->fk_product;
}
if ($entrepot_id < 0) { if ($entrepot_id < 0) {
$entrepot_id = ''; $entrepot_id = '';
} }
if (!($lineToTest->fk_product > 0) && empty($conf->global->STOCK_SUPPORTS_SERVICES)) { if (!($fk_product > 0) && empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
$entrepot_id = 0; $entrepot_id = 0;
} }
$eatby = GETPOST($eatby, 'alpha'); $eatby = GETPOST($eatby, 'alpha');