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

51727 Commits

Author SHA1 Message Date
Regis Houssin
b66da3d148 New: big refactorization of multicompany transverse mode 2017-06-06 10:23:33 +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
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
af584bc9c0 FIX #6880 #6925 2017-06-03 00:58:51 +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
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
Laurent Destailleur
9b4c929d79 NEW Add phpunit to check the engine is defined into sql create files. 2017-06-01 16:09:09 +02:00
gauthier
fb252706f9 FIX : situation_progress param default value must be 100 and not 0 2017-06-01 15:42:19 +02:00
Laurent Destailleur
f4cdb6b254 Fix month on 2 chars. Some setup return on 1 char only. More phpunit 
assert.
 2017-06-01 15:33:23 +02:00
Laurent Destailleur
7ad92c3a4d Fix new generic substitution system 2017-06-01 13:32:20 +02:00
Laurent Destailleur
733d1caac6 Correct usage of parameter 'none' in GETPOST 2017-06-01 12:37:16 +02:00
Laurent Destailleur
bb5a49eca4 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-06-01 12:26:59 +02:00
Laurent Destailleur
07a6bb5664 More files to delete in migration 2017-06-01 12:26:17 +02:00
Laurent Destailleur
77df19009d Removed duplicated code 2017-06-01 12:11:45 +02:00
Laurent Destailleur
417f71a8be Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-01 02:01:34 +02:00
Laurent Destailleur
c70beaa56b Complete work for mutualizing generic substitution system. 2017-06-01 01:57:22 +02:00
Laurent Destailleur
40334dbe14 Merge pull request #6905 from atm-quentin/NEW_project_mask_with_user_extrafield 
NEW_extrafield_in_project_mask
 2017-05-31 19:46:22 +02:00
Laurent Destailleur
a49174313f Replace {extra_ with {user_extra_ 2017-05-31 19:45:54 +02:00
Laurent Destailleur
6837312041 Merge branch 'develop' into 6.0-vat2 2017-05-31 19:28:41 +02:00
Laurent Destailleur
6c7179d281 Test of commit with autoremove trail space 2017-05-31 19:20:33 +02:00
Laurent Destailleur
d5f83d6bbe NEW #6915 Simplest change. 2017-05-31 19:15:39 +02:00
Laurent Destailleur
d70c14a411 Update bonprelevement.class.php 2017-05-31 19:07:39 +02:00
Laurent Destailleur
d7d8e51ab1 Merge pull request #6912 from atm-gauthier/5.0_fix_originid_on_supplierproposal 
FIX : origin & originid on supplierproposal
 2017-05-31 19:01:29 +02:00