Himanshu Warekar
26dfd5b314
fix: translation strings
2019-09-02 12:21:41 +05:30
Himanshu Warekar
e31c6964f3
Merge branch 'contacts-ref' of https://github.com/hrwx/erpnext into contacts-ref
2019-09-02 12:11:15 +05:30
Himanshu Warekar
fd85b1689d
fix: review fixes
2019-09-02 12:10:15 +05:30
Suraj Shetty
4a8710ef75
Merge pull request #18611 from surajshetty3416/fix-paid-amount
...
fix: Paid amount 0 while creating advanced payment entry
2019-09-02 08:38:34 +05:30
Suraj Shetty
58e6b67886
Merge pull request #18613 from surajshetty3416/fix-timesheet-creation
...
fix(timesheet): Hours automatically used to set 0
2019-09-02 08:38:12 +05:30
Suraj Shetty
f268562256
Merge branch 'develop' into contacts-ref
2019-09-02 06:32:11 +05:30
Mangesh-Khairnar
86720deeae
fix: bypass credit limit check
2019-09-01 10:15:23 +05:30
Suraj Shetty
72bea0dff4
test: Add test to check creation of pick list from multiple sales order
2019-08-31 18:34:25 +05:30
Suraj Shetty
736b5e07cc
fix: Maintain the order of Item List
2019-08-31 18:33:23 +05:30
Suraj Shetty
ca58fde552
test: Enable basic tests
2019-08-31 16:58:51 +05:30
Mangesh-Khairnar
bb3cec1556
test: fetch data from customer credit limit
2019-08-31 14:32:07 +05:30
Mangesh-Khairnar
42d0da8f5a
Revert "fix: process allocation expiry"
...
This reverts commit b654dc0e28
.
2019-08-31 14:28:10 +05:30
Mangesh-Khairnar
dbc69da409
fix: minor fixes
2019-08-31 14:28:02 +05:30
Mangesh-Khairnar
e3bb247868
fix: check column in credit limit
2019-08-31 13:16:14 +05:30
Mangesh-Khairnar
f856b3b559
fix: fetch customer group of the customer
2019-08-31 01:40:58 +05:30
Mangesh-Khairnar
89433b4bea
fix: get credit limit
2019-08-30 22:57:51 +05:30
Suraj Shetty
bcfec77e2c
style: Use single quotes
2019-08-30 19:44:37 +05:30
Suraj Shetty
744b92d233
fix: Commonify item not available alert
...
- Reorganise code
- UX fixes
2019-08-30 19:39:28 +05:30
Suraj Shetty
0eed0a9abe
test: Temporarily comment out tests
2019-08-30 19:12:16 +05:30
Mangesh-Khairnar
b3e5d11e1d
fix: multiple fixes
2019-08-30 18:18:48 +05:30
Suraj Shetty
0df38891a1
fix: Update pick list print format
2019-08-30 15:59:35 +05:30
Suraj Shetty
f75481fa23
Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list
2019-08-30 15:45:18 +05:30
pranav nachnekar
828fea6d66
formatting and date validation
2019-08-30 10:49:57 +05:30
pranav nachnekar
2cd994977b
Better date validation
2019-08-30 10:49:43 +05:30
pranav nachnekar
17906d5599
Added polyfill for datepicker
...
for Safari and IE support
2019-08-30 10:49:07 +05:30
Suraj Shetty
5e84ce55ae
fix: Add is_stock_item filter for item in locations table
2019-08-30 10:01:49 +05:30
Suraj Shetty
effe53d4ae
fix: Set default value for qty
2019-08-30 09:52:08 +05:30
Suraj Shetty
88885184dc
fix: Show separate button for pick list creation in work order
2019-08-30 09:30:18 +05:30
Suraj Shetty
9641edc562
fix: Set item locations before save
2019-08-29 22:23:13 +05:30
Suraj Shetty
9b42682575
fix: Check parent warehouse for batch as well
2019-08-29 21:14:26 +05:30
Mangesh-Khairnar
dcd5be0d07
patch: move credit limit in customer to child table
2019-08-29 20:53:51 +05:30
Mangesh-Khairnar
c059bc3e36
fix: grid view of customer credit limit
2019-08-29 20:51:31 +05:30
Deepesh Garg
52c61904c8
Merge pull request #18870 from rohitwaghchaure/not_able_to_save_sales_order_develop
...
fix: not able to save sales order
2019-08-29 20:32:06 +05:30
Suraj Shetty
a6ab00162e
style: Remove commented code
2019-08-29 20:17:04 +05:30
Suraj Shetty
9e4282e130
Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list
2019-08-29 20:09:55 +05:30
Rohit Waghchaure
13c7e183a6
fix: not able to save sales order
2019-08-29 20:03:52 +05:30
Mangesh-Khairnar
5755d2d32f
fix: customer credit limit report
2019-08-29 19:51:38 +05:30
Mangesh-Khairnar
79525327f0
feat: bypass credit limit check
2019-08-29 19:50:23 +05:30
Suraj Shetty
3e11338ed5
fix: Validate count of serial numbers
2019-08-29 19:46:49 +05:30
Mangesh-Khairnar
233ee277ef
Merge pull request #18853 from Mangesh-Khairnar/fix-allocation-expiry
...
fix: process allocation expiry
2019-08-29 18:29:07 +05:30
Mangesh-Khairnar
36b30911a8
feat: customer credit limit
2019-08-29 18:06:23 +05:30
Suraj Shetty
acd00df8fb
Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list
2019-08-29 17:24:23 +05:30
Suraj Shetty
ed1ec82d2f
refactor: Item picking logic
...
- Fix serial number selection
- Get limited item location based on required qty
- Store total item count to properly track available locations
- Pass missing serial no.
2019-08-29 17:23:09 +05:30
pranav nachnekar
25052a0ab7
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2019-08-29 16:56:54 +05:30
pranav nachnekar
dbd72ea89d
Added time generation
2019-08-29 16:56:19 +05:30
Mangesh-Khairnar
232b5dab81
Merge pull request #18854 from ruchamahabal/fixes
...
fix: exception in Shopify Settings
2019-08-29 16:33:46 +05:30
Deepesh Garg
dbe8dab3ce
Merge pull request #18794 from deepeshgarg007/supplier_items
...
fix: Enhancement in Purchase Order
2019-08-29 16:29:02 +05:30
Rucha Mahabal
f5b2db76cb
Merge branch 'develop' into fixes
2019-08-29 13:32:30 +05:30
Suraj Shetty
1c29c520bd
Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list
2019-08-29 13:18:57 +05:30
Mangesh-Khairnar
2f322609d7
Merge pull request #18852 from mbhavesh95863/patch-1
...
fix(selling): remove redundant listing
2019-08-29 13:12:38 +05:30
Mangesh-Khairnar
74c7b04b29
Merge branch 'develop' into fixes
2019-08-29 12:31:38 +05:30
rohitwaghchaure
c20e66e0be
Merge pull request #18860 from rohitwaghchaure/added_purchase_invoice_in_buying_module
...
fix: added purchase invoice in buying module
2019-08-29 12:13:50 +05:30
rohitwaghchaure
445a93e5f5
Merge pull request #18859 from rohitwaghchaure/incorrect_valuation_rate_calculated_for_serial_no_develop
...
fix: incorrect valuation rate calculated because of string replacement
2019-08-29 12:13:02 +05:30
Suraj Shetty
66f2bc69a6
fix: Item mapping of stock entry with no reference
2019-08-29 09:23:31 +05:30
Suraj Shetty
55a2699f4c
fix: Update dashboard of doctypes that are linked with pick list
2019-08-29 09:14:27 +05:30
Rohit Waghchaure
354d0af44e
fix: added purchase invoice in buying module
2019-08-28 17:51:31 +05:30
Suraj Shetty
f455c92d02
fix: Remove Pick List Reference Item use Item locations table instead
2019-08-28 17:44:22 +05:30
Mangesh-Khairnar
b654dc0e28
fix: process allocation expiry
2019-08-28 17:22:56 +05:30
Rohit Waghchaure
d03d8204ab
fix: incorrect valuation rate calculated because of string replacement issue
2019-08-28 17:22:50 +05:30
pranav nachnekar
adba6c833d
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2019-08-28 17:00:27 +05:30
pranav nachnekar
7b9e30914f
Added doctypes and portal pages
2019-08-28 16:57:37 +05:30
Rucha Mahabal
1707c3da95
fix: exception
...
Co-Authored-By: Himanshu <himanshuwarekar@yahoo.com>
2019-08-28 13:55:26 +05:30
Rucha Mahabal
b606d4d2ad
Merge branch 'develop' into fixes
2019-08-28 13:50:31 +05:30
Rucha Mahabal
9fa5dbd6e4
fix: raised exception in shopify
2019-08-28 13:29:03 +05:30
Suraj Shetty
1cf7270049
fix: Add picklist dashboard config
2019-08-28 12:40:58 +05:30
Suraj Shetty
be0ae7a430
fix: Doctype changes
...
- Check no copy for work order series field
- Add dashboard
- Set naming_series for pick list
2019-08-28 12:40:26 +05:30
Shivam Mishra
0aeccbf4b2
feat: added dashboard fixtures ( #18812 )
...
* feat: add dashboard charts fixture
* fix: remove return statement
* feat: added patch for creating default dashboards
* chore: renamed dashboard charts
* feat: add add_dashboard function to install fixtures
* fix: reload doctype issue in patches
* fix (travis): reloaded dashboard chart source
* fix (travis): reloaded dashboard chart source
* fix (travis): reloaded dashboard doctype
* fix (travis): reloaded dashboard chart link doctype
2019-08-28 11:39:45 +05:30
Suraj Shetty
8f32ac0edd
fix: Batch selection logic
2019-08-28 10:16:20 +05:30
Himanshu Warekar
a5b78f3c0d
fix: get address in single line
2019-08-28 00:04:05 +05:30
Mangesh-Khairnar
671c20ec56
Merge branch 'develop' into patch-1
2019-08-27 22:42:35 +05:30
Mangesh-Khairnar
17d3de1821
fix: process allocation expiry
2019-08-27 22:37:12 +05:30
mbhavesh95863
cfec328c74
Same report 2 times in list
2019-08-27 19:17:19 +05:30
Suraj Shetty
c5e0838890
fix: Import get_conversion factor method
2019-08-27 12:14:17 +05:30
Suraj Shetty
974ac3e6ad
fix: Update item detail for items without reference
2019-08-27 10:17:16 +05:30
Suraj Shetty
dc675b1eb0
fix: Re-order stock qty field
2019-08-27 08:06:22 +05:30
Himanshu Warekar
9057239c3c
fix: display address
2019-08-26 22:40:54 +05:30
Suraj Shetty
d6be8989e4
fix: Remove "Material Issue" purpose from pick list
...
- Because in material issue we already define source warehouse
2019-08-26 22:11:49 +05:30
Faris Ansari
8ac2a2f0c4
fix: Set default Parent Item Group
2019-08-26 13:00:17 +05:30
Himanshu Warekar
1c538b9b43
Merge branch 'develop' of https://github.com/frappe/erpnext into contacts-ref
2019-08-26 12:51:51 +05:30
Himanshu Warekar
ba6fe6cde5
Merge branch 'contacts-ref' of https://github.com/hrwx/erpnext into contacts-ref
2019-08-26 12:49:45 +05:30
Himanshu Warekar
7243e774c2
fix: add city, state and country
2019-08-26 12:49:20 +05:30
Shivam Mishra
db3bb793e9
feat: added domain info on footer ( #18839 )
2019-08-26 11:29:18 +05:30
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
a1aa85712b
Merge branch 'develop' into fix-timesheet-creation
2019-08-26 10:01:45 +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
Himanshu
dc0fb08ec7
Merge branch 'develop' into contacts-ref
2019-08-23 15:03:03 +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
Suraj Shetty
7f94a58bf1
Merge branch 'develop' into fix-timesheet-creation
2019-08-23 11:46:01 +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
Nabin Hait
bdfd69a2fe
Merge branch 'develop' into contacts-ref
2019-08-23 11:34:42 +05:30
Harshit
56d03a456b
fix: add contract to CRM module ( #18817 )
2019-08-23 11:34:25 +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
Suraj Shetty
6689ed543a
Merge branch 'develop' into fix-paid-amount
2019-08-23 10:42:23 +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
Himanshu Warekar
362c89ca73
Merge branch 'develop' of https://github.com/frappe/erpnext into contacts-ref
2019-08-22 17:29:38 +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
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
Himanshu Warekar
447134d308
Merge develop into contacts-ref
2019-08-22 09:21:30 +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
Himanshu Warekar
81f20891c1
fix: query
2019-08-21 16:09:35 +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
Himanshu Warekar
c6e02e2a74
fix: make contact structure call popup compatible
2019-08-21 13:36:41 +05:30
Himanshu Warekar
ea97a6cb5b
Merge develop into contacts-ref
2019-08-21 13:19:22 +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
Himanshu Warekar
9f4dc3fcd4
fix: call popup get contact name from number
2019-08-20 22:20:02 +05:30
Himanshu Warekar
128f5dbff1
Merge branch 'version-12-hotfix' of https://github.com/frappe/erpnext into contacts-ref
2019-08-20 20:38:18 +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
Mangesh-Khairnar
6d549b03f1
Merge branch 'develop' into fix-ledger-entry
2019-08-20 17:58:44 +05:30
Suraj Shetty
dd63b656c7
Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list
2019-08-20 16:59:43 +05:30
Sahil Khan
5f2c030ddc
Merge branch 'version-12-hotfix' into merge_v12_hotfix_1
2019-08-20 16:22:49 +05:30
deepeshgarg007
9e6abc4948
fix: Test case fixes
2019-08-20 16:14:44 +05:30
Sahil Khan
a8403cde16
bumped to version 12.0.7
2019-08-20 16:20:26 +05:50
deepeshgarg007
cb38cc96c3
fix: Enhancement in Purchase Order
2019-08-20 15:00:48 +05:30
Mangesh-Khairnar
79414a8d36
fix: fetch employee name on leave ledger creation
2019-08-20 14:45:57 +05:30
Mangesh-Khairnar
5cdda19494
fix: ledger entries after expiry
2019-08-20 14:45:57 +05:30
rohitwaghchaure
16dda1a991
fix: group by voucher consolidated showing incorrect data for deferred entries ( #18779 )
2019-08-20 12:37:32 +05:30
rohitwaghchaure
d5b4b1fdaf
fix: group by voucher consolidated showing incorrect data for deferred entries ( #18777 )
2019-08-20 12:35:15 +05:30
Suraj Shetty
5124b2806d
Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list
2019-08-20 12:05:51 +05:30
Suraj Shetty
1a090432d9
fix: Quantity while creating pick list from work order
...
- Fix get_mapped_doc config to filter items
- Fix erroneous condition in get_mapped_doc used for creation of pick_list
in sales order
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2019-08-20 12:04:07 +05:30
rohitwaghchaure
9ef7d5edaf
Merge pull request #18789 from rohitwaghchaure/asset_pro_rata_cal_for_wdv_remaining_amt_develop
...
Asset pro rata cal for wdv remaining amt develop
2019-08-20 10:33:15 +05:30
Rohit Waghchaure
5d3dee206f
fixed test cases and the logic for pro rata calculation
2019-08-20 10:30:56 +05:30
Rohit Waghchaure
1583925080
fix: Pro rata calculation is not working for WDV depreciation method
2019-08-20 10:30:38 +05:30
Mangesh-Khairnar
c97a7fb845
fix: restrict the payment order to non received type payment entries
2019-08-20 00:27:43 +05:30
Mangesh-Khairnar
becb89213f
Merge pull request #18737 from Mangesh-Khairnar/fix-payment-order
...
fix: restrict the payment order to non received type payment entries
2019-08-20 00:13:32 +05:30
Rohit Waghchaure
1008e6e450
fix: debit note not reconciled with another purchase invoice using payment reconciliation
2019-08-19 20:27:15 +05:30
Deepesh Garg
33b392ac2b
Update erpnext/controllers/sales_and_purchase_return.py
...
Co-Authored-By: Mangesh-Khairnar <mkhairnar10@gmail.com>
2019-08-19 17:43:10 +05:30
Deepesh Garg
3965451c7a
Update erpnext/controllers/sales_and_purchase_return.py
...
Co-Authored-By: Mangesh-Khairnar <mkhairnar10@gmail.com>
2019-08-19 17:40:29 +05:30
deepeshgarg007
0487ad5515
fix: Code cleanup
2019-08-19 16:40:29 +05:30
deepeshgarg007
e2acc748c8
fix: Check for return against delivery noteas well
2019-08-19 16:38:04 +05:30
Mangesh-Khairnar
4645727163
Merge branch 'develop' into fix-payment-order
2019-08-19 16:29:30 +05:30
deepeshgarg007
7d288437d8
fix: Assignment
2019-08-19 16:19:48 +05:30
deepeshgarg007
c80e5fe7a1
fix: Failing sales and purchase return test cases
2019-08-19 14:38:15 +05:30
Deepesh Garg
5efedd7a60
fix: Travis ( #18772 )
2019-08-19 12:56:22 +05:30
Deepesh Garg
960a1cbd8f
fix: Party dashboard heatmap not capturing sales, purchase and other activities ( #18753 )
2019-08-19 11:51:16 +05:30
Suraj Shetty
6450be5e58
fix: Get Items button
2019-08-19 10:48:21 +05:30
Suraj Shetty
669cff88d1
fix: Get items button
2019-08-19 10:38:01 +05:30
Anurag Mishra
19c3cb0d5b
fix: removed filters(not required) ( #18729 )
2019-08-19 10:31:02 +05:30
Anurag Mishra
bc5712a1b3
fix: validated cost center in financial_statement ( #18733 )
...
* fix: validated cost center in financial_statement
* Update financial_statements.py
2019-08-19 10:24:44 +05:30
Mangesh-Khairnar
0df513434e
fix: valuation rate in stock ledger ( #18744 )
...
* fix: valuation rate in stock ledger
* test: allow zero valuation rate for items
2019-08-19 10:04:52 +05:30
Karthikeyan S
d5e5e22adb
Merge pull request #18523 from Vigneshsekar/attendance_grace_period
...
feat(Auto Attendance): Add grace period
2019-08-18 13:25:48 +05:30
Deepesh Garg
77ec3cf402
Merge pull request #18757 from deepeshgarg007/accounting_dimension_fix
...
fix: Default dimensions in child doctypes
2019-08-16 17:27:14 +05:30
deepeshgarg007
0a2ed6da37
fix: Add missing semicolon
2019-08-16 15:50:17 +05:30
Deepesh Garg
6e80cbfd1e
Merge pull request #18761 from deepeshgarg007/symbol_fix_develop
...
fix: Symbol fix in chart of accounts
2019-08-16 15:48:17 +05:30
Faris Ansari
ac3579d2c6
Merge pull request #17624 from Mangesh-Khairnar/leave-management
...
feat: Carry Forward Leave Expiry
2019-08-16 15:39:24 +05:30
deepeshgarg007
8d0b6f9a60
fix: Handling if no default dimension exists
2019-08-16 14:00:26 +05:30
deepeshgarg007
42d9298318
fix: Remove extra space
2019-08-16 13:06:47 +05:30
Mangesh-Khairnar
4b71d9ca9f
Merge branch 'develop' into fix-payment-order
2019-08-16 12:42:26 +05:30
Suraj Shetty
ec1fe9e2ca
Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list
2019-08-16 08:17:26 +05:30
Suraj Shetty
182f4def00
fix: Delivery note creation from pick list
...
- Changes in serial no and batch no seletion
- Changes in warehouse overrwite logic
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2019-08-16 08:16:22 +05:30
deepeshgarg007
2fb6bc9867
fix: Default dimensions in child doctypes
2019-08-15 17:06:32 +05:30
Deepesh Garg
98a6e5cb6c
Merge pull request #18742 from rohitwaghchaure/incorrect_sequnce_between_name_and_contact
...
fix: sequence of customer name and contact in the AR report
2019-08-14 23:20:55 +05:30
Rohit Waghchaure
c5d41af10f
fix: sequence of customer name and contact in the AR report
2019-08-14 18:49:19 +05:30
Mangesh-Khairnar
dbb44c8950
fix: restrict the payment order to non received type payment entries
2019-08-14 17:38:44 +05:30
Mangesh-Khairnar
ae2a0fb4c7
chore: remove unused code
2019-08-14 16:50:31 +05:30
Mangesh-Khairnar
ca55af836b
fix: travis
2019-08-14 16:32:02 +05:30
Mangesh-Khairnar
3a42631e65
Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management
2019-08-14 16:11:08 +05:30
Mangesh-Khairnar
107b2768fd
refactor: replace raw sql with orm
2019-08-14 16:09:16 +05:30
Anurag Mishra
78690d7b8b
fix:payment ammount validation for pos invoices ( #18663 )
2019-08-14 15:03:58 +05:30
Mangesh-Khairnar
760b078dc9
fix(payroll-entry): commit submitted salary slip check on change ( #18694 )
...
* fix(payroll-entry): commit submitted salary slip check onchange
* fix: track submitted ss via flags
2019-08-14 14:40:00 +05:30
Deepesh Garg
2c5dcbe819
fix: Error handling in payment entry ( #18720 )
2019-08-14 14:26:37 +05:30
Mangesh-Khairnar
06ce1f5a40
fix(quality-inspection): fetch all items for inspection type in process ( #18716 )
...
* fix(quality-inspection): fetch all items for inspection type in process
* fix(quality-inspection): add server side validation for in process items
2019-08-14 14:25:59 +05:30
Vignesh S
4454630549
feat(Auto Attendance): Add grace period
...
Co-authored-by: Karthikeyan S <skarthikeyan1410@gmail.com>
2019-08-14 13:40:02 +05:30
Deepesh Garg
5a7f26f4d2
Merge pull request #18717 from Anurag810/company_fix
...
fix: removed hard coded string form company
2019-08-14 12:11:33 +05:30
Anurag Mishra
de20b083a0
Merge branch 'develop' into company_fix_v13
2019-08-14 12:10:02 +05:30
Anurag Mishra
904cbef4dc
fix: removed hard coded string
2019-08-13 19:48:42 +05:30
Anurag Mishra
81d5265385
fix: removed hard coded string
2019-08-13 19:40:36 +05:30
Sagar Vora
33d00bfeae
fix: v12 patches sequence ( #18610 )
2019-08-13 19:39:48 +05:30
rohitwaghchaure
4d7a0aaee1
Merge pull request #18705 from surajshetty3416/fix-payment-entry-account-permission
...
fix: Check if account passed is accessible under Payment Entry
2019-08-13 18:37:17 +05:30
Sagar Vora
e14a00b887
fix: v12 patches sequence ( #18609 )
2019-08-13 17:26:56 +05:30
Sahil Khan
f841afd48d
bumped to version 12.0.6
2019-08-13 15:04:18 +05:50
Mangesh-Khairnar
dab5b1f319
Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management
2019-08-13 13:33:26 +05:30
Mangesh-Khairnar
8b9b77959d
fix: fetch min date when carry forward expiry is greater than leave allocation expiry
2019-08-13 13:20:10 +05:30
Anurag Mishra
d2f13fe0a6
fix: query ( #18709 )
2019-08-13 13:19:24 +05:30
Suraj Shetty
469e430d38
Merge branch 'fix-payment-entry-account-permission' of github.com:surajshetty3416/erpnext into fix-payment-entry-account-permission
2019-08-13 12:12:03 +05:30
Suraj Shetty
64a962ce97
fix: Re-organise code
2019-08-13 12:10:00 +05:30
Suraj Shetty
1a2600c9ea
fix: Ignore account permission check
2019-08-13 12:09:06 +05:30
Himanshu
7df50b6ec7
fix(QMS): TreeView fixes ( #18595 )
...
* fix: TreeView fixes
* test: test case fix
2019-08-13 11:58:42 +05:30
Suraj Shetty
80afee04a4
fix: Set address while creating Opportunity from Lead ( #18702 )
...
* fix: Set address while creating Opportunity from Lead
* fix: Setting of address in opportunity from Lead
2019-08-13 10:58:29 +05:30
Suraj Shetty
bd2e7c0e53
fix: Comment description
2019-08-12 16:32:14 +05:30
Suraj Shetty
3234f0d299
fix: Check if account passed is accessible under Payment Entry
2019-08-12 16:18:36 +05:30
Faris Ansari
9eda500dbc
Merge branch 'develop' into refactor-call-popup
2019-08-12 15:56:35 +05:30
Rohit Waghchaure
fb23773935
fix: reconciled entry has not clearance date set
2019-08-12 15:35:19 +05:30
Frappe PR Bot
037caf096b
feat: Updated translation ( #18597 )
2019-08-12 15:32:37 +05:30
Suraj Shetty
f81b6c7cfb
fix: Set address while creating Opportunity from Lead ( #18700 )
2019-08-12 13:05:22 +05:30
DeeMysterio
1c728a7cf8
fix(delivery note): change the text invoice to sales invoice on make button ( #18658 )
2019-08-12 13:04:25 +05:30
DeeMysterio
cfce53103b
fix(delivery note): change the text invoice to sales invoice on make button ( #18666 )
2019-08-12 13:03:55 +05:30
Michelle Alva
af969d664f
Added Employee Tax Exxxemption category and sub-category links ( #18659 )
2019-08-12 12:59:59 +05:30
Himanshu
19199baf29
fix: miscellaneous fixes ( #18615 )
2019-08-12 12:17:28 +05:30
Himanshu
ebf38c5ebd
fix: misc fixes ( #18616 )
2019-08-12 12:17:16 +05:30
Andrew McLeod
c97ffaeac3
fix: Python3 urllib use in item_group.py (now uses six.moves) ( #18643 )
2019-08-12 12:06:30 +05:30
Andrew McLeod
677c522f01
fix: Python3 urllib use in item_group.py (now uses six.moves) ( #18642 )
2019-08-12 12:06:23 +05:30
Shivam Mishra
8363a6e585
refactor: remove from date and to date from standard filter ( #18696 )
2019-08-12 11:58:14 +05:30
Suraj Shetty
83705af0b3
fix: Filters for portal quotation list ( #18689 )
...
* fix: Filters for portal quotation list
* fix: Remove unwanted import
2019-08-12 11:51:27 +05:30
sahil28297
214815eb62
fix(patch): force reload child docs ( #18672 )
2019-08-12 11:49:21 +05:30
sahil28297
a0b9b3cef5
fix(patch): force reload child docs ( #18671 )
2019-08-12 11:49:14 +05:30
Deepesh Garg
cd7a89da32
Merge pull request #18691 from deepeshgarg007/gstr-3b-non-gst-v12
...
fix: GSTR 3B report fixes
2019-08-11 19:50:44 +05:30
Deepesh Garg
43dc351209
Merge pull request #18692 from deepeshgarg007/gstr-3b-non-gst-develop
...
fix: GSTR 3B report fixes
2019-08-11 19:50:29 +05:30
deepeshgarg007
9db6471fae
fix: Test Case
2019-08-11 17:29:09 +05:30
deepeshgarg007
4b28b3216b
fix: Test Cases
2019-08-11 17:28:55 +05:30
deepeshgarg007
db01743885
fix: Test Case
2019-08-11 15:47:35 +05:30
deepeshgarg007
b87c5d83de
fix: Test Cases
2019-08-11 12:40:45 +05:30
deepeshgarg007
c36abbcda3
fix: GSTR 3B report fixes
2019-08-11 11:01:02 +05:30
deepeshgarg007
dabcb6b531
fix: GSTR 3B report fixes
2019-08-11 10:58:16 +05:30
Deepesh Garg
1fb21cd9e5
Merge branch 'version-12-hotfix' into fix-item-template-description
2019-08-10 17:36:00 +05:30
Deepesh Garg
e6b076cb34
Merge pull request #18632 from netchampfaris/fix-item-template-description-fp
...
fix(Item Template): Fallback description string
2019-08-10 17:33:59 +05:30
Deepesh Garg
0b711d1f8a
Merge pull request #18684 from marination/fixes_v12
...
fix: Fixed error message in Payment Entry for outstanding invoices not found via filters
2019-08-10 17:26:54 +05:30
Suraj Shetty
3f7a757e80
Merge branch 'refactor-call-popup' of github.com:surajshetty3416/erpnext into refactor-call-popup
2019-08-09 19:23:09 +05:30
Suraj Shetty
d4edd284e6
fix: Set Contact or Lead for call log
...
- Set contact or lead to call log on new Contact or Lead creation
2019-08-09 19:23:04 +05:30
Suraj Shetty
b282f1f154
Merge branch 'develop' into refactor-call-popup
2019-08-09 18:18:17 +05:30
Himanshu Warekar
3fbfac64c2
Merge contacts-ref into contacts-ref
2019-08-09 17:51:14 +05:30
Himanshu Warekar
12fbecf48b
fix: use primary label instead of bold letters
2019-08-09 17:50:03 +05:30
Himanshu
59a6821299
Merge branch 'version-12-hotfix' into contacts-ref
2019-08-09 16:52:39 +05:30
marination
9839a9afb0
fix: Fixed error message in Payment Entry for outstanding invoices not found via filters
2019-08-09 15:54:18 +05:30
marination
4583100537
fix: Fixed error message in Payment Entry for outstanding invoices not found via filters
2019-08-09 15:30:05 +05:30
Deepesh Garg
ca5fdeb9bb
Merge pull request #18683 from Mangesh-Khairnar/fix-translation-test
...
test: Translation in search
2019-08-09 15:29:33 +05:30
rohitwaghchaure
5790fabd54
Merge pull request #18669 from rohitwaghchaure/removed_stock_item_condition_for_sub_contract_v12
...
fix: allow to subcontract service raw materials
2019-08-09 15:18:38 +05:30
rohitwaghchaure
ed6fb66a90
Merge pull request #18679 from Anurag810/get-item-from-product-bundle
...
fix: get item from product bundle
2019-08-09 15:17:42 +05:30
Mangesh-Khairnar
7c7e9ecfcd
test: translation fix
2019-08-09 14:48:36 +05:30
Anurag Mishra
8d4b04e719
fix: get item from product bundle
2019-08-09 14:34:09 +05:30
Mangesh-Khairnar
e173d54054
Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management
2019-08-09 13:37:51 +05:30
Anurag Mishra
24c3b4e00f
fix: get item from product bundle
2019-08-09 13:27:59 +05:30
Mangesh-Khairnar
261d132f3a
fix: calculate earned leaves based on annual allocation
2019-08-09 13:18:52 +05:30
Himanshu
0184c981ee
Merge branch 'version-12-hotfix' into contacts-ref
2019-08-09 11:15:28 +05:30
Suraj Shetty
e047de854b
Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list
2019-08-09 11:14:14 +05:30
Himanshu
ffddcb0526
Merge branch 'version-12-hotfix' into qms-fixes
2019-08-09 11:06:36 +05:30
Himanshu Warekar
86f3310ac1
fix: iterate over valid variable
2019-08-09 11:05:04 +05:30
Himanshu Warekar
f94d183297
feat: move to newer contacts structure
2019-08-08 23:50:03 +05:30
Himanshu Warekar
224c2ddaf4
feat: render multiple addresses
2019-08-08 23:34:34 +05:30
Mangesh-Khairnar
3662ed50d2
fix: multiple changes
2019-08-08 19:47:17 +05:30
Suraj Shetty
7e818067eb
Merge branch 'develop' into refactor-call-popup
2019-08-08 19:18:03 +05:30
Suraj Shetty
44b906a43d
Merge branch 'refactor-call-popup' of github.com:surajshetty3416/erpnext into refactor-call-popup
2019-08-08 19:16:37 +05:30
Suraj Shetty
429bfcfd83
fix: Make requested changes
2019-08-08 19:16:32 +05:30
Rohit Waghchaure
10e8073204
fix: allow to subcotract service raw materials
2019-08-08 18:20:53 +05:30
Faris Ansari
99c26e068d
fix: Set Maintenance Status fields as Read Only ( #18634 )
...
Maintenance Status is set based on warranty_expiry_date and
amc_expiry_date. Even if they are editable they are set programmatically
server side. Better to make them as read only.
2019-08-08 17:45:49 +05:30
Faris Ansari
cfd19afabf
fix: Set Maintenance Status fields as Read Only ( #18633 )
...
Maintenance Status is set based on warranty_expiry_date and
amc_expiry_date. Even if they are editable they are set programmatically
server side. Better to make them as read only.
2019-08-08 17:45:44 +05:30
Mangesh-Khairnar
bafc89f439
refactor: convert raw sql to orm
2019-08-08 17:43:23 +05:30
rohitwaghchaure
9f9184c908
fix: not able to transfer raw materials for subcontracted items ( #18650 )
2019-08-08 17:41:38 +05:30
rohitwaghchaure
536e6bf57c
fix: group by condition in the payment reconciliation ( #18657 )
2019-08-08 17:40:57 +05:30
Mangesh-Khairnar
f3a5188bec
fix: accounting period ( #18477 )
...
* fix: accounting period
* test: accounting period
* fix: account period creation
* fix: remove status field from accounting period
2019-08-08 17:39:13 +05:30
Mangesh-Khairnar
9bc4232af6
feat: calculate remaining leaves both multiple simultaneous allocation
2019-08-08 17:11:08 +05:30
Mangesh-Khairnar
5cbe6160ca
feat: consider carry forwarded leaves on creation of encashment
2019-08-08 17:06:15 +05:30
Deepesh Garg
f2bf76a2ef
fix: Show Cr or Dr symbol in chart of accounts based on balance ( #18653 )
...
* fix: Show Cr or Dr symbol in chart of accounts based on balance
* fix: Typo fix in comment
2019-08-08 15:52:39 +05:30
Deepesh Garg
f729eed035
fix: Show Cr or Dr symbol in chart of accounts based on balance ( #18654 )
...
* fix: Show Cr or Dr symbol in chart of accounts based on balance
* fix: Typo fix in comment
2019-08-08 15:52:25 +05:30
Deepesh Garg
065e8f3650
fix: Changes in print format due to attribute name changes in frappe ( #18639 )
2019-08-08 15:51:56 +05:30
Deepesh Garg
04b42600b0
fix: Changes in print format due to attribute name changes in frappe ( #18641 )
2019-08-08 15:51:50 +05:30
Faris Ansari
df7644a96d
fix: Show created serial nos as links in message ( #18635 )
...
Fixes #18623
2019-08-08 15:50:24 +05:30
Faris Ansari
afae8a0c46
fix: Show created serial nos as links in message ( #18636 )
...
Fixes #18623
2019-08-08 15:50:17 +05:30
Aditya Hase
472050bb8a
fix(quickbooks): Do not build global search for QuickBooks Migrator ( #18628 )
2019-08-08 15:48:35 +05:30
Aditya Hase
f19b7b9122
fix(quickbooks): Do not build global search for QuickBooks Migrator ( #18627 )
2019-08-08 15:48:09 +05:30
Mangesh-Khairnar
e5c733bdb3
fix: Accounting period ( #18630 )
...
* fix: accounting period
* test: accounting period
* fix: account period creation
* fix: remove status field from accounting period
2019-08-08 15:44:11 +05:30
Suraj Shetty
c7716f0bbc
Merge branch 'develop' into refactor-call-popup
2019-08-08 12:50:20 +05:30
Himanshu Warekar
b9f2a6048b
test: fix test cases
2019-08-07 18:21:38 +05:30
Faris Ansari
3623452839
fix(Item Template): Fallback description string
...
Fixes #18572
2019-08-07 17:21:51 +05:30
Faris Ansari
2260838933
fix(Item Template): Fallback description string
...
Fixes #18572
2019-08-07 17:21:22 +05:30
Himanshu
1b48448b7b
Merge branch 'version-12-hotfix' into qms-fixes
2019-08-07 11:32:06 +00:00
Rushabh Mehta
6276f1adc5
fix(minor): don't update modified timestamp for overdue tasks
2019-08-07 16:32:44 +05:30
Sahil Khan
c5ae3cc120
bumped to version 12.0.5
2019-08-07 16:41:13 +05:50
Suraj Shetty
cab8e9be89
fix(timesheet): Hours automatically used to set 0
...
- Case: If the company had standard working hour set
and when the user creates a timesheet with same date for
"To" and "From" then the hours field automatically used to
get reset to 0 after saving the form.
2019-08-07 10:40:29 +05:30
Suraj Shetty
0c699f0726
fix: Paid amount 0 while creating advanced payment entry
...
Paid amount is set 0 while creating advanced payment entry
against multi-currency purchase order.
Solution: Populate paid amount value after applying conversion rate
2019-08-07 10:17:05 +05:30
Suraj Shetty
9f4b270116
fix: prev_doc
2019-08-06 09:03:23 +05:30
Suraj Shetty
4ca82f9308
fix: Show contact and lead name in list view
2019-08-06 05:49:01 +05:30
Suraj Shetty
207f218db3
Merge branch 'refactor-call-popup' of github.com:surajshetty3416/erpnext into refactor-call-popup
2019-08-06 05:44:28 +05:30
Suraj Shetty
89d8a0b6fd
fix: reset_employee_emails_cache method
2019-08-06 05:44:13 +05:30
Himanshu
76c6a050af
Merge branch 'version-12-hotfix' into qms-fixes
2019-08-05 17:12:44 +00:00
Deepesh Garg
235166ec41
Merge pull request #18592 from deepeshgarg007/utils_fix_v12
...
fix: Ambigious column in query
2019-08-05 22:38:45 +05:30
Suraj Shetty
f6f849226e
Merge branch 'develop' into refactor-call-popup
2019-08-05 21:25:12 +05:30
Suraj Shetty
7d3f1fef1c
fix: Employee selection for call popup
...
- Check if employee with matched number is also
scheduled to receive popup
2019-08-05 21:21:45 +05:30
Mangesh-Khairnar
314647572c
fix: check for old unexpired allocation
2019-08-05 15:35:19 +05:30
Mangesh-Khairnar
6bed870dfa
feat: pro-rata leave allocation
2019-08-05 14:47:53 +05:30
Mangesh-Khairnar
f281f00d43
feat: auto leave encashment
2019-08-05 14:47:53 +05:30
Deepesh Garg
e4abaa7cdd
Merge pull request #18591 from deepeshgarg007/utils_fix_develop
...
fix: Ambigious column in query
2019-08-05 14:45:30 +05:30
Himanshu Warekar
e8f95a2adf
fix: TreeView fixes
2019-08-05 14:21:09 +05:30
Rucha Mahabal
d9fa83b196
fix: added Company by default in session defaults ( #18471 )
2019-08-05 14:15:16 +05:30
deepeshgarg007
23f30cdb8b
fix: Aambigious column in query
2019-08-05 12:42:35 +05:30
deepeshgarg007
043f70e9a6
fix: Aambigious column in query
2019-08-05 12:40:50 +05:30
Deepesh Garg
7638301d01
Merge pull request #18527 from netchampfaris/bom-comparison-tool
...
feat: BOM Comparison Tool
2019-08-05 11:58:46 +05:30
Suraj Shetty
0957480305
fix: Show popup to employees with same phone number
2019-08-05 11:32:51 +05:30
rohitwaghchaure
9601b6c601
feat: added checkbox 'Update Consumed Material Cost In Project' in work order to don't update the consumed material cost in the project for the subassembely work orders ( #18533 )
2019-08-05 10:40:23 +05:30
Frappe PR Bot
833afea3e3
feat: Updated translation ( #18542 )
2019-08-05 10:38:37 +05:30
Anurag Mishra
08df6bda41
fix: query ( #18468 )
2019-08-05 10:27:25 +05:30
Mangesh-Khairnar
31c5c1e562
fix(payroll-entry): show make bank entry button ( #18497 )
...
* fix(payroll-entry): show make bank entry button when manually submitting salary slip
* Update payroll_entry.py
2019-08-05 10:21:19 +05:30
Anurag Mishra
7e1987ed48
feat: validate cwip accounts for journal Entry ( #18518 )
2019-08-05 10:18:57 +05:30
Anurag Mishra
f9fb92ebb0
feat: validate cwip accoutns in journal entry ( #18519 )
2019-08-05 10:18:37 +05:30
Mangesh-Khairnar
a3d5200194
fix(sales-order): update items ( #18535 )
...
* fix(sales-order): update items
* fix: minor changes
* Update: accounts controller
2019-08-05 10:16:40 +05:30
Mangesh-Khairnar
9accae3ddc
fix(sales-order): update items ( #18536 )
...
* fix(sales-order): update items
* fix: minor changes
2019-08-05 10:16:25 +05:30
Deepesh Garg
8b0302bab9
fix: Make conversion rate optional for non itemized items ( #18540 )
2019-08-05 10:14:19 +05:30
Deepesh Garg
cfb899451f
fix: Make conversion rate optional for non itemized items ( #18541 )
2019-08-05 10:14:05 +05:30
Deepesh Garg
fb5aa43e77
fix: Type error handling while getting material request items ( #18549 )
...
* fix: Type error handling while getting material request items
* fix: Remove flt
2019-08-05 10:12:42 +05:30
Deepesh Garg
713d4bb1ba
fix: Type error handling while getting material request items ( #18550 )
...
* fix: Type error handling while getting material request items
* fix: Remove flt
2019-08-05 10:12:17 +05:30
Deepesh Garg
a7eaa4de14
fix: Customer price list not honored in shopping cart ( #18556 )
2019-08-05 10:10:53 +05:30
Deepesh Garg
65ad4287b6
fix: Customer price list not honored in shopping cart ( #18557 )
2019-08-05 10:10:38 +05:30
Suraj Shetty
580fa48642
fix: Quotation list in customer portal ( #18579 )
...
* fix: Quotation list in customer portal
Customers were not able to see their quotations because of
the recent customer field removal from quotation
* fix: Remove duplicate code
2019-08-05 10:08:35 +05:30
Mangesh-Khairnar
06a0afa039
Feat: Notify by email feature ( #18587 )
...
* feat: notify user by email in employee onboarding control
* fix: create task on update after submit
2019-08-05 10:07:05 +05:30
Nabin Hait
a813571c17
Update employee_advance.py
2019-08-05 10:05:28 +05:30
Mangesh-Khairnar
d66396f4e9
fix(employee-advance): update employee advance on change in expense claim ( #18588 )
...
* fix(employee-advance): update employee advance on rejection/cancellation of expense claim
* fix(expense-claim): display appropriate buttons only if linked transactions are valid
* Update employee_advance.py
2019-08-05 10:04:05 +05:30
Mangesh-Khairnar
c92e823651
fix(employee-advance): update employee advance on change in expense claim ( #18590 )
...
* fix(employee-advance): update employee advance on rejection/cancellation of expense claim
* fix(expense-claim): display appropriate buttons only if linked transactions are valid
2019-08-05 10:02:32 +05:30
Suraj Shetty
35c4b78e66
Merge branch 'develop' of github.com:frappe/erpnext into refactor-call-popup
2019-08-04 22:23:03 +05:30
rohitwaghchaure
ed7e074985
Merge pull request #18570 from rohitwaghchaure/add_serial_no_button_not_working
...
fix: add serial no button not working for the delivery note
2019-08-04 12:02:43 +05:30
Deepesh Garg
7668cd7053
Merge pull request #18577 from deepeshgarg007/taxes_and_totals_v13
...
fix: Error handling in taxes and totals
2019-08-03 18:26:54 +05:30
deepeshgarg007
b656529818
fix: Error handling in taxes and totals
2019-08-03 13:49:33 +05:30
deepeshgarg007
8bf19ce81a
fix: Error handling in taxes and totals
2019-08-03 13:44:44 +05:30
deepeshgarg007
a499079250
fix: Remove non standard fieldname
2019-08-03 10:27:33 +05:30
deepeshgarg007
75465775b4
Merge branch 'version-12-hotfix' of https://github.com/frappe/erpnext into error_report_v12
2019-08-03 10:26:46 +05:30
deepeshgarg007
b0916a35dc
fix: Remove payment order from bank dashboard
2019-08-03 10:24:04 +05:30
deepeshgarg007
93e46310b8
fix: Remove payment order from bank dashboard
2019-08-03 10:17:44 +05:30
Suraj Shetty
4b3b358ac6
fix: Show correct label instead of showing undefined ( #18559 )
2019-08-02 21:46:38 +05:30
Suraj Shetty
e45102b913
fix: Show correct label instead of showing undefined ( #18560 )
2019-08-02 21:46:28 +05:30
Rohit Waghchaure
dadd049cbf
fix: add serial no button not working for the delivery note
2019-08-02 19:11:31 +05:30
Suraj Shetty
6fd3a86012
fix: Option to create pick list from work order
2019-08-02 16:48:31 +05:30
Sahil Khan
8426ff726a
Merge branch 'version-12-hotfix' into version-12
2019-08-02 14:27:59 +05:30
Sahil Khan
968da1cd21
bumped to version 12.0.4
2019-08-02 14:47:59 +05:50
sahil28297
c7abc025ff
Merge branch 'develop' into task-fix
2019-08-02 14:14:52 +05:30
Shivam Mishra
0313dc0f8c
fix: task not updated issue
2019-08-02 14:12:36 +05:30
Shivam Mishra
dc53e8ebb0
fix: task not updated issue
2019-08-02 13:56:49 +05:30
Suraj Shetty
c6857e562b
fix: Check zero valuation rate only for valid doctypes ( #18529 )
...
fix: Check zero valuation rate only for valid doctypes
2019-08-02 11:22:31 +05:30
Suraj Shetty
c154e57603
Merge branch 'develop' into stock-ledger-fix_develop
2019-08-02 08:44:21 +05:30
Suraj Shetty
b559bf6de6
Merge branch 'version-12-hotfix' into stock-ledger-fix
2019-08-02 08:43:54 +05:30
Suraj Shetty
c57328669a
feat: Add pick list print format
2019-08-02 08:14:27 +05:30
Suraj Shetty
b35c0410b1
fix: Add option to get items from work order
2019-08-02 08:12:30 +05:30
Rohan
fc04d334da
Merge branch 'develop' into develop-customer-item-price-report
2019-08-01 17:51:03 +05:30
Suraj Shetty
a7dc3735ae
fix: Move folders to right location
2019-08-01 15:49:29 +05:30
deepeshgarg007
c16ef32b6b
fix: Payment Order link fix in bank dashboard
2019-08-01 14:10:03 +05:30
deepeshgarg007
8704bc6f39
fix: Payment Order link fix in bank dashboard
2019-08-01 13:24:48 +05:30
Suraj Shetty
31e3dada0e
Merge branch 'version-12-hotfix' into bom-comparison-tool
2019-08-01 12:59:19 +05:30
Suraj Shetty
e06f486aee
fix: Rename methods
2019-08-01 12:54:33 +05:30
Faris Ansari
d9e482759c
style: Missing semicolon
2019-08-01 12:53:19 +05:30
Suraj Shetty
bb7a2dbb6a
fix: Rename file
2019-08-01 12:38:26 +05:30
Suraj Shetty
0c1dbb116f
Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list
2019-08-01 12:06:20 +05:30
Suraj Shetty
fbcc56536b
fix: Rename Pick TIcket -> Pick List
2019-08-01 12:05:20 +05:30
Suraj Shetty
fa9111ebe2
fix: Add and rename some fields
...
- Add ability to create delivery note from pick ticket
- Minor fix related to create button
2019-08-01 11:07:14 +05:30
Mangesh-Khairnar
8fb600162e
fix: remove all leaves via scheduler
2019-07-31 19:31:26 +05:30
Mangesh-Khairnar
5eac8703da
fix: create reverse expiry for back dated leaves
2019-07-31 19:28:21 +05:30
Deepesh Garg
d301d26fda
fix: Enhancement in credit note ( #18511 )
...
* fix: Credit note enhancement
* Fix: Print format for Sales Invoice Return
* fix: Zero quantity validation fix for credit note
2019-07-31 15:58:19 +05:30
Deepesh Garg
b65c761b16
fix: Enhancement in credit note ( #18510 )
...
* fix: Credit note enhancement
* Fix: Print format for Sales Invoice Return
* fix: Zero quantity validation fix for credit note
2019-07-31 15:58:01 +05:30
rohitwaghchaure
fdb5e6b2e5
Merge pull request #18531 from rohitwaghchaure/scrap_item_not_adding_v12_hotfix
...
fix: scrap item not adding while doing finished good entry
2019-07-31 00:47:01 +05:30
Rohit Waghchaure
862363521b
fix: scrap item not adding while doing finished good entry
2019-07-30 23:57:58 +05:30
deepeshgarg007
f9c0ef3eb3
fix: Check zero valuation rate only for valid doctypes
2019-07-30 19:01:53 +05:30
deepeshgarg007
548293ad08
fix: Check zero valuation rate only for valid doctypes
2019-07-30 18:49:19 +05:30
Faris Ansari
f650cb8e4b
style: Indent and missing semicolon
2019-07-30 17:46:15 +05:30
Faris Ansari
a4ada93834
fix: Field labels
2019-07-30 17:11:34 +05:30
Faris Ansari
66064c7827
fix: Add BOM Comparison Tool to module view
2019-07-30 17:11:18 +05:30
Faris Ansari
1214e2d2a4
feat: BOM Comparison Tool
2019-07-30 16:54:46 +05:30
Sahil Khan
403968b2f7
bumped to version 12.0.3
2019-07-30 13:29:07 +05:50
Suraj Shetty
72d03464dc
fix: Show "Get Item Location" only if there are reference items
2019-07-30 11:56:24 +05:30
Suraj Shetty
14fb1600ec
fix: Select location based on group warehouse
2019-07-30 11:47:21 +05:30
Suraj Shetty
341f7733d1
fix: Make item read-only in item location table
2019-07-30 10:02:50 +05:30
Suraj Shetty
e260e8239f
fix: Batch number selection code
2019-07-30 10:02:10 +05:30
Suraj Shetty
55ab31314c
fix: Add code to set batch no
...
- And split item based on batch availibility
2019-07-30 09:02:03 +05:30
rohitwaghchaure
2a45eadc28
Merge pull request #18514 from deepeshgarg007/trail_balance_fix_hotfix
...
fix: Opening balance not getting calculated in trail_balance_report
2019-07-29 20:56:00 +05:30
Suraj Shetty
36c724d7b5
fix(Issue): reset issue fulfilled indicator ( #18454 )
...
fix(Issue): reset issue fulfilled indicator
2019-07-29 18:27:53 +05:30
Suraj Shetty
344df219a4
Merge pull request #18453 from hrwX/iss_ful_fix_v12
...
fix(Issue): change agreement fulfilled to ongoing when resetting SLA
2019-07-29 18:27:43 +05:30
rohitwaghchaure
3e4cabfd6c
Merge pull request #18516 from rohitwaghchaure/can_t_compare_datetime_issue_for_quotation
...
fix: can't compare datetime.date to unicode
2019-07-29 17:59:08 +05:30
Rohit Waghchaure
40e35048b8
fix: can't compare datetime.date to unicode
2019-07-29 17:14:39 +05:30
Suraj Shetty
9ad10cb425
test: Add basic tests
2019-07-29 16:52:26 +05:30
Deepesh Garg
62daa43a4c
Merge pull request #18513 from deepeshgarg007/trail_balance_fix
...
fix: Opening balance not getting calculated in trail balance report
2019-07-29 15:38:39 +05:30
rohitwaghchaure
a55e4e2c03
Merge pull request #18452 from rohitwaghchaure/scrap_item_not_adding
...
fix: scrap item not adding while doing finished good entry
2019-07-29 15:30:24 +05:30
deepeshgarg007
107c07e5cb
fix: Opening balance not getting calculated in trail_balance_report
2019-07-29 15:01:22 +05:30
deepeshgarg007
4c652396d0
fix: Opening balance not getting calculated in trail_balance_report
2019-07-29 14:57:33 +05:30
deepeshgarg007
f37fb82069
fix: Code cleanup
2019-07-29 12:14:49 +05:30
deepeshgarg007
d9f3ba5fda
fix: Reload doc in patch
2019-07-29 12:14:49 +05:30
deepeshgarg007
724be6eca2
fix: GL entry validation fix
2019-07-29 12:14:49 +05:30
deepeshgarg007
82661372f7
fix: Add accounting dimensions to subscription and opening invoice tool
2019-07-29 12:14:49 +05:30
deepeshgarg007
3d15128b91
fix: Test cases for accounting dimensions
2019-07-29 12:14:49 +05:30
deepeshgarg007
1c1f6f90bb
fix: Test Cases for accounting dimensions
2019-07-29 12:14:49 +05:30
deepeshgarg007
5dfe4df23b
fix: Set query fix
2019-07-29 12:14:49 +05:30
deepeshgarg007
22a4857a3c
fix: Codacy Fixes
2019-07-29 12:14:49 +05:30
deepeshgarg007
acc0958ead
fix: Patch
2019-07-29 12:14:49 +05:30
deepeshgarg007
f1f79ff1e1
fix: Remove dimensions from boot
2019-07-29 12:14:49 +05:30
deepeshgarg007
7d270edf79
fix: Added default dimension and filter in bootinfo
2019-07-29 12:14:49 +05:30
deepeshgarg007
b590f89310
fix: Default Accounting Dimensions in doctypes
2019-07-29 12:14:49 +05:30
rohitwaghchaure
8c8b1f2da6
Merge pull request #18463 from rohitwaghchaure/bank_reco_consider_incorrect_paid_amount_field_v12
...
fix: multi currency bank reconciliation issue
2019-07-29 11:40:40 +05:30
Suraj Shetty
7e20324776
Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list
2019-07-29 09:41:08 +05:30
deepeshgarg007
ec421df4e4
fix: Code cleanup
2019-07-29 08:58:56 +05:30
Suraj Shetty
27bdba49d4
test: Add test case statements
2019-07-28 22:04:07 +05:30
Suraj Shetty
d43764c8e5
fix: Use .set method to set serial no.
2019-07-28 22:03:28 +05:30
deepeshgarg007
6a43f6718a
fix: Reload doc in patch
2019-07-28 10:30:32 +05:30
deepeshgarg007
a65ad10c62
fix: GL entry validation fix
2019-07-27 19:06:36 +05:30
deepeshgarg007
4fce891241
Merge branch 'develop' of https://github.com/frappe/erpnext into defaut_accounting_dimension
2019-07-27 18:11:34 +05:30
Sahil Khan
82a9118cb2
bumped to version 12.0.2
2019-07-27 13:14:21 +05:50
Mangesh-Khairnar
f0f4dbd5f8
fix(payroll-entry): show make bank entry button when manually submitting salary slip ( #18498 )
2019-07-27 10:05:33 +05:30
Michelle Alva
e666b882e7
fix: added payroll period in HR module ( #18500 )
2019-07-27 10:03:18 +05:30
Himanshu
e83b0c3599
Merge branch 'version-12-hotfix' into iss_ful_fix_v12
2019-07-26 12:51:55 +00:00
Himanshu
9443e8e85f
Merge branch 'develop' into iss_ful_fix_v13
2019-07-26 12:51:09 +00:00
rohitwaghchaure
0f3281fe43
Merge pull request #18496 from rohitwaghchaure/asset_pro_rata_cal_for_wdv_remaining_amt_v12
...
fix: Pro rata calculation is not working for WDV depreciation method
2019-07-26 16:11:38 +05:30
Saurabh
af19347376
Merge branch 'develop' into scrap_item_not_adding
2019-07-26 15:10:17 +05:30
Deepesh Garg
64968979b2
Merge branch 'version-12-hotfix' into stock-ageing-v12
2019-07-26 14:42:34 +05:30
Aditya Hase
dc4452ffe3
perf(travis): Faster builds ( #18491 )
...
perf(travis): Faster builds
2019-07-26 13:44:05 +05:30
deepeshgarg007
2f87fd7951
Merge branch 'version-12-hotfix' of https://github.com/frappe/erpnext into stock-ageing-v12
2019-07-26 13:32:11 +05:30
Suraj Shetty
64f174fcaa
feat: Get item location from reference items
...
- Add option to get items from multiple sales order
- Add some required fiels to Pick TIcket Reference Item
2019-07-26 13:22:05 +05:30
Rohit Waghchaure
53f5e2e066
fixed test cases and the logic for pro rata calculation
2019-07-26 13:21:46 +05:30
Rohit Waghchaure
3844a98c42
fix: Pro rata calculation is not working for WDV depreciation method
2019-07-26 13:21:33 +05:30
Sahil Khan
ecd4d3883e
bumped to version 12.0.1
2019-07-26 13:29:14 +05:50
Himanshu
e87fbcc286
Merge branch 'develop' into iss_ful_fix_v13
2019-07-26 07:31:44 +00:00
Deepesh Garg
941e21092c
Merge branch 'develop' into stock_ageing_fix
2019-07-26 12:47:05 +05:30
Deepesh Garg
c391d65dc3
Merge pull request #18488 from adityahase/faster
...
perf(travis): Faster builds
2019-07-26 12:41:01 +05:30
Himanshu
b4ecd29015
Merge branch 'version-12-hotfix' into iss_ful_fix_v12
2019-07-26 06:58:59 +00:00
Himanshu
0162d0a2ea
Merge branch 'develop' into iss_ful_fix_v13
2019-07-26 06:58:55 +00:00
rohitwaghchaure
ad89b029c2
Merge pull request #18494 from netchampfaris/parent-account-child-account-currency-fp
...
fix(Account): Pass parent currency to child currency
2019-07-26 12:13:27 +05:30
rohitwaghchaure
a312f19fab
Merge pull request #18493 from netchampfaris/parent-account-child-account-currency
...
fix(Account): Pass parent currency to child currency
2019-07-26 12:12:15 +05:30
deepeshgarg007
06f99cae36
fix: Fixes in stock ageing report
2019-07-26 10:32:08 +05:30
deepeshgarg007
15154d4bd0
Merge branch 'develop' of https://github.com/frappe/erpnext into stock_ageing_fix
2019-07-26 10:30:22 +05:30
deepeshgarg007
7fdab021b6
fix: Use get_serial_no and remove batch
2019-07-26 10:26:13 +05:30
deepeshgarg007
1495c9599a
fix: Remove batch
2019-07-26 10:25:54 +05:30
deepeshgarg007
e3a2ab184e
fix: Consider serial no and batches in Stock ageing report
2019-07-26 10:25:15 +05:30
deepeshgarg007
f7733be322
fix: Enhancement in stock ageing report
2019-07-26 10:25:04 +05:30
deepeshgarg007
4d53992b35
fix: Changed columns to new dict form
2019-07-26 10:24:40 +05:30
deepeshgarg007
dda6b5cd53
fix: Add accounting dimensions to subscription and opening invoice tool
2019-07-26 09:14:42 +05:30
deepeshgarg007
aa92df4ddc
fix: Test cases for accounting dimensions
2019-07-26 09:14:42 +05:30
deepeshgarg007
0ce2afc9bc
fix: Test Cases for accounting dimensions
2019-07-26 09:14:42 +05:30
deepeshgarg007
41a1cd954c
fix: Set query fix
2019-07-26 09:14:42 +05:30
deepeshgarg007
b124aff0bb
fix: Codacy Fixes
2019-07-26 09:14:42 +05:30
deepeshgarg007
703fc08467
fix: Patch
2019-07-26 09:14:42 +05:30
deepeshgarg007
6dd5f74671
fix: Remove dimensions from boot
2019-07-26 09:14:42 +05:30
deepeshgarg007
ada1ac8013
fix: Added default dimension and filter in bootinfo
2019-07-26 09:14:42 +05:30
deepeshgarg007
efd6307bc4
fix: Default Accounting Dimensions in doctypes
2019-07-26 09:14:42 +05:30
Faris Ansari
0ec747f57c
fix(Account): Pass parent currency to child currency
...
In a scenario where Parent Company Account's Currency is different
from it's default currency, the Account Currency of Child would be set
from the default currency of Company which might be wrong
2019-07-26 08:55:34 +05:30
Deepesh Garg
6f6f4b9417
Merge pull request #18481 from deepeshgarg007/bank_reco_v12
...
fix: Dynamic link issue fix in Bank reconciliation statement
2019-07-26 08:49:03 +05:30
Deepesh Garg
641e8fea02
Merge branch 'develop' into bank_reco_develop
2019-07-26 08:48:02 +05:30