New: Add help info of field type into dictionary of payment types.
This commit is contained in:
parent
60c633fd8b
commit
a93ad958ac
@ -5,6 +5,7 @@ English Dolibarr ChangeLog
|
|||||||
|
|
||||||
***** ChangeLog for 3.7 compared to 3.6.* *****
|
***** ChangeLog for 3.7 compared to 3.6.* *****
|
||||||
For users:
|
For users:
|
||||||
|
- New: Add help info of field type into dictionary of payment types.
|
||||||
- New: Add proposals into referer page of thirdparty.
|
- New: Add proposals into referer page of thirdparty.
|
||||||
- New: On contact list can set filter on both active and not active (no more exclusive select).
|
- New: On contact list can set filter on both active and not active (no more exclusive select).
|
||||||
- New: Each user can include its own external ics calendar into dolibarr agenda view.
|
- New: Each user can include its own external ics calendar into dolibarr agenda view.
|
||||||
|
|||||||
@ -387,17 +387,23 @@ if ($id == 11)
|
|||||||
$langs->load("bills");
|
$langs->load("bills");
|
||||||
$langs->load("interventions");
|
$langs->load("interventions");
|
||||||
$elementList = array(
|
$elementList = array(
|
||||||
'commande' => $langs->trans('Order'),
|
'proposal' => $langs->trans('Proposal'),
|
||||||
|
'order' => $langs->trans('Order'),
|
||||||
|
'invoice' => $langs->trans('Bill'),
|
||||||
'invoice_supplier' => $langs->trans('SupplierBill'),
|
'invoice_supplier' => $langs->trans('SupplierBill'),
|
||||||
'order_supplier' => $langs->trans('SupplierOrder'),
|
'order_supplier' => $langs->trans('SupplierOrder'),
|
||||||
'contrat' => $langs->trans('Contract'),
|
'intervention' => $langs->trans('InterventionCard'),
|
||||||
|
'contract' => $langs->trans('Contract'),
|
||||||
'project' => $langs->trans('Project'),
|
'project' => $langs->trans('Project'),
|
||||||
'project_task' => $langs->trans('Task'),
|
'project_task' => $langs->trans('Task'),
|
||||||
|
'agenda' => $langs->trans('Agenda'),
|
||||||
|
// old deprecated
|
||||||
|
'contrat' => $langs->trans('Contract'),
|
||||||
'propal' => $langs->trans('Proposal'),
|
'propal' => $langs->trans('Proposal'),
|
||||||
|
'commande' => $langs->trans('Order'),
|
||||||
'facture' => $langs->trans('Bill'),
|
'facture' => $langs->trans('Bill'),
|
||||||
'facture_fourn' => $langs->trans('SupplierBill'),
|
'facture_fourn' => $langs->trans('SupplierBill'),
|
||||||
'fichinter' => $langs->trans('InterventionCard'),
|
'fichinter' => $langs->trans('InterventionCard')
|
||||||
'agenda' => $langs->trans('Agenda')
|
|
||||||
);
|
);
|
||||||
if (! empty($conf->global->MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES)) $elementList["societe"] = $langs->trans('ThirdParty');
|
if (! empty($conf->global->MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES)) $elementList["societe"] = $langs->trans('ThirdParty');
|
||||||
$sourceList = array(
|
$sourceList = array(
|
||||||
@ -770,7 +776,10 @@ if ($id)
|
|||||||
if ($fieldlist[$field]=='localtax2') { $valuetoshow=$langs->trans("Rate")." 3";}
|
if ($fieldlist[$field]=='localtax2') { $valuetoshow=$langs->trans("Rate")." 3";}
|
||||||
if ($fieldlist[$field]=='organization') { $valuetoshow=$langs->trans("Organization"); }
|
if ($fieldlist[$field]=='organization') { $valuetoshow=$langs->trans("Organization"); }
|
||||||
if ($fieldlist[$field]=='lang') { $valuetoshow=$langs->trans("Language"); }
|
if ($fieldlist[$field]=='lang') { $valuetoshow=$langs->trans("Language"); }
|
||||||
if ($fieldlist[$field]=='type') { $valuetoshow=$langs->trans("Type"); }
|
if ($fieldlist[$field]=='type') {
|
||||||
|
if ($tabname[$id] == MAIN_DB_PREFIX."c_paiement") $valuetoshow=$form->textwithtooltip($langs->trans("Type"),$langs->trans("TypePaymentDesc"),2,1,img_help(1,''));
|
||||||
|
else $valuetoshow=$langs->trans("Type");
|
||||||
|
}
|
||||||
if ($fieldlist[$field]=='code') { $valuetoshow=$langs->trans("Code"); }
|
if ($fieldlist[$field]=='code') { $valuetoshow=$langs->trans("Code"); }
|
||||||
if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') { $valuetoshow=$langs->trans("Label")."*"; }
|
if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') { $valuetoshow=$langs->trans("Label")."*"; }
|
||||||
if ($fieldlist[$field]=='libelle_facture') { $valuetoshow=$langs->trans("LabelOnDocuments")."*"; }
|
if ($fieldlist[$field]=='libelle_facture') { $valuetoshow=$langs->trans("LabelOnDocuments")."*"; }
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
-- ========================================================================
|
-- ========================================================================
|
||||||
-- Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
-- Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||||
-- Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
|
-- Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||||
-- Copyright (C) 2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
|
-- Copyright (C) 2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
|
||||||
--
|
--
|
||||||
-- This program is free software; you can redistribute it and/or modify
|
-- This program is free software; you can redistribute it and/or modify
|
||||||
@ -18,19 +18,12 @@
|
|||||||
--
|
--
|
||||||
-- ========================================================================
|
-- ========================================================================
|
||||||
|
|
||||||
|
|
||||||
-- Type :
|
|
||||||
--
|
|
||||||
-- 0 : entree d'argent
|
|
||||||
-- 1 : sortie d'argent
|
|
||||||
-- 2 : entree ou sortie d'argent
|
|
||||||
|
|
||||||
create table llx_c_paiement
|
create table llx_c_paiement
|
||||||
(
|
(
|
||||||
id integer PRIMARY KEY,
|
id integer PRIMARY KEY,
|
||||||
code varchar(6) NOT NULL,
|
code varchar(6) NOT NULL,
|
||||||
libelle varchar(30),
|
libelle varchar(30),
|
||||||
type smallint,
|
type smallint, -- 0: input money, 1: output money, 2: input and output, 3: other
|
||||||
active tinyint DEFAULT 1 NOT NULL,
|
active tinyint DEFAULT 1 NOT NULL,
|
||||||
accountancy_code varchar(32) NULL,
|
accountancy_code varchar(32) NULL,
|
||||||
module varchar(32) NULL
|
module varchar(32) NULL
|
||||||
|
|||||||
@ -1541,3 +1541,4 @@ Opened=Opened
|
|||||||
Closed=Closed
|
Closed=Closed
|
||||||
|
|
||||||
Format=Format
|
Format=Format
|
||||||
|
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
|
||||||
Loading…
Reference in New Issue
Block a user