From: Sven Schöling <s.schoeling@linet-services.de>
Date: Fri, 12 Jul 2013 13:14:47 +0000 (+0200)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.1.0beta1~175
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=c312836ce432677d4f7876f1e3a2b6d99f433cd6;p=kivitendo-erp.git

Merge branch 'master' of github.com:kivitendo/kivitendo-erp
---

c312836ce432677d4f7876f1e3a2b6d99f433cd6
diff --cc SL/Presenter/Part.pm
index f32149d11,1a33a463b..599d09356
--- a/SL/Presenter/Part.pm
+++ b/SL/Presenter/Part.pm
@@@ -40,17 -43,28 +43,33 @@@ see L<SL::Presenter
  
  =over 4
  
- =item C<part_picker NAME, VALUE, PARAMS>
+ =item C<part_picker $name, $value, %params>
+ 
+ All-in-one picker widget for parts. The name will be both id and name
+ of the resulting hidden C<id> input field (but the ID can be
+ overwritten with C<$params{id}>).
+ 
+ An additional dummy input will be generated which is used to find
+ parts. For a detailed description of it's behaviour, see section
+ C<PART PICKER SPECIFICATION>.
+ 
+ C<$value> can be a parts id or a C<Rose::DB:Object> instance.
  
 +All-in-one picker widget for parts. The name will be both id and name of the
 +resulting hidden C<id> input field. An additional dummy input will be generated
 +which is used to find parts. For a detailed description of it's behaviour, see
 +section L</PART PICKER SPECIFICATION>.
 +
- C<VALUE> can be an id or C<Rose::DB:Object> instance.
+ If C<%params> contains C<type> only parts of this type will be used
+ for autocompletion. You may comma separate multiple types as in
+ C<part,assembly>.
+ 
+ If C<%params> contains C<unit> only parts with this unit will be used
+ for autocompletion. You may comma separate multiple units as in
+ C<h,min>.
  
- If C<PARAMS> contains C<type> only parts of this type will be used for
- autocompletion. You may comma separate multiple types as in C<part,assembly>.
+ If C<%params> contains C<convertible_unit> only parts with a unit
+ that's convertible to unit will be used for autocompletion.
  
  Obsolete parts will by default not displayed for selection. However they are
  accepted as default values and can persist during updates. As with other