Suraj Shetty
8de8a78235
Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list
2019-08-26 10:51:12 +05:30
Mangesh-Khairnar
5dd1b50802
fix: update show in website on disabling item ( #18831 )
2019-08-26 10:27:25 +05:30
Suraj Shetty
00f9930fbf
style: Remove leftout print statements
2019-08-26 10:09:07 +05:30
Suraj Shetty
457da47dba
fix: set for_qty instead of pick_list
2019-08-26 10:05:35 +05:30
Suraj Shetty
2b9e256002
fix: Rename method name
2019-08-26 10:05:01 +05:30
Suraj Shetty
05f243590d
fix: Show option to create pick list or work order
2019-08-26 09:29:31 +05:30
Suraj Shetty
94d7096c8c
fix: Show create button only if target doc does not exists
2019-08-26 08:40:02 +05:30
Suraj Shetty
ecc801d3d8
fix: Add pick list field to delivery note
2019-08-26 08:39:11 +05:30
Suraj Shetty
be9f4ea487
fix: Add button to create pick list from material request
2019-08-26 08:38:37 +05:30
Suraj Shetty
a1dc152695
fix: Move get items location button below items table
2019-08-26 06:57:43 +05:30
Suraj Shetty
9209570937
feat: Add option to create pick list from material request
2019-08-26 06:33:27 +05:30
Nabin Hait
d8c262fd5c
fix: Translations of strings ( #18825 )
2019-08-23 16:32:58 +05:30
Mangesh-Khairnar
fe579c2efd
fix: show a descriptive message on submission of duplicate account ( #18486 )
...
* fix: show a descriptive message on submission of duplicate account
* Update account.py
2019-08-23 16:31:20 +05:30
Mangesh-Khairnar
d94a389dd3
chore: remove unwanted code ( #18645 )
2019-08-23 16:31:09 +05:30
Deepesh Garg
98b86ecbc2
Merge branch 'develop' into supplier_items
2019-08-23 15:41:30 +05:30
Tufan Kaynak
a7ab51c5ba
Update vehicle_expenses.py ( #18768 )
2019-08-23 12:50:52 +05:30
deepeshgarg007
59432418c6
fix: Consider multiple stock entry against a purchase order
2019-08-23 12:45:48 +05:30
Nabin Hait
6e7b9b5cb7
Update sales_invoice.py
2019-08-23 12:27:05 +05:30
Suraj Shetty
8b4d604cfd
fix: Use purpose field and remove item_base_on field
2019-08-23 11:57:16 +05:30
Michelle Alva
c890401fec
fix: added payroll period in HR module ( #18543 )
2019-08-23 11:50:48 +05:30
Deepesh Garg
f3d78dd29c
fix: Duplicate items check in Sales Invoice ( #18660 )
...
* fix: Duplicate items check in sales Invoice
* fix: Commonified function for duplicate items check in selling controller
* fix: Set valuation rate and transaction date in child tabel
2019-08-23 11:42:35 +05:30
KanchanChauhan
23b5f4ec99
fix: Leave Application status filter ( #18770 )
...
When we click on Status Open in list view it throws an error.
After fix, it filters the results on Open status
2019-08-23 11:40:09 +05:30
Harshit
56d03a456b
fix: add contract to CRM module ( #18817 )
2019-08-23 11:34:25 +05:30
Michelle Alva
680e098b87
fix(dash): Added Tax exemption category and sub category in Employee Tax and Benefits ( #18545 )
...
section
2019-08-23 11:32:43 +05:30
Anurag Mishra
db88476f8b
feat: refactor invoice_discounting ( #18629 )
...
* feat: refactor invoice_discountig
* Update invoice_discounting.py
* Update invoice_discounting.js
2019-08-23 11:27:00 +05:30
rohitwaghchaure
88ee7d8dbe
fix: POS Sync Issue ( #18807 )
2019-08-23 11:13:58 +05:30
deepeshgarg007
f2798eab50
fix: Conside multiple stock entry against a purchase order
2019-08-23 10:07:52 +05:30
Anurag Mishra
210317c0b5
fix: division by zero in asset Depereciation ( #18637 )
...
* fix: division by zero in asset Depereciation
* fix: requested changes
2019-08-23 00:21:26 +05:30
Suraj Shetty
687b1a5b1f
fix: Make pick list submittable and add few fields
...
- Add material request & item fields
- Add pick_list field to Stock Entry
- Add purpose field to pick list
2019-08-22 16:41:14 +05:30
Suraj Shetty
8d55f81baa
fix: Fix raw matterial selection based on finished item qty
2019-08-22 16:37:44 +05:30
Sahil Khan
7ff82fccf3
Merge branch 'develop' into version-12
2019-08-22 13:10:17 +05:30
Sahil Khan
cd25d6dc7f
bumped to version 12.0.8
2019-08-22 13:30:17 +05:50
Suraj Shetty
c1f25ff9e3
fix: Add option to select qty of finished goods Item
2019-08-22 09:53:44 +05:30
rohitwaghchaure
224d857928
Merge pull request #18703 from rohitwaghchaure/reconciled_entry_still_has_no_clearance_date_develop
...
fix: reconciled entry has not clearance date set
2019-08-21 23:36:06 +05:30
rohitwaghchaure
a23fc327df
Merge pull request #18785 from rohitwaghchaure/payment_recon_for_debit_entry_not_working_properly_develop
...
fix: debit note not reconciled with another purchase invoice using pa…
2019-08-21 23:35:35 +05:30
Suraj Shetty
ec92486377
fix: Add option to create Stock Entry from Pick List
2019-08-21 22:10:27 +05:30
Anastes Mp
a6c6e02c49
Incorrect database table ( #18558 )
...
Fixed Unknow Column tax_type error on offline pos
2019-08-21 16:53:06 +05:30
Suraj Shetty
298d38cde3
test: Fix existing tests
2019-08-21 16:37:49 +05:30
Suraj Shetty
109a07b834
fix: Fix get_employees_with_number query
...
if the passed number is 7039392929 then it should match
with the employee cell_number set as `7039392929, 0288382222`
2019-08-21 15:19:08 +05:30
Mangesh-Khairnar
5619db28cb
fix: fetch capital work in progress as expense account ( #18780 )
2019-08-21 14:49:24 +05:30
Nabin Hait
bcb0f6038e
fix: Single gl entry should only be considered once either in opening or closing entry ( #18792 )
2019-08-21 14:47:33 +05:30
Deepesh Garg
e9e0c0e7d4
fix: Minor fix in GSTR-1 report ( #18797 )
2019-08-21 14:40:35 +05:30
Suraj Shetty
e84de50147
fix: check if number exists after striping '0' ( #18805 )
...
fix: check if number exists after striping '0'
2019-08-21 14:22:59 +05:30
Suraj Shetty
da2a623e38
Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list
2019-08-21 11:48:27 +05:30
Suraj Shetty
6affeaa9c1
fix: check if number exists after striping '0'
...
- Absract number striping logic to separate method
- Rename a confusing variable name
- Remove leftout print statement
2019-08-21 09:14:56 +05:30
Suraj Shetty
d79a16c9f3
fix: Warehouse selection login
...
- Rename item_loactions -> locations, reference_items -> items
- Add customer and work_order field
- fix "Get Items" button UX
- fix get_pending_work_orders query
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2019-08-21 09:03:26 +05:30
rohitwaghchaure
d36ff39498
Merge pull request #18799 from scmmishra/cart-fix
...
fix: shopping cart item availability
2019-08-21 08:58:47 +05:30
Mangesh-Khairnar
576f51d89e
Merge pull request #18791 from Mangesh-Khairnar/fix-ledger-entry
...
fix: ledger entries
2019-08-20 19:57:50 +05:30
Shivam Mishra
eab5be1110
fix: shopping cart item availability
2019-08-20 19:31:54 +05:30
Mangesh-Khairnar
c9b6c9bb61
fix: calculate opening leave balance
2019-08-20 19:18:45 +05:30