Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,936 Commits 3 Branches 0 Tags 1 GiB
a7ac01153e
Commit Graph

25798 Commits

Author SHA1 Message Date
prssanna
1d346702ed chore: add .stylelintrc file 2021-02-01 19:07:32 +05:30
prssanna
7863118994 fix: docs link for store page in shopping cart settings 2021-02-01 18:57:30 +05:30
Saqib Ansari
cee3670167 chore: clean up sales invoice form 2021-02-01 15:45:26 +05:30
Suraj Shetty
13d48a0c20 Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui 2021-02-01 15:11:07 +05:30
Suraj Shetty
055b81da7b Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-02-01 15:10:52 +05:30
Saqib
beebaf6e1e
refactor: assets form cleanup with rebrand ui (#24494) 2021-02-01 11:22:57 +05:30
Deepesh Garg
ab88ec208e fix: Error handling in loan reports 2021-01-31 12:31:46 +05:30
prssanna
2aebf99968 fix: add removed get_employee_emails function 2021-01-29 15:55:21 +05:30
Saqib
fb75f0935f
Merge branch 'develop' into tcs_calculation 2021-01-29 14:26:48 +05:30
Saqib
77d5f59376
fix: discount amount calculation on net total (#24497) 2021-01-29 14:24:08 +05:30
rohitwaghchaure
cf3e0cf271
Merge pull request #24365 from rohitwaghchaure/fixed-extra-trasnferred_qty_issue-develop 
fix: extra transferred qty has not consumed against work order
 2021-01-29 12:28:28 +05:30
Saqib Ansari
3b2327ba8d fix: sider 2021-01-29 12:08:35 +05:30
Suraj Shetty
0a8939e1c1 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-29 08:56:22 +05:30
Deepesh Garg
7e3f5e04ab fix: LTV ration in interest report 2021-01-28 23:25:23 +05:30
Saqib
675a8330a4
refactor: POS Invoice merging and cancellation (#24351) 
* feat: pos invoice merging with background jobs

* fix: invoice threshold for queueing job

* refactor: cancellation flow of point of sale

* feat: tests for cancellation of pos closing

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-01-28 18:42:43 +05:30
leela
3234df5581 feat: improved call log doctype 
* Added links and some more fields into Call Log Doctype
* Display call info in the call log link pages
 2021-01-28 18:34:58 +05:30
Saqib
62dfff5dde
Merge branch 'develop' into tcs_calculation 2021-01-28 18:08:13 +05:30
Saqib Ansari
4d9b6066a2 fix: tcs amount calculation 2021-01-28 18:07:08 +05:30
Saqib
ac9e6ff704
fix(pos): multiple pos fixes and additions (#24227) 
* fix: make custom fields in pos invoice similar to sales invoice

* feat: allow/disallow rate & discount change

* fix: any pos profile can be selected while creating pos opening

* fix: cannot add item to cart

* fix: validate phone payment only if payment request exists

* fix: replace pos payment method patch

* chore: rearrange item & customer group filter

* fix: allow/disallow invoice level discount

* fix: updating qty of item with uom having space char

* fix: move configuration checbox to config section

* fix: invalid item rate trigger

* fix: cannot remove item from draft invoices

* fix: customer currency not set in pos invoice

* fix: duplicate item error message

* fix: sales uom not fetched in pos invoice

* fix: cannot add taxes to pos invoice for uae region

* fix: cannot merge pos invoice into credit note

* fix: tax calculation while merging pos invoices

* feat: delete draft orders from order list

* fix: merging of pos invoice with pricing rules
 2021-01-28 17:58:55 +05:30
Anupam Kumar
0d9a8ae4d2
feat: shopping portal changes (#24445) 
* feat: shopping portal changes

* fix: review changes

* review changes
 2021-01-28 17:32:57 +05:30
Anupam
e6f925e5e6 review changes 2021-01-28 15:58:03 +05:30
Marica
56c6805d79
Merge branch 'develop' into fixed-extra-trasnferred_qty_issue-develop 2021-01-28 15:03:15 +05:30
Marica
9580adad0c
Merge branch 'develop' into project-naming-series-patch 2021-01-28 14:32:11 +05:30
Marica
7aa16bafff
Merge branch 'develop' into lcv_multicurrency 2021-01-28 13:29:36 +05:30
Deepesh Garg
b4be292217
fix: Item valuation for internal stock transfers (#24200) 
* fix: Item valuation for internal stocktransfers

* fix: Consider conversion factor for invoices

* fix: Add missing set warehouse fields

* fix: Add validations and other fixes

* fix: Fixes in flow

* fix: Internal sales item link in Purchase Invoice

* fix: Debugging

* fix: Debug travis

* fix: Remove commented code

* fix: Rate forcing in sales order

* fix: Unreallized profit in Sales Register

* fix: Item wise gst sales register fix

* fix: From warehouse in Purchase Order

* fix: Target field in Sales Invoice

* fix: remove self

* fix: GST Purchasse register and other fixes

* fix: Add shipping_address to no field map

* fix: Ref doc map

* fix: Test Cases

* fix: address mapping between sales and purchase document

* fix: Import Error

* fix: Tax updation for internal invoices

* fix: Purchase Order and Invoice linking

* fix: Internal Party validation fix

* fix: validation

* fix(india): GST Taxes for intra state transfer

* fix(india): GST Taxes for intra state transfer

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-01-28 13:09:56 +05:30
Marica
465974cff0
Merge branch 'develop' into project-naming-series-patch 2021-01-28 13:01:28 +05:30
Marica
ed6368d782
Merge pull request #24481 from marination/stock-entry-indicator 
chore: Set Stock Entry Form Indicators in setup
 2021-01-28 13:00:24 +05:30
Marica
9e11521764
Merge pull request #24466 from marination/stock-entry-qi 
fix: Always show QI Template in Item
 2021-01-28 12:45:49 +05:30
Mohamed Almubarak
f7ea340181
fix(template): cards on second row overlaps the one before (#23454) 
* Update macros.html

fix second row of cards overlapps with the one before

* Update macros.html

fix(template): second row of cards overlaps with the one before

* Update macros.html

fix(template): second row of cards overlaps with the one before
 2021-01-28 12:32:13 +05:30
Jannat Patel
9f8cbe9101
Material request wrong status issue (#24019) 
* fix: material request status fix

* fix: changing precision to global defaults for material request status

* fix: adding back the removed flt

* fix: sider issues fixed

Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
 2021-01-28 12:29:52 +05:30
Saqib
8e55677f10
feat: deleting account & stock entries on deletion of transaction (#24298) 
* feat: control for deleting account & stock entries on deletion of a transaction

* chore: change label & fieldname

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-01-28 12:26:45 +05:30
Jannat Patel
3914aca647
fix: check for tax rate (#24376) 2021-01-28 12:25:15 +05:30
Anurag Mishra
5756bf50e6
fix: removed all day event from shift assignment calendar (#24397) 
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-01-28 12:24:39 +05:30
Afshan
e5529ad461
fix: validate tax template for tax category (#24402) 
* fix: validate tax template for tax category

* Update sales_taxes_and_charges_template.py
 2021-01-28 12:22:39 +05:30
Raffael Meyer
f6f4376463
feat: remove german sales invoice validation (#24441) 
This can be better achieved via Customize Form
(mandatory and mandatory_depends_on)
 2021-01-28 12:16:26 +05:30
Marica
cc22814df5
Merge branch 'develop' into lcv_multicurrency 2021-01-28 12:15:09 +05:30
Marica
cdccf4be52
Merge branch 'develop' into stock-entry-qi 2021-01-28 12:12:03 +05:30
Deepesh Garg
16bcd01f6d
feat: Provision to disable serial no and batch selector (#24398) 
* feat: feat: Provision to disbale serial no and batch selector

* fix: Sider issues

* fix: Linting issues
 2021-01-28 12:09:35 +05:30
Deepesh Garg
bd9bdc5797
feat: Batch wise item pricing (#24470) 
* feat: Batch wise item pricing

* fix: Rate for items with no batch

* fix: Add test case for batch pricing

* fix: Sider Issues

* fix: Add item filter for batch
 2021-01-28 12:05:57 +05:30
marination
27bac2aaec fix: Missing semi-colon 2021-01-28 12:04:14 +05:30
pateljannat
55e7c5644c fix:rfq contact email set 2021-01-28 12:00:18 +05:30
marination
bc370b3ee5 chore: Set Stock Entry Form Indicators in setup 
- Makes it easier to override via customisations
- Style consistency with other forms that set indicator in setup as well
 2021-01-28 11:44:26 +05:30
Marica
ea7c2dbfaf
Merge branch 'develop' into stock-entry-qi 2021-01-28 11:31:43 +05:30
Saqib
31eb740aef
Merge branch 'develop' into tcs_calculation 2021-01-27 19:47:19 +05:30
Saqib Ansari
ae9a9a2167 fix: tcs chargable amount 2021-01-27 19:36:29 +05:30
Saqib Ansari
ff12f91486 feat: charging tcs on sales invoice 2021-01-27 19:17:38 +05:30
prssanna
74feaf85dc fix: website order page style 2021-01-27 17:41:15 +05:30
Saqib Ansari
6db14d02d2 fix: test 2021-01-27 17:11:34 +05:30
Saqib Ansari
58250aac10 feat: pan and tax withholding category fields for customer 2021-01-27 16:59:36 +05:30
Saqib Ansari
6f718a31f0 refactor: tax withholding category against customer 2021-01-27 16:59:07 +05:30
Afshan
907e2990d0
fix: remove function to get earning deduction components (#24465) 
* fix: remove function to get earning deduction components

* fix: slider
 2021-01-27 15:34:42 +05:30
Saqib
5ba2f58355
fix: e_invoice print format not showing other charges (#24474) 2021-01-27 12:34:08 +05:30
prssanna
2d1d900c88 Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-27 10:58:17 +05:30
prssanna
72053cc4ab fix: cart address overflow 2021-01-27 10:57:34 +05:30
Deepesh Garg
dade7a4583 fix: Translation Syntax 2021-01-26 21:11:55 +05:30
Deepesh Garg
a0d61524c1 fix: Add distribute manually option in LCV 2021-01-26 17:05:00 +05:30
Deepesh Garg
ff3adfd1cf
Merge pull request #24468 from deepeshgarg007/lse_report_fix 
fix: Division by 0 error in security exposure reports
 2021-01-26 10:13:39 +05:30
Deepesh Garg
7a4db2214a fix: Division by 0 error in security exposure reports 2021-01-26 10:10:35 +05:30
Deepesh Garg
224fdf34e4 Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency 2021-01-25 22:16:02 +05:30
Raffael Meyer
1991ba7910
feat: temporary against account (#24086) 
* feat: add temporaray against account nmber to datev settings

* feat: use temporary against account in datev report

* test: add temp against account number to test data

* test: include temp against aaccount in filters
 2021-01-25 21:22:10 +05:30
Marica
35455d2de6
Merge branch 'develop' into project-naming-series-patch 2021-01-25 21:16:02 +05:30
marination
b0ef8fb7c5 fix: Always show QI Template in Item 2021-01-25 21:00:24 +05:30
David Angulo
e1e4810a46 feat: Make patient age translateable 2021-01-25 08:29:11 -06:00
rohitwaghchaure
fa3ec3c346
Merge pull request #23969 from marination/putaway 
feat: Putaway
 2021-01-25 16:42:04 +05:30
Anupam
8541d9738f fix: review changes 2021-01-25 14:18:26 +05:30
Marica
62a1caf6c4
Merge branch 'develop' into lcv_multicurrency 2021-01-25 12:39:16 +05:30
Marica
ec4f42d4a9
Merge branch 'develop' into project-naming-series-patch 2021-01-25 11:29:23 +05:30
Deepesh Garg
164079127f
Merge pull request #24446 from deepeshgarg007/patch-fix-1-new 
fix: Project Template patch
 2021-01-25 10:37:43 +05:30
Deepesh Garg
befe32cbe1
Merge pull request #24456 from deepeshgarg007/ltv_in_report 
fix: Add loan to value field in Loan Interest Report
 2021-01-24 19:18:42 +05:30
Deepesh Garg
91eb9bb5c2 fix: Add loan to value field in Loan Interest Report 2021-01-24 19:15:57 +05:30
Kaviya Periyasamy
c680547be3
fix(einvoice): QRCode generation (#24412) 2021-01-24 10:59:37 +05:30
rohitwaghchaure
13df7a0ca6
Merge pull request #24033 from ruchamahabal/patient-history-enhancements 
feat: Patient History Enhancements
 2021-01-23 18:19:16 +05:30
Rucha Mahabal
ab920b55a7
Merge branch 'develop' into service-units-in-appointment 2021-01-23 13:27:03 +05:30
Rucha Mahabal
edf5da3394
Merge branch 'develop' into patient-history-enhancements 2021-01-23 13:26:36 +05:30
Rucha Mahabal
ee28328006
fix(travis): Issue Analytics Report Test (#24453) 2021-01-23 13:26:24 +05:30
Rucha Mahabal
6f4ad3b73d fix: sider 2021-01-23 12:52:41 +05:30
Rucha Mahabal
cb1da4d07c fix: doctype meta not loading while setting up fields 2021-01-22 19:26:56 +05:30
Marica
6b0d334d25
Merge pull request #24399 from pateljannat/item-wise-purchase-registry-item-name-error 
fix: Item wise purchase registry item_name error
 2021-01-22 19:20:51 +05:30
Deepesh Garg
5b4ece5054 fix: Update patch 2021-01-22 17:12:35 +05:30
marination
7ba60570e7 fix: Spaces to Tabs 2021-01-22 16:55:06 +05:30
marination
c908deea61 fix: Patch to Add Naming Series to old projects 2021-01-22 16:10:01 +05:30
Rucha Mahabal
75a93d9057 feat: fetch date field for custom doctypes 2021-01-22 15:51:25 +05:30
Afshan
217440952f fix: slider 2021-01-22 15:39:59 +05:30
Afshan
02d495f1fb fix: added query for fetching salary component 2021-01-22 15:39:59 +05:30
prssanna
2aa1efb70e fix: broken image style 2021-01-22 15:31:38 +05:30
Rucha Mahabal
6058ea88e8
fix: SLA not applied automatically when priority is missing (#24447) 2021-01-22 13:35:08 +05:30
Marica
5631d014a7
Merge branch 'develop' into item-wise-purchase-registry-item-name-error 2021-01-22 12:35:35 +05:30
Deepesh Garg
0d26d24164
Merge pull request #24414 from Alchez/dev-irs-1099-year 
fix: use supplied year for IRS 1099 forms
 2021-01-22 12:17:43 +05:30
Deepesh Garg
cf7209f3d4 fix: Project Template patch 2021-01-22 11:47:13 +05:30
Anupam
988ea8d61d feat: shopping portal changes 2021-01-22 10:53:50 +05:30
Jannat Patel
02a7af1e6c
fix: full form for opportunity in crm dashboard (#24436) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-01-22 10:03:29 +05:30
Rucha Mahabal
858ad20dd0
Merge branch 'develop' into service-units-in-appointment 2021-01-22 09:09:29 +05:30
Rucha Mahabal
7201498801
Merge branch 'develop' into patient-history-enhancements 2021-01-22 09:04:37 +05:30
Rucha Mahabal
b9a21c4824 feat: added search to the Select fields dialog in Patient History Settings 2021-01-22 09:00:40 +05:30
Rucha Mahabal
ded08245cc fix: duplicate filters added on patient change 2021-01-22 08:52:17 +05:30
rohitwaghchaure
3afc6b1333
Merge pull request #24437 from AfshanKhan/fix-stock-ageing 
fix: stock ageing should not take cancelled stock entries.
 2021-01-21 23:09:41 +05:30
Rucha Mahabal
7a21e40527
Merge branch 'develop' into membership-enhancements-2 2021-01-21 20:21:17 +05:30
Rucha Mahabal
02e424fae2 chore: Add description for settings 2021-01-21 20:16:17 +05:30
Rucha Mahabal
bcc0674d37 fix: test 2021-01-21 19:52:13 +05:30
Abhishek Balam
ea30e0a37d fix: change modified date 2021-01-21 19:38:37 +05:30
Abhishek Balam
ae3a9c1ead fix: remove payroll card from HR workspace 2021-01-21 19:33:19 +05:30
Suraj Shetty
f0ff23eac3 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-21 19:07:57 +05:30
Saqib
577d2bed6e
fix: failing einvoice test (#24434) 2021-01-21 18:43:55 +05:30
Suraj Shetty
bed55bb7ba fix: Use multisql to support postgres 2021-01-21 18:36:50 +05:30
Afshan
96edfd93c9 fix: stock ageing should not take cancelled stock entries. 2021-01-21 18:22:35 +05:30
Rucha Mahabal
eee71f37d8 fix: test 2021-01-21 17:47:20 +05:30
Suraj Shetty
5f52f8d473 fix: Temporarily comment out help article link in issue timeline 2021-01-21 16:50:47 +05:30
Suraj Shetty
8670dda5b7 fix: Use abbr method for abbr 2021-01-21 16:47:04 +05:30
Rucha Mahabal
f1cca59d80 feat: update expiry for memberships 2021-01-21 16:36:15 +05:30
Suraj Shetty
2dcdeb8231 Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-21 15:33:42 +05:30
Suraj Shetty
17ed3fc270 fix: Set css_style fallback 2021-01-21 15:33:36 +05:30
prssanna
f3d321fb82 fix: remove console.log 2021-01-21 15:31:42 +05:30
Rucha Mahabal
b9781a4675 fix: membership test cases 2021-01-21 15:13:29 +05:30
Suraj Shetty
0c0155e885 fix: Make birthday messages translatable 2021-01-21 14:59:19 +05:30
Suraj Shetty
8b1a720ae8 Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-21 14:32:45 +05:30
Suraj Shetty
164fe37fa0 fix: Employee birthday reminder 2021-01-21 14:32:35 +05:30
Rucha Mahabal
f3e3f80102
Merge branch 'develop' into membership-enhancements-2 2021-01-21 13:24:39 +05:30
Rucha Mahabal
d98b506478 fix: patch 2021-01-21 13:23:59 +05:30
prssanna
9f1a156307 Merge branch 'shopping-cart' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-21 13:04:58 +05:30
Rucha Mahabal
b48eab972e fix: sider issues 2021-01-21 13:00:10 +05:30
Marica
d1e6303d67
Merge branch 'develop' into item-wise-purchase-registry-item-name-error 2021-01-21 12:14:47 +05:30
Rucha Mahabal
3af46cc6cc fix: show custom buttons after save 2021-01-21 11:59:34 +05:30
Rucha Mahabal
4284ad880b fix: create member from membership for website users only 2021-01-21 11:54:14 +05:30
Rucha Mahabal
53d0eebbe8 fix: patch for renaming field in Membership Settings 2021-01-20 23:22:08 +05:30
Rucha Mahabal
bc49815d54 refactor: missing validations, code clean-up 2021-01-20 23:14:27 +05:30
Rucha Mahabal
fa4b3ba505 fix: basic validations for Membership Type Linked Item 2021-01-20 21:59:27 +05:30
Rucha Mahabal
3575939386 fix: sider issues 2021-01-20 20:48:51 +05:30
pateljannat
f110759897 fix: date validation 2021-01-20 18:12:48 +05:30
prssanna
b00eb1b0cc feat: shopping cart page 2021-01-20 17:52:54 +05:30
prssanna
706eae7cac fix: product page fixes 2021-01-20 17:47:25 +05:30
prssanna
ac7bc78afe fix: show product price in item card 2021-01-20 17:46:19 +05:30
prssanna
599322871a fix: product query issues 2021-01-20 17:44:08 +05:30
Afshan
36e3e05a0e fix: query for salary componet in salary structure 2021-01-20 16:48:42 +05:30
Afshan
912647f4f2 fix: allow statistical component in salary structure. 2021-01-20 13:58:32 +05:30
Saqib
e2ed2324c3
fix: (e-invoicing) qrcode image generation (#24395) 
* fix: invalid taxable value of item for e-invoice

* fix: qrcode image duplicate error

* fix: net total discount calculation

* fix: auto fetch auth token
 2021-01-20 13:17:42 +05:30
Rucha Mahabal
bd02a42904
Merge branch 'develop' into membership-enhancements-2 2021-01-20 12:49:37 +05:30
Deepesh Garg
60a8ba5cbd Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency 2021-01-20 10:30:52 +05:30
Suraj Shetty
2e67a41c27 fix: Update birthday avatar code 2021-01-20 10:12:01 +05:30
Afshan
c69ab6d184 fix: select sal comp while making sal struct 2021-01-19 19:29:31 +05:30
Rohan Bansal
97b9995f8f fix: use supplied year for IRS 1099 forms 2021-01-19 19:10:03 +05:30
rohitwaghchaure
c474caba70
Merge pull request #24354 from rohitwaghchaure/fixed-incorrect-key-in-subcontract-develop 
fix: incorrect serial no in the subcontracted purchase receipt
 2021-01-19 15:08:53 +05:30
Rucha Mahabal
a28579a130 fix: sider issues 2021-01-19 14:16:44 +05:30
Rucha Mahabal
f39cbd3a1d test: appointment booking for admission service unit 2021-01-19 13:59:03 +05:30
Suraj Shetty
c858bb8122 fix: Rename patch 2021-01-19 10:47:50 +05:30
Jannat Patel
953960b193
Merge branch 'develop' into item-wise-purchase-registry-item-name-error 2021-01-19 10:44:49 +05:30
Deepesh Garg
6fb66f9428
Merge pull request #24362 from ruchamahabal/year-to-date-in-salary-components 
feat(Payroll): compute Year to Date for Salary Slip components
 2021-01-19 09:40:47 +05:30
Suraj Shetty
bbc6bfd3c3 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-19 09:34:06 +05:30
marination
957615bec8 fix: Stricter validations 
- Validation for overreceipt on Purchase Invoice, Stock Entry, Purchase Receipt & Stock Reconciliation
- Every incoming stock transaction must be checked to avoid overcapacity
- However application of rule and splitting only on certain doctypes
- Validate capacity < stock balance on save in putaway rule, irrespective
 2021-01-18 23:47:24 +05:30
Marica
6ac51edc56
Merge branch 'develop' into putaway 2021-01-18 17:47:25 +05:30
Saqib
7b8eac958e
feat: re-linking bank accounts with plaid (#24392) 2021-01-18 16:44:41 +05:30
Suraj Shetty
e560d7428e fix: Update split issue & help article 2021-01-18 16:43:22 +05:30
pateljannat
6bec696396 fix: item_group fallback 2021-01-18 16:21:56 +05:30
pateljannat
fa2b0d43bd fix: handled invoices with no item_code 2021-01-18 15:27:40 +05:30
Rucha Mahabal
20e5315480 feat: Allow selecting admission service unit in Patient Appointment for inpatients 2021-01-18 14:56:55 +05:30
Rucha Mahabal
ea19434af4
feat: Issue Analytics Script Report (#23604) 
* feat: Issue Analytics Report

* feat: add more filters, code clean-up

* fix: add report link to desk page

* test: Issue Analytics Report

* fix: sider issues

* fix: test

* debug: travis

* debug: travis

* fix: travis

* fix: travis

Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-01-18 13:53:52 +05:30
Deepesh Garg
c3d82a889a
Merge pull request #24370 from deepeshgarg007/loan_report_and_enhancements 
feat: Loan report and enhancements
 2021-01-18 12:26:45 +05:30
Deepesh Garg
52172252b4 fix: Interest calculations in Loan Interest Report 2021-01-18 12:07:54 +05:30
Deepesh Garg
2cb12e6f70 fix: Loan Security name fetch 2021-01-17 18:38:21 +05:30
Deepesh Garg
dd25ecb70d fix: Add reports in Desk Page 2021-01-17 17:52:02 +05:30
Deepesh Garg
ec60063155 fix: Auto Loan Write Off 2021-01-17 17:39:51 +05:30
Deepesh Garg
914ab7e4b0 fix: Add filters and currency in reports 2021-01-17 14:40:32 +05:30
Deepesh Garg
addea9697d feat: Loan Exposure report 2021-01-17 11:36:51 +05:30
Deepesh Garg
7976d12ed0 fix: Applicant-Wise Loan Security Exposure report 2021-01-16 18:10:01 +05:30
Deepesh Garg
1564d6ee1f fix: Test Case 2021-01-15 19:51:15 +05:30
Deepesh Garg
0c4d61269a fix: test case 2021-01-15 15:57:18 +05:30
Deepesh Garg
e30b33a3b8 fix: Linting issues 2021-01-15 15:47:15 +05:30
Deepesh Garg
cbed6f970a Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2021-01-15 15:43:59 +05:30
Suraj Shetty
cde1566606 fix: Typo 2021-01-15 15:28:50 +05:30
Suraj Shetty
f75d1bb043 fix: Typo 2021-01-15 14:53:51 +05:30
Suraj Shetty
22cdfbea87 Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-15 14:48:35 +05:30
Suraj Shetty
3d00e25232 refactor: Employee birthday reminder 2021-01-15 14:48:28 +05:30
Kanchan Chauhan
d2c71350cd
refactor(Job Application): New fields in Job Applicant and webform (#23326) 
* refactor(Job Application): New fields in Job Applicant and webform

* fix: translation syntax

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-01-15 13:56:03 +05:30
Rohan
b1d08126b0
feat: add "Sync Now" to Plaid Settings (#23602) 2021-01-15 12:56:30 +05:30
Rucha Mahabal
004e51ed9f
Merge branch 'develop' into patient-history-enhancements 2021-01-15 12:09:53 +05:30
Rucha Mahabal
1873c389e5 feat: Only allow submittable doctypes for Patient Medical Record 2021-01-15 02:12:57 +05:30
Rucha Mahabal
b15a19c6e0 test: Medical Record creation for custom doctypes 2021-01-15 01:27:30 +05:30
Rucha Mahabal
060d647248 fix: travis 2021-01-15 00:19:14 +05:30
Anuja P
47b42e6441 fix: Translation fixes 2021-01-14 21:20:00 +05:30
Anuja P
5ead7ee6cf fix:Payment Period based on invoice date report fix/refactor 2021-01-14 20:58:34 +05:30
Deepesh Garg
c96ea002a0
Merge pull request #24375 from deepeshgarg007/plv_cost_center_ignore_v13 
fix: Ignore group cost center validation for period closing voucher
 2021-01-14 19:47:56 +05:30
Deepesh Garg
847c706d2f fix: Ignore group cost center validation for period closing voucher 2021-01-14 19:44:41 +05:30
Anuja Pawar
4569e52b45
fix: fix for not having fiscal year while creating new company (#24130) 
* fix: Fiscal year fix while creating new company

* fix: for failing Travis

* fix: suggested changes

Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-01-14 19:24:30 +05:30
Mohammad Hasnain Mohsin Rajan
00981206ad
fix: last purchase rate not updating when voucher cancelled if only one voucher is present (#24322) 
* fix: last purchase rate not updating

* chore: use orm for updating

Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-01-14 19:23:18 +05:30
Deepesh Garg
660d4a1097
Merge pull request #24346 from GangaManoj/timesheet-linking 
fix: Link timesheets with corresponding projects
 2021-01-14 18:49:40 +05:30
Deepesh Garg
3f015f7142 fix: Update fieldnames 2021-01-14 18:44:14 +05:30
Marica
3c878505cb
Merge branch 'develop' into naming-series-proj 2021-01-14 16:34:51 +05:30
Marica
2b75342811
Merge pull request #24294 from marination/mr-se-warehouse-validation 
fix: Don't validate warehouse values between Material Request and Stock Entry
 2021-01-14 15:09:00 +05:30
Rucha Mahabal
751719ea0d
Merge branch 'develop' into patient-history-enhancements 2021-01-14 14:08:50 +05:30
marination
bc9eaac342 fix: Clear merge conflicts 
- 'get_project_template' was removed a month back
- in 'make_project' insert the project directly as a check for it is there in the beginning.
 2021-01-14 13:47:40 +05:30
Rucha Mahabal
6c90e26982 feat: add descriptions for YTD and MTD fields 2021-01-14 13:42:40 +05:30
Marica
17614c9860
Merge branch 'develop' into mr-se-warehouse-validation 2021-01-14 13:02:45 +05:30
Rucha Mahabal
6b9efa894f
Merge branch 'develop' into inpatient-visits-billing 2021-01-14 12:31:43 +05:30
marination
814858061f fix: test for raising MR-SE mismatch error 
- Make test add mismatched item code instead of warehouse, since warehouse can be different.
 2021-01-14 12:13:08 +05:30
Rucha Mahabal
49702c1487 test: year to date computation for salary slip components 2021-01-14 11:57:24 +05:30
Rohit Waghchaure
56c7b554a6 fix: extra transferred qty has not consumed against work order 2021-01-14 11:54:32 +05:30
Rucha Mahabal
2c315a738e feat: Salary Slip with Year to Date Print Format 2021-01-14 10:06:24 +05:30
Rucha Mahabal
fdad94f983 feat(Payroll): compute Year to Date for Salary Slip components 2021-01-14 00:40:58 +05:30
Anuja Pawar
e62ce4b172
fix: Add button PO, PI, SI, DN and, Quotation Dashboard (#24187) 2021-01-13 21:13:12 +05:30
Anupam Kumar
4a649a4fce
fix: removing payment_field from loan repayment closuer (#24291) 2021-01-13 21:10:49 +05:30
Afshan
33fac19bce
fix: calculation of remaining_sub_periods if relieving date before month start date (#24319) 2021-01-13 21:06:04 +05:30
Anuja Pawar
0b04e23f6d
fix: BOM Stock Report UoM correction (#24339) 2021-01-13 21:04:03 +05:30
Jannat Patel
00ccec7314
fix: subscription prepaid date validation (#24356) 2021-01-13 21:02:15 +05:30
Saqib
53cb9f9f47
fix(e-invoicing): ux issues (#24358) 
* fix: overseas invoice rounding adjustment

* fix: overseas shipping address

* fix: qrcode for document name having forward slash

* feat: sandbox mode toggle

* fix: cannot delete sales invoice if linked to e invoice req log
 2021-01-13 21:00:44 +05:30
Kanchan Chauhan
511434190d
fix(work order): Actual start and end dates update (#24360) 
Currently, even when the Work Order (without Operations) is completed and Stock Entries are there, the Actual Start Date and Actual End Date is not updated. 

For some reason need to db_set, then it updates the Actual Start Date and Actual End Date
 2021-01-13 20:59:43 +05:30
Rucha Mahabal
ef5f0c0461
feat: Issue Summary Script Report (#23603) 
* feat: Issue Summary Report

* feat: Add Issue Metrics to Issue Summary Report

* fix: code clean-up

* feat: Added Report Summary

* feat: Add SLA status fields

* fix: add report link to desk page

* fix: sider issues

Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-01-13 19:59:16 +05:30
Anurag Mishra
1e396dcb2a fix: validated GST state 2021-01-13 14:01:57 +05:30
Jannat Patel
8aeadc743e
fix: assessment plan error handling for course field (#23961) 
* fix: assessment plan error handling for course field

* fix: message rectification

* fix(travis): clean-up tests

* fix: travis

* fix: tests

Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-01-13 12:56:04 +05:30
Marica
1ff7743d81
Merge branch 'develop' into naming-series-proj 2021-01-13 10:40:24 +05:30
rohitwaghchaure
1c362c81f2
Merge pull request #24324 from marination/bom-rm-rate-company-based 
fix: Company Wise Valuation Rate for RM in BOM
 2021-01-13 10:39:39 +05:30
Rucha Mahabal
0f05925ff4 test: Do Not Bill Patient Encounters for Inpatients 2021-01-13 09:46:33 +05:30
Rucha Mahabal
1354197c72 feat(Healthcare Settings): Do Not Bill Patient Encounters for Inpatients 2021-01-13 09:12:50 +05:30
Rohit Waghchaure
7cd7bf7f96 fix: incorrect key 2021-01-13 00:13:57 +05:30
rohitwaghchaure
bc465a3045
Merge pull request #24332 from rohitwaghchaure/fixed-payment-entry-multi-currency-issue-develop 
fix: payment entry multi-currency issue
 2021-01-13 00:13:14 +05:30
Marica
b8c5cd7331
Merge branch 'develop' into mr-se-warehouse-validation 2021-01-12 20:16:58 +05:30
Marica
30cc040d50
Merge branch 'develop' into batch-selector 2021-01-12 20:14:35 +05:30
Marica
cb079cd8c4
Merge branch 'develop' into naming-series-proj 2021-01-12 19:57:55 +05:30
Marica
69f66664ce
Merge branch 'develop' into qi-reading-status 2021-01-12 19:32:47 +05:30
Anurag Mishra
36fa0512d2 fix: not able to create dunning from sales invoice 2021-01-12 17:02:19 +05:30
Deepesh Garg
59e2114419
Merge pull request #24311 from wojosc/patch-14 
fix: Update item_tax_template_dashboard.py
 2021-01-12 13:09:35 +05:30
Rushabh Mehta
b6c7ba2eea fix(minor): Rename loan workspace to loan management for naming 2021-01-12 11:34:11 +05:30
Deepesh Garg
7fd2b35a7d
Merge pull request #24092 from pateljannat/project-template-and-tasks 
feat: Project template with dependent tasks
 2021-01-12 11:28:35 +05:30
Marica
69abc27316
Merge branch 'develop' into qi-reading-status 2021-01-12 11:15:36 +05:30
Anupam
c53ad88503 fix: resolved commit 2021-01-12 10:51:29 +05:30
Rushabh Mehta
37aa81526a fix(minor): clear merge conflicts 2021-01-12 10:29:00 +05:30
Marica
0600d572ba
Merge branch 'develop' into batch-selector 2021-01-12 10:28:47 +05:30
Rushabh Mehta
7619d3d6d6 fix(merge): develop 2021-01-12 09:16:21 +05:30
Rucha Mahabal
80911577f5
Merge pull request #24340 from ruchamahabal/make-ipme-entries-editable 
fix: allow medication entries to be deleted from the table
 2021-01-11 17:59:02 +05:30
rohitwaghchaure
c92da35997
Merge pull request #22944 from anupamvs/opportunity-status 
fix: Opportunity Status fix
 2021-01-11 17:34:06 +05:30
Rucha Mahabal
8549358708
Merge branch 'develop' into make-ipme-entries-editable 2021-01-11 15:31:08 +05:30
Marica
aef71a8abe
Merge branch 'develop' into batch-selector 2021-01-11 14:22:11 +05:30
Marica
cffc489d57
Merge branch 'develop' into partially-submit-drop-ship-items-issue 2021-01-11 13:39:49 +05:30
marination
7646d7b741 fix: Batch/Serial Selector for Batched Item 2021-01-11 12:51:15 +05:30
Jannat Patel
dcda8b9e8c
feat: Patient appointment status changes (#24201) 
* feat: patient appointment status changes

* fix: sider

* fix: sider

* fix: test status on cancel of docs and test refactor

Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-01-11 12:50:39 +05:30
Rucha Mahabal
aff3f611d3 fix: allow medication entries to be deleted from the table 2021-01-11 12:48:11 +05:30
Jannat Patel
8a07de9ee0
Merge branch 'develop' into project-template-and-tasks 2021-01-11 10:57:09 +05:30
pateljannat
2460e101a7 fix: indicator ofor template task 2021-01-11 10:05:54 +05:30
Deepesh Garg
d3634f6dac feat: Loan Interest Report 2021-01-10 19:26:45 +05:30
Deepesh Garg
1b208e0695 fix: Add total loan interest amount field in loans 2021-01-10 12:29:55 +05:30
Ganga Manoj
2ffa4b9ce4 fix: Link timesheets with corresponding projects 2021-01-08 20:58:00 +05:30
Marica
b9d5ae9285
Merge branch 'develop' into qi-ux 2021-01-08 20:28:28 +05:30
Marica
63a91fc742
Merge branch 'develop' into qi-ux 2021-01-08 18:42:54 +05:30
Marica
ace08b1e48
Merge branch 'develop' into qc-back-update-se 2021-01-08 18:42:19 +05:30
marination
b7637f49cd fix: Remove QI link on cancel wherever same QI name exists 2021-01-08 18:35:49 +05:30
Anurag Mishra
05f6edfe0a
Merge branch 'develop' into fixed-payment-entry-multi-currency-issue-develop 2021-01-08 17:27:22 +05:30
Rushabh Mehta
f8a6dde8d8 fix(minor): routing 2021-01-08 14:37:38 +05:30
Rohit Waghchaure
3777c6aa38 fix: payment entry multi-currency issue 2021-01-08 12:59:15 +05:30
Rucha Mahabal
a93151502c fix: Components formulated from additional salary not being fetched in Payroll Entry 2021-01-08 12:10:26 +05:30
marination
c4963bfdb2 fix: Back Update from QC based on Batch No 2021-01-08 09:56:04 +05:30
marination
ff6ee9d4e7 fix: Formula field description and Rearrange grid view 
- Missing closing quote in Formula field description
- In grid view of child table in QI, show only input fields
 2021-01-08 09:14:43 +05:30
Marica
5cfdd0f503
Merge branch 'develop' into qi-ux 2021-01-07 15:47:55 +05:30
Marica
d91c7e2b38
Merge branch 'develop' into mr-se-warehouse-validation 2021-01-07 15:41:21 +05:30
marination
fab080c875 fix: Company Wise Valuation Rate for RM in BOM 2021-01-07 15:25:39 +05:30
pateljannat
fd5ebe9d4a fix: patch and columns 2021-01-07 15:16:15 +05:30
Jannat Patel
a586b0ba17
Merge branch 'develop' into project-template-and-tasks 2021-01-07 13:01:02 +05:30
pateljannat
3c55463b4b fix: validation for ldc against supplier and section code 2021-01-07 12:41:44 +05:30
Anurag Mishra
77ba72c4ff
Merge branch 'develop' into payroll_fixes2.0 2021-01-06 14:23:53 +05:30
Anurag Mishra
e7fa6f6a1c fix: edditable employee grid 2021-01-06 13:25:09 +05:30
Shivam Mishra
9fc44f1606
Merge pull request #24182 from scmmishra/fix-dont-set-primary 2021-01-06 12:52:44 +05:30
Jannat Patel
5a579089c2
fix: indentation 2021-01-06 11:21:13 +05:30
Deepesh Garg
5e15a5d230
Merge pull request #24186 from frappe/validate_regional_germany 
fix: regional validation of sales invoice (germany)
 2021-01-06 09:35:05 +05:30
Deepesh Garg
e72c51204b
Merge pull request #24189 from timgates42/bugfix_typo_update 
docs: fix simple typo, udpate -> update
 2021-01-06 09:34:11 +05:30
Deepesh Garg
f2863f9d16
Merge pull request #24313 from deepeshgarg007/ytd_error_fix_v13 
fix: Consider only submitted salary slips
 2021-01-06 09:30:00 +05:30
Deepesh Garg
ad8be7c1fe fix: Consider only submitted salary slips 2021-01-06 09:29:03 +05:30
Rucha Mahabal
a7a609d4ff
Merge pull request #24281 from ruchamahabal/allow-discharge 
feat: Allow Discharge despite Unbilled Healthcare Services
 2021-01-06 09:27:26 +05:30
Deepesh Garg
6f18d4c0f6
Merge pull request #24312 from deepeshgarg007/sanctioned_loan_unpledge 
fix: Sanctioned loan security unpledge
 2021-01-06 09:13:19 +05:30
Deepesh Garg
05fe7ac29c fix: fieldname 2021-01-06 09:10:28 +05:30
Deepesh Garg
dd768a07c5 fix: Sanctioned loan security unpledge 2021-01-05 23:55:00 +05:30
Wolfram Schmidt
5eef19723d
Update item_tax_template_dashboard.py 
added missing backlink. In Item Groups I can set Item Tax Temple in Table taxes.
 2021-01-05 18:47:11 +01:00
Nabin Hait
f7b9b0687e
fix: tax calculation on salary slip for the first month (#24272) 
* fix: tax calculation on salary slip for the first month

* fix: net pay precision issue

* fix: net pay precision issue

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2021-01-05 20:43:11 +05:30
Deepesh Garg
b01b108dfa fix: do not consider current salary slip in sum 2021-01-05 17:34:16 +05:30
Saurabh
994fa48cd4
Merge branch 'develop' into fix-dont-set-primary 2021-01-05 16:32:56 +05:30
Saqib
a56a5ccefa
refactor: fetch & validate address from erpnext rather than gst portal (#24297) 2021-01-05 15:59:17 +05:30
Marica
ba6e50b15e
Merge branch 'develop' into qi-ux 2021-01-05 15:15:10 +05:30
Anurag Mishra
b864b09d40
Merge branch 'develop' into gratuity 2021-01-05 14:47:38 +05:30
Anurag Mishra
112b3894cc
Merge pull request #24296 from AfshanKhan/fix-add-comp-in-leave-ledger 
fix: set company in leave allocation and leave ledger entry
 2021-01-05 14:45:16 +05:30
Marica
eab1867235
Merge branch 'develop' into qi-ux 2021-01-05 14:23:05 +05:30
Anurag Mishra
239fe7336e
fix: charts not displaying when tree_type changed 
fix: charts not displaying when tree_type changed
 2021-01-05 14:03:03 +05:30
Saqib
1f591ab02e
fix(e-invoicing): minor calculation fixes (#24285) 2021-01-05 13:53:51 +05:30
Afshan
f79c4d3560
Merge branch 'develop' into fix-add-comp-in-leave-ledger 2021-01-05 13:27:15 +05:30
Jannat Patel
16a809483b
fix: indentation 2021-01-05 12:28:45 +05:30
marination
b8aeb9ea88 fix: Indentation and missing semi-colon 
- Fix incorrect indentation after merge conflict
- Sider
 2021-01-05 12:16:25 +05:30
Rucha Mahabal
d643bb7c4b
Merge branch 'develop' into allow-discharge 2021-01-05 12:07:26 +05:30
Jannat Patel
06a401ffbf
fix: incoming rate attribute error (#24287) 
Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
 2021-01-05 11:54:34 +05:30
Marica
41ea77ce31
Merge branch 'develop' into putaway 2021-01-05 11:24:05 +05:30
Marica
95344f01e6
Merge branch 'develop' into qi-ux 2021-01-05 10:44:52 +05:30
Jannat Patel
7d0f35c4ab
Merge branch 'develop' into partially-submit-drop-ship-items-issue 2021-01-05 10:42:30 +05:30
Rucha Mahabal
f97e668130
Merge branch 'develop' into allow-discharge 2021-01-05 10:38:16 +05:30
Deepesh Garg
bfa71c23ae
Merge pull request #23965 from vorasmit/remarks-fix-develop 
fix: add remarks to sales invoice
 2021-01-05 09:54:53 +05:30
Nabin Hait
72fa368e8f
Merge branch 'develop' into mr-se-warehouse-validation 2021-01-05 09:30:16 +05:30
Nabin Hait
5a8f141eda
Merge branch 'develop' into fix-add-comp-in-leave-ledger 2021-01-05 09:29:44 +05:30
Marica
099162814c
Merge branch 'develop' into qi-ux 2021-01-05 09:27:40 +05:30
Nabin Hait
517fd8b9e6
fix: Ignore customer and supplier while deleting company transactions (#24279) 
* fix: Ignore customer and supplier while deleting company transactions

* fix: Test cases fixed based on Travis
 2021-01-05 09:23:39 +05:30
Afshan
0da201c6a5 fix: set company in leave allocation and leave ledger entry 2021-01-04 19:04:05 +05:30
marination
0c883853b3 fix: Dont validate warehouse values between MR to Stock Entry 
- Remove validation thta checks if warehouse in Stock Entry is the same as MR that it was pulled from
 2021-01-04 18:48:50 +05:30
Anupam
27fd9e4d7d fix: added empty value in Quality Inspection Reading status 2021-01-04 18:18:00 +05:30
Deepesh Garg
797a742cb2 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2021-01-04 14:24:00 +05:30
Deepesh Garg
a873ae0d9f fix: Check for custom dimensions 2021-01-04 14:23:31 +05:30
Rucha Mahabal
7206e12c2f test: Allow Discharge despite Unbilled Services 2021-01-04 12:11:00 +05:30
Rucha Mahabal
03b25be9e9 feat: Allow Discharge despite Unbilled Healthcare Services 2021-01-04 11:16:59 +05:30
marination
7877d5a7c2 fix: Create QI Parameters (links) in test cases 2021-01-04 11:10:04 +05:30
Afshan
a245f667d0
fix: pos error pop up (#24237) 2021-01-02 10:30:22 +05:30
Deepesh Garg
ffca52a348
Merge pull request #24254 from nextchamp-saqib/loan-patch-fix 
fix: update old loan patch
 2021-01-01 13:50:52 +05:30
vorasmit
3ef965f253
Update patches.txt 2021-01-01 10:55:20 +05:30
vorasmit
8c39ab68df
Delete update_sales_invoice_remarks.py 2021-01-01 10:54:57 +05:30
Anurag Mishra
b901d4002a
Merge pull request #24264 from AfshanKhan/fix-sal-struc-assign-payroll-acc 
fix: setting correct account for sal struct assignment if not specified.
 2020-12-31 18:26:46 +05:30
Afshan
47bc42740b
Merge branch 'develop' into fix-sal-struc-assign-payroll-acc 2020-12-31 17:41:44 +05:30
Afshan
4edcf813e7
Merge branch 'develop' into allow-cancel-leave-policy 2020-12-31 17:41:34 +05:30
Anurag Mishra
d7ea2bd705
Merge pull request #24177 from AfshanKhan/fix-perm-empl-sal-slip 
fix: error popup for submitted doc
 2020-12-31 17:07:30 +05:30
Afshan
e69148c266 fix: allow leave policy assignment to be cancelled. 2020-12-31 16:45:00 +05:30
Afshan
8b60fe6125 fix: setting correct account for sal struct assignment if not specified. 2020-12-31 16:10:39 +05:30
Saqib
2b67d57480
fix: cannot submit e-invoice if legal name not found 2020-12-31 13:26:05 +05:30
Saqib Ansari
d5d571ab9d fix: update old loan patch 2020-12-31 12:55:35 +05:30
Deepesh Garg
23ab5c5cc0 fix: Multiplle sider issues 2020-12-31 11:29:06 +05:30
Deepesh Garg
133ce286f9 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2020-12-31 11:24:14 +05:30
Deepesh Garg
f57089532a
Merge pull request #24252 from deepeshgarg007/partial_security_unpledge 
fix: Partial loan security unpledging
 2020-12-30 21:37:52 +05:30
Mohammad Hasnain Mohsin Rajan
11176852eb
Merge branch 'develop' into bugfix_typo_update 2020-12-30 20:59:38 +05:30
Deepesh Garg
9716216632 fix: check for string types 2020-12-30 20:33:35 +05:30
Deepesh Garg
a60707873c fix: Partial loan security unpledging 2020-12-30 20:24:15 +05:30
Karthikeyan S
aa44c754de
fix(GST E Invoice): update live URLs for adaequare GSP (#24248) 2020-12-30 19:22:37 +05:30
Deepesh Garg
5891b48cf6
Merge pull request #24176 from GangaManoj/Year-to-Date 
feat: Add year_to_date field (cumulative salary for a fiscal year)
 2020-12-30 16:53:47 +05:30
rohitwaghchaure
bb0fd33ac5
Merge pull request #24169 from Anurag810/payroll-entry-fixes 
fix: allow addition and removal of employee in payroll Entry
 2020-12-30 16:50:02 +05:30
Shivam Mishra
45a56288bb feat: style adjustments to product page 2020-12-30 15:51:50 +05:30
Shivam Mishra
31a651365d feat: update item group website slider 2020-12-30 15:51:34 +05:30
Deepesh Garg
66dcaf3ab2 fix: Salary structure assignment in tests 2020-12-30 15:47:22 +05:30
Saqib
f946bbd032
fix: minor e-invoicing issues (#24239) 
* fix: invoice value set to zero if rounded total disabled

* fix: unit rate & gross amount calculation

* fix: e-invoice-setup patch

* chore: no need to re-run the patch

* fix: item value & invoice value calculations
 2020-12-30 14:43:42 +05:30
Deepesh Garg
97d055dfc3 fix: Test Case 2020-12-30 14:06:13 +05:30
Anurag Mishra
b7631af741
Merge branch 'develop' into payroll-entry-fixes 2020-12-30 13:22:13 +05:30
Deepesh Garg
8b7ebe5044 fix: Test Case cleanup and fixes 2020-12-30 12:45:46 +05:30
Deepesh Garg
20133bd1df fix: Remove comments 2020-12-29 22:19:12 +05:30
Deepesh Garg
7e4eacba8d Merge branch 'develop' of https://github.com/frappe/erpnext into Year-to-Date 2020-12-29 22:13:55 +05:30
Deepesh Garg
353f8f4d85 fix: Add test case for YTD 2020-12-29 22:13:40 +05:30
Anurag Mishra
15af7a4afc
Merge pull request #24226 from AfshanKhan/asset-report 
fix: asset depreciation ledger
 2020-12-29 18:58:56 +05:30
Deepesh Garg
60b77f9865 Merge branch 'develop' of https://github.com/frappe/erpnext into Year-to-Date 2020-12-29 18:26:32 +05:30
rohitwaghchaure
b09ddc4672
Merge pull request #24233 from rohitwaghchaure/back-dates-allow-field-issue 
fix: option name for the field 'Role Allowed to Create/Edit Back-dated Transactions'
 2020-12-29 17:52:43 +05:30
Shivam Mishra
355943c3a0 feat: only show attributes that have an item 2020-12-29 17:46:18 +05:30
Shivam Mishra
2a6c4ec26e chore: remove dead code 2020-12-29 17:20:12 +05:30
Shivam Mishra
565b178721 feat: use ProductFiltersBuilder in all products page 2020-12-29 17:18:58 +05:30
Shivam Mishra
7055969ef3 feat: update item group template 2020-12-29 17:18:41 +05:30
Shivam Mishra
425bae8bf6 feat: use ProductQuery and ProductFiltersBuilder to build item group page 2020-12-29 17:18:22 +05:30
Shivam Mishra
298608ef40 feat: add product filters generator for item group and all products 2020-12-29 17:17:44 +05:30
Shivam Mishra
ed21350871 fix: page limit filter bug 2020-12-29 17:17:18 +05:30
Shivam Mishra
2dd26f7551 chore: cleanup product query 2020-12-29 17:17:03 +05:30
Shivam Mishra
b06ed4908f feat: add filter tables in item group 2020-12-29 17:16:29 +05:30
Shivam Mishra
134f6b1b6c chore: update style rules 2020-12-29 17:16:08 +05:30
Deepesh Garg
ff51540eed Merge branch 'accounting_dimension_filters' of github.com:deepeshgarg007/erpnext into accounting_dimension_filters 2020-12-29 17:02:07 +05:30
Deepesh Garg
e061004956 fix: Improve validation message 2020-12-29 17:00:39 +05:30
Raffael Meyer
a3462f6b0c
Merge branch 'develop' into validate_regional_germany 2020-12-29 11:58:57 +01:00
Rohit Waghchaure
81285204dc fix: option name for the field 'Role Allowed to Create/Edit Back-dated Transactions' 2020-12-29 16:25:45 +05:30
Deepesh Garg
4a8c2c4cb5 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2020-12-29 15:10:36 +05:30
Shivam Mishra
aa42886851 fix: template json 2020-12-29 13:28:35 +05:30
Anurag Mishra
dfe8f7601b
Merge branch 'develop' into gratuity 2020-12-29 13:27:03 +05:30
Anurag Mishra
5af8d2b883
Merge branch 'develop' into payroll-entry-fixes 2020-12-29 13:09:42 +05:30
Afshan
91e3c07d77 fix: assest depreciation ledger 2020-12-28 19:42:46 +05:30
marination
a69e81a151 chore: Made 'Parameter' a link field in QI and QI Template 
- Added doctype Quality Inspection Parameter
- Made 'Parameter' a link field in QI and QI Template
- Added patch to create Quality Inspection Parameter records for every parameter in the system
 2020-12-28 18:07:22 +05:30
marination
29a03bd5a1 feat: Add 'Manual Inspection' checkbox 
- fix merge conflict in js file
- Dont auto set status if manual inspection is checked
- Added 'Manual Inspection' checkbox in QI readings table
 2020-12-28 16:59:13 +05:30
pateljannat
88471854d5 fix: sider 2020-12-28 15:40:23 +05:30
rohitwaghchaure
527b7e16e5
Revert "feat: Batch wise item selling pricing" 2020-12-28 15:29:30 +05:30
Marica
62f9cc6c5a
Merge branch 'develop' into qi-ux 2020-12-28 15:09:15 +05:30
rohitwaghchaure
72e8ec5eee
Merge pull request #24087 from deepeshgarg007/batch-wise-pricing 
feat: Batch wise item selling pricing
 2020-12-28 14:37:33 +05:30
Rohit Waghchaure
40d2c6a0cc fix: finished good produced qty validation 2020-12-28 14:08:45 +05:30
pateljannat
aa8ff81061 Merge branch 'project-template-and-tasks' of https://github.com/pateljannat/erpnext into project-template-and-tasks 2020-12-28 12:35:27 +05:30
pateljannat
71f203dbc5 fix: template task status, subject in project template task 2020-12-28 12:35:19 +05:30
Shivam Mishra
c640065a66 feat: cleanup json 2020-12-28 12:16:29 +05:30
Rucha Mahabal
e1b9707ec1
Merge pull request #24152 from ruchamahabal/fix-therapy-type-filter 
fix: filter Therapy Types and Therapy Plan in Patient Appointment
 2020-12-28 11:36:34 +05:30
Deepesh Garg
d3814b2676 Merge branch develop into batch-wise-pricing 2020-12-28 10:48:29 +05:30
Jannat Patel
c09100d738
Merge branch 'develop' into partially-submit-drop-ship-items-issue 2020-12-28 10:20:27 +05:30
Deepesh Garg
7c300859ed fix: Test Cases 2020-12-26 20:14:51 +05:30
Deepesh Garg
d4fc451c2a
Merge pull request #24191 from nextchamp-saqib/accounting-entries-for-asset 
fix: accounting entries of asset when submitting purchase receipt
 2020-12-26 19:14:32 +05:30
Saqib
60a1d25196
fix: cancelling of asset value adjustement (#24193) 2020-12-26 13:01:49 +05:30
rohitwaghchaure
9f1e1f6c23
Merge pull request #24207 from rohitwaghchaure/fixed-serial-no-return-issue 
fix: partial serial no return issue
 2020-12-26 12:12:04 +05:30
Deepesh Garg
4f8da4c313 fix: Test Cases 2020-12-26 11:37:51 +05:30
Nabin Hait
0788df412c fix: Removed permissions from UAE VAT Settings 2020-12-25 20:54:01 +05:30
Deepesh Garg
5269f02919 Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency 2020-12-25 18:35:26 +05:30
Deepesh Garg
bfc17e487c fix: Commonify code for Stock Entry 2020-12-25 18:34:39 +05:30
Nabin Hait
b99c77b753
Reposting fixes (#24202) 
* fix: finished item validation and rate

* fix: Check if stock and account balance in sync after reposting

* fix: validate stock accounts in journal entry

* fix: validate expense against budget
 2020-12-25 18:12:35 +05:30
hasnain2808@gmail.com
46d5f4c7f1 refactor(analytics report): linting 2020-12-25 16:34:43 +05:30
rohitwaghchaure
fa0a075e95
Merge pull request #24196 from scmmishra/fix-file-url-employee 
fix: use file_url to save file and not file name
 2020-12-25 16:22:15 +05:30
rohitwaghchaure
ebcd4c454e
Merge pull request #24209 from rohitwaghchaure/added-shipment-link-in-delivery-note 
fix: added shipment link in delivery note dashboard
 2020-12-25 16:07:35 +05:30
Rohit Waghchaure
dab1ab990d fix: partial serial no return issue 2020-12-25 15:25:16 +05:30
rohitwaghchaure
de10d7dcf2
Update shipment.py 2020-12-25 15:15:55 +05:30
Rohit Waghchaure
5bcc6c6b15 fix: added shipment link in delivery note dashboard 2020-12-25 15:02:53 +05:30
Saqib
6d74f5b59b
feat: GST E Invoicing (#23455) 
* feat: init e-invoice settings

* feat: read public key file

* feat: rsa encryption with public key

* feat: save token and sek from auth request

* chore: handle error response

* feat: AES decryption of SEK with appkey

* feat: decrypt json data with SEK

* feat: make e invoice from erpnext sales invoice

* feat: generate IRN

* feat: decode signed json and QR code

* chore: validations

* feat: cancel IRN

* feat: complete e-invoice schema

* chore: move e-invoice settings to regional

* chore: split einvoice settings and operations

* chore: rename schema to template & js cleanup

* feat: make IRN field on regional setup

* feat: Generate & Cancel IRN from Sales Invoice

* chore: minor fixes

* fix: item discount

* chore: show irn cancelled check after cancellation

* fix: hide cancel irn dialog on error

* fix: public key is required on validate

* fix: cannot find attached key file

* fix: validation if e invoicing is disabled

* fix: do not show generate irn for invalid supply type

* fix: update irn_cancelled after cancelling irn

* chore: show irn field for proper gst_category

* feat: e-way bill details in e-invoice

* fix: save e-way bill no on irn generation

* chore: no copy on e invoice custom fields

* feat: cancel e-way bill before cancelling IRN

* feat: manual download / upload json

* chore: group e-invoicing actions

* fix: fn name

* chore: save signed invoice and qrcode after uplaoding irn

* fix: fetch token if not valid

* chore: move einvoicing stuff to seperate folder

* feat: QRCode Image and E-Invoice Print Format

* fix: bug

* fix: invalid syntax

* chore: code cleanup

* chore: clean up e invoice actions

* fix: download & upload e-invoice

* fix: print format

* fix: validations

* fix: add permissions on regional setup

* feat: add patch

* fix: validate document name

* fix: return date

* fix: credit note einvoice

* fix: validations

* fix: error logging

* fix: e_invoice module not found

* fix: add missing package

* fix: rename e_invoice_utils.py

* fix: einvoice field validation

* fix: patch

* fix: invoice totals calculation

* fix: other charges calculation

* chore: improve document name validation message

* fix: qr code image string

* feat: initialize GSP connector

* chore: remove unwanted fields

* fix: qr code generation

* feat: fetch and cache GSTIN details

* feat: generate & cancel IRN

* feat: cancel eway bill

* chore: remove unwanted fuctions

* chore: clean up einvoice actions

* fix: attach qrcode on irn generation

* fix: generate & cancel IRN

* fix: show/hide eway bill fields

* fix: valiations

* feat: generate eway bill from IRN

* chore: remove unwanted imports

* chore: error logging

* feat: header & footer in GST E Invoice

* chore: remove test pincode

* fix: invalid syntax

* feat: cess non advolem on einvoice item

* chore: remove fetch token from e invocie settings

* fix: imports

* fix: error handling

* feat: update timeline on einvoice actions

* fix: qrcode image size

* fix: exclude intra company transactions

* fix: eway bill test

* fix: ewaybill mandatory conditions

* chore: add tests

* fix: returning condition

* feat: log e-invocing requests

* chore: add ack date and ack no field for print formats

* fix: sider issues

* feat: show e-invoice preview before IRN generation

* fix: use as_list for error message

* fix: minor ux issues

* fix: dialog is undefined

* fix: error handling

* feat: add docs link to e invoice settings

* feat: multiple gstins for e invoicing

* fix: uncomment test condition

* fix: remove test pincode

* fix: cannot cancel irn without submitting sales invoice

* chore: code cleanup

* fix: sider issues

* fix: e invoice request log permissions

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-12-25 10:26:43 +05:30
rohitwaghchaure
4e9361f74b
Merge pull request #24204 from rohitwaghchaure/pricing-rule-not-working-margin 
fix: multiple pricing rule with margin type as Percentage is not working
 2020-12-25 09:33:39 +05:30
Rohit Waghchaure
aea62da544 fix: multiple pricing rule with margin type not working 2020-12-24 22:44:31 +05:30
Shivam Mishra
c54aca3f44 chore: cleanup comments 2020-12-24 18:02:50 +05:30
Shivam Mishra
a90b6a73dd fix: syntax error 2020-12-24 18:02:07 +05:30
Shivam Mishra
419c889a9a feat: add docstrings 2020-12-24 17:58:18 +05:30
Shivam Mishra
293f483cb4 feat: add ProductQuery engine 2020-12-24 17:54:07 +05:30
rohitwaghchaure
b9352b729a
Merge pull request #24063 from rohitwaghchaure/fixed-job-card-cacncel-flow-develop 
fix: don't cancel job card if manufacturing entry has made
 2020-12-24 17:46:45 +05:30
rohitwaghchaure
630258f493
Merge pull request #24164 from rohitwaghchaure/do-not-manufacture-same-serial-no-two-develop 
fix: do not manufacture same serial no multiple times
 2020-12-24 17:46:26 +05:30
Rucha Mahabal
d013d94e8d
Merge branch 'develop' into fix-therapy-type-filter 2020-12-24 17:44:25 +05:30
Rohit Waghchaure
304100db3b fix: don't cancel job card if manufacturing entry has made 2020-12-24 16:36:37 +05:30
Rohit Waghchaure
ed20819432 fix: travis 2020-12-24 16:24:10 +05:30
Shivam Mishra
d0437cfb59 feat: clear document cache on validate 2020-12-24 14:15:09 +05:30
Shivam Mishra
bba2726333 fix: minor styling fixes 2020-12-24 14:14:17 +05:30
Anurag Mishra
527a156512 feat: validated employees whose salary has been already precessed 2020-12-24 13:59:12 +05:30
Jannat Patel
29dd7e5fc4
Merge branch 'develop' into partially-submit-drop-ship-items-issue 2020-12-24 13:44:42 +05:30
prssanna
eb0e596d43 feat: store home page and product page 2020-12-24 11:40:33 +05:30
prssanna
7a38f41350 Merge branch 'shopping-cart' of https://github.com/frappe/erpnext into shopping-cart 2020-12-24 11:39:41 +05:30
prssanna
79c3d6f71d Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into shopping-cart 2020-12-24 11:36:59 +05:30
Rucha Mahabal
d2f91e8c11
fix: Do not cancel reference document on Quality Inspection cancellation (#24197) 2020-12-24 11:03:36 +05:30
Rushabh Mehta
ab1c2b7631 fix(minor): routing 2020-12-23 23:26:58 +05:30
Anurag Mishra
3278d02cd2 fix: sider 2020-12-23 18:07:54 +05:30
Anurag Mishra
1446749b63 fix: changes requested 2020-12-23 18:07:54 +05:30
Nabin Hait
eb065d6d40 fix: fixed gl entries 2020-12-23 18:07:54 +05:30
Nabin Hait
4da7a15ac0 fix: Fixed typo 2020-12-23 18:07:54 +05:30
Anurag Mishra
b71611dd3d feat: Added Form dashboard 2020-12-23 18:07:54 +05:30
Anurag Mishra
4cc333996c fix: test 2020-12-23 18:07:54 +05:30
Anurag Mishra
ba6ff6e227 fix: conflict 2020-12-23 18:07:53 +05:30
Anurag Mishra
708065cb85 fix: test cases 2020-12-23 18:07:53 +05:30
Anurag Mishra
af9f172be8 fix: requested changes and sider 2020-12-23 18:07:53 +05:30
Anurag Mishra
66b697cd05 feat: fix test for Gratuity 2020-12-23 18:07:53 +05:30
Anurag Mishra
550e60a69d feat: fix test for Gratuity 2020-12-23 18:07:53 +05:30
Anurag Mishra
b88af3a3f7 feat: Accrural Entry for Gratuity beafore Payment 2020-12-23 18:07:53 +05:30
Anurag Mishra
78fdd5d9b4 fix: update status on salary Slip submission 2020-12-23 18:07:53 +05:30
Anurag Mishra
46e1c09b45 style: Broken into smaller function 2020-12-23 18:07:53 +05:30
Anurag Mishra
4d6c3c9449 Fix: Changes Requested, Sider, codacy, Transalation 2020-12-23 18:07:53 +05:30
Anurag Mishra
493eea19e8 feat: added link from desk page and some minor fixes 2020-12-23 18:07:53 +05:30
Anurag Mishra
25c356894d test: gratuity 2020-12-23 18:07:53 +05:30
Anurag Mishra
f63df91186 patch: to create standard Gratuity Rule for india and UAE 2020-12-23 18:07:53 +05:30
Anurag Mishra
e1464a7bf0 feat: Indian Standard Gratuity Rule 2020-12-23 18:07:06 +05:30
Anurag Mishra
34a7250a2d fix: Some enhancements and better validation 2020-12-23 18:07:06 +05:30
Anurag Mishra
0761301c2e feat: Added all 3 standard slab for UAE 2020-12-23 18:07:06 +05:30
Anurag Mishra
47f3a3a5bd feat: validation for if no slab found 2020-12-23 18:07:06 +05:30
Anurag Mishra
6f1538026a feat: added minimum year for gratuity and condition utilisation 2020-12-23 18:07:06 +05:30
Anurag Mishra
30299c6f49 feat: validating and ordeing the rule slabr 2020-12-23 18:07:06 +05:30
Anurag Mishra
dedc0015c0 feat(HR): Working day calulation based on attendance or Leave 2020-12-23 18:07:06 +05:30
Anurag Mishra
49b326fc08 feat(HR): Gratuity Payment 2020-12-23 18:07:05 +05:30
Anurag Mishra
fc2cb3a85e Feat: gratuity 2020-12-23 18:07:05 +05:30
Deepesh Garg
aa7ab211be
Merge pull request #24171 from deepeshgarg007/breadcrum_schema 
fix: Add breadcrumbs to item group page
 2020-12-23 16:52:48 +05:30
Shivam Mishra
1ab4f09ee9 fix: use file_url to save file and not file name 2020-12-23 15:18:41 +05:30
Anurag Mishra
d884216c6f
fix: leave policy dashboard fix 
fix: leave policy dashboard fix
 2020-12-23 13:19:12 +05:30
Anurag Mishra
d556847fca fix: allow addition and removal of employee in payroll Entry 2020-12-23 12:59:48 +05:30
Nabin Hait
0411a43c6e fix: set finished good item rate based on qty 2020-12-23 12:14:41 +05:30
Saqib Ansari
09c6842199 fix: accounting entries of asset when submitting purchase receipt 2020-12-23 11:29:26 +05:30
Tim Gates
1fb412e3f6
docs: fix simple typo, udpate -> update 
There is a small typo in erpnext/patches/v4_0/map_charge_to_taxes_and_charges.py.

Should read `update` rather than `udpate`.
 2020-12-23 11:39:37 +11:00
barredterra
df8ea19406 fix: whitespace 2020-12-22 17:34:31 +01:00
barredterra
2acd8cbc02 fix: sider 2020-12-22 17:34:22 +01:00
Jannat Patel
b07914d185
Merge branch 'develop' into project-template-and-tasks 2020-12-22 20:47:30 +05:30
pateljannat
8dec1c142f fix: removed unused imports 2020-12-22 19:55:31 +05:30
Deepesh Garg
e5e2ad646a fix: Test Cases 2020-12-22 19:53:07 +05:30
pateljannat
6cf018c762 fix: holiday update in tests 2020-12-22 19:40:41 +05:30
pateljannat
4ebee5014e feat: aholiday check before setting start and end date in task 2020-12-22 18:14:46 +05:30
barredterra
511be6466d Revert "fix: fail silently" 
This reverts commit 6900a79421.
 2020-12-22 11:43:33 +01:00
barredterra
a69021018a test: add test for accounts controller 2020-12-22 11:38:09 +01:00
barredterra
5adbe49ca6 refactor: translation syntax 2020-12-22 11:37:43 +01:00
barredterra
6900a79421 fix: fail silently 2020-12-22 11:37:13 +01:00
Deepesh Garg
e1320c7e47 Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency 2020-12-22 13:32:59 +05:30
Deepesh Garg
468f67a4de fix: Add parent for all-products page 2020-12-22 12:44:09 +05:30
Mohammad Hasnain Mohsin Rajan
61b92b312a
Merge branch 'develop' into fix-analytics-reports 2020-12-22 12:41:43 +05:30
Shivam Mishra
46bc7ca69f feat: use call icon 2020-12-22 12:32:36 +05:30
Shivam Mishra
64fa0e8729 fix: wrap assignees in a list 2020-12-22 12:32:36 +05:30
barredterra
1725fbc59a feat: separate equity tree in CoA SKR04 2020-12-22 12:32:36 +05:30
Rucha Mahabal
7574a14d57 fix: Remove patch for setting next date in Subscription (#24158) 2020-12-22 12:32:36 +05:30
Rucha Mahabal
5f53b140e2 fix: Auto Repeat Import (#24157) 2020-12-22 12:32:36 +05:30
Rucha Mahabal
7d848b1785 refactor: Auto Repeat next schedule date function params (#23959) 
* refactor: Auto Repeat next schedule date function params

* refactor: Auto Repeat next schedule date function params
 2020-12-22 12:32:36 +05:30
prssanna
ec959bc3b9 fix: override field_map for job card gantt 2020-12-22 12:32:36 +05:30
pateljannat
3a26f26671 fix: get_doc to avoid modified error 2020-12-22 11:56:59 +05:30
Shivam Mishra
7d3876d51a feat: shopping cart search 2020-12-22 11:17:14 +05:30
Shivam Mishra
721251f09f feat: add product category cards 2020-12-22 11:17:14 +05:30
Shivam Mishra
b4946c31b4 refactor: use h1 for slidetitle 2020-12-22 11:17:14 +05:30
Shivam Mishra
e40926b4cc fix: don't use primary action for create 2020-12-22 11:17:14 +05:30
Shivam Mishra
09c8aaa87a feat: add slider template 2020-12-22 11:17:14 +05:30
Shivam Mishra
fa102e4713 feat: add templates for online store 2020-12-22 11:17:14 +05:30
Ganga Manoj
090783804b fix: Improve month_to_date computation 2020-12-21 23:52:05 +05:30
Ganga Manoj
c36cab81f2 fix: Update year_to_date and month_to_date field labels to show company currency 2020-12-21 23:46:02 +05:30
pateljannat
9466e42e70 fix: change request modifications 2020-12-21 20:52:20 +05:30
Nabin Hait
a77b8c9fcc
Repost item valuation (#24031) 
* feat: Reposting logic for future finished/transferred item

* feat: added fields to identify needs to recalculate rate while reposting

* refactor: Set rate for outgoing and finished items

* refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item

* refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item

* refactor: Get outgoing rate for purchase return

* refactor: Get incoming rate for sales return

* test: Added tests for reposting valuation of transferred/finished/returned items

* feat: added incoming rate field in DN, SI and Packed Item table

* feat: get incoming rate for returned item

* fix: no error while getting valuation rate in stock entry

* fix: update stock ledger for DN and SI

* feat: update item valuation rate in PR and PI based on supplied items cost

* feat: SLE reposting logic for sales return and subcontracted item with test cases

* feat: update qty in future sle

* feat: repost future sle and gle via Repost Item Valuation

* fix: Skip unwanted function calling while reposting

* fix: repost sle for specific item and warehouse

* test: Modified tests for backdated stock reco

* fix: ignore cancelled sle in few methods

* feat: role allowed to do backdated entry

* feat: Show reposting status on stock valuation related reports

* fix: minor fixes

* fix: fixed sider issues

* fix: serial no fix related to immutable ledger

* fix: Test cases fixes related to perpetual inventory

* fix: Test cases fixed

* fix: Fixed reposting on cancel and test cases

* feat: Restart reposting item valuation

* refactor: Code cleanup using small functions and test case fixes

* fix: minor fixes

* fix: Raise on error while reposting item valuation

* fix: minor fix

* fix: Tests fixed

* fix: skip some validation ig gle made from reposting

* fix: test fixes

* fix: debugging stock and account validation

* fix: debugging stock and account validation

* fix: debugging travis for stock and account sync validation

* fix: debugging travis

* fix: debugging travis

* fix: debugging travis
 2020-12-21 14:45:50 +05:30
marination
eae31f02cc fix: Sider (missing semi-colons) 2020-12-21 13:58:44 +05:30
Shivam Mishra
0e222173ea fix: don't set primary action if workflow is set 2020-12-21 13:44:03 +05:30
marination
68f91c9640 chore: Added tests for new ux 
- Test for value based inspection
- tweaks in test for formula based inspection
- tweaks in create_quality_inspection as status in child row is auto set now
 2020-12-21 12:24:45 +05:30
marination
0c4f97368d chore: UX improvement 
- Removed 'single reading' checkbox, unnecessary
- Removed 'Mean' field and added computed mean to formula data
- Changed 'Value Based' to 'Non-Numeric'
- Re-arranged fields
 2020-12-21 11:44:48 +05:30
Ganga Manoj
ddd9fe49fc feat: Add month_to_date field 2020-12-18 23:58:05 +05:30
Ganga Manoj
59fbf702da feat: Compute month_to_date 2020-12-18 23:52:11 +05:30
Ganga Manoj
1b1df6b6bc feat: Add month_to_date field 2020-12-18 23:51:05 +05:30
marination
d6277cdc7f feat: Value Based and Numeric Quality Inspection 
- Acceptance Formula is optional
- Choose between Value based and Numeric QI
- If numeric, select single or multiple readings
- Added Min, Max and Mean Values for numeric inspection to avoid formula usage
- Deprecated code cleanup in js file
 2020-12-18 21:37:19 +05:30
Ganga Manoj
89a02d7d3f feat: Changed Fiscal Year to Payroll Period 2020-12-18 15:31:45 +05:30
Rushabh Mehta
2cd41bca06 fix(routes): desk to app 2020-12-18 13:17:58 +05:30
Afshan
a81519f557 fix: error popup for submitted doc 2020-12-18 11:16:01 +05:30
Ganga Manoj
9f1e018e4f feat: Compute year_to_date 2020-12-18 01:35:27 +05:30
Ganga Manoj
04f48a011d feat: Add year_to_date field 2020-12-18 01:31:00 +05:30
pateljannat
b8e656512e fix: test cleanup 2020-12-17 20:22:06 +05:30
Deepesh Garg
b074334dcf fix: Typo in tax category doctype query 2020-12-17 18:46:59 +05:30
pateljannat
79b71462cb fix: patch 2020-12-17 18:21:34 +05:30
Deepesh Garg
5a06908bbc fix: Add breadccrumbs to item group page 2020-12-17 17:38:53 +05:30
pateljannat
09f0e9111d fix: patch 2020-12-17 17:20:21 +05:30
Anurag Mishra
611b42733b fix: leave policy dashboard fix and roles 2020-12-17 16:34:15 +05:30
Anurag Mishra
5e8e0037d6
Merge branch 'develop' into do-not-manufacture-same-serial-no-two-develop 2020-12-17 16:01:42 +05:30
Anurag Mishra
7e641f457c
Merge pull request #24166 from scmmishra/appointment-fix 
fix: wrap assignees in a list
 2020-12-17 16:00:48 +05:30
pateljannat
2dbb1d6bc7 fix: indentation 2020-12-17 15:49:52 +05:30
Shivam Mishra
1872e2c1ac fix: wrap assignees in a list 2020-12-17 14:29:52 +05:30
Deepesh Garg
5432ee3364
Merge pull request #24095 from frappe/skr04_equity_dev 
feat: separate equity tree in CoA SKR04
 2020-12-17 12:37:28 +05:30
Deepesh Garg
51892efd60 fix: Translation issues 2020-12-17 12:35:22 +05:30
Deepesh Garg
f48296ddf0 Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency 2020-12-17 12:20:16 +05:30
Deepesh Garg
6f99c0850c fix: Linting Issues 2020-12-17 12:19:58 +05:30
pateljannat
2f4c88b228 Merge branch 'project-template-and-tasks' of https://github.com/pateljannat/erpnext into project-template-and-tasks 2020-12-17 11:56:06 +05:30
pateljannat
f2bff8e220 fix: patch relaod doctype 2020-12-17 11:54:59 +05:30
Deepesh Garg
d6cd02d29d fix: Add tests 2020-12-17 09:21:24 +05:30
Deepesh Garg
5a2030c2f2 fix: Add server side methods and other fixes 2020-12-17 09:21:11 +05:30
Rucha Mahabal
f1854f9196
Merge branch 'develop' into fix-therapy-type-filter 2020-12-17 08:46:39 +05:30
Rohit Waghchaure
c9f63accdd fix: do not manufacture same serial no multiple times 2020-12-17 00:18:17 +05:30
Suraj Shetty
70cfc4df15 fix: Remove dashboard page from home 2020-12-16 20:55:47 +05:30
Jannat Patel
28098d6f93
Merge branch 'develop' into project-template-and-tasks 2020-12-16 20:09:27 +05:30
Rucha Mahabal
21168eab7f
fix: Remove patch for setting next date in Subscription (#24158) 2020-12-16 19:39:34 +05:30
pateljannat
2528d5ee15 fix: tests 2020-12-16 18:29:49 +05:30
Rucha Mahabal
23d6afe43a
fix: Auto Repeat Import (#24157) 2020-12-16 18:21:08 +05:30
Prssanna Desai
421bfee874
Merge branch 'develop' into job-card-gantt-v13 2020-12-16 16:59:50 +05:30
prssanna
ff59f18012 fix: override field_map for job card gantt 2020-12-16 16:56:30 +05:30
pateljannat
d44f45c57b fix: sider issues 2020-12-16 16:28:09 +05:30
hasnain2808@gmail.com
2da0035a0f Merge branch 'develop' into fix-analytics-reports 2020-12-16 16:14:23 +05:30
Rucha Mahabal
f2a431d866 fix: filter Therapy Types and Therapy Plan in Patient Appointment 2020-12-16 16:09:58 +05:30
Rucha Mahabal
5a8a52b9c6 fix: Therapy Type and Therapy Plan field visibility in Patient Appointment 2020-12-16 15:54:06 +05:30
Deepesh Garg
924f99bead fix: Help message 2020-12-16 15:42:50 +05:30
Deepesh Garg
4638f604ed Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2020-12-16 14:59:30 +05:30
Rucha Mahabal
b184d43e75
refactor: Auto Repeat next schedule date function params (#23959) 
* refactor: Auto Repeat next schedule date function params

* refactor: Auto Repeat next schedule date function params
 2020-12-16 14:51:42 +05:30
hasnain2808@gmail.com
9962ba86d0 fix: charts not displaying when tree_type changed 2020-12-16 14:41:04 +05:30
Your Name
3ebe511eb9 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-12-16 08:19:47 +00:00
pateljannat
87b477a311 feat: patch for project template tasks 2020-12-16 13:37:21 +05:30
Shivam Mishra
fd044b032f Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into desk-enhancements 2020-12-16 13:21:10 +05:30
Deepesh Garg
bc462fa140
Merge pull request #24146 from deepeshgarg007/tax_template_update_customer 
fix: Tax template update on customer address change
 2020-12-16 13:02:00 +05:30
Deepesh Garg
96a5e4effa fix: Tax template update on customer address change 2020-12-16 13:00:55 +05:30
Rucha Mahabal
02ebc9a11e
Merge branch 'develop' into patient-history-enhancements 2020-12-16 12:51:45 +05:30
Rushabh Mehta
34fc528500 fix(minor): debounce taxes call 2020-12-16 09:44:11 +05:30
Leela vadlamudi
29778e2fba
feat: Voice Call Settings doctype added (#24126) 2020-12-15 21:23:17 +05:30
Mohammad Hasnain Mohsin Rajan
c553453825
fix: user is not a field (#24129) 2020-12-15 16:29:10 +05:30
Saqib Ansari
d050816e17 fix: overflow of customer selector 2020-12-15 12:02:26 +05:30
pateljannat
a6fef7ae6b feat: parent-child relation tasks 2020-12-15 11:50:18 +05:30
pateljannat
caf67e608f fix: tests 2020-12-15 10:00:31 +05:30
pateljannat
23f0debf88 fix: tests 2020-12-15 10:00:21 +05:30
Rucha Mahabal
85213fa8cb
fix(Asset): set current asset value before calculating difference amount (#24119) 2020-12-15 09:32:02 +05:30
Afshan
89d14fdf68
fix: minor ui changes (#24125) 
* fix: minor ui changes

* fix: slider
 2020-12-15 09:31:30 +05:30
Afshan
58e8e06ab7
fix: retention filters (#24123) 
* fix: retention filters

* fix: slider
 2020-12-15 09:17:17 +05:30
Afshan
e64718b2ae
fix: selecting salary component (#24121) 2020-12-15 09:16:27 +05:30
Deepesh Garg
46f3c65b00 feat: Multi currency in landed cost voucher 2020-12-14 23:09:19 +05:30
pateljannat
f9751f1f95 feat: project template having dependent tasks 2020-12-14 16:20:02 +05:30
Marica
406af27b9e
Merge branch 'develop' into putaway 2020-12-14 13:07:50 +05:30
Anurag Mishra
0fc4bb02d1
Merge pull request #24100 from hasnain2808/add-fb-to-je 
fix(asset_val_adj): finance book not getting added in journal Entry of asset value adjustment
 2020-12-14 12:36:03 +05:30
marination
c47d38dc18 chore: Stock Entry Tests and fixes 
- Maintain item-warehouse wise rules for Stock Entry Material Transfer
- Test cases for Stock Entry with more use cases
- Sider fixes
 2020-12-14 12:12:49 +05:30
Deepesh Garg
05e8479521
Merge pull request #24117 from deepeshgarg007/gstr_opening_invoices 
fix: Opening invoices in GSTR-1 report
 2020-12-14 11:14:23 +05:30
Mohammad Hasnain Mohsin Rajan
b59d573009
Merge branch 'develop' into add-fb-to-je 2020-12-14 11:13:46 +05:30
Deepesh Garg
c838682188 fix: Opening invoices in GSTR-1 report 2020-12-14 10:35:16 +05:30
Suraj Shetty
f2511c84b5 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-12-14 09:05:48 +05:30
rohitwaghchaure
cf5f895617
Merge pull request #24110 from marination/status-updater-same-source-target-tables 
fix: Same source and target tables in Status Updater's update query
 2020-12-13 21:29:19 +05:30
rohitwaghchaure
d06ac9a958
Merge pull request #24114 from rohitwaghchaure/shipping-charges-not-added-in-invoice-develop 
fix: shipping chanrges not sync in erpnext from shopify
 2020-12-13 13:31:39 +05:30
rohitwaghchaure
8b8ef8d364
Merge pull request #24116 from rohitwaghchaure/fixed-stock-entry-multi-consumption-develop 
fix: incorrect stock quantity if 'Allow Multiple Material Consumption…
 2020-12-13 13:31:25 +05:30
rohitwaghchaure
e5e6d8297b
Merge pull request #24115 from rohitwaghchaure/delete-receive-at-warehouse-entry-develop 
fix: delete Receive at Warehouse entry on cancellation of Send to War…
 2020-12-13 12:33:50 +05:30
Deepesh Garg
ced3b13492 fix: Check for paid field 2020-12-12 19:31:05 +05:30
Deepesh Garg
68fce6d029 Merge branch 'develop' of https://github.com/frappe/erpnext into loan_patch_fix 2020-12-12 19:28:50 +05:30
Rohit Waghchaure
edb99d4e53 fix: incorrect stock quantity if 'Allow Multiple Material Consumption' has enabled 2020-12-12 16:03:07 +05:30
Rohit Waghchaure
5bfd6831c4 fix: delete Receive at Warehouse entry on cancellation of Send to Warehouse entry 2020-12-12 16:00:28 +05:30