Commit Graph

115 Commits

Author SHA1 Message Date
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
Ameya Shenoy
c5d222253a
Permisssion fixes for child table
Related to commit 595929eb2432140a27dc262d4d78aca4ec5455c3
frappe.client.[get_list, get, get_value] when called on child table
needs parent as an argument or it throws an error by default
2018-03-29 13:16:08 +05:30
rohitwaghchaure
68ba4fd697 [Fix] Multi-batch selection issue in POS (#13407) 2018-03-28 12:33:15 +05:30
Shreya Shah
3a9eec2e92 Calculate due date in Purchase Invoice on the basis of Supplier invoice date (#12913)
* pass bill_date as parameter and calculate due_date on that basis

* calculate payment_schedule on the basis of bill_date if present else posting_date

* add bill_date as an argument to get_party_details

* pass bill_date on supplier trigger in purchase invoice
2018-02-16 13:05:21 +05:30
sivankar
621740efd9 Enhancement and bug fix in batch (#12753)
* merge shelf like and manufacturing date

* setting default manufacturing date as todays date

* setting default manufacturing date as todays date

* fix

* Improvements to batch auto naming (#12496)

* refactor:
add new function - batch_uses_naming_series
use batch_uses_naming_series in autoname method

* properly update naming series on delete:
- add new functions - get_batch_prefix, get_batch_naming_series_key, get_batch_naming_series
- refactor get_name_from_naming_series
- add after_delete method

* add documentation and rename some functions

* PEP 8 compliance

* test

* added support for jinja template and added validation if expiry date is set or not if item has_expiry_date is set

* bug fix, renamed item_code to item as in batch doctype we refer 'item code' by 'item'

* added manufacturing date wise sort

* added prefix to expiry date and manufacturing date
2018-02-12 14:33:40 +05:30
Maxwell Morais
7cffd618ab
Serial No, wont relates to the warehouse
The serial no, picker wont follow the target serial no
2018-01-22 22:33:28 -02:00
Sachin Mane
64f48db406 Batch number selector bug fix (#12346)
* fix bug in batch number selector. fetch and display batch numbers only for the given item code.

* remove print statement

* Fix error on selecting Chattisgarh in address

Fix error on selecting Chattisgarh in address because of spelling mistake

* Revert "Fix error on selecting Chattisgarh in address"
2018-01-08 17:57:32 +05:30
Nabin Hait
92615901a7 Fixed merge conflict 2017-12-25 13:41:04 +05:30
rohitwaghchaure
bd5e01b09b [fix] Shipping address not fetch from purchase order in to purchase invoice & receipt. (#12134) 2017-12-25 11:28:07 +05:30
rohitwaghchaure
2b95a5438b POS batch fixes (#12005) 2017-12-14 16:06:23 +05:30
rohitwaghchaure
24e5265281 [enhance] Search customer using primary contact mobile number (#11998)
* [enhance] Search customer using primary contact mobile number

* Update build.json
2017-12-14 13:06:21 +05:30