Deepesh Garg
2172ab2d37
fix: Update columns in new format
2022-02-11 14:48:39 +05:30
Saqib Ansari
8128b33d4f
Merge pull request #29732 from alyf-de/encode-filters
...
fix: encode filters for URI
2022-02-11 14:44:46 +05:30
Saqib Ansari
2d8e03e059
Merge pull request #29748 from nextchamp-saqib/fix-gp-report-columns
...
fix: cannot jump to sales invoice in gross profit report
2022-02-11 14:38:40 +05:30
Rucha Mahabal
c7be9ef5d2
fix: consider leaves for past months if assignment is based on joining date too
2022-02-11 13:52:46 +05:30
Saqib Ansari
78dd364b0b
fix: cannot jump to sales invoice in gross profit report
2022-02-11 12:32:45 +05:30
Ankush Menat
77be98295c
fix: update bin modified timestamp when updating qty
...
These timestamps are used for writing integrations hence whenever bin is
updated timestamp should update to reliabily use Bin for integration
logic.
2022-02-11 11:54:58 +05:30
Ankush Menat
1553fa9c90
refactor!: drop deprecated and dead code
2022-02-11 11:23:37 +05:30
marination
86ca41b14a
test: Production Plan Pending Qty impact tests
...
- Two tests to check impact on pending qty: From SO and independent Prod Plan
- Added docstring to each test case for brief summary
- Changed helper function args to fallback to 0 instead of 1 if no arg is passed
- Removed unnecessary `get_doc()`
- Made helper function actions optional depending on args passed
2022-02-10 20:14:28 +05:30
Deepesh Garg
da73685f71
fix: Multiple fixes in Gross Profit report
2022-02-10 13:07:51 +05:30
Rohit Waghchaure
eec2f87088
fix: time out error while making work orders from prodcution plan
2022-02-10 12:30:41 +05:30
Ankush Menat
c371b52d27
fix: restrict filetypes to csv for rename tool
2022-02-10 10:26:00 +05:30
Devin Slauenwhite
49bee568a1
fix: get cart items for logged in user.
2022-02-09 12:03:05 -05:00
barredterra
5811d9e318
fix: encode filters for URI
2022-02-09 17:53:33 +01:00
Devin Slauenwhite
aeee334843
Merge remote-tracking branch 'upstream/develop' into feat-user-unique-cart
2022-02-09 11:08:24 -05:00
Devin Slauenwhite
34ad5b1abf
fix: get cart for logged in user.
2022-02-09 10:53:24 -05:00
Devin Slauenwhite
d636c3fb04
test: many users linked to customer shopping cart
2022-02-09 10:52:38 -05:00
Sagar Vora
2bc157a95c
fix: cleaner implementation for get_invoice_type
2022-02-09 17:48:24 +05:30
Smit Vora
6e679a5ad2
fix(India): Report GSTR-1 minor fixes
2022-02-09 17:48:24 +05:30
Sagar Vora
b68a99675d
fix: allow regional_overrides hook to be set in subsequent apps
2022-02-09 16:56:53 +05:30
Saqib Ansari
b35b637d01
Merge pull request #29701 from nextchamp-saqib/consolidation-round-off-err
...
fix(pos): incorrect grand_total in case of inclusive taxes on item
2022-02-09 16:42:30 +05:30
Saqib Ansari
0ebd32dc63
fix: cancelling of consolidated sales invoice that doesn't have closing entry
2022-02-09 16:08:28 +05:30
Saqib Ansari
4bb557dbd8
fix: flaky point of sale test
2022-02-09 16:07:42 +05:30
Saqib Ansari
75256863c6
fix(test): do not enable negative stock
2022-02-09 16:07:33 +05:30
Ankush Menat
2abc1c244e
Merge pull request #29715 from aaronmenezes/fix_reserved_for_production_calc
...
fix: Reserved for Production calculation considered closed work orders
2022-02-09 15:59:52 +05:30
Saqib Ansari
d106ec88ad
Merge pull request #29374 from nextchamp-saqib/fix-ignore-pricing-rule
...
fix: ignore pricing rule in transactions
2022-02-09 13:31:57 +05:30
Ankush Menat
89959976bd
fix: patch existing bins
2022-02-09 12:21:05 +05:30
Rucha Mahabal
89fa0bb73f
fix: consider based on DOJ config while calculating leaves for passed months
2022-02-09 11:28:14 +05:30
Ankush Menat
a8bf3a3f0d
refactor: move reserve quantity computation to work order
2022-02-09 11:26:03 +05:30
Ankush Menat
d2cc5f2482
test: remove dependency on other tests
2022-02-09 11:19:01 +05:30
Saqib Ansari
8ff7587aaa
Merge branch 'develop' into fix-ignore-pricing-rule
2022-02-09 10:31:22 +05:30
Saqib Ansari
ab36b27a94
fix: ignore pricing rule in all transactions
2022-02-09 10:10:17 +05:30
Deepesh Garg
6fd5281b46
Merge branch 'develop' into reverse_entry_dead_lock
2022-02-08 22:37:18 +05:30
aaronmenezes
6a8b7eeffe
fix: Reserved for Production calculation considered closed work orders
2022-02-08 19:25:49 +05:30
Ankush Menat
f2e056dfeb
Merge pull request #29296 from ankush/lifo_valuation
...
feat: LIFO valuation
2022-02-08 18:15:56 +05:30
Saqib Ansari
07dc228e32
Merge branch 'develop' into consolidation-round-off-err
2022-02-08 18:06:41 +05:30
marination
eaccef6116
fix: Initialise pending qty as planned qty for independent item rows in Prod Plan
...
- Rows that are not fetched from MR or SO, had pending qty 0 throughout
- Initialise pending qty on save only.
- After submit this field will be updated by work order/stock entry
- Bring functions in `validate()` closer to the top
2022-02-08 17:55:38 +05:30
Saqib Ansari
6fa406dd04
fix(test): pass price_list_rate only if pricing rule has to be removed
2022-02-08 17:51:53 +05:30
Ankush Menat
befcca4183
Merge branch 'develop' into lifo_valuation
2022-02-08 17:38:06 +05:30
Saqib Ansari
c2b83a0283
fix(test): case if write off is calculated as negative amount
2022-02-08 17:36:39 +05:30
Rucha Mahabal
7326d57966
fix: Earned Leave allocation based on joining date not working
2022-02-08 17:14:11 +05:30
Saqib Ansari
b51a5d9225
Merge pull request #29709 from nextchamp-saqib/fix-bank-reco-currency
...
fix: currency in bank reconciliation chart
2022-02-08 16:32:35 +05:30
Saqib Ansari
afc5c26d1c
fix(test): ignore stock validation
2022-02-08 16:04:08 +05:30
Saqib Ansari
3f962739fb
Merge branch 'develop' of https://github.com/frappe/erpnext into consolidation-round-off-err
2022-02-08 16:02:18 +05:30
Saqib Ansari
0fc5d2278d
fix: currency in bank reconciliation chart
2022-02-08 15:50:41 +05:30
Rucha Mahabal
bdf38a33cc
Merge pull request #29650 from ruchamahabal/fix-earned-leaves-allocation
2022-02-08 15:47:43 +05:30
Saqib Ansari
4f4395545e
Merge branch 'develop' into fix-ignore-pricing-rule
2022-02-08 15:29:28 +05:30
Saqib Ansari
27ced4f082
Merge pull request #29560 from ruthra-kumar/bug_invoice_creation_throws_typeerror
...
fix: typeerror on invoice creation from SO/PO
2022-02-08 15:27:05 +05:30
Rucha Mahabal
b71283aa7d
Merge branch 'develop' into fix-earned-leaves-allocation
2022-02-08 14:39:55 +05:30
Rucha Mahabal
bd1555bd23
fix: handle carry forwarded leaves while checking for duplicate allocation
2022-02-08 14:36:31 +05:30
Ankush Menat
bb105a33b2
test: validate on save instead of on creation
...
(cherry picked from commit 0efd5577bd9bdc0bb900d4d23d85aa86fd09929a)
2022-02-08 14:01:41 +05:30
