Anand Doshi
69b6195d3b
Merge branch 'validation-settings' of https://github.com/rmehta/erpnext into rmehta-validation-settings
...
Conflicts:
erpnext/stock/doctype/delivery_note/delivery_note.py
2015-08-27 11:39:20 +05:30
Rushabh Mehta
cd2d8a0410
[merge] re-applied changes to sales invoice & delivery note
2015-08-27 11:05:26 +05:30
Rushabh Mehta
5bec301929
Merge branch 'layout-cleanup' into develop
...
Conflicts:
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
erpnext/stock/doctype/delivery_note/delivery_note.json
2015-08-27 11:01:39 +05:30
Rushabh Mehta
491df14426
[minor] catch invalid item code in pricing list (via support ticket)
2015-08-27 10:31:28 +05:30
Rushabh Mehta
00eba4d7f6
[minor] show price list in sales order (via support ticket)
2015-08-27 10:25:07 +05:30
Rushabh Mehta
17679c6902
[layout cleanup] purchase, stock, journal entry
2015-08-26 22:20:38 +05:30
Anand Doshi
fa65c7bf29
[minor] stopped or cancelled message
2015-08-26 19:15:24 +05:30
Rushabh Mehta
f7800c053b
[layout cleanup] in Quotation, Sales Order, Delivery Note
2015-08-26 18:53:37 +05:30
Anand Doshi
10fc83d369
Merge branch 'develop'
2015-08-26 17:57:24 +05:30
Anand Doshi
eed8906a1e
bumped to version 5.8.2
2015-08-26 18:27:24 +06:00
Anand Doshi
414248b792
[fix] event creation on Contact Date
2015-08-26 17:56:55 +05:30
Anand Doshi
e91b3ea407
Merge branch 'develop'
2015-08-26 17:43:27 +05:30
Anand Doshi
28d53be50c
bumped to version 5.8.1
2015-08-26 18:13:26 +06:00
Anand Doshi
cb2f9a863d
[hotfix] reload Sales and Purchase Order Item
2015-08-26 17:42:40 +05:30
Anand Doshi
2b6bdc1edb
[fix] filter and validation of Debit To and Credit To accounts
2015-08-26 17:42:40 +05:30
Anand Doshi
f326c63588
Merge branch 'develop'
2015-08-26 16:55:08 +05:30
Anand Doshi
8ca72d8883
bumped to version 5.8.0
2015-08-26 17:25:08 +06:00
Anand Doshi
ab9f03d557
Merge pull request #3952 from neilLasrado/variant-duplication
...
Fixed validation to prevent duplication of Item Variants in case of Numeric Attributes
2015-08-26 16:52:25 +05:30
Anand Doshi
7fa8fb984e
[fix] Show write off account
2015-08-26 16:48:41 +05:30
Anand Doshi
f29628072f
[change-log]
2015-08-26 14:50:05 +05:30
Anand Doshi
cb3a4caa44
[fix] removed validate due date in Journal Entry
2015-08-26 14:50:04 +05:30
Neil Trini Lasrado
755f1f6841
Fixed validation to prevent duplication of Item Variants in case of Numeric Attributes
2015-08-26 12:59:29 +05:30
Anand Doshi
80a784fdc5
Merge pull request #3943 from nabinhait/fix4
...
[fix] Print Delivery Note without amount
2015-08-26 12:29:24 +05:30
Rushabh Mehta
678a4e24ff
[cleanup] Opportunity
2015-08-26 12:27:25 +05:30
Rushabh Mehta
b8a6f40370
[cleanup] layouts of item, customer, supplier, lead
2015-08-26 10:51:45 +05:30
Rushabh Mehta
f24f6044bd
[layout] cleaned up Sales Invoice
2015-08-26 10:51:44 +05:30
Rushabh Mehta
b6398be232
[minor] [fix] project query
2015-08-26 10:51:04 +05:30
Anand Doshi
007e2d0015
Merge branch 'nabinhait-return_improvements' into develop
2015-08-25 19:11:29 +05:30
Anand Doshi
fe13bfed44
Fixes to Return Improvements pull request
...
- Added "Returned Qty" in Sales and Purchase Order
- Map Expense Account in Return Delivery Note
- Defined some No Copy fields
- Added "Credit Note" and "Debit Note" Print Headings
- Fixed patch
2015-08-25 19:07:04 +05:30
Rushabh Mehta
3c107cdbf8
[enhancement] allow user to set warning for multiple items and sales order against multiple purchase orders #3699
2015-08-25 14:26:42 +05:30
Nabin Hait
b719c469c8
Allow different rate in Return Entry
2015-08-25 14:11:13 +05:30
Nabin Hait
3f321ebfde
utilities/repost_stock file renamed to stock/stock_balance
2015-08-25 14:11:13 +05:30
Nabin Hait
047ecd1eb9
Update order reference in return entries and repost reserved / ordered qty
2015-08-25 14:11:13 +05:30
Nabin Hait
1f94fa25a8
Update delivered / ordered qty in sales/purchase order from return entry
...
Reserved Qty logic cleaned up
2015-08-25 14:11:12 +05:30
Rushabh Mehta
ddd79f43d2
[fix] [hot] erpnext contact page
2015-08-25 14:03:43 +05:30
Nabin Hait
a7c013c030
[fix] Print Delivery Note without amount
2015-08-24 18:43:19 +05:30
Anand Doshi
f7cfaf58b5
Merge pull request #3927 from neilLasrado/default-warehouse
...
Fetch default WIP Warehouse and FG Warehouse on load of Production Order
2015-08-24 18:17:30 +05:30
Anand Doshi
82366e4b3f
Merge pull request #3941 from nabinhait/fix2
...
[fix] Stock Entry additional costs patch fix for v4 accounts
2015-08-24 17:49:47 +05:30
Anand Doshi
b0d4162ca6
Merge pull request #3942 from nabinhait/fix3
...
[fix] In general ledger report, consider cost center in group by voucher
2015-08-24 17:42:51 +05:30
Anand Doshi
b968772e97
Merge pull request #3939 from neilLasrado/variant
...
Fixes in Item Variants
2015-08-24 17:42:23 +05:30
Nabin Hait
3a990d946d
[fix] In general ledger report, consider cost center in group by voucher
2015-08-24 17:21:01 +05:30
Neil Trini Lasrado
db189d7f19
Fixed test case for Item Variants
2015-08-24 16:59:24 +05:30
Nabin Hait
b69eb84936
[fix] Stock Entry additional costs patch fix for v4 accounts
2015-08-24 16:55:10 +05:30
Anand Doshi
00c5875ff7
Merge branch 'develop'
2015-08-24 16:53:51 +05:30
Anand Doshi
5c9bd5e650
bumped to version 5.7.7
2015-08-24 17:23:51 +06:00
Neil Trini Lasrado
92a3dbb5d3
Fixes in Default Warehouse
2015-08-24 15:52:56 +05:30
Neil Trini Lasrado
75d90b1c00
Fixed Produciton Planning Tool
2015-08-24 15:23:58 +05:30
Neil Trini Lasrado
72e4cdcb25
Added default WIP Warehouse and FG Warehouse to Manufacturing Settings
...
Fetch default WIP Warehouse and FG Warehouse on load of Production Order
2015-08-24 15:23:58 +05:30
Neil Trini Lasrado
4c614bd59a
Fixed validation for numeric variants to check with values from template instead of master
2015-08-24 15:13:01 +05:30
Neil Trini Lasrado
7a6f048928
Fixed issue while creating item variants with decimal values (precision error)
2015-08-24 15:13:01 +05:30
