Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
54,329 Commits 36 Branches 189 Tags
9b1caefbf9c68ba433333efbeb125cb15d4b10dd
Commit Graph

3149 Commits

Author SHA1 Message Date
Regis Houssin
45a70d7dc3 Fix: wrong test 2015-10-01 12:41:29 +02:00
Regis Houssin
1c023e291c Fix: avoid error during update if db port not defined 2015-10-01 12:35:38 +02:00
Regis Houssin
259f7af3e6 Fix: missing llx_const encryption 2015-10-01 12:06:45 +02:00
Laurent Destailleur
b57c156b60 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/modules/modContrat.class.php
	htdocs/fichinter/card.php
	htdocs/install/upgrade2.php
 2015-10-01 11:16:35 +02:00
Laurent Destailleur
c7e05d2473 Add field pass_crypted to uniformize fields between members and users. 2015-09-30 19:27:36 +02:00
Florian HENRY
bb0de1dcad FIX : update2.php test res befre assign it 2015-09-29 15:00:11 +02:00
Juanjo Menent
f14c806439 Merge branch 'develop' into dolibarr-3509 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-09-26 09:03:50 +02:00
Juanjo Menent
342e3413db Issue 3509: Init works 2015-09-23 22:48:48 +02:00
aspangaro
918c323f8f Salaries : Add info card / add field datec / rename field user_creat to user_author 2015-09-23 06:37:14 +02:00
Laurent Destailleur
81b447dd0f NEW Add color on categories 2015-09-17 19:51:56 +02:00
Laurent Destailleur
b1168d223a NEW Introduce table llx_overwrite_trans to be able to overwrite 
translations by simple database edition.
 2015-09-17 18:44:42 +02:00
Laurent Destailleur
9cbd236c8c Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2015-09-16 22:09:21 +02:00
Laurent Destailleur
e0a88fabd9 FIX #3521 2015-09-14 17:54:53 +02:00
Laurent Destailleur
b4c964760d Sync transifex 2015-09-13 23:25:55 +02:00
Laurent Destailleur
4eedec0274 Fix tool to generate filecheck 2015-09-13 20:25:33 +02:00
Laurent Destailleur
309e1604e1 Fix migration missing for leave request module 
Fix permission label for expense report and leave request
 2015-09-12 11:35:49 +02:00
Laurent Destailleur
24a216b154 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-09-12 11:33:49 +02:00
Laurent Destailleur
4b97fae28f Fix migration missing for leave request module 
Fix permission label for expense report and leave request
 2015-09-11 07:52:06 +02:00
Florian HENRY
6cb993c0b4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-09-10 11:20:03 +02:00
aspangaro
393d528be7 Merge remote-tracking branch 'Upstream/develop' into develop-64 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-09-08 21:17:54 +02:00
aspangaro
16585553c1 Merge remote-tracking branch 'Upstream/develop' into develop-64 2015-09-07 21:52:08 +02:00
aspangaro
cf869f22b5 Merge remote-tracking branch 'Upstream/develop' into develop-63 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-09-07 21:45:13 +02:00
aspangaro
710e9327bf Update works 2015-09-07 21:42:12 +02:00
Laurent Destailleur
7f05e19e0d Prepare 3.9 2015-09-07 13:24:52 +02:00
aspangaro
5780d33f9b Merge remote-tracking branch 'Upstream/develop' into develop-64 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-09-06 22:00:52 +02:00
aspangaro
671018c5cc New Accountancy Uniformize code & rename a constant 2015-09-06 21:53:28 +02:00
Laurent Destailleur
77ef046af4 Start to mutualize the builddoc and remove_file action. 2015-09-06 14:02:21 +02:00
aspangaro
ef7df3f261 New: Accountancy rename llx_accountingaccount in llx_accounting_account 
Fix: language key
 2015-09-05 08:03:06 +02:00
Laurent Destailleur
7d4602f2c4 Fix payment mode type 2015-09-01 15:59:11 +02:00
Laurent Destailleur
942723ff8d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-08-31 12:13:35 +02:00
aspangaro
e4bac2adfd Merge remote-tracking branch 'Upstream/develop' into develop-57 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-08-30 07:39:45 +02:00
Laurent Destailleur
47ea834516 Fix debug module expense report 2015-08-28 20:11:16 +02:00
aspangaro
134bd42c4e Increase length of column pcg_version to 32 2015-08-27 15:13:29 +02:00
Florian HENRY
3ae9515416 add column for import 2015-08-20 10:43:27 +02:00
Florian HENRY
b4e810a7a8 FIX: #3392 2015-08-17 13:05:54 +02:00
aspangaro
bd69d37c3a New: Add number of expense reports to pay 2015-08-17 05:29:12 +02:00
Laurent Destailleur
3938a35455 Update template 2015-08-13 05:15:42 +02:00
Laurent Destailleur
ba67cf9fa6 Update doc 2015-08-13 00:51:32 +02:00
Laurent Destailleur
fc9dc100b1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-08-12 22:13:19 +02:00
Laurent Destailleur
daeada4bae Merge branch 'patch-70' of https://github.com/defrance/dolibarr into 
defrance-patch-70

Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-08-12 22:12:50 +02:00
Juanjo Menent
78d1dfae11 Merge remote-tracking branch 'origin/3.7' into develop 2015-08-12 18:41:44 +02:00
josemariagomezroncero
e146af3118 Update llx_c_type_resource.sql 
Error create table, missing incremet type element
 2015-08-11 22:38:21 +02:00
Laurent Destailleur
84e45848c8 Doc comments 2015-07-30 14:44:05 +02:00
Laurent Destailleur
ffeaa4e224 Test update checksum file 2015-07-29 15:50:59 +02:00
Laurent Destailleur
17f7b1528a Fix not compatible not supported option 2015-07-28 10:05:48 +02:00
Juanjo Menent
bd48163427 Merge remote-tracking branch 'origin/3.8' into develop 2015-07-22 11:27:05 +02:00
Juanjo Menent
16ae9633e5 FIX: Change Spanish provinces code to ISO 2015-07-22 11:26:20 +02:00
Juanjo Menent
70f9aa9ece Merge remote-tracking branch 'origin/3.8' into develop 2015-07-22 11:08:22 +02:00
Juanjo Menent
7c8b1feaeb FIX: Change Spanish provinces code to ISO 2015-07-22 10:57:25 +02:00
Laurent Destailleur
99c8a9211e Sync with transifex 2015-07-20 13:55:43 +02:00