Commit Graph

36337 Commits

Author SHA1 Message Date
GangaManoj
bf52f55870 fix(Asset Repair): Make Stock Items and Warehouse mandatory if stock_consumption is checked 2021-06-16 07:56:40 +05:30
GangaManoj
695cd70994 fix(Asset Repair): Add title to error messages 2021-06-16 07:50:03 +05:30
GangaManoj
14ea9ebcb7 fix(Asset Repair): Display fields according to the state of the doc 2021-06-16 07:03:32 +05:30
GangaManoj
285bc60684 fix(Asset Repair): Set asset_name as title 2021-06-15 12:02:07 +05:30
GangaManoj
d4acf87feb fix(Asset Repair): Make Accounting Dimensions section collapsible 2021-06-15 11:37:17 +05:30
Saqib
6eeaf9b933
Merge branch 'version-13-hotfix' into asset-repair-refactor 2021-06-08 17:26:50 +05:30
Ganga Manoj
0ea4d850e1
fix: Allow all System Managers to delete company transactions (#25834) 2021-06-08 17:23:44 +05:30
Sagar Vora
3f1231b77c
Merge pull request #25981 from resilient-tech/ssa-selection-v13
fix: choose correct Salary Structure Assignment when getting data for formula eval
2021-06-08 15:21:10 +05:30
Sagar Vora
062e247353 test: remove unused imports 2021-06-08 14:43:28 +05:30
Sagar Vora
ca205be5ac fix: tests 2021-06-08 14:43:28 +05:30
Sagar Vora
0e5e1350b2 perf: use frappe.get_value with wildcard instead of another frappe.get_doc call 2021-06-08 14:43:28 +05:30
Sagar Vora
74818c7b62 fix: improve filter for from_date; validation for joining and relieving date 2021-06-08 14:43:28 +05:30
Sagar Vora
447c978757 fix: choose correct Salary Structure Assignment when getting data for formula eval 2021-06-08 14:43:28 +05:30
Anuja Pawar
d4398fd84a
fix: update cost center from pos (#25971) 2021-06-07 16:20:21 +05:30
rohitwaghchaure
cf7baeab16
Merge pull request #25956 from rohitwaghchaure/fixed-conversion-factor-issue
fix: custom conversion factor field not mapped from job card to stock entry
2021-06-07 11:45:44 +05:30
Saqib
d689068d82
Merge pull request #25928 from nextchamp-saqib/pos-fixes-8
fix(pos): multiple pos issues
2021-06-06 11:25:29 +05:30
Saqib Ansari
3f32969bee fix(pos): broken image in item details section 2021-06-06 11:18:20 +05:30
Saqib Ansari
bc46a9772d fix(pos): cash shortcuts not working 2021-06-06 11:11:07 +05:30
Saqib Ansari
a85c2c16b4 fix(pos): item rate precision in item selector 2021-06-06 11:07:20 +05:30
Ankush Menat
215516f819
fix: AttributeError: 'PurchaseReceiptItem' object has no attribute 'purchase_invoice' (#25902) (#25957)
* fix: AttributeError: 'PurchaseReceiptItem' object has no attribute 'purchase_invoice'

This error occurs when upgrading from erpnext 13.0.1 to 13.4.0 after typing
bench update --patch --reset

* fix(minor): use .get instead of getattr

Co-authored-by: D Tim Cummings <tim@triptera.com.au>
2021-06-04 13:09:14 +05:30
Rucha Mahabal
3f45901f25
fix: invalid 'depends_on' expression in opportunity (#25955) 2021-06-04 11:16:38 +05:30
Rohit Waghchaure
af4794b2d1 fix: custom conversion factor field not mapped from job card to stock entry 2021-06-04 10:53:44 +05:30
Saqib
c6e016e545
fix: wrong round off gl entry posted in case of purchase invoice (#25775) 2021-06-04 10:08:22 +05:30
Saqib Ansari
4a1e270072 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into pos-fixes-8 2021-06-04 10:04:09 +05:30
GangaManoj
12d9e3b1e6 fix(Asset Repair): Add tests 2021-06-03 22:41:57 +05:30
GangaManoj
b55649f2ec fix(Asset): Add depreciation schedule details in create_asset() 2021-06-03 22:28:30 +05:30
rohitwaghchaure
25b953ad16
Merge pull request #25854 from rohitwaghchaure/fixed-timeout-error-in-repost-item-valuation
fix: timeout error in the repost item valuation
2021-06-03 22:14:22 +05:30
GangaManoj
aa9bbe51bd fix(Asset Repair): Add Company in GL Entries 2021-06-03 21:28:58 +05:30
GangaManoj
034f7bde33 fix(Asset Repair): Remove unnecessary condition 2021-06-03 21:12:43 +05:30
rohitwaghchaure
c59371ab0c
fix: filter type for item query (#25942) 2021-06-03 20:02:58 +05:30
Rohit Waghchaure
10558344b0 fix: timeout error in the repost item valuation 2021-06-03 16:34:31 +05:30
Marica
7437748a1d
Merge pull request #25805 from ankush/refactor_item
refactor: item doctype
2021-06-03 14:23:18 +05:30
Saqib Ansari
81b9a5ee47 fix(pos): cannot cancel consolidated sales invoice 2021-06-03 12:59:09 +05:30
Saqib Ansari
311b378328 fix(pos): searching items with barcode or serial no 2021-06-03 12:58:53 +05:30
rohitwaghchaure
40b90e5b6e
Merge pull request #25478 from noahjacob/prod_plan_feat
feat: Added check box to combine items with same BOM
2021-06-03 12:37:02 +05:30
GangaManoj
9fb47795c4 fix(Asset Repair): Only modify depreciation schedule if calculate_depreciation is checked 2021-06-03 04:55:49 +05:30
GangaManoj
2ceeb8138d fix(Asset Repair): Set company when creating Stock Entry 2021-06-03 01:54:44 +05:30
GangaManoj
960840dc3a fix(Asset Repair): Set completion_date 2021-06-03 01:53:13 +05:30
Marica
e7d9200e0f
Merge pull request #25221 from Alchez/dev-quality-inspection-accounts
feat: create Quality Inspections from account and stock documents
2021-06-03 01:39:05 +05:30
Nabin Hait
88d94dbf0a
Merge pull request #25915 from rohitwaghchaure/fixed-work-order-no-able-to-select-item
fix: not able to select the item code in work order
2021-06-02 19:00:34 +05:30
Rohan Bansal
a06ec03efc test: add test for new QI function 2021-06-02 14:55:31 +05:30
Rohan Bansal
11aff80dea Merge remote-tracking branch 'upstream/version-13-hotfix' into dev-quality-inspection-accounts 2021-06-02 14:22:32 +05:30
Rohit Waghchaure
721b4130db fix: not able to select the item code in work order 2021-06-02 14:13:09 +05:30
Fisher Yu
865663857c
fix: chart of accounts importer always error (#25882)
* fix: chart of accounts importer always error 

chart of accounts importer always error Parent Account Missing

* Update chart_of_accounts_importer.py
2021-06-01 12:15:58 +05:30
Ankush Menat
2c7fac0e76
fix: reload doc for possible future schema changes (#25904) 2021-06-01 11:56:00 +05:30
Jannat Patel
1175e0686b
refactor: leave balance report (#25771)
* refactor: leave balance report

* refactor: sql to orm
2021-06-01 10:53:00 +05:30
Ganga Manoj
c8b34798fe
fix(Delivery Note): Assign Product Bundle's conversion_factor to Packed Items (#25840) 2021-06-01 10:44:26 +05:30
rohitwaghchaure
970f00922d
Merge pull request #25898 from anupamvs/stock-reconciliation
fix: featching serialized items
2021-05-31 20:00:35 +05:30
Jannat Patel
022b5c973a
fix: wrap dates in getdate for leave application (#25899)
* fix: wrap dates in getdate for leave application

* fix: translation issue

* fix: replaced today with getdate
2021-05-31 19:49:53 +05:30
Ganga Manoj
908b0090e9
fix: Create POS Invoice for Product Bundles (#25847)
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-05-31 19:49:03 +05:30