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 |
|
Nabin Hait
|
78be566428
|
minor fix
|
2015-08-27 16:27:44 +05:30 |
|
Nabin Hait
|
f6f38f2f2d
|
[new fields] Exchange Rate in Journal Entry and some properties changes in Journal Entry Account
|
2015-08-27 16:27:33 +05:30 |
|
Nabin Hait
|
9a9a4293b3
|
[new fields] Party Account Currency, Paid Amount and Write Off Amount in Acompany Currency
|
2015-08-27 16:26:38 +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 |
|
Nabin Hait
|
2091f0c97e
|
Checked out json files from upstream
|
2015-08-27 14:35:17 +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 |
|
Nabin Hait
|
54fe26dcfb
|
[patch] Multi currency
|
2015-08-27 12:55:24 +05:30 |
|
Nabin Hait
|
4ffd7f3d05
|
Outstanding, paid and write-off amount in Invoice
|
2015-08-27 12:28:36 +05:30 |
|
Nabin Hait
|
a12d959729
|
GL Entries for Sales/Purchase Invoice in multi currency
|
2015-08-27 12:27:24 +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 |
|
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 |
|