lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
59,621 Commits 43 Branches 150 Tags 886 MiB
7ed0643b52
Commit Graph

59621 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Regis Houssin
7ed0643b52 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_transverse 2017-06-06 10:54:16 +02:00
Laurent Destailleur
2f59525967 Merge pull request #6942 from hregis/develop_bug 
Fix: avoid warning "Undefined property: stdClass::$AGENDA_DEFAULT_FILTER_TYPE"
 2017-06-06 10:47:20 +02:00
Laurent Destailleur
c50006c91b Merge pull request #6936 from aspangaro/6.0-multijournal 
Accountancy - Activate multijournal on bank_journal
 2017-06-06 10:38:05 +02:00
Regis Houssin
79a0b959d1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_transverse 2017-06-06 10:36:37 +02:00
Laurent Destailleur
2510ec7015 Fix php error 2017-06-06 10:29:34 +02:00
Regis Houssin
b66da3d148 New: big refactorization of multicompany transverse mode 2017-06-06 10:23:33 +02:00
Laurent Destailleur
22efbabfa6 NEW Add hook doUpgrade2 2017-06-06 01:34:25 +02:00
Alexandre SPANGARO
806d25ae41 Activate multi-journal on expensereport journal 2017-06-05 06:44:53 +02:00
Regis Houssin
74710827b2 Fix: avoid warning "Undefined property: 
stdClass::$AGENDA_DEFAULT_FILTER_TYPE"
 2017-06-03 14:15:34 +02:00
Alexandre SPANGARO
ef9275d031 Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal 
# Conflicts:
#	htdocs/core/menus/standard/eldy.lib.php
 2017-06-03 07:48:50 +02:00
Alexandre SPANGARO
90c1a38486 Accountancy - Activate multijournal on bank_journal 2017-06-03 07:23:14 +02:00
Laurent Destailleur
344263f53c Fix travis 2017-06-03 02:22:21 +02:00
Laurent Destailleur
504ea85334 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-03 01:55:27 +02:00
Laurent Destailleur
7f18dfee0d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/skeletons/build_class_from_table.php
	dev/skeletons/skeleton_card.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/projet/card.php
 2017-06-03 01:55:05 +02:00
Laurent Destailleur
3555bd2bd7 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/filefunc.inc.php
 2017-06-03 01:29:59 +02:00
Laurent Destailleur
d9794f942d Prepare 5.0.4 2017-06-03 01:17:33 +02:00
Laurent Destailleur
37a261587e Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-06-03 01:17:03 +02:00
Laurent Destailleur
75a01cbe7e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-06-03 01:13:06 +02:00
Laurent Destailleur
6f5103a772 Merge pull request #6935 from atm-ph/fix_develop_missing_entity_column 
Fix missing column entity
 2017-06-03 01:12:04 +02:00
Laurent Destailleur
af01e544d5 Merge branch 'develop' into fix_develop_missing_entity_column 2017-06-03 01:11:49 +02:00
Laurent Destailleur
4e397107e1 Merge pull request #6934 from atm-florian/dev_loancalc 
NEW : Add calculation function for Loan schedule
 2017-06-03 01:10:39 +02:00
Laurent Destailleur
832e9ed15a Merge pull request #6932 from atm-ph/fix_develop_get_extra_chkbxlst 
Fix get extrafields value from getOptionalsFromPost give an error wit…
 2017-06-03 01:04:18 +02:00
Laurent Destailleur
f0ff2b3085 Merge pull request #6931 from atm-arnaud/FIX_contratligne_update 
FIX contratligne update
 2017-06-03 01:02:56 +02:00
Laurent Destailleur
98586f3b2d Merge pull request #6930 from atm-ph/fix_5.0_wrong_agenda_view_link 
Fix week view link has wrong link
 2017-06-03 01:02:40 +02:00
Laurent Destailleur
1f451bf240 Merge pull request #6927 from atm-gauthier/4.0_fix_situation_percent_on_updateline_facture 
FIX : situation_progress param default value must be 100 and not 0
 2017-06-03 00:59:32 +02:00
Laurent Destailleur
7e4bce67ba Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-06-03 00:59:10 +02:00
Laurent Destailleur
af584bc9c0 FIX #6880 #6925 2017-06-03 00:58:51 +02:00
Laurent Destailleur
58f315e8d1 Merge pull request #6922 from inoveaconseil/patch-5 
Fix bug to display value
 2017-06-03 00:41:36 +02:00
Laurent Destailleur
04349d2e12 Merge pull request #6921 from inoveaconseil/patch-4 
Fix bug of prepare_head of card
 2017-06-03 00:41:08 +02:00
Laurent Destailleur
b789246e8d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-02 23:57:50 +02:00
Laurent Destailleur
e1b19b831a NEW An external module can hook and add mass actions 2017-06-02 23:57:37 +02:00
Laurent Destailleur
111087dfdc Work on module template 2017-06-02 23:56:27 +02:00
Laurent Destailleur
66420d0e80 Restore lost file and better generation of modules 2017-06-02 23:02:48 +02:00
atm-ph
70a188c042 Fix missing column entity on llx_accounting_journal after init demo with the bash 2017-06-02 21:45:02 +02:00
Laurent Destailleur
5e29817910 Init of the onlinesign 2017-06-02 20:17:08 +02:00
Laurent Destailleur
9e629bdb02 Work on modulebuilder 2017-06-02 20:01:25 +02:00
Laurent Destailleur
bfa50b8d1d Fix some security issues 2017-06-02 19:36:03 +02:00
Laurent Destailleur
1761df2bc2 NEW Add page statistics for project tasks 2017-06-02 19:28:22 +02:00
florian HENRY
b0f2db7aaa NEW : Add calculation function for Loan schedule 2017-06-02 17:48:29 +02:00
Laurent Destailleur
447db1b324 Fix orphelins for categories tables 2017-06-02 13:46:30 +02:00
Laurent Destailleur
c59d216cf5 NEW Can read time spent of others (hierarchy only or all if granted) 2017-06-02 13:24:45 +02:00
phf
64cd1e0923 Fix get extrafields value from getOptionalsFromPost give an error with chkbxlst type on propaldet for exemple 2017-06-02 12:31:03 +02:00
arnaud
df883a601b FIX contratligne update 2017-06-02 12:28:50 +02:00
Laurent Destailleur
bebf2b33ea CSS enhancement for mobile 2017-06-02 09:25:35 +02:00
Laurent Destailleur
5c58ed8ca7 Add a better error message when payment link is not valid. 2017-06-02 09:13:04 +02:00
Laurent Destailleur
976c8e0752 Fix security to test access on a task 2017-06-01 19:53:54 +02:00
Laurent Destailleur
b4f1df03de Update doc 2017-06-01 19:18:57 +02:00
Laurent Destailleur
dd2d9f533a Clean duplicated vars 2017-06-01 18:18:57 +02:00
Laurent Destailleur
76e1438fe6 FIX REST api to get project when user has permission to read all. 2017-06-01 17:29:47 +02:00
phf
31aa8bdf05 Fix week view link has wrong link 2017-06-01 16:26:32 +02:00