Nabin Hait
52daaca885
Fixed merge conflict
2017-03-08 14:30:38 +05:30
mbauskar
02198ec8b0
removed the test_clear_blank_rows test case from JE
2017-03-08 12:34:36 +05:30
Nabin Hait
33fb6ae323
Fixed merge conflict
2017-03-08 11:18:15 +05:30
mbauskar
c03f275e7a
[minor] allowed the credit and debit amount to be 0 in JE
2017-03-07 11:59:55 +05:30
Nabin Hait
fe876c0805
Test case fixed for multiple uom in selling
2017-03-06 16:41:13 +05:30
Nabin Hait
e68f32cf19
UOM Conversion in selling
2017-03-06 16:41:13 +05:30
Kanchan Chauhan
5a980ac87a
UOM Conversion in Selling
2017-03-06 16:41:12 +05:30
Nabin Hait
c642f76a4d
Fixed merge conflict
2017-02-27 14:40:53 +05:30
Rohit Waghchaure
b983f26b98
[Fix] Payment entry account Paid To Show receivable accounts for supplier
2017-02-24 15:07:54 +05:30
Nabin Hait
ff5bd680c2
Merge pull request #7840 from rmehta/new-buttons
...
[enhance] connect new buttons on dashboard to custom make buttons and fix text for payment request
2017-02-24 12:57:13 +05:30
Rushabh Mehta
509543752c
[enhance] connect new buttons on dashboard to custom make buttons and fix text for payment request
2017-02-23 17:03:46 +05:30
mbauskar
d6e409ea92
[minor] hide recurring section if document is in __local state
2017-02-22 18:22:14 +05:30
Nabin Hait
5079c9ef47
Fixed merge conflict
2017-02-22 15:31:31 +05:30
mbauskar
a8fa10d2a9
[minor] minor fixes for journal entry get_exchange_rate trigger
2017-02-22 14:51:09 +05:30
Kanchan Chauhan
f2803ac427
[Fix] Throw error if item is added multiple time
2017-02-22 10:40:38 +05:30
Nabin Hait
aa968cd12e
Merge pull request #7751 from nick9822/patch-3
...
Next Depreciation Date is entered as past date
2017-02-20 19:11:31 +05:30
Nabin Hait
8bb69ff8bf
Fixed merge conflict
2017-02-20 19:01:04 +05:30
Nabin Hait
589f4656ad
Merge branch 'develop' into in_global_search
2017-02-20 15:04:52 +05:30
Nabin Hait
fd3ec066ce
Added fields in global search
2017-02-20 13:38:31 +05:30
Rohit Waghchaure
f73d459c80
[Fix] Removed employee party type from the payment entry
2017-02-19 17:46:05 +05:30
Rohit Waghchaure
a020e4eba4
Payment entry fields issue, added total billed hours in timesheet
2017-02-17 14:51:57 +05:30
Kanchan Chauhan
1b204c8e4e
Accrual Payroll System
2017-02-16 16:30:51 +05:30
nick9822
23e174c270
Validation for purchase_date
...
Separate validation for purchase date.
2017-02-16 16:26:38 +05:30
Nabin Hait
d13d198dc8
Merge pull request #7747 from KanchanChauhan/item-name-asset
...
[Minor] Item Name in Asset
2017-02-16 15:15:23 +05:30
Nabin Hait
ea1cb68fe7
Merge branch 'master' into develop
2017-02-16 14:37:50 +05:30
Nabin Hait
99c6c79834
Update payment_entry.js
2017-02-16 14:21:04 +05:30
nick9822
e5cb3e34fe
nowdate changed to purchase_date
...
next depreciation date should be compared with purchase_date instead of nowdate.
2017-02-15 15:32:50 +05:30
Kanchan Chauhan
2307f57f19
[Minor] Item Name in Asset
2017-02-15 11:52:29 +05:30
Rohit Waghchaure
ff41c82c2b
[Fix] Payment Entry currency symbol issue
2017-02-15 11:44:15 +05:30
mbauskar
d487bf77e1
[minor] payment entry company trigger
2017-02-09 12:57:25 +05:30
khatrijitendra
d262eb1a1c
issue in type and rate
...
1. there is not such field, "type" it is "margin_type"
2. there is not such field, "rate" it is "margin_rate_or_amount"
2017-02-08 14:59:59 +05:30
Nabin Hait
6ff0caa87a
Fixed merge conflict
2017-02-08 11:33:33 +05:30
Nabin Hait
6f93cd5bd0
Merge pull request #7692 from rohitwaghchaure/minor_fixes_v_7_2
...
Minor fixes
2017-02-08 11:21:54 +05:30
Nabin Hait
533d22e88b
Merge pull request #7606 from rohitwaghchaure/data_import_tool_for_cost_center
...
[Fix] Allow data import tool for cost center
2017-02-08 11:21:25 +05:30
Rohit Waghchaure
b3489548a9
minor fix
2017-02-08 11:20:04 +05:30
Nabin Hait
70fd8546ce
Merge pull request #7677 from KanchanChauhan/serial-no-in-return
...
[Fix] Serial No if is_return
2017-02-07 13:28:30 +05:30
Nabin Hait
0a6aaf4257
Get standard/historical valuation rate where missing: some minor fixes
2017-02-07 12:50:22 +05:30
Kanchan Chauhan
4f3b0aa249
[Fix]Serial No if is_return
2017-02-07 11:28:34 +05:30
Nabin Hait
ea8fab52c6
Get standard/historical valuation rate where missing, if item is not a sample item
2017-02-07 01:24:32 +05:30
mbauskar
c874a82559
[minor] index out of range fixes for JE
2017-02-06 15:41:34 +05:30
Rushabh Mehta
6ede4a3809
[enhance] production order from sales order
2017-02-02 17:42:01 +05:30
Rushabh Mehta
a3d0bea375
Merge branch 'develop' into remove-party-status
2017-02-02 15:42:04 +05:30
Rohit Waghchaure
69060a8177
Minor fix
2017-02-01 19:14:53 +05:30
rohitwaghchaure
c13dbd408f
[Enhancement] POS Redesign ( #7639 )
...
* item group, discount
* POS Redesign
* offline customer
* removed offline records from modal view
2017-02-01 18:07:22 +05:30
rohitwaghchaure
ea092a7b24
[Enhancement] Booking of an employee's expense claim ( #7267 )
...
* [Enhancement] Auto book of an employee's expense claim
* test cases
* documentation
* fixes and changes
* removed payable from employee and added into the company
* Added party in account, patch to update party type for customer and supplier accounts
* added party type in erpnext, fix patch
* fixed travis
2017-02-01 12:02:08 +05:30
Rushabh Mehta
87037bdd56
[minor] remove party status as it leads to duplicate notifications fixes #7346 , also fix for #7568
2017-01-30 13:22:51 +05:30
Rohit Waghchaure
b327429db7
[Fix] Allow data import tool for cost center
2017-01-30 11:34:29 +05:30
Nabin Hait
349d520ae2
Fixed merge conflict
2017-01-20 15:44:35 +05:30
Rohit Waghchaure
84b827efcd
[Fix] Budget not working properly
2017-01-20 12:33:50 +05:30
Rohit Waghchaure
2b97cee32c
[Fix] POS print issue
2017-01-18 13:21:27 +05:30
