Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,069 Commits 3 Branches 0 Tags
Commit Graph

95 Commits

Author SHA1 Message Date
Nabin Hait
a804d6d487 Fixed merge conflict 2018-08-29 13:34:58 +05:30
rohitwaghchaure
e33047250e [Fix] Speacial character issue in searching project in sales invoice (#15220) 2018-08-27 11:43:57 +05:30
Doridel Cahanap
59e4c32e9f Allow Disabling Batch and edit Validations (#15076) 2018-08-06 14:45:18 +05:30
Ameya Shenoy
1cc7500be9
Merge branch 'master' into develop 2018-05-22 09:18:38 +00:00
Prateeksha Singh
984a7a7e61 [item-query] change order of description terms, name first 2018-05-17 17:29:36 +05:30
Rohit Waghchaure
585945e65d Allow to select Asset Received But Not Billed in expense account head 2018-05-17 00:23:27 +05:30
Saurabh
2ca83d61ea Resolve merge conflicts from enterprise_sprint branch 2018-05-14 21:15:46 +05:30
Zlash65
2e0809801d controller and other changes 2018-05-14 11:45:38 +05:30
creador30
dae8f1b353 Search for item_code (#13912) 
Item query can be called from custom script to search for an additional field. In this case the item_name, item_group and item_description are still searchable, but not item_code. As the item code is a must have field in search results, I have added this to the non-changable search fields in this query.
 2018-05-04 18:12:03 +05:30
Zarrar
0e3b000e81 sql syntax fix (#13529) 2018-04-05 10:34:30 +05:30
Nabin Hait
2b682c82e8 Fixed merge conflict 2018-04-04 11:40:16 +05:30
Rushabh Mehta
d5f9ebd008
[optimize] item queries (#13480) 2018-04-02 23:37:33 +05:30
Nabin Hait
e21e59614f Fixed merge conflict 2018-02-12 15:59:55 +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
Nabin Hait
ec2c9ec897 Merge branch 'master' into develop 2018-01-31 15:39:16 +05:30
Nabin Hait
7918b92d95 Invalid date value comparison, fixes for mariadb 10.2.3+ 2018-01-31 15:30:03 +05:30
Saurabh
ef31637549 Merge branch 'master' into develop 2018-01-22 15:29:15 +05:30
Rohit Waghchaure
c4c2bf0bfb [Fix] Image patch showing in the item link 2018-01-22 13:47:28 +05:30
Saurabh
35d8ce4fbd resolved merge conflicts 2018-01-12 16:58:32 +05:30
rohitwaghchaure
9fbed5617f [Fix] Wrong batch showing in the popup (#12421) 2018-01-12 16:22:33 +05:30
tundebabzy
76dddbf26e
Merge branch 'develop' into multi-barcode 2018-01-10 21:49:27 +01: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
Giovanni
ff7d73e418 - query fix 2017-12-10 20:46:46 +01:00
Giovanni
2144e02d3c - Added multiple barcode feature per item 2017-12-10 17:27:09 +01:00
tundebabzy
2a4fefc6ff Auto fetch batches based on quantity on POS (#11004) (#11767) 
* prevent premature escape when item has serial no and batch no

* fetch actual_batch_qty for item

* add available_qty to dialog

* remove expired batches from drop-down

* Update queries.py
 2017-11-29 10:53:09 +05:30
Saurabh
022ab63a0f [fix] query param fixes 2017-11-10 15:06:02 +05:30
Faris Ansari
99e31f97b8 set default params for paging (#11500) 2017-11-10 10:50:49 +05:30
Rushabh Mehta
bc4e2cd9c1 [added] hospitality domain (#11020) 
* [added] hospitality domain

* [tests] wip

* [tests] for restaurant

* [fix] tests for new naming

* [docs] added restaurant docs

* [docs] added restaurant docs
 2017-10-17 12:30:34 +05:30
tundebabzy
f6d738b3c5 Delivery note to billing issue (#10726) (#10766) 
* allow invoices to be made from sales returns

* Update queries.py
 2017-09-18 17:10:09 +05:30
Rushabh Mehta
7e506af0b9 [fix] warehouse query fixes https://github.com/frappe/erpnext/issues/10537 (#10538) 2017-08-24 15:23:33 +05:30
KanchanChauhan
4b888b95d0 [Minor] Added filter condition to Customer Query (#10057) 2017-07-25 14:03:01 +05:30
Console Admin
8623166dca Customer Query include Searchfields 
frappe/erpnext#8821
 2017-06-23 20:32:52 +03:00
Nabin Hait
1e2d7b3519 Filters for multiselect dialog for DN/PR in Sales/Purchase Invoice (#8882) 2017-05-17 13:52:21 +05:30
Nabin Hait
4e6ff8ccd8 Ignore permission for Bin in warehouse query (#8742) 2017-05-09 15:09:10 +05:30
Rushabh Mehta
b7e740ff45 [minor] ignore permissions for bin on warehouse_query (#8713) 2017-05-06 12:44:03 +05:30
suyashphadtare
34ab136b46 [fix] Remove un-necessary Whitespace 2017-02-10 19:14:43 +05:30
suyashphadtare
750a067688 [minor][fix] Show all warehouses with item actual qty in warehouse set query 2017-02-10 19:14:43 +05:30
suyashphadtare
049a88cc40 [minor] Show item quantity in warehouse set query 2017-02-10 19:14:43 +05:30
Rushabh Mehta
b92087cb2d [cleanup] move contact, address to frappe 💥 2017-01-13 18:54:47 +05:30
Kanchan Chauhan
7652b857c8 [Fix] Filters to get employee in Payroll 2016-11-16 15:29:01 +05:30
Nabin Hait
8693b5c93a Minor fixes 2016-09-05 11:51:45 +05:30
Maxwell Morais
3557261313 Extend search_fields for customer querie 
This PR is intended to extend the customer querie adding the meta-info from the doctype using the search fields to extend the customer querie
 2016-07-21 23:42:59 -03:00
Nabin Hait
972c25f78d Fixed conflict 2016-04-14 18:25:53 +05:30
Rushabh Mehta
203cc962f5 [enhancement] Item Selector 2016-04-08 17:21:00 +05:30
Neil Trini Lasrado
30b97b0b45 Fixed bug in get expense query 2016-03-31 23:10:13 +05:30
Nabin Hait
c6285069dc [fix] Item query in bom 2016-03-30 13:10:25 +05:30
Nabin Hait
3a15c92c5e Fixed Asset Depreciation first commit 2016-03-29 11:54:37 +05:30
Nabin Hait
6221117069 [fix] shipping address position in document 2016-03-16 16:23:30 +05:30
Nabin Hait
df4deba515 minor fix 2016-03-16 11:16:31 +05:30
Rushabh Mehta
3574b37ff3 [enhancement] sort links on basis of link_count (idx) 2016-03-11 14:33:04 +05:30