Commit Graph

40676 Commits

Author SHA1 Message Date
Deepesh Garg
170a657ed8
Merge pull request #29887 from deepeshgarg007/loan_interest_principal
fix: Ledger entries on LIA for term loans
2022-02-21 14:24:37 +05:30
Marica
e952cce17d
chore: Show 'Produced Qty' field in Sales Order Item (#29903) 2022-02-21 14:22:14 +05:30
Deepesh Garg
a82cf7214e fix: Total Credit amount in TDS Payable monthly report 2022-02-21 13:58:56 +05:30
Deepesh Garg
e24242ee33
Merge branch 'develop' into loan_interest_principal 2022-02-21 13:39:45 +05:30
Saqib Ansari
780694f6e2 test: number_of_depr_booked = total_number_of_depr 2022-02-21 12:45:52 +05:30
Saqib Ansari
c5808543c8 fix(asset): no. of depreciation booked cannot be equal to total no. of depreciations 2022-02-21 12:41:08 +05:30
Deepesh Garg
e13d774e8e
Merge branch 'develop' into gross_profit_non_stock_item 2022-02-21 12:34:14 +05:30
Saqib Ansari
1a31e9d916
Merge pull request #29896 from nextchamp-saqib/fix-pos-coupon-code-#2
fix(pos): removal of coupon code
2022-02-21 11:48:35 +05:30
Deepesh Garg
0b5e618e3a fix: Update bank reconciliation statement 2022-02-21 11:46:44 +05:30
Deepesh Garg
295cbb0ff2 fix: Update queries in Bank Reconciliation Tool 2022-02-21 11:45:23 +05:30
Deepesh Garg
a0bdcbd0cd fix: Add patch for account fields 2022-02-21 11:44:00 +05:30
Saqib Ansari
fa38c291bd fix(pos): removal of coupon code 2022-02-21 11:38:16 +05:30
rohitwaghchaure
6956578339
Merge pull request #29771 from deepeshgarg007/consolidated_financial_statment_error
fix: Error in consolidated financial statements
2022-02-20 18:21:54 +05:30
Deepesh Garg
83a60a2a17
Merge pull request #29869 from deepeshgarg007/gstr_1_gstin_filter
fix: GSTIN filter for GSTR-1 report
2022-02-19 19:41:49 +05:30
Deepesh Garg
d188fcc066
chore: remove console statements 2022-02-19 19:36:43 +05:30
Deepesh Garg
a28ec89507
Update gstr_1.js 2022-02-19 19:35:57 +05:30
Deepesh Garg
1aa12fb3f1 fix: Ledger entries on LIA for term loans 2022-02-19 19:19:32 +05:30
rohitwaghchaure
b9072eb9b8
Merge pull request #29773 from wojosc/patch-26
Translation for DocType
2022-02-19 16:37:25 +05:30
Marica
18c6cc96cf
Merge pull request #29816 from marination/repack-entry-stock-ageing
fix: Stock Ageing Transfer Bucket logic for Repack Entry with split batch rows
2022-02-18 19:17:55 +05:30
Marica
d1a283fd79
Merge branch 'develop' into repack-entry-stock-ageing 2022-02-18 18:54:23 +05:30
marination
d5be536740 test: Negative Stock, over consumption & over production with split rows, balance precision 2022-02-18 18:53:05 +05:30
marination
ed4a6c6cc6 fix: Range Qty precision 2022-02-18 18:52:42 +05:30
Deepesh Garg
85b67039da
Merge pull request #29774 from deepeshgarg007/patch_fixes
fix: Patch fixes
2022-02-18 17:49:54 +05:30
marination
d3fbbcfed3 fix: Precision of available qty and negative stock in transfer bucket
- Maintain only positive values in transfer bucket
- Use it to neutralize/add stock to fifo queue
2022-02-18 16:33:28 +05:30
Deepesh Garg
8b3d9088df
Merge branch 'develop' into consolidated_financial_statment_error 2022-02-17 23:32:50 +05:30
Deepesh Garg
e1f8f034c2 Merge branch 'develop' of https://github.com/frappe/erpnext into patch_fixes 2022-02-17 23:20:29 +05:30
Deepesh Garg
3a966d4dbe fix: Move patch to post sync 2022-02-17 23:18:07 +05:30
Deepesh Garg
1617e0d0e6 fix: Remove reload doc 2022-02-17 22:52:53 +05:30
Deepesh Garg
87b074ac09 fix: GSTIN filter for GSTR-1 report 2022-02-17 22:01:00 +05:30
Ankush Menat
c36bd7e1a6 fix: avoid creating bins without item-wh
Co-Authored-By:  Shadrak Gurupnor <30501401+shadrak98@users.noreply.github.com>
Co-Authored-By: Saurabh <saurabh6790@gmail.com>
2022-02-17 19:52:01 +05:30
Deepesh Garg
555b1335f6 feat: Bank Reconciliation for loan documents 2022-02-17 19:15:30 +05:30
Rucha Mahabal
bef46e2b64 chore: remove unused code and fields related to workstation from Timesheet Detail 2022-02-17 17:48:18 +05:30
Rucha Mahabal
47ff968253 test: timesheet not overlapping with continuous timelogs 2022-02-17 17:48:18 +05:30
Rucha Mahabal
3ec9acf8f7 fix: convert overlap raw query to frappe.qb 2022-02-17 17:48:18 +05:30
Rucha Mahabal
e2e998fbd9 fix(Timesheet): convert time logs to datetime while checking for overlap 2022-02-17 17:48:18 +05:30
Ankush Menat
229db14b7e ci: move some tasks to background
- wkhtml download
- asset building
2022-02-17 16:16:53 +05:30
Saqib Ansari
9a7f9c3668
Merge pull request #29859 from nextchamp-saqib/fix-pos-coupon-code
fix: coupon code is applied even if ignore_pricing_rule is enabled
2022-02-17 16:11:19 +05:30
Saqib Ansari
2743999785 fix: coupon code is applied even if ignore_pricing_rule is enabled 2022-02-17 16:03:43 +05:30
Ankush Menat
db93f26f20 fix: production plan status should consider qty + WO status 2022-02-17 14:48:32 +05:30
rohitwaghchaure
0da39950d8
Merge pull request #29836 from rohitwaghchaure/minor-item-name-in-excel-sheet
feat (minor): added item name in the excel sheet
2022-02-17 14:37:51 +05:30
Saqib Ansari
680f8c4dc2
Merge pull request #29848 from nextchamp-saqib/fix-brt-currency
fix: currency in bank reconciliation tool
2022-02-17 14:27:07 +05:30
Saqib Ansari
60674e52b8 fix: currency in bank reconciliation tool 2022-02-17 14:19:42 +05:30
Ankush Menat
d9fc3f3d90 test: putaway rule re-application shouldn't do anything 2022-02-17 12:26:51 +05:30
Ankush Menat
b000e93744 fix: avoid updating items table if no change due to putaway 2022-02-17 12:26:51 +05:30
Rohit Waghchaure
02e77029fa fix: added item name in the excel sheet 2022-02-16 18:15:57 +05:30
Marica
ecfa6344c0
Merge pull request #29835 from marination/move-wo-patch-to-v13
chore: Move patch that updates SO from WO to v13
2022-02-16 18:05:46 +05:30
marination
06d36c6143 chore: Move patch that updates SO from WO to v13 2022-02-16 17:40:16 +05:30
Wolfram Schmidt
235b0715bf
fix: allow renaming and merging (#29830) 2022-02-16 17:20:07 +05:30
Deepesh Garg
d251bec380
Merge pull request #29137 from ruthra-kumar/payment_terms_report
feat: Payment Terms Status report
2022-02-16 14:15:24 +05:30
Marica
e7cdb67af0
Merge pull request #29803 from marination/so-mr-wo-back-update
fix: Update SO via Work Order made from MR (attached to SO)
2022-02-16 14:04:20 +05:30