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

Merge pull request #11197 from homer8173/develop

Browse Source 
fix modulebuilder & takepos
This commit is contained in:
Laurent Destailleur 2019-05-18 00:56:49 +02:00 committed by GitHub
commit 30d91994b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/install/mysql/tables/llx_asset.sql
View File

@ -26,7 +26,7 @@ CREATE TABLE llx_asset(
note_public text, note_public text,
note_private text, note_private text,
date_creation datetime NOT NULL, date_creation datetime NOT NULL,
tms timestamp NOT NULL, tms timestamp,
fk_user_creat integer NOT NULL, fk_user_creat integer NOT NULL,
fk_user_modif integer, fk_user_modif integer,
import_key varchar(14), import_key varchar(14),

2
htdocs/install/mysql/tables/llx_bom_bom.sql
View File

@ -24,7 +24,7 @@ CREATE TABLE llx_bom_bom(
note_public text, note_public text,
note_private text, note_private text,
date_creation datetime NOT NULL, date_creation datetime NOT NULL,
tms timestamp NOT NULL, tms timestamp,
date_valid datetime, date_valid datetime,
fk_user_creat integer NOT NULL, fk_user_creat integer NOT NULL,
fk_user_modif integer, fk_user_modif integer,

2
htdocs/install/mysql/tables/llx_emailcollector_emailcollector.sql
View File

@ -34,7 +34,7 @@ CREATE TABLE llx_emailcollector_emailcollector(
note_public text, note_public text,
note_private text, note_private text,
date_creation datetime NOT NULL, date_creation datetime NOT NULL,
tms timestamp NOT NULL, tms timestamp,
fk_user_creat integer NOT NULL, fk_user_creat integer NOT NULL,
fk_user_modif integer, fk_user_modif integer,
import_key varchar(14), import_key varchar(14),

2
htdocs/install/mysql/tables/llx_emailcollector_emailcollectoraction.sql
View File

@ -21,7 +21,7 @@ CREATE TABLE llx_emailcollector_emailcollectoraction(
type varchar(128) NOT NULL, type varchar(128) NOT NULL,
actionparam varchar(255) NULL, actionparam varchar(255) NULL,
date_creation datetime NOT NULL, date_creation datetime NOT NULL,
tms timestamp NOT NULL, tms timestamp,
fk_user_creat integer NOT NULL, fk_user_creat integer NOT NULL,
fk_user_modif integer, fk_user_modif integer,
position integer DEFAULT 0, position integer DEFAULT 0,

2
htdocs/install/mysql/tables/llx_emailcollector_emailcollectorfilter.sql
View File

@ -21,7 +21,7 @@ CREATE TABLE llx_emailcollector_emailcollectorfilter(
type varchar(128) NOT NULL, type varchar(128) NOT NULL,
rulevalue varchar(128) NULL, rulevalue varchar(128) NULL,
date_creation datetime NOT NULL, date_creation datetime NOT NULL,
tms timestamp NOT NULL, tms timestamp,
fk_user_creat integer NOT NULL, fk_user_creat integer NOT NULL,
fk_user_modif integer, fk_user_modif integer,
import_key varchar(14), import_key varchar(14),

2
htdocs/install/mysql/tables/llx_pos_cash_fence.sql
View File

@ -33,6 +33,6 @@ CREATE TABLE llx_pos_cash_fence(
posnumber VARCHAR(30), posnumber VARCHAR(30),
fk_user_creat integer, fk_user_creat integer,
fk_user_valid integer, fk_user_valid integer,
tms TIMESTAMP NOT NULL, tms TIMESTAMP,
import_key VARCHAR(14) import_key VARCHAR(14)
) ENGINE=innodb; ) ENGINE=innodb;

2
htdocs/install/mysql/tables/llx_societe_account.sql
View File

@ -32,7 +32,7 @@ CREATE TABLE llx_societe_account(
date_last_login datetime, date_last_login datetime,
date_previous_login datetime, date_previous_login datetime,
date_creation datetime NOT NULL, date_creation datetime NOT NULL,
tms timestamp NOT NULL, tms timestamp,
fk_user_creat integer NOT NULL, fk_user_creat integer NOT NULL,
fk_user_modif integer, fk_user_modif integer,
import_key varchar(14), import_key varchar(14),

2
htdocs/modulebuilder/template/sql/llx_mymodule_myobject.sql
View File

@ -22,7 +22,7 @@ CREATE TABLE llx_mymodule_myobject(
qty INTEGER, qty INTEGER,
status INTEGER, status INTEGER,
date_creation DATETIME NOT NULL, date_creation DATETIME NOT NULL,
tms TIMESTAMP NOT NULL, tms TIMESTAMP,
import_key VARCHAR(14) import_key VARCHAR(14)
-- END MODULEBUILDER FIELDS -- END MODULEBUILDER FIELDS
) ENGINE=innodb; ) ENGINE=innodb;

2
htdocs/societe/card.php
View File

@ -1207,7 +1207,7 @@ else
{ {
// Supplier // Supplier
print '<tr>'; print '<tr>';
print '<td>'.$form->editfieldkey('Supplier', 'fournisseur', '', $object, 0, 'string', '', 1).'</td><td>'; print '<td>'.$form->editfieldkey('Vendor', 'fournisseur', '', $object, 0, 'string', '', 1).'</td><td>';
$default = -1; $default = -1;
if (! empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)) $default=1; if (! empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)) $default=1;
print $form->selectyesno("fournisseur", (GETPOST('fournisseur', 'int')!=''?GETPOST('fournisseur', 'int'):(GETPOST("type", 'alpha') == '' ? $default : $object->fournisseur)), 1, 0, (GETPOST("type", 'alpha') == '' ? 1 : 0)); print $form->selectyesno("fournisseur", (GETPOST('fournisseur', 'int')!=''?GETPOST('fournisseur', 'int'):(GETPOST("type", 'alpha') == '' ? $default : $object->fournisseur)), 1, 0, (GETPOST("type", 'alpha') == '' ? 1 : 0));

2
htdocs/takepos/pay.php
View File

@ -84,7 +84,7 @@ if ($resql) {
if ($paycode == 'CB') $paycode = 'CB'; if ($paycode == 'CB') $paycode = 'CB';
if ($paycode == 'CHQ') $paycode = 'CHEQUE'; if ($paycode == 'CHQ') $paycode = 'CHEQUE';
$accountname="CASHDESK_ID_BANKACCOUNT_".$paycode; $accountname="CASHDESK_ID_BANKACCOUNT_".$paycode.$_SESSION["takeposterminal"];
if (! empty($conf->global->$accountname) && $conf->global->$accountname > 0) array_push($paiements, $obj); if (! empty($conf->global->$accountname) && $conf->global->$accountname > 0) array_push($paiements, $obj);
} }
} }

2
htdocs/takepos/takepos.php
View File

@ -624,7 +624,7 @@ if ($resql){
if ($paycode == 'CB') $paycode = 'CARD'; if ($paycode == 'CB') $paycode = 'CARD';
if ($paycode == 'CHQ') $paycode = 'CHEQUE'; if ($paycode == 'CHQ') $paycode = 'CHEQUE';
$accountname="CASHDESK_ID_BANKACCOUNT_".$paycode; $accountname="CASHDESK_ID_BANKACCOUNT_".$paycode.$_SESSION["takeposterminal"];
if (! empty($conf->global->$accountname) && $conf->global->$accountname > 0) array_push($paiementsModes, $obj); if (! empty($conf->global->$accountname) && $conf->global->$accountname > 0) array_push($paiementsModes, $obj);
} }
} }