Commit Graph

23948 Commits

Author SHA1 Message Date
Meritsystems
1ad8eca4e8 Point of sale will list only items that are in stock based on option "Display Items in stock" in POS Profle. (#14895)
* Update point_of_sale.py

* Update point_of_sale.py

Add custom field(Display Items In Stock) to POS Profile Doctype of type Check.

* New field " Display Items in Stock" added

* Update point_of_sale.py

* Update point_of_sale.py

ORM used instead of SQL
used Bin to find actual quantity balances.

* Update point_of_sale.py

* Update point_of_sale.py

* Update point_of_sale.py

* Update point_of_sale.py

* Update point_of_sale.py
2018-08-07 14:38:50 +05:30
Saurabh
824b388631 Resolved merge conflicts 2018-08-07 13:01:11 +05:30
Prateeksha Singh
28d52dfe0c [hub][fix] Category page api call 2018-08-07 12:56:56 +05:30
Saurabh
91cecf8eac Merge branch 'hotfix' v10.1.46 2018-08-07 12:55:51 +05:30
Saurabh
6ec558bd59 bumped to version 10.1.46 2018-08-07 13:25:51 +06:00
Prateeksha Singh
318cca8cae [hub] Add 'See All' for Category items
- Also remove special `cursor: pointer` style
- Set it for all elements having a data-route
2018-08-07 12:41:21 +05:30
Prateeksha Singh
82b9508622 Add Products by Seller 2018-08-07 12:02:14 +05:30
Faris Ansari
796ca56f85 Use frappe.utils.md_to_html instead of manual import (#15087) 2018-08-07 11:53:36 +05:30
Prateeksha Singh
658d1bbae2 Fix product header styles 2018-08-06 19:13:10 +05:30
Prateeksha Singh
d3da401ef4 Home: Category-wise Items 2018-08-06 18:31:26 +05:30
Prateeksha Singh
b614ece991 [hub] Move sync, correct legacy code 2018-08-06 17:48:45 +05:30
Zarrar
2cadb1e12e add tax withholding & loyalty program in explore view (#15074) 2018-08-06 14:46:16 +05:30
Doridel Cahanap
59e4c32e9f Allow Disabling Batch and edit Validations (#15076) 2018-08-06 14:45:18 +05:30
Shreya Shah
11dd3ffdb5 Force delete item on deletion of Lab test template (#15079) 2018-08-06 14:43:00 +05:30
Shreya Shah
f0ef673498 Accounts receivable aging based on supplier due date (#15080)
* Accounts receivable aging based on supplier due date (#13801)

* Remove spaces
2018-08-06 14:42:35 +05:30
Charles-Henri Decultot
614959d5f8 Correction of the get_price method for pricing rules (#15082)
* Addition of currency arg in get_price

* Change Price to Rate
2018-08-06 14:42:04 +05:30
Jignesh Greycube
ef961746c1 Spelling updated from Maxiumm to Maximum (#15093)
Spelling updated from Maxiumm to Maximum
2018-08-06 14:32:46 +05:30
rohitwaghchaure
57d07d6b8e Merge pull request #15097 from rohitwaghchaure/incorrect_tax_amount_in_report
[Fix] Incorrect tax amount calculation because of same fieldname in the code
2018-08-06 14:32:44 +05:30
Jignesh Greycube
56027e3799 Spelling updated from Maxiumm to Maximum (#15092)
Spelling updated from Maxiumm to Maximum
2018-08-06 14:32:31 +05:30
Jignesh Greycube
cb66f6904f Spelling updated from Maxiumm to Maximum (#15091) 2018-08-06 14:32:19 +05:30
Jignesh Greycube
b2d16aca74 Updated Spelling Maxiumm to Maximum (#15090) 2018-08-06 14:32:05 +05:30
rohitwaghchaure
fc682c86c6 [Fix] Inactive student validation issue while disabling the student group (#15095) 2018-08-06 14:29:46 +05:30
Rohit Waghchaure
15f52e7b71 [Fix] Incorrect tax amount calculation because of same fieldname in the code 2018-08-06 14:29:34 +05:30
KanchanChauhan
7fb8540b70 Get item defaults from item group (#15089) 2018-08-06 14:29:14 +05:30
Prateeksha Singh
a5f6e54b70 fix merge conflict 2018-08-06 13:56:53 +05:30
Prateeksha Singh
733433c91e Merge pull request #15094 from frappe/search-injection-fix
prevent jinja exec in search title
2018-08-06 13:05:29 +05:30
Prateeksha Singh
0c796229dc prevent jinja exec in search title 2018-08-06 12:33:34 +05:30
Ameya Shenoy
26bfede116 Merge pull request #15078 from rohitwaghchaure/task_email_alert_not_working_from_project
Fix] Task's email alert on status change not working if we change the task status from the project form
2018-08-06 12:33:07 +05:30
Daniel Chalmers
5037e0d1ed link to license.txt (#15085) 2018-08-06 11:19:45 +05:30
Ranjith Kurungadam
752fd5a7a0 Tests SO for Serial No based delivery (#15072)
* fix remove SO from Serial No only when voucher SE

* SO tests - delivery by Serial No
2018-08-03 10:39:51 +05:30
Rohit Waghchaure
86217ca96c [Fix] Task email alert on status change not working if we change the task status from the project form 2018-08-02 16:41:53 +05:30
Prateeksha Singh
106856b1ab Show View count on items 2018-08-02 02:07:04 +05:30
Prateeksha Singh
32a2148651 [hub] Company (Seller) page 2018-08-02 01:42:23 +05:30
Faris Ansari
eeedc3bb47 Merge branch 'hub-redesign' of https://github.com/netchampfaris/erpnext into hub-redesign 2018-08-01 19:19:58 +05:30
Faris Ansari
2a81b4acd6 Messages: first cut 2018-08-01 19:19:53 +05:30
KanchanChauhan
e1f0be6da5 Delivery Date Change based on Delivery Date change in child table (#15068) 2018-08-01 18:11:58 +05:30
rohitwaghchaure
ae4ff5a403 [Fix] In words showing grand total instead of rounded total (#15065) 2018-08-01 18:09:51 +05:30
Nabin Hait
041a5c2d3b Get Advances and auto allocate (#14970) 2018-08-01 18:07:39 +05:30
Ranjith Kurungadam
d54991d624 Delivery by Serial No (#15030)
* fields added for delivery by Serial No

* SO - validate item for delivery by Serial No

* Stock Entry - add Serial No on production, validate reserved consumption

* add item by reservation to transaction if delivery by Serial No

* SLE - validate reserved Serial No by SO in Delivery Note, Sale Invoice

* Sales Order - validate Ensure Delivery by Serial No

* Serial No -  remove SO ref on cancel
2018-08-01 17:47:07 +05:30
rohitwaghchaure
0452b405f4 [Fix] Not able to submit the expense claim (#15057) 2018-08-01 17:45:51 +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
Nabin Hait
e45ec661ea Additional fields in Item Price (#14540)
* [IMPROVEMENT] Item Price New Fields and Features

* [IMPROVEMENT] Item Price

 - Item Price insert against Qty, Supplier/Customer, Validup/Validfrom
 - Stock Setting to accept Default Price List for Purchase or Sales Item
 - Move Item Section in Item Price

* Fetch default Item Price based on Customer as null

* test fixes

* Code cleanup and fixed the issue of incorrect item price fetched against the customer

* Removed min qty from packing_increment calculation

* Removed auto_update_price_list_rate from the stock settings

* Revert sales_order.json changes

* Removed sales, purchase price list from stock settings because this fields are already available in selling, buying settings

* Removed unnecessory file

* Fixed item price validation code
2018-08-01 17:44:34 +05:30
Prateeksha Singh
3aed5c219f [hub] make get_items generic, add legacy.py 2018-08-01 17:32:13 +05:30
Prateeksha Singh
4d4791ab39 [chore] remove imports 2018-08-01 16:42:09 +05:30
Prateeksha Singh
b4e9ec33cb Merge branch 'hub-redesign' of https://github.com/netchampfaris/erpnext into hub-redesign 2018-08-01 16:39:10 +05:30
Prateeksha Singh
6495d532a6 [restructure] make api.py 2018-08-01 16:38:39 +05:30
Faris Ansari
5249307f27 Prevent access of registered routes 2018-08-01 16:29:40 +05:30
Faris Ansari
2de046fbed Add generic action handler to subpage 2018-08-01 15:57:28 +05:30
Faris Ansari
de85f24383 Rename base_page to subpage 2018-08-01 15:57:13 +05:30
Faris Ansari
fbe9a46d51 Add Marketplace link to user dropdown in toolbar 2018-08-01 15:56:39 +05:30