lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
60,442 Commits 43 Branches 150 Tags 886 MiB
dfb49fc47b
Commit Graph

60442 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
dfb49fc47b Fix update tms 2017-07-20 18:36:18 +02:00
Laurent Destailleur
7760594643 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/website.lang
	htdocs/theme/eldy/style.css.php
	htdocs/websites/class/website.class.php
	htdocs/websites/index.php
 2017-07-20 18:31:58 +02:00
Laurent Destailleur
fa3ed50f3a Fix sql syntax 2017-07-20 18:23:42 +02:00
Laurent Destailleur
2f3128410b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-20 16:49:56 +02:00
Laurent Destailleur
3b8f60f90e Fix pb of recursive include in website module 2017-07-20 16:49:20 +02:00
Laurent Destailleur
2621c55bf4 Link of preview is enabled only if setup is correct. 2017-07-20 11:51:30 +02:00
Laurent Destailleur
1e7aa4d9b4 Work on module website 2017-07-19 16:38:00 +02:00
Laurent Destailleur
84f621fde3 Fix migration on pgsql 2017-07-19 16:31:15 +02:00
Laurent Destailleur
74db61ce15 Fix translation 2017-07-19 15:50:57 +02:00
Laurent Destailleur
1bc2bba953 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-18 15:15:50 +02:00
Laurent Destailleur
6665416d97 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-18 15:15:31 +02:00
Laurent Destailleur
1c5148bb1e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-07-18 15:13:46 +02:00
Laurent Destailleur
782cde37b3 Merge pull request #7175 from ATM-Marc/NEW_units_import_products 
NEW add fk_unit field into product/service import/export
 2017-07-18 14:49:59 +02:00
Laurent Destailleur
594f08cc6f Merge pull request #7170 from aspangaro/6.0-fix7169 
Fix #7169 : Unknown column 'ba.accountancy_journal' in member's subcription
 2017-07-18 14:46:42 +02:00
Laurent Destailleur
c59059ad9d Merge pull request #7167 from hregis/6.0_bug 
Fix: php 5.6 is ok now (travis)
 2017-07-18 14:45:26 +02:00
hguibourgdev
4b0638dd40 Update list.php 
FIX copy-paste error (sell versus buy)
 2017-07-18 14:43:03 +02:00
Laurent Destailleur
636c6ea880 Merge pull request #7163 from hguibourgdev/patch-6 
Update list.php
 2017-07-18 14:42:26 +02:00
Laurent Destailleur
b2c00ac463 Merge pull request #7161 from hguibourgdev/patch-4 
Patch 4
 2017-07-18 14:38:34 +02:00
Laurent Destailleur
5e1dbdc608 Update index.php 2017-07-18 14:35:11 +02:00
Articoder InfoSec Team
0179160f6c Reason: similar change is present elsewhere in the code 
Notes: please review carefully before accepting. patch propagation. manual test run. 
Reviewed By: https://github.com/dchichkov 
Cherry picked from:
===
From 0d62bd704e Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Wed, 22 Jun 2016 18:59:51 +0200
Subject: [PATCH] Fix: Bad column totalizing if MAIN_SHOW_HT_ON_SUMMARY activated
 2017-07-18 14:34:57 +02:00
Laurent Destailleur
c10852bea3 Merge pull request #7158 from articoder-infosec/patch-1 
Reason: similar change is present elsewhere in the code.
 2017-07-18 14:33:41 +02:00
Laurent Destailleur
ba660a041c Update index.php 2017-07-18 14:33:32 +02:00
Laurent Destailleur
04678f92da Merge pull request #7165 from hregis/develop_bug2 
Fix: add upgrade 6 to 7 in travis
 2017-07-18 14:29:32 +02:00
Laurent Destailleur
86926a28ec Fix css 2017-07-18 14:27:51 +02:00
Laurent Destailleur
a416ec4258 Try to fix travis 2017-07-18 14:25:07 +02:00
Laurent Destailleur
cfbd47bd78 Fix field null 2017-07-18 14:09:37 +02:00
Laurent Destailleur
5c296c679e Enhance source code editor 2017-07-18 13:42:07 +02:00
Laurent Destailleur
5f32c3d34a Work on new india vat system 2017-07-18 12:49:42 +02:00
Laurent Destailleur
6db2aeff20 Fix source code editor 2017-07-18 12:00:18 +02:00
Marc de Lima Lucio
447fdd542d Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_units_import_products 2017-07-18 10:30:43 +02:00
Laurent Destailleur
cfe7216577 Removed constant PROJECT_DEFAULT_PUBLIC (become useless) 2017-07-18 10:23:25 +02:00
Marc de Lima Lucio
3a05b6a164 NEW add fk_unit field into product/service import/export 2017-07-18 10:20:16 +02:00
Laurent Destailleur
fc53a8b576 Fxi copyright 2017-07-18 03:21:59 +02:00
Laurent Destailleur
98ef978b2a NEW Introduce code syntax coloration with mode 'ace' for DolEditor. 2017-07-18 03:18:16 +02:00
Laurent Destailleur
ae7f2ac253 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-17 20:21:35 +02:00
Laurent Destailleur
e5ec0a785d Fix use command standard @... to mark a change in official code 2017-07-17 20:20:38 +02:00
Laurent Destailleur
4582b54e91 Fix use command standard @... to mark a change in official code 2017-07-17 20:09:19 +02:00
Laurent Destailleur
b6c9823ad4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-17 16:45:47 +02:00
Laurent Destailleur
1ef70b387d Fix bad limit 2017-07-17 16:45:24 +02:00
Laurent Destailleur
b075f7a459 Incomplete translation 2017-07-17 16:32:10 +02:00
Laurent Destailleur
0cf38f7197 Fix log file name not set during install 2017-07-17 16:24:45 +02:00
Laurent Destailleur
b7a6c7d049 Fix log file name not set during install 2017-07-17 16:23:24 +02:00
Laurent Destailleur
4fa04247a9 Finished dev 2017-07-17 11:09:32 +02:00
Laurent Destailleur
d832bfc056 Some fix into dol_compress_dir function. 2017-07-17 11:05:38 +02:00
Laurent Destailleur
330f3af74d Fix pb in recursive dol_dir_list return. 2017-07-17 10:26:36 +02:00
Alexandre SPANGARO
4c84c97bb6 Fix #7169 : Unknown column 'ba.accountancy_journal' in member's subcription 2017-07-17 05:58:27 +02:00
Laurent Destailleur
caaeac35b6 Work on modulebuilder 2017-07-17 00:02:04 +02:00
Laurent Destailleur
4d9ae5bb44 Work on modulebuilder 2017-07-16 14:57:30 +02:00
Laurent Destailleur
816db0e856 Add protection against duplicate moduel with similar names 2017-07-16 13:25:10 +02:00
Laurent Destailleur
5c0e581d5a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-16 13:01:07 +02:00