Rushabh Mehta
8ffd483e24
[wip] shopping cart shipping rule, price list cleanup
2015-09-23 12:49:16 +05:30
Rushabh Mehta
156ce607e2
[cleanup] [wip] portal, shopping cart cleanup
2015-09-23 12:49:16 +05:30
Anand Doshi
b6ec680c46
[fix] round percentages in get_indicator
2015-09-22 16:36:20 +05:30
Saurabh
5fe0086d9a
[Fixes] Warehouse check while company delete & Variant Attribute value check
2015-09-16 16:59:24 +05:30
Anand Doshi
69f2cc8d24
[fix] don't fetch template item in get items of stock reconciliation
2015-09-15 11:54:13 +05:30
Anand Doshi
dbe623b167
[fix] Use User Permission value as default only if the document type is Setup
2015-09-14 13:08:53 +05:30
Anand Doshi
5d9cfc76cd
Don't copy title field in Duplicate
2015-09-11 15:35:26 +05:30
Nabin Hait
2377cdfa4e
Fixed conflict
2015-09-09 18:45:41 +05:30
Anand Doshi
9d5b84e78a
Merge pull request #3996 from nabinhait/fix6
...
Check credit limit in Delivery Note / Sales Invoice, only if not created against Sales Order
2015-09-09 15:11:12 +05:30
Nabin Hait
f0b3014a23
Planned Qty logic fixed and reposted for existing
2015-09-09 11:04:10 +05:30
Nabin Hait
cd103c05d6
Check credit limit in Delivery Note / Sales Invoice, only if not created against Sales Order
2015-09-08 19:24:35 +05:30
Anand Doshi
bc1e8b4408
[minor] Unset Apply User Permissions in default permissions
2015-09-08 19:23:23 +05:30
Nabin Hait
6c3ff3e2ed
Fixed conflict
2015-09-08 18:09:03 +05:30
Anand Doshi
9f25575e0c
Merge pull request #3988 from nabinhait/fix2
...
Set expense account in stock reco only if company available
2015-09-08 15:59:18 +05:30
Nabin Hait
f44128f81c
Set expense account in stock reco only if company available
2015-09-07 10:45:15 +05:30
Nabin Hait
11a746d363
Fixed conflict
2015-09-03 16:04:11 +05:30
Rushabh Mehta
85abdc4fad
[minor] added stock settings for serial no. #3967 . Merge with https://github.com/frappe/frappe/pull/1291
2015-09-03 10:29:38 +05:30
Anand Doshi
283850ce47
Merge pull request #3971 from anandpdoshi/fix-item-variant-attributes
...
Attributes in the variant should be in the same order as in the Template
2015-09-02 16:09:09 +05:30
Anand Doshi
099bbbded0
Attributes in the variant should be in the same order as in the Template
...
- Moved Item Variant code from item.py to controllers/item_variant.py
- Use Template Item's order of Attribute for Variant Item
2015-09-02 15:56:55 +05:30
Nabin Hait
906bf64f04
[fix] Insert Item Price automatically based on Rate in Stock UOM
2015-09-02 11:32:14 +05:30
Nabin Hait
76bb927337
Fixed conflict
2015-08-31 17:28:05 +05:30
Nabin Hait
6e439a5e53
Multi currency: test case and fixes
2015-08-28 19:24:22 +05:30
Anand Doshi
8b66f2a691
Exported all doctypes
2015-08-27 16:45:52 +05:30
Anand Doshi
f370b0c6a4
[fix] print hide additional discount, reload doctypes in sales return patch
2015-08-27 16:03:29 +05:30
Nabin Hait
09c68c9ad0
Merge branch 'develop' of https://github.com/frappe/erpnext into multi-currency
2015-08-27 14:55:55 +05:30
Nabin Hait
13d8835b75
Fixed merge conflict
2015-08-27 14:55:34 +05:30
Anand Doshi
b8610e1079
[fix] removed update_stock_ledger from delivery note
2015-08-27 14:46:47 +05:30
Anand Doshi
41e948b00a
[hotfix] update reserved quantity in delivery note
2015-08-27 14:42:25 +05:30
Anand Doshi
c6802ca6d0
[minor] show Inventory section for new Item if Maintain Stock is checked
2015-08-27 13:21:43 +05:30
Anand Doshi
282e4947fa
[fix] Changed more section label to 'More Information'
2015-08-27 13:11:46 +05:30
Anand Doshi
b99c180466
Merge branch 'rmehta-validation-settings' into develop
2015-08-27 12:22:06 +05:30
Rushabh Mehta
740db53b86
[fix] returned_qty reapply and change-log
2015-08-27 12:00:16 +05:30
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
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
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
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
b8a6f40370
[cleanup] layouts of item, customer, supplier, lead
2015-08-26 10:51:45 +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
3f321ebfde
utilities/repost_stock file renamed to stock/stock_balance
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
Nabin Hait
a7c013c030
[fix] Print Delivery Note without amount
2015-08-24 18:43:19 +05:30
Neil Trini Lasrado
db189d7f19
Fixed test case for Item Variants
2015-08-24 16:59:24 +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
