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

61931 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
Laurent Destailleur
a73d72f243 Add tables for default values 2017-04-14 10:14:23 +02:00
florian HENRY
8b0c123aca Merge branch '5.0' of https://github.com/Dolibarr/dolibarr.git into 5.0 2017-04-14 09:01:40 +02:00
florian HENRY
196156a21e fix setEventMessages error insteads of errors 2017-04-13 16:35:29 +02:00
philippe grand
1d546462dd Update code using new css class 2017-04-13 15:59:51 +02:00
Laurent Destailleur
6c069e9a1a Fix label of long status 2017-04-13 15:15:44 +02:00
Laurent Destailleur
db23a5222b Fix translation 2017-04-13 15:12:19 +02:00
Laurent Destailleur
5e4697b62d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-04-13 15:03:46 +02:00
Laurent Destailleur
1cffa8c9fc Fix for debian 8 2017-04-13 15:03:12 +02:00
Laurent Destailleur
3e9ccc186a NEW Small PDF template for products 2017-04-13 10:26:12 +02:00
Josep Lluís
e67ae3665e NEW Show local taxes in supplier facture list 
Show localtax1 and localtax2 in supplier facture list, only if they are enabled in company config
 2017-04-13 09:12:01 +02:00
Josep Lluís
deb309ab7e NEW Show local taxes in facture list 
Show localtax1 and localtax2 in facture list, only if they are enabled in company config
 2017-04-13 08:30:48 +02:00
philippe grand
edaa3ae672 Update code using new css class 2017-04-12 17:44:01 +02:00
Laurent Destailleur
6f4ce8dc2f Merge remote-tracking branch 'origin/3.9' into 4.0 2017-04-12 14:22:47 +02:00
Laurent Destailleur
a6b05bb4da Merge branch '5.0' of github.com:Dolibarr/dolibarr into 5.0 2017-04-12 14:08:58 +02:00
Laurent Destailleur
d74baea1d3 Fix error management on direct print 2017-04-12 13:01:41 +02:00
Laurent Destailleur
77dfb05647 Work on v6 look and feel 2017-04-12 12:35:13 +02:00
Laurent Destailleur
d78f3923ee Support of preview for pdf with several pages 2017-04-12 12:13:38 +02:00
Laurent Destailleur
26a9999fbf Support of preview for pdf with several pages 2017-04-12 11:38:55 +02:00
Maxime Kohlhaas
396ea54894 Subprice was null in supplier proposal and line was not transfered to supplier order 2017-04-12 11:09:49 +02:00
philippe grand
b0f2d2310b Update code using new css class 2017-04-12 10:28:05 +02:00
Laurent Destailleur
4eaa1d4f46 Add nb of generation into list of template invoices 2017-04-11 20:07:35 +02:00
Laurent Destailleur
8e33c8090d FIX No filter on company when showing the link to elements. 2017-04-11 19:07:03 +02:00
Laurent Destailleur
423ffefbf3 NEW Add hidden option THIRDPARTY_INCLUDE_PARENT_IN_LINKTO 2017-04-11 18:18:36 +02:00
gauthier
551d79f1e2 FIX : close supplier makes no sense. we just need to know if it is accepted or not 2017-04-11 17:36:21 +02:00
philippe grand
c3387cb4e6 ref column was missing for specimen and some update 2017-04-11 14:54:34 +02:00
philippe grand
06c91cdaf2 ref column was missing for specimen and some update 2017-04-11 14:47:11 +02:00
philippe grand
4d31759ff9 Update code using new css class 2017-04-11 14:35:10 +02:00
gauthier
8a373b25ba FIX : global $dateSelector isn't the good one, then date selector on objectline_create tpl was hidden 2017-04-11 12:41:19 +02:00
Laurent Destailleur
2446cb5431 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/facture.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/contact/list.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/facture/card.php
	htdocs/societe/list.php
	htdocs/user/document.php
 2017-04-11 11:43:54 +02:00
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