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

60001 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
BENKE Charlie
2af3f010bf expedition->dir_output is used by livraison 
not livraison->dir_output who not exist
 2017-04-11 11:33:14 +02:00
gauthier
30d58f77db FIX : forgotten parameter for right multicompany use 2017-04-11 11:33:05 +02:00
Laurent Destailleur
e68ad408af Merge pull request #6687 from defrance/patch-5 
expedition->dir_output is used by livraison
 2017-04-11 11:32:16 +02:00
Laurent Destailleur
0417eb3862 Merge pull request #6686 from guillaume-uH57J9/develop 
NEW Improve public member subscription form with member type
 2017-04-11 11:31:25 +02:00
Laurent Destailleur
17da4f64a7 Merge pull request #6683 from marcosgdf/bug-6679 
FIX #6679 User with restricted supplier invoice permissions can edit project, payment conditions, payment mode
 2017-04-11 11:21:14 +02:00
Laurent Destailleur
4d72165288 Merge pull request #6681 from marcosgdf/bug-6680 
FIX #6680 User with restricted supplier invoice permissions sees "reopen" button even if he has no permission to do it
 2017-04-11 11:20:52 +02:00
Laurent Destailleur
a7ccb175e5 Merge pull request #6676 from marcosgdf/bug-6675 
FIX #6675 Restricted user with no agenda permissions can see a button to create appointment in thirdparty contact list
 2017-04-11 11:17:45 +02:00
Laurent Destailleur
5ae1b5457b Merge pull request #6674 from marcosgdf/bug-6673 
FIX #6673 Missing "nature" table header in thirdparty list
 2017-04-11 11:17:21 +02:00
Laurent Destailleur
fc735eaa4f Merge pull request #6672 from marcosgdf/bug-6671 
FIX #6671 Cannot remove thirdparty type with "#" in its name
 2017-04-11 11:16:58 +02:00
Laurent Destailleur
eb4236011b Merge pull request #6670 from marcosgdf/bug-6669 
FIX #6669 User with no permission to edit customer invoices can see a edit button in project entry
 2017-04-11 11:15:16 +02:00
Laurent Destailleur
50dbe39cda Merge pull request #6668 from marcosgdf/bug-6613 
FIX #6613 Default subject for Supplier proposal emails is filled with a non-existing key
 2017-04-11 11:14:47 +02:00
Laurent Destailleur
cd90dcb1e1 Merge pull request #6667 from marcosgdf/bug-6623 
FIX #6623 User card shows "Return to list" link even if the user has no rights to list users
 2017-04-11 11:14:25 +02:00
Laurent Destailleur
e08b92d913 Merge pull request #6665 from defrance/patch-4 
Add invoice_rec_prepare_head for reccuring invoice
 2017-04-11 11:13:12 +02:00
Laurent Destailleur
550687e084 Merge pull request #6666 from simnandez/develop 
Fix: Travis error
 2017-04-11 11:12:29 +02:00
