Merge branch 'bug_8557' into 3.12-master

This commit is contained in:
Jared Camins-Esakov 2012-11-28 18:35:01 -05:00
commit 6f283a5a36
2 changed files with 7 additions and 3 deletions

View file

@ -322,7 +322,8 @@
</div> </div>
</div><div class="yui-g"><fieldset class="action"> </div><div class="yui-g"><fieldset class="action">
<input type="submit" value="Save" /> <input type="submit" onclick="return false;" style="display: none;" id="phony_submit" value="phony_submit" name="phony_submit" />
<input type="submit" value="Save" class="button" accesskey="w" />
<a class="cancel" href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid %]">Cancel</a> <a class="cancel" href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid %]">Cancel</a>
</fieldset></div> </form> </fieldset></div> </form>
[% ELSE %] [% ELSE %]

View file

@ -370,8 +370,11 @@ $(document).ready(function() {
[% END %] [% END %]
</table> </table>
<fieldset class="action"><input type="submit" value="Save" class="button" accesskey="w" /> <fieldset class="action">
<input type="submit" onclick="return false;" style="display: none;" id="phony_submit" value="phony_submit" name="phony_submit" />
<input type="submit" value="Save" class="button" accesskey="w" />
[% UNLESS ( serialsadditems ) %]&nbsp;&nbsp;<input type="button" onclick="javascript:generateReceive()" value="Multi receiving">[% END %] [% UNLESS ( serialsadditems ) %]&nbsp;&nbsp;<input type="button" onclick="javascript:generateReceive()" value="Multi receiving">[% END %]
</fieldset>
</form> </form>
</div> </div>