Neil Trini Lasrado
9739dc3639
Added make Production Order button against Material Request
2016-02-23 18:35:42 +05:30
Neil Trini Lasrado
cc23bc0549
Removed Material Request type validation
2016-02-23 18:35:42 +05:30
Neil Trini Lasrado
966e5643c9
Added Material Request Link to Production Order
2016-02-23 18:35:42 +05:30
Neil Trini Lasrado
3353b5ee62
Added material request type Manufacture
2016-02-23 18:35:42 +05:30
Nabin Hait
3b06aeaffd
Merge pull request #4860 from nabinhait/target_variance_fix
...
[fix] Sales Person target variance report: based on lft and rgt of item group
2016-02-23 18:00:08 +05:30
Nabin Hait
8a59c33e2f
[fix] Sales Person target variance report: based on lft and rgt of item group
2016-02-23 15:23:24 +05:30
Nabin Hait
195619e6d4
Merge pull request #4855 from sbkolate/patch-1
...
better validation example for developer
2016-02-22 18:06:02 +05:30
sbkolate
b17d4035c1
better validation example for developer
...
throw "past date selected" will freeze the form and user can not correct value of from_date.
but validated false will just throw the pop-up and user can correct value of from_date and save the form.
Example changed from Event to Task because same is available in Custom Script Help for desk user
2016-02-22 17:16:34 +05:30
Nabin Hait
22230afa0a
Merge pull request #4852 from nabinhait/fixes72
...
Fixes
2016-02-22 16:51:20 +05:30
Nabin Hait
e32f9c3a24
Update reorder_item.py
2016-02-22 16:50:13 +05:30
Nabin Hait
22d8198058
Merge branch 'creador30-reorder_level_zero' into develop
2016-02-22 16:24:55 +05:30
Nabin Hait
38be62c7e3
[fix] Allow auto reorder based on reorder qty, even if reordeer level is zero
2016-02-22 16:24:23 +05:30
Nabin Hait
7736e092e7
Merge branch 'reorder_level_zero' of https://github.com/creador30/erpnext into creador30-reorder_level_zero
2016-02-22 16:19:33 +05:30
Nabin Hait
db746f5bc7
[fix] Condition for Payment and Return button visibility
2016-02-22 16:17:10 +05:30
Nabin Hait
68eb689450
[fix] UOM fixed in Item-wise Purchase History report
2016-02-22 16:17:10 +05:30
Nabin Hait
65ec1bfa81
Merge pull request #4843 from nabinhait/delete_company_trans
...
minor fix
2016-02-22 15:48:50 +05:30
Nabin Hait
ddcd8c58bf
minor fix
2016-02-19 16:09:11 +05:30
Anand Doshi
8fdd4e7b54
Merge branch 'develop'
2016-02-19 13:13:01 +05:30
Anand Doshi
8fc643a815
bumped to version 6.22.1
2016-02-19 13:43:01 +06:00
Anand Doshi
626e8fc03b
[change-log]
2016-02-19 13:11:02 +05:30
Anand Doshi
52780cb937
Merge pull request #4841 from nabinhait/escape
...
[fix] Escaping strings with percentage
2016-02-19 13:01:00 +05:30
Anand Doshi
3bce3f412a
Merge pull request #4838 from nabinhait/rounding_gle
...
[fix] GLE for Rounding loss allowed upto 1 for all transactions except JE
2016-02-19 12:59:54 +05:30
Nabin Hait
1a99cb8bfe
[fix] Escaping strings with percentage
2016-02-19 12:45:57 +05:30
Anand Doshi
6e8eaf097a
[fix] test case of Leave Application
2016-02-19 00:27:02 +05:30
Anand Doshi
6dc83b356a
Merge pull request #4839 from neilLasrado/typos
...
Typo Fixes
2016-02-18 19:55:43 +05:30
Neil Trini Lasrado
f5a39d628f
Typo Fixes
2016-02-18 19:19:07 +05:30
Nabin Hait
fb24a27201
[fix] GLE for Rounding loss allowed upto 1 for all transactions except JE
2016-02-18 19:18:07 +05:30
Nabin Hait
fa413bbab2
Update accounts_controller.py
2016-02-18 18:23:31 +05:30
Anand Doshi
d843ec5fee
Merge pull request #4831 from neilLasrado/typos
...
Typo fixes in Accounts Module
2016-02-18 17:24:17 +05:30
Nabin Hait
67f40775ff
Update accounts_controller.py
2016-02-18 17:10:42 +05:30
Nabin Hait
7209cff29a
Merge pull request #4832 from revant/patch-1
...
Need to use set_balance_in_account_currency
2016-02-18 17:02:43 +05:30
Revant Nandgaonkar
78a62fe123
change args of set_balance_in_account_currency
...
https://github.com/frappe/erpnext/pull/4832
2016-02-18 16:48:35 +05:30
Anand Doshi
d9dc9e4616
Merge pull request #4827 from anandpdoshi/fix/bank-reconciliation-grid
...
[fix] Show Debit/Credit in Bank Reconciliation table
2016-02-18 16:14:56 +05:30
Revant Nandgaonkar
5da941b82c
Need to use set_balance_in_account_currency
...
b9ad5178e4
2016-02-18 16:02:05 +05:30
Anand Doshi
bd0086c1c7
Merge pull request #4826 from anandpdoshi/fix/return-warehouse-mandatory
...
[fix] Warehouse not mandatory for Purchase Invoice or a Sales Invoice without Update Stock
2016-02-18 15:02:11 +05:30
Anand Doshi
deccbabcc1
Merge pull request #4824 from vjFaLk/att-report-fix
...
"Left" Employees now show up in Monthly Attendance Report
2016-02-18 14:54:28 +05:30
Neil Trini Lasrado
8e7240a556
Typo fixes in Accounts Module
2016-02-18 14:38:36 +05:30
Anand Doshi
828d5ffaab
[fix] Show Debit/Credit in Bank Reconciliation table
2016-02-17 18:31:58 +05:30
Anand Doshi
ed8d9dadfa
[fix] Warehouse not mandatory for Purchase Invoice or a Sales Invoice without Update Stock
2016-02-17 17:14:11 +05:30
Valmik Jangla
7ae844f0a0
Minor fix
2016-02-17 15:06:30 +05:30
Valmik Jangla
b7ae1c1076
Inactive employees show up in report
2016-02-17 15:05:35 +05:30
Anand Doshi
5136a64d12
Merge pull request #4822 from neilLasrado/hr-fix
...
[minor] - fixed image view issues in Employee master.
2016-02-17 13:27:25 +05:30
Anand Doshi
123ca0fdcd
Merge branch 'develop'
2016-02-17 13:02:26 +05:30
Anand Doshi
1d77452fe0
bumped to version 6.22.0
2016-02-17 13:32:25 +06:00
Neil Trini Lasrado
25ab93a881
Changed image in employee from Attach to Attach Image, removed image view
2016-02-17 13:00:37 +05:30
Anand Doshi
9c0983f1b6
[translations]
2016-02-17 12:59:54 +05:30
Anand Doshi
9aaa6e3ea0
[change-log]
2016-02-17 12:26:28 +05:30
Anand Doshi
65397f6de1
Merge branch 'vjFaLk-make-employee' into develop
2016-02-16 15:53:18 +05:30
Anand Doshi
870d0441a8
[minor] moved make_employee from Employee to Offer Letter
2016-02-16 15:53:09 +05:30
Valmik Jangla
5e771c5678
Changed doclist to doc
2016-02-16 15:33:35 +05:30
