Marcos García de La Fuente
7075ac74c4
Merge branch 'develop' into units
...
Conflicts:
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/card.php
htdocs/contrat/class/contrat.class.php
htdocs/core/class/commonobjectline.class.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/class/product.class.php
2015-04-03 15:45:54 +02:00
Marcos García de La Fuente
b4c84fac9d
NEW: [ task #977 ] New option to manage product unit
...
Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements
2015-03-01 12:42:38 +01:00
Laurent Destailleur
ef14e4e7ed
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/fourn/class/fournisseur.product.class.php
2015-02-28 03:11:15 +01:00
Laurent Destailleur
3c0c9019b5
Comment
2013-12-08 15:40:22 +01:00
Laurent Destailleur
4654e811b2
Close taks [ task #645 ]. We keep fields, just add comment into tables
...
with explanation of fields.
2013-06-06 18:54:17 +02:00
Laurent Destailleur
01b2a6a79b
Prepare database for more localtax types.
2013-03-09 13:12:20 +01:00
Laurent Destailleur
8d206fdfb0
Prepare move to other licence. For the moment all answers for licence
...
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Regis Houssin
b838895db9
Fix: change for a neutral email
2012-12-30 15:13:49 +01:00
Laurent Destailleur
49e79a2c28
Fix: database compatibility
2012-09-27 23:43:58 +02:00
Laurent Destailleur
4847e946a4
Fix: Use varchar instead of char (for better compatibility, char is an
...
old directive)
Fix: Restore usage of text field for "enabled" menu because, even if in
standard code, we use 0 or 1, into external module, or menu editor we
should be able to use full condition dynamic string.
2012-09-10 16:20:34 +02:00
Christophe Battarel
2e4aa1131a
prepare database for local taxes management
...
add localtax1_type and localtax2_type in database.
these type are char(1) and support following values :
'0' : local tax not applied
'1' : local tax apply on products and services without vat (vat is not applied on local tax)
'2' : local tax apply on products and services before vat (vat is calculated on amount + localtax)
'3' : local tax apply on products without vat (vat is not applied on local tax)
'4' : local tax apply on products before vat (vat is calculated on amount + localtax)
'5' : local tax apply on services without vat (vat is not applied on local tax)
'6' : local tax apply on services before vat (vat is calculated on amount + localtax)
'7' : local tax is a fix amount applied on global invoice
2012-09-10 11:00:35 +02:00
Regis Houssin
c8e1aca7d8
New: [ task #498 ] part2
2012-08-23 07:50:20 +02:00
Christophe Battarel
a37707f96f
updata database for margin module
2012-07-18 11:39:41 +02:00
Regis Houssin
03711cf6f2
Fix: remove obsolete tags
2011-08-27 19:15:14 +00:00
Laurent Destailleur
69ecbf3981
Fix: Avoid errors into rpm packages
2011-08-03 01:13:30 +00:00
Regis Houssin
e28ab7f759
Fix: compatibility with mysql 5.5+
2011-02-24 09:57:02 +00:00
Regis Houssin
7648e6a723
Works on hook module
2010-09-24 14:39:03 +00:00
Regis Houssin
8f04e216db
Fix: regression
2010-09-06 22:17:16 +00:00
Regis Houssin
9b1b24cf56
Works on migration management positioning lines
2010-09-06 15:01:02 +00:00
Juanjo Menent
b38f9aef21
Works on enhancement of local taxes. New: Prepare database, costumer order tables
2010-03-01 20:42:24 +00:00
Regis Houssin
43d5b6f83c
Fix: add constraint in llx_propaldet
2009-11-12 16:40:01 +00:00
Laurent Destailleur
a469b8e0fc
Qual: Uniformize SQL code to be more compatible
2009-10-23 23:01:03 +00:00
Laurent Destailleur
8089dd48fd
Move mysql/pgsql/mssql dir into install directory.
2009-10-07 18:17:55 +00:00
