Commit Graph

1821 Commits

Author SHA1 Message Date
Nabin Hait
fa006402b8 fix: merge conflict 2021-07-01 12:47:28 +05:30
Afshan
9dc625c1c9
fix: validate product bundle for existing transactions before deletion (#25978) 2021-06-24 17:36:39 +05:30
Subin Tom
219a87d530
fix: disable sales order cancellation if linked to draft invoice (#26125) 2021-06-22 16:28:58 +05:30
Subin Tom
e3a697c582
fix: disable sales order cancellation if linked to draft invoice (#26104) 2021-06-22 16:27:53 +05:30
Ankush Menat
9891780f5a
perf(minor): remove unnecessary comprehensions (port #25645) 2021-06-11 18:40:22 +05:30
Ankush Menat
a9c84f749a
perf(minor): remove unnecessary comprehensions (#25645) 2021-06-11 16:00:48 +05:30
walstanb
646f0c3b53 fix: variable declaration 2021-06-08 17:54:34 +05:30
Suraj Shetty
81d49e9c71 fix: Use extend_cscript function to properly extend class methods to cscript 2021-05-21 17:03:09 +05:30
Faris Ansari
1483a60b90 fix: super call syntax error 2021-05-19 12:30:11 +05:30
Suraj Shetty
a83d2aacd9
Merge branch 'develop' into esbuild 2021-05-18 14:48:28 +05:30
Ankush Menat
90e671905a
chore: replace assertEquals with alias assertEqual (#25613)
* chore: replace assertEquals with alias assertEqual

assertEquals has been deprecated.

ref: https://docs.python.org/3/library/unittest.html#deprecated-aliases

* chore: sider fixes
2021-05-07 20:28:51 +05:30
Faris Ansari
69eb6d476e Merge remote-tracking branch 'upstream/develop' into esbuild 2021-05-07 15:21:33 +05:30
Nabin Hait
0e41295c0e
perf: Performance enhancement on setup wizard (#25606)
* perf: Performance enhancement on setup wizard

* fix: create departments without updating nsm
2021-05-06 19:14:06 +05:30
Nabin Hait
134eaa5786
perf: Performance enhancement on setup wizard (#25605)
* perf: Performance enhancement on setup wizard

* fix: create departments without updating nsm
2021-05-06 19:13:54 +05:30
Sagar Vora
f43a86d90f
perf: significant reduction in time taken to save a delivery note (#25475) 2021-05-06 16:40:06 +05:30
Walstan Baptista
4a805b5622
chore: frappe.whitelist for doc methods (#25465) 2021-04-24 14:23:08 +05:30
Faris Ansari
1fe891b287 refactor: Replace Class.extend with native class 2021-04-23 08:04:00 +05:30
Anupam
9d9c256e70 feat: added Disable Rounded Total in sales transactions 2021-04-16 00:11:40 +05:30
Nabin Hait
5931931c93
Merge branch 'develop' into customer_duplicates 2021-04-14 11:23:12 +05:30
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
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
e41d48c7de
fix: disable auto naming of customer during import 2021-04-02 14:22:04 +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
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
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
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
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
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
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