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

47605 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
faaa01d3de Merge pull request #2851 from aspangaro/develop-donation 
Fix: spaces  
 2015-05-20 15:18:22 +02:00
aspangaro
b9bed14afe Fix: spaces   2015-05-20 06:38:36 +02:00
Laurent Destailleur
26a74ba3cc Add constant to allow a module to disable injection scan for its pages. 2015-05-19 22:08:51 +02:00
Laurent Destailleur
0ef5fe24a3 Start ansible example to deplay a dolibarr instance on a linux server 2015-05-19 14:31:26 +02:00
Laurent Destailleur
afaed832b1 Start ansible example to deplay a dolibarr instance on a linux server 2015-05-19 14:14:17 +02:00
Laurent Destailleur
62e1c55c97 NEW Introduce function dolGetFirstLineOfText 2015-05-19 00:44:05 +02:00
Laurent Destailleur
03acb1a8c9 Uniformize way to report error after "buildoc" action. 2015-05-19 00:01:30 +02:00
Laurent Destailleur
e2280ce93e NEW Can close a project that has draft status with no need to switch it 
to validate status before.
 2015-05-18 23:49:08 +02:00
Laurent Destailleur
4a70bb7acf Work on generic usage of get_exdir. 2015-05-18 23:04:49 +02:00
Laurent Destailleur
15c355efc9 A ref field must never be null. 2015-05-18 22:31:14 +02:00
Laurent Destailleur
a258370f8a Prepare code for generic solution where all path are forged using 
get_exdir.
 2015-05-18 22:25:51 +02:00
Laurent Destailleur
4d6b25eb45 Prepare to generalize usage of get_exdir 2015-05-18 21:47:44 +02:00
Laurent Destailleur
6d03ba228d Fix consistency of backup result message 2015-05-18 20:33:02 +02:00
Laurent Destailleur
e230d72cea Increase default date range to current month instead of current day 2015-05-18 19:41:23 +02:00
Laurent Destailleur
36cad55ed7 Merge pull request #2829 from bafbes/patch-6 
NEW Add date filtering into audit page
 2015-05-18 19:25:30 +02:00
Laurent Destailleur
64b64d69d8 Merge pull request #2841 from fappels/develop 
Fix: update supplier orderline + rm deprecated prop
 2015-05-18 19:17:55 +02:00
Francis Appels
28e973331b Fix: update supplier orderline + rm deprecated prop 
- Fix SQL error in update supplier orderline
- Remove deprecated $libelle from product class, $libelle is removed
from code and can not be used anymore, no sense to mark deprecated.
- Add missing translation key
 2015-05-18 18:42:14 +02:00
Laurent Destailleur
7d51779610 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-18 11:01:19 +02:00
Laurent Destailleur
e561481f1e Add option THIRDPARTY_NOTCUSTOMERPROSPECT_BY_DEFAULT and 
THIRDPARTY_NOTCUSTOMERPROSPECT_BY_DEFAULT
 2015-05-18 10:58:04 +02:00
Laurent Destailleur
756de27a12 Fix syntax error 2015-05-18 09:11:34 +02:00
Laurent Destailleur
684686e0f6 Fix restore compatibility of new navigation style with jmobile 2015-05-18 08:59:58 +02:00
Laurent Destailleur
d25a2af70c Fix PHPCS 2015-05-17 23:47:15 +02:00
Laurent Destailleur
36d164f779 Add field gender into table of user. 2015-05-17 23:43:57 +02:00
Laurent Destailleur
851007f1a8 Prepare database to manage recurring events 2015-05-17 20:12:49 +02:00
Laurent Destailleur
c89c883d7d Fix the new navigation style. 2015-05-17 19:37:37 +02:00
Laurent Destailleur
372ad4924b Add print_barre_liste into prototype. 2015-05-17 18:34:52 +02:00
Bahfir Abbes
1ba2240553 fix add to listevents.php 
use of dol_mktime + check dates order
 2015-05-17 16:13:50 +01:00
Laurent Destailleur
fe3f701928 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	htdocs/expedition/list.php
	htdocs/filefunc.inc.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/user/class/user.class.php
 2015-05-16 17:09:42 +02:00
Laurent Destailleur
a11e707728 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-16 17:02:21 +02:00
Laurent Destailleur
e4aaff1de9 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/debian/changelog
	build/makepack-dolibarr.pl
	build/makepack-howto.txt
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
	htdocs/product/class/product.class.php
 2015-05-16 17:01:40 +02:00
Laurent Destailleur
5b00ba11fd Prepare packaging 2015-05-16 16:54:54 +02:00
Juanjo Menent
45040f89af Merge pull request #2838 from simnandez/develop 
Insert option to use old system storage photos only if the first installation was done with a version < 3.7.0
 2015-05-16 16:49:16 +02:00
Laurent Destailleur
cabbb9e421 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
 2015-05-16 16:49:03 +02:00
Laurent Destailleur
e46a8b3b54 Enhance packaging 2015-05-16 16:41:55 +02:00
Laurent Destailleur
e8fb89f89f Prepare packaging 3.7 2015-05-16 16:38:47 +02:00
Juanjo Menent
1d3bcc1d81 Insert option to use old system storage photos only if the first 
installation was done with a version < 3.7.0

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2015-05-16 16:19:51 +02:00
Laurent Destailleur
4dcdea5219 Prepare package 3.5.7 
Removed hardcoded version from rpm spec files, so it will not be
necessary to update this files when making a new release.
 2015-05-16 16:08:05 +02:00
Laurent Destailleur
1d8a3809f0 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2015-05-16 15:27:18 +02:00
Laurent Destailleur
80943111cc Prepare 3.5.7 2015-05-16 15:26:34 +02:00
Laurent Destailleur
ad7c4a2b52 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-05-16 14:00:09 +02:00
Laurent Destailleur
0e1cf72c43 Fix bad order for firstname, lasname 2015-05-16 13:59:48 +02:00
Laurent Destailleur
4b13d5fafe Fix css 2015-05-16 03:11:08 +02:00
Laurent Destailleur
58b70f0503 Better translation 2015-05-16 03:07:29 +02:00
Laurent Destailleur
213c918a90 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-16 02:53:56 +02:00
Laurent Destailleur
1b03e348d3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/compta/bank/annuel.php
 2015-05-16 02:53:36 +02:00
Laurent Destailleur
0b42940d5f Merge pull request #2830 from simnandez/3.7 
Insert option to use old system storage photos only if the first installation was done with a version < 3.7.0
 2015-05-16 02:28:39 +02:00
Laurent Destailleur
5f26001f53 Merge pull request #2836 from FHenry/develop 
FIX :  Fix problem with multicompany on new feature Product propal merge PDF product
 2015-05-16 02:26:06 +02:00
Laurent Destailleur
e382999b9e Css fix 2015-05-15 20:10:17 +02:00
Florian HENRY
f29d8aed5b Fix problem with multicompany on new feature Product propal merge PDF 
product
 2015-05-15 17:39:28 +02:00
Florian HENRY
4bc2d55cb3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-15 17:37:31 +02:00