Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 09:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
56,821 Commits 36 Branches 190 Tags
e83bb0f50c1b0b51a587a423183563f07f46a982
Commit Graph

2174 Commits

Author SHA1 Message Date
Laurent Destailleur
788cbf9a01 Complete work on dol_banner on contracts 2016-12-04 13:30:17 +01:00
Laurent Destailleur
888c4cd2ad Fix corrupted value for pointoftax field 2016-12-03 20:15:56 +01:00
Laurent Destailleur
17bc24e83e Complete repair 2016-12-03 20:05:49 +01:00
Laurent Destailleur
fb2f33cfac FIX Clean corrupted data 2016-12-03 19:48:08 +01:00
Laurent Destailleur
495ba00cb6 Fix: Slurp, database corruption due to missing unique key on main key. 2016-12-02 14:21:46 +01:00
Laurent Destailleur
0ec9dd9b88 Merge pull request #6048 from ozit/patch-1 
an extra comma at the end
 2016-11-29 23:37:41 +01:00
Laurent Destailleur
9ff38ee136 Add missing currency for madagascar 2016-11-29 12:28:17 +01:00
Laurent Destailleur
39c2088aa5 Fix constant 2016-11-29 11:23:15 +01:00
Laurent Destailleur
83972b39ce Complete work on dol_banner. Fix errors due to missing columns. 2016-11-28 23:58:36 +01:00
Oziel AO
2c8f2f220a an extra comma at the end 
note             text
not
  note             text,
 2016-11-28 12:29:30 +01:00
Laurent Destailleur
e6fb118155 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2016-11-26 15:52:17 +01:00
Laurent Destailleur
b63ad019ce Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-11-26 15:49:11 +01:00
Laurent Destailleur
e9b78db1ac Several bug fixes: 
missing import_key field, ref generator parameter must be task not
project, import must use css, serious database integrity problem
accepting duplicate tasks.
 2016-11-19 02:16:12 +01:00
florian HENRY
7bf6ad49da Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2016-11-14 12:23:17 +01:00
florian HENRY
37a9f15fb4 FIX : increase size of llx_c_actioncomm type column 2016-11-14 12:21:08 +01:00
Laurent Destailleur
af2f4cf78d Merge branch 'patch-20' of https://github.com/defrance/dolibarr into 
defrance-patch-20

Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
	htdocs/install/mysql/tables/llx_facturedet.sql
 2016-11-12 13:36:45 +01:00
Laurent Destailleur
645eee57db Fix syntax error 2016-11-12 11:22:18 +01:00
Laurent Destailleur
7953ea8b4d Merge pull request #5979 from aspangaro/5.0-p35 
Vat expense report integration in reports
 2016-11-12 11:09:58 +01:00
Regis Houssin
97a8a84b9d Fix: missing encrypt/decrypt with llx_const 2016-11-12 09:57:41 +01:00
Regis Houssin
a1cccc021e Fix: missing encrypt data for llx_const 2016-11-12 09:48:34 +01:00
aspangaro
137561aec9 Merge remote-tracking branch 'Upstream/develop' into 5.0-p35 2016-11-12 06:31:06 +01:00
BENKE Charlie
eda718a91b Update llx_facturedet.sql 2016-11-11 15:25:19 +01:00
BENKE Charlie
056e26e595 Update 4.0.0-5.0.0.sql 2016-11-11 15:05:56 +01:00
Laurent Destailleur
787f508172 More complete fix for #5974 2016-11-11 14:25:22 +01:00
Laurent Destailleur
360d697fc3 Add missing field to store result of email sending 2016-11-11 13:45:18 +01:00
Laurent Destailleur
fe9c880984 NEW Add missing unique key on table llx_links 2016-11-10 14:24:29 +01:00
Laurent Destailleur
bc245165c0 Merge pull request #5961 from defrance/patch-40 
When constant change, please add update of constant
 2016-11-08 14:35:50 +01:00
Laurent Destailleur
608ca669fd Update doc 
Add missing table in upgrade script
 2016-11-07 03:18:53 +01:00
BENKE Charlie
b3fdf4b872 Update 4.0.0-5.0.0.sql 2016-11-06 14:49:16 +01:00
BENKE Charlie
29196eedde When constant change, please add update of constant 2016-11-06 12:03:28 +01:00
aspangaro
5ed79800e0 Begin to wok on Vat expense report integration in reports 2016-11-05 07:48:42 +01:00
Laurent Destailleur
3fbba59f69 Better management of status of events 2016-10-30 13:12:35 +01:00
Laurent Destailleur
c858c5b39b Merge pull request #5941 from simnandez/develop 
Fix bad sql query introduced by #38e6c9c
 2016-10-29 17:50:10 +02:00
Laurent Destailleur
69fe2bfad6 Fix a case of corrupted data 2016-10-29 17:16:14 +02:00
Laurent Destailleur
cb3f0dadab NEW Can see/edit the customer ref of a shipment 2016-10-29 14:52:13 +02:00
Juanjo Menent
9bd44185c7 Fix bad sql query introduced by #38e6c9c 2016-10-29 14:46:57 +02:00
Laurent Destailleur
38e6c9cc57 Fix multientity on overwritting translation not yet supported. 2016-10-28 22:47:37 +02:00
aspangaro
883446c5bb Merge remote-tracking branch 'Upstream/develop' into 5.0-p32 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
 2016-10-25 22:09:40 +02:00
Laurent Destailleur
f67863e1aa NEW Can use any filter on all REST API to list. 2016-10-25 19:15:47 +02:00
aspangaro
6e7f104c5f Update works 2016-10-25 07:41:01 +02:00
Laurent Destailleur
f1421a2ee4 Rename constant with english name 2016-10-24 13:10:35 +02:00
Laurent Destailleur
fdcc858008 Merge branch 'dev_resource_extrafields' of 
https://github.com/atm-florian/dolibarr into
atm-florian-dev_resource_extrafields

Conflicts:
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2016-10-24 02:05:34 +02:00
Laurent Destailleur
3c3c5d06a1 Merge branch 'NEW_parent_warehouse' of 
https://github.com/atm-gauthier/dolibarr into
atm-gauthier-NEW_parent_warehouse

Conflicts:
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2016-10-24 00:58:02 +02:00
Laurent Destailleur
abc471575a Fix sql error 2016-10-22 17:00:19 +02:00
Laurent Destailleur
304a44ffc2 Debug accounting module 2016-10-21 14:48:55 +02:00
Laurent Destailleur
d18097da28 Prepare database to manage different vat rate with same rate value. 2016-10-21 14:09:11 +02:00
florian HENRY
54a154fa4f NEW : Add ressource extrafields 2016-10-19 22:14:51 +02:00
Laurent Destailleur
30e6dd93a6 Missing perf key on the most important table 2016-10-15 17:10:05 +02:00
Laurent Destailleur
850a275b47 Fix duplicate accounting account with same number. Add unique key. 2016-10-14 18:46:30 +02:00
Laurent Destailleur
79d376ee12 Debug accountancy module 2016-10-14 13:05:01 +02:00