Zlash65
|
c24d2fdf6c
|
setup leave & expense approver for each department
- assign approver in expense claim
|
2018-10-10 14:28:16 +05:30 |
|
Zlash65
|
a259466643
|
add relevant department to employees
|
2018-10-10 14:28:16 +05:30 |
|
Zlash65
|
0309bbee30
|
function call requires company as parameter
|
2018-10-10 14:28:16 +05:30 |
|
Zlash65
|
796bffbee1
|
fix payroll and stock related data
|
2018-10-10 14:28:16 +05:30 |
|
Zlash65
|
4c07970545
|
remove user permission from HR Manager user
|
2018-10-10 14:28:16 +05:30 |
|
Zlash65
|
fa7c8a9f8b
|
update employee and user records
|
2018-10-10 14:28:16 +05:30 |
|
Saurabh
|
99c064305f
|
Merge branch 'master' into staging-fixes
|
2018-10-09 17:55:33 +05:30 |
|
Saurabh
|
75c1682e61
|
Merge branch 'hotfix'
|
2018-10-09 17:55:32 +05:30 |
|
Saurabh
|
2dc8972794
|
bumped to version 10.1.58
|
2018-10-09 18:25:32 +06:00 |
|
Saurabh
|
f786eccdf9
|
Merge pull request #15633 from Zlash65/setup-fix
[Minor] Setup Wizard failing fix
|
2018-10-09 17:49:54 +05:30 |
|
Zlash65
|
a1036ad50b
|
setup wizard failing fix
|
2018-10-09 17:38:28 +05:30 |
|
Shreya Shah
|
8a4bcefec4
|
fix(accounts-receivable): Column values in Print and PDF (#15621)
|
2018-10-08 18:34:01 +05:30 |
|
Shreya Shah
|
5b34d00bc0
|
fix(accounts-receivable): Column values in Print and PDF (#15622)
|
2018-10-08 18:20:51 +05:30 |
|
Nabin Hait
|
d2c5b50842
|
fix(warehouse-account): get warehouse account map fallback handling (#15625)
* fix(warehouse-account): get warehouse account map fallback handling
* fix: import issue
|
2018-10-08 18:19:53 +05:30 |
|
Ameya Shenoy
|
cf91f34ffa
|
Merge branch 'staging-fixes' into staging
|
2018-10-08 09:43:48 +00:00 |
|
Ameya Shenoy
|
563b1d153b
|
bumped to version 11.0.3-beta.9
|
2018-10-08 09:43:48 +00:00 |
|
Ameya Shenoy
|
ecba14e6cf
|
Merge branch 'master' into staging-fixes
|
2018-10-08 09:39:49 +00:00 |
|
Ameya Shenoy
|
ee3b788024
|
Merge branch 'hotfix'
|
2018-10-08 09:37:37 +00:00 |
|
Ameya Shenoy
|
b509b06edf
|
bumped to version 10.1.57
|
2018-10-08 09:37:37 +00:00 |
|
Zarrar
|
87441bf62e
|
columns without fieldname's data not shown (#15618)
|
2018-10-08 14:34:34 +05:30 |
|
Zarrar
|
5fcccda883
|
[Minor] Supplier Quotation (#15578)
* throw meaningful error if RFQ does not have selected supplier
* Update supplier_quotation.py
* codacy fix
|
2018-10-08 14:30:53 +05:30 |
|
Shreya Shah
|
4fb9230d16
|
Add missing method link_to_mrs to buying.js (#15613)
|
2018-10-08 14:18:03 +05:30 |
|
Shreya Shah
|
95d93913ce
|
fix(link_to_mr): Add missing method to buying.js (#15616)
|
2018-10-08 14:17:37 +05:30 |
|
Shreya Shah
|
37d3686372
|
fix(setup_taxes): Pop if frappe.message_log (#15615)
|
2018-10-08 14:17:16 +05:30 |
|
Ameya Shenoy
|
8cafb5fbbb
|
Merge branch 'staging-fixes' into staging
|
2018-10-08 07:27:35 +00:00 |
|
Ameya Shenoy
|
0bd254b02b
|
bumped to version 11.0.3-beta.8
|
2018-10-08 07:27:35 +00:00 |
|
rohitwaghchaure
|
5e466bace4
|
Removed update_job_card_reference method (#15614)
|
2018-10-08 12:36:45 +05:30 |
|
Shreya Shah
|
c2857fd2cc
|
fix(setup_taxes): Pop if frappe.message_log (#15611)
|
2018-10-08 12:35:18 +05:30 |
|
Jamsheer
|
063cf9c582
|
Jam staging fixes (#15608)
* Test Inpatient Record - Fix
* Test Inpatient Record - Fix
|
2018-10-08 10:48:42 +05:30 |
|
Ameya Shenoy
|
36be62b927
|
Merge branch 'staging-fixes' into staging
|
2018-10-07 07:59:34 +00:00 |
|
Ameya Shenoy
|
cfdd629fd7
|
bumped to version 11.0.3-beta.7
|
2018-10-07 07:59:34 +00:00 |
|
Ameya Shenoy
|
272956980d
|
Merge pull request #15606 from codingCoffee/abc
fix: make location from warehouse patch
|
2018-10-07 13:25:05 +05:30 |
|
Ameya Shenoy
|
f7b5b7beb4
|
fix: make location from warehouse patch
- optimization by preventing patch execution if Asset doesn't exist
|
2018-10-07 13:08:00 +05:30 |
|
Ameya Shenoy
|
39903647ae
|
Merge branch 'staging-fixes' into staging
|
2018-10-07 06:23:22 +00:00 |
|
Ameya Shenoy
|
cd9be8f0a6
|
bumped to version 11.0.3-beta.6
|
2018-10-07 06:23:22 +00:00 |
|
Shreya Shah
|
5615cb4735
|
Set default only if customer_address not found (#15605)
* Set default only if customer_address not found
* Similar fix for Purchase Invoice and shipping_address
|
2018-10-07 11:42:07 +05:30 |
|
Shreya Shah
|
e7e269d4a4
|
[Error] Display appropriate msg if company is different for TDS (#15601)
* fix(tds): Display appropriate msg if company is different
* Update tax_withholding_category.py
|
2018-10-06 17:56:21 +05:30 |
|
Ameya Shenoy
|
b8c1897a80
|
Merge pull request #15603 from Zlash65/rectify
[Minor] Deferred Expense
|
2018-10-06 16:43:22 +05:30 |
|
Zlash65
|
58a080a1b1
|
add voucher detail no while creating gl entry
|
2018-10-06 16:34:58 +05:30 |
|
Ameya Shenoy
|
29fe8ce114
|
Merge branch 'staging-fixes' into staging
|
2018-10-05 09:09:53 +00:00 |
|
Ameya Shenoy
|
538678afc4
|
bumped to version 11.0.3-beta.5
|
2018-10-05 09:09:53 +00:00 |
|
Ameya Shenoy
|
ad908779be
|
Merge branch 'master' into staging-fixes
|
2018-10-05 08:54:58 +00:00 |
|
Ameya Shenoy
|
5eafa5a487
|
Merge branch 'hotfix'
|
2018-10-05 08:54:46 +00:00 |
|
Ameya Shenoy
|
97dbb4d125
|
bumped to version 10.1.56
|
2018-10-05 08:54:46 +00:00 |
|
Shreya Shah
|
5cff01634e
|
Merge pull request #15593 from Zlash65/fix-mod
[Minor] Item master - get_query for deferred accounts
|
2018-10-05 14:14:46 +05:30 |
|
Shreya Shah
|
32206029ac
|
Fix Codacy
|
2018-10-05 14:14:33 +05:30 |
|
Shreya Shah
|
deb9f0e03c
|
Merge pull request #15594 from shreyashah115/tds-report
Handle IndexError if no data found
|
2018-10-05 14:11:43 +05:30 |
|
Shreya Shah
|
db5ffce742
|
Merge pull request #15592 from shreyashah115/jv
Allow Reverse JV for all submitted docs
|
2018-10-05 13:33:11 +05:30 |
|
Shreya
|
0d7bd43367
|
Handle IndexError if no data found
|
2018-10-05 13:22:09 +05:30 |
|
Zlash65
|
2123b97d31
|
add get_query for revenue and expense account
|
2018-10-05 12:26:32 +05:30 |
|