Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
49,918 Commits 36 Branches 189 Tags
d71ccc4a0292f3bbdd449768b51a4c310f4e744c
Commit Graph

2773 Commits

Author SHA1 Message Date
Laurent Destailleur
dcf7d344cd Prepare database for future portal website 2015-10-19 12:54:22 +02:00
Laurent Destailleur
b9001d7ab8 NEW Prepare database to store information per files (for example to 
define if an image ca, be used as a cover or not)
 2015-10-18 22:43:19 +02:00
Laurent Destailleur
d0e590f8ea Move variables 2015-10-18 20:56:10 +02:00
Laurent Destailleur
91a2341e88 Add missing column 2015-10-17 03:32:19 +02:00
Laurent Destailleur
b3491ef4e5 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/admin/facture_cust_extrafields.php
	htdocs/compta/facture/admin/facturedet_cust_extrafields.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
 2015-10-16 10:12:36 +02:00
Laurent Destailleur
577776b950 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-15 12:19:01 +02:00
Laurent Destailleur
e2478eea07 NEW Increase length of bank code to 128 char #3704 2015-10-15 12:18:17 +02:00
Laurent Destailleur
7fe92bdf0a Merge pull request #3722 from GPCsolutions/zenfusion-23 
[Qual] Use default data root path if no conf
 2015-10-15 12:06:04 +02:00
Laurent Destailleur
7f75a3da9d NEW On list of thirdparties, user can select fields to show. 
Make phpunit test working again localy.
Add missing columns into llx_expedition.
 2015-10-15 03:29:35 +02:00
Laurent Destailleur
e9aed15bed Work on the feature to select which field to show 2015-10-14 18:48:03 +02:00
Raphaël Doursenaud
ddb23eaf3b [Qual] Use default data root path if no conf 
Installation can be protected by an install.lock file in the
data root path. This protection was ineffective if no configuration
file was available. Whith this change, it still searches the default
path.
 2015-10-12 15:25:36 +02:00
Laurent Destailleur
1acaf44acf Merge pull request #3718 from hregis/3.8_bug 
Fix: wrong files name
 2015-10-11 19:48:25 +02:00
Laurent Destailleur
a9a3c3b97f Exclude file from sources. It is generated when building package. 2015-10-11 19:47:47 +02:00
Laurent Destailleur
a8e52f9c54 Update filelist 2015-10-11 19:45:53 +02:00
Regis Houssin
f8f600828d Fix: wrong files name 2015-10-11 19:18:03 +02:00
Raphaël Doursenaud
b785db86a8 Fix unittests regression 
Introduced by incomplete renaming
of modSyncSupplierWebServices to modWebServicesClient
in 4b103ba8ce
 2015-10-09 19:02:44 +02:00
Laurent Destailleur
4b103ba8ce Work on a better way to manage modules. All one page. Introduce a way to 
choose order of modules family. We should also be able to introduce
filters.
 2015-10-07 08:13:23 +02:00
frederic34
7f86797f73 Add contact photo 2015-10-04 17:25:46 +02:00
Juanjo Menent
92f4c0d015 Merge remote-tracking branch 'upstream/develop' into dolibarr-3509 2015-10-03 16:01:24 +02:00
Juanjo Menent
67d28d6991 Merge remote-tracking branch 'upstream/develop' into dolibarr-3509 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-10-03 14:59:56 +02:00
Laurent Destailleur
c0c0cc2415 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/interventions.lang
	htdocs/theme/md_exp/style.css.php
 2015-10-03 14:28:31 +02:00
Laurent Destailleur
920803518f Removed not used table 2015-10-02 16:31:34 +02:00
Laurent Destailleur
53269a2703 Removed old theme with no maintener. 2015-10-01 23:27:41 +02:00
Laurent Destailleur
fcf3a0966c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-01 23:19:58 +02:00
Laurent Destailleur
3f8b95de77 Work on default theme 2015-10-01 23:19:50 +02:00
Laurent Destailleur
09e5d71796 Merge pull request #3631 from hregis/develop_origin 
Fix: missing llx_const encryption
 2015-10-01 13:57:47 +02:00
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