Commit Graph

2543 Commits

Author SHA1 Message Date
Deepesh Garg
b717420842
fix: Role to override maintain same rate check in transactions (#25193)
* feat: configurable action if the same purchase/selling rate is not maintained

* fix: Role to override maintain same rate check in transactions

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-04-14 10:43:45 +05:30
Nabin Hait
10c61376e3
fix: Backport missing commits to develop branch (#25305) 2021-04-13 15:46:01 +05:30
Ankush Menat
53ce877ad9
Merge branch 'develop' into escape_sql_credit_report 2021-04-12 14:37:31 +05:30
Saqib
b8a270074e
fix(pos): cannot set qty to less than zero (#25258) 2021-04-12 10:28:05 +05:30
Anupam Kumar
986452107b
fix: Lead Source's module (#24583)
* fix: Lead Source's module

* fix: patch fix
2021-04-09 18:15:51 +05:30
Ankush Menat
87b2a51322
fix: escape sql filters in credit report
closes #24965
2021-04-03 12:34:34 +05:30
Sagar Vora
d3ee8c7731
fix: customer creation from shopping cart (#25136) 2021-04-01 18:18:19 +05:30
Marica
bfc2590e3b
Merge branch 'develop' into patch-7 2021-03-31 22:23:23 +05:30
Marica
1b8d36634f
Merge branch 'develop' into patch-7 2021-03-31 16:04:24 +05:30
Marica
5a601ce851
Merge branch 'develop' into drop-shipping 2021-03-31 13:12:13 +05:30
Walstan Baptista
d6360755b9
chore: frappe.whitelist for doc methods (#25068)
* chore: frappe.whitelist for doc methods

* fix: incorrect spelling

* fix: sider issue

Co-authored-by: Sagar Vora <sagar@resilient.tech>
2021-03-31 12:30:32 +05:30
marination
120da991d0 fix: Test
- Preserve order of supplier list while removing duplicates
- Dont use list of set, but list of dict with unique keys
2021-03-31 12:27:57 +05:30
Marica
8451da7924
Merge branch 'develop' into drop-shipping 2021-03-31 11:44:07 +05:30
marination
0673f558c1 fix: Cleaned up and fixed validation and bin updation on deletion
- Created separate smaller functions for validation and bin updation of deleted row
- Made sure previous doc (linked doc) was also updated after deletion of row
- Tests to check bin updation on add/update/delete
- Made reserved qty for subcontrating read only in bin
2021-03-31 01:42:18 +05:30
Prssanna Desai
8a87ffc8f6
fix: POS print receipt (#24924)
* fix: POS print receipt

* fix: print recepit dialog
2021-03-24 19:52:39 +05:30
Saqib
dd39a6b47c
fix(pos): mode of payments disappear on loading draft pos invoice (#24917) 2021-03-24 17:56:24 +05:30
Walstan Baptista
22054044a3
test: created a new user to test warehouse user perms (#24954)
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2021-03-20 16:35:14 +05:30
Walstan Baptista
6df61d217f
test: created a new user to test child perms (#24943)
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2021-03-18 19:23:59 +05:30
Marica
3575314260
Merge branch 'develop' into drop-shipping 2021-03-15 12:53:45 +05:30
Marica
4ceea333a7
fix: POS Opening Entry with empty balance detail rows (#24876) 2021-03-15 12:49:14 +05:30
Anupam Kumar
ed42afc5e8
feat: price margin in buying (#24685) 2021-03-15 11:11:28 +05:30
marination
e685c787d2 fix: Sider (unused variables) 2021-03-12 14:24:09 +05:30
marination
86725a6580 fix: PO not created against all selected suppliers (drop shipping)
- Return list of created POs instead of first doc
- test case added
2021-03-12 14:12:46 +05:30
Rucha Mahabal
c7fff34cf5
fix(travis): Customer Testcase Failing (#24833) 2021-03-10 15:51:44 +05:30
Raffael Meyer
20cc2bb0d8
fix: autoname for Item Tax Template
* fix: autoname for Item Tax Template

Use title + company abbreviation instead of just title.

* fix: test records of Item Tax Template

* fix: rename item tax templates in test records

* Revert "fix: test records of Item Tax Template"

This reverts commit 53875c54ffe059c32d52b9ee60795d56f95473b1.

* fix: rename hardcoded item tax templates in tests

* fix: rename hardcoded Item Tax Templates in tests

(2)

* fix: delete Item Tax Template with company
2021-03-10 10:24:43 +05:30
Ankush Menat
7d892438f0
fix: track setting changes 2021-03-02 17:50:58 +05:30
Saqib
2a1b1537f9
fix(pos): rounded total and search fixes (#24738) 2021-02-26 16:49:28 +05:30
Deepesh Garg
27da2bb63a fix: Remove unique check from represents company field 2021-02-25 22:39:47 +05:30
Saqib Ansari
85c91ca2db Merge branch 'develop' into tcs_calculation 2021-02-23 15:56:29 +05:30
Saqib
e07eb86498
Merge branch 'develop' into tcs_calculation 2021-02-11 12:13:47 +05:30
Ankush Menat
df6e20887d
fix: update total in words after updating items (#24602)
* fix: Update total in words after Updating items

Update total in words after Updating items in sales/purchase orders.
Port of #24592

Closes ISS-20-21-09425

* test: Add test for total & words after update item

Add test for total & words after updating items in sales order.
2021-02-11 11:04:39 +05:30
Saqib
0f2dc0eb73
Merge branch 'develop' into tcs_calculation 2021-02-04 18:38:26 +05:30
prssanna
6f1664223d style: missing semicolon 2021-02-01 20:43:30 +05:30
prssanna
44a055b52f Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui 2021-02-01 20:39:20 +05:30
prssanna
73d60aa498 style: fix formatting 2021-02-01 20:38:17 +05:30
Suraj Shetty
cfb5f58141 style: Fix formatting issues 2021-02-01 20:37:18 +05:30
Suraj Shetty
723bd9676d style: Fix formatting issues 2021-02-01 20:34:21 +05:30
prssanna
526ea46ae2 fix: formatting issues 2021-02-01 20:12:47 +05:30
Suraj Shetty
1ab79da7d1 style: Fix formatting issues 2021-02-01 19:51:25 +05:30
Suraj Shetty
f67bf7ae98 chore: Fix formatting issues 2021-02-01 19:40:44 +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
Saqib
62dfff5dde
Merge branch 'develop' into tcs_calculation 2021-01-28 18:08:13 +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
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
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
Saqib Ansari
58250aac10 feat: pan and tax withholding category fields for customer 2021-01-27 16:59:36 +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
Anuja Pawar
e62ce4b172
fix: Add button PO, PI, SI, DN and, Quotation Dashboard (#24187) 2021-01-13 21:13:12 +05:30
Rushabh Mehta
37aa81526a fix(minor): clear merge conflicts 2021-01-12 10:29:00 +05:30
Rushabh Mehta
7619d3d6d6 fix(merge): develop 2021-01-12 09:16:21 +05:30