Laurent Destailleur
b2b1dcc574 Merge pull request #6663 from vvnt/patch-2 
FIX: situation invoice miscalculation (#6653)
 2017-04-11 11:11:29 +02:00
Laurent Destailleur
81020cea77 Merge pull request #6660 from atm-florian/dev_contractselect 
NEW select2 for contract selector
 2017-04-11 11:08:59 +02:00
Laurent Destailleur
d4de81ed6d Merge pull request #6659 from altatof/fix_incoterm 
FIX: dont get empty "Incoterms : - " string if no incoterm
 2017-04-11 11:08:17 +02:00
Laurent Destailleur
9447b2a38b Merge pull request #6658 from dolibarr95/patch-10 
Fix typo
 2017-04-11 11:07:24 +02:00
Laurent Destailleur
5cbad450f3 git push origin developMerge branch 'grandoc-develop' into develop 2017-04-11 11:06:38 +02:00
Laurent Destailleur
3907c30ee3 Merge branch 'develop' of https://github.com/grandoc/dolibarr into 
grandoc-develop

Conflicts:
	dev/skeletons/skeleton_list.php
 2017-04-11 11:06:26 +02:00
Laurent Destailleur
e357aed3e1 Merge pull request #6655 from altatof/fix_reffourn 
FIX: dont lose supplier ref if no supplier price in database
 2017-04-11 11:01:43 +02:00
Laurent Destailleur
abf87a6946 Merge branch '4.0' into fix_reffourn 2017-04-11 11:00:35 +02:00
Laurent Destailleur
f5f062936e Merge pull request #6654 from atm-florian/5.0 
fix: missing attribute update
 2017-04-11 10:59:31 +02:00
Laurent Destailleur
a6b7c812f2 Merge pull request #6684 from marcosgdf/recurring 
Corrected translation errors and little bug showing a non-available button to a restricted user
 2017-04-11 10:59:06 +02:00
Laurent Destailleur
6aa56ce0fa NEW Add a tracking id into mass emailing 
Prepare code to use a dedicated SMTP server according to context.
 2017-04-11 10:57:17 +02:00
Laurent Destailleur
0de77fa460 Fix look and feel v6 2017-04-11 09:55:45 +02:00
Laurent Destailleur
3749a7a1d1 New look 2017-04-11 02:51:44 +02:00
Laurent Destailleur
759315aef5 NEW Mass action delete available on project and tasks 2017-04-11 02:48:16 +02:00
Laurent Destailleur
37939e7cbd NEW Add key __USERID__ and __ENTITYID__ as key for dynamic filters. 2017-04-11 02:17:47 +02:00
Laurent Destailleur
d15792bdf4 Minor fix 2017-04-11 00:59:47 +02:00
Laurent Destailleur
9b45776941 Fix responsive 2017-04-10 17:25:53 +02:00
BENKE Charlie
20202871eb expedition->dir_output is used by livraison 
not livraison->dir_output who not exist
 2017-04-10 15:54:02 +02:00
Laurent Destailleur
06f9c1989b Work on default values 2017-04-10 13:14:31 +02:00
Laurent Destailleur
f1ae0eb7c6 Default value 2017-04-10 12:51:52 +02:00
Guillaume
f427c8441a add translation strings for ForceMemberType 2017-04-09 22:49:48 +02:00
guillaume-uH57J9
e335b757fd Add UI to configure MEMBER_NEWFORM_FORCETYPE 
Use tertiary operator ($var?: -1) instead of (!empty($var) ? $var : -1)
 2017-04-09 22:37:17 +02:00
guillaume-uH57J9
199067e4b8 members/new.php : non-public by default 
in the form, disable public by default, to be consistent with class Adherent's default value
 2017-04-09 22:00:19 +02:00
mikee2
c82ee862af Merge pull request #1 from mikee2/mikee2-odtphp-patch-1 
Update Segment.php
 2017-04-09 21:59:20 +02:00
mikee2
f460d2e705 Update Segment.php 2017-04-09 21:39:15 +02:00
Marcos García de La Fuente
996b5e9f87 Corrected translation errors and little bug showing a non-available button to a restricted user 2017-04-09 18:17:46 +02:00
Marcos García de La Fuente
12df7b6ab9 FIX #6679 User with restricted supplier invoice permissions can edit project, payment conditions, payment mode 
Close #6679
 2017-04-09 18:09:08 +02:00
Marcos García de La Fuente
59fa5c2fe6 FIX #6680 User with restricted supplier invoice permissions sees "reopen" button even if he has no permission to do it 
Close #6680
 2017-04-09 17:38:59 +02:00
Marcos García de La Fuente
2057613ad9 FIX #6675 Restricted user with no agenda permissions can see a button to create appointment in thirdparty contact list 
Close #6675
 2017-04-09 15:18:02 +02:00
Marcos García de La Fuente
2d83efc7e3 FIX #6673 Missing "nature" table header in thirdparty list 
Close #6673
 2017-04-09 15:03:02 +02:00
Laurent Destailleur
b054ca8267 NEW Introduce mass action on product list ('delete' for the moment) 2017-04-09 15:02:55 +02:00
Marcos García de La Fuente
da0af36086 FIX #6671 Cannot remove thirdparty type with "#" in its name 
Close #6671
 2017-04-09 14:51:15 +02:00
Laurent Destailleur
0a47245ba5 NEW Add mass actions (pdf merge and delete) for interventions 2017-04-09 14:31:56 +02:00
Marcos García de La Fuente
411d276ed2 FIX #6669 User with no permission to edit customer invoices can see a edit button in project entry 
Close #6669
 2017-04-09 14:29:40 +02:00
Marcos García de La Fuente
a8da077613 FIX #6613 Default subject for Supplier proposal emails is filled with a non-existing key 
Close #6613
 2017-04-09 14:13:04 +02:00
Marcos García de La Fuente
74f0ae5bbb FIX #6623 User card shows "Return to list" link even if the user has no rights to list users 
Close #6623
 2017-04-09 14:09:33 +02:00