marination
|
e33b9628d3
|
Merge branch 'batch-source-reference' of https://github.com/marination/erpnext into batch-source-reference
|
2020-09-03 14:42:05 +05:30 |
|
marination
|
44717e3b4a
|
fix: Item Alternative Test
|
2020-09-03 14:41:05 +05:30 |
|
Marica
|
1dbffa6ccc
|
Merge branch 'version-12-hotfix' into batch-source-reference
|
2020-09-02 20:24:07 +05:30 |
|
marination
|
9b6326f5d4
|
chore: Tests for Stock Reconciliation
|
2020-09-02 19:21:16 +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 |
|
marination
|
6b785cf522
|
chore: Tests for Stock Entry
|
2020-09-02 15:45:02 +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 |
|
marination
|
eab2d25c6a
|
fix: Unlink and delete batch created from stock reco on cancel
|
2020-08-27 20:34:51 +05:30 |
|
Rucha Mahabal
|
00dbbc9f5c
|
fix: BOM Update Tool failing due to Too Many Writes error
|
2020-08-27 19:00:07 +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 |
|
Michelle Alva
|
deb741bea5
|
fix:Add Delivery Note link in Sales Invoice Dashboard
|
2020-08-25 21:00:41 +05:30 |
|
Saurabh
|
1c19050aa4
|
Merge pull request #23160 from rohitwaghchaure/pricing-rule-not-working-js-side
fix: mixed condition pricing rule not working on js side
|
2020-08-25 19:40:54 +05:30 |
|
Rohit Waghchaure
|
62876c708b
|
fix: mixed condition pricing rule not working on js side
|
2020-08-25 18:32:46 +05:30 |
|
Rucha Mahabal
|
3fc00a5bfe
|
fix: conversion factor for BOM exploded item rate
|
2020-08-25 18:09:14 +05:30 |
|
Saurabh
|
9aa230c1b8
|
Merge pull request #23146 from rohitwaghchaure/pricing-rule-encoding-hotfix
fix(hot): Pricing Rule encoding fixed
|
2020-08-25 17:19:17 +05:30 |
|
Rohit Waghchaure
|
d223d4b829
|
fix(hot): Pricing Rule encoding fixed
|
2020-08-25 16:18:44 +05:30 |
|
rohitwaghchaure
|
51c29cafee
|
Merge pull request #23082 from ruchamahabal/fix-pos-print-v12
fix: Print Language for Customer not set for POS Invoice
|
2020-08-24 16:11:26 +05:30 |
|
rohitwaghchaure
|
6594d127cb
|
Merge pull request #23113 from wojosc/patch-12
refactor: allow to rename lead
|
2020-08-24 16:09:14 +05:30 |
|
rohitwaghchaure
|
65d16d1ef6
|
Merge pull request #23117 from nabinhait/subcontracted-pr-gle-v12
fix: GLE for subcontracted PR is fg item rate is zero
|
2020-08-24 16:06:59 +05:30 |
|
Deepesh Garg
|
9b4cc0b6e9
|
fix: Update paid amount for pos return (#20543)
* fix: Paid amount updation for pos return
* fix: Remove console
* fix: Styling
* fix: get default mode of payment from POS profile
* fix: Add test cases
* fix: Codacy
|
2020-08-24 15:01:57 +05:30 |
|
Nabin Hait
|
a82d9d3182
|
test: Test case for GLE in subcontracted PR if FG item rate is zero
|
2020-08-22 20:07:19 +05:30 |
|
Nabin Hait
|
98fda4b8c3
|
fix: GLE for subcontracted PR is fg item rate is zero
|
2020-08-22 20:07:05 +05:30 |
|
Wolfram Schmidt
|
572d150925
|
Update lead_source.json
as requested in https://github.com/frappe/erpnext/pull/22872
|
2020-08-21 20:02:29 +02:00 |
|