Nabin Hait
13d8835b75
Fixed merge conflict
2015-08-27 14:55:34 +05:30
Nabin Hait
54fe26dcfb
[patch] Multi currency
2015-08-27 12:55:24 +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
17679c6902
[layout cleanup] purchase, stock, journal entry
2015-08-26 22:20:38 +05:30
Rushabh Mehta
f7800c053b
[layout cleanup] in Quotation, Sales Order, Delivery Note
2015-08-26 18:53:37 +05:30
Anand Doshi
cb2f9a863d
[hotfix] reload Sales and Purchase Order Item
2015-08-26 17:42:40 +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
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
b69eb84936
[fix] Stock Entry additional costs patch fix for v4 accounts
2015-08-24 16:55:10 +05:30
Nabin Hait
69c1401764
Multi currency patch initialized
2015-08-21 14:31:47 +05:30
Anand Doshi
8554cbf001
[minor] fixed patch item template attributes
2015-08-20 17:43:35 +05:30
Nabin Hait
24998a6ca7
[fix][patch] Delete Bin for non-stock item
2015-08-20 15:21:42 +05:30
Nabin Hait
712fccd876
[fix][patch] Repost reserved qty for stock item
2015-08-20 14:59:44 +05:30
Anand Doshi
807c6af571
[minor] fix item template attributes
2015-08-20 11:42:05 +05:30
Nabin Hait
3922823bd6
[fix] Test case fixed for purchase cost against project
2015-08-19 14:23:13 +05:30
Nabin Hait
6ce72c5b07
[fix] Update project cost for draft project only
2015-08-19 14:15:28 +05:30
Nabin Hait
fa5fcf5405
[fix] Purchase cost against project
2015-08-19 11:56:23 +05:30
Nabin Hait
1826791891
[fix][patch] Reserved Qty logic fixed and reposted for existing items
2015-08-19 11:00:00 +05:30
Anand Doshi
2f01f96ae3
[fix] [patch] item template attributes
2015-08-18 17:52:50 +05:30
Anand Doshi
afbe39a559
[fix] patch and rename Variant Attribute to Item Variant Attribute
2015-08-18 17:30:44 +05:30
Anand Doshi
09ba897297
[fix] [patch] Item Template Attributes - migration from v4 and v5
2015-08-17 19:21:29 +05:30
Nabin Hait
3278ea177d
[fix] Additional Costs patch fixed for version 4 to 5 migration
2015-08-17 17:58:52 +05:30
Anand Doshi
5dc7ff1355
[hotfix] [patch] cleanup journal entry
2015-08-17 17:58:51 +05:30
Anand Doshi
bfbf768daa
[hotfix] [patch] cleanup journal entry
2015-08-17 17:58:51 +05:30
Neil Trini Lasrado
62dba50e9b
Multiple Fixes
2015-08-13 16:18:55 +05:30
Neil Trini Lasrado
b9b49632f2
Added patch to fetch Item Template Attributes
2015-08-13 16:17:36 +05:30
Anand Doshi
0a37f5575f
[hotfix] [patch] stock entry additional cost for docstatus < 2
2015-08-13 15:53:40 +05:30
Anand Doshi
746eae4d1a
[minor] Reload Journal Entry Account
2015-08-13 12:52:13 +05:30
Rushabh Mehta
7e4b93f48e
[patch] cleanup_journal_entry
2015-08-13 12:10:21 +05:30
Rushabh Mehta
b01cc1b449
[patch] cleanup_journal_entry
2015-08-13 11:54:04 +05:30
Rushabh Mehta
f738b951c5
[patch] cleanup_journal_entry
2015-08-13 11:50:51 +05:30
Rushabh Mehta
207b3efed7
[fix] journal entry get_query
2015-08-12 15:18:35 +05:30
Rushabh Mehta
1828c12481
[refactor] added dynamic link in journal entry, #3847
2015-08-12 12:28:33 +05:30
Nabin Hait
3c3a3ecea8
Additional Costs in Stock Entry
2015-08-10 14:07:45 +05:30
Anand Doshi
aa5182bb9e
[fix] rename old filenames that start with FileData and fix missing Item images
2015-08-04 23:06:01 +05:30
Nabin Hait
845bbe3e27
Update fix_invoice_outstanding.py
2015-08-04 10:48:05 +05:30
Nabin Hait
f7bf50d6fe
Merge pull request #3786 from nabinhait/fix4
...
[fix] Ignore if error coming while sending emails to system managers
2015-08-03 19:27:04 +05:30
Nabin Hait
374559bfad
[fix] Ignore if error coming while sending emails to system managers
2015-08-03 19:26:32 +05:30
Nabin Hait
5bbe823106
[patch] Fix outstanding amount for original invoice for return entry
2015-08-03 19:19:11 +05:30
Nabin Hait
03bccb81d8
[test case] Test case for discount amount on net total
2015-08-03 19:11:44 +05:30
Nabin Hait
1db0b6de0c
Patch to notify system managers if there are any wrong entries due to bug related to discount amount on net total
2015-08-03 19:11:44 +05:30
Nabin Hait
94f15fcec6
Propogate root type and report type into children based on parent
2015-08-03 11:17:07 +05:30
Nabin Hait
17405d4130
repost stock for product bundle materials
2015-07-30 14:53:27 +05:30
Nabin Hait
453cc374d4
- Fixed logic of reserved qty calculation while delivered product bundle via Sales Invoice
...
- Delete stock ledger entries on cancellation of Sales Invoice while product bundle delivered
- Make packing list on validate
2015-07-29 15:59:57 +05:30
Rushabh Mehta
1e8025b327
[cleanup] yes/no selects changed to checks in Item
2015-07-29 11:38:33 +05:30
Neil Trini Lasrado
2771b7d828
Track Operations removed and Global Switch added to disable capacity planning in manufacturing settings
2015-07-23 17:39:35 +05:30
Nabin Hait
14a394cde1
Update fields_to_be_renamed.py
2015-07-17 15:14:19 +05:30
Nabin Hait
3c821c89f2
Update rename_table_fieldnames.py
2015-07-17 15:13:29 +05:30
