Commit Graph

1712 Commits

Author SHA1 Message Date
marination
4f395cce54 chore: Add Filter Group to dialogs 2020-09-24 12:43:41 +05:30
Saurabh
30dbfc31e2
Merge pull request #23369 from abhishekbalam/breadcrumbs_for_maintenance
Fix(Maintenance): Breadcrumbs for Maintenance Visit and Schedule
2020-09-21 17:03:46 +05:30
Abhishek Balam
97f61d233e fix: breadcrumbs for maintenance visit and schedule under support 2020-09-21 13:00:43 +05:30
Deepesh Garg
095161ff60
Merge pull request #23328 from rohitwaghchaure/fixed-set-taxes-missing-error
fix: set_taxes() missing 1 required positional argument: 'company'
2020-09-19 18:07:08 +05:30
Deepesh Garg
0aff6d83af
Update erpnext/public/js/utils/party.js
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2020-09-19 18:05:58 +05:30
SDLyu
68672af8ab
Fix missing tax autoload when frm.doc.taxes is [] 2020-09-18 13:58:23 +08:00
Rohit Waghchaure
4f3b7da9ba fix: set_taxes() missing 1 required positional argument: 'company' 2020-09-15 14:47:36 +05:30
Marica
baedc627ee
Merge branch 'develop' into item-tax-update-items 2020-09-15 11:30:22 +05:30
Saqib
61314248bb
feat: uom in update items for SO & PO (#22869)
* feat: uom in update items for SO & PO

* fix: supplied items doesn't updates on uom change

* chore: add uom and conv factor change test

* fix: test

* fix: purchase order updates are not tracked

* fix: fetch conversion factor on uom change

* fix: codacy

Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-09-15 11:14:31 +05:30
Marica
65c2c4f85f
Merge branch 'develop' into item-tax-update-items 2020-09-15 09:49:06 +05:30
marination
b7cd84196d fix: Revert tax calculation changes 2020-09-15 09:42:51 +05:30
Saqib
cd89994b33
fix: multiple pos issues (#23297)
* fix: returns can be made against unconsolidated invoices

* fix: indentation

* fix: mode of payment not fetching for pos returns

* patch: default pos profile print format

* fix: tests

* chore: clean up retail desk page
2020-09-10 19:28:46 +05:30
Afshan
eb4b2aa142
fix: get_items from product bundle for purchase order (#22821)
* fix: get_items from product bundle for purchase order

* fix: Don't overwrite  doctype while setting attributes in child row

Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-09-01 15:01:32 +05:30
Deepesh Garg
d79b511e3f
Merge pull request #22950 from deepeshgarg007/billing_address_fetch
fix: Add default billing address for purchase documents
2020-08-31 17:16:31 +05:30
Deepesh Garg
1b760cb278 Merge branch 'develop' of https://github.com/frappe/erpnext into navbar_links 2020-08-21 12:36:21 +05:30
Marica
c23797e350
fix: Create Opportunity without Default Company from Email (#23097)
* fix: Create Opoortunity without Default Company from Email

* fix: Add Prompt to Select Company

* Update communication.js

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-08-20 19:12:12 +05:30
marination
22d3729427 fix: Codacy 2020-08-19 15:42:40 +05:30
marination
698d983eef fix: Item Tax Updation via Update Items in SO/PO 2020-08-19 14:59:46 +05:30
Deepesh Garg
617027c6ca Merge branch 'develop' of https://github.com/frappe/erpnext into navbar_links 2020-08-12 18:39:20 +05:30
Deepesh Garg
7d0a625b9c
git commit -m "fix: Add missing semicolon" 2020-08-11 22:02:12 +05:30
Nabin Hait
19ea7218d9 fix: Calculate taxes if tax is based on item quantity and inclusive on item price 2020-08-11 20:34:57 +05:30
Marica
0fcb05a3aa
fix: Misleading filters on Item tax Template Link field (#22918)
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-10 14:48:13 +05:30
marination
a07973cfa5 fix: Creating opportunity from email 2020-08-10 12:39:42 +05:30
Deepesh Garg
af1f46f2d9 fix: Add default billing address for purchase documents 2020-08-07 19:44:20 +05:30
Deepesh Garg
a306af8c08 fix: Add help link in navbar settings 2020-08-06 20:52:02 +05:30
Saurabh
a14618efe4 fix: validate theme_scss attribute 2020-07-30 17:22:29 +05:30
Sun Howwrongbum
9bd5f1e4b0
fix: incorrect available_qty being set (#22539)
* fix: incorrect available_qty being set

* style: descriptive variables
2020-07-23 20:06:26 +05:30
Saqib
a6f98d48bc
refactor: POS workflow (#20789)
* refactor: add pos invoice doctype replacing sales invoice in POS

* refactor: move pos.py to pos invoice

* feat: add pos invoice merge log doctype

* feat: ability to merge pos invoices into a sales invoice

* feat: [wip] new ui for point of sale

* fix: pos.py moved to pos_invoice

* feat: loyalty points for POS Invoice

* fix: loyalty points on merging

* feat: return against pos invoices

* Merge 'fork/serial-no-selector' into refactor-pos-invoice

* chore: status fix and set warehouse from pos profile

* fix: naming series

* feat: merge pos returns into credit notes

* feat: add pos list action for merging into sales invoices

* feat[UX]: add shortcuts & focus on search after customer selection

* feat: stock validation from previous pos transactions

* Merge 'fork/serial-no-selector' into refactor-pos-invoice

* chore: fix df not found for base_amount precision

* feat: serial no validation from previous pos transactions

* chore: move pos.py into pos page

* feat: pos opening voucher

* feat: link pos closing voucher with opening voucher

* chore: use map_doc instead of get_mapped_doc for better perf

* feat: enforce opening voucher on pos page

* feat: [ui] [wip] point of sale beta ui refactor

* fix: auto fetching serial nos with batch no

* feat: [ui] item details section for new pos ui

* feat: remove item from cart

* refactor: [ui] [wip] split point_of_sale into components
* new payment component
* new numberpad
* fix pos opening status
* move from flex to grids

* fix: search from item selector

* feat: loyalty points as payment method

* feat: pos invoice status
* fix a bug with invalid JSON

* fix: loyalty program ui fixes

* feat: past order list and past order summary

* feat: (minor) setting discount from item details

* fix: adding item before customer selection

* feat: post order submission summary
* save and open draft orders
* fix: item group filter

* fix:  item_det not defined while submitting sle

* fix: minor bugs

* fix: minor ux fixes

* feat: show opening time in pos ui

* feat: item and customer images

* feat: emailing and printing an invoice

* fix: item details field edit shows empty alert

* fix: (minor) ux fixes

* chore: rename pos opening voucher to pos opening entry

* chore: (minor) rename pos closing voucher and sub doctypes

* chore: add patch for renaming pos closing doctypes

* fix: negative stock not allowed in pos invoices* default is_pos in pos invoices* fix: transalation

* fix: invoices not getting fetched on pos closing

* fix: indentation

* feat: view / edit customer info

* fix: minor bugs

* fix: minor bug

* fix: patch

* fix: minor ux issues

* fix: remove uppercase status

* refactor: pos closing payment reconciliation

* fix: move pos invoice print formats to pos invoice doctype

* fix: ui issues

* feat: new child doctype to store pos payment mode details

* fix: add to patches.txt

* feat: search by serial no

* chore: [wip] code cleanup

* fix: item not selectable from cart

* chore: [wip] code cleanup

* fix: minor issues
* loyalty points transactions
* default payment mode

* fix: minor fixes
* set correct mop amount with loaylty points
* editing draft invoices from UI

* chore: pos invoice merge log tests

* fix: batch / serial validation in pos ui and on submission

* feat: use onscan js for barcode scan events

* fix: cart header with amount column

* fix: validate batch no and qty in pos transactions

* chore: do not fetch closing balances as opening balance

* feat: show available qty in item selector

* feat: shortcuts

* fix: onscan.js not found

* fix: onscan.js not found

* fix: cannot return partial items

* fix: neagtive stock indicator

* feat: invoice discount

* fix: change available stock on warehouse change

* chore: cleanup code

* fix: pos profile payment method table

* feat: adding same item with different uom

* fix: loyalty points deleted after consolidation

* fix: enter loyalty amount instead of loyalty points

* chore: return print format

* feat: custom fields in pos view

* chore: pos invoice test

* chore: remove offline pos

* fix: cyclic dependency

* fix: cyclic dependency

* patch: remove pos page and order fixes

* chore: little fixes

* fix: patch perf and plural naming

* chore: tidy up pos invoice validation

* chore: move pos closing to accounts

* fix: move pos doctypes to accounts

* fix: move pos doctypes to accounts

* fix: item description in cart

* fix: item description in cart

* chore: loyalty tests
* minor fixes

* chore: rename point of sale beta to point of sale

* chore: reset past order summary on filter change

* chore: add point of sale to accounting desk

* fix: payment reconciliation table in pos closing

* fix: travis

* Update accounting.json

* fix: test cases

* fix: tests
* patch loyalty point entries

* fix: remove test
* default mode of payment is mandatory for pos transaction

* chore: remove unused checks from pos profile

* fix: loyalty point entry patch

* fix: numpad reset and patches

* fix: minor bugs

* fix: travis

* fix: travis

* fix: travis

* fix: travis

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-07-23 18:51:26 +05:30
Anupam Kumar
7137b0b670
refactor: shopping cart (#22617)
* refactoring shopping cart settings

* adding column_break in shopping cart settings
2020-07-23 15:58:47 +05:30
Diksha Jadhav
09b8caf866 fix(report): fix alignment in script report that extends financial_statements.js 2020-07-21 17:35:10 +05:30
John Veness
72320afb07
Correct help link for Address (#22673) 2020-07-14 10:44:15 +05:30
Deepesh Garg
addd1e842b
Merge pull request #22568 from ahmadpak/develop
fix: Item Tax Template permissions as per company
2020-07-08 10:08:53 +05:30
marination
e27b996e38 fix: Check for Company before trying to fetch party details 2020-07-03 22:12:00 +05:30
mohammadahmad1990
41c0c9f46b fix: Item Tax Template 2020-07-03 15:01:49 +05:00
rohitwaghchaure
7e3f10e5bc
Merge pull request #22397 from Anurag810/salary_deductions_report_fixes
fix: Salary deductions report fixes
2020-06-28 16:27:37 +05:30
rohitwaghchaure
d5736711ce
fix: indentation 2020-06-28 11:12:20 +05:30
michellealva
08f842d12e fix: apply filters in all transactions 2020-06-26 19:56:00 +05:30
Deepesh Garg
8a55ec1580
fix: Add view ledger button for cancelled docs (#22432)
* fix: Add view ledger button for cancelled docs

* fix: Add moddified to date in Stock Ledger
2020-06-25 15:34:01 +05:30
Anurag Mishra
d0d9b53361 feat: added year filters 2020-06-23 11:49:57 +05:30
Deepesh Garg
c914d1b8e8
Merge branch 'develop' into ISS_20_21_02455 2020-06-22 18:46:58 +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
Afshan
aca2ca5982 style: formate according to Codacy/PR Quality Review 2020-06-19 16:22:41 +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
Marica
7dd92f15fa
Merge branch 'develop' into update-items-permission-fix 2020-06-15 11:44:59 +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
Deepesh Garg
6760077674 fix: Billing address in for Purchase documents 2020-06-13 22:40:23 +05:30
rohitwaghchaure
496b6a28f2
Merge pull request #22179 from rohitwaghchaure/code-cleanup-for-handling-batch-case-in-SI-develop
fix: Cannot read property 'has_batch_no' of undefined
2020-06-10 17:57:07 +05:30
Rohit Waghchaure
afe8e88cb8 fix: Cannot read property 'has_batch_no' of undefined 2020-06-10 17:55:24 +05:30