bcornwellmott
5491275b66
Merge branch 'develop' into bom_convert_uom
2017-06-07 08:42:54 -07:00
tundebabzy
99b734bfd7
Fix #4587 : Status does not display "Pending" in report filter ( #9104 )
...
* adds Material Request to `status_map`
* updates eval condition for Partially Ordered in Material Request map
* changes material_request doctype to include "pending", "ordered", "partially ordered", "issued", "transferred" as options
* adds more options to `validate_status`
* adds `set_status` just before saving
* adds `check_for_closed_status` in `before_cancel`
* adds patch to convert status to material request specific status
* adds stricter status update conditions
* changes `update_status` to me `set_status`
* adds checker such that draft status can only change to pending
* renames `check_draft_status` to `status_can_change`
* adds Cancelled to Material Request map
* makes `status_can_change` block any attempt to change a cancelled document
* adds more test cases
* updates what `set_status` checks for before adding comment
* adds patch to rename the present material request status
2017-06-07 12:02:07 +05:30
Nabin Hait
e4b3a67e74
Rate validation in return entry
2017-06-01 16:47:45 +05:30
Nabin Hait
ac3b2aa913
Set change amount automatically only if it is a cash transaction ( #9065 )
2017-05-30 15:35:01 +05:30
Nabin Hait
6a5cf672c1
Fixed opportunity status ( #9062 )
2017-05-30 15:34:20 +05:30
Ayush Shukla
e9cf1aba77
added float and rebase with hotfix ( #9019 )
2017-05-25 14:14:55 +05:30
Ben Cornwell-Mott
0f0b121669
Added BOM UOM selection for items
...
Added patch for BOM Item UOM
Fixed scrap qty issue
Added Scrap Qty update to patch
Reverted test record for production order
2017-05-24 11:12:51 -07:00
Prateeksha Singh
89cec18467
set variant name based on template name (frappe/erpnext#6367) ( #8920 )
2017-05-19 12:35:36 +05:30
Nabin Hait
83f8344e62
Merge branch 'master' of github.com:frappe/erpnext into hotfix
2017-05-18 14:06:37 +05:30
Nabin Hait
ee59ecd396
Merge branch 'hotfix' of github.com:frappe/erpnext into hotfix
2017-05-18 14:06:06 +05:30
Nabin Hait
e4f80a6eaa
Open lost opportunity again if quotation made against it ( #8854 )
2017-05-17 19:41:39 +05:30
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
8a27cf3785
Fix status of invoices with negative outstanding, if no return entry ( #8829 )
...
* Move allowance field in Item to the first section to apply it for both stock and non-stock items
* Fix status of invoices with negative outstanding, if no return entry
* get_value included in safe_eval
2017-05-16 12:43:00 +05:30
rohitwaghchaure
73456ac81a
[fix] Payments on the invoice is showing even if IS POS option is disabled ( #8802 )
2017-05-16 11:29:57 +05:30
Prateeksha Singh
edeb4dc7e0
Multiselect dialog for getting items ( #8583 )
...
* Concatenate docnames and send to mapper
* Multiselect with checkboxes
* set setters as separate filters
* Map filter fields to target_doc
* Get items from quotation (in SO) working
* [major] Set dialog setters for all forms
* Add date field
* Specify non-default date_fields
* [minor] add test_mapper.py
* [minor] remove cur_frm
* [minor][fix] test
* [minor] fix test with make_test_records
2017-05-15 11:32:06 +05:30
Nabin Hait
4f5ad50ecf
Item Rate in Sales Return must be less than or equal to reference doc ( #8775 )
...
* Item Rate in Sales Return must be less than or equal to reference doc
* Fix as rate field is not there in Packed Item
2017-05-11 16:44:19 +05:30
Makarand Bauskar
0e4c5c9efb
[minor] renamed a Total Margin field to Rate With Margin ( #8720 )
...
* [minor] renamed a Total Margin field to Rate With Margin
* [minor] minor fixes in field lable
2017-05-11 11:40:02 +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
Nabin Hait
42343bbc2c
Selling price validation against last purchase rate / valuation rate ( #8702 )
2017-05-05 17:23:17 +05:30
Nabin Hait
b6a8920489
Fixed conflict
2017-04-28 09:58:41 +05:30
Rushabh Mehta
551406ab11
[enhance] automatic batch selection in Delivery Note and Stock Entry
2017-04-24 10:28:38 +05:30
Rushabh Mehta
e385b5b97b
[enhance] automatic batch creation, move and split
2017-04-24 10:28:38 +05:30
mbauskar
8f3cc81302
[minor] minor fixes in pricing_rule and set_missing_value
2017-04-19 21:05:37 +05:30
mbauskar
9e9d242a24
[minor] fixes in test cases and added the test case for multiple uom in selling
2017-04-19 21:05:37 +05:30
mbauskar
287fe81329
[minor] calculate price list rate based on items uom
2017-04-19 21:05:37 +05:30
Rohit Waghchaure
dc981dc546
[fix] Auto serial no fecthed on the invoice even if stock update is disabled issue
2017-04-17 17:31:32 +05:30
Javier Wong
54d9c9eaf4
Merge branch 'develop' into develop
2017-04-14 18:33:44 +08:00
Javier Wong
9b11d9b45d
[fix] Stock Entry - Change "Is Sample Item" to "Allow Zero Valuation Rate"
2017-04-14 18:24:04 +08:00
mbauskar
e471b02172
[minor] if packed item warehouse not found then set the parent item warehouse to packed items
2017-04-12 18:51:01 +05:30
Makarand Bauskar
141c244ece
[minor] added order by args to get_*_list methods ( #8413 )
2017-04-12 13:02:28 +05:30
Rohit Waghchaure
87ad6d074a
[enhance] Stock qty added in purchase invoice
2017-04-11 18:29:52 +05:30
Makarand Bauskar
4782e8b751
[minor] added safe_eval for status_updater and added getdate and nowdate ( #8365 )
2017-04-07 17:16:16 +05:30
Rushabh Mehta
b58979fd3e
[added] frappe.safe_eval
2017-04-06 18:58:39 +05:30
Rushabh Mehta
9365641777
[added] frappe.safe_eval
2017-04-06 18:24:34 +05:30
Nabin Hait
d681c88d79
validate returned qty only if there is reference qty
2017-04-06 15:20:45 +05:30
Rohit Waghchaure
faf51d91b6
[fix] stock qty issue in purchase trends report
2017-04-05 14:53:26 +05:30
Nabin Hait
6f038bc1f3
Validate total advance against grand total considering write off amount
2017-04-03 17:56:05 +05:30
Nabin Hait
9300013acc
Validate total advance against grand total considering write off amount
2017-04-03 17:35:58 +05:30
Nabin Hait
8d8cba7faa
Validate total advance against grand total considering write off amount
2017-04-03 17:26:32 +05:30
Rushabh Mehta
cc8b2b2fdb
[fix] [refactor] demo for v8 and remove purchase common
2017-03-31 17:36:48 +05:30
Dominik Ottenbreit
6eb202ef3a
fix patch after test, fix variant based on manufacturer, add json for item_manufacturer
2017-03-24 14:49:52 +01:00
Nabin Hait
4a8a62a202
Merge pull request #8053 from umairsy/video-pages
...
updated erpnext-learn pages
2017-03-23 17:02:34 +05:30
Rushabh Mehta
a07c43fd68
[feature] ability to have variants based on manufacturer
2017-03-21 17:48:34 +01:00
Umair Sayyed
024896d806
updated erpnext-learn pages
2017-03-17 12:55:01 +05:30
Nabin Hait
56f650f342
Merge branch 'master' into develop
2017-03-15 11:28:07 +05:30
Rushabh Mehta
82c258948d
[fixes] for recurring and tests
2017-03-14 19:13:39 +05:30
Rohit Waghchaure
11fa7a9311
[fix] Removed customer, supplier and added link_name from website_list_for_contact file
2017-03-14 13:26:10 +05:30
Saurabh
4f4d0a8369
[fix] validate negative quantity while creating purchase receipt
2017-03-13 15:37:47 +05:30
Rohit Waghchaure
0169341917
[Fix] Item variants broken when using naming series for items and vriants of numeric value
2017-03-10 19:40:08 +05:30
Nabin Hait
e68f32cf19
UOM Conversion in selling
2017-03-06 16:41:13 +05:30
Kanchan Chauhan
5a980ac87a
UOM Conversion in Selling
2017-03-06 16:41:12 +05:30
Nabin Hait
a07c3193cf
Merge pull request #7889 from rohitwaghchaure/sales_return_issue_for_pos
...
[Fix] Sales Return Invoice (Is POS) doesn't show correct payment data
2017-03-04 18:32:40 +05:30
Rohit Waghchaure
a31ffbc745
[Fix] Sales Return Invoice (Is POS) doesn't show correct payment data
2017-03-03 16:28:49 +05:30
Nabin Hait
2bcacec5c6
Merge pull request #7576 from RobertSchouten/compact_dev
...
[fix] compact print format not longer ignores format builder
2017-02-24 13:09:18 +05:30
Nabin Hait
cd837ecbac
Merge branch 'develop' into develop
2017-02-20 19:09:20 +05:30
Nabin Hait
9f4cb0c097
Fixed merge conflict
2017-02-20 15:00:04 +05:30
Rohit Waghchaure
4b9d2f2733
[Fix] Cleanup supplied items if supply raw material is set as No
2017-02-16 18:53:23 +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
Nabin Hait
6ff0caa87a
Fixed merge conflict
2017-02-08 11:33:33 +05:30
Nabin Hait
0a6aaf4257
Get standard/historical valuation rate where missing: some minor fixes
2017-02-07 12:50:22 +05:30
Nabin Hait
ea8fab52c6
Get standard/historical valuation rate where missing, if item is not a sample item
2017-02-07 01:24:32 +05:30
Rushabh Mehta
a3d0bea375
Merge branch 'develop' into remove-party-status
2017-02-02 15:42:04 +05:30
Rushabh Mehta
87037bdd56
[minor] remove party status as it leads to duplicate notifications fixes #7346 , also fix for #7568
2017-01-30 13:22:51 +05:30
Rohit Waghchaure
92c9ad8c72
Merge branch 'master' into develop
2017-01-28 14:14:33 +05:30
Kanchan Chauhan
b77eaf7053
[URGENT][FIX]Stock Controller fix
2017-01-28 13:26:46 +05:30
Rushabh Mehta
710dc5392f
[merge]
2017-01-27 15:48:31 +05:30
Nabin Hait
cb19f52985
Update stock_controller.py
2017-01-25 19:20:35 +05:30
Rohit Waghchaure
3899d74f15
[Fix] Get valuation rate from item master and update stock value difference
2017-01-25 18:47:53 +05:30
robert schouten
67eff49516
[fix] compact print format not longer ignores format builder
2017-01-25 08:20:43 +08:00
Nabin Hait
349d520ae2
Fixed merge conflict
2017-01-20 15:44:35 +05:30
Nabin Hait
4c952f48f8
Some minor fixes
2017-01-20 15:15:31 +05:30
Nabin Hait
a0b967f2cd
Get valuation rate from Item while not found based on SLE
2017-01-20 12:50:40 +05:30
Rohit Waghchaure
56cc542eb7
[Fix] sales return discount issue
2017-01-18 14:50:24 +05:30
Nabin Hait
dd839055e3
Fixed merge conflict
2017-01-17 15:52:56 +05:30
Rohit Waghchaure
f58cad6b13
[Fix] Calculate paid amount when is pos is enabled
2017-01-17 12:11:57 +05:30
Rushabh Mehta
ffd80a6061
[fix] warehouse test cases
2017-01-16 17:23:20 +05:30
Rushabh Mehta
6695830f3f
[fix] warehouse test cases
2017-01-16 16:57:53 +05:30
Rushabh Mehta
b92087cb2d
[cleanup] move contact, address to frappe 💥
2017-01-13 18:54:47 +05:30
Nabin Hait
b251cd4ccb
Fixed merge conflict
2017-01-13 14:34:54 +05:30
Rohit Waghchaure
29458836e4
[Fix] After amend the status become cancelled even if docstatus is zero
2017-01-13 12:51:19 +05:30
Nabin Hait
007c87ea63
Merge pull request #7440 from nabinhait/gle_repost_optimization
...
Optimization to reduce GLE reposting time for future stock transactions
2017-01-13 11:33:42 +05:30
Nabin Hait
9784d27317
Optimization to reduce GLE reposting time for future stock transactions
2016-12-30 16:21:35 +05:30
Nabin Hait
58291c77e9
Fixed version conflict
2016-12-23 17:43:42 +05:30
Rushabh Mehta
0632ee3da9
Merge branch 'v7.2.0-beta' into develop
2016-12-21 17:31:09 +05:30
Rushabh Mehta
c6bd7ade2f
[fix] inclusive tax + total bug and cleanup in stock entry get_uom, fixes #7253
2016-12-21 17:30:29 +05:30
Nabin Hait
f573d43b90
fixed version conflict
2016-12-20 11:40:15 +05:30
Nabin Hait
3fe99559ef
Fixed negative stock validation message for translation and fixed test cases
2016-12-16 15:30:43 +05:30
Rohit Waghchaure
6500ef404d
[Fix] Timeout error in item attribute validation
2016-12-16 13:35:50 +05:30
Nabin Hait
8c61f343b3
Validate negative stock on delivery while missing valuation rate for booking expenses
2016-12-15 13:46:03 +05:30
Nabin Hait
f49bbe1142
Cleanup of lead and opportunity status updating logic
2016-12-15 11:51:54 +05:30
Nabin Hait
ad4f1c7fd1
date is optional in get_exchange_rate
2016-12-09 12:14:47 +05:30
Nabin Hait
3113f00c46
Replaced spaces with tabs
2016-12-08 15:42:44 +05:30
Nabin Hait
288a18e0cc
Fixes and patch for Currency Exchange based on date
2016-12-08 15:36:23 +05:30
Nabin Hait
1cc55fbbcb
Fixed merge conflict
2016-12-08 14:09:23 +05:30
Nabin Hait
a8333be6ad
Merge pull request #7023 from frappe/revert-7012-remove-count-star
...
Revert "[optimize] remove count(*) from queries"
2016-11-24 13:26:38 +05:30
Nabin Hait
f89f17cdde
Merge branch 'master' into develop
2016-11-23 16:00:22 +05:30
Nabin Hait
297d74a997
Unlink payment entries on cancellation of invoice
2016-11-23 15:59:00 +05:30
Rushabh Mehta
9872d8cdb5
Revert "[optimize] remove count(*) from queries"
2016-11-21 21:04:47 +05:30
Nabin Hait
d50d6a559c
Merge pull request #7012 from rmehta/remove-count-star
...
[optimize] remove count(*) from queries
2016-11-21 15:28:01 +05:30
Rushabh Mehta
5a258cbc2d
[optimize] remove count(*) from queries
2016-11-21 14:57:36 +05:30
Nabin Hait
c2f8dd71d7
Merge pull request #6965 from manassolanki/qa_redesign
...
[Fix] [Enhancement] Quality Inspection
2016-11-21 14:49:18 +05:30
Manas Solanki
60db98aaff
[Minor] Variable assignment before reference
...
Variable = 'inspection_required_fieldname'
2016-11-18 14:52:13 +05:30
KanchanChauhan
49a50fef63
Group same item in SO print ( #6959 )
2016-11-18 13:57:53 +05:30
Nabin Hait
c9b6a07732
[fix] Remove recurring id on amendment only if it is same as amended_from
2016-11-16 18:43:44 +05:30
Nabin Hait
7f6b99aca4
Merge pull request #6962 from KanchanChauhan/payroll-fixes
...
[Fix] Filters to get employee in Payroll
2016-11-16 17:34:00 +05:30
Nabin Hait
8af429da1f
Cleanup and fixes in quality inspection feature
2016-11-16 17:22:38 +05:30
Manas Solanki
cc90241fa5
Quality Inspection Issue
...
1. validate_inspection() function defination in stock_controller.py
2. function call in purchase_receipt.py, purchase_invoice.py and delivery_note.py
3. added functality in quality_inspection.py file for linking to purchase_receipt_no and delivery_note_no
2016-11-16 17:22:38 +05:30
mbauskar
e9747a8a6e
[minor] fixes in validate selling price
2016-11-16 17:19:47 +05:30
Kanchan Chauhan
7652b857c8
[Fix] Filters to get employee in Payroll
2016-11-16 15:29:01 +05:30
rohitwaghchaure
7be942db54
[Fix] Status updater for sales order in purchase order ( #6944 )
2016-11-16 11:14:32 +05:30
rohitwaghchaure
b3ba7f01ef
[Fix] PO status not changed as material return created against them ( #6869 )
2016-11-16 11:10:10 +05:30
Rohit Waghchaure
2285f90b64
added debit and credit note status
2016-11-09 14:47:24 +05:30
Rohit Waghchaure
2f1db57fe1
Added status field in sales invoice and purchase invoice
2016-11-08 18:49:58 +05:30
Nabin Hait
d662502f3c
[fix] Validate if warehouse is not linked to any account
2016-10-24 18:17:57 +05:30
Nabin Hait
9f26bc16b7
Update selling_controller.py
2016-10-20 16:45:53 +05:30
shreyas
e8aaa92816
[Minor] Some more fixes to the code
2016-10-20 15:57:45 +05:30
shreyas
edcba51c8b
[Fix] Added check to validate selling price against valuation rate
2016-10-20 15:57:45 +05:30
shreyas
1cfe2d7b45
[Minor] Validate purchase price against selling price
2016-10-20 15:57:45 +05:30
Nabin Hait
fa1cdd5bf0
Fixed merge conflict
2016-10-18 15:37:33 +05:30
Nabin Hait
fcd10f2e08
Merge pull request #6335 from RobertSchouten/stock_entry
...
[fix] warning for creating stock entry after sales invoice (causing missing gl entries)
2016-10-17 17:39:57 +05:30
Nabin Hait
e040510545
Always calculate additional discount amount if percentage is mentioned
2016-10-13 12:14:47 +05:30
Nabin Hait
cd9c45f816
Fixed merge conflict
2016-10-07 16:53:07 +05:30
Nabin Hait
2f75b7b42e
Fixed merge conflict
2016-10-07 14:16:17 +05:30
Rohit Waghchaure
770d04e633
[Fix] sales order status showing completed, while it's status was to bill
2016-10-07 13:55:48 +05:30
Rohit Waghchaure
7d5298997b
Documentation for payments
2016-10-06 16:49:39 +05:30
Nabin Hait
558f526a68
Fixed version conflict
2016-10-05 17:18:36 +05:30
Nabin Hait
cccc45edc5
Don't throw expense account validation on fetching item details
2016-10-05 17:15:53 +05:30
Nabin Hait
5fd5a77750
Fixed version conflict
2016-10-03 14:13:50 +05:30
Saurabh
4f62c4cf2d
[minor][fix] for condition maker
2016-10-03 12:48:25 +05:30
Rohit Waghchaure
21499e820d
[Enhancement] Supplier quotation added on supplier portal
2016-09-21 17:07:25 +05:30
Chude Osiegbu
256ec170d0
Corrections properly distinguish between transaction_date and posting_date as the basis for determining translation date that is passed to get_exchange_rate
2016-09-19 03:53:37 +01:00
Chude Osiegbu
1f64f9897c
Additional corrections for cases where get_exchange_rate was not called with the correct number of arguments.
2016-09-19 01:34:49 +01:00
Chude Osiegbu
7e74fb4357
Modification to set_price_list_currency in accounts_controller.py to allow for specification of date in get_exchange_rate call
2016-09-19 00:59:25 +01:00
RobertSchouten
db33ebb0ff
[fix] status updater percent when qty is minus value
2016-09-12 14:54:46 +08:00
robert schouten
6465711ca6
[fix] missing gl entries warnings
2016-09-12 11:17:14 +08:00
Nabin Hait
b8b228ed14
Fixed version conflict
2016-09-06 17:56:32 +05:30
Nabin Hait
ca627fb806
[fix] Fetch advance journal entry in invoice if it is tagged against linked order
2016-09-05 16:17:08 +05:30
Nabin Hait
406f0a38de
Fixed merge conflicts
2016-09-05 15:44:18 +05:30
Nabin Hait
8693b5c93a
Minor fixes
2016-09-05 11:51:45 +05:30
Rohit Waghchaure
560ba391f9
[Enhancement] Purchase return for rejected qty
2016-09-05 00:43:17 +05:30
Nabin Hait
5c69fed218
Ignore closed sales/purchase order in trends report
2016-09-02 12:53:18 +05:30
Rohit Waghchaure
609e2b4ca3
[POS] Currency format issue
2016-08-31 02:04:53 +05:30
Nabin Hait
a26bb96d2d
Merge pull request #6178 from nabinhait/status_updater_fix
...
Ignore validating billed amount against order if order item amount is zero
2016-08-26 12:09:39 +05:30
Nabin Hait
47a3f639ed
Ignore validating billed amount against order if order item amount is zero
2016-08-26 11:39:39 +05:30
Rohit Waghchaure
efb5bf2cfc
[POS] Fixed payment gl entry for sales return
2016-08-25 16:23:47 +05:30
Rohit Waghchaure
ea6d7e9b09
[Fix] decimal button not working
2016-08-23 11:39:44 +05:30
Nabin Hait
3b6dc141c6
[fix] Repost only distinct purchase receipts and invoices
2016-08-19 16:39:50 +05:30
Rohit Waghchaure
baef2624a2
Given provision to enter write off and change amount on POS
2016-08-10 00:50:53 +05:30
Rohit Waghchaure
7127a8f522
Allow user to edit change amount from sales invoice form for is pos
2016-08-08 23:19:18 +05:30
Nabin Hait
99d4ff4a29
Repost gle for future transactions if update stock checked in back dated purchase invoice
2016-08-08 14:12:58 +05:30
Nabin Hait
3bb1a421f0
Change amount calcualtion in POS if there is write off amount and gl entries in this scenario
2016-08-02 16:41:15 +05:30
Rohit Waghchaure
26cf01aaba
[mionr] fixes and cleanups
2016-07-26 00:30:25 +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
Rushabh Mehta
fc8e589295
[fix] party status updating bug, fixes #5794 , #5796
2016-07-20 12:09:27 +05:30
Rushabh Mehta
5c52fa9785
[fix] variant error message
2016-07-18 14:40:14 +05:30
Rushabh Mehta
95383bb281
[fix] item attribute validation and tests
2016-07-15 15:12:06 +05:30
Rushabh Mehta
20122aef79
[minor] optimize item attribute validation for #5756
2016-07-15 12:42:41 +05:30
Rushabh Mehta
b8bdfbcead
[minor] optimize item attribute validation for #5756
2016-07-15 12:41:08 +05:30
Rushabh Mehta
ea0ff23891
[cleanup] form dashboards
2016-07-07 14:28:05 +05:30
Rohit Waghchaure
a71d9d33af
Rename prevdoc field in purchase order and purchase receipt doctype
2016-07-06 12:13:29 +05:30
Nabin Hait
ff2f3ef1b1
Test Case Fixes
2016-07-04 11:42:25 +05:30
Nabin Hait
9db1b223da
Payment Entry: Test cases and default remarks
2016-07-04 11:42:24 +05:30
Nabin Hait
13093b4b68
Make payment entry aginst order, payment request and patch to rename advance table fields
2016-07-04 11:42:24 +05:30
Nabin Hait
05aefbbf5d
Payment Entry from invoice
2016-07-04 11:42:24 +05:30
Nabin Hait
1991c7b17d
Payment Reconciliation changes for Payment Entry
2016-07-04 11:42:24 +05:30
Nabin Hait
28a0528ae4
Advance Payment Entry adjustment against Invoice
2016-07-04 11:42:04 +05:30
Nabin Hait
e3a10170f7
Payment Entry submission and more
2016-07-04 11:41:24 +05:30
Nabin Hait
12e2a51519
[new][feature] Payment Entry
2016-07-04 11:41:24 +05:30
Rushabh Mehta
b33df4afe8
[cleanup] link methods made common
2016-07-04 11:39:25 +05:30
Rushabh Mehta
878dfec46a
[minor]
2016-07-04 11:39:25 +05:30
Saurabh
78333c7e07
[fixes] check group condition
2016-06-26 14:27:46 +05:30
Saurabh
7fecb50360
[enhance] rename warehouse account type to stock
2016-06-26 14:27:46 +05:30
Saurabh
4d02949814
[fixes] validate trash condition for warehouse and related account, move existing warehouses under all warehouse group, set account parent and is group for warehouse account
2016-06-25 11:06:14 +05:30
Saurabh
ec8babe7ac
[minor][fix]
2016-06-25 11:06:14 +05:30
Rushabh Mehta
a334062b03
[redesign] website routing system
2016-06-24 16:18:07 +05:30
Rushabh Mehta
2cb7a9f235
[ux] taxes table editable
2016-06-15 16:45:03 +05:30
Alec Ruiz-Ramon
fcaaa29a58
Status updater for quotation/lost to lead, quotation lost to oppt, and to set conversion as priority in lead
...
cleanup
squashed
2016-06-09 21:17:57 -04:00
Anand Doshi
34482788f4
[fix] removed bad import
2016-06-09 16:57:16 +05:30
Rushabh Mehta
aed79e993f
[fix] item attribute validation, fixes #5308
2016-06-02 17:49:16 +05:30
Nabin Hait
591a5aba56
Added Project in GL Entry and General Ledger report
2016-05-26 17:51:20 +05:30
Rohit Waghchaure
5d97d89a03
[Fix] Sales Invoice shows default date while no default mentioned
2016-05-17 15:13:17 +05:30
Rushabh Mehta
d42167e0e5
[cleanup] remove Features Setup
2016-05-11 16:47:14 +05:30
Nabin Hait
b81ed45b2b
fixed conflict
2016-05-11 12:52:31 +05:30
Rohit Waghchaure
6087fe178e
[Enhancement] POS
2016-05-09 23:36:15 +05:30
Nabin Hait
a9c4c8fc31
In Purchase Return entry, make sle and gle as per actual inward entry's valuation rate
2016-05-09 17:34:47 +05:30
Nabin Hait
332d29f166
Merge branch 'master' into develop
2016-05-06 16:13:35 +05:30
Nabin Hait
8704bead49
[fix] Validate returned serial nos and batch nos with original document
2016-05-06 15:30:10 +05:30
Nabin Hait
cd0e8ce8ad
Fixes and modification in fixed asset
2016-04-20 17:57:12 +05:30
Nabin Hait
3d9c5c0c20
Fixed Asset module cleanup and fixes
2016-04-20 17:57:11 +05:30
Nabin Hait
14aa9c5320
[fix] Cleanup and fixes in update stock feature in Purchase Invoice
2016-04-18 16:59:47 +05:30
Nabin Hait
ffd1e4efe6
Removed db_set from inside validate
2016-04-18 15:58:44 +05:30
Saurabh
fbb342c1ac
[enhancement] update landed cost on PI via landed cost voucher when update stock is set on PI
2016-04-18 15:58:43 +05:30
Saurabh
130c57b201
[fixes] code clean-up
2016-04-18 15:58:43 +05:30
Saurabh
e29248bcb3
[fixes] test-case to validate quantity after update stock and purchase return and code-cleaning
2016-04-18 15:58:43 +05:30
Saurabh
43520f93a1
[fixes] test cases, code cleanup.
2016-04-18 15:58:42 +05:30
jof2jc
524ebbcbb9
Added Make Receipt (Update Stock) and IsCash option on Purchase Invoice
2016-04-18 15:57:55 +05:30
Umair Sayyed
72534deea2
removed Is Sales Item and Is Purchase Item
2016-04-15 12:57:00 +05:30