nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-18 00:48:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,719 Commits 607 Branches 1,799 Tags
47c535399c09cb45f9acafe7626f39bf9d9cded4
Commit Graph

30719 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
47c535399c fix: Check if subscription is already created for current invoicing period (#23143) 
* fix: Check if subscription is already created for current invoicing period

* fix: Test for duplicate subscription

* fix: invoice generation at the begining of period fix

* fix: invoice generation at the begining of period fix

* fix: Remove unwanted file

* fix: Generate new invoices even though current invoices are unpaid

* fix: Make invoices table read-only

* fix: Update test cases
 2020-09-08 10:30:02 +05:30
rohitwaghchaure
b06c618585 Merge pull request #23247 from Anurag810/attendance_calendar_map_v12 
fix: Attendance calendar map fix
 2020-09-08 10:15:01 +05:30
rohitwaghchaure
8dd72018c2 Merge pull request #23262 from rohitwaghchaure/not-able-to-make-material-request-from-so 
fix: not able to make material request from SO
 2020-09-06 20:49:03 +05:30
rohitwaghchaure
b2bf54cc33 Merge pull request #23260 from anupamvs/se-quantity-v12 
fix: SE quantity data type issue
 2020-09-04 16:07:32 +05:30
Rohit Waghchaure
4f3eb3fceb fix: not able to make material request from SO 2020-09-04 15:24:56 +05:30
Anupam K
9260cf11b6 fix: SE quantity data type issue 2020-09-04 15:10:50 +05:30
Deepesh Garg
84077676f7 Merge pull request #23254 from anupamvs/profit-loss-fix 
fix: profit and loss report not working
 2020-09-04 13:23:57 +05:30
Anupam K
5519824414 fix: profit and loss report not working 2020-09-04 11:09:26 +05:30
Deepesh Garg
cce13aaa65 Merge pull request #23252 from deepeshgarg007/hsn_wise_summary 
fix: Stock qty in HSN wise outward summary
 2020-09-03 21:29:58 +05:30
Deepesh Garg
b78d35ae1d fix: Stock qty in HSN wise outward summary 2020-09-03 21:16:31 +05:30
Marica
4a67da2b0b Merge pull request #23246 from marination/item-tax-query-fix 
fix: Misleading filters on Item tax Template Link field
 2020-09-03 17:51:42 +05:30
Anurag Mishra
053fdd91da fix: data was not properly maped 2020-09-03 17:11:59 +05:30
marination
c407bb2385 fix: Misleading filters on Item tax Template Link field 2020-09-03 16:54:43 +05:30
Marica
271c550e96 Merge pull request #23244 from marination/purchase-over-receipt-subcontracted-hotfix 
fix: Raise Error on over receipt/consumption for sub-contracted PR
 2020-09-03 16:45:13 +05:30
marination
8781e77132 fix: Test for Over Receipt via PRs on a PO 2020-09-03 15:48:18 +05:30
marination
5c1f11e561 fix: Raise Error on over receipt/consumption for sub-contrcated PR 2020-09-03 15:47:38 +05:30
rohitwaghchaure
e212537a5f Merge pull request #23186 from rohitwaghchaure/incorrect-stock-balance-issue-for-batched-item 
fix: Incorrect stock balance issue for batched item
 2020-09-03 15:02:38 +05:30
rohitwaghchaure
bd70dd02c1 Merge pull request #23236 from rohitwaghchaure/fix-pos-special-char-escape-issue 
fix: pos item name special character issue
 2020-09-02 17:20:43 +05:30
Rohit Waghchaure
f30181527f fix: pos item name special character issue 2020-09-02 17:08:28 +05:30
rohitwaghchaure
ba867d48f7 Merge pull request #23020 from prssanna/gross-profit-total-v12 
feat: enable total row in Gross Profit Report
 2020-09-02 12:17:33 +05:30
rohitwaghchaure
a0099a3c63 Merge pull request #23124 from ruchamahabal/fix-pos-return 
fix: Update paid amount for pos return (#20543)
 2020-09-02 12:16:25 +05:30
Marica
3992ddedd0 fix: General Ledger filter validation (#23230) 2020-09-02 11:10:46 +05:30
Shivam Mishra
457a909784 fix: events not deleted on cancelling maintenance schedule (#23219) 
* feat: add participant to event_participant child table

* feat: add tests

* chore: update function name

Co-authored-by: Marica <maricadsouza221197@gmail.com>

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-09-01 16:30:34 +05:30
Marica
96882f599e Merge pull request #23206 from marination/party-details-hotfix 
fix: Check for Company before trying to fetch party details
 2020-09-01 16:29:43 +05:30
Marica
c50b296f2d Merge branch 'version-12-hotfix' into party-details-hotfix 2020-09-01 15:36:26 +05:30
Marica
05a90baddd fix: Don't overwrite doctype while setting attributes in child row (#23228) 2020-09-01 15:29:27 +05:30
rohitwaghchaure
14ea8928f5 Merge pull request #23226 from rohitwaghchaure/fixed-job-card-time-log-issue 
fix: incorrect job card timer issue
 2020-09-01 14:08:29 +05:30
Rohit Waghchaure
ee4e725b37 fix: incorrect job card timer issue 2020-09-01 14:02:34 +05:30
Afshan
ab6f761753 fix:reverse journal entry (#23224) 2020-08-31 22:01:54 +05:30
Rucha Mahabal
b574353c00 fix(Payroll Entry): Set cost center for payroll payable account (#23223) 2020-08-31 20:09:48 +05:30
Deepesh Garg
3bf5820236 Merge pull request #23081 from deepeshgarg007/hsn_wise_json_v12_hotfix 
feat: JSON download for HSN wise outward summary
 2020-08-31 17:15:45 +05:30
Marica
0ff376fa4a fix: Better error feedback on creating SO from Quotation (#23214) 2020-08-31 13:54:10 +05:30
rohitwaghchaure
dc8de013c9 Merge pull request #23215 from rohitwaghchaure/fixed-different-workstation-not-update-qty 
fix: incorrect completed qty against operation in work order if workstation is different in job card
 2020-08-31 13:29:44 +05:30
Rohit Waghchaure
b73879056f fix: incorrect completed qty against operation in work order if workstation is different in job card 2020-08-31 12:27:49 +05:30
rohitwaghchaure
a2c4cc1252 Merge pull request #23126 from rohitwaghchaure/multi-operation-job-card-issue 
fix: user created manual job card not linking job card operation with work order operation
 2020-08-31 11:52:20 +05:30
marination
17a3af47d9 fix: Check for Company before trying to fetch party details 2020-08-29 19:28:51 +05:30
Rohit Waghchaure
e352706330 fix: user created manual job card not linking job card operations with work order operations 2020-08-28 12:29:27 +05:30
rohitwaghchaure
8dc7a43cc9 Merge pull request #23169 from ruchamahabal/fix-appointment-duration-v12 
fix: don't overwrite patient appointment duration if already specified
 2020-08-28 10:39:59 +05:30
rohitwaghchaure
aa795efe15 Merge pull request #23171 from anupamvs/product-contact-us 
feat: Added phone field in product Inquiry
 2020-08-28 10:38:07 +05:30
rohitwaghchaure
89d1990d79 Merge pull request #23179 from marination/pricing-rule-missing-fix-version-12-hotfix 
fix: Pricing rule encoding missing line
 2020-08-28 10:36:24 +05:30
rohitwaghchaure
c8f695c0da Merge pull request #23191 from ruchamahabal/fix-bom-update-v12 
fix: BOM Update Tool failing due to Too Many Writes error
 2020-08-28 10:35:47 +05:30
Rucha Mahabal
00dbbc9f5c fix: BOM Update Tool failing due to Too Many Writes error 2020-08-27 19:00:07 +05:30
Rohit Waghchaure
09cb0f33b2 added test cases 2020-08-27 14:57:37 +05:30
Rohit Waghchaure
dcd80a3f48 fix: incorrect stock balance issue 2020-08-27 13:24:33 +05:30
marination
4cce4a7712 fix: get_applied_pricing_rule in taxes_and_totals 2020-08-26 20:18:37 +05:30
Rucha Mahabal
a3907e1329 fix: don't overwrite appointment duration if already specified 2020-08-26 15:15:05 +05:30
Anupam K
759282651b feat: Added phone field in product Inquiry 2020-08-26 14:23:56 +05:30
rohitwaghchaure
3bae6328c5 Merge pull request #23153 from ruchamahabal/fix-conversion-factor-v12 
fix: conversion factor for BOM exploded item rate
 2020-08-26 13:02:48 +05:30
Deepesh Garg
45d615887a fix: Codacy fixes 2020-08-26 12:12:06 +05:30
Rucha Mahabal
ed6cbc1239 Merge pull request #23164 from frappe/michellealva-sales_invoice_dashboard 
fix: Add Delivery Note link in Sales Invoice Dashboard
 2020-08-25 21:09:50 +05:30