Anand Doshi
|
be090fa512
|
bumped to version 6.0.1
|
2015-09-02 19:28:14 +06:00 |
|
Rushabh Mehta
|
c2283ca304
|
[hot] [fix] remove test options in Opportunity
|
2015-09-02 18:56:35 +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
|
caa839003b
|
Merge branch 'develop'
|
2015-09-02 16:02:45 +05:30 |
|
Anand Doshi
|
a6130dc918
|
bumped to version 6.0.0
|
2015-09-02 16:32:45 +06:00 |
|
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 |
|
Anand Doshi
|
c3796d273c
|
[change-log]
|
2015-09-02 15:54:53 +05:30 |
|
Anand Doshi
|
28700d6404
|
Merge pull request #3973 from nabinhait/fix14
[Fix] Delete Company Transactions
|
2015-09-02 14:59:44 +05:30 |
|
Anand Doshi
|
38f400ea87
|
Merge pull request #3972 from nabinhait/fix
Item Price Fix
|
2015-09-02 14:57:26 +05:30 |
|
Anand Doshi
|
f5793fff3c
|
Merge pull request #3966 from rmehta/calendar-for-sales-order
[enhancement] calendar for sales order and other related fixes #3542
|
2015-09-02 14:52:21 +05:30 |
|
Nabin Hait
|
e1d2bef389
|
[fix] Dont delete Employee while deleting company transactions
|
2015-09-02 14:07:46 +05:30 |
|
Nabin Hait
|
0ca3e3d89e
|
[fix] Clear notification count while deleting company transactions
|
2015-09-02 13:09:48 +05:30 |
|
Nabin Hait
|
a1fa659475
|
[fix] Delete Time Logs while deleting company transactions
|
2015-09-02 12:56:29 +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
|
e52ee553c0
|
Removed debug flag
|
2015-09-02 11:32:14 +05:30 |
|
Anand Doshi
|
409c1e494b
|
Updated CONTRIBUTING.md
|
2015-09-02 10:55:45 +05:30 |
|
Rushabh Mehta
|
19e560e73f
|
[fix] dropbox backup check not working
|
2015-09-01 09:57:25 +05:30 |
|
Rushabh Mehta
|
8f1391dc96
|
[enhancement] calendar for sales order and other related fixes #3542
|
2015-08-31 12:42:45 +05:30 |
|
Anand Doshi
|
0161b40aa9
|
Merge pull request #3965 from nabinhait/gross_profit
[fix] Fixed gross profit report due to removal of designation field from Sales Team table
|
2015-08-31 12:26:11 +05:30 |
|
Nabin Hait
|
1901ca5a45
|
[fix] Fixed gross profit report due to removal of designation field from Sales Team table
|
2015-08-31 12:02:50 +05:30 |
|
Anand Doshi
|
610ad47676
|
[hotfix] reload Delivery Note, Sales Invoice and Purchase Receipt in return entry patch
|
2015-08-28 11:40:14 +05:30 |
|
Anand Doshi
|
42701b2160
|
Merge branch 'nabinhait-notifications' into develop
Conflicts:
erpnext/selling/doctype/sales_order/sales_order.py
|
2015-08-27 17:05:32 +05:30 |
|
Anand Doshi
|
3d9d2d1dd1
|
Exported all doctypes
|
2015-08-27 17:04:39 +05:30 |
|
Anand Doshi
|
3ea7ce84ed
|
[fix] print hide additional discount, reload doctypes in sales return patch
|
2015-08-27 17:04:39 +05:30 |
|
Anand Doshi
|
002049eb85
|
[minor] show Inventory section for new Item if Maintain Stock is checked
|
2015-08-27 17:04:06 +05:30 |
|
Anand Doshi
|
57a51351d3
|
[fix] Changed more section label to 'More Information'
|
2015-08-27 17:04:06 +05:30 |
|
Anand Doshi
|
77a2107973
|
[minor] In Sales Order, changed label from PO No. to Customer's Purchase Order
|
2015-08-27 17:04:05 +05:30 |
|
Rushabh Mehta
|
c5346c99de
|
[enhancement] allow user to set warning for multiple items and sales order against multiple purchase orders #3699
|
2015-08-27 17:03:37 +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 |
|
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 |
|
Anand Doshi
|
6cf193d432
|
[minor] In Sales Order, changed label from PO No. to Customer's Purchase Order
|
2015-08-27 12:21:17 +05:30 |
|
Nabin Hait
|
35a5c87cbf
|
[fix] Clear notifications for Sales / Purchase Order on stop/unstop
|
2015-08-27 12:06:11 +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
|
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 |
|