Commit Graph

125 Commits

Author SHA1 Message Date
deepeshgarg007
ec421df4e4 fix: Code cleanup 2019-07-29 08:58:56 +05:30
deepeshgarg007
dda6b5cd53 fix: Add accounting dimensions to subscription and opening invoice tool 2019-07-26 09:14:42 +05:30
deepeshgarg007
6dd5f74671 fix: Remove dimensions from boot 2019-07-26 09:14:42 +05:30
deepeshgarg007
ada1ac8013 fix: Added default dimension and filter in bootinfo 2019-07-26 09:14:42 +05:30
deepeshgarg007
efd6307bc4 fix: Default Accounting Dimensions in doctypes 2019-07-26 09:14:42 +05:30
deepeshgarg007
d5fcab5f81 fix: Set taxes fix for lead 2019-07-15 12:44:11 +05:30
deepeshgarg007
890ea195f3 fix: Tree filter fixes for erpnext dimensions 2019-07-09 16:56:56 +05:30
deepeshgarg007
6bb5ade667 fix: Add accounting dimensions to various reports and fixes 2019-07-07 21:24:45 +05:30
Nabin Hait
34c551d9a5
fix: Missing commits from hotfix branch (#17997)
* fix: merge conflict

* fix: restored missing set_gst_state_and_state_number function

* fix: style linting as per codacy

* fix: Fixes related to customer/lead merging

* fix: merge conflict

* fix: Fixes related to customer/lead merging

* fix: Assign isue/opportunity to user

* fix: Assign isue/opportunity to user

* fix: Replaced Invoice type by GST Category

* fix: merge conflict

* fix: merge conflict

* fix: test cases

* fix: test cases
2019-07-03 10:34:31 +05:30
Deepesh Garg
78a86af7fd fix: Fiter passing fix in get batch query (#18131) 2019-07-02 10:10:55 +05:30
Deepesh Garg
fb29ffc90c fix: Usability fixes to Serial No and batch selector (#18071)
* fix: Usability fixes to Serial No and batch selector

* fix: Codacy

* Update sales_common.js
2019-06-28 14:08:08 +05:30
deepeshgarg007
946eefe039 fix: Codacy fixes 2019-06-17 23:10:36 +05:30
deepeshgarg007
d1e0f42fea fix: Styling fix 2019-06-17 12:47:39 +05:30
deepeshgarg007
7e3a98ba33 fix: Is group filter fixes in dimensions 2019-06-17 12:44:49 +05:30
deepeshgarg007
9297829804 fix: Codacy 2019-06-10 17:50:52 +05:30
deepeshgarg007
30f7e7be87 fix: Available qty not shown in item batch selector for batch 2019-06-10 17:46:16 +05:30
Rushabh Mehta
6744febedd
Merge pull request #17769 from deepeshgarg007/dimensions
feat: Configurable Accounting Dimensions
2019-06-03 17:00:58 +05:30
deepeshgarg007
545fef9934 fix: Pass delivery document no as empty string 2019-06-03 13:06:37 +05:30
deepeshgarg007
853a561f11 fix: Serial no filtering issue for delivered items 2019-06-03 12:11:54 +05:30
deepeshgarg007
52ea2874ec fix: Multiple fixes in accounting dimensions 2019-05-30 22:09:36 +05:30
deepeshgarg007
ffec8be85f fix: Styling and test case fixes 2019-05-28 17:56:07 +05:30
deepeshgarg007
e025aabef0 fix: Indentation fixes 2019-05-28 16:25:55 +05:30
deepeshgarg007
a8cb00f31f fix: Styling and test case fixes 2019-05-28 16:03:08 +05:30
deepeshgarg007
50ea99e35b fix: Is group filter for dimensions for doctype 2019-05-28 12:13:53 +05:30
Faris Ansari
cb03bb1c00 fix: Allow variant attributes to be optional 2019-05-03 13:41:50 +05:30
scmmishra
fed4fd0f02 style: linting issue fixed 2019-04-17 15:46:15 +05:30
scmmishra
5522cf8c26 fix: codacy linting 2019-04-17 10:26:21 +05:30
scmmishra
6d3302b0cc style (codacy): code formatting fixes 2019-04-16 18:25:53 +05:30
scmmishra
ed4b052df8 style (codacy): code formatting fixes 2019-04-16 17:03:25 +05:30
scmmishra
46901076be feat: Use standard serial picker to add as well as update serial numbers 2019-04-16 17:01:01 +05:30
scmmishra
407496b528 chore: minor changes to labels 2019-04-16 13:32:41 +05:30
scmmishra
19a41ed16d chore: code cleaning 2019-04-16 12:51:05 +05:30
scmmishra
41cf945247 feat (UX): Refactored batch selector 2019-04-16 12:47:39 +05:30
scmmishra
b98612ff5b feat: Added auto fetch logic and button for client 2019-04-16 12:20:42 +05:30
Saif Ur Rehman
1a441b267d Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
# Conflicts:
#	erpnext/patches.txt
2019-02-01 19:17:04 +05:00
pipeCh
c16c7fffb4 fixed for "Select Serial Numbers" dialog won't fill mandatory field 2019-01-24 15:00:07 +07:00
Saif Ur Rehman
13a6c0aeff Fix tests 2019-01-06 18:14:18 +05:00
Saif Ur Rehman
fd531a6b5e feat: Tax Category based on Address 2018-12-29 01:49:11 +05:00
Saif Ur Rehman
677866824a More work on Tax Category and Item Tax Template 2018-12-27 02:11:07 +05:00
Frappe Bot
ee5d7e6d0f Merge branch 'master' into staging-fixes 2018-12-06 09:26:42 +00:00
Rohit Waghchaure
675567419b [Fix] Permissions issue 2018-12-04 18:43:52 +05:30
Nabin Hait
ed643d5a12
fix(email digest): Income/expenses value in case of last period of a fiscal year (#15320) 2018-09-05 17:18:59 +05:30
Maxwell Morais
a2c1d92374 Revert "Fix shipping_address for DropShipping" (#15218)
* Revert "Cleaned up welcome email code (#15175)"

This reverts commit 771fbb8f01.

* Revert "[Fix] Raw materials are not showing in the stock entry if skip transfer is enabled and backflush is based on stock entry (#15187)"

This reverts commit 2b72d09948.

* Revert "[Enhance] Provision to backflush raw materials from WIP warehouse (#15184)"

This reverts commit c5cf428d00.

* Revert "[Minor] Create default department on country setup (#15206)"

This reverts commit 2b2712bb9e.

* Revert "Permissions issue in BOM tree"

This reverts commit 8fe8d1758a.

* Revert "Fix indentation accounts_receivable.py (#15203)"

This reverts commit fbc3df3247.

* Revert "Fix shipping_address for DropShipping (#15202)"

This reverts commit 4a394bcbf4.
2018-08-27 12:05:41 +05:30
Maxwell Morais
4a394bcbf4 Fix shipping_address for DropShipping (#15202)
This stretch of javascript go against the address definition for DropShipping.
When we create an PO from SO with dropshipping items, the backend code update fine the shipping address, but this stretch of code, replace the customer address to the Company address.

To reproduce that behavior, pick one sales order with Drop Shipping Items, make and purchase order, and take a look into the delivery address.
2018-08-23 11:08:37 +05:30
Rushabh Mehta
8705371ef0 fix(product-listing): fix variant selection in website 2018-08-16 09:22:45 +05:30
Zarrar
7f8024c516 [Enhancement] Tax Withholding Category (#15064)
* add single, cumulative threshold, remove checkboxes

* remove tds child table from supplier & add tds link field

* add description field in tax withholding category

* add tax withholding data for indian setup, some fixes

* add a checkbox for tax withholding in purchase invoice

* remove supplier's child table for tds

* enable tds field if supplier has tds set inits master

* move rates data to child table - adding fiscal year support

* change bootstrap data according to child table config of tds

* show category name in list view

* loyalty program fixes

* moved tax calculation to tax_withholding.py
- calculation for tds amount for cumulative threshold from gl entry

* add fiscal year dependency in company test

* minor loyalty program fix

* minor tier calculation fix

* minor handling duplicate exception

* toggle apply_tds according to supplier, code rectify

* minor fixes for loyalty program

* test case for single and cumulative threshold

* codacy fix
2018-08-01 17:45:05 +05:30
Ameya Shenoy
873e28d9b8
Merge branch 'master' into develop 2018-06-06 05:53:19 +00:00
rohitwaghchaure
5ecc26bf15 [Fix] get_shipping_address() takes at least 1 argument (0 given) (#14328) 2018-06-04 11:00:24 +05:30
rohitwaghchaure
780952ea03 Show actual qty in warehouse link search (#14258) 2018-05-31 09:29:18 +05:30
Nabin Hait
ff2e4c898a Fixed merge conflict 2018-03-29 13:57:39 +05:30