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

Browse Source 
develop

Conflicts:
	ChangeLog
This commit is contained in:
Laurent Destailleur 2012-10-06 23:15:10 +02:00
commit 566855d7e8
8 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -53,6 +53,7 @@ For users:
- New: POS module can works with only one payment method (cach, chq, credit card).
- New: Add possibility to defined position/job of a user
- New: [ task #210 ] Can choose cash account during POS login
- New: [ task #104 ] Can create an invoice from several orders
New experimental modules:
- New: Add margin and commissions management module.

6
htdocs/install/mysql/migration/3.2.0-3.3.0.sql
View File

@ -759,3 +759,9 @@ UPDATE llx_product p SET p.stock= (SELECT SUM(ps.reel) FROM llx_product_stock ps
-- Add possibility to defined position/job of a user
ALTER TABLE llx_user ADD COLUMN job varchar(128) AFTER firstname;
-- New Imports
ALTER TABLE llx_commande_fournisseurdet ADD COLUMN import_key varchar(14) AFTER info_bits;
ALTER TABLE llx_entrepot ADD COLUMN import_key varchar(14) AFTER fk_user_author;
ALTER TABLE llx_product_fournisseur_price ADD COLUMN import_key varchar(14) AFTER fk_user;
ALTER TABLE llx_product_stock ADD COLUMN import_key varchar(14) AFTER pmp;

9
htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql
View File

@ -1,7 +1,7 @@
-- ===================================================================
-- Copyright (C) 2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Copyright (C) 2007-2009 Laurent Destailleur <eldy@users.sourceforge.net>
-- Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
-- Copyright (C) 2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Copyright (C) 2007-2009 Laurent Destailleur <eldy@users.sourceforge.net>
-- Copyright (C) 2010-2012 Juanjo Menent <jmenent@2byte.es>
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
@ -43,5 +43,6 @@ create table llx_commande_fournisseurdet
product_type integer DEFAULT 0,
date_start datetime DEFAULT NULL, -- date debut si service
date_end datetime DEFAULT NULL, -- date fin si service
info_bits integer DEFAULT 0 -- TVA NPR ou non
info_bits integer DEFAULT 0, -- TVA NPR ou non
import_key varchar(14)
)ENGINE=innodb;

8
htdocs/install/mysql/tables/llx_entrepot.sql
View File

@ -1,6 +1,7 @@
-- ============================================================================
-- Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
-- Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
-- Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
@ -33,5 +34,6 @@ create table llx_entrepot
fk_pays integer DEFAULT 0,
statut tinyint DEFAULT 1, -- 1 open, 0 close
valo_pmp float(12,4), -- valoristaion du stock en PMP
fk_user_author integer
fk_user_author integer,
import_key varchar(14)
)ENGINE=innodb;

4
htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
View File

@ -2,6 +2,7 @@
-- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Copyright (C) 2009-2011 Laurent Destailleur <eldy@users.sourceforge.net>
-- Copyright (C) 2009-2012 Regis Houssin <regis@dolibarr.fr>
-- Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
@ -34,5 +35,6 @@ create table llx_product_fournisseur_price
charges double(24,8) DEFAULT 0,
unitcharges double(24,8) DEFAULT 0,
tva_tx double(6,3) NOT NULL,
fk_user integer
fk_user integer,
import_key varchar(14) -- Import key
)ENGINE=innodb;

8
htdocs/install/mysql/tables/llx_product_stock.sql
View File

@ -1,6 +1,7 @@
-- ============================================================================
-- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Copyright (C) 2009 Laurent Destailleur <eldy@users.sourceforge.net>
-- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Copyright (C) 2009 Laurent Destailleur <eldy@users.sourceforge.net>
-- Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
@ -24,6 +25,7 @@ create table llx_product_stock
fk_product integer NOT NULL,
fk_entrepot integer NOT NULL,
reel real, -- physical stock
pmp double(24,8) default 0 NOT NULL -- PMP value for product in this warehouse
pmp double(24,8) default 0 NOT NULL, -- PMP value for product in this warehouse
import_key varchar(14) -- Import key
)ENGINE=innodb;

5
htdocs/langs/ca_ES/admin.lang
View File

@ -837,6 +837,11 @@ SetupDescription5=Les altres entrades de configuració gestionen paràmetres opc
EventsSetup=Configuració del registre d'esdeveniments
LogEvents=Auditoria de la seguretat d'esdeveniments
Audit=Auditoria
InfoDolibarr=Info Dolibarr
InfoOS=Info SO
InfoWebServer=Info servidor
InfoDatabase=Info base de dades
InfoPHP=Info PHP
ListEvents=Auditoria d'esdeveniments
ListOfSecurityEvents=Llistat d'esdeveniments de seguretat Dolibarr
SecurityEventsPurged=Esdeveniments de seguretat purgats

5
htdocs/langs/es_ES/admin.lang
View File

@ -839,6 +839,11 @@ SetupDescription5=Las otras entradas de configuración gestionan parámetros opc
EventsSetup=Configuración del registro de eventos
LogEvents=Auditoría de la seguridad de eventos
Audit=Auditoría
InfoDolibarr=Info Dolibarr
InfoOS=Info SO
InfoWebServer=Info servidor
InfoDatabase=Info base de datos
InfoPHP=Info PHP
ListEvents=Auditoría de eventos
ListOfSecurityEvents=Listado de eventos de seguridad Dolibarr
SecurityEventsPurged=Eventos de seguridad purgados