Commit Graph

40511 Commits

Author SHA1 Message Date
Wolfram Schmidt
dbd29da189
Translation for DocType
https://testsystem.frappe.cloud/app/milestone
2022-02-13 13:11:31 +01:00
Deepesh Garg
3557bbc539
Merge pull request #29770 from frappe/mergify/bp/develop/pr-29716
fix: Loan repayment via Salary Slip (backport #29716)
2022-02-12 21:55:23 +05:30
Deepesh Garg
65711dbde8 test: Update account type in payroll payable account
(cherry picked from commit a54e0fe42b38f571396e88b3ebcc46fd3b389301)
2022-02-12 13:17:33 +00:00
Deepesh Garg
988dee04fa fix: Loan repayment via Salary Slip
(cherry picked from commit 2572480554db265e2e93a5dfba75749675b46d14)
2022-02-12 13:17:32 +00:00
Deepesh Garg
19e281a54f
Merge pull request #29700 from vorasmit/gstr-1-fixes
fix(India): Report GSTR-1 minor fixes
2022-02-12 17:16:24 +05:30
Wolfram Schmidt
a0d163ebff
chore: changed Region zu Gebiet (#29651)
"Region" is more fitting when talking about a geographical area or region. Gebiet is more accurate translation in this case of territory as we are talking about sales territory which would be a "Verkaufsgebiet".
2022-02-12 14:50:48 +05:30
Wolfram Schmidt
7338641791
chore: added DocType Translation #29730
frappe.cloud/app/doctype/Email Digest Recipient

..it's just a table

[skip ci]
2022-02-12 14:49:31 +05:30
Ankush Menat
eb8b424722
feat: item-wise negative stock setting (#29761) 2022-02-12 13:08:28 +05:30
mergify[bot]
749005eb8b
fix: list mutation within loop (#29766)
Prevent list mutation within loop leading to incorrect data

(cherry picked from commit 894a406ed406f8e6fa3efed9315609ffc33075f6)

Co-authored-by: Govind S Menokee <govindsmenokee@gmail.com>
2022-02-12 12:14:19 +05:30
Saqib Ansari
80944e666f
Merge pull request #29754 from resilient-tech/remove-format
chore: remove deprecated print format
2022-02-12 12:08:23 +05:30
Saqib Ansari
ef971e160a
Merge pull request #29729 from resilient-tech/allow_regional
fix: allow `regional_overrides` hook to be set in subsequent apps
2022-02-12 12:05:25 +05:30
Rucha Mahabal
961467c389
fix: revert removal of gratuity payment via salary slip (#29589) 2022-02-12 00:29:53 +05:30
Rucha Mahabal
fe37103dcb
Merge pull request #29711 from ruchamahabal/leave-policy-assgn-fixes 2022-02-11 21:24:07 +05:30
Rucha Mahabal
10ee2fbeac
Merge branch 'develop' into leave-policy-assgn-fixes 2022-02-11 21:00:49 +05:30
Rucha Mahabal
cbaadcf113 fix(test): reset test setup 2022-02-11 20:59:19 +05:30
Rucha Mahabal
9b0f9c3442 test: earned leave allocations based on DOJ 2022-02-11 20:08:01 +05:30
Deepesh Garg
86ef932979
Merge pull request #29756 from frappe/revert-29499-overseas_gst_tax
Revert "fix(India): Tax calculation for overseas suppliers"
2022-02-11 17:40:48 +05:30
Rucha Mahabal
51e6086829 chore: clean-up leave policy assignment tests 2022-02-11 17:40:20 +05:30
Deepesh Garg
ea20c63182
Revert "fix(India): Tax calculation for overseas suppliers" 2022-02-11 17:38:37 +05:30
rohitwaghchaure
ce79434a9b
Merge pull request #29736 from rohitwaghchaure/performance-issue-while-making-wo
fix: time out error while making work orders from production plan
2022-02-11 16:12:21 +05:30
Sagar Vora
d93d2a80b1 chore: remove deprecated print format 2022-02-11 15:21:17 +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
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
barredterra
5811d9e318 fix: encode filters for URI 2022-02-09 17:53:33 +01: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
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
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