Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[minor] [fixed conflicts]

Browse Source
This commit is contained in:
Rushabh Mehta 2013-08-14 18:51:05 +05:30
parent 170be3b717
commit 9cd825f2e0
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
selling/utils.py
View File

@ -69,18 +69,13 @@ def get_item_details(args):
if cint(args.is_pos): if cint(args.is_pos):
pos_settings = get_pos_settings(args.company) pos_settings = get_pos_settings(args.company)
<<<<<<< HEAD if pos_settings:
out.update(apply_pos_settings(pos_settings, out)) out.update(apply_pos_settings(pos_settings, out))
if args.doctype in ("Sales Invoice", "Delivery Note"): if args.doctype in ("Sales Invoice", "Delivery Note"):
if item_bean.doc.has_serial_no and not args.serial_no: if item_bean.doc.has_serial_no and not args.serial_no:
out.serial_no = _get_serial_nos_by_fifo(args, item_bean) out.serial_no = _get_serial_nos_by_fifo(args, item_bean)
=======
if pos_settings:
out.update(apply_pos_settings(pos_settings, out))
>>>>>>> 3d1ecf5254c5887a48c04003c7dce8a218136ddd
return out return out
def _get_serial_nos_by_fifo(args, item_bean): def _get_serial_nos_by_fifo(args, item_bean):