Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-07 01:58:09 +01:00
Code Issues Packages Projects Releases Wiki Activity
36,922 Commits 36 Branches 190 Tags
a6233a738c2f67e557b54b144066a7cb15c728e8
Commit Graph

670 Commits

Author SHA1 Message Date
Regis Houssin
0975918cc6 Fix: [task #146] Remove table llx_categorie_association 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-10-08 19:27:02 +02:00
simnandez
7faa90e831 New: More import options. Prepare database 2012-10-06 09:52:33 +02:00
Regis Houssin
6b21ca442d New: add possibility to defined position/job of a user 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-10-05 12:40:19 +02:00
Maxime Kohlhaas
0e17c7c063 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko186 2012-10-04 15:36:47 +02:00
Maxime Kohlhaas
12128a6226 Task # 186 : Stock calculation on product, migration + update product 2012-10-04 15:25:34 +02:00
Laurent Destailleur
bef9fd152b Fix: table creation scripts 2012-10-02 19:42:44 +02:00
Maxime Kohlhaas
1d21f24fa7 Task # 559 : Add possibility to define a discount for min quantity on supplier product prices 2012-10-01 11:25:17 +02:00
Laurent Destailleur
9db72fb50d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-09-28 16:11:46 +02:00
Laurent Destailleur
e7203fa4f3 New: The discount on line for supplier invoices is now supported 2012-09-28 16:08:44 +02:00
Regis Houssin
0441c6dd46 Merge pull request #417 from aspangaro/develop 
Continue working on accountancy
 2012-09-28 02:43:54 -07:00
Laurent Destailleur
49e79a2c28 Fix: database compatibility 2012-09-27 23:43:58 +02:00
Spangaro Alexandre
e4391207e4 Add new dictionnary to edit accountingsystem 2012-09-26 20:37:28 +02:00
Regis Houssin
338f0b06d9 Fix: missing changes in migration file 2012-09-25 08:06:39 +02:00
Spangaro Alexandre
ba45295c7e Working for accountancy 2012-09-24 07:14:39 +02:00
Spangaro Alexandre
96dd6efae0 Minor fix for llx_c_tva 2012-09-24 07:14:38 +02:00
Spangaro Alexandre
a6f9111b54 Add new column in llx_c_tva 2012-09-24 07:14:37 +02:00
Laurent Destailleur
9bbe0e6b1c Qual: Mutuamize codeby using tpl. 
New: Support unique field for extrafields
 2012-09-22 20:27:06 +02:00
Laurent Destailleur
22a28abed1 Fix: Add more sql fix commands 2012-09-20 17:46:47 +02:00
Laurent Destailleur
44591bd756 Use a specific type to isolate type of event that are event 
automatically added into agenda from other predefined events.
 2012-09-20 00:18:29 +02:00
simnandez
875edcad0d Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-09-19 10:32:00 +02:00
Laurent Destailleur
89dfd246d1 Init data must match migrated data 2012-09-18 18:27:10 +02:00
simnandez
fab101d2e8 Fix: Spanish localtax1 must be only applicable to products 
Add localtax2_type
 2012-09-18 15:38:08 +02:00
Laurent Destailleur
df3227ef7e Migrate spain to localtax type. 2012-09-16 16:56:24 +02:00
Laurent Destailleur
e7d3d9496c first step for extrafield for contact/address 2012-09-14 12:15:55 +02:00
Laurent Destailleur
643d6ff3f9 Fix: Debug feature predefined invoices 2012-09-14 10:09:56 +02:00
Laurent Destailleur
4cc56f0176 New: Extra fields supports more types (now int, string, double, date, 
datetime)
 2012-09-13 10:14:25 +02:00
Regis Houssin
f16a68bf01 Fix: remove unused tables 2012-09-12 16:40:46 +02:00
Regis Houssin
c6c2fd2f39 Fix: restore previous field type 2012-09-11 16:07:52 +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
Regis Houssin
26ff406e4a Fix: use MODIFY instead CHANGE for just change the type of field 2012-09-10 13:25:34 +02:00
Marcos García
74b28dab79 Merge branch 'develop' into minor 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-09-10 12:16:45 +02:00
Regis Houssin
83179fc4f0 Merge pull request #378 from cbattarel/localtax 
prepare database for local taxes management (2nd try) - task 204 on doliforge
 2012-09-10 03:04:31 -07:00
Regis Houssin
4269878e6d Fix: restore varchar for the moment 2012-09-10 11:59:17 +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
e1fcaf738f Fix: move llx_ecm_documents in external module 2012-09-10 10:55:06 +02:00
Marcos García
45cd500882 Modified llx_menu sql and improved new menu form 
Modified `enabled` field to tinyint(1) because only holds 0 or 1
Enabled input field now made yes/no select
 2012-09-10 02:09:52 +02:00
Regis Houssin
61159ca220 Fix: use specific hash for ref 2012-09-09 22:05:53 +02:00
Regis Houssin
5ff1240287 Fix: increase size for big path and where data is encrypted 2012-09-09 18:28:36 +02:00
Laurent Destailleur
1721f564c8 Increase size of field into database 2012-09-08 01:42:15 +02:00
Regis Houssin
d60211a7c8 Fix: update entity field 2012-09-07 17:43:27 +02:00
Regis Houssin
5270ec06cb Fix: compatibility with multicompany transverse mode 2012-09-07 17:20:12 +02:00
Regis Houssin
77bbae7723 Fix: remove older models for avoid warnings 2012-09-07 11:18:08 +02:00
Regis Houssin
68c71896d4 Fix: add extraparams field for more parameters 2012-09-07 10:50:19 +02:00
Laurent Destailleur
6e90e60268 Fix data init 2012-09-06 23:46:35 +02:00
Laurent Destailleur
f9607037a7 Qual: Removed deprecated table 2012-09-05 09:58:09 +02:00
Laurent Destailleur
246f3b5bb8 New: Add the holiday module (provided by teclib with permission to add 
it by default).
 2012-09-05 03:26:57 +02:00
Regis Houssin
5622d1624c New: prepare for extend GED module 2012-09-03 18:03:39 +02:00
Regis Houssin
14b1b1d6e5 Fix: missing upgrade with minor version 2012-09-03 16:28:55 +02:00
Laurent Destailleur
2927a58606 Fix: Some fix into ajax ecm. 
New: The cache for nb of files into a dir is now implemented. By
default it is "not defined" and we refresh it when making a scan of a
dir for all subdirs.
 2012-09-02 20:11:36 +02:00
Regis Houssin
6f8b63f0ef Merge pull request #367 from simnandez/develop 
Fix: Bad assignation of const for pdf delivery module name
 2012-09-01 09:48:57 -07:00