Commit Graph

294 Commits

Author SHA1 Message Date
Nabin Hait
701474cbaa
fix: POS patch fix (#22818) 2020-07-28 09:11:37 +05:30
Afshan
ecb1460440
fix: update the project after task deletion so that the % completed s… (#22591)
* fix: update the project after task deletion so that the % completed shows correct value

* fix: patch to correct % complete of previous projects

* fix: for version-13

* fix: removed patch from v13

Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-07-24 10:48:16 +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
Deepesh Garg
7c50f421e1
fix: Move branch code back to bank account (#22725)
* fix: Move branch code back to bank account

* fix: Patch
2020-07-22 18:21:04 +05:30
sahil28297
3d3c922d7f
fix(patch): handle duplicate entry error while inserting account (#22745) 2020-07-22 16:42:31 +05:30
rohitwaghchaure
41c9708f99
Merge branch 'develop' into project-link-for-all-accounts 2020-07-08 13:11:37 +05:30
Deepesh Garg
92a03aa5db Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-07-06 12:37:28 +05:30
Deepesh Garg
be05c4e14a fix: Codacy and minor fixes 2020-07-05 18:16:16 +05:30
mohammadahmad1990
f933cf80df Patch for Updating item Tax Template Company 2020-07-03 15:04:37 +05:00
Deepesh Garg
50e6e47e66 fix: Patch 2020-06-28 21:32:08 +05:30
Deepesh Garg
eca2c1cd93 fix: patch 2020-06-28 18:53:55 +05:30
vishdha
d3ec1c1d89 feat: Taxjar Integration Added 2020-06-24 16:37:21 +05:30
Deepesh Garg
3c63f5b76b Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-06-19 11:41:21 +05:30
Marica
d6906dccfe
Merge branch 'develop' into rfq-multi-uom 2020-06-18 14:44:46 +05:30
marination
95e9a4ef2c fix: Patch simplification
- Also, apply patch to all docs
2020-06-18 14:46:42 +05:30
Anupam Kumar
0a3c34de01
address label chages (#22137)
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-06-17 10:53:13 +05:30
Rohit Waghchaure
fa6e4f62e2 fix: travis for develop 2020-06-16 12:02:58 +05:30
marination
ae862c993b feat: Multi UOM support in Request for Quotation 2020-06-15 17:38:47 +05:30
Abhishek Balam
86ea75e49e
fix(HR): Change Due Advance Amount to Pending Amount (#22123)
* rename 'Due Advance Amount' field to 'Pending Amount'

* changed fieldname and references for easier debugging

* added patch for moving data

* added newline added

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
2020-06-12 13:13:14 +05:30
Deepesh Garg
dfa32a77c1 fix: Patch to remove Property Setter 2020-05-29 17:20:33 +05:30
Chinmay D. Pai
d6587fa1d5
fix: check if swift_number exists in bank account
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-05-29 12:44:09 +05:30
sahil28297
9209b9a7de
fix(set_purchase_receipt_delivery_note_detail): commit after every 100 sql updates (#22016) 2020-05-28 18:49:47 +05:30
sahil28297
517ab955ac
fix(rename_bank_reconcilliation): do not delete doc after renaming (#22013) 2020-05-28 18:32:16 +05:30
marination
29d7a7ea05 fix: Added permission via regional setup and patch 2020-05-27 22:14:36 +05:30
Vishal Dhayagude
6ff11de2f0
fix: Added gram, pound to ounce conversion (#21709)
* fix: pound, grams to Ounce converion factor added

* fix: patch date updated for UOM Conversion Factor

* fix: grams move to gram

* fix: duplicate entry of uom converion factor and patch added

* fix: typo fix

* fix: minor changes

* Update patches.txt

Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-05-25 14:54:19 +05:30
Nabin Hait
78a6b6b45d
fix: Remove duplicate leave ledger entry (#21871)
* fix: Remove duplicate leave ledger entry

* fix: Remove duplicate leave ledger entry
2020-05-22 13:13:17 +05:30
Chinmay Pai
baef43977b
fix: set customer and supplier details using sql (#21846)
* fix: set customer and supplier details using sql

instead of slowing down the query with get_doc and save()
we can just use sql to update the required values for
customer and supplier

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* chore: remove extra quote

Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>

* fix: update sql query to include tabPrice List

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
2020-05-22 10:50:13 +05:30
Marica
dd3e52184c
fix: Added Inactive serial no status (#21848) 2020-05-22 10:48:35 +05:30
sahil28297
82523a5487
fix(set_serial_no_status): auto commit on many writes (#21845) 2020-05-21 18:42:10 +05:30
Suraj Shetty
5cef8db4db
fix(patch): Handle single value in patch (#21823) 2020-05-21 14:32:24 +05:30
rohitwaghchaure
aa85e511da
feat: Production Planning Against Sales Order/Material Request/Work Order (#21763)
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-05-19 19:51:45 +05:30
rohitwaghchaure
be750096ed
fix: bom incorrect price list rate for raw material if price list currency is different from company currency (#21585)
* fix: bom incorrect price list rate for raw material if price list currency is different from company currency

* fixed test cases

* fixed base_rate calculation and added plc_conversion_rate trigger
2020-05-18 14:23:30 +05:30
Marica
f4f307c36a
fix: Patch to set status in old serial no data (#21720)
* fix: Patch to set status in old serial no data

* fix: Avoid get_doc in patch

* fix: fetch all values and check status in one query
2020-05-18 11:18:44 +05:30
rohitwaghchaure
2ee400989b
Merge pull request #21273 from marination/quoted-item-report
refactor: Quoted Item Comparison Report
2020-05-15 13:47:48 +05:30
Deepesh Garg
7d61c03af4
fix: Add missing dimensions in GL entries (#21689)
* fix: Add misssing dimensions in GL entries

* fix: Add project filter in trial balance report

* fix: Use current dimensions instead of dimensions from asset
2020-05-15 12:58:48 +05:30
Mangesh-Khairnar
f984bee5f9
fix: duplicate leave expiry creation (#21505)
* fix: validate existing ledger entries to avoid duplicates

* patch: remove duplicate ledger entries created

* fix: consider only submitted ledger entries

* fix: delete duplicate leaves from the ledger

* fix: check if duplicate ledger entry exists

* chore: formatting changes

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-15 11:55:42 +05:30
rohitwaghchaure
c649468f37
Fixed typo 2020-05-15 11:35:41 +05:30
rohitwaghchaure
b8011197d9
Merge branch 'develop' into quoted-item-report 2020-05-15 04:54:40 +05:30
Saqib
41b47a68b3
fix: item price not fetching when customer is unset in item price (#21488)
* fix: item price not fetching when customer is unset in item price

* fix: item price of selling type has hidden supplier value

* fix: remove test variable

* fix: test

* patch: invalid customer/supplier based on item price type

* fix: invalid query

* fix: patch

Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-05-15 04:24:36 +05:30
Marica
8a85b9428b
Merge branch 'develop' into quoted-item-report 2020-05-11 17:56:11 +05:30
Suraj Shetty
d53822f012
Merge pull request #21618 from scmmishra/sync-dashboards 2020-05-09 14:15:20 +05:30
Marica
c1a890a739
Merge branch 'develop' into quoted-item-report 2020-05-07 17:45:32 +05:30
Shivam Mishra
b2103f5470 feat: remove old fixtures 2020-05-06 15:18:43 +05:30
Deepesh Garg
3e0c51879e
fix: Set Purchase Receipt and Delivery Note detail patch (#21607)
* fix: Set Purchase Receipt and Delievry Note detail patch

* fix: Reload purchase receipt item
2020-05-06 10:46:13 +05:30
Nabin Hait
07fe4e1933
Update add_default_dashboards.py 2020-05-05 18:27:13 +05:30
Rucha Mahabal
98229db3ae
feat: Default Dashboard for Healthcare Workspace (#21414)
* feat: Default Dashboard for Healthcare Workspace

* fix: patch

* Update add_healthcare_dashboard.py

* fix: failing patch test

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-05-05 16:02:16 +05:30
Marica
5e3d8050aa
fix: Handle rows with same item code from Purchase Receipt to Invoice. (#20724)
* fix: Handle rows with same item code from Purchase Receipt to Invoice.

* fix: Added patch, fixed tests, fixed delivery note behaviour

* chore: Added comments amd fixed typo

* fix: Added patch to patches.txt

* fix: Patch fix and simplification, json timestamp updation.

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-05 14:37:39 +05:30
Mangesh-Khairnar
2f7861a9b8
feat: Process deferred accounting entry (#19658)
* feat: process deferred accounting

* feat: maintain entry for deferred accounting

* feat: add check for automatic deferred accounting entry

* feat: add build conditions for company and account

* fix: create record for automatic processing of deferred accounting

* feat: add custom naming series

* fix: change the deferred revenue creation via hooks

* fix: add client side  validations

* test: creation of gl entries on submission of process deferred accounting

* fix: add multiple validations

* patch(accounts-settings): set automatically process deferred accounting entry

* fix: On cancel function for deferred entry

* fix: Send email per process instead of per invoice

* fix: Test cases

* fix: Label

* fix: Process deferred accounting fixes

* fix: Error flag

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: deepeshgarg007 <deepeshgarg6@gmail.com>
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2020-05-02 20:09:33 +05:30
Deepesh Garg
1a1b06cf59
Merge pull request #21539 from deepeshgarg007/trvis_child_table_validation_fix
fix: Travis (develop)
2020-05-01 14:17:46 +05:30
Deepesh Garg
032814b86a fix: Patch test 2020-05-01 13:26:26 +05:30