Anoop
5e16ca0326
fix: Login page doesn't load for new sites ( #22388 )
...
* fix: Login page doesn't load for new sites
Login page broken as active domains are not set for new sites
* Update footer_powered.html
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-06-23 11:11:13 +05:30
Anurag Mishra
101d15f2f8
fix: not working without from_amount and percentage_deduction ( #22380 )
2020-06-23 10:45:54 +05:30
Anurag Mishra
36560c8406
fix: staffing Plan validation ( #22379 )
2020-06-23 10:44:33 +05:30
mergify[bot]
ca8894b0fc
fix: alternative item not working for subcontract ( #22386 )
...
(cherry picked from commit 171699537c3e7d7632f45123c6d30012c8de7281)
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
2020-06-23 10:42:32 +05:30
Marica
3dee5273d6
fix: Update Packed Items via Update Items in SO ( #22392 )
2020-06-23 10:33:47 +05:30
Marica
bd5c8573de
fix: Unable to create batched Item ( #22393 )
2020-06-23 10:32:51 +05:30
Deepesh Garg
7cc1cf36ca
feat: More controlled deferred revenue booking ( #21671 )
...
* feat: More controller deferred revenue booking
* fix: Query for last gl entry
* fix: Accounting Dimension for Deferred entries
* fix: Deferred revenue booking against paid invoices
* fix: Don not update outstanding on Deferred Entry submission
* fix: Naming fixes
* feat: Deferred revenue/expense booking based on months
* fix: Test case for fix monthly deferred revenue booking
* fix: Typo
* fix: Patch to update settings
* fix: Test case to book deferred expense via journal entry
* fix: Update field for better UX
* fix: Codacy
* fix: Change select field to checkbox
2020-06-23 09:57:56 +05:30
Raffael Meyer
c3e91be48e
Merge branch 'develop' into refactor_datev
2020-06-22 19:53:47 +02:00
Suraj Shetty
c753502412
Merge branch 'develop' into patch-1
2020-06-22 21:41:31 +05:30
rohitwaghchaure
b658a010f1
Merge pull request #22383 from frappe/mergify/bp/develop/pr-22330
...
fix(pricing_rule): apply_on logic dont get cleanup (bp #22330 )
2020-06-22 21:08:55 +05:30
Deepesh Garg
49f51f4132
Merge pull request #22346 from AfshanKhan/ISS_20_21_02455
...
fix: set row_id by default as previous row for On Previous Row Amount and On Previous Row Total
2020-06-22 20:53:23 +05:30
Rohit Waghchaure
aaed3b988f
added validation and clear fields for Apply Rule On Other
...
(cherry picked from commit ebbbc85fc0f9aa418163f8344d3a234ecbe08488)
2020-06-22 14:52:30 +00:00
Poranut Chollavorn
e3973a4730
fix(pricing_rule): apply_on logic dont get cleanup
...
(cherry picked from commit acf399c4e0c74458c17866be7d72788aeecbe829)
2020-06-22 14:52:29 +00:00
Deepesh Garg
5dc175f068
fix(Immutable Ledger): Item wise backdated stock entry posting ( #22366 )
...
* fix(Immutable Ledger): Item wise backdated stock entry posting
* fix: Remove fiscal year query
* fix: Update message string
2020-06-22 19:05:39 +05:30
Deepesh Garg
c914d1b8e8
Merge branch 'develop' into ISS_20_21_02455
2020-06-22 18:46:58 +05:30
Anupam Kumar
71da90034d
fix: resetting lost reason in opportunity and quotation ( #22378 )
2020-06-22 18:27:14 +05:30
Deepesh Garg
be4fc1a78e
fix(UX): Notify user of expense account change in Purchase Invoice ( #22193 )
2020-06-22 18:03:11 +05:30
Anurag Mishra
7672166ce3
fix: Wrong filter ( #22375 )
2020-06-22 17:22:05 +05:30
Anurag Mishra
0093b3b27c
fix: label ( #22377 )
2020-06-22 17:21:01 +05:30
Deepesh Garg
0252cb6789
Merge pull request #22374 from deepeshgarg007/employee_advance_cancel
...
fix: Unable to cancel employee advance
2020-06-22 14:55:21 +05:30
Deepesh Garg
62897d3878
fix: Unable to cancel employee advance
2020-06-22 14:54:01 +05:30
Anurag Mishra
8ffb9f852f
fix: patch check_is_income_tax_component ( #22371 )
2020-06-22 12:17:29 +05:30
rohitwaghchaure
39a7516252
Merge pull request #22241 from deepeshgarg007/cost_center_fix
...
fix: Minor fixes in cost center
2020-06-22 11:21:14 +05:30
Alvaro
43be163b32
feat: Enabled translation on html files in LMS [Proposal] ( #21582 )
...
* :fix: translation fix for html files in LMS
* fix: typo in translation
* Update content.html
* Update content.html
* Update profile.html
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-06-22 11:06:12 +05:30
Deepesh Garg
ded3ab1cd7
fix: Test Cases
2020-06-22 09:40:15 +05:30
Deepesh Garg
7f94765d02
Merge pull request #22350 from AfshanKhan/ISS_20_21_02392
...
fix: Skipping total row for tree-view reports
2020-06-21 19:25:59 +05:30
Afshan
84c6973742
fix: adding json for checked add total row
2020-06-21 17:48:44 +05:30
Deepesh Garg
95a497cffb
Merge branch 'develop' of https://github.com/frappe/erpnext into cost_center_fix
2020-06-20 12:33:41 +05:30
Deepesh Garg
bef80b7981
fix: Test
2020-06-20 12:32:30 +05:30
Deepesh Garg
dee1c92df1
Merge pull request #22351 from kennethsequeira/purchase_inv_due
...
fix: status error in purchase invoice
2020-06-20 11:58:19 +05:30
Deepesh Garg
c70eb30e7e
Merge branch 'develop' of https://github.com/frappe/erpnext into grn_posting
2020-06-20 11:56:25 +05:30
Deepesh Garg
53d5d16abb
fix: Move check from Stock Settings to Company Master
2020-06-20 11:55:56 +05:30
Afshan
3fbe6e9e4b
fix: test case
2020-06-19 22:51:52 +05:30
Kenneth Sequeira
b7c8037e9a
fix codacy
2020-06-19 22:33:51 +05:30
Anurag Mishra
289c82243f
feat: New Payroll module ( #21990 )
...
* feat: Moved Document to Payroll Module
* feat: Moved Reports to Payroll Module
* feat: Moved Print fromat With Patch
* feat: Moved Notifiction to Payroll Module and patches
* feat: added dashboard and desk page to Payroll
* feat: Payroll Dashboard
* feat: Module onboarding
* feat: Income tax Deductions Report
* feat: Ecs Checklist Report
* feat: Provident Fund Report
* feat: Professional Fund report and commonified Code
* feat: Total Payments Based On Payment Mode Report
* fix: refactor and added chart Total Payments Based On Payment Mode
* feat: Payroll Settings
* fix: Bank remittance Report
* feat(Payroll based on): Considered unmarked days
* feat: Added Help for condition an formula in Salary structure
* fix: requested changes
* fix: rename report Ecs checklist to salary_payments_via_ecs
* fix: renamed report report/total_payments_based_on_payment_mode
* fix: added role via setup.py for regional report
* feat: added All reports to desk page
* fix: frappe.reload doc in all patches
* fix: codacy
* fix: frappe.reload_doctype for patches
* patch: is_income_tax_component and component_type for salary component
* fix: uncommented code
* test: fixture
* fix: test
* test: test_payment_days_based_on_attendance
2020-06-19 19:17:57 +05:30
Marica
47a4567301
Merge branch 'develop' into purchase_inv_due
2020-06-19 18:44:53 +05:30
Kenneth Sequeira
02f3e045ab
fix: due date filter in purchase invoice
2020-06-19 18:22:04 +05:30
Afshan
65f00cea15
fix: Skipping*
2020-06-19 18:19:06 +05:30
Afshan
fbd66574ad
Skiping total row for tree-view reports
2020-06-19 18:17:01 +05:30
Deepesh Garg
aea450c36a
Revert "fix: update remark on submitting payment entry"
2020-06-19 17:29:49 +05:30
Afshan
aca2ca5982
style: formate according to Codacy/PR Quality Review
2020-06-19 16:22:41 +05:30
Marica
383807f72e
feat: Selling Desk, Dashboard and Onboarding ( #22055 )
...
* feat: Selling Desk, Dashboard and Onboarding
* chore: Selling Onboarding and fixes in Other onboardings
* chore: Dashboard and Number card Fixtures
* fix: Escape filters and Reposition Accounts Dashboard shortcut.
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-06-19 15:33:21 +05:30
Afshan
0fe14ce94e
style: formate according to Codacy/PR Quality Review
2020-06-19 15:10:15 +05:30
Afshan
6f7652f425
fix: set row_id by default as previous row for On Previous Row Amount and On Previous Row Total
2020-06-19 14:36:56 +05:30
Afshan
7a45c8bc28
fix: replaced "row_id" to "idx" as "row_id" was not available in variable "tax", also replaced "-1" by "-2" as "idx" starts with 0 rather than 1
2020-06-19 12:37:50 +05:30
Deepesh Garg
163a569715
chore: Delete Bank Reco doctype
2020-06-19 12:03:36 +05:30
Deepesh Garg
23cb5e1869
Merge pull request #22312 from frappe/email-digest-html
...
fix: Email digest html view fix
2020-06-19 11:36:02 +05:30
Rucha Mahabal
428235c478
fix: revert issue metrics patch ( #22331 )
2020-06-19 11:15:59 +05:30
Afshan
a9cdc7b696
style: moved project from reference section to accounting dimensions section ( #22309 )
2020-06-19 11:11:33 +05:30
rohitwaghchaure
a504bdb448
Merge pull request #22329 from scmmishra/fix-grammar-footer
...
refactor: show service instead of services
2020-06-19 10:59:52 +05:30
rohitwaghchaure
ec2dec03cc
Merge pull request #22334 from kennethsequeira/item-sale-hist
...
fix: Customer Group label in Item-wise Sales History report
2020-06-19 10:53:09 +05:30
Kenneth Sequeira
766f978858
fix: Customer Group label in Itemwise Sales report
2020-06-18 23:23:54 +05:30
rohitwaghchaure
9d25826bbe
Merge pull request #22249 from marination/rfq-multi-uom
...
feat: Multi UOM support in Request for Quotation
2020-06-18 20:48:13 +05:30
Shivam Mishra
e892448733
Merge branch 'develop' into fix-grammar-footer
2020-06-18 14:21:03 +00:00
Shivam Mishra
25702a1c55
refactor: show service instead of services
2020-06-18 19:49:46 +05:30
Anurag Mishra
d9b2d635d8
feat: added Expense approver for employee and validation ( #22244 )
...
* feat: added Expense approver for employee nad validation
* fix: requested changes
2020-06-18 19:13:01 +05:30
Prssanna Desai
82ddef58c0
feat: date filter for fiscal year ( #21880 )
...
* feat: date filter for fiscal year
* fix: rename fieldtypes to valid_for_fieldtypes
* Update utils.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-06-18 18:18:41 +05:30
Anupam Kumar
77673e27e0
enable Lead create by email ( #22314 )
...
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
2020-06-18 17:46:20 +05:30
Deepesh Garg
bdb40553c3
Merge pull request #22323 from deepeshgarg007/item_tax_map
...
fix: Do not copy Item Tax template from SO to PO
2020-06-18 17:01:53 +05:30
Deepesh Garg
1ba7708b60
fix: Do not copy Item Tax template from SO to PO
2020-06-18 16:45:16 +05:30
rohitwaghchaure
b5af614824
Merge pull request #22219 from Anurag810/quality_procedure_fix
...
fix: Child is shown in Parent process if added from tree view
2020-06-18 15:51:00 +05:30
rohitwaghchaure
853fce8c7e
Merge branch 'develop' into rfq-multi-uom
2020-06-18 15:49:53 +05:30
rohitwaghchaure
b7a2f8731f
Merge pull request #22048 from nextchamp-saqib/update-items-permission-fix
...
fix: submitted sales order can be updated with no permission
2020-06-18 15:47:12 +05:30
rohitwaghchaure
f1cbe89496
Merge pull request #22086 from deepeshgarg007/rcm_develop
...
fix(India): Reverse charge mechanism for GST
2020-06-18 15:46:42 +05:30
Rucha Mahabal
a529d71ca0
fix(patch): add patch for setting issue metrics ( #22296 )
...
* patch: set issue metrics in Issue documents
* fix: commit after every 100 records
2020-06-18 15:38:43 +05:30
Shivam Mishra
34d2bfbb3e
refactor: handle exceptions when updating addresses ( #22307 )
...
* refactor: handle exceptions when updating addresses
* refactor: fold common statements in a loop
2020-06-18 15:28:55 +05:30
Marica
d6906dccfe
Merge branch 'develop' into rfq-multi-uom
2020-06-18 14:44:46 +05:30
marination
95e9a4ef2c
fix: Patch simplification
...
- Also, apply patch to all docs
2020-06-18 14:46:42 +05:30
Anupam K
bd449c8d07
email digest html fix
2020-06-18 14:20:22 +05:30
Rohit Waghchaure
8d5380a2f0
fix: incorrect variable used
2020-06-18 14:06:31 +05:30
Chinmay Pai
96100e9507
chore: add standard queries hooks to whitelist ( #21939 )
...
standard queries are used within the search widget, and now require to
be whitelisted before they can be executed through the search widget.
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
Co-authored-by: sahil28297 <37302950+sahil28297@users.noreply.github.com>
2020-06-18 11:58:54 +05:30
Deepesh Garg
8db89bfab6
Merge pull request #22210 from abhishekbalam/customer_acq_revenue_fix
...
fix: Revenue and Customer Count only in date range in Customer Acq. Report
2020-06-18 11:55:09 +05:30
marination
24ee482d8f
fix: Codacy
2020-06-18 11:49:15 +05:30
Afshan
ea78b24035
style: subtitle to be displayed if provided else empty ( #22298 )
...
* added: /support
* refactor code and implemented fail checks
* removed unused imports
* changed filter from from title to name
* refactor code to move context inside main
* removed unused variable
* added: /support
* refactor code and implemented fail checks
* removed unused imports
* changed filter from from title to name
* refactor code to move context inside main
* removed unused variable
* refactor: renamed set to get
* style: subtitle to be displyed if provided else empty
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
2020-06-18 09:49:35 +05:30
Mangesh-Khairnar
53b601523b
fix: update shopify api version ( #22284 )
...
Co-authored-by: Saurabh <saurabh@erpnext.com>
2020-06-17 19:31:57 +05:30
Marica
7bc9352546
Merge branch 'develop' into variant-error-msg
2020-06-17 19:22:49 +05:30
marination
91dfd000ed
fix: Typo
2020-06-17 19:05:40 +05:30
Shivam Mishra
64d772480b
fix: limit max length for cards ( #22289 )
2020-06-17 18:48:15 +05:30
Shivam Mishra
6e231ae0cb
refactor: remove translation
2020-06-17 18:43:59 +05:30
Shivam Mishra
2462f07c87
refactor: update titles
2020-06-17 18:39:49 +05:30
Shivam Mishra
2b18bdfe72
fix: title for support
2020-06-17 18:36:51 +05:30
marination
b9c38a13d1
chore: Remove unnecessary get_doc
2020-06-17 18:36:12 +05:30
Shivam Mishra
7057a807ca
refactor: minor layout fixes to portal
2020-06-17 18:35:38 +05:30
marination
8b19d01d57
fix: Quality Procedure Fixes
...
- Dont prompt error message if parent is the same in child
- filter child procedure field
- Disable New button in tree view
- Editable grid for Quality Procedure Proces table.
2020-06-17 18:35:27 +05:30
Marica
5f3cdce353
Merge branch 'develop' into quality_procedure_fix
2020-06-17 18:27:04 +05:30
Kaviya Periyasamy
fec894f530
fix: modified time updated with the latest date ( #22286 )
2020-06-17 17:39:12 +05:30
Abhishek Balam
a4cd9e2389
use getdate() for comparing dates
2020-06-17 17:13:13 +05:30
Afshan
8546b71358
feat: /support ( #22194 )
...
* added: /support
* refactor code and implemented fail checks
* removed unused imports
* changed filter from from title to name
* refactor code to move context inside main
* removed unused variable
* added: /support
* refactor code and implemented fail checks
* removed unused imports
* changed filter from from title to name
* refactor code to move context inside main
* removed unused variable
* refactor: renamed set to get
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
2020-06-17 16:16:59 +05:30
Deepesh Garg
179365683f
Merge pull request #22265 from frappe/edu-academic-term-validation
...
fix: Adding filter in academic term
2020-06-17 15:34:47 +05:30
Deepesh Garg
0511e8cc03
Merge branch 'develop' into rcm_develop
2020-06-17 15:33:29 +05:30
marination
17422a3e45
fix: Message Formatting
2020-06-17 14:00:45 +05:30
Marica
6e751440cf
Merge branch 'develop' into quality_procedure_fix
2020-06-17 13:49:46 +05:30
Anupam Kumar
c6592c880a
fix: Student Admission ( #22255 )
...
* Student Admission fix
* adding check for application
* adding check for application
* updating error message
* added date_diff for date comparision
2020-06-17 12:38:31 +05:30
rohitwaghchaure
67022b2d15
Merge pull request #22275 from frappe/mergify/bp/develop/pr-22267
...
refactor: hide company currency fields in the routing (bp #22267 )
2020-06-17 12:27:40 +05:30
Anupam K
8d4ba6c7ec
Adding filter in academic term
2020-06-17 11:48:15 +05:30
Anupam Kumar
0a3c34de01
address label chages ( #22137 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-06-17 10:53:13 +05:30
rohitwaghchaure
8d856659af
refactor: hide company currency fields in the routing ( #22267 )
...
(cherry picked from commit fd3ff6be18b0bd5accc88aea22e3adfe48e62aff)
2020-06-17 05:22:45 +00:00
Kenneth Sequeira
c159556c24
fix: typo for language in Terms description ( #22270 )
2020-06-17 09:34:58 +05:30
Anurag Mishra
58831ecc7d
fix(HR): wrong shortcut in desk page ( #22269 )
2020-06-16 19:23:52 +05:30
Marica
74f34c2ee3
Merge branch 'develop' into update-items-permission-fix
2020-06-16 17:18:33 +05:30
rohitwaghchaure
64c0e8f325
Merge pull request #22257 from rohitwaghchaure/fixed-travis-for-develop-branch
...
fix: travis for develop
2020-06-16 12:38:10 +05:30
Rohit Waghchaure
fa6e4f62e2
fix: travis for develop
2020-06-16 12:02:58 +05:30
Marica
2112834743
fix: Handle unavailable Variants in Website ( #22195 )
...
* fix: Handle unavailable Variants in Website
* fix: Fetch cart setting from argument
2020-06-16 00:20:57 +05:30
marination
87dafb4d70
Merge branch 'develop' of https://github.com/frappe/erpnext into rfq-multi-uom
2020-06-15 17:44:04 +05:30
marination
ae862c993b
feat: Multi UOM support in Request for Quotation
2020-06-15 17:38:47 +05:30
rohitwaghchaure
d8683d381b
Merge pull request #22205 from deepeshgarg007/fiscal_year_travis
...
fix: Travis(develop)
2020-06-15 16:12:10 +05:30
Deepesh Garg
a66ce050ff
fix: Minor fixes in loan
2020-06-15 16:03:12 +05:30
rohitwaghchaure
75366ebaec
Merge pull request #22243 from Anurag810/expense-claim-standard-filter-fix
...
fix: added some standard filters in expense claim
2020-06-15 15:36:37 +05:30
rohitwaghchaure
21a95e1327
Merge pull request #22242 from Anurag810/employee_fix
...
fix(hr): allow to enter Relieving date if status = Left
2020-06-15 15:35:22 +05:30
Deepesh Garg
c2496a3600
fix: Asset maintenance test
2020-06-15 15:18:49 +05:30
Rucha Mahabal
b8b11bb8ea
Merge branch 'develop' into sla-enhancements
2020-06-15 15:11:40 +05:30
marination
8a0058787e
fix: Wrong key sent to gte_valuation_rate
2020-06-15 14:40:39 +05:30
Rucha Mahabal
096792791b
fix(patch): reload child tables
2020-06-15 14:07:06 +05:30
Rucha Mahabal
30487bd854
fix: codacy issues
2020-06-15 13:49:58 +05:30
P-Froggy
2957a631db
fix: Validation of Purchase Order against Material Request missing ( #22192 )
...
Validation of Purchase Order and Purchase Order Item against the linked Material Request Item was missing, so it was possible to exchange items in the purcahse order against others and still fullfill the material request.
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-06-15 13:41:16 +05:30
Rucha Mahabal
bf26b10df4
Merge branch 'develop' into sla-enhancements
2020-06-15 13:15:03 +05:30
Anurag Mishra
45b6fed029
fix: added some standard filters in expense cliam
2020-06-15 12:44:55 +05:30
Anurag Mishra
a2cf79da0f
fix: allow to enter Releaving date if status = Left
2020-06-15 12:28:31 +05:30
Deepesh Garg
0d880079b1
fix: Validation for group cost center
2020-06-15 12:23:24 +05:30
marination
8d68ba37bb
Merge branch 'update-items-permission-fix' of https://github.com/nextchamp-saqib/erpnext into update-items-permission-fix
2020-06-15 12:18:16 +05:30
marination
b7e94cc742
fix: Travis
2020-06-15 12:16:30 +05:30
Deepesh Garg
817cbc4b48
fix: Minor fixes in cost center
2020-06-15 12:07:04 +05:30
Marica
7dd92f15fa
Merge branch 'develop' into update-items-permission-fix
2020-06-15 11:44:59 +05:30
marination
359e934cd2
fix: Travis
2020-06-15 11:44:29 +05:30
Abhishek Balam
6c4a24a6c3
cleanup
2020-06-15 11:36:56 +05:30
Abhishek Balam
1a28227daa
fix merge conflict
2020-06-15 10:58:51 +05:30
Deepesh Garg
11253a91f1
Merge pull request #22199 from marination/qi-on-return
...
fix: Don't prompt for Quality Inspection on Return Documents.
2020-06-14 17:09:51 +05:30
rohitwaghchaure
25f49d59c5
Merge pull request #22233 from deepeshgarg007/pi_billing_address
...
fix: Billing address in for Purchase documents
2020-06-14 15:10:43 +05:30
rohitwaghchaure
c5a2803a1c
Merge pull request #22239 from rohitwaghchaure/item-none-not-found-opening-creation-tool-develop
...
fix: item none not found while making sales invoice using opening inv…
2020-06-14 15:09:38 +05:30
Rohit Waghchaure
d6f9a51cbb
fix: item none not found while making sales invoice using opening invoice creation tool
2020-06-14 14:46:49 +05:30
Deepesh Garg
5bf6bec656
fix: Consider Overseas category in RCM
2020-06-14 13:18:08 +05:30
Anupam K
234b5f9a8c
sm-post-permission-fix
2020-06-14 10:34:58 +05:30
Anupam K
c2d1ed7a34
Merge branch 'develop' of https://github.com/frappe/erpnext into opportunity-dashboard
2020-06-14 00:09:45 +05:30
Anupam K
65e7a2e7a6
opportunity-dashboard-fix
2020-06-14 00:05:38 +05:30
Deepesh Garg
3a16b033b6
Merge branch 'develop' of https://github.com/frappe/erpnext into rcm_develop
2020-06-13 22:50:14 +05:30
Deepesh Garg
6760077674
fix: Billing address in for Purchase documents
2020-06-13 22:40:23 +05:30
Deepesh Garg
dcdd1f3d9b
Merge pull request #22227 from frappe/opportunity-dashboard
...
fix: Links in opportunity dashboard
2020-06-13 22:16:10 +05:30
Deepesh Garg
5f4330621c
Merge pull request #22231 from deepeshgarg007/financila_satement_immutable
...
fix: Handle cancelled entries in financial statements
2020-06-13 21:19:20 +05:30
Deepesh Garg
cc4943d54d
fix: Distributed cost center query updation
2020-06-13 21:13:52 +05:30
Deepesh Garg
d80d442aa1
fix: Do not select cancelled entries in financial statements
2020-06-13 21:12:19 +05:30
Deepesh Garg
f3261794d9
Merge pull request #22230 from deepeshgarg007/financial_statement_to_date_v13
...
fix: Data not appearing properly for some fiscal_year in financial statements
2020-06-13 19:27:38 +05:30
Deepesh Garg
15231aa60d
fix: Data not appearing properly for some fiscal_year in financial statemets
2020-06-13 19:26:39 +05:30
Anupam K
8bc414620b
opportunity-dashboard-fix
2020-06-13 13:11:43 +05:30
Anurag Mishra
5b8a47d072
fix: patch for expense claim ( #22226 )
2020-06-13 01:04:32 +05:30
Deepesh Garg
28fecb1b29
Merge pull request #22198 from scmmishra/membership-fixes
...
fix: verification for razorpay hooks
2020-06-12 21:28:07 +05:30
John Clarke
15e4ea0472
Merge branch 'develop' into clarkejj-patch-1
2020-06-12 07:55:49 -06:00
John Clarke
85f237257a
Thanks so much for your pointer Marica - that violation is clear and obvious to me in retrospect, but a good relearning experience in any case
2020-06-12 07:22:14 -06:00
Deepesh Garg
c258ac82c5
feat: Accounting entries for service item in Purchase receipt
2020-06-12 18:33:42 +05:30
Anurag Mishra
7558e64d6d
fix: set_query in leave application ( #22197 )
2020-06-12 17:37:59 +05:30
John Clarke
677978dd00
Update stock_ageing.py
...
As reviewer Deepesh Garg advised thanks! batch[0] can be int of float - see line 49 - so change proposed cint to flt
2020-06-12 05:53:24 -06:00