Merge branch 'master' into develop

Browse Source

...

This commit is contained in:

Nabin Hait

2016-11-03 15:17:39 +05:30

parent 57f51f648e 4dc263ee12

commit eab38cd4eb

12 changed files with 76 additions and 29 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

erpnext/docs/assets/img/stock/projected_quantity.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 156 KiB

BIN

erpnext/docs/assets/img/stock/warehouse.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 96 KiB After Width:  |  Height:  |  Size: 60 KiB