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
ChillarAnand
358734dcea
fix: Skip deletion if linked docs exists
2022-02-17 16:31:27 +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
ChillarAnand
b3d4465db6
Merge branch 'develop' into remove-nonprofit
2022-02-17 15:30:11 +05:30
ChillarAnand
fb59247182
fix: Delete party type records in patch
2022-02-17 15:15:44 +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
ChillarAnand
db1957ffe6
Merge branch 'develop' into remove-nonprofit
2022-02-17 13:00:58 +05:30
ChillarAnand
b5ff9b27bd
refactor: Clean up non-profit setup
2022-02-17 12:37:25 +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
ChillarAnand
72fe559031
refactor: Remove non profit templates
2022-02-17 08:42:32 +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
Marica
c3c9a8d445
Merge branch 'develop' into so-mr-wo-back-update
2022-02-16 13:39:58 +05:30
Marica
f044b1ef27
Merge pull request #29639 from marination/item-variants-perf
...
perf: Weed out disabled variants via sql query instead of pythonic looping separately
2022-02-16 13:39:08 +05:30
Marica
201a38bfbf
Merge branch 'develop' into item-variants-perf
2022-02-16 13:03:32 +05:30
Kenneth Sequeira
a26183e205
fix: add supported currencies ( #29805 )
2022-02-16 13:02:36 +05:30
Marica
0ba72b133f
Merge branch 'develop' into repack-entry-stock-ageing
2022-02-16 12:48:51 +05:30
Marica
3fcf0ec81d
Merge branch 'develop' into so-mr-wo-back-update
2022-02-16 12:44:56 +05:30
marination
29c576e144
chore: Remove commented out code
2022-02-16 12:41:39 +05:30
Sagar Vora
08a391fa88
test: set correct DocType ( #29819 )
2022-02-16 10:56:57 +05:30
Deepesh Garg
2f5bfcc055
Merge branch 'develop' into payment_terms_report
2022-02-16 10:06:12 +05:30
marination
f6233e77c6
chore: Add transfer bucket working to .md file
2022-02-15 20:30:16 +05:30
marination
ea3b7de867
test: Stock Ageing FIFO buckets for Repack entry with same item
2022-02-15 18:41:42 +05:30
marination
799671c748
fix: Transfer Bucket logic for Repack Entry with split batch rows
2022-02-15 18:41:08 +05:30
Marica
e6fa33012f
Merge branch 'develop' into so-mr-wo-back-update
2022-02-15 17:51:54 +05:30
ruthra kumar
48f37c7659
test: added test for alternate currency
...
- Sales Order and Invoice will be submitted in USD with exchange rate
of 70 with the default company currency
- Report will display in defauly company currency
2022-02-15 17:21:08 +05:30
ruthra kumar
49fdc6c52e
test: refactor and fix failing test case
2022-02-15 17:20:29 +05:30
Ankush Menat
f89a64db48
fix: dont attempt to set batch number if item doesn't have batch no ( #29812 )
...
This causes other triggers and unnecessary changes (e.g. price list)
2022-02-15 16:10:35 +05:30
Deepesh Garg
4a33cdab34
Merge pull request #29791 from deepeshgarg007/tds_payable_cancelled_entries
...
fix: Fixes in TDS payable monthly report
2022-02-15 15:39:47 +05:30
marination
0ca58d7627
chore: Patch to update SO work_order_qty and Linter fix
2022-02-15 14:28:00 +05:30
marination
f9d52e7346
test: SO > MR > WO flow
2022-02-15 13:38:15 +05:30
